diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java
index 0afbd637f..e5df61745 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedAbilityOuterClass.java
@@ -79,10 +79,6 @@ public final class AbilityAppliedAbilityOuterClass {
     int getInstancedAbilityId();
   }
   /**
-   * <pre>
-   * Obf: NKCDMLBKHGI
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedAbility}
    */
   public static final class AbilityAppliedAbility extends
@@ -508,10 +504,6 @@ public final class AbilityAppliedAbilityOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NKCDMLBKHGI
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedAbility}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java
index d97558c37..26a65e379 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAppliedModifierOuterClass.java
@@ -131,12 +131,14 @@ public final class AbilityAppliedModifierOuterClass {
      * @return The isServerbuffModifier.
      */
     boolean getIsServerbuffModifier();
+
+    /**
+     * <code>bool NCEGKBANOBP = 14;</code>
+     * @return The nCEGKBANOBP.
+     */
+    boolean getNCEGKBANOBP();
   }
   /**
-   * <pre>
-   * Obf: OAHPGFENJJK
-   * </pre>
-   *
    * Protobuf type {@code AbilityAppliedModifier}
    */
   public static final class AbilityAppliedModifier extends
@@ -278,6 +280,11 @@ public final class AbilityAppliedModifierOuterClass {
               isServerbuffModifier_ = input.readBool();
               break;
             }
+            case 112: {
+
+              nCEGKBANOBP_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -513,6 +520,17 @@ public final class AbilityAppliedModifierOuterClass {
       return isServerbuffModifier_;
     }
 
+    public static final int NCEGKBANOBP_FIELD_NUMBER = 14;
+    private boolean nCEGKBANOBP_;
+    /**
+     * <code>bool NCEGKBANOBP = 14;</code>
+     * @return The nCEGKBANOBP.
+     */
+    @java.lang.Override
+    public boolean getNCEGKBANOBP() {
+      return nCEGKBANOBP_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -566,6 +584,9 @@ public final class AbilityAppliedModifierOuterClass {
       if (isServerbuffModifier_ != false) {
         output.writeBool(13, isServerbuffModifier_);
       }
+      if (nCEGKBANOBP_ != false) {
+        output.writeBool(14, nCEGKBANOBP_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -627,6 +648,10 @@ public final class AbilityAppliedModifierOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(13, isServerbuffModifier_);
       }
+      if (nCEGKBANOBP_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, nCEGKBANOBP_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -681,6 +706,8 @@ public final class AbilityAppliedModifierOuterClass {
           != other.getSbuffUid()) return false;
       if (getIsServerbuffModifier()
           != other.getIsServerbuffModifier()) return false;
+      if (getNCEGKBANOBP()
+          != other.getNCEGKBANOBP()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -729,6 +756,9 @@ public final class AbilityAppliedModifierOuterClass {
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
+      hash = (37 * hash) + NCEGKBANOBP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getNCEGKBANOBP());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -825,10 +855,6 @@ public final class AbilityAppliedModifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OAHPGFENJJK
-     * </pre>
-     *
      * Protobuf type {@code AbilityAppliedModifier}
      */
     public static final class Builder extends
@@ -908,6 +934,8 @@ public final class AbilityAppliedModifierOuterClass {
 
         isServerbuffModifier_ = false;
 
+        nCEGKBANOBP_ = false;
+
         return this;
       }
 
@@ -963,6 +991,7 @@ public final class AbilityAppliedModifierOuterClass {
         }
         result.sbuffUid_ = sbuffUid_;
         result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.nCEGKBANOBP_ = nCEGKBANOBP_;
         onBuilt();
         return result;
       }
@@ -1050,6 +1079,9 @@ public final class AbilityAppliedModifierOuterClass {
         if (other.getIsServerbuffModifier() != false) {
           setIsServerbuffModifier(other.getIsServerbuffModifier());
         }
+        if (other.getNCEGKBANOBP() != false) {
+          setNCEGKBANOBP(other.getNCEGKBANOBP());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1833,6 +1865,37 @@ public final class AbilityAppliedModifierOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean nCEGKBANOBP_ ;
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @return The nCEGKBANOBP.
+       */
+      @java.lang.Override
+      public boolean getNCEGKBANOBP() {
+        return nCEGKBANOBP_;
+      }
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @param value The nCEGKBANOBP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNCEGKBANOBP(boolean value) {
+        
+        nCEGKBANOBP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool NCEGKBANOBP = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNCEGKBANOBP() {
+        
+        nCEGKBANOBP_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1902,7 +1965,7 @@ public final class AbilityAppliedModifierOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AbilityAppliedModifier.proto\032\023AbilityS" +
       "tring.proto\032\035AbilityAttachedModifier.pro" +
-      "to\032\030ModifierDurability.proto\"\351\003\n\026Ability" +
+      "to\032\030ModifierDurability.proto\"\376\003\n\026Ability" +
       "AppliedModifier\022\031\n\021modifier_local_id\030\001 \001" +
       "(\005\022 \n\030parent_ability_entity_id\030\002 \001(\r\022+\n\023" +
       "parent_ability_name\030\003 \001(\0132\016.AbilityStrin" +
@@ -1915,7 +1978,8 @@ public final class AbilityAppliedModifierOuterClass {
       "arent_ability\030\n \001(\010\0220\n\023modifier_durabili" +
       "ty\030\013 \001(\0132\023.ModifierDurability\022\021\n\tsbuff_u" +
       "id\030\014 \001(\r\022\036\n\026is_serverbuff_modifier\030\r \001(\010" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\022\023\n\013NCEGKBANOBP\030\016 \001(\010B\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1929,7 +1993,7 @@ public final class AbilityAppliedModifierOuterClass {
     internal_static_AbilityAppliedModifier_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityAppliedModifier_descriptor,
-        new java.lang.String[] { "ModifierLocalId", "ParentAbilityEntityId", "ParentAbilityName", "ParentAbilityOverride", "InstancedAbilityId", "InstancedModifierId", "ExistDuration", "AttachedInstancedModifier", "ApplyEntityId", "IsAttachedParentAbility", "ModifierDurability", "SbuffUid", "IsServerbuffModifier", });
+        new java.lang.String[] { "ModifierLocalId", "ParentAbilityEntityId", "ParentAbilityName", "ParentAbilityOverride", "InstancedAbilityId", "InstancedModifierId", "ExistDuration", "AttachedInstancedModifier", "ApplyEntityId", "IsAttachedParentAbility", "ModifierDurability", "SbuffUid", "IsServerbuffModifier", "NCEGKBANOBP", });
     emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityAttachedModifierOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ModifierDurabilityOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java
index 6c6e0e2c1..a99494fb5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityAttachedModifierOuterClass.java
@@ -50,7 +50,7 @@ public final class AbilityAttachedModifierOuterClass {
   }
   /**
    * <pre>
-   * Obf: COGFLLLFFFC
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AbilityAttachedModifier}
@@ -412,7 +412,7 @@ public final class AbilityAttachedModifierOuterClass {
     }
     /**
      * <pre>
-     * Obf: COGFLLLFFFC
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AbilityAttachedModifier}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java
index d8ea8853a..b11642ed5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityChangeNotifyOuterClass.java
@@ -18,6 +18,12 @@ public final class AbilityChangeNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:AbilityChangeNotify)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
     /**
      * <code>.AbilityControlBlock ability_control_block = 12;</code>
      * @return Whether the abilityControlBlock field is set.
@@ -32,19 +38,8 @@ public final class AbilityChangeNotifyOuterClass {
      * <code>.AbilityControlBlock ability_control_block = 12;</code>
      */
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 300
-   * Obf: GEMMGPJKGAF
-   * </pre>
-   *
    * Protobuf type {@code AbilityChangeNotify}
    */
   public static final class AbilityChangeNotify extends
@@ -89,7 +84,7 @@ public final class AbilityChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 72: {
 
               entityId_ = input.readUInt32();
               break;
@@ -139,6 +134,17 @@ public final class AbilityChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.class, emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.Builder.class);
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
     /**
@@ -165,17 +171,6 @@ public final class AbilityChangeNotifyOuterClass {
       return getAbilityControlBlock();
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 8;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,7 +186,7 @@ public final class AbilityChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(8, entityId_);
+        output.writeUInt32(9, entityId_);
       }
       if (abilityControlBlock_ != null) {
         output.writeMessage(12, getAbilityControlBlock());
@@ -207,7 +202,7 @@ public final class AbilityChangeNotifyOuterClass {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, entityId_);
+          .computeUInt32Size(9, entityId_);
       }
       if (abilityControlBlock_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -228,13 +223,13 @@ public final class AbilityChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other = (emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
       if (hasAbilityControlBlock()) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class AbilityChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       if (hasAbilityControlBlock()) {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class AbilityChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 300
-     * Obf: GEMMGPJKGAF
-     * </pre>
-     *
      * Protobuf type {@code AbilityChangeNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         if (abilityControlBlockBuilder_ == null) {
           abilityControlBlock_ = null;
         } else {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
-        entityId_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class AbilityChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify result = new emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify(this);
+        result.entityId_ = entityId_;
         if (abilityControlBlockBuilder_ == null) {
           result.abilityControlBlock_ = abilityControlBlock_;
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class AbilityChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AbilityChangeNotifyOuterClass.AbilityChangeNotify.getDefaultInstance()) return this;
-        if (other.hasAbilityControlBlock()) {
-          mergeAbilityControlBlock(other.getAbilityControlBlock());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.hasAbilityControlBlock()) {
+          mergeAbilityControlBlock(other.getAbilityControlBlock());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,6 +503,37 @@ public final class AbilityChangeNotifyOuterClass {
         return this;
       }
 
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        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_;
@@ -631,37 +652,6 @@ public final class AbilityChangeNotifyOuterClass {
         }
         return abilityControlBlockBuilder_;
       }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +720,9 @@ public final class AbilityChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AbilityChangeNotify.proto\032\031AbilityCont" +
-      "rolBlock.proto\"]\n\023AbilityChangeNotify\0223\n" +
-      "\025ability_control_block\030\014 \001(\0132\024.AbilityCo" +
-      "ntrolBlock\022\021\n\tentity_id\030\010 \001(\rB\033\n\031emu.gra" +
+      "rolBlock.proto\"]\n\023AbilityChangeNotify\022\021\n" +
+      "\tentity_id\030\t \001(\r\0223\n\025ability_control_bloc" +
+      "k\030\014 \001(\0132\024.AbilityControlBlockB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class AbilityChangeNotifyOuterClass {
     internal_static_AbilityChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityChangeNotify_descriptor,
-        new java.lang.String[] { "AbilityControlBlock", "EntityId", });
+        new java.lang.String[] { "EntityId", "AbilityControlBlock", });
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java
index 2ca100e1b..2ac388aef 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityControlBlockOuterClass.java
@@ -43,10 +43,6 @@ public final class AbilityControlBlockOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: GGPHMELJCOL
-   * </pre>
-   *
    * Protobuf type {@code AbilityControlBlock}
    */
   public static final class AbilityControlBlock extends
@@ -335,10 +331,6 @@ public final class AbilityControlBlockOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GGPHMELJCOL
-     * </pre>
-     *
      * Protobuf type {@code AbilityControlBlock}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java
index 14f0a90e2..df22c076b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityEmbryoOuterClass.java
@@ -37,10 +37,6 @@ public final class AbilityEmbryoOuterClass {
     int getAbilityOverrideNameHash();
   }
   /**
-   * <pre>
-   * Obf: PLELJEGMEOD
-   * </pre>
-   *
    * Protobuf type {@code AbilityEmbryo}
    */
   public static final class AbilityEmbryo extends
@@ -343,10 +339,6 @@ public final class AbilityEmbryoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PLELJEGMEOD
-     * </pre>
-     *
      * Protobuf type {@code AbilityEmbryo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java
index 28ce3caec..82133328d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityGadgetInfoOuterClass.java
@@ -38,7 +38,7 @@ public final class AbilityGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: AHHOEHNNEIN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AbilityGadgetInfo}
@@ -344,7 +344,7 @@ public final class AbilityGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: AHHOEHNNEIN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AbilityGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java
index 7eca7fa5c..dcd497f10 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityIdentifierOuterClass.java
@@ -19,46 +19,42 @@ public final class AbilityIdentifierOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 local_id = 5;</code>
-     * @return The localId.
+     * <code>uint32 NKIEALGKIJD = 2;</code>
+     * @return The nKIEALGKIJD.
      */
-    int getLocalId();
+    int getNKIEALGKIJD();
 
     /**
-     * <code>uint32 instanced_ability_id = 11;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
-     * @return The isServerbuffModifier.
-     */
-    boolean getIsServerbuffModifier();
-
-    /**
-     * <code>uint32 instanced_modifier_id = 12;</code>
+     * <code>uint32 instanced_modifier_id = 5;</code>
      * @return The instancedModifierId.
      */
     int getInstancedModifierId();
 
     /**
-     * <code>uint32 MDEDDJNNKOI = 6;</code>
-     * @return The mDEDDJNNKOI.
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
      */
-    int getMDEDDJNNKOI();
+    int getInstancedAbilityId();
 
     /**
-     * <code>uint32 BKJOIGAMEAM = 10;</code>
-     * @return The bKJOIGAMEAM.
+     * <code>uint32 AJAEPNGNILD = 13;</code>
+     * @return The aJAEPNGNILD.
      */
-    int getBKJOIGAMEAM();
+    int getAJAEPNGNILD();
+
+    /**
+     * <code>bool is_serverbuff_modifier = 14;</code>
+     * @return The isServerbuffModifier.
+     */
+    boolean getIsServerbuffModifier();
+
+    /**
+     * <code>int32 local_id = 15;</code>
+     * @return The localId.
+     */
+    int getLocalId();
   }
   /**
-   * <pre>
-   * Obf: JJPHDINFFJI
-   * </pre>
-   *
    * Protobuf type {@code AbilityIdentifier}
    */
   public static final class AbilityIdentifier extends
@@ -105,32 +101,32 @@ public final class AbilityIdentifierOuterClass {
               break;
             case 16: {
 
-              isServerbuffModifier_ = input.readBool();
+              nKIEALGKIJD_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              localId_ = input.readInt32();
+              instancedModifierId_ = input.readUInt32();
               break;
             }
-            case 48: {
-
-              mDEDDJNNKOI_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              bKJOIGAMEAM_ = input.readUInt32();
-              break;
-            }
-            case 88: {
+            case 72: {
 
               instancedAbilityId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 104: {
 
-              instancedModifierId_ = input.readUInt32();
+              aJAEPNGNILD_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isServerbuffModifier_ = input.readBool();
+              break;
+            }
+            case 120: {
+
+              localId_ = input.readInt32();
               break;
             }
             default: {
@@ -165,43 +161,21 @@ public final class AbilityIdentifierOuterClass {
               emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.class, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder.class);
     }
 
-    public static final int LOCAL_ID_FIELD_NUMBER = 5;
-    private int localId_;
+    public static final int NKIEALGKIJD_FIELD_NUMBER = 2;
+    private int nKIEALGKIJD_;
     /**
-     * <code>int32 local_id = 5;</code>
-     * @return The localId.
+     * <code>uint32 NKIEALGKIJD = 2;</code>
+     * @return The nKIEALGKIJD.
      */
     @java.lang.Override
-    public int getLocalId() {
-      return localId_;
+    public int getNKIEALGKIJD() {
+      return nKIEALGKIJD_;
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 11;
-    private int instancedAbilityId_;
-    /**
-     * <code>uint32 instanced_ability_id = 11;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      return instancedAbilityId_;
-    }
-
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 2;
-    private boolean isServerbuffModifier_;
-    /**
-     * <code>bool is_serverbuff_modifier = 2;</code>
-     * @return The isServerbuffModifier.
-     */
-    @java.lang.Override
-    public boolean getIsServerbuffModifier() {
-      return isServerbuffModifier_;
-    }
-
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 12;
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 5;
     private int instancedModifierId_;
     /**
-     * <code>uint32 instanced_modifier_id = 12;</code>
+     * <code>uint32 instanced_modifier_id = 5;</code>
      * @return The instancedModifierId.
      */
     @java.lang.Override
@@ -209,26 +183,48 @@ public final class AbilityIdentifierOuterClass {
       return instancedModifierId_;
     }
 
-    public static final int MDEDDJNNKOI_FIELD_NUMBER = 6;
-    private int mDEDDJNNKOI_;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 9;
+    private int instancedAbilityId_;
     /**
-     * <code>uint32 MDEDDJNNKOI = 6;</code>
-     * @return The mDEDDJNNKOI.
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
      */
     @java.lang.Override
-    public int getMDEDDJNNKOI() {
-      return mDEDDJNNKOI_;
+    public int getInstancedAbilityId() {
+      return instancedAbilityId_;
     }
 
-    public static final int BKJOIGAMEAM_FIELD_NUMBER = 10;
-    private int bKJOIGAMEAM_;
+    public static final int AJAEPNGNILD_FIELD_NUMBER = 13;
+    private int aJAEPNGNILD_;
     /**
-     * <code>uint32 BKJOIGAMEAM = 10;</code>
-     * @return The bKJOIGAMEAM.
+     * <code>uint32 AJAEPNGNILD = 13;</code>
+     * @return The aJAEPNGNILD.
      */
     @java.lang.Override
-    public int getBKJOIGAMEAM() {
-      return bKJOIGAMEAM_;
+    public int getAJAEPNGNILD() {
+      return aJAEPNGNILD_;
+    }
+
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 14;
+    private boolean isServerbuffModifier_;
+    /**
+     * <code>bool is_serverbuff_modifier = 14;</code>
+     * @return The isServerbuffModifier.
+     */
+    @java.lang.Override
+    public boolean getIsServerbuffModifier() {
+      return isServerbuffModifier_;
+    }
+
+    public static final int LOCAL_ID_FIELD_NUMBER = 15;
+    private int localId_;
+    /**
+     * <code>int32 local_id = 15;</code>
+     * @return The localId.
+     */
+    @java.lang.Override
+    public int getLocalId() {
+      return localId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,23 +241,23 @@ public final class AbilityIdentifierOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isServerbuffModifier_ != false) {
-        output.writeBool(2, isServerbuffModifier_);
-      }
-      if (localId_ != 0) {
-        output.writeInt32(5, localId_);
-      }
-      if (mDEDDJNNKOI_ != 0) {
-        output.writeUInt32(6, mDEDDJNNKOI_);
-      }
-      if (bKJOIGAMEAM_ != 0) {
-        output.writeUInt32(10, bKJOIGAMEAM_);
-      }
-      if (instancedAbilityId_ != 0) {
-        output.writeUInt32(11, instancedAbilityId_);
+      if (nKIEALGKIJD_ != 0) {
+        output.writeUInt32(2, nKIEALGKIJD_);
       }
       if (instancedModifierId_ != 0) {
-        output.writeUInt32(12, instancedModifierId_);
+        output.writeUInt32(5, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        output.writeUInt32(9, instancedAbilityId_);
+      }
+      if (aJAEPNGNILD_ != 0) {
+        output.writeUInt32(13, aJAEPNGNILD_);
+      }
+      if (isServerbuffModifier_ != false) {
+        output.writeBool(14, isServerbuffModifier_);
+      }
+      if (localId_ != 0) {
+        output.writeInt32(15, localId_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class AbilityIdentifierOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isServerbuffModifier_ != false) {
+      if (nKIEALGKIJD_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isServerbuffModifier_);
-      }
-      if (localId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, localId_);
-      }
-      if (mDEDDJNNKOI_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, mDEDDJNNKOI_);
-      }
-      if (bKJOIGAMEAM_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, bKJOIGAMEAM_);
-      }
-      if (instancedAbilityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, instancedAbilityId_);
+          .computeUInt32Size(2, nKIEALGKIJD_);
       }
       if (instancedModifierId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, instancedModifierId_);
+          .computeUInt32Size(5, instancedModifierId_);
+      }
+      if (instancedAbilityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, instancedAbilityId_);
+      }
+      if (aJAEPNGNILD_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, aJAEPNGNILD_);
+      }
+      if (isServerbuffModifier_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isServerbuffModifier_);
+      }
+      if (localId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, localId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,18 +307,18 @@ public final class AbilityIdentifierOuterClass {
       }
       emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other = (emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier) obj;
 
-      if (getLocalId()
-          != other.getLocalId()) return false;
-      if (getInstancedAbilityId()
-          != other.getInstancedAbilityId()) return false;
-      if (getIsServerbuffModifier()
-          != other.getIsServerbuffModifier()) return false;
+      if (getNKIEALGKIJD()
+          != other.getNKIEALGKIJD()) return false;
       if (getInstancedModifierId()
           != other.getInstancedModifierId()) return false;
-      if (getMDEDDJNNKOI()
-          != other.getMDEDDJNNKOI()) return false;
-      if (getBKJOIGAMEAM()
-          != other.getBKJOIGAMEAM()) return false;
+      if (getInstancedAbilityId()
+          != other.getInstancedAbilityId()) return false;
+      if (getAJAEPNGNILD()
+          != other.getAJAEPNGNILD()) return false;
+      if (getIsServerbuffModifier()
+          != other.getIsServerbuffModifier()) return false;
+      if (getLocalId()
+          != other.getLocalId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -334,19 +330,19 @@ public final class AbilityIdentifierOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getLocalId();
+      hash = (37 * hash) + NKIEALGKIJD_FIELD_NUMBER;
+      hash = (53 * hash) + getNKIEALGKIJD();
+      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedModifierId();
       hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getInstancedAbilityId();
+      hash = (37 * hash) + AJAEPNGNILD_FIELD_NUMBER;
+      hash = (53 * hash) + getAJAEPNGNILD();
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
-      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedModifierId();
-      hash = (37 * hash) + MDEDDJNNKOI_FIELD_NUMBER;
-      hash = (53 * hash) + getMDEDDJNNKOI();
-      hash = (37 * hash) + BKJOIGAMEAM_FIELD_NUMBER;
-      hash = (53 * hash) + getBKJOIGAMEAM();
+      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLocalId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -443,10 +439,6 @@ public final class AbilityIdentifierOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JJPHDINFFJI
-     * </pre>
-     *
      * Protobuf type {@code AbilityIdentifier}
      */
     public static final class Builder extends
@@ -484,17 +476,17 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        localId_ = 0;
-
-        instancedAbilityId_ = 0;
-
-        isServerbuffModifier_ = false;
+        nKIEALGKIJD_ = 0;
 
         instancedModifierId_ = 0;
 
-        mDEDDJNNKOI_ = 0;
+        instancedAbilityId_ = 0;
 
-        bKJOIGAMEAM_ = 0;
+        aJAEPNGNILD_ = 0;
+
+        isServerbuffModifier_ = false;
+
+        localId_ = 0;
 
         return this;
       }
@@ -522,12 +514,12 @@ public final class AbilityIdentifierOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier buildPartial() {
         emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier result = new emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier(this);
-        result.localId_ = localId_;
-        result.instancedAbilityId_ = instancedAbilityId_;
-        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.nKIEALGKIJD_ = nKIEALGKIJD_;
         result.instancedModifierId_ = instancedModifierId_;
-        result.mDEDDJNNKOI_ = mDEDDJNNKOI_;
-        result.bKJOIGAMEAM_ = bKJOIGAMEAM_;
+        result.instancedAbilityId_ = instancedAbilityId_;
+        result.aJAEPNGNILD_ = aJAEPNGNILD_;
+        result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.localId_ = localId_;
         onBuilt();
         return result;
       }
@@ -576,23 +568,23 @@ public final class AbilityIdentifierOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier other) {
         if (other == emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance()) return this;
-        if (other.getLocalId() != 0) {
-          setLocalId(other.getLocalId());
-        }
-        if (other.getInstancedAbilityId() != 0) {
-          setInstancedAbilityId(other.getInstancedAbilityId());
-        }
-        if (other.getIsServerbuffModifier() != false) {
-          setIsServerbuffModifier(other.getIsServerbuffModifier());
+        if (other.getNKIEALGKIJD() != 0) {
+          setNKIEALGKIJD(other.getNKIEALGKIJD());
         }
         if (other.getInstancedModifierId() != 0) {
           setInstancedModifierId(other.getInstancedModifierId());
         }
-        if (other.getMDEDDJNNKOI() != 0) {
-          setMDEDDJNNKOI(other.getMDEDDJNNKOI());
+        if (other.getInstancedAbilityId() != 0) {
+          setInstancedAbilityId(other.getInstancedAbilityId());
         }
-        if (other.getBKJOIGAMEAM() != 0) {
-          setBKJOIGAMEAM(other.getBKJOIGAMEAM());
+        if (other.getAJAEPNGNILD() != 0) {
+          setAJAEPNGNILD(other.getAJAEPNGNILD());
+        }
+        if (other.getIsServerbuffModifier() != false) {
+          setIsServerbuffModifier(other.getIsServerbuffModifier());
+        }
+        if (other.getLocalId() != 0) {
+          setLocalId(other.getLocalId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -623,102 +615,40 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private int localId_ ;
+      private int nKIEALGKIJD_ ;
       /**
-       * <code>int32 local_id = 5;</code>
-       * @return The localId.
+       * <code>uint32 NKIEALGKIJD = 2;</code>
+       * @return The nKIEALGKIJD.
        */
       @java.lang.Override
-      public int getLocalId() {
-        return localId_;
+      public int getNKIEALGKIJD() {
+        return nKIEALGKIJD_;
       }
       /**
-       * <code>int32 local_id = 5;</code>
-       * @param value The localId to set.
+       * <code>uint32 NKIEALGKIJD = 2;</code>
+       * @param value The nKIEALGKIJD to set.
        * @return This builder for chaining.
        */
-      public Builder setLocalId(int value) {
+      public Builder setNKIEALGKIJD(int value) {
         
-        localId_ = value;
+        nKIEALGKIJD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 local_id = 5;</code>
+       * <code>uint32 NKIEALGKIJD = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLocalId() {
+      public Builder clearNKIEALGKIJD() {
         
-        localId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int instancedAbilityId_ ;
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @return The instancedAbilityId.
-       */
-      @java.lang.Override
-      public int getInstancedAbilityId() {
-        return instancedAbilityId_;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        
-        instancedAbilityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        
-        instancedAbilityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isServerbuffModifier_ ;
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @return The isServerbuffModifier.
-       */
-      @java.lang.Override
-      public boolean getIsServerbuffModifier() {
-        return isServerbuffModifier_;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @param value The isServerbuffModifier to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsServerbuffModifier(boolean value) {
-        
-        isServerbuffModifier_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_serverbuff_modifier = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsServerbuffModifier() {
-        
-        isServerbuffModifier_ = false;
+        nKIEALGKIJD_ = 0;
         onChanged();
         return this;
       }
 
       private int instancedModifierId_ ;
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @return The instancedModifierId.
        */
       @java.lang.Override
@@ -726,7 +656,7 @@ public final class AbilityIdentifierOuterClass {
         return instancedModifierId_;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @param value The instancedModifierId to set.
        * @return This builder for chaining.
        */
@@ -737,7 +667,7 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 12;</code>
+       * <code>uint32 instanced_modifier_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearInstancedModifierId() {
@@ -747,64 +677,126 @@ public final class AbilityIdentifierOuterClass {
         return this;
       }
 
-      private int mDEDDJNNKOI_ ;
+      private int instancedAbilityId_ ;
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
-       * @return The mDEDDJNNKOI.
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @return The instancedAbilityId.
        */
       @java.lang.Override
-      public int getMDEDDJNNKOI() {
-        return mDEDDJNNKOI_;
+      public int getInstancedAbilityId() {
+        return instancedAbilityId_;
       }
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
-       * @param value The mDEDDJNNKOI to set.
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @param value The instancedAbilityId to set.
        * @return This builder for chaining.
        */
-      public Builder setMDEDDJNNKOI(int value) {
+      public Builder setInstancedAbilityId(int value) {
         
-        mDEDDJNNKOI_ = value;
+        instancedAbilityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 MDEDDJNNKOI = 6;</code>
+       * <code>uint32 instanced_ability_id = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMDEDDJNNKOI() {
+      public Builder clearInstancedAbilityId() {
         
-        mDEDDJNNKOI_ = 0;
+        instancedAbilityId_ = 0;
         onChanged();
         return this;
       }
 
-      private int bKJOIGAMEAM_ ;
+      private int aJAEPNGNILD_ ;
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
-       * @return The bKJOIGAMEAM.
+       * <code>uint32 AJAEPNGNILD = 13;</code>
+       * @return The aJAEPNGNILD.
        */
       @java.lang.Override
-      public int getBKJOIGAMEAM() {
-        return bKJOIGAMEAM_;
+      public int getAJAEPNGNILD() {
+        return aJAEPNGNILD_;
       }
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
-       * @param value The bKJOIGAMEAM to set.
+       * <code>uint32 AJAEPNGNILD = 13;</code>
+       * @param value The aJAEPNGNILD to set.
        * @return This builder for chaining.
        */
-      public Builder setBKJOIGAMEAM(int value) {
+      public Builder setAJAEPNGNILD(int value) {
         
-        bKJOIGAMEAM_ = value;
+        aJAEPNGNILD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 BKJOIGAMEAM = 10;</code>
+       * <code>uint32 AJAEPNGNILD = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBKJOIGAMEAM() {
+      public Builder clearAJAEPNGNILD() {
         
-        bKJOIGAMEAM_ = 0;
+        aJAEPNGNILD_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isServerbuffModifier_ ;
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @return The isServerbuffModifier.
+       */
+      @java.lang.Override
+      public boolean getIsServerbuffModifier() {
+        return isServerbuffModifier_;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @param value The isServerbuffModifier to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsServerbuffModifier(boolean value) {
+        
+        isServerbuffModifier_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_serverbuff_modifier = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsServerbuffModifier() {
+        
+        isServerbuffModifier_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int localId_ ;
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @return The localId.
+       */
+      @java.lang.Override
+      public int getLocalId() {
+        return localId_;
+      }
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @param value The localId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLocalId(int value) {
+        
+        localId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 local_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLocalId() {
+        
+        localId_ = 0;
         onChanged();
         return this;
       }
@@ -876,10 +868,10 @@ public final class AbilityIdentifierOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027AbilityIdentifier.proto\"\254\001\n\021AbilityIde" +
-      "ntifier\022\020\n\010local_id\030\005 \001(\005\022\034\n\024instanced_a" +
-      "bility_id\030\013 \001(\r\022\036\n\026is_serverbuff_modifie" +
-      "r\030\002 \001(\010\022\035\n\025instanced_modifier_id\030\014 \001(\r\022\023" +
-      "\n\013MDEDDJNNKOI\030\006 \001(\r\022\023\n\013BKJOIGAMEAM\030\n \001(\r" +
+      "ntifier\022\023\n\013NKIEALGKIJD\030\002 \001(\r\022\035\n\025instance" +
+      "d_modifier_id\030\005 \001(\r\022\034\n\024instanced_ability" +
+      "_id\030\t \001(\r\022\023\n\013AJAEPNGNILD\030\r \001(\r\022\036\n\026is_ser" +
+      "verbuff_modifier\030\016 \001(\010\022\020\n\010local_id\030\017 \001(\005" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -891,7 +883,7 @@ public final class AbilityIdentifierOuterClass {
     internal_static_AbilityIdentifier_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityIdentifier_descriptor,
-        new java.lang.String[] { "LocalId", "InstancedAbilityId", "IsServerbuffModifier", "InstancedModifierId", "MDEDDJNNKOI", "BKJOIGAMEAM", });
+        new java.lang.String[] { "NKIEALGKIJD", "InstancedModifierId", "InstancedAbilityId", "AJAEPNGNILD", "IsServerbuffModifier", "LocalId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java
index bdb21630c..73fbb89aa 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationFailNotifyOuterClass.java
@@ -19,42 +19,41 @@ public final class AbilityInvocationFailNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return Whether the invoke field is set.
-     */
-    boolean hasInvoke();
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return The invoke.
-     */
-    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke();
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     */
-    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The reason.
      */
     java.lang.String getReason();
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The bytes for reason.
      */
     com.google.protobuf.ByteString
         getReasonBytes();
+
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return Whether the invoke field is set.
+     */
+    boolean hasInvoke();
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return The invoke.
+     */
+    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke();
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     */
+    emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 26730
-   * Obf: PKAPLLHEELP
+   * CmdId: 9225
    * </pre>
    *
    * Protobuf type {@code AbilityInvocationFailNotify}
@@ -102,13 +101,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
               reason_ = s;
               break;
             }
-            case 50: {
+            case 74: {
               emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder subBuilder = null;
               if (invoke_ != null) {
                 subBuilder = invoke_.toBuilder();
@@ -121,7 +120,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
               break;
             }
-            case 72: {
+            case 120: {
 
               entityId_ = input.readUInt32();
               break;
@@ -158,47 +157,10 @@ public final class AbilityInvocationFailNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.class, emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.Builder.class);
     }
 
-    public static final int INVOKE_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return Whether the invoke field is set.
-     */
-    @java.lang.Override
-    public boolean hasInvoke() {
-      return invoke_ != null;
-    }
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     * @return The invoke.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
-      return invoke_ == null ? emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance() : invoke_;
-    }
-    /**
-     * <code>.AbilityInvokeEntry invoke = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
-      return getInvoke();
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int REASON_FIELD_NUMBER = 1;
+    public static final int REASON_FIELD_NUMBER = 2;
     private volatile java.lang.Object reason_;
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The reason.
      */
     @java.lang.Override
@@ -215,7 +177,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
     }
     /**
-     * <code>string reason = 1;</code>
+     * <code>string reason = 2;</code>
      * @return The bytes for reason.
      */
     @java.lang.Override
@@ -233,6 +195,43 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
     }
 
+    public static final int INVOKE_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return Whether the invoke field is set.
+     */
+    @java.lang.Override
+    public boolean hasInvoke() {
+      return invoke_ != null;
+    }
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     * @return The invoke.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
+      return invoke_ == null ? emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance() : invoke_;
+    }
+    /**
+     * <code>.AbilityInvokeEntry invoke = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
+      return getInvoke();
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 15;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -248,13 +247,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, reason_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, reason_);
       }
       if (invoke_ != null) {
-        output.writeMessage(6, getInvoke());
+        output.writeMessage(9, getInvoke());
       }
       if (entityId_ != 0) {
-        output.writeUInt32(9, entityId_);
+        output.writeUInt32(15, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -266,15 +265,15 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(reason_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, reason_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, reason_);
       }
       if (invoke_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getInvoke());
+          .computeMessageSize(9, getInvoke());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, entityId_);
+          .computeUInt32Size(15, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -291,6 +290,8 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify other = (emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify) obj;
 
+      if (!getReason()
+          .equals(other.getReason())) return false;
       if (hasInvoke() != other.hasInvoke()) return false;
       if (hasInvoke()) {
         if (!getInvoke()
@@ -298,8 +299,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (!getReason()
-          .equals(other.getReason())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -311,14 +310,14 @@ public final class AbilityInvocationFailNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + getReason().hashCode();
       if (hasInvoke()) {
         hash = (37 * hash) + INVOKE_FIELD_NUMBER;
         hash = (53 * hash) + getInvoke().hashCode();
       }
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + getReason().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,8 +415,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 26730
-     * Obf: PKAPLLHEELP
+     * CmdId: 9225
      * </pre>
      *
      * Protobuf type {@code AbilityInvocationFailNotify}
@@ -457,6 +455,8 @@ public final class AbilityInvocationFailNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        reason_ = "";
+
         if (invokeBuilder_ == null) {
           invoke_ = null;
         } else {
@@ -465,8 +465,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
         entityId_ = 0;
 
-        reason_ = "";
-
         return this;
       }
 
@@ -493,13 +491,13 @@ public final class AbilityInvocationFailNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify buildPartial() {
         emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify result = new emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify(this);
+        result.reason_ = reason_;
         if (invokeBuilder_ == null) {
           result.invoke_ = invoke_;
         } else {
           result.invoke_ = invokeBuilder_.build();
         }
         result.entityId_ = entityId_;
-        result.reason_ = reason_;
         onBuilt();
         return result;
       }
@@ -548,16 +546,16 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify other) {
         if (other == emu.grasscutter.net.proto.AbilityInvocationFailNotifyOuterClass.AbilityInvocationFailNotify.getDefaultInstance()) return this;
+        if (!other.getReason().isEmpty()) {
+          reason_ = other.reason_;
+          onChanged();
+        }
         if (other.hasInvoke()) {
           mergeInvoke(other.getInvoke());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (!other.getReason().isEmpty()) {
-          reason_ = other.reason_;
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -587,18 +585,94 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
 
+      private java.lang.Object reason_ = "";
+      /**
+       * <code>string reason = 2;</code>
+       * @return The reason.
+       */
+      public java.lang.String getReason() {
+        java.lang.Object ref = reason_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          reason_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @return The bytes for reason.
+       */
+      public com.google.protobuf.ByteString
+          getReasonBytes() {
+        java.lang.Object ref = reason_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          reason_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = getDefaultInstance().getReason();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string reason = 2;</code>
+       * @param value The bytes for reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReasonBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry invoke_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokeBuilder_;
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        * @return Whether the invoke field is set.
        */
       public boolean hasInvoke() {
         return invokeBuilder_ != null || invoke_ != null;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        * @return The invoke.
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvoke() {
@@ -609,7 +683,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder setInvoke(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokeBuilder_ == null) {
@@ -625,7 +699,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder setInvoke(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -639,7 +713,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder mergeInvoke(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokeBuilder_ == null) {
@@ -657,7 +731,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public Builder clearInvoke() {
         if (invokeBuilder_ == null) {
@@ -671,7 +745,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokeBuilder() {
         
@@ -679,7 +753,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return getInvokeFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokeOrBuilder() {
         if (invokeBuilder_ != null) {
@@ -690,7 +764,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         }
       }
       /**
-       * <code>.AbilityInvokeEntry invoke = 6;</code>
+       * <code>.AbilityInvokeEntry invoke = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -708,7 +782,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -716,7 +790,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -727,7 +801,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 9;</code>
+       * <code>uint32 entity_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -736,82 +810,6 @@ public final class AbilityInvocationFailNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private java.lang.Object reason_ = "";
-      /**
-       * <code>string reason = 1;</code>
-       * @return The reason.
-       */
-      public java.lang.String getReason() {
-        java.lang.Object ref = reason_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          reason_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @return The bytes for reason.
-       */
-      public com.google.protobuf.ByteString
-          getReasonBytes() {
-        java.lang.Object ref = reason_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          reason_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        reason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = getDefaultInstance().getReason();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string reason = 1;</code>
-       * @param value The bytes for reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReasonBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        reason_ = value;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -881,9 +879,9 @@ public final class AbilityInvocationFailNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AbilityInvocationFailNotify.proto\032\030Abi" +
       "lityInvokeEntry.proto\"e\n\033AbilityInvocati" +
-      "onFailNotify\022#\n\006invoke\030\006 \001(\0132\023.AbilityIn" +
-      "vokeEntry\022\021\n\tentity_id\030\t \001(\r\022\016\n\006reason\030\001" +
-      " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "onFailNotify\022\016\n\006reason\030\002 \001(\t\022#\n\006invoke\030\t" +
+      " \001(\0132\023.AbilityInvokeEntry\022\021\n\tentity_id\030\017" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -896,7 +894,7 @@ public final class AbilityInvocationFailNotifyOuterClass {
     internal_static_AbilityInvocationFailNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvocationFailNotify_descriptor,
-        new java.lang.String[] { "Invoke", "EntityId", "Reason", });
+        new java.lang.String[] { "Reason", "Invoke", "EntityId", });
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java
index c1e2c1009..a437e6689 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvocationsNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class AbilityInvocationsNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 26313
-   * Obf: IFAKFDEJFLI
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvocationsNotify}
    */
   public static final class AbilityInvocationsNotify extends
@@ -94,7 +89,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class AbilityInvocationsNotifyOuterClass {
               emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.class, emu.grasscutter.net.proto.AbilityInvocationsNotifyOuterClass.AbilityInvocationsNotify.Builder.class);
     }
 
-    public static final int INVOKES_FIELD_NUMBER = 15;
+    public static final int INVOKES_FIELD_NUMBER = 13;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -156,21 +151,21 @@ public final class AbilityInvocationsNotifyOuterClass {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -193,7 +188,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(15, invokes_.get(i));
+        output.writeMessage(13, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class AbilityInvocationsNotifyOuterClass {
       size = 0;
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, invokes_.get(i));
+          .computeMessageSize(13, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class AbilityInvocationsNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26313
-     * Obf: IFAKFDEJFLI
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvocationsNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class AbilityInvocationsNotifyOuterClass {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -585,7 +575,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -632,7 +622,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -675,7 +665,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -729,14 +719,14 @@ public final class AbilityInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class AbilityInvocationsNotifyOuterClass {
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 15;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -833,7 +823,7 @@ public final class AbilityInvocationsNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036AbilityInvocationsNotify.proto\032\030Abilit" +
       "yInvokeEntry.proto\"@\n\030AbilityInvocations" +
-      "Notify\022$\n\007invokes\030\017 \003(\0132\023.AbilityInvokeE" +
+      "Notify\022$\n\007invokes\030\r \003(\0132\023.AbilityInvokeE" +
       "ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java
index 2740c9437..a7f48175a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeArgumentOuterClass.java
@@ -15,10 +15,6 @@ public final class AbilityInvokeArgumentOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LBKBGBCCGMA
-   * </pre>
-   *
    * Protobuf enum {@code AbilityInvokeArgument}
    */
   public enum AbilityInvokeArgument
@@ -311,6 +307,38 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;</code>
      */
     ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE(129),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME(130),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY(131),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER(133),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW(134),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON(135),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL(136),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR(137),
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141;</code>
+     */
+    ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA(141),
     UNRECOGNIZED(-1),
     ;
 
@@ -602,6 +630,38 @@ public final class AbilityInvokeArgumentOuterClass {
      * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE = 129;</code>
      */
     public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE_VALUE = 129;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME = 130;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME_VALUE = 130;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY = 131;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY_VALUE = 131;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER = 133;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER_VALUE = 133;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW = 134;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW_VALUE = 134;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON = 135;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON_VALUE = 135;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL = 136;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL_VALUE = 136;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR = 137;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR_VALUE = 137;
+    /**
+     * <code>ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA = 141;</code>
+     */
+    public static final int ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA_VALUE = 141;
 
 
     public final int getNumber() {
@@ -700,6 +760,14 @@ public final class AbilityInvokeArgumentOuterClass {
         case 127: return ABILITY_INVOKE_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET;
         case 128: return ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATION_FOLLOW_CAMERA;
         case 129: return ABILITY_INVOKE_ARGUMENT_MIXIN_BUOYANT_FORCE;
+        case 130: return ABILITY_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAME;
+        case 131: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHECK_SCAN_ENTITY;
+        case 133: return ABILITY_INVOKE_ARGUMENT_MIXIN_TIME_TRACK_PLAYER;
+        case 134: return ABILITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW;
+        case 135: return ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE_PHLOGISTON;
+        case 136: return ABILITY_INVOKE_ARGUMENT_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGISTON_BALL;
+        case 137: return ABILITY_INVOKE_ARGUMENT_MIXIN_FREQUENCY_SHIELD_BAR;
+        case 141: return ABILITY_INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_CAMERA;
         default: return null;
       }
     }
@@ -765,7 +833,7 @@ public final class AbilityInvokeArgumentOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033AbilityInvokeArgument.proto*\245\036\n\025Abilit" +
+      "\n\033AbilityInvokeArgument.proto*\360!\n\025Abilit" +
       "yInvokeArgument\022 \n\034ABILITY_INVOKE_ARGUME" +
       "NT_NONE\020\000\0220\n,ABILITY_INVOKE_ARGUMENT_MET" +
       "A_MODIFIER_CHANGE\020\001\022@\n<ABILITY_INVOKE_AR" +
@@ -862,8 +930,20 @@ public final class AbilityInvokeArgumentOuterClass {
       "E_ARGUMENT_MIXIN_ENERGY_CRYSTAL_TARGET\020\177" +
       "\0229\n4ABILITY_INVOKE_ARGUMENT_MIXIN_ROTATI" +
       "ON_FOLLOW_CAMERA\020\200\001\0220\n+ABILITY_INVOKE_AR" +
-      "GUMENT_MIXIN_BUOYANT_FORCE\020\201\001B\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "GUMENT_MIXIN_BUOYANT_FORCE\020\201\001\0225\n0ABILITY" +
+      "_INVOKE_ARGUMENT_MIXIN_FILMFEST_BALL_GAM" +
+      "E\020\202\001\0224\n/ABILITY_INVOKE_ARGUMENT_MIXIN_CH" +
+      "ECK_SCAN_ENTITY\020\203\001\0224\n/ABILITY_INVOKE_ARG" +
+      "UMENT_MIXIN_TIME_TRACK_PLAYER\020\205\001\022.\n)ABIL" +
+      "ITY_INVOKE_ARGUMENT_MIXIN_PART_FOLLOW\020\206\001" +
+      "\0224\n/ABILITY_INVOKE_ARGUMENT_MIXIN_CHANGE" +
+      "_PHLOGISTON\020\207\001\022K\nFABILITY_INVOKE_ARGUMEN" +
+      "T_MIXIN_HUMAN_DRAGON_COLLAB_PICK_PHLOGIS" +
+      "TON_BALL\020\210\001\0227\n2ABILITY_INVOKE_ARGUMENT_M" +
+      "IXIN_FREQUENCY_SHIELD_BAR\020\211\001\022:\n5ABILITY_" +
+      "INVOKE_ARGUMENT_MIXIN_VEHICLE_STEER_BY_C" +
+      "AMERA\020\215\001B\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java
index 57d113f80..442582653 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryHeadOuterClass.java
@@ -19,52 +19,48 @@ public final class AbilityInvokeEntryHeadOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 instanced_ability_id = 5;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>int32 modifier_config_local_id = 4;</code>
-     * @return The modifierConfigLocalId.
-     */
-    int getModifierConfigLocalId();
-
-    /**
-     * <code>int32 local_id = 9;</code>
+     * <code>int32 local_id = 1;</code>
      * @return The localId.
      */
     int getLocalId();
 
     /**
-     * <code>uint32 server_buff_uid = 7;</code>
+     * <code>uint32 server_buff_uid = 5;</code>
      * @return The serverBuffUid.
      */
     int getServerBuffUid();
 
     /**
-     * <code>uint32 instanced_modifier_id = 11;</code>
-     * @return The instancedModifierId.
+     * <code>int32 modifier_config_local_id = 6;</code>
+     * @return The modifierConfigLocalId.
      */
-    int getInstancedModifierId();
+    int getModifierConfigLocalId();
 
     /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
+     * <code>bool is_serverbuff_modifier = 7;</code>
      * @return The isServerbuffModifier.
      */
     boolean getIsServerbuffModifier();
 
     /**
-     * <code>uint32 target_id = 8;</code>
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
+     */
+    int getInstancedAbilityId();
+
+    /**
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     int getTargetId();
+
+    /**
+     * <code>uint32 instanced_modifier_id = 14;</code>
+     * @return The instancedModifierId.
+     */
+    int getInstancedModifierId();
   }
   /**
-   * <pre>
-   * Obf: JOJGDABCHAP
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvokeEntryHead}
    */
   public static final class AbilityInvokeEntryHead extends
@@ -109,41 +105,41 @@ public final class AbilityInvokeEntryHeadOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              modifierConfigLocalId_ = input.readInt32();
-              break;
-            }
-            case 40: {
-
-              instancedAbilityId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              serverBuffUid_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              targetId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 8: {
 
               localId_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 40: {
 
-              instancedModifierId_ = input.readUInt32();
+              serverBuffUid_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 48: {
+
+              modifierConfigLocalId_ = input.readInt32();
+              break;
+            }
+            case 56: {
 
               isServerbuffModifier_ = input.readBool();
               break;
             }
+            case 72: {
+
+              instancedAbilityId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              targetId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              instancedModifierId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -176,32 +172,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
               emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.class, emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.Builder.class);
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 5;
-    private int instancedAbilityId_;
-    /**
-     * <code>uint32 instanced_ability_id = 5;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      return instancedAbilityId_;
-    }
-
-    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 4;
-    private int modifierConfigLocalId_;
-    /**
-     * <code>int32 modifier_config_local_id = 4;</code>
-     * @return The modifierConfigLocalId.
-     */
-    @java.lang.Override
-    public int getModifierConfigLocalId() {
-      return modifierConfigLocalId_;
-    }
-
-    public static final int LOCAL_ID_FIELD_NUMBER = 9;
+    public static final int LOCAL_ID_FIELD_NUMBER = 1;
     private int localId_;
     /**
-     * <code>int32 local_id = 9;</code>
+     * <code>int32 local_id = 1;</code>
      * @return The localId.
      */
     @java.lang.Override
@@ -209,10 +183,10 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return localId_;
     }
 
-    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 7;
+    public static final int SERVER_BUFF_UID_FIELD_NUMBER = 5;
     private int serverBuffUid_;
     /**
-     * <code>uint32 server_buff_uid = 7;</code>
+     * <code>uint32 server_buff_uid = 5;</code>
      * @return The serverBuffUid.
      */
     @java.lang.Override
@@ -220,21 +194,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return serverBuffUid_;
     }
 
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 11;
-    private int instancedModifierId_;
+    public static final int MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER = 6;
+    private int modifierConfigLocalId_;
     /**
-     * <code>uint32 instanced_modifier_id = 11;</code>
-     * @return The instancedModifierId.
+     * <code>int32 modifier_config_local_id = 6;</code>
+     * @return The modifierConfigLocalId.
      */
     @java.lang.Override
-    public int getInstancedModifierId() {
-      return instancedModifierId_;
+    public int getModifierConfigLocalId() {
+      return modifierConfigLocalId_;
     }
 
-    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 12;
+    public static final int IS_SERVERBUFF_MODIFIER_FIELD_NUMBER = 7;
     private boolean isServerbuffModifier_;
     /**
-     * <code>bool is_serverbuff_modifier = 12;</code>
+     * <code>bool is_serverbuff_modifier = 7;</code>
      * @return The isServerbuffModifier.
      */
     @java.lang.Override
@@ -242,10 +216,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return isServerbuffModifier_;
     }
 
-    public static final int TARGET_ID_FIELD_NUMBER = 8;
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 9;
+    private int instancedAbilityId_;
+    /**
+     * <code>uint32 instanced_ability_id = 9;</code>
+     * @return The instancedAbilityId.
+     */
+    @java.lang.Override
+    public int getInstancedAbilityId() {
+      return instancedAbilityId_;
+    }
+
+    public static final int TARGET_ID_FIELD_NUMBER = 13;
     private int targetId_;
     /**
-     * <code>uint32 target_id = 8;</code>
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     @java.lang.Override
@@ -253,6 +238,17 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return targetId_;
     }
 
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 14;
+    private int instancedModifierId_;
+    /**
+     * <code>uint32 instanced_modifier_id = 14;</code>
+     * @return The instancedModifierId.
+     */
+    @java.lang.Override
+    public int getInstancedModifierId() {
+      return instancedModifierId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -267,26 +263,26 @@ public final class AbilityInvokeEntryHeadOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (modifierConfigLocalId_ != 0) {
-        output.writeInt32(4, modifierConfigLocalId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        output.writeUInt32(5, instancedAbilityId_);
+      if (localId_ != 0) {
+        output.writeInt32(1, localId_);
       }
       if (serverBuffUid_ != 0) {
-        output.writeUInt32(7, serverBuffUid_);
+        output.writeUInt32(5, serverBuffUid_);
       }
-      if (targetId_ != 0) {
-        output.writeUInt32(8, targetId_);
-      }
-      if (localId_ != 0) {
-        output.writeInt32(9, localId_);
-      }
-      if (instancedModifierId_ != 0) {
-        output.writeUInt32(11, instancedModifierId_);
+      if (modifierConfigLocalId_ != 0) {
+        output.writeInt32(6, modifierConfigLocalId_);
       }
       if (isServerbuffModifier_ != false) {
-        output.writeBool(12, isServerbuffModifier_);
+        output.writeBool(7, isServerbuffModifier_);
+      }
+      if (instancedAbilityId_ != 0) {
+        output.writeUInt32(9, instancedAbilityId_);
+      }
+      if (targetId_ != 0) {
+        output.writeUInt32(13, targetId_);
+      }
+      if (instancedModifierId_ != 0) {
+        output.writeUInt32(14, instancedModifierId_);
       }
       unknownFields.writeTo(output);
     }
@@ -297,33 +293,33 @@ public final class AbilityInvokeEntryHeadOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (modifierConfigLocalId_ != 0) {
+      if (localId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, modifierConfigLocalId_);
-      }
-      if (instancedAbilityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, instancedAbilityId_);
+          .computeInt32Size(1, localId_);
       }
       if (serverBuffUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, serverBuffUid_);
+          .computeUInt32Size(5, serverBuffUid_);
       }
-      if (targetId_ != 0) {
+      if (modifierConfigLocalId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetId_);
-      }
-      if (localId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, localId_);
-      }
-      if (instancedModifierId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, instancedModifierId_);
+          .computeInt32Size(6, modifierConfigLocalId_);
       }
       if (isServerbuffModifier_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isServerbuffModifier_);
+          .computeBoolSize(7, isServerbuffModifier_);
+      }
+      if (instancedAbilityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, instancedAbilityId_);
+      }
+      if (targetId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, targetId_);
+      }
+      if (instancedModifierId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, instancedModifierId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -340,20 +336,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other = (emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead) obj;
 
-      if (getInstancedAbilityId()
-          != other.getInstancedAbilityId()) return false;
-      if (getModifierConfigLocalId()
-          != other.getModifierConfigLocalId()) return false;
       if (getLocalId()
           != other.getLocalId()) return false;
       if (getServerBuffUid()
           != other.getServerBuffUid()) return false;
-      if (getInstancedModifierId()
-          != other.getInstancedModifierId()) return false;
+      if (getModifierConfigLocalId()
+          != other.getModifierConfigLocalId()) return false;
       if (getIsServerbuffModifier()
           != other.getIsServerbuffModifier()) return false;
+      if (getInstancedAbilityId()
+          != other.getInstancedAbilityId()) return false;
       if (getTargetId()
           != other.getTargetId()) return false;
+      if (getInstancedModifierId()
+          != other.getInstancedModifierId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -365,21 +361,21 @@ public final class AbilityInvokeEntryHeadOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedAbilityId();
-      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getModifierConfigLocalId();
       hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getLocalId();
       hash = (37 * hash) + SERVER_BUFF_UID_FIELD_NUMBER;
       hash = (53 * hash) + getServerBuffUid();
-      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getInstancedModifierId();
+      hash = (37 * hash) + MODIFIER_CONFIG_LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getModifierConfigLocalId();
       hash = (37 * hash) + IS_SERVERBUFF_MODIFIER_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerbuffModifier());
+      hash = (37 * hash) + INSTANCED_ABILITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedAbilityId();
       hash = (37 * hash) + TARGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetId();
+      hash = (37 * hash) + INSTANCED_MODIFIER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInstancedModifierId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -476,10 +472,6 @@ public final class AbilityInvokeEntryHeadOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JOJGDABCHAP
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvokeEntryHead}
      */
     public static final class Builder extends
@@ -517,20 +509,20 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        instancedAbilityId_ = 0;
-
-        modifierConfigLocalId_ = 0;
-
         localId_ = 0;
 
         serverBuffUid_ = 0;
 
-        instancedModifierId_ = 0;
+        modifierConfigLocalId_ = 0;
 
         isServerbuffModifier_ = false;
 
+        instancedAbilityId_ = 0;
+
         targetId_ = 0;
 
+        instancedModifierId_ = 0;
+
         return this;
       }
 
@@ -557,13 +549,13 @@ public final class AbilityInvokeEntryHeadOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead buildPartial() {
         emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead result = new emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead(this);
-        result.instancedAbilityId_ = instancedAbilityId_;
-        result.modifierConfigLocalId_ = modifierConfigLocalId_;
         result.localId_ = localId_;
         result.serverBuffUid_ = serverBuffUid_;
-        result.instancedModifierId_ = instancedModifierId_;
+        result.modifierConfigLocalId_ = modifierConfigLocalId_;
         result.isServerbuffModifier_ = isServerbuffModifier_;
+        result.instancedAbilityId_ = instancedAbilityId_;
         result.targetId_ = targetId_;
+        result.instancedModifierId_ = instancedModifierId_;
         onBuilt();
         return result;
       }
@@ -612,27 +604,27 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead other) {
         if (other == emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead.getDefaultInstance()) return this;
-        if (other.getInstancedAbilityId() != 0) {
-          setInstancedAbilityId(other.getInstancedAbilityId());
-        }
-        if (other.getModifierConfigLocalId() != 0) {
-          setModifierConfigLocalId(other.getModifierConfigLocalId());
-        }
         if (other.getLocalId() != 0) {
           setLocalId(other.getLocalId());
         }
         if (other.getServerBuffUid() != 0) {
           setServerBuffUid(other.getServerBuffUid());
         }
-        if (other.getInstancedModifierId() != 0) {
-          setInstancedModifierId(other.getInstancedModifierId());
+        if (other.getModifierConfigLocalId() != 0) {
+          setModifierConfigLocalId(other.getModifierConfigLocalId());
         }
         if (other.getIsServerbuffModifier() != false) {
           setIsServerbuffModifier(other.getIsServerbuffModifier());
         }
+        if (other.getInstancedAbilityId() != 0) {
+          setInstancedAbilityId(other.getInstancedAbilityId());
+        }
         if (other.getTargetId() != 0) {
           setTargetId(other.getTargetId());
         }
+        if (other.getInstancedModifierId() != 0) {
+          setInstancedModifierId(other.getInstancedModifierId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -662,71 +654,9 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
-      private int instancedAbilityId_ ;
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @return The instancedAbilityId.
-       */
-      @java.lang.Override
-      public int getInstancedAbilityId() {
-        return instancedAbilityId_;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        
-        instancedAbilityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        
-        instancedAbilityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int modifierConfigLocalId_ ;
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @return The modifierConfigLocalId.
-       */
-      @java.lang.Override
-      public int getModifierConfigLocalId() {
-        return modifierConfigLocalId_;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @param value The modifierConfigLocalId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setModifierConfigLocalId(int value) {
-        
-        modifierConfigLocalId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 modifier_config_local_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearModifierConfigLocalId() {
-        
-        modifierConfigLocalId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int localId_ ;
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @return The localId.
        */
       @java.lang.Override
@@ -734,7 +664,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return localId_;
       }
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @param value The localId to set.
        * @return This builder for chaining.
        */
@@ -745,7 +675,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>int32 local_id = 9;</code>
+       * <code>int32 local_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearLocalId() {
@@ -757,7 +687,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
 
       private int serverBuffUid_ ;
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @return The serverBuffUid.
        */
       @java.lang.Override
@@ -765,7 +695,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return serverBuffUid_;
       }
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @param value The serverBuffUid to set.
        * @return This builder for chaining.
        */
@@ -776,7 +706,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 server_buff_uid = 7;</code>
+       * <code>uint32 server_buff_uid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerBuffUid() {
@@ -786,40 +716,40 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
-      private int instancedModifierId_ ;
+      private int modifierConfigLocalId_ ;
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
-       * @return The instancedModifierId.
+       * <code>int32 modifier_config_local_id = 6;</code>
+       * @return The modifierConfigLocalId.
        */
       @java.lang.Override
-      public int getInstancedModifierId() {
-        return instancedModifierId_;
+      public int getModifierConfigLocalId() {
+        return modifierConfigLocalId_;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
-       * @param value The instancedModifierId to set.
+       * <code>int32 modifier_config_local_id = 6;</code>
+       * @param value The modifierConfigLocalId to set.
        * @return This builder for chaining.
        */
-      public Builder setInstancedModifierId(int value) {
+      public Builder setModifierConfigLocalId(int value) {
         
-        instancedModifierId_ = value;
+        modifierConfigLocalId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 instanced_modifier_id = 11;</code>
+       * <code>int32 modifier_config_local_id = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearInstancedModifierId() {
+      public Builder clearModifierConfigLocalId() {
         
-        instancedModifierId_ = 0;
+        modifierConfigLocalId_ = 0;
         onChanged();
         return this;
       }
 
       private boolean isServerbuffModifier_ ;
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @return The isServerbuffModifier.
        */
       @java.lang.Override
@@ -827,7 +757,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return isServerbuffModifier_;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @param value The isServerbuffModifier to set.
        * @return This builder for chaining.
        */
@@ -838,7 +768,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>bool is_serverbuff_modifier = 12;</code>
+       * <code>bool is_serverbuff_modifier = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsServerbuffModifier() {
@@ -848,9 +778,40 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
 
+      private int instancedAbilityId_ ;
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @return The instancedAbilityId.
+       */
+      @java.lang.Override
+      public int getInstancedAbilityId() {
+        return instancedAbilityId_;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @param value The instancedAbilityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedAbilityId(int value) {
+        
+        instancedAbilityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedAbilityId() {
+        
+        instancedAbilityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int targetId_ ;
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return The targetId.
        */
       @java.lang.Override
@@ -858,7 +819,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return targetId_;
       }
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @param value The targetId to set.
        * @return This builder for chaining.
        */
@@ -869,7 +830,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_id = 8;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetId() {
@@ -878,6 +839,37 @@ public final class AbilityInvokeEntryHeadOuterClass {
         onChanged();
         return this;
       }
+
+      private int instancedModifierId_ ;
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @return The instancedModifierId.
+       */
+      @java.lang.Override
+      public int getInstancedModifierId() {
+        return instancedModifierId_;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @param value The instancedModifierId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedModifierId(int value) {
+        
+        instancedModifierId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedModifierId() {
+        
+        instancedModifierId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -946,12 +938,12 @@ public final class AbilityInvokeEntryHeadOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AbilityInvokeEntryHead.proto\"\325\001\n\026Abili" +
-      "tyInvokeEntryHead\022\034\n\024instanced_ability_i" +
-      "d\030\005 \001(\r\022 \n\030modifier_config_local_id\030\004 \001(" +
-      "\005\022\020\n\010local_id\030\t \001(\005\022\027\n\017server_buff_uid\030\007" +
-      " \001(\r\022\035\n\025instanced_modifier_id\030\013 \001(\r\022\036\n\026i" +
-      "s_serverbuff_modifier\030\014 \001(\010\022\021\n\ttarget_id" +
-      "\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "tyInvokeEntryHead\022\020\n\010local_id\030\001 \001(\005\022\027\n\017s" +
+      "erver_buff_uid\030\005 \001(\r\022 \n\030modifier_config_" +
+      "local_id\030\006 \001(\005\022\036\n\026is_serverbuff_modifier" +
+      "\030\007 \001(\010\022\034\n\024instanced_ability_id\030\t \001(\r\022\021\n\t" +
+      "target_id\030\r \001(\r\022\035\n\025instanced_modifier_id" +
+      "\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -963,7 +955,7 @@ public final class AbilityInvokeEntryHeadOuterClass {
     internal_static_AbilityInvokeEntryHead_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntryHead_descriptor,
-        new java.lang.String[] { "InstancedAbilityId", "ModifierConfigLocalId", "LocalId", "ServerBuffUid", "InstancedModifierId", "IsServerbuffModifier", "TargetId", });
+        new java.lang.String[] { "LocalId", "ServerBuffUid", "ModifierConfigLocalId", "IsServerbuffModifier", "InstancedAbilityId", "TargetId", "InstancedModifierId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 c83fd297e..2f1e4bdc0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityInvokeEntryOuterClass.java
@@ -19,62 +19,38 @@ public final class AbilityInvokeEntryOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AbilityInvokeArgument argument_type = 7;</code>
-     * @return The enum numeric value on the wire for argumentType.
-     */
-    int getArgumentTypeValue();
-    /**
-     * <code>.AbilityInvokeArgument argument_type = 7;</code>
-     * @return The argumentType.
-     */
-    emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType();
-
-    /**
-     * <code>bytes ability_data = 2;</code>
-     * @return The abilityData.
-     */
-    com.google.protobuf.ByteString getAbilityData();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>.ForwardType forward_type = 14;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    int getForwardTypeValue();
-    /**
-     * <code>.ForwardType forward_type = 14;</code>
-     * @return The forwardType.
-     */
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
-
-    /**
-     * <code>double total_tick_time = 5;</code>
-     * @return The totalTickTime.
-     */
-    double getTotalTickTime();
-
-    /**
-     * <code>uint32 forward_peer = 12;</code>
-     * @return The forwardPeer.
-     */
-    int getForwardPeer();
-
-    /**
-     * <code>uint32 event_id = 1;</code>
+     * <code>uint32 event_id = 2;</code>
      * @return The eventId.
      */
     int getEventId();
 
     /**
-     * <code>bool is_ignore_auth = 13;</code>
-     * @return The isIgnoreAuth.
+     * <code>.AbilityInvokeArgument argument_type = 3;</code>
+     * @return The enum numeric value on the wire for argumentType.
      */
-    boolean getIsIgnoreAuth();
+    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.
+     */
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
 
     /**
      * <code>.AbilityInvokeEntryHead head = 8;</code>
@@ -90,12 +66,32 @@ public final class AbilityInvokeEntryOuterClass {
      * <code>.AbilityInvokeEntryHead head = 8;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHeadOrBuilder getHeadOrBuilder();
+
+    /**
+     * <code>bool is_ignore_auth = 9;</code>
+     * @return The isIgnoreAuth.
+     */
+    boolean getIsIgnoreAuth();
+
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>double total_tick_time = 12;</code>
+     * @return The totalTickTime.
+     */
+    double getTotalTickTime();
+
+    /**
+     * <code>bytes ability_data = 14;</code>
+     * @return The abilityData.
+     */
+    com.google.protobuf.ByteString getAbilityData();
   }
   /**
-   * <pre>
-   * Obf: BNCFAGLEKAM
-   * </pre>
-   *
    * Protobuf type {@code AbilityInvokeEntry}
    */
   public static final class AbilityInvokeEntry extends
@@ -109,8 +105,8 @@ public final class AbilityInvokeEntryOuterClass {
     }
     private AbilityInvokeEntry() {
       argumentType_ = 0;
-      abilityData_ = com.google.protobuf.ByteString.EMPTY;
       forwardType_ = 0;
+      abilityData_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -143,25 +139,26 @@ public final class AbilityInvokeEntryOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
 
               eventId_ = input.readUInt32();
               break;
             }
-            case 18: {
+            case 24: {
+              int rawValue = input.readEnum();
 
-              abilityData_ = input.readBytes();
+              argumentType_ = rawValue;
               break;
             }
-            case 41: {
+            case 32: {
 
-              totalTickTime_ = input.readDouble();
+              forwardPeer_ = input.readUInt32();
               break;
             }
             case 56: {
               int rawValue = input.readEnum();
 
-              argumentType_ = rawValue;
+              forwardType_ = rawValue;
               break;
             }
             case 66: {
@@ -179,23 +176,22 @@ public final class AbilityInvokeEntryOuterClass {
             }
             case 72: {
 
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
-
-              forwardPeer_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
               isIgnoreAuth_ = input.readBool();
               break;
             }
-            case 112: {
-              int rawValue = input.readEnum();
+            case 88: {
 
-              forwardType_ = rawValue;
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 97: {
+
+              totalTickTime_ = input.readDouble();
+              break;
+            }
+            case 114: {
+
+              abilityData_ = input.readBytes();
               break;
             }
             default: {
@@ -230,17 +226,28 @@ public final class AbilityInvokeEntryOuterClass {
               emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.class, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder.class);
     }
 
-    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 7;
+    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 = 7;</code>
+     * <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 = 7;</code>
+     * <code>.AbilityInvokeArgument argument_type = 3;</code>
      * @return The argumentType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument getArgumentType() {
@@ -249,62 +256,10 @@ public final class AbilityInvokeEntryOuterClass {
       return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
     }
 
-    public static final int ABILITY_DATA_FIELD_NUMBER = 2;
-    private com.google.protobuf.ByteString abilityData_;
-    /**
-     * <code>bytes ability_data = 2;</code>
-     * @return The abilityData.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getAbilityData() {
-      return abilityData_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 14;
-    private int forwardType_;
-    /**
-     * <code>.ForwardType forward_type = 14;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    @java.lang.Override public int getForwardTypeValue() {
-      return forwardType_;
-    }
-    /**
-     * <code>.ForwardType forward_type = 14;</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 TOTAL_TICK_TIME_FIELD_NUMBER = 5;
-    private double totalTickTime_;
-    /**
-     * <code>double total_tick_time = 5;</code>
-     * @return The totalTickTime.
-     */
-    @java.lang.Override
-    public double getTotalTickTime() {
-      return totalTickTime_;
-    }
-
-    public static final int FORWARD_PEER_FIELD_NUMBER = 12;
+    public static final int FORWARD_PEER_FIELD_NUMBER = 4;
     private int forwardPeer_;
     /**
-     * <code>uint32 forward_peer = 12;</code>
+     * <code>uint32 forward_peer = 4;</code>
      * @return The forwardPeer.
      */
     @java.lang.Override
@@ -312,26 +267,23 @@ public final class AbilityInvokeEntryOuterClass {
       return forwardPeer_;
     }
 
-    public static final int EVENT_ID_FIELD_NUMBER = 1;
-    private int eventId_;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 7;
+    private int forwardType_;
     /**
-     * <code>uint32 event_id = 1;</code>
-     * @return The eventId.
+     * <code>.ForwardType forward_type = 7;</code>
+     * @return The enum numeric value on the wire for forwardType.
      */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
+    @java.lang.Override public int getForwardTypeValue() {
+      return forwardType_;
     }
-
-    public static final int IS_IGNORE_AUTH_FIELD_NUMBER = 13;
-    private boolean isIgnoreAuth_;
     /**
-     * <code>bool is_ignore_auth = 13;</code>
-     * @return The isIgnoreAuth.
+     * <code>.ForwardType forward_type = 7;</code>
+     * @return The forwardType.
      */
-    @java.lang.Override
-    public boolean getIsIgnoreAuth() {
-      return isIgnoreAuth_;
+    @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 HEAD_FIELD_NUMBER = 8;
@@ -360,6 +312,50 @@ public final class AbilityInvokeEntryOuterClass {
       return getHead();
     }
 
+    public static final int IS_IGNORE_AUTH_FIELD_NUMBER = 9;
+    private boolean isIgnoreAuth_;
+    /**
+     * <code>bool is_ignore_auth = 9;</code>
+     * @return The isIgnoreAuth.
+     */
+    @java.lang.Override
+    public boolean getIsIgnoreAuth() {
+      return isIgnoreAuth_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 12;
+    private double totalTickTime_;
+    /**
+     * <code>double total_tick_time = 12;</code>
+     * @return The totalTickTime.
+     */
+    @java.lang.Override
+    public double getTotalTickTime() {
+      return totalTickTime_;
+    }
+
+    public static final int ABILITY_DATA_FIELD_NUMBER = 14;
+    private com.google.protobuf.ByteString abilityData_;
+    /**
+     * <code>bytes ability_data = 14;</code>
+     * @return The abilityData.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getAbilityData() {
+      return abilityData_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -375,31 +371,31 @@ public final class AbilityInvokeEntryOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (eventId_ != 0) {
-        output.writeUInt32(1, eventId_);
-      }
-      if (!abilityData_.isEmpty()) {
-        output.writeBytes(2, abilityData_);
-      }
-      if (totalTickTime_ != 0D) {
-        output.writeDouble(5, totalTickTime_);
+        output.writeUInt32(2, eventId_);
       }
       if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
-        output.writeEnum(7, argumentType_);
+        output.writeEnum(3, argumentType_);
+      }
+      if (forwardPeer_ != 0) {
+        output.writeUInt32(4, forwardPeer_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        output.writeEnum(7, forwardType_);
       }
       if (head_ != null) {
         output.writeMessage(8, getHead());
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(9, entityId_);
-      }
-      if (forwardPeer_ != 0) {
-        output.writeUInt32(12, forwardPeer_);
-      }
       if (isIgnoreAuth_ != false) {
-        output.writeBool(13, isIgnoreAuth_);
+        output.writeBool(9, isIgnoreAuth_);
       }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(14, forwardType_);
+      if (entityId_ != 0) {
+        output.writeUInt32(11, entityId_);
+      }
+      if (totalTickTime_ != 0D) {
+        output.writeDouble(12, totalTickTime_);
+      }
+      if (!abilityData_.isEmpty()) {
+        output.writeBytes(14, abilityData_);
       }
       unknownFields.writeTo(output);
     }
@@ -412,39 +408,39 @@ public final class AbilityInvokeEntryOuterClass {
       size = 0;
       if (eventId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, eventId_);
-      }
-      if (!abilityData_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, abilityData_);
-      }
-      if (totalTickTime_ != 0D) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(5, totalTickTime_);
+          .computeUInt32Size(2, eventId_);
       }
       if (argumentType_ != emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.ABILITY_INVOKE_ARGUMENT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, argumentType_);
+          .computeEnumSize(3, argumentType_);
+      }
+      if (forwardPeer_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, forwardPeer_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(7, forwardType_);
       }
       if (head_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(8, getHead());
       }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, entityId_);
-      }
-      if (forwardPeer_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, forwardPeer_);
-      }
       if (isIgnoreAuth_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isIgnoreAuth_);
+          .computeBoolSize(9, isIgnoreAuth_);
       }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, forwardType_);
+          .computeUInt32Size(11, entityId_);
+      }
+      if (totalTickTime_ != 0D) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(12, totalTickTime_);
+      }
+      if (!abilityData_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(14, abilityData_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -461,26 +457,26 @@ public final class AbilityInvokeEntryOuterClass {
       }
       emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry other = (emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry) obj;
 
-      if (argumentType_ != other.argumentType_) return false;
-      if (!getAbilityData()
-          .equals(other.getAbilityData())) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (forwardType_ != other.forwardType_) return false;
-      if (java.lang.Double.doubleToLongBits(getTotalTickTime())
-          != java.lang.Double.doubleToLongBits(
-              other.getTotalTickTime())) return false;
-      if (getForwardPeer()
-          != other.getForwardPeer()) return false;
       if (getEventId()
           != other.getEventId()) return false;
-      if (getIsIgnoreAuth()
-          != other.getIsIgnoreAuth()) return false;
+      if (argumentType_ != other.argumentType_) return false;
+      if (getForwardPeer()
+          != other.getForwardPeer()) return false;
+      if (forwardType_ != other.forwardType_) return false;
       if (hasHead() != other.hasHead()) return false;
       if (hasHead()) {
         if (!getHead()
             .equals(other.getHead())) return false;
       }
+      if (getIsIgnoreAuth()
+          != other.getIsIgnoreAuth()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (java.lang.Double.doubleToLongBits(getTotalTickTime())
+          != java.lang.Double.doubleToLongBits(
+              other.getTotalTickTime())) return false;
+      if (!getAbilityData()
+          .equals(other.getAbilityData())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -492,28 +488,28 @@ public final class AbilityInvokeEntryOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ARGUMENT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + argumentType_;
-      hash = (37 * hash) + ABILITY_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getAbilityData().hashCode();
-      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) + TOTAL_TICK_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          java.lang.Double.doubleToLongBits(getTotalTickTime()));
-      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
-      hash = (53 * hash) + getForwardPeer();
       hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEventId();
-      hash = (37 * hash) + IS_IGNORE_AUTH_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsIgnoreAuth());
+      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_;
       if (hasHead()) {
         hash = (37 * hash) + HEAD_FIELD_NUMBER;
         hash = (53 * hash) + getHead().hashCode();
       }
+      hash = (37 * hash) + IS_IGNORE_AUTH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsIgnoreAuth());
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -610,10 +606,6 @@ public final class AbilityInvokeEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BNCFAGLEKAM
-     * </pre>
-     *
      * Protobuf type {@code AbilityInvokeEntry}
      */
     public static final class Builder extends
@@ -651,21 +643,13 @@ public final class AbilityInvokeEntryOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        eventId_ = 0;
+
         argumentType_ = 0;
 
-        abilityData_ = com.google.protobuf.ByteString.EMPTY;
-
-        entityId_ = 0;
-
-        forwardType_ = 0;
-
-        totalTickTime_ = 0D;
-
         forwardPeer_ = 0;
 
-        eventId_ = 0;
-
-        isIgnoreAuth_ = false;
+        forwardType_ = 0;
 
         if (headBuilder_ == null) {
           head_ = null;
@@ -673,6 +657,14 @@ public final class AbilityInvokeEntryOuterClass {
           head_ = null;
           headBuilder_ = null;
         }
+        isIgnoreAuth_ = false;
+
+        entityId_ = 0;
+
+        totalTickTime_ = 0D;
+
+        abilityData_ = com.google.protobuf.ByteString.EMPTY;
+
         return this;
       }
 
@@ -699,19 +691,19 @@ public final class AbilityInvokeEntryOuterClass {
       @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.argumentType_ = argumentType_;
-        result.abilityData_ = abilityData_;
-        result.entityId_ = entityId_;
-        result.forwardType_ = forwardType_;
-        result.totalTickTime_ = totalTickTime_;
-        result.forwardPeer_ = forwardPeer_;
         result.eventId_ = eventId_;
-        result.isIgnoreAuth_ = isIgnoreAuth_;
+        result.argumentType_ = argumentType_;
+        result.forwardPeer_ = forwardPeer_;
+        result.forwardType_ = forwardType_;
         if (headBuilder_ == null) {
           result.head_ = head_;
         } else {
           result.head_ = headBuilder_.build();
         }
+        result.isIgnoreAuth_ = isIgnoreAuth_;
+        result.entityId_ = entityId_;
+        result.totalTickTime_ = totalTickTime_;
+        result.abilityData_ = abilityData_;
         onBuilt();
         return result;
       }
@@ -760,32 +752,32 @@ public final class AbilityInvokeEntryOuterClass {
 
       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.getAbilityData() != com.google.protobuf.ByteString.EMPTY) {
-          setAbilityData(other.getAbilityData());
-        }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
-        }
-        if (other.getTotalTickTime() != 0D) {
-          setTotalTickTime(other.getTotalTickTime());
-        }
         if (other.getForwardPeer() != 0) {
           setForwardPeer(other.getForwardPeer());
         }
-        if (other.getEventId() != 0) {
-          setEventId(other.getEventId());
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
+        if (other.hasHead()) {
+          mergeHead(other.getHead());
         }
         if (other.getIsIgnoreAuth() != false) {
           setIsIgnoreAuth(other.getIsIgnoreAuth());
         }
-        if (other.hasHead()) {
-          mergeHead(other.getHead());
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.getTotalTickTime() != 0D) {
+          setTotalTickTime(other.getTotalTickTime());
+        }
+        if (other.getAbilityData() != com.google.protobuf.ByteString.EMPTY) {
+          setAbilityData(other.getAbilityData());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -816,16 +808,47 @@ public final class AbilityInvokeEntryOuterClass {
         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 = 7;</code>
+       * <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 = 7;</code>
+       * <code>.AbilityInvokeArgument argument_type = 3;</code>
        * @param value The enum numeric value on the wire for argumentType to set.
        * @return This builder for chaining.
        */
@@ -836,7 +859,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * <code>.AbilityInvokeArgument argument_type = 3;</code>
        * @return The argumentType.
        */
       @java.lang.Override
@@ -846,7 +869,7 @@ public final class AbilityInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.AbilityInvokeArgument.UNRECOGNIZED : result;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * <code>.AbilityInvokeArgument argument_type = 3;</code>
        * @param value The argumentType to set.
        * @return This builder for chaining.
        */
@@ -860,7 +883,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityInvokeArgument argument_type = 7;</code>
+       * <code>.AbilityInvokeArgument argument_type = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearArgumentType() {
@@ -870,81 +893,47 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
 
-      private com.google.protobuf.ByteString abilityData_ = com.google.protobuf.ByteString.EMPTY;
+      private int forwardPeer_ ;
       /**
-       * <code>bytes ability_data = 2;</code>
-       * @return The abilityData.
+       * <code>uint32 forward_peer = 4;</code>
+       * @return The forwardPeer.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getAbilityData() {
-        return abilityData_;
+      public int getForwardPeer() {
+        return forwardPeer_;
       }
       /**
-       * <code>bytes ability_data = 2;</code>
-       * @param value The abilityData to set.
+       * <code>uint32 forward_peer = 4;</code>
+       * @param value The forwardPeer to set.
        * @return This builder for chaining.
        */
-      public Builder setAbilityData(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        abilityData_ = value;
+      public Builder setForwardPeer(int value) {
+        
+        forwardPeer_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes ability_data = 2;</code>
+       * <code>uint32 forward_peer = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAbilityData() {
+      public Builder clearForwardPeer() {
         
-        abilityData_ = getDefaultInstance().getAbilityData();
-        onChanged();
-        return this;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 9;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 9;</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 = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
+        forwardPeer_ = 0;
         onChanged();
         return this;
       }
 
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <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 = 14;</code>
+       * <code>.ForwardType forward_type = 7;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -955,7 +944,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 7;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -965,7 +954,7 @@ public final class AbilityInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 7;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -979,7 +968,7 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -989,130 +978,6 @@ public final class AbilityInvokeEntryOuterClass {
         return this;
       }
 
-      private double totalTickTime_ ;
-      /**
-       * <code>double total_tick_time = 5;</code>
-       * @return The totalTickTime.
-       */
-      @java.lang.Override
-      public double getTotalTickTime() {
-        return totalTickTime_;
-      }
-      /**
-       * <code>double total_tick_time = 5;</code>
-       * @param value The totalTickTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTotalTickTime(double value) {
-        
-        totalTickTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>double total_tick_time = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalTickTime() {
-        
-        totalTickTime_ = 0D;
-        onChanged();
-        return this;
-      }
-
-      private int forwardPeer_ ;
-      /**
-       * <code>uint32 forward_peer = 12;</code>
-       * @return The forwardPeer.
-       */
-      @java.lang.Override
-      public int getForwardPeer() {
-        return forwardPeer_;
-      }
-      /**
-       * <code>uint32 forward_peer = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardPeer() {
-        
-        forwardPeer_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 1;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <code>uint32 event_id = 1;</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 = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isIgnoreAuth_ ;
-      /**
-       * <code>bool is_ignore_auth = 13;</code>
-       * @return The isIgnoreAuth.
-       */
-      @java.lang.Override
-      public boolean getIsIgnoreAuth() {
-        return isIgnoreAuth_;
-      }
-      /**
-       * <code>bool is_ignore_auth = 13;</code>
-       * @param value The isIgnoreAuth to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsIgnoreAuth(boolean value) {
-        
-        isIgnoreAuth_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_ignore_auth = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsIgnoreAuth() {
-        
-        isIgnoreAuth_ = false;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.AbilityInvokeEntryHead head_;
       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_;
@@ -1231,6 +1096,133 @@ public final class AbilityInvokeEntryOuterClass {
         }
         return headBuilder_;
       }
+
+      private boolean isIgnoreAuth_ ;
+      /**
+       * <code>bool is_ignore_auth = 9;</code>
+       * @return The isIgnoreAuth.
+       */
+      @java.lang.Override
+      public boolean getIsIgnoreAuth() {
+        return isIgnoreAuth_;
+      }
+      /**
+       * <code>bool is_ignore_auth = 9;</code>
+       * @param value The isIgnoreAuth to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsIgnoreAuth(boolean value) {
+        
+        isIgnoreAuth_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_ignore_auth = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsIgnoreAuth() {
+        
+        isIgnoreAuth_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private double totalTickTime_ ;
+      /**
+       * <code>double total_tick_time = 12;</code>
+       * @return The totalTickTime.
+       */
+      @java.lang.Override
+      public double getTotalTickTime() {
+        return totalTickTime_;
+      }
+      /**
+       * <code>double total_tick_time = 12;</code>
+       * @param value The totalTickTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTotalTickTime(double value) {
+        
+        totalTickTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double total_tick_time = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalTickTime() {
+        
+        totalTickTime_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString abilityData_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes ability_data = 14;</code>
+       * @return The abilityData.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getAbilityData() {
+        return abilityData_;
+      }
+      /**
+       * <code>bytes ability_data = 14;</code>
+       * @param value The abilityData to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAbilityData(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        abilityData_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes ability_data = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAbilityData() {
+        
+        abilityData_ = getDefaultInstance().getAbilityData();
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1301,13 +1293,13 @@ public final class AbilityInvokeEntryOuterClass {
       "\n\030AbilityInvokeEntry.proto\032\033AbilityInvok" +
       "eArgument.proto\032\021ForwardType.proto\032\034Abil" +
       "ityInvokeEntryHead.proto\"\220\002\n\022AbilityInvo" +
-      "keEntry\022-\n\rargument_type\030\007 \001(\0162\026.Ability" +
-      "InvokeArgument\022\024\n\014ability_data\030\002 \001(\014\022\021\n\t" +
-      "entity_id\030\t \001(\r\022\"\n\014forward_type\030\016 \001(\0162\014." +
-      "ForwardType\022\027\n\017total_tick_time\030\005 \001(\001\022\024\n\014" +
-      "forward_peer\030\014 \001(\r\022\020\n\010event_id\030\001 \001(\r\022\026\n\016" +
-      "is_ignore_auth\030\r \001(\010\022%\n\004head\030\010 \001(\0132\027.Abi" +
-      "lityInvokeEntryHeadB\033\n\031emu.grasscutter.n" +
+      "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" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1322,7 +1314,7 @@ public final class AbilityInvokeEntryOuterClass {
     internal_static_AbilityInvokeEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityInvokeEntry_descriptor,
-        new java.lang.String[] { "ArgumentType", "AbilityData", "EntityId", "ForwardType", "TotalTickTime", "ForwardPeer", "EventId", "IsIgnoreAuth", "Head", });
+        new java.lang.String[] { "EventId", "ArgumentType", "ForwardPeer", "ForwardType", "Head", "IsIgnoreAuth", "EntityId", "TotalTickTime", "AbilityData", });
     emu.grasscutter.net.proto.AbilityInvokeArgumentOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityInvokeEntryHeadOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java
index 7e6216889..816f740a1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityMixinRecoverInfoOuterClass.java
@@ -18,28 +18,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AbilityMixinRecoverInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return Whether the instancedAbilityId field is set.
-     */
-    boolean hasInstancedAbilityId();
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return The instancedAbilityId.
-     */
-    int getInstancedAbilityId();
-
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return Whether the instancedModifierId field is set.
-     */
-    boolean hasInstancedModifierId();
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return The instancedModifierId.
-     */
-    int getInstancedModifierId();
-
     /**
      * <code>uint32 local_id = 3;</code>
      * @return The localId.
@@ -108,13 +86,31 @@ public final class AbilityMixinRecoverInfoOuterClass {
      */
     emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.BreakoutSnapShotOrBuilder getBreakoutSnapShotOrBuilder();
 
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return Whether the instancedAbilityId field is set.
+     */
+    boolean hasInstancedAbilityId();
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    int getInstancedAbilityId();
+
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return Whether the instancedModifierId field is set.
+     */
+    boolean hasInstancedModifierId();
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return The instancedModifierId.
+     */
+    int getInstancedModifierId();
+
     public emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo.SourceCase getSourceCase();
   }
   /**
-   * <pre>
-   * Obf: NNBAGDGFEKA
-   * </pre>
-   *
    * Protobuf type {@code AbilityMixinRecoverInfo}
    */
   public static final class AbilityMixinRecoverInfo extends
@@ -304,48 +300,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
           sourceCase_);
     }
 
-    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return Whether the instancedAbilityId field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstancedAbilityId() {
-      return sourceCase_ == 1;
-    }
-    /**
-     * <code>uint32 instanced_ability_id = 1;</code>
-     * @return The instancedAbilityId.
-     */
-    @java.lang.Override
-    public int getInstancedAbilityId() {
-      if (sourceCase_ == 1) {
-        return (java.lang.Integer) source_;
-      }
-      return 0;
-    }
-
-    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 2;
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return Whether the instancedModifierId field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstancedModifierId() {
-      return sourceCase_ == 2;
-    }
-    /**
-     * <code>uint32 instanced_modifier_id = 2;</code>
-     * @return The instancedModifierId.
-     */
-    @java.lang.Override
-    public int getInstancedModifierId() {
-      if (sourceCase_ == 2) {
-        return (java.lang.Integer) source_;
-      }
-      return 0;
-    }
-
     public static final int LOCAL_ID_FIELD_NUMBER = 3;
     private int localId_;
     /**
@@ -462,6 +416,48 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return getBreakoutSnapShot();
     }
 
+    public static final int INSTANCED_ABILITY_ID_FIELD_NUMBER = 1;
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return Whether the instancedAbilityId field is set.
+     */
+    @java.lang.Override
+    public boolean hasInstancedAbilityId() {
+      return sourceCase_ == 1;
+    }
+    /**
+     * <code>uint32 instanced_ability_id = 1;</code>
+     * @return The instancedAbilityId.
+     */
+    @java.lang.Override
+    public int getInstancedAbilityId() {
+      if (sourceCase_ == 1) {
+        return (java.lang.Integer) source_;
+      }
+      return 0;
+    }
+
+    public static final int INSTANCED_MODIFIER_ID_FIELD_NUMBER = 2;
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return Whether the instancedModifierId field is set.
+     */
+    @java.lang.Override
+    public boolean hasInstancedModifierId() {
+      return sourceCase_ == 2;
+    }
+    /**
+     * <code>uint32 instanced_modifier_id = 2;</code>
+     * @return The instancedModifierId.
+     */
+    @java.lang.Override
+    public int getInstancedModifierId() {
+      if (sourceCase_ == 2) {
+        return (java.lang.Integer) source_;
+      }
+      return 0;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -730,10 +726,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NNBAGDGFEKA
-     * </pre>
-     *
      * Protobuf type {@code AbilityMixinRecoverInfo}
      */
     public static final class Builder extends
@@ -819,12 +811,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
       public emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo buildPartial() {
         emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo result = new emu.grasscutter.net.proto.AbilityMixinRecoverInfoOuterClass.AbilityMixinRecoverInfo(this);
         int from_bitField0_ = bitField0_;
-        if (sourceCase_ == 1) {
-          result.source_ = source_;
-        }
-        if (sourceCase_ == 2) {
-          result.source_ = source_;
-        }
         result.localId_ = localId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           dataList_.makeImmutable();
@@ -846,6 +832,12 @@ public final class AbilityMixinRecoverInfoOuterClass {
         } else {
           result.breakoutSnapShot_ = breakoutSnapShotBuilder_.build();
         }
+        if (sourceCase_ == 1) {
+          result.source_ = source_;
+        }
+        if (sourceCase_ == 2) {
+          result.source_ = source_;
+        }
         result.sourceCase_ = sourceCase_;
         onBuilt();
         return result;
@@ -998,88 +990,6 @@ public final class AbilityMixinRecoverInfoOuterClass {
 
       private int bitField0_;
 
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return Whether the instancedAbilityId field is set.
-       */
-      public boolean hasInstancedAbilityId() {
-        return sourceCase_ == 1;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return The instancedAbilityId.
-       */
-      public int getInstancedAbilityId() {
-        if (sourceCase_ == 1) {
-          return (java.lang.Integer) source_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @param value The instancedAbilityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedAbilityId(int value) {
-        sourceCase_ = 1;
-        source_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_ability_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedAbilityId() {
-        if (sourceCase_ == 1) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return Whether the instancedModifierId field is set.
-       */
-      public boolean hasInstancedModifierId() {
-        return sourceCase_ == 2;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return The instancedModifierId.
-       */
-      public int getInstancedModifierId() {
-        if (sourceCase_ == 2) {
-          return (java.lang.Integer) source_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @param value The instancedModifierId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInstancedModifierId(int value) {
-        sourceCase_ = 2;
-        source_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 instanced_modifier_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInstancedModifierId() {
-        if (sourceCase_ == 2) {
-          sourceCase_ = 0;
-          source_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
       private int localId_ ;
       /**
        * <code>uint32 local_id = 3;</code>
@@ -1579,6 +1489,88 @@ public final class AbilityMixinRecoverInfoOuterClass {
         }
         return breakoutSnapShotBuilder_;
       }
+
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return Whether the instancedAbilityId field is set.
+       */
+      public boolean hasInstancedAbilityId() {
+        return sourceCase_ == 1;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return The instancedAbilityId.
+       */
+      public int getInstancedAbilityId() {
+        if (sourceCase_ == 1) {
+          return (java.lang.Integer) source_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @param value The instancedAbilityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedAbilityId(int value) {
+        sourceCase_ = 1;
+        source_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_ability_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedAbilityId() {
+        if (sourceCase_ == 1) {
+          sourceCase_ = 0;
+          source_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return Whether the instancedModifierId field is set.
+       */
+      public boolean hasInstancedModifierId() {
+        return sourceCase_ == 2;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return The instancedModifierId.
+       */
+      public int getInstancedModifierId() {
+        if (sourceCase_ == 2) {
+          return (java.lang.Integer) source_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @param value The instancedModifierId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInstancedModifierId(int value) {
+        sourceCase_ = 2;
+        source_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 instanced_modifier_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInstancedModifierId() {
+        if (sourceCase_ == 2) {
+          sourceCase_ = 0;
+          source_ = null;
+          onChanged();
+        }
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1648,13 +1640,13 @@ public final class AbilityMixinRecoverInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035AbilityMixinRecoverInfo.proto\032\031Massive" +
       "PropSyncInfo.proto\032\026BreakoutSnapShot.pro" +
-      "to\"\211\002\n\027AbilityMixinRecoverInfo\022\036\n\024instan" +
-      "ced_ability_id\030\001 \001(\rH\000\022\037\n\025instanced_modi" +
-      "fier_id\030\002 \001(\rH\000\022\020\n\010local_id\030\003 \001(\r\022\021\n\tdat" +
-      "a_list\030\004 \003(\r\022\036\n\026is_serverbuff_modifier\030\005" +
-      " \001(\010\022/\n\021massive_prop_list\030\006 \003(\0132\024.Massiv" +
-      "ePropSyncInfo\022-\n\022breakout_snap_shot\030\007 \001(" +
-      "\0132\021.BreakoutSnapShotB\010\n\006SourceB\033\n\031emu.gr" +
+      "to\"\211\002\n\027AbilityMixinRecoverInfo\022\020\n\010local_" +
+      "id\030\003 \001(\r\022\021\n\tdata_list\030\004 \003(\r\022\036\n\026is_server" +
+      "buff_modifier\030\005 \001(\010\022/\n\021massive_prop_list" +
+      "\030\006 \003(\0132\024.MassivePropSyncInfo\022-\n\022breakout" +
+      "_snap_shot\030\007 \001(\0132\021.BreakoutSnapShot\022\036\n\024i" +
+      "nstanced_ability_id\030\001 \001(\rH\000\022\037\n\025instanced" +
+      "_modifier_id\030\002 \001(\rH\000B\010\n\006SourceB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1668,7 +1660,7 @@ public final class AbilityMixinRecoverInfoOuterClass {
     internal_static_AbilityMixinRecoverInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AbilityMixinRecoverInfo_descriptor,
-        new java.lang.String[] { "InstancedAbilityId", "InstancedModifierId", "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "BreakoutSnapShot", "Source", });
+        new java.lang.String[] { "LocalId", "DataList", "IsServerbuffModifier", "MassivePropList", "BreakoutSnapShot", "InstancedAbilityId", "InstancedModifierId", "Source", });
     emu.grasscutter.net.proto.MassivePropSyncInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.BreakoutSnapShotOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java
index 9b7dedcb3..e84a70543 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarTypeOuterClass.java
@@ -16,7 +16,7 @@ public final class AbilityScalarTypeOuterClass {
   }
   /**
    * <pre>
-   * Obf: HOIECOCMCMI
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code AbilityScalarType}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java
index 9a103762d..613a3b9af 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityScalarValueEntryOuterClass.java
@@ -97,10 +97,6 @@ public final class AbilityScalarValueEntryOuterClass {
     public emu.grasscutter.net.proto.AbilityScalarValueEntryOuterClass.AbilityScalarValueEntry.ValueCase getValueCase();
   }
   /**
-   * <pre>
-   * Obf: DAEKOPFKPMK
-   * </pre>
-   *
    * Protobuf type {@code AbilityScalarValueEntry}
    */
   public static final class AbilityScalarValueEntry extends
@@ -670,10 +666,6 @@ public final class AbilityScalarValueEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DAEKOPFKPMK
-     * </pre>
-     *
      * Protobuf type {@code AbilityScalarValueEntry}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java
index 09fc4bf66..e7041a548 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilityStringOuterClass.java
@@ -50,7 +50,8 @@ public final class AbilityStringOuterClass {
   }
   /**
    * <pre>
-   * Obf: PPIBJBLBJDL
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code AbilityString}
@@ -440,7 +441,8 @@ public final class AbilityStringOuterClass {
     }
     /**
      * <pre>
-     * Obf: PPIBJBLBJDL
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code AbilityString}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java
index 5ec899b37..1c9d53da4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AbilitySyncStateInfoOuterClass.java
@@ -145,10 +145,6 @@ public final class AbilitySyncStateInfoOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: JDIFMANDKLC
-   * </pre>
-   *
    * Protobuf type {@code AbilitySyncStateInfo}
    */
   public static final class AbilitySyncStateInfo extends
@@ -729,10 +725,6 @@ public final class AbilitySyncStateInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JDIFMANDKLC
-     * </pre>
-     *
      * Protobuf type {@code AbilitySyncStateInfo}
      */
     public static final class Builder extends
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 948d475a2..35dcdfa55 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementAllDataNotifyOuterClass.java
@@ -19,52 +19,47 @@ public final class AchievementAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-     * @return A list containing the rewardTakenGoalIdList.
-     */
-    java.util.List<java.lang.Integer> getRewardTakenGoalIdListList();
-    /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-     * @return The count of rewardTakenGoalIdList.
-     */
-    int getRewardTakenGoalIdListCount();
-    /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-     * @param index The index of the element to return.
-     * @return The rewardTakenGoalIdList at the given index.
-     */
-    int getRewardTakenGoalIdList(int index);
-
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> 
         getAchievementListList();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index);
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     int getAchievementListCount();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
         getAchievementListOrBuilderList();
     /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
+     * <code>repeated .Achievement achievement_list = 8;</code>
      */
     emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
         int index);
+
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @return A list containing the rewardTakenGoalIdList.
+     */
+    java.util.List<java.lang.Integer> getRewardTakenGoalIdListList();
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @return The count of rewardTakenGoalIdList.
+     */
+    int getRewardTakenGoalIdListCount();
+    /**
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The rewardTakenGoalIdList at the given index.
+     */
+    int getRewardTakenGoalIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 27422
-   * Obf: BMJFIOKJEMJ
-   * </pre>
-   *
    * Protobuf type {@code AchievementAllDataNotify}
    */
   public static final class AchievementAllDataNotify extends
@@ -77,8 +72,8 @@ public final class AchievementAllDataNotifyOuterClass {
       super(builder);
     }
     private AchievementAllDataNotify() {
-      rewardTakenGoalIdList_ = emptyIntList();
       achievementList_ = java.util.Collections.emptyList();
+      rewardTakenGoalIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -112,20 +107,29 @@ public final class AchievementAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                rewardTakenGoalIdList_ = newIntList();
+                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: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rewardTakenGoalIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
               rewardTakenGoalIdList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 rewardTakenGoalIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 rewardTakenGoalIdList_.addInt(input.readUInt32());
@@ -133,15 +137,6 @@ public final class AchievementAllDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              achievementList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -158,10 +153,10 @@ public final class AchievementAllDataNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_.makeImmutable(); // C
+          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
+          rewardTakenGoalIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -180,10 +175,50 @@ public final class AchievementAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.class, emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.Builder.class);
     }
 
-    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 4;
+    public static final int ACHIEVEMENT_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_;
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
+      return achievementList_;
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
+        getAchievementListOrBuilderList() {
+      return achievementList_;
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getAchievementListCount() {
+      return achievementList_.size();
+    }
+    /**
+     * <code>repeated .Achievement achievement_list = 8;</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>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
+        int index) {
+      return achievementList_.get(index);
+    }
+
+    public static final int REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_;
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @return A list containing the rewardTakenGoalIdList.
      */
     @java.lang.Override
@@ -192,14 +227,14 @@ public final class AchievementAllDataNotifyOuterClass {
       return rewardTakenGoalIdList_;
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @return The count of rewardTakenGoalIdList.
      */
     public int getRewardTakenGoalIdListCount() {
       return rewardTakenGoalIdList_.size();
     }
     /**
-     * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
+     * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
      * @param index The index of the element to return.
      * @return The rewardTakenGoalIdList at the given index.
      */
@@ -208,46 +243,6 @@ public final class AchievementAllDataNotifyOuterClass {
     }
     private int rewardTakenGoalIdListMemoizedSerializedSize = -1;
 
-    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 = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
-        getAchievementListOrBuilderList() {
-      return achievementList_;
-    }
-    /**
-     * <code>repeated .Achievement achievement_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getAchievementListCount() {
-      return achievementList_.size();
-    }
-    /**
-     * <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 = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
-        int index) {
-      return achievementList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -263,16 +258,16 @@ public final class AchievementAllDataNotifyOuterClass {
     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(34);
+        output.writeUInt32NoTag(122);
         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);
     }
 
@@ -282,6 +277,10 @@ public final class AchievementAllDataNotifyOuterClass {
       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++) {
@@ -296,10 +295,6 @@ public final class AchievementAllDataNotifyOuterClass {
         }
         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;
@@ -315,10 +310,10 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify other = (emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify) obj;
 
-      if (!getRewardTakenGoalIdListList()
-          .equals(other.getRewardTakenGoalIdListList())) return false;
       if (!getAchievementListList()
           .equals(other.getAchievementListList())) return false;
+      if (!getRewardTakenGoalIdListList()
+          .equals(other.getRewardTakenGoalIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -330,14 +325,14 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getRewardTakenGoalIdListCount() > 0) {
-        hash = (37 * hash) + REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getRewardTakenGoalIdListList().hashCode();
-      }
       if (getAchievementListCount() > 0) {
         hash = (37 * hash) + ACHIEVEMENT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAchievementListList().hashCode();
       }
+      if (getRewardTakenGoalIdListCount() > 0) {
+        hash = (37 * hash) + REWARD_TAKEN_GOAL_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getRewardTakenGoalIdListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -434,11 +429,6 @@ public final class AchievementAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27422
-     * Obf: BMJFIOKJEMJ
-     * </pre>
-     *
      * Protobuf type {@code AchievementAllDataNotify}
      */
     public static final class Builder extends
@@ -477,14 +467,14 @@ public final class AchievementAllDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        rewardTakenGoalIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (achievementListBuilder_ == null) {
           achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           achievementListBuilder_.clear();
         }
+        rewardTakenGoalIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -512,20 +502,20 @@ public final class AchievementAllDataNotifyOuterClass {
       public emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify buildPartial() {
         emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify result = new emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify(this);
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.rewardTakenGoalIdList_ = rewardTakenGoalIdList_;
         if (achievementListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             achievementList_ = java.util.Collections.unmodifiableList(achievementList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.achievementList_ = achievementList_;
         } else {
           result.achievementList_ = achievementListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          rewardTakenGoalIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.rewardTakenGoalIdList_ = rewardTakenGoalIdList_;
         onBuilt();
         return result;
       }
@@ -574,21 +564,11 @@ public final class AchievementAllDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify other) {
         if (other == emu.grasscutter.net.proto.AchievementAllDataNotifyOuterClass.AchievementAllDataNotify.getDefaultInstance()) return this;
-        if (!other.rewardTakenGoalIdList_.isEmpty()) {
-          if (rewardTakenGoalIdList_.isEmpty()) {
-            rewardTakenGoalIdList_ = other.rewardTakenGoalIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureRewardTakenGoalIdListIsMutable();
-            rewardTakenGoalIdList_.addAll(other.rewardTakenGoalIdList_);
-          }
-          onChanged();
-        }
         if (achievementListBuilder_ == null) {
           if (!other.achievementList_.isEmpty()) {
             if (achievementList_.isEmpty()) {
               achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureAchievementListIsMutable();
               achievementList_.addAll(other.achievementList_);
@@ -601,7 +581,7 @@ public final class AchievementAllDataNotifyOuterClass {
               achievementListBuilder_.dispose();
               achievementListBuilder_ = null;
               achievementList_ = other.achievementList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               achievementListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAchievementListFieldBuilder() : null;
@@ -610,6 +590,16 @@ public final class AchievementAllDataNotifyOuterClass {
             }
           }
         }
+        if (!other.rewardTakenGoalIdList_.isEmpty()) {
+          if (rewardTakenGoalIdList_.isEmpty()) {
+            rewardTakenGoalIdList_ = other.rewardTakenGoalIdList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureRewardTakenGoalIdListIsMutable();
+            rewardTakenGoalIdList_.addAll(other.rewardTakenGoalIdList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -640,91 +630,12 @@ public final class AchievementAllDataNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_ = emptyIntList();
-      private void ensureRewardTakenGoalIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          rewardTakenGoalIdList_ = mutableCopy(rewardTakenGoalIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return A list containing the rewardTakenGoalIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getRewardTakenGoalIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(rewardTakenGoalIdList_) : rewardTakenGoalIdList_;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return The count of rewardTakenGoalIdList.
-       */
-      public int getRewardTakenGoalIdListCount() {
-        return rewardTakenGoalIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param index The index of the element to return.
-       * @return The rewardTakenGoalIdList at the given index.
-       */
-      public int getRewardTakenGoalIdList(int index) {
-        return rewardTakenGoalIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The rewardTakenGoalIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardTakenGoalIdList(
-          int index, int value) {
-        ensureRewardTakenGoalIdListIsMutable();
-        rewardTakenGoalIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param value The rewardTakenGoalIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addRewardTakenGoalIdList(int value) {
-        ensureRewardTakenGoalIdListIsMutable();
-        rewardTakenGoalIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @param values The rewardTakenGoalIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllRewardTakenGoalIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureRewardTakenGoalIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, rewardTakenGoalIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 reward_taken_goal_id_list = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardTakenGoalIdList() {
-        rewardTakenGoalIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> achievementList_ =
         java.util.Collections.emptyList();
       private void ensureAchievementListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           achievementList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AchievementOuterClass.Achievement>(achievementList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -732,7 +643,7 @@ public final class AchievementAllDataNotifyOuterClass {
           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 = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement> getAchievementListList() {
         if (achievementListBuilder_ == null) {
@@ -742,7 +653,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public int getAchievementListCount() {
         if (achievementListBuilder_ == null) {
@@ -752,7 +663,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement getAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -762,7 +673,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -779,7 +690,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder setAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -793,7 +704,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
         if (achievementListBuilder_ == null) {
@@ -809,7 +720,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement value) {
@@ -826,7 +737,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -840,7 +751,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAchievementList(
           int index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder builderForValue) {
@@ -854,7 +765,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder addAllAchievementList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AchievementOuterClass.Achievement> values) {
@@ -869,12 +780,12 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder clearAchievementList() {
         if (achievementListBuilder_ == null) {
           achievementList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           achievementListBuilder_.clear();
@@ -882,7 +793,7 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public Builder removeAchievementList(int index) {
         if (achievementListBuilder_ == null) {
@@ -895,14 +806,14 @@ public final class AchievementAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder getAchievementListBuilder(
           int index) {
         return getAchievementListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder getAchievementListOrBuilder(
           int index) {
@@ -912,7 +823,7 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder> 
            getAchievementListOrBuilderList() {
@@ -923,14 +834,14 @@ public final class AchievementAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</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 = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder addAchievementListBuilder(
           int index) {
@@ -938,7 +849,7 @@ public final class AchievementAllDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.getDefaultInstance());
       }
       /**
-       * <code>repeated .Achievement achievement_list = 9;</code>
+       * <code>repeated .Achievement achievement_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder> 
            getAchievementListBuilderList() {
@@ -951,13 +862,92 @@ public final class AchievementAllDataNotifyOuterClass {
           achievementListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.AchievementOuterClass.Achievement, emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Builder, emu.grasscutter.net.proto.AchievementOuterClass.AchievementOrBuilder>(
                   achievementList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           achievementList_ = null;
         }
         return achievementListBuilder_;
       }
+
+      private com.google.protobuf.Internal.IntList rewardTakenGoalIdList_ = emptyIntList();
+      private void ensureRewardTakenGoalIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          rewardTakenGoalIdList_ = mutableCopy(rewardTakenGoalIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return A list containing the rewardTakenGoalIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getRewardTakenGoalIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(rewardTakenGoalIdList_) : rewardTakenGoalIdList_;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return The count of rewardTakenGoalIdList.
+       */
+      public int getRewardTakenGoalIdListCount() {
+        return rewardTakenGoalIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param index The index of the element to return.
+       * @return The rewardTakenGoalIdList at the given index.
+       */
+      public int getRewardTakenGoalIdList(int index) {
+        return rewardTakenGoalIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param index The index to set the value at.
+       * @param value The rewardTakenGoalIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardTakenGoalIdList(
+          int index, int value) {
+        ensureRewardTakenGoalIdListIsMutable();
+        rewardTakenGoalIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param value The rewardTakenGoalIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRewardTakenGoalIdList(int value) {
+        ensureRewardTakenGoalIdListIsMutable();
+        rewardTakenGoalIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @param values The rewardTakenGoalIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRewardTakenGoalIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRewardTakenGoalIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, rewardTakenGoalIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 reward_taken_goal_id_list = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardTakenGoalIdList() {
+        rewardTakenGoalIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1027,8 +1017,8 @@ public final class AchievementAllDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036AchievementAllDataNotify.proto\032\021Achiev" +
       "ement.proto\"e\n\030AchievementAllDataNotify\022" +
-      "!\n\031reward_taken_goal_id_list\030\004 \003(\r\022&\n\020ac" +
-      "hievement_list\030\t \003(\0132\014.AchievementB\033\n\031em" +
+      "&\n\020achievement_list\030\010 \003(\0132\014.Achievement\022" +
+      "!\n\031reward_taken_goal_id_list\030\017 \003(\rB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1041,7 +1031,7 @@ public final class AchievementAllDataNotifyOuterClass {
     internal_static_AchievementAllDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AchievementAllDataNotify_descriptor,
-        new java.lang.String[] { "RewardTakenGoalIdList", "AchievementList", });
+        new java.lang.String[] { "AchievementList", "RewardTakenGoalIdList", });
     emu.grasscutter.net.proto.AchievementOuterClass.getDescriptor();
   }
 
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 c4a6e1679..85e2689b1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AchievementOuterClass.java
@@ -19,21 +19,10 @@ public final class AchievementOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 finish_timestamp = 15;</code>
-     * @return The finishTimestamp.
+     * <code>uint32 cur_progress = 3;</code>
+     * @return The curProgress.
      */
-    int getFinishTimestamp();
-
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The enum numeric value on the wire for status.
-     */
-    int getStatusValue();
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The status.
-     */
-    emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
+    int getCurProgress();
 
     /**
      * <code>uint32 total_progress = 4;</code>
@@ -42,22 +31,29 @@ public final class AchievementOuterClass {
     int getTotalProgress();
 
     /**
-     * <code>uint32 cur_progress = 14;</code>
-     * @return The curProgress.
+     * <code>uint32 finish_timestamp = 8;</code>
+     * @return The finishTimestamp.
      */
-    int getCurProgress();
+    int getFinishTimestamp();
 
     /**
-     * <code>uint32 id = 5;</code>
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The enum numeric value on the wire for status.
+     */
+    int getStatusValue();
+    /**
+     * <code>.Achievement.Status status = 9;</code>
+     * @return The status.
+     */
+    emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus();
+
+    /**
+     * <code>uint32 id = 15;</code>
      * @return The id.
      */
     int getId();
   }
   /**
-   * <pre>
-   * Obf: NJOHADFBICH
-   * </pre>
-   *
    * Protobuf type {@code Achievement}
    */
   public static final class Achievement extends
@@ -103,30 +99,30 @@ public final class AchievementOuterClass {
             case 0:
               done = true;
               break;
+            case 24: {
+
+              curProgress_ = input.readUInt32();
+              break;
+            }
             case 32: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 64: {
 
-              id_ = input.readUInt32();
+              finishTimestamp_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 72: {
               int rawValue = input.readEnum();
 
               status_ = rawValue;
               break;
             }
-            case 112: {
-
-              curProgress_ = input.readUInt32();
-              break;
-            }
             case 120: {
 
-              finishTimestamp_ = input.readUInt32();
+              id_ = input.readUInt32();
               break;
             }
             default: {
@@ -287,34 +283,15 @@ public final class AchievementOuterClass {
       // @@protoc_insertion_point(enum_scope:Achievement.Status)
     }
 
-    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 15;
-    private int finishTimestamp_;
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 3;
+    private int curProgress_;
     /**
-     * <code>uint32 finish_timestamp = 15;</code>
-     * @return The finishTimestamp.
+     * <code>uint32 cur_progress = 3;</code>
+     * @return The curProgress.
      */
     @java.lang.Override
-    public int getFinishTimestamp() {
-      return finishTimestamp_;
-    }
-
-    public static final int STATUS_FIELD_NUMBER = 10;
-    private int status_;
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The enum numeric value on the wire for status.
-     */
-    @java.lang.Override public int getStatusValue() {
-      return status_;
-    }
-    /**
-     * <code>.Achievement.Status status = 10;</code>
-     * @return The status.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-      return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
+    public int getCurProgress() {
+      return curProgress_;
     }
 
     public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
@@ -328,21 +305,40 @@ public final class AchievementOuterClass {
       return totalProgress_;
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 14;
-    private int curProgress_;
+    public static final int FINISH_TIMESTAMP_FIELD_NUMBER = 8;
+    private int finishTimestamp_;
     /**
-     * <code>uint32 cur_progress = 14;</code>
-     * @return The curProgress.
+     * <code>uint32 finish_timestamp = 8;</code>
+     * @return The finishTimestamp.
      */
     @java.lang.Override
-    public int getCurProgress() {
-      return curProgress_;
+    public int getFinishTimestamp() {
+      return finishTimestamp_;
     }
 
-    public static final int ID_FIELD_NUMBER = 5;
+    public static final int STATUS_FIELD_NUMBER = 9;
+    private int status_;
+    /**
+     * <code>.Achievement.Status status = 9;</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>
+     * @return The status.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
+      return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
+    }
+
+    public static final int ID_FIELD_NUMBER = 15;
     private int id_;
     /**
-     * <code>uint32 id = 5;</code>
+     * <code>uint32 id = 15;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -364,20 +360,20 @@ public final class AchievementOuterClass {
     @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 (id_ != 0) {
-        output.writeUInt32(5, id_);
+      if (finishTimestamp_ != 0) {
+        output.writeUInt32(8, finishTimestamp_);
       }
       if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
-        output.writeEnum(10, status_);
+        output.writeEnum(9, status_);
       }
-      if (curProgress_ != 0) {
-        output.writeUInt32(14, curProgress_);
-      }
-      if (finishTimestamp_ != 0) {
-        output.writeUInt32(15, finishTimestamp_);
+      if (id_ != 0) {
+        output.writeUInt32(15, id_);
       }
       unknownFields.writeTo(output);
     }
@@ -388,25 +384,25 @@ public final class AchievementOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (curProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, curProgress_);
+      }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, totalProgress_);
       }
-      if (id_ != 0) {
+      if (finishTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, id_);
+          .computeUInt32Size(8, finishTimestamp_);
       }
       if (status_ != emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, status_);
+          .computeEnumSize(9, status_);
       }
-      if (curProgress_ != 0) {
+      if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, curProgress_);
-      }
-      if (finishTimestamp_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, finishTimestamp_);
+          .computeUInt32Size(15, id_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -423,13 +419,13 @@ public final class AchievementOuterClass {
       }
       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;
@@ -443,14 +439,14 @@ public final class AchievementOuterClass {
       }
       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();
@@ -549,10 +545,6 @@ public final class AchievementOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NJOHADFBICH
-     * </pre>
-     *
      * Protobuf type {@code Achievement}
      */
     public static final class Builder extends
@@ -590,13 +582,13 @@ public final class AchievementOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        finishTimestamp_ = 0;
-
-        status_ = 0;
+        curProgress_ = 0;
 
         totalProgress_ = 0;
 
-        curProgress_ = 0;
+        finishTimestamp_ = 0;
+
+        status_ = 0;
 
         id_ = 0;
 
@@ -626,10 +618,10 @@ public final class AchievementOuterClass {
       @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;
@@ -679,18 +671,18 @@ public final class AchievementOuterClass {
 
       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());
         }
@@ -723,87 +715,33 @@ public final class AchievementOuterClass {
         return this;
       }
 
-      private int finishTimestamp_ ;
+      private int curProgress_ ;
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
-       * @return The finishTimestamp.
+       * <code>uint32 cur_progress = 3;</code>
+       * @return The curProgress.
        */
       @java.lang.Override
-      public int getFinishTimestamp() {
-        return finishTimestamp_;
+      public int getCurProgress() {
+        return curProgress_;
       }
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
-       * @param value The finishTimestamp to set.
+       * <code>uint32 cur_progress = 3;</code>
+       * @param value The curProgress to set.
        * @return This builder for chaining.
        */
-      public Builder setFinishTimestamp(int value) {
+      public Builder setCurProgress(int value) {
         
-        finishTimestamp_ = value;
+        curProgress_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 finish_timestamp = 15;</code>
+       * <code>uint32 cur_progress = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFinishTimestamp() {
+      public Builder clearCurProgress() {
         
-        finishTimestamp_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int status_ = 0;
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return The enum numeric value on the wire for status.
-       */
-      @java.lang.Override public int getStatusValue() {
-        return status_;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @param value The enum numeric value on the wire for status to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStatusValue(int value) {
-        
-        status_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return The status.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
-        return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @param value The status to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        status_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.Achievement.Status status = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStatus() {
-        
-        status_ = 0;
+        curProgress_ = 0;
         onChanged();
         return this;
       }
@@ -839,40 +777,94 @@ public final class AchievementOuterClass {
         return this;
       }
 
-      private int curProgress_ ;
+      private int finishTimestamp_ ;
       /**
-       * <code>uint32 cur_progress = 14;</code>
-       * @return The curProgress.
+       * <code>uint32 finish_timestamp = 8;</code>
+       * @return The finishTimestamp.
        */
       @java.lang.Override
-      public int getCurProgress() {
-        return curProgress_;
+      public int getFinishTimestamp() {
+        return finishTimestamp_;
       }
       /**
-       * <code>uint32 cur_progress = 14;</code>
-       * @param value The curProgress to set.
+       * <code>uint32 finish_timestamp = 8;</code>
+       * @param value The finishTimestamp to set.
        * @return This builder for chaining.
        */
-      public Builder setCurProgress(int value) {
+      public Builder setFinishTimestamp(int value) {
         
-        curProgress_ = value;
+        finishTimestamp_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 14;</code>
+       * <code>uint32 finish_timestamp = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurProgress() {
+      public Builder clearFinishTimestamp() {
         
-        curProgress_ = 0;
+        finishTimestamp_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int status_ = 0;
+      /**
+       * <code>.Achievement.Status status = 9;</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>
+       * @param value The enum numeric value on the wire for status to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStatusValue(int value) {
+        
+        status_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @return The status.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status getStatus() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status result = emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.valueOf(status_);
+        return result == null ? emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @param value The status to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStatus(emu.grasscutter.net.proto.AchievementOuterClass.Achievement.Status value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        status_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.Achievement.Status status = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearStatus() {
+        
+        status_ = 0;
         onChanged();
         return this;
       }
 
       private int id_ ;
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -880,7 +872,7 @@ public final class AchievementOuterClass {
         return id_;
       }
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -891,7 +883,7 @@ public final class AchievementOuterClass {
         return this;
       }
       /**
-       * <code>uint32 id = 5;</code>
+       * <code>uint32 id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -967,10 +959,10 @@ public final class AchievementOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021Achievement.proto\"\351\001\n\013Achievement\022\030\n\020f" +
-      "inish_timestamp\030\017 \001(\r\022#\n\006status\030\n \001(\0162\023." +
-      "Achievement.Status\022\026\n\016total_progress\030\004 \001" +
-      "(\r\022\024\n\014cur_progress\030\016 \001(\r\022\n\n\002id\030\005 \001(\r\"a\n\006" +
+      "\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" +
       "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" +
@@ -985,7 +977,7 @@ public final class AchievementOuterClass {
     internal_static_Achievement_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Achievement_descriptor,
-        new java.lang.String[] { "FinishTimestamp", "Status", "TotalProgress", "CurProgress", "Id", });
+        new java.lang.String[] { "CurProgress", "TotalProgress", "FinishTimestamp", "Status", "Id", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java
index b3b18c804..b13409c40 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class ActivityInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return Whether the activityInfo field is set.
      */
     boolean hasActivityInfo();
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return The activityInfo.
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfo();
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      */
     emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 1246
-   * Obf: JADBHEGBGIO
-   * </pre>
-   *
    * Protobuf type {@code ActivityInfoNotify}
    */
   public static final class ActivityInfoNotify extends
@@ -83,7 +78,7 @@ public final class ActivityInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 50: {
               emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder subBuilder = null;
               if (activityInfo_ != null) {
                 subBuilder = activityInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class ActivityInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityInfoNotifyOuterClass.ActivityInfoNotify.class, emu.grasscutter.net.proto.ActivityInfoNotifyOuterClass.ActivityInfoNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_INFO_FIELD_NUMBER = 3;
+    public static final int ACTIVITY_INFO_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo activityInfo_;
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return Whether the activityInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class ActivityInfoNotifyOuterClass {
       return activityInfo_ != null;
     }
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      * @return The activityInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class ActivityInfoNotifyOuterClass {
       return activityInfo_ == null ? emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.getDefaultInstance() : activityInfo_;
     }
     /**
-     * <code>.ActivityInfo activity_info = 3;</code>
+     * <code>.ActivityInfo activity_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class ActivityInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (activityInfo_ != null) {
-        output.writeMessage(3, getActivityInfo());
+        output.writeMessage(6, getActivityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class ActivityInfoNotifyOuterClass {
       size = 0;
       if (activityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getActivityInfo());
+          .computeMessageSize(6, getActivityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class ActivityInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1246
-     * Obf: JADBHEGBGIO
-     * </pre>
-     *
      * Protobuf type {@code ActivityInfoNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class ActivityInfoNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> activityInfoBuilder_;
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        * @return Whether the activityInfo field is set.
        */
       public boolean hasActivityInfo() {
         return activityInfoBuilder_ != null || activityInfo_ != null;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        * @return The activityInfo.
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo getActivityInfo() {
@@ -496,7 +486,7 @@ public final class ActivityInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder setActivityInfo(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
         if (activityInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder setActivityInfo(
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder mergeActivityInfo(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo value) {
         if (activityInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public Builder clearActivityInfo() {
         if (activityInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class ActivityInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder getActivityInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class ActivityInfoNotifyOuterClass {
         return getActivityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder getActivityInfoOrBuilder() {
         if (activityInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class ActivityInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ActivityInfo activity_info = 3;</code>
+       * <code>.ActivityInfo activity_info = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.Builder, emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfoOrBuilder> 
@@ -661,7 +651,7 @@ public final class ActivityInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030ActivityInfoNotify.proto\032\022ActivityInfo" +
       ".proto\":\n\022ActivityInfoNotify\022$\n\ractivity" +
-      "_info\030\003 \001(\0132\r.ActivityInfoB\033\n\031emu.grassc" +
+      "_info\030\006 \001(\0132\r.ActivityInfoB\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/ActivityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
index fdb853ff1..1d64eb582 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityInfoOuterClass.java
@@ -19,99 +19,276 @@ public final class ActivityInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_id = 3;</code>
-     * @return The activityId.
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
+     * @return A list containing the meetCondList.
      */
-    int getActivityId();
-
+    java.util.List<java.lang.Integer> getMeetCondListList();
     /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-     * @return A list containing the dNMOEAFCDGC.
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
+     * @return The count of meetCondList.
      */
-    java.util.List<java.lang.Integer> getDNMOEAFCDGCList();
+    int getMeetCondListCount();
     /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-     * @return The count of dNMOEAFCDGC.
-     */
-    int getDNMOEAFCDGCCount();
-    /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
      * @param index The index of the element to return.
-     * @return The dNMOEAFCDGC at the given index.
+     * @return The meetCondList at the given index.
      */
-    int getDNMOEAFCDGC(int index);
+    int getMeetCondList(int index);
 
     /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+     * <code>uint32 end_time = 4;</code>
+     * @return The endTime.
      */
-    java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> 
-        getWatcherInfoListList();
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfoList(int index);
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    int getWatcherInfoListCount();
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
-        getWatcherInfoListOrBuilderList();
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoListOrBuilder(
-        int index);
+    int getEndTime();
 
     /**
-     * <code>bool is_finished = 14;</code>
+     * <code>uint32 begin_time = 6;</code>
+     * @return The beginTime.
+     */
+    int getBeginTime();
+
+    /**
+     * <code>bool is_finished = 7;</code>
      * @return The isFinished.
      */
     boolean getIsFinished();
 
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-     * @return A list containing the lJLDCLMAMNL.
+     * <code>bool FALGLCJDKCL = 8;</code>
+     * @return The fALGLCJDKCL.
      */
-    java.util.List<java.lang.Integer> getLJLDCLMAMNLList();
+    boolean getFALGLCJDKCL();
+
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-     * @return The count of lJLDCLMAMNL.
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
      */
-    int getLJLDCLMAMNLCount();
+    java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> 
+        getWatcherInfoListList();
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfoList(int index);
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    int getWatcherInfoListCount();
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
+        getWatcherInfoListOrBuilderList();
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoListOrBuilder(
+        int index);
+
+    /**
+     * <pre>
+     * 1
+     * </pre>
+     *
+     * <code>repeated uint32 expire_cond_list = 11;</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>
+     * @return The count of expireCondList.
+     */
+    int getExpireCondListCount();
+    /**
+     * <pre>
+     * 1
+     * </pre>
+     *
+     * <code>repeated uint32 expire_cond_list = 11;</code>
      * @param index The index of the element to return.
-     * @return The lJLDCLMAMNL at the given index.
+     * @return The expireCondList at the given index.
      */
-    int getLJLDCLMAMNL(int index);
+    int getExpireCondList(int index);
 
     /**
-     * <code>bool PJJKJGALLGD = 16;</code>
-     * @return The pJJKJGALLGD.
-     */
-    boolean getPJJKJGALLGD();
-
-    /**
-     * <code>uint32 activity_type = 1;</code>
-     * @return The activityType.
-     */
-    int getActivityType();
-
-    /**
-     * <code>uint32 schedule_id = 5;</code>
+     * <code>uint32 schedule_id = 12;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
 
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>bool ONCLIGBKLPF = 13;</code>
+     * @return The oNCLIGBKLPF.
+     */
+    boolean getONCLIGBKLPF();
+
+    /**
+     * <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.
+     */
+    int getCurScore();
+
+    /**
+     * <code>uint32 FFGHMFNFPNL = 253;</code>
+     * @return The fFGHMFNFPNL.
+     */
+    int getFFGHMFNFPNL();
+
+    /**
+     * <code>uint32 first_day_start_time = 373;</code>
+     * @return The firstDayStartTime.
+     */
+    int getFirstDayStartTime();
+
+    /**
+     * <code>uint32 LKODGHFICBH = 426;</code>
+     * @return The lKODGHFICBH.
+     */
+    int getLKODGHFICBH();
+
+    /**
+     * <code>bool CDBIIEIPBFF = 509;</code>
+     * @return The cDBIIEIPBFF.
+     */
+    boolean getCDBIIEIPBFF();
+
+    /**
+     * <code>bool LCHFFKHPJIO = 678;</code>
+     * @return The lCHFFKHPJIO.
+     */
+    boolean getLCHFFKHPJIO();
+
+    /**
+     * <code>bool ILKPGDKEIEG = 739;</code>
+     * @return The iLKPGDKEIEG.
+     */
+    boolean getILKPGDKEIEG();
+
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @return A list containing the takenRewardList.
+     */
+    java.util.List<java.lang.Integer> getTakenRewardListList();
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @return The count of takenRewardList.
+     */
+    int getTakenRewardListCount();
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @param index The index of the element to return.
+     * @return The takenRewardList at the given index.
+     */
+    int getTakenRewardList(int index);
+
+    /**
+     * <code>uint64 CIDDJFNIMPJ = 892;</code>
+     * @return The cIDDJFNIMPJ.
+     */
+    long getCIDDJFNIMPJ();
+
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> 
+        getActivityPushTipsDataListList();
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index);
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    int getActivityPushTipsDataListCount();
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
+        getActivityPushTipsDataListOrBuilderList();
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 MPPFCLCENAP = 1040;</code>
+     * @return The mPPFCLCENAP.
+     */
+    int getMPPFCLCENAP();
+
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @return A list containing the gONEPFEDMEL.
+     */
+    java.util.List<java.lang.Long> getGONEPFEDMELList();
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @return The count of gONEPFEDMEL.
+     */
+    int getGONEPFEDMELCount();
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @param index The index of the element to return.
+     * @return The gONEPFEDMEL at the given index.
+     */
+    long getGONEPFEDMEL(int index);
+
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @return A list containing the nJCGNGLKPBJ.
+     */
+    java.util.List<java.lang.Integer> getNJCGNGLKPBJList();
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @return The count of nJCGNGLKPBJ.
+     */
+    int getNJCGNGLKPBJCount();
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @param index The index of the element to return.
+     * @return The nJCGNGLKPBJ at the given index.
+     */
+    int getNJCGNGLKPBJ(int index);
+
+    /**
+     * <code>bool ODMJHPBFIKO = 1408;</code>
+     * @return The oDMJHPBFIKO.
+     */
+    boolean getODMJHPBFIKO();
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     int getActivityCoinMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     boolean containsActivityCoinMap(
         int key);
@@ -122,119 +299,38 @@ public final class ActivityInfoOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getActivityCoinMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getActivityCoinMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
 
     int getActivityCoinMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
 
     int getActivityCoinMapOrThrow(
         int key);
 
     /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return A list containing the meetCondList.
-     */
-    java.util.List<java.lang.Integer> getMeetCondListList();
-    /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return The count of meetCondList.
-     */
-    int getMeetCondListCount();
-    /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @param index The index of the element to return.
-     * @return The meetCondList at the given index.
-     */
-    int getMeetCondList(int index);
-
-    /**
-     * <code>bool DKJDABCNGBP = 13;</code>
-     * @return The dKJDABCNGBP.
-     */
-    boolean getDKJDABCNGBP();
-
-    /**
-     * <code>uint32 begin_time = 2;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-
-    /**
-     * <code>uint32 INGFNLLCDOL = 733;</code>
-     * @return The iNGFNLLCDOL.
-     */
-    int getINGFNLLCDOL();
-
-    /**
-     * <code>bool ENNDKMJIMHN = 15;</code>
-     * @return The eNNDKMJIMHN.
-     */
-    boolean getENNDKMJIMHN();
-
-    /**
-     * <code>uint32 cur_score = 1555;</code>
-     * @return The curScore.
-     */
-    int getCurScore();
-
-    /**
-     * <code>bool BKJNDLLNAML = 1818;</code>
-     * @return The bKJNDLLNAML.
-     */
-    boolean getBKJNDLLNAML();
-
-    /**
-     * <code>uint32 first_day_start_time = 978;</code>
-     * @return The firstDayStartTime.
-     */
-    int getFirstDayStartTime();
-
-    /**
-     * <code>bool ABMOPKOIMPA = 525;</code>
-     * @return The aBMOPKOIMPA.
-     */
-    boolean getABMOPKOIMPA();
-
-    /**
-     * <code>uint32 FGFGECAAKJM = 1703;</code>
-     * @return The fGFGECAAKJM.
-     */
-    int getFGFGECAAKJM();
-
-    /**
-     * <code>bool GFEMIEBKKKL = 1117;</code>
-     * @return The gFEMIEBKKKL.
-     */
-    boolean getGFEMIEBKKKL();
-
-    /**
-     * <code>uint32 CEFIPNKPEKA = 621;</code>
-     * @return The cEFIPNKPEKA.
-     */
-    int getCEFIPNKPEKA();
-
-    /**
-     * <code>uint32 end_time = 11;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     int getWishGiftNumMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     boolean containsWishGiftNumMap(
         int key);
@@ -245,1347 +341,54 @@ public final class ActivityInfoOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getWishGiftNumMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getWishGiftNumMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
 
     int getWishGiftNumMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
 
     int getWishGiftNumMapOrThrow(
         int key);
 
     /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return A list containing the pHCOMIFAIJD.
-     */
-    java.util.List<java.lang.Integer> getPHCOMIFAIJDList();
-    /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return The count of pHCOMIFAIJD.
-     */
-    int getPHCOMIFAIJDCount();
-    /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @param index The index of the element to return.
-     * @return The pHCOMIFAIJD at the given index.
-     */
-    int getPHCOMIFAIJD(int index);
-
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> 
-        getActivityPushTipsDataListList();
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index);
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    int getActivityPushTipsDataListCount();
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
-        getActivityPushTipsDataListOrBuilderList();
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
-        int index);
-
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     * @return Whether the samLampInfo field is set.
-     */
-    boolean hasSamLampInfo();
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     * @return The samLampInfo.
-     */
-    emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo getSamLampInfo();
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     */
-    emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder getSamLampInfoOrBuilder();
-
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     * @return Whether the crucibleInfo field is set.
-     */
-    boolean hasCrucibleInfo();
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     * @return The crucibleInfo.
-     */
-    emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo getCrucibleInfo();
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     */
-    emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder getCrucibleInfoOrBuilder();
-
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     * @return Whether the salesmanInfo field is set.
-     */
-    boolean hasSalesmanInfo();
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     * @return The salesmanInfo.
-     */
-    emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo getSalesmanInfo();
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     */
-    emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder getSalesmanInfoOrBuilder();
-
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     * @return Whether the trialAvatarInfo field is set.
-     */
-    boolean hasTrialAvatarInfo();
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     * @return The trialAvatarInfo.
-     */
-    emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo getTrialAvatarInfo();
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     */
-    emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder getTrialAvatarInfoOrBuilder();
-
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     * @return Whether the deliveryInfo field is set.
-     */
-    boolean hasDeliveryInfo();
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     * @return The deliveryInfo.
-     */
-    emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo getDeliveryInfo();
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     */
-    emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder getDeliveryInfoOrBuilder();
-
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     * @return Whether the asterInfo field is set.
-     */
-    boolean hasAsterInfo();
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     * @return The asterInfo.
-     */
-    emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo getAsterInfo();
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     */
-    emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder getAsterInfoOrBuilder();
-
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     * @return Whether the flightInfo field is set.
-     */
-    boolean hasFlightInfo();
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     * @return The flightInfo.
-     */
-    emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo getFlightInfo();
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     */
-    emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder getFlightInfoOrBuilder();
-
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     * @return Whether the dragonSpineInfo field is set.
-     */
-    boolean hasDragonSpineInfo();
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     * @return The dragonSpineInfo.
-     */
-    emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo getDragonSpineInfo();
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     */
-    emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder getDragonSpineInfoOrBuilder();
-
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     * @return Whether the effigyInfo field is set.
-     */
-    boolean hasEffigyInfo();
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     * @return The effigyInfo.
-     */
-    emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo getEffigyInfo();
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     */
-    emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder getEffigyInfoOrBuilder();
-
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     * @return Whether the treasureMapInfo field is set.
-     */
-    boolean hasTreasureMapInfo();
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     * @return The treasureMapInfo.
-     */
-    emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo getTreasureMapInfo();
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     */
-    emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder getTreasureMapInfoOrBuilder();
-
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     * @return Whether the blessingInfo field is set.
-     */
-    boolean hasBlessingInfo();
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     * @return The blessingInfo.
-     */
-    emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo getBlessingInfo();
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     */
-    emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder getBlessingInfoOrBuilder();
-
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     * @return Whether the seaLampInfo field is set.
-     */
-    boolean hasSeaLampInfo();
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     * @return The seaLampInfo.
-     */
-    emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo getSeaLampInfo();
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     */
-    emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder getSeaLampInfoOrBuilder();
-
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     * @return Whether the expeditionInfo field is set.
-     */
-    boolean hasExpeditionInfo();
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     * @return The expeditionInfo.
-     */
-    emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo getExpeditionInfo();
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     */
-    emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder getExpeditionInfoOrBuilder();
-
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     * @return Whether the arenaChallengeInfo field is set.
-     */
-    boolean hasArenaChallengeInfo();
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     * @return The arenaChallengeInfo.
-     */
-    emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo getArenaChallengeInfo();
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     */
-    emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder getArenaChallengeInfoOrBuilder();
-
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     * @return Whether the fleurFairInfo field is set.
-     */
-    boolean hasFleurFairInfo();
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     * @return The fleurFairInfo.
-     */
-    emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo getFleurFairInfo();
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     */
-    emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder getFleurFairInfoOrBuilder();
-
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     * @return Whether the waterSpiritInfo field is set.
-     */
-    boolean hasWaterSpiritInfo();
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     * @return The waterSpiritInfo.
-     */
-    emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo getWaterSpiritInfo();
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     */
-    emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder getWaterSpiritInfoOrBuilder();
-
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     * @return Whether the challnelerSlabInfo field is set.
-     */
-    boolean hasChallnelerSlabInfo();
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     * @return The challnelerSlabInfo.
-     */
-    emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo getChallnelerSlabInfo();
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     */
-    emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder getChallnelerSlabInfoOrBuilder();
-
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     * @return Whether the mistTrialActivityInfo field is set.
-     */
-    boolean hasMistTrialActivityInfo();
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     * @return The mistTrialActivityInfo.
-     */
-    emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo getMistTrialActivityInfo();
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     */
-    emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder getMistTrialActivityInfoOrBuilder();
-
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     * @return Whether the hideAndSeekInfo field is set.
-     */
-    boolean hasHideAndSeekInfo();
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     * @return The hideAndSeekInfo.
-     */
-    emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo getHideAndSeekInfo();
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     */
-    emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder getHideAndSeekInfoOrBuilder();
-
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     * @return Whether the findHilichurlInfo field is set.
-     */
-    boolean hasFindHilichurlInfo();
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     * @return The findHilichurlInfo.
-     */
-    emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo getFindHilichurlInfo();
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     */
-    emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder getFindHilichurlInfoOrBuilder();
-
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     * @return Whether the summerTimeInfo field is set.
-     */
-    boolean hasSummerTimeInfo();
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     * @return The summerTimeInfo.
-     */
-    emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo getSummerTimeInfo();
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     */
-    emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder getSummerTimeInfoOrBuilder();
-
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     * @return Whether the buoyantCombatInfo field is set.
-     */
-    boolean hasBuoyantCombatInfo();
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     * @return The buoyantCombatInfo.
-     */
-    emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo getBuoyantCombatInfo();
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     */
-    emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder getBuoyantCombatInfoOrBuilder();
-
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     * @return Whether the echoShellInfo field is set.
-     */
-    boolean hasEchoShellInfo();
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     * @return The echoShellInfo.
-     */
-    emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo getEchoShellInfo();
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     */
-    emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder getEchoShellInfoOrBuilder();
-
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     * @return Whether the bounceConjuringInfo field is set.
-     */
-    boolean hasBounceConjuringInfo();
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     * @return The bounceConjuringInfo.
-     */
-    emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo getBounceConjuringInfo();
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     */
-    emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder getBounceConjuringInfoOrBuilder();
-
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     * @return Whether the blitzRushInfo field is set.
-     */
-    boolean hasBlitzRushInfo();
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     * @return The blitzRushInfo.
-     */
-    emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo getBlitzRushInfo();
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     */
-    emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder getBlitzRushInfoOrBuilder();
-
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     * @return Whether the chessInfo field is set.
-     */
-    boolean hasChessInfo();
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     * @return The chessInfo.
-     */
-    emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo getChessInfo();
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     */
-    emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder getChessInfoOrBuilder();
-
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     * @return Whether the sumoInfo field is set.
-     */
-    boolean hasSumoInfo();
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     * @return The sumoInfo.
-     */
-    emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo getSumoInfo();
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     */
-    emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder getSumoInfoOrBuilder();
-
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     * @return Whether the moonfinTrialInfo field is set.
-     */
-    boolean hasMoonfinTrialInfo();
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     * @return The moonfinTrialInfo.
-     */
-    emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo getMoonfinTrialInfo();
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     */
-    emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder getMoonfinTrialInfoOrBuilder();
-
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     * @return Whether the lunaRiteInfo field is set.
-     */
-    boolean hasLunaRiteInfo();
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     * @return The lunaRiteInfo.
-     */
-    emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo getLunaRiteInfo();
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     */
-    emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder getLunaRiteInfoOrBuilder();
-
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     * @return Whether the plantFlowerInfo field is set.
-     */
-    boolean hasPlantFlowerInfo();
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     * @return The plantFlowerInfo.
-     */
-    emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo getPlantFlowerInfo();
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     */
-    emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder getPlantFlowerInfoOrBuilder();
-
-    /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      * @return Whether the musicGameInfo field is set.
      */
     boolean hasMusicGameInfo();
     /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      * @return The musicGameInfo.
      */
     emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo getMusicGameInfo();
     /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      */
     emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfoOrBuilder getMusicGameInfoOrBuilder();
 
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     * @return Whether the roguelikeDungoenInfo field is set.
-     */
-    boolean hasRoguelikeDungoenInfo();
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     * @return The roguelikeDungoenInfo.
-     */
-    emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo getRoguelikeDungoenInfo();
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     */
-    emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder getRoguelikeDungoenInfoOrBuilder();
-
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     * @return Whether the digInfo field is set.
-     */
-    boolean hasDigInfo();
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     * @return The digInfo.
-     */
-    emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo getDigInfo();
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     */
-    emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder getDigInfoOrBuilder();
-
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     * @return Whether the hachiInfo field is set.
-     */
-    boolean hasHachiInfo();
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     * @return The hachiInfo.
-     */
-    emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo getHachiInfo();
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     */
-    emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder getHachiInfoOrBuilder();
-
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     * @return Whether the winterCampInfo field is set.
-     */
-    boolean hasWinterCampInfo();
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     * @return The winterCampInfo.
-     */
-    emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo getWinterCampInfo();
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     */
-    emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder getWinterCampInfoOrBuilder();
-
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     * @return Whether the potionInfo field is set.
-     */
-    boolean hasPotionInfo();
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     * @return The potionInfo.
-     */
-    emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo getPotionInfo();
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     */
-    emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder getPotionInfoOrBuilder();
-
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     * @return Whether the tanukiTravelActivityInfo field is set.
-     */
-    boolean hasTanukiTravelActivityInfo();
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     * @return The tanukiTravelActivityInfo.
-     */
-    emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo getTanukiTravelActivityInfo();
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     */
-    emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder getTanukiTravelActivityInfoOrBuilder();
-
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     * @return Whether the lanternRiteActivityInfo field is set.
-     */
-    boolean hasLanternRiteActivityInfo();
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     * @return The lanternRiteActivityInfo.
-     */
-    emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo getLanternRiteActivityInfo();
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     */
-    emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder getLanternRiteActivityInfoOrBuilder();
-
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     * @return Whether the michiaeMatsuriInfo field is set.
-     */
-    boolean hasMichiaeMatsuriInfo();
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     * @return The michiaeMatsuriInfo.
-     */
-    emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo getMichiaeMatsuriInfo();
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     */
-    emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder getMichiaeMatsuriInfoOrBuilder();
-
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     * @return Whether the bartenderInfo field is set.
-     */
-    boolean hasBartenderInfo();
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     * @return The bartenderInfo.
-     */
-    emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo getBartenderInfo();
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     */
-    emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder getBartenderInfoOrBuilder();
-
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     * @return Whether the ugcInfo field is set.
-     */
-    boolean hasUgcInfo();
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     * @return The ugcInfo.
-     */
-    emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo getUgcInfo();
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     */
-    emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder getUgcInfoOrBuilder();
-
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     * @return Whether the crystalLinkInfo field is set.
-     */
-    boolean hasCrystalLinkInfo();
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     * @return The crystalLinkInfo.
-     */
-    emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo getCrystalLinkInfo();
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     */
-    emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder getCrystalLinkInfoOrBuilder();
-
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     * @return Whether the irodoriInfo field is set.
-     */
-    boolean hasIrodoriInfo();
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     * @return The irodoriInfo.
-     */
-    emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo getIrodoriInfo();
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     */
-    emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder getIrodoriInfoOrBuilder();
-
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     * @return Whether the photoInfo field is set.
-     */
-    boolean hasPhotoInfo();
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     * @return The photoInfo.
-     */
-    emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo getPhotoInfo();
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     */
-    emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder getPhotoInfoOrBuilder();
-
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     * @return Whether the spiceInfo field is set.
-     */
-    boolean hasSpiceInfo();
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     * @return The spiceInfo.
-     */
-    emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo getSpiceInfo();
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     */
-    emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder getSpiceInfoOrBuilder();
-
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     * @return Whether the gachaInfo field is set.
-     */
-    boolean hasGachaInfo();
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     * @return The gachaInfo.
-     */
-    emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo getGachaInfo();
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     */
-    emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder getGachaInfoOrBuilder();
-
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     * @return Whether the luminanceStoneChallengeInfo field is set.
-     */
-    boolean hasLuminanceStoneChallengeInfo();
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     * @return The luminanceStoneChallengeInfo.
-     */
-    emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo getLuminanceStoneChallengeInfo();
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     */
-    emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder getLuminanceStoneChallengeInfoOrBuilder();
-
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     * @return Whether the rogueDiaryInfo field is set.
-     */
-    boolean hasRogueDiaryInfo();
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     * @return The rogueDiaryInfo.
-     */
-    emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo getRogueDiaryInfo();
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     */
-    emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder getRogueDiaryInfoOrBuilder();
-
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     * @return Whether the summerTimeV2Info field is set.
-     */
-    boolean hasSummerTimeV2Info();
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     * @return The summerTimeV2Info.
-     */
-    emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo getSummerTimeV2Info();
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     */
-    emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder getSummerTimeV2InfoOrBuilder();
-
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     * @return Whether the islandPartyInfo field is set.
-     */
-    boolean hasIslandPartyInfo();
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     * @return The islandPartyInfo.
-     */
-    emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo getIslandPartyInfo();
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     */
-    emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder getIslandPartyInfoOrBuilder();
-
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     * @return Whether the gearInfo field is set.
-     */
-    boolean hasGearInfo();
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     * @return The gearInfo.
-     */
-    emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo getGearInfo();
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     */
-    emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder getGearInfoOrBuilder();
-
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     * @return Whether the gravenInnocenceInfo field is set.
-     */
-    boolean hasGravenInnocenceInfo();
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     * @return The gravenInnocenceInfo.
-     */
-    emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo getGravenInnocenceInfo();
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     */
-    emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder getGravenInnocenceInfoOrBuilder();
-
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     * @return Whether the instableSprayInfo field is set.
-     */
-    boolean hasInstableSprayInfo();
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     * @return The instableSprayInfo.
-     */
-    emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo getInstableSprayInfo();
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     */
-    emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder getInstableSprayInfoOrBuilder();
-
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     * @return Whether the muqadasPotionInfo field is set.
-     */
-    boolean hasMuqadasPotionInfo();
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     * @return The muqadasPotionInfo.
-     */
-    emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo getMuqadasPotionInfo();
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     */
-    emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder getMuqadasPotionInfoOrBuilder();
-
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     * @return Whether the treasureSeelieInfo field is set.
-     */
-    boolean hasTreasureSeelieInfo();
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     * @return The treasureSeelieInfo.
-     */
-    emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo getTreasureSeelieInfo();
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     */
-    emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder getTreasureSeelieInfoOrBuilder();
-
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     * @return Whether the rockBoardExploreInfo field is set.
-     */
-    boolean hasRockBoardExploreInfo();
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     * @return The rockBoardExploreInfo.
-     */
-    emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo getRockBoardExploreInfo();
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     */
-    emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder getRockBoardExploreInfoOrBuilder();
-
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     * @return Whether the vintageInfo field is set.
-     */
-    boolean hasVintageInfo();
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     * @return The vintageInfo.
-     */
-    emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo getVintageInfo();
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     */
-    emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder getVintageInfoOrBuilder();
-
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     * @return Whether the windFieldInfo field is set.
-     */
-    boolean hasWindFieldInfo();
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     * @return The windFieldInfo.
-     */
-    emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo getWindFieldInfo();
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     */
-    emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder getWindFieldInfoOrBuilder();
-
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     * @return Whether the fungusFighterInfo field is set.
-     */
-    boolean hasFungusFighterInfo();
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     * @return The fungusFighterInfo.
-     */
-    emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo getFungusFighterInfo();
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     */
-    emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder getFungusFighterInfoOrBuilder();
-
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     * @return Whether the charAmusementInfo field is set.
-     */
-    boolean hasCharAmusementInfo();
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     * @return The charAmusementInfo.
-     */
-    emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo getCharAmusementInfo();
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     */
-    emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder getCharAmusementInfoOrBuilder();
-
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     * @return Whether the effigyChallengeInfo field is set.
-     */
-    boolean hasEffigyChallengeInfo();
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     * @return The effigyChallengeInfo.
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo getEffigyChallengeInfo();
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder getEffigyChallengeInfoOrBuilder();
-
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     * @return Whether the coinCollectInfo field is set.
-     */
-    boolean hasCoinCollectInfo();
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     * @return The coinCollectInfo.
-     */
-    emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo getCoinCollectInfo();
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     */
-    emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder getCoinCollectInfoOrBuilder();
-
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     * @return Whether the brickBreakerInfo field is set.
-     */
-    boolean hasBrickBreakerInfo();
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     * @return The brickBreakerInfo.
-     */
-    emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo getBrickBreakerInfo();
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     */
-    emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder getBrickBreakerInfoOrBuilder();
-
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     * @return Whether the duelHeartInfo field is set.
-     */
-    boolean hasDuelHeartInfo();
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     * @return The duelHeartInfo.
-     */
-    emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo getDuelHeartInfo();
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     */
-    emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder getDuelHeartInfoOrBuilder();
-
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     * @return Whether the seaLampV3Info field is set.
-     */
-    boolean hasSeaLampV3Info();
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     * @return The seaLampV3Info.
-     */
-    emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo getSeaLampV3Info();
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     */
-    emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder getSeaLampV3InfoOrBuilder();
-
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     * @return Whether the teamChainInfo field is set.
-     */
-    boolean hasTeamChainInfo();
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     * @return The teamChainInfo.
-     */
-    emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo getTeamChainInfo();
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     */
-    emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder getTeamChainInfoOrBuilder();
-
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     * @return Whether the electroherculesBattleInfo field is set.
-     */
-    boolean hasElectroherculesBattleInfo();
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     * @return The electroherculesBattleInfo.
-     */
-    emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo getElectroherculesBattleInfo();
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     */
-    emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder getElectroherculesBattleInfoOrBuilder();
-
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     * @return Whether the gcgFestivalInfo field is set.
-     */
-    boolean hasGcgFestivalInfo();
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     * @return The gcgFestivalInfo.
-     */
-    emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo getGcgFestivalInfo();
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     */
-    emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder getGcgFestivalInfoOrBuilder();
-
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     * @return Whether the fleurFairV2Info field is set.
-     */
-    boolean hasFleurFairV2Info();
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     * @return The fleurFairV2Info.
-     */
-    emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo getFleurFairV2Info();
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     */
-    emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder getFleurFairV2InfoOrBuilder();
-
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     * @return Whether the fungusFighterV2Info field is set.
-     */
-    boolean hasFungusFighterV2Info();
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     * @return The fungusFighterV2Info.
-     */
-    emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo getFungusFighterV2Info();
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     */
-    emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder getFungusFighterV2InfoOrBuilder();
-
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     * @return Whether the akaFesInfo field is set.
-     */
-    boolean hasAkaFesInfo();
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     * @return The akaFesInfo.
-     */
-    emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo getAkaFesInfo();
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     */
-    emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder getAkaFesInfoOrBuilder();
-
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     * @return Whether the sandwormCannonDetailInfo field is set.
-     */
-    boolean hasSandwormCannonDetailInfo();
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     * @return The sandwormCannonDetailInfo.
-     */
-    emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo getSandwormCannonDetailInfo();
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     */
-    emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder getSandwormCannonDetailInfoOrBuilder();
-
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     * @return Whether the sorushTrialInfo field is set.
-     */
-    boolean hasSorushTrialInfo();
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     * @return The sorushTrialInfo.
-     */
-    emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo getSorushTrialInfo();
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     */
-    emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder getSorushTrialInfoOrBuilder();
-
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     * @return Whether the journeyInfo field is set.
-     */
-    boolean hasJourneyInfo();
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     * @return The journeyInfo.
-     */
-    emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo getJourneyInfo();
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     */
-    emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder getJourneyInfoOrBuilder();
-
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     * @return Whether the effigyChallengeV4Info field is set.
-     */
-    boolean hasEffigyChallengeV4Info();
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     * @return The effigyChallengeV4Info.
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info getEffigyChallengeV4Info();
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder getEffigyChallengeV4InfoOrBuilder();
-
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     * @return Whether the gcgPveInfo field is set.
-     */
-    boolean hasGcgPveInfo();
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     * @return The gcgPveInfo.
-     */
-    emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo getGcgPveInfo();
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     */
-    emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder getGcgPveInfoOrBuilder();
-
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     * @return Whether the ugcV2Info field is set.
-     */
-    boolean hasUgcV2Info();
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     * @return The ugcV2Info.
-     */
-    emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info getUgcV2Info();
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     */
-    emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder getUgcV2InfoOrBuilder();
-
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     * @return Whether the penumbraAdventureInfo field is set.
-     */
-    boolean hasPenumbraAdventureInfo();
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     * @return The penumbraAdventureInfo.
-     */
-    emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo getPenumbraAdventureInfo();
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     */
-    emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder getPenumbraAdventureInfoOrBuilder();
-
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     * @return Whether the animalViewInfo field is set.
-     */
-    boolean hasAnimalViewInfo();
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     * @return The animalViewInfo.
-     */
-    emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo getAnimalViewInfo();
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     */
-    emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder getAnimalViewInfoOrBuilder();
-
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     * @return Whether the activityMultiCharacterInfo field is set.
-     */
-    boolean hasActivityMultiCharacterInfo();
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     * @return The activityMultiCharacterInfo.
-     */
-    emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo getActivityMultiCharacterInfo();
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     */
-    emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder getActivityMultiCharacterInfoOrBuilder();
-
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     * @return Whether the gcgPveInfiniteInfo field is set.
-     */
-    boolean hasGcgPveInfiniteInfo();
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     * @return The gcgPveInfiniteInfo.
-     */
-    emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo getGcgPveInfiniteInfo();
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     */
-    emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder getGcgPveInfiniteInfoOrBuilder();
-
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     * @return Whether the toyBattleInfo field is set.
-     */
-    boolean hasToyBattleInfo();
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     * @return The toyBattleInfo.
-     */
-    emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo getToyBattleInfo();
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     */
-    emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder getToyBattleInfoOrBuilder();
-
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     * @return Whether the photoUnderseaInfo field is set.
-     */
-    boolean hasPhotoUnderseaInfo();
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     * @return The photoUnderseaInfo.
-     */
-    emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo getPhotoUnderseaInfo();
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     */
-    emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder getPhotoUnderseaInfoOrBuilder();
-
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     * @return Whether the fontaineGatherInfo field is set.
-     */
-    boolean hasFontaineGatherInfo();
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     * @return The fontaineGatherInfo.
-     */
-    emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo getFontaineGatherInfo();
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     */
-    emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder getFontaineGatherInfoOrBuilder();
-
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     * @return Whether the gcgPvePuzzleInfo field is set.
-     */
-    boolean hasGcgPvePuzzleInfo();
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     * @return The gcgPvePuzzleInfo.
-     */
-    emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo getGcgPvePuzzleInfo();
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     */
-    emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder getGcgPvePuzzleInfoOrBuilder();
-
     public emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * Obf: AMADJGLDDCF
-   * </pre>
-   *
    * Protobuf type {@code ActivityInfo}
    */
   public static final class ActivityInfo extends
@@ -1598,12 +401,13 @@ public final class ActivityInfoOuterClass {
       super(builder);
     }
     private ActivityInfo() {
-      dNMOEAFCDGC_ = emptyIntList();
-      watcherInfoList_ = java.util.Collections.emptyList();
-      lJLDCLMAMNL_ = emptyIntList();
       meetCondList_ = emptyIntList();
-      pHCOMIFAIJD_ = emptyIntList();
+      watcherInfoList_ = java.util.Collections.emptyList();
+      expireCondList_ = emptyIntList();
+      takenRewardList_ = emptyIntList();
       activityPushTipsDataList_ = java.util.Collections.emptyList();
+      gONEPFEDMEL_ = emptyLongList();
+      nJCGNGLKPBJ_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -1638,89 +442,47 @@ public final class ActivityInfoOuterClass {
               done = true;
               break;
             case 8: {
-
-              activityType_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-
-              beginTime_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                pHCOMIFAIJD_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                meetCondList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              pHCOMIFAIJD_.addInt(input.readUInt32());
+              meetCondList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
-                pHCOMIFAIJD_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                meetCondList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
-                pHCOMIFAIJD_.addInt(input.readUInt32());
+                meetCondList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 40: {
+            case 32: {
 
-              scheduleId_ = input.readUInt32();
+              endTime_ = input.readUInt32();
               break;
             }
-            case 50: {
-              emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 6) {
-                subBuilder = ((emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 6;
+            case 48: {
+
+              beginTime_ = input.readUInt32();
               break;
             }
-            case 58: {
-              emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 7) {
-                subBuilder = ((emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 7;
+            case 56: {
+
+              isFinished_ = input.readBool();
               break;
             }
-            case 66: {
-              emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 8) {
-                subBuilder = ((emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 8;
+            case 64: {
+
+              fALGLCJDKCL_ = input.readBool();
               break;
             }
-            case 74: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 watcherInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo>();
                 mutable_bitField0_ |= 0x00000002;
@@ -1729,1166 +491,125 @@ public final class ActivityInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.parser(), extensionRegistry));
               break;
             }
-            case 82: {
-              emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 10) {
-                subBuilder = ((emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_).toBuilder();
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                expireCondList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 10;
+              expireCondList_.addInt(input.readUInt32());
               break;
             }
-            case 88: {
-
-              endTime_ = input.readUInt32();
+            case 90: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                expireCondList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                expireCondList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                meetCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              meetCondList_.addInt(input.readUInt32());
-              break;
-            }
-            case 98: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                meetCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                meetCondList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
+
+              scheduleId_ = input.readUInt32();
               break;
             }
             case 104: {
 
-              dKJDABCNGBP_ = input.readBool();
+              oNCLIGBKLPF_ = input.readBool();
               break;
             }
             case 112: {
 
-              isFinished_ = input.readBool();
+              activityType_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              eNNDKMJIMHN_ = input.readBool();
+              activityId_ = input.readUInt32();
               break;
             }
-            case 128: {
+            case 504: {
 
-              pJJKJGALLGD_ = input.readBool();
+              curScore_ = input.readUInt32();
               break;
             }
-            case 306: {
-              emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 38) {
-                subBuilder = ((emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 38;
+            case 2024: {
+
+              fFGHMFNFPNL_ = input.readUInt32();
               break;
             }
-            case 314: {
-              emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 39) {
-                subBuilder = ((emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 39;
+            case 2984: {
+
+              firstDayStartTime_ = input.readUInt32();
               break;
             }
-            case 434: {
-              emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 54) {
-                subBuilder = ((emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 54;
+            case 3408: {
+
+              lKODGHFICBH_ = input.readUInt32();
               break;
             }
-            case 498: {
-              emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder subBuilder = null;
-              if (detailCase_ == 62) {
-                subBuilder = ((emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 62;
+            case 4072: {
+
+              cDBIIEIPBFF_ = input.readBool();
               break;
             }
-            case 882: {
-              emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 110) {
-                subBuilder = ((emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 110;
+            case 5424: {
+
+              lCHFFKHPJIO_ = input.readBool();
               break;
             }
-            case 914: {
-              emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 114) {
-                subBuilder = ((emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 114;
+            case 5912: {
+
+              iLKPGDKEIEG_ = input.readBool();
               break;
             }
-            case 994: {
-              emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder subBuilder = null;
-              if (detailCase_ == 124) {
-                subBuilder = ((emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_).toBuilder();
+            case 6544: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                takenRewardList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 124;
+              takenRewardList_.addInt(input.readUInt32());
               break;
             }
-            case 1810: {
-              emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder subBuilder = null;
-              if (detailCase_ == 226) {
-                subBuilder = ((emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 226;
-              break;
-            }
-            case 2082: {
-              emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 260) {
-                subBuilder = ((emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 260;
-              break;
-            }
-            case 2346: {
-              emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 293) {
-                subBuilder = ((emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 293;
-              break;
-            }
-            case 2442: {
-              emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 305) {
-                subBuilder = ((emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 305;
-              break;
-            }
-            case 2450: {
-              emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder subBuilder = null;
-              if (detailCase_ == 306) {
-                subBuilder = ((emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 306;
-              break;
-            }
-            case 2650: {
-              emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 331) {
-                subBuilder = ((emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 331;
-              break;
-            }
-            case 2850: {
-              emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 356) {
-                subBuilder = ((emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 356;
-              break;
-            }
-            case 3114: {
-              emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 389) {
-                subBuilder = ((emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 389;
-              break;
-            }
-            case 3418: {
-              emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 427) {
-                subBuilder = ((emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 427;
-              break;
-            }
-            case 3570: {
-              emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 446) {
-                subBuilder = ((emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 446;
-              break;
-            }
-            case 3856: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                lJLDCLMAMNL_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              lJLDCLMAMNL_.addInt(input.readUInt32());
-              break;
-            }
-            case 3858: {
+            case 6546: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                lJLDCLMAMNL_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                takenRewardList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
-                lJLDCLMAMNL_.addInt(input.readUInt32());
+                takenRewardList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 4066: {
-              emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 508) {
-                subBuilder = ((emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 508;
-              break;
-            }
-            case 4154: {
-              emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 519) {
-                subBuilder = ((emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 519;
-              break;
-            }
-            case 4200: {
+            case 7136: {
 
-              aBMOPKOIMPA_ = input.readBool();
+              cIDDJFNIMPJ_ = input.readUInt64();
               break;
             }
-            case 4410: {
-              emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 551) {
-                subBuilder = ((emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 551;
-              break;
-            }
-            case 4968: {
-
-              cEFIPNKPEKA_ = input.readUInt32();
-              break;
-            }
-            case 5010: {
-              emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 626) {
-                subBuilder = ((emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 626;
-              break;
-            }
-            case 5146: {
-              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+            case 7866: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
                 activityPushTipsDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData>();
-                mutable_bitField0_ |= 0x00000080;
+                mutable_bitField0_ |= 0x00000010;
               }
               activityPushTipsDataList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.parser(), extensionRegistry));
               break;
             }
-            case 5394: {
-              emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 674) {
-                subBuilder = ((emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 674;
-              break;
-            }
-            case 5864: {
+            case 8320: {
 
-              iNGFNLLCDOL_ = input.readUInt32();
+              mPPFCLCENAP_ = input.readUInt32();
               break;
             }
-            case 6146: {
-              emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 768) {
-                subBuilder = ((emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 768;
-              break;
-            }
-            case 6610: {
-              emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 826) {
-                subBuilder = ((emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 826;
-              break;
-            }
-            case 6666: {
-              emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 833) {
-                subBuilder = ((emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 833;
-              break;
-            }
-            case 6674: {
-              emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 834) {
-                subBuilder = ((emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 834;
-              break;
-            }
-            case 6714: {
-              emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 839) {
-                subBuilder = ((emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 839;
-              break;
-            }
-            case 6970: {
-              emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder subBuilder = null;
-              if (detailCase_ == 871) {
-                subBuilder = ((emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 871;
-              break;
-            }
-            case 7282: {
-              emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 910) {
-                subBuilder = ((emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 910;
-              break;
-            }
-            case 7322: {
-              emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 915) {
-                subBuilder = ((emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 915;
-              break;
-            }
-            case 7394: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                wishGiftNumMap_ = com.google.protobuf.MapField.newMapField(
-                    WishGiftNumMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000020;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              wishGiftNumMap__ = input.readMessage(
-                  WishGiftNumMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              wishGiftNumMap_.getMutableMap().put(
-                  wishGiftNumMap__.getKey(), wishGiftNumMap__.getValue());
-              break;
-            }
-            case 7554: {
-              emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 944) {
-                subBuilder = ((emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 944;
-              break;
-            }
-            case 7578: {
-              emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder subBuilder = null;
-              if (detailCase_ == 947) {
-                subBuilder = ((emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 947;
-              break;
-            }
-            case 7602: {
-              emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 950) {
-                subBuilder = ((emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 950;
-              break;
-            }
-            case 7824: {
-
-              firstDayStartTime_ = input.readUInt32();
-              break;
-            }
-            case 7850: {
-              emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 981) {
-                subBuilder = ((emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 981;
-              break;
-            }
-            case 7930: {
-              emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder subBuilder = null;
-              if (detailCase_ == 991) {
-                subBuilder = ((emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 991;
-              break;
-            }
-            case 8082: {
-              emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1010) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1010;
-              break;
-            }
-            case 8202: {
-              emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1025) {
-                subBuilder = ((emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1025;
-              break;
-            }
-            case 8226: {
-              emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1028) {
-                subBuilder = ((emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1028;
-              break;
-            }
-            case 8282: {
-              emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder subBuilder = null;
-              if (detailCase_ == 1035) {
-                subBuilder = ((emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1035;
-              break;
-            }
-            case 8354: {
-              emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1044) {
-                subBuilder = ((emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1044;
-              break;
-            }
-            case 8618: {
-              emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1077) {
-                subBuilder = ((emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1077;
-              break;
-            }
-            case 8698: {
-              emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1087) {
-                subBuilder = ((emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1087;
-              break;
-            }
-            case 8914: {
-              emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder subBuilder = null;
-              if (detailCase_ == 1114) {
-                subBuilder = ((emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1114;
-              break;
-            }
-            case 8936: {
-
-              gFEMIEBKKKL_ = input.readBool();
-              break;
-            }
-            case 9322: {
-              emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1165) {
-                subBuilder = ((emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1165;
-              break;
-            }
-            case 9410: {
-              emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1176) {
-                subBuilder = ((emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1176;
-              break;
-            }
-            case 9538: {
-              emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1192) {
-                subBuilder = ((emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1192;
-              break;
-            }
-            case 9706: {
-              emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder subBuilder = null;
-              if (detailCase_ == 1213) {
-                subBuilder = ((emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1213;
-              break;
-            }
-            case 9778: {
-              emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1222) {
-                subBuilder = ((emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1222;
-              break;
-            }
-            case 10010: {
-              emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1251) {
-                subBuilder = ((emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1251;
-              break;
-            }
-            case 10106: {
-              emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1263) {
-                subBuilder = ((emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1263;
-              break;
-            }
-            case 10202: {
-              emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1275) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1275;
-              break;
-            }
-            case 10274: {
-              emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1284) {
-                subBuilder = ((emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1284;
-              break;
-            }
-            case 10410: {
-              emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1301) {
-                subBuilder = ((emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1301;
-              break;
-            }
-            case 10434: {
-              emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder subBuilder = null;
-              if (detailCase_ == 1304) {
-                subBuilder = ((emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1304;
-              break;
-            }
-            case 10570: {
-              emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder subBuilder = null;
-              if (detailCase_ == 1321) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1321;
-              break;
-            }
-            case 11530: {
-              emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1441) {
-                subBuilder = ((emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1441;
-              break;
-            }
-            case 11722: {
-              emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1465) {
-                subBuilder = ((emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1465;
-              break;
-            }
-            case 11794: {
-              emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1474) {
-                subBuilder = ((emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1474;
-              break;
-            }
-            case 11882: {
-              emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1485) {
-                subBuilder = ((emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1485;
-              break;
-            }
-            case 11938: {
-              emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1492) {
-                subBuilder = ((emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1492;
-              break;
-            }
-            case 12194: {
-              emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1524) {
-                subBuilder = ((emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1524;
-              break;
-            }
-            case 12330: {
-              emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1541) {
-                subBuilder = ((emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1541;
-              break;
-            }
-            case 12440: {
-
-              curScore_ = input.readUInt32();
-              break;
-            }
-            case 12498: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                activityCoinMap_ = com.google.protobuf.MapField.newMapField(
-                    ActivityCoinMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000008;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              activityCoinMap__ = input.readMessage(
-                  ActivityCoinMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              activityCoinMap_.getMutableMap().put(
-                  activityCoinMap__.getKey(), activityCoinMap__.getValue());
-              break;
-            }
-            case 12978: {
-              emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1622) {
-                subBuilder = ((emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1622;
-              break;
-            }
-            case 13314: {
-              emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1664) {
-                subBuilder = ((emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1664;
-              break;
-            }
-            case 13362: {
-              emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1670) {
-                subBuilder = ((emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1670;
-              break;
-            }
-            case 13624: {
-
-              fGFGECAAKJM_ = input.readUInt32();
-              break;
-            }
-            case 13888: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                dNMOEAFCDGC_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              dNMOEAFCDGC_.addInt(input.readUInt32());
-              break;
-            }
-            case 13890: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                dNMOEAFCDGC_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                dNMOEAFCDGC_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 13978: {
-              emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1747) {
-                subBuilder = ((emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1747;
-              break;
-            }
-            case 14034: {
-              emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1754) {
-                subBuilder = ((emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1754;
-              break;
-            }
-            case 14058: {
-              emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1757) {
-                subBuilder = ((emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1757;
-              break;
-            }
-            case 14362: {
-              emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1795) {
-                subBuilder = ((emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1795;
-              break;
-            }
-            case 14544: {
-
-              bKJNDLLNAML_ = input.readBool();
-              break;
-            }
-            case 14770: {
-              emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1846) {
-                subBuilder = ((emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1846;
-              break;
-            }
-            case 14778: {
+            case 8794: {
               emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1847) {
+              if (detailCase_ == 1099) {
                 subBuilder = ((emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_).toBuilder();
               }
               detail_ =
@@ -2897,147 +618,80 @@ public final class ActivityInfoOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_);
                 detail_ = subBuilder.buildPartial();
               }
-              detailCase_ = 1847;
+              detailCase_ = 1099;
               break;
             }
-            case 14834: {
-              emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1854) {
-                subBuilder = ((emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_).toBuilder();
+            case 9968: {
+              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
+                gONEPFEDMEL_ = newLongList();
+                mutable_bitField0_ |= 0x00000020;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1854;
+              gONEPFEDMEL_.addLong(input.readUInt64());
               break;
             }
-            case 14842: {
-              emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1855) {
-                subBuilder = ((emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_).toBuilder();
+            case 9970: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
+                gONEPFEDMEL_ = newLongList();
+                mutable_bitField0_ |= 0x00000020;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
+              while (input.getBytesUntilLimit() > 0) {
+                gONEPFEDMEL_.addLong(input.readUInt64());
               }
-              detailCase_ = 1855;
+              input.popLimit(limit);
               break;
             }
-            case 14914: {
-              emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1864) {
-                subBuilder = ((emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_).toBuilder();
+            case 10136: {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                nJCGNGLKPBJ_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1864;
+              nJCGNGLKPBJ_.addInt(input.readUInt32());
               break;
             }
-            case 14954: {
-              emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder subBuilder = null;
-              if (detailCase_ == 1869) {
-                subBuilder = ((emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_).toBuilder();
+            case 10138: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                nJCGNGLKPBJ_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_);
-                detail_ = subBuilder.buildPartial();
+              while (input.getBytesUntilLimit() > 0) {
+                nJCGNGLKPBJ_.addInt(input.readUInt32());
               }
-              detailCase_ = 1869;
+              input.popLimit(limit);
               break;
             }
-            case 15770: {
-              emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1971) {
-                subBuilder = ((emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1971;
+            case 11264: {
+
+              oDMJHPBFIKO_ = input.readBool();
               break;
             }
-            case 15842: {
-              emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1980) {
-                subBuilder = ((emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_).toBuilder();
+            case 14330: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+                activityCoinMap_ = com.google.protobuf.MapField.newMapField(
+                    ActivityCoinMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000080;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1980;
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              activityCoinMap__ = input.readMessage(
+                  ActivityCoinMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              activityCoinMap_.getMutableMap().put(
+                  activityCoinMap__.getKey(), activityCoinMap__.getValue());
               break;
             }
-            case 15858: {
-              emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1982) {
-                subBuilder = ((emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_).toBuilder();
+            case 15634: {
+              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
+                wishGiftNumMap_ = com.google.protobuf.MapField.newMapField(
+                    WishGiftNumMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000100;
               }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1982;
-              break;
-            }
-            case 15978: {
-              emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 1997) {
-                subBuilder = ((emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1997;
-              break;
-            }
-            case 16066: {
-              emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 2008) {
-                subBuilder = ((emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 2008;
-              break;
-            }
-            case 16114: {
-              emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder subBuilder = null;
-              if (detailCase_ == 2014) {
-                subBuilder = ((emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 2014;
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              wishGiftNumMap__ = input.readMessage(
+                  WishGiftNumMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              wishGiftNumMap_.getMutableMap().put(
+                  wishGiftNumMap__.getKey(), wishGiftNumMap__.getValue());
               break;
             }
             default: {
@@ -3055,23 +709,26 @@ public final class ActivityInfoOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          pHCOMIFAIJD_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          meetCondList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_);
         }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          meetCondList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          lJLDCLMAMNL_.makeImmutable(); // C
+          expireCondList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000080) != 0)) {
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          takenRewardList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000010) != 0)) {
           activityPushTipsDataList_ = java.util.Collections.unmodifiableList(activityPushTipsDataList_);
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          dNMOEAFCDGC_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000020) != 0)) {
+          gONEPFEDMEL_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          nJCGNGLKPBJ_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -3087,9 +744,9 @@ public final class ActivityInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 1562:
+        case 1791:
           return internalGetActivityCoinMap();
-        case 924:
+        case 1954:
           return internalGetWishGiftNumMap();
         default:
           throw new RuntimeException(
@@ -3109,91 +766,7 @@ public final class ActivityInfoOuterClass {
     public enum DetailCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      SAM_LAMP_INFO(10),
-      CRUCIBLE_INFO(7),
-      SALESMAN_INFO(8),
-      TRIAL_AVATAR_INFO(6),
-      DELIVERY_INFO(1846),
-      ASTER_INFO(260),
-      FLIGHT_INFO(826),
-      DRAGON_SPINE_INFO(110),
-      EFFIGY_INFO(1010),
-      TREASURE_MAP_INFO(1754),
-      BLESSING_INFO(331),
-      SEA_LAMP_INFO(1114),
-      EXPEDITION_INFO(674),
-      ARENA_CHALLENGE_INFO(39),
-      FLEUR_FAIR_INFO(293),
-      WATER_SPIRIT_INFO(1997),
-      CHALLNELER_SLAB_INFO(1757),
-      MIST_TRIAL_ACTIVITY_INFO(1622),
-      HIDE_AND_SEEK_INFO(1747),
-      FIND_HILICHURL_INFO(1284),
-      SUMMER_TIME_INFO(950),
-      BUOYANT_COMBAT_INFO(519),
-      ECHO_SHELL_INFO(305),
-      BOUNCE_CONJURING_INFO(1864),
-      BLITZ_RUSH_INFO(915),
-      CHESS_INFO(1087),
-      SUMO_INFO(2008),
-      MOONFIN_TRIAL_INFO(389),
-      LUNA_RITE_INFO(1971),
-      PLANT_FLOWER_INFO(1854),
-      MUSIC_GAME_INFO(1847),
-      ROGUELIKE_DUNGOEN_INFO(1025),
-      DIG_INFO(1855),
-      HACHI_INFO(1176),
-      WINTER_CAMP_INFO(2014),
-      POTION_INFO(1485),
-      TANUKI_TRAVEL_ACTIVITY_INFO(944),
-      LANTERN_RITE_ACTIVITY_INFO(1980),
-      MICHIAE_MATSURI_INFO(114),
-      BARTENDER_INFO(1441),
-      UGC_INFO(1795),
-      CRYSTAL_LINK_INFO(1301),
-      IRODORI_INFO(54),
-      PHOTO_INFO(1492),
-      SPICE_INFO(446),
-      GACHA_INFO(1192),
-      LUMINANCE_STONE_CHALLENGE_INFO(38),
-      ROGUE_DIARY_INFO(427),
-      SUMMER_TIME_V2_INFO(910),
-      ISLAND_PARTY_INFO(1044),
-      GEAR_INFO(1263),
-      GRAVEN_INNOCENCE_INFO(356),
-      INSTABLE_SPRAY_INFO(508),
-      MUQADAS_POTION_INFO(1474),
-      TREASURE_SEELIE_INFO(1251),
-      ROCK_BOARD_EXPLORE_INFO(1028),
-      VINTAGE_INFO(1465),
-      WIND_FIELD_INFO(768),
-      FUNGUS_FIGHTER_INFO(834),
-      CHAR_AMUSEMENT_INFO(1222),
-      EFFIGY_CHALLENGE_INFO(1275),
-      COIN_COLLECT_INFO(839),
-      BRICK_BREAKER_INFO(551),
-      DUEL_HEART_INFO(1670),
-      SEA_LAMP_V3_INFO(833),
-      TEAM_CHAIN_INFO(1165),
-      ELECTROHERCULES_BATTLE_INFO(981),
-      GCG_FESTIVAL_INFO(1664),
-      FLEUR_FAIR_V2_INFO(1982),
-      FUNGUS_FIGHTER_V2_INFO(1541),
-      AKA_FES_INFO(1524),
-      SANDWORM_CANNON_DETAIL_INFO(626),
-      SORUSH_TRIAL_INFO(1077),
-      JOURNEY_INFO(1869),
-      EFFIGY_CHALLENGE_V4_INFO(1321),
-      GCG_PVE_INFO(1304),
-      UGC_V2_INFO(991),
-      PENUMBRA_ADVENTURE_INFO(306),
-      ANIMAL_VIEW_INFO(947),
-      ACTIVITY_MULTI_CHARACTER_INFO(1213),
-      GCG_PVE_INFINITE_INFO(124),
-      TOY_BATTLE_INFO(62),
-      PHOTO_UNDERSEA_INFO(226),
-      FONTAINE_GATHER_INFO(1035),
-      GCG_PVE_PUZZLE_INFO(871),
+      MUSIC_GAME_INFO(1099),
       DETAIL_NOT_SET(0);
       private final int value;
       private DetailCase(int value) {
@@ -3211,91 +784,7 @@ public final class ActivityInfoOuterClass {
 
       public static DetailCase forNumber(int value) {
         switch (value) {
-          case 10: return SAM_LAMP_INFO;
-          case 7: return CRUCIBLE_INFO;
-          case 8: return SALESMAN_INFO;
-          case 6: return TRIAL_AVATAR_INFO;
-          case 1846: return DELIVERY_INFO;
-          case 260: return ASTER_INFO;
-          case 826: return FLIGHT_INFO;
-          case 110: return DRAGON_SPINE_INFO;
-          case 1010: return EFFIGY_INFO;
-          case 1754: return TREASURE_MAP_INFO;
-          case 331: return BLESSING_INFO;
-          case 1114: return SEA_LAMP_INFO;
-          case 674: return EXPEDITION_INFO;
-          case 39: return ARENA_CHALLENGE_INFO;
-          case 293: return FLEUR_FAIR_INFO;
-          case 1997: return WATER_SPIRIT_INFO;
-          case 1757: return CHALLNELER_SLAB_INFO;
-          case 1622: return MIST_TRIAL_ACTIVITY_INFO;
-          case 1747: return HIDE_AND_SEEK_INFO;
-          case 1284: return FIND_HILICHURL_INFO;
-          case 950: return SUMMER_TIME_INFO;
-          case 519: return BUOYANT_COMBAT_INFO;
-          case 305: return ECHO_SHELL_INFO;
-          case 1864: return BOUNCE_CONJURING_INFO;
-          case 915: return BLITZ_RUSH_INFO;
-          case 1087: return CHESS_INFO;
-          case 2008: return SUMO_INFO;
-          case 389: return MOONFIN_TRIAL_INFO;
-          case 1971: return LUNA_RITE_INFO;
-          case 1854: return PLANT_FLOWER_INFO;
-          case 1847: return MUSIC_GAME_INFO;
-          case 1025: return ROGUELIKE_DUNGOEN_INFO;
-          case 1855: return DIG_INFO;
-          case 1176: return HACHI_INFO;
-          case 2014: return WINTER_CAMP_INFO;
-          case 1485: return POTION_INFO;
-          case 944: return TANUKI_TRAVEL_ACTIVITY_INFO;
-          case 1980: return LANTERN_RITE_ACTIVITY_INFO;
-          case 114: return MICHIAE_MATSURI_INFO;
-          case 1441: return BARTENDER_INFO;
-          case 1795: return UGC_INFO;
-          case 1301: return CRYSTAL_LINK_INFO;
-          case 54: return IRODORI_INFO;
-          case 1492: return PHOTO_INFO;
-          case 446: return SPICE_INFO;
-          case 1192: return GACHA_INFO;
-          case 38: return LUMINANCE_STONE_CHALLENGE_INFO;
-          case 427: return ROGUE_DIARY_INFO;
-          case 910: return SUMMER_TIME_V2_INFO;
-          case 1044: return ISLAND_PARTY_INFO;
-          case 1263: return GEAR_INFO;
-          case 356: return GRAVEN_INNOCENCE_INFO;
-          case 508: return INSTABLE_SPRAY_INFO;
-          case 1474: return MUQADAS_POTION_INFO;
-          case 1251: return TREASURE_SEELIE_INFO;
-          case 1028: return ROCK_BOARD_EXPLORE_INFO;
-          case 1465: return VINTAGE_INFO;
-          case 768: return WIND_FIELD_INFO;
-          case 834: return FUNGUS_FIGHTER_INFO;
-          case 1222: return CHAR_AMUSEMENT_INFO;
-          case 1275: return EFFIGY_CHALLENGE_INFO;
-          case 839: return COIN_COLLECT_INFO;
-          case 551: return BRICK_BREAKER_INFO;
-          case 1670: return DUEL_HEART_INFO;
-          case 833: return SEA_LAMP_V3_INFO;
-          case 1165: return TEAM_CHAIN_INFO;
-          case 981: return ELECTROHERCULES_BATTLE_INFO;
-          case 1664: return GCG_FESTIVAL_INFO;
-          case 1982: return FLEUR_FAIR_V2_INFO;
-          case 1541: return FUNGUS_FIGHTER_V2_INFO;
-          case 1524: return AKA_FES_INFO;
-          case 626: return SANDWORM_CANNON_DETAIL_INFO;
-          case 1077: return SORUSH_TRIAL_INFO;
-          case 1869: return JOURNEY_INFO;
-          case 1321: return EFFIGY_CHALLENGE_V4_INFO;
-          case 1304: return GCG_PVE_INFO;
-          case 991: return UGC_V2_INFO;
-          case 306: return PENUMBRA_ADVENTURE_INFO;
-          case 947: return ANIMAL_VIEW_INFO;
-          case 1213: return ACTIVITY_MULTI_CHARACTER_INFO;
-          case 124: return GCG_PVE_INFINITE_INFO;
-          case 62: return TOY_BATTLE_INFO;
-          case 226: return PHOTO_UNDERSEA_INFO;
-          case 1035: return FONTAINE_GATHER_INFO;
-          case 871: return GCG_PVE_PUZZLE_INFO;
+          case 1099: return MUSIC_GAME_INFO;
           case 0: return DETAIL_NOT_SET;
           default: return null;
         }
@@ -3311,89 +800,72 @@ public final class ActivityInfoOuterClass {
           detailCase_);
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 3;
-    private int activityId_;
+    public static final int MEET_COND_LIST_FIELD_NUMBER = 1;
+    private com.google.protobuf.Internal.IntList meetCondList_;
     /**
-     * <code>uint32 activity_id = 3;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
-    public static final int DNMOEAFCDGC_FIELD_NUMBER = 1736;
-    private com.google.protobuf.Internal.IntList dNMOEAFCDGC_;
-    /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-     * @return A list containing the dNMOEAFCDGC.
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
+     * @return A list containing the meetCondList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getDNMOEAFCDGCList() {
-      return dNMOEAFCDGC_;
+        getMeetCondListList() {
+      return meetCondList_;
     }
     /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-     * @return The count of dNMOEAFCDGC.
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
+     * @return The count of meetCondList.
      */
-    public int getDNMOEAFCDGCCount() {
-      return dNMOEAFCDGC_.size();
+    public int getMeetCondListCount() {
+      return meetCondList_.size();
     }
     /**
-     * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
+     * <pre>
+     * 11
+     * </pre>
+     *
+     * <code>repeated uint32 meet_cond_list = 1;</code>
      * @param index The index of the element to return.
-     * @return The dNMOEAFCDGC at the given index.
+     * @return The meetCondList at the given index.
      */
-    public int getDNMOEAFCDGC(int index) {
-      return dNMOEAFCDGC_.getInt(index);
+    public int getMeetCondList(int index) {
+      return meetCondList_.getInt(index);
     }
-    private int dNMOEAFCDGCMemoizedSerializedSize = -1;
+    private int meetCondListMemoizedSerializedSize = -1;
 
-    public static final int WATCHER_INFO_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> watcherInfoList_;
+    public static final int END_TIME_FIELD_NUMBER = 4;
+    private int endTime_;
     /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+     * <code>uint32 end_time = 4;</code>
+     * @return The endTime.
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> getWatcherInfoListList() {
-      return watcherInfoList_;
-    }
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
-        getWatcherInfoListOrBuilderList() {
-      return watcherInfoList_;
-    }
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getWatcherInfoListCount() {
-      return watcherInfoList_.size();
-    }
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfoList(int index) {
-      return watcherInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoListOrBuilder(
-        int index) {
-      return watcherInfoList_.get(index);
+    public int getEndTime() {
+      return endTime_;
     }
 
-    public static final int IS_FINISHED_FIELD_NUMBER = 14;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 6;
+    private int beginTime_;
+    /**
+     * <code>uint32 begin_time = 6;</code>
+     * @return The beginTime.
+     */
+    @java.lang.Override
+    public int getBeginTime() {
+      return beginTime_;
+    }
+
+    public static final int IS_FINISHED_FIELD_NUMBER = 7;
     private boolean isFinished_;
     /**
-     * <code>bool is_finished = 14;</code>
+     * <code>bool is_finished = 7;</code>
      * @return The isFinished.
      */
     @java.lang.Override
@@ -3401,60 +873,101 @@ public final class ActivityInfoOuterClass {
       return isFinished_;
     }
 
-    public static final int LJLDCLMAMNL_FIELD_NUMBER = 482;
-    private com.google.protobuf.Internal.IntList lJLDCLMAMNL_;
+    public static final int FALGLCJDKCL_FIELD_NUMBER = 8;
+    private boolean fALGLCJDKCL_;
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-     * @return A list containing the lJLDCLMAMNL.
+     * <code>bool FALGLCJDKCL = 8;</code>
+     * @return The fALGLCJDKCL.
+     */
+    @java.lang.Override
+    public boolean getFALGLCJDKCL() {
+      return fALGLCJDKCL_;
+    }
+
+    public static final int WATCHER_INFO_LIST_FIELD_NUMBER = 10;
+    private java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> watcherInfoList_;
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> getWatcherInfoListList() {
+      return watcherInfoList_;
+    }
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
+        getWatcherInfoListOrBuilderList() {
+      return watcherInfoList_;
+    }
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    @java.lang.Override
+    public int getWatcherInfoListCount() {
+      return watcherInfoList_.size();
+    }
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfoList(int index) {
+      return watcherInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoListOrBuilder(
+        int index) {
+      return watcherInfoList_.get(index);
+    }
+
+    public static final int EXPIRE_COND_LIST_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList expireCondList_;
+    /**
+     * <pre>
+     * 1
+     * </pre>
+     *
+     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * @return A list containing the expireCondList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getLJLDCLMAMNLList() {
-      return lJLDCLMAMNL_;
+        getExpireCondListList() {
+      return expireCondList_;
     }
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-     * @return The count of lJLDCLMAMNL.
+     * <pre>
+     * 1
+     * </pre>
+     *
+     * <code>repeated uint32 expire_cond_list = 11;</code>
+     * @return The count of expireCondList.
      */
-    public int getLJLDCLMAMNLCount() {
-      return lJLDCLMAMNL_.size();
+    public int getExpireCondListCount() {
+      return expireCondList_.size();
     }
     /**
-     * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
+     * <pre>
+     * 1
+     * </pre>
+     *
+     * <code>repeated uint32 expire_cond_list = 11;</code>
      * @param index The index of the element to return.
-     * @return The lJLDCLMAMNL at the given index.
+     * @return The expireCondList at the given index.
      */
-    public int getLJLDCLMAMNL(int index) {
-      return lJLDCLMAMNL_.getInt(index);
+    public int getExpireCondList(int index) {
+      return expireCondList_.getInt(index);
     }
-    private int lJLDCLMAMNLMemoizedSerializedSize = -1;
+    private int expireCondListMemoizedSerializedSize = -1;
 
-    public static final int PJJKJGALLGD_FIELD_NUMBER = 16;
-    private boolean pJJKJGALLGD_;
-    /**
-     * <code>bool PJJKJGALLGD = 16;</code>
-     * @return The pJJKJGALLGD.
-     */
-    @java.lang.Override
-    public boolean getPJJKJGALLGD() {
-      return pJJKJGALLGD_;
-    }
-
-    public static final int ACTIVITY_TYPE_FIELD_NUMBER = 1;
-    private int activityType_;
-    /**
-     * <code>uint32 activity_type = 1;</code>
-     * @return The activityType.
-     */
-    @java.lang.Override
-    public int getActivityType() {
-      return activityType_;
-    }
-
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 5;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 12;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 5;</code>
+     * <code>uint32 schedule_id = 12;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -3462,7 +975,274 @@ public final class ActivityInfoOuterClass {
       return scheduleId_;
     }
 
-    public static final int ACTIVITY_COIN_MAP_FIELD_NUMBER = 1562;
+    public static final int ONCLIGBKLPF_FIELD_NUMBER = 13;
+    private boolean oNCLIGBKLPF_;
+    /**
+     * <code>bool ONCLIGBKLPF = 13;</code>
+     * @return The oNCLIGBKLPF.
+     */
+    @java.lang.Override
+    public boolean getONCLIGBKLPF() {
+      return oNCLIGBKLPF_;
+    }
+
+    public static final int ACTIVITY_TYPE_FIELD_NUMBER = 14;
+    private int activityType_;
+    /**
+     * <code>uint32 activity_type = 14;</code>
+     * @return The activityType.
+     */
+    @java.lang.Override
+    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_;
+    /**
+     * <code>uint32 cur_score = 63;</code>
+     * @return The curScore.
+     */
+    @java.lang.Override
+    public int getCurScore() {
+      return curScore_;
+    }
+
+    public static final int FFGHMFNFPNL_FIELD_NUMBER = 253;
+    private int fFGHMFNFPNL_;
+    /**
+     * <code>uint32 FFGHMFNFPNL = 253;</code>
+     * @return The fFGHMFNFPNL.
+     */
+    @java.lang.Override
+    public int getFFGHMFNFPNL() {
+      return fFGHMFNFPNL_;
+    }
+
+    public static final int FIRST_DAY_START_TIME_FIELD_NUMBER = 373;
+    private int firstDayStartTime_;
+    /**
+     * <code>uint32 first_day_start_time = 373;</code>
+     * @return The firstDayStartTime.
+     */
+    @java.lang.Override
+    public int getFirstDayStartTime() {
+      return firstDayStartTime_;
+    }
+
+    public static final int LKODGHFICBH_FIELD_NUMBER = 426;
+    private int lKODGHFICBH_;
+    /**
+     * <code>uint32 LKODGHFICBH = 426;</code>
+     * @return The lKODGHFICBH.
+     */
+    @java.lang.Override
+    public int getLKODGHFICBH() {
+      return lKODGHFICBH_;
+    }
+
+    public static final int CDBIIEIPBFF_FIELD_NUMBER = 509;
+    private boolean cDBIIEIPBFF_;
+    /**
+     * <code>bool CDBIIEIPBFF = 509;</code>
+     * @return The cDBIIEIPBFF.
+     */
+    @java.lang.Override
+    public boolean getCDBIIEIPBFF() {
+      return cDBIIEIPBFF_;
+    }
+
+    public static final int LCHFFKHPJIO_FIELD_NUMBER = 678;
+    private boolean lCHFFKHPJIO_;
+    /**
+     * <code>bool LCHFFKHPJIO = 678;</code>
+     * @return The lCHFFKHPJIO.
+     */
+    @java.lang.Override
+    public boolean getLCHFFKHPJIO() {
+      return lCHFFKHPJIO_;
+    }
+
+    public static final int ILKPGDKEIEG_FIELD_NUMBER = 739;
+    private boolean iLKPGDKEIEG_;
+    /**
+     * <code>bool ILKPGDKEIEG = 739;</code>
+     * @return The iLKPGDKEIEG.
+     */
+    @java.lang.Override
+    public boolean getILKPGDKEIEG() {
+      return iLKPGDKEIEG_;
+    }
+
+    public static final int TAKEN_REWARD_LIST_FIELD_NUMBER = 818;
+    private com.google.protobuf.Internal.IntList takenRewardList_;
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @return A list containing the takenRewardList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getTakenRewardListList() {
+      return takenRewardList_;
+    }
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @return The count of takenRewardList.
+     */
+    public int getTakenRewardListCount() {
+      return takenRewardList_.size();
+    }
+    /**
+     * <code>repeated uint32 taken_reward_list = 818;</code>
+     * @param index The index of the element to return.
+     * @return The takenRewardList at the given index.
+     */
+    public int getTakenRewardList(int index) {
+      return takenRewardList_.getInt(index);
+    }
+    private int takenRewardListMemoizedSerializedSize = -1;
+
+    public static final int CIDDJFNIMPJ_FIELD_NUMBER = 892;
+    private long cIDDJFNIMPJ_;
+    /**
+     * <code>uint64 CIDDJFNIMPJ = 892;</code>
+     * @return The cIDDJFNIMPJ.
+     */
+    @java.lang.Override
+    public long getCIDDJFNIMPJ() {
+      return cIDDJFNIMPJ_;
+    }
+
+    public static final int ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER = 983;
+    private java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> activityPushTipsDataList_;
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> getActivityPushTipsDataListList() {
+      return activityPushTipsDataList_;
+    }
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
+        getActivityPushTipsDataListOrBuilderList() {
+      return activityPushTipsDataList_;
+    }
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    @java.lang.Override
+    public int getActivityPushTipsDataListCount() {
+      return activityPushTipsDataList_.size();
+    }
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index) {
+      return activityPushTipsDataList_.get(index);
+    }
+    /**
+     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
+        int index) {
+      return activityPushTipsDataList_.get(index);
+    }
+
+    public static final int MPPFCLCENAP_FIELD_NUMBER = 1040;
+    private int mPPFCLCENAP_;
+    /**
+     * <code>uint32 MPPFCLCENAP = 1040;</code>
+     * @return The mPPFCLCENAP.
+     */
+    @java.lang.Override
+    public int getMPPFCLCENAP() {
+      return mPPFCLCENAP_;
+    }
+
+    public static final int GONEPFEDMEL_FIELD_NUMBER = 1246;
+    private com.google.protobuf.Internal.LongList gONEPFEDMEL_;
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @return A list containing the gONEPFEDMEL.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getGONEPFEDMELList() {
+      return gONEPFEDMEL_;
+    }
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @return The count of gONEPFEDMEL.
+     */
+    public int getGONEPFEDMELCount() {
+      return gONEPFEDMEL_.size();
+    }
+    /**
+     * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+     * @param index The index of the element to return.
+     * @return The gONEPFEDMEL at the given index.
+     */
+    public long getGONEPFEDMEL(int index) {
+      return gONEPFEDMEL_.getLong(index);
+    }
+    private int gONEPFEDMELMemoizedSerializedSize = -1;
+
+    public static final int NJCGNGLKPBJ_FIELD_NUMBER = 1267;
+    private com.google.protobuf.Internal.IntList nJCGNGLKPBJ_;
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @return A list containing the nJCGNGLKPBJ.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getNJCGNGLKPBJList() {
+      return nJCGNGLKPBJ_;
+    }
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @return The count of nJCGNGLKPBJ.
+     */
+    public int getNJCGNGLKPBJCount() {
+      return nJCGNGLKPBJ_.size();
+    }
+    /**
+     * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+     * @param index The index of the element to return.
+     * @return The nJCGNGLKPBJ at the given index.
+     */
+    public int getNJCGNGLKPBJ(int index) {
+      return nJCGNGLKPBJ_.getInt(index);
+    }
+    private int nJCGNGLKPBJMemoizedSerializedSize = -1;
+
+    public static final int ODMJHPBFIKO_FIELD_NUMBER = 1408;
+    private boolean oDMJHPBFIKO_;
+    /**
+     * <code>bool ODMJHPBFIKO = 1408;</code>
+     * @return The oDMJHPBFIKO.
+     */
+    @java.lang.Override
+    public boolean getODMJHPBFIKO() {
+      return oDMJHPBFIKO_;
+    }
+
+    public static final int ACTIVITY_COIN_MAP_FIELD_NUMBER = 1791;
     private static final class ActivityCoinMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -3489,7 +1269,7 @@ public final class ActivityInfoOuterClass {
       return internalGetActivityCoinMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
 
     @java.lang.Override
@@ -3507,7 +1287,7 @@ public final class ActivityInfoOuterClass {
       return getActivityCoinMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     @java.lang.Override
 
@@ -3515,7 +1295,7 @@ public final class ActivityInfoOuterClass {
       return internalGetActivityCoinMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     @java.lang.Override
 
@@ -3528,7 +1308,7 @@ public final class ActivityInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+     * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
      */
     @java.lang.Override
 
@@ -3543,167 +1323,7 @@ public final class ActivityInfoOuterClass {
       return map.get(key);
     }
 
-    public static final int MEET_COND_LIST_FIELD_NUMBER = 12;
-    private com.google.protobuf.Internal.IntList meetCondList_;
-    /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return A list containing the meetCondList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getMeetCondListList() {
-      return meetCondList_;
-    }
-    /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @return The count of meetCondList.
-     */
-    public int getMeetCondListCount() {
-      return meetCondList_.size();
-    }
-    /**
-     * <code>repeated uint32 meet_cond_list = 12;</code>
-     * @param index The index of the element to return.
-     * @return The meetCondList at the given index.
-     */
-    public int getMeetCondList(int index) {
-      return meetCondList_.getInt(index);
-    }
-    private int meetCondListMemoizedSerializedSize = -1;
-
-    public static final int DKJDABCNGBP_FIELD_NUMBER = 13;
-    private boolean dKJDABCNGBP_;
-    /**
-     * <code>bool DKJDABCNGBP = 13;</code>
-     * @return The dKJDABCNGBP.
-     */
-    @java.lang.Override
-    public boolean getDKJDABCNGBP() {
-      return dKJDABCNGBP_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 2;
-    private int beginTime_;
-    /**
-     * <code>uint32 begin_time = 2;</code>
-     * @return The beginTime.
-     */
-    @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
-    }
-
-    public static final int INGFNLLCDOL_FIELD_NUMBER = 733;
-    private int iNGFNLLCDOL_;
-    /**
-     * <code>uint32 INGFNLLCDOL = 733;</code>
-     * @return The iNGFNLLCDOL.
-     */
-    @java.lang.Override
-    public int getINGFNLLCDOL() {
-      return iNGFNLLCDOL_;
-    }
-
-    public static final int ENNDKMJIMHN_FIELD_NUMBER = 15;
-    private boolean eNNDKMJIMHN_;
-    /**
-     * <code>bool ENNDKMJIMHN = 15;</code>
-     * @return The eNNDKMJIMHN.
-     */
-    @java.lang.Override
-    public boolean getENNDKMJIMHN() {
-      return eNNDKMJIMHN_;
-    }
-
-    public static final int CUR_SCORE_FIELD_NUMBER = 1555;
-    private int curScore_;
-    /**
-     * <code>uint32 cur_score = 1555;</code>
-     * @return The curScore.
-     */
-    @java.lang.Override
-    public int getCurScore() {
-      return curScore_;
-    }
-
-    public static final int BKJNDLLNAML_FIELD_NUMBER = 1818;
-    private boolean bKJNDLLNAML_;
-    /**
-     * <code>bool BKJNDLLNAML = 1818;</code>
-     * @return The bKJNDLLNAML.
-     */
-    @java.lang.Override
-    public boolean getBKJNDLLNAML() {
-      return bKJNDLLNAML_;
-    }
-
-    public static final int FIRST_DAY_START_TIME_FIELD_NUMBER = 978;
-    private int firstDayStartTime_;
-    /**
-     * <code>uint32 first_day_start_time = 978;</code>
-     * @return The firstDayStartTime.
-     */
-    @java.lang.Override
-    public int getFirstDayStartTime() {
-      return firstDayStartTime_;
-    }
-
-    public static final int ABMOPKOIMPA_FIELD_NUMBER = 525;
-    private boolean aBMOPKOIMPA_;
-    /**
-     * <code>bool ABMOPKOIMPA = 525;</code>
-     * @return The aBMOPKOIMPA.
-     */
-    @java.lang.Override
-    public boolean getABMOPKOIMPA() {
-      return aBMOPKOIMPA_;
-    }
-
-    public static final int FGFGECAAKJM_FIELD_NUMBER = 1703;
-    private int fGFGECAAKJM_;
-    /**
-     * <code>uint32 FGFGECAAKJM = 1703;</code>
-     * @return The fGFGECAAKJM.
-     */
-    @java.lang.Override
-    public int getFGFGECAAKJM() {
-      return fGFGECAAKJM_;
-    }
-
-    public static final int GFEMIEBKKKL_FIELD_NUMBER = 1117;
-    private boolean gFEMIEBKKKL_;
-    /**
-     * <code>bool GFEMIEBKKKL = 1117;</code>
-     * @return The gFEMIEBKKKL.
-     */
-    @java.lang.Override
-    public boolean getGFEMIEBKKKL() {
-      return gFEMIEBKKKL_;
-    }
-
-    public static final int CEFIPNKPEKA_FIELD_NUMBER = 621;
-    private int cEFIPNKPEKA_;
-    /**
-     * <code>uint32 CEFIPNKPEKA = 621;</code>
-     * @return The cEFIPNKPEKA.
-     */
-    @java.lang.Override
-    public int getCEFIPNKPEKA() {
-      return cEFIPNKPEKA_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 11;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 11;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int WISH_GIFT_NUM_MAP_FIELD_NUMBER = 924;
+    public static final int WISH_GIFT_NUM_MAP_FIELD_NUMBER = 1954;
     private static final class WishGiftNumMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -3730,7 +1350,11 @@ public final class ActivityInfoOuterClass {
       return internalGetWishGiftNumMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
 
     @java.lang.Override
@@ -3748,7 +1372,11 @@ public final class ActivityInfoOuterClass {
       return getWishGiftNumMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     @java.lang.Override
 
@@ -3756,7 +1384,11 @@ public final class ActivityInfoOuterClass {
       return internalGetWishGiftNumMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     @java.lang.Override
 
@@ -3769,7 +1401,11 @@ public final class ActivityInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+     * <pre>
+     *CFKJEDGPNAE OKBINABFBKP = 1839;
+     * </pre>
+     *
+     * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
      */
     @java.lang.Override
 
@@ -3784,2709 +1420,37 @@ public final class ActivityInfoOuterClass {
       return map.get(key);
     }
 
-    public static final int PHCOMIFAIJD_FIELD_NUMBER = 4;
-    private com.google.protobuf.Internal.IntList pHCOMIFAIJD_;
+    public static final int MUSIC_GAME_INFO_FIELD_NUMBER = 1099;
     /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return A list containing the pHCOMIFAIJD.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getPHCOMIFAIJDList() {
-      return pHCOMIFAIJD_;
-    }
-    /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @return The count of pHCOMIFAIJD.
-     */
-    public int getPHCOMIFAIJDCount() {
-      return pHCOMIFAIJD_.size();
-    }
-    /**
-     * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-     * @param index The index of the element to return.
-     * @return The pHCOMIFAIJD at the given index.
-     */
-    public int getPHCOMIFAIJD(int index) {
-      return pHCOMIFAIJD_.getInt(index);
-    }
-    private int pHCOMIFAIJDMemoizedSerializedSize = -1;
-
-    public static final int ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER = 643;
-    private java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> activityPushTipsDataList_;
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> getActivityPushTipsDataListList() {
-      return activityPushTipsDataList_;
-    }
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
-        getActivityPushTipsDataListOrBuilderList() {
-      return activityPushTipsDataList_;
-    }
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    @java.lang.Override
-    public int getActivityPushTipsDataListCount() {
-      return activityPushTipsDataList_.size();
-    }
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index) {
-      return activityPushTipsDataList_.get(index);
-    }
-    /**
-     * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
-        int index) {
-      return activityPushTipsDataList_.get(index);
-    }
-
-    public static final int SAM_LAMP_INFO_FIELD_NUMBER = 10;
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     * @return Whether the samLampInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSamLampInfo() {
-      return detailCase_ == 10;
-    }
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     * @return The samLampInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo getSamLampInfo() {
-      if (detailCase_ == 10) {
-         return (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder getSamLampInfoOrBuilder() {
-      if (detailCase_ == 10) {
-         return (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int CRUCIBLE_INFO_FIELD_NUMBER = 7;
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     * @return Whether the crucibleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCrucibleInfo() {
-      return detailCase_ == 7;
-    }
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     * @return The crucibleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo getCrucibleInfo() {
-      if (detailCase_ == 7) {
-         return (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder getCrucibleInfoOrBuilder() {
-      if (detailCase_ == 7) {
-         return (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SALESMAN_INFO_FIELD_NUMBER = 8;
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     * @return Whether the salesmanInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSalesmanInfo() {
-      return detailCase_ == 8;
-    }
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     * @return The salesmanInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo getSalesmanInfo() {
-      if (detailCase_ == 8) {
-         return (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder getSalesmanInfoOrBuilder() {
-      if (detailCase_ == 8) {
-         return (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int TRIAL_AVATAR_INFO_FIELD_NUMBER = 6;
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     * @return Whether the trialAvatarInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTrialAvatarInfo() {
-      return detailCase_ == 6;
-    }
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     * @return The trialAvatarInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo getTrialAvatarInfo() {
-      if (detailCase_ == 6) {
-         return (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder getTrialAvatarInfoOrBuilder() {
-      if (detailCase_ == 6) {
-         return (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int DELIVERY_INFO_FIELD_NUMBER = 1846;
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     * @return Whether the deliveryInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasDeliveryInfo() {
-      return detailCase_ == 1846;
-    }
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     * @return The deliveryInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo getDeliveryInfo() {
-      if (detailCase_ == 1846) {
-         return (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder getDeliveryInfoOrBuilder() {
-      if (detailCase_ == 1846) {
-         return (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ASTER_INFO_FIELD_NUMBER = 260;
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     * @return Whether the asterInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAsterInfo() {
-      return detailCase_ == 260;
-    }
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     * @return The asterInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo getAsterInfo() {
-      if (detailCase_ == 260) {
-         return (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder getAsterInfoOrBuilder() {
-      if (detailCase_ == 260) {
-         return (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int FLIGHT_INFO_FIELD_NUMBER = 826;
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     * @return Whether the flightInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFlightInfo() {
-      return detailCase_ == 826;
-    }
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     * @return The flightInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo getFlightInfo() {
-      if (detailCase_ == 826) {
-         return (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder getFlightInfoOrBuilder() {
-      if (detailCase_ == 826) {
-         return (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int DRAGON_SPINE_INFO_FIELD_NUMBER = 110;
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     * @return Whether the dragonSpineInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasDragonSpineInfo() {
-      return detailCase_ == 110;
-    }
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     * @return The dragonSpineInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo getDragonSpineInfo() {
-      if (detailCase_ == 110) {
-         return (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder getDragonSpineInfoOrBuilder() {
-      if (detailCase_ == 110) {
-         return (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int EFFIGY_INFO_FIELD_NUMBER = 1010;
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     * @return Whether the effigyInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyInfo() {
-      return detailCase_ == 1010;
-    }
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     * @return The effigyInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo getEffigyInfo() {
-      if (detailCase_ == 1010) {
-         return (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder getEffigyInfoOrBuilder() {
-      if (detailCase_ == 1010) {
-         return (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int TREASURE_MAP_INFO_FIELD_NUMBER = 1754;
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     * @return Whether the treasureMapInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTreasureMapInfo() {
-      return detailCase_ == 1754;
-    }
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     * @return The treasureMapInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo getTreasureMapInfo() {
-      if (detailCase_ == 1754) {
-         return (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder getTreasureMapInfoOrBuilder() {
-      if (detailCase_ == 1754) {
-         return (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BLESSING_INFO_FIELD_NUMBER = 331;
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     * @return Whether the blessingInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBlessingInfo() {
-      return detailCase_ == 331;
-    }
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     * @return The blessingInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo getBlessingInfo() {
-      if (detailCase_ == 331) {
-         return (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder getBlessingInfoOrBuilder() {
-      if (detailCase_ == 331) {
-         return (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SEA_LAMP_INFO_FIELD_NUMBER = 1114;
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     * @return Whether the seaLampInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSeaLampInfo() {
-      return detailCase_ == 1114;
-    }
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     * @return The seaLampInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo getSeaLampInfo() {
-      if (detailCase_ == 1114) {
-         return (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder getSeaLampInfoOrBuilder() {
-      if (detailCase_ == 1114) {
-         return (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-    }
-
-    public static final int EXPEDITION_INFO_FIELD_NUMBER = 674;
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     * @return Whether the expeditionInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasExpeditionInfo() {
-      return detailCase_ == 674;
-    }
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     * @return The expeditionInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo getExpeditionInfo() {
-      if (detailCase_ == 674) {
-         return (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder getExpeditionInfoOrBuilder() {
-      if (detailCase_ == 674) {
-         return (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ARENA_CHALLENGE_INFO_FIELD_NUMBER = 39;
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     * @return Whether the arenaChallengeInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasArenaChallengeInfo() {
-      return detailCase_ == 39;
-    }
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     * @return The arenaChallengeInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo getArenaChallengeInfo() {
-      if (detailCase_ == 39) {
-         return (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder getArenaChallengeInfoOrBuilder() {
-      if (detailCase_ == 39) {
-         return (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int FLEUR_FAIR_INFO_FIELD_NUMBER = 293;
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     * @return Whether the fleurFairInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFleurFairInfo() {
-      return detailCase_ == 293;
-    }
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     * @return The fleurFairInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo getFleurFairInfo() {
-      if (detailCase_ == 293) {
-         return (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder getFleurFairInfoOrBuilder() {
-      if (detailCase_ == 293) {
-         return (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int WATER_SPIRIT_INFO_FIELD_NUMBER = 1997;
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     * @return Whether the waterSpiritInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWaterSpiritInfo() {
-      return detailCase_ == 1997;
-    }
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     * @return The waterSpiritInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo getWaterSpiritInfo() {
-      if (detailCase_ == 1997) {
-         return (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder getWaterSpiritInfoOrBuilder() {
-      if (detailCase_ == 1997) {
-         return (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int CHALLNELER_SLAB_INFO_FIELD_NUMBER = 1757;
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     * @return Whether the challnelerSlabInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasChallnelerSlabInfo() {
-      return detailCase_ == 1757;
-    }
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     * @return The challnelerSlabInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo getChallnelerSlabInfo() {
-      if (detailCase_ == 1757) {
-         return (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder getChallnelerSlabInfoOrBuilder() {
-      if (detailCase_ == 1757) {
-         return (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int MIST_TRIAL_ACTIVITY_INFO_FIELD_NUMBER = 1622;
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     * @return Whether the mistTrialActivityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMistTrialActivityInfo() {
-      return detailCase_ == 1622;
-    }
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     * @return The mistTrialActivityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo getMistTrialActivityInfo() {
-      if (detailCase_ == 1622) {
-         return (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder getMistTrialActivityInfoOrBuilder() {
-      if (detailCase_ == 1622) {
-         return (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int HIDE_AND_SEEK_INFO_FIELD_NUMBER = 1747;
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     * @return Whether the hideAndSeekInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasHideAndSeekInfo() {
-      return detailCase_ == 1747;
-    }
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     * @return The hideAndSeekInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo getHideAndSeekInfo() {
-      if (detailCase_ == 1747) {
-         return (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder getHideAndSeekInfoOrBuilder() {
-      if (detailCase_ == 1747) {
-         return (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int FIND_HILICHURL_INFO_FIELD_NUMBER = 1284;
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     * @return Whether the findHilichurlInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFindHilichurlInfo() {
-      return detailCase_ == 1284;
-    }
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     * @return The findHilichurlInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo getFindHilichurlInfo() {
-      if (detailCase_ == 1284) {
-         return (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder getFindHilichurlInfoOrBuilder() {
-      if (detailCase_ == 1284) {
-         return (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SUMMER_TIME_INFO_FIELD_NUMBER = 950;
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     * @return Whether the summerTimeInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSummerTimeInfo() {
-      return detailCase_ == 950;
-    }
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     * @return The summerTimeInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo getSummerTimeInfo() {
-      if (detailCase_ == 950) {
-         return (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder getSummerTimeInfoOrBuilder() {
-      if (detailCase_ == 950) {
-         return (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BUOYANT_COMBAT_INFO_FIELD_NUMBER = 519;
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     * @return Whether the buoyantCombatInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBuoyantCombatInfo() {
-      return detailCase_ == 519;
-    }
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     * @return The buoyantCombatInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo getBuoyantCombatInfo() {
-      if (detailCase_ == 519) {
-         return (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder getBuoyantCombatInfoOrBuilder() {
-      if (detailCase_ == 519) {
-         return (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ECHO_SHELL_INFO_FIELD_NUMBER = 305;
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     * @return Whether the echoShellInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEchoShellInfo() {
-      return detailCase_ == 305;
-    }
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     * @return The echoShellInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo getEchoShellInfo() {
-      if (detailCase_ == 305) {
-         return (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder getEchoShellInfoOrBuilder() {
-      if (detailCase_ == 305) {
-         return (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BOUNCE_CONJURING_INFO_FIELD_NUMBER = 1864;
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     * @return Whether the bounceConjuringInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBounceConjuringInfo() {
-      return detailCase_ == 1864;
-    }
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     * @return The bounceConjuringInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo getBounceConjuringInfo() {
-      if (detailCase_ == 1864) {
-         return (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder getBounceConjuringInfoOrBuilder() {
-      if (detailCase_ == 1864) {
-         return (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BLITZ_RUSH_INFO_FIELD_NUMBER = 915;
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     * @return Whether the blitzRushInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBlitzRushInfo() {
-      return detailCase_ == 915;
-    }
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     * @return The blitzRushInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo getBlitzRushInfo() {
-      if (detailCase_ == 915) {
-         return (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder getBlitzRushInfoOrBuilder() {
-      if (detailCase_ == 915) {
-         return (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int CHESS_INFO_FIELD_NUMBER = 1087;
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     * @return Whether the chessInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasChessInfo() {
-      return detailCase_ == 1087;
-    }
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     * @return The chessInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo getChessInfo() {
-      if (detailCase_ == 1087) {
-         return (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder getChessInfoOrBuilder() {
-      if (detailCase_ == 1087) {
-         return (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SUMO_INFO_FIELD_NUMBER = 2008;
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     * @return Whether the sumoInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSumoInfo() {
-      return detailCase_ == 2008;
-    }
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     * @return The sumoInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo getSumoInfo() {
-      if (detailCase_ == 2008) {
-         return (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder getSumoInfoOrBuilder() {
-      if (detailCase_ == 2008) {
-         return (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int MOONFIN_TRIAL_INFO_FIELD_NUMBER = 389;
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     * @return Whether the moonfinTrialInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMoonfinTrialInfo() {
-      return detailCase_ == 389;
-    }
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     * @return The moonfinTrialInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo getMoonfinTrialInfo() {
-      if (detailCase_ == 389) {
-         return (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder getMoonfinTrialInfoOrBuilder() {
-      if (detailCase_ == 389) {
-         return (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int LUNA_RITE_INFO_FIELD_NUMBER = 1971;
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     * @return Whether the lunaRiteInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasLunaRiteInfo() {
-      return detailCase_ == 1971;
-    }
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     * @return The lunaRiteInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo getLunaRiteInfo() {
-      if (detailCase_ == 1971) {
-         return (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder getLunaRiteInfoOrBuilder() {
-      if (detailCase_ == 1971) {
-         return (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-    }
-
-    public static final int PLANT_FLOWER_INFO_FIELD_NUMBER = 1854;
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     * @return Whether the plantFlowerInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPlantFlowerInfo() {
-      return detailCase_ == 1854;
-    }
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     * @return The plantFlowerInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo getPlantFlowerInfo() {
-      if (detailCase_ == 1854) {
-         return (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder getPlantFlowerInfoOrBuilder() {
-      if (detailCase_ == 1854) {
-         return (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int MUSIC_GAME_INFO_FIELD_NUMBER = 1847;
-    /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      * @return Whether the musicGameInfo field is set.
      */
     @java.lang.Override
     public boolean hasMusicGameInfo() {
-      return detailCase_ == 1847;
+      return detailCase_ == 1099;
     }
     /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      * @return The musicGameInfo.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo getMusicGameInfo() {
-      if (detailCase_ == 1847) {
+      if (detailCase_ == 1099) {
          return (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_;
       }
       return emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
     }
     /**
-     * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+     * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfoOrBuilder getMusicGameInfoOrBuilder() {
-      if (detailCase_ == 1847) {
+      if (detailCase_ == 1099) {
          return (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_;
       }
       return emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
     }
 
-    public static final int ROGUELIKE_DUNGOEN_INFO_FIELD_NUMBER = 1025;
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     * @return Whether the roguelikeDungoenInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRoguelikeDungoenInfo() {
-      return detailCase_ == 1025;
-    }
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     * @return The roguelikeDungoenInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo getRoguelikeDungoenInfo() {
-      if (detailCase_ == 1025) {
-         return (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder getRoguelikeDungoenInfoOrBuilder() {
-      if (detailCase_ == 1025) {
-         return (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int DIG_INFO_FIELD_NUMBER = 1855;
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     * @return Whether the digInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasDigInfo() {
-      return detailCase_ == 1855;
-    }
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     * @return The digInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo getDigInfo() {
-      if (detailCase_ == 1855) {
-         return (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder getDigInfoOrBuilder() {
-      if (detailCase_ == 1855) {
-         return (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int HACHI_INFO_FIELD_NUMBER = 1176;
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     * @return Whether the hachiInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasHachiInfo() {
-      return detailCase_ == 1176;
-    }
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     * @return The hachiInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo getHachiInfo() {
-      if (detailCase_ == 1176) {
-         return (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder getHachiInfoOrBuilder() {
-      if (detailCase_ == 1176) {
-         return (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int WINTER_CAMP_INFO_FIELD_NUMBER = 2014;
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     * @return Whether the winterCampInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWinterCampInfo() {
-      return detailCase_ == 2014;
-    }
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     * @return The winterCampInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo getWinterCampInfo() {
-      if (detailCase_ == 2014) {
-         return (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder getWinterCampInfoOrBuilder() {
-      if (detailCase_ == 2014) {
-         return (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int POTION_INFO_FIELD_NUMBER = 1485;
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     * @return Whether the potionInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPotionInfo() {
-      return detailCase_ == 1485;
-    }
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     * @return The potionInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo getPotionInfo() {
-      if (detailCase_ == 1485) {
-         return (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder getPotionInfoOrBuilder() {
-      if (detailCase_ == 1485) {
-         return (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int TANUKI_TRAVEL_ACTIVITY_INFO_FIELD_NUMBER = 944;
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     * @return Whether the tanukiTravelActivityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTanukiTravelActivityInfo() {
-      return detailCase_ == 944;
-    }
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     * @return The tanukiTravelActivityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo getTanukiTravelActivityInfo() {
-      if (detailCase_ == 944) {
-         return (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder getTanukiTravelActivityInfoOrBuilder() {
-      if (detailCase_ == 944) {
-         return (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int LANTERN_RITE_ACTIVITY_INFO_FIELD_NUMBER = 1980;
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     * @return Whether the lanternRiteActivityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasLanternRiteActivityInfo() {
-      return detailCase_ == 1980;
-    }
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     * @return The lanternRiteActivityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo getLanternRiteActivityInfo() {
-      if (detailCase_ == 1980) {
-         return (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder getLanternRiteActivityInfoOrBuilder() {
-      if (detailCase_ == 1980) {
-         return (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int MICHIAE_MATSURI_INFO_FIELD_NUMBER = 114;
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     * @return Whether the michiaeMatsuriInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMichiaeMatsuriInfo() {
-      return detailCase_ == 114;
-    }
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     * @return The michiaeMatsuriInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo getMichiaeMatsuriInfo() {
-      if (detailCase_ == 114) {
-         return (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder getMichiaeMatsuriInfoOrBuilder() {
-      if (detailCase_ == 114) {
-         return (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BARTENDER_INFO_FIELD_NUMBER = 1441;
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     * @return Whether the bartenderInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBartenderInfo() {
-      return detailCase_ == 1441;
-    }
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     * @return The bartenderInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo getBartenderInfo() {
-      if (detailCase_ == 1441) {
-         return (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder getBartenderInfoOrBuilder() {
-      if (detailCase_ == 1441) {
-         return (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int UGC_INFO_FIELD_NUMBER = 1795;
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     * @return Whether the ugcInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasUgcInfo() {
-      return detailCase_ == 1795;
-    }
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     * @return The ugcInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo getUgcInfo() {
-      if (detailCase_ == 1795) {
-         return (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder getUgcInfoOrBuilder() {
-      if (detailCase_ == 1795) {
-         return (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int CRYSTAL_LINK_INFO_FIELD_NUMBER = 1301;
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     * @return Whether the crystalLinkInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCrystalLinkInfo() {
-      return detailCase_ == 1301;
-    }
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     * @return The crystalLinkInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo getCrystalLinkInfo() {
-      if (detailCase_ == 1301) {
-         return (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder getCrystalLinkInfoOrBuilder() {
-      if (detailCase_ == 1301) {
-         return (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int IRODORI_INFO_FIELD_NUMBER = 54;
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     * @return Whether the irodoriInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasIrodoriInfo() {
-      return detailCase_ == 54;
-    }
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     * @return The irodoriInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo getIrodoriInfo() {
-      if (detailCase_ == 54) {
-         return (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder getIrodoriInfoOrBuilder() {
-      if (detailCase_ == 54) {
-         return (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int PHOTO_INFO_FIELD_NUMBER = 1492;
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     * @return Whether the photoInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPhotoInfo() {
-      return detailCase_ == 1492;
-    }
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     * @return The photoInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo getPhotoInfo() {
-      if (detailCase_ == 1492) {
-         return (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder getPhotoInfoOrBuilder() {
-      if (detailCase_ == 1492) {
-         return (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SPICE_INFO_FIELD_NUMBER = 446;
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     * @return Whether the spiceInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSpiceInfo() {
-      return detailCase_ == 446;
-    }
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     * @return The spiceInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo getSpiceInfo() {
-      if (detailCase_ == 446) {
-         return (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder getSpiceInfoOrBuilder() {
-      if (detailCase_ == 446) {
-         return (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int GACHA_INFO_FIELD_NUMBER = 1192;
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     * @return Whether the gachaInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGachaInfo() {
-      return detailCase_ == 1192;
-    }
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     * @return The gachaInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo getGachaInfo() {
-      if (detailCase_ == 1192) {
-         return (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder getGachaInfoOrBuilder() {
-      if (detailCase_ == 1192) {
-         return (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int LUMINANCE_STONE_CHALLENGE_INFO_FIELD_NUMBER = 38;
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     * @return Whether the luminanceStoneChallengeInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasLuminanceStoneChallengeInfo() {
-      return detailCase_ == 38;
-    }
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     * @return The luminanceStoneChallengeInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo getLuminanceStoneChallengeInfo() {
-      if (detailCase_ == 38) {
-         return (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder getLuminanceStoneChallengeInfoOrBuilder() {
-      if (detailCase_ == 38) {
-         return (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ROGUE_DIARY_INFO_FIELD_NUMBER = 427;
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     * @return Whether the rogueDiaryInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRogueDiaryInfo() {
-      return detailCase_ == 427;
-    }
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     * @return The rogueDiaryInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo getRogueDiaryInfo() {
-      if (detailCase_ == 427) {
-         return (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder getRogueDiaryInfoOrBuilder() {
-      if (detailCase_ == 427) {
-         return (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SUMMER_TIME_V2_INFO_FIELD_NUMBER = 910;
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     * @return Whether the summerTimeV2Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasSummerTimeV2Info() {
-      return detailCase_ == 910;
-    }
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     * @return The summerTimeV2Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo getSummerTimeV2Info() {
-      if (detailCase_ == 910) {
-         return (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder getSummerTimeV2InfoOrBuilder() {
-      if (detailCase_ == 910) {
-         return (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-    }
-
-    public static final int ISLAND_PARTY_INFO_FIELD_NUMBER = 1044;
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     * @return Whether the islandPartyInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasIslandPartyInfo() {
-      return detailCase_ == 1044;
-    }
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     * @return The islandPartyInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo getIslandPartyInfo() {
-      if (detailCase_ == 1044) {
-         return (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder getIslandPartyInfoOrBuilder() {
-      if (detailCase_ == 1044) {
-         return (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-    }
-
-    public static final int GEAR_INFO_FIELD_NUMBER = 1263;
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     * @return Whether the gearInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGearInfo() {
-      return detailCase_ == 1263;
-    }
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     * @return The gearInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo getGearInfo() {
-      if (detailCase_ == 1263) {
-         return (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder getGearInfoOrBuilder() {
-      if (detailCase_ == 1263) {
-         return (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int GRAVEN_INNOCENCE_INFO_FIELD_NUMBER = 356;
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     * @return Whether the gravenInnocenceInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGravenInnocenceInfo() {
-      return detailCase_ == 356;
-    }
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     * @return The gravenInnocenceInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo getGravenInnocenceInfo() {
-      if (detailCase_ == 356) {
-         return (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder getGravenInnocenceInfoOrBuilder() {
-      if (detailCase_ == 356) {
-         return (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-    }
-
-    public static final int INSTABLE_SPRAY_INFO_FIELD_NUMBER = 508;
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     * @return Whether the instableSprayInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstableSprayInfo() {
-      return detailCase_ == 508;
-    }
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     * @return The instableSprayInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo getInstableSprayInfo() {
-      if (detailCase_ == 508) {
-         return (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder getInstableSprayInfoOrBuilder() {
-      if (detailCase_ == 508) {
-         return (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-    }
-
-    public static final int MUQADAS_POTION_INFO_FIELD_NUMBER = 1474;
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     * @return Whether the muqadasPotionInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMuqadasPotionInfo() {
-      return detailCase_ == 1474;
-    }
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     * @return The muqadasPotionInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo getMuqadasPotionInfo() {
-      if (detailCase_ == 1474) {
-         return (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder getMuqadasPotionInfoOrBuilder() {
-      if (detailCase_ == 1474) {
-         return (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int TREASURE_SEELIE_INFO_FIELD_NUMBER = 1251;
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     * @return Whether the treasureSeelieInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTreasureSeelieInfo() {
-      return detailCase_ == 1251;
-    }
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     * @return The treasureSeelieInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo getTreasureSeelieInfo() {
-      if (detailCase_ == 1251) {
-         return (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder getTreasureSeelieInfoOrBuilder() {
-      if (detailCase_ == 1251) {
-         return (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ROCK_BOARD_EXPLORE_INFO_FIELD_NUMBER = 1028;
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     * @return Whether the rockBoardExploreInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRockBoardExploreInfo() {
-      return detailCase_ == 1028;
-    }
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     * @return The rockBoardExploreInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo getRockBoardExploreInfo() {
-      if (detailCase_ == 1028) {
-         return (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder getRockBoardExploreInfoOrBuilder() {
-      if (detailCase_ == 1028) {
-         return (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-    }
-
-    public static final int VINTAGE_INFO_FIELD_NUMBER = 1465;
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     * @return Whether the vintageInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasVintageInfo() {
-      return detailCase_ == 1465;
-    }
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     * @return The vintageInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo getVintageInfo() {
-      if (detailCase_ == 1465) {
-         return (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder getVintageInfoOrBuilder() {
-      if (detailCase_ == 1465) {
-         return (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-    }
-
-    public static final int WIND_FIELD_INFO_FIELD_NUMBER = 768;
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     * @return Whether the windFieldInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWindFieldInfo() {
-      return detailCase_ == 768;
-    }
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     * @return The windFieldInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo getWindFieldInfo() {
-      if (detailCase_ == 768) {
-         return (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder getWindFieldInfoOrBuilder() {
-      if (detailCase_ == 768) {
-         return (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-    }
-
-    public static final int FUNGUS_FIGHTER_INFO_FIELD_NUMBER = 834;
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     * @return Whether the fungusFighterInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFungusFighterInfo() {
-      return detailCase_ == 834;
-    }
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     * @return The fungusFighterInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo getFungusFighterInfo() {
-      if (detailCase_ == 834) {
-         return (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder getFungusFighterInfoOrBuilder() {
-      if (detailCase_ == 834) {
-         return (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-    }
-
-    public static final int CHAR_AMUSEMENT_INFO_FIELD_NUMBER = 1222;
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     * @return Whether the charAmusementInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCharAmusementInfo() {
-      return detailCase_ == 1222;
-    }
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     * @return The charAmusementInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo getCharAmusementInfo() {
-      if (detailCase_ == 1222) {
-         return (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder getCharAmusementInfoOrBuilder() {
-      if (detailCase_ == 1222) {
-         return (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-    }
-
-    public static final int EFFIGY_CHALLENGE_INFO_FIELD_NUMBER = 1275;
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     * @return Whether the effigyChallengeInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyChallengeInfo() {
-      return detailCase_ == 1275;
-    }
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     * @return The effigyChallengeInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo getEffigyChallengeInfo() {
-      if (detailCase_ == 1275) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder getEffigyChallengeInfoOrBuilder() {
-      if (detailCase_ == 1275) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-    }
-
-    public static final int COIN_COLLECT_INFO_FIELD_NUMBER = 839;
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     * @return Whether the coinCollectInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCoinCollectInfo() {
-      return detailCase_ == 839;
-    }
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     * @return The coinCollectInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo getCoinCollectInfo() {
-      if (detailCase_ == 839) {
-         return (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder getCoinCollectInfoOrBuilder() {
-      if (detailCase_ == 839) {
-         return (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-    }
-
-    public static final int BRICK_BREAKER_INFO_FIELD_NUMBER = 551;
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     * @return Whether the brickBreakerInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBrickBreakerInfo() {
-      return detailCase_ == 551;
-    }
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     * @return The brickBreakerInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo getBrickBreakerInfo() {
-      if (detailCase_ == 551) {
-         return (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder getBrickBreakerInfoOrBuilder() {
-      if (detailCase_ == 551) {
-         return (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-    }
-
-    public static final int DUEL_HEART_INFO_FIELD_NUMBER = 1670;
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     * @return Whether the duelHeartInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasDuelHeartInfo() {
-      return detailCase_ == 1670;
-    }
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     * @return The duelHeartInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo getDuelHeartInfo() {
-      if (detailCase_ == 1670) {
-         return (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder getDuelHeartInfoOrBuilder() {
-      if (detailCase_ == 1670) {
-         return (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SEA_LAMP_V3_INFO_FIELD_NUMBER = 833;
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     * @return Whether the seaLampV3Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasSeaLampV3Info() {
-      return detailCase_ == 833;
-    }
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     * @return The seaLampV3Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo getSeaLampV3Info() {
-      if (detailCase_ == 833) {
-         return (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder getSeaLampV3InfoOrBuilder() {
-      if (detailCase_ == 833) {
-         return (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-    }
-
-    public static final int TEAM_CHAIN_INFO_FIELD_NUMBER = 1165;
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     * @return Whether the teamChainInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTeamChainInfo() {
-      return detailCase_ == 1165;
-    }
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     * @return The teamChainInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo getTeamChainInfo() {
-      if (detailCase_ == 1165) {
-         return (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder getTeamChainInfoOrBuilder() {
-      if (detailCase_ == 1165) {
-         return (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-    }
-
-    public static final int ELECTROHERCULES_BATTLE_INFO_FIELD_NUMBER = 981;
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     * @return Whether the electroherculesBattleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasElectroherculesBattleInfo() {
-      return detailCase_ == 981;
-    }
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     * @return The electroherculesBattleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo getElectroherculesBattleInfo() {
-      if (detailCase_ == 981) {
-         return (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder getElectroherculesBattleInfoOrBuilder() {
-      if (detailCase_ == 981) {
-         return (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-    }
-
-    public static final int GCG_FESTIVAL_INFO_FIELD_NUMBER = 1664;
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     * @return Whether the gcgFestivalInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGcgFestivalInfo() {
-      return detailCase_ == 1664;
-    }
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     * @return The gcgFestivalInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo getGcgFestivalInfo() {
-      if (detailCase_ == 1664) {
-         return (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder getGcgFestivalInfoOrBuilder() {
-      if (detailCase_ == 1664) {
-         return (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-    }
-
-    public static final int FLEUR_FAIR_V2_INFO_FIELD_NUMBER = 1982;
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     * @return Whether the fleurFairV2Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasFleurFairV2Info() {
-      return detailCase_ == 1982;
-    }
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     * @return The fleurFairV2Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo getFleurFairV2Info() {
-      if (detailCase_ == 1982) {
-         return (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder getFleurFairV2InfoOrBuilder() {
-      if (detailCase_ == 1982) {
-         return (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-    }
-
-    public static final int FUNGUS_FIGHTER_V2_INFO_FIELD_NUMBER = 1541;
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     * @return Whether the fungusFighterV2Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasFungusFighterV2Info() {
-      return detailCase_ == 1541;
-    }
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     * @return The fungusFighterV2Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo getFungusFighterV2Info() {
-      if (detailCase_ == 1541) {
-         return (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder getFungusFighterV2InfoOrBuilder() {
-      if (detailCase_ == 1541) {
-         return (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-    }
-
-    public static final int AKA_FES_INFO_FIELD_NUMBER = 1524;
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     * @return Whether the akaFesInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAkaFesInfo() {
-      return detailCase_ == 1524;
-    }
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     * @return The akaFesInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo getAkaFesInfo() {
-      if (detailCase_ == 1524) {
-         return (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder getAkaFesInfoOrBuilder() {
-      if (detailCase_ == 1524) {
-         return (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SANDWORM_CANNON_DETAIL_INFO_FIELD_NUMBER = 626;
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     * @return Whether the sandwormCannonDetailInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSandwormCannonDetailInfo() {
-      return detailCase_ == 626;
-    }
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     * @return The sandwormCannonDetailInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo getSandwormCannonDetailInfo() {
-      if (detailCase_ == 626) {
-         return (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder getSandwormCannonDetailInfoOrBuilder() {
-      if (detailCase_ == 626) {
-         return (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-    }
-
-    public static final int SORUSH_TRIAL_INFO_FIELD_NUMBER = 1077;
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     * @return Whether the sorushTrialInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSorushTrialInfo() {
-      return detailCase_ == 1077;
-    }
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     * @return The sorushTrialInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo getSorushTrialInfo() {
-      if (detailCase_ == 1077) {
-         return (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder getSorushTrialInfoOrBuilder() {
-      if (detailCase_ == 1077) {
-         return (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-    }
-
-    public static final int JOURNEY_INFO_FIELD_NUMBER = 1869;
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     * @return Whether the journeyInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasJourneyInfo() {
-      return detailCase_ == 1869;
-    }
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     * @return The journeyInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo getJourneyInfo() {
-      if (detailCase_ == 1869) {
-         return (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.JourneyInfo journey_info = 1869;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder getJourneyInfoOrBuilder() {
-      if (detailCase_ == 1869) {
-         return (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-    }
-
-    public static final int EFFIGY_CHALLENGE_V4_INFO_FIELD_NUMBER = 1321;
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     * @return Whether the effigyChallengeV4Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyChallengeV4Info() {
-      return detailCase_ == 1321;
-    }
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     * @return The effigyChallengeV4Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info getEffigyChallengeV4Info() {
-      if (detailCase_ == 1321) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder getEffigyChallengeV4InfoOrBuilder() {
-      if (detailCase_ == 1321) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-    }
-
-    public static final int GCG_PVE_INFO_FIELD_NUMBER = 1304;
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     * @return Whether the gcgPveInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGcgPveInfo() {
-      return detailCase_ == 1304;
-    }
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     * @return The gcgPveInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo getGcgPveInfo() {
-      if (detailCase_ == 1304) {
-         return (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder getGcgPveInfoOrBuilder() {
-      if (detailCase_ == 1304) {
-         return (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-    }
-
-    public static final int UGC_V2_INFO_FIELD_NUMBER = 991;
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     * @return Whether the ugcV2Info field is set.
-     */
-    @java.lang.Override
-    public boolean hasUgcV2Info() {
-      return detailCase_ == 991;
-    }
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     * @return The ugcV2Info.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info getUgcV2Info() {
-      if (detailCase_ == 991) {
-         return (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_;
-      }
-      return emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-    }
-    /**
-     * <code>.UgcV2Info ugc_v2_info = 991;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder getUgcV2InfoOrBuilder() {
-      if (detailCase_ == 991) {
-         return (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_;
-      }
-      return emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-    }
-
-    public static final int PENUMBRA_ADVENTURE_INFO_FIELD_NUMBER = 306;
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     * @return Whether the penumbraAdventureInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPenumbraAdventureInfo() {
-      return detailCase_ == 306;
-    }
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     * @return The penumbraAdventureInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo getPenumbraAdventureInfo() {
-      if (detailCase_ == 306) {
-         return (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder getPenumbraAdventureInfoOrBuilder() {
-      if (detailCase_ == 306) {
-         return (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-    }
-
-    public static final int ANIMAL_VIEW_INFO_FIELD_NUMBER = 947;
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     * @return Whether the animalViewInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAnimalViewInfo() {
-      return detailCase_ == 947;
-    }
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     * @return The animalViewInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo getAnimalViewInfo() {
-      if (detailCase_ == 947) {
-         return (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.AnimalViewInfo animal_view_info = 947;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder getAnimalViewInfoOrBuilder() {
-      if (detailCase_ == 947) {
-         return (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-    }
-
-    public static final int ACTIVITY_MULTI_CHARACTER_INFO_FIELD_NUMBER = 1213;
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     * @return Whether the activityMultiCharacterInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasActivityMultiCharacterInfo() {
-      return detailCase_ == 1213;
-    }
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     * @return The activityMultiCharacterInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo getActivityMultiCharacterInfo() {
-      if (detailCase_ == 1213) {
-         return (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder getActivityMultiCharacterInfoOrBuilder() {
-      if (detailCase_ == 1213) {
-         return (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-    }
-
-    public static final int GCG_PVE_INFINITE_INFO_FIELD_NUMBER = 124;
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     * @return Whether the gcgPveInfiniteInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGcgPveInfiniteInfo() {
-      return detailCase_ == 124;
-    }
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     * @return The gcgPveInfiniteInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo getGcgPveInfiniteInfo() {
-      if (detailCase_ == 124) {
-         return (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder getGcgPveInfiniteInfoOrBuilder() {
-      if (detailCase_ == 124) {
-         return (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-    }
-
-    public static final int TOY_BATTLE_INFO_FIELD_NUMBER = 62;
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     * @return Whether the toyBattleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasToyBattleInfo() {
-      return detailCase_ == 62;
-    }
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     * @return The toyBattleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo getToyBattleInfo() {
-      if (detailCase_ == 62) {
-         return (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder getToyBattleInfoOrBuilder() {
-      if (detailCase_ == 62) {
-         return (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-    }
-
-    public static final int PHOTO_UNDERSEA_INFO_FIELD_NUMBER = 226;
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     * @return Whether the photoUnderseaInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPhotoUnderseaInfo() {
-      return detailCase_ == 226;
-    }
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     * @return The photoUnderseaInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo getPhotoUnderseaInfo() {
-      if (detailCase_ == 226) {
-         return (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder getPhotoUnderseaInfoOrBuilder() {
-      if (detailCase_ == 226) {
-         return (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-    }
-
-    public static final int FONTAINE_GATHER_INFO_FIELD_NUMBER = 1035;
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     * @return Whether the fontaineGatherInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFontaineGatherInfo() {
-      return detailCase_ == 1035;
-    }
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     * @return The fontaineGatherInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo getFontaineGatherInfo() {
-      if (detailCase_ == 1035) {
-         return (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder getFontaineGatherInfoOrBuilder() {
-      if (detailCase_ == 1035) {
-         return (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-    }
-
-    public static final int GCG_PVE_PUZZLE_INFO_FIELD_NUMBER = 871;
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     * @return Whether the gcgPvePuzzleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasGcgPvePuzzleInfo() {
-      return detailCase_ == 871;
-    }
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     * @return The gcgPvePuzzleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo getGcgPvePuzzleInfo() {
-      if (detailCase_ == 871) {
-         return (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder getGcgPvePuzzleInfoOrBuilder() {
-      if (detailCase_ == 871) {
-         return (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -6502,358 +1466,116 @@ public final class ActivityInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (activityType_ != 0) {
-        output.writeUInt32(1, activityType_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(2, beginTime_);
-      }
-      if (activityId_ != 0) {
-        output.writeUInt32(3, activityId_);
-      }
-      if (getPHCOMIFAIJDList().size() > 0) {
-        output.writeUInt32NoTag(34);
-        output.writeUInt32NoTag(pHCOMIFAIJDMemoizedSerializedSize);
-      }
-      for (int i = 0; i < pHCOMIFAIJD_.size(); i++) {
-        output.writeUInt32NoTag(pHCOMIFAIJD_.getInt(i));
-      }
-      if (scheduleId_ != 0) {
-        output.writeUInt32(5, scheduleId_);
-      }
-      if (detailCase_ == 6) {
-        output.writeMessage(6, (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 7) {
-        output.writeMessage(7, (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 8) {
-        output.writeMessage(8, (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_);
-      }
-      for (int i = 0; i < watcherInfoList_.size(); i++) {
-        output.writeMessage(9, watcherInfoList_.get(i));
-      }
-      if (detailCase_ == 10) {
-        output.writeMessage(10, (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_);
-      }
-      if (endTime_ != 0) {
-        output.writeUInt32(11, endTime_);
-      }
       if (getMeetCondListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(meetCondListMemoizedSerializedSize);
       }
       for (int i = 0; i < meetCondList_.size(); i++) {
         output.writeUInt32NoTag(meetCondList_.getInt(i));
       }
-      if (dKJDABCNGBP_ != false) {
-        output.writeBool(13, dKJDABCNGBP_);
+      if (endTime_ != 0) {
+        output.writeUInt32(4, endTime_);
+      }
+      if (beginTime_ != 0) {
+        output.writeUInt32(6, beginTime_);
       }
       if (isFinished_ != false) {
-        output.writeBool(14, isFinished_);
+        output.writeBool(7, isFinished_);
       }
-      if (eNNDKMJIMHN_ != false) {
-        output.writeBool(15, eNNDKMJIMHN_);
+      if (fALGLCJDKCL_ != false) {
+        output.writeBool(8, fALGLCJDKCL_);
       }
-      if (pJJKJGALLGD_ != false) {
-        output.writeBool(16, pJJKJGALLGD_);
+      for (int i = 0; i < watcherInfoList_.size(); i++) {
+        output.writeMessage(10, watcherInfoList_.get(i));
       }
-      if (detailCase_ == 38) {
-        output.writeMessage(38, (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_);
+      if (getExpireCondListList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(expireCondListMemoizedSerializedSize);
       }
-      if (detailCase_ == 39) {
-        output.writeMessage(39, (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_);
+      for (int i = 0; i < expireCondList_.size(); i++) {
+        output.writeUInt32NoTag(expireCondList_.getInt(i));
       }
-      if (detailCase_ == 54) {
-        output.writeMessage(54, (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_);
+      if (scheduleId_ != 0) {
+        output.writeUInt32(12, scheduleId_);
       }
-      if (detailCase_ == 62) {
-        output.writeMessage(62, (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_);
+      if (oNCLIGBKLPF_ != false) {
+        output.writeBool(13, oNCLIGBKLPF_);
       }
-      if (detailCase_ == 110) {
-        output.writeMessage(110, (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_);
+      if (activityType_ != 0) {
+        output.writeUInt32(14, activityType_);
       }
-      if (detailCase_ == 114) {
-        output.writeMessage(114, (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 124) {
-        output.writeMessage(124, (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_);
-      }
-      if (detailCase_ == 226) {
-        output.writeMessage(226, (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_);
-      }
-      if (detailCase_ == 260) {
-        output.writeMessage(260, (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 293) {
-        output.writeMessage(293, (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 305) {
-        output.writeMessage(305, (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_);
-      }
-      if (detailCase_ == 306) {
-        output.writeMessage(306, (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_);
-      }
-      if (detailCase_ == 331) {
-        output.writeMessage(331, (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 356) {
-        output.writeMessage(356, (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_);
-      }
-      if (detailCase_ == 389) {
-        output.writeMessage(389, (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 427) {
-        output.writeMessage(427, (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 446) {
-        output.writeMessage(446, (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_);
-      }
-      if (getLJLDCLMAMNLList().size() > 0) {
-        output.writeUInt32NoTag(3858);
-        output.writeUInt32NoTag(lJLDCLMAMNLMemoizedSerializedSize);
-      }
-      for (int i = 0; i < lJLDCLMAMNL_.size(); i++) {
-        output.writeUInt32NoTag(lJLDCLMAMNL_.getInt(i));
-      }
-      if (detailCase_ == 508) {
-        output.writeMessage(508, (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_);
-      }
-      if (detailCase_ == 519) {
-        output.writeMessage(519, (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_);
-      }
-      if (aBMOPKOIMPA_ != false) {
-        output.writeBool(525, aBMOPKOIMPA_);
-      }
-      if (detailCase_ == 551) {
-        output.writeMessage(551, (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_);
-      }
-      if (cEFIPNKPEKA_ != 0) {
-        output.writeUInt32(621, cEFIPNKPEKA_);
-      }
-      if (detailCase_ == 626) {
-        output.writeMessage(626, (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_);
-      }
-      for (int i = 0; i < activityPushTipsDataList_.size(); i++) {
-        output.writeMessage(643, activityPushTipsDataList_.get(i));
-      }
-      if (detailCase_ == 674) {
-        output.writeMessage(674, (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_);
-      }
-      if (iNGFNLLCDOL_ != 0) {
-        output.writeUInt32(733, iNGFNLLCDOL_);
-      }
-      if (detailCase_ == 768) {
-        output.writeMessage(768, (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_);
-      }
-      if (detailCase_ == 826) {
-        output.writeMessage(826, (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 833) {
-        output.writeMessage(833, (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_);
-      }
-      if (detailCase_ == 834) {
-        output.writeMessage(834, (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_);
-      }
-      if (detailCase_ == 839) {
-        output.writeMessage(839, (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_);
-      }
-      if (detailCase_ == 871) {
-        output.writeMessage(871, (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_);
-      }
-      if (detailCase_ == 910) {
-        output.writeMessage(910, (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 915) {
-        output.writeMessage(915, (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_);
-      }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetWishGiftNumMap(),
-          WishGiftNumMapDefaultEntryHolder.defaultEntry,
-          924);
-      if (detailCase_ == 944) {
-        output.writeMessage(944, (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 947) {
-        output.writeMessage(947, (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_);
-      }
-      if (detailCase_ == 950) {
-        output.writeMessage(950, (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_);
-      }
-      if (firstDayStartTime_ != 0) {
-        output.writeUInt32(978, firstDayStartTime_);
-      }
-      if (detailCase_ == 981) {
-        output.writeMessage(981, (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_);
-      }
-      if (detailCase_ == 991) {
-        output.writeMessage(991, (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_);
-      }
-      if (detailCase_ == 1010) {
-        output.writeMessage(1010, (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1025) {
-        output.writeMessage(1025, (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1028) {
-        output.writeMessage(1028, (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_);
-      }
-      if (detailCase_ == 1035) {
-        output.writeMessage(1035, (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_);
-      }
-      if (detailCase_ == 1044) {
-        output.writeMessage(1044, (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_);
-      }
-      if (detailCase_ == 1077) {
-        output.writeMessage(1077, (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_);
-      }
-      if (detailCase_ == 1087) {
-        output.writeMessage(1087, (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1114) {
-        output.writeMessage(1114, (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_);
-      }
-      if (gFEMIEBKKKL_ != false) {
-        output.writeBool(1117, gFEMIEBKKKL_);
-      }
-      if (detailCase_ == 1165) {
-        output.writeMessage(1165, (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_);
-      }
-      if (detailCase_ == 1176) {
-        output.writeMessage(1176, (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1192) {
-        output.writeMessage(1192, (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1213) {
-        output.writeMessage(1213, (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_);
-      }
-      if (detailCase_ == 1222) {
-        output.writeMessage(1222, (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_);
-      }
-      if (detailCase_ == 1251) {
-        output.writeMessage(1251, (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1263) {
-        output.writeMessage(1263, (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1275) {
-        output.writeMessage(1275, (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 1284) {
-        output.writeMessage(1284, (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_);
-      }
-      if (detailCase_ == 1301) {
-        output.writeMessage(1301, (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1304) {
-        output.writeMessage(1304, (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_);
-      }
-      if (detailCase_ == 1321) {
-        output.writeMessage(1321, (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_);
-      }
-      if (detailCase_ == 1441) {
-        output.writeMessage(1441, (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1465) {
-        output.writeMessage(1465, (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1474) {
-        output.writeMessage(1474, (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1485) {
-        output.writeMessage(1485, (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1492) {
-        output.writeMessage(1492, (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1524) {
-        output.writeMessage(1524, (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_);
-      }
-      if (detailCase_ == 1541) {
-        output.writeMessage(1541, (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_);
+      if (activityId_ != 0) {
+        output.writeUInt32(15, activityId_);
       }
       if (curScore_ != 0) {
-        output.writeUInt32(1555, curScore_);
+        output.writeUInt32(63, curScore_);
+      }
+      if (fFGHMFNFPNL_ != 0) {
+        output.writeUInt32(253, fFGHMFNFPNL_);
+      }
+      if (firstDayStartTime_ != 0) {
+        output.writeUInt32(373, firstDayStartTime_);
+      }
+      if (lKODGHFICBH_ != 0) {
+        output.writeUInt32(426, lKODGHFICBH_);
+      }
+      if (cDBIIEIPBFF_ != false) {
+        output.writeBool(509, cDBIIEIPBFF_);
+      }
+      if (lCHFFKHPJIO_ != false) {
+        output.writeBool(678, lCHFFKHPJIO_);
+      }
+      if (iLKPGDKEIEG_ != false) {
+        output.writeBool(739, iLKPGDKEIEG_);
+      }
+      if (getTakenRewardListList().size() > 0) {
+        output.writeUInt32NoTag(6546);
+        output.writeUInt32NoTag(takenRewardListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < takenRewardList_.size(); i++) {
+        output.writeUInt32NoTag(takenRewardList_.getInt(i));
+      }
+      if (cIDDJFNIMPJ_ != 0L) {
+        output.writeUInt64(892, cIDDJFNIMPJ_);
+      }
+      for (int i = 0; i < activityPushTipsDataList_.size(); i++) {
+        output.writeMessage(983, activityPushTipsDataList_.get(i));
+      }
+      if (mPPFCLCENAP_ != 0) {
+        output.writeUInt32(1040, mPPFCLCENAP_);
+      }
+      if (detailCase_ == 1099) {
+        output.writeMessage(1099, (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_);
+      }
+      if (getGONEPFEDMELList().size() > 0) {
+        output.writeUInt32NoTag(9970);
+        output.writeUInt32NoTag(gONEPFEDMELMemoizedSerializedSize);
+      }
+      for (int i = 0; i < gONEPFEDMEL_.size(); i++) {
+        output.writeUInt64NoTag(gONEPFEDMEL_.getLong(i));
+      }
+      if (getNJCGNGLKPBJList().size() > 0) {
+        output.writeUInt32NoTag(10138);
+        output.writeUInt32NoTag(nJCGNGLKPBJMemoizedSerializedSize);
+      }
+      for (int i = 0; i < nJCGNGLKPBJ_.size(); i++) {
+        output.writeUInt32NoTag(nJCGNGLKPBJ_.getInt(i));
+      }
+      if (oDMJHPBFIKO_ != false) {
+        output.writeBool(1408, oDMJHPBFIKO_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetActivityCoinMap(),
           ActivityCoinMapDefaultEntryHolder.defaultEntry,
-          1562);
-      if (detailCase_ == 1622) {
-        output.writeMessage(1622, (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1664) {
-        output.writeMessage(1664, (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_);
-      }
-      if (detailCase_ == 1670) {
-        output.writeMessage(1670, (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_);
-      }
-      if (fGFGECAAKJM_ != 0) {
-        output.writeUInt32(1703, fGFGECAAKJM_);
-      }
-      if (getDNMOEAFCDGCList().size() > 0) {
-        output.writeUInt32NoTag(13890);
-        output.writeUInt32NoTag(dNMOEAFCDGCMemoizedSerializedSize);
-      }
-      for (int i = 0; i < dNMOEAFCDGC_.size(); i++) {
-        output.writeUInt32NoTag(dNMOEAFCDGC_.getInt(i));
-      }
-      if (detailCase_ == 1747) {
-        output.writeMessage(1747, (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1754) {
-        output.writeMessage(1754, (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1757) {
-        output.writeMessage(1757, (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1795) {
-        output.writeMessage(1795, (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_);
-      }
-      if (bKJNDLLNAML_ != false) {
-        output.writeBool(1818, bKJNDLLNAML_);
-      }
-      if (detailCase_ == 1846) {
-        output.writeMessage(1846, (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1847) {
-        output.writeMessage(1847, (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1854) {
-        output.writeMessage(1854, (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1855) {
-        output.writeMessage(1855, (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1864) {
-        output.writeMessage(1864, (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1869) {
-        output.writeMessage(1869, (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_);
-      }
-      if (detailCase_ == 1971) {
-        output.writeMessage(1971, (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_);
-      }
-      if (detailCase_ == 1980) {
-        output.writeMessage(1980, (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1982) {
-        output.writeMessage(1982, (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 1997) {
-        output.writeMessage(1997, (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 2008) {
-        output.writeMessage(2008, (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 2014) {
-        output.writeMessage(2014, (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_);
-      }
+          1791);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetWishGiftNumMap(),
+          WishGiftNumMapDefaultEntryHolder.defaultEntry,
+          1954);
       unknownFields.writeTo(output);
     }
 
@@ -6863,60 +1585,6 @@ public final class ActivityInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (activityType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, activityType_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, beginTime_);
-      }
-      if (activityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, activityId_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < pHCOMIFAIJD_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(pHCOMIFAIJD_.getInt(i));
-        }
-        size += dataSize;
-        if (!getPHCOMIFAIJDList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        pHCOMIFAIJDMemoizedSerializedSize = dataSize;
-      }
-      if (scheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, scheduleId_);
-      }
-      if (detailCase_ == 6) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 7) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 8) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_);
-      }
-      for (int i = 0; i < watcherInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, watcherInfoList_.get(i));
-      }
-      if (detailCase_ == 10) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_);
-      }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, endTime_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < meetCondList_.size(); i++) {
@@ -6931,321 +1599,145 @@ public final class ActivityInfoOuterClass {
         }
         meetCondListMemoizedSerializedSize = dataSize;
       }
-      if (dKJDABCNGBP_ != false) {
+      if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, dKJDABCNGBP_);
+          .computeUInt32Size(4, endTime_);
+      }
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, beginTime_);
       }
       if (isFinished_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isFinished_);
+          .computeBoolSize(7, isFinished_);
       }
-      if (eNNDKMJIMHN_ != false) {
+      if (fALGLCJDKCL_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, eNNDKMJIMHN_);
+          .computeBoolSize(8, fALGLCJDKCL_);
       }
-      if (pJJKJGALLGD_ != false) {
+      for (int i = 0; i < watcherInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(16, pJJKJGALLGD_);
-      }
-      if (detailCase_ == 38) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(38, (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 39) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(39, (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 54) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(54, (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 62) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(62, (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_);
-      }
-      if (detailCase_ == 110) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(110, (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 114) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(114, (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 124) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(124, (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_);
-      }
-      if (detailCase_ == 226) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(226, (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_);
-      }
-      if (detailCase_ == 260) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(260, (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 293) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(293, (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 305) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(305, (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_);
-      }
-      if (detailCase_ == 306) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(306, (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_);
-      }
-      if (detailCase_ == 331) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(331, (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 356) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(356, (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_);
-      }
-      if (detailCase_ == 389) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(389, (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 427) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(427, (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 446) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(446, (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_);
+          .computeMessageSize(10, watcherInfoList_.get(i));
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < lJLDCLMAMNL_.size(); i++) {
+        for (int i = 0; i < expireCondList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lJLDCLMAMNL_.getInt(i));
+            .computeUInt32SizeNoTag(expireCondList_.getInt(i));
         }
         size += dataSize;
-        if (!getLJLDCLMAMNLList().isEmpty()) {
+        if (!getExpireCondListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        expireCondListMemoizedSerializedSize = dataSize;
+      }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, scheduleId_);
+      }
+      if (oNCLIGBKLPF_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, oNCLIGBKLPF_);
+      }
+      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_);
+      }
+      if (fFGHMFNFPNL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(253, fFGHMFNFPNL_);
+      }
+      if (firstDayStartTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(373, firstDayStartTime_);
+      }
+      if (lKODGHFICBH_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(426, lKODGHFICBH_);
+      }
+      if (cDBIIEIPBFF_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(509, cDBIIEIPBFF_);
+      }
+      if (lCHFFKHPJIO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(678, lCHFFKHPJIO_);
+      }
+      if (iLKPGDKEIEG_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(739, iLKPGDKEIEG_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < takenRewardList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(takenRewardList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getTakenRewardListList().isEmpty()) {
           size += 2;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        lJLDCLMAMNLMemoizedSerializedSize = dataSize;
+        takenRewardListMemoizedSerializedSize = dataSize;
       }
-      if (detailCase_ == 508) {
+      if (cIDDJFNIMPJ_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(508, (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_);
-      }
-      if (detailCase_ == 519) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(519, (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_);
-      }
-      if (aBMOPKOIMPA_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(525, aBMOPKOIMPA_);
-      }
-      if (detailCase_ == 551) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(551, (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_);
-      }
-      if (cEFIPNKPEKA_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(621, cEFIPNKPEKA_);
-      }
-      if (detailCase_ == 626) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(626, (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_);
+          .computeUInt64Size(892, cIDDJFNIMPJ_);
       }
       for (int i = 0; i < activityPushTipsDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(643, activityPushTipsDataList_.get(i));
+          .computeMessageSize(983, activityPushTipsDataList_.get(i));
       }
-      if (detailCase_ == 674) {
+      if (mPPFCLCENAP_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(674, (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_);
+          .computeUInt32Size(1040, mPPFCLCENAP_);
       }
-      if (iNGFNLLCDOL_ != 0) {
+      if (detailCase_ == 1099) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(733, iNGFNLLCDOL_);
+          .computeMessageSize(1099, (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_);
       }
-      if (detailCase_ == 768) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(768, (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < gONEPFEDMEL_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(gONEPFEDMEL_.getLong(i));
+        }
+        size += dataSize;
+        if (!getGONEPFEDMELList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        gONEPFEDMELMemoizedSerializedSize = dataSize;
       }
-      if (detailCase_ == 826) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(826, (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < nJCGNGLKPBJ_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(nJCGNGLKPBJ_.getInt(i));
+        }
+        size += dataSize;
+        if (!getNJCGNGLKPBJList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        nJCGNGLKPBJMemoizedSerializedSize = dataSize;
       }
-      if (detailCase_ == 833) {
+      if (oDMJHPBFIKO_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(833, (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_);
-      }
-      if (detailCase_ == 834) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(834, (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_);
-      }
-      if (detailCase_ == 839) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(839, (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_);
-      }
-      if (detailCase_ == 871) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(871, (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_);
-      }
-      if (detailCase_ == 910) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(910, (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 915) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(915, (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetWishGiftNumMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        wishGiftNumMap__ = WishGiftNumMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(924, wishGiftNumMap__);
-      }
-      if (detailCase_ == 944) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(944, (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 947) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(947, (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_);
-      }
-      if (detailCase_ == 950) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(950, (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_);
-      }
-      if (firstDayStartTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(978, firstDayStartTime_);
-      }
-      if (detailCase_ == 981) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(981, (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_);
-      }
-      if (detailCase_ == 991) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(991, (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_);
-      }
-      if (detailCase_ == 1010) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1010, (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1025) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1025, (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1028) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1028, (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_);
-      }
-      if (detailCase_ == 1035) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1035, (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_);
-      }
-      if (detailCase_ == 1044) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1044, (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_);
-      }
-      if (detailCase_ == 1077) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1077, (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_);
-      }
-      if (detailCase_ == 1087) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1087, (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1114) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1114, (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_);
-      }
-      if (gFEMIEBKKKL_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1117, gFEMIEBKKKL_);
-      }
-      if (detailCase_ == 1165) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1165, (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_);
-      }
-      if (detailCase_ == 1176) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1176, (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1192) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1192, (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1213) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1213, (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_);
-      }
-      if (detailCase_ == 1222) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1222, (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_);
-      }
-      if (detailCase_ == 1251) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1251, (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1263) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1263, (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1275) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1275, (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 1284) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1284, (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_);
-      }
-      if (detailCase_ == 1301) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1301, (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1304) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1304, (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_);
-      }
-      if (detailCase_ == 1321) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1321, (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_);
-      }
-      if (detailCase_ == 1441) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1441, (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1465) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1465, (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1474) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1474, (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1485) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1485, (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1492) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1492, (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1524) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1524, (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_);
-      }
-      if (detailCase_ == 1541) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1541, (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_);
-      }
-      if (curScore_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1555, curScore_);
+          .computeBoolSize(1408, oDMJHPBFIKO_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetActivityCoinMap().getMap().entrySet()) {
@@ -7255,105 +1747,17 @@ public final class ActivityInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1562, activityCoinMap__);
+            .computeMessageSize(1791, activityCoinMap__);
       }
-      if (detailCase_ == 1622) {
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetWishGiftNumMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        wishGiftNumMap__ = WishGiftNumMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1622, (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1664) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1664, (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_);
-      }
-      if (detailCase_ == 1670) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1670, (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_);
-      }
-      if (fGFGECAAKJM_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1703, fGFGECAAKJM_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < dNMOEAFCDGC_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(dNMOEAFCDGC_.getInt(i));
-        }
-        size += dataSize;
-        if (!getDNMOEAFCDGCList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        dNMOEAFCDGCMemoizedSerializedSize = dataSize;
-      }
-      if (detailCase_ == 1747) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1747, (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1754) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1754, (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1757) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1757, (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1795) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1795, (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_);
-      }
-      if (bKJNDLLNAML_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1818, bKJNDLLNAML_);
-      }
-      if (detailCase_ == 1846) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1846, (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1847) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1847, (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1854) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1854, (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1855) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1855, (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1864) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1864, (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1869) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1869, (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_);
-      }
-      if (detailCase_ == 1971) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1971, (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_);
-      }
-      if (detailCase_ == 1980) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1980, (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 1982) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1982, (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_);
-      }
-      if (detailCase_ == 1997) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1997, (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 2008) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2008, (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_);
-      }
-      if (detailCase_ == 2014) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2014, (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_);
+            .computeMessageSize(1954, wishGiftNumMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -7370,398 +1774,66 @@ public final class ActivityInfoOuterClass {
       }
       emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo other = (emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo) obj;
 
-      if (getActivityId()
-          != other.getActivityId()) return false;
-      if (!getDNMOEAFCDGCList()
-          .equals(other.getDNMOEAFCDGCList())) return false;
-      if (!getWatcherInfoListList()
-          .equals(other.getWatcherInfoListList())) return false;
-      if (getIsFinished()
-          != other.getIsFinished()) return false;
-      if (!getLJLDCLMAMNLList()
-          .equals(other.getLJLDCLMAMNLList())) return false;
-      if (getPJJKJGALLGD()
-          != other.getPJJKJGALLGD()) return false;
-      if (getActivityType()
-          != other.getActivityType()) return false;
-      if (getScheduleId()
-          != other.getScheduleId()) return false;
-      if (!internalGetActivityCoinMap().equals(
-          other.internalGetActivityCoinMap())) return false;
       if (!getMeetCondListList()
           .equals(other.getMeetCondListList())) return false;
-      if (getDKJDABCNGBP()
-          != other.getDKJDABCNGBP()) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
-      if (getINGFNLLCDOL()
-          != other.getINGFNLLCDOL()) return false;
-      if (getENNDKMJIMHN()
-          != other.getENNDKMJIMHN()) return false;
-      if (getCurScore()
-          != other.getCurScore()) return false;
-      if (getBKJNDLLNAML()
-          != other.getBKJNDLLNAML()) return false;
-      if (getFirstDayStartTime()
-          != other.getFirstDayStartTime()) return false;
-      if (getABMOPKOIMPA()
-          != other.getABMOPKOIMPA()) return false;
-      if (getFGFGECAAKJM()
-          != other.getFGFGECAAKJM()) return false;
-      if (getGFEMIEBKKKL()
-          != other.getGFEMIEBKKKL()) return false;
-      if (getCEFIPNKPEKA()
-          != other.getCEFIPNKPEKA()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
-      if (!internalGetWishGiftNumMap().equals(
-          other.internalGetWishGiftNumMap())) return false;
-      if (!getPHCOMIFAIJDList()
-          .equals(other.getPHCOMIFAIJDList())) return false;
+      if (getBeginTime()
+          != other.getBeginTime()) return false;
+      if (getIsFinished()
+          != other.getIsFinished()) return false;
+      if (getFALGLCJDKCL()
+          != other.getFALGLCJDKCL()) return false;
+      if (!getWatcherInfoListList()
+          .equals(other.getWatcherInfoListList())) return false;
+      if (!getExpireCondListList()
+          .equals(other.getExpireCondListList())) return false;
+      if (getScheduleId()
+          != other.getScheduleId()) return false;
+      if (getONCLIGBKLPF()
+          != other.getONCLIGBKLPF()) return false;
+      if (getActivityType()
+          != other.getActivityType()) return false;
+      if (getActivityId()
+          != other.getActivityId()) return false;
+      if (getCurScore()
+          != other.getCurScore()) return false;
+      if (getFFGHMFNFPNL()
+          != other.getFFGHMFNFPNL()) return false;
+      if (getFirstDayStartTime()
+          != other.getFirstDayStartTime()) return false;
+      if (getLKODGHFICBH()
+          != other.getLKODGHFICBH()) return false;
+      if (getCDBIIEIPBFF()
+          != other.getCDBIIEIPBFF()) return false;
+      if (getLCHFFKHPJIO()
+          != other.getLCHFFKHPJIO()) return false;
+      if (getILKPGDKEIEG()
+          != other.getILKPGDKEIEG()) return false;
+      if (!getTakenRewardListList()
+          .equals(other.getTakenRewardListList())) return false;
+      if (getCIDDJFNIMPJ()
+          != other.getCIDDJFNIMPJ()) return false;
       if (!getActivityPushTipsDataListList()
           .equals(other.getActivityPushTipsDataListList())) return false;
+      if (getMPPFCLCENAP()
+          != other.getMPPFCLCENAP()) return false;
+      if (!getGONEPFEDMELList()
+          .equals(other.getGONEPFEDMELList())) return false;
+      if (!getNJCGNGLKPBJList()
+          .equals(other.getNJCGNGLKPBJList())) return false;
+      if (getODMJHPBFIKO()
+          != other.getODMJHPBFIKO()) return false;
+      if (!internalGetActivityCoinMap().equals(
+          other.internalGetActivityCoinMap())) return false;
+      if (!internalGetWishGiftNumMap().equals(
+          other.internalGetWishGiftNumMap())) return false;
       if (!getDetailCase().equals(other.getDetailCase())) return false;
       switch (detailCase_) {
-        case 10:
-          if (!getSamLampInfo()
-              .equals(other.getSamLampInfo())) return false;
-          break;
-        case 7:
-          if (!getCrucibleInfo()
-              .equals(other.getCrucibleInfo())) return false;
-          break;
-        case 8:
-          if (!getSalesmanInfo()
-              .equals(other.getSalesmanInfo())) return false;
-          break;
-        case 6:
-          if (!getTrialAvatarInfo()
-              .equals(other.getTrialAvatarInfo())) return false;
-          break;
-        case 1846:
-          if (!getDeliveryInfo()
-              .equals(other.getDeliveryInfo())) return false;
-          break;
-        case 260:
-          if (!getAsterInfo()
-              .equals(other.getAsterInfo())) return false;
-          break;
-        case 826:
-          if (!getFlightInfo()
-              .equals(other.getFlightInfo())) return false;
-          break;
-        case 110:
-          if (!getDragonSpineInfo()
-              .equals(other.getDragonSpineInfo())) return false;
-          break;
-        case 1010:
-          if (!getEffigyInfo()
-              .equals(other.getEffigyInfo())) return false;
-          break;
-        case 1754:
-          if (!getTreasureMapInfo()
-              .equals(other.getTreasureMapInfo())) return false;
-          break;
-        case 331:
-          if (!getBlessingInfo()
-              .equals(other.getBlessingInfo())) return false;
-          break;
-        case 1114:
-          if (!getSeaLampInfo()
-              .equals(other.getSeaLampInfo())) return false;
-          break;
-        case 674:
-          if (!getExpeditionInfo()
-              .equals(other.getExpeditionInfo())) return false;
-          break;
-        case 39:
-          if (!getArenaChallengeInfo()
-              .equals(other.getArenaChallengeInfo())) return false;
-          break;
-        case 293:
-          if (!getFleurFairInfo()
-              .equals(other.getFleurFairInfo())) return false;
-          break;
-        case 1997:
-          if (!getWaterSpiritInfo()
-              .equals(other.getWaterSpiritInfo())) return false;
-          break;
-        case 1757:
-          if (!getChallnelerSlabInfo()
-              .equals(other.getChallnelerSlabInfo())) return false;
-          break;
-        case 1622:
-          if (!getMistTrialActivityInfo()
-              .equals(other.getMistTrialActivityInfo())) return false;
-          break;
-        case 1747:
-          if (!getHideAndSeekInfo()
-              .equals(other.getHideAndSeekInfo())) return false;
-          break;
-        case 1284:
-          if (!getFindHilichurlInfo()
-              .equals(other.getFindHilichurlInfo())) return false;
-          break;
-        case 950:
-          if (!getSummerTimeInfo()
-              .equals(other.getSummerTimeInfo())) return false;
-          break;
-        case 519:
-          if (!getBuoyantCombatInfo()
-              .equals(other.getBuoyantCombatInfo())) return false;
-          break;
-        case 305:
-          if (!getEchoShellInfo()
-              .equals(other.getEchoShellInfo())) return false;
-          break;
-        case 1864:
-          if (!getBounceConjuringInfo()
-              .equals(other.getBounceConjuringInfo())) return false;
-          break;
-        case 915:
-          if (!getBlitzRushInfo()
-              .equals(other.getBlitzRushInfo())) return false;
-          break;
-        case 1087:
-          if (!getChessInfo()
-              .equals(other.getChessInfo())) return false;
-          break;
-        case 2008:
-          if (!getSumoInfo()
-              .equals(other.getSumoInfo())) return false;
-          break;
-        case 389:
-          if (!getMoonfinTrialInfo()
-              .equals(other.getMoonfinTrialInfo())) return false;
-          break;
-        case 1971:
-          if (!getLunaRiteInfo()
-              .equals(other.getLunaRiteInfo())) return false;
-          break;
-        case 1854:
-          if (!getPlantFlowerInfo()
-              .equals(other.getPlantFlowerInfo())) return false;
-          break;
-        case 1847:
+        case 1099:
           if (!getMusicGameInfo()
               .equals(other.getMusicGameInfo())) return false;
           break;
-        case 1025:
-          if (!getRoguelikeDungoenInfo()
-              .equals(other.getRoguelikeDungoenInfo())) return false;
-          break;
-        case 1855:
-          if (!getDigInfo()
-              .equals(other.getDigInfo())) return false;
-          break;
-        case 1176:
-          if (!getHachiInfo()
-              .equals(other.getHachiInfo())) return false;
-          break;
-        case 2014:
-          if (!getWinterCampInfo()
-              .equals(other.getWinterCampInfo())) return false;
-          break;
-        case 1485:
-          if (!getPotionInfo()
-              .equals(other.getPotionInfo())) return false;
-          break;
-        case 944:
-          if (!getTanukiTravelActivityInfo()
-              .equals(other.getTanukiTravelActivityInfo())) return false;
-          break;
-        case 1980:
-          if (!getLanternRiteActivityInfo()
-              .equals(other.getLanternRiteActivityInfo())) return false;
-          break;
-        case 114:
-          if (!getMichiaeMatsuriInfo()
-              .equals(other.getMichiaeMatsuriInfo())) return false;
-          break;
-        case 1441:
-          if (!getBartenderInfo()
-              .equals(other.getBartenderInfo())) return false;
-          break;
-        case 1795:
-          if (!getUgcInfo()
-              .equals(other.getUgcInfo())) return false;
-          break;
-        case 1301:
-          if (!getCrystalLinkInfo()
-              .equals(other.getCrystalLinkInfo())) return false;
-          break;
-        case 54:
-          if (!getIrodoriInfo()
-              .equals(other.getIrodoriInfo())) return false;
-          break;
-        case 1492:
-          if (!getPhotoInfo()
-              .equals(other.getPhotoInfo())) return false;
-          break;
-        case 446:
-          if (!getSpiceInfo()
-              .equals(other.getSpiceInfo())) return false;
-          break;
-        case 1192:
-          if (!getGachaInfo()
-              .equals(other.getGachaInfo())) return false;
-          break;
-        case 38:
-          if (!getLuminanceStoneChallengeInfo()
-              .equals(other.getLuminanceStoneChallengeInfo())) return false;
-          break;
-        case 427:
-          if (!getRogueDiaryInfo()
-              .equals(other.getRogueDiaryInfo())) return false;
-          break;
-        case 910:
-          if (!getSummerTimeV2Info()
-              .equals(other.getSummerTimeV2Info())) return false;
-          break;
-        case 1044:
-          if (!getIslandPartyInfo()
-              .equals(other.getIslandPartyInfo())) return false;
-          break;
-        case 1263:
-          if (!getGearInfo()
-              .equals(other.getGearInfo())) return false;
-          break;
-        case 356:
-          if (!getGravenInnocenceInfo()
-              .equals(other.getGravenInnocenceInfo())) return false;
-          break;
-        case 508:
-          if (!getInstableSprayInfo()
-              .equals(other.getInstableSprayInfo())) return false;
-          break;
-        case 1474:
-          if (!getMuqadasPotionInfo()
-              .equals(other.getMuqadasPotionInfo())) return false;
-          break;
-        case 1251:
-          if (!getTreasureSeelieInfo()
-              .equals(other.getTreasureSeelieInfo())) return false;
-          break;
-        case 1028:
-          if (!getRockBoardExploreInfo()
-              .equals(other.getRockBoardExploreInfo())) return false;
-          break;
-        case 1465:
-          if (!getVintageInfo()
-              .equals(other.getVintageInfo())) return false;
-          break;
-        case 768:
-          if (!getWindFieldInfo()
-              .equals(other.getWindFieldInfo())) return false;
-          break;
-        case 834:
-          if (!getFungusFighterInfo()
-              .equals(other.getFungusFighterInfo())) return false;
-          break;
-        case 1222:
-          if (!getCharAmusementInfo()
-              .equals(other.getCharAmusementInfo())) return false;
-          break;
-        case 1275:
-          if (!getEffigyChallengeInfo()
-              .equals(other.getEffigyChallengeInfo())) return false;
-          break;
-        case 839:
-          if (!getCoinCollectInfo()
-              .equals(other.getCoinCollectInfo())) return false;
-          break;
-        case 551:
-          if (!getBrickBreakerInfo()
-              .equals(other.getBrickBreakerInfo())) return false;
-          break;
-        case 1670:
-          if (!getDuelHeartInfo()
-              .equals(other.getDuelHeartInfo())) return false;
-          break;
-        case 833:
-          if (!getSeaLampV3Info()
-              .equals(other.getSeaLampV3Info())) return false;
-          break;
-        case 1165:
-          if (!getTeamChainInfo()
-              .equals(other.getTeamChainInfo())) return false;
-          break;
-        case 981:
-          if (!getElectroherculesBattleInfo()
-              .equals(other.getElectroherculesBattleInfo())) return false;
-          break;
-        case 1664:
-          if (!getGcgFestivalInfo()
-              .equals(other.getGcgFestivalInfo())) return false;
-          break;
-        case 1982:
-          if (!getFleurFairV2Info()
-              .equals(other.getFleurFairV2Info())) return false;
-          break;
-        case 1541:
-          if (!getFungusFighterV2Info()
-              .equals(other.getFungusFighterV2Info())) return false;
-          break;
-        case 1524:
-          if (!getAkaFesInfo()
-              .equals(other.getAkaFesInfo())) return false;
-          break;
-        case 626:
-          if (!getSandwormCannonDetailInfo()
-              .equals(other.getSandwormCannonDetailInfo())) return false;
-          break;
-        case 1077:
-          if (!getSorushTrialInfo()
-              .equals(other.getSorushTrialInfo())) return false;
-          break;
-        case 1869:
-          if (!getJourneyInfo()
-              .equals(other.getJourneyInfo())) return false;
-          break;
-        case 1321:
-          if (!getEffigyChallengeV4Info()
-              .equals(other.getEffigyChallengeV4Info())) return false;
-          break;
-        case 1304:
-          if (!getGcgPveInfo()
-              .equals(other.getGcgPveInfo())) return false;
-          break;
-        case 991:
-          if (!getUgcV2Info()
-              .equals(other.getUgcV2Info())) return false;
-          break;
-        case 306:
-          if (!getPenumbraAdventureInfo()
-              .equals(other.getPenumbraAdventureInfo())) return false;
-          break;
-        case 947:
-          if (!getAnimalViewInfo()
-              .equals(other.getAnimalViewInfo())) return false;
-          break;
-        case 1213:
-          if (!getActivityMultiCharacterInfo()
-              .equals(other.getActivityMultiCharacterInfo())) return false;
-          break;
-        case 124:
-          if (!getGcgPveInfiniteInfo()
-              .equals(other.getGcgPveInfiniteInfo())) return false;
-          break;
-        case 62:
-          if (!getToyBattleInfo()
-              .equals(other.getToyBattleInfo())) return false;
-          break;
-        case 226:
-          if (!getPhotoUnderseaInfo()
-              .equals(other.getPhotoUnderseaInfo())) return false;
-          break;
-        case 1035:
-          if (!getFontaineGatherInfo()
-              .equals(other.getFontaineGatherInfo())) return false;
-          break;
-        case 871:
-          if (!getGcgPvePuzzleInfo()
-              .equals(other.getGcgPvePuzzleInfo())) return false;
-          break;
         case 0:
         default:
       }
@@ -7776,420 +1848,91 @@ public final class ActivityInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
-      if (getDNMOEAFCDGCCount() > 0) {
-        hash = (37 * hash) + DNMOEAFCDGC_FIELD_NUMBER;
-        hash = (53 * hash) + getDNMOEAFCDGCList().hashCode();
-      }
-      if (getWatcherInfoListCount() > 0) {
-        hash = (37 * hash) + WATCHER_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getWatcherInfoListList().hashCode();
-      }
-      hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFinished());
-      if (getLJLDCLMAMNLCount() > 0) {
-        hash = (37 * hash) + LJLDCLMAMNL_FIELD_NUMBER;
-        hash = (53 * hash) + getLJLDCLMAMNLList().hashCode();
-      }
-      hash = (37 * hash) + PJJKJGALLGD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getPJJKJGALLGD());
-      hash = (37 * hash) + ACTIVITY_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityType();
-      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getScheduleId();
-      if (!internalGetActivityCoinMap().getMap().isEmpty()) {
-        hash = (37 * hash) + ACTIVITY_COIN_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetActivityCoinMap().hashCode();
-      }
       if (getMeetCondListCount() > 0) {
         hash = (37 * hash) + MEET_COND_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMeetCondListList().hashCode();
       }
-      hash = (37 * hash) + DKJDABCNGBP_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getDKJDABCNGBP());
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + INGFNLLCDOL_FIELD_NUMBER;
-      hash = (53 * hash) + getINGFNLLCDOL();
-      hash = (37 * hash) + ENNDKMJIMHN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getENNDKMJIMHN());
-      hash = (37 * hash) + CUR_SCORE_FIELD_NUMBER;
-      hash = (53 * hash) + getCurScore();
-      hash = (37 * hash) + BKJNDLLNAML_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getBKJNDLLNAML());
-      hash = (37 * hash) + FIRST_DAY_START_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getFirstDayStartTime();
-      hash = (37 * hash) + ABMOPKOIMPA_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getABMOPKOIMPA());
-      hash = (37 * hash) + FGFGECAAKJM_FIELD_NUMBER;
-      hash = (53 * hash) + getFGFGECAAKJM();
-      hash = (37 * hash) + GFEMIEBKKKL_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getGFEMIEBKKKL());
-      hash = (37 * hash) + CEFIPNKPEKA_FIELD_NUMBER;
-      hash = (53 * hash) + getCEFIPNKPEKA();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
-      if (!internalGetWishGiftNumMap().getMap().isEmpty()) {
-        hash = (37 * hash) + WISH_GIFT_NUM_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetWishGiftNumMap().hashCode();
+      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());
+      hash = (37 * hash) + FALGLCJDKCL_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getFALGLCJDKCL());
+      if (getWatcherInfoListCount() > 0) {
+        hash = (37 * hash) + WATCHER_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getWatcherInfoListList().hashCode();
       }
-      if (getPHCOMIFAIJDCount() > 0) {
-        hash = (37 * hash) + PHCOMIFAIJD_FIELD_NUMBER;
-        hash = (53 * hash) + getPHCOMIFAIJDList().hashCode();
+      if (getExpireCondListCount() > 0) {
+        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) + ONCLIGBKLPF_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getONCLIGBKLPF());
+      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) + FFGHMFNFPNL_FIELD_NUMBER;
+      hash = (53 * hash) + getFFGHMFNFPNL();
+      hash = (37 * hash) + FIRST_DAY_START_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getFirstDayStartTime();
+      hash = (37 * hash) + LKODGHFICBH_FIELD_NUMBER;
+      hash = (53 * hash) + getLKODGHFICBH();
+      hash = (37 * hash) + CDBIIEIPBFF_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCDBIIEIPBFF());
+      hash = (37 * hash) + LCHFFKHPJIO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getLCHFFKHPJIO());
+      hash = (37 * hash) + ILKPGDKEIEG_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getILKPGDKEIEG());
+      if (getTakenRewardListCount() > 0) {
+        hash = (37 * hash) + TAKEN_REWARD_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTakenRewardListList().hashCode();
+      }
+      hash = (37 * hash) + CIDDJFNIMPJ_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getCIDDJFNIMPJ());
       if (getActivityPushTipsDataListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_PUSH_TIPS_DATA_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityPushTipsDataListList().hashCode();
       }
+      hash = (37 * hash) + MPPFCLCENAP_FIELD_NUMBER;
+      hash = (53 * hash) + getMPPFCLCENAP();
+      if (getGONEPFEDMELCount() > 0) {
+        hash = (37 * hash) + GONEPFEDMEL_FIELD_NUMBER;
+        hash = (53 * hash) + getGONEPFEDMELList().hashCode();
+      }
+      if (getNJCGNGLKPBJCount() > 0) {
+        hash = (37 * hash) + NJCGNGLKPBJ_FIELD_NUMBER;
+        hash = (53 * hash) + getNJCGNGLKPBJList().hashCode();
+      }
+      hash = (37 * hash) + ODMJHPBFIKO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getODMJHPBFIKO());
+      if (!internalGetActivityCoinMap().getMap().isEmpty()) {
+        hash = (37 * hash) + ACTIVITY_COIN_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetActivityCoinMap().hashCode();
+      }
+      if (!internalGetWishGiftNumMap().getMap().isEmpty()) {
+        hash = (37 * hash) + WISH_GIFT_NUM_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetWishGiftNumMap().hashCode();
+      }
       switch (detailCase_) {
-        case 10:
-          hash = (37 * hash) + SAM_LAMP_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSamLampInfo().hashCode();
-          break;
-        case 7:
-          hash = (37 * hash) + CRUCIBLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCrucibleInfo().hashCode();
-          break;
-        case 8:
-          hash = (37 * hash) + SALESMAN_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSalesmanInfo().hashCode();
-          break;
-        case 6:
-          hash = (37 * hash) + TRIAL_AVATAR_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTrialAvatarInfo().hashCode();
-          break;
-        case 1846:
-          hash = (37 * hash) + DELIVERY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getDeliveryInfo().hashCode();
-          break;
-        case 260:
-          hash = (37 * hash) + ASTER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getAsterInfo().hashCode();
-          break;
-        case 826:
-          hash = (37 * hash) + FLIGHT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFlightInfo().hashCode();
-          break;
-        case 110:
-          hash = (37 * hash) + DRAGON_SPINE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getDragonSpineInfo().hashCode();
-          break;
-        case 1010:
-          hash = (37 * hash) + EFFIGY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyInfo().hashCode();
-          break;
-        case 1754:
-          hash = (37 * hash) + TREASURE_MAP_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTreasureMapInfo().hashCode();
-          break;
-        case 331:
-          hash = (37 * hash) + BLESSING_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBlessingInfo().hashCode();
-          break;
-        case 1114:
-          hash = (37 * hash) + SEA_LAMP_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSeaLampInfo().hashCode();
-          break;
-        case 674:
-          hash = (37 * hash) + EXPEDITION_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getExpeditionInfo().hashCode();
-          break;
-        case 39:
-          hash = (37 * hash) + ARENA_CHALLENGE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getArenaChallengeInfo().hashCode();
-          break;
-        case 293:
-          hash = (37 * hash) + FLEUR_FAIR_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFleurFairInfo().hashCode();
-          break;
-        case 1997:
-          hash = (37 * hash) + WATER_SPIRIT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getWaterSpiritInfo().hashCode();
-          break;
-        case 1757:
-          hash = (37 * hash) + CHALLNELER_SLAB_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getChallnelerSlabInfo().hashCode();
-          break;
-        case 1622:
-          hash = (37 * hash) + MIST_TRIAL_ACTIVITY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getMistTrialActivityInfo().hashCode();
-          break;
-        case 1747:
-          hash = (37 * hash) + HIDE_AND_SEEK_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getHideAndSeekInfo().hashCode();
-          break;
-        case 1284:
-          hash = (37 * hash) + FIND_HILICHURL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFindHilichurlInfo().hashCode();
-          break;
-        case 950:
-          hash = (37 * hash) + SUMMER_TIME_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSummerTimeInfo().hashCode();
-          break;
-        case 519:
-          hash = (37 * hash) + BUOYANT_COMBAT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBuoyantCombatInfo().hashCode();
-          break;
-        case 305:
-          hash = (37 * hash) + ECHO_SHELL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEchoShellInfo().hashCode();
-          break;
-        case 1864:
-          hash = (37 * hash) + BOUNCE_CONJURING_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBounceConjuringInfo().hashCode();
-          break;
-        case 915:
-          hash = (37 * hash) + BLITZ_RUSH_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBlitzRushInfo().hashCode();
-          break;
-        case 1087:
-          hash = (37 * hash) + CHESS_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getChessInfo().hashCode();
-          break;
-        case 2008:
-          hash = (37 * hash) + SUMO_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSumoInfo().hashCode();
-          break;
-        case 389:
-          hash = (37 * hash) + MOONFIN_TRIAL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getMoonfinTrialInfo().hashCode();
-          break;
-        case 1971:
-          hash = (37 * hash) + LUNA_RITE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getLunaRiteInfo().hashCode();
-          break;
-        case 1854:
-          hash = (37 * hash) + PLANT_FLOWER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPlantFlowerInfo().hashCode();
-          break;
-        case 1847:
+        case 1099:
           hash = (37 * hash) + MUSIC_GAME_INFO_FIELD_NUMBER;
           hash = (53 * hash) + getMusicGameInfo().hashCode();
           break;
-        case 1025:
-          hash = (37 * hash) + ROGUELIKE_DUNGOEN_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getRoguelikeDungoenInfo().hashCode();
-          break;
-        case 1855:
-          hash = (37 * hash) + DIG_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getDigInfo().hashCode();
-          break;
-        case 1176:
-          hash = (37 * hash) + HACHI_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getHachiInfo().hashCode();
-          break;
-        case 2014:
-          hash = (37 * hash) + WINTER_CAMP_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getWinterCampInfo().hashCode();
-          break;
-        case 1485:
-          hash = (37 * hash) + POTION_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPotionInfo().hashCode();
-          break;
-        case 944:
-          hash = (37 * hash) + TANUKI_TRAVEL_ACTIVITY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTanukiTravelActivityInfo().hashCode();
-          break;
-        case 1980:
-          hash = (37 * hash) + LANTERN_RITE_ACTIVITY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getLanternRiteActivityInfo().hashCode();
-          break;
-        case 114:
-          hash = (37 * hash) + MICHIAE_MATSURI_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getMichiaeMatsuriInfo().hashCode();
-          break;
-        case 1441:
-          hash = (37 * hash) + BARTENDER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBartenderInfo().hashCode();
-          break;
-        case 1795:
-          hash = (37 * hash) + UGC_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getUgcInfo().hashCode();
-          break;
-        case 1301:
-          hash = (37 * hash) + CRYSTAL_LINK_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCrystalLinkInfo().hashCode();
-          break;
-        case 54:
-          hash = (37 * hash) + IRODORI_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getIrodoriInfo().hashCode();
-          break;
-        case 1492:
-          hash = (37 * hash) + PHOTO_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPhotoInfo().hashCode();
-          break;
-        case 446:
-          hash = (37 * hash) + SPICE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSpiceInfo().hashCode();
-          break;
-        case 1192:
-          hash = (37 * hash) + GACHA_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGachaInfo().hashCode();
-          break;
-        case 38:
-          hash = (37 * hash) + LUMINANCE_STONE_CHALLENGE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getLuminanceStoneChallengeInfo().hashCode();
-          break;
-        case 427:
-          hash = (37 * hash) + ROGUE_DIARY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getRogueDiaryInfo().hashCode();
-          break;
-        case 910:
-          hash = (37 * hash) + SUMMER_TIME_V2_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSummerTimeV2Info().hashCode();
-          break;
-        case 1044:
-          hash = (37 * hash) + ISLAND_PARTY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getIslandPartyInfo().hashCode();
-          break;
-        case 1263:
-          hash = (37 * hash) + GEAR_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGearInfo().hashCode();
-          break;
-        case 356:
-          hash = (37 * hash) + GRAVEN_INNOCENCE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGravenInnocenceInfo().hashCode();
-          break;
-        case 508:
-          hash = (37 * hash) + INSTABLE_SPRAY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getInstableSprayInfo().hashCode();
-          break;
-        case 1474:
-          hash = (37 * hash) + MUQADAS_POTION_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getMuqadasPotionInfo().hashCode();
-          break;
-        case 1251:
-          hash = (37 * hash) + TREASURE_SEELIE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTreasureSeelieInfo().hashCode();
-          break;
-        case 1028:
-          hash = (37 * hash) + ROCK_BOARD_EXPLORE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getRockBoardExploreInfo().hashCode();
-          break;
-        case 1465:
-          hash = (37 * hash) + VINTAGE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getVintageInfo().hashCode();
-          break;
-        case 768:
-          hash = (37 * hash) + WIND_FIELD_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getWindFieldInfo().hashCode();
-          break;
-        case 834:
-          hash = (37 * hash) + FUNGUS_FIGHTER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFungusFighterInfo().hashCode();
-          break;
-        case 1222:
-          hash = (37 * hash) + CHAR_AMUSEMENT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCharAmusementInfo().hashCode();
-          break;
-        case 1275:
-          hash = (37 * hash) + EFFIGY_CHALLENGE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyChallengeInfo().hashCode();
-          break;
-        case 839:
-          hash = (37 * hash) + COIN_COLLECT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCoinCollectInfo().hashCode();
-          break;
-        case 551:
-          hash = (37 * hash) + BRICK_BREAKER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBrickBreakerInfo().hashCode();
-          break;
-        case 1670:
-          hash = (37 * hash) + DUEL_HEART_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getDuelHeartInfo().hashCode();
-          break;
-        case 833:
-          hash = (37 * hash) + SEA_LAMP_V3_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSeaLampV3Info().hashCode();
-          break;
-        case 1165:
-          hash = (37 * hash) + TEAM_CHAIN_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTeamChainInfo().hashCode();
-          break;
-        case 981:
-          hash = (37 * hash) + ELECTROHERCULES_BATTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getElectroherculesBattleInfo().hashCode();
-          break;
-        case 1664:
-          hash = (37 * hash) + GCG_FESTIVAL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGcgFestivalInfo().hashCode();
-          break;
-        case 1982:
-          hash = (37 * hash) + FLEUR_FAIR_V2_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFleurFairV2Info().hashCode();
-          break;
-        case 1541:
-          hash = (37 * hash) + FUNGUS_FIGHTER_V2_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFungusFighterV2Info().hashCode();
-          break;
-        case 1524:
-          hash = (37 * hash) + AKA_FES_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getAkaFesInfo().hashCode();
-          break;
-        case 626:
-          hash = (37 * hash) + SANDWORM_CANNON_DETAIL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSandwormCannonDetailInfo().hashCode();
-          break;
-        case 1077:
-          hash = (37 * hash) + SORUSH_TRIAL_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSorushTrialInfo().hashCode();
-          break;
-        case 1869:
-          hash = (37 * hash) + JOURNEY_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getJourneyInfo().hashCode();
-          break;
-        case 1321:
-          hash = (37 * hash) + EFFIGY_CHALLENGE_V4_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyChallengeV4Info().hashCode();
-          break;
-        case 1304:
-          hash = (37 * hash) + GCG_PVE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGcgPveInfo().hashCode();
-          break;
-        case 991:
-          hash = (37 * hash) + UGC_V2_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getUgcV2Info().hashCode();
-          break;
-        case 306:
-          hash = (37 * hash) + PENUMBRA_ADVENTURE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPenumbraAdventureInfo().hashCode();
-          break;
-        case 947:
-          hash = (37 * hash) + ANIMAL_VIEW_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getAnimalViewInfo().hashCode();
-          break;
-        case 1213:
-          hash = (37 * hash) + ACTIVITY_MULTI_CHARACTER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getActivityMultiCharacterInfo().hashCode();
-          break;
-        case 124:
-          hash = (37 * hash) + GCG_PVE_INFINITE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGcgPveInfiniteInfo().hashCode();
-          break;
-        case 62:
-          hash = (37 * hash) + TOY_BATTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getToyBattleInfo().hashCode();
-          break;
-        case 226:
-          hash = (37 * hash) + PHOTO_UNDERSEA_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPhotoUnderseaInfo().hashCode();
-          break;
-        case 1035:
-          hash = (37 * hash) + FONTAINE_GATHER_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFontaineGatherInfo().hashCode();
-          break;
-        case 871:
-          hash = (37 * hash) + GCG_PVE_PUZZLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getGcgPvePuzzleInfo().hashCode();
-          break;
         case 0:
         default:
       }
@@ -8289,10 +2032,6 @@ public final class ActivityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AMADJGLDDCF
-     * </pre>
-     *
      * Protobuf type {@code ActivityInfo}
      */
     public static final class Builder extends
@@ -8308,9 +2047,9 @@ public final class ActivityInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 1562:
+          case 1791:
             return internalGetActivityCoinMap();
-          case 924:
+          case 1954:
             return internalGetWishGiftNumMap();
           default:
             throw new RuntimeException(
@@ -8321,9 +2060,9 @@ public final class ActivityInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 1562:
+          case 1791:
             return internalGetMutableActivityCoinMap();
-          case 924:
+          case 1954:
             return internalGetMutableWishGiftNumMap();
           default:
             throw new RuntimeException(
@@ -8358,62 +2097,66 @@ public final class ActivityInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityId_ = 0;
-
-        dNMOEAFCDGC_ = emptyIntList();
+        meetCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        endTime_ = 0;
+
+        beginTime_ = 0;
+
+        isFinished_ = false;
+
+        fALGLCJDKCL_ = false;
+
         if (watcherInfoListBuilder_ == null) {
           watcherInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           watcherInfoListBuilder_.clear();
         }
-        isFinished_ = false;
-
-        lJLDCLMAMNL_ = emptyIntList();
+        expireCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        pJJKJGALLGD_ = false;
+        scheduleId_ = 0;
+
+        oNCLIGBKLPF_ = false;
 
         activityType_ = 0;
 
-        scheduleId_ = 0;
-
-        internalGetMutableActivityCoinMap().clear();
-        meetCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        dKJDABCNGBP_ = false;
-
-        beginTime_ = 0;
-
-        iNGFNLLCDOL_ = 0;
-
-        eNNDKMJIMHN_ = false;
+        activityId_ = 0;
 
         curScore_ = 0;
 
-        bKJNDLLNAML_ = false;
+        fFGHMFNFPNL_ = 0;
 
         firstDayStartTime_ = 0;
 
-        aBMOPKOIMPA_ = false;
+        lKODGHFICBH_ = 0;
 
-        fGFGECAAKJM_ = 0;
+        cDBIIEIPBFF_ = false;
 
-        gFEMIEBKKKL_ = false;
+        lCHFFKHPJIO_ = false;
 
-        cEFIPNKPEKA_ = 0;
+        iLKPGDKEIEG_ = false;
 
-        endTime_ = 0;
+        takenRewardList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        cIDDJFNIMPJ_ = 0L;
 
-        internalGetMutableWishGiftNumMap().clear();
-        pHCOMIFAIJD_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
         if (activityPushTipsDataListBuilder_ == null) {
           activityPushTipsDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000080);
+          bitField0_ = (bitField0_ & ~0x00000010);
         } else {
           activityPushTipsDataListBuilder_.clear();
         }
+        mPPFCLCENAP_ = 0;
+
+        gONEPFEDMEL_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        nJCGNGLKPBJ_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        oDMJHPBFIKO_ = false;
+
+        internalGetMutableActivityCoinMap().clear();
+        internalGetMutableWishGiftNumMap().clear();
         detailCase_ = 0;
         detail_ = null;
         return this;
@@ -8443,12 +2186,15 @@ public final class ActivityInfoOuterClass {
       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_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          dNMOEAFCDGC_.makeImmutable();
+          meetCondList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.dNMOEAFCDGC_ = dNMOEAFCDGC_;
+        result.meetCondList_ = meetCondList_;
+        result.endTime_ = endTime_;
+        result.beginTime_ = beginTime_;
+        result.isFinished_ = isFinished_;
+        result.fALGLCJDKCL_ = fALGLCJDKCL_;
         if (watcherInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             watcherInfoList_ = java.util.Collections.unmodifiableList(watcherInfoList_);
@@ -8458,645 +2204,60 @@ public final class ActivityInfoOuterClass {
         } else {
           result.watcherInfoList_ = watcherInfoListBuilder_.build();
         }
-        result.isFinished_ = isFinished_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          lJLDCLMAMNL_.makeImmutable();
+          expireCondList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.lJLDCLMAMNL_ = lJLDCLMAMNL_;
-        result.pJJKJGALLGD_ = pJJKJGALLGD_;
-        result.activityType_ = activityType_;
+        result.expireCondList_ = expireCondList_;
         result.scheduleId_ = scheduleId_;
-        result.activityCoinMap_ = internalGetActivityCoinMap();
-        result.activityCoinMap_.makeImmutable();
-        if (((bitField0_ & 0x00000010) != 0)) {
-          meetCondList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
-        }
-        result.meetCondList_ = meetCondList_;
-        result.dKJDABCNGBP_ = dKJDABCNGBP_;
-        result.beginTime_ = beginTime_;
-        result.iNGFNLLCDOL_ = iNGFNLLCDOL_;
-        result.eNNDKMJIMHN_ = eNNDKMJIMHN_;
+        result.oNCLIGBKLPF_ = oNCLIGBKLPF_;
+        result.activityType_ = activityType_;
+        result.activityId_ = activityId_;
         result.curScore_ = curScore_;
-        result.bKJNDLLNAML_ = bKJNDLLNAML_;
+        result.fFGHMFNFPNL_ = fFGHMFNFPNL_;
         result.firstDayStartTime_ = firstDayStartTime_;
-        result.aBMOPKOIMPA_ = aBMOPKOIMPA_;
-        result.fGFGECAAKJM_ = fGFGECAAKJM_;
-        result.gFEMIEBKKKL_ = gFEMIEBKKKL_;
-        result.cEFIPNKPEKA_ = cEFIPNKPEKA_;
-        result.endTime_ = endTime_;
-        result.wishGiftNumMap_ = internalGetWishGiftNumMap();
-        result.wishGiftNumMap_.makeImmutable();
-        if (((bitField0_ & 0x00000040) != 0)) {
-          pHCOMIFAIJD_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000040);
+        result.lKODGHFICBH_ = lKODGHFICBH_;
+        result.cDBIIEIPBFF_ = cDBIIEIPBFF_;
+        result.lCHFFKHPJIO_ = lCHFFKHPJIO_;
+        result.iLKPGDKEIEG_ = iLKPGDKEIEG_;
+        if (((bitField0_ & 0x00000008) != 0)) {
+          takenRewardList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.pHCOMIFAIJD_ = pHCOMIFAIJD_;
+        result.takenRewardList_ = takenRewardList_;
+        result.cIDDJFNIMPJ_ = cIDDJFNIMPJ_;
         if (activityPushTipsDataListBuilder_ == null) {
-          if (((bitField0_ & 0x00000080) != 0)) {
+          if (((bitField0_ & 0x00000010) != 0)) {
             activityPushTipsDataList_ = java.util.Collections.unmodifiableList(activityPushTipsDataList_);
-            bitField0_ = (bitField0_ & ~0x00000080);
+            bitField0_ = (bitField0_ & ~0x00000010);
           }
           result.activityPushTipsDataList_ = activityPushTipsDataList_;
         } else {
           result.activityPushTipsDataList_ = activityPushTipsDataListBuilder_.build();
         }
-        if (detailCase_ == 10) {
-          if (samLampInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = samLampInfoBuilder_.build();
-          }
+        result.mPPFCLCENAP_ = mPPFCLCENAP_;
+        if (((bitField0_ & 0x00000020) != 0)) {
+          gONEPFEDMEL_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000020);
         }
-        if (detailCase_ == 7) {
-          if (crucibleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = crucibleInfoBuilder_.build();
-          }
+        result.gONEPFEDMEL_ = gONEPFEDMEL_;
+        if (((bitField0_ & 0x00000040) != 0)) {
+          nJCGNGLKPBJ_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000040);
         }
-        if (detailCase_ == 8) {
-          if (salesmanInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = salesmanInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 6) {
-          if (trialAvatarInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = trialAvatarInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1846) {
-          if (deliveryInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = deliveryInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 260) {
-          if (asterInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = asterInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 826) {
-          if (flightInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = flightInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 110) {
-          if (dragonSpineInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = dragonSpineInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1010) {
-          if (effigyInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = effigyInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1754) {
-          if (treasureMapInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = treasureMapInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 331) {
-          if (blessingInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = blessingInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1114) {
-          if (seaLampInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = seaLampInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 674) {
-          if (expeditionInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = expeditionInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 39) {
-          if (arenaChallengeInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = arenaChallengeInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 293) {
-          if (fleurFairInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fleurFairInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1997) {
-          if (waterSpiritInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = waterSpiritInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1757) {
-          if (challnelerSlabInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = challnelerSlabInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1622) {
-          if (mistTrialActivityInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = mistTrialActivityInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1747) {
-          if (hideAndSeekInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = hideAndSeekInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1284) {
-          if (findHilichurlInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = findHilichurlInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 950) {
-          if (summerTimeInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = summerTimeInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 519) {
-          if (buoyantCombatInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = buoyantCombatInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 305) {
-          if (echoShellInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = echoShellInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1864) {
-          if (bounceConjuringInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = bounceConjuringInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 915) {
-          if (blitzRushInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = blitzRushInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1087) {
-          if (chessInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = chessInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 2008) {
-          if (sumoInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = sumoInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 389) {
-          if (moonfinTrialInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = moonfinTrialInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1971) {
-          if (lunaRiteInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = lunaRiteInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1854) {
-          if (plantFlowerInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = plantFlowerInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1847) {
+        result.nJCGNGLKPBJ_ = nJCGNGLKPBJ_;
+        result.oDMJHPBFIKO_ = oDMJHPBFIKO_;
+        result.activityCoinMap_ = internalGetActivityCoinMap();
+        result.activityCoinMap_.makeImmutable();
+        result.wishGiftNumMap_ = internalGetWishGiftNumMap();
+        result.wishGiftNumMap_.makeImmutable();
+        if (detailCase_ == 1099) {
           if (musicGameInfoBuilder_ == null) {
             result.detail_ = detail_;
           } else {
             result.detail_ = musicGameInfoBuilder_.build();
           }
         }
-        if (detailCase_ == 1025) {
-          if (roguelikeDungoenInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = roguelikeDungoenInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1855) {
-          if (digInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = digInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1176) {
-          if (hachiInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = hachiInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 2014) {
-          if (winterCampInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = winterCampInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1485) {
-          if (potionInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = potionInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 944) {
-          if (tanukiTravelActivityInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = tanukiTravelActivityInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1980) {
-          if (lanternRiteActivityInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = lanternRiteActivityInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 114) {
-          if (michiaeMatsuriInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = michiaeMatsuriInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1441) {
-          if (bartenderInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = bartenderInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1795) {
-          if (ugcInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = ugcInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1301) {
-          if (crystalLinkInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = crystalLinkInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 54) {
-          if (irodoriInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = irodoriInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1492) {
-          if (photoInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = photoInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 446) {
-          if (spiceInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = spiceInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1192) {
-          if (gachaInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gachaInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 38) {
-          if (luminanceStoneChallengeInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = luminanceStoneChallengeInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 427) {
-          if (rogueDiaryInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = rogueDiaryInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 910) {
-          if (summerTimeV2InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = summerTimeV2InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1044) {
-          if (islandPartyInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = islandPartyInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1263) {
-          if (gearInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gearInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 356) {
-          if (gravenInnocenceInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gravenInnocenceInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 508) {
-          if (instableSprayInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = instableSprayInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1474) {
-          if (muqadasPotionInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = muqadasPotionInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1251) {
-          if (treasureSeelieInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = treasureSeelieInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1028) {
-          if (rockBoardExploreInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = rockBoardExploreInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1465) {
-          if (vintageInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = vintageInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 768) {
-          if (windFieldInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = windFieldInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 834) {
-          if (fungusFighterInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fungusFighterInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1222) {
-          if (charAmusementInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = charAmusementInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1275) {
-          if (effigyChallengeInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = effigyChallengeInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 839) {
-          if (coinCollectInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = coinCollectInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 551) {
-          if (brickBreakerInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = brickBreakerInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1670) {
-          if (duelHeartInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = duelHeartInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 833) {
-          if (seaLampV3InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = seaLampV3InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1165) {
-          if (teamChainInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = teamChainInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 981) {
-          if (electroherculesBattleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = electroherculesBattleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1664) {
-          if (gcgFestivalInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gcgFestivalInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1982) {
-          if (fleurFairV2InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fleurFairV2InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1541) {
-          if (fungusFighterV2InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fungusFighterV2InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1524) {
-          if (akaFesInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = akaFesInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 626) {
-          if (sandwormCannonDetailInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = sandwormCannonDetailInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1077) {
-          if (sorushTrialInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = sorushTrialInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1869) {
-          if (journeyInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = journeyInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1321) {
-          if (effigyChallengeV4InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = effigyChallengeV4InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1304) {
-          if (gcgPveInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gcgPveInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 991) {
-          if (ugcV2InfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = ugcV2InfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 306) {
-          if (penumbraAdventureInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = penumbraAdventureInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 947) {
-          if (animalViewInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = animalViewInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1213) {
-          if (activityMultiCharacterInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = activityMultiCharacterInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 124) {
-          if (gcgPveInfiniteInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gcgPveInfiniteInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 62) {
-          if (toyBattleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = toyBattleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 226) {
-          if (photoUnderseaInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = photoUnderseaInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1035) {
-          if (fontaineGatherInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fontaineGatherInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 871) {
-          if (gcgPvePuzzleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = gcgPvePuzzleInfoBuilder_.build();
-          }
-        }
         result.detailCase_ = detailCase_;
         onBuilt();
         return result;
@@ -9146,19 +2307,28 @@ public final class ActivityInfoOuterClass {
 
       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.dNMOEAFCDGC_.isEmpty()) {
-          if (dNMOEAFCDGC_.isEmpty()) {
-            dNMOEAFCDGC_ = other.dNMOEAFCDGC_;
+        if (!other.meetCondList_.isEmpty()) {
+          if (meetCondList_.isEmpty()) {
+            meetCondList_ = other.meetCondList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureDNMOEAFCDGCIsMutable();
-            dNMOEAFCDGC_.addAll(other.dNMOEAFCDGC_);
+            ensureMeetCondListIsMutable();
+            meetCondList_.addAll(other.meetCondList_);
           }
           onChanged();
         }
+        if (other.getEndTime() != 0) {
+          setEndTime(other.getEndTime());
+        }
+        if (other.getBeginTime() != 0) {
+          setBeginTime(other.getBeginTime());
+        }
+        if (other.getIsFinished() != false) {
+          setIsFinished(other.getIsFinished());
+        }
+        if (other.getFALGLCJDKCL() != false) {
+          setFALGLCJDKCL(other.getFALGLCJDKCL());
+        }
         if (watcherInfoListBuilder_ == null) {
           if (!other.watcherInfoList_.isEmpty()) {
             if (watcherInfoList_.isEmpty()) {
@@ -9185,93 +2355,67 @@ public final class ActivityInfoOuterClass {
             }
           }
         }
-        if (other.getIsFinished() != false) {
-          setIsFinished(other.getIsFinished());
-        }
-        if (!other.lJLDCLMAMNL_.isEmpty()) {
-          if (lJLDCLMAMNL_.isEmpty()) {
-            lJLDCLMAMNL_ = other.lJLDCLMAMNL_;
+        if (!other.expireCondList_.isEmpty()) {
+          if (expireCondList_.isEmpty()) {
+            expireCondList_ = other.expireCondList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureLJLDCLMAMNLIsMutable();
-            lJLDCLMAMNL_.addAll(other.lJLDCLMAMNL_);
+            ensureExpireCondListIsMutable();
+            expireCondList_.addAll(other.expireCondList_);
           }
           onChanged();
         }
-        if (other.getPJJKJGALLGD() != false) {
-          setPJJKJGALLGD(other.getPJJKJGALLGD());
-        }
-        if (other.getActivityType() != 0) {
-          setActivityType(other.getActivityType());
-        }
         if (other.getScheduleId() != 0) {
           setScheduleId(other.getScheduleId());
         }
-        internalGetMutableActivityCoinMap().mergeFrom(
-            other.internalGetActivityCoinMap());
-        if (!other.meetCondList_.isEmpty()) {
-          if (meetCondList_.isEmpty()) {
-            meetCondList_ = other.meetCondList_;
-            bitField0_ = (bitField0_ & ~0x00000010);
-          } else {
-            ensureMeetCondListIsMutable();
-            meetCondList_.addAll(other.meetCondList_);
-          }
-          onChanged();
+        if (other.getONCLIGBKLPF() != false) {
+          setONCLIGBKLPF(other.getONCLIGBKLPF());
         }
-        if (other.getDKJDABCNGBP() != false) {
-          setDKJDABCNGBP(other.getDKJDABCNGBP());
+        if (other.getActivityType() != 0) {
+          setActivityType(other.getActivityType());
         }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
-        }
-        if (other.getINGFNLLCDOL() != 0) {
-          setINGFNLLCDOL(other.getINGFNLLCDOL());
-        }
-        if (other.getENNDKMJIMHN() != false) {
-          setENNDKMJIMHN(other.getENNDKMJIMHN());
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
         }
         if (other.getCurScore() != 0) {
           setCurScore(other.getCurScore());
         }
-        if (other.getBKJNDLLNAML() != false) {
-          setBKJNDLLNAML(other.getBKJNDLLNAML());
+        if (other.getFFGHMFNFPNL() != 0) {
+          setFFGHMFNFPNL(other.getFFGHMFNFPNL());
         }
         if (other.getFirstDayStartTime() != 0) {
           setFirstDayStartTime(other.getFirstDayStartTime());
         }
-        if (other.getABMOPKOIMPA() != false) {
-          setABMOPKOIMPA(other.getABMOPKOIMPA());
+        if (other.getLKODGHFICBH() != 0) {
+          setLKODGHFICBH(other.getLKODGHFICBH());
         }
-        if (other.getFGFGECAAKJM() != 0) {
-          setFGFGECAAKJM(other.getFGFGECAAKJM());
+        if (other.getCDBIIEIPBFF() != false) {
+          setCDBIIEIPBFF(other.getCDBIIEIPBFF());
         }
-        if (other.getGFEMIEBKKKL() != false) {
-          setGFEMIEBKKKL(other.getGFEMIEBKKKL());
+        if (other.getLCHFFKHPJIO() != false) {
+          setLCHFFKHPJIO(other.getLCHFFKHPJIO());
         }
-        if (other.getCEFIPNKPEKA() != 0) {
-          setCEFIPNKPEKA(other.getCEFIPNKPEKA());
+        if (other.getILKPGDKEIEG() != false) {
+          setILKPGDKEIEG(other.getILKPGDKEIEG());
         }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
-        internalGetMutableWishGiftNumMap().mergeFrom(
-            other.internalGetWishGiftNumMap());
-        if (!other.pHCOMIFAIJD_.isEmpty()) {
-          if (pHCOMIFAIJD_.isEmpty()) {
-            pHCOMIFAIJD_ = other.pHCOMIFAIJD_;
-            bitField0_ = (bitField0_ & ~0x00000040);
+        if (!other.takenRewardList_.isEmpty()) {
+          if (takenRewardList_.isEmpty()) {
+            takenRewardList_ = other.takenRewardList_;
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensurePHCOMIFAIJDIsMutable();
-            pHCOMIFAIJD_.addAll(other.pHCOMIFAIJD_);
+            ensureTakenRewardListIsMutable();
+            takenRewardList_.addAll(other.takenRewardList_);
           }
           onChanged();
         }
+        if (other.getCIDDJFNIMPJ() != 0L) {
+          setCIDDJFNIMPJ(other.getCIDDJFNIMPJ());
+        }
         if (activityPushTipsDataListBuilder_ == null) {
           if (!other.activityPushTipsDataList_.isEmpty()) {
             if (activityPushTipsDataList_.isEmpty()) {
               activityPushTipsDataList_ = other.activityPushTipsDataList_;
-              bitField0_ = (bitField0_ & ~0x00000080);
+              bitField0_ = (bitField0_ & ~0x00000010);
             } else {
               ensureActivityPushTipsDataListIsMutable();
               activityPushTipsDataList_.addAll(other.activityPushTipsDataList_);
@@ -9284,7 +2428,7 @@ public final class ActivityInfoOuterClass {
               activityPushTipsDataListBuilder_.dispose();
               activityPushTipsDataListBuilder_ = null;
               activityPushTipsDataList_ = other.activityPushTipsDataList_;
-              bitField0_ = (bitField0_ & ~0x00000080);
+              bitField0_ = (bitField0_ & ~0x00000010);
               activityPushTipsDataListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getActivityPushTipsDataListFieldBuilder() : null;
@@ -9293,347 +2437,41 @@ public final class ActivityInfoOuterClass {
             }
           }
         }
+        if (other.getMPPFCLCENAP() != 0) {
+          setMPPFCLCENAP(other.getMPPFCLCENAP());
+        }
+        if (!other.gONEPFEDMEL_.isEmpty()) {
+          if (gONEPFEDMEL_.isEmpty()) {
+            gONEPFEDMEL_ = other.gONEPFEDMEL_;
+            bitField0_ = (bitField0_ & ~0x00000020);
+          } else {
+            ensureGONEPFEDMELIsMutable();
+            gONEPFEDMEL_.addAll(other.gONEPFEDMEL_);
+          }
+          onChanged();
+        }
+        if (!other.nJCGNGLKPBJ_.isEmpty()) {
+          if (nJCGNGLKPBJ_.isEmpty()) {
+            nJCGNGLKPBJ_ = other.nJCGNGLKPBJ_;
+            bitField0_ = (bitField0_ & ~0x00000040);
+          } else {
+            ensureNJCGNGLKPBJIsMutable();
+            nJCGNGLKPBJ_.addAll(other.nJCGNGLKPBJ_);
+          }
+          onChanged();
+        }
+        if (other.getODMJHPBFIKO() != false) {
+          setODMJHPBFIKO(other.getODMJHPBFIKO());
+        }
+        internalGetMutableActivityCoinMap().mergeFrom(
+            other.internalGetActivityCoinMap());
+        internalGetMutableWishGiftNumMap().mergeFrom(
+            other.internalGetWishGiftNumMap());
         switch (other.getDetailCase()) {
-          case SAM_LAMP_INFO: {
-            mergeSamLampInfo(other.getSamLampInfo());
-            break;
-          }
-          case CRUCIBLE_INFO: {
-            mergeCrucibleInfo(other.getCrucibleInfo());
-            break;
-          }
-          case SALESMAN_INFO: {
-            mergeSalesmanInfo(other.getSalesmanInfo());
-            break;
-          }
-          case TRIAL_AVATAR_INFO: {
-            mergeTrialAvatarInfo(other.getTrialAvatarInfo());
-            break;
-          }
-          case DELIVERY_INFO: {
-            mergeDeliveryInfo(other.getDeliveryInfo());
-            break;
-          }
-          case ASTER_INFO: {
-            mergeAsterInfo(other.getAsterInfo());
-            break;
-          }
-          case FLIGHT_INFO: {
-            mergeFlightInfo(other.getFlightInfo());
-            break;
-          }
-          case DRAGON_SPINE_INFO: {
-            mergeDragonSpineInfo(other.getDragonSpineInfo());
-            break;
-          }
-          case EFFIGY_INFO: {
-            mergeEffigyInfo(other.getEffigyInfo());
-            break;
-          }
-          case TREASURE_MAP_INFO: {
-            mergeTreasureMapInfo(other.getTreasureMapInfo());
-            break;
-          }
-          case BLESSING_INFO: {
-            mergeBlessingInfo(other.getBlessingInfo());
-            break;
-          }
-          case SEA_LAMP_INFO: {
-            mergeSeaLampInfo(other.getSeaLampInfo());
-            break;
-          }
-          case EXPEDITION_INFO: {
-            mergeExpeditionInfo(other.getExpeditionInfo());
-            break;
-          }
-          case ARENA_CHALLENGE_INFO: {
-            mergeArenaChallengeInfo(other.getArenaChallengeInfo());
-            break;
-          }
-          case FLEUR_FAIR_INFO: {
-            mergeFleurFairInfo(other.getFleurFairInfo());
-            break;
-          }
-          case WATER_SPIRIT_INFO: {
-            mergeWaterSpiritInfo(other.getWaterSpiritInfo());
-            break;
-          }
-          case CHALLNELER_SLAB_INFO: {
-            mergeChallnelerSlabInfo(other.getChallnelerSlabInfo());
-            break;
-          }
-          case MIST_TRIAL_ACTIVITY_INFO: {
-            mergeMistTrialActivityInfo(other.getMistTrialActivityInfo());
-            break;
-          }
-          case HIDE_AND_SEEK_INFO: {
-            mergeHideAndSeekInfo(other.getHideAndSeekInfo());
-            break;
-          }
-          case FIND_HILICHURL_INFO: {
-            mergeFindHilichurlInfo(other.getFindHilichurlInfo());
-            break;
-          }
-          case SUMMER_TIME_INFO: {
-            mergeSummerTimeInfo(other.getSummerTimeInfo());
-            break;
-          }
-          case BUOYANT_COMBAT_INFO: {
-            mergeBuoyantCombatInfo(other.getBuoyantCombatInfo());
-            break;
-          }
-          case ECHO_SHELL_INFO: {
-            mergeEchoShellInfo(other.getEchoShellInfo());
-            break;
-          }
-          case BOUNCE_CONJURING_INFO: {
-            mergeBounceConjuringInfo(other.getBounceConjuringInfo());
-            break;
-          }
-          case BLITZ_RUSH_INFO: {
-            mergeBlitzRushInfo(other.getBlitzRushInfo());
-            break;
-          }
-          case CHESS_INFO: {
-            mergeChessInfo(other.getChessInfo());
-            break;
-          }
-          case SUMO_INFO: {
-            mergeSumoInfo(other.getSumoInfo());
-            break;
-          }
-          case MOONFIN_TRIAL_INFO: {
-            mergeMoonfinTrialInfo(other.getMoonfinTrialInfo());
-            break;
-          }
-          case LUNA_RITE_INFO: {
-            mergeLunaRiteInfo(other.getLunaRiteInfo());
-            break;
-          }
-          case PLANT_FLOWER_INFO: {
-            mergePlantFlowerInfo(other.getPlantFlowerInfo());
-            break;
-          }
           case MUSIC_GAME_INFO: {
             mergeMusicGameInfo(other.getMusicGameInfo());
             break;
           }
-          case ROGUELIKE_DUNGOEN_INFO: {
-            mergeRoguelikeDungoenInfo(other.getRoguelikeDungoenInfo());
-            break;
-          }
-          case DIG_INFO: {
-            mergeDigInfo(other.getDigInfo());
-            break;
-          }
-          case HACHI_INFO: {
-            mergeHachiInfo(other.getHachiInfo());
-            break;
-          }
-          case WINTER_CAMP_INFO: {
-            mergeWinterCampInfo(other.getWinterCampInfo());
-            break;
-          }
-          case POTION_INFO: {
-            mergePotionInfo(other.getPotionInfo());
-            break;
-          }
-          case TANUKI_TRAVEL_ACTIVITY_INFO: {
-            mergeTanukiTravelActivityInfo(other.getTanukiTravelActivityInfo());
-            break;
-          }
-          case LANTERN_RITE_ACTIVITY_INFO: {
-            mergeLanternRiteActivityInfo(other.getLanternRiteActivityInfo());
-            break;
-          }
-          case MICHIAE_MATSURI_INFO: {
-            mergeMichiaeMatsuriInfo(other.getMichiaeMatsuriInfo());
-            break;
-          }
-          case BARTENDER_INFO: {
-            mergeBartenderInfo(other.getBartenderInfo());
-            break;
-          }
-          case UGC_INFO: {
-            mergeUgcInfo(other.getUgcInfo());
-            break;
-          }
-          case CRYSTAL_LINK_INFO: {
-            mergeCrystalLinkInfo(other.getCrystalLinkInfo());
-            break;
-          }
-          case IRODORI_INFO: {
-            mergeIrodoriInfo(other.getIrodoriInfo());
-            break;
-          }
-          case PHOTO_INFO: {
-            mergePhotoInfo(other.getPhotoInfo());
-            break;
-          }
-          case SPICE_INFO: {
-            mergeSpiceInfo(other.getSpiceInfo());
-            break;
-          }
-          case GACHA_INFO: {
-            mergeGachaInfo(other.getGachaInfo());
-            break;
-          }
-          case LUMINANCE_STONE_CHALLENGE_INFO: {
-            mergeLuminanceStoneChallengeInfo(other.getLuminanceStoneChallengeInfo());
-            break;
-          }
-          case ROGUE_DIARY_INFO: {
-            mergeRogueDiaryInfo(other.getRogueDiaryInfo());
-            break;
-          }
-          case SUMMER_TIME_V2_INFO: {
-            mergeSummerTimeV2Info(other.getSummerTimeV2Info());
-            break;
-          }
-          case ISLAND_PARTY_INFO: {
-            mergeIslandPartyInfo(other.getIslandPartyInfo());
-            break;
-          }
-          case GEAR_INFO: {
-            mergeGearInfo(other.getGearInfo());
-            break;
-          }
-          case GRAVEN_INNOCENCE_INFO: {
-            mergeGravenInnocenceInfo(other.getGravenInnocenceInfo());
-            break;
-          }
-          case INSTABLE_SPRAY_INFO: {
-            mergeInstableSprayInfo(other.getInstableSprayInfo());
-            break;
-          }
-          case MUQADAS_POTION_INFO: {
-            mergeMuqadasPotionInfo(other.getMuqadasPotionInfo());
-            break;
-          }
-          case TREASURE_SEELIE_INFO: {
-            mergeTreasureSeelieInfo(other.getTreasureSeelieInfo());
-            break;
-          }
-          case ROCK_BOARD_EXPLORE_INFO: {
-            mergeRockBoardExploreInfo(other.getRockBoardExploreInfo());
-            break;
-          }
-          case VINTAGE_INFO: {
-            mergeVintageInfo(other.getVintageInfo());
-            break;
-          }
-          case WIND_FIELD_INFO: {
-            mergeWindFieldInfo(other.getWindFieldInfo());
-            break;
-          }
-          case FUNGUS_FIGHTER_INFO: {
-            mergeFungusFighterInfo(other.getFungusFighterInfo());
-            break;
-          }
-          case CHAR_AMUSEMENT_INFO: {
-            mergeCharAmusementInfo(other.getCharAmusementInfo());
-            break;
-          }
-          case EFFIGY_CHALLENGE_INFO: {
-            mergeEffigyChallengeInfo(other.getEffigyChallengeInfo());
-            break;
-          }
-          case COIN_COLLECT_INFO: {
-            mergeCoinCollectInfo(other.getCoinCollectInfo());
-            break;
-          }
-          case BRICK_BREAKER_INFO: {
-            mergeBrickBreakerInfo(other.getBrickBreakerInfo());
-            break;
-          }
-          case DUEL_HEART_INFO: {
-            mergeDuelHeartInfo(other.getDuelHeartInfo());
-            break;
-          }
-          case SEA_LAMP_V3_INFO: {
-            mergeSeaLampV3Info(other.getSeaLampV3Info());
-            break;
-          }
-          case TEAM_CHAIN_INFO: {
-            mergeTeamChainInfo(other.getTeamChainInfo());
-            break;
-          }
-          case ELECTROHERCULES_BATTLE_INFO: {
-            mergeElectroherculesBattleInfo(other.getElectroherculesBattleInfo());
-            break;
-          }
-          case GCG_FESTIVAL_INFO: {
-            mergeGcgFestivalInfo(other.getGcgFestivalInfo());
-            break;
-          }
-          case FLEUR_FAIR_V2_INFO: {
-            mergeFleurFairV2Info(other.getFleurFairV2Info());
-            break;
-          }
-          case FUNGUS_FIGHTER_V2_INFO: {
-            mergeFungusFighterV2Info(other.getFungusFighterV2Info());
-            break;
-          }
-          case AKA_FES_INFO: {
-            mergeAkaFesInfo(other.getAkaFesInfo());
-            break;
-          }
-          case SANDWORM_CANNON_DETAIL_INFO: {
-            mergeSandwormCannonDetailInfo(other.getSandwormCannonDetailInfo());
-            break;
-          }
-          case SORUSH_TRIAL_INFO: {
-            mergeSorushTrialInfo(other.getSorushTrialInfo());
-            break;
-          }
-          case JOURNEY_INFO: {
-            mergeJourneyInfo(other.getJourneyInfo());
-            break;
-          }
-          case EFFIGY_CHALLENGE_V4_INFO: {
-            mergeEffigyChallengeV4Info(other.getEffigyChallengeV4Info());
-            break;
-          }
-          case GCG_PVE_INFO: {
-            mergeGcgPveInfo(other.getGcgPveInfo());
-            break;
-          }
-          case UGC_V2_INFO: {
-            mergeUgcV2Info(other.getUgcV2Info());
-            break;
-          }
-          case PENUMBRA_ADVENTURE_INFO: {
-            mergePenumbraAdventureInfo(other.getPenumbraAdventureInfo());
-            break;
-          }
-          case ANIMAL_VIEW_INFO: {
-            mergeAnimalViewInfo(other.getAnimalViewInfo());
-            break;
-          }
-          case ACTIVITY_MULTI_CHARACTER_INFO: {
-            mergeActivityMultiCharacterInfo(other.getActivityMultiCharacterInfo());
-            break;
-          }
-          case GCG_PVE_INFINITE_INFO: {
-            mergeGcgPveInfiniteInfo(other.getGcgPveInfiniteInfo());
-            break;
-          }
-          case TOY_BATTLE_INFO: {
-            mergeToyBattleInfo(other.getToyBattleInfo());
-            break;
-          }
-          case PHOTO_UNDERSEA_INFO: {
-            mergePhotoUnderseaInfo(other.getPhotoUnderseaInfo());
-            break;
-          }
-          case FONTAINE_GATHER_INFO: {
-            mergeFontaineGatherInfo(other.getFontaineGatherInfo());
-            break;
-          }
-          case GCG_PVE_PUZZLE_INFO: {
-            mergeGcgPvePuzzleInfo(other.getGcgPvePuzzleInfo());
-            break;
-          }
           case DETAIL_NOT_SET: {
             break;
           }
@@ -9683,116 +2521,237 @@ public final class ActivityInfoOuterClass {
 
       private int bitField0_;
 
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 3;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList dNMOEAFCDGC_ = emptyIntList();
-      private void ensureDNMOEAFCDGCIsMutable() {
+      private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList();
+      private void ensureMeetCondListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          dNMOEAFCDGC_ = mutableCopy(dNMOEAFCDGC_);
+          meetCondList_ = mutableCopy(meetCondList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-       * @return A list containing the dNMOEAFCDGC.
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
+       * @return A list containing the meetCondList.
        */
       public java.util.List<java.lang.Integer>
-          getDNMOEAFCDGCList() {
+          getMeetCondListList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(dNMOEAFCDGC_) : dNMOEAFCDGC_;
+                 java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_;
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-       * @return The count of dNMOEAFCDGC.
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
+       * @return The count of meetCondList.
        */
-      public int getDNMOEAFCDGCCount() {
-        return dNMOEAFCDGC_.size();
+      public int getMeetCondListCount() {
+        return meetCondList_.size();
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param index The index of the element to return.
-       * @return The dNMOEAFCDGC at the given index.
+       * @return The meetCondList at the given index.
        */
-      public int getDNMOEAFCDGC(int index) {
-        return dNMOEAFCDGC_.getInt(index);
+      public int getMeetCondList(int index) {
+        return meetCondList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
        * @param index The index to set the value at.
-       * @param value The dNMOEAFCDGC to set.
+       * @param value The meetCondList to set.
        * @return This builder for chaining.
        */
-      public Builder setDNMOEAFCDGC(
+      public Builder setMeetCondList(
           int index, int value) {
-        ensureDNMOEAFCDGCIsMutable();
-        dNMOEAFCDGC_.setInt(index, value);
+        ensureMeetCondListIsMutable();
+        meetCondList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-       * @param value The dNMOEAFCDGC to add.
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
+       * @param value The meetCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addDNMOEAFCDGC(int value) {
-        ensureDNMOEAFCDGCIsMutable();
-        dNMOEAFCDGC_.addInt(value);
+      public Builder addMeetCondList(int value) {
+        ensureMeetCondListIsMutable();
+        meetCondList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
-       * @param values The dNMOEAFCDGC to add.
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
+       * @param values The meetCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllDNMOEAFCDGC(
+      public Builder addAllMeetCondList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureDNMOEAFCDGCIsMutable();
+        ensureMeetCondListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, dNMOEAFCDGC_);
+            values, meetCondList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 DNMOEAFCDGC = 1736;</code>
+       * <pre>
+       * 11
+       * </pre>
+       *
+       * <code>repeated uint32 meet_cond_list = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDNMOEAFCDGC() {
-        dNMOEAFCDGC_ = emptyIntList();
+      public Builder clearMeetCondList() {
+        meetCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
+      private int endTime_ ;
+      /**
+       * <code>uint32 end_time = 4;</code>
+       * @return The endTime.
+       */
+      @java.lang.Override
+      public int getEndTime() {
+        return endTime_;
+      }
+      /**
+       * <code>uint32 end_time = 4;</code>
+       * @param value The endTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndTime(int value) {
+        
+        endTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 end_time = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndTime() {
+        
+        endTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int beginTime_ ;
+      /**
+       * <code>uint32 begin_time = 6;</code>
+       * @return The beginTime.
+       */
+      @java.lang.Override
+      public int getBeginTime() {
+        return beginTime_;
+      }
+      /**
+       * <code>uint32 begin_time = 6;</code>
+       * @param value The beginTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBeginTime(int value) {
+        
+        beginTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 begin_time = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBeginTime() {
+        
+        beginTime_ = 0;
+        onChanged();
+        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 boolean fALGLCJDKCL_ ;
+      /**
+       * <code>bool FALGLCJDKCL = 8;</code>
+       * @return The fALGLCJDKCL.
+       */
+      @java.lang.Override
+      public boolean getFALGLCJDKCL() {
+        return fALGLCJDKCL_;
+      }
+      /**
+       * <code>bool FALGLCJDKCL = 8;</code>
+       * @param value The fALGLCJDKCL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFALGLCJDKCL(boolean value) {
+        
+        fALGLCJDKCL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool FALGLCJDKCL = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFALGLCJDKCL() {
+        
+        fALGLCJDKCL_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> watcherInfoList_ =
         java.util.Collections.emptyList();
       private void ensureWatcherInfoListIsMutable() {
@@ -9806,7 +2765,7 @@ public final class ActivityInfoOuterClass {
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> watcherInfoListBuilder_;
 
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> getWatcherInfoListList() {
         if (watcherInfoListBuilder_ == null) {
@@ -9816,7 +2775,7 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public int getWatcherInfoListCount() {
         if (watcherInfoListBuilder_ == null) {
@@ -9826,7 +2785,7 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo getWatcherInfoList(int index) {
         if (watcherInfoListBuilder_ == null) {
@@ -9836,7 +2795,7 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder setWatcherInfoList(
           int index, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
@@ -9853,7 +2812,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder setWatcherInfoList(
           int index, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -9867,7 +2826,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder addWatcherInfoList(emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
         if (watcherInfoListBuilder_ == null) {
@@ -9883,7 +2842,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder addWatcherInfoList(
           int index, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo value) {
@@ -9900,7 +2859,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder addWatcherInfoList(
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -9914,7 +2873,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder addWatcherInfoList(
           int index, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder builderForValue) {
@@ -9928,7 +2887,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder addAllWatcherInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo> values) {
@@ -9943,7 +2902,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder clearWatcherInfoList() {
         if (watcherInfoListBuilder_ == null) {
@@ -9956,7 +2915,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public Builder removeWatcherInfoList(int index) {
         if (watcherInfoListBuilder_ == null) {
@@ -9969,14 +2928,14 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder getWatcherInfoListBuilder(
           int index) {
         return getWatcherInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder getWatcherInfoListOrBuilder(
           int index) {
@@ -9986,7 +2945,7 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfoOrBuilder> 
            getWatcherInfoListOrBuilderList() {
@@ -9997,14 +2956,14 @@ public final class ActivityInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder addWatcherInfoListBuilder() {
         return getWatcherInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder addWatcherInfoListBuilder(
           int index) {
@@ -10012,7 +2971,7 @@ public final class ActivityInfoOuterClass {
             index, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityWatcherInfo watcher_info_list = 9;</code>
+       * <code>repeated .ActivityWatcherInfo watcher_info_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder> 
            getWatcherInfoListBuilderList() {
@@ -10033,181 +2992,116 @@ public final class ActivityInfoOuterClass {
         return watcherInfoListBuilder_;
       }
 
-      private boolean isFinished_ ;
-      /**
-       * <code>bool is_finished = 14;</code>
-       * @return The isFinished.
-       */
-      @java.lang.Override
-      public boolean getIsFinished() {
-        return isFinished_;
-      }
-      /**
-       * <code>bool is_finished = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFinished() {
-        
-        isFinished_ = false;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList lJLDCLMAMNL_ = emptyIntList();
-      private void ensureLJLDCLMAMNLIsMutable() {
+      private com.google.protobuf.Internal.IntList expireCondList_ = emptyIntList();
+      private void ensureExpireCondListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          lJLDCLMAMNL_ = mutableCopy(lJLDCLMAMNL_);
+          expireCondList_ = mutableCopy(expireCondList_);
           bitField0_ |= 0x00000004;
          }
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-       * @return A list containing the lJLDCLMAMNL.
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * @return A list containing the expireCondList.
        */
       public java.util.List<java.lang.Integer>
-          getLJLDCLMAMNLList() {
+          getExpireCondListList() {
         return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(lJLDCLMAMNL_) : lJLDCLMAMNL_;
+                 java.util.Collections.unmodifiableList(expireCondList_) : expireCondList_;
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-       * @return The count of lJLDCLMAMNL.
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * @return The count of expireCondList.
        */
-      public int getLJLDCLMAMNLCount() {
-        return lJLDCLMAMNL_.size();
+      public int getExpireCondListCount() {
+        return expireCondList_.size();
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
        * @param index The index of the element to return.
-       * @return The lJLDCLMAMNL at the given index.
+       * @return The expireCondList at the given index.
        */
-      public int getLJLDCLMAMNL(int index) {
-        return lJLDCLMAMNL_.getInt(index);
+      public int getExpireCondList(int index) {
+        return expireCondList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
        * @param index The index to set the value at.
-       * @param value The lJLDCLMAMNL to set.
+       * @param value The expireCondList to set.
        * @return This builder for chaining.
        */
-      public Builder setLJLDCLMAMNL(
+      public Builder setExpireCondList(
           int index, int value) {
-        ensureLJLDCLMAMNLIsMutable();
-        lJLDCLMAMNL_.setInt(index, value);
+        ensureExpireCondListIsMutable();
+        expireCondList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-       * @param value The lJLDCLMAMNL to add.
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * @param value The expireCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addLJLDCLMAMNL(int value) {
-        ensureLJLDCLMAMNLIsMutable();
-        lJLDCLMAMNL_.addInt(value);
+      public Builder addExpireCondList(int value) {
+        ensureExpireCondListIsMutable();
+        expireCondList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
-       * @param values The lJLDCLMAMNL to add.
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
+       * @param values The expireCondList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllLJLDCLMAMNL(
+      public Builder addAllExpireCondList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLJLDCLMAMNLIsMutable();
+        ensureExpireCondListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lJLDCLMAMNL_);
+            values, expireCondList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 LJLDCLMAMNL = 482;</code>
+       * <pre>
+       * 1
+       * </pre>
+       *
+       * <code>repeated uint32 expire_cond_list = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLJLDCLMAMNL() {
-        lJLDCLMAMNL_ = emptyIntList();
+      public Builder clearExpireCondList() {
+        expireCondList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
-      private boolean pJJKJGALLGD_ ;
-      /**
-       * <code>bool PJJKJGALLGD = 16;</code>
-       * @return The pJJKJGALLGD.
-       */
-      @java.lang.Override
-      public boolean getPJJKJGALLGD() {
-        return pJJKJGALLGD_;
-      }
-      /**
-       * <code>bool PJJKJGALLGD = 16;</code>
-       * @param value The pJJKJGALLGD to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPJJKJGALLGD(boolean value) {
-        
-        pJJKJGALLGD_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool PJJKJGALLGD = 16;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPJJKJGALLGD() {
-        
-        pJJKJGALLGD_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int activityType_ ;
-      /**
-       * <code>uint32 activity_type = 1;</code>
-       * @return The activityType.
-       */
-      @java.lang.Override
-      public int getActivityType() {
-        return activityType_;
-      }
-      /**
-       * <code>uint32 activity_type = 1;</code>
-       * @param value The activityType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityType(int value) {
-        
-        activityType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_type = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityType() {
-        
-        activityType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 5;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -10215,7 +3109,7 @@ public final class ActivityInfoOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 5;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -10226,7 +3120,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 5;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -10236,6 +3130,886 @@ public final class ActivityInfoOuterClass {
         return this;
       }
 
+      private boolean oNCLIGBKLPF_ ;
+      /**
+       * <code>bool ONCLIGBKLPF = 13;</code>
+       * @return The oNCLIGBKLPF.
+       */
+      @java.lang.Override
+      public boolean getONCLIGBKLPF() {
+        return oNCLIGBKLPF_;
+      }
+      /**
+       * <code>bool ONCLIGBKLPF = 13;</code>
+       * @param value The oNCLIGBKLPF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setONCLIGBKLPF(boolean value) {
+        
+        oNCLIGBKLPF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool ONCLIGBKLPF = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearONCLIGBKLPF() {
+        
+        oNCLIGBKLPF_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int activityType_ ;
+      /**
+       * <code>uint32 activity_type = 14;</code>
+       * @return The activityType.
+       */
+      @java.lang.Override
+      public int getActivityType() {
+        return activityType_;
+      }
+      /**
+       * <code>uint32 activity_type = 14;</code>
+       * @param value The activityType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityType(int value) {
+        
+        activityType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityType() {
+        
+        activityType_ = 0;
+        onChanged();
+        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>
+       * @return The curScore.
+       */
+      @java.lang.Override
+      public int getCurScore() {
+        return curScore_;
+      }
+      /**
+       * <code>uint32 cur_score = 63;</code>
+       * @param value The curScore to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurScore(int value) {
+        
+        curScore_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_score = 63;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurScore() {
+        
+        curScore_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int fFGHMFNFPNL_ ;
+      /**
+       * <code>uint32 FFGHMFNFPNL = 253;</code>
+       * @return The fFGHMFNFPNL.
+       */
+      @java.lang.Override
+      public int getFFGHMFNFPNL() {
+        return fFGHMFNFPNL_;
+      }
+      /**
+       * <code>uint32 FFGHMFNFPNL = 253;</code>
+       * @param value The fFGHMFNFPNL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFFGHMFNFPNL(int value) {
+        
+        fFGHMFNFPNL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 FFGHMFNFPNL = 253;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFFGHMFNFPNL() {
+        
+        fFGHMFNFPNL_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int firstDayStartTime_ ;
+      /**
+       * <code>uint32 first_day_start_time = 373;</code>
+       * @return The firstDayStartTime.
+       */
+      @java.lang.Override
+      public int getFirstDayStartTime() {
+        return firstDayStartTime_;
+      }
+      /**
+       * <code>uint32 first_day_start_time = 373;</code>
+       * @param value The firstDayStartTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFirstDayStartTime(int value) {
+        
+        firstDayStartTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 first_day_start_time = 373;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFirstDayStartTime() {
+        
+        firstDayStartTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int lKODGHFICBH_ ;
+      /**
+       * <code>uint32 LKODGHFICBH = 426;</code>
+       * @return The lKODGHFICBH.
+       */
+      @java.lang.Override
+      public int getLKODGHFICBH() {
+        return lKODGHFICBH_;
+      }
+      /**
+       * <code>uint32 LKODGHFICBH = 426;</code>
+       * @param value The lKODGHFICBH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLKODGHFICBH(int value) {
+        
+        lKODGHFICBH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 LKODGHFICBH = 426;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLKODGHFICBH() {
+        
+        lKODGHFICBH_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean cDBIIEIPBFF_ ;
+      /**
+       * <code>bool CDBIIEIPBFF = 509;</code>
+       * @return The cDBIIEIPBFF.
+       */
+      @java.lang.Override
+      public boolean getCDBIIEIPBFF() {
+        return cDBIIEIPBFF_;
+      }
+      /**
+       * <code>bool CDBIIEIPBFF = 509;</code>
+       * @param value The cDBIIEIPBFF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCDBIIEIPBFF(boolean value) {
+        
+        cDBIIEIPBFF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool CDBIIEIPBFF = 509;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCDBIIEIPBFF() {
+        
+        cDBIIEIPBFF_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean lCHFFKHPJIO_ ;
+      /**
+       * <code>bool LCHFFKHPJIO = 678;</code>
+       * @return The lCHFFKHPJIO.
+       */
+      @java.lang.Override
+      public boolean getLCHFFKHPJIO() {
+        return lCHFFKHPJIO_;
+      }
+      /**
+       * <code>bool LCHFFKHPJIO = 678;</code>
+       * @param value The lCHFFKHPJIO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLCHFFKHPJIO(boolean value) {
+        
+        lCHFFKHPJIO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool LCHFFKHPJIO = 678;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLCHFFKHPJIO() {
+        
+        lCHFFKHPJIO_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean iLKPGDKEIEG_ ;
+      /**
+       * <code>bool ILKPGDKEIEG = 739;</code>
+       * @return The iLKPGDKEIEG.
+       */
+      @java.lang.Override
+      public boolean getILKPGDKEIEG() {
+        return iLKPGDKEIEG_;
+      }
+      /**
+       * <code>bool ILKPGDKEIEG = 739;</code>
+       * @param value The iLKPGDKEIEG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setILKPGDKEIEG(boolean value) {
+        
+        iLKPGDKEIEG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool ILKPGDKEIEG = 739;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearILKPGDKEIEG() {
+        
+        iLKPGDKEIEG_ = false;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList takenRewardList_ = emptyIntList();
+      private void ensureTakenRewardListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          takenRewardList_ = mutableCopy(takenRewardList_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @return A list containing the takenRewardList.
+       */
+      public java.util.List<java.lang.Integer>
+          getTakenRewardListList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(takenRewardList_) : takenRewardList_;
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @return The count of takenRewardList.
+       */
+      public int getTakenRewardListCount() {
+        return takenRewardList_.size();
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @param index The index of the element to return.
+       * @return The takenRewardList at the given index.
+       */
+      public int getTakenRewardList(int index) {
+        return takenRewardList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @param index The index to set the value at.
+       * @param value The takenRewardList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTakenRewardList(
+          int index, int value) {
+        ensureTakenRewardListIsMutable();
+        takenRewardList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @param value The takenRewardList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTakenRewardList(int value) {
+        ensureTakenRewardListIsMutable();
+        takenRewardList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @param values The takenRewardList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTakenRewardList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureTakenRewardListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, takenRewardList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 taken_reward_list = 818;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTakenRewardList() {
+        takenRewardList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private long cIDDJFNIMPJ_ ;
+      /**
+       * <code>uint64 CIDDJFNIMPJ = 892;</code>
+       * @return The cIDDJFNIMPJ.
+       */
+      @java.lang.Override
+      public long getCIDDJFNIMPJ() {
+        return cIDDJFNIMPJ_;
+      }
+      /**
+       * <code>uint64 CIDDJFNIMPJ = 892;</code>
+       * @param value The cIDDJFNIMPJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCIDDJFNIMPJ(long value) {
+        
+        cIDDJFNIMPJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 CIDDJFNIMPJ = 892;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCIDDJFNIMPJ() {
+        
+        cIDDJFNIMPJ_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> activityPushTipsDataList_ =
+        java.util.Collections.emptyList();
+      private void ensureActivityPushTipsDataListIsMutable() {
+        if (!((bitField0_ & 0x00000010) != 0)) {
+          activityPushTipsDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData>(activityPushTipsDataList_);
+          bitField0_ |= 0x00000010;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> activityPushTipsDataListBuilder_;
+
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> getActivityPushTipsDataListList() {
+        if (activityPushTipsDataListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(activityPushTipsDataList_);
+        } else {
+          return activityPushTipsDataListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public int getActivityPushTipsDataListCount() {
+        if (activityPushTipsDataListBuilder_ == null) {
+          return activityPushTipsDataList_.size();
+        } else {
+          return activityPushTipsDataListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          return activityPushTipsDataList_.get(index);
+        } else {
+          return activityPushTipsDataListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder setActivityPushTipsDataList(
+          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.set(index, value);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder setActivityPushTipsDataList(
+          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder addActivityPushTipsDataList(emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.add(value);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder addActivityPushTipsDataList(
+          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.add(index, value);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder addActivityPushTipsDataList(
+          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder addActivityPushTipsDataList(
+          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder addAllActivityPushTipsDataList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> values) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          ensureActivityPushTipsDataListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, activityPushTipsDataList_);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder clearActivityPushTipsDataList() {
+        if (activityPushTipsDataListBuilder_ == null) {
+          activityPushTipsDataList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000010);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public Builder removeActivityPushTipsDataList(int index) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          ensureActivityPushTipsDataListIsMutable();
+          activityPushTipsDataList_.remove(index);
+          onChanged();
+        } else {
+          activityPushTipsDataListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder getActivityPushTipsDataListBuilder(
+          int index) {
+        return getActivityPushTipsDataListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
+          int index) {
+        if (activityPushTipsDataListBuilder_ == null) {
+          return activityPushTipsDataList_.get(index);  } else {
+          return activityPushTipsDataListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
+           getActivityPushTipsDataListOrBuilderList() {
+        if (activityPushTipsDataListBuilder_ != null) {
+          return activityPushTipsDataListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(activityPushTipsDataList_);
+        }
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder addActivityPushTipsDataListBuilder() {
+        return getActivityPushTipsDataListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder addActivityPushTipsDataListBuilder(
+          int index) {
+        return getActivityPushTipsDataListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 983;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder> 
+           getActivityPushTipsDataListBuilderList() {
+        return getActivityPushTipsDataListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
+          getActivityPushTipsDataListFieldBuilder() {
+        if (activityPushTipsDataListBuilder_ == null) {
+          activityPushTipsDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder>(
+                  activityPushTipsDataList_,
+                  ((bitField0_ & 0x00000010) != 0),
+                  getParentForChildren(),
+                  isClean());
+          activityPushTipsDataList_ = null;
+        }
+        return activityPushTipsDataListBuilder_;
+      }
+
+      private int mPPFCLCENAP_ ;
+      /**
+       * <code>uint32 MPPFCLCENAP = 1040;</code>
+       * @return The mPPFCLCENAP.
+       */
+      @java.lang.Override
+      public int getMPPFCLCENAP() {
+        return mPPFCLCENAP_;
+      }
+      /**
+       * <code>uint32 MPPFCLCENAP = 1040;</code>
+       * @param value The mPPFCLCENAP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMPPFCLCENAP(int value) {
+        
+        mPPFCLCENAP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MPPFCLCENAP = 1040;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMPPFCLCENAP() {
+        
+        mPPFCLCENAP_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList gONEPFEDMEL_ = emptyLongList();
+      private void ensureGONEPFEDMELIsMutable() {
+        if (!((bitField0_ & 0x00000020) != 0)) {
+          gONEPFEDMEL_ = mutableCopy(gONEPFEDMEL_);
+          bitField0_ |= 0x00000020;
+         }
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @return A list containing the gONEPFEDMEL.
+       */
+      public java.util.List<java.lang.Long>
+          getGONEPFEDMELList() {
+        return ((bitField0_ & 0x00000020) != 0) ?
+                 java.util.Collections.unmodifiableList(gONEPFEDMEL_) : gONEPFEDMEL_;
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @return The count of gONEPFEDMEL.
+       */
+      public int getGONEPFEDMELCount() {
+        return gONEPFEDMEL_.size();
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @param index The index of the element to return.
+       * @return The gONEPFEDMEL at the given index.
+       */
+      public long getGONEPFEDMEL(int index) {
+        return gONEPFEDMEL_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @param index The index to set the value at.
+       * @param value The gONEPFEDMEL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGONEPFEDMEL(
+          int index, long value) {
+        ensureGONEPFEDMELIsMutable();
+        gONEPFEDMEL_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @param value The gONEPFEDMEL to add.
+       * @return This builder for chaining.
+       */
+      public Builder addGONEPFEDMEL(long value) {
+        ensureGONEPFEDMELIsMutable();
+        gONEPFEDMEL_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @param values The gONEPFEDMEL to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllGONEPFEDMEL(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureGONEPFEDMELIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, gONEPFEDMEL_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 GONEPFEDMEL = 1246;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGONEPFEDMEL() {
+        gONEPFEDMEL_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList nJCGNGLKPBJ_ = emptyIntList();
+      private void ensureNJCGNGLKPBJIsMutable() {
+        if (!((bitField0_ & 0x00000040) != 0)) {
+          nJCGNGLKPBJ_ = mutableCopy(nJCGNGLKPBJ_);
+          bitField0_ |= 0x00000040;
+         }
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @return A list containing the nJCGNGLKPBJ.
+       */
+      public java.util.List<java.lang.Integer>
+          getNJCGNGLKPBJList() {
+        return ((bitField0_ & 0x00000040) != 0) ?
+                 java.util.Collections.unmodifiableList(nJCGNGLKPBJ_) : nJCGNGLKPBJ_;
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @return The count of nJCGNGLKPBJ.
+       */
+      public int getNJCGNGLKPBJCount() {
+        return nJCGNGLKPBJ_.size();
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @param index The index of the element to return.
+       * @return The nJCGNGLKPBJ at the given index.
+       */
+      public int getNJCGNGLKPBJ(int index) {
+        return nJCGNGLKPBJ_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @param index The index to set the value at.
+       * @param value The nJCGNGLKPBJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNJCGNGLKPBJ(
+          int index, int value) {
+        ensureNJCGNGLKPBJIsMutable();
+        nJCGNGLKPBJ_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @param value The nJCGNGLKPBJ to add.
+       * @return This builder for chaining.
+       */
+      public Builder addNJCGNGLKPBJ(int value) {
+        ensureNJCGNGLKPBJIsMutable();
+        nJCGNGLKPBJ_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @param values The nJCGNGLKPBJ to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllNJCGNGLKPBJ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureNJCGNGLKPBJIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, nJCGNGLKPBJ_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 NJCGNGLKPBJ = 1267;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNJCGNGLKPBJ() {
+        nJCGNGLKPBJ_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
+      private boolean oDMJHPBFIKO_ ;
+      /**
+       * <code>bool ODMJHPBFIKO = 1408;</code>
+       * @return The oDMJHPBFIKO.
+       */
+      @java.lang.Override
+      public boolean getODMJHPBFIKO() {
+        return oDMJHPBFIKO_;
+      }
+      /**
+       * <code>bool ODMJHPBFIKO = 1408;</code>
+       * @param value The oDMJHPBFIKO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setODMJHPBFIKO(boolean value) {
+        
+        oDMJHPBFIKO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool ODMJHPBFIKO = 1408;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearODMJHPBFIKO() {
+        
+        oDMJHPBFIKO_ = false;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> activityCoinMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -10263,7 +4037,7 @@ public final class ActivityInfoOuterClass {
         return internalGetActivityCoinMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
 
       @java.lang.Override
@@ -10281,7 +4055,7 @@ public final class ActivityInfoOuterClass {
         return getActivityCoinMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
       @java.lang.Override
 
@@ -10289,7 +4063,7 @@ public final class ActivityInfoOuterClass {
         return internalGetActivityCoinMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
       @java.lang.Override
 
@@ -10302,7 +4076,7 @@ public final class ActivityInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
       @java.lang.Override
 
@@ -10323,7 +4097,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
 
       public Builder removeActivityCoinMap(
@@ -10342,7 +4116,7 @@ public final class ActivityInfoOuterClass {
         return internalGetMutableActivityCoinMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
       public Builder putActivityCoinMap(
           int key,
@@ -10354,7 +4128,7 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1562;</code>
+       * <code>map&lt;uint32, uint32&gt; activity_coin_map = 1791;</code>
        */
 
       public Builder putAllActivityCoinMap(
@@ -10364,457 +4138,6 @@ public final class ActivityInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList meetCondList_ = emptyIntList();
-      private void ensureMeetCondListIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          meetCondList_ = mutableCopy(meetCondList_);
-          bitField0_ |= 0x00000010;
-         }
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @return A list containing the meetCondList.
-       */
-      public java.util.List<java.lang.Integer>
-          getMeetCondListList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(meetCondList_) : meetCondList_;
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @return The count of meetCondList.
-       */
-      public int getMeetCondListCount() {
-        return meetCondList_.size();
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param index The index of the element to return.
-       * @return The meetCondList at the given index.
-       */
-      public int getMeetCondList(int index) {
-        return meetCondList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param index The index to set the value at.
-       * @param value The meetCondList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMeetCondList(
-          int index, int value) {
-        ensureMeetCondListIsMutable();
-        meetCondList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param value The meetCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addMeetCondList(int value) {
-        ensureMeetCondListIsMutable();
-        meetCondList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @param values The meetCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllMeetCondList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureMeetCondListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, meetCondList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 meet_cond_list = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMeetCondList() {
-        meetCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        onChanged();
-        return this;
-      }
-
-      private boolean dKJDABCNGBP_ ;
-      /**
-       * <code>bool DKJDABCNGBP = 13;</code>
-       * @return The dKJDABCNGBP.
-       */
-      @java.lang.Override
-      public boolean getDKJDABCNGBP() {
-        return dKJDABCNGBP_;
-      }
-      /**
-       * <code>bool DKJDABCNGBP = 13;</code>
-       * @param value The dKJDABCNGBP to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDKJDABCNGBP(boolean value) {
-        
-        dKJDABCNGBP_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool DKJDABCNGBP = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDKJDABCNGBP() {
-        
-        dKJDABCNGBP_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 2;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 2;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int iNGFNLLCDOL_ ;
-      /**
-       * <code>uint32 INGFNLLCDOL = 733;</code>
-       * @return The iNGFNLLCDOL.
-       */
-      @java.lang.Override
-      public int getINGFNLLCDOL() {
-        return iNGFNLLCDOL_;
-      }
-      /**
-       * <code>uint32 INGFNLLCDOL = 733;</code>
-       * @param value The iNGFNLLCDOL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setINGFNLLCDOL(int value) {
-        
-        iNGFNLLCDOL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 INGFNLLCDOL = 733;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearINGFNLLCDOL() {
-        
-        iNGFNLLCDOL_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean eNNDKMJIMHN_ ;
-      /**
-       * <code>bool ENNDKMJIMHN = 15;</code>
-       * @return The eNNDKMJIMHN.
-       */
-      @java.lang.Override
-      public boolean getENNDKMJIMHN() {
-        return eNNDKMJIMHN_;
-      }
-      /**
-       * <code>bool ENNDKMJIMHN = 15;</code>
-       * @param value The eNNDKMJIMHN to set.
-       * @return This builder for chaining.
-       */
-      public Builder setENNDKMJIMHN(boolean value) {
-        
-        eNNDKMJIMHN_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool ENNDKMJIMHN = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearENNDKMJIMHN() {
-        
-        eNNDKMJIMHN_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int curScore_ ;
-      /**
-       * <code>uint32 cur_score = 1555;</code>
-       * @return The curScore.
-       */
-      @java.lang.Override
-      public int getCurScore() {
-        return curScore_;
-      }
-      /**
-       * <code>uint32 cur_score = 1555;</code>
-       * @param value The curScore to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurScore(int value) {
-        
-        curScore_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_score = 1555;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurScore() {
-        
-        curScore_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean bKJNDLLNAML_ ;
-      /**
-       * <code>bool BKJNDLLNAML = 1818;</code>
-       * @return The bKJNDLLNAML.
-       */
-      @java.lang.Override
-      public boolean getBKJNDLLNAML() {
-        return bKJNDLLNAML_;
-      }
-      /**
-       * <code>bool BKJNDLLNAML = 1818;</code>
-       * @param value The bKJNDLLNAML to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBKJNDLLNAML(boolean value) {
-        
-        bKJNDLLNAML_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool BKJNDLLNAML = 1818;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBKJNDLLNAML() {
-        
-        bKJNDLLNAML_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int firstDayStartTime_ ;
-      /**
-       * <code>uint32 first_day_start_time = 978;</code>
-       * @return The firstDayStartTime.
-       */
-      @java.lang.Override
-      public int getFirstDayStartTime() {
-        return firstDayStartTime_;
-      }
-      /**
-       * <code>uint32 first_day_start_time = 978;</code>
-       * @param value The firstDayStartTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFirstDayStartTime(int value) {
-        
-        firstDayStartTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 first_day_start_time = 978;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFirstDayStartTime() {
-        
-        firstDayStartTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean aBMOPKOIMPA_ ;
-      /**
-       * <code>bool ABMOPKOIMPA = 525;</code>
-       * @return The aBMOPKOIMPA.
-       */
-      @java.lang.Override
-      public boolean getABMOPKOIMPA() {
-        return aBMOPKOIMPA_;
-      }
-      /**
-       * <code>bool ABMOPKOIMPA = 525;</code>
-       * @param value The aBMOPKOIMPA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setABMOPKOIMPA(boolean value) {
-        
-        aBMOPKOIMPA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool ABMOPKOIMPA = 525;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearABMOPKOIMPA() {
-        
-        aBMOPKOIMPA_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int fGFGECAAKJM_ ;
-      /**
-       * <code>uint32 FGFGECAAKJM = 1703;</code>
-       * @return The fGFGECAAKJM.
-       */
-      @java.lang.Override
-      public int getFGFGECAAKJM() {
-        return fGFGECAAKJM_;
-      }
-      /**
-       * <code>uint32 FGFGECAAKJM = 1703;</code>
-       * @param value The fGFGECAAKJM to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFGFGECAAKJM(int value) {
-        
-        fGFGECAAKJM_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 FGFGECAAKJM = 1703;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFGFGECAAKJM() {
-        
-        fGFGECAAKJM_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean gFEMIEBKKKL_ ;
-      /**
-       * <code>bool GFEMIEBKKKL = 1117;</code>
-       * @return The gFEMIEBKKKL.
-       */
-      @java.lang.Override
-      public boolean getGFEMIEBKKKL() {
-        return gFEMIEBKKKL_;
-      }
-      /**
-       * <code>bool GFEMIEBKKKL = 1117;</code>
-       * @param value The gFEMIEBKKKL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGFEMIEBKKKL(boolean value) {
-        
-        gFEMIEBKKKL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool GFEMIEBKKKL = 1117;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGFEMIEBKKKL() {
-        
-        gFEMIEBKKKL_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int cEFIPNKPEKA_ ;
-      /**
-       * <code>uint32 CEFIPNKPEKA = 621;</code>
-       * @return The cEFIPNKPEKA.
-       */
-      @java.lang.Override
-      public int getCEFIPNKPEKA() {
-        return cEFIPNKPEKA_;
-      }
-      /**
-       * <code>uint32 CEFIPNKPEKA = 621;</code>
-       * @param value The cEFIPNKPEKA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCEFIPNKPEKA(int value) {
-        
-        cEFIPNKPEKA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 CEFIPNKPEKA = 621;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCEFIPNKPEKA() {
-        
-        cEFIPNKPEKA_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 11;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 11;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> wishGiftNumMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -10842,7 +4165,11 @@ public final class ActivityInfoOuterClass {
         return internalGetWishGiftNumMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
 
       @java.lang.Override
@@ -10860,7 +4187,11 @@ public final class ActivityInfoOuterClass {
         return getWishGiftNumMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
       @java.lang.Override
 
@@ -10868,7 +4199,11 @@ public final class ActivityInfoOuterClass {
         return internalGetWishGiftNumMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
       @java.lang.Override
 
@@ -10881,7 +4216,11 @@ public final class ActivityInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
       @java.lang.Override
 
@@ -10902,7 +4241,11 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
 
       public Builder removeWishGiftNumMap(
@@ -10921,7 +4264,11 @@ public final class ActivityInfoOuterClass {
         return internalGetMutableWishGiftNumMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
       public Builder putWishGiftNumMap(
           int key,
@@ -10933,7 +4280,11 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 924;</code>
+       * <pre>
+       *CFKJEDGPNAE OKBINABFBKP = 1839;
+       * </pre>
+       *
+       * <code>map&lt;uint32, uint32&gt; wish_gift_num_map = 1954;</code>
        */
 
       public Builder putAllWishGiftNumMap(
@@ -10943,4585 +4294,36 @@ public final class ActivityInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList pHCOMIFAIJD_ = emptyIntList();
-      private void ensurePHCOMIFAIJDIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
-          pHCOMIFAIJD_ = mutableCopy(pHCOMIFAIJD_);
-          bitField0_ |= 0x00000040;
-         }
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @return A list containing the pHCOMIFAIJD.
-       */
-      public java.util.List<java.lang.Integer>
-          getPHCOMIFAIJDList() {
-        return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(pHCOMIFAIJD_) : pHCOMIFAIJD_;
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @return The count of pHCOMIFAIJD.
-       */
-      public int getPHCOMIFAIJDCount() {
-        return pHCOMIFAIJD_.size();
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param index The index of the element to return.
-       * @return The pHCOMIFAIJD at the given index.
-       */
-      public int getPHCOMIFAIJD(int index) {
-        return pHCOMIFAIJD_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The pHCOMIFAIJD to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPHCOMIFAIJD(
-          int index, int value) {
-        ensurePHCOMIFAIJDIsMutable();
-        pHCOMIFAIJD_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param value The pHCOMIFAIJD to add.
-       * @return This builder for chaining.
-       */
-      public Builder addPHCOMIFAIJD(int value) {
-        ensurePHCOMIFAIJDIsMutable();
-        pHCOMIFAIJD_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @param values The pHCOMIFAIJD to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllPHCOMIFAIJD(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensurePHCOMIFAIJDIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, pHCOMIFAIJD_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PHCOMIFAIJD = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPHCOMIFAIJD() {
-        pHCOMIFAIJD_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> activityPushTipsDataList_ =
-        java.util.Collections.emptyList();
-      private void ensureActivityPushTipsDataListIsMutable() {
-        if (!((bitField0_ & 0x00000080) != 0)) {
-          activityPushTipsDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData>(activityPushTipsDataList_);
-          bitField0_ |= 0x00000080;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> activityPushTipsDataListBuilder_;
-
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> getActivityPushTipsDataListList() {
-        if (activityPushTipsDataListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(activityPushTipsDataList_);
-        } else {
-          return activityPushTipsDataListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public int getActivityPushTipsDataListCount() {
-        if (activityPushTipsDataListBuilder_ == null) {
-          return activityPushTipsDataList_.size();
-        } else {
-          return activityPushTipsDataListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData getActivityPushTipsDataList(int index) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          return activityPushTipsDataList_.get(index);
-        } else {
-          return activityPushTipsDataListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder setActivityPushTipsDataList(
-          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.set(index, value);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder setActivityPushTipsDataList(
-          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder addActivityPushTipsDataList(emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.add(value);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder addActivityPushTipsDataList(
-          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData value) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.add(index, value);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder addActivityPushTipsDataList(
-          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder addActivityPushTipsDataList(
-          int index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder builderForValue) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder addAllActivityPushTipsDataList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData> values) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          ensureActivityPushTipsDataListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, activityPushTipsDataList_);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder clearActivityPushTipsDataList() {
-        if (activityPushTipsDataListBuilder_ == null) {
-          activityPushTipsDataList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000080);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public Builder removeActivityPushTipsDataList(int index) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          ensureActivityPushTipsDataListIsMutable();
-          activityPushTipsDataList_.remove(index);
-          onChanged();
-        } else {
-          activityPushTipsDataListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder getActivityPushTipsDataListBuilder(
-          int index) {
-        return getActivityPushTipsDataListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder getActivityPushTipsDataListOrBuilder(
-          int index) {
-        if (activityPushTipsDataListBuilder_ == null) {
-          return activityPushTipsDataList_.get(index);  } else {
-          return activityPushTipsDataListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
-           getActivityPushTipsDataListOrBuilderList() {
-        if (activityPushTipsDataListBuilder_ != null) {
-          return activityPushTipsDataListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(activityPushTipsDataList_);
-        }
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder addActivityPushTipsDataListBuilder() {
-        return getActivityPushTipsDataListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder addActivityPushTipsDataListBuilder(
-          int index) {
-        return getActivityPushTipsDataListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ActivityPushTipsData activity_push_tips_data_list = 643;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder> 
-           getActivityPushTipsDataListBuilderList() {
-        return getActivityPushTipsDataListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder> 
-          getActivityPushTipsDataListFieldBuilder() {
-        if (activityPushTipsDataListBuilder_ == null) {
-          activityPushTipsDataListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsDataOrBuilder>(
-                  activityPushTipsDataList_,
-                  ((bitField0_ & 0x00000080) != 0),
-                  getParentForChildren(),
-                  isClean());
-          activityPushTipsDataList_ = null;
-        }
-        return activityPushTipsDataListBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder> samLampInfoBuilder_;
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       * @return Whether the samLampInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSamLampInfo() {
-        return detailCase_ == 10;
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       * @return The samLampInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo getSamLampInfo() {
-        if (samLampInfoBuilder_ == null) {
-          if (detailCase_ == 10) {
-            return (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 10) {
-            return samLampInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      public Builder setSamLampInfo(emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo value) {
-        if (samLampInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          samLampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      public Builder setSamLampInfo(
-          emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder builderForValue) {
-        if (samLampInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          samLampInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      public Builder mergeSamLampInfo(emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo value) {
-        if (samLampInfoBuilder_ == null) {
-          if (detailCase_ == 10 &&
-              detail_ != emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 10) {
-            samLampInfoBuilder_.mergeFrom(value);
-          }
-          samLampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      public Builder clearSamLampInfo() {
-        if (samLampInfoBuilder_ == null) {
-          if (detailCase_ == 10) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 10) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          samLampInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      public emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder getSamLampInfoBuilder() {
-        return getSamLampInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder getSamLampInfoOrBuilder() {
-        if ((detailCase_ == 10) && (samLampInfoBuilder_ != null)) {
-          return samLampInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 10) {
-            return (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampActivityDetailInfo sam_lamp_info = 10;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder> 
-          getSamLampInfoFieldBuilder() {
-        if (samLampInfoBuilder_ == null) {
-          if (!(detailCase_ == 10)) {
-            detail_ = emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.getDefaultInstance();
-          }
-          samLampInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.SeaLampActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 10;
-        onChanged();;
-        return samLampInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder> crucibleInfoBuilder_;
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       * @return Whether the crucibleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasCrucibleInfo() {
-        return detailCase_ == 7;
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       * @return The crucibleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo getCrucibleInfo() {
-        if (crucibleInfoBuilder_ == null) {
-          if (detailCase_ == 7) {
-            return (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 7) {
-            return crucibleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      public Builder setCrucibleInfo(emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo value) {
-        if (crucibleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          crucibleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 7;
-        return this;
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      public Builder setCrucibleInfo(
-          emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder builderForValue) {
-        if (crucibleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          crucibleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 7;
-        return this;
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      public Builder mergeCrucibleInfo(emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo value) {
-        if (crucibleInfoBuilder_ == null) {
-          if (detailCase_ == 7 &&
-              detail_ != emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 7) {
-            crucibleInfoBuilder_.mergeFrom(value);
-          }
-          crucibleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 7;
-        return this;
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      public Builder clearCrucibleInfo() {
-        if (crucibleInfoBuilder_ == null) {
-          if (detailCase_ == 7) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 7) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          crucibleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      public emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder getCrucibleInfoBuilder() {
-        return getCrucibleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder getCrucibleInfoOrBuilder() {
-        if ((detailCase_ == 7) && (crucibleInfoBuilder_ != null)) {
-          return crucibleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 7) {
-            return (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrucibleActivityDetailInfo crucible_info = 7;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder> 
-          getCrucibleInfoFieldBuilder() {
-        if (crucibleInfoBuilder_ == null) {
-          if (!(detailCase_ == 7)) {
-            detail_ = emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.getDefaultInstance();
-          }
-          crucibleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.CrucibleActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 7;
-        onChanged();;
-        return crucibleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder> salesmanInfoBuilder_;
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       * @return Whether the salesmanInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSalesmanInfo() {
-        return detailCase_ == 8;
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       * @return The salesmanInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo getSalesmanInfo() {
-        if (salesmanInfoBuilder_ == null) {
-          if (detailCase_ == 8) {
-            return (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 8) {
-            return salesmanInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      public Builder setSalesmanInfo(emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo value) {
-        if (salesmanInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          salesmanInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 8;
-        return this;
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      public Builder setSalesmanInfo(
-          emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder builderForValue) {
-        if (salesmanInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          salesmanInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 8;
-        return this;
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      public Builder mergeSalesmanInfo(emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo value) {
-        if (salesmanInfoBuilder_ == null) {
-          if (detailCase_ == 8 &&
-              detail_ != emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 8) {
-            salesmanInfoBuilder_.mergeFrom(value);
-          }
-          salesmanInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 8;
-        return this;
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      public Builder clearSalesmanInfo() {
-        if (salesmanInfoBuilder_ == null) {
-          if (detailCase_ == 8) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 8) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          salesmanInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      public emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder getSalesmanInfoBuilder() {
-        return getSalesmanInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder getSalesmanInfoOrBuilder() {
-        if ((detailCase_ == 8) && (salesmanInfoBuilder_ != null)) {
-          return salesmanInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 8) {
-            return (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SalesmanActivityDetailInfo salesman_info = 8;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder> 
-          getSalesmanInfoFieldBuilder() {
-        if (salesmanInfoBuilder_ == null) {
-          if (!(detailCase_ == 8)) {
-            detail_ = emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.getDefaultInstance();
-          }
-          salesmanInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo.Builder, emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.SalesmanActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 8;
-        onChanged();;
-        return salesmanInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder> trialAvatarInfoBuilder_;
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       * @return Whether the trialAvatarInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTrialAvatarInfo() {
-        return detailCase_ == 6;
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       * @return The trialAvatarInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo getTrialAvatarInfo() {
-        if (trialAvatarInfoBuilder_ == null) {
-          if (detailCase_ == 6) {
-            return (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 6) {
-            return trialAvatarInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      public Builder setTrialAvatarInfo(emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo value) {
-        if (trialAvatarInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          trialAvatarInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 6;
-        return this;
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      public Builder setTrialAvatarInfo(
-          emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder builderForValue) {
-        if (trialAvatarInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          trialAvatarInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 6;
-        return this;
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      public Builder mergeTrialAvatarInfo(emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo value) {
-        if (trialAvatarInfoBuilder_ == null) {
-          if (detailCase_ == 6 &&
-              detail_ != emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 6) {
-            trialAvatarInfoBuilder_.mergeFrom(value);
-          }
-          trialAvatarInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 6;
-        return this;
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      public Builder clearTrialAvatarInfo() {
-        if (trialAvatarInfoBuilder_ == null) {
-          if (detailCase_ == 6) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 6) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          trialAvatarInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      public emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder getTrialAvatarInfoBuilder() {
-        return getTrialAvatarInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder getTrialAvatarInfoOrBuilder() {
-        if ((detailCase_ == 6) && (trialAvatarInfoBuilder_ != null)) {
-          return trialAvatarInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 6) {
-            return (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TrialAvatarActivityDetailInfo trial_avatar_info = 6;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder> 
-          getTrialAvatarInfoFieldBuilder() {
-        if (trialAvatarInfoBuilder_ == null) {
-          if (!(detailCase_ == 6)) {
-            detail_ = emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.getDefaultInstance();
-          }
-          trialAvatarInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo.Builder, emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.TrialAvatarActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 6;
-        onChanged();;
-        return trialAvatarInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder> deliveryInfoBuilder_;
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       * @return Whether the deliveryInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasDeliveryInfo() {
-        return detailCase_ == 1846;
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       * @return The deliveryInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo getDeliveryInfo() {
-        if (deliveryInfoBuilder_ == null) {
-          if (detailCase_ == 1846) {
-            return (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1846) {
-            return deliveryInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      public Builder setDeliveryInfo(emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo value) {
-        if (deliveryInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          deliveryInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1846;
-        return this;
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      public Builder setDeliveryInfo(
-          emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder builderForValue) {
-        if (deliveryInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          deliveryInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1846;
-        return this;
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      public Builder mergeDeliveryInfo(emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo value) {
-        if (deliveryInfoBuilder_ == null) {
-          if (detailCase_ == 1846 &&
-              detail_ != emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1846) {
-            deliveryInfoBuilder_.mergeFrom(value);
-          }
-          deliveryInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1846;
-        return this;
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      public Builder clearDeliveryInfo() {
-        if (deliveryInfoBuilder_ == null) {
-          if (detailCase_ == 1846) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1846) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          deliveryInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder getDeliveryInfoBuilder() {
-        return getDeliveryInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder getDeliveryInfoOrBuilder() {
-        if ((detailCase_ == 1846) && (deliveryInfoBuilder_ != null)) {
-          return deliveryInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1846) {
-            return (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DeliveryActivityDetailInfo delivery_info = 1846;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder> 
-          getDeliveryInfoFieldBuilder() {
-        if (deliveryInfoBuilder_ == null) {
-          if (!(detailCase_ == 1846)) {
-            detail_ = emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.getDefaultInstance();
-          }
-          deliveryInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo.Builder, emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.DeliveryActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1846;
-        onChanged();;
-        return deliveryInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder> asterInfoBuilder_;
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       * @return Whether the asterInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasAsterInfo() {
-        return detailCase_ == 260;
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       * @return The asterInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo getAsterInfo() {
-        if (asterInfoBuilder_ == null) {
-          if (detailCase_ == 260) {
-            return (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 260) {
-            return asterInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      public Builder setAsterInfo(emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo value) {
-        if (asterInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          asterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 260;
-        return this;
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      public Builder setAsterInfo(
-          emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder builderForValue) {
-        if (asterInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          asterInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 260;
-        return this;
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      public Builder mergeAsterInfo(emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo value) {
-        if (asterInfoBuilder_ == null) {
-          if (detailCase_ == 260 &&
-              detail_ != emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 260) {
-            asterInfoBuilder_.mergeFrom(value);
-          }
-          asterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 260;
-        return this;
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      public Builder clearAsterInfo() {
-        if (asterInfoBuilder_ == null) {
-          if (detailCase_ == 260) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 260) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          asterInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      public emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder getAsterInfoBuilder() {
-        return getAsterInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder getAsterInfoOrBuilder() {
-        if ((detailCase_ == 260) && (asterInfoBuilder_ != null)) {
-          return asterInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 260) {
-            return (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AsterActivityDetailInfo aster_info = 260;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder> 
-          getAsterInfoFieldBuilder() {
-        if (asterInfoBuilder_ == null) {
-          if (!(detailCase_ == 260)) {
-            detail_ = emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.getDefaultInstance();
-          }
-          asterInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo.Builder, emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.AsterActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 260;
-        onChanged();;
-        return asterInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder> flightInfoBuilder_;
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       * @return Whether the flightInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFlightInfo() {
-        return detailCase_ == 826;
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       * @return The flightInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo getFlightInfo() {
-        if (flightInfoBuilder_ == null) {
-          if (detailCase_ == 826) {
-            return (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 826) {
-            return flightInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      public Builder setFlightInfo(emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo value) {
-        if (flightInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          flightInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 826;
-        return this;
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      public Builder setFlightInfo(
-          emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder builderForValue) {
-        if (flightInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          flightInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 826;
-        return this;
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      public Builder mergeFlightInfo(emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo value) {
-        if (flightInfoBuilder_ == null) {
-          if (detailCase_ == 826 &&
-              detail_ != emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 826) {
-            flightInfoBuilder_.mergeFrom(value);
-          }
-          flightInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 826;
-        return this;
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      public Builder clearFlightInfo() {
-        if (flightInfoBuilder_ == null) {
-          if (detailCase_ == 826) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 826) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          flightInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      public emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder getFlightInfoBuilder() {
-        return getFlightInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder getFlightInfoOrBuilder() {
-        if ((detailCase_ == 826) && (flightInfoBuilder_ != null)) {
-          return flightInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 826) {
-            return (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FlightActivityDetailInfo flight_info = 826;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder> 
-          getFlightInfoFieldBuilder() {
-        if (flightInfoBuilder_ == null) {
-          if (!(detailCase_ == 826)) {
-            detail_ = emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.getDefaultInstance();
-          }
-          flightInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo.Builder, emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.FlightActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 826;
-        onChanged();;
-        return flightInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder> dragonSpineInfoBuilder_;
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       * @return Whether the dragonSpineInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasDragonSpineInfo() {
-        return detailCase_ == 110;
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       * @return The dragonSpineInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo getDragonSpineInfo() {
-        if (dragonSpineInfoBuilder_ == null) {
-          if (detailCase_ == 110) {
-            return (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 110) {
-            return dragonSpineInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      public Builder setDragonSpineInfo(emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo value) {
-        if (dragonSpineInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          dragonSpineInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 110;
-        return this;
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      public Builder setDragonSpineInfo(
-          emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder builderForValue) {
-        if (dragonSpineInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          dragonSpineInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 110;
-        return this;
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      public Builder mergeDragonSpineInfo(emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo value) {
-        if (dragonSpineInfoBuilder_ == null) {
-          if (detailCase_ == 110 &&
-              detail_ != emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 110) {
-            dragonSpineInfoBuilder_.mergeFrom(value);
-          }
-          dragonSpineInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 110;
-        return this;
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      public Builder clearDragonSpineInfo() {
-        if (dragonSpineInfoBuilder_ == null) {
-          if (detailCase_ == 110) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 110) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          dragonSpineInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      public emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder getDragonSpineInfoBuilder() {
-        return getDragonSpineInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder getDragonSpineInfoOrBuilder() {
-        if ((detailCase_ == 110) && (dragonSpineInfoBuilder_ != null)) {
-          return dragonSpineInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 110) {
-            return (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DragonSpineActivityDetailInfo dragon_spine_info = 110;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder> 
-          getDragonSpineInfoFieldBuilder() {
-        if (dragonSpineInfoBuilder_ == null) {
-          if (!(detailCase_ == 110)) {
-            detail_ = emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.getDefaultInstance();
-          }
-          dragonSpineInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo.Builder, emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.DragonSpineActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 110;
-        onChanged();;
-        return dragonSpineInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder> effigyInfoBuilder_;
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       * @return Whether the effigyInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyInfo() {
-        return detailCase_ == 1010;
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       * @return The effigyInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo getEffigyInfo() {
-        if (effigyInfoBuilder_ == null) {
-          if (detailCase_ == 1010) {
-            return (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1010) {
-            return effigyInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      public Builder setEffigyInfo(emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo value) {
-        if (effigyInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1010;
-        return this;
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      public Builder setEffigyInfo(
-          emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder builderForValue) {
-        if (effigyInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1010;
-        return this;
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      public Builder mergeEffigyInfo(emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo value) {
-        if (effigyInfoBuilder_ == null) {
-          if (detailCase_ == 1010 &&
-              detail_ != emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1010) {
-            effigyInfoBuilder_.mergeFrom(value);
-          }
-          effigyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1010;
-        return this;
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      public Builder clearEffigyInfo() {
-        if (effigyInfoBuilder_ == null) {
-          if (detailCase_ == 1010) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1010) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder getEffigyInfoBuilder() {
-        return getEffigyInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder getEffigyInfoOrBuilder() {
-        if ((detailCase_ == 1010) && (effigyInfoBuilder_ != null)) {
-          return effigyInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1010) {
-            return (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyActivityDetailInfo effigy_info = 1010;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder> 
-          getEffigyInfoFieldBuilder() {
-        if (effigyInfoBuilder_ == null) {
-          if (!(detailCase_ == 1010)) {
-            detail_ = emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.getDefaultInstance();
-          }
-          effigyInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo.Builder, emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.EffigyActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1010;
-        onChanged();;
-        return effigyInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder> treasureMapInfoBuilder_;
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       * @return Whether the treasureMapInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTreasureMapInfo() {
-        return detailCase_ == 1754;
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       * @return The treasureMapInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo getTreasureMapInfo() {
-        if (treasureMapInfoBuilder_ == null) {
-          if (detailCase_ == 1754) {
-            return (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1754) {
-            return treasureMapInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      public Builder setTreasureMapInfo(emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo value) {
-        if (treasureMapInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          treasureMapInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1754;
-        return this;
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      public Builder setTreasureMapInfo(
-          emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder builderForValue) {
-        if (treasureMapInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          treasureMapInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1754;
-        return this;
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      public Builder mergeTreasureMapInfo(emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo value) {
-        if (treasureMapInfoBuilder_ == null) {
-          if (detailCase_ == 1754 &&
-              detail_ != emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1754) {
-            treasureMapInfoBuilder_.mergeFrom(value);
-          }
-          treasureMapInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1754;
-        return this;
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      public Builder clearTreasureMapInfo() {
-        if (treasureMapInfoBuilder_ == null) {
-          if (detailCase_ == 1754) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1754) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          treasureMapInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      public emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder getTreasureMapInfoBuilder() {
-        return getTreasureMapInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder getTreasureMapInfoOrBuilder() {
-        if ((detailCase_ == 1754) && (treasureMapInfoBuilder_ != null)) {
-          return treasureMapInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1754) {
-            return (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TreasureMapActivityDetailInfo treasure_map_info = 1754;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder> 
-          getTreasureMapInfoFieldBuilder() {
-        if (treasureMapInfoBuilder_ == null) {
-          if (!(detailCase_ == 1754)) {
-            detail_ = emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.getDefaultInstance();
-          }
-          treasureMapInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.TreasureMapActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1754;
-        onChanged();;
-        return treasureMapInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder> blessingInfoBuilder_;
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       * @return Whether the blessingInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBlessingInfo() {
-        return detailCase_ == 331;
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       * @return The blessingInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo getBlessingInfo() {
-        if (blessingInfoBuilder_ == null) {
-          if (detailCase_ == 331) {
-            return (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 331) {
-            return blessingInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      public Builder setBlessingInfo(emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo value) {
-        if (blessingInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          blessingInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 331;
-        return this;
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      public Builder setBlessingInfo(
-          emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder builderForValue) {
-        if (blessingInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          blessingInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 331;
-        return this;
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      public Builder mergeBlessingInfo(emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo value) {
-        if (blessingInfoBuilder_ == null) {
-          if (detailCase_ == 331 &&
-              detail_ != emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 331) {
-            blessingInfoBuilder_.mergeFrom(value);
-          }
-          blessingInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 331;
-        return this;
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      public Builder clearBlessingInfo() {
-        if (blessingInfoBuilder_ == null) {
-          if (detailCase_ == 331) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 331) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          blessingInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      public emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder getBlessingInfoBuilder() {
-        return getBlessingInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder getBlessingInfoOrBuilder() {
-        if ((detailCase_ == 331) && (blessingInfoBuilder_ != null)) {
-          return blessingInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 331) {
-            return (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BlessingActivityDetailInfo blessing_info = 331;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder> 
-          getBlessingInfoFieldBuilder() {
-        if (blessingInfoBuilder_ == null) {
-          if (!(detailCase_ == 331)) {
-            detail_ = emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.getDefaultInstance();
-          }
-          blessingInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.BlessingActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 331;
-        onChanged();;
-        return blessingInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder> seaLampInfoBuilder_;
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       * @return Whether the seaLampInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSeaLampInfo() {
-        return detailCase_ == 1114;
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       * @return The seaLampInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo getSeaLampInfo() {
-        if (seaLampInfoBuilder_ == null) {
-          if (detailCase_ == 1114) {
-            return (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1114) {
-            return seaLampInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      public Builder setSeaLampInfo(emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo value) {
-        if (seaLampInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          seaLampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1114;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      public Builder setSeaLampInfo(
-          emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder builderForValue) {
-        if (seaLampInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          seaLampInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1114;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      public Builder mergeSeaLampInfo(emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo value) {
-        if (seaLampInfoBuilder_ == null) {
-          if (detailCase_ == 1114 &&
-              detail_ != emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.newBuilder((emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1114) {
-            seaLampInfoBuilder_.mergeFrom(value);
-          }
-          seaLampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1114;
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      public Builder clearSeaLampInfo() {
-        if (seaLampInfoBuilder_ == null) {
-          if (detailCase_ == 1114) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1114) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          seaLampInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      public emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder getSeaLampInfoBuilder() {
-        return getSeaLampInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder getSeaLampInfoOrBuilder() {
-        if ((detailCase_ == 1114) && (seaLampInfoBuilder_ != null)) {
-          return seaLampInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1114) {
-            return (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampActivityInfo sea_lamp_info = 1114;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder> 
-          getSeaLampInfoFieldBuilder() {
-        if (seaLampInfoBuilder_ == null) {
-          if (!(detailCase_ == 1114)) {
-            detail_ = emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.getDefaultInstance();
-          }
-          seaLampInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo.Builder, emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.SeaLampActivityInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1114;
-        onChanged();;
-        return seaLampInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder> expeditionInfoBuilder_;
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       * @return Whether the expeditionInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasExpeditionInfo() {
-        return detailCase_ == 674;
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       * @return The expeditionInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo getExpeditionInfo() {
-        if (expeditionInfoBuilder_ == null) {
-          if (detailCase_ == 674) {
-            return (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 674) {
-            return expeditionInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      public Builder setExpeditionInfo(emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo value) {
-        if (expeditionInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          expeditionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 674;
-        return this;
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      public Builder setExpeditionInfo(
-          emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder builderForValue) {
-        if (expeditionInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          expeditionInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 674;
-        return this;
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      public Builder mergeExpeditionInfo(emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo value) {
-        if (expeditionInfoBuilder_ == null) {
-          if (detailCase_ == 674 &&
-              detail_ != emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 674) {
-            expeditionInfoBuilder_.mergeFrom(value);
-          }
-          expeditionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 674;
-        return this;
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      public Builder clearExpeditionInfo() {
-        if (expeditionInfoBuilder_ == null) {
-          if (detailCase_ == 674) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 674) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          expeditionInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      public emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder getExpeditionInfoBuilder() {
-        return getExpeditionInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder getExpeditionInfoOrBuilder() {
-        if ((detailCase_ == 674) && (expeditionInfoBuilder_ != null)) {
-          return expeditionInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 674) {
-            return (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ExpeditionActivityDetailInfo expedition_info = 674;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder> 
-          getExpeditionInfoFieldBuilder() {
-        if (expeditionInfoBuilder_ == null) {
-          if (!(detailCase_ == 674)) {
-            detail_ = emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.getDefaultInstance();
-          }
-          expeditionInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo.Builder, emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.ExpeditionActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 674;
-        onChanged();;
-        return expeditionInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder> arenaChallengeInfoBuilder_;
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       * @return Whether the arenaChallengeInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasArenaChallengeInfo() {
-        return detailCase_ == 39;
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       * @return The arenaChallengeInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo getArenaChallengeInfo() {
-        if (arenaChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 39) {
-            return (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 39) {
-            return arenaChallengeInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      public Builder setArenaChallengeInfo(emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo value) {
-        if (arenaChallengeInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          arenaChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 39;
-        return this;
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      public Builder setArenaChallengeInfo(
-          emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder builderForValue) {
-        if (arenaChallengeInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          arenaChallengeInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 39;
-        return this;
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      public Builder mergeArenaChallengeInfo(emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo value) {
-        if (arenaChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 39 &&
-              detail_ != emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 39) {
-            arenaChallengeInfoBuilder_.mergeFrom(value);
-          }
-          arenaChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 39;
-        return this;
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      public Builder clearArenaChallengeInfo() {
-        if (arenaChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 39) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 39) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          arenaChallengeInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      public emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder getArenaChallengeInfoBuilder() {
-        return getArenaChallengeInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder getArenaChallengeInfoOrBuilder() {
-        if ((detailCase_ == 39) && (arenaChallengeInfoBuilder_ != null)) {
-          return arenaChallengeInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 39) {
-            return (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ArenaChallengeActivityDetailInfo arena_challenge_info = 39;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder> 
-          getArenaChallengeInfoFieldBuilder() {
-        if (arenaChallengeInfoBuilder_ == null) {
-          if (!(detailCase_ == 39)) {
-            detail_ = emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.getDefaultInstance();
-          }
-          arenaChallengeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.ArenaChallengeActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 39;
-        onChanged();;
-        return arenaChallengeInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder> fleurFairInfoBuilder_;
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       * @return Whether the fleurFairInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFleurFairInfo() {
-        return detailCase_ == 293;
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       * @return The fleurFairInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo getFleurFairInfo() {
-        if (fleurFairInfoBuilder_ == null) {
-          if (detailCase_ == 293) {
-            return (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 293) {
-            return fleurFairInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      public Builder setFleurFairInfo(emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo value) {
-        if (fleurFairInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fleurFairInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 293;
-        return this;
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      public Builder setFleurFairInfo(
-          emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder builderForValue) {
-        if (fleurFairInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fleurFairInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 293;
-        return this;
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      public Builder mergeFleurFairInfo(emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo value) {
-        if (fleurFairInfoBuilder_ == null) {
-          if (detailCase_ == 293 &&
-              detail_ != emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 293) {
-            fleurFairInfoBuilder_.mergeFrom(value);
-          }
-          fleurFairInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 293;
-        return this;
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      public Builder clearFleurFairInfo() {
-        if (fleurFairInfoBuilder_ == null) {
-          if (detailCase_ == 293) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 293) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fleurFairInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      public emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder getFleurFairInfoBuilder() {
-        return getFleurFairInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder getFleurFairInfoOrBuilder() {
-        if ((detailCase_ == 293) && (fleurFairInfoBuilder_ != null)) {
-          return fleurFairInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 293) {
-            return (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FleurFairActivityDetailInfo fleur_fair_info = 293;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder> 
-          getFleurFairInfoFieldBuilder() {
-        if (fleurFairInfoBuilder_ == null) {
-          if (!(detailCase_ == 293)) {
-            detail_ = emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.getDefaultInstance();
-          }
-          fleurFairInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo.Builder, emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.FleurFairActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 293;
-        onChanged();;
-        return fleurFairInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder> waterSpiritInfoBuilder_;
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       * @return Whether the waterSpiritInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasWaterSpiritInfo() {
-        return detailCase_ == 1997;
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       * @return The waterSpiritInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo getWaterSpiritInfo() {
-        if (waterSpiritInfoBuilder_ == null) {
-          if (detailCase_ == 1997) {
-            return (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1997) {
-            return waterSpiritInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      public Builder setWaterSpiritInfo(emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo value) {
-        if (waterSpiritInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          waterSpiritInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1997;
-        return this;
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      public Builder setWaterSpiritInfo(
-          emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder builderForValue) {
-        if (waterSpiritInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          waterSpiritInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1997;
-        return this;
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      public Builder mergeWaterSpiritInfo(emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo value) {
-        if (waterSpiritInfoBuilder_ == null) {
-          if (detailCase_ == 1997 &&
-              detail_ != emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1997) {
-            waterSpiritInfoBuilder_.mergeFrom(value);
-          }
-          waterSpiritInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1997;
-        return this;
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      public Builder clearWaterSpiritInfo() {
-        if (waterSpiritInfoBuilder_ == null) {
-          if (detailCase_ == 1997) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1997) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          waterSpiritInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      public emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder getWaterSpiritInfoBuilder() {
-        return getWaterSpiritInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder getWaterSpiritInfoOrBuilder() {
-        if ((detailCase_ == 1997) && (waterSpiritInfoBuilder_ != null)) {
-          return waterSpiritInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1997) {
-            return (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WaterSpiritActivityDetailInfo water_spirit_info = 1997;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder> 
-          getWaterSpiritInfoFieldBuilder() {
-        if (waterSpiritInfoBuilder_ == null) {
-          if (!(detailCase_ == 1997)) {
-            detail_ = emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.getDefaultInstance();
-          }
-          waterSpiritInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo.Builder, emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.WaterSpiritActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1997;
-        onChanged();;
-        return waterSpiritInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder> challnelerSlabInfoBuilder_;
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       * @return Whether the challnelerSlabInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasChallnelerSlabInfo() {
-        return detailCase_ == 1757;
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       * @return The challnelerSlabInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo getChallnelerSlabInfo() {
-        if (challnelerSlabInfoBuilder_ == null) {
-          if (detailCase_ == 1757) {
-            return (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1757) {
-            return challnelerSlabInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      public Builder setChallnelerSlabInfo(emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo value) {
-        if (challnelerSlabInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          challnelerSlabInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1757;
-        return this;
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      public Builder setChallnelerSlabInfo(
-          emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder builderForValue) {
-        if (challnelerSlabInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          challnelerSlabInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1757;
-        return this;
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      public Builder mergeChallnelerSlabInfo(emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo value) {
-        if (challnelerSlabInfoBuilder_ == null) {
-          if (detailCase_ == 1757 &&
-              detail_ != emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1757) {
-            challnelerSlabInfoBuilder_.mergeFrom(value);
-          }
-          challnelerSlabInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1757;
-        return this;
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      public Builder clearChallnelerSlabInfo() {
-        if (challnelerSlabInfoBuilder_ == null) {
-          if (detailCase_ == 1757) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1757) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          challnelerSlabInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      public emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder getChallnelerSlabInfoBuilder() {
-        return getChallnelerSlabInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder getChallnelerSlabInfoOrBuilder() {
-        if ((detailCase_ == 1757) && (challnelerSlabInfoBuilder_ != null)) {
-          return challnelerSlabInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1757) {
-            return (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChannelerSlabActivityDetailInfo challneler_slab_info = 1757;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder> 
-          getChallnelerSlabInfoFieldBuilder() {
-        if (challnelerSlabInfoBuilder_ == null) {
-          if (!(detailCase_ == 1757)) {
-            detail_ = emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.getDefaultInstance();
-          }
-          challnelerSlabInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.ChannelerSlabActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1757;
-        onChanged();;
-        return challnelerSlabInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder> mistTrialActivityInfoBuilder_;
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       * @return Whether the mistTrialActivityInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasMistTrialActivityInfo() {
-        return detailCase_ == 1622;
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       * @return The mistTrialActivityInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo getMistTrialActivityInfo() {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1622) {
-            return (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1622) {
-            return mistTrialActivityInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      public Builder setMistTrialActivityInfo(emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo value) {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          mistTrialActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1622;
-        return this;
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      public Builder setMistTrialActivityInfo(
-          emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder builderForValue) {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          mistTrialActivityInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1622;
-        return this;
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      public Builder mergeMistTrialActivityInfo(emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo value) {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1622 &&
-              detail_ != emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1622) {
-            mistTrialActivityInfoBuilder_.mergeFrom(value);
-          }
-          mistTrialActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1622;
-        return this;
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      public Builder clearMistTrialActivityInfo() {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1622) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1622) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          mistTrialActivityInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      public emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder getMistTrialActivityInfoBuilder() {
-        return getMistTrialActivityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder getMistTrialActivityInfoOrBuilder() {
-        if ((detailCase_ == 1622) && (mistTrialActivityInfoBuilder_ != null)) {
-          return mistTrialActivityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1622) {
-            return (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MistTrialActivityDetailInfo mist_trial_activity_info = 1622;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder> 
-          getMistTrialActivityInfoFieldBuilder() {
-        if (mistTrialActivityInfoBuilder_ == null) {
-          if (!(detailCase_ == 1622)) {
-            detail_ = emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.getDefaultInstance();
-          }
-          mistTrialActivityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.MistTrialActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1622;
-        onChanged();;
-        return mistTrialActivityInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder> hideAndSeekInfoBuilder_;
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       * @return Whether the hideAndSeekInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasHideAndSeekInfo() {
-        return detailCase_ == 1747;
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       * @return The hideAndSeekInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo getHideAndSeekInfo() {
-        if (hideAndSeekInfoBuilder_ == null) {
-          if (detailCase_ == 1747) {
-            return (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1747) {
-            return hideAndSeekInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      public Builder setHideAndSeekInfo(emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo value) {
-        if (hideAndSeekInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          hideAndSeekInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1747;
-        return this;
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      public Builder setHideAndSeekInfo(
-          emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder builderForValue) {
-        if (hideAndSeekInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          hideAndSeekInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1747;
-        return this;
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      public Builder mergeHideAndSeekInfo(emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo value) {
-        if (hideAndSeekInfoBuilder_ == null) {
-          if (detailCase_ == 1747 &&
-              detail_ != emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1747) {
-            hideAndSeekInfoBuilder_.mergeFrom(value);
-          }
-          hideAndSeekInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1747;
-        return this;
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      public Builder clearHideAndSeekInfo() {
-        if (hideAndSeekInfoBuilder_ == null) {
-          if (detailCase_ == 1747) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1747) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          hideAndSeekInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      public emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder getHideAndSeekInfoBuilder() {
-        return getHideAndSeekInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder getHideAndSeekInfoOrBuilder() {
-        if ((detailCase_ == 1747) && (hideAndSeekInfoBuilder_ != null)) {
-          return hideAndSeekInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1747) {
-            return (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.HideAndSeekActivityDetailInfo hide_and_seek_info = 1747;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder> 
-          getHideAndSeekInfoFieldBuilder() {
-        if (hideAndSeekInfoBuilder_ == null) {
-          if (!(detailCase_ == 1747)) {
-            detail_ = emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.getDefaultInstance();
-          }
-          hideAndSeekInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo.Builder, emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.HideAndSeekActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1747;
-        onChanged();;
-        return hideAndSeekInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder> findHilichurlInfoBuilder_;
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       * @return Whether the findHilichurlInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFindHilichurlInfo() {
-        return detailCase_ == 1284;
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       * @return The findHilichurlInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo getFindHilichurlInfo() {
-        if (findHilichurlInfoBuilder_ == null) {
-          if (detailCase_ == 1284) {
-            return (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1284) {
-            return findHilichurlInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      public Builder setFindHilichurlInfo(emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo value) {
-        if (findHilichurlInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          findHilichurlInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1284;
-        return this;
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      public Builder setFindHilichurlInfo(
-          emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder builderForValue) {
-        if (findHilichurlInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          findHilichurlInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1284;
-        return this;
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      public Builder mergeFindHilichurlInfo(emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo value) {
-        if (findHilichurlInfoBuilder_ == null) {
-          if (detailCase_ == 1284 &&
-              detail_ != emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.newBuilder((emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1284) {
-            findHilichurlInfoBuilder_.mergeFrom(value);
-          }
-          findHilichurlInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1284;
-        return this;
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      public Builder clearFindHilichurlInfo() {
-        if (findHilichurlInfoBuilder_ == null) {
-          if (detailCase_ == 1284) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1284) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          findHilichurlInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      public emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder getFindHilichurlInfoBuilder() {
-        return getFindHilichurlInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder getFindHilichurlInfoOrBuilder() {
-        if ((detailCase_ == 1284) && (findHilichurlInfoBuilder_ != null)) {
-          return findHilichurlInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1284) {
-            return (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FindHilichurlDetailInfo find_hilichurl_info = 1284;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder> 
-          getFindHilichurlInfoFieldBuilder() {
-        if (findHilichurlInfoBuilder_ == null) {
-          if (!(detailCase_ == 1284)) {
-            detail_ = emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.getDefaultInstance();
-          }
-          findHilichurlInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo.Builder, emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.FindHilichurlDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1284;
-        onChanged();;
-        return findHilichurlInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder> summerTimeInfoBuilder_;
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       * @return Whether the summerTimeInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSummerTimeInfo() {
-        return detailCase_ == 950;
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       * @return The summerTimeInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo getSummerTimeInfo() {
-        if (summerTimeInfoBuilder_ == null) {
-          if (detailCase_ == 950) {
-            return (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 950) {
-            return summerTimeInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      public Builder setSummerTimeInfo(emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo value) {
-        if (summerTimeInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          summerTimeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 950;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      public Builder setSummerTimeInfo(
-          emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder builderForValue) {
-        if (summerTimeInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          summerTimeInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 950;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      public Builder mergeSummerTimeInfo(emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo value) {
-        if (summerTimeInfoBuilder_ == null) {
-          if (detailCase_ == 950 &&
-              detail_ != emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.newBuilder((emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 950) {
-            summerTimeInfoBuilder_.mergeFrom(value);
-          }
-          summerTimeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 950;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      public Builder clearSummerTimeInfo() {
-        if (summerTimeInfoBuilder_ == null) {
-          if (detailCase_ == 950) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 950) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          summerTimeInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      public emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder getSummerTimeInfoBuilder() {
-        return getSummerTimeInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder getSummerTimeInfoOrBuilder() {
-        if ((detailCase_ == 950) && (summerTimeInfoBuilder_ != null)) {
-          return summerTimeInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 950) {
-            return (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeDetailInfo summer_time_info = 950;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder> 
-          getSummerTimeInfoFieldBuilder() {
-        if (summerTimeInfoBuilder_ == null) {
-          if (!(detailCase_ == 950)) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.getDefaultInstance();
-          }
-          summerTimeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.SummerTimeDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 950;
-        onChanged();;
-        return summerTimeInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder> buoyantCombatInfoBuilder_;
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       * @return Whether the buoyantCombatInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBuoyantCombatInfo() {
-        return detailCase_ == 519;
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       * @return The buoyantCombatInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo getBuoyantCombatInfo() {
-        if (buoyantCombatInfoBuilder_ == null) {
-          if (detailCase_ == 519) {
-            return (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 519) {
-            return buoyantCombatInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      public Builder setBuoyantCombatInfo(emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo value) {
-        if (buoyantCombatInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          buoyantCombatInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 519;
-        return this;
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      public Builder setBuoyantCombatInfo(
-          emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder builderForValue) {
-        if (buoyantCombatInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          buoyantCombatInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 519;
-        return this;
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      public Builder mergeBuoyantCombatInfo(emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo value) {
-        if (buoyantCombatInfoBuilder_ == null) {
-          if (detailCase_ == 519 &&
-              detail_ != emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.newBuilder((emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 519) {
-            buoyantCombatInfoBuilder_.mergeFrom(value);
-          }
-          buoyantCombatInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 519;
-        return this;
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      public Builder clearBuoyantCombatInfo() {
-        if (buoyantCombatInfoBuilder_ == null) {
-          if (detailCase_ == 519) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 519) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          buoyantCombatInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      public emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder getBuoyantCombatInfoBuilder() {
-        return getBuoyantCombatInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder getBuoyantCombatInfoOrBuilder() {
-        if ((detailCase_ == 519) && (buoyantCombatInfoBuilder_ != null)) {
-          return buoyantCombatInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 519) {
-            return (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BuoyantCombatDetailInfo buoyant_combat_info = 519;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder> 
-          getBuoyantCombatInfoFieldBuilder() {
-        if (buoyantCombatInfoBuilder_ == null) {
-          if (!(detailCase_ == 519)) {
-            detail_ = emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.getDefaultInstance();
-          }
-          buoyantCombatInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo.Builder, emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.BuoyantCombatDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 519;
-        onChanged();;
-        return buoyantCombatInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder> echoShellInfoBuilder_;
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       * @return Whether the echoShellInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEchoShellInfo() {
-        return detailCase_ == 305;
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       * @return The echoShellInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo getEchoShellInfo() {
-        if (echoShellInfoBuilder_ == null) {
-          if (detailCase_ == 305) {
-            return (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 305) {
-            return echoShellInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      public Builder setEchoShellInfo(emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo value) {
-        if (echoShellInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          echoShellInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 305;
-        return this;
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      public Builder setEchoShellInfo(
-          emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder builderForValue) {
-        if (echoShellInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          echoShellInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 305;
-        return this;
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      public Builder mergeEchoShellInfo(emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo value) {
-        if (echoShellInfoBuilder_ == null) {
-          if (detailCase_ == 305 &&
-              detail_ != emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.newBuilder((emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 305) {
-            echoShellInfoBuilder_.mergeFrom(value);
-          }
-          echoShellInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 305;
-        return this;
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      public Builder clearEchoShellInfo() {
-        if (echoShellInfoBuilder_ == null) {
-          if (detailCase_ == 305) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 305) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          echoShellInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      public emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder getEchoShellInfoBuilder() {
-        return getEchoShellInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder getEchoShellInfoOrBuilder() {
-        if ((detailCase_ == 305) && (echoShellInfoBuilder_ != null)) {
-          return echoShellInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 305) {
-            return (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EchoShellDetailInfo echo_shell_info = 305;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder> 
-          getEchoShellInfoFieldBuilder() {
-        if (echoShellInfoBuilder_ == null) {
-          if (!(detailCase_ == 305)) {
-            detail_ = emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.getDefaultInstance();
-          }
-          echoShellInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo.Builder, emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.EchoShellDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 305;
-        onChanged();;
-        return echoShellInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder> bounceConjuringInfoBuilder_;
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       * @return Whether the bounceConjuringInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBounceConjuringInfo() {
-        return detailCase_ == 1864;
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       * @return The bounceConjuringInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo getBounceConjuringInfo() {
-        if (bounceConjuringInfoBuilder_ == null) {
-          if (detailCase_ == 1864) {
-            return (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1864) {
-            return bounceConjuringInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      public Builder setBounceConjuringInfo(emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo value) {
-        if (bounceConjuringInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          bounceConjuringInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1864;
-        return this;
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      public Builder setBounceConjuringInfo(
-          emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder builderForValue) {
-        if (bounceConjuringInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          bounceConjuringInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1864;
-        return this;
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      public Builder mergeBounceConjuringInfo(emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo value) {
-        if (bounceConjuringInfoBuilder_ == null) {
-          if (detailCase_ == 1864 &&
-              detail_ != emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1864) {
-            bounceConjuringInfoBuilder_.mergeFrom(value);
-          }
-          bounceConjuringInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1864;
-        return this;
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      public Builder clearBounceConjuringInfo() {
-        if (bounceConjuringInfoBuilder_ == null) {
-          if (detailCase_ == 1864) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1864) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          bounceConjuringInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      public emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder getBounceConjuringInfoBuilder() {
-        return getBounceConjuringInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder getBounceConjuringInfoOrBuilder() {
-        if ((detailCase_ == 1864) && (bounceConjuringInfoBuilder_ != null)) {
-          return bounceConjuringInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1864) {
-            return (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BounceConjuringActivityDetailInfo bounce_conjuring_info = 1864;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder> 
-          getBounceConjuringInfoFieldBuilder() {
-        if (bounceConjuringInfoBuilder_ == null) {
-          if (!(detailCase_ == 1864)) {
-            detail_ = emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.getDefaultInstance();
-          }
-          bounceConjuringInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo.Builder, emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.BounceConjuringActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1864;
-        onChanged();;
-        return bounceConjuringInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder> blitzRushInfoBuilder_;
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       * @return Whether the blitzRushInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBlitzRushInfo() {
-        return detailCase_ == 915;
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       * @return The blitzRushInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo getBlitzRushInfo() {
-        if (blitzRushInfoBuilder_ == null) {
-          if (detailCase_ == 915) {
-            return (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 915) {
-            return blitzRushInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      public Builder setBlitzRushInfo(emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo value) {
-        if (blitzRushInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          blitzRushInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 915;
-        return this;
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      public Builder setBlitzRushInfo(
-          emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder builderForValue) {
-        if (blitzRushInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          blitzRushInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 915;
-        return this;
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      public Builder mergeBlitzRushInfo(emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo value) {
-        if (blitzRushInfoBuilder_ == null) {
-          if (detailCase_ == 915 &&
-              detail_ != emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 915) {
-            blitzRushInfoBuilder_.mergeFrom(value);
-          }
-          blitzRushInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 915;
-        return this;
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      public Builder clearBlitzRushInfo() {
-        if (blitzRushInfoBuilder_ == null) {
-          if (detailCase_ == 915) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 915) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          blitzRushInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      public emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder getBlitzRushInfoBuilder() {
-        return getBlitzRushInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder getBlitzRushInfoOrBuilder() {
-        if ((detailCase_ == 915) && (blitzRushInfoBuilder_ != null)) {
-          return blitzRushInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 915) {
-            return (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BlitzRushActivityDetailInfo blitz_rush_info = 915;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder> 
-          getBlitzRushInfoFieldBuilder() {
-        if (blitzRushInfoBuilder_ == null) {
-          if (!(detailCase_ == 915)) {
-            detail_ = emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.getDefaultInstance();
-          }
-          blitzRushInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo.Builder, emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.BlitzRushActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 915;
-        onChanged();;
-        return blitzRushInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder> chessInfoBuilder_;
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       * @return Whether the chessInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasChessInfo() {
-        return detailCase_ == 1087;
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       * @return The chessInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo getChessInfo() {
-        if (chessInfoBuilder_ == null) {
-          if (detailCase_ == 1087) {
-            return (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1087) {
-            return chessInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      public Builder setChessInfo(emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo value) {
-        if (chessInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          chessInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1087;
-        return this;
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      public Builder setChessInfo(
-          emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder builderForValue) {
-        if (chessInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          chessInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1087;
-        return this;
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      public Builder mergeChessInfo(emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo value) {
-        if (chessInfoBuilder_ == null) {
-          if (detailCase_ == 1087 &&
-              detail_ != emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1087) {
-            chessInfoBuilder_.mergeFrom(value);
-          }
-          chessInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1087;
-        return this;
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      public Builder clearChessInfo() {
-        if (chessInfoBuilder_ == null) {
-          if (detailCase_ == 1087) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1087) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          chessInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      public emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder getChessInfoBuilder() {
-        return getChessInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder getChessInfoOrBuilder() {
-        if ((detailCase_ == 1087) && (chessInfoBuilder_ != null)) {
-          return chessInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1087) {
-            return (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChessActivityDetailInfo chess_info = 1087;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder> 
-          getChessInfoFieldBuilder() {
-        if (chessInfoBuilder_ == null) {
-          if (!(detailCase_ == 1087)) {
-            detail_ = emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.getDefaultInstance();
-          }
-          chessInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo.Builder, emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.ChessActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1087;
-        onChanged();;
-        return chessInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder> sumoInfoBuilder_;
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       * @return Whether the sumoInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSumoInfo() {
-        return detailCase_ == 2008;
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       * @return The sumoInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo getSumoInfo() {
-        if (sumoInfoBuilder_ == null) {
-          if (detailCase_ == 2008) {
-            return (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 2008) {
-            return sumoInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      public Builder setSumoInfo(emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo value) {
-        if (sumoInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          sumoInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2008;
-        return this;
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      public Builder setSumoInfo(
-          emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder builderForValue) {
-        if (sumoInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          sumoInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 2008;
-        return this;
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      public Builder mergeSumoInfo(emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo value) {
-        if (sumoInfoBuilder_ == null) {
-          if (detailCase_ == 2008 &&
-              detail_ != emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 2008) {
-            sumoInfoBuilder_.mergeFrom(value);
-          }
-          sumoInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2008;
-        return this;
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      public Builder clearSumoInfo() {
-        if (sumoInfoBuilder_ == null) {
-          if (detailCase_ == 2008) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 2008) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          sumoInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      public emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder getSumoInfoBuilder() {
-        return getSumoInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder getSumoInfoOrBuilder() {
-        if ((detailCase_ == 2008) && (sumoInfoBuilder_ != null)) {
-          return sumoInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 2008) {
-            return (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SumoActivityDetailInfo sumo_info = 2008;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder> 
-          getSumoInfoFieldBuilder() {
-        if (sumoInfoBuilder_ == null) {
-          if (!(detailCase_ == 2008)) {
-            detail_ = emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.getDefaultInstance();
-          }
-          sumoInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo.Builder, emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.SumoActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 2008;
-        onChanged();;
-        return sumoInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder> moonfinTrialInfoBuilder_;
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       * @return Whether the moonfinTrialInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasMoonfinTrialInfo() {
-        return detailCase_ == 389;
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       * @return The moonfinTrialInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo getMoonfinTrialInfo() {
-        if (moonfinTrialInfoBuilder_ == null) {
-          if (detailCase_ == 389) {
-            return (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 389) {
-            return moonfinTrialInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      public Builder setMoonfinTrialInfo(emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo value) {
-        if (moonfinTrialInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          moonfinTrialInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 389;
-        return this;
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      public Builder setMoonfinTrialInfo(
-          emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder builderForValue) {
-        if (moonfinTrialInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          moonfinTrialInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 389;
-        return this;
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      public Builder mergeMoonfinTrialInfo(emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo value) {
-        if (moonfinTrialInfoBuilder_ == null) {
-          if (detailCase_ == 389 &&
-              detail_ != emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 389) {
-            moonfinTrialInfoBuilder_.mergeFrom(value);
-          }
-          moonfinTrialInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 389;
-        return this;
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      public Builder clearMoonfinTrialInfo() {
-        if (moonfinTrialInfoBuilder_ == null) {
-          if (detailCase_ == 389) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 389) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          moonfinTrialInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      public emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder getMoonfinTrialInfoBuilder() {
-        return getMoonfinTrialInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder getMoonfinTrialInfoOrBuilder() {
-        if ((detailCase_ == 389) && (moonfinTrialInfoBuilder_ != null)) {
-          return moonfinTrialInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 389) {
-            return (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MoonfinTrialActivityDetailInfo moonfin_trial_info = 389;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder> 
-          getMoonfinTrialInfoFieldBuilder() {
-        if (moonfinTrialInfoBuilder_ == null) {
-          if (!(detailCase_ == 389)) {
-            detail_ = emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.getDefaultInstance();
-          }
-          moonfinTrialInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo.Builder, emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.MoonfinTrialActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 389;
-        onChanged();;
-        return moonfinTrialInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder> lunaRiteInfoBuilder_;
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       * @return Whether the lunaRiteInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasLunaRiteInfo() {
-        return detailCase_ == 1971;
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       * @return The lunaRiteInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo getLunaRiteInfo() {
-        if (lunaRiteInfoBuilder_ == null) {
-          if (detailCase_ == 1971) {
-            return (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1971) {
-            return lunaRiteInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      public Builder setLunaRiteInfo(emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo value) {
-        if (lunaRiteInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          lunaRiteInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1971;
-        return this;
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      public Builder setLunaRiteInfo(
-          emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder builderForValue) {
-        if (lunaRiteInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          lunaRiteInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1971;
-        return this;
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      public Builder mergeLunaRiteInfo(emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo value) {
-        if (lunaRiteInfoBuilder_ == null) {
-          if (detailCase_ == 1971 &&
-              detail_ != emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.newBuilder((emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1971) {
-            lunaRiteInfoBuilder_.mergeFrom(value);
-          }
-          lunaRiteInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1971;
-        return this;
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      public Builder clearLunaRiteInfo() {
-        if (lunaRiteInfoBuilder_ == null) {
-          if (detailCase_ == 1971) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1971) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          lunaRiteInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      public emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder getLunaRiteInfoBuilder() {
-        return getLunaRiteInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder getLunaRiteInfoOrBuilder() {
-        if ((detailCase_ == 1971) && (lunaRiteInfoBuilder_ != null)) {
-          return lunaRiteInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1971) {
-            return (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LunaRiteDetailInfo luna_rite_info = 1971;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder> 
-          getLunaRiteInfoFieldBuilder() {
-        if (lunaRiteInfoBuilder_ == null) {
-          if (!(detailCase_ == 1971)) {
-            detail_ = emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.getDefaultInstance();
-          }
-          lunaRiteInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo.Builder, emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.LunaRiteDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1971;
-        onChanged();;
-        return lunaRiteInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder> plantFlowerInfoBuilder_;
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       * @return Whether the plantFlowerInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPlantFlowerInfo() {
-        return detailCase_ == 1854;
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       * @return The plantFlowerInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo getPlantFlowerInfo() {
-        if (plantFlowerInfoBuilder_ == null) {
-          if (detailCase_ == 1854) {
-            return (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1854) {
-            return plantFlowerInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      public Builder setPlantFlowerInfo(emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo value) {
-        if (plantFlowerInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          plantFlowerInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1854;
-        return this;
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      public Builder setPlantFlowerInfo(
-          emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder builderForValue) {
-        if (plantFlowerInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          plantFlowerInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1854;
-        return this;
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      public Builder mergePlantFlowerInfo(emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo value) {
-        if (plantFlowerInfoBuilder_ == null) {
-          if (detailCase_ == 1854 &&
-              detail_ != emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1854) {
-            plantFlowerInfoBuilder_.mergeFrom(value);
-          }
-          plantFlowerInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1854;
-        return this;
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      public Builder clearPlantFlowerInfo() {
-        if (plantFlowerInfoBuilder_ == null) {
-          if (detailCase_ == 1854) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1854) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          plantFlowerInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      public emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder getPlantFlowerInfoBuilder() {
-        return getPlantFlowerInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder getPlantFlowerInfoOrBuilder() {
-        if ((detailCase_ == 1854) && (plantFlowerInfoBuilder_ != null)) {
-          return plantFlowerInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1854) {
-            return (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PlantFlowerActivityDetailInfo plant_flower_info = 1854;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder> 
-          getPlantFlowerInfoFieldBuilder() {
-        if (plantFlowerInfoBuilder_ == null) {
-          if (!(detailCase_ == 1854)) {
-            detail_ = emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.getDefaultInstance();
-          }
-          plantFlowerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo.Builder, emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.PlantFlowerActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1854;
-        onChanged();;
-        return plantFlowerInfoBuilder_;
-      }
-
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo, emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder, emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfoOrBuilder> musicGameInfoBuilder_;
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        * @return Whether the musicGameInfo field is set.
        */
       @java.lang.Override
       public boolean hasMusicGameInfo() {
-        return detailCase_ == 1847;
+        return detailCase_ == 1099;
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        * @return The musicGameInfo.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo getMusicGameInfo() {
         if (musicGameInfoBuilder_ == null) {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             return (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_;
           }
           return emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
         } else {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             return musicGameInfoBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       public Builder setMusicGameInfo(emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo value) {
         if (musicGameInfoBuilder_ == null) {
@@ -15533,11 +4335,11 @@ public final class ActivityInfoOuterClass {
         } else {
           musicGameInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 1847;
+        detailCase_ = 1099;
         return this;
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       public Builder setMusicGameInfo(
           emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder builderForValue) {
@@ -15547,15 +4349,15 @@ public final class ActivityInfoOuterClass {
         } else {
           musicGameInfoBuilder_.setMessage(builderForValue.build());
         }
-        detailCase_ = 1847;
+        detailCase_ = 1099;
         return this;
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       public Builder mergeMusicGameInfo(emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo value) {
         if (musicGameInfoBuilder_ == null) {
-          if (detailCase_ == 1847 &&
+          if (detailCase_ == 1099 &&
               detail_ != emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_)
                 .mergeFrom(value).buildPartial();
@@ -15564,26 +4366,26 @@ public final class ActivityInfoOuterClass {
           }
           onChanged();
         } else {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             musicGameInfoBuilder_.mergeFrom(value);
           }
           musicGameInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 1847;
+        detailCase_ = 1099;
         return this;
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       public Builder clearMusicGameInfo() {
         if (musicGameInfoBuilder_ == null) {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             detailCase_ = 0;
             detail_ = null;
             onChanged();
           }
         } else {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             detailCase_ = 0;
             detail_ = null;
           }
@@ -15592,33 +4394,33 @@ public final class ActivityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder getMusicGameInfoBuilder() {
         return getMusicGameInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfoOrBuilder getMusicGameInfoOrBuilder() {
-        if ((detailCase_ == 1847) && (musicGameInfoBuilder_ != null)) {
+        if ((detailCase_ == 1099) && (musicGameInfoBuilder_ != null)) {
           return musicGameInfoBuilder_.getMessageOrBuilder();
         } else {
-          if (detailCase_ == 1847) {
+          if (detailCase_ == 1099) {
             return (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) detail_;
           }
           return emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.MusicGameActivityDetailInfo music_game_info = 1847;</code>
+       * <code>.MusicGameActivityDetailInfo music_game_info = 1099;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo, emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder, emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfoOrBuilder> 
           getMusicGameInfoFieldBuilder() {
         if (musicGameInfoBuilder_ == null) {
-          if (!(detailCase_ == 1847)) {
+          if (!(detailCase_ == 1099)) {
             detail_ = emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance();
           }
           musicGameInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -15628,7624 +4430,10 @@ public final class ActivityInfoOuterClass {
                   isClean());
           detail_ = null;
         }
-        detailCase_ = 1847;
+        detailCase_ = 1099;
         onChanged();;
         return musicGameInfoBuilder_;
       }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder> roguelikeDungoenInfoBuilder_;
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       * @return Whether the roguelikeDungoenInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasRoguelikeDungoenInfo() {
-        return detailCase_ == 1025;
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       * @return The roguelikeDungoenInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo getRoguelikeDungoenInfo() {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          if (detailCase_ == 1025) {
-            return (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1025) {
-            return roguelikeDungoenInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      public Builder setRoguelikeDungoenInfo(emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo value) {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          roguelikeDungoenInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1025;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      public Builder setRoguelikeDungoenInfo(
-          emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder builderForValue) {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          roguelikeDungoenInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1025;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      public Builder mergeRoguelikeDungoenInfo(emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo value) {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          if (detailCase_ == 1025 &&
-              detail_ != emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1025) {
-            roguelikeDungoenInfoBuilder_.mergeFrom(value);
-          }
-          roguelikeDungoenInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1025;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      public Builder clearRoguelikeDungoenInfo() {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          if (detailCase_ == 1025) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1025) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          roguelikeDungoenInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      public emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder getRoguelikeDungoenInfoBuilder() {
-        return getRoguelikeDungoenInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder getRoguelikeDungoenInfoOrBuilder() {
-        if ((detailCase_ == 1025) && (roguelikeDungoenInfoBuilder_ != null)) {
-          return roguelikeDungoenInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1025) {
-            return (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RoguelikeDungeonActivityDetailInfo roguelike_dungoen_info = 1025;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder> 
-          getRoguelikeDungoenInfoFieldBuilder() {
-        if (roguelikeDungoenInfoBuilder_ == null) {
-          if (!(detailCase_ == 1025)) {
-            detail_ = emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.getDefaultInstance();
-          }
-          roguelikeDungoenInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.RoguelikeDungeonActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1025;
-        onChanged();;
-        return roguelikeDungoenInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder> digInfoBuilder_;
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       * @return Whether the digInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasDigInfo() {
-        return detailCase_ == 1855;
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       * @return The digInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo getDigInfo() {
-        if (digInfoBuilder_ == null) {
-          if (detailCase_ == 1855) {
-            return (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1855) {
-            return digInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      public Builder setDigInfo(emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo value) {
-        if (digInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          digInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1855;
-        return this;
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      public Builder setDigInfo(
-          emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder builderForValue) {
-        if (digInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          digInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1855;
-        return this;
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      public Builder mergeDigInfo(emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo value) {
-        if (digInfoBuilder_ == null) {
-          if (detailCase_ == 1855 &&
-              detail_ != emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1855) {
-            digInfoBuilder_.mergeFrom(value);
-          }
-          digInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1855;
-        return this;
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      public Builder clearDigInfo() {
-        if (digInfoBuilder_ == null) {
-          if (detailCase_ == 1855) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1855) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          digInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      public emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder getDigInfoBuilder() {
-        return getDigInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder getDigInfoOrBuilder() {
-        if ((detailCase_ == 1855) && (digInfoBuilder_ != null)) {
-          return digInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1855) {
-            return (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DigActivityDetailInfo dig_info = 1855;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder> 
-          getDigInfoFieldBuilder() {
-        if (digInfoBuilder_ == null) {
-          if (!(detailCase_ == 1855)) {
-            detail_ = emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.getDefaultInstance();
-          }
-          digInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo.Builder, emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.DigActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1855;
-        onChanged();;
-        return digInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder> hachiInfoBuilder_;
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       * @return Whether the hachiInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasHachiInfo() {
-        return detailCase_ == 1176;
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       * @return The hachiInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo getHachiInfo() {
-        if (hachiInfoBuilder_ == null) {
-          if (detailCase_ == 1176) {
-            return (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1176) {
-            return hachiInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      public Builder setHachiInfo(emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo value) {
-        if (hachiInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          hachiInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1176;
-        return this;
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      public Builder setHachiInfo(
-          emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder builderForValue) {
-        if (hachiInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          hachiInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1176;
-        return this;
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      public Builder mergeHachiInfo(emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo value) {
-        if (hachiInfoBuilder_ == null) {
-          if (detailCase_ == 1176 &&
-              detail_ != emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1176) {
-            hachiInfoBuilder_.mergeFrom(value);
-          }
-          hachiInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1176;
-        return this;
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      public Builder clearHachiInfo() {
-        if (hachiInfoBuilder_ == null) {
-          if (detailCase_ == 1176) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1176) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          hachiInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      public emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder getHachiInfoBuilder() {
-        return getHachiInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder getHachiInfoOrBuilder() {
-        if ((detailCase_ == 1176) && (hachiInfoBuilder_ != null)) {
-          return hachiInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1176) {
-            return (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.HachiActivityDetailInfo hachi_info = 1176;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder> 
-          getHachiInfoFieldBuilder() {
-        if (hachiInfoBuilder_ == null) {
-          if (!(detailCase_ == 1176)) {
-            detail_ = emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.getDefaultInstance();
-          }
-          hachiInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo.Builder, emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.HachiActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1176;
-        onChanged();;
-        return hachiInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder> winterCampInfoBuilder_;
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       * @return Whether the winterCampInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasWinterCampInfo() {
-        return detailCase_ == 2014;
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       * @return The winterCampInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo getWinterCampInfo() {
-        if (winterCampInfoBuilder_ == null) {
-          if (detailCase_ == 2014) {
-            return (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 2014) {
-            return winterCampInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      public Builder setWinterCampInfo(emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo value) {
-        if (winterCampInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          winterCampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2014;
-        return this;
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      public Builder setWinterCampInfo(
-          emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder builderForValue) {
-        if (winterCampInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          winterCampInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 2014;
-        return this;
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      public Builder mergeWinterCampInfo(emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo value) {
-        if (winterCampInfoBuilder_ == null) {
-          if (detailCase_ == 2014 &&
-              detail_ != emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 2014) {
-            winterCampInfoBuilder_.mergeFrom(value);
-          }
-          winterCampInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2014;
-        return this;
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      public Builder clearWinterCampInfo() {
-        if (winterCampInfoBuilder_ == null) {
-          if (detailCase_ == 2014) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 2014) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          winterCampInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      public emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder getWinterCampInfoBuilder() {
-        return getWinterCampInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder getWinterCampInfoOrBuilder() {
-        if ((detailCase_ == 2014) && (winterCampInfoBuilder_ != null)) {
-          return winterCampInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 2014) {
-            return (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WinterCampActivityDetailInfo winter_camp_info = 2014;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder> 
-          getWinterCampInfoFieldBuilder() {
-        if (winterCampInfoBuilder_ == null) {
-          if (!(detailCase_ == 2014)) {
-            detail_ = emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.getDefaultInstance();
-          }
-          winterCampInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo.Builder, emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.WinterCampActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 2014;
-        onChanged();;
-        return winterCampInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder> potionInfoBuilder_;
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       * @return Whether the potionInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPotionInfo() {
-        return detailCase_ == 1485;
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       * @return The potionInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo getPotionInfo() {
-        if (potionInfoBuilder_ == null) {
-          if (detailCase_ == 1485) {
-            return (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1485) {
-            return potionInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      public Builder setPotionInfo(emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo value) {
-        if (potionInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          potionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1485;
-        return this;
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      public Builder setPotionInfo(
-          emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder builderForValue) {
-        if (potionInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          potionInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1485;
-        return this;
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      public Builder mergePotionInfo(emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo value) {
-        if (potionInfoBuilder_ == null) {
-          if (detailCase_ == 1485 &&
-              detail_ != emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1485) {
-            potionInfoBuilder_.mergeFrom(value);
-          }
-          potionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1485;
-        return this;
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      public Builder clearPotionInfo() {
-        if (potionInfoBuilder_ == null) {
-          if (detailCase_ == 1485) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1485) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          potionInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      public emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder getPotionInfoBuilder() {
-        return getPotionInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder getPotionInfoOrBuilder() {
-        if ((detailCase_ == 1485) && (potionInfoBuilder_ != null)) {
-          return potionInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1485) {
-            return (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PotionActivityDetailInfo potion_info = 1485;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder> 
-          getPotionInfoFieldBuilder() {
-        if (potionInfoBuilder_ == null) {
-          if (!(detailCase_ == 1485)) {
-            detail_ = emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.getDefaultInstance();
-          }
-          potionInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.PotionActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1485;
-        onChanged();;
-        return potionInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder> tanukiTravelActivityInfoBuilder_;
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       * @return Whether the tanukiTravelActivityInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTanukiTravelActivityInfo() {
-        return detailCase_ == 944;
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       * @return The tanukiTravelActivityInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo getTanukiTravelActivityInfo() {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          if (detailCase_ == 944) {
-            return (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 944) {
-            return tanukiTravelActivityInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      public Builder setTanukiTravelActivityInfo(emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo value) {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          tanukiTravelActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 944;
-        return this;
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      public Builder setTanukiTravelActivityInfo(
-          emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder builderForValue) {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          tanukiTravelActivityInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 944;
-        return this;
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      public Builder mergeTanukiTravelActivityInfo(emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo value) {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          if (detailCase_ == 944 &&
-              detail_ != emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 944) {
-            tanukiTravelActivityInfoBuilder_.mergeFrom(value);
-          }
-          tanukiTravelActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 944;
-        return this;
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      public Builder clearTanukiTravelActivityInfo() {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          if (detailCase_ == 944) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 944) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          tanukiTravelActivityInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      public emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder getTanukiTravelActivityInfoBuilder() {
-        return getTanukiTravelActivityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder getTanukiTravelActivityInfoOrBuilder() {
-        if ((detailCase_ == 944) && (tanukiTravelActivityInfoBuilder_ != null)) {
-          return tanukiTravelActivityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 944) {
-            return (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TanukiTravelActivityDetailInfo tanuki_travel_activity_info = 944;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder> 
-          getTanukiTravelActivityInfoFieldBuilder() {
-        if (tanukiTravelActivityInfoBuilder_ == null) {
-          if (!(detailCase_ == 944)) {
-            detail_ = emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.getDefaultInstance();
-          }
-          tanukiTravelActivityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo.Builder, emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.TanukiTravelActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 944;
-        onChanged();;
-        return tanukiTravelActivityInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder> lanternRiteActivityInfoBuilder_;
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       * @return Whether the lanternRiteActivityInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasLanternRiteActivityInfo() {
-        return detailCase_ == 1980;
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       * @return The lanternRiteActivityInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo getLanternRiteActivityInfo() {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1980) {
-            return (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1980) {
-            return lanternRiteActivityInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      public Builder setLanternRiteActivityInfo(emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo value) {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          lanternRiteActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1980;
-        return this;
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      public Builder setLanternRiteActivityInfo(
-          emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder builderForValue) {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          lanternRiteActivityInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1980;
-        return this;
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      public Builder mergeLanternRiteActivityInfo(emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo value) {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1980 &&
-              detail_ != emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1980) {
-            lanternRiteActivityInfoBuilder_.mergeFrom(value);
-          }
-          lanternRiteActivityInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1980;
-        return this;
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      public Builder clearLanternRiteActivityInfo() {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          if (detailCase_ == 1980) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1980) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          lanternRiteActivityInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      public emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder getLanternRiteActivityInfoBuilder() {
-        return getLanternRiteActivityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder getLanternRiteActivityInfoOrBuilder() {
-        if ((detailCase_ == 1980) && (lanternRiteActivityInfoBuilder_ != null)) {
-          return lanternRiteActivityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1980) {
-            return (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LanternRiteActivityDetailInfo lantern_rite_activity_info = 1980;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder> 
-          getLanternRiteActivityInfoFieldBuilder() {
-        if (lanternRiteActivityInfoBuilder_ == null) {
-          if (!(detailCase_ == 1980)) {
-            detail_ = emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.getDefaultInstance();
-          }
-          lanternRiteActivityInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo.Builder, emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.LanternRiteActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1980;
-        onChanged();;
-        return lanternRiteActivityInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder> michiaeMatsuriInfoBuilder_;
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       * @return Whether the michiaeMatsuriInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasMichiaeMatsuriInfo() {
-        return detailCase_ == 114;
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       * @return The michiaeMatsuriInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo getMichiaeMatsuriInfo() {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          if (detailCase_ == 114) {
-            return (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 114) {
-            return michiaeMatsuriInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      public Builder setMichiaeMatsuriInfo(emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo value) {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          michiaeMatsuriInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 114;
-        return this;
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      public Builder setMichiaeMatsuriInfo(
-          emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder builderForValue) {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          michiaeMatsuriInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 114;
-        return this;
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      public Builder mergeMichiaeMatsuriInfo(emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo value) {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          if (detailCase_ == 114 &&
-              detail_ != emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 114) {
-            michiaeMatsuriInfoBuilder_.mergeFrom(value);
-          }
-          michiaeMatsuriInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 114;
-        return this;
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      public Builder clearMichiaeMatsuriInfo() {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          if (detailCase_ == 114) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 114) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          michiaeMatsuriInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      public emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder getMichiaeMatsuriInfoBuilder() {
-        return getMichiaeMatsuriInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder getMichiaeMatsuriInfoOrBuilder() {
-        if ((detailCase_ == 114) && (michiaeMatsuriInfoBuilder_ != null)) {
-          return michiaeMatsuriInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 114) {
-            return (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MichiaeMatsuriActivityDetailInfo michiae_matsuri_info = 114;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder> 
-          getMichiaeMatsuriInfoFieldBuilder() {
-        if (michiaeMatsuriInfoBuilder_ == null) {
-          if (!(detailCase_ == 114)) {
-            detail_ = emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.getDefaultInstance();
-          }
-          michiaeMatsuriInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo.Builder, emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.MichiaeMatsuriActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 114;
-        onChanged();;
-        return michiaeMatsuriInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder> bartenderInfoBuilder_;
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       * @return Whether the bartenderInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBartenderInfo() {
-        return detailCase_ == 1441;
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       * @return The bartenderInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo getBartenderInfo() {
-        if (bartenderInfoBuilder_ == null) {
-          if (detailCase_ == 1441) {
-            return (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1441) {
-            return bartenderInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      public Builder setBartenderInfo(emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo value) {
-        if (bartenderInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          bartenderInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1441;
-        return this;
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      public Builder setBartenderInfo(
-          emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder builderForValue) {
-        if (bartenderInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          bartenderInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1441;
-        return this;
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      public Builder mergeBartenderInfo(emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo value) {
-        if (bartenderInfoBuilder_ == null) {
-          if (detailCase_ == 1441 &&
-              detail_ != emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1441) {
-            bartenderInfoBuilder_.mergeFrom(value);
-          }
-          bartenderInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1441;
-        return this;
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      public Builder clearBartenderInfo() {
-        if (bartenderInfoBuilder_ == null) {
-          if (detailCase_ == 1441) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1441) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          bartenderInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      public emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder getBartenderInfoBuilder() {
-        return getBartenderInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder getBartenderInfoOrBuilder() {
-        if ((detailCase_ == 1441) && (bartenderInfoBuilder_ != null)) {
-          return bartenderInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1441) {
-            return (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BartenderActivityDetailInfo bartender_info = 1441;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder> 
-          getBartenderInfoFieldBuilder() {
-        if (bartenderInfoBuilder_ == null) {
-          if (!(detailCase_ == 1441)) {
-            detail_ = emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.getDefaultInstance();
-          }
-          bartenderInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo.Builder, emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.BartenderActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1441;
-        onChanged();;
-        return bartenderInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder> ugcInfoBuilder_;
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       * @return Whether the ugcInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasUgcInfo() {
-        return detailCase_ == 1795;
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       * @return The ugcInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo getUgcInfo() {
-        if (ugcInfoBuilder_ == null) {
-          if (detailCase_ == 1795) {
-            return (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1795) {
-            return ugcInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      public Builder setUgcInfo(emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo value) {
-        if (ugcInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          ugcInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1795;
-        return this;
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      public Builder setUgcInfo(
-          emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder builderForValue) {
-        if (ugcInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          ugcInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1795;
-        return this;
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      public Builder mergeUgcInfo(emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo value) {
-        if (ugcInfoBuilder_ == null) {
-          if (detailCase_ == 1795 &&
-              detail_ != emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1795) {
-            ugcInfoBuilder_.mergeFrom(value);
-          }
-          ugcInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1795;
-        return this;
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      public Builder clearUgcInfo() {
-        if (ugcInfoBuilder_ == null) {
-          if (detailCase_ == 1795) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1795) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          ugcInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      public emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder getUgcInfoBuilder() {
-        return getUgcInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder getUgcInfoOrBuilder() {
-        if ((detailCase_ == 1795) && (ugcInfoBuilder_ != null)) {
-          return ugcInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1795) {
-            return (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.UgcActivityDetailInfo ugc_info = 1795;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder> 
-          getUgcInfoFieldBuilder() {
-        if (ugcInfoBuilder_ == null) {
-          if (!(detailCase_ == 1795)) {
-            detail_ = emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.getDefaultInstance();
-          }
-          ugcInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo.Builder, emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.UgcActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1795;
-        onChanged();;
-        return ugcInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder> crystalLinkInfoBuilder_;
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       * @return Whether the crystalLinkInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasCrystalLinkInfo() {
-        return detailCase_ == 1301;
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       * @return The crystalLinkInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo getCrystalLinkInfo() {
-        if (crystalLinkInfoBuilder_ == null) {
-          if (detailCase_ == 1301) {
-            return (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1301) {
-            return crystalLinkInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      public Builder setCrystalLinkInfo(emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo value) {
-        if (crystalLinkInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          crystalLinkInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1301;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      public Builder setCrystalLinkInfo(
-          emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder builderForValue) {
-        if (crystalLinkInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          crystalLinkInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1301;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      public Builder mergeCrystalLinkInfo(emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo value) {
-        if (crystalLinkInfoBuilder_ == null) {
-          if (detailCase_ == 1301 &&
-              detail_ != emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1301) {
-            crystalLinkInfoBuilder_.mergeFrom(value);
-          }
-          crystalLinkInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1301;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      public Builder clearCrystalLinkInfo() {
-        if (crystalLinkInfoBuilder_ == null) {
-          if (detailCase_ == 1301) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1301) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          crystalLinkInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      public emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder getCrystalLinkInfoBuilder() {
-        return getCrystalLinkInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder getCrystalLinkInfoOrBuilder() {
-        if ((detailCase_ == 1301) && (crystalLinkInfoBuilder_ != null)) {
-          return crystalLinkInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1301) {
-            return (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrystalLinkActivityDetailInfo crystal_link_info = 1301;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder> 
-          getCrystalLinkInfoFieldBuilder() {
-        if (crystalLinkInfoBuilder_ == null) {
-          if (!(detailCase_ == 1301)) {
-            detail_ = emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.getDefaultInstance();
-          }
-          crystalLinkInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo.Builder, emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.CrystalLinkActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1301;
-        onChanged();;
-        return crystalLinkInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder> irodoriInfoBuilder_;
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       * @return Whether the irodoriInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasIrodoriInfo() {
-        return detailCase_ == 54;
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       * @return The irodoriInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo getIrodoriInfo() {
-        if (irodoriInfoBuilder_ == null) {
-          if (detailCase_ == 54) {
-            return (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 54) {
-            return irodoriInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      public Builder setIrodoriInfo(emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo value) {
-        if (irodoriInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          irodoriInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 54;
-        return this;
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      public Builder setIrodoriInfo(
-          emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder builderForValue) {
-        if (irodoriInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          irodoriInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 54;
-        return this;
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      public Builder mergeIrodoriInfo(emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo value) {
-        if (irodoriInfoBuilder_ == null) {
-          if (detailCase_ == 54 &&
-              detail_ != emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 54) {
-            irodoriInfoBuilder_.mergeFrom(value);
-          }
-          irodoriInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 54;
-        return this;
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      public Builder clearIrodoriInfo() {
-        if (irodoriInfoBuilder_ == null) {
-          if (detailCase_ == 54) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 54) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          irodoriInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      public emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder getIrodoriInfoBuilder() {
-        return getIrodoriInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder getIrodoriInfoOrBuilder() {
-        if ((detailCase_ == 54) && (irodoriInfoBuilder_ != null)) {
-          return irodoriInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 54) {
-            return (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.IrodoriActivityDetailInfo irodori_info = 54;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder> 
-          getIrodoriInfoFieldBuilder() {
-        if (irodoriInfoBuilder_ == null) {
-          if (!(detailCase_ == 54)) {
-            detail_ = emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.getDefaultInstance();
-          }
-          irodoriInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo.Builder, emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.IrodoriActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 54;
-        onChanged();;
-        return irodoriInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder> photoInfoBuilder_;
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       * @return Whether the photoInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPhotoInfo() {
-        return detailCase_ == 1492;
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       * @return The photoInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo getPhotoInfo() {
-        if (photoInfoBuilder_ == null) {
-          if (detailCase_ == 1492) {
-            return (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1492) {
-            return photoInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      public Builder setPhotoInfo(emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo value) {
-        if (photoInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          photoInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1492;
-        return this;
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      public Builder setPhotoInfo(
-          emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder builderForValue) {
-        if (photoInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          photoInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1492;
-        return this;
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      public Builder mergePhotoInfo(emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo value) {
-        if (photoInfoBuilder_ == null) {
-          if (detailCase_ == 1492 &&
-              detail_ != emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1492) {
-            photoInfoBuilder_.mergeFrom(value);
-          }
-          photoInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1492;
-        return this;
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      public Builder clearPhotoInfo() {
-        if (photoInfoBuilder_ == null) {
-          if (detailCase_ == 1492) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1492) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          photoInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      public emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder getPhotoInfoBuilder() {
-        return getPhotoInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder getPhotoInfoOrBuilder() {
-        if ((detailCase_ == 1492) && (photoInfoBuilder_ != null)) {
-          return photoInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1492) {
-            return (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PhotoActivityDetailInfo photo_info = 1492;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder> 
-          getPhotoInfoFieldBuilder() {
-        if (photoInfoBuilder_ == null) {
-          if (!(detailCase_ == 1492)) {
-            detail_ = emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.getDefaultInstance();
-          }
-          photoInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo.Builder, emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.PhotoActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1492;
-        onChanged();;
-        return photoInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder> spiceInfoBuilder_;
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       * @return Whether the spiceInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSpiceInfo() {
-        return detailCase_ == 446;
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       * @return The spiceInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo getSpiceInfo() {
-        if (spiceInfoBuilder_ == null) {
-          if (detailCase_ == 446) {
-            return (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 446) {
-            return spiceInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      public Builder setSpiceInfo(emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo value) {
-        if (spiceInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          spiceInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 446;
-        return this;
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      public Builder setSpiceInfo(
-          emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder builderForValue) {
-        if (spiceInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          spiceInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 446;
-        return this;
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      public Builder mergeSpiceInfo(emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo value) {
-        if (spiceInfoBuilder_ == null) {
-          if (detailCase_ == 446 &&
-              detail_ != emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 446) {
-            spiceInfoBuilder_.mergeFrom(value);
-          }
-          spiceInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 446;
-        return this;
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      public Builder clearSpiceInfo() {
-        if (spiceInfoBuilder_ == null) {
-          if (detailCase_ == 446) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 446) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          spiceInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      public emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder getSpiceInfoBuilder() {
-        return getSpiceInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder getSpiceInfoOrBuilder() {
-        if ((detailCase_ == 446) && (spiceInfoBuilder_ != null)) {
-          return spiceInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 446) {
-            return (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SpiceActivityDetailInfo spice_info = 446;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder> 
-          getSpiceInfoFieldBuilder() {
-        if (spiceInfoBuilder_ == null) {
-          if (!(detailCase_ == 446)) {
-            detail_ = emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.getDefaultInstance();
-          }
-          spiceInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo.Builder, emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.SpiceActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 446;
-        onChanged();;
-        return spiceInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder> gachaInfoBuilder_;
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       * @return Whether the gachaInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGachaInfo() {
-        return detailCase_ == 1192;
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       * @return The gachaInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo getGachaInfo() {
-        if (gachaInfoBuilder_ == null) {
-          if (detailCase_ == 1192) {
-            return (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1192) {
-            return gachaInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      public Builder setGachaInfo(emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo value) {
-        if (gachaInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gachaInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1192;
-        return this;
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      public Builder setGachaInfo(
-          emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder builderForValue) {
-        if (gachaInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gachaInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1192;
-        return this;
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      public Builder mergeGachaInfo(emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo value) {
-        if (gachaInfoBuilder_ == null) {
-          if (detailCase_ == 1192 &&
-              detail_ != emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1192) {
-            gachaInfoBuilder_.mergeFrom(value);
-          }
-          gachaInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1192;
-        return this;
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      public Builder clearGachaInfo() {
-        if (gachaInfoBuilder_ == null) {
-          if (detailCase_ == 1192) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1192) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gachaInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      public emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder getGachaInfoBuilder() {
-        return getGachaInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder getGachaInfoOrBuilder() {
-        if ((detailCase_ == 1192) && (gachaInfoBuilder_ != null)) {
-          return gachaInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1192) {
-            return (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GachaActivityDetailInfo gacha_info = 1192;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder> 
-          getGachaInfoFieldBuilder() {
-        if (gachaInfoBuilder_ == null) {
-          if (!(detailCase_ == 1192)) {
-            detail_ = emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.getDefaultInstance();
-          }
-          gachaInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo.Builder, emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.GachaActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1192;
-        onChanged();;
-        return gachaInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder> luminanceStoneChallengeInfoBuilder_;
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       * @return Whether the luminanceStoneChallengeInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasLuminanceStoneChallengeInfo() {
-        return detailCase_ == 38;
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       * @return The luminanceStoneChallengeInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo getLuminanceStoneChallengeInfo() {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 38) {
-            return (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 38) {
-            return luminanceStoneChallengeInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      public Builder setLuminanceStoneChallengeInfo(emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo value) {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          luminanceStoneChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 38;
-        return this;
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      public Builder setLuminanceStoneChallengeInfo(
-          emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder builderForValue) {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          luminanceStoneChallengeInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 38;
-        return this;
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      public Builder mergeLuminanceStoneChallengeInfo(emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo value) {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 38 &&
-              detail_ != emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 38) {
-            luminanceStoneChallengeInfoBuilder_.mergeFrom(value);
-          }
-          luminanceStoneChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 38;
-        return this;
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      public Builder clearLuminanceStoneChallengeInfo() {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 38) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 38) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          luminanceStoneChallengeInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      public emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder getLuminanceStoneChallengeInfoBuilder() {
-        return getLuminanceStoneChallengeInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder getLuminanceStoneChallengeInfoOrBuilder() {
-        if ((detailCase_ == 38) && (luminanceStoneChallengeInfoBuilder_ != null)) {
-          return luminanceStoneChallengeInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 38) {
-            return (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.LuminanceStoneChallengeActivityDetailInfo luminance_stone_challenge_info = 38;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder> 
-          getLuminanceStoneChallengeInfoFieldBuilder() {
-        if (luminanceStoneChallengeInfoBuilder_ == null) {
-          if (!(detailCase_ == 38)) {
-            detail_ = emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.getDefaultInstance();
-          }
-          luminanceStoneChallengeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo.Builder, emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.LuminanceStoneChallengeActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 38;
-        onChanged();;
-        return luminanceStoneChallengeInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder> rogueDiaryInfoBuilder_;
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       * @return Whether the rogueDiaryInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasRogueDiaryInfo() {
-        return detailCase_ == 427;
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       * @return The rogueDiaryInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo getRogueDiaryInfo() {
-        if (rogueDiaryInfoBuilder_ == null) {
-          if (detailCase_ == 427) {
-            return (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 427) {
-            return rogueDiaryInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      public Builder setRogueDiaryInfo(emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo value) {
-        if (rogueDiaryInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          rogueDiaryInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 427;
-        return this;
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      public Builder setRogueDiaryInfo(
-          emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder builderForValue) {
-        if (rogueDiaryInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          rogueDiaryInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 427;
-        return this;
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      public Builder mergeRogueDiaryInfo(emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo value) {
-        if (rogueDiaryInfoBuilder_ == null) {
-          if (detailCase_ == 427 &&
-              detail_ != emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 427) {
-            rogueDiaryInfoBuilder_.mergeFrom(value);
-          }
-          rogueDiaryInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 427;
-        return this;
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      public Builder clearRogueDiaryInfo() {
-        if (rogueDiaryInfoBuilder_ == null) {
-          if (detailCase_ == 427) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 427) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          rogueDiaryInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      public emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder getRogueDiaryInfoBuilder() {
-        return getRogueDiaryInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder getRogueDiaryInfoOrBuilder() {
-        if ((detailCase_ == 427) && (rogueDiaryInfoBuilder_ != null)) {
-          return rogueDiaryInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 427) {
-            return (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RogueDiaryActivityDetailInfo rogue_diary_info = 427;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder> 
-          getRogueDiaryInfoFieldBuilder() {
-        if (rogueDiaryInfoBuilder_ == null) {
-          if (!(detailCase_ == 427)) {
-            detail_ = emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.getDefaultInstance();
-          }
-          rogueDiaryInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo.Builder, emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.RogueDiaryActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 427;
-        onChanged();;
-        return rogueDiaryInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder> summerTimeV2InfoBuilder_;
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       * @return Whether the summerTimeV2Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasSummerTimeV2Info() {
-        return detailCase_ == 910;
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       * @return The summerTimeV2Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo getSummerTimeV2Info() {
-        if (summerTimeV2InfoBuilder_ == null) {
-          if (detailCase_ == 910) {
-            return (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 910) {
-            return summerTimeV2InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      public Builder setSummerTimeV2Info(emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo value) {
-        if (summerTimeV2InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          summerTimeV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 910;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      public Builder setSummerTimeV2Info(
-          emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder builderForValue) {
-        if (summerTimeV2InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          summerTimeV2InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 910;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      public Builder mergeSummerTimeV2Info(emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo value) {
-        if (summerTimeV2InfoBuilder_ == null) {
-          if (detailCase_ == 910 &&
-              detail_ != emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.newBuilder((emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 910) {
-            summerTimeV2InfoBuilder_.mergeFrom(value);
-          }
-          summerTimeV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 910;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      public Builder clearSummerTimeV2Info() {
-        if (summerTimeV2InfoBuilder_ == null) {
-          if (detailCase_ == 910) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 910) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          summerTimeV2InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      public emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder getSummerTimeV2InfoBuilder() {
-        return getSummerTimeV2InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder getSummerTimeV2InfoOrBuilder() {
-        if ((detailCase_ == 910) && (summerTimeV2InfoBuilder_ != null)) {
-          return summerTimeV2InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 910) {
-            return (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeV2DetailInfo summer_time_v2_info = 910;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder> 
-          getSummerTimeV2InfoFieldBuilder() {
-        if (summerTimeV2InfoBuilder_ == null) {
-          if (!(detailCase_ == 910)) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.getDefaultInstance();
-          }
-          summerTimeV2InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.SummerTimeV2DetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 910;
-        onChanged();;
-        return summerTimeV2InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder> islandPartyInfoBuilder_;
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       * @return Whether the islandPartyInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasIslandPartyInfo() {
-        return detailCase_ == 1044;
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       * @return The islandPartyInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo getIslandPartyInfo() {
-        if (islandPartyInfoBuilder_ == null) {
-          if (detailCase_ == 1044) {
-            return (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1044) {
-            return islandPartyInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      public Builder setIslandPartyInfo(emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo value) {
-        if (islandPartyInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          islandPartyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1044;
-        return this;
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      public Builder setIslandPartyInfo(
-          emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder builderForValue) {
-        if (islandPartyInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          islandPartyInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1044;
-        return this;
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      public Builder mergeIslandPartyInfo(emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo value) {
-        if (islandPartyInfoBuilder_ == null) {
-          if (detailCase_ == 1044 &&
-              detail_ != emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.newBuilder((emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1044) {
-            islandPartyInfoBuilder_.mergeFrom(value);
-          }
-          islandPartyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1044;
-        return this;
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      public Builder clearIslandPartyInfo() {
-        if (islandPartyInfoBuilder_ == null) {
-          if (detailCase_ == 1044) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1044) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          islandPartyInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      public emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder getIslandPartyInfoBuilder() {
-        return getIslandPartyInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder getIslandPartyInfoOrBuilder() {
-        if ((detailCase_ == 1044) && (islandPartyInfoBuilder_ != null)) {
-          return islandPartyInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1044) {
-            return (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.IslandPartyDetailInfo island_party_info = 1044;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder> 
-          getIslandPartyInfoFieldBuilder() {
-        if (islandPartyInfoBuilder_ == null) {
-          if (!(detailCase_ == 1044)) {
-            detail_ = emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.getDefaultInstance();
-          }
-          islandPartyInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo.Builder, emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.IslandPartyDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1044;
-        onChanged();;
-        return islandPartyInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder> gearInfoBuilder_;
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       * @return Whether the gearInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGearInfo() {
-        return detailCase_ == 1263;
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       * @return The gearInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo getGearInfo() {
-        if (gearInfoBuilder_ == null) {
-          if (detailCase_ == 1263) {
-            return (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1263) {
-            return gearInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      public Builder setGearInfo(emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo value) {
-        if (gearInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gearInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1263;
-        return this;
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      public Builder setGearInfo(
-          emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder builderForValue) {
-        if (gearInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gearInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1263;
-        return this;
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      public Builder mergeGearInfo(emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo value) {
-        if (gearInfoBuilder_ == null) {
-          if (detailCase_ == 1263 &&
-              detail_ != emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1263) {
-            gearInfoBuilder_.mergeFrom(value);
-          }
-          gearInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1263;
-        return this;
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      public Builder clearGearInfo() {
-        if (gearInfoBuilder_ == null) {
-          if (detailCase_ == 1263) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1263) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gearInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      public emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder getGearInfoBuilder() {
-        return getGearInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder getGearInfoOrBuilder() {
-        if ((detailCase_ == 1263) && (gearInfoBuilder_ != null)) {
-          return gearInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1263) {
-            return (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GearActivityDetailInfo gear_info = 1263;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder> 
-          getGearInfoFieldBuilder() {
-        if (gearInfoBuilder_ == null) {
-          if (!(detailCase_ == 1263)) {
-            detail_ = emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.getDefaultInstance();
-          }
-          gearInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo.Builder, emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.GearActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1263;
-        onChanged();;
-        return gearInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder> gravenInnocenceInfoBuilder_;
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       * @return Whether the gravenInnocenceInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGravenInnocenceInfo() {
-        return detailCase_ == 356;
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       * @return The gravenInnocenceInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo getGravenInnocenceInfo() {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          if (detailCase_ == 356) {
-            return (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 356) {
-            return gravenInnocenceInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      public Builder setGravenInnocenceInfo(emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo value) {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gravenInnocenceInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 356;
-        return this;
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      public Builder setGravenInnocenceInfo(
-          emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder builderForValue) {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gravenInnocenceInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 356;
-        return this;
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      public Builder mergeGravenInnocenceInfo(emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo value) {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          if (detailCase_ == 356 &&
-              detail_ != emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.newBuilder((emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 356) {
-            gravenInnocenceInfoBuilder_.mergeFrom(value);
-          }
-          gravenInnocenceInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 356;
-        return this;
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      public Builder clearGravenInnocenceInfo() {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          if (detailCase_ == 356) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 356) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gravenInnocenceInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      public emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder getGravenInnocenceInfoBuilder() {
-        return getGravenInnocenceInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder getGravenInnocenceInfoOrBuilder() {
-        if ((detailCase_ == 356) && (gravenInnocenceInfoBuilder_ != null)) {
-          return gravenInnocenceInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 356) {
-            return (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GravenInnocenceDetailInfo graven_innocence_info = 356;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder> 
-          getGravenInnocenceInfoFieldBuilder() {
-        if (gravenInnocenceInfoBuilder_ == null) {
-          if (!(detailCase_ == 356)) {
-            detail_ = emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.getDefaultInstance();
-          }
-          gravenInnocenceInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo.Builder, emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.GravenInnocenceDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 356;
-        onChanged();;
-        return gravenInnocenceInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder> instableSprayInfoBuilder_;
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       * @return Whether the instableSprayInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasInstableSprayInfo() {
-        return detailCase_ == 508;
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       * @return The instableSprayInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo getInstableSprayInfo() {
-        if (instableSprayInfoBuilder_ == null) {
-          if (detailCase_ == 508) {
-            return (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 508) {
-            return instableSprayInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      public Builder setInstableSprayInfo(emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo value) {
-        if (instableSprayInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          instableSprayInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 508;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      public Builder setInstableSprayInfo(
-          emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder builderForValue) {
-        if (instableSprayInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          instableSprayInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 508;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      public Builder mergeInstableSprayInfo(emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo value) {
-        if (instableSprayInfoBuilder_ == null) {
-          if (detailCase_ == 508 &&
-              detail_ != emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.newBuilder((emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 508) {
-            instableSprayInfoBuilder_.mergeFrom(value);
-          }
-          instableSprayInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 508;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      public Builder clearInstableSprayInfo() {
-        if (instableSprayInfoBuilder_ == null) {
-          if (detailCase_ == 508) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 508) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          instableSprayInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      public emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder getInstableSprayInfoBuilder() {
-        return getInstableSprayInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder getInstableSprayInfoOrBuilder() {
-        if ((detailCase_ == 508) && (instableSprayInfoBuilder_ != null)) {
-          return instableSprayInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 508) {
-            return (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.InstableSprayDetailInfo instable_spray_info = 508;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder> 
-          getInstableSprayInfoFieldBuilder() {
-        if (instableSprayInfoBuilder_ == null) {
-          if (!(detailCase_ == 508)) {
-            detail_ = emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.getDefaultInstance();
-          }
-          instableSprayInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo.Builder, emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.InstableSprayDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 508;
-        onChanged();;
-        return instableSprayInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder> muqadasPotionInfoBuilder_;
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       * @return Whether the muqadasPotionInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasMuqadasPotionInfo() {
-        return detailCase_ == 1474;
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       * @return The muqadasPotionInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo getMuqadasPotionInfo() {
-        if (muqadasPotionInfoBuilder_ == null) {
-          if (detailCase_ == 1474) {
-            return (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1474) {
-            return muqadasPotionInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      public Builder setMuqadasPotionInfo(emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo value) {
-        if (muqadasPotionInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          muqadasPotionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1474;
-        return this;
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      public Builder setMuqadasPotionInfo(
-          emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder builderForValue) {
-        if (muqadasPotionInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          muqadasPotionInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1474;
-        return this;
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      public Builder mergeMuqadasPotionInfo(emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo value) {
-        if (muqadasPotionInfoBuilder_ == null) {
-          if (detailCase_ == 1474 &&
-              detail_ != emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1474) {
-            muqadasPotionInfoBuilder_.mergeFrom(value);
-          }
-          muqadasPotionInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1474;
-        return this;
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      public Builder clearMuqadasPotionInfo() {
-        if (muqadasPotionInfoBuilder_ == null) {
-          if (detailCase_ == 1474) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1474) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          muqadasPotionInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      public emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder getMuqadasPotionInfoBuilder() {
-        return getMuqadasPotionInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder getMuqadasPotionInfoOrBuilder() {
-        if ((detailCase_ == 1474) && (muqadasPotionInfoBuilder_ != null)) {
-          return muqadasPotionInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1474) {
-            return (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MuqadasPotionActivityDetailInfo muqadas_potion_info = 1474;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder> 
-          getMuqadasPotionInfoFieldBuilder() {
-        if (muqadasPotionInfoBuilder_ == null) {
-          if (!(detailCase_ == 1474)) {
-            detail_ = emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.getDefaultInstance();
-          }
-          muqadasPotionInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo.Builder, emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.MuqadasPotionActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1474;
-        onChanged();;
-        return muqadasPotionInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder> treasureSeelieInfoBuilder_;
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       * @return Whether the treasureSeelieInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTreasureSeelieInfo() {
-        return detailCase_ == 1251;
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       * @return The treasureSeelieInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo getTreasureSeelieInfo() {
-        if (treasureSeelieInfoBuilder_ == null) {
-          if (detailCase_ == 1251) {
-            return (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1251) {
-            return treasureSeelieInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      public Builder setTreasureSeelieInfo(emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo value) {
-        if (treasureSeelieInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          treasureSeelieInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1251;
-        return this;
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      public Builder setTreasureSeelieInfo(
-          emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder builderForValue) {
-        if (treasureSeelieInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          treasureSeelieInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1251;
-        return this;
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      public Builder mergeTreasureSeelieInfo(emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo value) {
-        if (treasureSeelieInfoBuilder_ == null) {
-          if (detailCase_ == 1251 &&
-              detail_ != emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1251) {
-            treasureSeelieInfoBuilder_.mergeFrom(value);
-          }
-          treasureSeelieInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1251;
-        return this;
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      public Builder clearTreasureSeelieInfo() {
-        if (treasureSeelieInfoBuilder_ == null) {
-          if (detailCase_ == 1251) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1251) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          treasureSeelieInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      public emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder getTreasureSeelieInfoBuilder() {
-        return getTreasureSeelieInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder getTreasureSeelieInfoOrBuilder() {
-        if ((detailCase_ == 1251) && (treasureSeelieInfoBuilder_ != null)) {
-          return treasureSeelieInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1251) {
-            return (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TreasureSeelieActivityDetailInfo treasure_seelie_info = 1251;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder> 
-          getTreasureSeelieInfoFieldBuilder() {
-        if (treasureSeelieInfoBuilder_ == null) {
-          if (!(detailCase_ == 1251)) {
-            detail_ = emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.getDefaultInstance();
-          }
-          treasureSeelieInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo.Builder, emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.TreasureSeelieActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1251;
-        onChanged();;
-        return treasureSeelieInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder> rockBoardExploreInfoBuilder_;
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       * @return Whether the rockBoardExploreInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasRockBoardExploreInfo() {
-        return detailCase_ == 1028;
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       * @return The rockBoardExploreInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo getRockBoardExploreInfo() {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          if (detailCase_ == 1028) {
-            return (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1028) {
-            return rockBoardExploreInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      public Builder setRockBoardExploreInfo(emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo value) {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          rockBoardExploreInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1028;
-        return this;
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      public Builder setRockBoardExploreInfo(
-          emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder builderForValue) {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          rockBoardExploreInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1028;
-        return this;
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      public Builder mergeRockBoardExploreInfo(emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo value) {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          if (detailCase_ == 1028 &&
-              detail_ != emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.newBuilder((emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1028) {
-            rockBoardExploreInfoBuilder_.mergeFrom(value);
-          }
-          rockBoardExploreInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1028;
-        return this;
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      public Builder clearRockBoardExploreInfo() {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          if (detailCase_ == 1028) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1028) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          rockBoardExploreInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      public emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder getRockBoardExploreInfoBuilder() {
-        return getRockBoardExploreInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder getRockBoardExploreInfoOrBuilder() {
-        if ((detailCase_ == 1028) && (rockBoardExploreInfoBuilder_ != null)) {
-          return rockBoardExploreInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1028) {
-            return (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RockBoardExploreDetailInfo rock_board_explore_info = 1028;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder> 
-          getRockBoardExploreInfoFieldBuilder() {
-        if (rockBoardExploreInfoBuilder_ == null) {
-          if (!(detailCase_ == 1028)) {
-            detail_ = emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.getDefaultInstance();
-          }
-          rockBoardExploreInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo.Builder, emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.RockBoardExploreDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1028;
-        onChanged();;
-        return rockBoardExploreInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder> vintageInfoBuilder_;
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       * @return Whether the vintageInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasVintageInfo() {
-        return detailCase_ == 1465;
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       * @return The vintageInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo getVintageInfo() {
-        if (vintageInfoBuilder_ == null) {
-          if (detailCase_ == 1465) {
-            return (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1465) {
-            return vintageInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      public Builder setVintageInfo(emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo value) {
-        if (vintageInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          vintageInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1465;
-        return this;
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      public Builder setVintageInfo(
-          emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder builderForValue) {
-        if (vintageInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          vintageInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1465;
-        return this;
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      public Builder mergeVintageInfo(emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo value) {
-        if (vintageInfoBuilder_ == null) {
-          if (detailCase_ == 1465 &&
-              detail_ != emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.newBuilder((emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1465) {
-            vintageInfoBuilder_.mergeFrom(value);
-          }
-          vintageInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1465;
-        return this;
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      public Builder clearVintageInfo() {
-        if (vintageInfoBuilder_ == null) {
-          if (detailCase_ == 1465) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1465) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          vintageInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      public emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder getVintageInfoBuilder() {
-        return getVintageInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder getVintageInfoOrBuilder() {
-        if ((detailCase_ == 1465) && (vintageInfoBuilder_ != null)) {
-          return vintageInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1465) {
-            return (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.VintageActivityDetailInfo vintage_info = 1465;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder> 
-          getVintageInfoFieldBuilder() {
-        if (vintageInfoBuilder_ == null) {
-          if (!(detailCase_ == 1465)) {
-            detail_ = emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.getDefaultInstance();
-          }
-          vintageInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo.Builder, emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.VintageActivityDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1465;
-        onChanged();;
-        return vintageInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder> windFieldInfoBuilder_;
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       * @return Whether the windFieldInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasWindFieldInfo() {
-        return detailCase_ == 768;
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       * @return The windFieldInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo getWindFieldInfo() {
-        if (windFieldInfoBuilder_ == null) {
-          if (detailCase_ == 768) {
-            return (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 768) {
-            return windFieldInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      public Builder setWindFieldInfo(emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo value) {
-        if (windFieldInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          windFieldInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 768;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      public Builder setWindFieldInfo(
-          emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder builderForValue) {
-        if (windFieldInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          windFieldInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 768;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      public Builder mergeWindFieldInfo(emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo value) {
-        if (windFieldInfoBuilder_ == null) {
-          if (detailCase_ == 768 &&
-              detail_ != emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.newBuilder((emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 768) {
-            windFieldInfoBuilder_.mergeFrom(value);
-          }
-          windFieldInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 768;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      public Builder clearWindFieldInfo() {
-        if (windFieldInfoBuilder_ == null) {
-          if (detailCase_ == 768) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 768) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          windFieldInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      public emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder getWindFieldInfoBuilder() {
-        return getWindFieldInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder getWindFieldInfoOrBuilder() {
-        if ((detailCase_ == 768) && (windFieldInfoBuilder_ != null)) {
-          return windFieldInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 768) {
-            return (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WindFieldDetailInfo wind_field_info = 768;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder> 
-          getWindFieldInfoFieldBuilder() {
-        if (windFieldInfoBuilder_ == null) {
-          if (!(detailCase_ == 768)) {
-            detail_ = emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.getDefaultInstance();
-          }
-          windFieldInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo.Builder, emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.WindFieldDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 768;
-        onChanged();;
-        return windFieldInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder> fungusFighterInfoBuilder_;
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       * @return Whether the fungusFighterInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFungusFighterInfo() {
-        return detailCase_ == 834;
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       * @return The fungusFighterInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo getFungusFighterInfo() {
-        if (fungusFighterInfoBuilder_ == null) {
-          if (detailCase_ == 834) {
-            return (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 834) {
-            return fungusFighterInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      public Builder setFungusFighterInfo(emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo value) {
-        if (fungusFighterInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fungusFighterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 834;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      public Builder setFungusFighterInfo(
-          emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder builderForValue) {
-        if (fungusFighterInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fungusFighterInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 834;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      public Builder mergeFungusFighterInfo(emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo value) {
-        if (fungusFighterInfoBuilder_ == null) {
-          if (detailCase_ == 834 &&
-              detail_ != emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.newBuilder((emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 834) {
-            fungusFighterInfoBuilder_.mergeFrom(value);
-          }
-          fungusFighterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 834;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      public Builder clearFungusFighterInfo() {
-        if (fungusFighterInfoBuilder_ == null) {
-          if (detailCase_ == 834) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 834) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fungusFighterInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      public emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder getFungusFighterInfoBuilder() {
-        return getFungusFighterInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder getFungusFighterInfoOrBuilder() {
-        if ((detailCase_ == 834) && (fungusFighterInfoBuilder_ != null)) {
-          return fungusFighterInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 834) {
-            return (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterDetailInfo fungus_fighter_info = 834;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder> 
-          getFungusFighterInfoFieldBuilder() {
-        if (fungusFighterInfoBuilder_ == null) {
-          if (!(detailCase_ == 834)) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.getDefaultInstance();
-          }
-          fungusFighterInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.FungusFighterDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 834;
-        onChanged();;
-        return fungusFighterInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder> charAmusementInfoBuilder_;
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       * @return Whether the charAmusementInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasCharAmusementInfo() {
-        return detailCase_ == 1222;
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       * @return The charAmusementInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo getCharAmusementInfo() {
-        if (charAmusementInfoBuilder_ == null) {
-          if (detailCase_ == 1222) {
-            return (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1222) {
-            return charAmusementInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      public Builder setCharAmusementInfo(emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo value) {
-        if (charAmusementInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          charAmusementInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1222;
-        return this;
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      public Builder setCharAmusementInfo(
-          emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder builderForValue) {
-        if (charAmusementInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          charAmusementInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1222;
-        return this;
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      public Builder mergeCharAmusementInfo(emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo value) {
-        if (charAmusementInfoBuilder_ == null) {
-          if (detailCase_ == 1222 &&
-              detail_ != emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.newBuilder((emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1222) {
-            charAmusementInfoBuilder_.mergeFrom(value);
-          }
-          charAmusementInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1222;
-        return this;
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      public Builder clearCharAmusementInfo() {
-        if (charAmusementInfoBuilder_ == null) {
-          if (detailCase_ == 1222) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1222) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          charAmusementInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      public emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder getCharAmusementInfoBuilder() {
-        return getCharAmusementInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder getCharAmusementInfoOrBuilder() {
-        if ((detailCase_ == 1222) && (charAmusementInfoBuilder_ != null)) {
-          return charAmusementInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1222) {
-            return (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CharAmusementDetailInfo char_amusement_info = 1222;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder> 
-          getCharAmusementInfoFieldBuilder() {
-        if (charAmusementInfoBuilder_ == null) {
-          if (!(detailCase_ == 1222)) {
-            detail_ = emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.getDefaultInstance();
-          }
-          charAmusementInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo.Builder, emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.CharAmusementDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1222;
-        onChanged();;
-        return charAmusementInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder> effigyChallengeInfoBuilder_;
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       * @return Whether the effigyChallengeInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyChallengeInfo() {
-        return detailCase_ == 1275;
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       * @return The effigyChallengeInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo getEffigyChallengeInfo() {
-        if (effigyChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 1275) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1275) {
-            return effigyChallengeInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      public Builder setEffigyChallengeInfo(emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo value) {
-        if (effigyChallengeInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1275;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      public Builder setEffigyChallengeInfo(
-          emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder builderForValue) {
-        if (effigyChallengeInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyChallengeInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1275;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      public Builder mergeEffigyChallengeInfo(emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo value) {
-        if (effigyChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 1275 &&
-              detail_ != emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1275) {
-            effigyChallengeInfoBuilder_.mergeFrom(value);
-          }
-          effigyChallengeInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1275;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      public Builder clearEffigyChallengeInfo() {
-        if (effigyChallengeInfoBuilder_ == null) {
-          if (detailCase_ == 1275) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1275) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyChallengeInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder getEffigyChallengeInfoBuilder() {
-        return getEffigyChallengeInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder getEffigyChallengeInfoOrBuilder() {
-        if ((detailCase_ == 1275) && (effigyChallengeInfoBuilder_ != null)) {
-          return effigyChallengeInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1275) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV2DetailInfo effigy_challenge_info = 1275;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder> 
-          getEffigyChallengeInfoFieldBuilder() {
-        if (effigyChallengeInfoBuilder_ == null) {
-          if (!(detailCase_ == 1275)) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.getDefaultInstance();
-          }
-          effigyChallengeInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.EffigyChallengeV2DetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1275;
-        onChanged();;
-        return effigyChallengeInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder> coinCollectInfoBuilder_;
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       * @return Whether the coinCollectInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasCoinCollectInfo() {
-        return detailCase_ == 839;
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       * @return The coinCollectInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo getCoinCollectInfo() {
-        if (coinCollectInfoBuilder_ == null) {
-          if (detailCase_ == 839) {
-            return (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 839) {
-            return coinCollectInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      public Builder setCoinCollectInfo(emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo value) {
-        if (coinCollectInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          coinCollectInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 839;
-        return this;
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      public Builder setCoinCollectInfo(
-          emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder builderForValue) {
-        if (coinCollectInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          coinCollectInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 839;
-        return this;
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      public Builder mergeCoinCollectInfo(emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo value) {
-        if (coinCollectInfoBuilder_ == null) {
-          if (detailCase_ == 839 &&
-              detail_ != emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.newBuilder((emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 839) {
-            coinCollectInfoBuilder_.mergeFrom(value);
-          }
-          coinCollectInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 839;
-        return this;
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      public Builder clearCoinCollectInfo() {
-        if (coinCollectInfoBuilder_ == null) {
-          if (detailCase_ == 839) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 839) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          coinCollectInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      public emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder getCoinCollectInfoBuilder() {
-        return getCoinCollectInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder getCoinCollectInfoOrBuilder() {
-        if ((detailCase_ == 839) && (coinCollectInfoBuilder_ != null)) {
-          return coinCollectInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 839) {
-            return (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CoinCollectDetailInfo coin_collect_info = 839;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder> 
-          getCoinCollectInfoFieldBuilder() {
-        if (coinCollectInfoBuilder_ == null) {
-          if (!(detailCase_ == 839)) {
-            detail_ = emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.getDefaultInstance();
-          }
-          coinCollectInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo.Builder, emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.CoinCollectDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 839;
-        onChanged();;
-        return coinCollectInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder> brickBreakerInfoBuilder_;
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       * @return Whether the brickBreakerInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBrickBreakerInfo() {
-        return detailCase_ == 551;
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       * @return The brickBreakerInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo getBrickBreakerInfo() {
-        if (brickBreakerInfoBuilder_ == null) {
-          if (detailCase_ == 551) {
-            return (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 551) {
-            return brickBreakerInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      public Builder setBrickBreakerInfo(emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo value) {
-        if (brickBreakerInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          brickBreakerInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 551;
-        return this;
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      public Builder setBrickBreakerInfo(
-          emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder builderForValue) {
-        if (brickBreakerInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          brickBreakerInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 551;
-        return this;
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      public Builder mergeBrickBreakerInfo(emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo value) {
-        if (brickBreakerInfoBuilder_ == null) {
-          if (detailCase_ == 551 &&
-              detail_ != emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.newBuilder((emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 551) {
-            brickBreakerInfoBuilder_.mergeFrom(value);
-          }
-          brickBreakerInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 551;
-        return this;
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      public Builder clearBrickBreakerInfo() {
-        if (brickBreakerInfoBuilder_ == null) {
-          if (detailCase_ == 551) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 551) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          brickBreakerInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      public emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder getBrickBreakerInfoBuilder() {
-        return getBrickBreakerInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder getBrickBreakerInfoOrBuilder() {
-        if ((detailCase_ == 551) && (brickBreakerInfoBuilder_ != null)) {
-          return brickBreakerInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 551) {
-            return (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BrickBreakerDetailInfo brick_breaker_info = 551;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder> 
-          getBrickBreakerInfoFieldBuilder() {
-        if (brickBreakerInfoBuilder_ == null) {
-          if (!(detailCase_ == 551)) {
-            detail_ = emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.getDefaultInstance();
-          }
-          brickBreakerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo.Builder, emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.BrickBreakerDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 551;
-        onChanged();;
-        return brickBreakerInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder> duelHeartInfoBuilder_;
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       * @return Whether the duelHeartInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasDuelHeartInfo() {
-        return detailCase_ == 1670;
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       * @return The duelHeartInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo getDuelHeartInfo() {
-        if (duelHeartInfoBuilder_ == null) {
-          if (detailCase_ == 1670) {
-            return (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1670) {
-            return duelHeartInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      public Builder setDuelHeartInfo(emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo value) {
-        if (duelHeartInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          duelHeartInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1670;
-        return this;
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      public Builder setDuelHeartInfo(
-          emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder builderForValue) {
-        if (duelHeartInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          duelHeartInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1670;
-        return this;
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      public Builder mergeDuelHeartInfo(emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo value) {
-        if (duelHeartInfoBuilder_ == null) {
-          if (detailCase_ == 1670 &&
-              detail_ != emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.newBuilder((emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1670) {
-            duelHeartInfoBuilder_.mergeFrom(value);
-          }
-          duelHeartInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1670;
-        return this;
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      public Builder clearDuelHeartInfo() {
-        if (duelHeartInfoBuilder_ == null) {
-          if (detailCase_ == 1670) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1670) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          duelHeartInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      public emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder getDuelHeartInfoBuilder() {
-        return getDuelHeartInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder getDuelHeartInfoOrBuilder() {
-        if ((detailCase_ == 1670) && (duelHeartInfoBuilder_ != null)) {
-          return duelHeartInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1670) {
-            return (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.DuelHeartDetailInfo duel_heart_info = 1670;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder> 
-          getDuelHeartInfoFieldBuilder() {
-        if (duelHeartInfoBuilder_ == null) {
-          if (!(detailCase_ == 1670)) {
-            detail_ = emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.getDefaultInstance();
-          }
-          duelHeartInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo.Builder, emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.DuelHeartDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1670;
-        onChanged();;
-        return duelHeartInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder> seaLampV3InfoBuilder_;
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       * @return Whether the seaLampV3Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasSeaLampV3Info() {
-        return detailCase_ == 833;
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       * @return The seaLampV3Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo getSeaLampV3Info() {
-        if (seaLampV3InfoBuilder_ == null) {
-          if (detailCase_ == 833) {
-            return (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 833) {
-            return seaLampV3InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      public Builder setSeaLampV3Info(emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo value) {
-        if (seaLampV3InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          seaLampV3InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 833;
-        return this;
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      public Builder setSeaLampV3Info(
-          emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder builderForValue) {
-        if (seaLampV3InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          seaLampV3InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 833;
-        return this;
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      public Builder mergeSeaLampV3Info(emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo value) {
-        if (seaLampV3InfoBuilder_ == null) {
-          if (detailCase_ == 833 &&
-              detail_ != emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.newBuilder((emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 833) {
-            seaLampV3InfoBuilder_.mergeFrom(value);
-          }
-          seaLampV3InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 833;
-        return this;
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      public Builder clearSeaLampV3Info() {
-        if (seaLampV3InfoBuilder_ == null) {
-          if (detailCase_ == 833) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 833) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          seaLampV3InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      public emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder getSeaLampV3InfoBuilder() {
-        return getSeaLampV3InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder getSeaLampV3InfoOrBuilder() {
-        if ((detailCase_ == 833) && (seaLampV3InfoBuilder_ != null)) {
-          return seaLampV3InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 833) {
-            return (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SeaLampV3DetailInfo sea_lamp_v3_info = 833;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder> 
-          getSeaLampV3InfoFieldBuilder() {
-        if (seaLampV3InfoBuilder_ == null) {
-          if (!(detailCase_ == 833)) {
-            detail_ = emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.getDefaultInstance();
-          }
-          seaLampV3InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo.Builder, emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.SeaLampV3DetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 833;
-        onChanged();;
-        return seaLampV3InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder> teamChainInfoBuilder_;
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       * @return Whether the teamChainInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTeamChainInfo() {
-        return detailCase_ == 1165;
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       * @return The teamChainInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo getTeamChainInfo() {
-        if (teamChainInfoBuilder_ == null) {
-          if (detailCase_ == 1165) {
-            return (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1165) {
-            return teamChainInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      public Builder setTeamChainInfo(emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo value) {
-        if (teamChainInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          teamChainInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1165;
-        return this;
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      public Builder setTeamChainInfo(
-          emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder builderForValue) {
-        if (teamChainInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          teamChainInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1165;
-        return this;
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      public Builder mergeTeamChainInfo(emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo value) {
-        if (teamChainInfoBuilder_ == null) {
-          if (detailCase_ == 1165 &&
-              detail_ != emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.newBuilder((emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1165) {
-            teamChainInfoBuilder_.mergeFrom(value);
-          }
-          teamChainInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1165;
-        return this;
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      public Builder clearTeamChainInfo() {
-        if (teamChainInfoBuilder_ == null) {
-          if (detailCase_ == 1165) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1165) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          teamChainInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      public emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder getTeamChainInfoBuilder() {
-        return getTeamChainInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder getTeamChainInfoOrBuilder() {
-        if ((detailCase_ == 1165) && (teamChainInfoBuilder_ != null)) {
-          return teamChainInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1165) {
-            return (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TeamChainDetailInfo team_chain_info = 1165;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder> 
-          getTeamChainInfoFieldBuilder() {
-        if (teamChainInfoBuilder_ == null) {
-          if (!(detailCase_ == 1165)) {
-            detail_ = emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.getDefaultInstance();
-          }
-          teamChainInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo.Builder, emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.TeamChainDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1165;
-        onChanged();;
-        return teamChainInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder> electroherculesBattleInfoBuilder_;
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       * @return Whether the electroherculesBattleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasElectroherculesBattleInfo() {
-        return detailCase_ == 981;
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       * @return The electroherculesBattleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo getElectroherculesBattleInfo() {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          if (detailCase_ == 981) {
-            return (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 981) {
-            return electroherculesBattleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      public Builder setElectroherculesBattleInfo(emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo value) {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          electroherculesBattleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 981;
-        return this;
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      public Builder setElectroherculesBattleInfo(
-          emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder builderForValue) {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          electroherculesBattleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 981;
-        return this;
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      public Builder mergeElectroherculesBattleInfo(emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo value) {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          if (detailCase_ == 981 &&
-              detail_ != emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.newBuilder((emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 981) {
-            electroherculesBattleInfoBuilder_.mergeFrom(value);
-          }
-          electroherculesBattleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 981;
-        return this;
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      public Builder clearElectroherculesBattleInfo() {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          if (detailCase_ == 981) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 981) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          electroherculesBattleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      public emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder getElectroherculesBattleInfoBuilder() {
-        return getElectroherculesBattleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder getElectroherculesBattleInfoOrBuilder() {
-        if ((detailCase_ == 981) && (electroherculesBattleInfoBuilder_ != null)) {
-          return electroherculesBattleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 981) {
-            return (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ElectroherculesBattleDetailInfo electrohercules_battle_info = 981;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder> 
-          getElectroherculesBattleInfoFieldBuilder() {
-        if (electroherculesBattleInfoBuilder_ == null) {
-          if (!(detailCase_ == 981)) {
-            detail_ = emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.getDefaultInstance();
-          }
-          electroherculesBattleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo.Builder, emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.ElectroherculesBattleDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 981;
-        onChanged();;
-        return electroherculesBattleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder> gcgFestivalInfoBuilder_;
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       * @return Whether the gcgFestivalInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGcgFestivalInfo() {
-        return detailCase_ == 1664;
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       * @return The gcgFestivalInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo getGcgFestivalInfo() {
-        if (gcgFestivalInfoBuilder_ == null) {
-          if (detailCase_ == 1664) {
-            return (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1664) {
-            return gcgFestivalInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      public Builder setGcgFestivalInfo(emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo value) {
-        if (gcgFestivalInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gcgFestivalInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1664;
-        return this;
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      public Builder setGcgFestivalInfo(
-          emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder builderForValue) {
-        if (gcgFestivalInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gcgFestivalInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1664;
-        return this;
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      public Builder mergeGcgFestivalInfo(emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo value) {
-        if (gcgFestivalInfoBuilder_ == null) {
-          if (detailCase_ == 1664 &&
-              detail_ != emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.newBuilder((emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1664) {
-            gcgFestivalInfoBuilder_.mergeFrom(value);
-          }
-          gcgFestivalInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1664;
-        return this;
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      public Builder clearGcgFestivalInfo() {
-        if (gcgFestivalInfoBuilder_ == null) {
-          if (detailCase_ == 1664) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1664) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gcgFestivalInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      public emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder getGcgFestivalInfoBuilder() {
-        return getGcgFestivalInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder getGcgFestivalInfoOrBuilder() {
-        if ((detailCase_ == 1664) && (gcgFestivalInfoBuilder_ != null)) {
-          return gcgFestivalInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1664) {
-            return (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GCGFestivalDetailInfo gcg_festival_info = 1664;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder> 
-          getGcgFestivalInfoFieldBuilder() {
-        if (gcgFestivalInfoBuilder_ == null) {
-          if (!(detailCase_ == 1664)) {
-            detail_ = emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.getDefaultInstance();
-          }
-          gcgFestivalInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo.Builder, emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.GCGFestivalDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1664;
-        onChanged();;
-        return gcgFestivalInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder> fleurFairV2InfoBuilder_;
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       * @return Whether the fleurFairV2Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasFleurFairV2Info() {
-        return detailCase_ == 1982;
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       * @return The fleurFairV2Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo getFleurFairV2Info() {
-        if (fleurFairV2InfoBuilder_ == null) {
-          if (detailCase_ == 1982) {
-            return (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1982) {
-            return fleurFairV2InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      public Builder setFleurFairV2Info(emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo value) {
-        if (fleurFairV2InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fleurFairV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1982;
-        return this;
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      public Builder setFleurFairV2Info(
-          emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder builderForValue) {
-        if (fleurFairV2InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fleurFairV2InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1982;
-        return this;
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      public Builder mergeFleurFairV2Info(emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo value) {
-        if (fleurFairV2InfoBuilder_ == null) {
-          if (detailCase_ == 1982 &&
-              detail_ != emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.newBuilder((emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1982) {
-            fleurFairV2InfoBuilder_.mergeFrom(value);
-          }
-          fleurFairV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1982;
-        return this;
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      public Builder clearFleurFairV2Info() {
-        if (fleurFairV2InfoBuilder_ == null) {
-          if (detailCase_ == 1982) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1982) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fleurFairV2InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      public emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder getFleurFairV2InfoBuilder() {
-        return getFleurFairV2InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder getFleurFairV2InfoOrBuilder() {
-        if ((detailCase_ == 1982) && (fleurFairV2InfoBuilder_ != null)) {
-          return fleurFairV2InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1982) {
-            return (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FleurFairV2DetailInfo fleur_fair_v2_info = 1982;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder> 
-          getFleurFairV2InfoFieldBuilder() {
-        if (fleurFairV2InfoBuilder_ == null) {
-          if (!(detailCase_ == 1982)) {
-            detail_ = emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.getDefaultInstance();
-          }
-          fleurFairV2InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo.Builder, emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.FleurFairV2DetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1982;
-        onChanged();;
-        return fleurFairV2InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder> fungusFighterV2InfoBuilder_;
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       * @return Whether the fungusFighterV2Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasFungusFighterV2Info() {
-        return detailCase_ == 1541;
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       * @return The fungusFighterV2Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo getFungusFighterV2Info() {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          if (detailCase_ == 1541) {
-            return (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1541) {
-            return fungusFighterV2InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      public Builder setFungusFighterV2Info(emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo value) {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fungusFighterV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1541;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      public Builder setFungusFighterV2Info(
-          emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder builderForValue) {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fungusFighterV2InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1541;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      public Builder mergeFungusFighterV2Info(emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo value) {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          if (detailCase_ == 1541 &&
-              detail_ != emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.newBuilder((emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1541) {
-            fungusFighterV2InfoBuilder_.mergeFrom(value);
-          }
-          fungusFighterV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1541;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      public Builder clearFungusFighterV2Info() {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          if (detailCase_ == 1541) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1541) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fungusFighterV2InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      public emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder getFungusFighterV2InfoBuilder() {
-        return getFungusFighterV2InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder getFungusFighterV2InfoOrBuilder() {
-        if ((detailCase_ == 1541) && (fungusFighterV2InfoBuilder_ != null)) {
-          return fungusFighterV2InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1541) {
-            return (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterV2DetailInfo fungus_fighter_v2_info = 1541;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder> 
-          getFungusFighterV2InfoFieldBuilder() {
-        if (fungusFighterV2InfoBuilder_ == null) {
-          if (!(detailCase_ == 1541)) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.getDefaultInstance();
-          }
-          fungusFighterV2InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.FungusFighterV2DetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1541;
-        onChanged();;
-        return fungusFighterV2InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder> akaFesInfoBuilder_;
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       * @return Whether the akaFesInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasAkaFesInfo() {
-        return detailCase_ == 1524;
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       * @return The akaFesInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo getAkaFesInfo() {
-        if (akaFesInfoBuilder_ == null) {
-          if (detailCase_ == 1524) {
-            return (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1524) {
-            return akaFesInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      public Builder setAkaFesInfo(emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo value) {
-        if (akaFesInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          akaFesInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1524;
-        return this;
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      public Builder setAkaFesInfo(
-          emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder builderForValue) {
-        if (akaFesInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          akaFesInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1524;
-        return this;
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      public Builder mergeAkaFesInfo(emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo value) {
-        if (akaFesInfoBuilder_ == null) {
-          if (detailCase_ == 1524 &&
-              detail_ != emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.newBuilder((emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1524) {
-            akaFesInfoBuilder_.mergeFrom(value);
-          }
-          akaFesInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1524;
-        return this;
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      public Builder clearAkaFesInfo() {
-        if (akaFesInfoBuilder_ == null) {
-          if (detailCase_ == 1524) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1524) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          akaFesInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      public emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder getAkaFesInfoBuilder() {
-        return getAkaFesInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder getAkaFesInfoOrBuilder() {
-        if ((detailCase_ == 1524) && (akaFesInfoBuilder_ != null)) {
-          return akaFesInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1524) {
-            return (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AkaFesDetailInfo aka_fes_info = 1524;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder> 
-          getAkaFesInfoFieldBuilder() {
-        if (akaFesInfoBuilder_ == null) {
-          if (!(detailCase_ == 1524)) {
-            detail_ = emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.getDefaultInstance();
-          }
-          akaFesInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo.Builder, emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.AkaFesDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1524;
-        onChanged();;
-        return akaFesInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder> sandwormCannonDetailInfoBuilder_;
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       * @return Whether the sandwormCannonDetailInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSandwormCannonDetailInfo() {
-        return detailCase_ == 626;
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       * @return The sandwormCannonDetailInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo getSandwormCannonDetailInfo() {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          if (detailCase_ == 626) {
-            return (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 626) {
-            return sandwormCannonDetailInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      public Builder setSandwormCannonDetailInfo(emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo value) {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          sandwormCannonDetailInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 626;
-        return this;
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      public Builder setSandwormCannonDetailInfo(
-          emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder builderForValue) {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          sandwormCannonDetailInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 626;
-        return this;
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      public Builder mergeSandwormCannonDetailInfo(emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo value) {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          if (detailCase_ == 626 &&
-              detail_ != emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.newBuilder((emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 626) {
-            sandwormCannonDetailInfoBuilder_.mergeFrom(value);
-          }
-          sandwormCannonDetailInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 626;
-        return this;
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      public Builder clearSandwormCannonDetailInfo() {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          if (detailCase_ == 626) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 626) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          sandwormCannonDetailInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      public emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder getSandwormCannonDetailInfoBuilder() {
-        return getSandwormCannonDetailInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder getSandwormCannonDetailInfoOrBuilder() {
-        if ((detailCase_ == 626) && (sandwormCannonDetailInfoBuilder_ != null)) {
-          return sandwormCannonDetailInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 626) {
-            return (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SandwormCannonDetailInfo sandworm_cannon_detail_info = 626;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder> 
-          getSandwormCannonDetailInfoFieldBuilder() {
-        if (sandwormCannonDetailInfoBuilder_ == null) {
-          if (!(detailCase_ == 626)) {
-            detail_ = emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.getDefaultInstance();
-          }
-          sandwormCannonDetailInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo.Builder, emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.SandwormCannonDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 626;
-        onChanged();;
-        return sandwormCannonDetailInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder> sorushTrialInfoBuilder_;
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       * @return Whether the sorushTrialInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSorushTrialInfo() {
-        return detailCase_ == 1077;
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       * @return The sorushTrialInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo getSorushTrialInfo() {
-        if (sorushTrialInfoBuilder_ == null) {
-          if (detailCase_ == 1077) {
-            return (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1077) {
-            return sorushTrialInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      public Builder setSorushTrialInfo(emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo value) {
-        if (sorushTrialInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          sorushTrialInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1077;
-        return this;
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      public Builder setSorushTrialInfo(
-          emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder builderForValue) {
-        if (sorushTrialInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          sorushTrialInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1077;
-        return this;
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      public Builder mergeSorushTrialInfo(emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo value) {
-        if (sorushTrialInfoBuilder_ == null) {
-          if (detailCase_ == 1077 &&
-              detail_ != emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.newBuilder((emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1077) {
-            sorushTrialInfoBuilder_.mergeFrom(value);
-          }
-          sorushTrialInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1077;
-        return this;
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      public Builder clearSorushTrialInfo() {
-        if (sorushTrialInfoBuilder_ == null) {
-          if (detailCase_ == 1077) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1077) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          sorushTrialInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      public emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder getSorushTrialInfoBuilder() {
-        return getSorushTrialInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder getSorushTrialInfoOrBuilder() {
-        if ((detailCase_ == 1077) && (sorushTrialInfoBuilder_ != null)) {
-          return sorushTrialInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1077) {
-            return (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SorushTrialDetailInfo sorush_trial_info = 1077;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder> 
-          getSorushTrialInfoFieldBuilder() {
-        if (sorushTrialInfoBuilder_ == null) {
-          if (!(detailCase_ == 1077)) {
-            detail_ = emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.getDefaultInstance();
-          }
-          sorushTrialInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo.Builder, emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.SorushTrialDetailInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1077;
-        onChanged();;
-        return sorushTrialInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder> journeyInfoBuilder_;
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       * @return Whether the journeyInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasJourneyInfo() {
-        return detailCase_ == 1869;
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       * @return The journeyInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo getJourneyInfo() {
-        if (journeyInfoBuilder_ == null) {
-          if (detailCase_ == 1869) {
-            return (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1869) {
-            return journeyInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      public Builder setJourneyInfo(emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo value) {
-        if (journeyInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          journeyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1869;
-        return this;
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      public Builder setJourneyInfo(
-          emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder builderForValue) {
-        if (journeyInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          journeyInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1869;
-        return this;
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      public Builder mergeJourneyInfo(emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo value) {
-        if (journeyInfoBuilder_ == null) {
-          if (detailCase_ == 1869 &&
-              detail_ != emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.newBuilder((emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1869) {
-            journeyInfoBuilder_.mergeFrom(value);
-          }
-          journeyInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1869;
-        return this;
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      public Builder clearJourneyInfo() {
-        if (journeyInfoBuilder_ == null) {
-          if (detailCase_ == 1869) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1869) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          journeyInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      public emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder getJourneyInfoBuilder() {
-        return getJourneyInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder getJourneyInfoOrBuilder() {
-        if ((detailCase_ == 1869) && (journeyInfoBuilder_ != null)) {
-          return journeyInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1869) {
-            return (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.JourneyInfo journey_info = 1869;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder> 
-          getJourneyInfoFieldBuilder() {
-        if (journeyInfoBuilder_ == null) {
-          if (!(detailCase_ == 1869)) {
-            detail_ = emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.getDefaultInstance();
-          }
-          journeyInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo.Builder, emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.JourneyInfoOuterClass.JourneyInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1869;
-        onChanged();;
-        return journeyInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder> effigyChallengeV4InfoBuilder_;
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       * @return Whether the effigyChallengeV4Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyChallengeV4Info() {
-        return detailCase_ == 1321;
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       * @return The effigyChallengeV4Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info getEffigyChallengeV4Info() {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          if (detailCase_ == 1321) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1321) {
-            return effigyChallengeV4InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      public Builder setEffigyChallengeV4Info(emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info value) {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyChallengeV4InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1321;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      public Builder setEffigyChallengeV4Info(
-          emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder builderForValue) {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyChallengeV4InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1321;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      public Builder mergeEffigyChallengeV4Info(emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info value) {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          if (detailCase_ == 1321 &&
-              detail_ != emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.newBuilder((emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1321) {
-            effigyChallengeV4InfoBuilder_.mergeFrom(value);
-          }
-          effigyChallengeV4InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1321;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      public Builder clearEffigyChallengeV4Info() {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          if (detailCase_ == 1321) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1321) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyChallengeV4InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder getEffigyChallengeV4InfoBuilder() {
-        return getEffigyChallengeV4InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder getEffigyChallengeV4InfoOrBuilder() {
-        if ((detailCase_ == 1321) && (effigyChallengeV4InfoBuilder_ != null)) {
-          return effigyChallengeV4InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1321) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV4Info effigy_challenge_v4_info = 1321;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder> 
-          getEffigyChallengeV4InfoFieldBuilder() {
-        if (effigyChallengeV4InfoBuilder_ == null) {
-          if (!(detailCase_ == 1321)) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.getDefaultInstance();
-          }
-          effigyChallengeV4InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info.Builder, emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4InfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.EffigyChallengeV4Info) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1321;
-        onChanged();;
-        return effigyChallengeV4InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder> gcgPveInfoBuilder_;
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       * @return Whether the gcgPveInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGcgPveInfo() {
-        return detailCase_ == 1304;
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       * @return The gcgPveInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo getGcgPveInfo() {
-        if (gcgPveInfoBuilder_ == null) {
-          if (detailCase_ == 1304) {
-            return (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1304) {
-            return gcgPveInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      public Builder setGcgPveInfo(emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo value) {
-        if (gcgPveInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gcgPveInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1304;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      public Builder setGcgPveInfo(
-          emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder builderForValue) {
-        if (gcgPveInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gcgPveInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1304;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      public Builder mergeGcgPveInfo(emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo value) {
-        if (gcgPveInfoBuilder_ == null) {
-          if (detailCase_ == 1304 &&
-              detail_ != emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.newBuilder((emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1304) {
-            gcgPveInfoBuilder_.mergeFrom(value);
-          }
-          gcgPveInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1304;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      public Builder clearGcgPveInfo() {
-        if (gcgPveInfoBuilder_ == null) {
-          if (detailCase_ == 1304) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1304) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gcgPveInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      public emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder getGcgPveInfoBuilder() {
-        return getGcgPveInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder getGcgPveInfoOrBuilder() {
-        if ((detailCase_ == 1304) && (gcgPveInfoBuilder_ != null)) {
-          return gcgPveInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1304) {
-            return (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPveInfo gcg_pve_info = 1304;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder> 
-          getGcgPveInfoFieldBuilder() {
-        if (gcgPveInfoBuilder_ == null) {
-          if (!(detailCase_ == 1304)) {
-            detail_ = emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.getDefaultInstance();
-          }
-          gcgPveInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo.Builder, emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GcgPveInfoOuterClass.GcgPveInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1304;
-        onChanged();;
-        return gcgPveInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder> ugcV2InfoBuilder_;
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       * @return Whether the ugcV2Info field is set.
-       */
-      @java.lang.Override
-      public boolean hasUgcV2Info() {
-        return detailCase_ == 991;
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       * @return The ugcV2Info.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info getUgcV2Info() {
-        if (ugcV2InfoBuilder_ == null) {
-          if (detailCase_ == 991) {
-            return (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_;
-          }
-          return emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-        } else {
-          if (detailCase_ == 991) {
-            return ugcV2InfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      public Builder setUgcV2Info(emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info value) {
-        if (ugcV2InfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          ugcV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 991;
-        return this;
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      public Builder setUgcV2Info(
-          emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder builderForValue) {
-        if (ugcV2InfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          ugcV2InfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 991;
-        return this;
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      public Builder mergeUgcV2Info(emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info value) {
-        if (ugcV2InfoBuilder_ == null) {
-          if (detailCase_ == 991 &&
-              detail_ != emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.newBuilder((emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 991) {
-            ugcV2InfoBuilder_.mergeFrom(value);
-          }
-          ugcV2InfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 991;
-        return this;
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      public Builder clearUgcV2Info() {
-        if (ugcV2InfoBuilder_ == null) {
-          if (detailCase_ == 991) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 991) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          ugcV2InfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      public emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder getUgcV2InfoBuilder() {
-        return getUgcV2InfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder getUgcV2InfoOrBuilder() {
-        if ((detailCase_ == 991) && (ugcV2InfoBuilder_ != null)) {
-          return ugcV2InfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 991) {
-            return (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_;
-          }
-          return emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.UgcV2Info ugc_v2_info = 991;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder> 
-          getUgcV2InfoFieldBuilder() {
-        if (ugcV2InfoBuilder_ == null) {
-          if (!(detailCase_ == 991)) {
-            detail_ = emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.getDefaultInstance();
-          }
-          ugcV2InfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info.Builder, emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2InfoOrBuilder>(
-                  (emu.grasscutter.net.proto.UgcV2InfoOuterClass.UgcV2Info) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 991;
-        onChanged();;
-        return ugcV2InfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder> penumbraAdventureInfoBuilder_;
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       * @return Whether the penumbraAdventureInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPenumbraAdventureInfo() {
-        return detailCase_ == 306;
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       * @return The penumbraAdventureInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo getPenumbraAdventureInfo() {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          if (detailCase_ == 306) {
-            return (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 306) {
-            return penumbraAdventureInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      public Builder setPenumbraAdventureInfo(emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo value) {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          penumbraAdventureInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 306;
-        return this;
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      public Builder setPenumbraAdventureInfo(
-          emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder builderForValue) {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          penumbraAdventureInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 306;
-        return this;
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      public Builder mergePenumbraAdventureInfo(emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo value) {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          if (detailCase_ == 306 &&
-              detail_ != emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.newBuilder((emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 306) {
-            penumbraAdventureInfoBuilder_.mergeFrom(value);
-          }
-          penumbraAdventureInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 306;
-        return this;
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      public Builder clearPenumbraAdventureInfo() {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          if (detailCase_ == 306) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 306) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          penumbraAdventureInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      public emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder getPenumbraAdventureInfoBuilder() {
-        return getPenumbraAdventureInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder getPenumbraAdventureInfoOrBuilder() {
-        if ((detailCase_ == 306) && (penumbraAdventureInfoBuilder_ != null)) {
-          return penumbraAdventureInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 306) {
-            return (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PenumbraAdventureInfo penumbra_adventure_info = 306;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder> 
-          getPenumbraAdventureInfoFieldBuilder() {
-        if (penumbraAdventureInfoBuilder_ == null) {
-          if (!(detailCase_ == 306)) {
-            detail_ = emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.getDefaultInstance();
-          }
-          penumbraAdventureInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo.Builder, emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.PenumbraAdventureInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 306;
-        onChanged();;
-        return penumbraAdventureInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder> animalViewInfoBuilder_;
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       * @return Whether the animalViewInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasAnimalViewInfo() {
-        return detailCase_ == 947;
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       * @return The animalViewInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo getAnimalViewInfo() {
-        if (animalViewInfoBuilder_ == null) {
-          if (detailCase_ == 947) {
-            return (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 947) {
-            return animalViewInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      public Builder setAnimalViewInfo(emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo value) {
-        if (animalViewInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          animalViewInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 947;
-        return this;
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      public Builder setAnimalViewInfo(
-          emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder builderForValue) {
-        if (animalViewInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          animalViewInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 947;
-        return this;
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      public Builder mergeAnimalViewInfo(emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo value) {
-        if (animalViewInfoBuilder_ == null) {
-          if (detailCase_ == 947 &&
-              detail_ != emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.newBuilder((emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 947) {
-            animalViewInfoBuilder_.mergeFrom(value);
-          }
-          animalViewInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 947;
-        return this;
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      public Builder clearAnimalViewInfo() {
-        if (animalViewInfoBuilder_ == null) {
-          if (detailCase_ == 947) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 947) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          animalViewInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      public emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder getAnimalViewInfoBuilder() {
-        return getAnimalViewInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder getAnimalViewInfoOrBuilder() {
-        if ((detailCase_ == 947) && (animalViewInfoBuilder_ != null)) {
-          return animalViewInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 947) {
-            return (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.AnimalViewInfo animal_view_info = 947;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder> 
-          getAnimalViewInfoFieldBuilder() {
-        if (animalViewInfoBuilder_ == null) {
-          if (!(detailCase_ == 947)) {
-            detail_ = emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.getDefaultInstance();
-          }
-          animalViewInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo.Builder, emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.AnimalViewInfoOuterClass.AnimalViewInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 947;
-        onChanged();;
-        return animalViewInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder> activityMultiCharacterInfoBuilder_;
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       * @return Whether the activityMultiCharacterInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasActivityMultiCharacterInfo() {
-        return detailCase_ == 1213;
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       * @return The activityMultiCharacterInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo getActivityMultiCharacterInfo() {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          if (detailCase_ == 1213) {
-            return (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1213) {
-            return activityMultiCharacterInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      public Builder setActivityMultiCharacterInfo(emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo value) {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          activityMultiCharacterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1213;
-        return this;
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      public Builder setActivityMultiCharacterInfo(
-          emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder builderForValue) {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          activityMultiCharacterInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1213;
-        return this;
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      public Builder mergeActivityMultiCharacterInfo(emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo value) {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          if (detailCase_ == 1213 &&
-              detail_ != emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.newBuilder((emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1213) {
-            activityMultiCharacterInfoBuilder_.mergeFrom(value);
-          }
-          activityMultiCharacterInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1213;
-        return this;
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      public Builder clearActivityMultiCharacterInfo() {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          if (detailCase_ == 1213) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1213) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          activityMultiCharacterInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      public emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder getActivityMultiCharacterInfoBuilder() {
-        return getActivityMultiCharacterInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder getActivityMultiCharacterInfoOrBuilder() {
-        if ((detailCase_ == 1213) && (activityMultiCharacterInfoBuilder_ != null)) {
-          return activityMultiCharacterInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1213) {
-            return (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ActivityMultiCharacterInfo activity_multi_character_info = 1213;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder> 
-          getActivityMultiCharacterInfoFieldBuilder() {
-        if (activityMultiCharacterInfoBuilder_ == null) {
-          if (!(detailCase_ == 1213)) {
-            detail_ = emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.getDefaultInstance();
-          }
-          activityMultiCharacterInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo.Builder, emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.ActivityMultiCharacterInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1213;
-        onChanged();;
-        return activityMultiCharacterInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder> gcgPveInfiniteInfoBuilder_;
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       * @return Whether the gcgPveInfiniteInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGcgPveInfiniteInfo() {
-        return detailCase_ == 124;
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       * @return The gcgPveInfiniteInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo getGcgPveInfiniteInfo() {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          if (detailCase_ == 124) {
-            return (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 124) {
-            return gcgPveInfiniteInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      public Builder setGcgPveInfiniteInfo(emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo value) {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gcgPveInfiniteInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 124;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      public Builder setGcgPveInfiniteInfo(
-          emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder builderForValue) {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gcgPveInfiniteInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 124;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      public Builder mergeGcgPveInfiniteInfo(emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo value) {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          if (detailCase_ == 124 &&
-              detail_ != emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.newBuilder((emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 124) {
-            gcgPveInfiniteInfoBuilder_.mergeFrom(value);
-          }
-          gcgPveInfiniteInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 124;
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      public Builder clearGcgPveInfiniteInfo() {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          if (detailCase_ == 124) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 124) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gcgPveInfiniteInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      public emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder getGcgPveInfiniteInfoBuilder() {
-        return getGcgPveInfiniteInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder getGcgPveInfiniteInfoOrBuilder() {
-        if ((detailCase_ == 124) && (gcgPveInfiniteInfoBuilder_ != null)) {
-          return gcgPveInfiniteInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 124) {
-            return (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPveInfiniteInfo gcg_pve_infinite_info = 124;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder> 
-          getGcgPveInfiniteInfoFieldBuilder() {
-        if (gcgPveInfiniteInfoBuilder_ == null) {
-          if (!(detailCase_ == 124)) {
-            detail_ = emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.getDefaultInstance();
-          }
-          gcgPveInfiniteInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo.Builder, emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.GcgPveInfiniteInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 124;
-        onChanged();;
-        return gcgPveInfiniteInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder> toyBattleInfoBuilder_;
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       * @return Whether the toyBattleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasToyBattleInfo() {
-        return detailCase_ == 62;
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       * @return The toyBattleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo getToyBattleInfo() {
-        if (toyBattleInfoBuilder_ == null) {
-          if (detailCase_ == 62) {
-            return (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 62) {
-            return toyBattleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      public Builder setToyBattleInfo(emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo value) {
-        if (toyBattleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          toyBattleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 62;
-        return this;
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      public Builder setToyBattleInfo(
-          emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder builderForValue) {
-        if (toyBattleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          toyBattleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 62;
-        return this;
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      public Builder mergeToyBattleInfo(emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo value) {
-        if (toyBattleInfoBuilder_ == null) {
-          if (detailCase_ == 62 &&
-              detail_ != emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.newBuilder((emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 62) {
-            toyBattleInfoBuilder_.mergeFrom(value);
-          }
-          toyBattleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 62;
-        return this;
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      public Builder clearToyBattleInfo() {
-        if (toyBattleInfoBuilder_ == null) {
-          if (detailCase_ == 62) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 62) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          toyBattleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      public emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder getToyBattleInfoBuilder() {
-        return getToyBattleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder getToyBattleInfoOrBuilder() {
-        if ((detailCase_ == 62) && (toyBattleInfoBuilder_ != null)) {
-          return toyBattleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 62) {
-            return (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ToyBattleInfo toy_battle_info = 62;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder> 
-          getToyBattleInfoFieldBuilder() {
-        if (toyBattleInfoBuilder_ == null) {
-          if (!(detailCase_ == 62)) {
-            detail_ = emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.getDefaultInstance();
-          }
-          toyBattleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo.Builder, emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ToyBattleInfoOuterClass.ToyBattleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 62;
-        onChanged();;
-        return toyBattleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder> photoUnderseaInfoBuilder_;
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       * @return Whether the photoUnderseaInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPhotoUnderseaInfo() {
-        return detailCase_ == 226;
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       * @return The photoUnderseaInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo getPhotoUnderseaInfo() {
-        if (photoUnderseaInfoBuilder_ == null) {
-          if (detailCase_ == 226) {
-            return (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 226) {
-            return photoUnderseaInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      public Builder setPhotoUnderseaInfo(emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo value) {
-        if (photoUnderseaInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          photoUnderseaInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 226;
-        return this;
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      public Builder setPhotoUnderseaInfo(
-          emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder builderForValue) {
-        if (photoUnderseaInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          photoUnderseaInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 226;
-        return this;
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      public Builder mergePhotoUnderseaInfo(emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo value) {
-        if (photoUnderseaInfoBuilder_ == null) {
-          if (detailCase_ == 226 &&
-              detail_ != emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.newBuilder((emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 226) {
-            photoUnderseaInfoBuilder_.mergeFrom(value);
-          }
-          photoUnderseaInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 226;
-        return this;
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      public Builder clearPhotoUnderseaInfo() {
-        if (photoUnderseaInfoBuilder_ == null) {
-          if (detailCase_ == 226) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 226) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          photoUnderseaInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      public emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder getPhotoUnderseaInfoBuilder() {
-        return getPhotoUnderseaInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder getPhotoUnderseaInfoOrBuilder() {
-        if ((detailCase_ == 226) && (photoUnderseaInfoBuilder_ != null)) {
-          return photoUnderseaInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 226) {
-            return (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PhotoUnderseaInfo photo_undersea_info = 226;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder> 
-          getPhotoUnderseaInfoFieldBuilder() {
-        if (photoUnderseaInfoBuilder_ == null) {
-          if (!(detailCase_ == 226)) {
-            detail_ = emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.getDefaultInstance();
-          }
-          photoUnderseaInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo.Builder, emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.PhotoUnderseaInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 226;
-        onChanged();;
-        return photoUnderseaInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder> fontaineGatherInfoBuilder_;
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       * @return Whether the fontaineGatherInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFontaineGatherInfo() {
-        return detailCase_ == 1035;
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       * @return The fontaineGatherInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo getFontaineGatherInfo() {
-        if (fontaineGatherInfoBuilder_ == null) {
-          if (detailCase_ == 1035) {
-            return (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1035) {
-            return fontaineGatherInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      public Builder setFontaineGatherInfo(emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo value) {
-        if (fontaineGatherInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fontaineGatherInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1035;
-        return this;
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      public Builder setFontaineGatherInfo(
-          emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder builderForValue) {
-        if (fontaineGatherInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fontaineGatherInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1035;
-        return this;
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      public Builder mergeFontaineGatherInfo(emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo value) {
-        if (fontaineGatherInfoBuilder_ == null) {
-          if (detailCase_ == 1035 &&
-              detail_ != emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.newBuilder((emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1035) {
-            fontaineGatherInfoBuilder_.mergeFrom(value);
-          }
-          fontaineGatherInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1035;
-        return this;
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      public Builder clearFontaineGatherInfo() {
-        if (fontaineGatherInfoBuilder_ == null) {
-          if (detailCase_ == 1035) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1035) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fontaineGatherInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      public emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder getFontaineGatherInfoBuilder() {
-        return getFontaineGatherInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder getFontaineGatherInfoOrBuilder() {
-        if ((detailCase_ == 1035) && (fontaineGatherInfoBuilder_ != null)) {
-          return fontaineGatherInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1035) {
-            return (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FontaineGatherInfo fontaine_gather_info = 1035;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder> 
-          getFontaineGatherInfoFieldBuilder() {
-        if (fontaineGatherInfoBuilder_ == null) {
-          if (!(detailCase_ == 1035)) {
-            detail_ = emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.getDefaultInstance();
-          }
-          fontaineGatherInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo.Builder, emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.FontaineGatherInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1035;
-        onChanged();;
-        return fontaineGatherInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder> gcgPvePuzzleInfoBuilder_;
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       * @return Whether the gcgPvePuzzleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasGcgPvePuzzleInfo() {
-        return detailCase_ == 871;
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       * @return The gcgPvePuzzleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo getGcgPvePuzzleInfo() {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          if (detailCase_ == 871) {
-            return (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 871) {
-            return gcgPvePuzzleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      public Builder setGcgPvePuzzleInfo(emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo value) {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          gcgPvePuzzleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 871;
-        return this;
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      public Builder setGcgPvePuzzleInfo(
-          emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder builderForValue) {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          gcgPvePuzzleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 871;
-        return this;
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      public Builder mergeGcgPvePuzzleInfo(emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo value) {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          if (detailCase_ == 871 &&
-              detail_ != emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.newBuilder((emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 871) {
-            gcgPvePuzzleInfoBuilder_.mergeFrom(value);
-          }
-          gcgPvePuzzleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 871;
-        return this;
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      public Builder clearGcgPvePuzzleInfo() {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          if (detailCase_ == 871) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 871) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          gcgPvePuzzleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      public emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder getGcgPvePuzzleInfoBuilder() {
-        return getGcgPvePuzzleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder getGcgPvePuzzleInfoOrBuilder() {
-        if ((detailCase_ == 871) && (gcgPvePuzzleInfoBuilder_ != null)) {
-          return gcgPvePuzzleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 871) {
-            return (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.GcgPvePuzzleInfo gcg_pve_puzzle_info = 871;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder> 
-          getGcgPvePuzzleInfoFieldBuilder() {
-        if (gcgPvePuzzleInfoBuilder_ == null) {
-          if (!(detailCase_ == 871)) {
-            detail_ = emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.getDefaultInstance();
-          }
-          gcgPvePuzzleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo.Builder, emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.GcgPvePuzzleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 871;
-        onChanged();;
-        return gcgPvePuzzleInfoBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -23324,315 +4512,47 @@ public final class ActivityInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022ActivityInfo.proto\032\031ActivityWatcherInf" +
-      "o.proto\032\032ActivityPushTipsData.proto\032\037Sea" +
-      "LampActivityDetailInfo.proto\032 CrucibleAc" +
-      "tivityDetailInfo.proto\032 SalesmanActivity" +
-      "DetailInfo.proto\032#TrialAvatarActivityDet" +
-      "ailInfo.proto\032 DeliveryActivityDetailInf" +
-      "o.proto\032\035AsterActivityDetailInfo.proto\032\036" +
-      "FlightActivityDetailInfo.proto\032#DragonSp" +
-      "ineActivityDetailInfo.proto\032\036EffigyActiv" +
-      "ityDetailInfo.proto\032#TreasureMapActivity" +
-      "DetailInfo.proto\032 BlessingActivityDetail" +
-      "Info.proto\032\031SeaLampActivityInfo.proto\032\"E" +
-      "xpeditionActivityDetailInfo.proto\032&Arena" +
-      "ChallengeActivityDetailInfo.proto\032!Fleur" +
-      "FairActivityDetailInfo.proto\032#WaterSpiri" +
-      "tActivityDetailInfo.proto\032%ChannelerSlab" +
-      "ActivityDetailInfo.proto\032!MistTrialActiv" +
-      "ityDetailInfo.proto\032#HideAndSeekActivity" +
-      "DetailInfo.proto\032\035FindHilichurlDetailInf" +
-      "o.proto\032\032SummerTimeDetailInfo.proto\032\035Buo" +
-      "yantCombatDetailInfo.proto\032\031EchoShellDet" +
-      "ailInfo.proto\032\'BounceConjuringActivityDe" +
-      "tailInfo.proto\032!BlitzRushActivityDetailI" +
-      "nfo.proto\032\035ChessActivityDetailInfo.proto" +
-      "\032\034SumoActivityDetailInfo.proto\032$MoonfinT" +
-      "rialActivityDetailInfo.proto\032\030LunaRiteDe" +
-      "tailInfo.proto\032#PlantFlowerActivityDetai" +
-      "lInfo.proto\032!MusicGameActivityDetailInfo" +
-      ".proto\032(RoguelikeDungeonActivityDetailIn" +
-      "fo.proto\032\033DigActivityDetailInfo.proto\032\035H" +
-      "achiActivityDetailInfo.proto\032\"WinterCamp" +
-      "ActivityDetailInfo.proto\032\036PotionActivity" +
-      "DetailInfo.proto\032$TanukiTravelActivityDe" +
-      "tailInfo.proto\032#LanternRiteActivityDetai" +
-      "lInfo.proto\032&MichiaeMatsuriActivityDetai" +
-      "lInfo.proto\032!BartenderActivityDetailInfo" +
-      ".proto\032\033UgcActivityDetailInfo.proto\032#Cry" +
-      "stalLinkActivityDetailInfo.proto\032\037Irodor" +
-      "iActivityDetailInfo.proto\032\035PhotoActivity" +
-      "DetailInfo.proto\032\035SpiceActivityDetailInf" +
-      "o.proto\032\035GachaActivityDetailInfo.proto\032/" +
-      "LuminanceStoneChallengeActivityDetailInf" +
-      "o.proto\032\"RogueDiaryActivityDetailInfo.pr" +
-      "oto\032\034SummerTimeV2DetailInfo.proto\032\033Islan" +
-      "dPartyDetailInfo.proto\032\034GearActivityDeta" +
-      "ilInfo.proto\032\037GravenInnocenceDetailInfo." +
-      "proto\032\035InstableSprayDetailInfo.proto\032%Mu" +
-      "qadasPotionActivityDetailInfo.proto\032&Tre" +
-      "asureSeelieActivityDetailInfo.proto\032 Roc" +
-      "kBoardExploreDetailInfo.proto\032\037VintageAc" +
-      "tivityDetailInfo.proto\032\031WindFieldDetailI" +
-      "nfo.proto\032\035FungusFighterDetailInfo.proto" +
-      "\032\035CharAmusementDetailInfo.proto\032!EffigyC" +
-      "hallengeV2DetailInfo.proto\032\033CoinCollectD" +
-      "etailInfo.proto\032\034BrickBreakerDetailInfo." +
-      "proto\032\031DuelHeartDetailInfo.proto\032\031SeaLam" +
-      "pV3DetailInfo.proto\032\031TeamChainDetailInfo" +
-      ".proto\032%ElectroherculesBattleDetailInfo." +
-      "proto\032\033GCGFestivalDetailInfo.proto\032\033Fleu" +
-      "rFairV2DetailInfo.proto\032\037FungusFighterV2" +
-      "DetailInfo.proto\032\026AkaFesDetailInfo.proto" +
-      "\032\036SandwormCannonDetailInfo.proto\032\033Sorush" +
-      "TrialDetailInfo.proto\032\021JourneyInfo.proto" +
-      "\032\033EffigyChallengeV4Info.proto\032\020GcgPveInf" +
-      "o.proto\032\017UgcV2Info.proto\032\033PenumbraAdvent" +
-      "ureInfo.proto\032\024AnimalViewInfo.proto\032 Act" +
-      "ivityMultiCharacterInfo.proto\032\030GcgPveInf" +
-      "initeInfo.proto\032\023ToyBattleInfo.proto\032\027Ph" +
-      "otoUnderseaInfo.proto\032\030FontaineGatherInf" +
-      "o.proto\032\026GcgPvePuzzleInfo.proto\"\205,\n\014Acti" +
-      "vityInfo\022\023\n\013activity_id\030\003 \001(\r\022\024\n\013DNMOEAF" +
-      "CDGC\030\310\r \003(\r\022/\n\021watcher_info_list\030\t \003(\0132\024" +
-      ".ActivityWatcherInfo\022\023\n\013is_finished\030\016 \001(" +
-      "\010\022\024\n\013LJLDCLMAMNL\030\342\003 \003(\r\022\023\n\013PJJKJGALLGD\030\020" +
-      " \001(\010\022\025\n\ractivity_type\030\001 \001(\r\022\023\n\013schedule_" +
-      "id\030\005 \001(\r\022>\n\021activity_coin_map\030\232\014 \003(\0132\".A" +
-      "ctivityInfo.ActivityCoinMapEntry\022\026\n\016meet" +
-      "_cond_list\030\014 \003(\r\022\023\n\013DKJDABCNGBP\030\r \001(\010\022\022\n" +
-      "\nbegin_time\030\002 \001(\r\022\024\n\013INGFNLLCDOL\030\335\005 \001(\r\022" +
-      "\023\n\013ENNDKMJIMHN\030\017 \001(\010\022\022\n\tcur_score\030\223\014 \001(\r" +
-      "\022\024\n\013BKJNDLLNAML\030\232\016 \001(\010\022\035\n\024first_day_star" +
-      "t_time\030\322\007 \001(\r\022\024\n\013ABMOPKOIMPA\030\215\004 \001(\010\022\024\n\013F" +
-      "GFGECAAKJM\030\247\r \001(\r\022\024\n\013GFEMIEBKKKL\030\335\010 \001(\010\022" +
-      "\024\n\013CEFIPNKPEKA\030\355\004 \001(\r\022\020\n\010end_time\030\013 \001(\r\022" +
-      "=\n\021wish_gift_num_map\030\234\007 \003(\0132!.ActivityIn" +
-      "fo.WishGiftNumMapEntry\022\023\n\013PHCOMIFAIJD\030\004 " +
-      "\003(\r\022<\n\034activity_push_tips_data_list\030\203\005 \003" +
-      "(\0132\025.ActivityPushTipsData\0223\n\rsam_lamp_in" +
-      "fo\030\n \001(\0132\032.SeaLampActivityDetailInfoH\000\0224" +
-      "\n\rcrucible_info\030\007 \001(\0132\033.CrucibleActivity" +
-      "DetailInfoH\000\0224\n\rsalesman_info\030\010 \001(\0132\033.Sa" +
-      "lesmanActivityDetailInfoH\000\022;\n\021trial_avat" +
-      "ar_info\030\006 \001(\0132\036.TrialAvatarActivityDetai" +
-      "lInfoH\000\0225\n\rdelivery_info\030\266\016 \001(\0132\033.Delive" +
-      "ryActivityDetailInfoH\000\022/\n\naster_info\030\204\002 " +
-      "\001(\0132\030.AsterActivityDetailInfoH\000\0221\n\013fligh" +
-      "t_info\030\272\006 \001(\0132\031.FlightActivityDetailInfo" +
-      "H\000\022;\n\021dragon_spine_info\030n \001(\0132\036.DragonSp" +
-      "ineActivityDetailInfoH\000\0221\n\013effigy_info\030\362" +
-      "\007 \001(\0132\031.EffigyActivityDetailInfoH\000\022<\n\021tr" +
-      "easure_map_info\030\332\r \001(\0132\036.TreasureMapActi" +
-      "vityDetailInfoH\000\0225\n\rblessing_info\030\313\002 \001(\013" +
-      "2\033.BlessingActivityDetailInfoH\000\022.\n\rsea_l" +
-      "amp_info\030\332\010 \001(\0132\024.SeaLampActivityInfoH\000\022" +
-      "9\n\017expedition_info\030\242\005 \001(\0132\035.ExpeditionAc" +
-      "tivityDetailInfoH\000\022A\n\024arena_challenge_in" +
-      "fo\030\' \001(\0132!.ArenaChallengeActivityDetailI" +
-      "nfoH\000\0228\n\017fleur_fair_info\030\245\002 \001(\0132\034.FleurF" +
-      "airActivityDetailInfoH\000\022<\n\021water_spirit_" +
-      "info\030\315\017 \001(\0132\036.WaterSpiritActivityDetailI" +
-      "nfoH\000\022A\n\024challneler_slab_info\030\335\r \001(\0132 .C" +
-      "hannelerSlabActivityDetailInfoH\000\022A\n\030mist" +
-      "_trial_activity_info\030\326\014 \001(\0132\034.MistTrialA" +
-      "ctivityDetailInfoH\000\022=\n\022hide_and_seek_inf" +
-      "o\030\323\r \001(\0132\036.HideAndSeekActivityDetailInfo" +
-      "H\000\0228\n\023find_hilichurl_info\030\204\n \001(\0132\030.FindH" +
-      "ilichurlDetailInfoH\000\0222\n\020summer_time_info" +
-      "\030\266\007 \001(\0132\025.SummerTimeDetailInfoH\000\0228\n\023buoy" +
-      "ant_combat_info\030\207\004 \001(\0132\030.BuoyantCombatDe" +
-      "tailInfoH\000\0220\n\017echo_shell_info\030\261\002 \001(\0132\024.E" +
-      "choShellDetailInfoH\000\022D\n\025bounce_conjuring" +
-      "_info\030\310\016 \001(\0132\".BounceConjuringActivityDe" +
-      "tailInfoH\000\0228\n\017blitz_rush_info\030\223\007 \001(\0132\034.B" +
-      "litzRushActivityDetailInfoH\000\022/\n\nchess_in" +
-      "fo\030\277\010 \001(\0132\030.ChessActivityDetailInfoH\000\022-\n" +
-      "\tsumo_info\030\330\017 \001(\0132\027.SumoActivityDetailIn" +
-      "foH\000\022>\n\022moonfin_trial_info\030\205\003 \001(\0132\037.Moon" +
-      "finTrialActivityDetailInfoH\000\022.\n\016luna_rit" +
-      "e_info\030\263\017 \001(\0132\023.LunaRiteDetailInfoH\000\022<\n\021" +
-      "plant_flower_info\030\276\016 \001(\0132\036.PlantFlowerAc" +
-      "tivityDetailInfoH\000\0228\n\017music_game_info\030\267\016" +
-      " \001(\0132\034.MusicGameActivityDetailInfoH\000\022F\n\026" +
-      "roguelike_dungoen_info\030\201\010 \001(\0132#.Roguelik" +
-      "eDungeonActivityDetailInfoH\000\022+\n\010dig_info" +
-      "\030\277\016 \001(\0132\026.DigActivityDetailInfoH\000\022/\n\nhac" +
-      "hi_info\030\230\t \001(\0132\030.HachiActivityDetailInfo" +
-      "H\000\022:\n\020winter_camp_info\030\336\017 \001(\0132\035.WinterCa" +
-      "mpActivityDetailInfoH\000\0221\n\013potion_info\030\315\013" +
-      " \001(\0132\031.PotionActivityDetailInfoH\000\022G\n\033tan" +
-      "uki_travel_activity_info\030\260\007 \001(\0132\037.Tanuki" +
-      "TravelActivityDetailInfoH\000\022E\n\032lantern_ri" +
-      "te_activity_info\030\274\017 \001(\0132\036.LanternRiteAct" +
-      "ivityDetailInfoH\000\022A\n\024michiae_matsuri_inf" +
-      "o\030r \001(\0132!.MichiaeMatsuriActivityDetailIn" +
-      "foH\000\0227\n\016bartender_info\030\241\013 \001(\0132\034.Bartende" +
-      "rActivityDetailInfoH\000\022+\n\010ugc_info\030\203\016 \001(\013" +
-      "2\026.UgcActivityDetailInfoH\000\022<\n\021crystal_li" +
-      "nk_info\030\225\n \001(\0132\036.CrystalLinkActivityDeta" +
-      "ilInfoH\000\0222\n\014irodori_info\0306 \001(\0132\032.Irodori" +
-      "ActivityDetailInfoH\000\022/\n\nphoto_info\030\324\013 \001(" +
-      "\0132\030.PhotoActivityDetailInfoH\000\022/\n\nspice_i" +
-      "nfo\030\276\003 \001(\0132\030.SpiceActivityDetailInfoH\000\022/" +
-      "\n\ngacha_info\030\250\t \001(\0132\030.GachaActivityDetai" +
-      "lInfoH\000\022T\n\036luminance_stone_challenge_inf" +
-      "o\030& \001(\0132*.LuminanceStoneChallengeActivit" +
-      "yDetailInfoH\000\022:\n\020rogue_diary_info\030\253\003 \001(\013" +
-      "2\035.RogueDiaryActivityDetailInfoH\000\0227\n\023sum" +
-      "mer_time_v2_info\030\216\007 \001(\0132\027.SummerTimeV2De" +
-      "tailInfoH\000\0224\n\021island_party_info\030\224\010 \001(\0132\026" +
-      ".IslandPartyDetailInfoH\000\022-\n\tgear_info\030\357\t" +
-      " \001(\0132\027.GearActivityDetailInfoH\000\022<\n\025grave" +
-      "n_innocence_info\030\344\002 \001(\0132\032.GravenInnocenc" +
-      "eDetailInfoH\000\0228\n\023instable_spray_info\030\374\003 " +
-      "\001(\0132\030.InstableSprayDetailInfoH\000\022@\n\023muqad" +
-      "as_potion_info\030\302\013 \001(\0132 .MuqadasPotionAct" +
-      "ivityDetailInfoH\000\022B\n\024treasure_seelie_inf" +
-      "o\030\343\t \001(\0132!.TreasureSeelieActivityDetailI" +
-      "nfoH\000\022?\n\027rock_board_explore_info\030\204\010 \001(\0132" +
-      "\033.RockBoardExploreDetailInfoH\000\0223\n\014vintag" +
-      "e_info\030\271\013 \001(\0132\032.VintageActivityDetailInf" +
-      "oH\000\0220\n\017wind_field_info\030\200\006 \001(\0132\024.WindFiel" +
-      "dDetailInfoH\000\0228\n\023fungus_fighter_info\030\302\006 " +
-      "\001(\0132\030.FungusFighterDetailInfoH\000\0228\n\023char_" +
-      "amusement_info\030\306\t \001(\0132\030.CharAmusementDet" +
-      "ailInfoH\000\022>\n\025effigy_challenge_info\030\373\t \001(" +
-      "\0132\034.EffigyChallengeV2DetailInfoH\000\0224\n\021coi" +
-      "n_collect_info\030\307\006 \001(\0132\026.CoinCollectDetai" +
-      "lInfoH\000\0226\n\022brick_breaker_info\030\247\004 \001(\0132\027.B" +
-      "rickBreakerDetailInfoH\000\0220\n\017duel_heart_in" +
-      "fo\030\206\r \001(\0132\024.DuelHeartDetailInfoH\000\0221\n\020sea" +
-      "_lamp_v3_info\030\301\006 \001(\0132\024.SeaLampV3DetailIn" +
-      "foH\000\0220\n\017team_chain_info\030\215\t \001(\0132\024.TeamCha" +
-      "inDetailInfoH\000\022H\n\033electrohercules_battle" +
-      "_info\030\325\007 \001(\0132 .ElectroherculesBattleDeta" +
-      "ilInfoH\000\0224\n\021gcg_festival_info\030\200\r \001(\0132\026.G" +
-      "CGFestivalDetailInfoH\000\0225\n\022fleur_fair_v2_" +
-      "info\030\276\017 \001(\0132\026.FleurFairV2DetailInfoH\000\022=\n" +
-      "\026fungus_fighter_v2_info\030\205\014 \001(\0132\032.FungusF" +
-      "ighterV2DetailInfoH\000\022*\n\014aka_fes_info\030\364\013 " +
-      "\001(\0132\021.AkaFesDetailInfoH\000\022A\n\033sandworm_can" +
-      "non_detail_info\030\362\004 \001(\0132\031.SandwormCannonD" +
-      "etailInfoH\000\0224\n\021sorush_trial_info\030\265\010 \001(\0132" +
-      "\026.SorushTrialDetailInfoH\000\022%\n\014journey_inf" +
-      "o\030\315\016 \001(\0132\014.JourneyInfoH\000\022;\n\030effigy_chall" +
-      "enge_v4_info\030\251\n \001(\0132\026.EffigyChallengeV4I" +
-      "nfoH\000\022$\n\014gcg_pve_info\030\230\n \001(\0132\013.GcgPveInf" +
-      "oH\000\022\"\n\013ugc_v2_info\030\337\007 \001(\0132\n.UgcV2InfoH\000\022" +
-      ":\n\027penumbra_adventure_info\030\262\002 \001(\0132\026.Penu" +
-      "mbraAdventureInfoH\000\022,\n\020animal_view_info\030" +
-      "\263\007 \001(\0132\017.AnimalViewInfoH\000\022E\n\035activity_mu" +
-      "lti_character_info\030\275\t \001(\0132\033.ActivityMult" +
-      "iCharacterInfoH\000\0224\n\025gcg_pve_infinite_inf" +
-      "o\030| \001(\0132\023.GcgPveInfiniteInfoH\000\022)\n\017toy_ba" +
-      "ttle_info\030> \001(\0132\016.ToyBattleInfoH\000\0222\n\023pho" +
-      "to_undersea_info\030\342\001 \001(\0132\022.PhotoUnderseaI" +
-      "nfoH\000\0224\n\024fontaine_gather_info\030\213\010 \001(\0132\023.F" +
-      "ontaineGatherInfoH\000\0221\n\023gcg_pve_puzzle_in" +
-      "fo\030\347\006 \001(\0132\021.GcgPvePuzzleInfoH\000\0326\n\024Activi" +
-      "tyCoinMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" +
-      "(\r:\0028\001\0325\n\023WishGiftNumMapEntry\022\013\n\003key\030\001 \001" +
-      "(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\010\n\006detailB\033\n\031emu.g" +
-      "rasscutter.net.protob\006proto3"
+      "o.proto\032\032ActivityPushTipsData.proto\032!Mus" +
+      "icGameActivityDetailInfo.proto\"\261\007\n\014Activ" +
+      "ityInfo\022\026\n\016meet_cond_list\030\001 \003(\r\022\020\n\010end_t" +
+      "ime\030\004 \001(\r\022\022\n\nbegin_time\030\006 \001(\r\022\023\n\013is_fini" +
+      "shed\030\007 \001(\010\022\023\n\013FALGLCJDKCL\030\010 \001(\010\022/\n\021watch" +
+      "er_info_list\030\n \003(\0132\024.ActivityWatcherInfo" +
+      "\022\030\n\020expire_cond_list\030\013 \003(\r\022\023\n\013schedule_i" +
+      "d\030\014 \001(\r\022\023\n\013ONCLIGBKLPF\030\r \001(\010\022\025\n\ractivity" +
+      "_type\030\016 \001(\r\022\023\n\013activity_id\030\017 \001(\r\022\021\n\tcur_" +
+      "score\030? \001(\r\022\024\n\013FFGHMFNFPNL\030\375\001 \001(\r\022\035\n\024fir" +
+      "st_day_start_time\030\365\002 \001(\r\022\024\n\013LKODGHFICBH\030" +
+      "\252\003 \001(\r\022\024\n\013CDBIIEIPBFF\030\375\003 \001(\010\022\024\n\013LCHFFKHP" +
+      "JIO\030\246\005 \001(\010\022\024\n\013ILKPGDKEIEG\030\343\005 \001(\010\022\032\n\021take" +
+      "n_reward_list\030\262\006 \003(\r\022\024\n\013CIDDJFNIMPJ\030\374\006 \001" +
+      "(\004\022<\n\034activity_push_tips_data_list\030\327\007 \003(" +
+      "\0132\025.ActivityPushTipsData\022\024\n\013MPPFCLCENAP\030" +
+      "\220\010 \001(\r\022\024\n\013GONEPFEDMEL\030\336\t \003(\004\022\024\n\013NJCGNGLK" +
+      "PBJ\030\363\t \003(\r\022\024\n\013ODMJHPBFIKO\030\200\013 \001(\010\022>\n\021acti" +
+      "vity_coin_map\030\377\r \003(\0132\".ActivityInfo.Acti" +
+      "vityCoinMapEntry\022=\n\021wish_gift_num_map\030\242\017" +
+      " \003(\0132!.ActivityInfo.WishGiftNumMapEntry\022" +
+      "8\n\017music_game_info\030\313\010 \001(\0132\034.MusicGameAct" +
+      "ivityDetailInfoH\000\0326\n\024ActivityCoinMapEntr" +
+      "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0325\n\023Wis" +
+      "hGiftNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002" +
+      " \001(\r:\0028\001B\010\n\006detailB\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.JourneyInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GcgPveInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.UgcV2InfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AnimalViewInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ToyBattleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.getDescriptor(),
         });
     internal_static_ActivityInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_ActivityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityInfo_descriptor,
-        new java.lang.String[] { "ActivityId", "DNMOEAFCDGC", "WatcherInfoList", "IsFinished", "LJLDCLMAMNL", "PJJKJGALLGD", "ActivityType", "ScheduleId", "ActivityCoinMap", "MeetCondList", "DKJDABCNGBP", "BeginTime", "INGFNLLCDOL", "ENNDKMJIMHN", "CurScore", "BKJNDLLNAML", "FirstDayStartTime", "ABMOPKOIMPA", "FGFGECAAKJM", "GFEMIEBKKKL", "CEFIPNKPEKA", "EndTime", "WishGiftNumMap", "PHCOMIFAIJD", "ActivityPushTipsDataList", "SamLampInfo", "CrucibleInfo", "SalesmanInfo", "TrialAvatarInfo", "DeliveryInfo", "AsterInfo", "FlightInfo", "DragonSpineInfo", "EffigyInfo", "TreasureMapInfo", "BlessingInfo", "SeaLampInfo", "ExpeditionInfo", "ArenaChallengeInfo", "FleurFairInfo", "WaterSpiritInfo", "ChallnelerSlabInfo", "MistTrialActivityInfo", "HideAndSeekInfo", "FindHilichurlInfo", "SummerTimeInfo", "BuoyantCombatInfo", "EchoShellInfo", "BounceConjuringInfo", "BlitzRushInfo", "ChessInfo", "SumoInfo", "MoonfinTrialInfo", "LunaRiteInfo", "PlantFlowerInfo", "MusicGameInfo", "RoguelikeDungoenInfo", "DigInfo", "HachiInfo", "WinterCampInfo", "PotionInfo", "TanukiTravelActivityInfo", "LanternRiteActivityInfo", "MichiaeMatsuriInfo", "BartenderInfo", "UgcInfo", "CrystalLinkInfo", "IrodoriInfo", "PhotoInfo", "SpiceInfo", "GachaInfo", "LuminanceStoneChallengeInfo", "RogueDiaryInfo", "SummerTimeV2Info", "IslandPartyInfo", "GearInfo", "GravenInnocenceInfo", "InstableSprayInfo", "MuqadasPotionInfo", "TreasureSeelieInfo", "RockBoardExploreInfo", "VintageInfo", "WindFieldInfo", "FungusFighterInfo", "CharAmusementInfo", "EffigyChallengeInfo", "CoinCollectInfo", "BrickBreakerInfo", "DuelHeartInfo", "SeaLampV3Info", "TeamChainInfo", "ElectroherculesBattleInfo", "GcgFestivalInfo", "FleurFairV2Info", "FungusFighterV2Info", "AkaFesInfo", "SandwormCannonDetailInfo", "SorushTrialInfo", "JourneyInfo", "EffigyChallengeV4Info", "GcgPveInfo", "UgcV2Info", "PenumbraAdventureInfo", "AnimalViewInfo", "ActivityMultiCharacterInfo", "GcgPveInfiniteInfo", "ToyBattleInfo", "PhotoUnderseaInfo", "FontaineGatherInfo", "GcgPvePuzzleInfo", "Detail", });
+        new java.lang.String[] { "MeetCondList", "EndTime", "BeginTime", "IsFinished", "FALGLCJDKCL", "WatcherInfoList", "ExpireCondList", "ScheduleId", "ONCLIGBKLPF", "ActivityType", "ActivityId", "CurScore", "FFGHMFNFPNL", "FirstDayStartTime", "LKODGHFICBH", "CDBIIEIPBFF", "LCHFFKHPJIO", "ILKPGDKEIEG", "TakenRewardList", "CIDDJFNIMPJ", "ActivityPushTipsDataList", "MPPFCLCENAP", "GONEPFEDMEL", "NJCGNGLKPBJ", "ODMJHPBFIKO", "ActivityCoinMap", "WishGiftNumMap", "MusicGameInfo", "Detail", });
     internal_static_ActivityInfo_ActivityCoinMapEntry_descriptor =
       internal_static_ActivityInfo_descriptor.getNestedTypes().get(0);
     internal_static_ActivityInfo_ActivityCoinMapEntry_fieldAccessorTable = new
@@ -23647,91 +4567,7 @@ public final class ActivityInfoOuterClass {
         new java.lang.String[] { "Key", "Value", });
     emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SeaLampActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.CrucibleActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SalesmanActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TrialAvatarActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.DeliveryActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AsterActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FlightActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.DragonSpineActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TreasureMapActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BlessingActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SeaLampActivityInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ExpeditionActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ArenaChallengeActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FleurFairActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.WaterSpiritActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ChannelerSlabActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.MistTrialActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HideAndSeekActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FindHilichurlDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SummerTimeDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BuoyantCombatDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EchoShellDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BounceConjuringActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BlitzRushActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ChessActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SumoActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.MoonfinTrialActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.LunaRiteDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PlantFlowerActivityDetailInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.RoguelikeDungeonActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.DigActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HachiActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.WinterCampActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PotionActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TanukiTravelActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.LanternRiteActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.MichiaeMatsuriActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BartenderActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.UgcActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.CrystalLinkActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.IrodoriActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PhotoActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SpiceActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GachaActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.LuminanceStoneChallengeActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.RogueDiaryActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SummerTimeV2DetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.IslandPartyDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GearActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GravenInnocenceDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.InstableSprayDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.MuqadasPotionActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TreasureSeelieActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.RockBoardExploreDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.VintageActivityDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.WindFieldDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FungusFighterDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.CharAmusementDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyChallengeV2DetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.CoinCollectDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BrickBreakerDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.DuelHeartDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SeaLampV3DetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TeamChainDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ElectroherculesBattleDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GCGFestivalDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FleurFairV2DetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FungusFighterV2DetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AkaFesDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SandwormCannonDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SorushTrialDetailInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.JourneyInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyChallengeV4InfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GcgPveInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.UgcV2InfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PenumbraAdventureInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AnimalViewInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ActivityMultiCharacterInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GcgPveInfiniteInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ToyBattleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PhotoUnderseaInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FontaineGatherInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GcgPvePuzzleInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsDataOuterClass.java
index e0b002baf..985273c63 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsDataOuterClass.java
@@ -19,27 +19,23 @@ public final class ActivityPushTipsDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 activity_push_tips_id = 13;</code>
-     * @return The activityPushTipsId.
-     */
-    int getActivityPushTipsId();
-
-    /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState getState();
+
+    /**
+     * <code>uint32 activity_push_tips_id = 7;</code>
+     * @return The activityPushTipsId.
+     */
+    int getActivityPushTipsId();
   }
   /**
-   * <pre>
-   * Obf: IBNKKJGBKML
-   * </pre>
-   *
    * Protobuf type {@code ActivityPushTipsData}
    */
   public static final class ActivityPushTipsData extends
@@ -85,13 +81,13 @@ public final class ActivityPushTipsDataOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 24: {
               int rawValue = input.readEnum();
 
               state_ = rawValue;
               break;
             }
-            case 104: {
+            case 56: {
 
               activityPushTipsId_ = input.readUInt32();
               break;
@@ -128,28 +124,17 @@ public final class ActivityPushTipsDataOuterClass {
               emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.class, emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.Builder.class);
     }
 
-    public static final int ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER = 13;
-    private int activityPushTipsId_;
-    /**
-     * <code>uint32 activity_push_tips_id = 13;</code>
-     * @return The activityPushTipsId.
-     */
-    @java.lang.Override
-    public int getActivityPushTipsId() {
-      return activityPushTipsId_;
-    }
-
-    public static final int STATE_FIELD_NUMBER = 6;
+    public static final int STATE_FIELD_NUMBER = 3;
     private int state_;
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.ActivityPushTipsState state = 6;</code>
+     * <code>.ActivityPushTipsState state = 3;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState getState() {
@@ -158,6 +143,17 @@ public final class ActivityPushTipsDataOuterClass {
       return result == null ? emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.UNRECOGNIZED : result;
     }
 
+    public static final int ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER = 7;
+    private int activityPushTipsId_;
+    /**
+     * <code>uint32 activity_push_tips_id = 7;</code>
+     * @return The activityPushTipsId.
+     */
+    @java.lang.Override
+    public int getActivityPushTipsId() {
+      return activityPushTipsId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -172,11 +168,11 @@ public final class ActivityPushTipsDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ACTIVITY_PUSH_TIPS_STATE_NONE.getNumber()) {
-        output.writeEnum(6, state_);
+      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ActivityPushTipsState_NONE.getNumber()) {
+        output.writeEnum(3, state_);
       }
       if (activityPushTipsId_ != 0) {
-        output.writeUInt32(13, activityPushTipsId_);
+        output.writeUInt32(7, activityPushTipsId_);
       }
       unknownFields.writeTo(output);
     }
@@ -187,13 +183,13 @@ public final class ActivityPushTipsDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ACTIVITY_PUSH_TIPS_STATE_NONE.getNumber()) {
+      if (state_ != emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.ActivityPushTipsState_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, state_);
+          .computeEnumSize(3, state_);
       }
       if (activityPushTipsId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, activityPushTipsId_);
+          .computeUInt32Size(7, activityPushTipsId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -210,9 +206,9 @@ public final class ActivityPushTipsDataOuterClass {
       }
       emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData other = (emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData) obj;
 
+      if (state_ != other.state_) return false;
       if (getActivityPushTipsId()
           != other.getActivityPushTipsId()) return false;
-      if (state_ != other.state_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -224,10 +220,10 @@ public final class ActivityPushTipsDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityPushTipsId();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
+      hash = (37 * hash) + ACTIVITY_PUSH_TIPS_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityPushTipsId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -324,10 +320,6 @@ public final class ActivityPushTipsDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IBNKKJGBKML
-     * </pre>
-     *
      * Protobuf type {@code ActivityPushTipsData}
      */
     public static final class Builder extends
@@ -365,10 +357,10 @@ public final class ActivityPushTipsDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        activityPushTipsId_ = 0;
-
         state_ = 0;
 
+        activityPushTipsId_ = 0;
+
         return this;
       }
 
@@ -395,8 +387,8 @@ public final class ActivityPushTipsDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData buildPartial() {
         emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData result = new emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData(this);
-        result.activityPushTipsId_ = activityPushTipsId_;
         result.state_ = state_;
+        result.activityPushTipsId_ = activityPushTipsId_;
         onBuilt();
         return result;
       }
@@ -445,12 +437,12 @@ public final class ActivityPushTipsDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData other) {
         if (other == emu.grasscutter.net.proto.ActivityPushTipsDataOuterClass.ActivityPushTipsData.getDefaultInstance()) return this;
-        if (other.getActivityPushTipsId() != 0) {
-          setActivityPushTipsId(other.getActivityPushTipsId());
-        }
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
+        if (other.getActivityPushTipsId() != 0) {
+          setActivityPushTipsId(other.getActivityPushTipsId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -480,47 +472,16 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
 
-      private int activityPushTipsId_ ;
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @return The activityPushTipsId.
-       */
-      @java.lang.Override
-      public int getActivityPushTipsId() {
-        return activityPushTipsId_;
-      }
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @param value The activityPushTipsId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivityPushTipsId(int value) {
-        
-        activityPushTipsId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 activity_push_tips_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityPushTipsId() {
-        
-        activityPushTipsId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int state_ = 0;
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -531,7 +492,7 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -541,7 +502,7 @@ public final class ActivityPushTipsDataOuterClass {
         return result == null ? emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.ActivityPushTipsState.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -555,7 +516,7 @@ public final class ActivityPushTipsDataOuterClass {
         return this;
       }
       /**
-       * <code>.ActivityPushTipsState state = 6;</code>
+       * <code>.ActivityPushTipsState state = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -564,6 +525,37 @@ public final class ActivityPushTipsDataOuterClass {
         onChanged();
         return this;
       }
+
+      private int activityPushTipsId_ ;
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @return The activityPushTipsId.
+       */
+      @java.lang.Override
+      public int getActivityPushTipsId() {
+        return activityPushTipsId_;
+      }
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @param value The activityPushTipsId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivityPushTipsId(int value) {
+        
+        activityPushTipsId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 activity_push_tips_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityPushTipsId() {
+        
+        activityPushTipsId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -633,8 +625,8 @@ public final class ActivityPushTipsDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032ActivityPushTipsData.proto\032\033ActivityPu" +
       "shTipsState.proto\"\\\n\024ActivityPushTipsDat" +
-      "a\022\035\n\025activity_push_tips_id\030\r \001(\r\022%\n\005stat" +
-      "e\030\006 \001(\0162\026.ActivityPushTipsStateB\033\n\031emu.g" +
+      "a\022%\n\005state\030\003 \001(\0162\026.ActivityPushTipsState" +
+      "\022\035\n\025activity_push_tips_id\030\007 \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -647,7 +639,7 @@ public final class ActivityPushTipsDataOuterClass {
     internal_static_ActivityPushTipsData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityPushTipsData_descriptor,
-        new java.lang.String[] { "ActivityPushTipsId", "State", });
+        new java.lang.String[] { "State", "ActivityPushTipsId", });
     emu.grasscutter.net.proto.ActivityPushTipsStateOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java
index 7d4c0e088..e0988ff49 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityPushTipsStateOuterClass.java
@@ -15,41 +15,37 @@ public final class ActivityPushTipsStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DKHCNPIKCHO
-   * </pre>
-   *
    * Protobuf enum {@code ActivityPushTipsState}
    */
   public enum ActivityPushTipsState
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
+     * <code>ActivityPushTipsState_NONE = 0;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_NONE(0),
+    ActivityPushTipsState_NONE(0),
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
+     * <code>ActivityPushTipsState_START = 1;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_START(1),
+    ActivityPushTipsState_START(1),
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
+     * <code>ActivityPushTipsState_READ = 2;</code>
      */
-    ACTIVITY_PUSH_TIPS_STATE_READ(2),
+    ActivityPushTipsState_READ(2),
     UNRECOGNIZED(-1),
     ;
 
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_NONE = 0;</code>
+     * <code>ActivityPushTipsState_NONE = 0;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_NONE_VALUE = 0;
+    public static final int ActivityPushTipsState_NONE_VALUE = 0;
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_START = 1;</code>
+     * <code>ActivityPushTipsState_START = 1;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_START_VALUE = 1;
+    public static final int ActivityPushTipsState_START_VALUE = 1;
     /**
-     * <code>ACTIVITY_PUSH_TIPS_STATE_READ = 2;</code>
+     * <code>ActivityPushTipsState_READ = 2;</code>
      */
-    public static final int ACTIVITY_PUSH_TIPS_STATE_READ_VALUE = 2;
+    public static final int ActivityPushTipsState_READ_VALUE = 2;
 
 
     public final int getNumber() {
@@ -76,9 +72,9 @@ public final class ActivityPushTipsStateOuterClass {
      */
     public static ActivityPushTipsState forNumber(int value) {
       switch (value) {
-        case 0: return ACTIVITY_PUSH_TIPS_STATE_NONE;
-        case 1: return ACTIVITY_PUSH_TIPS_STATE_START;
-        case 2: return ACTIVITY_PUSH_TIPS_STATE_READ;
+        case 0: return ActivityPushTipsState_NONE;
+        case 1: return ActivityPushTipsState_START;
+        case 2: return ActivityPushTipsState_READ;
         default: return null;
       }
     }
@@ -144,11 +140,11 @@ public final class ActivityPushTipsStateOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033ActivityPushTipsState.proto*\201\001\n\025Activi" +
-      "tyPushTipsState\022!\n\035ACTIVITY_PUSH_TIPS_ST" +
-      "ATE_NONE\020\000\022\"\n\036ACTIVITY_PUSH_TIPS_STATE_S" +
-      "TART\020\001\022!\n\035ACTIVITY_PUSH_TIPS_STATE_READ\020" +
-      "\002B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\033ActivityPushTipsState.proto*x\n\025Activit" +
+      "yPushTipsState\022\036\n\032ActivityPushTipsState_" +
+      "NONE\020\000\022\037\n\033ActivityPushTipsState_START\020\001\022" +
+      "\036\n\032ActivityPushTipsState_READ\020\002B\033\n\031emu.g" +
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java
index b5bbe06d3..806f98cf1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoNotifyOuterClass.java
@@ -19,41 +19,36 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    int getRemainFlySeaLampNum();
+
+    /**
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> 
         getActivityScheduleListList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index);
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     int getActivityScheduleListCount();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
         getActivityScheduleListOrBuilderList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    int getRemainFlySeaLampNum();
   }
   /**
-   * <pre>
-   * CmdId: 23970
-   * Obf: HGICHODDHDN
-   * </pre>
-   *
    * Protobuf type {@code ActivityScheduleInfoNotify}
    */
   public static final class ActivityScheduleInfoNotify extends
@@ -100,12 +95,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 8: {
 
               remainFlySeaLampNum_ = input.readUInt32();
               break;
             }
-            case 90: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityScheduleList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,17 +144,28 @@ public final class ActivityScheduleInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.class, emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.Builder.class);
     }
 
-    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 11;
+    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 1;
+    private int remainFlySeaLampNum_;
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    @java.lang.Override
+    public int getRemainFlySeaLampNum() {
+      return remainFlySeaLampNum_;
+    }
+
+    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_;
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public int getActivityScheduleListCount() {
       return activityScheduleList_.size();
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
       return activityScheduleList_.get(index);
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
@@ -189,17 +195,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return activityScheduleList_.get(index);
     }
 
-    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 10;
-    private int remainFlySeaLampNum_;
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    @java.lang.Override
-    public int getRemainFlySeaLampNum() {
-      return remainFlySeaLampNum_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -215,10 +210,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (remainFlySeaLampNum_ != 0) {
-        output.writeUInt32(10, remainFlySeaLampNum_);
+        output.writeUInt32(1, remainFlySeaLampNum_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
-        output.writeMessage(11, activityScheduleList_.get(i));
+        output.writeMessage(12, activityScheduleList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       size = 0;
       if (remainFlySeaLampNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, remainFlySeaLampNum_);
+          .computeUInt32Size(1, remainFlySeaLampNum_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, activityScheduleList_.get(i));
+          .computeMessageSize(12, activityScheduleList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other = (emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify) obj;
 
-      if (!getActivityScheduleListList()
-          .equals(other.getActivityScheduleListList())) return false;
       if (getRemainFlySeaLampNum()
           != other.getRemainFlySeaLampNum()) return false;
+      if (!getActivityScheduleListList()
+          .equals(other.getActivityScheduleListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getRemainFlySeaLampNum();
       if (getActivityScheduleListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityScheduleListList().hashCode();
       }
-      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getRemainFlySeaLampNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23970
-     * Obf: HGICHODDHDN
-     * </pre>
-     *
      * Protobuf type {@code ActivityScheduleInfoNotify}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        remainFlySeaLampNum_ = 0;
+
         if (activityScheduleListBuilder_ == null) {
           activityScheduleList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           activityScheduleListBuilder_.clear();
         }
-        remainFlySeaLampNum_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       public emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify result = new emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify(this);
         int from_bitField0_ = bitField0_;
+        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         if (activityScheduleListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             activityScheduleList_ = java.util.Collections.unmodifiableList(activityScheduleList_);
@@ -456,7 +447,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         } else {
           result.activityScheduleList_ = activityScheduleListBuilder_.build();
         }
-        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoNotifyOuterClass.ActivityScheduleInfoNotify.getDefaultInstance()) return this;
+        if (other.getRemainFlySeaLampNum() != 0) {
+          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
+        }
         if (activityScheduleListBuilder_ == null) {
           if (!other.activityScheduleList_.isEmpty()) {
             if (activityScheduleList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             }
           }
         }
-        if (other.getRemainFlySeaLampNum() != 0) {
-          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class ActivityScheduleInfoNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int remainFlySeaLampNum_ ;
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @return The remainFlySeaLampNum.
+       */
+      @java.lang.Override
+      public int getRemainFlySeaLampNum() {
+        return remainFlySeaLampNum_;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @param value The remainFlySeaLampNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRemainFlySeaLampNum(int value) {
+        
+        remainFlySeaLampNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRemainFlySeaLampNum() {
+        
+        remainFlySeaLampNum_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_ =
         java.util.Collections.emptyList();
       private void ensureActivityScheduleListIsMutable() {
@@ -577,7 +598,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> activityScheduleListBuilder_;
 
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
         if (activityScheduleListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public int getActivityScheduleListCount() {
         if (activityScheduleListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -624,7 +645,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
         if (activityScheduleListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -671,7 +692,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder addAllActivityScheduleList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> values) {
@@ -714,7 +735,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder clearActivityScheduleList() {
         if (activityScheduleListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public Builder removeActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder getActivityScheduleListBuilder(
           int index) {
         return getActivityScheduleListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
            getActivityScheduleListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder() {
         return getActivityScheduleListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 11;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder> 
            getActivityScheduleListBuilderList() {
@@ -803,37 +824,6 @@ public final class ActivityScheduleInfoNotifyOuterClass {
         }
         return activityScheduleListBuilder_;
       }
-
-      private int remainFlySeaLampNum_ ;
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @return The remainFlySeaLampNum.
-       */
-      @java.lang.Override
-      public int getRemainFlySeaLampNum() {
-        return remainFlySeaLampNum_;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @param value The remainFlySeaLampNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRemainFlySeaLampNum(int value) {
-        
-        remainFlySeaLampNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRemainFlySeaLampNum() {
-        
-        remainFlySeaLampNum_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +893,9 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n ActivityScheduleInfoNotify.proto\032\032Acti" +
       "vityScheduleInfo.proto\"t\n\032ActivitySchedu" +
-      "leInfoNotify\0225\n\026activity_schedule_list\030\013" +
-      " \003(\0132\025.ActivityScheduleInfo\022\037\n\027remain_fl" +
-      "y_sea_lamp_num\030\n \001(\rB\033\n\031emu.grasscutter." +
+      "leInfoNotify\022\037\n\027remain_fly_sea_lamp_num\030" +
+      "\001 \001(\r\0225\n\026activity_schedule_list\030\014 \003(\0132\025." +
+      "ActivityScheduleInfoB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +908,7 @@ public final class ActivityScheduleInfoNotifyOuterClass {
     internal_static_ActivityScheduleInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfoNotify_descriptor,
-        new java.lang.String[] { "ActivityScheduleList", "RemainFlySeaLampNum", });
+        new java.lang.String[] { "RemainFlySeaLampNum", "ActivityScheduleList", });
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java
index 2c7599469..22c294ee0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityScheduleInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class ActivityScheduleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_open = 6;</code>
-     * @return The isOpen.
-     */
-    boolean getIsOpen();
-
-    /**
-     * <code>uint32 begin_time = 7;</code>
+     * <code>uint32 begin_time = 6;</code>
      * @return The beginTime.
      */
     int getBeginTime();
 
     /**
-     * <code>uint32 end_time = 8;</code>
+     * <code>uint32 activity_id = 7;</code>
+     * @return The activityId.
+     */
+    int getActivityId();
+
+    /**
+     * <code>bool is_open = 9;</code>
+     * @return The isOpen.
+     */
+    boolean getIsOpen();
+
+    /**
+     * <code>uint32 end_time = 13;</code>
      * @return The endTime.
      */
     int getEndTime();
 
     /**
-     * <code>uint32 schedule_id = 4;</code>
+     * <code>uint32 schedule_id = 14;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
-
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    int getActivityId();
   }
   /**
-   * <pre>
-   * Obf: MJEHIMOOCNJ
-   * </pre>
-   *
    * Protobuf type {@code ActivityScheduleInfo}
    */
   public static final class ActivityScheduleInfo extends
@@ -97,31 +93,31 @@ public final class ActivityScheduleInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              activityId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              scheduleId_ = input.readUInt32();
-              break;
-            }
             case 48: {
 
-              isOpen_ = input.readBool();
-              break;
-            }
-            case 56: {
-
               beginTime_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 56: {
+
+              activityId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              isOpen_ = input.readBool();
+              break;
+            }
+            case 104: {
 
               endTime_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              scheduleId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,21 +150,10 @@ public final class ActivityScheduleInfoOuterClass {
               emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.class, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder.class);
     }
 
-    public static final int IS_OPEN_FIELD_NUMBER = 6;
-    private boolean isOpen_;
-    /**
-     * <code>bool is_open = 6;</code>
-     * @return The isOpen.
-     */
-    @java.lang.Override
-    public boolean getIsOpen() {
-      return isOpen_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 7;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 6;
     private int beginTime_;
     /**
-     * <code>uint32 begin_time = 7;</code>
+     * <code>uint32 begin_time = 6;</code>
      * @return The beginTime.
      */
     @java.lang.Override
@@ -176,10 +161,32 @@ public final class ActivityScheduleInfoOuterClass {
       return beginTime_;
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 8;
+    public static final int ACTIVITY_ID_FIELD_NUMBER = 7;
+    private int activityId_;
+    /**
+     * <code>uint32 activity_id = 7;</code>
+     * @return The activityId.
+     */
+    @java.lang.Override
+    public int getActivityId() {
+      return activityId_;
+    }
+
+    public static final int IS_OPEN_FIELD_NUMBER = 9;
+    private boolean isOpen_;
+    /**
+     * <code>bool is_open = 9;</code>
+     * @return The isOpen.
+     */
+    @java.lang.Override
+    public boolean getIsOpen() {
+      return isOpen_;
+    }
+
+    public static final int END_TIME_FIELD_NUMBER = 13;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 8;</code>
+     * <code>uint32 end_time = 13;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -187,10 +194,10 @@ public final class ActivityScheduleInfoOuterClass {
       return endTime_;
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 4;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 14;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 4;</code>
+     * <code>uint32 schedule_id = 14;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -198,17 +205,6 @@ public final class ActivityScheduleInfoOuterClass {
       return scheduleId_;
     }
 
-    public static final int ACTIVITY_ID_FIELD_NUMBER = 1;
-    private int activityId_;
-    /**
-     * <code>uint32 activity_id = 1;</code>
-     * @return The activityId.
-     */
-    @java.lang.Override
-    public int getActivityId() {
-      return activityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -223,20 +219,20 @@ public final class ActivityScheduleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (activityId_ != 0) {
-        output.writeUInt32(1, activityId_);
+      if (beginTime_ != 0) {
+        output.writeUInt32(6, beginTime_);
       }
-      if (scheduleId_ != 0) {
-        output.writeUInt32(4, scheduleId_);
+      if (activityId_ != 0) {
+        output.writeUInt32(7, activityId_);
       }
       if (isOpen_ != false) {
-        output.writeBool(6, isOpen_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(7, beginTime_);
+        output.writeBool(9, isOpen_);
       }
       if (endTime_ != 0) {
-        output.writeUInt32(8, endTime_);
+        output.writeUInt32(13, endTime_);
+      }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(14, scheduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,25 +243,25 @@ public final class ActivityScheduleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, beginTime_);
+      }
       if (activityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, activityId_);
-      }
-      if (scheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, scheduleId_);
+          .computeUInt32Size(7, activityId_);
       }
       if (isOpen_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isOpen_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, beginTime_);
+          .computeBoolSize(9, isOpen_);
       }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, endTime_);
+          .computeUInt32Size(13, endTime_);
+      }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, scheduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -282,16 +278,16 @@ public final class ActivityScheduleInfoOuterClass {
       }
       emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other = (emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo) obj;
 
-      if (getIsOpen()
-          != other.getIsOpen()) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
+      if (getActivityId()
+          != other.getActivityId()) return false;
+      if (getIsOpen()
+          != other.getIsOpen()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (getScheduleId()
           != other.getScheduleId()) return false;
-      if (getActivityId()
-          != other.getActivityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -303,17 +299,17 @@ public final class ActivityScheduleInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getActivityId();
       hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOpen());
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
       hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + ACTIVITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getActivityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -410,10 +406,6 @@ public final class ActivityScheduleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MJEHIMOOCNJ
-     * </pre>
-     *
      * Protobuf type {@code ActivityScheduleInfo}
      */
     public static final class Builder extends
@@ -451,16 +443,16 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isOpen_ = false;
-
         beginTime_ = 0;
 
+        activityId_ = 0;
+
+        isOpen_ = false;
+
         endTime_ = 0;
 
         scheduleId_ = 0;
 
-        activityId_ = 0;
-
         return this;
       }
 
@@ -487,11 +479,11 @@ public final class ActivityScheduleInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo result = new emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo(this);
-        result.isOpen_ = isOpen_;
         result.beginTime_ = beginTime_;
+        result.activityId_ = activityId_;
+        result.isOpen_ = isOpen_;
         result.endTime_ = endTime_;
         result.scheduleId_ = scheduleId_;
-        result.activityId_ = activityId_;
         onBuilt();
         return result;
       }
@@ -540,21 +532,21 @@ public final class ActivityScheduleInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo other) {
         if (other == emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance()) return this;
-        if (other.getIsOpen() != false) {
-          setIsOpen(other.getIsOpen());
-        }
         if (other.getBeginTime() != 0) {
           setBeginTime(other.getBeginTime());
         }
+        if (other.getActivityId() != 0) {
+          setActivityId(other.getActivityId());
+        }
+        if (other.getIsOpen() != false) {
+          setIsOpen(other.getIsOpen());
+        }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
         if (other.getScheduleId() != 0) {
           setScheduleId(other.getScheduleId());
         }
-        if (other.getActivityId() != 0) {
-          setActivityId(other.getActivityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -584,40 +576,9 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
-      private boolean isOpen_ ;
-      /**
-       * <code>bool is_open = 6;</code>
-       * @return The isOpen.
-       */
-      @java.lang.Override
-      public boolean getIsOpen() {
-        return isOpen_;
-      }
-      /**
-       * <code>bool is_open = 6;</code>
-       * @param value The isOpen to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsOpen(boolean value) {
-        
-        isOpen_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_open = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsOpen() {
-        
-        isOpen_ = false;
-        onChanged();
-        return this;
-      }
-
       private int beginTime_ ;
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @return The beginTime.
        */
       @java.lang.Override
@@ -625,7 +586,7 @@ public final class ActivityScheduleInfoOuterClass {
         return beginTime_;
       }
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @param value The beginTime to set.
        * @return This builder for chaining.
        */
@@ -636,7 +597,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 begin_time = 7;</code>
+       * <code>uint32 begin_time = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeginTime() {
@@ -646,9 +607,71 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
 
+      private int activityId_ ;
+      /**
+       * <code>uint32 activity_id = 7;</code>
+       * @return The activityId.
+       */
+      @java.lang.Override
+      public int getActivityId() {
+        return activityId_;
+      }
+      /**
+       * <code>uint32 activity_id = 7;</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 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivityId() {
+        
+        activityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isOpen_ ;
+      /**
+       * <code>bool is_open = 9;</code>
+       * @return The isOpen.
+       */
+      @java.lang.Override
+      public boolean getIsOpen() {
+        return isOpen_;
+      }
+      /**
+       * <code>bool is_open = 9;</code>
+       * @param value The isOpen to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsOpen(boolean value) {
+        
+        isOpen_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_open = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsOpen() {
+        
+        isOpen_ = false;
+        onChanged();
+        return this;
+      }
+
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -656,7 +679,7 @@ public final class ActivityScheduleInfoOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -667,7 +690,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 8;</code>
+       * <code>uint32 end_time = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -679,7 +702,7 @@ public final class ActivityScheduleInfoOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -687,7 +710,7 @@ public final class ActivityScheduleInfoOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -698,7 +721,7 @@ public final class ActivityScheduleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 4;</code>
+       * <code>uint32 schedule_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -707,37 +730,6 @@ public final class ActivityScheduleInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int activityId_ ;
-      /**
-       * <code>uint32 activity_id = 1;</code>
-       * @return The activityId.
-       */
-      @java.lang.Override
-      public int getActivityId() {
-        return activityId_;
-      }
-      /**
-       * <code>uint32 activity_id = 1;</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 = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivityId() {
-        
-        activityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -806,9 +798,9 @@ public final class ActivityScheduleInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ActivityScheduleInfo.proto\"w\n\024Activity" +
-      "ScheduleInfo\022\017\n\007is_open\030\006 \001(\010\022\022\n\nbegin_t" +
-      "ime\030\007 \001(\r\022\020\n\010end_time\030\010 \001(\r\022\023\n\013schedule_" +
-      "id\030\004 \001(\r\022\023\n\013activity_id\030\001 \001(\rB\033\n\031emu.gra" +
+      "ScheduleInfo\022\022\n\nbegin_time\030\006 \001(\r\022\023\n\013acti" +
+      "vity_id\030\007 \001(\r\022\017\n\007is_open\030\t \001(\010\022\020\n\010end_ti" +
+      "me\030\r \001(\r\022\023\n\013schedule_id\030\016 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -820,7 +812,7 @@ public final class ActivityScheduleInfoOuterClass {
     internal_static_ActivityScheduleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityScheduleInfo_descriptor,
-        new java.lang.String[] { "IsOpen", "BeginTime", "EndTime", "ScheduleId", "ActivityId", });
+        new java.lang.String[] { "BeginTime", "ActivityId", "IsOpen", "EndTime", "ScheduleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java
index 82925b3bd..a51f25d10 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ActivityWatcherInfoOuterClass.java
@@ -19,34 +19,30 @@ public final class ActivityWatcherInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 7;</code>
      * @return The totalProgress.
      */
     int getTotalProgress();
 
     /**
-     * <code>uint32 watcher_id = 13;</code>
-     * @return The watcherId.
+     * <code>uint32 cur_progress = 8;</code>
+     * @return The curProgress.
      */
-    int getWatcherId();
+    int getCurProgress();
 
     /**
-     * <code>bool is_taken_reward = 8;</code>
+     * <code>bool is_taken_reward = 9;</code>
      * @return The isTakenReward.
      */
     boolean getIsTakenReward();
 
     /**
-     * <code>uint32 cur_progress = 15;</code>
-     * @return The curProgress.
+     * <code>uint32 watcher_id = 11;</code>
+     * @return The watcherId.
      */
-    int getCurProgress();
+    int getWatcherId();
   }
   /**
-   * <pre>
-   * Obf: MCEOHOILHEH
-   * </pre>
-   *
    * Protobuf type {@code ActivityWatcherInfo}
    */
   public static final class ActivityWatcherInfo extends
@@ -91,26 +87,26 @@ public final class ActivityWatcherInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              isTakenReward_ = input.readBool();
-              break;
-            }
-            case 104: {
-
-              watcherId_ = input.readUInt32();
-              break;
-            }
-            case 112: {
+            case 56: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
               curProgress_ = input.readUInt32();
               break;
             }
+            case 72: {
+
+              isTakenReward_ = input.readBool();
+              break;
+            }
+            case 88: {
+
+              watcherId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,10 +139,10 @@ public final class ActivityWatcherInfoOuterClass {
               emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.class, emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo.Builder.class);
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 14;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 7;
     private int totalProgress_;
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 7;</code>
      * @return The totalProgress.
      */
     @java.lang.Override
@@ -154,21 +150,21 @@ public final class ActivityWatcherInfoOuterClass {
       return totalProgress_;
     }
 
-    public static final int WATCHER_ID_FIELD_NUMBER = 13;
-    private int watcherId_;
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 8;
+    private int curProgress_;
     /**
-     * <code>uint32 watcher_id = 13;</code>
-     * @return The watcherId.
+     * <code>uint32 cur_progress = 8;</code>
+     * @return The curProgress.
      */
     @java.lang.Override
-    public int getWatcherId() {
-      return watcherId_;
+    public int getCurProgress() {
+      return curProgress_;
     }
 
-    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 8;
+    public static final int IS_TAKEN_REWARD_FIELD_NUMBER = 9;
     private boolean isTakenReward_;
     /**
-     * <code>bool is_taken_reward = 8;</code>
+     * <code>bool is_taken_reward = 9;</code>
      * @return The isTakenReward.
      */
     @java.lang.Override
@@ -176,15 +172,15 @@ public final class ActivityWatcherInfoOuterClass {
       return isTakenReward_;
     }
 
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 15;
-    private int curProgress_;
+    public static final int WATCHER_ID_FIELD_NUMBER = 11;
+    private int watcherId_;
     /**
-     * <code>uint32 cur_progress = 15;</code>
-     * @return The curProgress.
+     * <code>uint32 watcher_id = 11;</code>
+     * @return The watcherId.
      */
     @java.lang.Override
-    public int getCurProgress() {
-      return curProgress_;
+    public int getWatcherId() {
+      return watcherId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -201,17 +197,17 @@ public final class ActivityWatcherInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isTakenReward_ != false) {
-        output.writeBool(8, isTakenReward_);
-      }
-      if (watcherId_ != 0) {
-        output.writeUInt32(13, watcherId_);
-      }
       if (totalProgress_ != 0) {
-        output.writeUInt32(14, totalProgress_);
+        output.writeUInt32(7, totalProgress_);
       }
       if (curProgress_ != 0) {
-        output.writeUInt32(15, curProgress_);
+        output.writeUInt32(8, curProgress_);
+      }
+      if (isTakenReward_ != false) {
+        output.writeBool(9, isTakenReward_);
+      }
+      if (watcherId_ != 0) {
+        output.writeUInt32(11, watcherId_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +218,21 @@ public final class ActivityWatcherInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isTakenReward_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isTakenReward_);
-      }
-      if (watcherId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, watcherId_);
-      }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, totalProgress_);
+          .computeUInt32Size(7, totalProgress_);
       }
       if (curProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, curProgress_);
+          .computeUInt32Size(8, curProgress_);
+      }
+      if (isTakenReward_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isTakenReward_);
+      }
+      if (watcherId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, watcherId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -255,12 +251,12 @@ public final class ActivityWatcherInfoOuterClass {
 
       if (getTotalProgress()
           != other.getTotalProgress()) return false;
-      if (getWatcherId()
-          != other.getWatcherId()) return false;
-      if (getIsTakenReward()
-          != other.getIsTakenReward()) return false;
       if (getCurProgress()
           != other.getCurProgress()) return false;
+      if (getIsTakenReward()
+          != other.getIsTakenReward()) return false;
+      if (getWatcherId()
+          != other.getWatcherId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -274,13 +270,13 @@ public final class ActivityWatcherInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getTotalProgress();
-      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWatcherId();
+      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getCurProgress();
       hash = (37 * hash) + IS_TAKEN_REWARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTakenReward());
-      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getCurProgress();
+      hash = (37 * hash) + WATCHER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWatcherId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +373,6 @@ public final class ActivityWatcherInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MCEOHOILHEH
-     * </pre>
-     *
      * Protobuf type {@code ActivityWatcherInfo}
      */
     public static final class Builder extends
@@ -420,11 +412,11 @@ public final class ActivityWatcherInfoOuterClass {
         super.clear();
         totalProgress_ = 0;
 
-        watcherId_ = 0;
+        curProgress_ = 0;
 
         isTakenReward_ = false;
 
-        curProgress_ = 0;
+        watcherId_ = 0;
 
         return this;
       }
@@ -453,9 +445,9 @@ public final class ActivityWatcherInfoOuterClass {
       public emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo buildPartial() {
         emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo result = new emu.grasscutter.net.proto.ActivityWatcherInfoOuterClass.ActivityWatcherInfo(this);
         result.totalProgress_ = totalProgress_;
-        result.watcherId_ = watcherId_;
-        result.isTakenReward_ = isTakenReward_;
         result.curProgress_ = curProgress_;
+        result.isTakenReward_ = isTakenReward_;
+        result.watcherId_ = watcherId_;
         onBuilt();
         return result;
       }
@@ -507,14 +499,14 @@ public final class ActivityWatcherInfoOuterClass {
         if (other.getTotalProgress() != 0) {
           setTotalProgress(other.getTotalProgress());
         }
-        if (other.getWatcherId() != 0) {
-          setWatcherId(other.getWatcherId());
+        if (other.getCurProgress() != 0) {
+          setCurProgress(other.getCurProgress());
         }
         if (other.getIsTakenReward() != false) {
           setIsTakenReward(other.getIsTakenReward());
         }
-        if (other.getCurProgress() != 0) {
-          setCurProgress(other.getCurProgress());
+        if (other.getWatcherId() != 0) {
+          setWatcherId(other.getWatcherId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -547,7 +539,7 @@ public final class ActivityWatcherInfoOuterClass {
 
       private int totalProgress_ ;
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @return The totalProgress.
        */
       @java.lang.Override
@@ -555,7 +547,7 @@ public final class ActivityWatcherInfoOuterClass {
         return totalProgress_;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @param value The totalProgress to set.
        * @return This builder for chaining.
        */
@@ -566,7 +558,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalProgress() {
@@ -576,71 +568,9 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
 
-      private int watcherId_ ;
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @return The watcherId.
-       */
-      @java.lang.Override
-      public int getWatcherId() {
-        return watcherId_;
-      }
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @param value The watcherId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWatcherId(int value) {
-        
-        watcherId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 watcher_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWatcherId() {
-        
-        watcherId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isTakenReward_ ;
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @return The isTakenReward.
-       */
-      @java.lang.Override
-      public boolean getIsTakenReward() {
-        return isTakenReward_;
-      }
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @param value The isTakenReward to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTakenReward(boolean value) {
-        
-        isTakenReward_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_taken_reward = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTakenReward() {
-        
-        isTakenReward_ = false;
-        onChanged();
-        return this;
-      }
-
       private int curProgress_ ;
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @return The curProgress.
        */
       @java.lang.Override
@@ -648,7 +578,7 @@ public final class ActivityWatcherInfoOuterClass {
         return curProgress_;
       }
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @param value The curProgress to set.
        * @return This builder for chaining.
        */
@@ -659,7 +589,7 @@ public final class ActivityWatcherInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 15;</code>
+       * <code>uint32 cur_progress = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurProgress() {
@@ -668,6 +598,68 @@ public final class ActivityWatcherInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isTakenReward_ ;
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @return The isTakenReward.
+       */
+      @java.lang.Override
+      public boolean getIsTakenReward() {
+        return isTakenReward_;
+      }
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @param value The isTakenReward to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTakenReward(boolean value) {
+        
+        isTakenReward_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_taken_reward = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTakenReward() {
+        
+        isTakenReward_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int watcherId_ ;
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @return The watcherId.
+       */
+      @java.lang.Override
+      public int getWatcherId() {
+        return watcherId_;
+      }
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @param value The watcherId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWatcherId(int value) {
+        
+        watcherId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 watcher_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWatcherId() {
+        
+        watcherId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +728,9 @@ public final class ActivityWatcherInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031ActivityWatcherInfo.proto\"p\n\023ActivityW" +
-      "atcherInfo\022\026\n\016total_progress\030\016 \001(\r\022\022\n\nwa" +
-      "tcher_id\030\r \001(\r\022\027\n\017is_taken_reward\030\010 \001(\010\022" +
-      "\024\n\014cur_progress\030\017 \001(\rB\033\n\031emu.grasscutter" +
+      "atcherInfo\022\026\n\016total_progress\030\007 \001(\r\022\024\n\014cu" +
+      "r_progress\030\010 \001(\r\022\027\n\017is_taken_reward\030\t \001(" +
+      "\010\022\022\n\nwatcher_id\030\013 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class ActivityWatcherInfoOuterClass {
     internal_static_ActivityWatcherInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ActivityWatcherInfo_descriptor,
-        new java.lang.String[] { "TotalProgress", "WatcherId", "IsTakenReward", "CurProgress", });
+        new java.lang.String[] { "TotalProgress", "CurProgress", "IsTakenReward", "WatcherId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamReqOuterClass.java
index 1d8a67f60..4e6fa4146 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamReqOuterClass.java
@@ -20,8 +20,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 22083
-   * Obf: PDKOLMGNNBP
+   * CmdId: 23418
    * </pre>
    *
    * Protobuf type {@code AddBackupAvatarTeamReq}
@@ -246,8 +245,7 @@ public final class AddBackupAvatarTeamReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 22083
-     * Obf: PDKOLMGNNBP
+     * CmdId: 23418
      * </pre>
      *
      * Protobuf type {@code AddBackupAvatarTeamReq}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java
index 753be259c..7ef090efe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddBackupAvatarTeamRspOuterClass.java
@@ -19,15 +19,14 @@ public final class AddBackupAvatarTeamRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 7930
-   * Obf: GDMKNCBFCEH
+   * CmdId: 7660
    * </pre>
    *
    * Protobuf type {@code AddBackupAvatarTeamRsp}
@@ -74,7 +73,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +110,10 @@ public final class AddBackupAvatarTeamRspOuterClass {
               emu.grasscutter.net.proto.AddBackupAvatarTeamRspOuterClass.AddBackupAvatarTeamRsp.class, emu.grasscutter.net.proto.AddBackupAvatarTeamRspOuterClass.AddBackupAvatarTeamRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +136,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+        output.writeInt32(5, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +149,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +278,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 7930
-     * Obf: GDMKNCBFCEH
+     * CmdId: 7660
      * </pre>
      *
      * Protobuf type {@code AddBackupAvatarTeamRsp}
@@ -431,7 +429,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +437,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +448,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +525,7 @@ public final class AddBackupAvatarTeamRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AddBackupAvatarTeamRsp.proto\")\n\026AddBac" +
-      "kupAvatarTeamRsp\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu" +
+      "kupAvatarTeamRsp\022\017\n\007retcode\030\005 \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/AddFriendNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddFriendNotifyOuterClass.java
index fe28a5f67..27d16131e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddFriendNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddFriendNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class AddFriendNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 11;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     boolean hasTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return The targetFriendBrief.
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 2626
-   * Obf: EHIPCHBKFKE
-   * </pre>
-   *
    * Protobuf type {@code AddFriendNotify}
    */
   public static final class AddFriendNotify extends
@@ -89,12 +84,12 @@ public final class AddFriendNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 88: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 50: {
+            case 98: {
               emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
               if (targetFriendBrief_ != null) {
                 subBuilder = targetFriendBrief_.toBuilder();
@@ -139,10 +134,10 @@ public final class AddFriendNotifyOuterClass {
               emu.grasscutter.net.proto.AddFriendNotifyOuterClass.AddFriendNotify.class, emu.grasscutter.net.proto.AddFriendNotifyOuterClass.AddFriendNotify.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 4;
+    public static final int TARGET_UID_FIELD_NUMBER = 11;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 11;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class AddFriendNotifyOuterClass {
       return targetUid_;
     }
 
-    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 6;
+    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class AddFriendNotifyOuterClass {
       return targetFriendBrief_ != null;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      * @return The targetFriendBrief.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class AddFriendNotifyOuterClass {
       return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 6;</code>
+     * <code>.FriendBrief target_friend_brief = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
@@ -191,10 +186,10 @@ public final class AddFriendNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(4, targetUid_);
+        output.writeUInt32(11, targetUid_);
       }
       if (targetFriendBrief_ != null) {
-        output.writeMessage(6, getTargetFriendBrief());
+        output.writeMessage(12, getTargetFriendBrief());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class AddFriendNotifyOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, targetUid_);
+          .computeUInt32Size(11, targetUid_);
       }
       if (targetFriendBrief_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getTargetFriendBrief());
+          .computeMessageSize(12, getTargetFriendBrief());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class AddFriendNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2626
-     * Obf: EHIPCHBKFKE
-     * </pre>
-     *
      * Protobuf type {@code AddFriendNotify}
      */
     public static final class Builder extends
@@ -515,7 +505,7 @@ public final class AddFriendNotifyOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -523,7 +513,7 @@ public final class AddFriendNotifyOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -534,7 +524,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -548,14 +538,14 @@ public final class AddFriendNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        * @return Whether the targetFriendBrief field is set.
        */
       public boolean hasTargetFriendBrief() {
         return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        * @return The targetFriendBrief.
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -566,7 +556,7 @@ public final class AddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -582,7 +572,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder setTargetFriendBrief(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -596,7 +586,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -614,7 +604,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public Builder clearTargetFriendBrief() {
         if (targetFriendBriefBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class AddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
         
@@ -636,7 +626,7 @@ public final class AddFriendNotifyOuterClass {
         return getTargetFriendBriefFieldBuilder().getBuilder();
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
         if (targetFriendBriefBuilder_ != null) {
@@ -647,7 +637,7 @@ public final class AddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 6;</code>
+       * <code>.FriendBrief target_friend_brief = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -730,8 +720,8 @@ public final class AddFriendNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AddFriendNotify.proto\032\021FriendBrief.pro" +
-      "to\"P\n\017AddFriendNotify\022\022\n\ntarget_uid\030\004 \001(" +
-      "\r\022)\n\023target_friend_brief\030\006 \001(\0132\014.FriendB" +
+      "to\"P\n\017AddFriendNotify\022\022\n\ntarget_uid\030\013 \001(" +
+      "\r\022)\n\023target_friend_brief\030\014 \001(\0132\014.FriendB" +
       "riefB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java
index 7ab7a5598..1c5aa859c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardNotifyOuterClass.java
@@ -19,71 +19,66 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 initial_level = 15;</code>
-     * @return The initialLevel.
-     */
-    int getInitialLevel();
-
-    /**
-     * <code>uint32 avatar_id = 14;</code>
+     * <code>uint32 avatar_id = 6;</code>
      * @return The avatarId.
      */
     int getAvatarId();
 
     /**
-     * <code>uint32 reason = 12;</code>
-     * @return The reason.
-     */
-    int getReason();
-
-    /**
-     * <code>bool is_transfer_to_item = 9;</code>
-     * @return The isTransferToItem.
-     */
-    boolean getIsTransferToItem();
-
-    /**
-     * <code>uint32 item_id = 1;</code>
+     * <code>uint32 item_id = 7;</code>
      * @return The itemId.
      */
     int getItemId();
 
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>uint32 initial_level = 8;</code>
+     * @return The initialLevel.
+     */
+    int getInitialLevel();
+
+    /**
+     * <code>uint32 initial_promote_level = 9;</code>
+     * @return The initialPromoteLevel.
+     */
+    int getInitialPromoteLevel();
+
+    /**
+     * <code>bool is_transfer_to_item = 12;</code>
+     * @return The isTransferToItem.
+     */
+    boolean getIsTransferToItem();
+
+    /**
+     * <code>uint32 reason = 14;</code>
+     * @return The reason.
+     */
+    int getReason();
+
+    /**
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> 
         getTransferItemListList();
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getTransferItemList(int index);
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     int getTransferItemListCount();
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder> 
         getTransferItemListOrBuilderList();
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder getTransferItemListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 initial_promote_level = 8;</code>
-     * @return The initialPromoteLevel.
-     */
-    int getInitialPromoteLevel();
   }
   /**
-   * <pre>
-   * CmdId: 7037
-   * Obf: BEANNFLOONI
-   * </pre>
-   *
    * Protobuf type {@code AddNoGachaAvatarCardNotify}
    */
   public static final class AddNoGachaAvatarCardNotify extends
@@ -130,12 +125,37 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 48: {
+
+              avatarId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
 
               itemId_ = input.readUInt32();
               break;
             }
-            case 18: {
+            case 64: {
+
+              initialLevel_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              initialPromoteLevel_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              isTransferToItem_ = input.readBool();
+              break;
+            }
+            case 112: {
+
+              reason_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 transferItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem>();
                 mutable_bitField0_ |= 0x00000001;
@@ -144,31 +164,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.parser(), extensionRegistry));
               break;
             }
-            case 64: {
-
-              initialPromoteLevel_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              isTransferToItem_ = input.readBool();
-              break;
-            }
-            case 96: {
-
-              reason_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              avatarId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              initialLevel_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -204,21 +199,10 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
               emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.Builder.class);
     }
 
-    public static final int INITIAL_LEVEL_FIELD_NUMBER = 15;
-    private int initialLevel_;
-    /**
-     * <code>uint32 initial_level = 15;</code>
-     * @return The initialLevel.
-     */
-    @java.lang.Override
-    public int getInitialLevel() {
-      return initialLevel_;
-    }
-
-    public static final int AVATAR_ID_FIELD_NUMBER = 14;
+    public static final int AVATAR_ID_FIELD_NUMBER = 6;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 14;</code>
+     * <code>uint32 avatar_id = 6;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -226,32 +210,10 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return avatarId_;
     }
 
-    public static final int REASON_FIELD_NUMBER = 12;
-    private int reason_;
-    /**
-     * <code>uint32 reason = 12;</code>
-     * @return The reason.
-     */
-    @java.lang.Override
-    public int getReason() {
-      return reason_;
-    }
-
-    public static final int IS_TRANSFER_TO_ITEM_FIELD_NUMBER = 9;
-    private boolean isTransferToItem_;
-    /**
-     * <code>bool is_transfer_to_item = 9;</code>
-     * @return The isTransferToItem.
-     */
-    @java.lang.Override
-    public boolean getIsTransferToItem() {
-      return isTransferToItem_;
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 1;
+    public static final int ITEM_ID_FIELD_NUMBER = 7;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 1;</code>
+     * <code>uint32 item_id = 7;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -259,17 +221,61 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return itemId_;
     }
 
-    public static final int TRANSFER_ITEM_LIST_FIELD_NUMBER = 2;
+    public static final int INITIAL_LEVEL_FIELD_NUMBER = 8;
+    private int initialLevel_;
+    /**
+     * <code>uint32 initial_level = 8;</code>
+     * @return The initialLevel.
+     */
+    @java.lang.Override
+    public int getInitialLevel() {
+      return initialLevel_;
+    }
+
+    public static final int INITIAL_PROMOTE_LEVEL_FIELD_NUMBER = 9;
+    private int initialPromoteLevel_;
+    /**
+     * <code>uint32 initial_promote_level = 9;</code>
+     * @return The initialPromoteLevel.
+     */
+    @java.lang.Override
+    public int getInitialPromoteLevel() {
+      return initialPromoteLevel_;
+    }
+
+    public static final int IS_TRANSFER_TO_ITEM_FIELD_NUMBER = 12;
+    private boolean isTransferToItem_;
+    /**
+     * <code>bool is_transfer_to_item = 12;</code>
+     * @return The isTransferToItem.
+     */
+    @java.lang.Override
+    public boolean getIsTransferToItem() {
+      return isTransferToItem_;
+    }
+
+    public static final int REASON_FIELD_NUMBER = 14;
+    private int reason_;
+    /**
+     * <code>uint32 reason = 14;</code>
+     * @return The reason.
+     */
+    @java.lang.Override
+    public int getReason() {
+      return reason_;
+    }
+
+    public static final int TRANSFER_ITEM_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> transferItemList_;
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> getTransferItemListList() {
       return transferItemList_;
     }
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder> 
@@ -277,21 +283,21 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return transferItemList_;
     }
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     @java.lang.Override
     public int getTransferItemListCount() {
       return transferItemList_.size();
     }
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getTransferItemList(int index) {
       return transferItemList_.get(index);
     }
     /**
-     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+     * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder getTransferItemListOrBuilder(
@@ -299,17 +305,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return transferItemList_.get(index);
     }
 
-    public static final int INITIAL_PROMOTE_LEVEL_FIELD_NUMBER = 8;
-    private int initialPromoteLevel_;
-    /**
-     * <code>uint32 initial_promote_level = 8;</code>
-     * @return The initialPromoteLevel.
-     */
-    @java.lang.Override
-    public int getInitialPromoteLevel() {
-      return initialPromoteLevel_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -324,26 +319,26 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (itemId_ != 0) {
-        output.writeUInt32(1, itemId_);
-      }
-      for (int i = 0; i < transferItemList_.size(); i++) {
-        output.writeMessage(2, transferItemList_.get(i));
-      }
-      if (initialPromoteLevel_ != 0) {
-        output.writeUInt32(8, initialPromoteLevel_);
-      }
-      if (isTransferToItem_ != false) {
-        output.writeBool(9, isTransferToItem_);
-      }
-      if (reason_ != 0) {
-        output.writeUInt32(12, reason_);
-      }
       if (avatarId_ != 0) {
-        output.writeUInt32(14, avatarId_);
+        output.writeUInt32(6, avatarId_);
+      }
+      if (itemId_ != 0) {
+        output.writeUInt32(7, itemId_);
       }
       if (initialLevel_ != 0) {
-        output.writeUInt32(15, initialLevel_);
+        output.writeUInt32(8, initialLevel_);
+      }
+      if (initialPromoteLevel_ != 0) {
+        output.writeUInt32(9, initialPromoteLevel_);
+      }
+      if (isTransferToItem_ != false) {
+        output.writeBool(12, isTransferToItem_);
+      }
+      if (reason_ != 0) {
+        output.writeUInt32(14, reason_);
+      }
+      for (int i = 0; i < transferItemList_.size(); i++) {
+        output.writeMessage(15, transferItemList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -354,33 +349,33 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (itemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, itemId_);
-      }
-      for (int i = 0; i < transferItemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, transferItemList_.get(i));
-      }
-      if (initialPromoteLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, initialPromoteLevel_);
-      }
-      if (isTransferToItem_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isTransferToItem_);
-      }
-      if (reason_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, reason_);
-      }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, avatarId_);
+          .computeUInt32Size(6, avatarId_);
+      }
+      if (itemId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, itemId_);
       }
       if (initialLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, initialLevel_);
+          .computeUInt32Size(8, initialLevel_);
+      }
+      if (initialPromoteLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, initialPromoteLevel_);
+      }
+      if (isTransferToItem_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isTransferToItem_);
+      }
+      if (reason_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, reason_);
+      }
+      for (int i = 0; i < transferItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, transferItemList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -397,20 +392,20 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify other = (emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify) obj;
 
-      if (getInitialLevel()
-          != other.getInitialLevel()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
-      if (getReason()
-          != other.getReason()) return false;
-      if (getIsTransferToItem()
-          != other.getIsTransferToItem()) return false;
       if (getItemId()
           != other.getItemId()) return false;
-      if (!getTransferItemListList()
-          .equals(other.getTransferItemListList())) return false;
+      if (getInitialLevel()
+          != other.getInitialLevel()) return false;
       if (getInitialPromoteLevel()
           != other.getInitialPromoteLevel()) return false;
+      if (getIsTransferToItem()
+          != other.getIsTransferToItem()) return false;
+      if (getReason()
+          != other.getReason()) return false;
+      if (!getTransferItemListList()
+          .equals(other.getTransferItemListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -422,23 +417,23 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + INITIAL_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getInitialLevel();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + getReason();
+      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getItemId();
+      hash = (37 * hash) + INITIAL_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getInitialLevel();
+      hash = (37 * hash) + INITIAL_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getInitialPromoteLevel();
       hash = (37 * hash) + IS_TRANSFER_TO_ITEM_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTransferToItem());
-      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getItemId();
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + getReason();
       if (getTransferItemListCount() > 0) {
         hash = (37 * hash) + TRANSFER_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTransferItemListList().hashCode();
       }
-      hash = (37 * hash) + INITIAL_PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getInitialPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -535,11 +530,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7037
-     * Obf: BEANNFLOONI
-     * </pre>
-     *
      * Protobuf type {@code AddNoGachaAvatarCardNotify}
      */
     public static final class Builder extends
@@ -578,15 +568,17 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        initialLevel_ = 0;
-
         avatarId_ = 0;
 
-        reason_ = 0;
+        itemId_ = 0;
+
+        initialLevel_ = 0;
+
+        initialPromoteLevel_ = 0;
 
         isTransferToItem_ = false;
 
-        itemId_ = 0;
+        reason_ = 0;
 
         if (transferItemListBuilder_ == null) {
           transferItemList_ = java.util.Collections.emptyList();
@@ -594,8 +586,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         } else {
           transferItemListBuilder_.clear();
         }
-        initialPromoteLevel_ = 0;
-
         return this;
       }
 
@@ -623,11 +613,12 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify buildPartial() {
         emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify result = new emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify(this);
         int from_bitField0_ = bitField0_;
-        result.initialLevel_ = initialLevel_;
         result.avatarId_ = avatarId_;
-        result.reason_ = reason_;
-        result.isTransferToItem_ = isTransferToItem_;
         result.itemId_ = itemId_;
+        result.initialLevel_ = initialLevel_;
+        result.initialPromoteLevel_ = initialPromoteLevel_;
+        result.isTransferToItem_ = isTransferToItem_;
+        result.reason_ = reason_;
         if (transferItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             transferItemList_ = java.util.Collections.unmodifiableList(transferItemList_);
@@ -637,7 +628,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         } else {
           result.transferItemList_ = transferItemListBuilder_.build();
         }
-        result.initialPromoteLevel_ = initialPromoteLevel_;
         onBuilt();
         return result;
       }
@@ -686,20 +676,23 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify other) {
         if (other == emu.grasscutter.net.proto.AddNoGachaAvatarCardNotifyOuterClass.AddNoGachaAvatarCardNotify.getDefaultInstance()) return this;
-        if (other.getInitialLevel() != 0) {
-          setInitialLevel(other.getInitialLevel());
-        }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
-        if (other.getReason() != 0) {
-          setReason(other.getReason());
+        if (other.getItemId() != 0) {
+          setItemId(other.getItemId());
+        }
+        if (other.getInitialLevel() != 0) {
+          setInitialLevel(other.getInitialLevel());
+        }
+        if (other.getInitialPromoteLevel() != 0) {
+          setInitialPromoteLevel(other.getInitialPromoteLevel());
         }
         if (other.getIsTransferToItem() != false) {
           setIsTransferToItem(other.getIsTransferToItem());
         }
-        if (other.getItemId() != 0) {
-          setItemId(other.getItemId());
+        if (other.getReason() != 0) {
+          setReason(other.getReason());
         }
         if (transferItemListBuilder_ == null) {
           if (!other.transferItemList_.isEmpty()) {
@@ -727,9 +720,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             }
           }
         }
-        if (other.getInitialPromoteLevel() != 0) {
-          setInitialPromoteLevel(other.getInitialPromoteLevel());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -760,40 +750,9 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int initialLevel_ ;
-      /**
-       * <code>uint32 initial_level = 15;</code>
-       * @return The initialLevel.
-       */
-      @java.lang.Override
-      public int getInitialLevel() {
-        return initialLevel_;
-      }
-      /**
-       * <code>uint32 initial_level = 15;</code>
-       * @param value The initialLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInitialLevel(int value) {
-        
-        initialLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 initial_level = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInitialLevel() {
-        
-        initialLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 14;</code>
+       * <code>uint32 avatar_id = 6;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -801,7 +760,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 14;</code>
+       * <code>uint32 avatar_id = 6;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -812,7 +771,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 14;</code>
+       * <code>uint32 avatar_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -822,71 +781,9 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
 
-      private int reason_ ;
-      /**
-       * <code>uint32 reason = 12;</code>
-       * @return The reason.
-       */
-      @java.lang.Override
-      public int getReason() {
-        return reason_;
-      }
-      /**
-       * <code>uint32 reason = 12;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(int value) {
-        
-        reason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reason = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isTransferToItem_ ;
-      /**
-       * <code>bool is_transfer_to_item = 9;</code>
-       * @return The isTransferToItem.
-       */
-      @java.lang.Override
-      public boolean getIsTransferToItem() {
-        return isTransferToItem_;
-      }
-      /**
-       * <code>bool is_transfer_to_item = 9;</code>
-       * @param value The isTransferToItem to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTransferToItem(boolean value) {
-        
-        isTransferToItem_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_transfer_to_item = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTransferToItem() {
-        
-        isTransferToItem_ = false;
-        onChanged();
-        return this;
-      }
-
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 1;</code>
+       * <code>uint32 item_id = 7;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -894,7 +791,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 1;</code>
+       * <code>uint32 item_id = 7;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -905,7 +802,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 1;</code>
+       * <code>uint32 item_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -915,6 +812,130 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
 
+      private int initialLevel_ ;
+      /**
+       * <code>uint32 initial_level = 8;</code>
+       * @return The initialLevel.
+       */
+      @java.lang.Override
+      public int getInitialLevel() {
+        return initialLevel_;
+      }
+      /**
+       * <code>uint32 initial_level = 8;</code>
+       * @param value The initialLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInitialLevel(int value) {
+        
+        initialLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 initial_level = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInitialLevel() {
+        
+        initialLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int initialPromoteLevel_ ;
+      /**
+       * <code>uint32 initial_promote_level = 9;</code>
+       * @return The initialPromoteLevel.
+       */
+      @java.lang.Override
+      public int getInitialPromoteLevel() {
+        return initialPromoteLevel_;
+      }
+      /**
+       * <code>uint32 initial_promote_level = 9;</code>
+       * @param value The initialPromoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInitialPromoteLevel(int value) {
+        
+        initialPromoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 initial_promote_level = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInitialPromoteLevel() {
+        
+        initialPromoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isTransferToItem_ ;
+      /**
+       * <code>bool is_transfer_to_item = 12;</code>
+       * @return The isTransferToItem.
+       */
+      @java.lang.Override
+      public boolean getIsTransferToItem() {
+        return isTransferToItem_;
+      }
+      /**
+       * <code>bool is_transfer_to_item = 12;</code>
+       * @param value The isTransferToItem to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTransferToItem(boolean value) {
+        
+        isTransferToItem_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_transfer_to_item = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTransferToItem() {
+        
+        isTransferToItem_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int reason_ ;
+      /**
+       * <code>uint32 reason = 14;</code>
+       * @return The reason.
+       */
+      @java.lang.Override
+      public int getReason() {
+        return reason_;
+      }
+      /**
+       * <code>uint32 reason = 14;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(int value) {
+        
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reason = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> transferItemList_ =
         java.util.Collections.emptyList();
       private void ensureTransferItemListIsMutable() {
@@ -928,7 +949,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
           emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder> transferItemListBuilder_;
 
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> getTransferItemListList() {
         if (transferItemListBuilder_ == null) {
@@ -938,7 +959,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public int getTransferItemListCount() {
         if (transferItemListBuilder_ == null) {
@@ -948,7 +969,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem getTransferItemList(int index) {
         if (transferItemListBuilder_ == null) {
@@ -958,7 +979,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder setTransferItemList(
           int index, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem value) {
@@ -975,7 +996,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder setTransferItemList(
           int index, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder builderForValue) {
@@ -989,7 +1010,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder addTransferItemList(emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem value) {
         if (transferItemListBuilder_ == null) {
@@ -1005,7 +1026,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder addTransferItemList(
           int index, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem value) {
@@ -1022,7 +1043,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder addTransferItemList(
           emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder builderForValue) {
@@ -1036,7 +1057,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder addTransferItemList(
           int index, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder builderForValue) {
@@ -1050,7 +1071,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder addAllTransferItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem> values) {
@@ -1065,7 +1086,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder clearTransferItemList() {
         if (transferItemListBuilder_ == null) {
@@ -1078,7 +1099,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public Builder removeTransferItemList(int index) {
         if (transferItemListBuilder_ == null) {
@@ -1091,14 +1112,14 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder getTransferItemListBuilder(
           int index) {
         return getTransferItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder getTransferItemListOrBuilder(
           int index) {
@@ -1108,7 +1129,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItemOrBuilder> 
            getTransferItemListOrBuilderList() {
@@ -1119,14 +1140,14 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder addTransferItemListBuilder() {
         return getTransferItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder addTransferItemListBuilder(
           int index) {
@@ -1134,7 +1155,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
             index, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 2;</code>
+       * <code>repeated .AddNoGachaAvatarCardTransferItem transfer_item_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder> 
            getTransferItemListBuilderList() {
@@ -1154,37 +1175,6 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
         }
         return transferItemListBuilder_;
       }
-
-      private int initialPromoteLevel_ ;
-      /**
-       * <code>uint32 initial_promote_level = 8;</code>
-       * @return The initialPromoteLevel.
-       */
-      @java.lang.Override
-      public int getInitialPromoteLevel() {
-        return initialPromoteLevel_;
-      }
-      /**
-       * <code>uint32 initial_promote_level = 8;</code>
-       * @param value The initialPromoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setInitialPromoteLevel(int value) {
-        
-        initialPromoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 initial_promote_level = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearInitialPromoteLevel() {
-        
-        initialPromoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1254,12 +1244,12 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n AddNoGachaAvatarCardNotify.proto\032&AddN" +
       "oGachaAvatarCardTransferItem.proto\"\342\001\n\032A" +
-      "ddNoGachaAvatarCardNotify\022\025\n\rinitial_lev" +
-      "el\030\017 \001(\r\022\021\n\tavatar_id\030\016 \001(\r\022\016\n\006reason\030\014 " +
-      "\001(\r\022\033\n\023is_transfer_to_item\030\t \001(\010\022\017\n\007item" +
-      "_id\030\001 \001(\r\022=\n\022transfer_item_list\030\002 \003(\0132!." +
-      "AddNoGachaAvatarCardTransferItem\022\035\n\025init" +
-      "ial_promote_level\030\010 \001(\rB\033\n\031emu.grasscutt" +
+      "ddNoGachaAvatarCardNotify\022\021\n\tavatar_id\030\006" +
+      " \001(\r\022\017\n\007item_id\030\007 \001(\r\022\025\n\rinitial_level\030\010" +
+      " \001(\r\022\035\n\025initial_promote_level\030\t \001(\r\022\033\n\023i" +
+      "s_transfer_to_item\030\014 \001(\010\022\016\n\006reason\030\016 \001(\r" +
+      "\022=\n\022transfer_item_list\030\017 \003(\0132!.AddNoGach" +
+      "aAvatarCardTransferItemB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1272,7 +1262,7 @@ public final class AddNoGachaAvatarCardNotifyOuterClass {
     internal_static_AddNoGachaAvatarCardNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddNoGachaAvatarCardNotify_descriptor,
-        new java.lang.String[] { "InitialLevel", "AvatarId", "Reason", "IsTransferToItem", "ItemId", "TransferItemList", "InitialPromoteLevel", });
+        new java.lang.String[] { "AvatarId", "ItemId", "InitialLevel", "InitialPromoteLevel", "IsTransferToItem", "Reason", "TransferItemList", });
     emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java
index be6810836..67f06638b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddNoGachaAvatarCardTransferItemOuterClass.java
@@ -19,28 +19,24 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 count = 1;</code>
+     * <code>uint32 count = 3;</code>
      * @return The count.
      */
     int getCount();
 
     /**
-     * <code>uint32 item_id = 15;</code>
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     int getItemId();
 
     /**
-     * <code>bool is_new = 13;</code>
+     * <code>bool is_new = 11;</code>
      * @return The isNew.
      */
     boolean getIsNew();
   }
   /**
-   * <pre>
-   * Obf: APPDFAFBKIM
-   * </pre>
-   *
    * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
    */
   public static final class AddNoGachaAvatarCardTransferItem extends
@@ -85,21 +81,21 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
               count_ = input.readUInt32();
               break;
             }
-            case 104: {
-
-              isNew_ = input.readBool();
-              break;
-            }
-            case 120: {
+            case 48: {
 
               itemId_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              isNew_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -132,10 +128,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
               emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.class, emu.grasscutter.net.proto.AddNoGachaAvatarCardTransferItemOuterClass.AddNoGachaAvatarCardTransferItem.Builder.class);
     }
 
-    public static final int COUNT_FIELD_NUMBER = 1;
+    public static final int COUNT_FIELD_NUMBER = 3;
     private int count_;
     /**
-     * <code>uint32 count = 1;</code>
+     * <code>uint32 count = 3;</code>
      * @return The count.
      */
     @java.lang.Override
@@ -143,10 +139,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return count_;
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 15;
+    public static final int ITEM_ID_FIELD_NUMBER = 6;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 15;</code>
+     * <code>uint32 item_id = 6;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -154,10 +150,10 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return itemId_;
     }
 
-    public static final int IS_NEW_FIELD_NUMBER = 13;
+    public static final int IS_NEW_FIELD_NUMBER = 11;
     private boolean isNew_;
     /**
-     * <code>bool is_new = 13;</code>
+     * <code>bool is_new = 11;</code>
      * @return The isNew.
      */
     @java.lang.Override
@@ -180,13 +176,13 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (count_ != 0) {
-        output.writeUInt32(1, count_);
-      }
-      if (isNew_ != false) {
-        output.writeBool(13, isNew_);
+        output.writeUInt32(3, count_);
       }
       if (itemId_ != 0) {
-        output.writeUInt32(15, itemId_);
+        output.writeUInt32(6, itemId_);
+      }
+      if (isNew_ != false) {
+        output.writeBool(11, isNew_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +195,15 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       size = 0;
       if (count_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, count_);
-      }
-      if (isNew_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isNew_);
+          .computeUInt32Size(3, count_);
       }
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, itemId_);
+          .computeUInt32Size(6, itemId_);
+      }
+      if (isNew_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isNew_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,10 +340,6 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: APPDFAFBKIM
-     * </pre>
-     *
      * Protobuf type {@code AddNoGachaAvatarCardTransferItem}
      */
     public static final class Builder extends
@@ -508,7 +500,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private int count_ ;
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @return The count.
        */
       @java.lang.Override
@@ -516,7 +508,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return count_;
       }
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @param value The count to set.
        * @return This builder for chaining.
        */
@@ -527,7 +519,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>uint32 count = 1;</code>
+       * <code>uint32 count = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearCount() {
@@ -539,7 +531,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -547,7 +539,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -558,7 +550,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 15;</code>
+       * <code>uint32 item_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -570,7 +562,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
 
       private boolean isNew_ ;
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @return The isNew.
        */
       @java.lang.Override
@@ -578,7 +570,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return isNew_;
       }
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @param value The isNew to set.
        * @return This builder for chaining.
        */
@@ -589,7 +581,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>bool is_new = 13;</code>
+       * <code>bool is_new = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsNew() {
@@ -667,7 +659,7 @@ public final class AddNoGachaAvatarCardTransferItemOuterClass {
     java.lang.String[] descriptorData = {
       "\n&AddNoGachaAvatarCardTransferItem.proto" +
       "\"R\n AddNoGachaAvatarCardTransferItem\022\r\n\005" +
-      "count\030\001 \001(\r\022\017\n\007item_id\030\017 \001(\r\022\016\n\006is_new\030\r" +
+      "count\030\003 \001(\r\022\017\n\007item_id\030\006 \001(\r\022\016\n\006is_new\030\013" +
       " \001(\010B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
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 116284cbc..d48944d02 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressReqOuterClass.java
@@ -19,29 +19,24 @@ public final class AddQuestContentProgressReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 add_progress = 7;</code>
-     * @return The addProgress.
-     */
-    int getAddProgress();
-
-    /**
-     * <code>uint32 content_type = 1;</code>
+     * <code>uint32 content_type = 7;</code>
      * @return The contentType.
      */
     int getContentType();
 
     /**
-     * <code>uint32 param = 6;</code>
+     * <code>uint32 param = 11;</code>
      * @return The param.
      */
     int getParam();
+
+    /**
+     * <code>uint32 add_progress = 15;</code>
+     * @return The addProgress.
+     */
+    int getAddProgress();
   }
   /**
-   * <pre>
-   * CmdId: 3824
-   * Obf: AIJHHIHHOHI
-   * </pre>
-   *
    * Protobuf type {@code AddQuestContentProgressReq}
    */
   public static final class AddQuestContentProgressReq extends
@@ -86,17 +81,17 @@ public final class AddQuestContentProgressReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 56: {
 
               contentType_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 88: {
 
               param_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 120: {
 
               addProgress_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class AddQuestContentProgressReqOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.class, emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.Builder.class);
     }
 
-    public static final int ADD_PROGRESS_FIELD_NUMBER = 7;
-    private int addProgress_;
-    /**
-     * <code>uint32 add_progress = 7;</code>
-     * @return The addProgress.
-     */
-    @java.lang.Override
-    public int getAddProgress() {
-      return addProgress_;
-    }
-
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 1;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 7;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 1;</code>
+     * <code>uint32 content_type = 7;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class AddQuestContentProgressReqOuterClass {
       return contentType_;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 6;
+    public static final int PARAM_FIELD_NUMBER = 11;
     private int param_;
     /**
-     * <code>uint32 param = 6;</code>
+     * <code>uint32 param = 11;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class AddQuestContentProgressReqOuterClass {
       return param_;
     }
 
+    public static final int ADD_PROGRESS_FIELD_NUMBER = 15;
+    private int addProgress_;
+    /**
+     * <code>uint32 add_progress = 15;</code>
+     * @return The addProgress.
+     */
+    @java.lang.Override
+    public int getAddProgress() {
+      return addProgress_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,13 +176,13 @@ public final class AddQuestContentProgressReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (contentType_ != 0) {
-        output.writeUInt32(1, contentType_);
+        output.writeUInt32(7, contentType_);
       }
       if (param_ != 0) {
-        output.writeUInt32(6, param_);
+        output.writeUInt32(11, param_);
       }
       if (addProgress_ != 0) {
-        output.writeUInt32(7, addProgress_);
+        output.writeUInt32(15, addProgress_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AddQuestContentProgressReqOuterClass {
       size = 0;
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, contentType_);
+          .computeUInt32Size(7, contentType_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, param_);
+          .computeUInt32Size(11, param_);
       }
       if (addProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, addProgress_);
+          .computeUInt32Size(15, addProgress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other = (emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq) obj;
 
-      if (getAddProgress()
-          != other.getAddProgress()) return false;
       if (getContentType()
           != other.getContentType()) return false;
       if (getParam()
           != other.getParam()) return false;
+      if (getAddProgress()
+          != other.getAddProgress()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class AddQuestContentProgressReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getAddProgress();
       hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getContentType();
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
+      hash = (37 * hash) + ADD_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getAddProgress();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class AddQuestContentProgressReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3824
-     * Obf: AIJHHIHHOHI
-     * </pre>
-     *
      * Protobuf type {@code AddQuestContentProgressReq}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        addProgress_ = 0;
-
         contentType_ = 0;
 
         param_ = 0;
 
+        addProgress_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class AddQuestContentProgressReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq buildPartial() {
         emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq result = new emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq(this);
-        result.addProgress_ = addProgress_;
         result.contentType_ = contentType_;
         result.param_ = param_;
+        result.addProgress_ = addProgress_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class AddQuestContentProgressReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq other) {
         if (other == emu.grasscutter.net.proto.AddQuestContentProgressReqOuterClass.AddQuestContentProgressReq.getDefaultInstance()) return this;
-        if (other.getAddProgress() != 0) {
-          setAddProgress(other.getAddProgress());
-        }
         if (other.getContentType() != 0) {
           setContentType(other.getContentType());
         }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
+        if (other.getAddProgress() != 0) {
+          setAddProgress(other.getAddProgress());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +497,9 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
 
-      private int addProgress_ ;
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @return The addProgress.
-       */
-      @java.lang.Override
-      public int getAddProgress() {
-        return addProgress_;
-      }
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @param value The addProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAddProgress(int value) {
-        
-        addProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 add_progress = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAddProgress() {
-        
-        addProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -548,7 +507,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -559,7 +518,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 1;</code>
+       * <code>uint32 content_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -571,7 +530,7 @@ public final class AddQuestContentProgressReqOuterClass {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class AddQuestContentProgressReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 6;</code>
+       * <code>uint32 param = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -599,6 +558,37 @@ public final class AddQuestContentProgressReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int addProgress_ ;
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @return The addProgress.
+       */
+      @java.lang.Override
+      public int getAddProgress() {
+        return addProgress_;
+      }
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @param value The addProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAddProgress(int value) {
+        
+        addProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 add_progress = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAddProgress() {
+        
+        addProgress_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class AddQuestContentProgressReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressReq.proto\"W\n\032Ad" +
-      "dQuestContentProgressReq\022\024\n\014add_progress" +
-      "\030\007 \001(\r\022\024\n\014content_type\030\001 \001(\r\022\r\n\005param\030\006 " +
+      "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 " +
       "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class AddQuestContentProgressReqOuterClass {
     internal_static_AddQuestContentProgressReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddQuestContentProgressReq_descriptor,
-        new java.lang.String[] { "AddProgress", "ContentType", "Param", });
+        new java.lang.String[] { "ContentType", "Param", "AddProgress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 e4d146a5a..b768e7d55 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AddQuestContentProgressRspOuterClass.java
@@ -19,23 +19,18 @@ public final class AddQuestContentProgressRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 content_type = 10;</code>
+     * <code>uint32 content_type = 12;</code>
      * @return The contentType.
      */
     int getContentType();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 5514
-   * Obf: FGGNCOHIPDL
-   * </pre>
-   *
    * Protobuf type {@code AddQuestContentProgressRsp}
    */
   public static final class AddQuestContentProgressRsp extends
@@ -80,12 +75,12 @@ public final class AddQuestContentProgressRspOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 96: {
 
               contentType_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
@@ -122,21 +117,10 @@ public final class AddQuestContentProgressRspOuterClass {
               emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.class, emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int CONTENT_TYPE_FIELD_NUMBER = 10;
+    public static final int CONTENT_TYPE_FIELD_NUMBER = 12;
     private int contentType_;
     /**
-     * <code>uint32 content_type = 10;</code>
+     * <code>uint32 content_type = 12;</code>
      * @return The contentType.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AddQuestContentProgressRspOuterClass {
       return contentType_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class AddQuestContentProgressRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (contentType_ != 0) {
-        output.writeUInt32(10, contentType_);
+        output.writeUInt32(12, contentType_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AddQuestContentProgressRspOuterClass {
       size = 0;
       if (contentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, contentType_);
+          .computeUInt32Size(12, contentType_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AddQuestContentProgressRspOuterClass {
       }
       emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other = (emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getContentType()
           != other.getContentType()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class AddQuestContentProgressRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getContentType();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class AddQuestContentProgressRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5514
-     * Obf: FGGNCOHIPDL
-     * </pre>
-     *
      * Protobuf type {@code AddQuestContentProgressRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class AddQuestContentProgressRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         contentType_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class AddQuestContentProgressRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp buildPartial() {
         emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp result = new emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp(this);
-        result.retcode_ = retcode_;
         result.contentType_ = contentType_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class AddQuestContentProgressRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp other) {
         if (other == emu.grasscutter.net.proto.AddQuestContentProgressRspOuterClass.AddQuestContentProgressRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getContentType() != 0) {
           setContentType(other.getContentType());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 12;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int contentType_ ;
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @return The contentType.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return contentType_;
       }
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @param value The contentType to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class AddQuestContentProgressRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 content_type = 10;</code>
+       * <code>uint32 content_type = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearContentType() {
@@ -529,6 +488,37 @@ public final class AddQuestContentProgressRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -597,8 +587,8 @@ public final class AddQuestContentProgressRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AddQuestContentProgressRsp.proto\"C\n\032Ad" +
-      "dQuestContentProgressRsp\022\017\n\007retcode\030\014 \001(" +
-      "\005\022\024\n\014content_type\030\n \001(\rB\033\n\031emu.grasscutt" +
+      "dQuestContentProgressRsp\022\024\n\014content_type" +
+      "\030\014 \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class AddQuestContentProgressRspOuterClass {
     internal_static_AddQuestContentProgressRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AddQuestContentProgressRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ContentType", });
+        new java.lang.String[] { "ContentType", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AdjustWorldLevelRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AdjustWorldLevelRspOuterClass.java
index 6fbde3592..196ee6e21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AdjustWorldLevelRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AdjustWorldLevelRspOuterClass.java
@@ -19,13 +19,7 @@ public final class AdjustWorldLevelRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cd_over_time = 3;</code>
-     * @return The cdOverTime.
-     */
-    int getCdOverTime();
-
-    /**
-     * <code>uint32 after_world_level = 15;</code>
+     * <code>uint32 after_world_level = 3;</code>
      * @return The afterWorldLevel.
      */
     int getAfterWorldLevel();
@@ -35,11 +29,16 @@ public final class AdjustWorldLevelRspOuterClass {
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 cd_over_time = 8;</code>
+     * @return The cdOverTime.
+     */
+    int getCdOverTime();
   }
   /**
    * <pre>
-   * CmdId: 29945
-   * Obf: IDFOMBDLFNJ
+   * CmdId: 29530
    * </pre>
    *
    * Protobuf type {@code AdjustWorldLevelRsp}
@@ -88,7 +87,7 @@ public final class AdjustWorldLevelRspOuterClass {
               break;
             case 24: {
 
-              cdOverTime_ = input.readUInt32();
+              afterWorldLevel_ = input.readUInt32();
               break;
             }
             case 48: {
@@ -96,9 +95,9 @@ public final class AdjustWorldLevelRspOuterClass {
               retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
-              afterWorldLevel_ = input.readUInt32();
+              cdOverTime_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,21 +132,10 @@ public final class AdjustWorldLevelRspOuterClass {
               emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.class, emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.Builder.class);
     }
 
-    public static final int CD_OVER_TIME_FIELD_NUMBER = 3;
-    private int cdOverTime_;
-    /**
-     * <code>uint32 cd_over_time = 3;</code>
-     * @return The cdOverTime.
-     */
-    @java.lang.Override
-    public int getCdOverTime() {
-      return cdOverTime_;
-    }
-
-    public static final int AFTER_WORLD_LEVEL_FIELD_NUMBER = 15;
+    public static final int AFTER_WORLD_LEVEL_FIELD_NUMBER = 3;
     private int afterWorldLevel_;
     /**
-     * <code>uint32 after_world_level = 15;</code>
+     * <code>uint32 after_world_level = 3;</code>
      * @return The afterWorldLevel.
      */
     @java.lang.Override
@@ -166,6 +154,17 @@ public final class AdjustWorldLevelRspOuterClass {
       return retcode_;
     }
 
+    public static final int CD_OVER_TIME_FIELD_NUMBER = 8;
+    private int cdOverTime_;
+    /**
+     * <code>uint32 cd_over_time = 8;</code>
+     * @return The cdOverTime.
+     */
+    @java.lang.Override
+    public int getCdOverTime() {
+      return cdOverTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +179,14 @@ public final class AdjustWorldLevelRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (cdOverTime_ != 0) {
-        output.writeUInt32(3, cdOverTime_);
+      if (afterWorldLevel_ != 0) {
+        output.writeUInt32(3, afterWorldLevel_);
       }
       if (retcode_ != 0) {
         output.writeInt32(6, retcode_);
       }
-      if (afterWorldLevel_ != 0) {
-        output.writeUInt32(15, afterWorldLevel_);
+      if (cdOverTime_ != 0) {
+        output.writeUInt32(8, cdOverTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class AdjustWorldLevelRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (cdOverTime_ != 0) {
+      if (afterWorldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, cdOverTime_);
+          .computeUInt32Size(3, afterWorldLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(6, retcode_);
       }
-      if (afterWorldLevel_ != 0) {
+      if (cdOverTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, afterWorldLevel_);
+          .computeUInt32Size(8, cdOverTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +224,12 @@ public final class AdjustWorldLevelRspOuterClass {
       }
       emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp other = (emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp) obj;
 
-      if (getCdOverTime()
-          != other.getCdOverTime()) return false;
       if (getAfterWorldLevel()
           != other.getAfterWorldLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCdOverTime()
+          != other.getCdOverTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +241,12 @@ public final class AdjustWorldLevelRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CD_OVER_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCdOverTime();
       hash = (37 * hash) + AFTER_WORLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getAfterWorldLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CD_OVER_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCdOverTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,8 +344,7 @@ public final class AdjustWorldLevelRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29945
-     * Obf: IDFOMBDLFNJ
+     * CmdId: 29530
      * </pre>
      *
      * Protobuf type {@code AdjustWorldLevelRsp}
@@ -386,12 +384,12 @@ public final class AdjustWorldLevelRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        cdOverTime_ = 0;
-
         afterWorldLevel_ = 0;
 
         retcode_ = 0;
 
+        cdOverTime_ = 0;
+
         return this;
       }
 
@@ -418,9 +416,9 @@ public final class AdjustWorldLevelRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp buildPartial() {
         emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp result = new emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp(this);
-        result.cdOverTime_ = cdOverTime_;
         result.afterWorldLevel_ = afterWorldLevel_;
         result.retcode_ = retcode_;
+        result.cdOverTime_ = cdOverTime_;
         onBuilt();
         return result;
       }
@@ -469,15 +467,15 @@ public final class AdjustWorldLevelRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp other) {
         if (other == emu.grasscutter.net.proto.AdjustWorldLevelRspOuterClass.AdjustWorldLevelRsp.getDefaultInstance()) return this;
-        if (other.getCdOverTime() != 0) {
-          setCdOverTime(other.getCdOverTime());
-        }
         if (other.getAfterWorldLevel() != 0) {
           setAfterWorldLevel(other.getAfterWorldLevel());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCdOverTime() != 0) {
+          setCdOverTime(other.getCdOverTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +505,9 @@ public final class AdjustWorldLevelRspOuterClass {
         return this;
       }
 
-      private int cdOverTime_ ;
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @return The cdOverTime.
-       */
-      @java.lang.Override
-      public int getCdOverTime() {
-        return cdOverTime_;
-      }
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @param value The cdOverTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCdOverTime(int value) {
-        
-        cdOverTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cd_over_time = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCdOverTime() {
-        
-        cdOverTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int afterWorldLevel_ ;
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @return The afterWorldLevel.
        */
       @java.lang.Override
@@ -548,7 +515,7 @@ public final class AdjustWorldLevelRspOuterClass {
         return afterWorldLevel_;
       }
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @param value The afterWorldLevel to set.
        * @return This builder for chaining.
        */
@@ -559,7 +526,7 @@ public final class AdjustWorldLevelRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 after_world_level = 15;</code>
+       * <code>uint32 after_world_level = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearAfterWorldLevel() {
@@ -599,6 +566,37 @@ public final class AdjustWorldLevelRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int cdOverTime_ ;
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @return The cdOverTime.
+       */
+      @java.lang.Override
+      public int getCdOverTime() {
+        return cdOverTime_;
+      }
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @param value The cdOverTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCdOverTime(int value) {
+        
+        cdOverTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cd_over_time = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCdOverTime() {
+        
+        cdOverTime_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +665,8 @@ public final class AdjustWorldLevelRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AdjustWorldLevelRsp.proto\"W\n\023AdjustWor" +
-      "ldLevelRsp\022\024\n\014cd_over_time\030\003 \001(\r\022\031\n\021afte" +
-      "r_world_level\030\017 \001(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031" +
+      "ldLevelRsp\022\031\n\021after_world_level\030\003 \001(\r\022\017\n" +
+      "\007retcode\030\006 \001(\005\022\024\n\014cd_over_time\030\010 \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +678,7 @@ public final class AdjustWorldLevelRspOuterClass {
     internal_static_AdjustWorldLevelRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AdjustWorldLevelRsp_descriptor,
-        new java.lang.String[] { "CdOverTime", "AfterWorldLevel", "Retcode", });
+        new java.lang.String[] { "AfterWorldLevel", "Retcode", "CdOverTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java
index c1ed7dbff..0091900e7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AiSkillCdInfoOuterClass.java
@@ -19,45 +19,11 @@ public final class AiSkillCdInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    int getSkillCdMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    boolean containsSkillCdMap(
-        int key);
-    /**
-     * Use {@link #getSkillCdMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillCdMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillCdMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    int getSkillCdMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    int getSkillCdMapOrThrow(
-        int key);
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     int getSkillGroupCdMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     boolean containsSkillGroupCdMap(
         int key);
@@ -68,29 +34,59 @@ public final class AiSkillCdInfoOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getSkillGroupCdMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getSkillGroupCdMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     int getSkillGroupCdMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     int getSkillGroupCdMapOrThrow(
         int key);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    int getSkillCdMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    boolean containsSkillCdMap(
+        int key);
+    /**
+     * Use {@link #getSkillCdMapMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillCdMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getSkillCdMapMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    int getSkillCdMapOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    int getSkillCdMapOrThrow(
+        int key);
   }
   /**
-   * <pre>
-   * Obf: AJLFKACFMII
-   * </pre>
-   *
    * Protobuf type {@code AiSkillCdInfo}
    */
   public static final class AiSkillCdInfo extends
@@ -136,24 +132,11 @@ public final class AiSkillCdInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                skillCdMap_ = com.google.protobuf.MapField.newMapField(
-                    SkillCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              skillCdMap__ = input.readMessage(
-                  SkillCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              skillCdMap_.getMutableMap().put(
-                  skillCdMap__.getKey(), skillCdMap__.getValue());
-              break;
-            }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 skillGroupCdMap_ = com.google.protobuf.MapField.newMapField(
                     SkillGroupCdMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               skillGroupCdMap__ = input.readMessage(
@@ -162,6 +145,19 @@ public final class AiSkillCdInfoOuterClass {
                   skillGroupCdMap__.getKey(), skillGroupCdMap__.getValue());
               break;
             }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                skillCdMap_ = com.google.protobuf.MapField.newMapField(
+                    SkillCdMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              skillCdMap__ = input.readMessage(
+                  SkillCdMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              skillCdMap_.getMutableMap().put(
+                  skillCdMap__.getKey(), skillCdMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -191,10 +187,10 @@ public final class AiSkillCdInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 6:
-          return internalGetSkillCdMap();
-        case 11:
+        case 12:
           return internalGetSkillGroupCdMap();
+        case 14:
+          return internalGetSkillCdMap();
         default:
           throw new RuntimeException(
               "Invalid map field number: " + number);
@@ -208,88 +204,7 @@ public final class AiSkillCdInfoOuterClass {
               emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.class, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.Builder.class);
     }
 
-    public static final int SKILL_CD_MAP_FIELD_NUMBER = 6;
-    private static final class SkillCdMapDefaultEntryHolder {
-      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.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_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> skillCdMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetSkillCdMap() {
-      if (skillCdMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            SkillCdMapDefaultEntryHolder.defaultEntry);
-      }
-      return skillCdMap_;
-    }
-
-    public int getSkillCdMapCount() {
-      return internalGetSkillCdMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsSkillCdMap(
-        int key) {
-      
-      return internalGetSkillCdMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getSkillCdMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
-      return getSkillCdMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
-      return internalGetSkillCdMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillCdMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillCdMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public int getSkillCdMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillCdMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 11;
+    public static final int SKILL_GROUP_CD_MAP_FIELD_NUMBER = 12;
     private static final class SkillGroupCdMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -316,7 +231,7 @@ public final class AiSkillCdInfoOuterClass {
       return internalGetSkillGroupCdMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
 
     @java.lang.Override
@@ -334,7 +249,7 @@ public final class AiSkillCdInfoOuterClass {
       return getSkillGroupCdMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -342,7 +257,7 @@ public final class AiSkillCdInfoOuterClass {
       return internalGetSkillGroupCdMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -355,7 +270,7 @@ public final class AiSkillCdInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
      */
     @java.lang.Override
 
@@ -370,6 +285,87 @@ public final class AiSkillCdInfoOuterClass {
       return map.get(key);
     }
 
+    public static final int SKILL_CD_MAP_FIELD_NUMBER = 14;
+    private static final class SkillCdMapDefaultEntryHolder {
+      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.AiSkillCdInfoOuterClass.internal_static_AiSkillCdInfo_SkillCdMapEntry_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> skillCdMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetSkillCdMap() {
+      if (skillCdMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            SkillCdMapDefaultEntryHolder.defaultEntry);
+      }
+      return skillCdMap_;
+    }
+
+    public int getSkillCdMapCount() {
+      return internalGetSkillCdMap().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsSkillCdMap(
+        int key) {
+      
+      return internalGetSkillCdMap().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getSkillCdMapMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
+      return getSkillCdMapMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
+      return internalGetSkillCdMap().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillCdMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillCdMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+     */
+    @java.lang.Override
+
+    public int getSkillCdMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetSkillCdMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -387,15 +383,15 @@ public final class AiSkillCdInfoOuterClass {
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
-          internalGetSkillCdMap(),
-          SkillCdMapDefaultEntryHolder.defaultEntry,
-          6);
+          internalGetSkillGroupCdMap(),
+          SkillGroupCdMapDefaultEntryHolder.defaultEntry,
+          12);
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
-          internalGetSkillGroupCdMap(),
-          SkillGroupCdMapDefaultEntryHolder.defaultEntry,
-          11);
+          internalGetSkillCdMap(),
+          SkillCdMapDefaultEntryHolder.defaultEntry,
+          14);
       unknownFields.writeTo(output);
     }
 
@@ -405,16 +401,6 @@ public final class AiSkillCdInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetSkillCdMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        skillCdMap__ = SkillCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(6, skillCdMap__);
-      }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetSkillGroupCdMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
@@ -423,7 +409,17 @@ public final class AiSkillCdInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(11, skillGroupCdMap__);
+            .computeMessageSize(12, skillGroupCdMap__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetSkillCdMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        skillCdMap__ = SkillCdMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(14, skillCdMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -440,10 +436,10 @@ public final class AiSkillCdInfoOuterClass {
       }
       emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other = (emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo) obj;
 
-      if (!internalGetSkillCdMap().equals(
-          other.internalGetSkillCdMap())) return false;
       if (!internalGetSkillGroupCdMap().equals(
           other.internalGetSkillGroupCdMap())) return false;
+      if (!internalGetSkillCdMap().equals(
+          other.internalGetSkillCdMap())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -455,14 +451,14 @@ public final class AiSkillCdInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (!internalGetSkillCdMap().getMap().isEmpty()) {
-        hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetSkillCdMap().hashCode();
-      }
       if (!internalGetSkillGroupCdMap().getMap().isEmpty()) {
         hash = (37 * hash) + SKILL_GROUP_CD_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetSkillGroupCdMap().hashCode();
       }
+      if (!internalGetSkillCdMap().getMap().isEmpty()) {
+        hash = (37 * hash) + SKILL_CD_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetSkillCdMap().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -559,10 +555,6 @@ public final class AiSkillCdInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AJLFKACFMII
-     * </pre>
-     *
      * Protobuf type {@code AiSkillCdInfo}
      */
     public static final class Builder extends
@@ -578,10 +570,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 6:
-            return internalGetSkillCdMap();
-          case 11:
+          case 12:
             return internalGetSkillGroupCdMap();
+          case 14:
+            return internalGetSkillCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -591,10 +583,10 @@ public final class AiSkillCdInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 6:
-            return internalGetMutableSkillCdMap();
-          case 11:
+          case 12:
             return internalGetMutableSkillGroupCdMap();
+          case 14:
+            return internalGetMutableSkillCdMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -626,8 +618,8 @@ public final class AiSkillCdInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableSkillCdMap().clear();
         internalGetMutableSkillGroupCdMap().clear();
+        internalGetMutableSkillCdMap().clear();
         return this;
       }
 
@@ -655,10 +647,10 @@ public final class AiSkillCdInfoOuterClass {
       public emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo buildPartial() {
         emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo result = new emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo(this);
         int from_bitField0_ = bitField0_;
-        result.skillCdMap_ = internalGetSkillCdMap();
-        result.skillCdMap_.makeImmutable();
         result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
         result.skillGroupCdMap_.makeImmutable();
+        result.skillCdMap_ = internalGetSkillCdMap();
+        result.skillCdMap_.makeImmutable();
         onBuilt();
         return result;
       }
@@ -707,10 +699,10 @@ public final class AiSkillCdInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo other) {
         if (other == emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo.getDefaultInstance()) return this;
-        internalGetMutableSkillCdMap().mergeFrom(
-            other.internalGetSkillCdMap());
         internalGetMutableSkillGroupCdMap().mergeFrom(
             other.internalGetSkillGroupCdMap());
+        internalGetMutableSkillCdMap().mergeFrom(
+            other.internalGetSkillCdMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -741,134 +733,6 @@ public final class AiSkillCdInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> skillCdMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetSkillCdMap() {
-        if (skillCdMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              SkillCdMapDefaultEntryHolder.defaultEntry);
-        }
-        return skillCdMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableSkillCdMap() {
-        onChanged();;
-        if (skillCdMap_ == null) {
-          skillCdMap_ = com.google.protobuf.MapField.newMapField(
-              SkillCdMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!skillCdMap_.isMutable()) {
-          skillCdMap_ = skillCdMap_.copy();
-        }
-        return skillCdMap_;
-      }
-
-      public int getSkillCdMapCount() {
-        return internalGetSkillCdMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsSkillCdMap(
-          int key) {
-        
-        return internalGetSkillCdMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getSkillCdMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
-        return getSkillCdMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
-        return internalGetSkillCdMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillCdMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillCdMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public int getSkillCdMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillCdMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearSkillCdMap() {
-        internalGetMutableSkillCdMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      public Builder removeSkillCdMap(
-          int key) {
-        
-        internalGetMutableSkillCdMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableSkillCdMap() {
-        return internalGetMutableSkillCdMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-      public Builder putSkillCdMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableSkillCdMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 6;</code>
-       */
-
-      public Builder putAllSkillCdMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableSkillCdMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> skillGroupCdMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -896,7 +760,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetSkillGroupCdMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       @java.lang.Override
@@ -914,7 +778,7 @@ public final class AiSkillCdInfoOuterClass {
         return getSkillGroupCdMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -922,7 +786,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetSkillGroupCdMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -935,7 +799,7 @@ public final class AiSkillCdInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       @java.lang.Override
 
@@ -956,7 +820,7 @@ public final class AiSkillCdInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       public Builder removeSkillGroupCdMap(
@@ -975,7 +839,7 @@ public final class AiSkillCdInfoOuterClass {
         return internalGetMutableSkillGroupCdMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
       public Builder putSkillGroupCdMap(
           int key,
@@ -987,7 +851,7 @@ public final class AiSkillCdInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 11;</code>
+       * <code>map&lt;uint32, uint32&gt; skill_group_cd_map = 12;</code>
        */
 
       public Builder putAllSkillGroupCdMap(
@@ -996,6 +860,134 @@ public final class AiSkillCdInfoOuterClass {
             .putAll(values);
         return this;
       }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> skillCdMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetSkillCdMap() {
+        if (skillCdMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              SkillCdMapDefaultEntryHolder.defaultEntry);
+        }
+        return skillCdMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableSkillCdMap() {
+        onChanged();;
+        if (skillCdMap_ == null) {
+          skillCdMap_ = com.google.protobuf.MapField.newMapField(
+              SkillCdMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!skillCdMap_.isMutable()) {
+          skillCdMap_ = skillCdMap_.copy();
+        }
+        return skillCdMap_;
+      }
+
+      public int getSkillCdMapCount() {
+        return internalGetSkillCdMap().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsSkillCdMap(
+          int key) {
+        
+        return internalGetSkillCdMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getSkillCdMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMap() {
+        return getSkillCdMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillCdMapMap() {
+        return internalGetSkillCdMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillCdMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillCdMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillCdMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillCdMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearSkillCdMap() {
+        internalGetMutableSkillCdMap().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      public Builder removeSkillCdMap(
+          int key) {
+        
+        internalGetMutableSkillCdMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableSkillCdMap() {
+        return internalGetMutableSkillCdMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+      public Builder putSkillCdMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableSkillCdMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_cd_map = 14;</code>
+       */
+
+      public Builder putAllSkillCdMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableSkillCdMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1054,16 +1046,16 @@ public final class AiSkillCdInfoOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1074,11 +1066,11 @@ public final class AiSkillCdInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023AiSkillCdInfo.proto\"\361\001\n\rAiSkillCdInfo\022" +
-      "4\n\014skill_cd_map\030\006 \003(\0132\036.AiSkillCdInfo.Sk" +
-      "illCdMapEntry\022?\n\022skill_group_cd_map\030\013 \003(" +
-      "\0132#.AiSkillCdInfo.SkillGroupCdMapEntry\0321" +
-      "\n\017SkillCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
-      "\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013\n\003key" +
+      "?\n\022skill_group_cd_map\030\014 \003(\0132#.AiSkillCdI" +
+      "nfo.SkillGroupCdMapEntry\0224\n\014skill_cd_map" +
+      "\030\016 \003(\0132\036.AiSkillCdInfo.SkillCdMapEntry\0326" +
+      "\n\024SkillGroupCdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
+      "alue\030\002 \001(\r:\0028\001\0321\n\017SkillCdMapEntry\022\013\n\003key" +
       "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
@@ -1091,19 +1083,19 @@ public final class AiSkillCdInfoOuterClass {
     internal_static_AiSkillCdInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_descriptor,
-        new java.lang.String[] { "SkillCdMap", "SkillGroupCdMap", });
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
-    internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "SkillGroupCdMap", "SkillCdMap", });
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor =
-      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(0);
     internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AiSkillCdInfo_SkillGroupCdMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor =
+      internal_static_AiSkillCdInfo_descriptor.getNestedTypes().get(1);
+    internal_static_AiSkillCdInfo_SkillCdMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AiSkillCdInfo_SkillCdMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AllMarkPointNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AllMarkPointNotifyOuterClass.java
index 3c8942f20..548edb641 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AllMarkPointNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AllMarkPointNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class AllMarkPointNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> 
         getMarkListList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index);
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     int getMarkListCount();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
         getMarkListOrBuilderList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 2766
-   * Obf: KCCLLAGEBMD
-   * </pre>
-   *
    * Protobuf type {@code AllMarkPointNotify}
    */
   public static final class AllMarkPointNotify extends
@@ -94,7 +89,7 @@ public final class AllMarkPointNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class AllMarkPointNotifyOuterClass {
               emu.grasscutter.net.proto.AllMarkPointNotifyOuterClass.AllMarkPointNotify.class, emu.grasscutter.net.proto.AllMarkPointNotifyOuterClass.AllMarkPointNotify.Builder.class);
     }
 
-    public static final int MARK_LIST_FIELD_NUMBER = 4;
+    public static final int MARK_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_;
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
@@ -156,21 +151,21 @@ public final class AllMarkPointNotifyOuterClass {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public int getMarkListCount() {
       return markList_.size();
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
       return markList_.get(index);
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 4;</code>
+     * <code>repeated .MapMarkPoint mark_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
@@ -193,7 +188,7 @@ public final class AllMarkPointNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < markList_.size(); i++) {
-        output.writeMessage(4, markList_.get(i));
+        output.writeMessage(3, markList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class AllMarkPointNotifyOuterClass {
       size = 0;
       for (int i = 0; i < markList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, markList_.get(i));
+          .computeMessageSize(3, markList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class AllMarkPointNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2766
-     * Obf: KCCLLAGEBMD
-     * </pre>
-     *
      * Protobuf type {@code AllMarkPointNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class AllMarkPointNotifyOuterClass {
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markListBuilder_;
 
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
         if (markListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public int getMarkListCount() {
         if (markListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -585,7 +575,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -632,7 +622,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder addAllMarkList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> values) {
@@ -675,7 +665,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder clearMarkList() {
         if (markListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public Builder removeMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class AllMarkPointNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkListBuilder(
           int index) {
         return getMarkListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
            getMarkListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class AllMarkPointNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder() {
         return getMarkListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class AllMarkPointNotifyOuterClass {
             index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 4;</code>
+       * <code>repeated .MapMarkPoint mark_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder> 
            getMarkListBuilderList() {
@@ -833,7 +823,7 @@ public final class AllMarkPointNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030AllMarkPointNotify.proto\032\022MapMarkPoint" +
       ".proto\"6\n\022AllMarkPointNotify\022 \n\tmark_lis" +
-      "t\030\004 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutte" +
+      "t\030\003 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java
index 97483b5b2..20624ddfa 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoOuterClass.java
@@ -61,7 +61,7 @@ public final class AnimatorParameterValueInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: IGGDJDFNMAG
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code AnimatorParameterValueInfo}
@@ -497,7 +497,7 @@ public final class AnimatorParameterValueInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: IGGDJDFNMAG
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code AnimatorParameterValueInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java
index cd047709e..7f0a93806 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AnimatorParameterValueInfoPairOuterClass.java
@@ -40,10 +40,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
     emu.grasscutter.net.proto.AnimatorParameterValueInfoOuterClass.AnimatorParameterValueInfoOrBuilder getAnimatorParaOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: CABIAHBAEHD
-   * </pre>
-   *
    * Protobuf type {@code AnimatorParameterValueInfoPair}
    */
   public static final class AnimatorParameterValueInfoPair extends
@@ -347,10 +343,6 @@ public final class AnimatorParameterValueInfoPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CABIAHBAEHD
-     * </pre>
-     *
      * Protobuf type {@code AnimatorParameterValueInfoPair}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AnnounceDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AnnounceDataOuterClass.java
index 1e2ef7b2b..d94962b19 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AnnounceDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AnnounceDataOuterClass.java
@@ -19,82 +19,78 @@ public final class AnnounceDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string count_down_text = 3;</code>
-     * @return The countDownText.
-     */
-    java.lang.String getCountDownText();
-    /**
-     * <code>string count_down_text = 3;</code>
-     * @return The bytes for countDownText.
-     */
-    com.google.protobuf.ByteString
-        getCountDownTextBytes();
-
-    /**
-     * <code>bool is_center_system_last_5_every_minutes = 7;</code>
-     * @return The isCenterSystemLast5EveryMinutes.
-     */
-    boolean getIsCenterSystemLast5EveryMinutes();
-
-    /**
-     * <code>uint32 count_down_frequency = 2;</code>
-     * @return The countDownFrequency.
-     */
-    int getCountDownFrequency();
-
-    /**
-     * <code>uint32 center_system_frequency = 14;</code>
-     * @return The centerSystemFrequency.
-     */
-    int getCenterSystemFrequency();
-
-    /**
-     * <code>uint32 end_time = 5;</code>
+     * <code>uint32 end_time = 1;</code>
      * @return The endTime.
      */
     int getEndTime();
 
     /**
-     * <code>string dungeon_confirm_text = 11;</code>
+     * <code>uint32 count_down_frequency = 3;</code>
+     * @return The countDownFrequency.
+     */
+    int getCountDownFrequency();
+
+    /**
+     * <code>string dungeon_confirm_text = 6;</code>
      * @return The dungeonConfirmText.
      */
     java.lang.String getDungeonConfirmText();
     /**
-     * <code>string dungeon_confirm_text = 11;</code>
+     * <code>string dungeon_confirm_text = 6;</code>
      * @return The bytes for dungeonConfirmText.
      */
     com.google.protobuf.ByteString
         getDungeonConfirmTextBytes();
 
     /**
-     * <code>uint32 config_id = 12;</code>
-     * @return The configId.
+     * <code>string count_down_text = 7;</code>
+     * @return The countDownText.
      */
-    int getConfigId();
+    java.lang.String getCountDownText();
+    /**
+     * <code>string count_down_text = 7;</code>
+     * @return The bytes for countDownText.
+     */
+    com.google.protobuf.ByteString
+        getCountDownTextBytes();
 
     /**
-     * <code>string center_system_text = 1;</code>
+     * <code>uint32 center_system_frequency = 8;</code>
+     * @return The centerSystemFrequency.
+     */
+    int getCenterSystemFrequency();
+
+    /**
+     * <code>bool is_center_system_last5_every_minutes = 10;</code>
+     * @return The isCenterSystemLast5EveryMinutes.
+     */
+    boolean getIsCenterSystemLast5EveryMinutes();
+
+    /**
+     * <code>string center_system_text = 12;</code>
      * @return The centerSystemText.
      */
     java.lang.String getCenterSystemText();
     /**
-     * <code>string center_system_text = 1;</code>
+     * <code>string center_system_text = 12;</code>
      * @return The bytes for centerSystemText.
      */
     com.google.protobuf.ByteString
         getCenterSystemTextBytes();
 
     /**
-     * <code>uint32 begin_time = 10;</code>
+     * <code>uint32 begin_time = 13;</code>
      * @return The beginTime.
      */
     int getBeginTime();
+
+    /**
+     * <code>uint32 config_id = 14;</code>
+     * @return The configId.
+     */
+    int getConfigId();
   }
   /**
-   * <pre>
-   * Obf: LIBOAIMMBLM
-   * </pre>
-   *
    * Protobuf type {@code AnnounceData}
    */
   public static final class AnnounceData extends
@@ -107,8 +103,8 @@ public final class AnnounceDataOuterClass {
       super(builder);
     }
     private AnnounceData() {
-      countDownText_ = "";
       dungeonConfirmText_ = "";
+      countDownText_ = "";
       centerSystemText_ = "";
     }
 
@@ -142,52 +138,52 @@ public final class AnnounceDataOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              centerSystemText_ = s;
-              break;
-            }
-            case 16: {
-
-              countDownFrequency_ = input.readUInt32();
-              break;
-            }
-            case 26: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              countDownText_ = s;
-              break;
-            }
-            case 40: {
+            case 8: {
 
               endTime_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 24: {
 
-              isCenterSystemLast5EveryMinutes_ = input.readBool();
+              countDownFrequency_ = input.readUInt32();
               break;
             }
-            case 80: {
-
-              beginTime_ = input.readUInt32();
-              break;
-            }
-            case 90: {
+            case 50: {
               java.lang.String s = input.readStringRequireUtf8();
 
               dungeonConfirmText_ = s;
               break;
             }
-            case 96: {
+            case 58: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              configId_ = input.readUInt32();
+              countDownText_ = s;
+              break;
+            }
+            case 64: {
+
+              centerSystemFrequency_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              isCenterSystemLast5EveryMinutes_ = input.readBool();
+              break;
+            }
+            case 98: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              centerSystemText_ = s;
+              break;
+            }
+            case 104: {
+
+              beginTime_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              centerSystemFrequency_ = input.readUInt32();
+              configId_ = input.readUInt32();
               break;
             }
             default: {
@@ -222,81 +218,10 @@ public final class AnnounceDataOuterClass {
               emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.class, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder.class);
     }
 
-    public static final int COUNT_DOWN_TEXT_FIELD_NUMBER = 3;
-    private volatile java.lang.Object countDownText_;
-    /**
-     * <code>string count_down_text = 3;</code>
-     * @return The countDownText.
-     */
-    @java.lang.Override
-    public java.lang.String getCountDownText() {
-      java.lang.Object ref = countDownText_;
-      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();
-        countDownText_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string count_down_text = 3;</code>
-     * @return The bytes for countDownText.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getCountDownTextBytes() {
-      java.lang.Object ref = countDownText_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        countDownText_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int IS_CENTER_SYSTEM_LAST_5_EVERY_MINUTES_FIELD_NUMBER = 7;
-    private boolean isCenterSystemLast5EveryMinutes_;
-    /**
-     * <code>bool is_center_system_last_5_every_minutes = 7;</code>
-     * @return The isCenterSystemLast5EveryMinutes.
-     */
-    @java.lang.Override
-    public boolean getIsCenterSystemLast5EveryMinutes() {
-      return isCenterSystemLast5EveryMinutes_;
-    }
-
-    public static final int COUNT_DOWN_FREQUENCY_FIELD_NUMBER = 2;
-    private int countDownFrequency_;
-    /**
-     * <code>uint32 count_down_frequency = 2;</code>
-     * @return The countDownFrequency.
-     */
-    @java.lang.Override
-    public int getCountDownFrequency() {
-      return countDownFrequency_;
-    }
-
-    public static final int CENTER_SYSTEM_FREQUENCY_FIELD_NUMBER = 14;
-    private int centerSystemFrequency_;
-    /**
-     * <code>uint32 center_system_frequency = 14;</code>
-     * @return The centerSystemFrequency.
-     */
-    @java.lang.Override
-    public int getCenterSystemFrequency() {
-      return centerSystemFrequency_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 5;
+    public static final int END_TIME_FIELD_NUMBER = 1;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 5;</code>
+     * <code>uint32 end_time = 1;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -304,10 +229,21 @@ public final class AnnounceDataOuterClass {
       return endTime_;
     }
 
-    public static final int DUNGEON_CONFIRM_TEXT_FIELD_NUMBER = 11;
+    public static final int COUNT_DOWN_FREQUENCY_FIELD_NUMBER = 3;
+    private int countDownFrequency_;
+    /**
+     * <code>uint32 count_down_frequency = 3;</code>
+     * @return The countDownFrequency.
+     */
+    @java.lang.Override
+    public int getCountDownFrequency() {
+      return countDownFrequency_;
+    }
+
+    public static final int DUNGEON_CONFIRM_TEXT_FIELD_NUMBER = 6;
     private volatile java.lang.Object dungeonConfirmText_;
     /**
-     * <code>string dungeon_confirm_text = 11;</code>
+     * <code>string dungeon_confirm_text = 6;</code>
      * @return The dungeonConfirmText.
      */
     @java.lang.Override
@@ -324,7 +260,7 @@ public final class AnnounceDataOuterClass {
       }
     }
     /**
-     * <code>string dungeon_confirm_text = 11;</code>
+     * <code>string dungeon_confirm_text = 6;</code>
      * @return The bytes for dungeonConfirmText.
      */
     @java.lang.Override
@@ -342,21 +278,70 @@ public final class AnnounceDataOuterClass {
       }
     }
 
-    public static final int CONFIG_ID_FIELD_NUMBER = 12;
-    private int configId_;
+    public static final int COUNT_DOWN_TEXT_FIELD_NUMBER = 7;
+    private volatile java.lang.Object countDownText_;
     /**
-     * <code>uint32 config_id = 12;</code>
-     * @return The configId.
+     * <code>string count_down_text = 7;</code>
+     * @return The countDownText.
      */
     @java.lang.Override
-    public int getConfigId() {
-      return configId_;
+    public java.lang.String getCountDownText() {
+      java.lang.Object ref = countDownText_;
+      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();
+        countDownText_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string count_down_text = 7;</code>
+     * @return The bytes for countDownText.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getCountDownTextBytes() {
+      java.lang.Object ref = countDownText_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        countDownText_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int CENTER_SYSTEM_TEXT_FIELD_NUMBER = 1;
+    public static final int CENTER_SYSTEM_FREQUENCY_FIELD_NUMBER = 8;
+    private int centerSystemFrequency_;
+    /**
+     * <code>uint32 center_system_frequency = 8;</code>
+     * @return The centerSystemFrequency.
+     */
+    @java.lang.Override
+    public int getCenterSystemFrequency() {
+      return centerSystemFrequency_;
+    }
+
+    public static final int IS_CENTER_SYSTEM_LAST5_EVERY_MINUTES_FIELD_NUMBER = 10;
+    private boolean isCenterSystemLast5EveryMinutes_;
+    /**
+     * <code>bool is_center_system_last5_every_minutes = 10;</code>
+     * @return The isCenterSystemLast5EveryMinutes.
+     */
+    @java.lang.Override
+    public boolean getIsCenterSystemLast5EveryMinutes() {
+      return isCenterSystemLast5EveryMinutes_;
+    }
+
+    public static final int CENTER_SYSTEM_TEXT_FIELD_NUMBER = 12;
     private volatile java.lang.Object centerSystemText_;
     /**
-     * <code>string center_system_text = 1;</code>
+     * <code>string center_system_text = 12;</code>
      * @return The centerSystemText.
      */
     @java.lang.Override
@@ -373,7 +358,7 @@ public final class AnnounceDataOuterClass {
       }
     }
     /**
-     * <code>string center_system_text = 1;</code>
+     * <code>string center_system_text = 12;</code>
      * @return The bytes for centerSystemText.
      */
     @java.lang.Override
@@ -391,10 +376,10 @@ public final class AnnounceDataOuterClass {
       }
     }
 
-    public static final int BEGIN_TIME_FIELD_NUMBER = 10;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 13;
     private int beginTime_;
     /**
-     * <code>uint32 begin_time = 10;</code>
+     * <code>uint32 begin_time = 13;</code>
      * @return The beginTime.
      */
     @java.lang.Override
@@ -402,6 +387,17 @@ public final class AnnounceDataOuterClass {
       return beginTime_;
     }
 
+    public static final int CONFIG_ID_FIELD_NUMBER = 14;
+    private int configId_;
+    /**
+     * <code>uint32 config_id = 14;</code>
+     * @return The configId.
+     */
+    @java.lang.Override
+    public int getConfigId() {
+      return configId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -416,32 +412,32 @@ public final class AnnounceDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(centerSystemText_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, centerSystemText_);
+      if (endTime_ != 0) {
+        output.writeUInt32(1, endTime_);
       }
       if (countDownFrequency_ != 0) {
-        output.writeUInt32(2, countDownFrequency_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countDownText_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, countDownText_);
-      }
-      if (endTime_ != 0) {
-        output.writeUInt32(5, endTime_);
-      }
-      if (isCenterSystemLast5EveryMinutes_ != false) {
-        output.writeBool(7, isCenterSystemLast5EveryMinutes_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(10, beginTime_);
+        output.writeUInt32(3, countDownFrequency_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dungeonConfirmText_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, dungeonConfirmText_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, dungeonConfirmText_);
       }
-      if (configId_ != 0) {
-        output.writeUInt32(12, configId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countDownText_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, countDownText_);
       }
       if (centerSystemFrequency_ != 0) {
-        output.writeUInt32(14, centerSystemFrequency_);
+        output.writeUInt32(8, centerSystemFrequency_);
+      }
+      if (isCenterSystemLast5EveryMinutes_ != false) {
+        output.writeBool(10, isCenterSystemLast5EveryMinutes_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(centerSystemText_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, centerSystemText_);
+      }
+      if (beginTime_ != 0) {
+        output.writeUInt32(13, beginTime_);
+      }
+      if (configId_ != 0) {
+        output.writeUInt32(14, configId_);
       }
       unknownFields.writeTo(output);
     }
@@ -452,38 +448,38 @@ public final class AnnounceDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(centerSystemText_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, centerSystemText_);
+      if (endTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, endTime_);
       }
       if (countDownFrequency_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, countDownFrequency_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countDownText_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, countDownText_);
-      }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, endTime_);
-      }
-      if (isCenterSystemLast5EveryMinutes_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isCenterSystemLast5EveryMinutes_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, beginTime_);
+          .computeUInt32Size(3, countDownFrequency_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dungeonConfirmText_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, dungeonConfirmText_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, dungeonConfirmText_);
       }
-      if (configId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, configId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countDownText_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, countDownText_);
       }
       if (centerSystemFrequency_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, centerSystemFrequency_);
+          .computeUInt32Size(8, centerSystemFrequency_);
+      }
+      if (isCenterSystemLast5EveryMinutes_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isCenterSystemLast5EveryMinutes_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(centerSystemText_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, centerSystemText_);
+      }
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, beginTime_);
+      }
+      if (configId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, configId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -500,24 +496,24 @@ public final class AnnounceDataOuterClass {
       }
       emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData other = (emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData) obj;
 
-      if (!getCountDownText()
-          .equals(other.getCountDownText())) return false;
-      if (getIsCenterSystemLast5EveryMinutes()
-          != other.getIsCenterSystemLast5EveryMinutes()) return false;
-      if (getCountDownFrequency()
-          != other.getCountDownFrequency()) return false;
-      if (getCenterSystemFrequency()
-          != other.getCenterSystemFrequency()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
+      if (getCountDownFrequency()
+          != other.getCountDownFrequency()) return false;
       if (!getDungeonConfirmText()
           .equals(other.getDungeonConfirmText())) return false;
-      if (getConfigId()
-          != other.getConfigId()) return false;
+      if (!getCountDownText()
+          .equals(other.getCountDownText())) return false;
+      if (getCenterSystemFrequency()
+          != other.getCenterSystemFrequency()) return false;
+      if (getIsCenterSystemLast5EveryMinutes()
+          != other.getIsCenterSystemLast5EveryMinutes()) return false;
       if (!getCenterSystemText()
           .equals(other.getCenterSystemText())) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
+      if (getConfigId()
+          != other.getConfigId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -529,25 +525,25 @@ public final class AnnounceDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + COUNT_DOWN_TEXT_FIELD_NUMBER;
-      hash = (53 * hash) + getCountDownText().hashCode();
-      hash = (37 * hash) + IS_CENTER_SYSTEM_LAST_5_EVERY_MINUTES_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsCenterSystemLast5EveryMinutes());
-      hash = (37 * hash) + COUNT_DOWN_FREQUENCY_FIELD_NUMBER;
-      hash = (53 * hash) + getCountDownFrequency();
-      hash = (37 * hash) + CENTER_SYSTEM_FREQUENCY_FIELD_NUMBER;
-      hash = (53 * hash) + getCenterSystemFrequency();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + COUNT_DOWN_FREQUENCY_FIELD_NUMBER;
+      hash = (53 * hash) + getCountDownFrequency();
       hash = (37 * hash) + DUNGEON_CONFIRM_TEXT_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonConfirmText().hashCode();
-      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getConfigId();
+      hash = (37 * hash) + COUNT_DOWN_TEXT_FIELD_NUMBER;
+      hash = (53 * hash) + getCountDownText().hashCode();
+      hash = (37 * hash) + CENTER_SYSTEM_FREQUENCY_FIELD_NUMBER;
+      hash = (53 * hash) + getCenterSystemFrequency();
+      hash = (37 * hash) + IS_CENTER_SYSTEM_LAST5_EVERY_MINUTES_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsCenterSystemLast5EveryMinutes());
       hash = (37 * hash) + CENTER_SYSTEM_TEXT_FIELD_NUMBER;
       hash = (53 * hash) + getCenterSystemText().hashCode();
       hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -644,10 +640,6 @@ public final class AnnounceDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LIBOAIMMBLM
-     * </pre>
-     *
      * Protobuf type {@code AnnounceData}
      */
     public static final class Builder extends
@@ -685,24 +677,24 @@ public final class AnnounceDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        countDownText_ = "";
-
-        isCenterSystemLast5EveryMinutes_ = false;
+        endTime_ = 0;
 
         countDownFrequency_ = 0;
 
-        centerSystemFrequency_ = 0;
-
-        endTime_ = 0;
-
         dungeonConfirmText_ = "";
 
-        configId_ = 0;
+        countDownText_ = "";
+
+        centerSystemFrequency_ = 0;
+
+        isCenterSystemLast5EveryMinutes_ = false;
 
         centerSystemText_ = "";
 
         beginTime_ = 0;
 
+        configId_ = 0;
+
         return this;
       }
 
@@ -729,15 +721,15 @@ public final class AnnounceDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData buildPartial() {
         emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData result = new emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData(this);
-        result.countDownText_ = countDownText_;
-        result.isCenterSystemLast5EveryMinutes_ = isCenterSystemLast5EveryMinutes_;
-        result.countDownFrequency_ = countDownFrequency_;
-        result.centerSystemFrequency_ = centerSystemFrequency_;
         result.endTime_ = endTime_;
+        result.countDownFrequency_ = countDownFrequency_;
         result.dungeonConfirmText_ = dungeonConfirmText_;
-        result.configId_ = configId_;
+        result.countDownText_ = countDownText_;
+        result.centerSystemFrequency_ = centerSystemFrequency_;
+        result.isCenterSystemLast5EveryMinutes_ = isCenterSystemLast5EveryMinutes_;
         result.centerSystemText_ = centerSystemText_;
         result.beginTime_ = beginTime_;
+        result.configId_ = configId_;
         onBuilt();
         return result;
       }
@@ -786,28 +778,25 @@ public final class AnnounceDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData other) {
         if (other == emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.getDefaultInstance()) return this;
-        if (!other.getCountDownText().isEmpty()) {
-          countDownText_ = other.countDownText_;
-          onChanged();
-        }
-        if (other.getIsCenterSystemLast5EveryMinutes() != false) {
-          setIsCenterSystemLast5EveryMinutes(other.getIsCenterSystemLast5EveryMinutes());
+        if (other.getEndTime() != 0) {
+          setEndTime(other.getEndTime());
         }
         if (other.getCountDownFrequency() != 0) {
           setCountDownFrequency(other.getCountDownFrequency());
         }
-        if (other.getCenterSystemFrequency() != 0) {
-          setCenterSystemFrequency(other.getCenterSystemFrequency());
-        }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
         if (!other.getDungeonConfirmText().isEmpty()) {
           dungeonConfirmText_ = other.dungeonConfirmText_;
           onChanged();
         }
-        if (other.getConfigId() != 0) {
-          setConfigId(other.getConfigId());
+        if (!other.getCountDownText().isEmpty()) {
+          countDownText_ = other.countDownText_;
+          onChanged();
+        }
+        if (other.getCenterSystemFrequency() != 0) {
+          setCenterSystemFrequency(other.getCenterSystemFrequency());
+        }
+        if (other.getIsCenterSystemLast5EveryMinutes() != false) {
+          setIsCenterSystemLast5EveryMinutes(other.getIsCenterSystemLast5EveryMinutes());
         }
         if (!other.getCenterSystemText().isEmpty()) {
           centerSystemText_ = other.centerSystemText_;
@@ -816,6 +805,9 @@ public final class AnnounceDataOuterClass {
         if (other.getBeginTime() != 0) {
           setBeginTime(other.getBeginTime());
         }
+        if (other.getConfigId() != 0) {
+          setConfigId(other.getConfigId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -845,178 +837,9 @@ public final class AnnounceDataOuterClass {
         return this;
       }
 
-      private java.lang.Object countDownText_ = "";
-      /**
-       * <code>string count_down_text = 3;</code>
-       * @return The countDownText.
-       */
-      public java.lang.String getCountDownText() {
-        java.lang.Object ref = countDownText_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          countDownText_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string count_down_text = 3;</code>
-       * @return The bytes for countDownText.
-       */
-      public com.google.protobuf.ByteString
-          getCountDownTextBytes() {
-        java.lang.Object ref = countDownText_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          countDownText_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string count_down_text = 3;</code>
-       * @param value The countDownText to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountDownText(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        countDownText_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string count_down_text = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCountDownText() {
-        
-        countDownText_ = getDefaultInstance().getCountDownText();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string count_down_text = 3;</code>
-       * @param value The bytes for countDownText to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountDownTextBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        countDownText_ = value;
-        onChanged();
-        return this;
-      }
-
-      private boolean isCenterSystemLast5EveryMinutes_ ;
-      /**
-       * <code>bool is_center_system_last_5_every_minutes = 7;</code>
-       * @return The isCenterSystemLast5EveryMinutes.
-       */
-      @java.lang.Override
-      public boolean getIsCenterSystemLast5EveryMinutes() {
-        return isCenterSystemLast5EveryMinutes_;
-      }
-      /**
-       * <code>bool is_center_system_last_5_every_minutes = 7;</code>
-       * @param value The isCenterSystemLast5EveryMinutes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsCenterSystemLast5EveryMinutes(boolean value) {
-        
-        isCenterSystemLast5EveryMinutes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_center_system_last_5_every_minutes = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsCenterSystemLast5EveryMinutes() {
-        
-        isCenterSystemLast5EveryMinutes_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int countDownFrequency_ ;
-      /**
-       * <code>uint32 count_down_frequency = 2;</code>
-       * @return The countDownFrequency.
-       */
-      @java.lang.Override
-      public int getCountDownFrequency() {
-        return countDownFrequency_;
-      }
-      /**
-       * <code>uint32 count_down_frequency = 2;</code>
-       * @param value The countDownFrequency to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountDownFrequency(int value) {
-        
-        countDownFrequency_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 count_down_frequency = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCountDownFrequency() {
-        
-        countDownFrequency_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int centerSystemFrequency_ ;
-      /**
-       * <code>uint32 center_system_frequency = 14;</code>
-       * @return The centerSystemFrequency.
-       */
-      @java.lang.Override
-      public int getCenterSystemFrequency() {
-        return centerSystemFrequency_;
-      }
-      /**
-       * <code>uint32 center_system_frequency = 14;</code>
-       * @param value The centerSystemFrequency to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCenterSystemFrequency(int value) {
-        
-        centerSystemFrequency_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 center_system_frequency = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCenterSystemFrequency() {
-        
-        centerSystemFrequency_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 5;</code>
+       * <code>uint32 end_time = 1;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -1024,7 +847,7 @@ public final class AnnounceDataOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 5;</code>
+       * <code>uint32 end_time = 1;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -1035,7 +858,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 5;</code>
+       * <code>uint32 end_time = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -1045,9 +868,40 @@ public final class AnnounceDataOuterClass {
         return this;
       }
 
+      private int countDownFrequency_ ;
+      /**
+       * <code>uint32 count_down_frequency = 3;</code>
+       * @return The countDownFrequency.
+       */
+      @java.lang.Override
+      public int getCountDownFrequency() {
+        return countDownFrequency_;
+      }
+      /**
+       * <code>uint32 count_down_frequency = 3;</code>
+       * @param value The countDownFrequency to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountDownFrequency(int value) {
+        
+        countDownFrequency_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 count_down_frequency = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCountDownFrequency() {
+        
+        countDownFrequency_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object dungeonConfirmText_ = "";
       /**
-       * <code>string dungeon_confirm_text = 11;</code>
+       * <code>string dungeon_confirm_text = 6;</code>
        * @return The dungeonConfirmText.
        */
       public java.lang.String getDungeonConfirmText() {
@@ -1063,7 +917,7 @@ public final class AnnounceDataOuterClass {
         }
       }
       /**
-       * <code>string dungeon_confirm_text = 11;</code>
+       * <code>string dungeon_confirm_text = 6;</code>
        * @return The bytes for dungeonConfirmText.
        */
       public com.google.protobuf.ByteString
@@ -1080,7 +934,7 @@ public final class AnnounceDataOuterClass {
         }
       }
       /**
-       * <code>string dungeon_confirm_text = 11;</code>
+       * <code>string dungeon_confirm_text = 6;</code>
        * @param value The dungeonConfirmText to set.
        * @return This builder for chaining.
        */
@@ -1095,7 +949,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>string dungeon_confirm_text = 11;</code>
+       * <code>string dungeon_confirm_text = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearDungeonConfirmText() {
@@ -1105,7 +959,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>string dungeon_confirm_text = 11;</code>
+       * <code>string dungeon_confirm_text = 6;</code>
        * @param value The bytes for dungeonConfirmText to set.
        * @return This builder for chaining.
        */
@@ -1121,40 +975,147 @@ public final class AnnounceDataOuterClass {
         return this;
       }
 
-      private int configId_ ;
+      private java.lang.Object countDownText_ = "";
       /**
-       * <code>uint32 config_id = 12;</code>
-       * @return The configId.
+       * <code>string count_down_text = 7;</code>
+       * @return The countDownText.
        */
-      @java.lang.Override
-      public int getConfigId() {
-        return configId_;
+      public java.lang.String getCountDownText() {
+        java.lang.Object ref = countDownText_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          countDownText_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 config_id = 12;</code>
-       * @param value The configId to set.
+       * <code>string count_down_text = 7;</code>
+       * @return The bytes for countDownText.
+       */
+      public com.google.protobuf.ByteString
+          getCountDownTextBytes() {
+        java.lang.Object ref = countDownText_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          countDownText_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string count_down_text = 7;</code>
+       * @param value The countDownText to set.
        * @return This builder for chaining.
        */
-      public Builder setConfigId(int value) {
-        
-        configId_ = value;
+      public Builder setCountDownText(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        countDownText_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 config_id = 12;</code>
+       * <code>string count_down_text = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearConfigId() {
+      public Builder clearCountDownText() {
         
-        configId_ = 0;
+        countDownText_ = getDefaultInstance().getCountDownText();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string count_down_text = 7;</code>
+       * @param value The bytes for countDownText to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountDownTextBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        countDownText_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int centerSystemFrequency_ ;
+      /**
+       * <code>uint32 center_system_frequency = 8;</code>
+       * @return The centerSystemFrequency.
+       */
+      @java.lang.Override
+      public int getCenterSystemFrequency() {
+        return centerSystemFrequency_;
+      }
+      /**
+       * <code>uint32 center_system_frequency = 8;</code>
+       * @param value The centerSystemFrequency to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCenterSystemFrequency(int value) {
+        
+        centerSystemFrequency_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 center_system_frequency = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCenterSystemFrequency() {
+        
+        centerSystemFrequency_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isCenterSystemLast5EveryMinutes_ ;
+      /**
+       * <code>bool is_center_system_last5_every_minutes = 10;</code>
+       * @return The isCenterSystemLast5EveryMinutes.
+       */
+      @java.lang.Override
+      public boolean getIsCenterSystemLast5EveryMinutes() {
+        return isCenterSystemLast5EveryMinutes_;
+      }
+      /**
+       * <code>bool is_center_system_last5_every_minutes = 10;</code>
+       * @param value The isCenterSystemLast5EveryMinutes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsCenterSystemLast5EveryMinutes(boolean value) {
+        
+        isCenterSystemLast5EveryMinutes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_center_system_last5_every_minutes = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsCenterSystemLast5EveryMinutes() {
+        
+        isCenterSystemLast5EveryMinutes_ = false;
         onChanged();
         return this;
       }
 
       private java.lang.Object centerSystemText_ = "";
       /**
-       * <code>string center_system_text = 1;</code>
+       * <code>string center_system_text = 12;</code>
        * @return The centerSystemText.
        */
       public java.lang.String getCenterSystemText() {
@@ -1170,7 +1131,7 @@ public final class AnnounceDataOuterClass {
         }
       }
       /**
-       * <code>string center_system_text = 1;</code>
+       * <code>string center_system_text = 12;</code>
        * @return The bytes for centerSystemText.
        */
       public com.google.protobuf.ByteString
@@ -1187,7 +1148,7 @@ public final class AnnounceDataOuterClass {
         }
       }
       /**
-       * <code>string center_system_text = 1;</code>
+       * <code>string center_system_text = 12;</code>
        * @param value The centerSystemText to set.
        * @return This builder for chaining.
        */
@@ -1202,7 +1163,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>string center_system_text = 1;</code>
+       * <code>string center_system_text = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCenterSystemText() {
@@ -1212,7 +1173,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>string center_system_text = 1;</code>
+       * <code>string center_system_text = 12;</code>
        * @param value The bytes for centerSystemText to set.
        * @return This builder for chaining.
        */
@@ -1230,7 +1191,7 @@ public final class AnnounceDataOuterClass {
 
       private int beginTime_ ;
       /**
-       * <code>uint32 begin_time = 10;</code>
+       * <code>uint32 begin_time = 13;</code>
        * @return The beginTime.
        */
       @java.lang.Override
@@ -1238,7 +1199,7 @@ public final class AnnounceDataOuterClass {
         return beginTime_;
       }
       /**
-       * <code>uint32 begin_time = 10;</code>
+       * <code>uint32 begin_time = 13;</code>
        * @param value The beginTime to set.
        * @return This builder for chaining.
        */
@@ -1249,7 +1210,7 @@ public final class AnnounceDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 begin_time = 10;</code>
+       * <code>uint32 begin_time = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeginTime() {
@@ -1258,6 +1219,37 @@ public final class AnnounceDataOuterClass {
         onChanged();
         return this;
       }
+
+      private int configId_ ;
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @return The configId.
+       */
+      @java.lang.Override
+      public int getConfigId() {
+        return configId_;
+      }
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @param value The configId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigId(int value) {
+        
+        configId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigId() {
+        
+        configId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1325,15 +1317,15 @@ public final class AnnounceDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022AnnounceData.proto\"\210\002\n\014AnnounceData\022\027\n" +
-      "\017count_down_text\030\003 \001(\t\022-\n%is_center_syst" +
-      "em_last_5_every_minutes\030\007 \001(\010\022\034\n\024count_d" +
-      "own_frequency\030\002 \001(\r\022\037\n\027center_system_fre" +
-      "quency\030\016 \001(\r\022\020\n\010end_time\030\005 \001(\r\022\034\n\024dungeo" +
-      "n_confirm_text\030\013 \001(\t\022\021\n\tconfig_id\030\014 \001(\r\022" +
-      "\032\n\022center_system_text\030\001 \001(\t\022\022\n\nbegin_tim" +
-      "e\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
-      "oto3"
+      "\n\022AnnounceData.proto\"\207\002\n\014AnnounceData\022\020\n" +
+      "\010end_time\030\001 \001(\r\022\034\n\024count_down_frequency\030" +
+      "\003 \001(\r\022\034\n\024dungeon_confirm_text\030\006 \001(\t\022\027\n\017c" +
+      "ount_down_text\030\007 \001(\t\022\037\n\027center_system_fr" +
+      "equency\030\010 \001(\r\022,\n$is_center_system_last5_" +
+      "every_minutes\030\n \001(\010\022\032\n\022center_system_tex" +
+      "t\030\014 \001(\t\022\022\n\nbegin_time\030\r \001(\r\022\021\n\tconfig_id" +
+      "\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1344,7 +1336,7 @@ public final class AnnounceDataOuterClass {
     internal_static_AnnounceData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AnnounceData_descriptor,
-        new java.lang.String[] { "CountDownText", "IsCenterSystemLast5EveryMinutes", "CountDownFrequency", "CenterSystemFrequency", "EndTime", "DungeonConfirmText", "ConfigId", "CenterSystemText", "BeginTime", });
+        new java.lang.String[] { "EndTime", "CountDownFrequency", "DungeonConfirmText", "CountDownText", "CenterSystemFrequency", "IsCenterSystemLast5EveryMinutes", "CenterSystemText", "BeginTime", "ConfigId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java
index 3eaf8d93d..12f3a7e30 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class AskAddFriendNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 3;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
-    /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     boolean hasTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return The targetFriendBrief.
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief();
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder();
+
+    /**
+     * <code>uint32 target_uid = 14;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 27323
-   * Obf: NADOGBCLNJI
-   * </pre>
-   *
    * Protobuf type {@code AskAddFriendNotify}
    */
   public static final class AskAddFriendNotify extends
@@ -89,12 +84,7 @@ public final class AskAddFriendNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              targetUid_ = input.readUInt32();
-              break;
-            }
-            case 58: {
+            case 42: {
               emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder subBuilder = null;
               if (targetFriendBrief_ != null) {
                 subBuilder = targetFriendBrief_.toBuilder();
@@ -107,6 +97,11 @@ public final class AskAddFriendNotifyOuterClass {
 
               break;
             }
+            case 112: {
+
+              targetUid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,21 +134,10 @@ public final class AskAddFriendNotifyOuterClass {
               emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.class, emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 3;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 3;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
-    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 7;
+    public static final int TARGET_FRIEND_BRIEF_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return Whether the targetFriendBrief field is set.
      */
     @java.lang.Override
@@ -161,7 +145,7 @@ public final class AskAddFriendNotifyOuterClass {
       return targetFriendBrief_ != null;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      * @return The targetFriendBrief.
      */
     @java.lang.Override
@@ -169,13 +153,24 @@ public final class AskAddFriendNotifyOuterClass {
       return targetFriendBrief_ == null ? emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance() : targetFriendBrief_;
     }
     /**
-     * <code>.FriendBrief target_friend_brief = 7;</code>
+     * <code>.FriendBrief target_friend_brief = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
       return getTargetFriendBrief();
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +185,11 @@ public final class AskAddFriendNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetUid_ != 0) {
-        output.writeUInt32(3, targetUid_);
-      }
       if (targetFriendBrief_ != null) {
-        output.writeMessage(7, getTargetFriendBrief());
+        output.writeMessage(5, getTargetFriendBrief());
+      }
+      if (targetUid_ != 0) {
+        output.writeUInt32(14, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class AskAddFriendNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, targetUid_);
-      }
       if (targetFriendBrief_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getTargetFriendBrief());
+          .computeMessageSize(5, getTargetFriendBrief());
+      }
+      if (targetUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class AskAddFriendNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other = (emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify) obj;
 
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
       if (hasTargetFriendBrief() != other.hasTargetFriendBrief()) return false;
       if (hasTargetFriendBrief()) {
         if (!getTargetFriendBrief()
             .equals(other.getTargetFriendBrief())) return false;
       }
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class AskAddFriendNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
       if (hasTargetFriendBrief()) {
         hash = (37 * hash) + TARGET_FRIEND_BRIEF_FIELD_NUMBER;
         hash = (53 * hash) + getTargetFriendBrief().hashCode();
       }
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class AskAddFriendNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27323
-     * Obf: NADOGBCLNJI
-     * </pre>
-     *
      * Protobuf type {@code AskAddFriendNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetUid_ = 0;
-
         if (targetFriendBriefBuilder_ == null) {
           targetFriendBrief_ = null;
         } else {
           targetFriendBrief_ = null;
           targetFriendBriefBuilder_ = null;
         }
+        targetUid_ = 0;
+
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class AskAddFriendNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify buildPartial() {
         emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify result = new emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify(this);
-        result.targetUid_ = targetUid_;
         if (targetFriendBriefBuilder_ == null) {
           result.targetFriendBrief_ = targetFriendBrief_;
         } else {
           result.targetFriendBrief_ = targetFriendBriefBuilder_.build();
         }
+        result.targetUid_ = targetUid_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class AskAddFriendNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify other) {
         if (other == emu.grasscutter.net.proto.AskAddFriendNotifyOuterClass.AskAddFriendNotify.getDefaultInstance()) return this;
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         if (other.hasTargetFriendBrief()) {
           mergeTargetFriendBrief(other.getTargetFriendBrief());
         }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +503,18 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
 
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 3;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
-      /**
-       * <code>uint32 target_uid = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief targetFriendBrief_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> targetFriendBriefBuilder_;
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        * @return Whether the targetFriendBrief field is set.
        */
       public boolean hasTargetFriendBrief() {
         return targetFriendBriefBuilder_ != null || targetFriendBrief_ != null;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        * @return The targetFriendBrief.
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getTargetFriendBrief() {
@@ -566,7 +525,7 @@ public final class AskAddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder setTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -582,7 +541,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder setTargetFriendBrief(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -596,7 +555,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder mergeTargetFriendBrief(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (targetFriendBriefBuilder_ == null) {
@@ -614,7 +573,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public Builder clearTargetFriendBrief() {
         if (targetFriendBriefBuilder_ == null) {
@@ -628,7 +587,7 @@ public final class AskAddFriendNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getTargetFriendBriefBuilder() {
         
@@ -636,7 +595,7 @@ public final class AskAddFriendNotifyOuterClass {
         return getTargetFriendBriefFieldBuilder().getBuilder();
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getTargetFriendBriefOrBuilder() {
         if (targetFriendBriefBuilder_ != null) {
@@ -647,7 +606,7 @@ public final class AskAddFriendNotifyOuterClass {
         }
       }
       /**
-       * <code>.FriendBrief target_friend_brief = 7;</code>
+       * <code>.FriendBrief target_friend_brief = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -662,6 +621,37 @@ public final class AskAddFriendNotifyOuterClass {
         }
         return targetFriendBriefBuilder_;
       }
+
+      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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +720,9 @@ public final class AskAddFriendNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030AskAddFriendNotify.proto\032\021FriendBrief." +
-      "proto\"S\n\022AskAddFriendNotify\022\022\n\ntarget_ui" +
-      "d\030\003 \001(\r\022)\n\023target_friend_brief\030\007 \001(\0132\014.F" +
-      "riendBriefB\033\n\031emu.grasscutter.net.protob" +
+      "proto\"S\n\022AskAddFriendNotify\022)\n\023target_fr" +
+      "iend_brief\030\005 \001(\0132\014.FriendBrief\022\022\n\ntarget" +
+      "_uid\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class AskAddFriendNotifyOuterClass {
     internal_static_AskAddFriendNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AskAddFriendNotify_descriptor,
-        new java.lang.String[] { "TargetUid", "TargetFriendBrief", });
+        new java.lang.String[] { "TargetFriendBrief", "TargetUid", });
     emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java
index ca0bc62a6..c63d797bd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AskAddFriendReqOuterClass.java
@@ -19,17 +19,12 @@ public final class AskAddFriendReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 9257
-   * Obf: DHLNDCPMCPG
-   * </pre>
-   *
    * Protobuf type {@code AskAddFriendReq}
    */
   public static final class AskAddFriendReq extends
@@ -74,7 +69,7 @@ public final class AskAddFriendReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 80: {
 
               targetUid_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AskAddFriendReqOuterClass {
               emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.class, emu.grasscutter.net.proto.AskAddFriendReqOuterClass.AskAddFriendReq.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 8;
+    public static final int TARGET_UID_FIELD_NUMBER = 10;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 8;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AskAddFriendReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(8, targetUid_);
+        output.writeUInt32(10, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AskAddFriendReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, targetUid_);
+          .computeUInt32Size(10, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AskAddFriendReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9257
-     * Obf: DHLNDCPMCPG
-     * </pre>
-     *
      * Protobuf type {@code AskAddFriendReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AskAddFriendReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AskAddFriendReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AskAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 8;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -527,7 +517,7 @@ public final class AskAddFriendReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AskAddFriendReq.proto\"%\n\017AskAddFriendR" +
-      "eq\022\022\n\ntarget_uid\030\010 \001(\rB\033\n\031emu.grasscutte" +
+      "eq\022\022\n\ntarget_uid\030\n \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java
index 303a1a94d..ced691e68 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AttackHitEffectResultOuterClass.java
@@ -19,46 +19,42 @@ public final class AttackHitEffectResultOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 PPEJOCMAFFH = 11;</code>
-     * @return The pPEJOCMAFFH.
+     * <code>uint32 KIHHJKCGGCC = 3;</code>
+     * @return The kIHHJKCGGCC.
      */
-    int getPPEJOCMAFFH();
+    int getKIHHJKCGGCC();
 
     /**
-     * <code>float HLMGLLLLEIJ = 7;</code>
-     * @return The hLMGLLLLEIJ.
+     * <code>float HFHKMEOPFBI = 5;</code>
+     * @return The hFHKMEOPFBI.
      */
-    float getHLMGLLLLEIJ();
+    float getHFHKMEOPFBI();
 
     /**
-     * <code>uint32 POCHAAAEPMH = 2;</code>
-     * @return The pOCHAAAEPMH.
+     * <code>uint32 ECBDDJLPPMK = 6;</code>
+     * @return The eCBDDJLPPMK.
      */
-    int getPOCHAAAEPMH();
+    int getECBDDJLPPMK();
 
     /**
-     * <code>float NMMAGALAPME = 13;</code>
-     * @return The nMMAGALAPME.
+     * <code>float DADJPJBELMO = 8;</code>
+     * @return The dADJPJBELMO.
      */
-    float getNMMAGALAPME();
+    float getDADJPJBELMO();
 
     /**
-     * <code>float DPMHMPLKOEK = 1;</code>
-     * @return The dPMHMPLKOEK.
+     * <code>float HDJALIDKDPN = 10;</code>
+     * @return The hDJALIDKDPN.
      */
-    float getDPMHMPLKOEK();
+    float getHDJALIDKDPN();
 
     /**
-     * <code>float LOHBEFJPFHA = 5;</code>
-     * @return The lOHBEFJPFHA.
+     * <code>float CCLCOGCLHKO = 13;</code>
+     * @return The cCLCOGCLHKO.
      */
-    float getLOHBEFJPFHA();
+    float getCCLCOGCLHKO();
   }
   /**
-   * <pre>
-   * Obf: LEKHHDAJFPK
-   * </pre>
-   *
    * Protobuf type {@code AttackHitEffectResult}
    */
   public static final class AttackHitEffectResult extends
@@ -103,34 +99,34 @@ public final class AttackHitEffectResultOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
+            case 24: {
 
-              dPMHMPLKOEK_ = input.readFloat();
-              break;
-            }
-            case 16: {
-
-              pOCHAAAEPMH_ = input.readUInt32();
+              kIHHJKCGGCC_ = input.readUInt32();
               break;
             }
             case 45: {
 
-              lOHBEFJPFHA_ = input.readFloat();
+              hFHKMEOPFBI_ = input.readFloat();
               break;
             }
-            case 61: {
+            case 48: {
 
-              hLMGLLLLEIJ_ = input.readFloat();
+              eCBDDJLPPMK_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 69: {
 
-              pPEJOCMAFFH_ = input.readUInt32();
+              dADJPJBELMO_ = input.readFloat();
+              break;
+            }
+            case 85: {
+
+              hDJALIDKDPN_ = input.readFloat();
               break;
             }
             case 109: {
 
-              nMMAGALAPME_ = input.readFloat();
+              cCLCOGCLHKO_ = input.readFloat();
               break;
             }
             default: {
@@ -165,70 +161,70 @@ public final class AttackHitEffectResultOuterClass {
               emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.class, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder.class);
     }
 
-    public static final int PPEJOCMAFFH_FIELD_NUMBER = 11;
-    private int pPEJOCMAFFH_;
+    public static final int KIHHJKCGGCC_FIELD_NUMBER = 3;
+    private int kIHHJKCGGCC_;
     /**
-     * <code>uint32 PPEJOCMAFFH = 11;</code>
-     * @return The pPEJOCMAFFH.
+     * <code>uint32 KIHHJKCGGCC = 3;</code>
+     * @return The kIHHJKCGGCC.
      */
     @java.lang.Override
-    public int getPPEJOCMAFFH() {
-      return pPEJOCMAFFH_;
+    public int getKIHHJKCGGCC() {
+      return kIHHJKCGGCC_;
     }
 
-    public static final int HLMGLLLLEIJ_FIELD_NUMBER = 7;
-    private float hLMGLLLLEIJ_;
+    public static final int HFHKMEOPFBI_FIELD_NUMBER = 5;
+    private float hFHKMEOPFBI_;
     /**
-     * <code>float HLMGLLLLEIJ = 7;</code>
-     * @return The hLMGLLLLEIJ.
+     * <code>float HFHKMEOPFBI = 5;</code>
+     * @return The hFHKMEOPFBI.
      */
     @java.lang.Override
-    public float getHLMGLLLLEIJ() {
-      return hLMGLLLLEIJ_;
+    public float getHFHKMEOPFBI() {
+      return hFHKMEOPFBI_;
     }
 
-    public static final int POCHAAAEPMH_FIELD_NUMBER = 2;
-    private int pOCHAAAEPMH_;
+    public static final int ECBDDJLPPMK_FIELD_NUMBER = 6;
+    private int eCBDDJLPPMK_;
     /**
-     * <code>uint32 POCHAAAEPMH = 2;</code>
-     * @return The pOCHAAAEPMH.
+     * <code>uint32 ECBDDJLPPMK = 6;</code>
+     * @return The eCBDDJLPPMK.
      */
     @java.lang.Override
-    public int getPOCHAAAEPMH() {
-      return pOCHAAAEPMH_;
+    public int getECBDDJLPPMK() {
+      return eCBDDJLPPMK_;
     }
 
-    public static final int NMMAGALAPME_FIELD_NUMBER = 13;
-    private float nMMAGALAPME_;
+    public static final int DADJPJBELMO_FIELD_NUMBER = 8;
+    private float dADJPJBELMO_;
     /**
-     * <code>float NMMAGALAPME = 13;</code>
-     * @return The nMMAGALAPME.
+     * <code>float DADJPJBELMO = 8;</code>
+     * @return The dADJPJBELMO.
      */
     @java.lang.Override
-    public float getNMMAGALAPME() {
-      return nMMAGALAPME_;
+    public float getDADJPJBELMO() {
+      return dADJPJBELMO_;
     }
 
-    public static final int DPMHMPLKOEK_FIELD_NUMBER = 1;
-    private float dPMHMPLKOEK_;
+    public static final int HDJALIDKDPN_FIELD_NUMBER = 10;
+    private float hDJALIDKDPN_;
     /**
-     * <code>float DPMHMPLKOEK = 1;</code>
-     * @return The dPMHMPLKOEK.
+     * <code>float HDJALIDKDPN = 10;</code>
+     * @return The hDJALIDKDPN.
      */
     @java.lang.Override
-    public float getDPMHMPLKOEK() {
-      return dPMHMPLKOEK_;
+    public float getHDJALIDKDPN() {
+      return hDJALIDKDPN_;
     }
 
-    public static final int LOHBEFJPFHA_FIELD_NUMBER = 5;
-    private float lOHBEFJPFHA_;
+    public static final int CCLCOGCLHKO_FIELD_NUMBER = 13;
+    private float cCLCOGCLHKO_;
     /**
-     * <code>float LOHBEFJPFHA = 5;</code>
-     * @return The lOHBEFJPFHA.
+     * <code>float CCLCOGCLHKO = 13;</code>
+     * @return The cCLCOGCLHKO.
      */
     @java.lang.Override
-    public float getLOHBEFJPFHA() {
-      return lOHBEFJPFHA_;
+    public float getCCLCOGCLHKO() {
+      return cCLCOGCLHKO_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -245,23 +241,23 @@ public final class AttackHitEffectResultOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dPMHMPLKOEK_ != 0F) {
-        output.writeFloat(1, dPMHMPLKOEK_);
+      if (kIHHJKCGGCC_ != 0) {
+        output.writeUInt32(3, kIHHJKCGGCC_);
       }
-      if (pOCHAAAEPMH_ != 0) {
-        output.writeUInt32(2, pOCHAAAEPMH_);
+      if (hFHKMEOPFBI_ != 0F) {
+        output.writeFloat(5, hFHKMEOPFBI_);
       }
-      if (lOHBEFJPFHA_ != 0F) {
-        output.writeFloat(5, lOHBEFJPFHA_);
+      if (eCBDDJLPPMK_ != 0) {
+        output.writeUInt32(6, eCBDDJLPPMK_);
       }
-      if (hLMGLLLLEIJ_ != 0F) {
-        output.writeFloat(7, hLMGLLLLEIJ_);
+      if (dADJPJBELMO_ != 0F) {
+        output.writeFloat(8, dADJPJBELMO_);
       }
-      if (pPEJOCMAFFH_ != 0) {
-        output.writeUInt32(11, pPEJOCMAFFH_);
+      if (hDJALIDKDPN_ != 0F) {
+        output.writeFloat(10, hDJALIDKDPN_);
       }
-      if (nMMAGALAPME_ != 0F) {
-        output.writeFloat(13, nMMAGALAPME_);
+      if (cCLCOGCLHKO_ != 0F) {
+        output.writeFloat(13, cCLCOGCLHKO_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class AttackHitEffectResultOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dPMHMPLKOEK_ != 0F) {
+      if (kIHHJKCGGCC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, dPMHMPLKOEK_);
+          .computeUInt32Size(3, kIHHJKCGGCC_);
       }
-      if (pOCHAAAEPMH_ != 0) {
+      if (hFHKMEOPFBI_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, pOCHAAAEPMH_);
+          .computeFloatSize(5, hFHKMEOPFBI_);
       }
-      if (lOHBEFJPFHA_ != 0F) {
+      if (eCBDDJLPPMK_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(5, lOHBEFJPFHA_);
+          .computeUInt32Size(6, eCBDDJLPPMK_);
       }
-      if (hLMGLLLLEIJ_ != 0F) {
+      if (dADJPJBELMO_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(7, hLMGLLLLEIJ_);
+          .computeFloatSize(8, dADJPJBELMO_);
       }
-      if (pPEJOCMAFFH_ != 0) {
+      if (hDJALIDKDPN_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, pPEJOCMAFFH_);
+          .computeFloatSize(10, hDJALIDKDPN_);
       }
-      if (nMMAGALAPME_ != 0F) {
+      if (cCLCOGCLHKO_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(13, nMMAGALAPME_);
+          .computeFloatSize(13, cCLCOGCLHKO_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,22 +307,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other = (emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult) obj;
 
-      if (getPPEJOCMAFFH()
-          != other.getPPEJOCMAFFH()) return false;
-      if (java.lang.Float.floatToIntBits(getHLMGLLLLEIJ())
+      if (getKIHHJKCGGCC()
+          != other.getKIHHJKCGGCC()) return false;
+      if (java.lang.Float.floatToIntBits(getHFHKMEOPFBI())
           != java.lang.Float.floatToIntBits(
-              other.getHLMGLLLLEIJ())) return false;
-      if (getPOCHAAAEPMH()
-          != other.getPOCHAAAEPMH()) return false;
-      if (java.lang.Float.floatToIntBits(getNMMAGALAPME())
+              other.getHFHKMEOPFBI())) return false;
+      if (getECBDDJLPPMK()
+          != other.getECBDDJLPPMK()) return false;
+      if (java.lang.Float.floatToIntBits(getDADJPJBELMO())
           != java.lang.Float.floatToIntBits(
-              other.getNMMAGALAPME())) return false;
-      if (java.lang.Float.floatToIntBits(getDPMHMPLKOEK())
+              other.getDADJPJBELMO())) return false;
+      if (java.lang.Float.floatToIntBits(getHDJALIDKDPN())
           != java.lang.Float.floatToIntBits(
-              other.getDPMHMPLKOEK())) return false;
-      if (java.lang.Float.floatToIntBits(getLOHBEFJPFHA())
+              other.getHDJALIDKDPN())) return false;
+      if (java.lang.Float.floatToIntBits(getCCLCOGCLHKO())
           != java.lang.Float.floatToIntBits(
-              other.getLOHBEFJPFHA())) return false;
+              other.getCCLCOGCLHKO())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -338,22 +334,22 @@ public final class AttackHitEffectResultOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PPEJOCMAFFH_FIELD_NUMBER;
-      hash = (53 * hash) + getPPEJOCMAFFH();
-      hash = (37 * hash) + HLMGLLLLEIJ_FIELD_NUMBER;
+      hash = (37 * hash) + KIHHJKCGGCC_FIELD_NUMBER;
+      hash = (53 * hash) + getKIHHJKCGGCC();
+      hash = (37 * hash) + HFHKMEOPFBI_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getHLMGLLLLEIJ());
-      hash = (37 * hash) + POCHAAAEPMH_FIELD_NUMBER;
-      hash = (53 * hash) + getPOCHAAAEPMH();
-      hash = (37 * hash) + NMMAGALAPME_FIELD_NUMBER;
+          getHFHKMEOPFBI());
+      hash = (37 * hash) + ECBDDJLPPMK_FIELD_NUMBER;
+      hash = (53 * hash) + getECBDDJLPPMK();
+      hash = (37 * hash) + DADJPJBELMO_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNMMAGALAPME());
-      hash = (37 * hash) + DPMHMPLKOEK_FIELD_NUMBER;
+          getDADJPJBELMO());
+      hash = (37 * hash) + HDJALIDKDPN_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getDPMHMPLKOEK());
-      hash = (37 * hash) + LOHBEFJPFHA_FIELD_NUMBER;
+          getHDJALIDKDPN());
+      hash = (37 * hash) + CCLCOGCLHKO_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getLOHBEFJPFHA());
+          getCCLCOGCLHKO());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -450,10 +446,6 @@ public final class AttackHitEffectResultOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LEKHHDAJFPK
-     * </pre>
-     *
      * Protobuf type {@code AttackHitEffectResult}
      */
     public static final class Builder extends
@@ -491,17 +483,17 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pPEJOCMAFFH_ = 0;
+        kIHHJKCGGCC_ = 0;
 
-        hLMGLLLLEIJ_ = 0F;
+        hFHKMEOPFBI_ = 0F;
 
-        pOCHAAAEPMH_ = 0;
+        eCBDDJLPPMK_ = 0;
 
-        nMMAGALAPME_ = 0F;
+        dADJPJBELMO_ = 0F;
 
-        dPMHMPLKOEK_ = 0F;
+        hDJALIDKDPN_ = 0F;
 
-        lOHBEFJPFHA_ = 0F;
+        cCLCOGCLHKO_ = 0F;
 
         return this;
       }
@@ -529,12 +521,12 @@ public final class AttackHitEffectResultOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult buildPartial() {
         emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult result = new emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult(this);
-        result.pPEJOCMAFFH_ = pPEJOCMAFFH_;
-        result.hLMGLLLLEIJ_ = hLMGLLLLEIJ_;
-        result.pOCHAAAEPMH_ = pOCHAAAEPMH_;
-        result.nMMAGALAPME_ = nMMAGALAPME_;
-        result.dPMHMPLKOEK_ = dPMHMPLKOEK_;
-        result.lOHBEFJPFHA_ = lOHBEFJPFHA_;
+        result.kIHHJKCGGCC_ = kIHHJKCGGCC_;
+        result.hFHKMEOPFBI_ = hFHKMEOPFBI_;
+        result.eCBDDJLPPMK_ = eCBDDJLPPMK_;
+        result.dADJPJBELMO_ = dADJPJBELMO_;
+        result.hDJALIDKDPN_ = hDJALIDKDPN_;
+        result.cCLCOGCLHKO_ = cCLCOGCLHKO_;
         onBuilt();
         return result;
       }
@@ -583,23 +575,23 @@ public final class AttackHitEffectResultOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult other) {
         if (other == emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance()) return this;
-        if (other.getPPEJOCMAFFH() != 0) {
-          setPPEJOCMAFFH(other.getPPEJOCMAFFH());
+        if (other.getKIHHJKCGGCC() != 0) {
+          setKIHHJKCGGCC(other.getKIHHJKCGGCC());
         }
-        if (other.getHLMGLLLLEIJ() != 0F) {
-          setHLMGLLLLEIJ(other.getHLMGLLLLEIJ());
+        if (other.getHFHKMEOPFBI() != 0F) {
+          setHFHKMEOPFBI(other.getHFHKMEOPFBI());
         }
-        if (other.getPOCHAAAEPMH() != 0) {
-          setPOCHAAAEPMH(other.getPOCHAAAEPMH());
+        if (other.getECBDDJLPPMK() != 0) {
+          setECBDDJLPPMK(other.getECBDDJLPPMK());
         }
-        if (other.getNMMAGALAPME() != 0F) {
-          setNMMAGALAPME(other.getNMMAGALAPME());
+        if (other.getDADJPJBELMO() != 0F) {
+          setDADJPJBELMO(other.getDADJPJBELMO());
         }
-        if (other.getDPMHMPLKOEK() != 0F) {
-          setDPMHMPLKOEK(other.getDPMHMPLKOEK());
+        if (other.getHDJALIDKDPN() != 0F) {
+          setHDJALIDKDPN(other.getHDJALIDKDPN());
         }
-        if (other.getLOHBEFJPFHA() != 0F) {
-          setLOHBEFJPFHA(other.getLOHBEFJPFHA());
+        if (other.getCCLCOGCLHKO() != 0F) {
+          setCCLCOGCLHKO(other.getCCLCOGCLHKO());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -630,188 +622,188 @@ public final class AttackHitEffectResultOuterClass {
         return this;
       }
 
-      private int pPEJOCMAFFH_ ;
+      private int kIHHJKCGGCC_ ;
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
-       * @return The pPEJOCMAFFH.
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
+       * @return The kIHHJKCGGCC.
        */
       @java.lang.Override
-      public int getPPEJOCMAFFH() {
-        return pPEJOCMAFFH_;
+      public int getKIHHJKCGGCC() {
+        return kIHHJKCGGCC_;
       }
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
-       * @param value The pPEJOCMAFFH to set.
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
+       * @param value The kIHHJKCGGCC to set.
        * @return This builder for chaining.
        */
-      public Builder setPPEJOCMAFFH(int value) {
+      public Builder setKIHHJKCGGCC(int value) {
         
-        pPEJOCMAFFH_ = value;
+        kIHHJKCGGCC_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 PPEJOCMAFFH = 11;</code>
+       * <code>uint32 KIHHJKCGGCC = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPPEJOCMAFFH() {
+      public Builder clearKIHHJKCGGCC() {
         
-        pPEJOCMAFFH_ = 0;
+        kIHHJKCGGCC_ = 0;
         onChanged();
         return this;
       }
 
-      private float hLMGLLLLEIJ_ ;
+      private float hFHKMEOPFBI_ ;
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
-       * @return The hLMGLLLLEIJ.
+       * <code>float HFHKMEOPFBI = 5;</code>
+       * @return The hFHKMEOPFBI.
        */
       @java.lang.Override
-      public float getHLMGLLLLEIJ() {
-        return hLMGLLLLEIJ_;
+      public float getHFHKMEOPFBI() {
+        return hFHKMEOPFBI_;
       }
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
-       * @param value The hLMGLLLLEIJ to set.
+       * <code>float HFHKMEOPFBI = 5;</code>
+       * @param value The hFHKMEOPFBI to set.
        * @return This builder for chaining.
        */
-      public Builder setHLMGLLLLEIJ(float value) {
+      public Builder setHFHKMEOPFBI(float value) {
         
-        hLMGLLLLEIJ_ = value;
+        hFHKMEOPFBI_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float HLMGLLLLEIJ = 7;</code>
+       * <code>float HFHKMEOPFBI = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHLMGLLLLEIJ() {
+      public Builder clearHFHKMEOPFBI() {
         
-        hLMGLLLLEIJ_ = 0F;
+        hFHKMEOPFBI_ = 0F;
         onChanged();
         return this;
       }
 
-      private int pOCHAAAEPMH_ ;
+      private int eCBDDJLPPMK_ ;
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
-       * @return The pOCHAAAEPMH.
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
+       * @return The eCBDDJLPPMK.
        */
       @java.lang.Override
-      public int getPOCHAAAEPMH() {
-        return pOCHAAAEPMH_;
+      public int getECBDDJLPPMK() {
+        return eCBDDJLPPMK_;
       }
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
-       * @param value The pOCHAAAEPMH to set.
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
+       * @param value The eCBDDJLPPMK to set.
        * @return This builder for chaining.
        */
-      public Builder setPOCHAAAEPMH(int value) {
+      public Builder setECBDDJLPPMK(int value) {
         
-        pOCHAAAEPMH_ = value;
+        eCBDDJLPPMK_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 POCHAAAEPMH = 2;</code>
+       * <code>uint32 ECBDDJLPPMK = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPOCHAAAEPMH() {
+      public Builder clearECBDDJLPPMK() {
         
-        pOCHAAAEPMH_ = 0;
+        eCBDDJLPPMK_ = 0;
         onChanged();
         return this;
       }
 
-      private float nMMAGALAPME_ ;
+      private float dADJPJBELMO_ ;
       /**
-       * <code>float NMMAGALAPME = 13;</code>
-       * @return The nMMAGALAPME.
+       * <code>float DADJPJBELMO = 8;</code>
+       * @return The dADJPJBELMO.
        */
       @java.lang.Override
-      public float getNMMAGALAPME() {
-        return nMMAGALAPME_;
+      public float getDADJPJBELMO() {
+        return dADJPJBELMO_;
       }
       /**
-       * <code>float NMMAGALAPME = 13;</code>
-       * @param value The nMMAGALAPME to set.
+       * <code>float DADJPJBELMO = 8;</code>
+       * @param value The dADJPJBELMO to set.
        * @return This builder for chaining.
        */
-      public Builder setNMMAGALAPME(float value) {
+      public Builder setDADJPJBELMO(float value) {
         
-        nMMAGALAPME_ = value;
+        dADJPJBELMO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float NMMAGALAPME = 13;</code>
+       * <code>float DADJPJBELMO = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNMMAGALAPME() {
+      public Builder clearDADJPJBELMO() {
         
-        nMMAGALAPME_ = 0F;
+        dADJPJBELMO_ = 0F;
         onChanged();
         return this;
       }
 
-      private float dPMHMPLKOEK_ ;
+      private float hDJALIDKDPN_ ;
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
-       * @return The dPMHMPLKOEK.
+       * <code>float HDJALIDKDPN = 10;</code>
+       * @return The hDJALIDKDPN.
        */
       @java.lang.Override
-      public float getDPMHMPLKOEK() {
-        return dPMHMPLKOEK_;
+      public float getHDJALIDKDPN() {
+        return hDJALIDKDPN_;
       }
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
-       * @param value The dPMHMPLKOEK to set.
+       * <code>float HDJALIDKDPN = 10;</code>
+       * @param value The hDJALIDKDPN to set.
        * @return This builder for chaining.
        */
-      public Builder setDPMHMPLKOEK(float value) {
+      public Builder setHDJALIDKDPN(float value) {
         
-        dPMHMPLKOEK_ = value;
+        hDJALIDKDPN_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float DPMHMPLKOEK = 1;</code>
+       * <code>float HDJALIDKDPN = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDPMHMPLKOEK() {
+      public Builder clearHDJALIDKDPN() {
         
-        dPMHMPLKOEK_ = 0F;
+        hDJALIDKDPN_ = 0F;
         onChanged();
         return this;
       }
 
-      private float lOHBEFJPFHA_ ;
+      private float cCLCOGCLHKO_ ;
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
-       * @return The lOHBEFJPFHA.
+       * <code>float CCLCOGCLHKO = 13;</code>
+       * @return The cCLCOGCLHKO.
        */
       @java.lang.Override
-      public float getLOHBEFJPFHA() {
-        return lOHBEFJPFHA_;
+      public float getCCLCOGCLHKO() {
+        return cCLCOGCLHKO_;
       }
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
-       * @param value The lOHBEFJPFHA to set.
+       * <code>float CCLCOGCLHKO = 13;</code>
+       * @param value The cCLCOGCLHKO to set.
        * @return This builder for chaining.
        */
-      public Builder setLOHBEFJPFHA(float value) {
+      public Builder setCCLCOGCLHKO(float value) {
         
-        lOHBEFJPFHA_ = value;
+        cCLCOGCLHKO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float LOHBEFJPFHA = 5;</code>
+       * <code>float CCLCOGCLHKO = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLOHBEFJPFHA() {
+      public Builder clearCCLCOGCLHKO() {
         
-        lOHBEFJPFHA_ = 0F;
+        cCLCOGCLHKO_ = 0F;
         onChanged();
         return this;
       }
@@ -883,10 +875,10 @@ public final class AttackHitEffectResultOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AttackHitEffectResult.proto\"\225\001\n\025Attack" +
-      "HitEffectResult\022\023\n\013PPEJOCMAFFH\030\013 \001(\r\022\023\n\013" +
-      "HLMGLLLLEIJ\030\007 \001(\002\022\023\n\013POCHAAAEPMH\030\002 \001(\r\022\023" +
-      "\n\013NMMAGALAPME\030\r \001(\002\022\023\n\013DPMHMPLKOEK\030\001 \001(\002" +
-      "\022\023\n\013LOHBEFJPFHA\030\005 \001(\002B\033\n\031emu.grasscutter" +
+      "HitEffectResult\022\023\n\013KIHHJKCGGCC\030\003 \001(\r\022\023\n\013" +
+      "HFHKMEOPFBI\030\005 \001(\002\022\023\n\013ECBDDJLPPMK\030\006 \001(\r\022\023" +
+      "\n\013DADJPJBELMO\030\010 \001(\002\022\023\n\013HDJALIDKDPN\030\n \001(\002" +
+      "\022\023\n\013CCLCOGCLHKO\030\r \001(\002B\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -898,7 +890,7 @@ public final class AttackHitEffectResultOuterClass {
     internal_static_AttackHitEffectResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AttackHitEffectResult_descriptor,
-        new java.lang.String[] { "PPEJOCMAFFH", "HLMGLLLLEIJ", "POCHAAAEPMH", "NMMAGALAPME", "DPMHMPLKOEK", "LOHBEFJPFHA", });
+        new java.lang.String[] { "KIHHJKCGGCC", "HFHKMEOPFBI", "ECBDDJLPPMK", "DADJPJBELMO", "HDJALIDKDPN", "CCLCOGCLHKO", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AttackResultOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AttackResultOuterClass.java
index 252a01fed..7714f2732 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AttackResultOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AttackResultOuterClass.java
@@ -19,94 +19,7 @@ public final class AttackResultOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 BLJNCIEFOED = 5;</code>
-     * @return The bLJNCIEFOED.
-     */
-    int getBLJNCIEFOED();
-
-    /**
-     * <code>uint32 element_type = 10;</code>
-     * @return The elementType.
-     */
-    int getElementType();
-
-    /**
-     * <code>float FMPIEJOMIFJ = 1723;</code>
-     * @return The fMPIEJOMIFJ.
-     */
-    float getFMPIEJOMIFJ();
-
-    /**
-     * <code>float NLAAOODDKGK = 778;</code>
-     * @return The nLAAOODDKGK.
-     */
-    float getNLAAOODDKGK();
-
-    /**
-     * <code>bool BAAHKFCEBMA = 7;</code>
-     * @return The bAAHKFCEBMA.
-     */
-    boolean getBAAHKFCEBMA();
-
-    /**
-     * <code>float KFCPIKCMIOI = 567;</code>
-     * @return The kFCPIKCMIOI.
-     */
-    float getKFCPIKCMIOI();
-
-    /**
-     * <code>float DPHDFDJJNOA = 27;</code>
-     * @return The dPHDFDJJNOA.
-     */
-    float getDPHDFDJJNOA();
-
-    /**
-     * <code>bool BILAJCEBMGF = 378;</code>
-     * @return The bILAJCEBMGF.
-     */
-    boolean getBILAJCEBMGF();
-
-    /**
-     * <code>uint32 MIKMJNBAAIJ = 8;</code>
-     * @return The mIKMJNBAAIJ.
-     */
-    int getMIKMJNBAAIJ();
-
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     * @return Whether the hitEffResult field is set.
-     */
-    boolean hasHitEffResult();
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     * @return The hitEffResult.
-     */
-    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult();
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     */
-    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder();
-
-    /**
-     * <code>uint32 BKKNPCPEDCF = 457;</code>
-     * @return The bKKNPCPEDCF.
-     */
-    int getBKKNPCPEDCF();
-
-    /**
-     * <code>uint32 DKDBHEJFOGD = 1602;</code>
-     * @return The dKDBHEJFOGD.
-     */
-    int getDKDBHEJFOGD();
-
-    /**
-     * <code>uint32 defense_id = 9;</code>
-     * @return The defenseId.
-     */
-    int getDefenseId();
-
-    /**
-     * <code>uint32 attacker_id = 14;</code>
+     * <code>uint32 attacker_id = 1;</code>
      * @return The attackerId.
      */
     int getAttackerId();
@@ -118,133 +31,230 @@ public final class AttackResultOuterClass {
     float getDamage();
 
     /**
-     * <code>uint32 EMOHABNNHBJ = 314;</code>
-     * @return The eMOHABNNHBJ.
+     * <code>int32 hit_retreat_angle_compat = 3;</code>
+     * @return The hitRetreatAngleCompat.
      */
-    int getEMOHABNNHBJ();
+    int getHitRetreatAngleCompat();
 
     /**
-     * <code>bool KAKHNCAHEOP = 609;</code>
-     * @return The kAKHNCAHEOP.
+     * <code>uint32 defense_id = 5;</code>
+     * @return The defenseId.
      */
-    boolean getKAKHNCAHEOP();
+    int getDefenseId();
 
     /**
-     * <code>string anim_event_id = 15;</code>
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     * @return Whether the abilityIdentifier field is set.
+     */
+    boolean hasAbilityIdentifier();
+    /**
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     * @return The abilityIdentifier.
+     */
+    emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier getAbilityIdentifier();
+    /**
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     */
+    emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder getAbilityIdentifierOrBuilder();
+
+    /**
+     * <code>uint32 IICFMJEJOBO = 7;</code>
+     * @return The iICFMJEJOBO.
+     */
+    int getIICFMJEJOBO();
+
+    /**
+     * <code>bool is_crit = 8;</code>
+     * @return The isCrit.
+     */
+    boolean getIsCrit();
+
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     * @return Whether the resolvedDir field is set.
+     */
+    boolean hasResolvedDir();
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     * @return The resolvedDir.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getResolvedDir();
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getResolvedDirOrBuilder();
+
+    /**
+     * <code>uint32 BAABHEHFAPH = 10;</code>
+     * @return The bAABHEHFAPH.
+     */
+    int getBAABHEHFAPH();
+
+    /**
+     * <code>uint32 element_type = 11;</code>
+     * @return The elementType.
+     */
+    int getElementType();
+
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     * @return Whether the hitEffResult field is set.
+     */
+    boolean hasHitEffResult();
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     * @return The hitEffResult.
+     */
+    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult();
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     */
+    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder();
+
+    /**
+     * <code>string anim_event_id = 14;</code>
      * @return The animEventId.
      */
     java.lang.String getAnimEventId();
     /**
-     * <code>string anim_event_id = 15;</code>
+     * <code>string anim_event_id = 14;</code>
      * @return The bytes for animEventId.
      */
     com.google.protobuf.ByteString
         getAnimEventIdBytes();
 
     /**
-     * <code>int32 hit_retreat_angle_compat = 13;</code>
-     * @return The hitRetreatAngleCompat.
-     */
-    int getHitRetreatAngleCompat();
-
-    /**
-     * <code>uint32 KGKNJIIOPMP = 1649;</code>
-     * @return The kGKNJIIOPMP.
-     */
-    int getKGKNJIIOPMP();
-
-    /**
-     * <code>uint32 EFKGDDIGOHJ = 82;</code>
-     * @return The eFKGDDIGOHJ.
-     */
-    int getEFKGDDIGOHJ();
-
-    /**
-     * <code>uint32 JDPELIFFANG = 394;</code>
-     * @return The jDPELIFFANG.
-     */
-    int getJDPELIFFANG();
-
-    /**
-     * <code>uint32 ODBKCAJFBMO = 1652;</code>
-     * @return The oDBKCAJFBMO.
-     */
-    int getODBKCAJFBMO();
-
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     * @return Whether the abilityIdentifier field is set.
-     */
-    boolean hasAbilityIdentifier();
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     * @return The abilityIdentifier.
-     */
-    emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier getAbilityIdentifier();
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     */
-    emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder getAbilityIdentifierOrBuilder();
-
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     * @return Whether the resolvedDir field is set.
-     */
-    boolean hasResolvedDir();
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     * @return The resolvedDir.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getResolvedDir();
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getResolvedDirOrBuilder();
-
-    /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      * @return Whether the hitCollision field is set.
      */
     boolean hasHitCollision();
     /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      * @return The hitCollision.
      */
     emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision getHitCollision();
     /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      */
     emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollisionOrBuilder getHitCollisionOrBuilder();
 
     /**
-     * <code>uint32 NFDLHHGPLKL = 866;</code>
-     * @return The nFDLHHGPLKL.
+     * <code>uint32 MPBEBAKODGF = 222;</code>
+     * @return The mPBEBAKODGF.
      */
-    int getNFDLHHGPLKL();
+    int getMPBEBAKODGF();
 
     /**
-     * <code>uint32 OEEFAHMCLOM = 216;</code>
-     * @return The oEEFAHMCLOM.
+     * <code>uint32 EBLEIGGLHLG = 309;</code>
+     * @return The eBLEIGGLHLG.
      */
-    int getOEEFAHMCLOM();
+    int getEBLEIGGLHLG();
 
     /**
-     * <code>uint32 IEJNKCBILGI = 1603;</code>
-     * @return The iEJNKCBILGI.
+     * <pre>
+     * 533
+     * </pre>
+     *
+     * <code>float element_amplify_rate = 389;</code>
+     * @return The elementAmplifyRate.
      */
-    int getIEJNKCBILGI();
+    float getElementAmplifyRate();
 
     /**
-     * <code>bool FIHKEJMFKHO = 1672;</code>
-     * @return The fIHKEJMFKHO.
+     * <pre>
+     * 389
+     * </pre>
+     *
+     * <code>float element_durability_attenuation = 533;</code>
+     * @return The elementDurabilityAttenuation.
      */
-    boolean getFIHKEJMFKHO();
+    float getElementDurabilityAttenuation();
+
+    /**
+     * <code>bool mute_element_hurt = 590;</code>
+     * @return The muteElementHurt.
+     */
+    boolean getMuteElementHurt();
+
+    /**
+     * <code>uint32 MFLNDGPEJOE = 606;</code>
+     * @return The mFLNDGPEJOE.
+     */
+    int getMFLNDGPEJOE();
+
+    /**
+     * <code>float damage_shield = 779;</code>
+     * @return The damageShield.
+     */
+    float getDamageShield();
+
+    /**
+     * <code>uint32 IFMINIBILFH = 823;</code>
+     * @return The iFMINIBILFH.
+     */
+    int getIFMINIBILFH();
+
+    /**
+     * <code>uint32 JKGEMBOBALF = 1349;</code>
+     * @return The jKGEMBOBALF.
+     */
+    int getJKGEMBOBALF();
+
+    /**
+     * <code>uint32 EKJHPCHCMLF = 1525;</code>
+     * @return The eKJHPCHCMLF.
+     */
+    int getEKJHPCHCMLF();
+
+    /**
+     * <code>uint32 POAFAPLMPEB = 1640;</code>
+     * @return The pOAFAPLMPEB.
+     */
+    int getPOAFAPLMPEB();
+
+    /**
+     * <code>bool use_gadget_damage_action = 1733;</code>
+     * @return The useGadgetDamageAction.
+     */
+    boolean getUseGadgetDamageAction();
+
+    /**
+     * <code>uint32 ELIFILCNKFD = 1756;</code>
+     * @return The eLIFILCNKFD.
+     */
+    int getELIFILCNKFD();
+
+    /**
+     * <code>float endure_delta = 1827;</code>
+     * @return The endureDelta.
+     */
+    float getEndureDelta();
+
+    /**
+     * <code>uint32 FLPFBAFHGNN = 1842;</code>
+     * @return The fLPFBAFHGNN.
+     */
+    int getFLPFBAFHGNN();
+
+    /**
+     * <code>uint32 NMPEDJOPMMB = 1859;</code>
+     * @return The nMPEDJOPMMB.
+     */
+    int getNMPEDJOPMMB();
+
+    /**
+     * <code>bool is_resist_text = 1978;</code>
+     * @return The isResistText.
+     */
+    boolean getIsResistText();
+
+    /**
+     * <code>uint32 GMNJEDPKNDE = 2023;</code>
+     * @return The gMNJEDPKNDE.
+     */
+    int getGMNJEDPKNDE();
   }
   /**
-   * <pre>
-   * Obf: ICJAFHIJEBJ
-   * </pre>
-   *
    * Protobuf type {@code AttackResult}
    */
   public static final class AttackResult extends
@@ -290,12 +300,27 @@ public final class AttackResultOuterClass {
             case 0:
               done = true;
               break;
+            case 8: {
+
+              attackerId_ = input.readUInt32();
+              break;
+            }
             case 21: {
 
               damage_ = input.readFloat();
               break;
             }
-            case 26: {
+            case 24: {
+
+              hitRetreatAngleCompat_ = input.readInt32();
+              break;
+            }
+            case 40: {
+
+              defenseId_ = input.readUInt32();
+              break;
+            }
+            case 50: {
               emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder subBuilder = null;
               if (abilityIdentifier_ != null) {
                 subBuilder = abilityIdentifier_.toBuilder();
@@ -308,7 +333,17 @@ public final class AttackResultOuterClass {
 
               break;
             }
-            case 34: {
+            case 56: {
+
+              iICFMJEJOBO_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              isCrit_ = input.readBool();
+              break;
+            }
+            case 74: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (resolvedDir_ != null) {
                 subBuilder = resolvedDir_.toBuilder();
@@ -321,12 +356,17 @@ public final class AttackResultOuterClass {
 
               break;
             }
-            case 40: {
+            case 80: {
 
-              bLJNCIEFOED_ = input.readUInt32();
+              bAABHEHFAPH_ = input.readUInt32();
               break;
             }
-            case 50: {
+            case 88: {
+
+              elementType_ = input.readUInt32();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder subBuilder = null;
               if (hitEffResult_ != null) {
                 subBuilder = hitEffResult_.toBuilder();
@@ -339,27 +379,13 @@ public final class AttackResultOuterClass {
 
               break;
             }
-            case 56: {
+            case 114: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              bAAHKFCEBMA_ = input.readBool();
+              animEventId_ = s;
               break;
             }
-            case 64: {
-
-              mIKMJNBAAIJ_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              defenseId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              elementType_ = input.readUInt32();
-              break;
-            }
-            case 90: {
+            case 122: {
               emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder subBuilder = null;
               if (hitCollision_ != null) {
                 subBuilder = hitCollision_.toBuilder();
@@ -372,105 +398,94 @@ public final class AttackResultOuterClass {
 
               break;
             }
-            case 104: {
+            case 1776: {
 
-              hitRetreatAngleCompat_ = input.readInt32();
+              mPBEBAKODGF_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 2472: {
 
-              attackerId_ = input.readUInt32();
+              eBLEIGGLHLG_ = input.readUInt32();
               break;
             }
-            case 122: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 3117: {
 
-              animEventId_ = s;
+              elementAmplifyRate_ = input.readFloat();
               break;
             }
-            case 221: {
+            case 4269: {
 
-              dPHDFDJJNOA_ = input.readFloat();
+              elementDurabilityAttenuation_ = input.readFloat();
               break;
             }
-            case 656: {
+            case 4720: {
 
-              eFKGDDIGOHJ_ = input.readUInt32();
+              muteElementHurt_ = input.readBool();
               break;
             }
-            case 1728: {
+            case 4848: {
 
-              oEEFAHMCLOM_ = input.readUInt32();
+              mFLNDGPEJOE_ = input.readUInt32();
               break;
             }
-            case 2512: {
+            case 6237: {
 
-              eMOHABNNHBJ_ = input.readUInt32();
+              damageShield_ = input.readFloat();
               break;
             }
-            case 3024: {
+            case 6584: {
 
-              bILAJCEBMGF_ = input.readBool();
+              iFMINIBILFH_ = input.readUInt32();
               break;
             }
-            case 3152: {
+            case 10792: {
 
-              jDPELIFFANG_ = input.readUInt32();
+              jKGEMBOBALF_ = input.readUInt32();
               break;
             }
-            case 3656: {
+            case 12200: {
 
-              bKKNPCPEDCF_ = input.readUInt32();
+              eKJHPCHCMLF_ = input.readUInt32();
               break;
             }
-            case 4541: {
+            case 13120: {
 
-              kFCPIKCMIOI_ = input.readFloat();
+              pOAFAPLMPEB_ = input.readUInt32();
               break;
             }
-            case 4872: {
+            case 13864: {
 
-              kAKHNCAHEOP_ = input.readBool();
+              useGadgetDamageAction_ = input.readBool();
               break;
             }
-            case 6229: {
+            case 14048: {
 
-              nLAAOODDKGK_ = input.readFloat();
+              eLIFILCNKFD_ = input.readUInt32();
               break;
             }
-            case 6928: {
+            case 14621: {
 
-              nFDLHHGPLKL_ = input.readUInt32();
+              endureDelta_ = input.readFloat();
               break;
             }
-            case 12816: {
+            case 14736: {
 
-              dKDBHEJFOGD_ = input.readUInt32();
+              fLPFBAFHGNN_ = input.readUInt32();
               break;
             }
-            case 12824: {
+            case 14872: {
 
-              iEJNKCBILGI_ = input.readUInt32();
+              nMPEDJOPMMB_ = input.readUInt32();
               break;
             }
-            case 13192: {
+            case 15824: {
 
-              kGKNJIIOPMP_ = input.readUInt32();
+              isResistText_ = input.readBool();
               break;
             }
-            case 13216: {
+            case 16184: {
 
-              oDBKCAJFBMO_ = input.readUInt32();
-              break;
-            }
-            case 13376: {
-
-              fIHKEJMFKHO_ = input.readBool();
-              break;
-            }
-            case 13789: {
-
-              fMPIEJOMIFJ_ = input.readFloat();
+              gMNJEDPKNDE_ = input.readUInt32();
               break;
             }
             default: {
@@ -505,168 +520,10 @@ public final class AttackResultOuterClass {
               emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.class, emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder.class);
     }
 
-    public static final int BLJNCIEFOED_FIELD_NUMBER = 5;
-    private int bLJNCIEFOED_;
-    /**
-     * <code>uint32 BLJNCIEFOED = 5;</code>
-     * @return The bLJNCIEFOED.
-     */
-    @java.lang.Override
-    public int getBLJNCIEFOED() {
-      return bLJNCIEFOED_;
-    }
-
-    public static final int ELEMENT_TYPE_FIELD_NUMBER = 10;
-    private int elementType_;
-    /**
-     * <code>uint32 element_type = 10;</code>
-     * @return The elementType.
-     */
-    @java.lang.Override
-    public int getElementType() {
-      return elementType_;
-    }
-
-    public static final int FMPIEJOMIFJ_FIELD_NUMBER = 1723;
-    private float fMPIEJOMIFJ_;
-    /**
-     * <code>float FMPIEJOMIFJ = 1723;</code>
-     * @return The fMPIEJOMIFJ.
-     */
-    @java.lang.Override
-    public float getFMPIEJOMIFJ() {
-      return fMPIEJOMIFJ_;
-    }
-
-    public static final int NLAAOODDKGK_FIELD_NUMBER = 778;
-    private float nLAAOODDKGK_;
-    /**
-     * <code>float NLAAOODDKGK = 778;</code>
-     * @return The nLAAOODDKGK.
-     */
-    @java.lang.Override
-    public float getNLAAOODDKGK() {
-      return nLAAOODDKGK_;
-    }
-
-    public static final int BAAHKFCEBMA_FIELD_NUMBER = 7;
-    private boolean bAAHKFCEBMA_;
-    /**
-     * <code>bool BAAHKFCEBMA = 7;</code>
-     * @return The bAAHKFCEBMA.
-     */
-    @java.lang.Override
-    public boolean getBAAHKFCEBMA() {
-      return bAAHKFCEBMA_;
-    }
-
-    public static final int KFCPIKCMIOI_FIELD_NUMBER = 567;
-    private float kFCPIKCMIOI_;
-    /**
-     * <code>float KFCPIKCMIOI = 567;</code>
-     * @return The kFCPIKCMIOI.
-     */
-    @java.lang.Override
-    public float getKFCPIKCMIOI() {
-      return kFCPIKCMIOI_;
-    }
-
-    public static final int DPHDFDJJNOA_FIELD_NUMBER = 27;
-    private float dPHDFDJJNOA_;
-    /**
-     * <code>float DPHDFDJJNOA = 27;</code>
-     * @return The dPHDFDJJNOA.
-     */
-    @java.lang.Override
-    public float getDPHDFDJJNOA() {
-      return dPHDFDJJNOA_;
-    }
-
-    public static final int BILAJCEBMGF_FIELD_NUMBER = 378;
-    private boolean bILAJCEBMGF_;
-    /**
-     * <code>bool BILAJCEBMGF = 378;</code>
-     * @return The bILAJCEBMGF.
-     */
-    @java.lang.Override
-    public boolean getBILAJCEBMGF() {
-      return bILAJCEBMGF_;
-    }
-
-    public static final int MIKMJNBAAIJ_FIELD_NUMBER = 8;
-    private int mIKMJNBAAIJ_;
-    /**
-     * <code>uint32 MIKMJNBAAIJ = 8;</code>
-     * @return The mIKMJNBAAIJ.
-     */
-    @java.lang.Override
-    public int getMIKMJNBAAIJ() {
-      return mIKMJNBAAIJ_;
-    }
-
-    public static final int HIT_EFF_RESULT_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult hitEffResult_;
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     * @return Whether the hitEffResult field is set.
-     */
-    @java.lang.Override
-    public boolean hasHitEffResult() {
-      return hitEffResult_ != null;
-    }
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     * @return The hitEffResult.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult() {
-      return hitEffResult_ == null ? emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
-    }
-    /**
-     * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder() {
-      return getHitEffResult();
-    }
-
-    public static final int BKKNPCPEDCF_FIELD_NUMBER = 457;
-    private int bKKNPCPEDCF_;
-    /**
-     * <code>uint32 BKKNPCPEDCF = 457;</code>
-     * @return The bKKNPCPEDCF.
-     */
-    @java.lang.Override
-    public int getBKKNPCPEDCF() {
-      return bKKNPCPEDCF_;
-    }
-
-    public static final int DKDBHEJFOGD_FIELD_NUMBER = 1602;
-    private int dKDBHEJFOGD_;
-    /**
-     * <code>uint32 DKDBHEJFOGD = 1602;</code>
-     * @return The dKDBHEJFOGD.
-     */
-    @java.lang.Override
-    public int getDKDBHEJFOGD() {
-      return dKDBHEJFOGD_;
-    }
-
-    public static final int DEFENSE_ID_FIELD_NUMBER = 9;
-    private int defenseId_;
-    /**
-     * <code>uint32 defense_id = 9;</code>
-     * @return The defenseId.
-     */
-    @java.lang.Override
-    public int getDefenseId() {
-      return defenseId_;
-    }
-
-    public static final int ATTACKER_ID_FIELD_NUMBER = 14;
+    public static final int ATTACKER_ID_FIELD_NUMBER = 1;
     private int attackerId_;
     /**
-     * <code>uint32 attacker_id = 14;</code>
+     * <code>uint32 attacker_id = 1;</code>
      * @return The attackerId.
      */
     @java.lang.Override
@@ -685,32 +542,154 @@ public final class AttackResultOuterClass {
       return damage_;
     }
 
-    public static final int EMOHABNNHBJ_FIELD_NUMBER = 314;
-    private int eMOHABNNHBJ_;
+    public static final int HIT_RETREAT_ANGLE_COMPAT_FIELD_NUMBER = 3;
+    private int hitRetreatAngleCompat_;
     /**
-     * <code>uint32 EMOHABNNHBJ = 314;</code>
-     * @return The eMOHABNNHBJ.
+     * <code>int32 hit_retreat_angle_compat = 3;</code>
+     * @return The hitRetreatAngleCompat.
      */
     @java.lang.Override
-    public int getEMOHABNNHBJ() {
-      return eMOHABNNHBJ_;
+    public int getHitRetreatAngleCompat() {
+      return hitRetreatAngleCompat_;
     }
 
-    public static final int KAKHNCAHEOP_FIELD_NUMBER = 609;
-    private boolean kAKHNCAHEOP_;
+    public static final int DEFENSE_ID_FIELD_NUMBER = 5;
+    private int defenseId_;
     /**
-     * <code>bool KAKHNCAHEOP = 609;</code>
-     * @return The kAKHNCAHEOP.
+     * <code>uint32 defense_id = 5;</code>
+     * @return The defenseId.
      */
     @java.lang.Override
-    public boolean getKAKHNCAHEOP() {
-      return kAKHNCAHEOP_;
+    public int getDefenseId() {
+      return defenseId_;
     }
 
-    public static final int ANIM_EVENT_ID_FIELD_NUMBER = 15;
+    public static final int ABILITY_IDENTIFIER_FIELD_NUMBER = 6;
+    private emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier abilityIdentifier_;
+    /**
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     * @return Whether the abilityIdentifier field is set.
+     */
+    @java.lang.Override
+    public boolean hasAbilityIdentifier() {
+      return abilityIdentifier_ != null;
+    }
+    /**
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     * @return The abilityIdentifier.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier getAbilityIdentifier() {
+      return abilityIdentifier_ == null ? emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance() : abilityIdentifier_;
+    }
+    /**
+     * <code>.AbilityIdentifier ability_identifier = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder getAbilityIdentifierOrBuilder() {
+      return getAbilityIdentifier();
+    }
+
+    public static final int IICFMJEJOBO_FIELD_NUMBER = 7;
+    private int iICFMJEJOBO_;
+    /**
+     * <code>uint32 IICFMJEJOBO = 7;</code>
+     * @return The iICFMJEJOBO.
+     */
+    @java.lang.Override
+    public int getIICFMJEJOBO() {
+      return iICFMJEJOBO_;
+    }
+
+    public static final int IS_CRIT_FIELD_NUMBER = 8;
+    private boolean isCrit_;
+    /**
+     * <code>bool is_crit = 8;</code>
+     * @return The isCrit.
+     */
+    @java.lang.Override
+    public boolean getIsCrit() {
+      return isCrit_;
+    }
+
+    public static final int RESOLVED_DIR_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector resolvedDir_;
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     * @return Whether the resolvedDir field is set.
+     */
+    @java.lang.Override
+    public boolean hasResolvedDir() {
+      return resolvedDir_ != null;
+    }
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     * @return The resolvedDir.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getResolvedDir() {
+      return resolvedDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : resolvedDir_;
+    }
+    /**
+     * <code>.Vector resolved_dir = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getResolvedDirOrBuilder() {
+      return getResolvedDir();
+    }
+
+    public static final int BAABHEHFAPH_FIELD_NUMBER = 10;
+    private int bAABHEHFAPH_;
+    /**
+     * <code>uint32 BAABHEHFAPH = 10;</code>
+     * @return The bAABHEHFAPH.
+     */
+    @java.lang.Override
+    public int getBAABHEHFAPH() {
+      return bAABHEHFAPH_;
+    }
+
+    public static final int ELEMENT_TYPE_FIELD_NUMBER = 11;
+    private int elementType_;
+    /**
+     * <code>uint32 element_type = 11;</code>
+     * @return The elementType.
+     */
+    @java.lang.Override
+    public int getElementType() {
+      return elementType_;
+    }
+
+    public static final int HIT_EFF_RESULT_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult hitEffResult_;
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     * @return Whether the hitEffResult field is set.
+     */
+    @java.lang.Override
+    public boolean hasHitEffResult() {
+      return hitEffResult_ != null;
+    }
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     * @return The hitEffResult.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult() {
+      return hitEffResult_ == null ? emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
+    }
+    /**
+     * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder() {
+      return getHitEffResult();
+    }
+
+    public static final int ANIM_EVENT_ID_FIELD_NUMBER = 14;
     private volatile java.lang.Object animEventId_;
     /**
-     * <code>string anim_event_id = 15;</code>
+     * <code>string anim_event_id = 14;</code>
      * @return The animEventId.
      */
     @java.lang.Override
@@ -727,7 +706,7 @@ public final class AttackResultOuterClass {
       }
     }
     /**
-     * <code>string anim_event_id = 15;</code>
+     * <code>string anim_event_id = 14;</code>
      * @return The bytes for animEventId.
      */
     @java.lang.Override
@@ -745,117 +724,10 @@ public final class AttackResultOuterClass {
       }
     }
 
-    public static final int HIT_RETREAT_ANGLE_COMPAT_FIELD_NUMBER = 13;
-    private int hitRetreatAngleCompat_;
-    /**
-     * <code>int32 hit_retreat_angle_compat = 13;</code>
-     * @return The hitRetreatAngleCompat.
-     */
-    @java.lang.Override
-    public int getHitRetreatAngleCompat() {
-      return hitRetreatAngleCompat_;
-    }
-
-    public static final int KGKNJIIOPMP_FIELD_NUMBER = 1649;
-    private int kGKNJIIOPMP_;
-    /**
-     * <code>uint32 KGKNJIIOPMP = 1649;</code>
-     * @return The kGKNJIIOPMP.
-     */
-    @java.lang.Override
-    public int getKGKNJIIOPMP() {
-      return kGKNJIIOPMP_;
-    }
-
-    public static final int EFKGDDIGOHJ_FIELD_NUMBER = 82;
-    private int eFKGDDIGOHJ_;
-    /**
-     * <code>uint32 EFKGDDIGOHJ = 82;</code>
-     * @return The eFKGDDIGOHJ.
-     */
-    @java.lang.Override
-    public int getEFKGDDIGOHJ() {
-      return eFKGDDIGOHJ_;
-    }
-
-    public static final int JDPELIFFANG_FIELD_NUMBER = 394;
-    private int jDPELIFFANG_;
-    /**
-     * <code>uint32 JDPELIFFANG = 394;</code>
-     * @return The jDPELIFFANG.
-     */
-    @java.lang.Override
-    public int getJDPELIFFANG() {
-      return jDPELIFFANG_;
-    }
-
-    public static final int ODBKCAJFBMO_FIELD_NUMBER = 1652;
-    private int oDBKCAJFBMO_;
-    /**
-     * <code>uint32 ODBKCAJFBMO = 1652;</code>
-     * @return The oDBKCAJFBMO.
-     */
-    @java.lang.Override
-    public int getODBKCAJFBMO() {
-      return oDBKCAJFBMO_;
-    }
-
-    public static final int ABILITY_IDENTIFIER_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier abilityIdentifier_;
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     * @return Whether the abilityIdentifier field is set.
-     */
-    @java.lang.Override
-    public boolean hasAbilityIdentifier() {
-      return abilityIdentifier_ != null;
-    }
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     * @return The abilityIdentifier.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier getAbilityIdentifier() {
-      return abilityIdentifier_ == null ? emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.getDefaultInstance() : abilityIdentifier_;
-    }
-    /**
-     * <code>.AbilityIdentifier ability_identifier = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder getAbilityIdentifierOrBuilder() {
-      return getAbilityIdentifier();
-    }
-
-    public static final int RESOLVED_DIR_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector resolvedDir_;
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     * @return Whether the resolvedDir field is set.
-     */
-    @java.lang.Override
-    public boolean hasResolvedDir() {
-      return resolvedDir_ != null;
-    }
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     * @return The resolvedDir.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getResolvedDir() {
-      return resolvedDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : resolvedDir_;
-    }
-    /**
-     * <code>.Vector resolved_dir = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getResolvedDirOrBuilder() {
-      return getResolvedDir();
-    }
-
-    public static final int HIT_COLLISION_FIELD_NUMBER = 11;
+    public static final int HIT_COLLISION_FIELD_NUMBER = 15;
     private emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision hitCollision_;
     /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      * @return Whether the hitCollision field is set.
      */
     @java.lang.Override
@@ -863,7 +735,7 @@ public final class AttackResultOuterClass {
       return hitCollision_ != null;
     }
     /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      * @return The hitCollision.
      */
     @java.lang.Override
@@ -871,55 +743,217 @@ public final class AttackResultOuterClass {
       return hitCollision_ == null ? emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.getDefaultInstance() : hitCollision_;
     }
     /**
-     * <code>.HitCollision hit_collision = 11;</code>
+     * <code>.HitCollision hit_collision = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollisionOrBuilder getHitCollisionOrBuilder() {
       return getHitCollision();
     }
 
-    public static final int NFDLHHGPLKL_FIELD_NUMBER = 866;
-    private int nFDLHHGPLKL_;
+    public static final int MPBEBAKODGF_FIELD_NUMBER = 222;
+    private int mPBEBAKODGF_;
     /**
-     * <code>uint32 NFDLHHGPLKL = 866;</code>
-     * @return The nFDLHHGPLKL.
+     * <code>uint32 MPBEBAKODGF = 222;</code>
+     * @return The mPBEBAKODGF.
      */
     @java.lang.Override
-    public int getNFDLHHGPLKL() {
-      return nFDLHHGPLKL_;
+    public int getMPBEBAKODGF() {
+      return mPBEBAKODGF_;
     }
 
-    public static final int OEEFAHMCLOM_FIELD_NUMBER = 216;
-    private int oEEFAHMCLOM_;
+    public static final int EBLEIGGLHLG_FIELD_NUMBER = 309;
+    private int eBLEIGGLHLG_;
     /**
-     * <code>uint32 OEEFAHMCLOM = 216;</code>
-     * @return The oEEFAHMCLOM.
+     * <code>uint32 EBLEIGGLHLG = 309;</code>
+     * @return The eBLEIGGLHLG.
      */
     @java.lang.Override
-    public int getOEEFAHMCLOM() {
-      return oEEFAHMCLOM_;
+    public int getEBLEIGGLHLG() {
+      return eBLEIGGLHLG_;
     }
 
-    public static final int IEJNKCBILGI_FIELD_NUMBER = 1603;
-    private int iEJNKCBILGI_;
+    public static final int ELEMENT_AMPLIFY_RATE_FIELD_NUMBER = 389;
+    private float elementAmplifyRate_;
     /**
-     * <code>uint32 IEJNKCBILGI = 1603;</code>
-     * @return The iEJNKCBILGI.
+     * <pre>
+     * 533
+     * </pre>
+     *
+     * <code>float element_amplify_rate = 389;</code>
+     * @return The elementAmplifyRate.
      */
     @java.lang.Override
-    public int getIEJNKCBILGI() {
-      return iEJNKCBILGI_;
+    public float getElementAmplifyRate() {
+      return elementAmplifyRate_;
     }
 
-    public static final int FIHKEJMFKHO_FIELD_NUMBER = 1672;
-    private boolean fIHKEJMFKHO_;
+    public static final int ELEMENT_DURABILITY_ATTENUATION_FIELD_NUMBER = 533;
+    private float elementDurabilityAttenuation_;
     /**
-     * <code>bool FIHKEJMFKHO = 1672;</code>
-     * @return The fIHKEJMFKHO.
+     * <pre>
+     * 389
+     * </pre>
+     *
+     * <code>float element_durability_attenuation = 533;</code>
+     * @return The elementDurabilityAttenuation.
      */
     @java.lang.Override
-    public boolean getFIHKEJMFKHO() {
-      return fIHKEJMFKHO_;
+    public float getElementDurabilityAttenuation() {
+      return elementDurabilityAttenuation_;
+    }
+
+    public static final int MUTE_ELEMENT_HURT_FIELD_NUMBER = 590;
+    private boolean muteElementHurt_;
+    /**
+     * <code>bool mute_element_hurt = 590;</code>
+     * @return The muteElementHurt.
+     */
+    @java.lang.Override
+    public boolean getMuteElementHurt() {
+      return muteElementHurt_;
+    }
+
+    public static final int MFLNDGPEJOE_FIELD_NUMBER = 606;
+    private int mFLNDGPEJOE_;
+    /**
+     * <code>uint32 MFLNDGPEJOE = 606;</code>
+     * @return The mFLNDGPEJOE.
+     */
+    @java.lang.Override
+    public int getMFLNDGPEJOE() {
+      return mFLNDGPEJOE_;
+    }
+
+    public static final int DAMAGE_SHIELD_FIELD_NUMBER = 779;
+    private float damageShield_;
+    /**
+     * <code>float damage_shield = 779;</code>
+     * @return The damageShield.
+     */
+    @java.lang.Override
+    public float getDamageShield() {
+      return damageShield_;
+    }
+
+    public static final int IFMINIBILFH_FIELD_NUMBER = 823;
+    private int iFMINIBILFH_;
+    /**
+     * <code>uint32 IFMINIBILFH = 823;</code>
+     * @return The iFMINIBILFH.
+     */
+    @java.lang.Override
+    public int getIFMINIBILFH() {
+      return iFMINIBILFH_;
+    }
+
+    public static final int JKGEMBOBALF_FIELD_NUMBER = 1349;
+    private int jKGEMBOBALF_;
+    /**
+     * <code>uint32 JKGEMBOBALF = 1349;</code>
+     * @return The jKGEMBOBALF.
+     */
+    @java.lang.Override
+    public int getJKGEMBOBALF() {
+      return jKGEMBOBALF_;
+    }
+
+    public static final int EKJHPCHCMLF_FIELD_NUMBER = 1525;
+    private int eKJHPCHCMLF_;
+    /**
+     * <code>uint32 EKJHPCHCMLF = 1525;</code>
+     * @return The eKJHPCHCMLF.
+     */
+    @java.lang.Override
+    public int getEKJHPCHCMLF() {
+      return eKJHPCHCMLF_;
+    }
+
+    public static final int POAFAPLMPEB_FIELD_NUMBER = 1640;
+    private int pOAFAPLMPEB_;
+    /**
+     * <code>uint32 POAFAPLMPEB = 1640;</code>
+     * @return The pOAFAPLMPEB.
+     */
+    @java.lang.Override
+    public int getPOAFAPLMPEB() {
+      return pOAFAPLMPEB_;
+    }
+
+    public static final int USE_GADGET_DAMAGE_ACTION_FIELD_NUMBER = 1733;
+    private boolean useGadgetDamageAction_;
+    /**
+     * <code>bool use_gadget_damage_action = 1733;</code>
+     * @return The useGadgetDamageAction.
+     */
+    @java.lang.Override
+    public boolean getUseGadgetDamageAction() {
+      return useGadgetDamageAction_;
+    }
+
+    public static final int ELIFILCNKFD_FIELD_NUMBER = 1756;
+    private int eLIFILCNKFD_;
+    /**
+     * <code>uint32 ELIFILCNKFD = 1756;</code>
+     * @return The eLIFILCNKFD.
+     */
+    @java.lang.Override
+    public int getELIFILCNKFD() {
+      return eLIFILCNKFD_;
+    }
+
+    public static final int ENDURE_DELTA_FIELD_NUMBER = 1827;
+    private float endureDelta_;
+    /**
+     * <code>float endure_delta = 1827;</code>
+     * @return The endureDelta.
+     */
+    @java.lang.Override
+    public float getEndureDelta() {
+      return endureDelta_;
+    }
+
+    public static final int FLPFBAFHGNN_FIELD_NUMBER = 1842;
+    private int fLPFBAFHGNN_;
+    /**
+     * <code>uint32 FLPFBAFHGNN = 1842;</code>
+     * @return The fLPFBAFHGNN.
+     */
+    @java.lang.Override
+    public int getFLPFBAFHGNN() {
+      return fLPFBAFHGNN_;
+    }
+
+    public static final int NMPEDJOPMMB_FIELD_NUMBER = 1859;
+    private int nMPEDJOPMMB_;
+    /**
+     * <code>uint32 NMPEDJOPMMB = 1859;</code>
+     * @return The nMPEDJOPMMB.
+     */
+    @java.lang.Override
+    public int getNMPEDJOPMMB() {
+      return nMPEDJOPMMB_;
+    }
+
+    public static final int IS_RESIST_TEXT_FIELD_NUMBER = 1978;
+    private boolean isResistText_;
+    /**
+     * <code>bool is_resist_text = 1978;</code>
+     * @return The isResistText.
+     */
+    @java.lang.Override
+    public boolean getIsResistText() {
+      return isResistText_;
+    }
+
+    public static final int GMNJEDPKNDE_FIELD_NUMBER = 2023;
+    private int gMNJEDPKNDE_;
+    /**
+     * <code>uint32 GMNJEDPKNDE = 2023;</code>
+     * @return The gMNJEDPKNDE.
+     */
+    @java.lang.Override
+    public int getGMNJEDPKNDE() {
+      return gMNJEDPKNDE_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -936,95 +970,98 @@ public final class AttackResultOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (attackerId_ != 0) {
+        output.writeUInt32(1, attackerId_);
+      }
       if (damage_ != 0F) {
         output.writeFloat(2, damage_);
       }
-      if (abilityIdentifier_ != null) {
-        output.writeMessage(3, getAbilityIdentifier());
-      }
-      if (resolvedDir_ != null) {
-        output.writeMessage(4, getResolvedDir());
-      }
-      if (bLJNCIEFOED_ != 0) {
-        output.writeUInt32(5, bLJNCIEFOED_);
-      }
-      if (hitEffResult_ != null) {
-        output.writeMessage(6, getHitEffResult());
-      }
-      if (bAAHKFCEBMA_ != false) {
-        output.writeBool(7, bAAHKFCEBMA_);
-      }
-      if (mIKMJNBAAIJ_ != 0) {
-        output.writeUInt32(8, mIKMJNBAAIJ_);
+      if (hitRetreatAngleCompat_ != 0) {
+        output.writeInt32(3, hitRetreatAngleCompat_);
       }
       if (defenseId_ != 0) {
-        output.writeUInt32(9, defenseId_);
+        output.writeUInt32(5, defenseId_);
+      }
+      if (abilityIdentifier_ != null) {
+        output.writeMessage(6, getAbilityIdentifier());
+      }
+      if (iICFMJEJOBO_ != 0) {
+        output.writeUInt32(7, iICFMJEJOBO_);
+      }
+      if (isCrit_ != false) {
+        output.writeBool(8, isCrit_);
+      }
+      if (resolvedDir_ != null) {
+        output.writeMessage(9, getResolvedDir());
+      }
+      if (bAABHEHFAPH_ != 0) {
+        output.writeUInt32(10, bAABHEHFAPH_);
       }
       if (elementType_ != 0) {
-        output.writeUInt32(10, elementType_);
+        output.writeUInt32(11, elementType_);
       }
-      if (hitCollision_ != null) {
-        output.writeMessage(11, getHitCollision());
-      }
-      if (hitRetreatAngleCompat_ != 0) {
-        output.writeInt32(13, hitRetreatAngleCompat_);
-      }
-      if (attackerId_ != 0) {
-        output.writeUInt32(14, attackerId_);
+      if (hitEffResult_ != null) {
+        output.writeMessage(13, getHitEffResult());
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(animEventId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, animEventId_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, animEventId_);
       }
-      if (dPHDFDJJNOA_ != 0F) {
-        output.writeFloat(27, dPHDFDJJNOA_);
+      if (hitCollision_ != null) {
+        output.writeMessage(15, getHitCollision());
       }
-      if (eFKGDDIGOHJ_ != 0) {
-        output.writeUInt32(82, eFKGDDIGOHJ_);
+      if (mPBEBAKODGF_ != 0) {
+        output.writeUInt32(222, mPBEBAKODGF_);
       }
-      if (oEEFAHMCLOM_ != 0) {
-        output.writeUInt32(216, oEEFAHMCLOM_);
+      if (eBLEIGGLHLG_ != 0) {
+        output.writeUInt32(309, eBLEIGGLHLG_);
       }
-      if (eMOHABNNHBJ_ != 0) {
-        output.writeUInt32(314, eMOHABNNHBJ_);
+      if (elementAmplifyRate_ != 0F) {
+        output.writeFloat(389, elementAmplifyRate_);
       }
-      if (bILAJCEBMGF_ != false) {
-        output.writeBool(378, bILAJCEBMGF_);
+      if (elementDurabilityAttenuation_ != 0F) {
+        output.writeFloat(533, elementDurabilityAttenuation_);
       }
-      if (jDPELIFFANG_ != 0) {
-        output.writeUInt32(394, jDPELIFFANG_);
+      if (muteElementHurt_ != false) {
+        output.writeBool(590, muteElementHurt_);
       }
-      if (bKKNPCPEDCF_ != 0) {
-        output.writeUInt32(457, bKKNPCPEDCF_);
+      if (mFLNDGPEJOE_ != 0) {
+        output.writeUInt32(606, mFLNDGPEJOE_);
       }
-      if (kFCPIKCMIOI_ != 0F) {
-        output.writeFloat(567, kFCPIKCMIOI_);
+      if (damageShield_ != 0F) {
+        output.writeFloat(779, damageShield_);
       }
-      if (kAKHNCAHEOP_ != false) {
-        output.writeBool(609, kAKHNCAHEOP_);
+      if (iFMINIBILFH_ != 0) {
+        output.writeUInt32(823, iFMINIBILFH_);
       }
-      if (nLAAOODDKGK_ != 0F) {
-        output.writeFloat(778, nLAAOODDKGK_);
+      if (jKGEMBOBALF_ != 0) {
+        output.writeUInt32(1349, jKGEMBOBALF_);
       }
-      if (nFDLHHGPLKL_ != 0) {
-        output.writeUInt32(866, nFDLHHGPLKL_);
+      if (eKJHPCHCMLF_ != 0) {
+        output.writeUInt32(1525, eKJHPCHCMLF_);
       }
-      if (dKDBHEJFOGD_ != 0) {
-        output.writeUInt32(1602, dKDBHEJFOGD_);
+      if (pOAFAPLMPEB_ != 0) {
+        output.writeUInt32(1640, pOAFAPLMPEB_);
       }
-      if (iEJNKCBILGI_ != 0) {
-        output.writeUInt32(1603, iEJNKCBILGI_);
+      if (useGadgetDamageAction_ != false) {
+        output.writeBool(1733, useGadgetDamageAction_);
       }
-      if (kGKNJIIOPMP_ != 0) {
-        output.writeUInt32(1649, kGKNJIIOPMP_);
+      if (eLIFILCNKFD_ != 0) {
+        output.writeUInt32(1756, eLIFILCNKFD_);
       }
-      if (oDBKCAJFBMO_ != 0) {
-        output.writeUInt32(1652, oDBKCAJFBMO_);
+      if (endureDelta_ != 0F) {
+        output.writeFloat(1827, endureDelta_);
       }
-      if (fIHKEJMFKHO_ != false) {
-        output.writeBool(1672, fIHKEJMFKHO_);
+      if (fLPFBAFHGNN_ != 0) {
+        output.writeUInt32(1842, fLPFBAFHGNN_);
       }
-      if (fMPIEJOMIFJ_ != 0F) {
-        output.writeFloat(1723, fMPIEJOMIFJ_);
+      if (nMPEDJOPMMB_ != 0) {
+        output.writeUInt32(1859, nMPEDJOPMMB_);
+      }
+      if (isResistText_ != false) {
+        output.writeBool(1978, isResistText_);
+      }
+      if (gMNJEDPKNDE_ != 0) {
+        output.writeUInt32(2023, gMNJEDPKNDE_);
       }
       unknownFields.writeTo(output);
     }
@@ -1035,124 +1072,128 @@ public final class AttackResultOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (attackerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, attackerId_);
+      }
       if (damage_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
           .computeFloatSize(2, damage_);
       }
-      if (abilityIdentifier_ != null) {
+      if (hitRetreatAngleCompat_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getAbilityIdentifier());
-      }
-      if (resolvedDir_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getResolvedDir());
-      }
-      if (bLJNCIEFOED_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, bLJNCIEFOED_);
-      }
-      if (hitEffResult_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getHitEffResult());
-      }
-      if (bAAHKFCEBMA_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, bAAHKFCEBMA_);
-      }
-      if (mIKMJNBAAIJ_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, mIKMJNBAAIJ_);
+          .computeInt32Size(3, hitRetreatAngleCompat_);
       }
       if (defenseId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, defenseId_);
+          .computeUInt32Size(5, defenseId_);
+      }
+      if (abilityIdentifier_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getAbilityIdentifier());
+      }
+      if (iICFMJEJOBO_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, iICFMJEJOBO_);
+      }
+      if (isCrit_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(8, isCrit_);
+      }
+      if (resolvedDir_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getResolvedDir());
+      }
+      if (bAABHEHFAPH_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, bAABHEHFAPH_);
       }
       if (elementType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, elementType_);
+          .computeUInt32Size(11, elementType_);
+      }
+      if (hitEffResult_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, getHitEffResult());
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(animEventId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, animEventId_);
       }
       if (hitCollision_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getHitCollision());
+          .computeMessageSize(15, getHitCollision());
       }
-      if (hitRetreatAngleCompat_ != 0) {
+      if (mPBEBAKODGF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, hitRetreatAngleCompat_);
+          .computeUInt32Size(222, mPBEBAKODGF_);
       }
-      if (attackerId_ != 0) {
+      if (eBLEIGGLHLG_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, attackerId_);
+          .computeUInt32Size(309, eBLEIGGLHLG_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(animEventId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, animEventId_);
-      }
-      if (dPHDFDJJNOA_ != 0F) {
+      if (elementAmplifyRate_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(27, dPHDFDJJNOA_);
+          .computeFloatSize(389, elementAmplifyRate_);
       }
-      if (eFKGDDIGOHJ_ != 0) {
+      if (elementDurabilityAttenuation_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(82, eFKGDDIGOHJ_);
+          .computeFloatSize(533, elementDurabilityAttenuation_);
       }
-      if (oEEFAHMCLOM_ != 0) {
+      if (muteElementHurt_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(216, oEEFAHMCLOM_);
+          .computeBoolSize(590, muteElementHurt_);
       }
-      if (eMOHABNNHBJ_ != 0) {
+      if (mFLNDGPEJOE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(314, eMOHABNNHBJ_);
+          .computeUInt32Size(606, mFLNDGPEJOE_);
       }
-      if (bILAJCEBMGF_ != false) {
+      if (damageShield_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(378, bILAJCEBMGF_);
+          .computeFloatSize(779, damageShield_);
       }
-      if (jDPELIFFANG_ != 0) {
+      if (iFMINIBILFH_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(394, jDPELIFFANG_);
+          .computeUInt32Size(823, iFMINIBILFH_);
       }
-      if (bKKNPCPEDCF_ != 0) {
+      if (jKGEMBOBALF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(457, bKKNPCPEDCF_);
+          .computeUInt32Size(1349, jKGEMBOBALF_);
       }
-      if (kFCPIKCMIOI_ != 0F) {
+      if (eKJHPCHCMLF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(567, kFCPIKCMIOI_);
+          .computeUInt32Size(1525, eKJHPCHCMLF_);
       }
-      if (kAKHNCAHEOP_ != false) {
+      if (pOAFAPLMPEB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(609, kAKHNCAHEOP_);
+          .computeUInt32Size(1640, pOAFAPLMPEB_);
       }
-      if (nLAAOODDKGK_ != 0F) {
+      if (useGadgetDamageAction_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(778, nLAAOODDKGK_);
+          .computeBoolSize(1733, useGadgetDamageAction_);
       }
-      if (nFDLHHGPLKL_ != 0) {
+      if (eLIFILCNKFD_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(866, nFDLHHGPLKL_);
+          .computeUInt32Size(1756, eLIFILCNKFD_);
       }
-      if (dKDBHEJFOGD_ != 0) {
+      if (endureDelta_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1602, dKDBHEJFOGD_);
+          .computeFloatSize(1827, endureDelta_);
       }
-      if (iEJNKCBILGI_ != 0) {
+      if (fLPFBAFHGNN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1603, iEJNKCBILGI_);
+          .computeUInt32Size(1842, fLPFBAFHGNN_);
       }
-      if (kGKNJIIOPMP_ != 0) {
+      if (nMPEDJOPMMB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1649, kGKNJIIOPMP_);
+          .computeUInt32Size(1859, nMPEDJOPMMB_);
       }
-      if (oDBKCAJFBMO_ != 0) {
+      if (isResistText_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1652, oDBKCAJFBMO_);
+          .computeBoolSize(1978, isResistText_);
       }
-      if (fIHKEJMFKHO_ != false) {
+      if (gMNJEDPKNDE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1672, fIHKEJMFKHO_);
-      }
-      if (fMPIEJOMIFJ_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1723, fMPIEJOMIFJ_);
+          .computeUInt32Size(2023, gMNJEDPKNDE_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1169,83 +1210,85 @@ public final class AttackResultOuterClass {
       }
       emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult other = (emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult) obj;
 
-      if (getBLJNCIEFOED()
-          != other.getBLJNCIEFOED()) return false;
-      if (getElementType()
-          != other.getElementType()) return false;
-      if (java.lang.Float.floatToIntBits(getFMPIEJOMIFJ())
-          != java.lang.Float.floatToIntBits(
-              other.getFMPIEJOMIFJ())) return false;
-      if (java.lang.Float.floatToIntBits(getNLAAOODDKGK())
-          != java.lang.Float.floatToIntBits(
-              other.getNLAAOODDKGK())) return false;
-      if (getBAAHKFCEBMA()
-          != other.getBAAHKFCEBMA()) return false;
-      if (java.lang.Float.floatToIntBits(getKFCPIKCMIOI())
-          != java.lang.Float.floatToIntBits(
-              other.getKFCPIKCMIOI())) return false;
-      if (java.lang.Float.floatToIntBits(getDPHDFDJJNOA())
-          != java.lang.Float.floatToIntBits(
-              other.getDPHDFDJJNOA())) return false;
-      if (getBILAJCEBMGF()
-          != other.getBILAJCEBMGF()) return false;
-      if (getMIKMJNBAAIJ()
-          != other.getMIKMJNBAAIJ()) return false;
-      if (hasHitEffResult() != other.hasHitEffResult()) return false;
-      if (hasHitEffResult()) {
-        if (!getHitEffResult()
-            .equals(other.getHitEffResult())) return false;
-      }
-      if (getBKKNPCPEDCF()
-          != other.getBKKNPCPEDCF()) return false;
-      if (getDKDBHEJFOGD()
-          != other.getDKDBHEJFOGD()) return false;
-      if (getDefenseId()
-          != other.getDefenseId()) return false;
       if (getAttackerId()
           != other.getAttackerId()) return false;
       if (java.lang.Float.floatToIntBits(getDamage())
           != java.lang.Float.floatToIntBits(
               other.getDamage())) return false;
-      if (getEMOHABNNHBJ()
-          != other.getEMOHABNNHBJ()) return false;
-      if (getKAKHNCAHEOP()
-          != other.getKAKHNCAHEOP()) return false;
-      if (!getAnimEventId()
-          .equals(other.getAnimEventId())) return false;
       if (getHitRetreatAngleCompat()
           != other.getHitRetreatAngleCompat()) return false;
-      if (getKGKNJIIOPMP()
-          != other.getKGKNJIIOPMP()) return false;
-      if (getEFKGDDIGOHJ()
-          != other.getEFKGDDIGOHJ()) return false;
-      if (getJDPELIFFANG()
-          != other.getJDPELIFFANG()) return false;
-      if (getODBKCAJFBMO()
-          != other.getODBKCAJFBMO()) return false;
+      if (getDefenseId()
+          != other.getDefenseId()) return false;
       if (hasAbilityIdentifier() != other.hasAbilityIdentifier()) return false;
       if (hasAbilityIdentifier()) {
         if (!getAbilityIdentifier()
             .equals(other.getAbilityIdentifier())) return false;
       }
+      if (getIICFMJEJOBO()
+          != other.getIICFMJEJOBO()) return false;
+      if (getIsCrit()
+          != other.getIsCrit()) return false;
       if (hasResolvedDir() != other.hasResolvedDir()) return false;
       if (hasResolvedDir()) {
         if (!getResolvedDir()
             .equals(other.getResolvedDir())) return false;
       }
+      if (getBAABHEHFAPH()
+          != other.getBAABHEHFAPH()) return false;
+      if (getElementType()
+          != other.getElementType()) return false;
+      if (hasHitEffResult() != other.hasHitEffResult()) return false;
+      if (hasHitEffResult()) {
+        if (!getHitEffResult()
+            .equals(other.getHitEffResult())) return false;
+      }
+      if (!getAnimEventId()
+          .equals(other.getAnimEventId())) return false;
       if (hasHitCollision() != other.hasHitCollision()) return false;
       if (hasHitCollision()) {
         if (!getHitCollision()
             .equals(other.getHitCollision())) return false;
       }
-      if (getNFDLHHGPLKL()
-          != other.getNFDLHHGPLKL()) return false;
-      if (getOEEFAHMCLOM()
-          != other.getOEEFAHMCLOM()) return false;
-      if (getIEJNKCBILGI()
-          != other.getIEJNKCBILGI()) return false;
-      if (getFIHKEJMFKHO()
-          != other.getFIHKEJMFKHO()) return false;
+      if (getMPBEBAKODGF()
+          != other.getMPBEBAKODGF()) return false;
+      if (getEBLEIGGLHLG()
+          != other.getEBLEIGGLHLG()) return false;
+      if (java.lang.Float.floatToIntBits(getElementAmplifyRate())
+          != java.lang.Float.floatToIntBits(
+              other.getElementAmplifyRate())) return false;
+      if (java.lang.Float.floatToIntBits(getElementDurabilityAttenuation())
+          != java.lang.Float.floatToIntBits(
+              other.getElementDurabilityAttenuation())) return false;
+      if (getMuteElementHurt()
+          != other.getMuteElementHurt()) return false;
+      if (getMFLNDGPEJOE()
+          != other.getMFLNDGPEJOE()) return false;
+      if (java.lang.Float.floatToIntBits(getDamageShield())
+          != java.lang.Float.floatToIntBits(
+              other.getDamageShield())) return false;
+      if (getIFMINIBILFH()
+          != other.getIFMINIBILFH()) return false;
+      if (getJKGEMBOBALF()
+          != other.getJKGEMBOBALF()) return false;
+      if (getEKJHPCHCMLF()
+          != other.getEKJHPCHCMLF()) return false;
+      if (getPOAFAPLMPEB()
+          != other.getPOAFAPLMPEB()) return false;
+      if (getUseGadgetDamageAction()
+          != other.getUseGadgetDamageAction()) return false;
+      if (getELIFILCNKFD()
+          != other.getELIFILCNKFD()) return false;
+      if (java.lang.Float.floatToIntBits(getEndureDelta())
+          != java.lang.Float.floatToIntBits(
+              other.getEndureDelta())) return false;
+      if (getFLPFBAFHGNN()
+          != other.getFLPFBAFHGNN()) return false;
+      if (getNMPEDJOPMMB()
+          != other.getNMPEDJOPMMB()) return false;
+      if (getIsResistText()
+          != other.getIsResistText()) return false;
+      if (getGMNJEDPKNDE()
+          != other.getGMNJEDPKNDE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1257,83 +1300,85 @@ public final class AttackResultOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + BLJNCIEFOED_FIELD_NUMBER;
-      hash = (53 * hash) + getBLJNCIEFOED();
-      hash = (37 * hash) + ELEMENT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getElementType();
-      hash = (37 * hash) + FMPIEJOMIFJ_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getFMPIEJOMIFJ());
-      hash = (37 * hash) + NLAAOODDKGK_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNLAAOODDKGK());
-      hash = (37 * hash) + BAAHKFCEBMA_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getBAAHKFCEBMA());
-      hash = (37 * hash) + KFCPIKCMIOI_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getKFCPIKCMIOI());
-      hash = (37 * hash) + DPHDFDJJNOA_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getDPHDFDJJNOA());
-      hash = (37 * hash) + BILAJCEBMGF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getBILAJCEBMGF());
-      hash = (37 * hash) + MIKMJNBAAIJ_FIELD_NUMBER;
-      hash = (53 * hash) + getMIKMJNBAAIJ();
-      if (hasHitEffResult()) {
-        hash = (37 * hash) + HIT_EFF_RESULT_FIELD_NUMBER;
-        hash = (53 * hash) + getHitEffResult().hashCode();
-      }
-      hash = (37 * hash) + BKKNPCPEDCF_FIELD_NUMBER;
-      hash = (53 * hash) + getBKKNPCPEDCF();
-      hash = (37 * hash) + DKDBHEJFOGD_FIELD_NUMBER;
-      hash = (53 * hash) + getDKDBHEJFOGD();
-      hash = (37 * hash) + DEFENSE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDefenseId();
       hash = (37 * hash) + ATTACKER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAttackerId();
       hash = (37 * hash) + DAMAGE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getDamage());
-      hash = (37 * hash) + EMOHABNNHBJ_FIELD_NUMBER;
-      hash = (53 * hash) + getEMOHABNNHBJ();
-      hash = (37 * hash) + KAKHNCAHEOP_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getKAKHNCAHEOP());
-      hash = (37 * hash) + ANIM_EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAnimEventId().hashCode();
       hash = (37 * hash) + HIT_RETREAT_ANGLE_COMPAT_FIELD_NUMBER;
       hash = (53 * hash) + getHitRetreatAngleCompat();
-      hash = (37 * hash) + KGKNJIIOPMP_FIELD_NUMBER;
-      hash = (53 * hash) + getKGKNJIIOPMP();
-      hash = (37 * hash) + EFKGDDIGOHJ_FIELD_NUMBER;
-      hash = (53 * hash) + getEFKGDDIGOHJ();
-      hash = (37 * hash) + JDPELIFFANG_FIELD_NUMBER;
-      hash = (53 * hash) + getJDPELIFFANG();
-      hash = (37 * hash) + ODBKCAJFBMO_FIELD_NUMBER;
-      hash = (53 * hash) + getODBKCAJFBMO();
+      hash = (37 * hash) + DEFENSE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDefenseId();
       if (hasAbilityIdentifier()) {
         hash = (37 * hash) + ABILITY_IDENTIFIER_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityIdentifier().hashCode();
       }
+      hash = (37 * hash) + IICFMJEJOBO_FIELD_NUMBER;
+      hash = (53 * hash) + getIICFMJEJOBO();
+      hash = (37 * hash) + IS_CRIT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsCrit());
       if (hasResolvedDir()) {
         hash = (37 * hash) + RESOLVED_DIR_FIELD_NUMBER;
         hash = (53 * hash) + getResolvedDir().hashCode();
       }
+      hash = (37 * hash) + BAABHEHFAPH_FIELD_NUMBER;
+      hash = (53 * hash) + getBAABHEHFAPH();
+      hash = (37 * hash) + ELEMENT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getElementType();
+      if (hasHitEffResult()) {
+        hash = (37 * hash) + HIT_EFF_RESULT_FIELD_NUMBER;
+        hash = (53 * hash) + getHitEffResult().hashCode();
+      }
+      hash = (37 * hash) + ANIM_EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAnimEventId().hashCode();
       if (hasHitCollision()) {
         hash = (37 * hash) + HIT_COLLISION_FIELD_NUMBER;
         hash = (53 * hash) + getHitCollision().hashCode();
       }
-      hash = (37 * hash) + NFDLHHGPLKL_FIELD_NUMBER;
-      hash = (53 * hash) + getNFDLHHGPLKL();
-      hash = (37 * hash) + OEEFAHMCLOM_FIELD_NUMBER;
-      hash = (53 * hash) + getOEEFAHMCLOM();
-      hash = (37 * hash) + IEJNKCBILGI_FIELD_NUMBER;
-      hash = (53 * hash) + getIEJNKCBILGI();
-      hash = (37 * hash) + FIHKEJMFKHO_FIELD_NUMBER;
+      hash = (37 * hash) + MPBEBAKODGF_FIELD_NUMBER;
+      hash = (53 * hash) + getMPBEBAKODGF();
+      hash = (37 * hash) + EBLEIGGLHLG_FIELD_NUMBER;
+      hash = (53 * hash) + getEBLEIGGLHLG();
+      hash = (37 * hash) + ELEMENT_AMPLIFY_RATE_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getElementAmplifyRate());
+      hash = (37 * hash) + ELEMENT_DURABILITY_ATTENUATION_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getElementDurabilityAttenuation());
+      hash = (37 * hash) + MUTE_ELEMENT_HURT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getFIHKEJMFKHO());
+          getMuteElementHurt());
+      hash = (37 * hash) + MFLNDGPEJOE_FIELD_NUMBER;
+      hash = (53 * hash) + getMFLNDGPEJOE();
+      hash = (37 * hash) + DAMAGE_SHIELD_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getDamageShield());
+      hash = (37 * hash) + IFMINIBILFH_FIELD_NUMBER;
+      hash = (53 * hash) + getIFMINIBILFH();
+      hash = (37 * hash) + JKGEMBOBALF_FIELD_NUMBER;
+      hash = (53 * hash) + getJKGEMBOBALF();
+      hash = (37 * hash) + EKJHPCHCMLF_FIELD_NUMBER;
+      hash = (53 * hash) + getEKJHPCHCMLF();
+      hash = (37 * hash) + POAFAPLMPEB_FIELD_NUMBER;
+      hash = (53 * hash) + getPOAFAPLMPEB();
+      hash = (37 * hash) + USE_GADGET_DAMAGE_ACTION_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getUseGadgetDamageAction());
+      hash = (37 * hash) + ELIFILCNKFD_FIELD_NUMBER;
+      hash = (53 * hash) + getELIFILCNKFD();
+      hash = (37 * hash) + ENDURE_DELTA_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getEndureDelta());
+      hash = (37 * hash) + FLPFBAFHGNN_FIELD_NUMBER;
+      hash = (53 * hash) + getFLPFBAFHGNN();
+      hash = (37 * hash) + NMPEDJOPMMB_FIELD_NUMBER;
+      hash = (53 * hash) + getNMPEDJOPMMB();
+      hash = (37 * hash) + IS_RESIST_TEXT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsResistText());
+      hash = (37 * hash) + GMNJEDPKNDE_FIELD_NUMBER;
+      hash = (53 * hash) + getGMNJEDPKNDE();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1430,10 +1475,6 @@ public final class AttackResultOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ICJAFHIJEBJ
-     * </pre>
-     *
      * Protobuf type {@code AttackResult}
      */
     public static final class Builder extends
@@ -1471,55 +1512,13 @@ public final class AttackResultOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        bLJNCIEFOED_ = 0;
-
-        elementType_ = 0;
-
-        fMPIEJOMIFJ_ = 0F;
-
-        nLAAOODDKGK_ = 0F;
-
-        bAAHKFCEBMA_ = false;
-
-        kFCPIKCMIOI_ = 0F;
-
-        dPHDFDJJNOA_ = 0F;
-
-        bILAJCEBMGF_ = false;
-
-        mIKMJNBAAIJ_ = 0;
-
-        if (hitEffResultBuilder_ == null) {
-          hitEffResult_ = null;
-        } else {
-          hitEffResult_ = null;
-          hitEffResultBuilder_ = null;
-        }
-        bKKNPCPEDCF_ = 0;
-
-        dKDBHEJFOGD_ = 0;
-
-        defenseId_ = 0;
-
         attackerId_ = 0;
 
         damage_ = 0F;
 
-        eMOHABNNHBJ_ = 0;
-
-        kAKHNCAHEOP_ = false;
-
-        animEventId_ = "";
-
         hitRetreatAngleCompat_ = 0;
 
-        kGKNJIIOPMP_ = 0;
-
-        eFKGDDIGOHJ_ = 0;
-
-        jDPELIFFANG_ = 0;
-
-        oDBKCAJFBMO_ = 0;
+        defenseId_ = 0;
 
         if (abilityIdentifierBuilder_ == null) {
           abilityIdentifier_ = null;
@@ -1527,25 +1526,69 @@ public final class AttackResultOuterClass {
           abilityIdentifier_ = null;
           abilityIdentifierBuilder_ = null;
         }
+        iICFMJEJOBO_ = 0;
+
+        isCrit_ = false;
+
         if (resolvedDirBuilder_ == null) {
           resolvedDir_ = null;
         } else {
           resolvedDir_ = null;
           resolvedDirBuilder_ = null;
         }
+        bAABHEHFAPH_ = 0;
+
+        elementType_ = 0;
+
+        if (hitEffResultBuilder_ == null) {
+          hitEffResult_ = null;
+        } else {
+          hitEffResult_ = null;
+          hitEffResultBuilder_ = null;
+        }
+        animEventId_ = "";
+
         if (hitCollisionBuilder_ == null) {
           hitCollision_ = null;
         } else {
           hitCollision_ = null;
           hitCollisionBuilder_ = null;
         }
-        nFDLHHGPLKL_ = 0;
+        mPBEBAKODGF_ = 0;
 
-        oEEFAHMCLOM_ = 0;
+        eBLEIGGLHLG_ = 0;
 
-        iEJNKCBILGI_ = 0;
+        elementAmplifyRate_ = 0F;
 
-        fIHKEJMFKHO_ = false;
+        elementDurabilityAttenuation_ = 0F;
+
+        muteElementHurt_ = false;
+
+        mFLNDGPEJOE_ = 0;
+
+        damageShield_ = 0F;
+
+        iFMINIBILFH_ = 0;
+
+        jKGEMBOBALF_ = 0;
+
+        eKJHPCHCMLF_ = 0;
+
+        pOAFAPLMPEB_ = 0;
+
+        useGadgetDamageAction_ = false;
+
+        eLIFILCNKFD_ = 0;
+
+        endureDelta_ = 0F;
+
+        fLPFBAFHGNN_ = 0;
+
+        nMPEDJOPMMB_ = 0;
+
+        isResistText_ = false;
+
+        gMNJEDPKNDE_ = 0;
 
         return this;
       }
@@ -1573,52 +1616,53 @@ public final class AttackResultOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult buildPartial() {
         emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult result = new emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult(this);
-        result.bLJNCIEFOED_ = bLJNCIEFOED_;
-        result.elementType_ = elementType_;
-        result.fMPIEJOMIFJ_ = fMPIEJOMIFJ_;
-        result.nLAAOODDKGK_ = nLAAOODDKGK_;
-        result.bAAHKFCEBMA_ = bAAHKFCEBMA_;
-        result.kFCPIKCMIOI_ = kFCPIKCMIOI_;
-        result.dPHDFDJJNOA_ = dPHDFDJJNOA_;
-        result.bILAJCEBMGF_ = bILAJCEBMGF_;
-        result.mIKMJNBAAIJ_ = mIKMJNBAAIJ_;
-        if (hitEffResultBuilder_ == null) {
-          result.hitEffResult_ = hitEffResult_;
-        } else {
-          result.hitEffResult_ = hitEffResultBuilder_.build();
-        }
-        result.bKKNPCPEDCF_ = bKKNPCPEDCF_;
-        result.dKDBHEJFOGD_ = dKDBHEJFOGD_;
-        result.defenseId_ = defenseId_;
         result.attackerId_ = attackerId_;
         result.damage_ = damage_;
-        result.eMOHABNNHBJ_ = eMOHABNNHBJ_;
-        result.kAKHNCAHEOP_ = kAKHNCAHEOP_;
-        result.animEventId_ = animEventId_;
         result.hitRetreatAngleCompat_ = hitRetreatAngleCompat_;
-        result.kGKNJIIOPMP_ = kGKNJIIOPMP_;
-        result.eFKGDDIGOHJ_ = eFKGDDIGOHJ_;
-        result.jDPELIFFANG_ = jDPELIFFANG_;
-        result.oDBKCAJFBMO_ = oDBKCAJFBMO_;
+        result.defenseId_ = defenseId_;
         if (abilityIdentifierBuilder_ == null) {
           result.abilityIdentifier_ = abilityIdentifier_;
         } else {
           result.abilityIdentifier_ = abilityIdentifierBuilder_.build();
         }
+        result.iICFMJEJOBO_ = iICFMJEJOBO_;
+        result.isCrit_ = isCrit_;
         if (resolvedDirBuilder_ == null) {
           result.resolvedDir_ = resolvedDir_;
         } else {
           result.resolvedDir_ = resolvedDirBuilder_.build();
         }
+        result.bAABHEHFAPH_ = bAABHEHFAPH_;
+        result.elementType_ = elementType_;
+        if (hitEffResultBuilder_ == null) {
+          result.hitEffResult_ = hitEffResult_;
+        } else {
+          result.hitEffResult_ = hitEffResultBuilder_.build();
+        }
+        result.animEventId_ = animEventId_;
         if (hitCollisionBuilder_ == null) {
           result.hitCollision_ = hitCollision_;
         } else {
           result.hitCollision_ = hitCollisionBuilder_.build();
         }
-        result.nFDLHHGPLKL_ = nFDLHHGPLKL_;
-        result.oEEFAHMCLOM_ = oEEFAHMCLOM_;
-        result.iEJNKCBILGI_ = iEJNKCBILGI_;
-        result.fIHKEJMFKHO_ = fIHKEJMFKHO_;
+        result.mPBEBAKODGF_ = mPBEBAKODGF_;
+        result.eBLEIGGLHLG_ = eBLEIGGLHLG_;
+        result.elementAmplifyRate_ = elementAmplifyRate_;
+        result.elementDurabilityAttenuation_ = elementDurabilityAttenuation_;
+        result.muteElementHurt_ = muteElementHurt_;
+        result.mFLNDGPEJOE_ = mFLNDGPEJOE_;
+        result.damageShield_ = damageShield_;
+        result.iFMINIBILFH_ = iFMINIBILFH_;
+        result.jKGEMBOBALF_ = jKGEMBOBALF_;
+        result.eKJHPCHCMLF_ = eKJHPCHCMLF_;
+        result.pOAFAPLMPEB_ = pOAFAPLMPEB_;
+        result.useGadgetDamageAction_ = useGadgetDamageAction_;
+        result.eLIFILCNKFD_ = eLIFILCNKFD_;
+        result.endureDelta_ = endureDelta_;
+        result.fLPFBAFHGNN_ = fLPFBAFHGNN_;
+        result.nMPEDJOPMMB_ = nMPEDJOPMMB_;
+        result.isResistText_ = isResistText_;
+        result.gMNJEDPKNDE_ = gMNJEDPKNDE_;
         onBuilt();
         return result;
       }
@@ -1667,96 +1711,99 @@ public final class AttackResultOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult other) {
         if (other == emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.getDefaultInstance()) return this;
-        if (other.getBLJNCIEFOED() != 0) {
-          setBLJNCIEFOED(other.getBLJNCIEFOED());
-        }
-        if (other.getElementType() != 0) {
-          setElementType(other.getElementType());
-        }
-        if (other.getFMPIEJOMIFJ() != 0F) {
-          setFMPIEJOMIFJ(other.getFMPIEJOMIFJ());
-        }
-        if (other.getNLAAOODDKGK() != 0F) {
-          setNLAAOODDKGK(other.getNLAAOODDKGK());
-        }
-        if (other.getBAAHKFCEBMA() != false) {
-          setBAAHKFCEBMA(other.getBAAHKFCEBMA());
-        }
-        if (other.getKFCPIKCMIOI() != 0F) {
-          setKFCPIKCMIOI(other.getKFCPIKCMIOI());
-        }
-        if (other.getDPHDFDJJNOA() != 0F) {
-          setDPHDFDJJNOA(other.getDPHDFDJJNOA());
-        }
-        if (other.getBILAJCEBMGF() != false) {
-          setBILAJCEBMGF(other.getBILAJCEBMGF());
-        }
-        if (other.getMIKMJNBAAIJ() != 0) {
-          setMIKMJNBAAIJ(other.getMIKMJNBAAIJ());
-        }
-        if (other.hasHitEffResult()) {
-          mergeHitEffResult(other.getHitEffResult());
-        }
-        if (other.getBKKNPCPEDCF() != 0) {
-          setBKKNPCPEDCF(other.getBKKNPCPEDCF());
-        }
-        if (other.getDKDBHEJFOGD() != 0) {
-          setDKDBHEJFOGD(other.getDKDBHEJFOGD());
-        }
-        if (other.getDefenseId() != 0) {
-          setDefenseId(other.getDefenseId());
-        }
         if (other.getAttackerId() != 0) {
           setAttackerId(other.getAttackerId());
         }
         if (other.getDamage() != 0F) {
           setDamage(other.getDamage());
         }
-        if (other.getEMOHABNNHBJ() != 0) {
-          setEMOHABNNHBJ(other.getEMOHABNNHBJ());
+        if (other.getHitRetreatAngleCompat() != 0) {
+          setHitRetreatAngleCompat(other.getHitRetreatAngleCompat());
         }
-        if (other.getKAKHNCAHEOP() != false) {
-          setKAKHNCAHEOP(other.getKAKHNCAHEOP());
+        if (other.getDefenseId() != 0) {
+          setDefenseId(other.getDefenseId());
+        }
+        if (other.hasAbilityIdentifier()) {
+          mergeAbilityIdentifier(other.getAbilityIdentifier());
+        }
+        if (other.getIICFMJEJOBO() != 0) {
+          setIICFMJEJOBO(other.getIICFMJEJOBO());
+        }
+        if (other.getIsCrit() != false) {
+          setIsCrit(other.getIsCrit());
+        }
+        if (other.hasResolvedDir()) {
+          mergeResolvedDir(other.getResolvedDir());
+        }
+        if (other.getBAABHEHFAPH() != 0) {
+          setBAABHEHFAPH(other.getBAABHEHFAPH());
+        }
+        if (other.getElementType() != 0) {
+          setElementType(other.getElementType());
+        }
+        if (other.hasHitEffResult()) {
+          mergeHitEffResult(other.getHitEffResult());
         }
         if (!other.getAnimEventId().isEmpty()) {
           animEventId_ = other.animEventId_;
           onChanged();
         }
-        if (other.getHitRetreatAngleCompat() != 0) {
-          setHitRetreatAngleCompat(other.getHitRetreatAngleCompat());
-        }
-        if (other.getKGKNJIIOPMP() != 0) {
-          setKGKNJIIOPMP(other.getKGKNJIIOPMP());
-        }
-        if (other.getEFKGDDIGOHJ() != 0) {
-          setEFKGDDIGOHJ(other.getEFKGDDIGOHJ());
-        }
-        if (other.getJDPELIFFANG() != 0) {
-          setJDPELIFFANG(other.getJDPELIFFANG());
-        }
-        if (other.getODBKCAJFBMO() != 0) {
-          setODBKCAJFBMO(other.getODBKCAJFBMO());
-        }
-        if (other.hasAbilityIdentifier()) {
-          mergeAbilityIdentifier(other.getAbilityIdentifier());
-        }
-        if (other.hasResolvedDir()) {
-          mergeResolvedDir(other.getResolvedDir());
-        }
         if (other.hasHitCollision()) {
           mergeHitCollision(other.getHitCollision());
         }
-        if (other.getNFDLHHGPLKL() != 0) {
-          setNFDLHHGPLKL(other.getNFDLHHGPLKL());
+        if (other.getMPBEBAKODGF() != 0) {
+          setMPBEBAKODGF(other.getMPBEBAKODGF());
         }
-        if (other.getOEEFAHMCLOM() != 0) {
-          setOEEFAHMCLOM(other.getOEEFAHMCLOM());
+        if (other.getEBLEIGGLHLG() != 0) {
+          setEBLEIGGLHLG(other.getEBLEIGGLHLG());
         }
-        if (other.getIEJNKCBILGI() != 0) {
-          setIEJNKCBILGI(other.getIEJNKCBILGI());
+        if (other.getElementAmplifyRate() != 0F) {
+          setElementAmplifyRate(other.getElementAmplifyRate());
         }
-        if (other.getFIHKEJMFKHO() != false) {
-          setFIHKEJMFKHO(other.getFIHKEJMFKHO());
+        if (other.getElementDurabilityAttenuation() != 0F) {
+          setElementDurabilityAttenuation(other.getElementDurabilityAttenuation());
+        }
+        if (other.getMuteElementHurt() != false) {
+          setMuteElementHurt(other.getMuteElementHurt());
+        }
+        if (other.getMFLNDGPEJOE() != 0) {
+          setMFLNDGPEJOE(other.getMFLNDGPEJOE());
+        }
+        if (other.getDamageShield() != 0F) {
+          setDamageShield(other.getDamageShield());
+        }
+        if (other.getIFMINIBILFH() != 0) {
+          setIFMINIBILFH(other.getIFMINIBILFH());
+        }
+        if (other.getJKGEMBOBALF() != 0) {
+          setJKGEMBOBALF(other.getJKGEMBOBALF());
+        }
+        if (other.getEKJHPCHCMLF() != 0) {
+          setEKJHPCHCMLF(other.getEKJHPCHCMLF());
+        }
+        if (other.getPOAFAPLMPEB() != 0) {
+          setPOAFAPLMPEB(other.getPOAFAPLMPEB());
+        }
+        if (other.getUseGadgetDamageAction() != false) {
+          setUseGadgetDamageAction(other.getUseGadgetDamageAction());
+        }
+        if (other.getELIFILCNKFD() != 0) {
+          setELIFILCNKFD(other.getELIFILCNKFD());
+        }
+        if (other.getEndureDelta() != 0F) {
+          setEndureDelta(other.getEndureDelta());
+        }
+        if (other.getFLPFBAFHGNN() != 0) {
+          setFLPFBAFHGNN(other.getFLPFBAFHGNN());
+        }
+        if (other.getNMPEDJOPMMB() != 0) {
+          setNMPEDJOPMMB(other.getNMPEDJOPMMB());
+        }
+        if (other.getIsResistText() != false) {
+          setIsResistText(other.getIsResistText());
+        }
+        if (other.getGMNJEDPKNDE() != 0) {
+          setGMNJEDPKNDE(other.getGMNJEDPKNDE());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1787,500 +1834,9 @@ public final class AttackResultOuterClass {
         return this;
       }
 
-      private int bLJNCIEFOED_ ;
-      /**
-       * <code>uint32 BLJNCIEFOED = 5;</code>
-       * @return The bLJNCIEFOED.
-       */
-      @java.lang.Override
-      public int getBLJNCIEFOED() {
-        return bLJNCIEFOED_;
-      }
-      /**
-       * <code>uint32 BLJNCIEFOED = 5;</code>
-       * @param value The bLJNCIEFOED to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBLJNCIEFOED(int value) {
-        
-        bLJNCIEFOED_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 BLJNCIEFOED = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBLJNCIEFOED() {
-        
-        bLJNCIEFOED_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int elementType_ ;
-      /**
-       * <code>uint32 element_type = 10;</code>
-       * @return The elementType.
-       */
-      @java.lang.Override
-      public int getElementType() {
-        return elementType_;
-      }
-      /**
-       * <code>uint32 element_type = 10;</code>
-       * @param value The elementType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setElementType(int value) {
-        
-        elementType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 element_type = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearElementType() {
-        
-        elementType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private float fMPIEJOMIFJ_ ;
-      /**
-       * <code>float FMPIEJOMIFJ = 1723;</code>
-       * @return The fMPIEJOMIFJ.
-       */
-      @java.lang.Override
-      public float getFMPIEJOMIFJ() {
-        return fMPIEJOMIFJ_;
-      }
-      /**
-       * <code>float FMPIEJOMIFJ = 1723;</code>
-       * @param value The fMPIEJOMIFJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFMPIEJOMIFJ(float value) {
-        
-        fMPIEJOMIFJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float FMPIEJOMIFJ = 1723;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFMPIEJOMIFJ() {
-        
-        fMPIEJOMIFJ_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private float nLAAOODDKGK_ ;
-      /**
-       * <code>float NLAAOODDKGK = 778;</code>
-       * @return The nLAAOODDKGK.
-       */
-      @java.lang.Override
-      public float getNLAAOODDKGK() {
-        return nLAAOODDKGK_;
-      }
-      /**
-       * <code>float NLAAOODDKGK = 778;</code>
-       * @param value The nLAAOODDKGK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNLAAOODDKGK(float value) {
-        
-        nLAAOODDKGK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float NLAAOODDKGK = 778;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNLAAOODDKGK() {
-        
-        nLAAOODDKGK_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private boolean bAAHKFCEBMA_ ;
-      /**
-       * <code>bool BAAHKFCEBMA = 7;</code>
-       * @return The bAAHKFCEBMA.
-       */
-      @java.lang.Override
-      public boolean getBAAHKFCEBMA() {
-        return bAAHKFCEBMA_;
-      }
-      /**
-       * <code>bool BAAHKFCEBMA = 7;</code>
-       * @param value The bAAHKFCEBMA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBAAHKFCEBMA(boolean value) {
-        
-        bAAHKFCEBMA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool BAAHKFCEBMA = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBAAHKFCEBMA() {
-        
-        bAAHKFCEBMA_ = false;
-        onChanged();
-        return this;
-      }
-
-      private float kFCPIKCMIOI_ ;
-      /**
-       * <code>float KFCPIKCMIOI = 567;</code>
-       * @return The kFCPIKCMIOI.
-       */
-      @java.lang.Override
-      public float getKFCPIKCMIOI() {
-        return kFCPIKCMIOI_;
-      }
-      /**
-       * <code>float KFCPIKCMIOI = 567;</code>
-       * @param value The kFCPIKCMIOI to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKFCPIKCMIOI(float value) {
-        
-        kFCPIKCMIOI_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float KFCPIKCMIOI = 567;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKFCPIKCMIOI() {
-        
-        kFCPIKCMIOI_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private float dPHDFDJJNOA_ ;
-      /**
-       * <code>float DPHDFDJJNOA = 27;</code>
-       * @return The dPHDFDJJNOA.
-       */
-      @java.lang.Override
-      public float getDPHDFDJJNOA() {
-        return dPHDFDJJNOA_;
-      }
-      /**
-       * <code>float DPHDFDJJNOA = 27;</code>
-       * @param value The dPHDFDJJNOA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDPHDFDJJNOA(float value) {
-        
-        dPHDFDJJNOA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float DPHDFDJJNOA = 27;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDPHDFDJJNOA() {
-        
-        dPHDFDJJNOA_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private boolean bILAJCEBMGF_ ;
-      /**
-       * <code>bool BILAJCEBMGF = 378;</code>
-       * @return The bILAJCEBMGF.
-       */
-      @java.lang.Override
-      public boolean getBILAJCEBMGF() {
-        return bILAJCEBMGF_;
-      }
-      /**
-       * <code>bool BILAJCEBMGF = 378;</code>
-       * @param value The bILAJCEBMGF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBILAJCEBMGF(boolean value) {
-        
-        bILAJCEBMGF_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool BILAJCEBMGF = 378;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBILAJCEBMGF() {
-        
-        bILAJCEBMGF_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int mIKMJNBAAIJ_ ;
-      /**
-       * <code>uint32 MIKMJNBAAIJ = 8;</code>
-       * @return The mIKMJNBAAIJ.
-       */
-      @java.lang.Override
-      public int getMIKMJNBAAIJ() {
-        return mIKMJNBAAIJ_;
-      }
-      /**
-       * <code>uint32 MIKMJNBAAIJ = 8;</code>
-       * @param value The mIKMJNBAAIJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMIKMJNBAAIJ(int value) {
-        
-        mIKMJNBAAIJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 MIKMJNBAAIJ = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMIKMJNBAAIJ() {
-        
-        mIKMJNBAAIJ_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult hitEffResult_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder> hitEffResultBuilder_;
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       * @return Whether the hitEffResult field is set.
-       */
-      public boolean hasHitEffResult() {
-        return hitEffResultBuilder_ != null || hitEffResult_ != null;
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       * @return The hitEffResult.
-       */
-      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult() {
-        if (hitEffResultBuilder_ == null) {
-          return hitEffResult_ == null ? emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
-        } else {
-          return hitEffResultBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public Builder setHitEffResult(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult value) {
-        if (hitEffResultBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          hitEffResult_ = value;
-          onChanged();
-        } else {
-          hitEffResultBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public Builder setHitEffResult(
-          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder builderForValue) {
-        if (hitEffResultBuilder_ == null) {
-          hitEffResult_ = builderForValue.build();
-          onChanged();
-        } else {
-          hitEffResultBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public Builder mergeHitEffResult(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult value) {
-        if (hitEffResultBuilder_ == null) {
-          if (hitEffResult_ != null) {
-            hitEffResult_ =
-              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.newBuilder(hitEffResult_).mergeFrom(value).buildPartial();
-          } else {
-            hitEffResult_ = value;
-          }
-          onChanged();
-        } else {
-          hitEffResultBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public Builder clearHitEffResult() {
-        if (hitEffResultBuilder_ == null) {
-          hitEffResult_ = null;
-          onChanged();
-        } else {
-          hitEffResult_ = null;
-          hitEffResultBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder getHitEffResultBuilder() {
-        
-        onChanged();
-        return getHitEffResultFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder() {
-        if (hitEffResultBuilder_ != null) {
-          return hitEffResultBuilder_.getMessageOrBuilder();
-        } else {
-          return hitEffResult_ == null ?
-              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
-        }
-      }
-      /**
-       * <code>.AttackHitEffectResult hit_eff_result = 6;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder> 
-          getHitEffResultFieldBuilder() {
-        if (hitEffResultBuilder_ == null) {
-          hitEffResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder>(
-                  getHitEffResult(),
-                  getParentForChildren(),
-                  isClean());
-          hitEffResult_ = null;
-        }
-        return hitEffResultBuilder_;
-      }
-
-      private int bKKNPCPEDCF_ ;
-      /**
-       * <code>uint32 BKKNPCPEDCF = 457;</code>
-       * @return The bKKNPCPEDCF.
-       */
-      @java.lang.Override
-      public int getBKKNPCPEDCF() {
-        return bKKNPCPEDCF_;
-      }
-      /**
-       * <code>uint32 BKKNPCPEDCF = 457;</code>
-       * @param value The bKKNPCPEDCF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBKKNPCPEDCF(int value) {
-        
-        bKKNPCPEDCF_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 BKKNPCPEDCF = 457;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBKKNPCPEDCF() {
-        
-        bKKNPCPEDCF_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int dKDBHEJFOGD_ ;
-      /**
-       * <code>uint32 DKDBHEJFOGD = 1602;</code>
-       * @return The dKDBHEJFOGD.
-       */
-      @java.lang.Override
-      public int getDKDBHEJFOGD() {
-        return dKDBHEJFOGD_;
-      }
-      /**
-       * <code>uint32 DKDBHEJFOGD = 1602;</code>
-       * @param value The dKDBHEJFOGD to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDKDBHEJFOGD(int value) {
-        
-        dKDBHEJFOGD_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 DKDBHEJFOGD = 1602;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDKDBHEJFOGD() {
-        
-        dKDBHEJFOGD_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int defenseId_ ;
-      /**
-       * <code>uint32 defense_id = 9;</code>
-       * @return The defenseId.
-       */
-      @java.lang.Override
-      public int getDefenseId() {
-        return defenseId_;
-      }
-      /**
-       * <code>uint32 defense_id = 9;</code>
-       * @param value The defenseId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDefenseId(int value) {
-        
-        defenseId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 defense_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDefenseId() {
-        
-        defenseId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int attackerId_ ;
       /**
-       * <code>uint32 attacker_id = 14;</code>
+       * <code>uint32 attacker_id = 1;</code>
        * @return The attackerId.
        */
       @java.lang.Override
@@ -2288,7 +1844,7 @@ public final class AttackResultOuterClass {
         return attackerId_;
       }
       /**
-       * <code>uint32 attacker_id = 14;</code>
+       * <code>uint32 attacker_id = 1;</code>
        * @param value The attackerId to set.
        * @return This builder for chaining.
        */
@@ -2299,7 +1855,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>uint32 attacker_id = 14;</code>
+       * <code>uint32 attacker_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAttackerId() {
@@ -2340,147 +1896,9 @@ public final class AttackResultOuterClass {
         return this;
       }
 
-      private int eMOHABNNHBJ_ ;
-      /**
-       * <code>uint32 EMOHABNNHBJ = 314;</code>
-       * @return The eMOHABNNHBJ.
-       */
-      @java.lang.Override
-      public int getEMOHABNNHBJ() {
-        return eMOHABNNHBJ_;
-      }
-      /**
-       * <code>uint32 EMOHABNNHBJ = 314;</code>
-       * @param value The eMOHABNNHBJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEMOHABNNHBJ(int value) {
-        
-        eMOHABNNHBJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 EMOHABNNHBJ = 314;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEMOHABNNHBJ() {
-        
-        eMOHABNNHBJ_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean kAKHNCAHEOP_ ;
-      /**
-       * <code>bool KAKHNCAHEOP = 609;</code>
-       * @return The kAKHNCAHEOP.
-       */
-      @java.lang.Override
-      public boolean getKAKHNCAHEOP() {
-        return kAKHNCAHEOP_;
-      }
-      /**
-       * <code>bool KAKHNCAHEOP = 609;</code>
-       * @param value The kAKHNCAHEOP to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKAKHNCAHEOP(boolean value) {
-        
-        kAKHNCAHEOP_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool KAKHNCAHEOP = 609;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKAKHNCAHEOP() {
-        
-        kAKHNCAHEOP_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object animEventId_ = "";
-      /**
-       * <code>string anim_event_id = 15;</code>
-       * @return The animEventId.
-       */
-      public java.lang.String getAnimEventId() {
-        java.lang.Object ref = animEventId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          animEventId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string anim_event_id = 15;</code>
-       * @return The bytes for animEventId.
-       */
-      public com.google.protobuf.ByteString
-          getAnimEventIdBytes() {
-        java.lang.Object ref = animEventId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          animEventId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string anim_event_id = 15;</code>
-       * @param value The animEventId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAnimEventId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        animEventId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string anim_event_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAnimEventId() {
-        
-        animEventId_ = getDefaultInstance().getAnimEventId();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string anim_event_id = 15;</code>
-       * @param value The bytes for animEventId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAnimEventIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        animEventId_ = value;
-        onChanged();
-        return this;
-      }
-
       private int hitRetreatAngleCompat_ ;
       /**
-       * <code>int32 hit_retreat_angle_compat = 13;</code>
+       * <code>int32 hit_retreat_angle_compat = 3;</code>
        * @return The hitRetreatAngleCompat.
        */
       @java.lang.Override
@@ -2488,7 +1906,7 @@ public final class AttackResultOuterClass {
         return hitRetreatAngleCompat_;
       }
       /**
-       * <code>int32 hit_retreat_angle_compat = 13;</code>
+       * <code>int32 hit_retreat_angle_compat = 3;</code>
        * @param value The hitRetreatAngleCompat to set.
        * @return This builder for chaining.
        */
@@ -2499,7 +1917,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>int32 hit_retreat_angle_compat = 13;</code>
+       * <code>int32 hit_retreat_angle_compat = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearHitRetreatAngleCompat() {
@@ -2509,126 +1927,33 @@ public final class AttackResultOuterClass {
         return this;
       }
 
-      private int kGKNJIIOPMP_ ;
+      private int defenseId_ ;
       /**
-       * <code>uint32 KGKNJIIOPMP = 1649;</code>
-       * @return The kGKNJIIOPMP.
+       * <code>uint32 defense_id = 5;</code>
+       * @return The defenseId.
        */
       @java.lang.Override
-      public int getKGKNJIIOPMP() {
-        return kGKNJIIOPMP_;
+      public int getDefenseId() {
+        return defenseId_;
       }
       /**
-       * <code>uint32 KGKNJIIOPMP = 1649;</code>
-       * @param value The kGKNJIIOPMP to set.
+       * <code>uint32 defense_id = 5;</code>
+       * @param value The defenseId to set.
        * @return This builder for chaining.
        */
-      public Builder setKGKNJIIOPMP(int value) {
+      public Builder setDefenseId(int value) {
         
-        kGKNJIIOPMP_ = value;
+        defenseId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KGKNJIIOPMP = 1649;</code>
+       * <code>uint32 defense_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKGKNJIIOPMP() {
+      public Builder clearDefenseId() {
         
-        kGKNJIIOPMP_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int eFKGDDIGOHJ_ ;
-      /**
-       * <code>uint32 EFKGDDIGOHJ = 82;</code>
-       * @return The eFKGDDIGOHJ.
-       */
-      @java.lang.Override
-      public int getEFKGDDIGOHJ() {
-        return eFKGDDIGOHJ_;
-      }
-      /**
-       * <code>uint32 EFKGDDIGOHJ = 82;</code>
-       * @param value The eFKGDDIGOHJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEFKGDDIGOHJ(int value) {
-        
-        eFKGDDIGOHJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 EFKGDDIGOHJ = 82;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEFKGDDIGOHJ() {
-        
-        eFKGDDIGOHJ_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int jDPELIFFANG_ ;
-      /**
-       * <code>uint32 JDPELIFFANG = 394;</code>
-       * @return The jDPELIFFANG.
-       */
-      @java.lang.Override
-      public int getJDPELIFFANG() {
-        return jDPELIFFANG_;
-      }
-      /**
-       * <code>uint32 JDPELIFFANG = 394;</code>
-       * @param value The jDPELIFFANG to set.
-       * @return This builder for chaining.
-       */
-      public Builder setJDPELIFFANG(int value) {
-        
-        jDPELIFFANG_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 JDPELIFFANG = 394;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearJDPELIFFANG() {
-        
-        jDPELIFFANG_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int oDBKCAJFBMO_ ;
-      /**
-       * <code>uint32 ODBKCAJFBMO = 1652;</code>
-       * @return The oDBKCAJFBMO.
-       */
-      @java.lang.Override
-      public int getODBKCAJFBMO() {
-        return oDBKCAJFBMO_;
-      }
-      /**
-       * <code>uint32 ODBKCAJFBMO = 1652;</code>
-       * @param value The oDBKCAJFBMO to set.
-       * @return This builder for chaining.
-       */
-      public Builder setODBKCAJFBMO(int value) {
-        
-        oDBKCAJFBMO_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 ODBKCAJFBMO = 1652;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearODBKCAJFBMO() {
-        
-        oDBKCAJFBMO_ = 0;
+        defenseId_ = 0;
         onChanged();
         return this;
       }
@@ -2637,14 +1962,14 @@ public final class AttackResultOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder> abilityIdentifierBuilder_;
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        * @return Whether the abilityIdentifier field is set.
        */
       public boolean hasAbilityIdentifier() {
         return abilityIdentifierBuilder_ != null || abilityIdentifier_ != null;
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        * @return The abilityIdentifier.
        */
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier getAbilityIdentifier() {
@@ -2655,7 +1980,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public Builder setAbilityIdentifier(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier value) {
         if (abilityIdentifierBuilder_ == null) {
@@ -2671,7 +1996,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public Builder setAbilityIdentifier(
           emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder builderForValue) {
@@ -2685,7 +2010,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public Builder mergeAbilityIdentifier(emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier value) {
         if (abilityIdentifierBuilder_ == null) {
@@ -2703,7 +2028,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public Builder clearAbilityIdentifier() {
         if (abilityIdentifierBuilder_ == null) {
@@ -2717,7 +2042,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder getAbilityIdentifierBuilder() {
         
@@ -2725,7 +2050,7 @@ public final class AttackResultOuterClass {
         return getAbilityIdentifierFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder getAbilityIdentifierOrBuilder() {
         if (abilityIdentifierBuilder_ != null) {
@@ -2736,7 +2061,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.AbilityIdentifier ability_identifier = 3;</code>
+       * <code>.AbilityIdentifier ability_identifier = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifier.Builder, emu.grasscutter.net.proto.AbilityIdentifierOuterClass.AbilityIdentifierOrBuilder> 
@@ -2752,18 +2077,80 @@ public final class AttackResultOuterClass {
         return abilityIdentifierBuilder_;
       }
 
+      private int iICFMJEJOBO_ ;
+      /**
+       * <code>uint32 IICFMJEJOBO = 7;</code>
+       * @return The iICFMJEJOBO.
+       */
+      @java.lang.Override
+      public int getIICFMJEJOBO() {
+        return iICFMJEJOBO_;
+      }
+      /**
+       * <code>uint32 IICFMJEJOBO = 7;</code>
+       * @param value The iICFMJEJOBO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIICFMJEJOBO(int value) {
+        
+        iICFMJEJOBO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IICFMJEJOBO = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIICFMJEJOBO() {
+        
+        iICFMJEJOBO_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isCrit_ ;
+      /**
+       * <code>bool is_crit = 8;</code>
+       * @return The isCrit.
+       */
+      @java.lang.Override
+      public boolean getIsCrit() {
+        return isCrit_;
+      }
+      /**
+       * <code>bool is_crit = 8;</code>
+       * @param value The isCrit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsCrit(boolean value) {
+        
+        isCrit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_crit = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsCrit() {
+        
+        isCrit_ = false;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector resolvedDir_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> resolvedDirBuilder_;
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        * @return Whether the resolvedDir field is set.
        */
       public boolean hasResolvedDir() {
         return resolvedDirBuilder_ != null || resolvedDir_ != null;
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        * @return The resolvedDir.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getResolvedDir() {
@@ -2774,7 +2161,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public Builder setResolvedDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (resolvedDirBuilder_ == null) {
@@ -2790,7 +2177,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public Builder setResolvedDir(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -2804,7 +2191,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public Builder mergeResolvedDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (resolvedDirBuilder_ == null) {
@@ -2822,7 +2209,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public Builder clearResolvedDir() {
         if (resolvedDirBuilder_ == null) {
@@ -2836,7 +2223,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getResolvedDirBuilder() {
         
@@ -2844,7 +2231,7 @@ public final class AttackResultOuterClass {
         return getResolvedDirFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getResolvedDirOrBuilder() {
         if (resolvedDirBuilder_ != null) {
@@ -2855,7 +2242,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.Vector resolved_dir = 4;</code>
+       * <code>.Vector resolved_dir = 9;</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> 
@@ -2871,18 +2258,275 @@ public final class AttackResultOuterClass {
         return resolvedDirBuilder_;
       }
 
+      private int bAABHEHFAPH_ ;
+      /**
+       * <code>uint32 BAABHEHFAPH = 10;</code>
+       * @return The bAABHEHFAPH.
+       */
+      @java.lang.Override
+      public int getBAABHEHFAPH() {
+        return bAABHEHFAPH_;
+      }
+      /**
+       * <code>uint32 BAABHEHFAPH = 10;</code>
+       * @param value The bAABHEHFAPH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBAABHEHFAPH(int value) {
+        
+        bAABHEHFAPH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 BAABHEHFAPH = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBAABHEHFAPH() {
+        
+        bAABHEHFAPH_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int elementType_ ;
+      /**
+       * <code>uint32 element_type = 11;</code>
+       * @return The elementType.
+       */
+      @java.lang.Override
+      public int getElementType() {
+        return elementType_;
+      }
+      /**
+       * <code>uint32 element_type = 11;</code>
+       * @param value The elementType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setElementType(int value) {
+        
+        elementType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 element_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearElementType() {
+        
+        elementType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult hitEffResult_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder> hitEffResultBuilder_;
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       * @return Whether the hitEffResult field is set.
+       */
+      public boolean hasHitEffResult() {
+        return hitEffResultBuilder_ != null || hitEffResult_ != null;
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       * @return The hitEffResult.
+       */
+      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult getHitEffResult() {
+        if (hitEffResultBuilder_ == null) {
+          return hitEffResult_ == null ? emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
+        } else {
+          return hitEffResultBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public Builder setHitEffResult(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult value) {
+        if (hitEffResultBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          hitEffResult_ = value;
+          onChanged();
+        } else {
+          hitEffResultBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public Builder setHitEffResult(
+          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder builderForValue) {
+        if (hitEffResultBuilder_ == null) {
+          hitEffResult_ = builderForValue.build();
+          onChanged();
+        } else {
+          hitEffResultBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public Builder mergeHitEffResult(emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult value) {
+        if (hitEffResultBuilder_ == null) {
+          if (hitEffResult_ != null) {
+            hitEffResult_ =
+              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.newBuilder(hitEffResult_).mergeFrom(value).buildPartial();
+          } else {
+            hitEffResult_ = value;
+          }
+          onChanged();
+        } else {
+          hitEffResultBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public Builder clearHitEffResult() {
+        if (hitEffResultBuilder_ == null) {
+          hitEffResult_ = null;
+          onChanged();
+        } else {
+          hitEffResult_ = null;
+          hitEffResultBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder getHitEffResultBuilder() {
+        
+        onChanged();
+        return getHitEffResultFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      public emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder getHitEffResultOrBuilder() {
+        if (hitEffResultBuilder_ != null) {
+          return hitEffResultBuilder_.getMessageOrBuilder();
+        } else {
+          return hitEffResult_ == null ?
+              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.getDefaultInstance() : hitEffResult_;
+        }
+      }
+      /**
+       * <code>.AttackHitEffectResult hit_eff_result = 13;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder> 
+          getHitEffResultFieldBuilder() {
+        if (hitEffResultBuilder_ == null) {
+          hitEffResultBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResult.Builder, emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.AttackHitEffectResultOrBuilder>(
+                  getHitEffResult(),
+                  getParentForChildren(),
+                  isClean());
+          hitEffResult_ = null;
+        }
+        return hitEffResultBuilder_;
+      }
+
+      private java.lang.Object animEventId_ = "";
+      /**
+       * <code>string anim_event_id = 14;</code>
+       * @return The animEventId.
+       */
+      public java.lang.String getAnimEventId() {
+        java.lang.Object ref = animEventId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          animEventId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string anim_event_id = 14;</code>
+       * @return The bytes for animEventId.
+       */
+      public com.google.protobuf.ByteString
+          getAnimEventIdBytes() {
+        java.lang.Object ref = animEventId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          animEventId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string anim_event_id = 14;</code>
+       * @param value The animEventId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnimEventId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        animEventId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string anim_event_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnimEventId() {
+        
+        animEventId_ = getDefaultInstance().getAnimEventId();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string anim_event_id = 14;</code>
+       * @param value The bytes for animEventId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnimEventIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        animEventId_ = value;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision hitCollision_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision, emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder, emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollisionOrBuilder> hitCollisionBuilder_;
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        * @return Whether the hitCollision field is set.
        */
       public boolean hasHitCollision() {
         return hitCollisionBuilder_ != null || hitCollision_ != null;
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        * @return The hitCollision.
        */
       public emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision getHitCollision() {
@@ -2893,7 +2537,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public Builder setHitCollision(emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision value) {
         if (hitCollisionBuilder_ == null) {
@@ -2909,7 +2553,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public Builder setHitCollision(
           emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder builderForValue) {
@@ -2923,7 +2567,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public Builder mergeHitCollision(emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision value) {
         if (hitCollisionBuilder_ == null) {
@@ -2941,7 +2585,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public Builder clearHitCollision() {
         if (hitCollisionBuilder_ == null) {
@@ -2955,7 +2599,7 @@ public final class AttackResultOuterClass {
         return this;
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder getHitCollisionBuilder() {
         
@@ -2963,7 +2607,7 @@ public final class AttackResultOuterClass {
         return getHitCollisionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       public emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollisionOrBuilder getHitCollisionOrBuilder() {
         if (hitCollisionBuilder_ != null) {
@@ -2974,7 +2618,7 @@ public final class AttackResultOuterClass {
         }
       }
       /**
-       * <code>.HitCollision hit_collision = 11;</code>
+       * <code>.HitCollision hit_collision = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision, emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder, emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollisionOrBuilder> 
@@ -2990,126 +2634,584 @@ public final class AttackResultOuterClass {
         return hitCollisionBuilder_;
       }
 
-      private int nFDLHHGPLKL_ ;
+      private int mPBEBAKODGF_ ;
       /**
-       * <code>uint32 NFDLHHGPLKL = 866;</code>
-       * @return The nFDLHHGPLKL.
+       * <code>uint32 MPBEBAKODGF = 222;</code>
+       * @return The mPBEBAKODGF.
        */
       @java.lang.Override
-      public int getNFDLHHGPLKL() {
-        return nFDLHHGPLKL_;
+      public int getMPBEBAKODGF() {
+        return mPBEBAKODGF_;
       }
       /**
-       * <code>uint32 NFDLHHGPLKL = 866;</code>
-       * @param value The nFDLHHGPLKL to set.
+       * <code>uint32 MPBEBAKODGF = 222;</code>
+       * @param value The mPBEBAKODGF to set.
        * @return This builder for chaining.
        */
-      public Builder setNFDLHHGPLKL(int value) {
+      public Builder setMPBEBAKODGF(int value) {
         
-        nFDLHHGPLKL_ = value;
+        mPBEBAKODGF_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 NFDLHHGPLKL = 866;</code>
+       * <code>uint32 MPBEBAKODGF = 222;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNFDLHHGPLKL() {
+      public Builder clearMPBEBAKODGF() {
         
-        nFDLHHGPLKL_ = 0;
+        mPBEBAKODGF_ = 0;
         onChanged();
         return this;
       }
 
-      private int oEEFAHMCLOM_ ;
+      private int eBLEIGGLHLG_ ;
       /**
-       * <code>uint32 OEEFAHMCLOM = 216;</code>
-       * @return The oEEFAHMCLOM.
+       * <code>uint32 EBLEIGGLHLG = 309;</code>
+       * @return The eBLEIGGLHLG.
        */
       @java.lang.Override
-      public int getOEEFAHMCLOM() {
-        return oEEFAHMCLOM_;
+      public int getEBLEIGGLHLG() {
+        return eBLEIGGLHLG_;
       }
       /**
-       * <code>uint32 OEEFAHMCLOM = 216;</code>
-       * @param value The oEEFAHMCLOM to set.
+       * <code>uint32 EBLEIGGLHLG = 309;</code>
+       * @param value The eBLEIGGLHLG to set.
        * @return This builder for chaining.
        */
-      public Builder setOEEFAHMCLOM(int value) {
+      public Builder setEBLEIGGLHLG(int value) {
         
-        oEEFAHMCLOM_ = value;
+        eBLEIGGLHLG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 OEEFAHMCLOM = 216;</code>
+       * <code>uint32 EBLEIGGLHLG = 309;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOEEFAHMCLOM() {
+      public Builder clearEBLEIGGLHLG() {
         
-        oEEFAHMCLOM_ = 0;
+        eBLEIGGLHLG_ = 0;
         onChanged();
         return this;
       }
 
-      private int iEJNKCBILGI_ ;
+      private float elementAmplifyRate_ ;
       /**
-       * <code>uint32 IEJNKCBILGI = 1603;</code>
-       * @return The iEJNKCBILGI.
+       * <pre>
+       * 533
+       * </pre>
+       *
+       * <code>float element_amplify_rate = 389;</code>
+       * @return The elementAmplifyRate.
        */
       @java.lang.Override
-      public int getIEJNKCBILGI() {
-        return iEJNKCBILGI_;
+      public float getElementAmplifyRate() {
+        return elementAmplifyRate_;
       }
       /**
-       * <code>uint32 IEJNKCBILGI = 1603;</code>
-       * @param value The iEJNKCBILGI to set.
+       * <pre>
+       * 533
+       * </pre>
+       *
+       * <code>float element_amplify_rate = 389;</code>
+       * @param value The elementAmplifyRate to set.
        * @return This builder for chaining.
        */
-      public Builder setIEJNKCBILGI(int value) {
+      public Builder setElementAmplifyRate(float value) {
         
-        iEJNKCBILGI_ = value;
+        elementAmplifyRate_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 IEJNKCBILGI = 1603;</code>
+       * <pre>
+       * 533
+       * </pre>
+       *
+       * <code>float element_amplify_rate = 389;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIEJNKCBILGI() {
+      public Builder clearElementAmplifyRate() {
         
-        iEJNKCBILGI_ = 0;
+        elementAmplifyRate_ = 0F;
         onChanged();
         return this;
       }
 
-      private boolean fIHKEJMFKHO_ ;
+      private float elementDurabilityAttenuation_ ;
       /**
-       * <code>bool FIHKEJMFKHO = 1672;</code>
-       * @return The fIHKEJMFKHO.
+       * <pre>
+       * 389
+       * </pre>
+       *
+       * <code>float element_durability_attenuation = 533;</code>
+       * @return The elementDurabilityAttenuation.
        */
       @java.lang.Override
-      public boolean getFIHKEJMFKHO() {
-        return fIHKEJMFKHO_;
+      public float getElementDurabilityAttenuation() {
+        return elementDurabilityAttenuation_;
       }
       /**
-       * <code>bool FIHKEJMFKHO = 1672;</code>
-       * @param value The fIHKEJMFKHO to set.
+       * <pre>
+       * 389
+       * </pre>
+       *
+       * <code>float element_durability_attenuation = 533;</code>
+       * @param value The elementDurabilityAttenuation to set.
        * @return This builder for chaining.
        */
-      public Builder setFIHKEJMFKHO(boolean value) {
+      public Builder setElementDurabilityAttenuation(float value) {
         
-        fIHKEJMFKHO_ = value;
+        elementDurabilityAttenuation_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool FIHKEJMFKHO = 1672;</code>
+       * <pre>
+       * 389
+       * </pre>
+       *
+       * <code>float element_durability_attenuation = 533;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFIHKEJMFKHO() {
+      public Builder clearElementDurabilityAttenuation() {
         
-        fIHKEJMFKHO_ = false;
+        elementDurabilityAttenuation_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private boolean muteElementHurt_ ;
+      /**
+       * <code>bool mute_element_hurt = 590;</code>
+       * @return The muteElementHurt.
+       */
+      @java.lang.Override
+      public boolean getMuteElementHurt() {
+        return muteElementHurt_;
+      }
+      /**
+       * <code>bool mute_element_hurt = 590;</code>
+       * @param value The muteElementHurt to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMuteElementHurt(boolean value) {
+        
+        muteElementHurt_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool mute_element_hurt = 590;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMuteElementHurt() {
+        
+        muteElementHurt_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int mFLNDGPEJOE_ ;
+      /**
+       * <code>uint32 MFLNDGPEJOE = 606;</code>
+       * @return The mFLNDGPEJOE.
+       */
+      @java.lang.Override
+      public int getMFLNDGPEJOE() {
+        return mFLNDGPEJOE_;
+      }
+      /**
+       * <code>uint32 MFLNDGPEJOE = 606;</code>
+       * @param value The mFLNDGPEJOE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMFLNDGPEJOE(int value) {
+        
+        mFLNDGPEJOE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MFLNDGPEJOE = 606;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMFLNDGPEJOE() {
+        
+        mFLNDGPEJOE_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private float damageShield_ ;
+      /**
+       * <code>float damage_shield = 779;</code>
+       * @return The damageShield.
+       */
+      @java.lang.Override
+      public float getDamageShield() {
+        return damageShield_;
+      }
+      /**
+       * <code>float damage_shield = 779;</code>
+       * @param value The damageShield to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDamageShield(float value) {
+        
+        damageShield_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float damage_shield = 779;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDamageShield() {
+        
+        damageShield_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int iFMINIBILFH_ ;
+      /**
+       * <code>uint32 IFMINIBILFH = 823;</code>
+       * @return The iFMINIBILFH.
+       */
+      @java.lang.Override
+      public int getIFMINIBILFH() {
+        return iFMINIBILFH_;
+      }
+      /**
+       * <code>uint32 IFMINIBILFH = 823;</code>
+       * @param value The iFMINIBILFH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIFMINIBILFH(int value) {
+        
+        iFMINIBILFH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IFMINIBILFH = 823;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIFMINIBILFH() {
+        
+        iFMINIBILFH_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int jKGEMBOBALF_ ;
+      /**
+       * <code>uint32 JKGEMBOBALF = 1349;</code>
+       * @return The jKGEMBOBALF.
+       */
+      @java.lang.Override
+      public int getJKGEMBOBALF() {
+        return jKGEMBOBALF_;
+      }
+      /**
+       * <code>uint32 JKGEMBOBALF = 1349;</code>
+       * @param value The jKGEMBOBALF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJKGEMBOBALF(int value) {
+        
+        jKGEMBOBALF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 JKGEMBOBALF = 1349;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJKGEMBOBALF() {
+        
+        jKGEMBOBALF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int eKJHPCHCMLF_ ;
+      /**
+       * <code>uint32 EKJHPCHCMLF = 1525;</code>
+       * @return The eKJHPCHCMLF.
+       */
+      @java.lang.Override
+      public int getEKJHPCHCMLF() {
+        return eKJHPCHCMLF_;
+      }
+      /**
+       * <code>uint32 EKJHPCHCMLF = 1525;</code>
+       * @param value The eKJHPCHCMLF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEKJHPCHCMLF(int value) {
+        
+        eKJHPCHCMLF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 EKJHPCHCMLF = 1525;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEKJHPCHCMLF() {
+        
+        eKJHPCHCMLF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int pOAFAPLMPEB_ ;
+      /**
+       * <code>uint32 POAFAPLMPEB = 1640;</code>
+       * @return The pOAFAPLMPEB.
+       */
+      @java.lang.Override
+      public int getPOAFAPLMPEB() {
+        return pOAFAPLMPEB_;
+      }
+      /**
+       * <code>uint32 POAFAPLMPEB = 1640;</code>
+       * @param value The pOAFAPLMPEB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPOAFAPLMPEB(int value) {
+        
+        pOAFAPLMPEB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 POAFAPLMPEB = 1640;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPOAFAPLMPEB() {
+        
+        pOAFAPLMPEB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean useGadgetDamageAction_ ;
+      /**
+       * <code>bool use_gadget_damage_action = 1733;</code>
+       * @return The useGadgetDamageAction.
+       */
+      @java.lang.Override
+      public boolean getUseGadgetDamageAction() {
+        return useGadgetDamageAction_;
+      }
+      /**
+       * <code>bool use_gadget_damage_action = 1733;</code>
+       * @param value The useGadgetDamageAction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUseGadgetDamageAction(boolean value) {
+        
+        useGadgetDamageAction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool use_gadget_damage_action = 1733;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUseGadgetDamageAction() {
+        
+        useGadgetDamageAction_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int eLIFILCNKFD_ ;
+      /**
+       * <code>uint32 ELIFILCNKFD = 1756;</code>
+       * @return The eLIFILCNKFD.
+       */
+      @java.lang.Override
+      public int getELIFILCNKFD() {
+        return eLIFILCNKFD_;
+      }
+      /**
+       * <code>uint32 ELIFILCNKFD = 1756;</code>
+       * @param value The eLIFILCNKFD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setELIFILCNKFD(int value) {
+        
+        eLIFILCNKFD_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 ELIFILCNKFD = 1756;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearELIFILCNKFD() {
+        
+        eLIFILCNKFD_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private float endureDelta_ ;
+      /**
+       * <code>float endure_delta = 1827;</code>
+       * @return The endureDelta.
+       */
+      @java.lang.Override
+      public float getEndureDelta() {
+        return endureDelta_;
+      }
+      /**
+       * <code>float endure_delta = 1827;</code>
+       * @param value The endureDelta to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndureDelta(float value) {
+        
+        endureDelta_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float endure_delta = 1827;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndureDelta() {
+        
+        endureDelta_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int fLPFBAFHGNN_ ;
+      /**
+       * <code>uint32 FLPFBAFHGNN = 1842;</code>
+       * @return The fLPFBAFHGNN.
+       */
+      @java.lang.Override
+      public int getFLPFBAFHGNN() {
+        return fLPFBAFHGNN_;
+      }
+      /**
+       * <code>uint32 FLPFBAFHGNN = 1842;</code>
+       * @param value The fLPFBAFHGNN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFLPFBAFHGNN(int value) {
+        
+        fLPFBAFHGNN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 FLPFBAFHGNN = 1842;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFLPFBAFHGNN() {
+        
+        fLPFBAFHGNN_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nMPEDJOPMMB_ ;
+      /**
+       * <code>uint32 NMPEDJOPMMB = 1859;</code>
+       * @return The nMPEDJOPMMB.
+       */
+      @java.lang.Override
+      public int getNMPEDJOPMMB() {
+        return nMPEDJOPMMB_;
+      }
+      /**
+       * <code>uint32 NMPEDJOPMMB = 1859;</code>
+       * @param value The nMPEDJOPMMB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNMPEDJOPMMB(int value) {
+        
+        nMPEDJOPMMB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 NMPEDJOPMMB = 1859;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNMPEDJOPMMB() {
+        
+        nMPEDJOPMMB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isResistText_ ;
+      /**
+       * <code>bool is_resist_text = 1978;</code>
+       * @return The isResistText.
+       */
+      @java.lang.Override
+      public boolean getIsResistText() {
+        return isResistText_;
+      }
+      /**
+       * <code>bool is_resist_text = 1978;</code>
+       * @param value The isResistText to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsResistText(boolean value) {
+        
+        isResistText_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_resist_text = 1978;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsResistText() {
+        
+        isResistText_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int gMNJEDPKNDE_ ;
+      /**
+       * <code>uint32 GMNJEDPKNDE = 2023;</code>
+       * @return The gMNJEDPKNDE.
+       */
+      @java.lang.Override
+      public int getGMNJEDPKNDE() {
+        return gMNJEDPKNDE_;
+      }
+      /**
+       * <code>uint32 GMNJEDPKNDE = 2023;</code>
+       * @param value The gMNJEDPKNDE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGMNJEDPKNDE(int value) {
+        
+        gMNJEDPKNDE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GMNJEDPKNDE = 2023;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGMNJEDPKNDE() {
+        
+        gMNJEDPKNDE_ = 0;
         onChanged();
         return this;
       }
@@ -3180,36 +3282,38 @@ public final class AttackResultOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022AttackResult.proto\032\033AttackHitEffectRes" +
-      "ult.proto\032\027AbilityIdentifier.proto\032\014Vect" +
-      "or.proto\032\022HitCollision.proto\"\356\005\n\014AttackR" +
-      "esult\022\023\n\013BLJNCIEFOED\030\005 \001(\r\022\024\n\014element_ty" +
-      "pe\030\n \001(\r\022\024\n\013FMPIEJOMIFJ\030\273\r \001(\002\022\024\n\013NLAAOO" +
-      "DDKGK\030\212\006 \001(\002\022\023\n\013BAAHKFCEBMA\030\007 \001(\010\022\024\n\013KFC" +
-      "PIKCMIOI\030\267\004 \001(\002\022\023\n\013DPHDFDJJNOA\030\033 \001(\002\022\024\n\013" +
-      "BILAJCEBMGF\030\372\002 \001(\010\022\023\n\013MIKMJNBAAIJ\030\010 \001(\r\022" +
-      ".\n\016hit_eff_result\030\006 \001(\0132\026.AttackHitEffec" +
-      "tResult\022\024\n\013BKKNPCPEDCF\030\311\003 \001(\r\022\024\n\013DKDBHEJ" +
-      "FOGD\030\302\014 \001(\r\022\022\n\ndefense_id\030\t \001(\r\022\023\n\013attac" +
-      "ker_id\030\016 \001(\r\022\016\n\006damage\030\002 \001(\002\022\024\n\013EMOHABNN" +
-      "HBJ\030\272\002 \001(\r\022\024\n\013KAKHNCAHEOP\030\341\004 \001(\010\022\025\n\ranim" +
-      "_event_id\030\017 \001(\t\022 \n\030hit_retreat_angle_com" +
-      "pat\030\r \001(\005\022\024\n\013KGKNJIIOPMP\030\361\014 \001(\r\022\023\n\013EFKGD" +
-      "DIGOHJ\030R \001(\r\022\024\n\013JDPELIFFANG\030\212\003 \001(\r\022\024\n\013OD" +
-      "BKCAJFBMO\030\364\014 \001(\r\022.\n\022ability_identifier\030\003" +
-      " \001(\0132\022.AbilityIdentifier\022\035\n\014resolved_dir" +
-      "\030\004 \001(\0132\007.Vector\022$\n\rhit_collision\030\013 \001(\0132\r" +
-      ".HitCollision\022\024\n\013NFDLHHGPLKL\030\342\006 \001(\r\022\024\n\013O" +
-      "EEFAHMCLOM\030\330\001 \001(\r\022\024\n\013IEJNKCBILGI\030\303\014 \001(\r\022" +
-      "\024\n\013FIHKEJMFKHO\030\210\r \001(\010B\033\n\031emu.grasscutter" +
-      ".net.protob\006proto3"
+      "\n\022AttackResult.proto\032\027AbilityIdentifier." +
+      "proto\032\014Vector.proto\032\033AttackHitEffectResu" +
+      "lt.proto\032\022HitCollision.proto\"\267\006\n\014AttackR" +
+      "esult\022\023\n\013attacker_id\030\001 \001(\r\022\016\n\006damage\030\002 \001" +
+      "(\002\022 \n\030hit_retreat_angle_compat\030\003 \001(\005\022\022\n\n" +
+      "defense_id\030\005 \001(\r\022.\n\022ability_identifier\030\006" +
+      " \001(\0132\022.AbilityIdentifier\022\023\n\013IICFMJEJOBO\030" +
+      "\007 \001(\r\022\017\n\007is_crit\030\010 \001(\010\022\035\n\014resolved_dir\030\t" +
+      " \001(\0132\007.Vector\022\023\n\013BAABHEHFAPH\030\n \001(\r\022\024\n\014el" +
+      "ement_type\030\013 \001(\r\022.\n\016hit_eff_result\030\r \001(\013" +
+      "2\026.AttackHitEffectResult\022\025\n\ranim_event_i" +
+      "d\030\016 \001(\t\022$\n\rhit_collision\030\017 \001(\0132\r.HitColl" +
+      "ision\022\024\n\013MPBEBAKODGF\030\336\001 \001(\r\022\024\n\013EBLEIGGLH" +
+      "LG\030\265\002 \001(\r\022\035\n\024element_amplify_rate\030\205\003 \001(\002" +
+      "\022\'\n\036element_durability_attenuation\030\225\004 \001(" +
+      "\002\022\032\n\021mute_element_hurt\030\316\004 \001(\010\022\024\n\013MFLNDGP" +
+      "EJOE\030\336\004 \001(\r\022\026\n\rdamage_shield\030\213\006 \001(\002\022\024\n\013I" +
+      "FMINIBILFH\030\267\006 \001(\r\022\024\n\013JKGEMBOBALF\030\305\n \001(\r\022" +
+      "\024\n\013EKJHPCHCMLF\030\365\013 \001(\r\022\024\n\013POAFAPLMPEB\030\350\014 " +
+      "\001(\r\022!\n\030use_gadget_damage_action\030\305\r \001(\010\022\024" +
+      "\n\013ELIFILCNKFD\030\334\r \001(\r\022\025\n\014endure_delta\030\243\016 " +
+      "\001(\002\022\024\n\013FLPFBAFHGNN\030\262\016 \001(\r\022\024\n\013NMPEDJOPMMB" +
+      "\030\303\016 \001(\r\022\027\n\016is_resist_text\030\272\017 \001(\010\022\024\n\013GMNJ" +
+      "EDPKNDE\030\347\017 \001(\rB\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AbilityIdentifierOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HitCollisionOuterClass.getDescriptor(),
         });
     internal_static_AttackResult_descriptor =
@@ -3217,10 +3321,10 @@ public final class AttackResultOuterClass {
     internal_static_AttackResult_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AttackResult_descriptor,
-        new java.lang.String[] { "BLJNCIEFOED", "ElementType", "FMPIEJOMIFJ", "NLAAOODDKGK", "BAAHKFCEBMA", "KFCPIKCMIOI", "DPHDFDJJNOA", "BILAJCEBMGF", "MIKMJNBAAIJ", "HitEffResult", "BKKNPCPEDCF", "DKDBHEJFOGD", "DefenseId", "AttackerId", "Damage", "EMOHABNNHBJ", "KAKHNCAHEOP", "AnimEventId", "HitRetreatAngleCompat", "KGKNJIIOPMP", "EFKGDDIGOHJ", "JDPELIFFANG", "ODBKCAJFBMO", "AbilityIdentifier", "ResolvedDir", "HitCollision", "NFDLHHGPLKL", "OEEFAHMCLOM", "IEJNKCBILGI", "FIHKEJMFKHO", });
-    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.getDescriptor();
+        new java.lang.String[] { "AttackerId", "Damage", "HitRetreatAngleCompat", "DefenseId", "AbilityIdentifier", "IICFMJEJOBO", "IsCrit", "ResolvedDir", "BAABHEHFAPH", "ElementType", "HitEffResult", "AnimEventId", "HitCollision", "MPBEBAKODGF", "EBLEIGGLHLG", "ElementAmplifyRate", "ElementDurabilityAttenuation", "MuteElementHurt", "MFLNDGPEJOE", "DamageShield", "IFMINIBILFH", "JKGEMBOBALF", "EKJHPCHCMLF", "POAFAPLMPEB", "UseGadgetDamageAction", "ELIFILCNKFD", "EndureDelta", "FLPFBAFHGNN", "NMPEDJOPMMB", "IsResistText", "GMNJEDPKNDE", });
     emu.grasscutter.net.proto.AbilityIdentifierOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AttackHitEffectResultOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HitCollisionOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AuthorityChangeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AuthorityChangeOuterClass.java
index 8dada311b..fd2c40519 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AuthorityChangeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AuthorityChangeOuterClass.java
@@ -19,37 +19,33 @@ public final class AuthorityChangeOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return Whether the entityAuthorityInfo field is set.
-     */
-    boolean hasEntityAuthorityInfo();
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return The entityAuthorityInfo.
-     */
-    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo();
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     */
-    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder();
-
-    /**
-     * <code>uint32 authority_peer_id = 9;</code>
+     * <code>uint32 authority_peer_id = 7;</code>
      * @return The authorityPeerId.
      */
     int getAuthorityPeerId();
 
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return Whether the entityAuthorityInfo field is set.
+     */
+    boolean hasEntityAuthorityInfo();
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return The entityAuthorityInfo.
+     */
+    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo();
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     */
+    emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: MBOKNLKIPFI
-   * </pre>
-   *
    * Protobuf type {@code AuthorityChange}
    */
   public static final class AuthorityChange extends
@@ -94,17 +90,17 @@ public final class AuthorityChangeOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 56: {
 
               authorityPeerId_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 88: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder subBuilder = null;
               if (entityAuthorityInfo_ != null) {
                 subBuilder = entityAuthorityInfo_.toBuilder();
@@ -149,36 +145,10 @@ public final class AuthorityChangeOuterClass {
               emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.class, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder.class);
     }
 
-    public static final int ENTITY_AUTHORITY_INFO_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return Whether the entityAuthorityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEntityAuthorityInfo() {
-      return entityAuthorityInfo_ != null;
-    }
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     * @return The entityAuthorityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
-      return entityAuthorityInfo_ == null ? emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.getDefaultInstance() : entityAuthorityInfo_;
-    }
-    /**
-     * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
-      return getEntityAuthorityInfo();
-    }
-
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 9;
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 7;
     private int authorityPeerId_;
     /**
-     * <code>uint32 authority_peer_id = 9;</code>
+     * <code>uint32 authority_peer_id = 7;</code>
      * @return The authorityPeerId.
      */
     @java.lang.Override
@@ -186,10 +156,10 @@ public final class AuthorityChangeOuterClass {
       return authorityPeerId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 11;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -197,6 +167,32 @@ public final class AuthorityChangeOuterClass {
       return entityId_;
     }
 
+    public static final int ENTITY_AUTHORITY_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return Whether the entityAuthorityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasEntityAuthorityInfo() {
+      return entityAuthorityInfo_ != null;
+    }
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     * @return The entityAuthorityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
+      return entityAuthorityInfo_ == null ? emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.getDefaultInstance() : entityAuthorityInfo_;
+    }
+    /**
+     * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
+      return getEntityAuthorityInfo();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -211,14 +207,14 @@ public final class AuthorityChangeOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
-      }
       if (authorityPeerId_ != 0) {
-        output.writeUInt32(9, authorityPeerId_);
+        output.writeUInt32(7, authorityPeerId_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(11, entityId_);
       }
       if (entityAuthorityInfo_ != null) {
-        output.writeMessage(10, getEntityAuthorityInfo());
+        output.writeMessage(12, getEntityAuthorityInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +225,17 @@ public final class AuthorityChangeOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
-      }
       if (authorityPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, authorityPeerId_);
+          .computeUInt32Size(7, authorityPeerId_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, entityId_);
       }
       if (entityAuthorityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getEntityAuthorityInfo());
+          .computeMessageSize(12, getEntityAuthorityInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,15 +252,15 @@ public final class AuthorityChangeOuterClass {
       }
       emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange other = (emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange) obj;
 
+      if (getAuthorityPeerId()
+          != other.getAuthorityPeerId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasEntityAuthorityInfo() != other.hasEntityAuthorityInfo()) return false;
       if (hasEntityAuthorityInfo()) {
         if (!getEntityAuthorityInfo()
             .equals(other.getEntityAuthorityInfo())) return false;
       }
-      if (getAuthorityPeerId()
-          != other.getAuthorityPeerId()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -276,14 +272,14 @@ public final class AuthorityChangeOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasEntityAuthorityInfo()) {
-        hash = (37 * hash) + ENTITY_AUTHORITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getEntityAuthorityInfo().hashCode();
-      }
       hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAuthorityPeerId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      if (hasEntityAuthorityInfo()) {
+        hash = (37 * hash) + ENTITY_AUTHORITY_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getEntityAuthorityInfo().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -380,10 +376,6 @@ public final class AuthorityChangeOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MBOKNLKIPFI
-     * </pre>
-     *
      * Protobuf type {@code AuthorityChange}
      */
     public static final class Builder extends
@@ -421,16 +413,16 @@ public final class AuthorityChangeOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        authorityPeerId_ = 0;
+
+        entityId_ = 0;
+
         if (entityAuthorityInfoBuilder_ == null) {
           entityAuthorityInfo_ = null;
         } else {
           entityAuthorityInfo_ = null;
           entityAuthorityInfoBuilder_ = null;
         }
-        authorityPeerId_ = 0;
-
-        entityId_ = 0;
-
         return this;
       }
 
@@ -457,13 +449,13 @@ public final class AuthorityChangeOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange buildPartial() {
         emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange result = new emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange(this);
+        result.authorityPeerId_ = authorityPeerId_;
+        result.entityId_ = entityId_;
         if (entityAuthorityInfoBuilder_ == null) {
           result.entityAuthorityInfo_ = entityAuthorityInfo_;
         } else {
           result.entityAuthorityInfo_ = entityAuthorityInfoBuilder_.build();
         }
-        result.authorityPeerId_ = authorityPeerId_;
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -512,15 +504,15 @@ public final class AuthorityChangeOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange other) {
         if (other == emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.getDefaultInstance()) return this;
-        if (other.hasEntityAuthorityInfo()) {
-          mergeEntityAuthorityInfo(other.getEntityAuthorityInfo());
-        }
         if (other.getAuthorityPeerId() != 0) {
           setAuthorityPeerId(other.getAuthorityPeerId());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.hasEntityAuthorityInfo()) {
+          mergeEntityAuthorityInfo(other.getEntityAuthorityInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -550,18 +542,80 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
 
+      private int authorityPeerId_ ;
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @return The authorityPeerId.
+       */
+      @java.lang.Override
+      public int getAuthorityPeerId() {
+        return authorityPeerId_;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @param value The authorityPeerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAuthorityPeerId(int value) {
+        
+        authorityPeerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAuthorityPeerId() {
+        
+        authorityPeerId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo entityAuthorityInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder> entityAuthorityInfoBuilder_;
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        * @return Whether the entityAuthorityInfo field is set.
        */
       public boolean hasEntityAuthorityInfo() {
         return entityAuthorityInfoBuilder_ != null || entityAuthorityInfo_ != null;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        * @return The entityAuthorityInfo.
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo getEntityAuthorityInfo() {
@@ -572,7 +626,7 @@ public final class AuthorityChangeOuterClass {
         }
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder setEntityAuthorityInfo(emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo value) {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -588,7 +642,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder setEntityAuthorityInfo(
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder builderForValue) {
@@ -602,7 +656,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder mergeEntityAuthorityInfo(emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo value) {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -620,7 +674,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public Builder clearEntityAuthorityInfo() {
         if (entityAuthorityInfoBuilder_ == null) {
@@ -634,7 +688,7 @@ public final class AuthorityChangeOuterClass {
         return this;
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder getEntityAuthorityInfoBuilder() {
         
@@ -642,7 +696,7 @@ public final class AuthorityChangeOuterClass {
         return getEntityAuthorityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       public emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder getEntityAuthorityInfoOrBuilder() {
         if (entityAuthorityInfoBuilder_ != null) {
@@ -653,7 +707,7 @@ public final class AuthorityChangeOuterClass {
         }
       }
       /**
-       * <code>.EntityAuthorityInfo entity_authority_info = 10;</code>
+       * <code>.EntityAuthorityInfo entity_authority_info = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfo.Builder, emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.EntityAuthorityInfoOrBuilder> 
@@ -668,68 +722,6 @@ public final class AuthorityChangeOuterClass {
         }
         return entityAuthorityInfoBuilder_;
       }
-
-      private int authorityPeerId_ ;
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return The authorityPeerId.
-       */
-      @java.lang.Override
-      public int getAuthorityPeerId() {
-        return authorityPeerId_;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @param value The authorityPeerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAuthorityPeerId(int value) {
-        
-        authorityPeerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAuthorityPeerId() {
-        
-        authorityPeerId_ = 0;
-        onChanged();
-        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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -798,10 +790,10 @@ public final class AuthorityChangeOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AuthorityChange.proto\032\031EntityAuthority" +
-      "Info.proto\"t\n\017AuthorityChange\0223\n\025entity_" +
-      "authority_info\030\n \001(\0132\024.EntityAuthorityIn" +
-      "fo\022\031\n\021authority_peer_id\030\t \001(\r\022\021\n\tentity_" +
-      "id\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "Info.proto\"t\n\017AuthorityChange\022\031\n\021authori" +
+      "ty_peer_id\030\007 \001(\r\022\021\n\tentity_id\030\013 \001(\r\0223\n\025e" +
+      "ntity_authority_info\030\014 \001(\0132\024.EntityAutho" +
+      "rityInfoB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +806,7 @@ public final class AuthorityChangeOuterClass {
     internal_static_AuthorityChange_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AuthorityChange_descriptor,
-        new java.lang.String[] { "EntityAuthorityInfo", "AuthorityPeerId", "EntityId", });
+        new java.lang.String[] { "AuthorityPeerId", "EntityId", "EntityAuthorityInfo", });
     emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java
index 0ee96161f..9f321585f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarAddNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class AvatarAddNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_in_team = 12;</code>
+     * <code>bool is_in_team = 3;</code>
      * @return The isInTeam.
      */
     boolean getIsInTeam();
 
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return Whether the avatar field is set.
      */
     boolean hasAvatar();
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return The avatar.
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar();
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      */
     emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 7458
-   * Obf: MLOIBCFBPKN
-   * </pre>
-   *
    * Protobuf type {@code AvatarAddNotify}
    */
   public static final class AvatarAddNotify extends
@@ -89,12 +84,12 @@ public final class AvatarAddNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 24: {
 
               isInTeam_ = input.readBool();
               break;
             }
-            case 114: {
+            case 98: {
               emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
               if (avatar_ != null) {
                 subBuilder = avatar_.toBuilder();
@@ -139,10 +134,10 @@ public final class AvatarAddNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.class, emu.grasscutter.net.proto.AvatarAddNotifyOuterClass.AvatarAddNotify.Builder.class);
     }
 
-    public static final int IS_IN_TEAM_FIELD_NUMBER = 12;
+    public static final int IS_IN_TEAM_FIELD_NUMBER = 3;
     private boolean isInTeam_;
     /**
-     * <code>bool is_in_team = 12;</code>
+     * <code>bool is_in_team = 3;</code>
      * @return The isInTeam.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class AvatarAddNotifyOuterClass {
       return isInTeam_;
     }
 
-    public static final int AVATAR_FIELD_NUMBER = 14;
+    public static final int AVATAR_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatar_;
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return Whether the avatar field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ != null;
     }
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      * @return The avatar.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class AvatarAddNotifyOuterClass {
       return avatar_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatar_;
     }
     /**
-     * <code>.AvatarInfo avatar = 14;</code>
+     * <code>.AvatarInfo avatar = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
@@ -191,10 +186,10 @@ public final class AvatarAddNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isInTeam_ != false) {
-        output.writeBool(12, isInTeam_);
+        output.writeBool(3, isInTeam_);
       }
       if (avatar_ != null) {
-        output.writeMessage(14, getAvatar());
+        output.writeMessage(12, getAvatar());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class AvatarAddNotifyOuterClass {
       size = 0;
       if (isInTeam_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isInTeam_);
+          .computeBoolSize(3, isInTeam_);
       }
       if (avatar_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getAvatar());
+          .computeMessageSize(12, getAvatar());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -349,11 +344,6 @@ public final class AvatarAddNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7458
-     * Obf: MLOIBCFBPKN
-     * </pre>
-     *
      * Protobuf type {@code AvatarAddNotify}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class AvatarAddNotifyOuterClass {
 
       private boolean isInTeam_ ;
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @return The isInTeam.
        */
       @java.lang.Override
@@ -524,7 +514,7 @@ public final class AvatarAddNotifyOuterClass {
         return isInTeam_;
       }
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @param value The isInTeam to set.
        * @return This builder for chaining.
        */
@@ -535,7 +525,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_in_team = 12;</code>
+       * <code>bool is_in_team = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInTeam() {
@@ -549,14 +539,14 @@ public final class AvatarAddNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> avatarBuilder_;
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        * @return Whether the avatar field is set.
        */
       public boolean hasAvatar() {
         return avatarBuilder_ != null || avatar_ != null;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        * @return The avatar.
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatar() {
@@ -567,7 +557,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder setAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -583,7 +573,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder setAvatar(
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -597,7 +587,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder mergeAvatar(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public Builder clearAvatar() {
         if (avatarBuilder_ == null) {
@@ -629,7 +619,7 @@ public final class AvatarAddNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarBuilder() {
         
@@ -637,7 +627,7 @@ public final class AvatarAddNotifyOuterClass {
         return getAvatarFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarOrBuilder() {
         if (avatarBuilder_ != null) {
@@ -648,7 +638,7 @@ public final class AvatarAddNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarInfo avatar = 14;</code>
+       * <code>.AvatarInfo avatar = 12;</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> 
@@ -731,8 +721,8 @@ public final class AvatarAddNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025AvatarAddNotify.proto\032\020AvatarInfo.prot" +
-      "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\014 \001(\010" +
-      "\022\033\n\006avatar\030\016 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
+      "o\"B\n\017AvatarAddNotify\022\022\n\nis_in_team\030\003 \001(\010" +
+      "\022\033\n\006avatar\030\014 \001(\0132\013.AvatarInfoB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java
index 20bfe848c..1d5e440e5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeNotifyOuterClass.java
@@ -34,11 +34,6 @@ public final class AvatarChangeCostumeNotifyOuterClass {
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 22376
-   * Obf: MMGGANDHHFL
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeNotify}
    */
   public static final class AvatarChangeCostumeNotify extends
@@ -315,11 +310,6 @@ public final class AvatarChangeCostumeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22376
-     * Obf: MMGGANDHHFL
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeNotify}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java
index cd08c2188..cc7a79186 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeReqOuterClass.java
@@ -19,23 +19,18 @@ public final class AvatarChangeCostumeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 13;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 costume_id = 5;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>uint64 avatar_guid = 10;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 8840
-   * Obf: IMDCBJNFILE
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeReq}
    */
   public static final class AvatarChangeCostumeReq extends
@@ -80,14 +75,14 @@ public final class AvatarChangeCostumeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 80: {
 
-              costumeId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
             case 104: {
 
-              avatarGuid_ = input.readUInt64();
+              costumeId_ = input.readUInt32();
               break;
             }
             default: {
@@ -122,21 +117,10 @@ public final class AvatarChangeCostumeReqOuterClass {
               emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.class, emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 13;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int COSTUME_ID_FIELD_NUMBER = 5;
+    public static final int COSTUME_ID_FIELD_NUMBER = 13;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 5;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AvatarChangeCostumeReqOuterClass {
       return costumeId_;
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 10;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class AvatarChangeCostumeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (costumeId_ != 0) {
-        output.writeUInt32(5, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(13, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        output.writeUInt32(13, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class AvatarChangeCostumeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (costumeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, costumeId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
+      }
+      if (costumeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AvatarChangeCostumeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq other = (emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class AvatarChangeCostumeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCostumeId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCostumeId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class AvatarChangeCostumeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8840
-     * Obf: IMDCBJNFILE
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeReq}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class AvatarChangeCostumeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
         costumeId_ = 0;
 
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class AvatarChangeCostumeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq result = new emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq(this);
-        result.avatarGuid_ = avatarGuid_;
         result.costumeId_ = costumeId_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class AvatarChangeCostumeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarChangeCostumeReqOuterClass.AvatarChangeCostumeReq.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 13;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class AvatarChangeCostumeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 5;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -530,6 +489,37 @@ public final class AvatarChangeCostumeReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 10;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 10;</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 = 10;</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) {
@@ -598,8 +588,8 @@ public final class AvatarChangeCostumeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeReq.proto\"A\n\026Avatar" +
-      "ChangeCostumeReq\022\023\n\013avatar_guid\030\r \001(\004\022\022\n" +
-      "\ncostume_id\030\005 \001(\rB\033\n\031emu.grasscutter.net" +
+      "ChangeCostumeReq\022\022\n\ncostume_id\030\r \001(\r\022\023\n\013" +
+      "avatar_guid\030\n \001(\004B\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class AvatarChangeCostumeReqOuterClass {
     internal_static_AvatarChangeCostumeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeCostumeReq_descriptor,
-        new java.lang.String[] { "AvatarGuid", "CostumeId", });
+        new java.lang.String[] { "CostumeId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 c85da1ba0..cc3c36dc3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeCostumeRspOuterClass.java
@@ -24,24 +24,19 @@ public final class AvatarChangeCostumeRspOuterClass {
      */
     long getAvatarGuid();
 
-    /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
     /**
      * <code>uint32 costume_id = 9;</code>
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 9148
-   * Obf: KGBMPCNCLNC
-   * </pre>
-   *
    * Protobuf type {@code AvatarChangeCostumeRsp}
    */
   public static final class AvatarChangeCostumeRsp extends
@@ -86,11 +81,6 @@ public final class AvatarChangeCostumeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             case 32: {
 
               avatarGuid_ = input.readUInt64();
@@ -101,6 +91,11 @@ public final class AvatarChangeCostumeRspOuterClass {
               costumeId_ = input.readUInt32();
               break;
             }
+            case 120: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,17 +139,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       return avatarGuid_;
     }
 
-    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 COSTUME_ID_FIELD_NUMBER = 9;
     private int costumeId_;
     /**
@@ -166,6 +150,17 @@ public final class AvatarChangeCostumeRspOuterClass {
       return costumeId_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,15 +175,15 @@ public final class AvatarChangeCostumeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
       if (avatarGuid_ != 0L) {
         output.writeUInt64(4, avatarGuid_);
       }
       if (costumeId_ != 0) {
         output.writeUInt32(9, costumeId_);
       }
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -198,10 +193,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(4, avatarGuid_);
@@ -210,6 +201,10 @@ public final class AvatarChangeCostumeRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, costumeId_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -227,10 +222,10 @@ public final class AvatarChangeCostumeRspOuterClass {
 
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,10 +240,10 @@ public final class AvatarChangeCostumeRspOuterClass {
       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) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class AvatarChangeCostumeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9148
-     * Obf: KGBMPCNCLNC
-     * </pre>
-     *
      * Protobuf type {@code AvatarChangeCostumeRsp}
      */
     public static final class Builder extends
@@ -389,10 +379,10 @@ public final class AvatarChangeCostumeRspOuterClass {
         super.clear();
         avatarGuid_ = 0L;
 
-        retcode_ = 0;
-
         costumeId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -420,8 +410,8 @@ public final class AvatarChangeCostumeRspOuterClass {
       public emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp result = new emu.grasscutter.net.proto.AvatarChangeCostumeRspOuterClass.AvatarChangeCostumeRsp(this);
         result.avatarGuid_ = avatarGuid_;
-        result.retcode_ = retcode_;
         result.costumeId_ = costumeId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -473,12 +463,12 @@ public final class AvatarChangeCostumeRspOuterClass {
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -539,37 +529,6 @@ public final class AvatarChangeCostumeRspOuterClass {
         return this;
       }
 
-      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 costumeId_ ;
       /**
        * <code>uint32 costume_id = 9;</code>
@@ -600,6 +559,37 @@ public final class AvatarChangeCostumeRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -668,8 +658,8 @@ public final class AvatarChangeCostumeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034AvatarChangeCostumeRsp.proto\"R\n\026Avatar" +
-      "ChangeCostumeRsp\022\023\n\013avatar_guid\030\004 \001(\004\022\017\n" +
-      "\007retcode\030\001 \001(\005\022\022\n\ncostume_id\030\t \001(\rB\033\n\031em" +
+      "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" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarChangeCostumeRspOuterClass {
     internal_static_AvatarChangeCostumeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarChangeCostumeRsp_descriptor,
-        new java.lang.String[] { "AvatarGuid", "Retcode", "CostumeId", });
+        new java.lang.String[] { "AvatarGuid", "CostumeId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeTraceEffectReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeTraceEffectReqOuterClass.java
new file mode 100644
index 000000000..49c6119df
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarChangeTraceEffectReqOuterClass.java
@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AvatarChangeTraceEffectReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AvatarChangeTraceEffectReqOuterClass {
+  private AvatarChangeTraceEffectReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AvatarChangeTraceEffectReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AvatarChangeTraceEffectReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint64 avatar_guid = 13;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 trace_effect_id = 6;</code>
+     * @return The traceEffectId.
+     */
+    int getTraceEffectId();
+  }
+  /**
+   * Protobuf type {@code AvatarChangeTraceEffectReq}
+   */
+  public static final class AvatarChangeTraceEffectReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AvatarChangeTraceEffectReq)
+      AvatarChangeTraceEffectReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AvatarChangeTraceEffectReq.newBuilder() to construct.
+    private AvatarChangeTraceEffectReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AvatarChangeTraceEffectReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AvatarChangeTraceEffectReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AvatarChangeTraceEffectReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 48: {
+
+              traceEffectId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.class, emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.Builder.class);
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 13;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int TRACE_EFFECT_ID_FIELD_NUMBER = 6;
+    private int traceEffectId_;
+    /**
+     * <code>uint32 trace_effect_id = 6;</code>
+     * @return The traceEffectId.
+     */
+    @java.lang.Override
+    public int getTraceEffectId() {
+      return traceEffectId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (traceEffectId_ != 0) {
+        output.writeUInt32(6, traceEffectId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(13, avatarGuid_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (traceEffectId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, traceEffectId_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, avatarGuid_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq other = (emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) obj;
+
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
+      if (getTraceEffectId()
+          != other.getTraceEffectId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
+      hash = (37 * hash) + TRACE_EFFECT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTraceEffectId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code AvatarChangeTraceEffectReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AvatarChangeTraceEffectReq)
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.class, emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        avatarGuid_ = 0L;
+
+        traceEffectId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.internal_static_AvatarChangeTraceEffectReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq build() {
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq buildPartial() {
+        emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq result = new emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq(this);
+        result.avatarGuid_ = avatarGuid_;
+        result.traceEffectId_ = traceEffectId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) {
+          return mergeFrom((emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq other) {
+        if (other == emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq.getDefaultInstance()) return this;
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
+        if (other.getTraceEffectId() != 0) {
+          setTraceEffectId(other.getTraceEffectId());
+        }
+        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.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 13;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 13;</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 = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int traceEffectId_ ;
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @return The traceEffectId.
+       */
+      @java.lang.Override
+      public int getTraceEffectId() {
+        return traceEffectId_;
+      }
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @param value The traceEffectId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTraceEffectId(int value) {
+        
+        traceEffectId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 trace_effect_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTraceEffectId() {
+        
+        traceEffectId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AvatarChangeTraceEffectReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:AvatarChangeTraceEffectReq)
+    private static final emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq();
+    }
+
+    public static emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AvatarChangeTraceEffectReq>
+        PARSER = new com.google.protobuf.AbstractParser<AvatarChangeTraceEffectReq>() {
+      @java.lang.Override
+      public AvatarChangeTraceEffectReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AvatarChangeTraceEffectReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AvatarChangeTraceEffectReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AvatarChangeTraceEffectReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarChangeTraceEffectReqOuterClass.AvatarChangeTraceEffectReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AvatarChangeTraceEffectReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n AvatarChangeTraceEffectReq.proto\"J\n\032Av" +
+      "atarChangeTraceEffectReq\022\023\n\013avatar_guid\030" +
+      "\r \001(\004\022\027\n\017trace_effect_id\030\006 \001(\rB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AvatarChangeTraceEffectReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AvatarChangeTraceEffectReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AvatarChangeTraceEffectReq_descriptor,
+        new java.lang.String[] { "AvatarGuid", "TraceEffectId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
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 8f7c4228d..702690ebd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDataNotifyOuterClass.java
@@ -19,98 +19,92 @@ public final class AvatarDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
+     * @return A list containing the oNAODHDMILI.
      */
-    java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> 
-        getAvatarListList();
+    java.util.List<java.lang.Integer> getONAODHDMILIList();
     /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
+     * @return The count of oNAODHDMILI.
      */
-    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index);
+    int getONAODHDMILICount();
     /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    int getAvatarListCount();
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
-        getAvatarListOrBuilderList();
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 cur_avatar_team_id = 2;</code>
-     * @return The curAvatarTeamId.
-     */
-    int getCurAvatarTeamId();
-
-    /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
-     * @return A list containing the ownedCostumeList.
-     */
-    java.util.List<java.lang.Integer> getOwnedCostumeListList();
-    /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
-     * @return The count of ownedCostumeList.
-     */
-    int getOwnedCostumeListCount();
-    /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
      * @param index The index of the element to return.
-     * @return The ownedCostumeList at the given index.
+     * @return The oNAODHDMILI at the given index.
      */
-    int getOwnedCostumeList(int index);
+    int getONAODHDMILI(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 = 14;</code>
-     * @return The count of ownedFlycloakList.
-     */
-    int getOwnedFlycloakListCount();
-    /**
-     * <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 uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     java.util.List<java.lang.Long> getTempAvatarGuidListList();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @return The count of tempAvatarGuidList.
      */
     int getTempAvatarGuidListCount();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
     long getTempAvatarGuidList(int index);
 
     /**
-     * <code>uint64 choose_avatar_guid = 15;</code>
-     * @return The chooseAvatarGuid.
+     * <code>uint32 cur_avatar_team_id = 7;</code>
+     * @return The curAvatarTeamId.
      */
-    long getChooseAvatarGuid();
+    int getCurAvatarTeamId();
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> 
+        getAvatarListList();
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index);
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    int getAvatarListCount();
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
+        getAvatarListOrBuilderList();
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @return A list containing the backupAvatarTeamOrderList.
+     */
+    java.util.List<java.lang.Integer> getBackupAvatarTeamOrderListList();
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @return The count of backupAvatarTeamOrderList.
+     */
+    int getBackupAvatarTeamOrderListCount();
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @param index The index of the element to return.
+     * @return The backupAvatarTeamOrderList at the given index.
+     */
+    int getBackupAvatarTeamOrderList(int index);
+
+    /**
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -121,71 +115,89 @@ public final class AvatarDataNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <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 = 13;</code>
+     * <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 = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
 
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated uint32 owned_flycloak_list = 11;</code>
+     * @return A list containing the ownedFlycloakList.
+     */
+    java.util.List<java.lang.Integer> getOwnedFlycloakListList();
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 11;</code>
+     * @return The count of ownedFlycloakList.
+     */
+    int getOwnedFlycloakListCount();
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 11;</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 = 12;</code>
+     * @return A list containing the ownedCostumeList.
+     */
+    java.util.List<java.lang.Integer> getOwnedCostumeListList();
+    /**
+     * <code>repeated uint32 owned_costume_list = 12;</code>
+     * @return The count of ownedCostumeList.
+     */
+    int getOwnedCostumeListCount();
+    /**
+     * <code>repeated uint32 owned_costume_list = 12;</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 = 13;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> 
         getAvatarRenameListList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index);
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     int getAvatarRenameListCount();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
         getAvatarRenameListOrBuilderList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
         int index);
 
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @return A list containing the backupAvatarTeamOrderList.
+     * <code>uint64 choose_avatar_guid = 14;</code>
+     * @return The chooseAvatarGuid.
      */
-    java.util.List<java.lang.Integer> getBackupAvatarTeamOrderListList();
-    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @return The count of backupAvatarTeamOrderList.
-     */
-    int getBackupAvatarTeamOrderListCount();
-    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @param index The index of the element to return.
-     * @return The backupAvatarTeamOrderList at the given index.
-     */
-    int getBackupAvatarTeamOrderList(int index);
+    long getChooseAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 29811
-   * Obf: OGCGDDPPLMI
-   * </pre>
-   *
    * Protobuf type {@code AvatarDataNotify}
    */
   public static final class AvatarDataNotify extends
@@ -198,12 +210,13 @@ public final class AvatarDataNotifyOuterClass {
       super(builder);
     }
     private AvatarDataNotify() {
-      avatarList_ = java.util.Collections.emptyList();
-      ownedCostumeList_ = emptyIntList();
-      ownedFlycloakList_ = emptyIntList();
+      oNAODHDMILI_ = emptyIntList();
       tempAvatarGuidList_ = emptyLongList();
-      avatarRenameList_ = java.util.Collections.emptyList();
+      avatarList_ = java.util.Collections.emptyList();
       backupAvatarTeamOrderList_ = emptyIntList();
+      ownedFlycloakList_ = emptyIntList();
+      ownedCostumeList_ = emptyIntList();
+      avatarRenameList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -237,20 +250,41 @@ public final class AvatarDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+            case 16: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                oNAODHDMILI_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              oNAODHDMILI_.addInt(input.readUInt32());
+              break;
+            }
+            case 18: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                oNAODHDMILI_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                oNAODHDMILI_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               tempAvatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 10: {
+            case 34: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 tempAvatarGuidList_.addLong(input.readUInt64());
@@ -258,55 +292,34 @@ public final class AvatarDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 16: {
+            case 56: {
 
               curAvatarTeamId_ = input.readUInt32();
               break;
             }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 avatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000004;
               }
               avatarList_.add(
                   input.readMessage(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.parser(), extensionRegistry));
               break;
             }
-            case 40: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                ownedCostumeList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              ownedCostumeList_.addInt(input.readUInt32());
-              break;
-            }
-            case 42: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                ownedCostumeList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                ownedCostumeList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 56: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+                mutable_bitField0_ |= 0x00000008;
               }
               backupAvatarTeamOrderList_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+                mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_.addInt(input.readUInt32());
@@ -314,16 +327,7 @@ public final class AvatarDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>();
-                mutable_bitField0_ |= 0x00000020;
-              }
-              avatarRenameList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 106: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000010) != 0)) {
                 avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
                     AvatarTeamMapDefaultEntryHolder.defaultEntry);
@@ -336,20 +340,20 @@ public final class AvatarDataNotifyOuterClass {
                   avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
               break;
             }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
                 ownedFlycloakList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000020;
               }
               ownedFlycloakList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
                 ownedFlycloakList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000020;
               }
               while (input.getBytesUntilLimit() > 0) {
                 ownedFlycloakList_.addInt(input.readUInt32());
@@ -357,7 +361,37 @@ public final class AvatarDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                ownedCostumeList_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              ownedCostumeList_.addInt(input.readUInt32());
+              break;
+            }
+            case 98: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                ownedCostumeList_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                ownedCostumeList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+                avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              avatarRenameList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 112: {
 
               chooseAvatarGuid_ = input.readUInt64();
               break;
@@ -377,24 +411,27 @@ public final class AvatarDataNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          tempAvatarGuidList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          avatarList_ = java.util.Collections.unmodifiableList(avatarList_);
+          oNAODHDMILI_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          ownedCostumeList_.makeImmutable(); // C
+          tempAvatarGuidList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          avatarList_ = java.util.Collections.unmodifiableList(avatarList_);
+        }
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
           backupAvatarTeamOrderList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          avatarRenameList_ = java.util.Collections.unmodifiableList(avatarRenameList_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           ownedFlycloakList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          ownedCostumeList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000080) != 0)) {
+          avatarRenameList_ = java.util.Collections.unmodifiableList(avatarRenameList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -409,7 +446,7 @@ public final class AvatarDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 13:
+        case 10:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -424,117 +461,38 @@ public final class AvatarDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify.class, emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify.Builder.class);
     }
 
-    public static final int AVATAR_LIST_FIELD_NUMBER = 3;
-    private java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> avatarList_;
+    public static final int ONAODHDMILI_FIELD_NUMBER = 2;
+    private com.google.protobuf.Internal.IntList oNAODHDMILI_;
     /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> getAvatarListList() {
-      return avatarList_;
-    }
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
-        getAvatarListOrBuilderList() {
-      return avatarList_;
-    }
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    @java.lang.Override
-    public int getAvatarListCount() {
-      return avatarList_.size();
-    }
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index) {
-      return avatarList_.get(index);
-    }
-    /**
-     * <code>repeated .AvatarInfo avatar_list = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
-        int index) {
-      return avatarList_.get(index);
-    }
-
-    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 2;
-    private int curAvatarTeamId_;
-    /**
-     * <code>uint32 cur_avatar_team_id = 2;</code>
-     * @return The curAvatarTeamId.
-     */
-    @java.lang.Override
-    public int getCurAvatarTeamId() {
-      return curAvatarTeamId_;
-    }
-
-    public static final int OWNED_COSTUME_LIST_FIELD_NUMBER = 5;
-    private com.google.protobuf.Internal.IntList ownedCostumeList_;
-    /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
-     * @return A list containing the ownedCostumeList.
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
+     * @return A list containing the oNAODHDMILI.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getOwnedCostumeListList() {
-      return ownedCostumeList_;
+        getONAODHDMILIList() {
+      return oNAODHDMILI_;
     }
     /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
-     * @return The count of ownedCostumeList.
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
+     * @return The count of oNAODHDMILI.
      */
-    public int getOwnedCostumeListCount() {
-      return ownedCostumeList_.size();
+    public int getONAODHDMILICount() {
+      return oNAODHDMILI_.size();
     }
     /**
-     * <code>repeated uint32 owned_costume_list = 5;</code>
+     * <code>repeated uint32 ONAODHDMILI = 2;</code>
      * @param index The index of the element to return.
-     * @return The ownedCostumeList at the given index.
+     * @return The oNAODHDMILI at the given index.
      */
-    public int getOwnedCostumeList(int index) {
-      return ownedCostumeList_.getInt(index);
+    public int getONAODHDMILI(int index) {
+      return oNAODHDMILI_.getInt(index);
     }
-    private int ownedCostumeListMemoizedSerializedSize = -1;
+    private int oNAODHDMILIMemoizedSerializedSize = -1;
 
-    public static final int OWNED_FLYCLOAK_LIST_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList ownedFlycloakList_;
-    /**
-     * <code>repeated uint32 owned_flycloak_list = 14;</code>
-     * @return A list containing the ownedFlycloakList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getOwnedFlycloakListList() {
-      return ownedFlycloakList_;
-    }
-    /**
-     * <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 = 14;</code>
-     * @param index The index of the element to return.
-     * @return The ownedFlycloakList at the given index.
-     */
-    public int getOwnedFlycloakList(int index) {
-      return ownedFlycloakList_.getInt(index);
-    }
-    private int ownedFlycloakListMemoizedSerializedSize = -1;
-
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 1;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 4;
     private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     @java.lang.Override
@@ -543,14 +501,14 @@ public final class AvatarDataNotifyOuterClass {
       return tempAvatarGuidList_;
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @return The count of tempAvatarGuidList.
      */
     public int getTempAvatarGuidListCount() {
       return tempAvatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
@@ -559,18 +517,86 @@ public final class AvatarDataNotifyOuterClass {
     }
     private int tempAvatarGuidListMemoizedSerializedSize = -1;
 
-    public static final int CHOOSE_AVATAR_GUID_FIELD_NUMBER = 15;
-    private long chooseAvatarGuid_;
+    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 7;
+    private int curAvatarTeamId_;
     /**
-     * <code>uint64 choose_avatar_guid = 15;</code>
-     * @return The chooseAvatarGuid.
+     * <code>uint32 cur_avatar_team_id = 7;</code>
+     * @return The curAvatarTeamId.
      */
     @java.lang.Override
-    public long getChooseAvatarGuid() {
-      return chooseAvatarGuid_;
+    public int getCurAvatarTeamId() {
+      return curAvatarTeamId_;
     }
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 13;
+    public static final int AVATAR_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> avatarList_;
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> getAvatarListList() {
+      return avatarList_;
+    }
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
+        getAvatarListOrBuilderList() {
+      return avatarList_;
+    }
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getAvatarListCount() {
+      return avatarList_.size();
+    }
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index) {
+      return avatarList_.get(index);
+    }
+    /**
+     * <code>repeated .AvatarInfo avatar_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
+        int index) {
+      return avatarList_.get(index);
+    }
+
+    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @return A list containing the backupAvatarTeamOrderList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getBackupAvatarTeamOrderListList() {
+      return backupAvatarTeamOrderList_;
+    }
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @return The count of backupAvatarTeamOrderList.
+     */
+    public int getBackupAvatarTeamOrderListCount() {
+      return backupAvatarTeamOrderList_.size();
+    }
+    /**
+     * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+     * @param index The index of the element to return.
+     * @return The backupAvatarTeamOrderList at the given index.
+     */
+    public int getBackupAvatarTeamOrderList(int index) {
+      return backupAvatarTeamOrderList_.getInt(index);
+    }
+    private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;
+
+    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 =
@@ -597,7 +623,7 @@ public final class AvatarDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
 
     @java.lang.Override
@@ -615,7 +641,7 @@ public final class AvatarDataNotifyOuterClass {
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -623,7 +649,7 @@ public final class AvatarDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -636,7 +662,7 @@ public final class AvatarDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
      */
     @java.lang.Override
 
@@ -651,17 +677,73 @@ public final class AvatarDataNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 11;
+    public static final int OWNED_FLYCLOAK_LIST_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList ownedFlycloakList_;
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 11;</code>
+     * @return A list containing the ownedFlycloakList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getOwnedFlycloakListList() {
+      return ownedFlycloakList_;
+    }
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 11;</code>
+     * @return The count of ownedFlycloakList.
+     */
+    public int getOwnedFlycloakListCount() {
+      return ownedFlycloakList_.size();
+    }
+    /**
+     * <code>repeated uint32 owned_flycloak_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The ownedFlycloakList at the given index.
+     */
+    public int getOwnedFlycloakList(int index) {
+      return ownedFlycloakList_.getInt(index);
+    }
+    private int ownedFlycloakListMemoizedSerializedSize = -1;
+
+    public static final int OWNED_COSTUME_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList ownedCostumeList_;
+    /**
+     * <code>repeated uint32 owned_costume_list = 12;</code>
+     * @return A list containing the ownedCostumeList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getOwnedCostumeListList() {
+      return ownedCostumeList_;
+    }
+    /**
+     * <code>repeated uint32 owned_costume_list = 12;</code>
+     * @return The count of ownedCostumeList.
+     */
+    public int getOwnedCostumeListCount() {
+      return ownedCostumeList_.size();
+    }
+    /**
+     * <code>repeated uint32 owned_costume_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The ownedCostumeList at the given index.
+     */
+    public int getOwnedCostumeList(int index) {
+      return ownedCostumeList_.getInt(index);
+    }
+    private int ownedCostumeListMemoizedSerializedSize = -1;
+
+    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 13;
     private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_;
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
@@ -669,21 +751,21 @@ public final class AvatarDataNotifyOuterClass {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     @java.lang.Override
     public int getAvatarRenameListCount() {
       return avatarRenameList_.size();
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
       return avatarRenameList_.get(index);
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
@@ -691,33 +773,16 @@ public final class AvatarDataNotifyOuterClass {
       return avatarRenameList_.get(index);
     }
 
-    public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 7;
-    private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
+    public static final int CHOOSE_AVATAR_GUID_FIELD_NUMBER = 14;
+    private long chooseAvatarGuid_;
     /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @return A list containing the backupAvatarTeamOrderList.
+     * <code>uint64 choose_avatar_guid = 14;</code>
+     * @return The chooseAvatarGuid.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getBackupAvatarTeamOrderListList() {
-      return backupAvatarTeamOrderList_;
+    public long getChooseAvatarGuid() {
+      return chooseAvatarGuid_;
     }
-    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @return The count of backupAvatarTeamOrderList.
-     */
-    public int getBackupAvatarTeamOrderListCount() {
-      return backupAvatarTeamOrderList_.size();
-    }
-    /**
-     * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-     * @param index The index of the element to return.
-     * @return The backupAvatarTeamOrderList at the given index.
-     */
-    public int getBackupAvatarTeamOrderList(int index) {
-      return backupAvatarTeamOrderList_.getInt(index);
-    }
-    private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -734,51 +799,58 @@ public final class AvatarDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (getONAODHDMILIList().size() > 0) {
+        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(oNAODHDMILIMemoizedSerializedSize);
+      }
+      for (int i = 0; i < oNAODHDMILI_.size(); i++) {
+        output.writeUInt32NoTag(oNAODHDMILI_.getInt(i));
+      }
       if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(34);
         output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
         output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
       }
       if (curAvatarTeamId_ != 0) {
-        output.writeUInt32(2, curAvatarTeamId_);
+        output.writeUInt32(7, curAvatarTeamId_);
       }
       for (int i = 0; i < avatarList_.size(); i++) {
-        output.writeMessage(3, avatarList_.get(i));
-      }
-      if (getOwnedCostumeListList().size() > 0) {
-        output.writeUInt32NoTag(42);
-        output.writeUInt32NoTag(ownedCostumeListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < ownedCostumeList_.size(); i++) {
-        output.writeUInt32NoTag(ownedCostumeList_.getInt(i));
+        output.writeMessage(8, avatarList_.get(i));
       }
       if (getBackupAvatarTeamOrderListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(74);
         output.writeUInt32NoTag(backupAvatarTeamOrderListMemoizedSerializedSize);
       }
       for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
         output.writeUInt32NoTag(backupAvatarTeamOrderList_.getInt(i));
       }
-      for (int i = 0; i < avatarRenameList_.size(); i++) {
-        output.writeMessage(11, avatarRenameList_.get(i));
-      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetAvatarTeamMap(),
           AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          13);
+          10);
       if (getOwnedFlycloakListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(ownedFlycloakListMemoizedSerializedSize);
       }
       for (int i = 0; i < ownedFlycloakList_.size(); i++) {
         output.writeUInt32NoTag(ownedFlycloakList_.getInt(i));
       }
+      if (getOwnedCostumeListList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(ownedCostumeListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < ownedCostumeList_.size(); i++) {
+        output.writeUInt32NoTag(ownedCostumeList_.getInt(i));
+      }
+      for (int i = 0; i < avatarRenameList_.size(); i++) {
+        output.writeMessage(13, avatarRenameList_.get(i));
+      }
       if (chooseAvatarGuid_ != 0L) {
-        output.writeUInt64(15, chooseAvatarGuid_);
+        output.writeUInt64(14, chooseAvatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -789,6 +861,20 @@ public final class AvatarDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < oNAODHDMILI_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(oNAODHDMILI_.getInt(i));
+        }
+        size += dataSize;
+        if (!getONAODHDMILIList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        oNAODHDMILIMemoizedSerializedSize = dataSize;
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -805,25 +891,11 @@ public final class AvatarDataNotifyOuterClass {
       }
       if (curAvatarTeamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, curAvatarTeamId_);
+          .computeUInt32Size(7, curAvatarTeamId_);
       }
       for (int i = 0; i < avatarList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, avatarList_.get(i));
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < ownedCostumeList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(ownedCostumeList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getOwnedCostumeListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        ownedCostumeListMemoizedSerializedSize = dataSize;
+          .computeMessageSize(8, avatarList_.get(i));
       }
       {
         int dataSize = 0;
@@ -839,10 +911,6 @@ public final class AvatarDataNotifyOuterClass {
         }
         backupAvatarTeamOrderListMemoizedSerializedSize = dataSize;
       }
-      for (int i = 0; i < avatarRenameList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, avatarRenameList_.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>
@@ -851,7 +919,7 @@ public final class AvatarDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, avatarTeamMap__);
+            .computeMessageSize(10, avatarTeamMap__);
       }
       {
         int dataSize = 0;
@@ -867,9 +935,27 @@ public final class AvatarDataNotifyOuterClass {
         }
         ownedFlycloakListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < ownedCostumeList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(ownedCostumeList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getOwnedCostumeListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        ownedCostumeListMemoizedSerializedSize = dataSize;
+      }
+      for (int i = 0; i < avatarRenameList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, avatarRenameList_.get(i));
+      }
       if (chooseAvatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, chooseAvatarGuid_);
+          .computeUInt64Size(14, chooseAvatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -886,24 +972,26 @@ public final class AvatarDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify other = (emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify) obj;
 
-      if (!getAvatarListList()
-          .equals(other.getAvatarListList())) return false;
-      if (getCurAvatarTeamId()
-          != other.getCurAvatarTeamId()) return false;
-      if (!getOwnedCostumeListList()
-          .equals(other.getOwnedCostumeListList())) return false;
-      if (!getOwnedFlycloakListList()
-          .equals(other.getOwnedFlycloakListList())) return false;
+      if (!getONAODHDMILIList()
+          .equals(other.getONAODHDMILIList())) return false;
       if (!getTempAvatarGuidListList()
           .equals(other.getTempAvatarGuidListList())) return false;
-      if (getChooseAvatarGuid()
-          != other.getChooseAvatarGuid()) return false;
-      if (!internalGetAvatarTeamMap().equals(
-          other.internalGetAvatarTeamMap())) return false;
-      if (!getAvatarRenameListList()
-          .equals(other.getAvatarRenameListList())) return false;
+      if (getCurAvatarTeamId()
+          != other.getCurAvatarTeamId()) return false;
+      if (!getAvatarListList()
+          .equals(other.getAvatarListList())) return false;
       if (!getBackupAvatarTeamOrderListList()
           .equals(other.getBackupAvatarTeamOrderListList())) return false;
+      if (!internalGetAvatarTeamMap().equals(
+          other.internalGetAvatarTeamMap())) 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 (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -915,39 +1003,43 @@ public final class AvatarDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getAvatarListCount() > 0) {
-        hash = (37 * hash) + AVATAR_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarListList().hashCode();
-      }
-      hash = (37 * hash) + CUR_AVATAR_TEAM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCurAvatarTeamId();
-      if (getOwnedCostumeListCount() > 0) {
-        hash = (37 * hash) + OWNED_COSTUME_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getOwnedCostumeListList().hashCode();
-      }
-      if (getOwnedFlycloakListCount() > 0) {
-        hash = (37 * hash) + OWNED_FLYCLOAK_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getOwnedFlycloakListList().hashCode();
+      if (getONAODHDMILICount() > 0) {
+        hash = (37 * hash) + ONAODHDMILI_FIELD_NUMBER;
+        hash = (53 * hash) + getONAODHDMILIList().hashCode();
       }
       if (getTempAvatarGuidListCount() > 0) {
         hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
       }
-      hash = (37 * hash) + CHOOSE_AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getChooseAvatarGuid());
-      if (!internalGetAvatarTeamMap().getMap().isEmpty()) {
-        hash = (37 * hash) + AVATAR_TEAM_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetAvatarTeamMap().hashCode();
-      }
-      if (getAvatarRenameListCount() > 0) {
-        hash = (37 * hash) + AVATAR_RENAME_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarRenameListList().hashCode();
+      hash = (37 * hash) + CUR_AVATAR_TEAM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurAvatarTeamId();
+      if (getAvatarListCount() > 0) {
+        hash = (37 * hash) + AVATAR_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarListList().hashCode();
       }
       if (getBackupAvatarTeamOrderListCount() > 0) {
         hash = (37 * hash) + BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getBackupAvatarTeamOrderListList().hashCode();
       }
+      if (!internalGetAvatarTeamMap().getMap().isEmpty()) {
+        hash = (37 * hash) + AVATAR_TEAM_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetAvatarTeamMap().hashCode();
+      }
+      if (getOwnedFlycloakListCount() > 0) {
+        hash = (37 * hash) + OWNED_FLYCLOAK_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getOwnedFlycloakListList().hashCode();
+      }
+      if (getOwnedCostumeListCount() > 0) {
+        hash = (37 * hash) + OWNED_COSTUME_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getOwnedCostumeListList().hashCode();
+      }
+      if (getAvatarRenameListCount() > 0) {
+        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());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1044,11 +1136,6 @@ public final class AvatarDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29811
-     * Obf: OGCGDDPPLMI
-     * </pre>
-     *
      * Protobuf type {@code AvatarDataNotify}
      */
     public static final class Builder extends
@@ -1064,7 +1151,7 @@ public final class AvatarDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 10:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -1075,7 +1162,7 @@ public final class AvatarDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 10:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -1110,31 +1197,33 @@ public final class AvatarDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        oNAODHDMILI_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        curAvatarTeamId_ = 0;
+
         if (avatarListBuilder_ == null) {
           avatarList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           avatarListBuilder_.clear();
         }
-        curAvatarTeamId_ = 0;
-
-        ownedCostumeList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        ownedFlycloakList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        tempAvatarGuidList_ = emptyLongList();
+        backupAvatarTeamOrderList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
-        chooseAvatarGuid_ = 0L;
-
         internalGetMutableAvatarTeamMap().clear();
+        ownedFlycloakList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        ownedCostumeList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
         if (avatarRenameListBuilder_ == null) {
           avatarRenameList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00000080);
         } else {
           avatarRenameListBuilder_.clear();
         }
-        backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+        chooseAvatarGuid_ = 0L;
+
         return this;
       }
 
@@ -1162,48 +1251,53 @@ public final class AvatarDataNotifyOuterClass {
       public emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify result = new emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify(this);
         int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          oNAODHDMILI_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.oNAODHDMILI_ = oNAODHDMILI_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          tempAvatarGuidList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.tempAvatarGuidList_ = tempAvatarGuidList_;
+        result.curAvatarTeamId_ = curAvatarTeamId_;
         if (avatarListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             avatarList_ = java.util.Collections.unmodifiableList(avatarList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.avatarList_ = avatarList_;
         } else {
           result.avatarList_ = avatarListBuilder_.build();
         }
-        result.curAvatarTeamId_ = curAvatarTeamId_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          ownedCostumeList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.ownedCostumeList_ = ownedCostumeList_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          ownedFlycloakList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.ownedFlycloakList_ = ownedFlycloakList_;
         if (((bitField0_ & 0x00000008) != 0)) {
-          tempAvatarGuidList_.makeImmutable();
+          backupAvatarTeamOrderList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.tempAvatarGuidList_ = tempAvatarGuidList_;
-        result.chooseAvatarGuid_ = chooseAvatarGuid_;
+        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
         result.avatarTeamMap_ = internalGetAvatarTeamMap();
         result.avatarTeamMap_.makeImmutable();
+        if (((bitField0_ & 0x00000020) != 0)) {
+          ownedFlycloakList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000020);
+        }
+        result.ownedFlycloakList_ = ownedFlycloakList_;
+        if (((bitField0_ & 0x00000040) != 0)) {
+          ownedCostumeList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000040);
+        }
+        result.ownedCostumeList_ = ownedCostumeList_;
         if (avatarRenameListBuilder_ == null) {
-          if (((bitField0_ & 0x00000020) != 0)) {
+          if (((bitField0_ & 0x00000080) != 0)) {
             avatarRenameList_ = java.util.Collections.unmodifiableList(avatarRenameList_);
-            bitField0_ = (bitField0_ & ~0x00000020);
+            bitField0_ = (bitField0_ & ~0x00000080);
           }
           result.avatarRenameList_ = avatarRenameList_;
         } else {
           result.avatarRenameList_ = avatarRenameListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000040) != 0)) {
-          backupAvatarTeamOrderList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000040);
-        }
-        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
+        result.chooseAvatarGuid_ = chooseAvatarGuid_;
         onBuilt();
         return result;
       }
@@ -1252,11 +1346,34 @@ public final class AvatarDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarDataNotifyOuterClass.AvatarDataNotify.getDefaultInstance()) return this;
+        if (!other.oNAODHDMILI_.isEmpty()) {
+          if (oNAODHDMILI_.isEmpty()) {
+            oNAODHDMILI_ = other.oNAODHDMILI_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureONAODHDMILIIsMutable();
+            oNAODHDMILI_.addAll(other.oNAODHDMILI_);
+          }
+          onChanged();
+        }
+        if (!other.tempAvatarGuidList_.isEmpty()) {
+          if (tempAvatarGuidList_.isEmpty()) {
+            tempAvatarGuidList_ = other.tempAvatarGuidList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureTempAvatarGuidListIsMutable();
+            tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
+          }
+          onChanged();
+        }
+        if (other.getCurAvatarTeamId() != 0) {
+          setCurAvatarTeamId(other.getCurAvatarTeamId());
+        }
         if (avatarListBuilder_ == null) {
           if (!other.avatarList_.isEmpty()) {
             if (avatarList_.isEmpty()) {
               avatarList_ = other.avatarList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
               ensureAvatarListIsMutable();
               avatarList_.addAll(other.avatarList_);
@@ -1269,7 +1386,7 @@ public final class AvatarDataNotifyOuterClass {
               avatarListBuilder_.dispose();
               avatarListBuilder_ = null;
               avatarList_ = other.avatarList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
               avatarListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAvatarListFieldBuilder() : null;
@@ -1278,49 +1395,43 @@ public final class AvatarDataNotifyOuterClass {
             }
           }
         }
-        if (other.getCurAvatarTeamId() != 0) {
-          setCurAvatarTeamId(other.getCurAvatarTeamId());
-        }
-        if (!other.ownedCostumeList_.isEmpty()) {
-          if (ownedCostumeList_.isEmpty()) {
-            ownedCostumeList_ = other.ownedCostumeList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
+          if (backupAvatarTeamOrderList_.isEmpty()) {
+            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
+            bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensureOwnedCostumeListIsMutable();
-            ownedCostumeList_.addAll(other.ownedCostumeList_);
+            ensureBackupAvatarTeamOrderListIsMutable();
+            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
           }
           onChanged();
         }
+        internalGetMutableAvatarTeamMap().mergeFrom(
+            other.internalGetAvatarTeamMap());
         if (!other.ownedFlycloakList_.isEmpty()) {
           if (ownedFlycloakList_.isEmpty()) {
             ownedFlycloakList_ = other.ownedFlycloakList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000020);
           } else {
             ensureOwnedFlycloakListIsMutable();
             ownedFlycloakList_.addAll(other.ownedFlycloakList_);
           }
           onChanged();
         }
-        if (!other.tempAvatarGuidList_.isEmpty()) {
-          if (tempAvatarGuidList_.isEmpty()) {
-            tempAvatarGuidList_ = other.tempAvatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000008);
+        if (!other.ownedCostumeList_.isEmpty()) {
+          if (ownedCostumeList_.isEmpty()) {
+            ownedCostumeList_ = other.ownedCostumeList_;
+            bitField0_ = (bitField0_ & ~0x00000040);
           } else {
-            ensureTempAvatarGuidListIsMutable();
-            tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
+            ensureOwnedCostumeListIsMutable();
+            ownedCostumeList_.addAll(other.ownedCostumeList_);
           }
           onChanged();
         }
-        if (other.getChooseAvatarGuid() != 0L) {
-          setChooseAvatarGuid(other.getChooseAvatarGuid());
-        }
-        internalGetMutableAvatarTeamMap().mergeFrom(
-            other.internalGetAvatarTeamMap());
         if (avatarRenameListBuilder_ == null) {
           if (!other.avatarRenameList_.isEmpty()) {
             if (avatarRenameList_.isEmpty()) {
               avatarRenameList_ = other.avatarRenameList_;
-              bitField0_ = (bitField0_ & ~0x00000020);
+              bitField0_ = (bitField0_ & ~0x00000080);
             } else {
               ensureAvatarRenameListIsMutable();
               avatarRenameList_.addAll(other.avatarRenameList_);
@@ -1333,7 +1444,7 @@ public final class AvatarDataNotifyOuterClass {
               avatarRenameListBuilder_.dispose();
               avatarRenameListBuilder_ = null;
               avatarRenameList_ = other.avatarRenameList_;
-              bitField0_ = (bitField0_ & ~0x00000020);
+              bitField0_ = (bitField0_ & ~0x00000080);
               avatarRenameListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAvatarRenameListFieldBuilder() : null;
@@ -1342,15 +1453,8 @@ public final class AvatarDataNotifyOuterClass {
             }
           }
         }
-        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
-          if (backupAvatarTeamOrderList_.isEmpty()) {
-            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-          } else {
-            ensureBackupAvatarTeamOrderListIsMutable();
-            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
-          }
-          onChanged();
+        if (other.getChooseAvatarGuid() != 0L) {
+          setChooseAvatarGuid(other.getChooseAvatarGuid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1382,12 +1486,201 @@ public final class AvatarDataNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList oNAODHDMILI_ = emptyIntList();
+      private void ensureONAODHDMILIIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          oNAODHDMILI_ = mutableCopy(oNAODHDMILI_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @return A list containing the oNAODHDMILI.
+       */
+      public java.util.List<java.lang.Integer>
+          getONAODHDMILIList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(oNAODHDMILI_) : oNAODHDMILI_;
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @return The count of oNAODHDMILI.
+       */
+      public int getONAODHDMILICount() {
+        return oNAODHDMILI_.size();
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @param index The index of the element to return.
+       * @return The oNAODHDMILI at the given index.
+       */
+      public int getONAODHDMILI(int index) {
+        return oNAODHDMILI_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @param index The index to set the value at.
+       * @param value The oNAODHDMILI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setONAODHDMILI(
+          int index, int value) {
+        ensureONAODHDMILIIsMutable();
+        oNAODHDMILI_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @param value The oNAODHDMILI to add.
+       * @return This builder for chaining.
+       */
+      public Builder addONAODHDMILI(int value) {
+        ensureONAODHDMILIIsMutable();
+        oNAODHDMILI_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @param values The oNAODHDMILI to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllONAODHDMILI(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureONAODHDMILIIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, oNAODHDMILI_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 ONAODHDMILI = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearONAODHDMILI() {
+        oNAODHDMILI_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
+      private void ensureTempAvatarGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
+       * @return A list containing the tempAvatarGuidList.
+       */
+      public java.util.List<java.lang.Long>
+          getTempAvatarGuidListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 4;</code>
+       * @return The count of tempAvatarGuidList.
+       */
+      public int getTempAvatarGuidListCount() {
+        return tempAvatarGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTempAvatarGuidList() {
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private int curAvatarTeamId_ ;
+      /**
+       * <code>uint32 cur_avatar_team_id = 7;</code>
+       * @return The curAvatarTeamId.
+       */
+      @java.lang.Override
+      public int getCurAvatarTeamId() {
+        return curAvatarTeamId_;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 7;</code>
+       * @param value The curAvatarTeamId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurAvatarTeamId(int value) {
+        
+        curAvatarTeamId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarTeamId() {
+        
+        curAvatarTeamId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> avatarList_ =
         java.util.Collections.emptyList();
       private void ensureAvatarListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           avatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo>(avatarList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000004;
          }
       }
 
@@ -1395,7 +1688,7 @@ public final class AvatarDataNotifyOuterClass {
           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 = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> getAvatarListList() {
         if (avatarListBuilder_ == null) {
@@ -1405,7 +1698,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public int getAvatarListCount() {
         if (avatarListBuilder_ == null) {
@@ -1415,7 +1708,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarList(int index) {
         if (avatarListBuilder_ == null) {
@@ -1425,7 +1718,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder setAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
@@ -1442,7 +1735,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder setAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1456,7 +1749,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder addAvatarList(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
         if (avatarListBuilder_ == null) {
@@ -1472,7 +1765,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder addAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
@@ -1489,7 +1782,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder addAvatarList(
           emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1503,7 +1796,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder addAvatarList(
           int index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
@@ -1517,7 +1810,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder addAllAvatarList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo> values) {
@@ -1532,12 +1825,12 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder clearAvatarList() {
         if (avatarListBuilder_ == null) {
           avatarList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
           avatarListBuilder_.clear();
@@ -1545,7 +1838,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public Builder removeAvatarList(int index) {
         if (avatarListBuilder_ == null) {
@@ -1558,14 +1851,14 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarListBuilder(
           int index) {
         return getAvatarListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarListOrBuilder(
           int index) {
@@ -1575,7 +1868,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder> 
            getAvatarListOrBuilderList() {
@@ -1586,14 +1879,14 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</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 = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder addAvatarListBuilder(
           int index) {
@@ -1601,7 +1894,7 @@ public final class AvatarDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarInfo avatar_list = 3;</code>
+       * <code>repeated .AvatarInfo avatar_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder> 
            getAvatarListBuilderList() {
@@ -1614,7 +1907,7 @@ public final class AvatarDataNotifyOuterClass {
           avatarListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder, emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder>(
                   avatarList_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
           avatarList_ = null;
@@ -1622,305 +1915,85 @@ public final class AvatarDataNotifyOuterClass {
         return avatarListBuilder_;
       }
 
-      private int curAvatarTeamId_ ;
-      /**
-       * <code>uint32 cur_avatar_team_id = 2;</code>
-       * @return The curAvatarTeamId.
-       */
-      @java.lang.Override
-      public int getCurAvatarTeamId() {
-        return curAvatarTeamId_;
-      }
-      /**
-       * <code>uint32 cur_avatar_team_id = 2;</code>
-       * @param value The curAvatarTeamId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurAvatarTeamId(int value) {
-        
-        curAvatarTeamId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_avatar_team_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurAvatarTeamId() {
-        
-        curAvatarTeamId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList ownedCostumeList_ = emptyIntList();
-      private void ensureOwnedCostumeListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          ownedCostumeList_ = mutableCopy(ownedCostumeList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @return A list containing the ownedCostumeList.
-       */
-      public java.util.List<java.lang.Integer>
-          getOwnedCostumeListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(ownedCostumeList_) : ownedCostumeList_;
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @return The count of ownedCostumeList.
-       */
-      public int getOwnedCostumeListCount() {
-        return ownedCostumeList_.size();
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @param index The index of the element to return.
-       * @return The ownedCostumeList at the given index.
-       */
-      public int getOwnedCostumeList(int index) {
-        return ownedCostumeList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @param index The index to set the value at.
-       * @param value The ownedCostumeList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOwnedCostumeList(
-          int index, int value) {
-        ensureOwnedCostumeListIsMutable();
-        ownedCostumeList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @param value The ownedCostumeList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addOwnedCostumeList(int value) {
-        ensureOwnedCostumeListIsMutable();
-        ownedCostumeList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @param values The ownedCostumeList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllOwnedCostumeList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOwnedCostumeListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, ownedCostumeList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_costume_list = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOwnedCostumeList() {
-        ownedCostumeList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList ownedFlycloakList_ = emptyIntList();
-      private void ensureOwnedFlycloakListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          ownedFlycloakList_ = mutableCopy(ownedFlycloakList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <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) ?
-                 java.util.Collections.unmodifiableList(ownedFlycloakList_) : ownedFlycloakList_;
-      }
-      /**
-       * <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 = 14;</code>
-       * @param index The index of the element to return.
-       * @return The ownedFlycloakList at the given index.
-       */
-      public int getOwnedFlycloakList(int index) {
-        return ownedFlycloakList_.getInt(index);
-      }
-      /**
-       * <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.
-       */
-      public Builder setOwnedFlycloakList(
-          int index, int value) {
-        ensureOwnedFlycloakListIsMutable();
-        ownedFlycloakList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_flycloak_list = 14;</code>
-       * @param value The ownedFlycloakList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addOwnedFlycloakList(int value) {
-        ensureOwnedFlycloakListIsMutable();
-        ownedFlycloakList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_flycloak_list = 14;</code>
-       * @param values The ownedFlycloakList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllOwnedFlycloakList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOwnedFlycloakListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, ownedFlycloakList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 owned_flycloak_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOwnedFlycloakList() {
-        ownedFlycloakList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
-      private void ensureTempAvatarGuidListIsMutable() {
+      private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_ = emptyIntList();
+      private void ensureBackupAvatarTeamOrderListIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
+          backupAvatarTeamOrderList_ = mutableCopy(backupAvatarTeamOrderList_);
           bitField0_ |= 0x00000008;
          }
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
-       * @return A list containing the tempAvatarGuidList.
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+       * @return A list containing the backupAvatarTeamOrderList.
        */
-      public java.util.List<java.lang.Long>
-          getTempAvatarGuidListList() {
+      public java.util.List<java.lang.Integer>
+          getBackupAvatarTeamOrderListList() {
         return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
+                 java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
-       * @return The count of tempAvatarGuidList.
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+       * @return The count of backupAvatarTeamOrderList.
        */
-      public int getTempAvatarGuidListCount() {
-        return tempAvatarGuidList_.size();
+      public int getBackupAvatarTeamOrderListCount() {
+        return backupAvatarTeamOrderList_.size();
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
        * @param index The index of the element to return.
-       * @return The tempAvatarGuidList at the given index.
+       * @return The backupAvatarTeamOrderList at the given index.
        */
-      public long getTempAvatarGuidList(int index) {
-        return tempAvatarGuidList_.getLong(index);
+      public int getBackupAvatarTeamOrderList(int index) {
+        return backupAvatarTeamOrderList_.getInt(index);
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
        * @param index The index to set the value at.
-       * @param value The tempAvatarGuidList to set.
+       * @param value The backupAvatarTeamOrderList to set.
        * @return This builder for chaining.
        */
-      public Builder setTempAvatarGuidList(
-          int index, long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.setLong(index, value);
+      public Builder setBackupAvatarTeamOrderList(
+          int index, int value) {
+        ensureBackupAvatarTeamOrderListIsMutable();
+        backupAvatarTeamOrderList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
-       * @param value The tempAvatarGuidList to add.
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+       * @param value The backupAvatarTeamOrderList to add.
        * @return This builder for chaining.
        */
-      public Builder addTempAvatarGuidList(long value) {
-        ensureTempAvatarGuidListIsMutable();
-        tempAvatarGuidList_.addLong(value);
+      public Builder addBackupAvatarTeamOrderList(int value) {
+        ensureBackupAvatarTeamOrderListIsMutable();
+        backupAvatarTeamOrderList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
-       * @param values The tempAvatarGuidList to add.
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
+       * @param values The backupAvatarTeamOrderList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllTempAvatarGuidList(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureTempAvatarGuidListIsMutable();
+      public Builder addAllBackupAvatarTeamOrderList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureBackupAvatarTeamOrderListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, tempAvatarGuidList_);
+            values, backupAvatarTeamOrderList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 1;</code>
+       * <code>repeated uint32 backup_avatar_team_order_list = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTempAvatarGuidList() {
-        tempAvatarGuidList_ = emptyLongList();
+      public Builder clearBackupAvatarTeamOrderList() {
+        backupAvatarTeamOrderList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
 
-      private long chooseAvatarGuid_ ;
-      /**
-       * <code>uint64 choose_avatar_guid = 15;</code>
-       * @return The chooseAvatarGuid.
-       */
-      @java.lang.Override
-      public long getChooseAvatarGuid() {
-        return chooseAvatarGuid_;
-      }
-      /**
-       * <code>uint64 choose_avatar_guid = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChooseAvatarGuid() {
-        
-        chooseAvatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> avatarTeamMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
@@ -1948,7 +2021,7 @@ public final class AvatarDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       @java.lang.Override
@@ -1966,7 +2039,7 @@ public final class AvatarDataNotifyOuterClass {
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -1974,7 +2047,7 @@ public final class AvatarDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -1987,7 +2060,7 @@ public final class AvatarDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       @java.lang.Override
 
@@ -2008,7 +2081,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -2027,7 +2100,7 @@ public final class AvatarDataNotifyOuterClass {
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -2039,7 +2112,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 13;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 10;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -2049,12 +2122,170 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
 
+      private com.google.protobuf.Internal.IntList ownedFlycloakList_ = emptyIntList();
+      private void ensureOwnedFlycloakListIsMutable() {
+        if (!((bitField0_ & 0x00000020) != 0)) {
+          ownedFlycloakList_ = mutableCopy(ownedFlycloakList_);
+          bitField0_ |= 0x00000020;
+         }
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @return A list containing the ownedFlycloakList.
+       */
+      public java.util.List<java.lang.Integer>
+          getOwnedFlycloakListList() {
+        return ((bitField0_ & 0x00000020) != 0) ?
+                 java.util.Collections.unmodifiableList(ownedFlycloakList_) : ownedFlycloakList_;
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @return The count of ownedFlycloakList.
+       */
+      public int getOwnedFlycloakListCount() {
+        return ownedFlycloakList_.size();
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @param index The index of the element to return.
+       * @return The ownedFlycloakList at the given index.
+       */
+      public int getOwnedFlycloakList(int index) {
+        return ownedFlycloakList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The ownedFlycloakList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnedFlycloakList(
+          int index, int value) {
+        ensureOwnedFlycloakListIsMutable();
+        ownedFlycloakList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @param value The ownedFlycloakList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addOwnedFlycloakList(int value) {
+        ensureOwnedFlycloakListIsMutable();
+        ownedFlycloakList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @param values The ownedFlycloakList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllOwnedFlycloakList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureOwnedFlycloakListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, ownedFlycloakList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_flycloak_list = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOwnedFlycloakList() {
+        ownedFlycloakList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList ownedCostumeList_ = emptyIntList();
+      private void ensureOwnedCostumeListIsMutable() {
+        if (!((bitField0_ & 0x00000040) != 0)) {
+          ownedCostumeList_ = mutableCopy(ownedCostumeList_);
+          bitField0_ |= 0x00000040;
+         }
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @return A list containing the ownedCostumeList.
+       */
+      public java.util.List<java.lang.Integer>
+          getOwnedCostumeListList() {
+        return ((bitField0_ & 0x00000040) != 0) ?
+                 java.util.Collections.unmodifiableList(ownedCostumeList_) : ownedCostumeList_;
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @return The count of ownedCostumeList.
+       */
+      public int getOwnedCostumeListCount() {
+        return ownedCostumeList_.size();
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @param index The index of the element to return.
+       * @return The ownedCostumeList at the given index.
+       */
+      public int getOwnedCostumeList(int index) {
+        return ownedCostumeList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The ownedCostumeList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnedCostumeList(
+          int index, int value) {
+        ensureOwnedCostumeListIsMutable();
+        ownedCostumeList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @param value The ownedCostumeList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addOwnedCostumeList(int value) {
+        ensureOwnedCostumeListIsMutable();
+        ownedCostumeList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @param values The ownedCostumeList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllOwnedCostumeList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureOwnedCostumeListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, ownedCostumeList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 owned_costume_list = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOwnedCostumeList() {
+        ownedCostumeList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_ =
         java.util.Collections.emptyList();
       private void ensureAvatarRenameListIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
+        if (!((bitField0_ & 0x00000080) != 0)) {
           avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>(avatarRenameList_);
-          bitField0_ |= 0x00000020;
+          bitField0_ |= 0x00000080;
          }
       }
 
@@ -2062,7 +2293,7 @@ public final class AvatarDataNotifyOuterClass {
           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 = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
         if (avatarRenameListBuilder_ == null) {
@@ -2072,7 +2303,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public int getAvatarRenameListCount() {
         if (avatarRenameListBuilder_ == null) {
@@ -2082,7 +2313,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -2092,7 +2323,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -2109,7 +2340,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2123,7 +2354,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder addAvatarRenameList(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
         if (avatarRenameListBuilder_ == null) {
@@ -2139,7 +2370,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -2156,7 +2387,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder addAvatarRenameList(
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2170,7 +2401,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -2184,7 +2415,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder addAllAvatarRenameList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> values) {
@@ -2199,12 +2430,12 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder clearAvatarRenameList() {
         if (avatarRenameListBuilder_ == null) {
           avatarRenameList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000020);
+          bitField0_ = (bitField0_ & ~0x00000080);
           onChanged();
         } else {
           avatarRenameListBuilder_.clear();
@@ -2212,7 +2443,7 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public Builder removeAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -2225,14 +2456,14 @@ public final class AvatarDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder getAvatarRenameListBuilder(
           int index) {
         return getAvatarRenameListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
           int index) {
@@ -2242,7 +2473,7 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
            getAvatarRenameListOrBuilderList() {
@@ -2253,14 +2484,14 @@ public final class AvatarDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</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 = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder(
           int index) {
@@ -2268,7 +2499,7 @@ public final class AvatarDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 11;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder> 
            getAvatarRenameListBuilderList() {
@@ -2281,7 +2512,7 @@ public final class AvatarDataNotifyOuterClass {
           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_ & 0x00000020) != 0),
+                  ((bitField0_ & 0x00000080) != 0),
                   getParentForChildren(),
                   isClean());
           avatarRenameList_ = null;
@@ -2289,81 +2520,33 @@ public final class AvatarDataNotifyOuterClass {
         return avatarRenameListBuilder_;
       }
 
-      private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_ = emptyIntList();
-      private void ensureBackupAvatarTeamOrderListIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
-          backupAvatarTeamOrderList_ = mutableCopy(backupAvatarTeamOrderList_);
-          bitField0_ |= 0x00000040;
-         }
-      }
+      private long chooseAvatarGuid_ ;
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @return A list containing the backupAvatarTeamOrderList.
+       * <code>uint64 choose_avatar_guid = 14;</code>
+       * @return The chooseAvatarGuid.
        */
-      public java.util.List<java.lang.Integer>
-          getBackupAvatarTeamOrderListList() {
-        return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
+      @java.lang.Override
+      public long getChooseAvatarGuid() {
+        return chooseAvatarGuid_;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @return The count of backupAvatarTeamOrderList.
-       */
-      public int getBackupAvatarTeamOrderListCount() {
-        return backupAvatarTeamOrderList_.size();
-      }
-      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @param index The index of the element to return.
-       * @return The backupAvatarTeamOrderList at the given index.
-       */
-      public int getBackupAvatarTeamOrderList(int index) {
-        return backupAvatarTeamOrderList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @param index The index to set the value at.
-       * @param value The backupAvatarTeamOrderList to set.
+       * <code>uint64 choose_avatar_guid = 14;</code>
+       * @param value The chooseAvatarGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setBackupAvatarTeamOrderList(
-          int index, int value) {
-        ensureBackupAvatarTeamOrderListIsMutable();
-        backupAvatarTeamOrderList_.setInt(index, value);
+      public Builder setChooseAvatarGuid(long value) {
+        
+        chooseAvatarGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @param value The backupAvatarTeamOrderList to add.
+       * <code>uint64 choose_avatar_guid = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder addBackupAvatarTeamOrderList(int value) {
-        ensureBackupAvatarTeamOrderListIsMutable();
-        backupAvatarTeamOrderList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @param values The backupAvatarTeamOrderList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllBackupAvatarTeamOrderList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureBackupAvatarTeamOrderListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, backupAvatarTeamOrderList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 backup_avatar_team_order_list = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBackupAvatarTeamOrderList() {
-        backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
+      public Builder clearChooseAvatarGuid() {
+        
+        chooseAvatarGuid_ = 0L;
         onChanged();
         return this;
       }
@@ -2441,18 +2624,18 @@ public final class AvatarDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\026AvatarDataNotify.proto\032\020AvatarInfo.pro" +
       "to\032\020AvatarTeam.proto\032\026AvatarRenameInfo.p" +
-      "roto\"\234\003\n\020AvatarDataNotify\022 \n\013avatar_list" +
-      "\030\003 \003(\0132\013.AvatarInfo\022\032\n\022cur_avatar_team_i" +
-      "d\030\002 \001(\r\022\032\n\022owned_costume_list\030\005 \003(\r\022\033\n\023o" +
-      "wned_flycloak_list\030\016 \003(\r\022\035\n\025temp_avatar_" +
-      "guid_list\030\001 \003(\004\022\032\n\022choose_avatar_guid\030\017 " +
-      "\001(\004\022=\n\017avatar_team_map\030\r \003(\0132$.AvatarDat" +
-      "aNotify.AvatarTeamMapEntry\022-\n\022avatar_ren" +
-      "ame_list\030\013 \003(\0132\021.AvatarRenameInfo\022%\n\035bac" +
-      "kup_avatar_team_order_list\030\007 \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"
+      "roto\"\261\003\n\020AvatarDataNotify\022\023\n\013ONAODHDMILI" +
+      "\030\002 \003(\r\022\035\n\025temp_avatar_guid_list\030\004 \003(\004\022\032\n" +
+      "\022cur_avatar_team_id\030\007 \001(\r\022 \n\013avatar_list" +
+      "\030\010 \003(\0132\013.AvatarInfo\022%\n\035backup_avatar_tea" +
+      "m_order_list\030\t \003(\r\022=\n\017avatar_team_map\030\n " +
+      "\003(\0132$.AvatarDataNotify.AvatarTeamMapEntr" +
+      "y\022\033\n\023owned_flycloak_list\030\013 \003(\r\022\032\n\022owned_" +
+      "costume_list\030\014 \003(\r\022-\n\022avatar_rename_list" +
+      "\030\r \003(\0132\021.AvatarRenameInfo\022\032\n\022choose_avat" +
+      "ar_guid\030\016 \001(\004\032A\n\022AvatarTeamMapEntry\022\013\n\003k" +
+      "ey\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\0028\001" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2466,7 +2649,7 @@ public final class AvatarDataNotifyOuterClass {
     internal_static_AvatarDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDataNotify_descriptor,
-        new java.lang.String[] { "AvatarList", "CurAvatarTeamId", "OwnedCostumeList", "OwnedFlycloakList", "TempAvatarGuidList", "ChooseAvatarGuid", "AvatarTeamMap", "AvatarRenameList", "BackupAvatarTeamOrderList", });
+        new java.lang.String[] { "ONAODHDMILI", "TempAvatarGuidList", "CurAvatarTeamId", "AvatarList", "BackupAvatarTeamOrderList", "AvatarTeamMap", "OwnedFlycloakList", "OwnedCostumeList", "AvatarRenameList", "ChooseAvatarGuid", });
     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 ad3cd0777..07fdf76c7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndReqOuterClass.java
@@ -19,38 +19,33 @@ public final class AvatarDieAnimationEndReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_id = 9;</code>
-     * @return The skillId.
+     * <code>.Vector reborn_pos = 13;</code>
+     * @return Whether the rebornPos field is set.
      */
-    int getSkillId();
+    boolean hasRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 13;</code>
+     * @return The rebornPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
+    /**
+     * <code>.Vector reborn_pos = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
 
     /**
-     * <code>uint64 die_guid = 8;</code>
+     * <code>uint64 die_guid = 12;</code>
      * @return The dieGuid.
      */
     long getDieGuid();
 
     /**
-     * <code>.Vector reborn_pos = 14;</code>
-     * @return Whether the rebornPos field is set.
+     * <code>uint32 skill_id = 7;</code>
+     * @return The skillId.
      */
-    boolean hasRebornPos();
-    /**
-     * <code>.Vector reborn_pos = 14;</code>
-     * @return The rebornPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos();
-    /**
-     * <code>.Vector reborn_pos = 14;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder();
+    int getSkillId();
   }
   /**
-   * <pre>
-   * CmdId: 4506
-   * Obf: HPOMJHEAICH
-   * </pre>
-   *
    * Protobuf type {@code AvatarDieAnimationEndReq}
    */
   public static final class AvatarDieAnimationEndReq extends
@@ -95,17 +90,17 @@ public final class AvatarDieAnimationEndReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              dieGuid_ = input.readUInt64();
-              break;
-            }
-            case 72: {
+            case 56: {
 
               skillId_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 96: {
+
+              dieGuid_ = input.readUInt64();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rebornPos_ != null) {
                 subBuilder = rebornPos_.toBuilder();
@@ -150,32 +145,10 @@ public final class AvatarDieAnimationEndReqOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.class, emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.Builder.class);
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 9;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 9;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int DIE_GUID_FIELD_NUMBER = 8;
-    private long dieGuid_;
-    /**
-     * <code>uint64 die_guid = 8;</code>
-     * @return The dieGuid.
-     */
-    @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
-    }
-
-    public static final int REBORN_POS_FIELD_NUMBER = 14;
+    public static final int REBORN_POS_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      * @return Whether the rebornPos field is set.
      */
     @java.lang.Override
@@ -183,7 +156,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ != null;
     }
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      * @return The rebornPos.
      */
     @java.lang.Override
@@ -191,13 +164,35 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return rebornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rebornPos_;
     }
     /**
-     * <code>.Vector reborn_pos = 14;</code>
+     * <code>.Vector reborn_pos = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
       return getRebornPos();
     }
 
+    public static final int DIE_GUID_FIELD_NUMBER = 12;
+    private long dieGuid_;
+    /**
+     * <code>uint64 die_guid = 12;</code>
+     * @return The dieGuid.
+     */
+    @java.lang.Override
+    public long getDieGuid() {
+      return dieGuid_;
+    }
+
+    public static final int SKILL_ID_FIELD_NUMBER = 7;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 7;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -212,14 +207,14 @@ public final class AvatarDieAnimationEndReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dieGuid_ != 0L) {
-        output.writeUInt64(8, dieGuid_);
-      }
       if (skillId_ != 0) {
-        output.writeUInt32(9, skillId_);
+        output.writeUInt32(7, skillId_);
+      }
+      if (dieGuid_ != 0L) {
+        output.writeUInt64(12, dieGuid_);
       }
       if (rebornPos_ != null) {
-        output.writeMessage(14, getRebornPos());
+        output.writeMessage(13, getRebornPos());
       }
       unknownFields.writeTo(output);
     }
@@ -230,17 +225,17 @@ public final class AvatarDieAnimationEndReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dieGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, dieGuid_);
-      }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, skillId_);
+          .computeUInt32Size(7, skillId_);
+      }
+      if (dieGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(12, dieGuid_);
       }
       if (rebornPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getRebornPos());
+          .computeMessageSize(13, getRebornPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +252,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other = (emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq) obj;
 
-      if (getSkillId()
-          != other.getSkillId()) return false;
-      if (getDieGuid()
-          != other.getDieGuid()) return false;
       if (hasRebornPos() != other.hasRebornPos()) return false;
       if (hasRebornPos()) {
         if (!getRebornPos()
             .equals(other.getRebornPos())) return false;
       }
+      if (getDieGuid()
+          != other.getDieGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,15 +272,15 @@ public final class AvatarDieAnimationEndReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      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());
       if (hasRebornPos()) {
         hash = (37 * hash) + REBORN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getRebornPos().hashCode();
       }
+      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;
@@ -382,11 +377,6 @@ public final class AvatarDieAnimationEndReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4506
-     * Obf: HPOMJHEAICH
-     * </pre>
-     *
      * Protobuf type {@code AvatarDieAnimationEndReq}
      */
     public static final class Builder extends
@@ -424,16 +414,16 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        skillId_ = 0;
-
-        dieGuid_ = 0L;
-
         if (rebornPosBuilder_ == null) {
           rebornPos_ = null;
         } else {
           rebornPos_ = null;
           rebornPosBuilder_ = null;
         }
+        dieGuid_ = 0L;
+
+        skillId_ = 0;
+
         return this;
       }
 
@@ -460,13 +450,13 @@ public final class AvatarDieAnimationEndReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq buildPartial() {
         emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq result = new emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq(this);
-        result.skillId_ = skillId_;
-        result.dieGuid_ = dieGuid_;
         if (rebornPosBuilder_ == null) {
           result.rebornPos_ = rebornPos_;
         } else {
           result.rebornPos_ = rebornPosBuilder_.build();
         }
+        result.dieGuid_ = dieGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -515,14 +505,14 @@ public final class AvatarDieAnimationEndReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq other) {
         if (other == emu.grasscutter.net.proto.AvatarDieAnimationEndReqOuterClass.AvatarDieAnimationEndReq.getDefaultInstance()) return this;
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
+        if (other.hasRebornPos()) {
+          mergeRebornPos(other.getRebornPos());
         }
         if (other.getDieGuid() != 0L) {
           setDieGuid(other.getDieGuid());
         }
-        if (other.hasRebornPos()) {
-          mergeRebornPos(other.getRebornPos());
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -553,80 +543,18 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
 
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rebornPos_;
       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 = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        * @return Whether the rebornPos field is set.
        */
       public boolean hasRebornPos() {
         return rebornPosBuilder_ != null || rebornPos_ != null;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        * @return The rebornPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRebornPos() {
@@ -637,7 +565,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder setRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -653,7 +581,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder setRebornPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -667,7 +595,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder mergeRebornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rebornPosBuilder_ == null) {
@@ -685,7 +613,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public Builder clearRebornPos() {
         if (rebornPosBuilder_ == null) {
@@ -699,7 +627,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRebornPosBuilder() {
         
@@ -707,7 +635,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         return getRebornPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRebornPosOrBuilder() {
         if (rebornPosBuilder_ != null) {
@@ -718,7 +646,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
       }
       /**
-       * <code>.Vector reborn_pos = 14;</code>
+       * <code>.Vector reborn_pos = 13;</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> 
@@ -733,6 +661,68 @@ public final class AvatarDieAnimationEndReqOuterClass {
         }
         return rebornPosBuilder_;
       }
+
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -801,9 +791,9 @@ public final class AvatarDieAnimationEndReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndReq.proto\032\014Vector" +
-      ".proto\"[\n\030AvatarDieAnimationEndReq\022\020\n\010sk" +
-      "ill_id\030\t \001(\r\022\020\n\010die_guid\030\010 \001(\004\022\033\n\nreborn" +
-      "_pos\030\016 \001(\0132\007.VectorB\033\n\031emu.grasscutter.n" +
+      ".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" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -816,7 +806,7 @@ public final class AvatarDieAnimationEndReqOuterClass {
     internal_static_AvatarDieAnimationEndReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndReq_descriptor,
-        new java.lang.String[] { "SkillId", "DieGuid", "RebornPos", });
+        new java.lang.String[] { "RebornPos", "DieGuid", "SkillId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
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 856b1c63f..83009e8e7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarDieAnimationEndRspOuterClass.java
@@ -19,29 +19,24 @@ public final class AvatarDieAnimationEndRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
+    /**
+     * <code>uint64 die_guid = 11;</code>
+     * @return The dieGuid.
+     */
+    long getDieGuid();
+
     /**
      * <code>uint32 skill_id = 13;</code>
      * @return The skillId.
      */
     int getSkillId();
-
-    /**
-     * <code>uint64 die_guid = 5;</code>
-     * @return The dieGuid.
-     */
-    long getDieGuid();
   }
   /**
-   * <pre>
-   * CmdId: 24745
-   * Obf: LPNGCMDGKEM
-   * </pre>
-   *
    * Protobuf type {@code AvatarDieAnimationEndRsp}
    */
   public static final class AvatarDieAnimationEndRsp extends
@@ -86,12 +81,12 @@ public final class AvatarDieAnimationEndRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 40: {
+            case 88: {
 
               dieGuid_ = input.readUInt64();
               break;
@@ -133,10 +128,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
               emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.class, emu.grasscutter.net.proto.AvatarDieAnimationEndRspOuterClass.AvatarDieAnimationEndRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +139,17 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return retcode_;
     }
 
+    public static final int DIE_GUID_FIELD_NUMBER = 11;
+    private long dieGuid_;
+    /**
+     * <code>uint64 die_guid = 11;</code>
+     * @return The dieGuid.
+     */
+    @java.lang.Override
+    public long getDieGuid() {
+      return dieGuid_;
+    }
+
     public static final int SKILL_ID_FIELD_NUMBER = 13;
     private int skillId_;
     /**
@@ -155,17 +161,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return skillId_;
     }
 
-    public static final int DIE_GUID_FIELD_NUMBER = 5;
-    private long dieGuid_;
-    /**
-     * <code>uint64 die_guid = 5;</code>
-     * @return The dieGuid.
-     */
-    @java.lang.Override
-    public long getDieGuid() {
-      return dieGuid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,10 +176,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(6, retcode_);
       }
       if (dieGuid_ != 0L) {
-        output.writeUInt64(5, dieGuid_);
+        output.writeUInt64(11, dieGuid_);
       }
       if (skillId_ != 0) {
         output.writeUInt32(13, skillId_);
@@ -200,11 +195,11 @@ public final class AvatarDieAnimationEndRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(6, retcode_);
       }
       if (dieGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, dieGuid_);
+          .computeUInt64Size(11, dieGuid_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -227,10 +222,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getSkillId()
-          != other.getSkillId()) return false;
       if (getDieGuid()
           != other.getDieGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,11 +239,11 @@ public final class AvatarDieAnimationEndRspOuterClass {
       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,11 +340,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24745
-     * Obf: LPNGCMDGKEM
-     * </pre>
-     *
      * Protobuf type {@code AvatarDieAnimationEndRsp}
      */
     public static final class Builder extends
@@ -389,10 +379,10 @@ public final class AvatarDieAnimationEndRspOuterClass {
         super.clear();
         retcode_ = 0;
 
-        skillId_ = 0;
-
         dieGuid_ = 0L;
 
+        skillId_ = 0;
+
         return this;
       }
 
@@ -420,8 +410,8 @@ public final class AvatarDieAnimationEndRspOuterClass {
       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.skillId_ = skillId_;
         result.dieGuid_ = dieGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -473,12 +463,12 @@ public final class AvatarDieAnimationEndRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
-        }
         if (other.getDieGuid() != 0L) {
           setDieGuid(other.getDieGuid());
         }
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -510,7 +500,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -518,7 +508,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -529,7 +519,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -539,6 +529,37 @@ public final class AvatarDieAnimationEndRspOuterClass {
         return this;
       }
 
+      private long dieGuid_ ;
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @return The dieGuid.
+       */
+      @java.lang.Override
+      public long getDieGuid() {
+        return dieGuid_;
+      }
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @param value The dieGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieGuid(long value) {
+        
+        dieGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 die_guid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieGuid() {
+        
+        dieGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int skillId_ ;
       /**
        * <code>uint32 skill_id = 13;</code>
@@ -569,37 +590,6 @@ public final class AvatarDieAnimationEndRspOuterClass {
         onChanged();
         return this;
       }
-
-      private long dieGuid_ ;
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @return The dieGuid.
-       */
-      @java.lang.Override
-      public long getDieGuid() {
-        return dieGuid_;
-      }
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @param value The dieGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieGuid(long value) {
-        
-        dieGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 die_guid = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieGuid() {
-        
-        dieGuid_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,8 +658,8 @@ public final class AvatarDieAnimationEndRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarDieAnimationEndRsp.proto\"O\n\030Avat" +
-      "arDieAnimationEndRsp\022\017\n\007retcode\030\004 \001(\005\022\020\n" +
-      "\010skill_id\030\r \001(\r\022\020\n\010die_guid\030\005 \001(\004B\033\n\031emu" +
+      "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" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarDieAnimationEndRspOuterClass {
     internal_static_AvatarDieAnimationEndRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarDieAnimationEndRsp_descriptor,
-        new java.lang.String[] { "Retcode", "SkillId", "DieGuid", });
+        new java.lang.String[] { "Retcode", "DieGuid", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterElementView.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterElementView.java
new file mode 100644
index 000000000..474894a4e
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterElementView.java
@@ -0,0 +1,616 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: AvatarEnterElementView.proto
+
+package emu.grasscutter.net.proto;
+
+public final class AvatarEnterElementView {
+  private AvatarEnterElementView() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface AvatarEnterElementViewNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:AvatarEnterElementViewNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool is_triggerd = 14;</code>
+     * @return The isTriggerd.
+     */
+    boolean getIsTriggerd();
+
+    /**
+     * <code>uint32 avatar_entity_id = 11;</code>
+     * @return The avatarEntityId.
+     */
+    int getAvatarEntityId();
+  }
+  /**
+   * <pre>
+   * CmdId: 88
+   * </pre>
+   *
+   * Protobuf type {@code AvatarEnterElementViewNotify}
+   */
+  public static final class AvatarEnterElementViewNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:AvatarEnterElementViewNotify)
+      AvatarEnterElementViewNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use AvatarEnterElementViewNotify.newBuilder() to construct.
+    private AvatarEnterElementViewNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private AvatarEnterElementViewNotify() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new AvatarEnterElementViewNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private AvatarEnterElementViewNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 88: {
+
+              avatarEntityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isTriggerd_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.class, emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.Builder.class);
+    }
+
+    public static final int IS_TRIGGERD_FIELD_NUMBER = 14;
+    private boolean isTriggerd_;
+    /**
+     * <code>bool is_triggerd = 14;</code>
+     * @return The isTriggerd.
+     */
+    @java.lang.Override
+    public boolean getIsTriggerd() {
+      return isTriggerd_;
+    }
+
+    public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 11;
+    private int avatarEntityId_;
+    /**
+     * <code>uint32 avatar_entity_id = 11;</code>
+     * @return The avatarEntityId.
+     */
+    @java.lang.Override
+    public int getAvatarEntityId() {
+      return avatarEntityId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (avatarEntityId_ != 0) {
+        output.writeUInt32(11, avatarEntityId_);
+      }
+      if (isTriggerd_ != false) {
+        output.writeBool(14, isTriggerd_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (avatarEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, avatarEntityId_);
+      }
+      if (isTriggerd_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isTriggerd_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify other = (emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) obj;
+
+      if (getIsTriggerd()
+          != other.getIsTriggerd()) return false;
+      if (getAvatarEntityId()
+          != other.getAvatarEntityId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_TRIGGERD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTriggerd());
+      hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarEntityId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * <pre>
+     * CmdId: 88
+     * </pre>
+     *
+     * Protobuf type {@code AvatarEnterElementViewNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:AvatarEnterElementViewNotify)
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.class, emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        isTriggerd_ = false;
+
+        avatarEntityId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.internal_static_AvatarEnterElementViewNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify build() {
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify buildPartial() {
+        emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify result = new emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify(this);
+        result.isTriggerd_ = isTriggerd_;
+        result.avatarEntityId_ = avatarEntityId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify other) {
+        if (other == emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify.getDefaultInstance()) return this;
+        if (other.getIsTriggerd() != false) {
+          setIsTriggerd(other.getIsTriggerd());
+        }
+        if (other.getAvatarEntityId() != 0) {
+          setAvatarEntityId(other.getAvatarEntityId());
+        }
+        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.AvatarEnterElementView.AvatarEnterElementViewNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean isTriggerd_ ;
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @return The isTriggerd.
+       */
+      @java.lang.Override
+      public boolean getIsTriggerd() {
+        return isTriggerd_;
+      }
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @param value The isTriggerd to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTriggerd(boolean value) {
+        
+        isTriggerd_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_triggerd = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTriggerd() {
+        
+        isTriggerd_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int avatarEntityId_ ;
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @return The avatarEntityId.
+       */
+      @java.lang.Override
+      public int getAvatarEntityId() {
+        return avatarEntityId_;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @param value The avatarEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarEntityId(int value) {
+        
+        avatarEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarEntityId() {
+        
+        avatarEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:AvatarEnterElementViewNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:AvatarEnterElementViewNotify)
+    private static final emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify();
+    }
+
+    public static emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<AvatarEnterElementViewNotify>
+        PARSER = new com.google.protobuf.AbstractParser<AvatarEnterElementViewNotify>() {
+      @java.lang.Override
+      public AvatarEnterElementViewNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new AvatarEnterElementViewNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<AvatarEnterElementViewNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<AvatarEnterElementViewNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarEnterElementView.AvatarEnterElementViewNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AvatarEnterElementViewNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AvatarEnterElementViewNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\034AvatarEnterElementView.proto\"M\n\034Avatar" +
+      "EnterElementViewNotify\022\023\n\013is_triggerd\030\016 " +
+      "\001(\010\022\030\n\020avatar_entity_id\030\013 \001(\rB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_AvatarEnterElementViewNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_AvatarEnterElementViewNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AvatarEnterElementViewNotify_descriptor,
+        new java.lang.String[] { "IsTriggerd", "AvatarEntityId", });
+  }
+
+  // @@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 b32438c41..caea8f7af 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEnterSceneInfoOuterClass.java
@@ -18,50 +18,6 @@ public final class AvatarEnterSceneInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarEnterSceneInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    boolean hasAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-     * @return The avatarAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
-
-    /**
-     * <code>uint64 weapon_guid = 1;</code>
-     * @return The weaponGuid.
-     */
-    long getWeaponGuid();
-
-    /**
-     * <code>uint32 avatar_entity_id = 5;</code>
-     * @return The avatarEntityId.
-     */
-    int getAvatarEntityId();
-
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</code>
-     * @return A list containing the buffIdList.
-     */
-    java.util.List<java.lang.Integer> getBuffIdListList();
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</code>
-     * @return The count of buffIdList.
-     */
-    int getBuffIdListCount();
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</code>
-     * @param index The index of the element to return.
-     * @return The buffIdList at the given index.
-     */
-    int getBuffIdList(int index);
-
     /**
      * <code>uint32 weapon_entity_id = 3;</code>
      * @return The weaponEntityId.
@@ -69,55 +25,95 @@ public final class AvatarEnterSceneInfoOuterClass {
     int getWeaponEntityId();
 
     /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * @return Whether the weaponAbilityInfo field is set.
      */
-    long getAvatarGuid();
+    boolean hasWeaponAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     * @return The weaponAbilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
+     * <code>uint32 avatar_entity_id = 6;</code>
+     * @return The avatarEntityId.
+     */
+    int getAvatarEntityId();
+
+    /**
+     * <code>uint64 weapon_guid = 7;</code>
+     * @return The weaponGuid.
+     */
+    long getWeaponGuid();
+
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
         getServerBuffListList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
     /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
      */
     int getServerBuffListCount();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
         getServerBuffListOrBuilderList();
     /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
      */
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
         int index);
 
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return Whether the weaponAbilityInfo field is set.
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+     * @return Whether the avatarAbilityInfo field is set.
      */
-    boolean hasWeaponAbilityInfo();
+    boolean hasAvatarAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
-     * @return The weaponAbilityInfo.
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+     * @return The avatarAbilityInfo.
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
      */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
+
+    /**
+     * <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.
+     */
+    int getBuffIdListCount();
+    /**
+     * <code>repeated uint32 buff_id_list = 10;</code>
+     * @param index The index of the element to return.
+     * @return The buffIdList at the given index.
+     */
+    int getBuffIdList(int index);
+
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
-   * <pre>
-   * Obf: AJDGFFHCOCL
-   * </pre>
-   *
    * Protobuf type {@code AvatarEnterSceneInfo}
    */
   public static final class AvatarEnterSceneInfo extends
@@ -130,8 +126,8 @@ public final class AvatarEnterSceneInfoOuterClass {
       super(builder);
     }
     private AvatarEnterSceneInfo() {
-      buffIdList_ = emptyIntList();
       serverBuffList_ = java.util.Collections.emptyList();
+      buffIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -165,43 +161,44 @@ public final class AvatarEnterSceneInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              weaponGuid_ = input.readUInt64();
-              break;
-            }
             case 24: {
 
               weaponEntityId_ = input.readUInt32();
               break;
             }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                buffIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              buffIdList_.addInt(input.readUInt32());
-              break;
-            }
             case 34: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                buffIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+              emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
+              if (weaponAbilityInfo_ != null) {
+                subBuilder = weaponAbilityInfo_.toBuilder();
               }
-              while (input.getBytesUntilLimit() > 0) {
-                buffIdList_.addInt(input.readUInt32());
+              weaponAbilityInfo_ = input.readMessage(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(weaponAbilityInfo_);
+                weaponAbilityInfo_ = subBuilder.buildPartial();
               }
-              input.popLimit(limit);
+
               break;
             }
-            case 40: {
+            case 48: {
 
               avatarEntityId_ = input.readUInt32();
               break;
             }
+            case 56: {
+
+              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: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (avatarAbilityInfo_ != null) {
                 subBuilder = avatarAbilityInfo_.toBuilder();
@@ -214,31 +211,30 @@ public final class AvatarEnterSceneInfoOuterClass {
 
               break;
             }
-            case 72: {
-
-              avatarGuid_ = input.readUInt64();
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                buffIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              buffIdList_.addInt(input.readUInt32());
               break;
             }
             case 82: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                buffIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+              while (input.getBytesUntilLimit() > 0) {
+                buffIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               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 96: {
 
+              avatarGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -257,10 +253,10 @@ public final class AvatarEnterSceneInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          buffIdList_.makeImmutable(); // C
+          serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
+          buffIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -279,82 +275,6 @@ public final class AvatarEnterSceneInfoOuterClass {
               emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.class, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder.class);
     }
 
-    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-     * @return Whether the avatarAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAvatarAbilityInfo() {
-      return avatarAbilityInfo_ != null;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</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_;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-      return getAvatarAbilityInfo();
-    }
-
-    public static final int WEAPON_GUID_FIELD_NUMBER = 1;
-    private long weaponGuid_;
-    /**
-     * <code>uint64 weapon_guid = 1;</code>
-     * @return The weaponGuid.
-     */
-    @java.lang.Override
-    public long getWeaponGuid() {
-      return weaponGuid_;
-    }
-
-    public static final int AVATAR_ENTITY_ID_FIELD_NUMBER = 5;
-    private int avatarEntityId_;
-    /**
-     * <code>uint32 avatar_entity_id = 5;</code>
-     * @return The avatarEntityId.
-     */
-    @java.lang.Override
-    public int getAvatarEntityId() {
-      return avatarEntityId_;
-    }
-
-    public static final int BUFF_ID_LIST_FIELD_NUMBER = 4;
-    private com.google.protobuf.Internal.IntList buffIdList_;
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</code>
-     * @return A list containing the buffIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getBuffIdListList() {
-      return buffIdList_;
-    }
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</code>
-     * @return The count of buffIdList.
-     */
-    public int getBuffIdListCount() {
-      return buffIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 buff_id_list = 4;</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);
-    }
-    private int buffIdListMemoizedSerializedSize = -1;
-
     public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 3;
     private int weaponEntityId_;
     /**
@@ -366,61 +286,10 @@ public final class AvatarEnterSceneInfoOuterClass {
       return weaponEntityId_;
     }
 
-    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 SERVER_BUFF_LIST_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
-      return serverBuffList_.get(index);
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index) {
-      return serverBuffList_.get(index);
-    }
-
-    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 15;
+    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
      * @return Whether the weaponAbilityInfo field is set.
      */
     @java.lang.Override
@@ -428,7 +297,7 @@ public final class AvatarEnterSceneInfoOuterClass {
       return weaponAbilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
      * @return The weaponAbilityInfo.
      */
     @java.lang.Override
@@ -436,13 +305,140 @@ public final class AvatarEnterSceneInfoOuterClass {
       return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</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_;
+    /**
+     * <code>uint32 avatar_entity_id = 6;</code>
+     * @return The avatarEntityId.
+     */
+    @java.lang.Override
+    public int getAvatarEntityId() {
+      return avatarEntityId_;
+    }
+
+    public static final int WEAPON_GUID_FIELD_NUMBER = 7;
+    private long weaponGuid_;
+    /**
+     * <code>uint64 weapon_guid = 7;</code>
+     * @return The weaponGuid.
+     */
+    @java.lang.Override
+    public long getWeaponGuid() {
+      return weaponGuid_;
+    }
+
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 8;</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>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getServerBuffListCount() {
+      return serverBuffList_.size();
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 8;</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>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index) {
+      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;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</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_;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+      return getAvatarAbilityInfo();
+    }
+
+    public static final int BUFF_ID_LIST_FIELD_NUMBER = 10;
+    private com.google.protobuf.Internal.IntList buffIdList_;
+    /**
+     * <code>repeated uint32 buff_id_list = 10;</code>
+     * @return A list containing the buffIdList.
+     */
+    @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);
+    }
+    private int buffIdListMemoizedSerializedSize = -1;
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -458,33 +454,33 @@ public final class AvatarEnterSceneInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (weaponGuid_ != 0L) {
-        output.writeUInt64(1, weaponGuid_);
-      }
       if (weaponEntityId_ != 0) {
         output.writeUInt32(3, weaponEntityId_);
       }
+      if (weaponAbilityInfo_ != null) {
+        output.writeMessage(4, getWeaponAbilityInfo());
+      }
+      if (avatarEntityId_ != 0) {
+        output.writeUInt32(6, avatarEntityId_);
+      }
+      if (weaponGuid_ != 0L) {
+        output.writeUInt64(7, weaponGuid_);
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(8, serverBuffList_.get(i));
+      }
+      if (avatarAbilityInfo_ != null) {
+        output.writeMessage(9, getAvatarAbilityInfo());
+      }
       if (getBuffIdListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(buffIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < buffIdList_.size(); i++) {
         output.writeUInt32NoTag(buffIdList_.getInt(i));
       }
-      if (avatarEntityId_ != 0) {
-        output.writeUInt32(5, avatarEntityId_);
-      }
-      if (avatarAbilityInfo_ != null) {
-        output.writeMessage(8, getAvatarAbilityInfo());
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(10, serverBuffList_.get(i));
-      }
-      if (weaponAbilityInfo_ != null) {
-        output.writeMessage(15, getWeaponAbilityInfo());
+        output.writeUInt64(12, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -495,14 +491,30 @@ public final class AvatarEnterSceneInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (weaponGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, weaponGuid_);
-      }
       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) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(7, weaponGuid_);
+      }
+      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());
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < buffIdList_.size(); i++) {
@@ -517,25 +529,9 @@ public final class AvatarEnterSceneInfoOuterClass {
         }
         buffIdListMemoizedSerializedSize = dataSize;
       }
-      if (avatarEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, avatarEntityId_);
-      }
-      if (avatarAbilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getAvatarAbilityInfo());
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, serverBuffList_.get(i));
-      }
-      if (weaponAbilityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getWeaponAbilityInfo());
+          .computeUInt64Size(12, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -552,28 +548,28 @@ public final class AvatarEnterSceneInfoOuterClass {
       }
       emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo other = (emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo) obj;
 
-      if (hasAvatarAbilityInfo() != other.hasAvatarAbilityInfo()) return false;
-      if (hasAvatarAbilityInfo()) {
-        if (!getAvatarAbilityInfo()
-            .equals(other.getAvatarAbilityInfo())) return false;
-      }
-      if (getWeaponGuid()
-          != other.getWeaponGuid()) return false;
-      if (getAvatarEntityId()
-          != other.getAvatarEntityId()) return false;
-      if (!getBuffIdListList()
-          .equals(other.getBuffIdListList())) return false;
       if (getWeaponEntityId()
           != other.getWeaponEntityId()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
-      if (!getServerBuffListList()
-          .equals(other.getServerBuffListList())) 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 (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -585,32 +581,32 @@ public final class AvatarEnterSceneInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasAvatarAbilityInfo()) {
-        hash = (37 * hash) + AVATAR_ABILITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarAbilityInfo().hashCode();
-      }
-      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getWeaponGuid());
-      hash = (37 * hash) + AVATAR_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarEntityId();
-      if (getBuffIdListCount() > 0) {
-        hash = (37 * hash) + BUFF_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getBuffIdListList().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());
-      if (getServerBuffListCount() > 0) {
-        hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getServerBuffListList().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();
+      }
+      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;
@@ -707,10 +703,6 @@ public final class AvatarEnterSceneInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AJDGFFHCOCL
-     * </pre>
-     *
      * Protobuf type {@code AvatarEnterSceneInfo}
      */
     public static final class Builder extends
@@ -749,34 +741,34 @@ public final class AvatarEnterSceneInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
-        } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
-        }
-        weaponGuid_ = 0L;
-
-        avatarEntityId_ = 0;
-
-        buffIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         weaponEntityId_ = 0;
 
-        avatarGuid_ = 0L;
-
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          serverBuffListBuilder_.clear();
-        }
         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);
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -804,34 +796,34 @@ public final class AvatarEnterSceneInfoOuterClass {
       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_;
-        if (avatarAbilityInfoBuilder_ == null) {
-          result.avatarAbilityInfo_ = avatarAbilityInfo_;
-        } else {
-          result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
-        }
-        result.weaponGuid_ = weaponGuid_;
-        result.avatarEntityId_ = avatarEntityId_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          buffIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.buffIdList_ = buffIdList_;
         result.weaponEntityId_ = weaponEntityId_;
-        result.avatarGuid_ = avatarGuid_;
-        if (serverBuffListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
-            serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.serverBuffList_ = serverBuffList_;
-        } else {
-          result.serverBuffList_ = serverBuffListBuilder_.build();
-        }
         if (weaponAbilityInfoBuilder_ == null) {
           result.weaponAbilityInfo_ = weaponAbilityInfo_;
         } else {
           result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
         }
+        result.avatarEntityId_ = avatarEntityId_;
+        result.weaponGuid_ = weaponGuid_;
+        if (serverBuffListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          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_;
         onBuilt();
         return result;
       }
@@ -880,36 +872,23 @@ public final class AvatarEnterSceneInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo other) {
         if (other == emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.getDefaultInstance()) return this;
-        if (other.hasAvatarAbilityInfo()) {
-          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
+        if (other.getWeaponEntityId() != 0) {
+          setWeaponEntityId(other.getWeaponEntityId());
         }
-        if (other.getWeaponGuid() != 0L) {
-          setWeaponGuid(other.getWeaponGuid());
+        if (other.hasWeaponAbilityInfo()) {
+          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
         }
         if (other.getAvatarEntityId() != 0) {
           setAvatarEntityId(other.getAvatarEntityId());
         }
-        if (!other.buffIdList_.isEmpty()) {
-          if (buffIdList_.isEmpty()) {
-            buffIdList_ = other.buffIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureBuffIdListIsMutable();
-            buffIdList_.addAll(other.buffIdList_);
-          }
-          onChanged();
-        }
-        if (other.getWeaponEntityId() != 0) {
-          setWeaponEntityId(other.getWeaponEntityId());
-        }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.getWeaponGuid() != 0L) {
+          setWeaponGuid(other.getWeaponGuid());
         }
         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_);
@@ -922,7 +901,7 @@ public final class AvatarEnterSceneInfoOuterClass {
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -931,8 +910,21 @@ public final class AvatarEnterSceneInfoOuterClass {
             }
           }
         }
-        if (other.hasWeaponAbilityInfo()) {
-          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
+        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());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -964,266 +956,6 @@ public final class AvatarEnterSceneInfoOuterClass {
       }
       private int bitField0_;
 
-      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 = 8;</code>
-       * @return Whether the avatarAbilityInfo field is set.
-       */
-      public boolean hasAvatarAbilityInfo() {
-        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-       * @return The avatarAbilityInfo.
-       */
-      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>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-       */
-      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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-       */
-      public Builder setAvatarAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-       */
-      public Builder clearAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
-          onChanged();
-        } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
-        
-        onChanged();
-        return getAvatarAbilityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 8;</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 = 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> 
-          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 long weaponGuid_ ;
-      /**
-       * <code>uint64 weapon_guid = 1;</code>
-       * @return The weaponGuid.
-       */
-      @java.lang.Override
-      public long getWeaponGuid() {
-        return weaponGuid_;
-      }
-      /**
-       * <code>uint64 weapon_guid = 1;</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 = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponGuid() {
-        
-        weaponGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int avatarEntityId_ ;
-      /**
-       * <code>uint32 avatar_entity_id = 5;</code>
-       * @return The avatarEntityId.
-       */
-      @java.lang.Override
-      public int getAvatarEntityId() {
-        return avatarEntityId_;
-      }
-      /**
-       * <code>uint32 avatar_entity_id = 5;</code>
-       * @param value The avatarEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarEntityId(int value) {
-        
-        avatarEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 avatar_entity_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarEntityId() {
-        
-        avatarEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList buffIdList_ = emptyIntList();
-      private void ensureBuffIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          buffIdList_ = mutableCopy(buffIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @return A list containing the buffIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getBuffIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(buffIdList_) : buffIdList_;
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @return The count of buffIdList.
-       */
-      public int getBuffIdListCount() {
-        return buffIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</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);
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The buffIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBuffIdList(
-          int index, int value) {
-        ensureBuffIdListIsMutable();
-        buffIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @param value The buffIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addBuffIdList(int value) {
-        ensureBuffIdListIsMutable();
-        buffIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @param values The buffIdList to add.
-       * @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_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 buff_id_list = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBuffIdList() {
-        buffIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private int weaponEntityId_ ;
       /**
        * <code>uint32 weapon_entity_id = 3;</code>
@@ -1255,289 +987,18 @@ public final class AvatarEnterSceneInfoOuterClass {
         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 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 = 10;</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 = 10;</code>
-       */
-      public int getServerBuffListCount() {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.size();
-        } else {
-          return serverBuffListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
-          int index) {
-        return getServerBuffListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 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>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        * @return Whether the weaponAbilityInfo field is set.
        */
       public boolean hasWeaponAbilityInfo() {
         return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        * @return The weaponAbilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
@@ -1548,7 +1009,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public Builder setWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1564,7 +1025,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public Builder setWeaponAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -1578,7 +1039,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public Builder mergeWeaponAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1596,7 +1057,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public Builder clearWeaponAbilityInfo() {
         if (weaponAbilityInfoBuilder_ == null) {
@@ -1610,7 +1071,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
         
@@ -1618,7 +1079,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         return getWeaponAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
         if (weaponAbilityInfoBuilder_ != null) {
@@ -1629,7 +1090,7 @@ public final class AvatarEnterSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 15;</code>
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 4;</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> 
@@ -1644,6 +1105,537 @@ public final class AvatarEnterSceneInfoOuterClass {
         }
         return weaponAbilityInfoBuilder_;
       }
+
+      private int avatarEntityId_ ;
+      /**
+       * <code>uint32 avatar_entity_id = 6;</code>
+       * @return The avatarEntityId.
+       */
+      @java.lang.Override
+      public int getAvatarEntityId() {
+        return avatarEntityId_;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 6;</code>
+       * @param value The avatarEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarEntityId(int value) {
+        
+        avatarEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 avatar_entity_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarEntityId() {
+        
+        avatarEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long weaponGuid_ ;
+      /**
+       * <code>uint64 weapon_guid = 7;</code>
+       * @return The weaponGuid.
+       */
+      @java.lang.Override
+      public long getWeaponGuid() {
+        return weaponGuid_;
+      }
+      /**
+       * <code>uint64 weapon_guid = 7;</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 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeaponGuid() {
+        
+        weaponGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      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>repeated .ServerBuff server_buff_list = 8;</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 = 8;</code>
+       */
+      public int getServerBuffListCount() {
+        if (serverBuffListBuilder_ == null) {
+          return serverBuffList_.size();
+        } else {
+          return serverBuffListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</code>
+       */
+      public Builder clearServerBuffList() {
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 8;</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 = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
+          int index) {
+        return getServerBuffListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 8;</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 = 8;</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 = 8;</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>
+       */
+      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 = 8;</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 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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       * @return The avatarAbilityInfo.
+       */
+      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>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       */
+      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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       */
+      public Builder setAvatarAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       */
+      public Builder clearAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = null;
+          onChanged();
+        } else {
+          avatarAbilityInfo_ = null;
+          avatarAbilityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 9;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
+        
+        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);
+      }
+      /**
+       * <code>repeated uint32 buff_id_list = 10;</code>
+       * @param index The index to set the value at.
+       * @param value The buffIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBuffIdList(
+          int index, int value) {
+        ensureBuffIdListIsMutable();
+        buffIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 buff_id_list = 10;</code>
+       * @param value The buffIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addBuffIdList(int value) {
+        ensureBuffIdListIsMutable();
+        buffIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 buff_id_list = 10;</code>
+       * @param values The buffIdList to add.
+       * @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_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 buff_id_list = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBuffIdList() {
+        buffIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 12;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>uint64 avatar_guid = 12;</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) {
@@ -1713,13 +1705,13 @@ public final class AvatarEnterSceneInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032AvatarEnterSceneInfo.proto\032\032AbilitySyn" +
       "cStateInfo.proto\032\020ServerBuff.proto\"\231\002\n\024A" +
-      "vatarEnterSceneInfo\0222\n\023avatar_ability_in" +
-      "fo\030\010 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013weapo" +
-      "n_guid\030\001 \001(\004\022\030\n\020avatar_entity_id\030\005 \001(\r\022\024" +
-      "\n\014buff_id_list\030\004 \003(\r\022\030\n\020weapon_entity_id" +
-      "\030\003 \001(\r\022\023\n\013avatar_guid\030\t \001(\004\022%\n\020server_bu" +
-      "ff_list\030\n \003(\0132\013.ServerBuff\0222\n\023weapon_abi" +
-      "lity_info\030\017 \001(\0132\025.AbilitySyncStateInfoB\033" +
+      "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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1733,7 +1725,7 @@ public final class AvatarEnterSceneInfoOuterClass {
     internal_static_AvatarEnterSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarEnterSceneInfo_descriptor,
-        new java.lang.String[] { "AvatarAbilityInfo", "WeaponGuid", "AvatarEntityId", "BuffIdList", "WeaponEntityId", "AvatarGuid", "ServerBuffList", "WeaponAbilityInfo", });
+        new java.lang.String[] { "WeaponEntityId", "WeaponAbilityInfo", "AvatarEntityId", "WeaponGuid", "ServerBuffList", "AvatarAbilityInfo", "BuffIdList", "AvatarGuid", });
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java
index 91d4f833f..9df574191 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixInfoOuterClass.java
@@ -31,10 +31,6 @@ public final class AvatarEquipAffixInfoOuterClass {
     int getLeftCdTime();
   }
   /**
-   * <pre>
-   * Obf: CFINPAOKBJN
-   * </pre>
-   *
    * Protobuf type {@code AvatarEquipAffixInfo}
    */
   public static final class AvatarEquipAffixInfo extends
@@ -310,10 +306,6 @@ public final class AvatarEquipAffixInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CFINPAOKBJN
-     * </pre>
-     *
      * Protobuf type {@code AvatarEquipAffixInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java
index 020c886b6..7ec19c567 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipAffixStartNotifyOuterClass.java
@@ -19,30 +19,29 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return Whether the equipAffixInfo field is set.
      */
     boolean hasEquipAffixInfo();
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return The equipAffixInfo.
      */
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo();
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder();
 
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 21354
-   * Obf: CNGHGKIPNBB
+   * CmdId: 8492
    * </pre>
    *
    * Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -89,7 +88,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 18: {
               emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder subBuilder = null;
               if (equipAffixInfo_ != null) {
                 subBuilder = equipAffixInfo_.toBuilder();
@@ -102,7 +101,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
 
               break;
             }
-            case 96: {
+            case 80: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -139,10 +138,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.class, emu.grasscutter.net.proto.AvatarEquipAffixStartNotifyOuterClass.AvatarEquipAffixStartNotify.Builder.class);
     }
 
-    public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 5;
+    public static final int EQUIP_AFFIX_INFO_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo equipAffixInfo_;
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return Whether the equipAffixInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +149,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       return equipAffixInfo_ != null;
     }
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      * @return The equipAffixInfo.
      */
     @java.lang.Override
@@ -158,17 +157,17 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       return equipAffixInfo_ == null ? emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.getDefaultInstance() : equipAffixInfo_;
     }
     /**
-     * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+     * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
       return getEquipAffixInfo();
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -191,10 +190,10 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (equipAffixInfo_ != null) {
-        output.writeMessage(5, getEquipAffixInfo());
+        output.writeMessage(2, getEquipAffixInfo());
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +206,11 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       size = 0;
       if (equipAffixInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getEquipAffixInfo());
+          .computeMessageSize(2, getEquipAffixInfo());
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -350,8 +349,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 21354
-     * Obf: CNGHGKIPNBB
+     * CmdId: 8492
      * </pre>
      *
      * Protobuf type {@code AvatarEquipAffixStartNotify}
@@ -518,14 +516,14 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> equipAffixInfoBuilder_;
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        * @return Whether the equipAffixInfo field is set.
        */
       public boolean hasEquipAffixInfo() {
         return equipAffixInfoBuilder_ != null || equipAffixInfo_ != null;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        * @return The equipAffixInfo.
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo getEquipAffixInfo() {
@@ -536,7 +534,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder setEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
         if (equipAffixInfoBuilder_ == null) {
@@ -552,7 +550,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder setEquipAffixInfo(
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder builderForValue) {
@@ -566,7 +564,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder mergeEquipAffixInfo(emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo value) {
         if (equipAffixInfoBuilder_ == null) {
@@ -584,7 +582,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public Builder clearEquipAffixInfo() {
         if (equipAffixInfoBuilder_ == null) {
@@ -598,7 +596,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder getEquipAffixInfoBuilder() {
         
@@ -606,7 +604,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return getEquipAffixInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder getEquipAffixInfoOrBuilder() {
         if (equipAffixInfoBuilder_ != null) {
@@ -617,7 +615,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         }
       }
       /**
-       * <code>.AvatarEquipAffixInfo equip_affix_info = 5;</code>
+       * <code>.AvatarEquipAffixInfo equip_affix_info = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfo.Builder, emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.AvatarEquipAffixInfoOrBuilder> 
@@ -635,7 +633,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -643,7 +641,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -654,7 +652,7 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -732,8 +730,8 @@ public final class AvatarEquipAffixStartNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AvatarEquipAffixStartNotify.proto\032\032Ava" +
       "tarEquipAffixInfo.proto\"c\n\033AvatarEquipAf" +
-      "fixStartNotify\022/\n\020equip_affix_info\030\005 \001(\013" +
-      "2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\014" +
+      "fixStartNotify\022/\n\020equip_affix_info\030\002 \001(\013" +
+      "2\025.AvatarEquipAffixInfo\022\023\n\013avatar_guid\030\n" +
       " \001(\004B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
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 69c4e6308..0fa09c381 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarEquipChangeNotifyOuterClass.java
@@ -19,65 +19,60 @@ public final class AvatarEquipChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>.SceneWeaponInfo weapon = 4;</code>
      * @return Whether the weapon field is set.
      */
     boolean hasWeapon();
     /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
+     * <code>.SceneWeaponInfo weapon = 4;</code>
      * @return The weapon.
      */
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon();
     /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
+     * <code>.SceneWeaponInfo weapon = 4;</code>
      */
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder();
 
     /**
-     * <code>uint32 item_id = 8;</code>
-     * @return The itemId.
-     */
-    int getItemId();
-
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 5;</code>
-     * @return Whether the reliquary field is set.
-     */
-    boolean hasReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 5;</code>
-     * @return The reliquary.
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo getReliquary();
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 5;</code>
-     */
-    emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder();
-
-    /**
-     * <code>uint64 equip_guid = 4;</code>
+     * <code>uint64 equip_guid = 7;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
 
     /**
-     * <code>uint32 equip_type = 6;</code>
+     * <code>uint32 equip_type = 10;</code>
      * @return The equipType.
      */
     int getEquipType();
 
     /**
-     * <code>uint64 avatar_guid = 1;</code>
-     * @return The avatarGuid.
+     * <code>.SceneReliquaryInfo reliquary = 11;</code>
+     * @return Whether the reliquary field is set.
      */
-    long getAvatarGuid();
+    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>
+     * @return The itemId.
+     */
+    int getItemId();
   }
   /**
-   * <pre>
-   * CmdId: 20682
-   * Obf: GOMNKIGKPAH
-   * </pre>
-   *
    * Protobuf type {@code AvatarEquipChangeNotify}
    */
   public static final class AvatarEquipChangeNotify extends
@@ -127,30 +122,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 32: {
-
-              equipGuid_ = input.readUInt64();
-              break;
-            }
-            case 42: {
-              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();
-              }
-
-              break;
-            }
-            case 48: {
-
-              equipType_ = input.readUInt32();
-              break;
-            }
-            case 58: {
+            case 34: {
               emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder subBuilder = null;
               if (weapon_ != null) {
                 subBuilder = weapon_.toBuilder();
@@ -163,7 +135,30 @@ public final class AvatarEquipChangeNotifyOuterClass {
 
               break;
             }
-            case 64: {
+            case 56: {
+
+              equipGuid_ = input.readUInt64();
+              break;
+            }
+            case 80: {
+
+              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();
+              }
+
+              break;
+            }
+            case 96: {
 
               itemId_ = input.readUInt32();
               break;
@@ -200,91 +195,6 @@ public final class AvatarEquipChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.class, emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify.Builder.class);
     }
 
-    public static final int WEAPON_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
-    /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
-     * @return Whether the weapon field is set.
-     */
-    @java.lang.Override
-    public boolean hasWeapon() {
-      return weapon_ != null;
-    }
-    /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
-     * @return The weapon.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
-      return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
-    }
-    /**
-     * <code>.SceneWeaponInfo weapon = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
-      return getWeapon();
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 8;
-    private int itemId_;
-    /**
-     * <code>uint32 item_id = 8;</code>
-     * @return The itemId.
-     */
-    @java.lang.Override
-    public int getItemId() {
-      return itemId_;
-    }
-
-    public static final int RELIQUARY_FIELD_NUMBER = 5;
-    private emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo reliquary_;
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 5;</code>
-     * @return Whether the reliquary field is set.
-     */
-    @java.lang.Override
-    public boolean hasReliquary() {
-      return reliquary_ != null;
-    }
-    /**
-     * <code>.SceneReliquaryInfo reliquary = 5;</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 = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfoOrBuilder getReliquaryOrBuilder() {
-      return getReliquary();
-    }
-
-    public static final int EQUIP_GUID_FIELD_NUMBER = 4;
-    private long equipGuid_;
-    /**
-     * <code>uint64 equip_guid = 4;</code>
-     * @return The equipGuid.
-     */
-    @java.lang.Override
-    public long getEquipGuid() {
-      return equipGuid_;
-    }
-
-    public static final int EQUIP_TYPE_FIELD_NUMBER = 6;
-    private int equipType_;
-    /**
-     * <code>uint32 equip_type = 6;</code>
-     * @return The equipType.
-     */
-    @java.lang.Override
-    public int getEquipType() {
-      return equipType_;
-    }
-
     public static final int AVATAR_GUID_FIELD_NUMBER = 1;
     private long avatarGuid_;
     /**
@@ -296,6 +206,91 @@ public final class AvatarEquipChangeNotifyOuterClass {
       return avatarGuid_;
     }
 
+    public static final int WEAPON_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo weapon_;
+    /**
+     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * @return Whether the weapon field is set.
+     */
+    @java.lang.Override
+    public boolean hasWeapon() {
+      return weapon_ != null;
+    }
+    /**
+     * <code>.SceneWeaponInfo weapon = 4;</code>
+     * @return The weapon.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
+      return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
+    }
+    /**
+     * <code>.SceneWeaponInfo weapon = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
+      return getWeapon();
+    }
+
+    public static final int EQUIP_GUID_FIELD_NUMBER = 7;
+    private long equipGuid_;
+    /**
+     * <code>uint64 equip_guid = 7;</code>
+     * @return The equipGuid.
+     */
+    @java.lang.Override
+    public long getEquipGuid() {
+      return equipGuid_;
+    }
+
+    public static final int EQUIP_TYPE_FIELD_NUMBER = 10;
+    private int equipType_;
+    /**
+     * <code>uint32 equip_type = 10;</code>
+     * @return The equipType.
+     */
+    @java.lang.Override
+    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;
+    private int itemId_;
+    /**
+     * <code>uint32 item_id = 12;</code>
+     * @return The itemId.
+     */
+    @java.lang.Override
+    public int getItemId() {
+      return itemId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -313,20 +308,20 @@ public final class AvatarEquipChangeNotifyOuterClass {
       if (avatarGuid_ != 0L) {
         output.writeUInt64(1, avatarGuid_);
       }
-      if (equipGuid_ != 0L) {
-        output.writeUInt64(4, equipGuid_);
+      if (weapon_ != null) {
+        output.writeMessage(4, getWeapon());
       }
-      if (reliquary_ != null) {
-        output.writeMessage(5, getReliquary());
+      if (equipGuid_ != 0L) {
+        output.writeUInt64(7, equipGuid_);
       }
       if (equipType_ != 0) {
-        output.writeUInt32(6, equipType_);
+        output.writeUInt32(10, equipType_);
       }
-      if (weapon_ != null) {
-        output.writeMessage(7, getWeapon());
+      if (reliquary_ != null) {
+        output.writeMessage(11, getReliquary());
       }
       if (itemId_ != 0) {
-        output.writeUInt32(8, itemId_);
+        output.writeUInt32(12, itemId_);
       }
       unknownFields.writeTo(output);
     }
@@ -341,25 +336,25 @@ public final class AvatarEquipChangeNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(1, avatarGuid_);
       }
+      if (weapon_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getWeapon());
+      }
       if (equipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, equipGuid_);
-      }
-      if (reliquary_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getReliquary());
+          .computeUInt64Size(7, equipGuid_);
       }
       if (equipType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, equipType_);
+          .computeUInt32Size(10, equipType_);
       }
-      if (weapon_ != null) {
+      if (reliquary_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getWeapon());
+          .computeMessageSize(11, getReliquary());
       }
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, itemId_);
+          .computeUInt32Size(12, itemId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -376,24 +371,24 @@ public final class AvatarEquipChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify other = (emu.grasscutter.net.proto.AvatarEquipChangeNotifyOuterClass.AvatarEquipChangeNotify) obj;
 
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (hasWeapon() != other.hasWeapon()) return false;
       if (hasWeapon()) {
         if (!getWeapon()
             .equals(other.getWeapon())) return false;
       }
-      if (getItemId()
-          != other.getItemId()) 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 (getEquipGuid()
-          != other.getEquipGuid()) return false;
-      if (getEquipType()
-          != other.getEquipType()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
+      if (getItemId()
+          != other.getItemId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -405,24 +400,24 @@ public final class AvatarEquipChangeNotifyOuterClass {
       }
       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 (hasWeapon()) {
         hash = (37 * hash) + WEAPON_FIELD_NUMBER;
         hash = (53 * hash) + getWeapon().hashCode();
       }
-      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getItemId();
-      if (hasReliquary()) {
-        hash = (37 * hash) + RELIQUARY_FIELD_NUMBER;
-        hash = (53 * hash) + getReliquary().hashCode();
-      }
       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();
-      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();
+      }
+      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getItemId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -519,11 +514,6 @@ public final class AvatarEquipChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20682
-     * Obf: GOMNKIGKPAH
-     * </pre>
-     *
      * Protobuf type {@code AvatarEquipChangeNotify}
      */
     public static final class Builder extends
@@ -561,13 +551,17 @@ public final class AvatarEquipChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        avatarGuid_ = 0L;
+
         if (weaponBuilder_ == null) {
           weapon_ = null;
         } else {
           weapon_ = null;
           weaponBuilder_ = null;
         }
-        itemId_ = 0;
+        equipGuid_ = 0L;
+
+        equipType_ = 0;
 
         if (reliquaryBuilder_ == null) {
           reliquary_ = null;
@@ -575,11 +569,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
           reliquary_ = null;
           reliquaryBuilder_ = null;
         }
-        equipGuid_ = 0L;
-
-        equipType_ = 0;
-
-        avatarGuid_ = 0L;
+        itemId_ = 0;
 
         return this;
       }
@@ -607,20 +597,20 @@ public final class AvatarEquipChangeNotifyOuterClass {
       @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 (weaponBuilder_ == null) {
           result.weapon_ = weapon_;
         } else {
           result.weapon_ = weaponBuilder_.build();
         }
-        result.itemId_ = itemId_;
+        result.equipGuid_ = equipGuid_;
+        result.equipType_ = equipType_;
         if (reliquaryBuilder_ == null) {
           result.reliquary_ = reliquary_;
         } else {
           result.reliquary_ = reliquaryBuilder_.build();
         }
-        result.equipGuid_ = equipGuid_;
-        result.equipType_ = equipType_;
-        result.avatarGuid_ = avatarGuid_;
+        result.itemId_ = itemId_;
         onBuilt();
         return result;
       }
@@ -669,23 +659,23 @@ public final class AvatarEquipChangeNotifyOuterClass {
 
       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.hasWeapon()) {
           mergeWeapon(other.getWeapon());
         }
-        if (other.getItemId() != 0) {
-          setItemId(other.getItemId());
-        }
-        if (other.hasReliquary()) {
-          mergeReliquary(other.getReliquary());
-        }
         if (other.getEquipGuid() != 0L) {
           setEquipGuid(other.getEquipGuid());
         }
         if (other.getEquipType() != 0) {
           setEquipType(other.getEquipType());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.hasReliquary()) {
+          mergeReliquary(other.getReliquary());
+        }
+        if (other.getItemId() != 0) {
+          setItemId(other.getItemId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -716,337 +706,6 @@ public final class AvatarEquipChangeNotifyOuterClass {
         return this;
       }
 
-      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 = 7;</code>
-       * @return Whether the weapon field is set.
-       */
-      public boolean hasWeapon() {
-        return weaponBuilder_ != null || weapon_ != null;
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       * @return The weapon.
-       */
-      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
-        if (weaponBuilder_ == null) {
-          return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
-        } else {
-          return weaponBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public Builder setWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
-        if (weaponBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          weapon_ = value;
-          onChanged();
-        } else {
-          weaponBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public Builder setWeapon(
-          emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder builderForValue) {
-        if (weaponBuilder_ == null) {
-          weapon_ = builderForValue.build();
-          onChanged();
-        } else {
-          weaponBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public Builder mergeWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
-        if (weaponBuilder_ == null) {
-          if (weapon_ != null) {
-            weapon_ =
-              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.newBuilder(weapon_).mergeFrom(value).buildPartial();
-          } else {
-            weapon_ = value;
-          }
-          onChanged();
-        } else {
-          weaponBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public Builder clearWeapon() {
-        if (weaponBuilder_ == null) {
-          weapon_ = null;
-          onChanged();
-        } else {
-          weapon_ = null;
-          weaponBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder getWeaponBuilder() {
-        
-        onChanged();
-        return getWeaponFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</code>
-       */
-      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
-        if (weaponBuilder_ != null) {
-          return weaponBuilder_.getMessageOrBuilder();
-        } else {
-          return weapon_ == null ?
-              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
-        }
-      }
-      /**
-       * <code>.SceneWeaponInfo weapon = 7;</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> 
-          getWeaponFieldBuilder() {
-        if (weaponBuilder_ == null) {
-          weaponBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder>(
-                  getWeapon(),
-                  getParentForChildren(),
-                  isClean());
-          weapon_ = null;
-        }
-        return weaponBuilder_;
-      }
-
-      private int itemId_ ;
-      /**
-       * <code>uint32 item_id = 8;</code>
-       * @return The itemId.
-       */
-      @java.lang.Override
-      public int getItemId() {
-        return itemId_;
-      }
-      /**
-       * <code>uint32 item_id = 8;</code>
-       * @param value The itemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setItemId(int value) {
-        
-        itemId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 item_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearItemId() {
-        
-        itemId_ = 0;
-        onChanged();
-        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 = 5;</code>
-       * @return Whether the reliquary field is set.
-       */
-      public boolean hasReliquary() {
-        return reliquaryBuilder_ != null || reliquary_ != null;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 5;</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 = 5;</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 = 5;</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 = 5;</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 = 5;</code>
-       */
-      public Builder clearReliquary() {
-        if (reliquaryBuilder_ == null) {
-          reliquary_ = null;
-          onChanged();
-        } else {
-          reliquary_ = null;
-          reliquaryBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 5;</code>
-       */
-      public emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.SceneReliquaryInfo.Builder getReliquaryBuilder() {
-        
-        onChanged();
-        return getReliquaryFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneReliquaryInfo reliquary = 5;</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 = 5;</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 long equipGuid_ ;
-      /**
-       * <code>uint64 equip_guid = 4;</code>
-       * @return The equipGuid.
-       */
-      @java.lang.Override
-      public long getEquipGuid() {
-        return equipGuid_;
-      }
-      /**
-       * <code>uint64 equip_guid = 4;</code>
-       * @param value The equipGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEquipGuid(long value) {
-        
-        equipGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 equip_guid = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEquipGuid() {
-        
-        equipGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int equipType_ ;
-      /**
-       * <code>uint32 equip_type = 6;</code>
-       * @return The equipType.
-       */
-      @java.lang.Override
-      public int getEquipType() {
-        return equipType_;
-      }
-      /**
-       * <code>uint32 equip_type = 6;</code>
-       * @param value The equipType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEquipType(int value) {
-        
-        equipType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 equip_type = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEquipType() {
-        
-        equipType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
        * <code>uint64 avatar_guid = 1;</code>
@@ -1077,6 +736,337 @@ public final class AvatarEquipChangeNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      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>
+       * @return Whether the weapon field is set.
+       */
+      public boolean hasWeapon() {
+        return weaponBuilder_ != null || weapon_ != null;
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       * @return The weapon.
+       */
+      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo getWeapon() {
+        if (weaponBuilder_ == null) {
+          return weapon_ == null ? emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
+        } else {
+          return weaponBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public Builder setWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
+        if (weaponBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          weapon_ = value;
+          onChanged();
+        } else {
+          weaponBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public Builder setWeapon(
+          emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder builderForValue) {
+        if (weaponBuilder_ == null) {
+          weapon_ = builderForValue.build();
+          onChanged();
+        } else {
+          weaponBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public Builder mergeWeapon(emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo value) {
+        if (weaponBuilder_ == null) {
+          if (weapon_ != null) {
+            weapon_ =
+              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.newBuilder(weapon_).mergeFrom(value).buildPartial();
+          } else {
+            weapon_ = value;
+          }
+          onChanged();
+        } else {
+          weaponBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public Builder clearWeapon() {
+        if (weaponBuilder_ == null) {
+          weapon_ = null;
+          onChanged();
+        } else {
+          weapon_ = null;
+          weaponBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder getWeaponBuilder() {
+        
+        onChanged();
+        return getWeaponFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</code>
+       */
+      public emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder getWeaponOrBuilder() {
+        if (weaponBuilder_ != null) {
+          return weaponBuilder_.getMessageOrBuilder();
+        } else {
+          return weapon_ == null ?
+              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.getDefaultInstance() : weapon_;
+        }
+      }
+      /**
+       * <code>.SceneWeaponInfo weapon = 4;</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> 
+          getWeaponFieldBuilder() {
+        if (weaponBuilder_ == null) {
+          weaponBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfo.Builder, emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.SceneWeaponInfoOrBuilder>(
+                  getWeapon(),
+                  getParentForChildren(),
+                  isClean());
+          weapon_ = null;
+        }
+        return weaponBuilder_;
+      }
+
+      private long equipGuid_ ;
+      /**
+       * <code>uint64 equip_guid = 7;</code>
+       * @return The equipGuid.
+       */
+      @java.lang.Override
+      public long getEquipGuid() {
+        return equipGuid_;
+      }
+      /**
+       * <code>uint64 equip_guid = 7;</code>
+       * @param value The equipGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEquipGuid(long value) {
+        
+        equipGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 equip_guid = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEquipGuid() {
+        
+        equipGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int equipType_ ;
+      /**
+       * <code>uint32 equip_type = 10;</code>
+       * @return The equipType.
+       */
+      @java.lang.Override
+      public int getEquipType() {
+        return equipType_;
+      }
+      /**
+       * <code>uint32 equip_type = 10;</code>
+       * @param value The equipType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEquipType(int value) {
+        
+        equipType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 equip_type = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEquipType() {
+        
+        equipType_ = 0;
+        onChanged();
+        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>
+       * @return The itemId.
+       */
+      @java.lang.Override
+      public int getItemId() {
+        return itemId_;
+      }
+      /**
+       * <code>uint32 item_id = 12;</code>
+       * @param value The itemId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setItemId(int value) {
+        
+        itemId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 item_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearItemId() {
+        
+        itemId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1146,11 +1136,11 @@ public final class AvatarEquipChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035AvatarEquipChangeNotify.proto\032\025SceneWe" +
       "aponInfo.proto\032\030SceneReliquaryInfo.proto" +
-      "\"\261\001\n\027AvatarEquipChangeNotify\022 \n\006weapon\030\007" +
-      " \001(\0132\020.SceneWeaponInfo\022\017\n\007item_id\030\010 \001(\r\022" +
-      "&\n\treliquary\030\005 \001(\0132\023.SceneReliquaryInfo\022" +
-      "\022\n\nequip_guid\030\004 \001(\004\022\022\n\nequip_type\030\006 \001(\r\022" +
-      "\023\n\013avatar_guid\030\001 \001(\004B\033\n\031emu.grasscutter." +
+      "\"\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." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1164,7 +1154,7 @@ public final class AvatarEquipChangeNotifyOuterClass {
     internal_static_AvatarEquipChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarEquipChangeNotify_descriptor,
-        new java.lang.String[] { "Weapon", "ItemId", "Reliquary", "EquipGuid", "EquipType", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "Weapon", "EquipGuid", "EquipType", "Reliquary", "ItemId", });
     emu.grasscutter.net.proto.SceneWeaponInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SceneReliquaryInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExcelInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExcelInfoOuterClass.java
index d0ec3a098..240cfae64 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExcelInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExcelInfoOuterClass.java
@@ -49,10 +49,6 @@ public final class AvatarExcelInfoOuterClass {
     long getCombatConfigHash();
   }
   /**
-   * <pre>
-   * Obf: HGHGOIMIAMF
-   * </pre>
-   *
    * Protobuf type {@code AvatarExcelInfo}
    */
   public static final class AvatarExcelInfo extends
@@ -414,10 +410,6 @@ public final class AvatarExcelInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HGHGOIMIAMF
-     * </pre>
-     *
      * Protobuf type {@code AvatarExcelInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionDataNotifyOuterClass.java
index afd294782..fd081e621 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionDataNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     int getExpeditionInfoMapCount();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     boolean containsExpeditionInfoMap(
         long key);
@@ -34,30 +34,25 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo>
     getExpeditionInfoMapMap();
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrDefault(
         long key,
         emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo defaultValue);
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo getExpeditionInfoMapOrThrow(
         long key);
   }
   /**
-   * <pre>
-   * CmdId: 26803
-   * Obf: FCCLNDJAANA
-   * </pre>
-   *
    * Protobuf type {@code AvatarExpeditionDataNotify}
    */
   public static final class AvatarExpeditionDataNotify extends
@@ -103,7 +98,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 expeditionInfoMap_ = com.google.protobuf.MapField.newMapField(
                     ExpeditionInfoMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
+        case 3:
           return internalGetExpeditionInfoMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify.class, emu.grasscutter.net.proto.AvatarExpeditionDataNotifyOuterClass.AvatarExpeditionDataNotify.Builder.class);
     }
 
-    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 4;
+    public static final int EXPEDITION_INFO_MAP_FIELD_NUMBER = 3;
     private static final class ExpeditionInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Long, emu.grasscutter.net.proto.AvatarExpeditionInfoOuterClass.AvatarExpeditionInfo> defaultEntry =
@@ -187,7 +182,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return internalGetExpeditionInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return getExpeditionInfoMapMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return internalGetExpeditionInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+     * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
           output,
           internalGetExpeditionInfoMap(),
           ExpeditionInfoMapDefaultEntryHolder.defaultEntry,
-          4);
+          3);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, expeditionInfoMap__);
+            .computeMessageSize(3, expeditionInfoMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26803
-     * Obf: FCCLNDJAANA
-     * </pre>
-     *
      * Protobuf type {@code AvatarExpeditionDataNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 3:
             return internalGetExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 3:
             return internalGetMutableExpeditionInfoMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetExpeditionInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return getExpeditionInfoMapMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetExpeditionInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       public Builder removeExpeditionInfoMap(
@@ -688,7 +678,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return internalGetMutableExpeditionInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
       public Builder putExpeditionInfoMap(
           long key,
@@ -700,7 +690,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 4;</code>
+       * <code>map&lt;uint64, .AvatarExpeditionInfo&gt; expedition_info_map = 3;</code>
        */
 
       public Builder putAllExpeditionInfoMap(
@@ -783,7 +773,7 @@ public final class AvatarExpeditionDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n AvatarExpeditionDataNotify.proto\032\032Avat" +
       "arExpeditionInfo.proto\"\276\001\n\032AvatarExpedit" +
-      "ionDataNotify\022O\n\023expedition_info_map\030\004 \003" +
+      "ionDataNotify\022O\n\023expedition_info_map\030\003 \003" +
       "(\01322.AvatarExpeditionDataNotify.Expediti" +
       "onInfoMapEntry\032O\n\026ExpeditionInfoMapEntry" +
       "\022\013\n\003key\030\001 \001(\004\022$\n\005value\030\002 \001(\0132\025.AvatarExp" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionInfoOuterClass.java
index 9966069e2..193eb956f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionInfoOuterClass.java
@@ -54,10 +54,6 @@ public final class AvatarExpeditionInfoOuterClass {
     float getShortenRatio();
   }
   /**
-   * <pre>
-   * Obf: MBBNGLKDKFD
-   * </pre>
-   *
    * Protobuf type {@code AvatarExpeditionInfo}
    */
   public static final class AvatarExpeditionInfo extends
@@ -425,10 +421,6 @@ public final class AvatarExpeditionInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MBBNGLKDKFD
-     * </pre>
-     *
      * Protobuf type {@code AvatarExpeditionInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java
index 9a159eeae..ce125f171 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarExpeditionStateOuterClass.java
@@ -15,10 +15,6 @@ public final class AvatarExpeditionStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OJBIHADNECN
-   * </pre>
-   *
    * Protobuf enum {@code AvatarExpeditionState}
    */
   public enum AvatarExpeditionState
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java
index 68559cebe..75dfe7b39 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterDataNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class AvatarFetterDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     int getFetterInfoMapCount();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     boolean containsFetterInfoMap(
         long key);
@@ -34,19 +34,19 @@ public final class AvatarFetterDataNotifyOuterClass {
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
     getFetterInfoMap();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     java.util.Map<java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo>
     getFetterInfoMapMap();
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrDefault(
         long key,
         emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo defaultValue);
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo getFetterInfoMapOrThrow(
@@ -54,8 +54,7 @@ public final class AvatarFetterDataNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 29004
-   * Obf: JKPPLBNFEGM
+   * CmdId: 4274
    * </pre>
    *
    * Protobuf type {@code AvatarFetterDataNotify}
@@ -103,7 +102,7 @@ public final class AvatarFetterDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fetterInfoMap_ = com.google.protobuf.MapField.newMapField(
                     FetterInfoMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +144,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 8:
+        case 12:
           return internalGetFetterInfoMap();
         default:
           throw new RuntimeException(
@@ -160,7 +159,7 @@ public final class AvatarFetterDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.class, emu.grasscutter.net.proto.AvatarFetterDataNotifyOuterClass.AvatarFetterDataNotify.Builder.class);
     }
 
-    public static final int FETTER_INFO_MAP_FIELD_NUMBER = 8;
+    public static final int FETTER_INFO_MAP_FIELD_NUMBER = 12;
     private static final class FetterInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Long, emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.AvatarFetterInfo> defaultEntry =
@@ -187,7 +186,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return internalGetFetterInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
 
     @java.lang.Override
@@ -205,7 +204,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return getFetterInfoMapMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -213,7 +212,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return internalGetFetterInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -226,7 +225,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+     * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
      */
     @java.lang.Override
 
@@ -260,7 +259,7 @@ public final class AvatarFetterDataNotifyOuterClass {
           output,
           internalGetFetterInfoMap(),
           FetterInfoMapDefaultEntryHolder.defaultEntry,
-          8);
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +277,7 @@ public final class AvatarFetterDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(8, fetterInfoMap__);
+            .computeMessageSize(12, fetterInfoMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -409,8 +408,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29004
-     * Obf: JKPPLBNFEGM
+     * CmdId: 4274
      * </pre>
      *
      * Protobuf type {@code AvatarFetterDataNotify}
@@ -428,7 +426,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetFetterInfoMap();
           default:
             throw new RuntimeException(
@@ -439,7 +437,7 @@ public final class AvatarFetterDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 8:
+          case 12:
             return internalGetMutableFetterInfoMap();
           default:
             throw new RuntimeException(
@@ -609,7 +607,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetFetterInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       @java.lang.Override
@@ -627,7 +625,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return getFetterInfoMapMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -635,7 +633,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetFetterInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -648,7 +646,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       @java.lang.Override
 
@@ -669,7 +667,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       public Builder removeFetterInfoMap(
@@ -688,7 +686,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return internalGetMutableFetterInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
       public Builder putFetterInfoMap(
           long key,
@@ -700,7 +698,7 @@ public final class AvatarFetterDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 8;</code>
+       * <code>map&lt;uint64, .AvatarFetterInfo&gt; fetter_info_map = 12;</code>
        */
 
       public Builder putAllFetterInfoMap(
@@ -783,7 +781,7 @@ public final class AvatarFetterDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarFetterDataNotify.proto\032\026AvatarFe" +
       "tterInfo.proto\"\246\001\n\026AvatarFetterDataNotif" +
-      "y\022C\n\017fetter_info_map\030\010 \003(\0132*.AvatarFette" +
+      "y\022C\n\017fetter_info_map\030\014 \003(\0132*.AvatarFette" +
       "rDataNotify.FetterInfoMapEntry\032G\n\022Fetter" +
       "InfoMapEntry\022\013\n\003key\030\001 \001(\004\022 \n\005value\030\002 \001(\013" +
       "2\021.AvatarFetterInfo:\0028\001B\033\n\031emu.grasscutt" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterInfoOuterClass.java
index 5062c7625..463261a64 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterInfoOuterClass.java
@@ -106,10 +106,6 @@ public final class AvatarFetterInfoOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * Obf: BJIGILJGKAI
-   * </pre>
-   *
    * Protobuf type {@code AvatarFetterInfo}
    */
   public static final class AvatarFetterInfo extends
@@ -693,10 +689,6 @@ public final class AvatarFetterInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BJIGILJGKAI
-     * </pre>
-     *
      * Protobuf type {@code AvatarFetterInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java
index 38bd745c9..202767437 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardReqOuterClass.java
@@ -19,21 +19,20 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 14;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 fetter_level = 9;</code>
+     * <code>uint32 fetter_level = 8;</code>
      * @return The fetterLevel.
      */
     int getFetterLevel();
+
+    /**
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 28996
-   * Obf: NAEEPLALPHF
+   * CmdId: 7455
    * </pre>
    *
    * Protobuf type {@code AvatarFetterLevelRewardReq}
@@ -80,16 +79,16 @@ public final class AvatarFetterLevelRewardReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
-
-              fetterLevel_ = input.readUInt32();
-              break;
-            }
-            case 112: {
+            case 8: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 64: {
+
+              fetterLevel_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +121,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
               emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.class, emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 14;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 14;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int FETTER_LEVEL_FIELD_NUMBER = 9;
+    public static final int FETTER_LEVEL_FIELD_NUMBER = 8;
     private int fetterLevel_;
     /**
-     * <code>uint32 fetter_level = 9;</code>
+     * <code>uint32 fetter_level = 8;</code>
      * @return The fetterLevel.
      */
     @java.lang.Override
@@ -144,6 +132,17 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       return fetterLevel_;
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 1;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +157,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (fetterLevel_ != 0) {
-        output.writeUInt32(9, fetterLevel_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(14, avatarGuid_);
+        output.writeUInt64(1, avatarGuid_);
+      }
+      if (fetterLevel_ != 0) {
+        output.writeUInt32(8, fetterLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +172,13 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (fetterLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, fetterLevel_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, avatarGuid_);
+          .computeUInt64Size(1, avatarGuid_);
+      }
+      if (fetterLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, fetterLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +195,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq other = (emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getFetterLevel()
           != other.getFetterLevel()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +210,11 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getFetterLevel();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getFetterLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -313,8 +312,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 28996
-     * Obf: NAEEPLALPHF
+     * CmdId: 7455
      * </pre>
      *
      * Protobuf type {@code AvatarFetterLevelRewardReq}
@@ -354,10 +352,10 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
         fetterLevel_ = 0;
 
+        avatarGuid_ = 0L;
+
         return this;
       }
 
@@ -384,8 +382,8 @@ public final class AvatarFetterLevelRewardReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq buildPartial() {
         emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq result = new emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq(this);
-        result.avatarGuid_ = avatarGuid_;
         result.fetterLevel_ = fetterLevel_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -434,12 +432,12 @@ public final class AvatarFetterLevelRewardReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq other) {
         if (other == emu.grasscutter.net.proto.AvatarFetterLevelRewardReqOuterClass.AvatarFetterLevelRewardReq.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getFetterLevel() != 0) {
           setFetterLevel(other.getFetterLevel());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +467,9 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return this;
       }
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 14;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int fetterLevel_ ;
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @return The fetterLevel.
        */
       @java.lang.Override
@@ -510,7 +477,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return fetterLevel_;
       }
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @param value The fetterLevel to set.
        * @return This builder for chaining.
        */
@@ -521,7 +488,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 fetter_level = 9;</code>
+       * <code>uint32 fetter_level = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearFetterLevel() {
@@ -530,6 +497,37 @@ public final class AvatarFetterLevelRewardReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 1;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 1;</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 = 1;</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) {
@@ -598,8 +596,8 @@ public final class AvatarFetterLevelRewardReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarFetterLevelRewardReq.proto\"G\n\032Av" +
-      "atarFetterLevelRewardReq\022\023\n\013avatar_guid\030" +
-      "\016 \001(\004\022\024\n\014fetter_level\030\t \001(\rB\033\n\031emu.grass" +
+      "atarFetterLevelRewardReq\022\024\n\014fetter_level" +
+      "\030\010 \001(\r\022\023\n\013avatar_guid\030\001 \001(\004B\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +609,7 @@ public final class AvatarFetterLevelRewardReqOuterClass {
     internal_static_AvatarFetterLevelRewardReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFetterLevelRewardReq_descriptor,
-        new java.lang.String[] { "AvatarGuid", "FetterLevel", });
+        new java.lang.String[] { "FetterLevel", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java
index 7305100e6..90efe68bc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFetterLevelRewardRspOuterClass.java
@@ -18,18 +18,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarFetterLevelRewardRsp)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 fetter_level = 12;</code>
-     * @return The fetterLevel.
-     */
-    int getFetterLevel();
-
-    /**
-     * <code>uint32 reward_id = 7;</code>
-     * @return The rewardId.
-     */
-    int getRewardId();
-
     /**
      * <code>int32 retcode = 5;</code>
      * @return The retcode.
@@ -37,15 +25,26 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint32 fetter_level = 7;</code>
+     * @return The fetterLevel.
+     */
+    int getFetterLevel();
+
+    /**
+     * <code>uint64 avatar_guid = 12;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 reward_id = 14;</code>
+     * @return The rewardId.
+     */
+    int getRewardId();
   }
   /**
    * <pre>
-   * CmdId: 3975
-   * Obf: MEJJHABMCID
+   * CmdId: 21750
    * </pre>
    *
    * Protobuf type {@code AvatarFetterLevelRewardRsp}
@@ -99,17 +98,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
             }
             case 56: {
 
-              rewardId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              avatarGuid_ = input.readUInt64();
+              fetterLevel_ = input.readUInt32();
               break;
             }
             case 96: {
 
-              fetterLevel_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 112: {
+
+              rewardId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,28 +143,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
               emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.class, emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.Builder.class);
     }
 
-    public static final int FETTER_LEVEL_FIELD_NUMBER = 12;
-    private int fetterLevel_;
-    /**
-     * <code>uint32 fetter_level = 12;</code>
-     * @return The fetterLevel.
-     */
-    @java.lang.Override
-    public int getFetterLevel() {
-      return fetterLevel_;
-    }
-
-    public static final int REWARD_ID_FIELD_NUMBER = 7;
-    private int rewardId_;
-    /**
-     * <code>uint32 reward_id = 7;</code>
-     * @return The rewardId.
-     */
-    @java.lang.Override
-    public int getRewardId() {
-      return rewardId_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
@@ -177,10 +154,21 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
+    public static final int FETTER_LEVEL_FIELD_NUMBER = 7;
+    private int fetterLevel_;
+    /**
+     * <code>uint32 fetter_level = 7;</code>
+     * @return The fetterLevel.
+     */
+    @java.lang.Override
+    public int getFetterLevel() {
+      return fetterLevel_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint64 avatar_guid = 12;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -188,6 +176,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       return avatarGuid_;
     }
 
+    public static final int REWARD_ID_FIELD_NUMBER = 14;
+    private int rewardId_;
+    /**
+     * <code>uint32 reward_id = 14;</code>
+     * @return The rewardId.
+     */
+    @java.lang.Override
+    public int getRewardId() {
+      return rewardId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -205,14 +204,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(5, retcode_);
       }
-      if (rewardId_ != 0) {
-        output.writeUInt32(7, rewardId_);
+      if (fetterLevel_ != 0) {
+        output.writeUInt32(7, fetterLevel_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(11, avatarGuid_);
+        output.writeUInt64(12, avatarGuid_);
       }
-      if (fetterLevel_ != 0) {
-        output.writeUInt32(12, fetterLevel_);
+      if (rewardId_ != 0) {
+        output.writeUInt32(14, rewardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -227,17 +226,17 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(5, retcode_);
       }
-      if (rewardId_ != 0) {
+      if (fetterLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, rewardId_);
+          .computeUInt32Size(7, fetterLevel_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, avatarGuid_);
+          .computeUInt64Size(12, avatarGuid_);
       }
-      if (fetterLevel_ != 0) {
+      if (rewardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, fetterLevel_);
+          .computeUInt32Size(14, rewardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +253,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp other = (emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp) obj;
 
-      if (getFetterLevel()
-          != other.getFetterLevel()) return false;
-      if (getRewardId()
-          != other.getRewardId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getFetterLevel()
+          != other.getFetterLevel()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getRewardId()
+          != other.getRewardId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +272,15 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getFetterLevel();
-      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRewardId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + FETTER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getFetterLevel();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRewardId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,8 +378,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3975
-     * Obf: MEJJHABMCID
+     * CmdId: 21750
      * </pre>
      *
      * Protobuf type {@code AvatarFetterLevelRewardRsp}
@@ -420,14 +418,14 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        fetterLevel_ = 0;
-
-        rewardId_ = 0;
-
         retcode_ = 0;
 
+        fetterLevel_ = 0;
+
         avatarGuid_ = 0L;
 
+        rewardId_ = 0;
+
         return this;
       }
 
@@ -454,10 +452,10 @@ public final class AvatarFetterLevelRewardRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp result = new emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp(this);
-        result.fetterLevel_ = fetterLevel_;
-        result.rewardId_ = rewardId_;
         result.retcode_ = retcode_;
+        result.fetterLevel_ = fetterLevel_;
         result.avatarGuid_ = avatarGuid_;
+        result.rewardId_ = rewardId_;
         onBuilt();
         return result;
       }
@@ -506,18 +504,18 @@ public final class AvatarFetterLevelRewardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarFetterLevelRewardRspOuterClass.AvatarFetterLevelRewardRsp.getDefaultInstance()) return this;
-        if (other.getFetterLevel() != 0) {
-          setFetterLevel(other.getFetterLevel());
-        }
-        if (other.getRewardId() != 0) {
-          setRewardId(other.getRewardId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getFetterLevel() != 0) {
+          setFetterLevel(other.getFetterLevel());
+        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getRewardId() != 0) {
+          setRewardId(other.getRewardId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,68 +545,6 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
 
-      private int fetterLevel_ ;
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @return The fetterLevel.
-       */
-      @java.lang.Override
-      public int getFetterLevel() {
-        return fetterLevel_;
-      }
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @param value The fetterLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFetterLevel(int value) {
-        
-        fetterLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 fetter_level = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFetterLevel() {
-        
-        fetterLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int rewardId_ ;
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @return The rewardId.
-       */
-      @java.lang.Override
-      public int getRewardId() {
-        return rewardId_;
-      }
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @param value The rewardId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardId(int value) {
-        
-        rewardId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reward_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardId() {
-        
-        rewardId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 5;</code>
@@ -640,9 +576,40 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
 
+      private int fetterLevel_ ;
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @return The fetterLevel.
+       */
+      @java.lang.Override
+      public int getFetterLevel() {
+        return fetterLevel_;
+      }
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @param value The fetterLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFetterLevel(int value) {
+        
+        fetterLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 fetter_level = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFetterLevel() {
+        
+        fetterLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -650,7 +617,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -661,7 +628,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 11;</code>
+       * <code>uint64 avatar_guid = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -670,6 +637,37 @@ public final class AvatarFetterLevelRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int rewardId_ ;
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @return The rewardId.
+       */
+      @java.lang.Override
+      public int getRewardId() {
+        return rewardId_;
+      }
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @param value The rewardId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardId(int value) {
+        
+        rewardId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reward_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardId() {
+        
+        rewardId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +736,9 @@ public final class AvatarFetterLevelRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n AvatarFetterLevelRewardRsp.proto\"k\n\032Av" +
-      "atarFetterLevelRewardRsp\022\024\n\014fetter_level" +
-      "\030\014 \001(\r\022\021\n\treward_id\030\007 \001(\r\022\017\n\007retcode\030\005 \001" +
-      "(\005\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031emu.grasscutt" +
+      "atarFetterLevelRewardRsp\022\017\n\007retcode\030\005 \001(" +
+      "\005\022\024\n\014fetter_level\030\007 \001(\r\022\023\n\013avatar_guid\030\014" +
+      " \001(\004\022\021\n\treward_id\030\016 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +750,7 @@ public final class AvatarFetterLevelRewardRspOuterClass {
     internal_static_AvatarFetterLevelRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFetterLevelRewardRsp_descriptor,
-        new java.lang.String[] { "FetterLevel", "RewardId", "Retcode", "AvatarGuid", });
+        new java.lang.String[] { "Retcode", "FetterLevel", "AvatarGuid", "RewardId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java
index 33e5e14c1..6ed05d9fb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropNotifyOuterClass.java
@@ -19,17 +19,11 @@ public final class AvatarFightPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 7;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -40,28 +34,33 @@ public final class AvatarFightPropNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrThrow(
         int key);
+
+    /**
+     * <code>uint64 avatar_guid = 11;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 20455
-   * Obf: DPKAGLDONFP
+   * CmdId: 287
    * </pre>
    *
    * Protobuf type {@code AvatarFightPropNotify}
@@ -109,7 +108,7 @@ public final class AvatarFightPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +121,7 @@ public final class AvatarFightPropNotifyOuterClass {
                   fightPropMap__.getKey(), fightPropMap__.getValue());
               break;
             }
-            case 56: {
+            case 88: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -156,7 +155,7 @@ public final class AvatarFightPropNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 7:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -171,18 +170,7 @@ public final class AvatarFightPropNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.class, emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 7;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 3;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 7;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -209,7 +197,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     @java.lang.Override
@@ -227,7 +215,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -235,7 +223,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -248,7 +236,7 @@ public final class AvatarFightPropNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -263,6 +251,17 @@ public final class AvatarFightPropNotifyOuterClass {
       return map.get(key);
     }
 
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 11;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -282,9 +281,9 @@ public final class AvatarFightPropNotifyOuterClass {
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          3);
+          7);
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(7, avatarGuid_);
+        output.writeUInt64(11, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +302,11 @@ public final class AvatarFightPropNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, fightPropMap__);
+            .computeMessageSize(7, fightPropMap__);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, avatarGuid_);
+          .computeUInt64Size(11, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -324,10 +323,10 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify other = (emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (!internalGetFightPropMap().equals(
           other.internalGetFightPropMap())) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -339,13 +338,13 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       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 (!internalGetFightPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + FIGHT_PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetFightPropMap().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;
@@ -443,8 +442,7 @@ public final class AvatarFightPropNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20455
-     * Obf: DPKAGLDONFP
+     * CmdId: 287
      * </pre>
      *
      * Protobuf type {@code AvatarFightPropNotify}
@@ -462,7 +460,7 @@ public final class AvatarFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 7:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 7:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -506,9 +504,9 @@ public final class AvatarFightPropNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableFightPropMap().clear();
         avatarGuid_ = 0L;
 
-        internalGetMutableFightPropMap().clear();
         return this;
       }
 
@@ -536,9 +534,9 @@ public final class AvatarFightPropNotifyOuterClass {
       public emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify result = new emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify(this);
         int from_bitField0_ = bitField0_;
-        result.avatarGuid_ = avatarGuid_;
         result.fightPropMap_ = internalGetFightPropMap();
         result.fightPropMap_.makeImmutable();
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -587,11 +585,11 @@ public final class AvatarFightPropNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarFightPropNotifyOuterClass.AvatarFightPropNotify.getDefaultInstance()) return this;
+        internalGetMutableFightPropMap().mergeFrom(
+            other.internalGetFightPropMap());
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        internalGetMutableFightPropMap().mergeFrom(
-            other.internalGetFightPropMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,37 +620,6 @@ public final class AvatarFightPropNotifyOuterClass {
       }
       private int bitField0_;
 
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 7;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Float> fightPropMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
@@ -680,7 +647,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       @java.lang.Override
@@ -698,7 +665,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -706,7 +673,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -719,7 +686,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -740,7 +707,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder removeFightPropMap(
@@ -759,7 +726,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -771,7 +738,7 @@ public final class AvatarFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -780,6 +747,37 @@ public final class AvatarFightPropNotifyOuterClass {
             .putAll(values);
         return this;
       }
+
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 11;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 11;</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 = 11;</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) {
@@ -853,9 +851,9 @@ public final class AvatarFightPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarFightPropNotify.proto\"\243\001\n\025Avatar" +
-      "FightPropNotify\022\023\n\013avatar_guid\030\007 \001(\004\022@\n\016" +
-      "fight_prop_map\030\003 \003(\0132(.AvatarFightPropNo" +
-      "tify.FightPropMapEntry\0323\n\021FightPropMapEn" +
+      "FightPropNotify\022@\n\016fight_prop_map\030\007 \003(\0132" +
+      "(.AvatarFightPropNotify.FightPropMapEntr" +
+      "y\022\023\n\013avatar_guid\030\013 \001(\004\0323\n\021FightPropMapEn" +
       "try\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
@@ -868,7 +866,7 @@ public final class AvatarFightPropNotifyOuterClass {
     internal_static_AvatarFightPropNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarFightPropNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "FightPropMap", });
+        new java.lang.String[] { "FightPropMap", "AvatarGuid", });
     internal_static_AvatarFightPropNotify_FightPropMapEntry_descriptor =
       internal_static_AvatarFightPropNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarFightPropNotify_FightPropMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java
index e60cb0bb1..e39eeddd0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFightPropUpdateNotifyOuterClass.java
@@ -19,17 +19,17 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 3;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -40,19 +40,19 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     float getFightPropMapOrThrow(
@@ -60,8 +60,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 21000
-   * Obf: CHDLCNDEHEB
+   * CmdId: 20328
    * </pre>
    *
    * Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -109,12 +108,12 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 34: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -156,7 +155,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
+        case 7:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -171,10 +170,10 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.class, emu.grasscutter.net.proto.AvatarFightPropUpdateNotifyOuterClass.AvatarFightPropUpdateNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 2;</code>
+     * <code>uint64 avatar_guid = 3;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -182,7 +181,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 4;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 7;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -209,7 +208,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
 
     @java.lang.Override
@@ -227,7 +226,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -235,7 +234,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -248,7 +247,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
      */
     @java.lang.Override
 
@@ -278,14 +277,14 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(2, avatarGuid_);
+        output.writeUInt64(3, avatarGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          4);
+          7);
       unknownFields.writeTo(output);
     }
 
@@ -297,7 +296,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, avatarGuid_);
+          .computeUInt64Size(3, avatarGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
            : internalGetFightPropMap().getMap().entrySet()) {
@@ -307,7 +306,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, fightPropMap__);
+            .computeMessageSize(7, fightPropMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -443,8 +442,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 21000
-     * Obf: CHDLCNDEHEB
+     * CmdId: 20328
      * </pre>
      *
      * Protobuf type {@code AvatarFightPropUpdateNotify}
@@ -462,7 +460,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 7:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 7:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -624,7 +622,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -632,7 +630,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -643,7 +641,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 2;</code>
+       * <code>uint64 avatar_guid = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -680,7 +678,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       @java.lang.Override
@@ -698,7 +696,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -706,7 +704,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -719,7 +717,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       @java.lang.Override
 
@@ -740,7 +738,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder removeFightPropMap(
@@ -759,7 +757,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -771,7 +769,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 4;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -854,7 +852,7 @@ public final class AvatarFightPropUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!AvatarFightPropUpdateNotify.proto\"\257\001\n\033" +
       "AvatarFightPropUpdateNotify\022\023\n\013avatar_gu" +
-      "id\030\002 \001(\004\022F\n\016fight_prop_map\030\004 \003(\0132..Avata" +
+      "id\030\003 \001(\004\022F\n\016fight_prop_map\030\007 \003(\0132..Avata" +
       "rFightPropUpdateNotify.FightPropMapEntry" +
       "\0323\n\021FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005va" +
       "lue\030\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.pro" +
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 30a8da43e..f2c850fc4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarFlycloakChangeNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 2;</code>
+     * <code>uint32 flycloak_id = 4;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23578
-   * Obf: GHNNAHDIIKE
-   * </pre>
-   *
    * Protobuf type {@code AvatarFlycloakChangeNotify}
    */
   public static final class AvatarFlycloakChangeNotify extends
@@ -80,12 +75,12 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
               flycloakId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 80: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -122,10 +117,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.class, emu.grasscutter.net.proto.AvatarFlycloakChangeNotifyOuterClass.AvatarFlycloakChangeNotify.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 2;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 4;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 2;</code>
+     * <code>uint32 flycloak_id = 4;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       return flycloakId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 10;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (flycloakId_ != 0) {
-        output.writeUInt32(2, flycloakId_);
+        output.writeUInt32(4, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(10, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       size = 0;
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, flycloakId_);
+          .computeUInt32Size(4, flycloakId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(10, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23578
-     * Obf: GHNNAHDIIKE
-     * </pre>
-     *
      * Protobuf type {@code AvatarFlycloakChangeNotify}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
 
       private int flycloakId_ ;
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @return The flycloakId.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return flycloakId_;
       }
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @param value The flycloakId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 flycloak_id = 2;</code>
+       * <code>uint32 flycloak_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearFlycloakId() {
@@ -502,7 +492,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +500,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +511,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -599,7 +589,7 @@ public final class AvatarFlycloakChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n AvatarFlycloakChangeNotify.proto\"F\n\032Av" +
       "atarFlycloakChangeNotify\022\023\n\013flycloak_id\030" +
-      "\002 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu.grassc" +
+      "\004 \001(\r\022\023\n\013avatar_guid\030\n \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/AvatarGainCostumeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainCostumeNotifyOuterClass.java
index 02ec74620..7ad6e1cf2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainCostumeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainCostumeNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class AvatarGainCostumeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costume_id = 6;</code>
+     * <code>uint32 costume_id = 2;</code>
      * @return The costumeId.
      */
     int getCostumeId();
   }
   /**
-   * <pre>
-   * CmdId: 24251
-   * Obf: CMOIAGEGIOJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarGainCostumeNotify}
    */
   public static final class AvatarGainCostumeNotify extends
@@ -74,7 +69,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 16: {
 
               costumeId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AvatarGainCostumeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify.class, emu.grasscutter.net.proto.AvatarGainCostumeNotifyOuterClass.AvatarGainCostumeNotify.Builder.class);
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 6;
+    public static final int COSTUME_ID_FIELD_NUMBER = 2;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 6;</code>
+     * <code>uint32 costume_id = 2;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (costumeId_ != 0) {
-        output.writeUInt32(6, costumeId_);
+        output.writeUInt32(2, costumeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
       size = 0;
       if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, costumeId_);
+          .computeUInt32Size(2, costumeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AvatarGainCostumeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24251
-     * Obf: CMOIAGEGIOJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarGainCostumeNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 6;</code>
+       * <code>uint32 costume_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -527,7 +517,7 @@ public final class AvatarGainCostumeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarGainCostumeNotify.proto\"-\n\027Avata" +
-      "rGainCostumeNotify\022\022\n\ncostume_id\030\006 \001(\rB\033" +
+      "rGainCostumeNotify\022\022\n\ncostume_id\030\002 \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/AvatarGainFlycloakNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java
index db722e756..3646a2822 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarGainFlycloakNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 13;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
   }
   /**
-   * <pre>
-   * CmdId: 29528
-   * Obf: LOFNLHIBOBB
-   * </pre>
-   *
    * Protobuf type {@code AvatarGainFlycloakNotify}
    */
   public static final class AvatarGainFlycloakNotify extends
@@ -74,7 +69,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 104: {
 
               flycloakId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class AvatarGainFlycloakNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.class, emu.grasscutter.net.proto.AvatarGainFlycloakNotifyOuterClass.AvatarGainFlycloakNotify.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 6;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 13;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 13;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (flycloakId_ != 0) {
-        output.writeUInt32(6, flycloakId_);
+        output.writeUInt32(13, flycloakId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       size = 0;
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, flycloakId_);
+          .computeUInt32Size(13, flycloakId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class AvatarGainFlycloakNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29528
-     * Obf: LOFNLHIBOBB
-     * </pre>
-     *
      * Protobuf type {@code AvatarGainFlycloakNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
 
       private int flycloakId_ ;
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @return The flycloakId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
         return flycloakId_;
       }
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @param value The flycloakId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 flycloak_id = 6;</code>
+       * <code>uint32 flycloak_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearFlycloakId() {
@@ -527,7 +517,7 @@ public final class AvatarGainFlycloakNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarGainFlycloakNotify.proto\"/\n\030Avat" +
-      "arGainFlycloakNotify\022\023\n\013flycloak_id\030\006 \001(" +
+      "arGainFlycloakNotify\022\023\n\013flycloak_id\030\r \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/AvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarInfoOuterClass.java
index e50f921bb..ca58c7837 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarInfoOuterClass.java
@@ -420,31 +420,28 @@ public final class AvatarInfoOuterClass {
     int getAnimHash();
 
     /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return Whether the pDGKJIIEPIO field is set.
+     * <pre>
+     *JNHGJAIIMGJ PINDEGAFOAE = 28;
+     * </pre>
+     *
+     * <code>uint32 ABLFJPMKKDA = 29;</code>
+     * @return The aBLFJPMKKDA.
      */
-    boolean hasPDGKJIIEPIO();
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return The pDGKJIIEPIO.
-     */
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO();
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     */
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder();
+    int getABLFJPMKKDA();
 
     /**
-     * <code>uint32 GJFKDCJENJE = 29;</code>
-     * @return The gJFKDCJENJE.
+     * <code>uint32 GCHGLANNHMC = 30;</code>
+     * @return The gCHGLANNHMC.
      */
-    int getGJFKDCJENJE();
+    int getGCHGLANNHMC();
+
+    /**
+     * <code>uint32 KCINBOMOIGL = 31;</code>
+     * @return The kCINBOMOIGL.
+     */
+    int getKCINBOMOIGL();
   }
   /**
-   * <pre>
-   * Obf: FHPLJBCPFFF
-   * </pre>
-   *
    * Protobuf type {@code AvatarInfo}
    */
   public static final class AvatarInfo extends
@@ -776,22 +773,19 @@ public final class AvatarInfoOuterClass {
               animHash_ = input.readUInt32();
               break;
             }
-            case 226: {
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder subBuilder = null;
-              if (pDGKJIIEPIO_ != null) {
-                subBuilder = pDGKJIIEPIO_.toBuilder();
-              }
-              pDGKJIIEPIO_ = input.readMessage(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pDGKJIIEPIO_);
-                pDGKJIIEPIO_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
             case 232: {
 
-              gJFKDCJENJE_ = input.readUInt32();
+              aBLFJPMKKDA_ = input.readUInt32();
+              break;
+            }
+            case 240: {
+
+              gCHGLANNHMC_ = input.readUInt32();
+              break;
+            }
+            case 248: {
+
+              kCINBOMOIGL_ = input.readUInt32();
               break;
             }
             default: {
@@ -1667,41 +1661,41 @@ public final class AvatarInfoOuterClass {
       return animHash_;
     }
 
-    public static final int PDGKJIIEPIO_FIELD_NUMBER = 28;
-    private emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI pDGKJIIEPIO_;
+    public static final int ABLFJPMKKDA_FIELD_NUMBER = 29;
+    private int aBLFJPMKKDA_;
     /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return Whether the pDGKJIIEPIO field is set.
+     * <pre>
+     *JNHGJAIIMGJ PINDEGAFOAE = 28;
+     * </pre>
+     *
+     * <code>uint32 ABLFJPMKKDA = 29;</code>
+     * @return The aBLFJPMKKDA.
      */
     @java.lang.Override
-    public boolean hasPDGKJIIEPIO() {
-      return pDGKJIIEPIO_ != null;
-    }
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     * @return The pDGKJIIEPIO.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO() {
-      return pDGKJIIEPIO_ == null ? emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-    }
-    /**
-     * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder() {
-      return getPDGKJIIEPIO();
+    public int getABLFJPMKKDA() {
+      return aBLFJPMKKDA_;
     }
 
-    public static final int GJFKDCJENJE_FIELD_NUMBER = 29;
-    private int gJFKDCJENJE_;
+    public static final int GCHGLANNHMC_FIELD_NUMBER = 30;
+    private int gCHGLANNHMC_;
     /**
-     * <code>uint32 GJFKDCJENJE = 29;</code>
-     * @return The gJFKDCJENJE.
+     * <code>uint32 GCHGLANNHMC = 30;</code>
+     * @return The gCHGLANNHMC.
      */
     @java.lang.Override
-    public int getGJFKDCJENJE() {
-      return gJFKDCJENJE_;
+    public int getGCHGLANNHMC() {
+      return gCHGLANNHMC_;
+    }
+
+    public static final int KCINBOMOIGL_FIELD_NUMBER = 31;
+    private int kCINBOMOIGL_;
+    /**
+     * <code>uint32 KCINBOMOIGL = 31;</code>
+     * @return The kCINBOMOIGL.
+     */
+    @java.lang.Override
+    public int getKCINBOMOIGL() {
+      return kCINBOMOIGL_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1832,11 +1826,14 @@ public final class AvatarInfoOuterClass {
       if (animHash_ != 0) {
         output.writeUInt32(27, animHash_);
       }
-      if (pDGKJIIEPIO_ != null) {
-        output.writeMessage(28, getPDGKJIIEPIO());
+      if (aBLFJPMKKDA_ != 0) {
+        output.writeUInt32(29, aBLFJPMKKDA_);
       }
-      if (gJFKDCJENJE_ != 0) {
-        output.writeUInt32(29, gJFKDCJENJE_);
+      if (gCHGLANNHMC_ != 0) {
+        output.writeUInt32(30, gCHGLANNHMC_);
+      }
+      if (kCINBOMOIGL_ != 0) {
+        output.writeUInt32(31, kCINBOMOIGL_);
       }
       unknownFields.writeTo(output);
     }
@@ -2031,13 +2028,17 @@ public final class AvatarInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(27, animHash_);
       }
-      if (pDGKJIIEPIO_ != null) {
+      if (aBLFJPMKKDA_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(28, getPDGKJIIEPIO());
+          .computeUInt32Size(29, aBLFJPMKKDA_);
       }
-      if (gJFKDCJENJE_ != 0) {
+      if (gCHGLANNHMC_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(29, gJFKDCJENJE_);
+          .computeUInt32Size(30, gCHGLANNHMC_);
+      }
+      if (kCINBOMOIGL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(31, kCINBOMOIGL_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2114,13 +2115,12 @@ public final class AvatarInfoOuterClass {
       }
       if (getAnimHash()
           != other.getAnimHash()) return false;
-      if (hasPDGKJIIEPIO() != other.hasPDGKJIIEPIO()) return false;
-      if (hasPDGKJIIEPIO()) {
-        if (!getPDGKJIIEPIO()
-            .equals(other.getPDGKJIIEPIO())) return false;
-      }
-      if (getGJFKDCJENJE()
-          != other.getGJFKDCJENJE()) return false;
+      if (getABLFJPMKKDA()
+          != other.getABLFJPMKKDA()) return false;
+      if (getGCHGLANNHMC()
+          != other.getGCHGLANNHMC()) return false;
+      if (getKCINBOMOIGL()
+          != other.getKCINBOMOIGL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2214,12 +2214,12 @@ public final class AvatarInfoOuterClass {
       }
       hash = (37 * hash) + ANIM_HASH_FIELD_NUMBER;
       hash = (53 * hash) + getAnimHash();
-      if (hasPDGKJIIEPIO()) {
-        hash = (37 * hash) + PDGKJIIEPIO_FIELD_NUMBER;
-        hash = (53 * hash) + getPDGKJIIEPIO().hashCode();
-      }
-      hash = (37 * hash) + GJFKDCJENJE_FIELD_NUMBER;
-      hash = (53 * hash) + getGJFKDCJENJE();
+      hash = (37 * hash) + ABLFJPMKKDA_FIELD_NUMBER;
+      hash = (53 * hash) + getABLFJPMKKDA();
+      hash = (37 * hash) + GCHGLANNHMC_FIELD_NUMBER;
+      hash = (53 * hash) + getGCHGLANNHMC();
+      hash = (37 * hash) + KCINBOMOIGL_FIELD_NUMBER;
+      hash = (53 * hash) + getKCINBOMOIGL();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2316,10 +2316,6 @@ public final class AvatarInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FHPLJBCPFFF
-     * </pre>
-     *
      * Protobuf type {@code AvatarInfo}
      */
     public static final class Builder extends
@@ -2459,13 +2455,11 @@ public final class AvatarInfoOuterClass {
         }
         animHash_ = 0;
 
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIO_ = null;
-        } else {
-          pDGKJIIEPIO_ = null;
-          pDGKJIIEPIOBuilder_ = null;
-        }
-        gJFKDCJENJE_ = 0;
+        aBLFJPMKKDA_ = 0;
+
+        gCHGLANNHMC_ = 0;
+
+        kCINBOMOIGL_ = 0;
 
         return this;
       }
@@ -2565,12 +2559,9 @@ public final class AvatarInfoOuterClass {
           result.excelInfo_ = excelInfoBuilder_.build();
         }
         result.animHash_ = animHash_;
-        if (pDGKJIIEPIOBuilder_ == null) {
-          result.pDGKJIIEPIO_ = pDGKJIIEPIO_;
-        } else {
-          result.pDGKJIIEPIO_ = pDGKJIIEPIOBuilder_.build();
-        }
-        result.gJFKDCJENJE_ = gJFKDCJENJE_;
+        result.aBLFJPMKKDA_ = aBLFJPMKKDA_;
+        result.gCHGLANNHMC_ = gCHGLANNHMC_;
+        result.kCINBOMOIGL_ = kCINBOMOIGL_;
         onBuilt();
         return result;
       }
@@ -2750,11 +2741,14 @@ public final class AvatarInfoOuterClass {
         if (other.getAnimHash() != 0) {
           setAnimHash(other.getAnimHash());
         }
-        if (other.hasPDGKJIIEPIO()) {
-          mergePDGKJIIEPIO(other.getPDGKJIIEPIO());
+        if (other.getABLFJPMKKDA() != 0) {
+          setABLFJPMKKDA(other.getABLFJPMKKDA());
         }
-        if (other.getGJFKDCJENJE() != 0) {
-          setGJFKDCJENJE(other.getGJFKDCJENJE());
+        if (other.getGCHGLANNHMC() != 0) {
+          setGCHGLANNHMC(other.getGCHGLANNHMC());
+        }
+        if (other.getKCINBOMOIGL() != 0) {
+          setKCINBOMOIGL(other.getKCINBOMOIGL());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -4813,152 +4807,107 @@ public final class AvatarInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI pDGKJIIEPIO_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder> pDGKJIIEPIOBuilder_;
+      private int aBLFJPMKKDA_ ;
       /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       * @return Whether the pDGKJIIEPIO field is set.
-       */
-      public boolean hasPDGKJIIEPIO() {
-        return pDGKJIIEPIOBuilder_ != null || pDGKJIIEPIO_ != null;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       * @return The pDGKJIIEPIO.
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI getPDGKJIIEPIO() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          return pDGKJIIEPIO_ == null ? emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-        } else {
-          return pDGKJIIEPIOBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder setPDGKJIIEPIO(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI value) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pDGKJIIEPIO_ = value;
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder setPDGKJIIEPIO(
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder builderForValue) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIO_ = builderForValue.build();
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder mergePDGKJIIEPIO(emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI value) {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          if (pDGKJIIEPIO_ != null) {
-            pDGKJIIEPIO_ =
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.newBuilder(pDGKJIIEPIO_).mergeFrom(value).buildPartial();
-          } else {
-            pDGKJIIEPIO_ = value;
-          }
-          onChanged();
-        } else {
-          pDGKJIIEPIOBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public Builder clearPDGKJIIEPIO() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIO_ = null;
-          onChanged();
-        } else {
-          pDGKJIIEPIO_ = null;
-          pDGKJIIEPIOBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder getPDGKJIIEPIOBuilder() {
-        
-        onChanged();
-        return getPDGKJIIEPIOFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      public emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder getPDGKJIIEPIOOrBuilder() {
-        if (pDGKJIIEPIOBuilder_ != null) {
-          return pDGKJIIEPIOBuilder_.getMessageOrBuilder();
-        } else {
-          return pDGKJIIEPIO_ == null ?
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.getDefaultInstance() : pDGKJIIEPIO_;
-        }
-      }
-      /**
-       * <code>.JCDPOCOOGCI PDGKJIIEPIO = 28;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder> 
-          getPDGKJIIEPIOFieldBuilder() {
-        if (pDGKJIIEPIOBuilder_ == null) {
-          pDGKJIIEPIOBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCI.Builder, emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.JCDPOCOOGCIOrBuilder>(
-                  getPDGKJIIEPIO(),
-                  getParentForChildren(),
-                  isClean());
-          pDGKJIIEPIO_ = null;
-        }
-        return pDGKJIIEPIOBuilder_;
-      }
-
-      private int gJFKDCJENJE_ ;
-      /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
-       * @return The gJFKDCJENJE.
+       * <pre>
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
+       * </pre>
+       *
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
+       * @return The aBLFJPMKKDA.
        */
       @java.lang.Override
-      public int getGJFKDCJENJE() {
-        return gJFKDCJENJE_;
+      public int getABLFJPMKKDA() {
+        return aBLFJPMKKDA_;
       }
       /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
-       * @param value The gJFKDCJENJE to set.
+       * <pre>
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
+       * </pre>
+       *
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
+       * @param value The aBLFJPMKKDA to set.
        * @return This builder for chaining.
        */
-      public Builder setGJFKDCJENJE(int value) {
+      public Builder setABLFJPMKKDA(int value) {
         
-        gJFKDCJENJE_ = value;
+        aBLFJPMKKDA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 GJFKDCJENJE = 29;</code>
+       * <pre>
+       *JNHGJAIIMGJ PINDEGAFOAE = 28;
+       * </pre>
+       *
+       * <code>uint32 ABLFJPMKKDA = 29;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGJFKDCJENJE() {
+      public Builder clearABLFJPMKKDA() {
         
-        gJFKDCJENJE_ = 0;
+        aBLFJPMKKDA_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gCHGLANNHMC_ ;
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @return The gCHGLANNHMC.
+       */
+      @java.lang.Override
+      public int getGCHGLANNHMC() {
+        return gCHGLANNHMC_;
+      }
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @param value The gCHGLANNHMC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGCHGLANNHMC(int value) {
+        
+        gCHGLANNHMC_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GCHGLANNHMC = 30;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGCHGLANNHMC() {
+        
+        gCHGLANNHMC_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kCINBOMOIGL_ ;
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @return The kCINBOMOIGL.
+       */
+      @java.lang.Override
+      public int getKCINBOMOIGL() {
+        return kCINBOMOIGL_;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @param value The kCINBOMOIGL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKCINBOMOIGL(int value) {
+        
+        kCINBOMOIGL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 31;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKCINBOMOIGL() {
+        
+        kCINBOMOIGL_ = 0;
         onChanged();
         return this;
       }
@@ -5054,63 +5003,62 @@ public final class AvatarInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020AvatarInfo.proto\032\017PropValue.proto\032\025Tri" +
-      "alAvatarInfo.proto\032\025AvatarSkillInfo.prot" +
+      "\n\020AvatarInfo.proto\032\017PropValue.proto\032\025Ava" +
+      "tarSkillInfo.proto\032\025TrialAvatarInfo.prot" +
       "o\032\026AvatarFetterInfo.proto\032\033AvatarExpedit" +
       "ionState.proto\032\032AvatarEquipAffixInfo.pro" +
-      "to\032\025AvatarExcelInfo.proto\032\021JCDPOCOOGCI.p" +
-      "roto\"\346\t\n\nAvatarInfo\022\021\n\tavatar_id\030\001 \001(\r\022\014" +
-      "\n\004guid\030\002 \001(\004\022*\n\010prop_map\030\003 \003(\0132\030.AvatarI" +
-      "nfo.PropMapEntry\022\022\n\nlife_state\030\004 \001(\r\022\027\n\017" +
-      "equip_guid_list\030\005 \003(\004\022\026\n\016talent_id_list\030" +
-      "\006 \003(\r\0225\n\016fight_prop_map\030\007 \003(\0132\035.AvatarIn" +
-      "fo.FightPropMapEntry\022+\n\021trial_avatar_inf" +
-      "o\030\t \001(\0132\020.TrialAvatarInfo\022,\n\tskill_map\030\n" +
-      " \003(\0132\031.AvatarInfo.SkillMapEntry\022\026\n\016skill" +
-      "_depot_id\030\013 \001(\r\022&\n\013fetter_info\030\014 \001(\0132\021.A" +
-      "vatarFetterInfo\022\036\n\026core_proud_skill_leve" +
-      "l\030\r \001(\r\022!\n\031inherent_proud_skill_list\030\016 \003" +
-      "(\r\0227\n\017skill_level_map\030\017 \003(\0132\036.AvatarInfo" +
-      ".SkillLevelMapEntry\0220\n\020expedition_state\030" +
-      "\020 \001(\0162\026.AvatarExpeditionState\022M\n\033proud_s" +
-      "kill_extra_level_map\030\021 \003(\0132(.AvatarInfo." +
-      "ProudSkillExtraLevelMapEntry\022\020\n\010is_focus" +
-      "\030\022 \001(\010\022\023\n\013avatar_type\030\023 \001(\r\022\033\n\023team_reso" +
-      "nance_list\030\024 \003(\r\022\033\n\023wearing_flycloak_id\030" +
-      "\025 \001(\r\022/\n\020equip_affix_list\030\026 \003(\0132\025.Avatar" +
-      "EquipAffixInfo\022\021\n\tborn_time\030\027 \001(\r\022#\n\033pen" +
-      "ding_promote_reward_list\030\030 \003(\r\022\022\n\ncostum" +
-      "e_id\030\031 \001(\r\022$\n\nexcel_info\030\032 \001(\0132\020.AvatarE" +
-      "xcelInfo\022\021\n\tanim_hash\030\033 \001(\r\022!\n\013PDGKJIIEP" +
-      "IO\030\034 \001(\0132\014.JCDPOCOOGCI\022\023\n\013GJFKDCJENJE\030\035 " +
-      "\001(\r\032:\n\014PropMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005valu" +
-      "e\030\002 \001(\0132\n.PropValue:\0028\001\0323\n\021FightPropMapE" +
-      "ntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\032A\n\r" +
-      "SkillMapEntry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(" +
-      "\0132\020.AvatarSkillInfo:\0028\001\0324\n\022SkillLevelMap" +
-      "Entry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032>\n" +
-      "\034ProudSkillExtraLevelMapEntry\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"
+      "to\032\025AvatarExcelInfo.proto\"\355\t\n\nAvatarInfo" +
+      "\022\021\n\tavatar_id\030\001 \001(\r\022\014\n\004guid\030\002 \001(\004\022*\n\010pro" +
+      "p_map\030\003 \003(\0132\030.AvatarInfo.PropMapEntry\022\022\n" +
+      "\nlife_state\030\004 \001(\r\022\027\n\017equip_guid_list\030\005 \003" +
+      "(\004\022\026\n\016talent_id_list\030\006 \003(\r\0225\n\016fight_prop" +
+      "_map\030\007 \003(\0132\035.AvatarInfo.FightPropMapEntr" +
+      "y\022+\n\021trial_avatar_info\030\t \001(\0132\020.TrialAvat" +
+      "arInfo\022,\n\tskill_map\030\n \003(\0132\031.AvatarInfo.S" +
+      "killMapEntry\022\026\n\016skill_depot_id\030\013 \001(\r\022&\n\013" +
+      "fetter_info\030\014 \001(\0132\021.AvatarFetterInfo\022\036\n\026" +
+      "core_proud_skill_level\030\r \001(\r\022!\n\031inherent" +
+      "_proud_skill_list\030\016 \003(\r\0227\n\017skill_level_m" +
+      "ap\030\017 \003(\0132\036.AvatarInfo.SkillLevelMapEntry" +
+      "\0220\n\020expedition_state\030\020 \001(\0162\026.AvatarExped" +
+      "itionState\022M\n\033proud_skill_extra_level_ma" +
+      "p\030\021 \003(\0132(.AvatarInfo.ProudSkillExtraLeve" +
+      "lMapEntry\022\020\n\010is_focus\030\022 \001(\010\022\023\n\013avatar_ty" +
+      "pe\030\023 \001(\r\022\033\n\023team_resonance_list\030\024 \003(\r\022\033\n" +
+      "\023wearing_flycloak_id\030\025 \001(\r\022/\n\020equip_affi" +
+      "x_list\030\026 \003(\0132\025.AvatarEquipAffixInfo\022\021\n\tb" +
+      "orn_time\030\027 \001(\r\022#\n\033pending_promote_reward" +
+      "_list\030\030 \003(\r\022\022\n\ncostume_id\030\031 \001(\r\022$\n\nexcel" +
+      "_info\030\032 \001(\0132\020.AvatarExcelInfo\022\021\n\tanim_ha" +
+      "sh\030\033 \001(\r\022\023\n\013ABLFJPMKKDA\030\035 \001(\r\022\023\n\013GCHGLAN" +
+      "NHMC\030\036 \001(\r\022\023\n\013KCINBOMOIGL\030\037 \001(\r\032:\n\014PropM" +
+      "apEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.Pr" +
+      "opValue:\0028\001\0323\n\021FightPropMapEntry\022\013\n\003key\030" +
+      "\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\032A\n\rSkillMapEntr" +
+      "y\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.AvatarSk" +
+      "illInfo:\0028\001\0324\n\022SkillLevelMapEntry\022\013\n\003key" +
+      "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032>\n\034ProudSkillE" +
+      "xtraLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
+      "\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarExpeditionStateOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.getDescriptor(),
         });
     internal_static_AvatarInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_AvatarInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarInfo_descriptor,
-        new java.lang.String[] { "AvatarId", "Guid", "PropMap", "LifeState", "EquipGuidList", "TalentIdList", "FightPropMap", "TrialAvatarInfo", "SkillMap", "SkillDepotId", "FetterInfo", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ExpeditionState", "ProudSkillExtraLevelMap", "IsFocus", "AvatarType", "TeamResonanceList", "WearingFlycloakId", "EquipAffixList", "BornTime", "PendingPromoteRewardList", "CostumeId", "ExcelInfo", "AnimHash", "PDGKJIIEPIO", "GJFKDCJENJE", });
+        new java.lang.String[] { "AvatarId", "Guid", "PropMap", "LifeState", "EquipGuidList", "TalentIdList", "FightPropMap", "TrialAvatarInfo", "SkillMap", "SkillDepotId", "FetterInfo", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ExpeditionState", "ProudSkillExtraLevelMap", "IsFocus", "AvatarType", "TeamResonanceList", "WearingFlycloakId", "EquipAffixList", "BornTime", "PendingPromoteRewardList", "CostumeId", "ExcelInfo", "AnimHash", "ABLFJPMKKDA", "GCHGLANNHMC", "KCINBOMOIGL", });
     internal_static_AvatarInfo_PropMapEntry_descriptor =
       internal_static_AvatarInfo_descriptor.getNestedTypes().get(0);
     internal_static_AvatarInfo_PropMapEntry_fieldAccessorTable = new
@@ -5142,13 +5090,12 @@ public final class AvatarInfoOuterClass {
         internal_static_AvatarInfo_ProudSkillExtraLevelMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.TrialAvatarInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarExpeditionStateOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarEquipAffixInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.JCDPOCOOGCIOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 d4f301f6b..24227a7d7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarLifeStateChangeNotifyOuterClass.java
@@ -19,82 +19,102 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 move_reliable_seq = 5;</code>
-     * @return The moveReliableSeq.
-     */
-    int getMoveReliableSeq();
-
-    /**
-     * <code>string attack_tag = 10;</code>
-     * @return The attackTag.
-     */
-    java.lang.String getAttackTag();
-    /**
-     * <code>string attack_tag = 10;</code>
-     * @return The bytes for attackTag.
-     */
-    com.google.protobuf.ByteString
-        getAttackTagBytes();
-
-    /**
-     * <code>uint32 source_entity_id = 1;</code>
+     * <code>uint32 source_entity_id = 2;</code>
      * @return The sourceEntityId.
      */
     int getSourceEntityId();
 
     /**
-     * <code>uint64 avatar_guid = 15;</code>
-     * @return The avatarGuid.
+     * <code>repeated string EPGOBHIEDOI = 3;</code>
+     * @return A list containing the ePGOBHIEDOI.
      */
-    long getAvatarGuid();
+    java.util.List<java.lang.String>
+        getEPGOBHIEDOIList();
+    /**
+     * <code>repeated string EPGOBHIEDOI = 3;</code>
+     * @return The count of ePGOBHIEDOI.
+     */
+    int getEPGOBHIEDOICount();
+    /**
+     * <code>repeated string EPGOBHIEDOI = 3;</code>
+     * @param index The index of the element to return.
+     * @return The ePGOBHIEDOI at the given index.
+     */
+    java.lang.String getEPGOBHIEDOI(int 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.
+     */
+    com.google.protobuf.ByteString
+        getEPGOBHIEDOIBytes(int index);
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
-
-    /**
-     * <code>.PlayerDieType die_type = 7;</code>
+     * <code>.PlayerDieType die_type = 5;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     int getDieTypeValue();
     /**
-     * <code>.PlayerDieType die_type = 7;</code>
+     * <code>.PlayerDieType die_type = 5;</code>
      * @return The dieType.
      */
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
 
     /**
-     * <code>uint32 life_state = 12;</code>
+     * <code>uint64 avatar_guid = 9;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 move_reliable_seq = 10;</code>
+     * @return The moveReliableSeq.
+     */
+    int getMoveReliableSeq();
+
+    /**
+     * <code>uint32 life_state = 11;</code>
      * @return The lifeState.
      */
     int getLifeState();
+
+    /**
+     * <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>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index);
+
+    /**
+     * <code>string attack_tag = 15;</code>
+     * @return The attackTag.
+     */
+    java.lang.String getAttackTag();
+    /**
+     * <code>string attack_tag = 15;</code>
+     * @return The bytes for attackTag.
+     */
+    com.google.protobuf.ByteString
+        getAttackTagBytes();
   }
   /**
-   * <pre>
-   * CmdId: 22381
-   * Obf: ANPPCHBBAGA
-   * </pre>
-   *
    * Protobuf type {@code AvatarLifeStateChangeNotify}
    */
   public static final class AvatarLifeStateChangeNotify extends
@@ -107,9 +127,10 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       super(builder);
     }
     private AvatarLifeStateChangeNotify() {
-      attackTag_ = "";
-      serverBuffList_ = java.util.Collections.emptyList();
+      ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       dieType_ = 0;
+      serverBuffList_ = java.util.Collections.emptyList();
+      attackTag_ = "";
     }
 
     @java.lang.Override
@@ -143,45 +164,54 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
 
               sourceEntityId_ = input.readUInt32();
               break;
             }
-            case 40: {
-
-              moveReliableSeq_ = input.readUInt32();
-              break;
-            }
-            case 50: {
+            case 26: {
+              java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
+                ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              serverBuffList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
+              ePGOBHIEDOI_.add(s);
               break;
             }
-            case 56: {
+            case 40: {
               int rawValue = input.readEnum();
 
               dieType_ = rawValue;
               break;
             }
-            case 82: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 72: {
 
-              attackTag_ = s;
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 96: {
+            case 80: {
+
+              moveReliableSeq_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               lifeState_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 114: {
+              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));
+              break;
+            }
+            case 122: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              avatarGuid_ = input.readUInt64();
+              attackTag_ = s;
               break;
             }
             default: {
@@ -200,6 +230,9 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
             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();
@@ -219,10 +252,86 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.class, emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.Builder.class);
     }
 
-    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 5;
+    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 = 5;</code>
+     * <code>uint32 move_reliable_seq = 10;</code>
      * @return The moveReliableSeq.
      */
     @java.lang.Override
@@ -230,10 +339,61 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       return moveReliableSeq_;
     }
 
-    public static final int ATTACK_TAG_FIELD_NUMBER = 10;
+    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;
+    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 14;</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>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 14;</code>
+     */
+    @java.lang.Override
+    public int getServerBuffListCount() {
+      return serverBuffList_.size();
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 14;</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>
+     */
+    @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 = 15;
     private volatile java.lang.Object attackTag_;
     /**
-     * <code>string attack_tag = 10;</code>
+     * <code>string attack_tag = 15;</code>
      * @return The attackTag.
      */
     @java.lang.Override
@@ -250,7 +410,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       }
     }
     /**
-     * <code>string attack_tag = 10;</code>
+     * <code>string attack_tag = 15;</code>
      * @return The bytes for attackTag.
      */
     @java.lang.Override
@@ -268,98 +428,6 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       }
     }
 
-    public static final int SOURCE_ENTITY_ID_FIELD_NUMBER = 1;
-    private int sourceEntityId_;
-    /**
-     * <code>uint32 source_entity_id = 1;</code>
-     * @return The sourceEntityId.
-     */
-    @java.lang.Override
-    public int getSourceEntityId() {
-      return sourceEntityId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 15;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 6;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-      return serverBuffList_;
-    }
-    /**
-     * <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_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 6;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <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);
-    }
-    /**
-     * <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 DIE_TYPE_FIELD_NUMBER = 7;
-    private int dieType_;
-    /**
-     * <code>.PlayerDieType die_type = 7;</code>
-     * @return The enum numeric value on the wire for dieType.
-     */
-    @java.lang.Override public int getDieTypeValue() {
-      return dieType_;
-    }
-    /**
-     * <code>.PlayerDieType die_type = 7;</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 LIFE_STATE_FIELD_NUMBER = 12;
-    private int lifeState_;
-    /**
-     * <code>uint32 life_state = 12;</code>
-     * @return The lifeState.
-     */
-    @java.lang.Override
-    public int getLifeState() {
-      return lifeState_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -375,25 +443,28 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sourceEntityId_ != 0) {
-        output.writeUInt32(1, sourceEntityId_);
+        output.writeUInt32(2, sourceEntityId_);
       }
-      if (moveReliableSeq_ != 0) {
-        output.writeUInt32(5, moveReliableSeq_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(6, serverBuffList_.get(i));
+      for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, ePGOBHIEDOI_.getRaw(i));
       }
       if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(7, dieType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, attackTag_);
-      }
-      if (lifeState_ != 0) {
-        output.writeUInt32(12, lifeState_);
+        output.writeEnum(5, dieType_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(15, avatarGuid_);
+        output.writeUInt64(9, avatarGuid_);
+      }
+      if (moveReliableSeq_ != 0) {
+        output.writeUInt32(10, moveReliableSeq_);
+      }
+      if (lifeState_ != 0) {
+        output.writeUInt32(11, lifeState_);
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(14, serverBuffList_.get(i));
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, attackTag_);
       }
       unknownFields.writeTo(output);
     }
@@ -406,30 +477,38 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       size = 0;
       if (sourceEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, sourceEntityId_);
+          .computeUInt32Size(2, sourceEntityId_);
       }
-      if (moveReliableSeq_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, moveReliableSeq_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, 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()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, dieType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, attackTag_);
-      }
-      if (lifeState_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, lifeState_);
+          .computeEnumSize(5, dieType_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, avatarGuid_);
+          .computeUInt64Size(9, avatarGuid_);
+      }
+      if (moveReliableSeq_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, moveReliableSeq_);
+      }
+      if (lifeState_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, lifeState_);
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, serverBuffList_.get(i));
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, attackTag_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -446,19 +525,21 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other = (emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify) obj;
 
-      if (getMoveReliableSeq()
-          != other.getMoveReliableSeq()) return false;
-      if (!getAttackTag()
-          .equals(other.getAttackTag())) return false;
       if (getSourceEntityId()
           != other.getSourceEntityId()) return false;
+      if (!getEPGOBHIEDOIList()
+          .equals(other.getEPGOBHIEDOIList())) return false;
+      if (dieType_ != other.dieType_) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (!getServerBuffListList()
-          .equals(other.getServerBuffListList())) return false;
-      if (dieType_ != other.dieType_) return false;
+      if (getMoveReliableSeq()
+          != other.getMoveReliableSeq()) return false;
       if (getLifeState()
           != other.getLifeState()) return false;
+      if (!getServerBuffListList()
+          .equals(other.getServerBuffListList())) return false;
+      if (!getAttackTag()
+          .equals(other.getAttackTag())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -470,23 +551,27 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getMoveReliableSeq();
-      hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
-      hash = (53 * hash) + getAttackTag().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();
+      }
+      hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + dieType_;
       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) + DIE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + dieType_;
-      hash = (37 * hash) + LIFE_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + getLifeState();
+      hash = (37 * hash) + ATTACK_TAG_FIELD_NUMBER;
+      hash = (53 * hash) + getAttackTag().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -583,11 +668,6 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22381
-     * Obf: ANPPCHBBAGA
-     * </pre>
-     *
      * Protobuf type {@code AvatarLifeStateChangeNotify}
      */
     public static final class Builder extends
@@ -626,23 +706,25 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        moveReliableSeq_ = 0;
-
-        attackTag_ = "";
-
         sourceEntityId_ = 0;
 
+        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        dieType_ = 0;
+
         avatarGuid_ = 0L;
 
+        moveReliableSeq_ = 0;
+
+        lifeState_ = 0;
+
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           serverBuffListBuilder_.clear();
         }
-        dieType_ = 0;
-
-        lifeState_ = 0;
+        attackTag_ = "";
 
         return this;
       }
@@ -671,21 +753,26 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       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.moveReliableSeq_ = moveReliableSeq_;
-        result.attackTag_ = attackTag_;
         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_ & 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();
         }
-        result.dieType_ = dieType_;
-        result.lifeState_ = lifeState_;
+        result.attackTag_ = attackTag_;
         onBuilt();
         return result;
       }
@@ -734,24 +821,36 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarLifeStateChangeNotifyOuterClass.AvatarLifeStateChangeNotify.getDefaultInstance()) return this;
-        if (other.getMoveReliableSeq() != 0) {
-          setMoveReliableSeq(other.getMoveReliableSeq());
-        }
-        if (!other.getAttackTag().isEmpty()) {
-          attackTag_ = other.attackTag_;
-          onChanged();
-        }
         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_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureServerBuffListIsMutable();
               serverBuffList_.addAll(other.serverBuffList_);
@@ -764,7 +863,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -773,11 +872,9 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
             }
           }
         }
-        if (other.dieType_ != 0) {
-          setDieTypeValue(other.getDieTypeValue());
-        }
-        if (other.getLifeState() != 0) {
-          setLifeState(other.getLifeState());
+        if (!other.getAttackTag().isEmpty()) {
+          attackTag_ = other.attackTag_;
+          onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -809,116 +906,9 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int moveReliableSeq_ ;
-      /**
-       * <code>uint32 move_reliable_seq = 5;</code>
-       * @return The moveReliableSeq.
-       */
-      @java.lang.Override
-      public int getMoveReliableSeq() {
-        return moveReliableSeq_;
-      }
-      /**
-       * <code>uint32 move_reliable_seq = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMoveReliableSeq() {
-        
-        moveReliableSeq_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object attackTag_ = "";
-      /**
-       * <code>string attack_tag = 10;</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;
-        }
-      }
-      /**
-       * <code>string attack_tag = 10;</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;
-        }
-      }
-      /**
-       * <code>string attack_tag = 10;</code>
-       * @param value The attackTag to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAttackTag(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        attackTag_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string attack_tag = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAttackTag() {
-        
-        attackTag_ = getDefaultInstance().getAttackTag();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string attack_tag = 10;</code>
-       * @param value The bytes for attackTag to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAttackTagBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        attackTag_ = value;
-        onChanged();
-        return this;
-      }
-
       private int sourceEntityId_ ;
       /**
-       * <code>uint32 source_entity_id = 1;</code>
+       * <code>uint32 source_entity_id = 2;</code>
        * @return The sourceEntityId.
        */
       @java.lang.Override
@@ -926,7 +916,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return sourceEntityId_;
       }
       /**
-       * <code>uint32 source_entity_id = 1;</code>
+       * <code>uint32 source_entity_id = 2;</code>
        * @param value The sourceEntityId to set.
        * @return This builder for chaining.
        */
@@ -937,7 +927,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 source_entity_id = 1;</code>
+       * <code>uint32 source_entity_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearSourceEntityId() {
@@ -947,9 +937,173 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         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();
+        }
+        
+        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 = 15;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -957,7 +1111,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 15;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -968,7 +1122,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 15;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -978,12 +1132,74 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         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;
+        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();
+        return this;
+      }
+
       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;
          }
       }
 
@@ -991,7 +1207,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
           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 = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
         if (serverBuffListBuilder_ == null) {
@@ -1001,7 +1217,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public int getServerBuffListCount() {
         if (serverBuffListBuilder_ == null) {
@@ -1011,7 +1227,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1021,7 +1237,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1038,7 +1254,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1052,7 +1268,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
         if (serverBuffListBuilder_ == null) {
@@ -1068,7 +1284,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1085,7 +1301,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder addServerBuffList(
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1099,7 +1315,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1113,7 +1329,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder addAllServerBuffList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
@@ -1128,12 +1344,12 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder clearServerBuffList() {
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           serverBuffListBuilder_.clear();
@@ -1141,7 +1357,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public Builder removeServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1154,14 +1370,14 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
           int index) {
         return getServerBuffListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
           int index) {
@@ -1171,7 +1387,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
            getServerBuffListOrBuilderList() {
@@ -1182,14 +1398,14 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</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 = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
           int index) {
@@ -1197,7 +1413,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 6;</code>
+       * <code>repeated .ServerBuff server_buff_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
            getServerBuffListBuilderList() {
@@ -1210,7 +1426,7 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
           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;
@@ -1218,87 +1434,78 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
         return serverBuffListBuilder_;
       }
 
-      private int dieType_ = 0;
+      private java.lang.Object attackTag_ = "";
       /**
-       * <code>.PlayerDieType die_type = 7;</code>
-       * @return The enum numeric value on the wire for dieType.
+       * <code>string attack_tag = 15;</code>
+       * @return The attackTag.
        */
-      @java.lang.Override public int getDieTypeValue() {
-        return dieType_;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 7;</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 = 7;</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 = 7;</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();
+      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;
         }
-        
-        dieType_ = value.getNumber();
+      }
+      /**
+       * <code>string attack_tag = 15;</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;
+        }
+      }
+      /**
+       * <code>string attack_tag = 15;</code>
+       * @param value The attackTag to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAttackTag(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        attackTag_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 7;</code>
+       * <code>string attack_tag = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDieType() {
+      public Builder clearAttackTag() {
         
-        dieType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int lifeState_ ;
-      /**
-       * <code>uint32 life_state = 12;</code>
-       * @return The lifeState.
-       */
-      @java.lang.Override
-      public int getLifeState() {
-        return lifeState_;
-      }
-      /**
-       * <code>uint32 life_state = 12;</code>
-       * @param value The lifeState to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLifeState(int value) {
-        
-        lifeState_ = value;
+        attackTag_ = getDefaultInstance().getAttackTag();
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 life_state = 12;</code>
+       * <code>string attack_tag = 15;</code>
+       * @param value The bytes for attackTag to set.
        * @return This builder for chaining.
        */
-      public Builder clearLifeState() {
+      public Builder setAttackTagBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        lifeState_ = 0;
+        attackTag_ = value;
         onChanged();
         return this;
       }
@@ -1369,30 +1576,30 @@ public final class AvatarLifeStateChangeNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n!AvatarLifeStateChangeNotify.proto\032\020Ser" +
-      "verBuff.proto\032\023PlayerDieType.proto\"\330\001\n\033A" +
-      "vatarLifeStateChangeNotify\022\031\n\021move_relia" +
-      "ble_seq\030\005 \001(\r\022\022\n\nattack_tag\030\n \001(\t\022\030\n\020sou" +
-      "rce_entity_id\030\001 \001(\r\022\023\n\013avatar_guid\030\017 \001(\004" +
-      "\022%\n\020server_buff_list\030\006 \003(\0132\013.ServerBuff\022" +
-      " \n\010die_type\030\007 \001(\0162\016.PlayerDieType\022\022\n\nlif" +
-      "e_state\030\014 \001(\rB\033\n\031emu.grasscutter.net.pro" +
-      "tob\006proto3"
+      "\n!AvatarLifeStateChangeNotify.proto\032\023Pla" +
+      "yerDieType.proto\032\020ServerBuff.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" +
+      "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
         });
     internal_static_AvatarLifeStateChangeNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_AvatarLifeStateChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarLifeStateChangeNotify_descriptor,
-        new java.lang.String[] { "MoveReliableSeq", "AttackTag", "SourceEntityId", "AvatarGuid", "ServerBuffList", "DieType", "LifeState", });
-    emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
+        new java.lang.String[] { "SourceEntityId", "EPGOBHIEDOI", "DieType", "AvatarGuid", "MoveReliableSeq", "LifeState", "ServerBuffList", "AttackTag", });
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteGetRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteGetRewardRspOuterClass.java
index 309cb061c..6a7bef4b1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteGetRewardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteGetRewardRspOuterClass.java
@@ -19,17 +19,11 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 reward_id = 11;</code>
+     * <code>uint32 reward_id = 4;</code>
      * @return The rewardId.
      */
     int getRewardId();
 
-    /**
-     * <code>uint32 promote_level = 10;</code>
-     * @return The promoteLevel.
-     */
-    int getPromoteLevel();
-
     /**
      * <code>int32 retcode = 5;</code>
      * @return The retcode.
@@ -37,17 +31,18 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 promote_level = 14;</code>
+     * @return The promoteLevel.
+     */
+    int getPromoteLevel();
   }
   /**
-   * <pre>
-   * CmdId: 7336
-   * Obf: KMMIMMNJBJN
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteGetRewardRsp}
    */
   public static final class AvatarPromoteGetRewardRsp extends
@@ -92,26 +87,26 @@ public final class AvatarPromoteGetRewardRspOuterClass {
             case 0:
               done = true;
               break;
+            case 32: {
+
+              rewardId_ = input.readUInt32();
+              break;
+            }
             case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
-
-              promoteLevel_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              rewardId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 56: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 112: {
+
+              promoteLevel_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,10 +139,10 @@ public final class AvatarPromoteGetRewardRspOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp.class, emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp.Builder.class);
     }
 
-    public static final int REWARD_ID_FIELD_NUMBER = 11;
+    public static final int REWARD_ID_FIELD_NUMBER = 4;
     private int rewardId_;
     /**
-     * <code>uint32 reward_id = 11;</code>
+     * <code>uint32 reward_id = 4;</code>
      * @return The rewardId.
      */
     @java.lang.Override
@@ -155,17 +150,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return rewardId_;
     }
 
-    public static final int PROMOTE_LEVEL_FIELD_NUMBER = 10;
-    private int promoteLevel_;
-    /**
-     * <code>uint32 promote_level = 10;</code>
-     * @return The promoteLevel.
-     */
-    @java.lang.Override
-    public int getPromoteLevel() {
-      return promoteLevel_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
@@ -177,10 +161,10 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 12;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -188,6 +172,17 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return avatarGuid_;
     }
 
+    public static final int PROMOTE_LEVEL_FIELD_NUMBER = 14;
+    private int promoteLevel_;
+    /**
+     * <code>uint32 promote_level = 14;</code>
+     * @return The promoteLevel.
+     */
+    @java.lang.Override
+    public int getPromoteLevel() {
+      return promoteLevel_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (rewardId_ != 0) {
+        output.writeUInt32(4, rewardId_);
+      }
       if (retcode_ != 0) {
         output.writeInt32(5, retcode_);
       }
-      if (promoteLevel_ != 0) {
-        output.writeUInt32(10, promoteLevel_);
-      }
-      if (rewardId_ != 0) {
-        output.writeUInt32(11, rewardId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
+        output.writeUInt64(7, avatarGuid_);
+      }
+      if (promoteLevel_ != 0) {
+        output.writeUInt32(14, promoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (rewardId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, rewardId_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(5, retcode_);
       }
-      if (promoteLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, promoteLevel_);
-      }
-      if (rewardId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, rewardId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
+          .computeUInt64Size(7, avatarGuid_);
+      }
+      if (promoteLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, promoteLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +251,12 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       if (getRewardId()
           != other.getRewardId()) return false;
-      if (getPromoteLevel()
-          != other.getPromoteLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getPromoteLevel()
+          != other.getPromoteLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,13 +270,13 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRewardId();
-      hash = (37 * hash) + PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getPromoteLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7336
-     * Obf: KMMIMMNJBJN
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteGetRewardRsp}
      */
     public static final class Builder extends
@@ -422,12 +412,12 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         super.clear();
         rewardId_ = 0;
 
-        promoteLevel_ = 0;
-
         retcode_ = 0;
 
         avatarGuid_ = 0L;
 
+        promoteLevel_ = 0;
+
         return this;
       }
 
@@ -455,9 +445,9 @@ public final class AvatarPromoteGetRewardRspOuterClass {
       public emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp result = new emu.grasscutter.net.proto.AvatarPromoteGetRewardRspOuterClass.AvatarPromoteGetRewardRsp(this);
         result.rewardId_ = rewardId_;
-        result.promoteLevel_ = promoteLevel_;
         result.retcode_ = retcode_;
         result.avatarGuid_ = avatarGuid_;
+        result.promoteLevel_ = promoteLevel_;
         onBuilt();
         return result;
       }
@@ -509,15 +499,15 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         if (other.getRewardId() != 0) {
           setRewardId(other.getRewardId());
         }
-        if (other.getPromoteLevel() != 0) {
-          setPromoteLevel(other.getPromoteLevel());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getPromoteLevel() != 0) {
+          setPromoteLevel(other.getPromoteLevel());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -549,7 +539,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       private int rewardId_ ;
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @return The rewardId.
        */
       @java.lang.Override
@@ -557,7 +547,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return rewardId_;
       }
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @param value The rewardId to set.
        * @return This builder for chaining.
        */
@@ -568,7 +558,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 reward_id = 11;</code>
+       * <code>uint32 reward_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRewardId() {
@@ -578,37 +568,6 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
 
-      private int promoteLevel_ ;
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @return The promoteLevel.
-       */
-      @java.lang.Override
-      public int getPromoteLevel() {
-        return promoteLevel_;
-      }
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @param value The promoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPromoteLevel(int value) {
-        
-        promoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 promote_level = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPromoteLevel() {
-        
-        promoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 5;</code>
@@ -642,7 +601,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -650,7 +609,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -661,7 +620,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 12;</code>
+       * <code>uint64 avatar_guid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -670,6 +629,37 @@ public final class AvatarPromoteGetRewardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int promoteLevel_ ;
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @return The promoteLevel.
+       */
+      @java.lang.Override
+      public int getPromoteLevel() {
+        return promoteLevel_;
+      }
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @param value The promoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPromoteLevel(int value) {
+        
+        promoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 promote_level = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPromoteLevel() {
+        
+        promoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +728,9 @@ public final class AvatarPromoteGetRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037AvatarPromoteGetRewardRsp.proto\"k\n\031Ava" +
-      "tarPromoteGetRewardRsp\022\021\n\treward_id\030\013 \001(" +
-      "\r\022\025\n\rpromote_level\030\n \001(\r\022\017\n\007retcode\030\005 \001(" +
-      "\005\022\023\n\013avatar_guid\030\014 \001(\004B\033\n\031emu.grasscutte" +
+      "tarPromoteGetRewardRsp\022\021\n\treward_id\030\004 \001(" +
+      "\r\022\017\n\007retcode\030\005 \001(\005\022\023\n\013avatar_guid\030\007 \001(\004\022" +
+      "\025\n\rpromote_level\030\016 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class AvatarPromoteGetRewardRspOuterClass {
     internal_static_AvatarPromoteGetRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarPromoteGetRewardRsp_descriptor,
-        new java.lang.String[] { "RewardId", "PromoteLevel", "Retcode", "AvatarGuid", });
+        new java.lang.String[] { "RewardId", "Retcode", "AvatarGuid", "PromoteLevel", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java
index 8dca1dac1..ffee9255f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteReqOuterClass.java
@@ -19,17 +19,12 @@ public final class AvatarPromoteReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 guid = 5;</code>
+     * <code>uint64 guid = 8;</code>
      * @return The guid.
      */
     long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23288
-   * Obf: MLDPIPBFIKB
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteReq}
    */
   public static final class AvatarPromoteReq extends
@@ -74,7 +69,7 @@ public final class AvatarPromoteReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 64: {
 
               guid_ = input.readUInt64();
               break;
@@ -111,10 +106,10 @@ public final class AvatarPromoteReqOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.class, emu.grasscutter.net.proto.AvatarPromoteReqOuterClass.AvatarPromoteReq.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 5;
+    public static final int GUID_FIELD_NUMBER = 8;
     private long guid_;
     /**
-     * <code>uint64 guid = 5;</code>
+     * <code>uint64 guid = 8;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class AvatarPromoteReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (guid_ != 0L) {
-        output.writeUInt64(5, guid_);
+        output.writeUInt64(8, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class AvatarPromoteReqOuterClass {
       size = 0;
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, guid_);
+          .computeUInt64Size(8, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class AvatarPromoteReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23288
-     * Obf: MLDPIPBFIKB
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class AvatarPromoteReqOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class AvatarPromoteReqOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class AvatarPromoteReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 5;</code>
+       * <code>uint64 guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -528,7 +518,7 @@ public final class AvatarPromoteReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPromoteReq.proto\" \n\020AvatarPromot" +
-      "eReq\022\014\n\004guid\030\005 \001(\004B\033\n\031emu.grasscutter.ne" +
+      "eReq\022\014\n\004guid\030\010 \001(\004B\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/AvatarPromoteRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java
index db940368b..a31a6ec15 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPromoteRspOuterClass.java
@@ -19,7 +19,7 @@ public final class AvatarPromoteRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 guid = 7;</code>
+     * <code>uint64 guid = 2;</code>
      * @return The guid.
      */
     long getGuid();
@@ -31,11 +31,6 @@ public final class AvatarPromoteRspOuterClass {
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8592
-   * Obf: BLNOILBHJIJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarPromoteRsp}
    */
   public static final class AvatarPromoteRsp extends
@@ -80,7 +75,7 @@ public final class AvatarPromoteRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 16: {
 
               guid_ = input.readUInt64();
               break;
@@ -122,10 +117,10 @@ public final class AvatarPromoteRspOuterClass {
               emu.grasscutter.net.proto.AvatarPromoteRspOuterClass.AvatarPromoteRsp.class, emu.grasscutter.net.proto.AvatarPromoteRspOuterClass.AvatarPromoteRsp.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 7;
+    public static final int GUID_FIELD_NUMBER = 2;
     private long guid_;
     /**
-     * <code>uint64 guid = 7;</code>
+     * <code>uint64 guid = 2;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -159,7 +154,7 @@ public final class AvatarPromoteRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (guid_ != 0L) {
-        output.writeUInt64(7, guid_);
+        output.writeUInt64(2, guid_);
       }
       if (retcode_ != 0) {
         output.writeInt32(12, retcode_);
@@ -175,7 +170,7 @@ public final class AvatarPromoteRspOuterClass {
       size = 0;
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, guid_);
+          .computeUInt64Size(2, guid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -312,11 +307,6 @@ public final class AvatarPromoteRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8592
-     * Obf: BLNOILBHJIJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarPromoteRsp}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class AvatarPromoteRspOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class AvatarPromoteRspOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class AvatarPromoteRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 7;</code>
+       * <code>uint64 guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -598,7 +588,7 @@ public final class AvatarPromoteRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPromoteRsp.proto\"1\n\020AvatarPromot" +
-      "eRsp\022\014\n\004guid\030\007 \001(\004\022\017\n\007retcode\030\014 \001(\005B\033\n\031e" +
+      "eRsp\022\014\n\004guid\030\002 \001(\004\022\017\n\007retcode\030\014 \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/AvatarPropChangeReasonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropChangeReasonNotifyOuterClass.java
index 04ad52035..c3966b331 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropChangeReasonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropChangeReasonNotifyOuterClass.java
@@ -19,44 +19,43 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>float old_value = 2;</code>
+     * @return The oldValue.
+     */
+    float getOldValue();
+
+    /**
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
 
     /**
-     * <code>uint32 prop_type = 7;</code>
-     * @return The propType.
-     */
-    int getPropType();
-
-    /**
-     * <code>float cur_value = 1;</code>
-     * @return The curValue.
-     */
-    float getCurValue();
-
-    /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>float old_value = 14;</code>
-     * @return The oldValue.
+     * <code>uint32 prop_type = 10;</code>
+     * @return The propType.
      */
-    float getOldValue();
+    int getPropType();
+
+    /**
+     * <code>float cur_value = 12;</code>
+     * @return The curValue.
+     */
+    float getCurValue();
   }
   /**
    * <pre>
-   * CmdId: 3637
-   * Obf: LKDNAGGMHGL
+   * CmdId: 24920
    * </pre>
    *
    * Protobuf type {@code AvatarPropChangeReasonNotify}
@@ -104,12 +103,12 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
+            case 21: {
 
-              curValue_ = input.readFloat();
+              oldValue_ = input.readFloat();
               break;
             }
-            case 16: {
+            case 40: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
@@ -117,17 +116,17 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
             }
             case 56: {
 
-              propType_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 117: {
+            case 80: {
 
-              oldValue_ = input.readFloat();
+              propType_ = input.readUInt32();
+              break;
+            }
+            case 101: {
+
+              curValue_ = input.readFloat();
               break;
             }
             default: {
@@ -162,17 +161,28 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.class, emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int REASON_FIELD_NUMBER = 2;
+    public static final int OLD_VALUE_FIELD_NUMBER = 2;
+    private float oldValue_;
+    /**
+     * <code>float old_value = 2;</code>
+     * @return The oldValue.
+     */
+    @java.lang.Override
+    public float getOldValue() {
+      return oldValue_;
+    }
+
+    public static final int REASON_FIELD_NUMBER = 5;
     private int reason_;
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.PropChangeReason reason = 2;</code>
+     * <code>.PropChangeReason reason = 5;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
@@ -181,32 +191,10 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 7;
-    private int propType_;
-    /**
-     * <code>uint32 prop_type = 7;</code>
-     * @return The propType.
-     */
-    @java.lang.Override
-    public int getPropType() {
-      return propType_;
-    }
-
-    public static final int CUR_VALUE_FIELD_NUMBER = 1;
-    private float curValue_;
-    /**
-     * <code>float cur_value = 1;</code>
-     * @return The curValue.
-     */
-    @java.lang.Override
-    public float getCurValue() {
-      return curValue_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 11;</code>
+     * <code>uint64 avatar_guid = 7;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -214,15 +202,26 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int OLD_VALUE_FIELD_NUMBER = 14;
-    private float oldValue_;
+    public static final int PROP_TYPE_FIELD_NUMBER = 10;
+    private int propType_;
     /**
-     * <code>float old_value = 14;</code>
-     * @return The oldValue.
+     * <code>uint32 prop_type = 10;</code>
+     * @return The propType.
      */
     @java.lang.Override
-    public float getOldValue() {
-      return oldValue_;
+    public int getPropType() {
+      return propType_;
+    }
+
+    public static final int CUR_VALUE_FIELD_NUMBER = 12;
+    private float curValue_;
+    /**
+     * <code>float cur_value = 12;</code>
+     * @return The curValue.
+     */
+    @java.lang.Override
+    public float getCurValue() {
+      return curValue_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -239,20 +238,20 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curValue_ != 0F) {
-        output.writeFloat(1, curValue_);
+      if (oldValue_ != 0F) {
+        output.writeFloat(2, oldValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        output.writeEnum(2, reason_);
-      }
-      if (propType_ != 0) {
-        output.writeUInt32(7, propType_);
+        output.writeEnum(5, reason_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(11, avatarGuid_);
+        output.writeUInt64(7, avatarGuid_);
       }
-      if (oldValue_ != 0F) {
-        output.writeFloat(14, oldValue_);
+      if (propType_ != 0) {
+        output.writeUInt32(10, propType_);
+      }
+      if (curValue_ != 0F) {
+        output.writeFloat(12, curValue_);
       }
       unknownFields.writeTo(output);
     }
@@ -263,25 +262,25 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curValue_ != 0F) {
+      if (oldValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, curValue_);
+          .computeFloatSize(2, oldValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, reason_);
-      }
-      if (propType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, propType_);
+          .computeEnumSize(5, reason_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, avatarGuid_);
+          .computeUInt64Size(7, avatarGuid_);
       }
-      if (oldValue_ != 0F) {
+      if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(14, oldValue_);
+          .computeUInt32Size(10, propType_);
+      }
+      if (curValue_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(12, curValue_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -298,17 +297,17 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify other = (emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify) obj;
 
+      if (java.lang.Float.floatToIntBits(getOldValue())
+          != java.lang.Float.floatToIntBits(
+              other.getOldValue())) return false;
       if (reason_ != other.reason_) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getPropType()
           != other.getPropType()) return false;
       if (java.lang.Float.floatToIntBits(getCurValue())
           != java.lang.Float.floatToIntBits(
               other.getCurValue())) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
-      if (java.lang.Float.floatToIntBits(getOldValue())
-          != java.lang.Float.floatToIntBits(
-              other.getOldValue())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -320,19 +319,19 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      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 = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       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) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
-      hash = (37 * hash) + OLD_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getOldValue());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -430,8 +429,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3637
-     * Obf: LKDNAGGMHGL
+     * CmdId: 24920
      * </pre>
      *
      * Protobuf type {@code AvatarPropChangeReasonNotify}
@@ -471,16 +469,16 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        oldValue_ = 0F;
+
         reason_ = 0;
 
+        avatarGuid_ = 0L;
+
         propType_ = 0;
 
         curValue_ = 0F;
 
-        avatarGuid_ = 0L;
-
-        oldValue_ = 0F;
-
         return this;
       }
 
@@ -507,11 +505,11 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify result = new emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify(this);
+        result.oldValue_ = oldValue_;
         result.reason_ = reason_;
+        result.avatarGuid_ = avatarGuid_;
         result.propType_ = propType_;
         result.curValue_ = curValue_;
-        result.avatarGuid_ = avatarGuid_;
-        result.oldValue_ = oldValue_;
         onBuilt();
         return result;
       }
@@ -560,21 +558,21 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarPropChangeReasonNotifyOuterClass.AvatarPropChangeReasonNotify.getDefaultInstance()) return this;
+        if (other.getOldValue() != 0F) {
+          setOldValue(other.getOldValue());
+        }
         if (other.reason_ != 0) {
           setReasonValue(other.getReasonValue());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
         if (other.getCurValue() != 0F) {
           setCurValue(other.getCurValue());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
-        if (other.getOldValue() != 0F) {
-          setOldValue(other.getOldValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -604,16 +602,47 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
 
+      private float oldValue_ ;
+      /**
+       * <code>float old_value = 2;</code>
+       * @return The oldValue.
+       */
+      @java.lang.Override
+      public float getOldValue() {
+        return oldValue_;
+      }
+      /**
+       * <code>float old_value = 2;</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 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldValue() {
+        
+        oldValue_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private int reason_ = 0;
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -624,7 +653,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -634,7 +663,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -648,7 +677,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 2;</code>
+       * <code>.PropChangeReason reason = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -658,9 +687,40 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 7;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 7;</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 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int propType_ ;
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @return The propType.
        */
       @java.lang.Override
@@ -668,7 +728,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return propType_;
       }
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @param value The propType to set.
        * @return This builder for chaining.
        */
@@ -679,7 +739,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 prop_type = 7;</code>
+       * <code>uint32 prop_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearPropType() {
@@ -691,7 +751,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
 
       private float curValue_ ;
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @return The curValue.
        */
       @java.lang.Override
@@ -699,7 +759,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return curValue_;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @param value The curValue to set.
        * @return This builder for chaining.
        */
@@ -710,7 +770,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>float cur_value = 1;</code>
+       * <code>float cur_value = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurValue() {
@@ -719,68 +779,6 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 11;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 11;</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 = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private float oldValue_ ;
-      /**
-       * <code>float old_value = 14;</code>
-       * @return The oldValue.
-       */
-      @java.lang.Override
-      public float getOldValue() {
-        return oldValue_;
-      }
-      /**
-       * <code>float old_value = 14;</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 = 14;</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) {
@@ -850,10 +848,10 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"AvatarPropChangeReasonNotify.proto\032\026Pr" +
       "opChangeReason.proto\"\217\001\n\034AvatarPropChang" +
-      "eReasonNotify\022!\n\006reason\030\002 \001(\0162\021.PropChan" +
-      "geReason\022\021\n\tprop_type\030\007 \001(\r\022\021\n\tcur_value" +
-      "\030\001 \001(\002\022\023\n\013avatar_guid\030\013 \001(\004\022\021\n\told_value" +
-      "\030\016 \001(\002B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "eReasonNotify\022\021\n\told_value\030\002 \001(\002\022!\n\006reas" +
+      "on\030\005 \001(\0162\021.PropChangeReason\022\023\n\013avatar_gu" +
+      "id\030\007 \001(\004\022\021\n\tprop_type\030\n \001(\r\022\021\n\tcur_value" +
+      "\030\014 \001(\002B\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -866,7 +864,7 @@ public final class AvatarPropChangeReasonNotifyOuterClass {
     internal_static_AvatarPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "Reason", "PropType", "CurValue", "AvatarGuid", "OldValue", });
+        new java.lang.String[] { "OldValue", "Reason", "AvatarGuid", "PropType", "CurValue", });
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.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 a29374c3e..5e2096b5f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarPropNotifyOuterClass.java
@@ -19,7 +19,7 @@ public final class AvatarPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
@@ -59,11 +59,6 @@ public final class AvatarPropNotifyOuterClass {
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 5355
-   * Obf: KGKHNJBJKOJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarPropNotify}
    */
   public static final class AvatarPropNotify extends
@@ -109,7 +104,7 @@ public final class AvatarPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               avatarGuid_ = input.readUInt64();
               break;
@@ -171,10 +166,10 @@ public final class AvatarPropNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.class, emu.grasscutter.net.proto.AvatarPropNotifyOuterClass.AvatarPropNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -278,7 +273,7 @@ public final class AvatarPropNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
+        output.writeUInt64(6, avatarGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
@@ -297,7 +292,7 @@ public final class AvatarPropNotifyOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
+          .computeUInt64Size(6, avatarGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Long> entry
            : internalGetPropMap().getMap().entrySet()) {
@@ -442,11 +437,6 @@ public final class AvatarPropNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5355
-     * Obf: KGKHNJBJKOJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarPropNotify}
      */
     public static final class Builder extends
@@ -624,7 +614,7 @@ public final class AvatarPropNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -632,7 +622,7 @@ public final class AvatarPropNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -643,7 +633,7 @@ public final class AvatarPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -853,7 +843,7 @@ public final class AvatarPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarPropNotify.proto\"\211\001\n\020AvatarPropN" +
-      "otify\022\023\n\013avatar_guid\030\004 \001(\004\0220\n\010prop_map\030\010" +
+      "otify\022\023\n\013avatar_guid\030\006 \001(\004\0220\n\010prop_map\030\010" +
       " \003(\0132\036.AvatarPropNotify.PropMapEntry\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" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoNotifyOuterClass.java
index c90327988..41b05e447 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoNotifyOuterClass.java
@@ -19,33 +19,32 @@ public final class AvatarRenameInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> 
         getAvatarRenameListList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index);
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     int getAvatarRenameListCount();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
         getAvatarRenameListOrBuilderList();
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 26468
-   * Obf: MEDFBIJCAGF
+   * CmdId: 6549
    * </pre>
    *
    * Protobuf type {@code AvatarRenameInfoNotify}
@@ -94,7 +93,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarRenameList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +137,17 @@ public final class AvatarRenameInfoNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarRenameInfoNotifyOuterClass.AvatarRenameInfoNotify.class, emu.grasscutter.net.proto.AvatarRenameInfoNotifyOuterClass.AvatarRenameInfoNotify.Builder.class);
     }
 
-    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 8;
+    public static final int AVATAR_RENAME_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> avatarRenameList_;
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
@@ -156,21 +155,21 @@ public final class AvatarRenameInfoNotifyOuterClass {
       return avatarRenameList_;
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public int getAvatarRenameListCount() {
       return avatarRenameList_.size();
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
       return avatarRenameList_.get(index);
     }
     /**
-     * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+     * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
@@ -193,7 +192,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < avatarRenameList_.size(); i++) {
-        output.writeMessage(8, avatarRenameList_.get(i));
+        output.writeMessage(2, avatarRenameList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +205,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < avatarRenameList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, avatarRenameList_.get(i));
+          .computeMessageSize(2, avatarRenameList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -337,8 +336,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 26468
-     * Obf: MEDFBIJCAGF
+     * CmdId: 6549
      * </pre>
      *
      * Protobuf type {@code AvatarRenameInfoNotify}
@@ -538,7 +536,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
           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 = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> getAvatarRenameListList() {
         if (avatarRenameListBuilder_ == null) {
@@ -548,7 +546,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public int getAvatarRenameListCount() {
         if (avatarRenameListBuilder_ == null) {
@@ -558,7 +556,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo getAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -568,7 +566,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -585,7 +583,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder setAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -599,7 +597,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
         if (avatarRenameListBuilder_ == null) {
@@ -615,7 +613,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo value) {
@@ -632,7 +630,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -646,7 +644,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAvatarRenameList(
           int index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder builderForValue) {
@@ -660,7 +658,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder addAllAvatarRenameList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo> values) {
@@ -675,7 +673,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder clearAvatarRenameList() {
         if (avatarRenameListBuilder_ == null) {
@@ -688,7 +686,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public Builder removeAvatarRenameList(int index) {
         if (avatarRenameListBuilder_ == null) {
@@ -701,14 +699,14 @@ public final class AvatarRenameInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder getAvatarRenameListBuilder(
           int index) {
         return getAvatarRenameListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder getAvatarRenameListOrBuilder(
           int index) {
@@ -718,7 +716,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfoOrBuilder> 
            getAvatarRenameListOrBuilderList() {
@@ -729,14 +727,14 @@ public final class AvatarRenameInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</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 = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder addAvatarRenameListBuilder(
           int index) {
@@ -744,7 +742,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarRenameInfo avatar_rename_list = 8;</code>
+       * <code>repeated .AvatarRenameInfo avatar_rename_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder> 
            getAvatarRenameListBuilderList() {
@@ -833,7 +831,7 @@ public final class AvatarRenameInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarRenameInfoNotify.proto\032\026AvatarRe" +
       "nameInfo.proto\"G\n\026AvatarRenameInfoNotify" +
-      "\022-\n\022avatar_rename_list\030\010 \003(\0132\021.AvatarRen" +
+      "\022-\n\022avatar_rename_list\030\002 \003(\0132\021.AvatarRen" +
       "ameInfoB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
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 385a66a80..a8b9dea72 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarRenameInfoOuterClass.java
@@ -18,29 +18,25 @@ public final class AvatarRenameInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:AvatarRenameInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>string avatar_name = 1;</code>
-     * @return The avatarName.
-     */
-    java.lang.String getAvatarName();
-    /**
-     * <code>string avatar_name = 1;</code>
-     * @return The bytes for avatarName.
-     */
-    com.google.protobuf.ByteString
-        getAvatarNameBytes();
-
     /**
      * <code>uint32 avatar_id = 13;</code>
      * @return The avatarId.
      */
     int getAvatarId();
+
+    /**
+     * <code>string avatar_name = 15;</code>
+     * @return The avatarName.
+     */
+    java.lang.String getAvatarName();
+    /**
+     * <code>string avatar_name = 15;</code>
+     * @return The bytes for avatarName.
+     */
+    com.google.protobuf.ByteString
+        getAvatarNameBytes();
   }
   /**
-   * <pre>
-   * Obf: NNBEINLIFPB
-   * </pre>
-   *
    * Protobuf type {@code AvatarRenameInfo}
    */
   public static final class AvatarRenameInfo extends
@@ -86,17 +82,17 @@ public final class AvatarRenameInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              avatarName_ = s;
-              break;
-            }
             case 104: {
 
               avatarId_ = input.readUInt32();
               break;
             }
+            case 122: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              avatarName_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -129,10 +125,21 @@ public final class AvatarRenameInfoOuterClass {
               emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.class, emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo.Builder.class);
     }
 
-    public static final int AVATAR_NAME_FIELD_NUMBER = 1;
+    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;
     private volatile java.lang.Object avatarName_;
     /**
-     * <code>string avatar_name = 1;</code>
+     * <code>string avatar_name = 15;</code>
      * @return The avatarName.
      */
     @java.lang.Override
@@ -149,7 +156,7 @@ public final class AvatarRenameInfoOuterClass {
       }
     }
     /**
-     * <code>string avatar_name = 1;</code>
+     * <code>string avatar_name = 15;</code>
      * @return The bytes for avatarName.
      */
     @java.lang.Override
@@ -167,17 +174,6 @@ public final class AvatarRenameInfoOuterClass {
       }
     }
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -192,12 +188,12 @@ public final class AvatarRenameInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, avatarName_);
-      }
       if (avatarId_ != 0) {
         output.writeUInt32(13, avatarId_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, avatarName_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -207,13 +203,13 @@ public final class AvatarRenameInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, avatarName_);
-      }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(13, avatarId_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(avatarName_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, avatarName_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -229,10 +225,10 @@ public final class AvatarRenameInfoOuterClass {
       }
       emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo other = (emu.grasscutter.net.proto.AvatarRenameInfoOuterClass.AvatarRenameInfo) obj;
 
-      if (!getAvatarName()
-          .equals(other.getAvatarName())) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
+      if (!getAvatarName()
+          .equals(other.getAvatarName())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +240,10 @@ public final class AvatarRenameInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarName().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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,10 +340,6 @@ public final class AvatarRenameInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NNBEINLIFPB
-     * </pre>
-     *
      * Protobuf type {@code AvatarRenameInfo}
      */
     public static final class Builder extends
@@ -385,10 +377,10 @@ public final class AvatarRenameInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarName_ = "";
-
         avatarId_ = 0;
 
+        avatarName_ = "";
+
         return this;
       }
 
@@ -415,8 +407,8 @@ public final class AvatarRenameInfoOuterClass {
       @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.avatarName_ = avatarName_;
         result.avatarId_ = avatarId_;
+        result.avatarName_ = avatarName_;
         onBuilt();
         return result;
       }
@@ -465,13 +457,13 @@ public final class AvatarRenameInfoOuterClass {
 
       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;
@@ -501,82 +493,6 @@ public final class AvatarRenameInfoOuterClass {
         return this;
       }
 
-      private java.lang.Object avatarName_ = "";
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return The avatarName.
-       */
-      public java.lang.String getAvatarName() {
-        java.lang.Object ref = avatarName_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          avatarName_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return The bytes for avatarName.
-       */
-      public com.google.protobuf.ByteString
-          getAvatarNameBytes() {
-        java.lang.Object ref = avatarName_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          avatarName_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @param value The avatarName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        avatarName_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarName() {
-        
-        avatarName_ = getDefaultInstance().getAvatarName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string avatar_name = 1;</code>
-       * @param value The bytes for avatarName to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        avatarName_ = value;
-        onChanged();
-        return this;
-      }
-
       private int avatarId_ ;
       /**
        * <code>uint32 avatar_id = 13;</code>
@@ -607,6 +523,82 @@ public final class AvatarRenameInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object avatarName_ = "";
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return The avatarName.
+       */
+      public java.lang.String getAvatarName() {
+        java.lang.Object ref = avatarName_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          avatarName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return The bytes for avatarName.
+       */
+      public com.google.protobuf.ByteString
+          getAvatarNameBytes() {
+        java.lang.Object ref = avatarName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          avatarName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @param value The avatarName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        avatarName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarName() {
+        
+        avatarName_ = getDefaultInstance().getAvatarName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string avatar_name = 15;</code>
+       * @param value The bytes for avatarName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        avatarName_ = value;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -675,8 +667,8 @@ public final class AvatarRenameInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026AvatarRenameInfo.proto\":\n\020AvatarRename" +
-      "Info\022\023\n\013avatar_name\030\001 \001(\t\022\021\n\tavatar_id\030\r" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "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" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -688,7 +680,7 @@ public final class AvatarRenameInfoOuterClass {
     internal_static_AvatarRenameInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarRenameInfo_descriptor,
-        new java.lang.String[] { "AvatarName", "AvatarId", });
+        new java.lang.String[] { "AvatarId", "AvatarName", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java
index ace17fba6..612f14379 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataNotifyOuterClass.java
@@ -19,33 +19,32 @@ public final class AvatarSatiationDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> 
         getSatiationDataListList();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index);
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     int getSatiationDataListCount();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
         getSatiationDataListOrBuilderList();
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 704
-   * Obf: EBKOHKKPGDN
+   * CmdId: 4982
    * </pre>
    *
    * Protobuf type {@code AvatarSatiationDataNotify}
@@ -94,7 +93,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 satiationDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +137,17 @@ public final class AvatarSatiationDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSatiationDataNotifyOuterClass.AvatarSatiationDataNotify.class, emu.grasscutter.net.proto.AvatarSatiationDataNotifyOuterClass.AvatarSatiationDataNotify.Builder.class);
     }
 
-    public static final int SATIATION_DATA_LIST_FIELD_NUMBER = 15;
+    public static final int SATIATION_DATA_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> satiationDataList_;
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> getSatiationDataListList() {
       return satiationDataList_;
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
@@ -156,21 +155,21 @@ public final class AvatarSatiationDataNotifyOuterClass {
       return satiationDataList_;
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public int getSatiationDataListCount() {
       return satiationDataList_.size();
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index) {
       return satiationDataList_.get(index);
     }
     /**
-     * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+     * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
@@ -193,7 +192,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < satiationDataList_.size(); i++) {
-        output.writeMessage(15, satiationDataList_.get(i));
+        output.writeMessage(7, satiationDataList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +205,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
       size = 0;
       for (int i = 0; i < satiationDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, satiationDataList_.get(i));
+          .computeMessageSize(7, satiationDataList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -337,8 +336,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 704
-     * Obf: EBKOHKKPGDN
+     * CmdId: 4982
      * </pre>
      *
      * Protobuf type {@code AvatarSatiationDataNotify}
@@ -538,7 +536,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
           emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> satiationDataListBuilder_;
 
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> getSatiationDataListList() {
         if (satiationDataListBuilder_ == null) {
@@ -548,7 +546,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public int getSatiationDataListCount() {
         if (satiationDataListBuilder_ == null) {
@@ -558,7 +556,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData getSatiationDataList(int index) {
         if (satiationDataListBuilder_ == null) {
@@ -568,7 +566,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder setSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
@@ -585,7 +583,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder setSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -599,7 +597,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
         if (satiationDataListBuilder_ == null) {
@@ -615,7 +613,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData value) {
@@ -632,7 +630,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -646,7 +644,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addSatiationDataList(
           int index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder builderForValue) {
@@ -660,7 +658,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder addAllSatiationDataList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData> values) {
@@ -675,7 +673,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder clearSatiationDataList() {
         if (satiationDataListBuilder_ == null) {
@@ -688,7 +686,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public Builder removeSatiationDataList(int index) {
         if (satiationDataListBuilder_ == null) {
@@ -701,14 +699,14 @@ public final class AvatarSatiationDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder getSatiationDataListBuilder(
           int index) {
         return getSatiationDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder getSatiationDataListOrBuilder(
           int index) {
@@ -718,7 +716,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationDataOrBuilder> 
            getSatiationDataListOrBuilderList() {
@@ -729,14 +727,14 @@ public final class AvatarSatiationDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder addSatiationDataListBuilder() {
         return getSatiationDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder addSatiationDataListBuilder(
           int index) {
@@ -744,7 +742,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarSatiationData satiation_data_list = 15;</code>
+       * <code>repeated .AvatarSatiationData satiation_data_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder> 
            getSatiationDataListBuilderList() {
@@ -833,7 +831,7 @@ public final class AvatarSatiationDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037AvatarSatiationDataNotify.proto\032\031Avata" +
       "rSatiationData.proto\"N\n\031AvatarSatiationD" +
-      "ataNotify\0221\n\023satiation_data_list\030\017 \003(\0132\024" +
+      "ataNotify\0221\n\023satiation_data_list\030\007 \003(\0132\024" +
       ".AvatarSatiationDataB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java
index a5a4cb6b0..79c14ae7d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSatiationDataOuterClass.java
@@ -19,28 +19,24 @@ public final class AvatarSatiationDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float penalty_finish_time = 1;</code>
-     * @return The penaltyFinishTime.
-     */
-    float getPenaltyFinishTime();
-
-    /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 5;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>float finish_time = 9;</code>
+     * <code>float penalty_finish_time = 7;</code>
+     * @return The penaltyFinishTime.
+     */
+    float getPenaltyFinishTime();
+
+    /**
+     * <code>float finish_time = 10;</code>
      * @return The finishTime.
      */
     float getFinishTime();
   }
   /**
-   * <pre>
-   * Obf: PNGEFKDMGGI
-   * </pre>
-   *
    * Protobuf type {@code AvatarSatiationData}
    */
   public static final class AvatarSatiationData extends
@@ -85,17 +81,17 @@ public final class AvatarSatiationDataOuterClass {
             case 0:
               done = true;
               break;
-            case 13: {
-
-              penaltyFinishTime_ = input.readFloat();
-              break;
-            }
-            case 32: {
+            case 40: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 77: {
+            case 61: {
+
+              penaltyFinishTime_ = input.readFloat();
+              break;
+            }
+            case 85: {
 
               finishTime_ = input.readFloat();
               break;
@@ -132,21 +128,10 @@ public final class AvatarSatiationDataOuterClass {
               emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.class, emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.Builder.class);
     }
 
-    public static final int PENALTY_FINISH_TIME_FIELD_NUMBER = 1;
-    private float penaltyFinishTime_;
-    /**
-     * <code>float penalty_finish_time = 1;</code>
-     * @return The penaltyFinishTime.
-     */
-    @java.lang.Override
-    public float getPenaltyFinishTime() {
-      return penaltyFinishTime_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 5;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -154,10 +139,21 @@ public final class AvatarSatiationDataOuterClass {
       return avatarGuid_;
     }
 
-    public static final int FINISH_TIME_FIELD_NUMBER = 9;
+    public static final int PENALTY_FINISH_TIME_FIELD_NUMBER = 7;
+    private float penaltyFinishTime_;
+    /**
+     * <code>float penalty_finish_time = 7;</code>
+     * @return The penaltyFinishTime.
+     */
+    @java.lang.Override
+    public float getPenaltyFinishTime() {
+      return penaltyFinishTime_;
+    }
+
+    public static final int FINISH_TIME_FIELD_NUMBER = 10;
     private float finishTime_;
     /**
-     * <code>float finish_time = 9;</code>
+     * <code>float finish_time = 10;</code>
      * @return The finishTime.
      */
     @java.lang.Override
@@ -179,14 +175,14 @@ public final class AvatarSatiationDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (penaltyFinishTime_ != 0F) {
-        output.writeFloat(1, penaltyFinishTime_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
+        output.writeUInt64(5, avatarGuid_);
+      }
+      if (penaltyFinishTime_ != 0F) {
+        output.writeFloat(7, penaltyFinishTime_);
       }
       if (finishTime_ != 0F) {
-        output.writeFloat(9, finishTime_);
+        output.writeFloat(10, finishTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +193,17 @@ public final class AvatarSatiationDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (penaltyFinishTime_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(1, penaltyFinishTime_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
+          .computeUInt64Size(5, avatarGuid_);
+      }
+      if (penaltyFinishTime_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(7, penaltyFinishTime_);
       }
       if (finishTime_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(9, finishTime_);
+          .computeFloatSize(10, finishTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,11 +220,11 @@ public final class AvatarSatiationDataOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData other = (emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData) obj;
 
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (java.lang.Float.floatToIntBits(getPenaltyFinishTime())
           != java.lang.Float.floatToIntBits(
               other.getPenaltyFinishTime())) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (java.lang.Float.floatToIntBits(getFinishTime())
           != java.lang.Float.floatToIntBits(
               other.getFinishTime())) return false;
@@ -243,12 +239,12 @@ public final class AvatarSatiationDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PENALTY_FINISH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getPenaltyFinishTime());
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + PENALTY_FINISH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getPenaltyFinishTime());
       hash = (37 * hash) + FINISH_TIME_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getFinishTime());
@@ -348,10 +344,6 @@ public final class AvatarSatiationDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PNGEFKDMGGI
-     * </pre>
-     *
      * Protobuf type {@code AvatarSatiationData}
      */
     public static final class Builder extends
@@ -389,10 +381,10 @@ public final class AvatarSatiationDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        penaltyFinishTime_ = 0F;
-
         avatarGuid_ = 0L;
 
+        penaltyFinishTime_ = 0F;
+
         finishTime_ = 0F;
 
         return this;
@@ -421,8 +413,8 @@ public final class AvatarSatiationDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData buildPartial() {
         emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData result = new emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData(this);
-        result.penaltyFinishTime_ = penaltyFinishTime_;
         result.avatarGuid_ = avatarGuid_;
+        result.penaltyFinishTime_ = penaltyFinishTime_;
         result.finishTime_ = finishTime_;
         onBuilt();
         return result;
@@ -472,12 +464,12 @@ public final class AvatarSatiationDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData other) {
         if (other == emu.grasscutter.net.proto.AvatarSatiationDataOuterClass.AvatarSatiationData.getDefaultInstance()) return this;
-        if (other.getPenaltyFinishTime() != 0F) {
-          setPenaltyFinishTime(other.getPenaltyFinishTime());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getPenaltyFinishTime() != 0F) {
+          setPenaltyFinishTime(other.getPenaltyFinishTime());
+        }
         if (other.getFinishTime() != 0F) {
           setFinishTime(other.getFinishTime());
         }
@@ -510,40 +502,9 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
 
-      private float penaltyFinishTime_ ;
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @return The penaltyFinishTime.
-       */
-      @java.lang.Override
-      public float getPenaltyFinishTime() {
-        return penaltyFinishTime_;
-      }
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @param value The penaltyFinishTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPenaltyFinishTime(float value) {
-        
-        penaltyFinishTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float penalty_finish_time = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPenaltyFinishTime() {
-        
-        penaltyFinishTime_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -551,7 +512,7 @@ public final class AvatarSatiationDataOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -562,7 +523,7 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -572,9 +533,40 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
 
+      private float penaltyFinishTime_ ;
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @return The penaltyFinishTime.
+       */
+      @java.lang.Override
+      public float getPenaltyFinishTime() {
+        return penaltyFinishTime_;
+      }
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @param value The penaltyFinishTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPenaltyFinishTime(float value) {
+        
+        penaltyFinishTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float penalty_finish_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPenaltyFinishTime() {
+        
+        penaltyFinishTime_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private float finishTime_ ;
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @return The finishTime.
        */
       @java.lang.Override
@@ -582,7 +574,7 @@ public final class AvatarSatiationDataOuterClass {
         return finishTime_;
       }
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @param value The finishTime to set.
        * @return This builder for chaining.
        */
@@ -593,7 +585,7 @@ public final class AvatarSatiationDataOuterClass {
         return this;
       }
       /**
-       * <code>float finish_time = 9;</code>
+       * <code>float finish_time = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishTime() {
@@ -670,8 +662,8 @@ public final class AvatarSatiationDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031AvatarSatiationData.proto\"\\\n\023AvatarSat" +
-      "iationData\022\033\n\023penalty_finish_time\030\001 \001(\002\022" +
-      "\023\n\013avatar_guid\030\004 \001(\004\022\023\n\013finish_time\030\t \001(" +
+      "iationData\022\023\n\013avatar_guid\030\005 \001(\004\022\033\n\023penal" +
+      "ty_finish_time\030\007 \001(\002\022\023\n\013finish_time\030\n \001(" +
       "\002B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +675,7 @@ public final class AvatarSatiationDataOuterClass {
     internal_static_AvatarSatiationData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSatiationData_descriptor,
-        new java.lang.String[] { "PenaltyFinishTime", "AvatarGuid", "FinishTime", });
+        new java.lang.String[] { "AvatarGuid", "PenaltyFinishTime", "FinishTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java
index d7ebe6072..769c94838 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillChangeNotifyOuterClass.java
@@ -19,45 +19,44 @@ public final class AvatarSkillChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_depot_id = 2;</code>
-     * @return The skillDepotId.
-     */
-    int getSkillDepotId();
-
-    /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 cur_level = 7;</code>
+     * <code>uint32 cur_level = 3;</code>
      * @return The curLevel.
      */
     int getCurLevel();
 
     /**
-     * <code>uint32 avatar_skill_id = 10;</code>
-     * @return The avatarSkillId.
+     * <code>uint32 skill_depot_id = 6;</code>
+     * @return The skillDepotId.
      */
-    int getAvatarSkillId();
+    int getSkillDepotId();
 
     /**
-     * <code>uint32 old_level = 12;</code>
+     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
+
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint64 avatar_guid = 14;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 avatar_skill_id = 15;</code>
+     * @return The avatarSkillId.
+     */
+    int getAvatarSkillId();
   }
   /**
    * <pre>
-   * CmdId: 20893
-   * Obf: KHLDKNNHLFE
+   * CmdId: 4410
    * </pre>
    *
    * Protobuf type {@code AvatarSkillChangeNotify}
@@ -104,36 +103,36 @@ public final class AvatarSkillChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              skillDepotId_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 48: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
+            case 24: {
 
               curLevel_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 48: {
 
-              avatarSkillId_ = input.readUInt32();
+              skillDepotId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 72: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 120: {
+
+              avatarSkillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -166,43 +165,10 @@ public final class AvatarSkillChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.class, emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.Builder.class);
     }
 
-    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 2;
-    private int skillDepotId_;
-    /**
-     * <code>uint32 skill_depot_id = 2;</code>
-     * @return The skillDepotId.
-     */
-    @java.lang.Override
-    public int getSkillDepotId() {
-      return skillDepotId_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 5;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 5;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int CUR_LEVEL_FIELD_NUMBER = 7;
+    public static final int CUR_LEVEL_FIELD_NUMBER = 3;
     private int curLevel_;
     /**
-     * <code>uint32 cur_level = 7;</code>
+     * <code>uint32 cur_level = 3;</code>
      * @return The curLevel.
      */
     @java.lang.Override
@@ -210,21 +176,21 @@ public final class AvatarSkillChangeNotifyOuterClass {
       return curLevel_;
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 10;
-    private int avatarSkillId_;
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 6;
+    private int skillDepotId_;
     /**
-     * <code>uint32 avatar_skill_id = 10;</code>
-     * @return The avatarSkillId.
+     * <code>uint32 skill_depot_id = 6;</code>
+     * @return The skillDepotId.
      */
     @java.lang.Override
-    public int getAvatarSkillId() {
-      return avatarSkillId_;
+    public int getSkillDepotId() {
+      return skillDepotId_;
     }
 
-    public static final int OLD_LEVEL_FIELD_NUMBER = 12;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 12;</code>
+     * <code>uint32 old_level = 9;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -232,6 +198,39 @@ public final class AvatarSkillChangeNotifyOuterClass {
       return oldLevel_;
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 14;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 14;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 15;
+    private int avatarSkillId_;
+    /**
+     * <code>uint32 avatar_skill_id = 15;</code>
+     * @return The avatarSkillId.
+     */
+    @java.lang.Override
+    public int getAvatarSkillId() {
+      return avatarSkillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -246,23 +245,23 @@ public final class AvatarSkillChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (skillDepotId_ != 0) {
-        output.writeUInt32(2, skillDepotId_);
-      }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(5, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
-      }
       if (curLevel_ != 0) {
-        output.writeUInt32(7, curLevel_);
+        output.writeUInt32(3, curLevel_);
       }
-      if (avatarSkillId_ != 0) {
-        output.writeUInt32(10, avatarSkillId_);
+      if (skillDepotId_ != 0) {
+        output.writeUInt32(6, skillDepotId_);
       }
       if (oldLevel_ != 0) {
-        output.writeUInt32(12, oldLevel_);
+        output.writeUInt32(9, oldLevel_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(11, entityId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(14, avatarGuid_);
+      }
+      if (avatarSkillId_ != 0) {
+        output.writeUInt32(15, avatarSkillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -273,29 +272,29 @@ public final class AvatarSkillChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (skillDepotId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, skillDepotId_);
-      }
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
-      }
       if (curLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, curLevel_);
+          .computeUInt32Size(3, curLevel_);
       }
-      if (avatarSkillId_ != 0) {
+      if (skillDepotId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, avatarSkillId_);
+          .computeUInt32Size(6, skillDepotId_);
       }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, oldLevel_);
+          .computeUInt32Size(9, oldLevel_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, entityId_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(14, avatarGuid_);
+      }
+      if (avatarSkillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, avatarSkillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,18 +311,18 @@ public final class AvatarSkillChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify other = (emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify) obj;
 
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
       if (getSkillDepotId()
           != other.getSkillDepotId()) return false;
+      if (getOldLevel()
+          != other.getOldLevel()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
       if (getAvatarSkillId()
           != other.getAvatarSkillId()) return false;
-      if (getOldLevel()
-          != other.getOldLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -335,19 +334,19 @@ public final class AvatarSkillChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillDepotId();
+      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarSkillId();
-      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -445,8 +444,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20893
-     * Obf: KHLDKNNHLFE
+     * CmdId: 4410
      * </pre>
      *
      * Protobuf type {@code AvatarSkillChangeNotify}
@@ -486,18 +484,18 @@ public final class AvatarSkillChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        curLevel_ = 0;
+
         skillDepotId_ = 0;
 
+        oldLevel_ = 0;
+
         entityId_ = 0;
 
         avatarGuid_ = 0L;
 
-        curLevel_ = 0;
-
         avatarSkillId_ = 0;
 
-        oldLevel_ = 0;
-
         return this;
       }
 
@@ -524,12 +522,12 @@ public final class AvatarSkillChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify result = new emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify(this);
+        result.curLevel_ = curLevel_;
         result.skillDepotId_ = skillDepotId_;
+        result.oldLevel_ = oldLevel_;
         result.entityId_ = entityId_;
         result.avatarGuid_ = avatarGuid_;
-        result.curLevel_ = curLevel_;
         result.avatarSkillId_ = avatarSkillId_;
-        result.oldLevel_ = oldLevel_;
         onBuilt();
         return result;
       }
@@ -578,24 +576,24 @@ public final class AvatarSkillChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillChangeNotifyOuterClass.AvatarSkillChangeNotify.getDefaultInstance()) return this;
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
+        }
         if (other.getSkillDepotId() != 0) {
           setSkillDepotId(other.getSkillDepotId());
         }
+        if (other.getOldLevel() != 0) {
+          setOldLevel(other.getOldLevel());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
         if (other.getAvatarSkillId() != 0) {
           setAvatarSkillId(other.getAvatarSkillId());
         }
-        if (other.getOldLevel() != 0) {
-          setOldLevel(other.getOldLevel());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -625,9 +623,40 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
+      private int curLevel_ ;
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @return The curLevel.
+       */
+      @java.lang.Override
+      public int getCurLevel() {
+        return curLevel_;
+      }
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @param value The curLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurLevel(int value) {
+        
+        curLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_level = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurLevel() {
+        
+        curLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int skillDepotId_ ;
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @return The skillDepotId.
        */
       @java.lang.Override
@@ -635,7 +664,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return skillDepotId_;
       }
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @param value The skillDepotId to set.
        * @return This builder for chaining.
        */
@@ -646,7 +675,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_depot_id = 2;</code>
+       * <code>uint32 skill_depot_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillDepotId() {
@@ -656,9 +685,40 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
+      private int oldLevel_ ;
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @return The oldLevel.
+       */
+      @java.lang.Override
+      public int getOldLevel() {
+        return oldLevel_;
+      }
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @param value The oldLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldLevel(int value) {
+        
+        oldLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_level = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldLevel() {
+        
+        oldLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -666,7 +726,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -677,7 +737,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -689,7 +749,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -697,7 +757,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -708,7 +768,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 5;</code>
+       * <code>uint64 avatar_guid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -718,40 +778,9 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
 
-      private int curLevel_ ;
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @return The curLevel.
-       */
-      @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
-      }
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @param value The curLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurLevel(int value) {
-        
-        curLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_level = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurLevel() {
-        
-        curLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int avatarSkillId_ ;
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @return The avatarSkillId.
        */
       @java.lang.Override
@@ -759,7 +788,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return avatarSkillId_;
       }
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @param value The avatarSkillId to set.
        * @return This builder for chaining.
        */
@@ -770,7 +799,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_skill_id = 10;</code>
+       * <code>uint32 avatar_skill_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarSkillId() {
@@ -779,37 +808,6 @@ public final class AvatarSkillChangeNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int oldLevel_ ;
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @return The oldLevel.
-       */
-      @java.lang.Override
-      public int getOldLevel() {
-        return oldLevel_;
-      }
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @param value The oldLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldLevel(int value) {
-        
-        oldLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_level = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldLevel() {
-        
-        oldLevel_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -878,10 +876,10 @@ public final class AvatarSkillChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarSkillChangeNotify.proto\"\230\001\n\027Avat" +
-      "arSkillChangeNotify\022\026\n\016skill_depot_id\030\002 " +
-      "\001(\r\022\021\n\tentity_id\030\006 \001(\r\022\023\n\013avatar_guid\030\005 " +
-      "\001(\004\022\021\n\tcur_level\030\007 \001(\r\022\027\n\017avatar_skill_i" +
-      "d\030\n \001(\r\022\021\n\told_level\030\014 \001(\rB\033\n\031emu.grassc" +
+      "arSkillChangeNotify\022\021\n\tcur_level\030\003 \001(\r\022\026" +
+      "\n\016skill_depot_id\030\006 \001(\r\022\021\n\told_level\030\t \001(" +
+      "\r\022\021\n\tentity_id\030\013 \001(\r\022\023\n\013avatar_guid\030\016 \001(" +
+      "\004\022\027\n\017avatar_skill_id\030\017 \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -893,7 +891,7 @@ public final class AvatarSkillChangeNotifyOuterClass {
     internal_static_AvatarSkillChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillChangeNotify_descriptor,
-        new java.lang.String[] { "SkillDepotId", "EntityId", "AvatarGuid", "CurLevel", "AvatarSkillId", "OldLevel", });
+        new java.lang.String[] { "CurLevel", "SkillDepotId", "OldLevel", "EntityId", "AvatarGuid", "AvatarSkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java
index 7decabbb4..0e30c4ebc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillDepotChangeNotifyOuterClass.java
@@ -19,74 +19,57 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>uint32 core_proud_skill_level = 1;</code>
-     * @return The coreProudSkillLevel.
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
-    int getCoreProudSkillLevel();
-
+    int getSkillLevelMapCount();
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @return A list containing the proudSkillList.
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
-    java.util.List<java.lang.Integer> getProudSkillListList();
-    /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @return The count of proudSkillList.
-     */
-    int getProudSkillListCount();
-    /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The proudSkillList at the given index.
-     */
-    int getProudSkillList(int index);
-
-    /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-     */
-    int getProudSkillExtraLevelMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-     */
-    boolean containsProudSkillExtraLevelMap(
+    boolean containsSkillLevelMap(
         int key);
     /**
-     * Use {@link #getProudSkillExtraLevelMapMap()} instead.
+     * Use {@link #getSkillLevelMapMap()} instead.
      */
     @java.lang.Deprecated
     java.util.Map<java.lang.Integer, java.lang.Integer>
-    getProudSkillExtraLevelMap();
+    getSkillLevelMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
-    getProudSkillExtraLevelMapMap();
+    getSkillLevelMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
 
-    int getProudSkillExtraLevelMapOrDefault(
+    int getSkillLevelMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
 
-    int getProudSkillExtraLevelMapOrThrow(
+    int getSkillLevelMapOrThrow(
         int key);
 
+    /**
+     * <code>uint32 skill_depot_id = 5;</code>
+     * @return The skillDepotId.
+     */
+    int getSkillDepotId();
+
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
     /**
      * <code>repeated uint32 talent_id_list = 7;</code>
      * @return A list containing the talentIdList.
@@ -105,49 +88,65 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     int getTalentIdList(int index);
 
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>uint32 core_proud_skill_level = 8;</code>
+     * @return The coreProudSkillLevel.
      */
-    int getSkillLevelMapCount();
+    int getCoreProudSkillLevel();
+
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @return A list containing the proudSkillList.
      */
-    boolean containsSkillLevelMap(
+    java.util.List<java.lang.Integer> getProudSkillListList();
+    /**
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @return The count of proudSkillList.
+     */
+    int getProudSkillListCount();
+    /**
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @param index The index of the element to return.
+     * @return The proudSkillList at the given index.
+     */
+    int getProudSkillList(int index);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
+     */
+    int getProudSkillExtraLevelMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
+     */
+    boolean containsProudSkillExtraLevelMap(
         int key);
     /**
-     * Use {@link #getSkillLevelMapMap()} instead.
+     * Use {@link #getProudSkillExtraLevelMapMap()} instead.
      */
     @java.lang.Deprecated
     java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillLevelMap();
+    getProudSkillExtraLevelMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
-    getSkillLevelMapMap();
+    getProudSkillExtraLevelMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
 
-    int getSkillLevelMapOrDefault(
+    int getProudSkillExtraLevelMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
 
-    int getSkillLevelMapOrThrow(
+    int getProudSkillExtraLevelMapOrThrow(
         int key);
-
-    /**
-     * <code>uint32 skill_depot_id = 14;</code>
-     * @return The skillDepotId.
-     */
-    int getSkillDepotId();
   }
   /**
    * <pre>
-   * CmdId: 3748
-   * Obf: LEIEOELEMFM
+   * CmdId: 25309
    * </pre>
    *
    * Protobuf type {@code AvatarSkillDepotChangeNotify}
@@ -162,8 +161,8 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       super(builder);
     }
     private AvatarSkillDepotChangeNotify() {
-      proudSkillList_ = emptyIntList();
       talentIdList_ = emptyIntList();
+      proudSkillList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -199,79 +198,14 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
               break;
             case 8: {
 
-              coreProudSkillLevel_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                proudSkillList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              proudSkillList_.addInt(input.readUInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                proudSkillList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                proudSkillList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                proudSkillExtraLevelMap_ = com.google.protobuf.MapField.newMapField(
-                    ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              proudSkillExtraLevelMap__ = input.readMessage(
-                  ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              proudSkillExtraLevelMap_.getMutableMap().put(
-                  proudSkillExtraLevelMap__.getKey(), proudSkillExtraLevelMap__.getValue());
-              break;
-            }
-            case 56: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                talentIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              talentIdList_.addInt(input.readUInt32());
-              break;
-            }
-            case 58: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                talentIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                talentIdList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 72: {
-
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 80: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 skillLevelMap_ = com.google.protobuf.MapField.newMapField(
                     SkillLevelMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               skillLevelMap__ = input.readMessage(
@@ -280,11 +214,76 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
                   skillLevelMap__.getKey(), skillLevelMap__.getValue());
               break;
             }
-            case 112: {
+            case 40: {
 
               skillDepotId_ = input.readUInt32();
               break;
             }
+            case 48: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                talentIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              talentIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                talentIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                talentIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 64: {
+
+              coreProudSkillLevel_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                proudSkillList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              proudSkillList_.addInt(input.readUInt32());
+              break;
+            }
+            case 82: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                proudSkillList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                proudSkillList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                proudSkillExtraLevelMap_ = com.google.protobuf.MapField.newMapField(
+                    ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000008;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              proudSkillExtraLevelMap__ = input.readMessage(
+                  ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              proudSkillExtraLevelMap_.getMutableMap().put(
+                  proudSkillExtraLevelMap__.getKey(), proudSkillExtraLevelMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -300,11 +299,11 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          proudSkillList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          talentIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          talentIdList_.makeImmutable(); // C
+          proudSkillList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -320,10 +319,10 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
-          return internalGetProudSkillExtraLevelMap();
-        case 13:
+        case 2:
           return internalGetSkillLevelMap();
+        case 13:
+          return internalGetProudSkillExtraLevelMap();
         default:
           throw new RuntimeException(
               "Invalid map field number: " + number);
@@ -337,10 +336,10 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify.class, emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -348,137 +347,109 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int CORE_PROUD_SKILL_LEVEL_FIELD_NUMBER = 1;
-    private int coreProudSkillLevel_;
-    /**
-     * <code>uint32 core_proud_skill_level = 1;</code>
-     * @return The coreProudSkillLevel.
-     */
-    @java.lang.Override
-    public int getCoreProudSkillLevel() {
-      return coreProudSkillLevel_;
-    }
-
-    public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList proudSkillList_;
-    /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @return A list containing the proudSkillList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getProudSkillListList() {
-      return proudSkillList_;
-    }
-    /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @return The count of proudSkillList.
-     */
-    public int getProudSkillListCount() {
-      return proudSkillList_.size();
-    }
-    /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The proudSkillList at the given index.
-     */
-    public int getProudSkillList(int index) {
-      return proudSkillList_.getInt(index);
-    }
-    private int proudSkillListMemoizedSerializedSize = -1;
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int PROUD_SKILL_EXTRA_LEVEL_MAP_FIELD_NUMBER = 4;
-    private static final class ProudSkillExtraLevelMapDefaultEntryHolder {
+    public static final int SKILL_LEVEL_MAP_FIELD_NUMBER = 2;
+    private static final class SkillLevelMapDefaultEntryHolder {
       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.AvatarSkillDepotChangeNotifyOuterClass.internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor, 
+                  emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_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> proudSkillExtraLevelMap_;
+        java.lang.Integer, java.lang.Integer> skillLevelMap_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetProudSkillExtraLevelMap() {
-      if (proudSkillExtraLevelMap_ == null) {
+    internalGetSkillLevelMap() {
+      if (skillLevelMap_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
-            ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
+            SkillLevelMapDefaultEntryHolder.defaultEntry);
       }
-      return proudSkillExtraLevelMap_;
+      return skillLevelMap_;
     }
 
-    public int getProudSkillExtraLevelMapCount() {
-      return internalGetProudSkillExtraLevelMap().getMap().size();
+    public int getSkillLevelMapCount() {
+      return internalGetSkillLevelMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
 
     @java.lang.Override
-    public boolean containsProudSkillExtraLevelMap(
+    public boolean containsSkillLevelMap(
         int key) {
       
-      return internalGetProudSkillExtraLevelMap().getMap().containsKey(key);
+      return internalGetSkillLevelMap().getMap().containsKey(key);
     }
     /**
-     * Use {@link #getProudSkillExtraLevelMapMap()} instead.
+     * Use {@link #getSkillLevelMapMap()} instead.
      */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMap() {
-      return getProudSkillExtraLevelMapMap();
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMap() {
+      return getSkillLevelMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
     @java.lang.Override
 
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMapMap() {
-      return internalGetProudSkillExtraLevelMap().getMap();
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMapMap() {
+      return internalGetSkillLevelMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
     @java.lang.Override
 
-    public int getProudSkillExtraLevelMapOrDefault(
+    public int getSkillLevelMapOrDefault(
         int key,
         int defaultValue) {
       
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetProudSkillExtraLevelMap().getMap();
+          internalGetSkillLevelMap().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
+     * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
      */
     @java.lang.Override
 
-    public int getProudSkillExtraLevelMapOrThrow(
+    public int getSkillLevelMapOrThrow(
         int key) {
       
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetProudSkillExtraLevelMap().getMap();
+          internalGetSkillLevelMap().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
 
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 5;
+    private int skillDepotId_;
+    /**
+     * <code>uint32 skill_depot_id = 5;</code>
+     * @return The skillDepotId.
+     */
+    @java.lang.Override
+    public int getSkillDepotId() {
+      return skillDepotId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 6;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     public static final int TALENT_ID_LIST_FIELD_NUMBER = 7;
     private com.google.protobuf.Internal.IntList talentIdList_;
     /**
@@ -507,98 +478,126 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     }
     private int talentIdListMemoizedSerializedSize = -1;
 
-    public static final int SKILL_LEVEL_MAP_FIELD_NUMBER = 13;
-    private static final class SkillLevelMapDefaultEntryHolder {
+    public static final int CORE_PROUD_SKILL_LEVEL_FIELD_NUMBER = 8;
+    private int coreProudSkillLevel_;
+    /**
+     * <code>uint32 core_proud_skill_level = 8;</code>
+     * @return The coreProudSkillLevel.
+     */
+    @java.lang.Override
+    public int getCoreProudSkillLevel() {
+      return coreProudSkillLevel_;
+    }
+
+    public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 10;
+    private com.google.protobuf.Internal.IntList proudSkillList_;
+    /**
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @return A list containing the proudSkillList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getProudSkillListList() {
+      return proudSkillList_;
+    }
+    /**
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @return The count of proudSkillList.
+     */
+    public int getProudSkillListCount() {
+      return proudSkillList_.size();
+    }
+    /**
+     * <code>repeated uint32 proud_skill_list = 10;</code>
+     * @param index The index of the element to return.
+     * @return The proudSkillList at the given index.
+     */
+    public int getProudSkillList(int index) {
+      return proudSkillList_.getInt(index);
+    }
+    private int proudSkillListMemoizedSerializedSize = -1;
+
+    public static final int PROUD_SKILL_EXTRA_LEVEL_MAP_FIELD_NUMBER = 13;
+    private static final class ProudSkillExtraLevelMapDefaultEntryHolder {
       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.AvatarSkillDepotChangeNotifyOuterClass.internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_descriptor, 
+                  emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_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> skillLevelMap_;
+        java.lang.Integer, java.lang.Integer> proudSkillExtraLevelMap_;
     private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetSkillLevelMap() {
-      if (skillLevelMap_ == null) {
+    internalGetProudSkillExtraLevelMap() {
+      if (proudSkillExtraLevelMap_ == null) {
         return com.google.protobuf.MapField.emptyMapField(
-            SkillLevelMapDefaultEntryHolder.defaultEntry);
+            ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
       }
-      return skillLevelMap_;
+      return proudSkillExtraLevelMap_;
     }
 
-    public int getSkillLevelMapCount() {
-      return internalGetSkillLevelMap().getMap().size();
+    public int getProudSkillExtraLevelMapCount() {
+      return internalGetProudSkillExtraLevelMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
 
     @java.lang.Override
-    public boolean containsSkillLevelMap(
+    public boolean containsProudSkillExtraLevelMap(
         int key) {
       
-      return internalGetSkillLevelMap().getMap().containsKey(key);
+      return internalGetProudSkillExtraLevelMap().getMap().containsKey(key);
     }
     /**
-     * Use {@link #getSkillLevelMapMap()} instead.
+     * Use {@link #getProudSkillExtraLevelMapMap()} instead.
      */
     @java.lang.Override
     @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMap() {
-      return getSkillLevelMapMap();
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMap() {
+      return getProudSkillExtraLevelMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
     @java.lang.Override
 
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMapMap() {
-      return internalGetSkillLevelMap().getMap();
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMapMap() {
+      return internalGetProudSkillExtraLevelMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
     @java.lang.Override
 
-    public int getSkillLevelMapOrDefault(
+    public int getProudSkillExtraLevelMapOrDefault(
         int key,
         int defaultValue) {
       
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillLevelMap().getMap();
+          internalGetProudSkillExtraLevelMap().getMap();
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
      */
     @java.lang.Override
 
-    public int getSkillLevelMapOrThrow(
+    public int getProudSkillExtraLevelMapOrThrow(
         int key) {
       
       java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetSkillLevelMap().getMap();
+          internalGetProudSkillExtraLevelMap().getMap();
       if (!map.containsKey(key)) {
         throw new java.lang.IllegalArgumentException();
       }
       return map.get(key);
     }
 
-    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 14;
-    private int skillDepotId_;
-    /**
-     * <code>uint32 skill_depot_id = 14;</code>
-     * @return The skillDepotId.
-     */
-    @java.lang.Override
-    public int getSkillDepotId() {
-      return skillDepotId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -614,11 +613,33 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(1, avatarGuid_);
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetSkillLevelMap(),
+          SkillLevelMapDefaultEntryHolder.defaultEntry,
+          2);
+      if (skillDepotId_ != 0) {
+        output.writeUInt32(5, skillDepotId_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(6, entityId_);
+      }
+      if (getTalentIdListList().size() > 0) {
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(talentIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < talentIdList_.size(); i++) {
+        output.writeUInt32NoTag(talentIdList_.getInt(i));
+      }
       if (coreProudSkillLevel_ != 0) {
-        output.writeUInt32(1, coreProudSkillLevel_);
+        output.writeUInt32(8, coreProudSkillLevel_);
       }
       if (getProudSkillListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(proudSkillListMemoizedSerializedSize);
       }
       for (int i = 0; i < proudSkillList_.size(); i++) {
@@ -629,29 +650,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
           output,
           internalGetProudSkillExtraLevelMap(),
           ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry,
-          4);
-      if (getTalentIdListList().size() > 0) {
-        output.writeUInt32NoTag(58);
-        output.writeUInt32NoTag(talentIdListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < talentIdList_.size(); i++) {
-        output.writeUInt32NoTag(talentIdList_.getInt(i));
-      }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
-      }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetSkillLevelMap(),
-          SkillLevelMapDefaultEntryHolder.defaultEntry,
           13);
-      if (skillDepotId_ != 0) {
-        output.writeUInt32(14, skillDepotId_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -661,9 +660,45 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(1, avatarGuid_);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetSkillLevelMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        skillLevelMap__ = SkillLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, skillLevelMap__);
+      }
+      if (skillDepotId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, skillDepotId_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, entityId_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < talentIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(talentIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getTalentIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        talentIdListMemoizedSerializedSize = dataSize;
+      }
       if (coreProudSkillLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, coreProudSkillLevel_);
+          .computeUInt32Size(8, coreProudSkillLevel_);
       }
       {
         int dataSize = 0;
@@ -687,43 +722,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, proudSkillExtraLevelMap__);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < talentIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(talentIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getTalentIdListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        talentIdListMemoizedSerializedSize = dataSize;
-      }
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetSkillLevelMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        skillLevelMap__ = SkillLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, skillLevelMap__);
-      }
-      if (skillDepotId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, skillDepotId_);
+            .computeMessageSize(13, proudSkillExtraLevelMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -742,20 +741,20 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
 
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getCoreProudSkillLevel()
-          != other.getCoreProudSkillLevel()) return false;
-      if (!getProudSkillListList()
-          .equals(other.getProudSkillListList())) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (!internalGetProudSkillExtraLevelMap().equals(
-          other.internalGetProudSkillExtraLevelMap())) return false;
-      if (!getTalentIdListList()
-          .equals(other.getTalentIdListList())) return false;
       if (!internalGetSkillLevelMap().equals(
           other.internalGetSkillLevelMap())) return false;
       if (getSkillDepotId()
           != other.getSkillDepotId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (!getTalentIdListList()
+          .equals(other.getTalentIdListList())) return false;
+      if (getCoreProudSkillLevel()
+          != other.getCoreProudSkillLevel()) return false;
+      if (!getProudSkillListList()
+          .equals(other.getProudSkillListList())) return false;
+      if (!internalGetProudSkillExtraLevelMap().equals(
+          other.internalGetProudSkillExtraLevelMap())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -770,28 +769,28 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + CORE_PROUD_SKILL_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCoreProudSkillLevel();
-      if (getProudSkillListCount() > 0) {
-        hash = (37 * hash) + PROUD_SKILL_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getProudSkillListList().hashCode();
-      }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      if (!internalGetProudSkillExtraLevelMap().getMap().isEmpty()) {
-        hash = (37 * hash) + PROUD_SKILL_EXTRA_LEVEL_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetProudSkillExtraLevelMap().hashCode();
-      }
-      if (getTalentIdListCount() > 0) {
-        hash = (37 * hash) + TALENT_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getTalentIdListList().hashCode();
-      }
       if (!internalGetSkillLevelMap().getMap().isEmpty()) {
         hash = (37 * hash) + SKILL_LEVEL_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetSkillLevelMap().hashCode();
       }
       hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSkillDepotId();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      if (getTalentIdListCount() > 0) {
+        hash = (37 * hash) + TALENT_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTalentIdListList().hashCode();
+      }
+      hash = (37 * hash) + CORE_PROUD_SKILL_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCoreProudSkillLevel();
+      if (getProudSkillListCount() > 0) {
+        hash = (37 * hash) + PROUD_SKILL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getProudSkillListList().hashCode();
+      }
+      if (!internalGetProudSkillExtraLevelMap().getMap().isEmpty()) {
+        hash = (37 * hash) + PROUD_SKILL_EXTRA_LEVEL_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetProudSkillExtraLevelMap().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -889,8 +888,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3748
-     * Obf: LEIEOELEMFM
+     * CmdId: 25309
      * </pre>
      *
      * Protobuf type {@code AvatarSkillDepotChangeNotify}
@@ -908,10 +906,10 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
-            return internalGetProudSkillExtraLevelMap();
-          case 13:
+          case 2:
             return internalGetSkillLevelMap();
+          case 13:
+            return internalGetProudSkillExtraLevelMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -921,10 +919,10 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
-            return internalGetMutableProudSkillExtraLevelMap();
-          case 13:
+          case 2:
             return internalGetMutableSkillLevelMap();
+          case 13:
+            return internalGetMutableProudSkillExtraLevelMap();
           default:
             throw new RuntimeException(
                 "Invalid map field number: " + number);
@@ -958,18 +956,18 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         super.clear();
         avatarGuid_ = 0L;
 
-        coreProudSkillLevel_ = 0;
-
-        proudSkillList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        entityId_ = 0;
-
-        internalGetMutableProudSkillExtraLevelMap().clear();
-        talentIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
         internalGetMutableSkillLevelMap().clear();
         skillDepotId_ = 0;
 
+        entityId_ = 0;
+
+        talentIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        coreProudSkillLevel_ = 0;
+
+        proudSkillList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        internalGetMutableProudSkillExtraLevelMap().clear();
         return this;
       }
 
@@ -998,23 +996,23 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify result = new emu.grasscutter.net.proto.AvatarSkillDepotChangeNotifyOuterClass.AvatarSkillDepotChangeNotify(this);
         int from_bitField0_ = bitField0_;
         result.avatarGuid_ = avatarGuid_;
-        result.coreProudSkillLevel_ = coreProudSkillLevel_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          proudSkillList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.proudSkillList_ = proudSkillList_;
-        result.entityId_ = entityId_;
-        result.proudSkillExtraLevelMap_ = internalGetProudSkillExtraLevelMap();
-        result.proudSkillExtraLevelMap_.makeImmutable();
-        if (((bitField0_ & 0x00000004) != 0)) {
-          talentIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.talentIdList_ = talentIdList_;
         result.skillLevelMap_ = internalGetSkillLevelMap();
         result.skillLevelMap_.makeImmutable();
         result.skillDepotId_ = skillDepotId_;
+        result.entityId_ = entityId_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          talentIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.talentIdList_ = talentIdList_;
+        result.coreProudSkillLevel_ = coreProudSkillLevel_;
+        if (((bitField0_ & 0x00000004) != 0)) {
+          proudSkillList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.proudSkillList_ = proudSkillList_;
+        result.proudSkillExtraLevelMap_ = internalGetProudSkillExtraLevelMap();
+        result.proudSkillExtraLevelMap_.makeImmutable();
         onBuilt();
         return result;
       }
@@ -1066,39 +1064,39 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getCoreProudSkillLevel() != 0) {
-          setCoreProudSkillLevel(other.getCoreProudSkillLevel());
-        }
-        if (!other.proudSkillList_.isEmpty()) {
-          if (proudSkillList_.isEmpty()) {
-            proudSkillList_ = other.proudSkillList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureProudSkillListIsMutable();
-            proudSkillList_.addAll(other.proudSkillList_);
-          }
-          onChanged();
+        internalGetMutableSkillLevelMap().mergeFrom(
+            other.internalGetSkillLevelMap());
+        if (other.getSkillDepotId() != 0) {
+          setSkillDepotId(other.getSkillDepotId());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        internalGetMutableProudSkillExtraLevelMap().mergeFrom(
-            other.internalGetProudSkillExtraLevelMap());
         if (!other.talentIdList_.isEmpty()) {
           if (talentIdList_.isEmpty()) {
             talentIdList_ = other.talentIdList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureTalentIdListIsMutable();
             talentIdList_.addAll(other.talentIdList_);
           }
           onChanged();
         }
-        internalGetMutableSkillLevelMap().mergeFrom(
-            other.internalGetSkillLevelMap());
-        if (other.getSkillDepotId() != 0) {
-          setSkillDepotId(other.getSkillDepotId());
+        if (other.getCoreProudSkillLevel() != 0) {
+          setCoreProudSkillLevel(other.getCoreProudSkillLevel());
         }
+        if (!other.proudSkillList_.isEmpty()) {
+          if (proudSkillList_.isEmpty()) {
+            proudSkillList_ = other.proudSkillList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureProudSkillListIsMutable();
+            proudSkillList_.addAll(other.proudSkillList_);
+          }
+          onChanged();
+        }
+        internalGetMutableProudSkillExtraLevelMap().mergeFrom(
+            other.internalGetProudSkillExtraLevelMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1131,7 +1129,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -1139,7 +1137,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -1150,7 +1148,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -1160,119 +1158,168 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return this;
       }
 
-      private int coreProudSkillLevel_ ;
-      /**
-       * <code>uint32 core_proud_skill_level = 1;</code>
-       * @return The coreProudSkillLevel.
-       */
-      @java.lang.Override
-      public int getCoreProudSkillLevel() {
-        return coreProudSkillLevel_;
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> skillLevelMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetSkillLevelMap() {
+        if (skillLevelMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              SkillLevelMapDefaultEntryHolder.defaultEntry);
+        }
+        return skillLevelMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableSkillLevelMap() {
+        onChanged();;
+        if (skillLevelMap_ == null) {
+          skillLevelMap_ = com.google.protobuf.MapField.newMapField(
+              SkillLevelMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!skillLevelMap_.isMutable()) {
+          skillLevelMap_ = skillLevelMap_.copy();
+        }
+        return skillLevelMap_;
+      }
+
+      public int getSkillLevelMapCount() {
+        return internalGetSkillLevelMap().getMap().size();
       }
       /**
-       * <code>uint32 core_proud_skill_level = 1;</code>
-       * @param value The coreProudSkillLevel to set.
-       * @return This builder for chaining.
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
        */
-      public Builder setCoreProudSkillLevel(int value) {
+
+      @java.lang.Override
+      public boolean containsSkillLevelMap(
+          int key) {
         
-        coreProudSkillLevel_ = value;
-        onChanged();
+        return internalGetSkillLevelMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getSkillLevelMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMap() {
+        return getSkillLevelMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMapMap() {
+        return internalGetSkillLevelMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillLevelMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillLevelMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
+       */
+      @java.lang.Override
+
+      public int getSkillLevelMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetSkillLevelMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearSkillLevelMap() {
+        internalGetMutableSkillLevelMap().getMutableMap()
+            .clear();
         return this;
       }
       /**
-       * <code>uint32 core_proud_skill_level = 1;</code>
-       * @return This builder for chaining.
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
        */
-      public Builder clearCoreProudSkillLevel() {
+
+      public Builder removeSkillLevelMap(
+          int key) {
         
-        coreProudSkillLevel_ = 0;
-        onChanged();
+        internalGetMutableSkillLevelMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableSkillLevelMap() {
+        return internalGetMutableSkillLevelMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
+       */
+      public Builder putSkillLevelMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableSkillLevelMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; skill_level_map = 2;</code>
+       */
+
+      public Builder putAllSkillLevelMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableSkillLevelMap().getMutableMap()
+            .putAll(values);
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList proudSkillList_ = emptyIntList();
-      private void ensureProudSkillListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          proudSkillList_ = mutableCopy(proudSkillList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
+      private int skillDepotId_ ;
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @return A list containing the proudSkillList.
+       * <code>uint32 skill_depot_id = 5;</code>
+       * @return The skillDepotId.
        */
-      public java.util.List<java.lang.Integer>
-          getProudSkillListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(proudSkillList_) : proudSkillList_;
+      @java.lang.Override
+      public int getSkillDepotId() {
+        return skillDepotId_;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @return The count of proudSkillList.
-       */
-      public int getProudSkillListCount() {
-        return proudSkillList_.size();
-      }
-      /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The proudSkillList at the given index.
-       */
-      public int getProudSkillList(int index) {
-        return proudSkillList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The proudSkillList to set.
+       * <code>uint32 skill_depot_id = 5;</code>
+       * @param value The skillDepotId to set.
        * @return This builder for chaining.
        */
-      public Builder setProudSkillList(
-          int index, int value) {
-        ensureProudSkillListIsMutable();
-        proudSkillList_.setInt(index, value);
+      public Builder setSkillDepotId(int value) {
+        
+        skillDepotId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @param value The proudSkillList to add.
+       * <code>uint32 skill_depot_id = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder addProudSkillList(int value) {
-        ensureProudSkillListIsMutable();
-        proudSkillList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @param values The proudSkillList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllProudSkillList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureProudSkillListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, proudSkillList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearProudSkillList() {
-        proudSkillList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+      public Builder clearSkillDepotId() {
+        
+        skillDepotId_ = 0;
         onChanged();
         return this;
       }
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 6;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -1280,7 +1327,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 6;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -1291,7 +1338,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -1301,139 +1348,11 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
         return this;
       }
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> proudSkillExtraLevelMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetProudSkillExtraLevelMap() {
-        if (proudSkillExtraLevelMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
-        }
-        return proudSkillExtraLevelMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableProudSkillExtraLevelMap() {
-        onChanged();;
-        if (proudSkillExtraLevelMap_ == null) {
-          proudSkillExtraLevelMap_ = com.google.protobuf.MapField.newMapField(
-              ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!proudSkillExtraLevelMap_.isMutable()) {
-          proudSkillExtraLevelMap_ = proudSkillExtraLevelMap_.copy();
-        }
-        return proudSkillExtraLevelMap_;
-      }
-
-      public int getProudSkillExtraLevelMapCount() {
-        return internalGetProudSkillExtraLevelMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsProudSkillExtraLevelMap(
-          int key) {
-        
-        return internalGetProudSkillExtraLevelMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getProudSkillExtraLevelMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMap() {
-        return getProudSkillExtraLevelMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMapMap() {
-        return internalGetProudSkillExtraLevelMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getProudSkillExtraLevelMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetProudSkillExtraLevelMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getProudSkillExtraLevelMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetProudSkillExtraLevelMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearProudSkillExtraLevelMap() {
-        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-
-      public Builder removeProudSkillExtraLevelMap(
-          int key) {
-        
-        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableProudSkillExtraLevelMap() {
-        return internalGetMutableProudSkillExtraLevelMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-      public Builder putProudSkillExtraLevelMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 4;</code>
-       */
-
-      public Builder putAllProudSkillExtraLevelMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList talentIdList_ = emptyIntList();
       private void ensureTalentIdListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           talentIdList_ = mutableCopy(talentIdList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
       /**
@@ -1442,7 +1361,7 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
        */
       public java.util.List<java.lang.Integer>
           getTalentIdListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000002) != 0) ?
                  java.util.Collections.unmodifiableList(talentIdList_) : talentIdList_;
       }
       /**
@@ -1503,105 +1422,215 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
        */
       public Builder clearTalentIdList() {
         talentIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private int coreProudSkillLevel_ ;
+      /**
+       * <code>uint32 core_proud_skill_level = 8;</code>
+       * @return The coreProudSkillLevel.
+       */
+      @java.lang.Override
+      public int getCoreProudSkillLevel() {
+        return coreProudSkillLevel_;
+      }
+      /**
+       * <code>uint32 core_proud_skill_level = 8;</code>
+       * @param value The coreProudSkillLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCoreProudSkillLevel(int value) {
+        
+        coreProudSkillLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 core_proud_skill_level = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCoreProudSkillLevel() {
+        
+        coreProudSkillLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList proudSkillList_ = emptyIntList();
+      private void ensureProudSkillListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          proudSkillList_ = mutableCopy(proudSkillList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @return A list containing the proudSkillList.
+       */
+      public java.util.List<java.lang.Integer>
+          getProudSkillListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(proudSkillList_) : proudSkillList_;
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @return The count of proudSkillList.
+       */
+      public int getProudSkillListCount() {
+        return proudSkillList_.size();
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @param index The index of the element to return.
+       * @return The proudSkillList at the given index.
+       */
+      public int getProudSkillList(int index) {
+        return proudSkillList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @param index The index to set the value at.
+       * @param value The proudSkillList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setProudSkillList(
+          int index, int value) {
+        ensureProudSkillListIsMutable();
+        proudSkillList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @param value The proudSkillList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addProudSkillList(int value) {
+        ensureProudSkillListIsMutable();
+        proudSkillList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @param values The proudSkillList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllProudSkillList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureProudSkillListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, proudSkillList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 proud_skill_list = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearProudSkillList() {
+        proudSkillList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
       private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> skillLevelMap_;
+          java.lang.Integer, java.lang.Integer> proudSkillExtraLevelMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetSkillLevelMap() {
-        if (skillLevelMap_ == null) {
+      internalGetProudSkillExtraLevelMap() {
+        if (proudSkillExtraLevelMap_ == null) {
           return com.google.protobuf.MapField.emptyMapField(
-              SkillLevelMapDefaultEntryHolder.defaultEntry);
+              ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
         }
-        return skillLevelMap_;
+        return proudSkillExtraLevelMap_;
       }
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableSkillLevelMap() {
+      internalGetMutableProudSkillExtraLevelMap() {
         onChanged();;
-        if (skillLevelMap_ == null) {
-          skillLevelMap_ = com.google.protobuf.MapField.newMapField(
-              SkillLevelMapDefaultEntryHolder.defaultEntry);
+        if (proudSkillExtraLevelMap_ == null) {
+          proudSkillExtraLevelMap_ = com.google.protobuf.MapField.newMapField(
+              ProudSkillExtraLevelMapDefaultEntryHolder.defaultEntry);
         }
-        if (!skillLevelMap_.isMutable()) {
-          skillLevelMap_ = skillLevelMap_.copy();
+        if (!proudSkillExtraLevelMap_.isMutable()) {
+          proudSkillExtraLevelMap_ = proudSkillExtraLevelMap_.copy();
         }
-        return skillLevelMap_;
+        return proudSkillExtraLevelMap_;
       }
 
-      public int getSkillLevelMapCount() {
-        return internalGetSkillLevelMap().getMap().size();
+      public int getProudSkillExtraLevelMapCount() {
+        return internalGetProudSkillExtraLevelMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
 
       @java.lang.Override
-      public boolean containsSkillLevelMap(
+      public boolean containsProudSkillExtraLevelMap(
           int key) {
         
-        return internalGetSkillLevelMap().getMap().containsKey(key);
+        return internalGetProudSkillExtraLevelMap().getMap().containsKey(key);
       }
       /**
-       * Use {@link #getSkillLevelMapMap()} instead.
+       * Use {@link #getProudSkillExtraLevelMapMap()} instead.
        */
       @java.lang.Override
       @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMap() {
-        return getSkillLevelMapMap();
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMap() {
+        return getProudSkillExtraLevelMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
       @java.lang.Override
 
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getSkillLevelMapMap() {
-        return internalGetSkillLevelMap().getMap();
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getProudSkillExtraLevelMapMap() {
+        return internalGetProudSkillExtraLevelMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
       @java.lang.Override
 
-      public int getSkillLevelMapOrDefault(
+      public int getProudSkillExtraLevelMapOrDefault(
           int key,
           int defaultValue) {
         
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillLevelMap().getMap();
+            internalGetProudSkillExtraLevelMap().getMap();
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
       @java.lang.Override
 
-      public int getSkillLevelMapOrThrow(
+      public int getProudSkillExtraLevelMapOrThrow(
           int key) {
         
         java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetSkillLevelMap().getMap();
+            internalGetProudSkillExtraLevelMap().getMap();
         if (!map.containsKey(key)) {
           throw new java.lang.IllegalArgumentException();
         }
         return map.get(key);
       }
 
-      public Builder clearSkillLevelMap() {
-        internalGetMutableSkillLevelMap().getMutableMap()
+      public Builder clearProudSkillExtraLevelMap() {
+        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
             .clear();
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
 
-      public Builder removeSkillLevelMap(
+      public Builder removeProudSkillExtraLevelMap(
           int key) {
         
-        internalGetMutableSkillLevelMap().getMutableMap()
+        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
             .remove(key);
         return this;
       }
@@ -1610,62 +1639,31 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
        */
       @java.lang.Deprecated
       public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableSkillLevelMap() {
-        return internalGetMutableSkillLevelMap().getMutableMap();
+      getMutableProudSkillExtraLevelMap() {
+        return internalGetMutableProudSkillExtraLevelMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
-      public Builder putSkillLevelMap(
+      public Builder putProudSkillExtraLevelMap(
           int key,
           int value) {
         
         
-        internalGetMutableSkillLevelMap().getMutableMap()
+        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
             .put(key, value);
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; skill_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; proud_skill_extra_level_map = 13;</code>
        */
 
-      public Builder putAllSkillLevelMap(
+      public Builder putAllProudSkillExtraLevelMap(
           java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableSkillLevelMap().getMutableMap()
+        internalGetMutableProudSkillExtraLevelMap().getMutableMap()
             .putAll(values);
         return this;
       }
-
-      private int skillDepotId_ ;
-      /**
-       * <code>uint32 skill_depot_id = 14;</code>
-       * @return The skillDepotId.
-       */
-      @java.lang.Override
-      public int getSkillDepotId() {
-        return skillDepotId_;
-      }
-      /**
-       * <code>uint32 skill_depot_id = 14;</code>
-       * @param value The skillDepotId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillDepotId(int value) {
-        
-        skillDepotId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_depot_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillDepotId() {
-        
-        skillDepotId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1724,16 +1722,16 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AvatarSkillDepotChangeNotify_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_fieldAccessorTable;
   private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_descriptor;
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1745,16 +1743,16 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"AvatarSkillDepotChangeNotify.proto\"\322\003\n" +
       "\034AvatarSkillDepotChangeNotify\022\023\n\013avatar_" +
-      "guid\030\t \001(\004\022\036\n\026core_proud_skill_level\030\001 \001" +
-      "(\r\022\030\n\020proud_skill_list\030\003 \003(\r\022\021\n\tentity_i" +
-      "d\030\n \001(\r\022_\n\033proud_skill_extra_level_map\030\004" +
-      " \003(\0132:.AvatarSkillDepotChangeNotify.Prou" +
-      "dSkillExtraLevelMapEntry\022\026\n\016talent_id_li" +
-      "st\030\007 \003(\r\022I\n\017skill_level_map\030\r \003(\01320.Avat" +
-      "arSkillDepotChangeNotify.SkillLevelMapEn" +
-      "try\022\026\n\016skill_depot_id\030\016 \001(\r\032>\n\034ProudSkil" +
-      "lExtraLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005valu" +
-      "e\030\002 \001(\r:\0028\001\0324\n\022SkillLevelMapEntry\022\013\n\003key" +
+      "guid\030\001 \001(\004\022I\n\017skill_level_map\030\002 \003(\01320.Av" +
+      "atarSkillDepotChangeNotify.SkillLevelMap" +
+      "Entry\022\026\n\016skill_depot_id\030\005 \001(\r\022\021\n\tentity_" +
+      "id\030\006 \001(\r\022\026\n\016talent_id_list\030\007 \003(\r\022\036\n\026core" +
+      "_proud_skill_level\030\010 \001(\r\022\030\n\020proud_skill_" +
+      "list\030\n \003(\r\022_\n\033proud_skill_extra_level_ma" +
+      "p\030\r \003(\0132:.AvatarSkillDepotChangeNotify.P" +
+      "roudSkillExtraLevelMapEntry\0324\n\022SkillLeve" +
+      "lMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028" +
+      "\001\032>\n\034ProudSkillExtraLevelMapEntry\022\013\n\003key" +
       "\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
@@ -1767,19 +1765,19 @@ public final class AvatarSkillDepotChangeNotifyOuterClass {
     internal_static_AvatarSkillDepotChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillDepotChangeNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "CoreProudSkillLevel", "ProudSkillList", "EntityId", "ProudSkillExtraLevelMap", "TalentIdList", "SkillLevelMap", "SkillDepotId", });
-    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor =
-      internal_static_AvatarSkillDepotChangeNotify_descriptor.getNestedTypes().get(0);
-    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "AvatarGuid", "SkillLevelMap", "SkillDepotId", "EntityId", "TalentIdList", "CoreProudSkillLevel", "ProudSkillList", "ProudSkillExtraLevelMap", });
     internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_descriptor =
-      internal_static_AvatarSkillDepotChangeNotify_descriptor.getNestedTypes().get(1);
+      internal_static_AvatarSkillDepotChangeNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillDepotChangeNotify_SkillLevelMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor =
+      internal_static_AvatarSkillDepotChangeNotify_descriptor.getNestedTypes().get(1);
+    internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_AvatarSkillDepotChangeNotify_ProudSkillExtraLevelMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java
index c44382df1..4f9e95e23 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     int getSkillMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     boolean containsSkillMap(
         int key);
@@ -34,34 +34,33 @@ public final class AvatarSkillInfoNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
     getSkillMap();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo>
     getSkillMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo defaultValue);
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo getSkillMapOrThrow(
         int key);
 
     /**
-     * <code>uint64 guid = 13;</code>
+     * <code>uint64 guid = 14;</code>
      * @return The guid.
      */
     long getGuid();
   }
   /**
    * <pre>
-   * CmdId: 29066
-   * Obf: NHOMLJLJGFL
+   * CmdId: 25299
    * </pre>
    *
    * Protobuf type {@code AvatarSkillInfoNotify}
@@ -109,7 +108,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 skillMap_ = com.google.protobuf.MapField.newMapField(
                     SkillMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +121,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
                   skillMap__.getKey(), skillMap__.getValue());
               break;
             }
-            case 104: {
+            case 112: {
 
               guid_ = input.readUInt64();
               break;
@@ -156,7 +155,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 11:
+        case 13:
           return internalGetSkillMap();
         default:
           throw new RuntimeException(
@@ -171,7 +170,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.class, emu.grasscutter.net.proto.AvatarSkillInfoNotifyOuterClass.AvatarSkillInfoNotify.Builder.class);
     }
 
-    public static final int SKILL_MAP_FIELD_NUMBER = 11;
+    public static final int SKILL_MAP_FIELD_NUMBER = 13;
     private static final class SkillMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarSkillInfoOuterClass.AvatarSkillInfo> defaultEntry =
@@ -198,7 +197,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return internalGetSkillMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
 
     @java.lang.Override
@@ -216,7 +215,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return getSkillMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -224,7 +223,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return internalGetSkillMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -237,7 +236,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+     * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
      */
     @java.lang.Override
 
@@ -252,10 +251,10 @@ public final class AvatarSkillInfoNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int GUID_FIELD_NUMBER = 13;
+    public static final int GUID_FIELD_NUMBER = 14;
     private long guid_;
     /**
-     * <code>uint64 guid = 13;</code>
+     * <code>uint64 guid = 14;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -282,9 +281,9 @@ public final class AvatarSkillInfoNotifyOuterClass {
           output,
           internalGetSkillMap(),
           SkillMapDefaultEntryHolder.defaultEntry,
-          11);
+          13);
       if (guid_ != 0L) {
-        output.writeUInt64(13, guid_);
+        output.writeUInt64(14, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +302,11 @@ public final class AvatarSkillInfoNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(11, skillMap__);
+            .computeMessageSize(13, skillMap__);
       }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, guid_);
+          .computeUInt64Size(14, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -443,8 +442,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29066
-     * Obf: NHOMLJLJGFL
+     * CmdId: 25299
      * </pre>
      *
      * Protobuf type {@code AvatarSkillInfoNotify}
@@ -462,7 +460,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 11:
+          case 13:
             return internalGetSkillMap();
           default:
             throw new RuntimeException(
@@ -473,7 +471,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 11:
+          case 13:
             return internalGetMutableSkillMap();
           default:
             throw new RuntimeException(
@@ -649,7 +647,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetSkillMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       @java.lang.Override
@@ -667,7 +665,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return getSkillMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -675,7 +673,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetSkillMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -688,7 +686,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       @java.lang.Override
 
@@ -709,7 +707,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       public Builder removeSkillMap(
@@ -728,7 +726,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return internalGetMutableSkillMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
       public Builder putSkillMap(
           int key,
@@ -740,7 +738,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 11;</code>
+       * <code>map&lt;uint32, .AvatarSkillInfo&gt; skill_map = 13;</code>
        */
 
       public Builder putAllSkillMap(
@@ -752,7 +750,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -760,7 +758,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -771,7 +769,7 @@ public final class AvatarSkillInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 13;</code>
+       * <code>uint64 guid = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -854,8 +852,8 @@ public final class AvatarSkillInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillInfoNotify.proto\032\025AvatarSki" +
       "llInfo.proto\"\241\001\n\025AvatarSkillInfoNotify\0227" +
-      "\n\tskill_map\030\013 \003(\0132$.AvatarSkillInfoNotif" +
-      "y.SkillMapEntry\022\014\n\004guid\030\r \001(\004\032A\n\rSkillMa" +
+      "\n\tskill_map\030\r \003(\0132$.AvatarSkillInfoNotif" +
+      "y.SkillMapEntry\022\014\n\004guid\030\016 \001(\004\032A\n\rSkillMa" +
       "pEntry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.Ava" +
       "tarSkillInfo:\0028\001B\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoOuterClass.java
index 268343eb6..1d8b42105 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillInfoOuterClass.java
@@ -48,10 +48,6 @@ public final class AvatarSkillInfoOuterClass {
     int getMaxChargeCount();
   }
   /**
-   * <pre>
-   * Obf: FKBNODHMBMG
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillInfo}
    */
   public static final class AvatarSkillInfo extends
@@ -409,10 +405,6 @@ public final class AvatarSkillInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FKBNODHMBMG
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java
index 8cfe2e918..1d8a364bd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillMaxChargeCountNotifyOuterClass.java
@@ -19,13 +19,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 skill_id = 15;</code>
-     * @return The skillId.
-     */
-    int getSkillId();
-
-    /**
-     * <code>uint32 max_charge_count = 4;</code>
+     * <code>uint32 max_charge_count = 6;</code>
      * @return The maxChargeCount.
      */
     int getMaxChargeCount();
@@ -35,11 +29,16 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 skill_id = 15;</code>
+     * @return The skillId.
+     */
+    int getSkillId();
   }
   /**
    * <pre>
-   * CmdId: 22843
-   * Obf: MIPDHBPHHBA
+   * CmdId: 28497
    * </pre>
    *
    * Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -86,7 +85,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               maxChargeCount_ = input.readUInt32();
               break;
@@ -133,21 +132,10 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.class, emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.Builder.class);
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 15;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 15;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 4;
+    public static final int MAX_CHARGE_COUNT_FIELD_NUMBER = 6;
     private int maxChargeCount_;
     /**
-     * <code>uint32 max_charge_count = 4;</code>
+     * <code>uint32 max_charge_count = 6;</code>
      * @return The maxChargeCount.
      */
     @java.lang.Override
@@ -166,6 +154,17 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       return avatarGuid_;
     }
 
+    public static final int SKILL_ID_FIELD_NUMBER = 15;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 15;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,7 +180,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (maxChargeCount_ != 0) {
-        output.writeUInt32(4, maxChargeCount_);
+        output.writeUInt32(6, maxChargeCount_);
       }
       if (avatarGuid_ != 0L) {
         output.writeUInt64(7, avatarGuid_);
@@ -200,7 +199,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       size = 0;
       if (maxChargeCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, maxChargeCount_);
+          .computeUInt32Size(6, maxChargeCount_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -225,12 +224,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other = (emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify) obj;
 
-      if (getSkillId()
-          != other.getSkillId()) return false;
       if (getMaxChargeCount()
           != other.getMaxChargeCount()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +241,13 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       hash = (37 * hash) + MAX_CHARGE_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getMaxChargeCount();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +345,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 22843
-     * Obf: MIPDHBPHHBA
+     * CmdId: 28497
      * </pre>
      *
      * Protobuf type {@code AvatarSkillMaxChargeCountNotify}
@@ -387,12 +385,12 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        skillId_ = 0;
-
         maxChargeCount_ = 0;
 
         avatarGuid_ = 0L;
 
+        skillId_ = 0;
+
         return this;
       }
 
@@ -419,9 +417,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify result = new emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify(this);
-        result.skillId_ = skillId_;
         result.maxChargeCount_ = maxChargeCount_;
         result.avatarGuid_ = avatarGuid_;
+        result.skillId_ = skillId_;
         onBuilt();
         return result;
       }
@@ -470,15 +468,15 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillMaxChargeCountNotifyOuterClass.AvatarSkillMaxChargeCountNotify.getDefaultInstance()) return this;
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
-        }
         if (other.getMaxChargeCount() != 0) {
           setMaxChargeCount(other.getMaxChargeCount());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -508,40 +506,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return this;
       }
 
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int maxChargeCount_ ;
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @return The maxChargeCount.
        */
       @java.lang.Override
@@ -549,7 +516,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return maxChargeCount_;
       }
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @param value The maxChargeCount to set.
        * @return This builder for chaining.
        */
@@ -560,7 +527,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 max_charge_count = 4;</code>
+       * <code>uint32 max_charge_count = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaxChargeCount() {
@@ -600,6 +567,37 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -668,9 +666,9 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%AvatarSkillMaxChargeCountNotify.proto\"" +
-      "b\n\037AvatarSkillMaxChargeCountNotify\022\020\n\010sk" +
-      "ill_id\030\017 \001(\r\022\030\n\020max_charge_count\030\004 \001(\r\022\023" +
-      "\n\013avatar_guid\030\007 \001(\004B\033\n\031emu.grasscutter.n" +
+      "b\n\037AvatarSkillMaxChargeCountNotify\022\030\n\020ma" +
+      "x_charge_count\030\006 \001(\r\022\023\n\013avatar_guid\030\007 \001(" +
+      "\004\022\020\n\010skill_id\030\017 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -682,7 +680,7 @@ public final class AvatarSkillMaxChargeCountNotifyOuterClass {
     internal_static_AvatarSkillMaxChargeCountNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillMaxChargeCountNotify_descriptor,
-        new java.lang.String[] { "SkillId", "MaxChargeCount", "AvatarGuid", });
+        new java.lang.String[] { "MaxChargeCount", "AvatarGuid", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java
index 3f47b6b55..4564c2b8b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeReqOuterClass.java
@@ -19,29 +19,24 @@ public final class AvatarSkillUpgradeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_skill_id = 13;</code>
-     * @return The avatarSkillId.
-     */
-    int getAvatarSkillId();
-
-    /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 10;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint32 avatar_skill_id = 12;</code>
+     * @return The avatarSkillId.
+     */
+    int getAvatarSkillId();
+
+    /**
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 29541
-   * Obf: JLJFPGIINAB
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillUpgradeReq}
    */
   public static final class AvatarSkillUpgradeReq extends
@@ -86,17 +81,17 @@ public final class AvatarSkillUpgradeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 48: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 80: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 96: {
 
               avatarSkillId_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
               emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.class, emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.Builder.class);
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 13;
-    private int avatarSkillId_;
-    /**
-     * <code>uint32 avatar_skill_id = 13;</code>
-     * @return The avatarSkillId.
-     */
-    @java.lang.Override
-    public int getAvatarSkillId() {
-      return avatarSkillId_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 10;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 10;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -155,10 +139,21 @@ public final class AvatarSkillUpgradeReqOuterClass {
       return oldLevel_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 12;
+    private int avatarSkillId_;
+    /**
+     * <code>uint32 avatar_skill_id = 12;</code>
+     * @return The avatarSkillId.
+     */
+    @java.lang.Override
+    public int getAvatarSkillId() {
+      return avatarSkillId_;
+    }
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class AvatarSkillUpgradeReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(6, avatarGuid_);
       }
       if (oldLevel_ != 0) {
-        output.writeUInt32(9, oldLevel_);
+        output.writeUInt32(10, oldLevel_);
       }
       if (avatarSkillId_ != 0) {
-        output.writeUInt32(13, avatarSkillId_);
+        output.writeUInt32(12, avatarSkillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AvatarSkillUpgradeReqOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(6, avatarGuid_);
       }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, oldLevel_);
+          .computeUInt32Size(10, oldLevel_);
       }
       if (avatarSkillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, avatarSkillId_);
+          .computeUInt32Size(12, avatarSkillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other = (emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq) obj;
 
-      if (getAvatarSkillId()
-          != other.getAvatarSkillId()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
+      if (getAvatarSkillId()
+          != other.getAvatarSkillId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +237,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getOldLevel();
+      hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
@@ -345,11 +340,6 @@ public final class AvatarSkillUpgradeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29541
-     * Obf: JLJFPGIINAB
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillUpgradeReq}
      */
     public static final class Builder extends
@@ -387,10 +377,10 @@ public final class AvatarSkillUpgradeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarSkillId_ = 0;
-
         oldLevel_ = 0;
 
+        avatarSkillId_ = 0;
+
         avatarGuid_ = 0L;
 
         return this;
@@ -419,8 +409,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq result = new emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq(this);
-        result.avatarSkillId_ = avatarSkillId_;
         result.oldLevel_ = oldLevel_;
+        result.avatarSkillId_ = avatarSkillId_;
         result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
@@ -470,12 +460,12 @@ public final class AvatarSkillUpgradeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeReqOuterClass.AvatarSkillUpgradeReq.getDefaultInstance()) return this;
-        if (other.getAvatarSkillId() != 0) {
-          setAvatarSkillId(other.getAvatarSkillId());
-        }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
+        if (other.getAvatarSkillId() != 0) {
+          setAvatarSkillId(other.getAvatarSkillId());
+        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
@@ -508,40 +498,9 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
 
-      private int avatarSkillId_ ;
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @return The avatarSkillId.
-       */
-      @java.lang.Override
-      public int getAvatarSkillId() {
-        return avatarSkillId_;
-      }
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @param value The avatarSkillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAvatarSkillId(int value) {
-        
-        avatarSkillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 avatar_skill_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarSkillId() {
-        
-        avatarSkillId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int oldLevel_ ;
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @return The oldLevel.
        */
       @java.lang.Override
@@ -549,7 +508,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return oldLevel_;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @param value The oldLevel to set.
        * @return This builder for chaining.
        */
@@ -560,7 +519,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearOldLevel() {
@@ -570,9 +529,40 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
 
+      private int avatarSkillId_ ;
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @return The avatarSkillId.
+       */
+      @java.lang.Override
+      public int getAvatarSkillId() {
+        return avatarSkillId_;
+      }
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @param value The avatarSkillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAvatarSkillId(int value) {
+        
+        avatarSkillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 avatar_skill_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarSkillId() {
+        
+        avatarSkillId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -668,8 +658,8 @@ public final class AvatarSkillUpgradeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillUpgradeReq.proto\"X\n\025AvatarS" +
-      "killUpgradeReq\022\027\n\017avatar_skill_id\030\r \001(\r\022" +
-      "\021\n\told_level\030\t \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B" +
+      "killUpgradeReq\022\021\n\told_level\030\n \001(\r\022\027\n\017ava" +
+      "tar_skill_id\030\014 \001(\r\022\023\n\013avatar_guid\030\006 \001(\004B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarSkillUpgradeReqOuterClass {
     internal_static_AvatarSkillUpgradeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillUpgradeReq_descriptor,
-        new java.lang.String[] { "AvatarSkillId", "OldLevel", "AvatarGuid", });
+        new java.lang.String[] { "OldLevel", "AvatarSkillId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java
index e5831f464..af85fd1ab 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarSkillUpgradeRspOuterClass.java
@@ -19,41 +19,36 @@ public final class AvatarSkillUpgradeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_level = 2;</code>
-     * @return The curLevel.
-     */
-    int getCurLevel();
-
-    /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 2;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 avatar_skill_id = 1;</code>
+     * <code>uint32 cur_level = 6;</code>
+     * @return The curLevel.
+     */
+    int getCurLevel();
+
+    /**
+     * <code>uint32 avatar_skill_id = 9;</code>
      * @return The avatarSkillId.
      */
     int getAvatarSkillId();
 
     /**
-     * <code>uint64 avatar_guid = 7;</code>
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 22584
-   * Obf: JDINKHGKCON
-   * </pre>
-   *
    * Protobuf type {@code AvatarSkillUpgradeRsp}
    */
   public static final class AvatarSkillUpgradeRsp extends
@@ -98,29 +93,29 @@ public final class AvatarSkillUpgradeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              avatarSkillId_ = input.readUInt32();
-              break;
-            }
             case 16: {
 
-              curLevel_ = input.readUInt32();
+              oldLevel_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 24: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
+            case 48: {
 
-              avatarGuid_ = input.readUInt64();
+              curLevel_ = input.readUInt32();
               break;
             }
             case 72: {
 
-              oldLevel_ = input.readUInt32();
+              avatarSkillId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              avatarGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -155,21 +150,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
               emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.class, emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.Builder.class);
     }
 
-    public static final int CUR_LEVEL_FIELD_NUMBER = 2;
-    private int curLevel_;
-    /**
-     * <code>uint32 cur_level = 2;</code>
-     * @return The curLevel.
-     */
-    @java.lang.Override
-    public int getCurLevel() {
-      return curLevel_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 9;
+    public static final int OLD_LEVEL_FIELD_NUMBER = 2;
     private int oldLevel_;
     /**
-     * <code>uint32 old_level = 9;</code>
+     * <code>uint32 old_level = 2;</code>
      * @return The oldLevel.
      */
     @java.lang.Override
@@ -177,10 +161,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return oldLevel_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -188,10 +172,21 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 1;
+    public static final int CUR_LEVEL_FIELD_NUMBER = 6;
+    private int curLevel_;
+    /**
+     * <code>uint32 cur_level = 6;</code>
+     * @return The curLevel.
+     */
+    @java.lang.Override
+    public int getCurLevel() {
+      return curLevel_;
+    }
+
+    public static final int AVATAR_SKILL_ID_FIELD_NUMBER = 9;
     private int avatarSkillId_;
     /**
-     * <code>uint32 avatar_skill_id = 1;</code>
+     * <code>uint32 avatar_skill_id = 9;</code>
      * @return The avatarSkillId.
      */
     @java.lang.Override
@@ -199,10 +194,10 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return avatarSkillId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 7;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 11;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 7;</code>
+     * <code>uint64 avatar_guid = 11;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -224,20 +219,20 @@ public final class AvatarSkillUpgradeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarSkillId_ != 0) {
-        output.writeUInt32(1, avatarSkillId_);
-      }
-      if (curLevel_ != 0) {
-        output.writeUInt32(2, curLevel_);
+      if (oldLevel_ != 0) {
+        output.writeUInt32(2, oldLevel_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      if (curLevel_ != 0) {
+        output.writeUInt32(6, curLevel_);
+      }
+      if (avatarSkillId_ != 0) {
+        output.writeUInt32(9, avatarSkillId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(7, avatarGuid_);
-      }
-      if (oldLevel_ != 0) {
-        output.writeUInt32(9, oldLevel_);
+        output.writeUInt64(11, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -248,25 +243,25 @@ public final class AvatarSkillUpgradeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarSkillId_ != 0) {
+      if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, avatarSkillId_);
-      }
-      if (curLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, curLevel_);
+          .computeUInt32Size(2, oldLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(3, retcode_);
+      }
+      if (curLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, curLevel_);
+      }
+      if (avatarSkillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, avatarSkillId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, avatarGuid_);
-      }
-      if (oldLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, oldLevel_);
+          .computeUInt64Size(11, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,12 +278,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other = (emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp) obj;
 
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
       if (getAvatarSkillId()
           != other.getAvatarSkillId()) return false;
       if (getAvatarGuid()
@@ -304,12 +299,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + AVATAR_SKILL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarSkillId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
@@ -411,11 +406,6 @@ public final class AvatarSkillUpgradeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22584
-     * Obf: JDINKHGKCON
-     * </pre>
-     *
      * Protobuf type {@code AvatarSkillUpgradeRsp}
      */
     public static final class Builder extends
@@ -453,12 +443,12 @@ public final class AvatarSkillUpgradeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curLevel_ = 0;
-
         oldLevel_ = 0;
 
         retcode_ = 0;
 
+        curLevel_ = 0;
+
         avatarSkillId_ = 0;
 
         avatarGuid_ = 0L;
@@ -489,9 +479,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp result = new emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp(this);
-        result.curLevel_ = curLevel_;
         result.oldLevel_ = oldLevel_;
         result.retcode_ = retcode_;
+        result.curLevel_ = curLevel_;
         result.avatarSkillId_ = avatarSkillId_;
         result.avatarGuid_ = avatarGuid_;
         onBuilt();
@@ -542,15 +532,15 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarSkillUpgradeRspOuterClass.AvatarSkillUpgradeRsp.getDefaultInstance()) return this;
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
+        }
         if (other.getAvatarSkillId() != 0) {
           setAvatarSkillId(other.getAvatarSkillId());
         }
@@ -586,40 +576,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
 
-      private int curLevel_ ;
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @return The curLevel.
-       */
-      @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
-      }
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @param value The curLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurLevel(int value) {
-        
-        curLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_level = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurLevel() {
-        
-        curLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int oldLevel_ ;
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @return The oldLevel.
        */
       @java.lang.Override
@@ -627,7 +586,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return oldLevel_;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @param value The oldLevel to set.
        * @return This builder for chaining.
        */
@@ -638,7 +597,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 old_level = 9;</code>
+       * <code>uint32 old_level = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearOldLevel() {
@@ -650,7 +609,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -658,7 +617,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -669,7 +628,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -679,9 +638,40 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
 
+      private int curLevel_ ;
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @return The curLevel.
+       */
+      @java.lang.Override
+      public int getCurLevel() {
+        return curLevel_;
+      }
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @param value The curLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurLevel(int value) {
+        
+        curLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_level = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurLevel() {
+        
+        curLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int avatarSkillId_ ;
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @return The avatarSkillId.
        */
       @java.lang.Override
@@ -689,7 +679,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return avatarSkillId_;
       }
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @param value The avatarSkillId to set.
        * @return This builder for chaining.
        */
@@ -700,7 +690,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_skill_id = 1;</code>
+       * <code>uint32 avatar_skill_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarSkillId() {
@@ -712,7 +702,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -720,7 +710,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -731,7 +721,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 7;</code>
+       * <code>uint64 avatar_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -808,9 +798,9 @@ public final class AvatarSkillUpgradeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarSkillUpgradeRsp.proto\"|\n\025AvatarS" +
-      "killUpgradeRsp\022\021\n\tcur_level\030\002 \001(\r\022\021\n\told" +
-      "_level\030\t \001(\r\022\017\n\007retcode\030\004 \001(\005\022\027\n\017avatar_" +
-      "skill_id\030\001 \001(\r\022\023\n\013avatar_guid\030\007 \001(\004B\033\n\031e" +
+      "killUpgradeRsp\022\021\n\told_level\030\002 \001(\r\022\017\n\007ret" +
+      "code\030\003 \001(\005\022\021\n\tcur_level\030\006 \001(\r\022\027\n\017avatar_" +
+      "skill_id\030\t \001(\r\022\023\n\013avatar_guid\030\013 \001(\004B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -822,7 +812,7 @@ public final class AvatarSkillUpgradeRspOuterClass {
     internal_static_AvatarSkillUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarSkillUpgradeRsp_descriptor,
-        new java.lang.String[] { "CurLevel", "OldLevel", "Retcode", "AvatarSkillId", "AvatarGuid", });
+        new java.lang.String[] { "OldLevel", "Retcode", "CurLevel", "AvatarSkillId", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamAllDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamAllDataNotifyOuterClass.java
index e1fb07e4c..429fdd9d4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamAllDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamAllDataNotifyOuterClass.java
@@ -19,11 +19,28 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return A list containing the tempAvatarGuidList.
+     */
+    java.util.List<java.lang.Long> getTempAvatarGuidListList();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    int getTempAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</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 = 7;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -34,24 +51,30 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</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 = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
 
+    /**
+     * <code>uint32 cur_avatar_team_id = 10;</code>
+     * @return The curAvatarTeamId.
+     */
+    int getCurAvatarTeamId();
+
     /**
      * <code>repeated uint32 backup_avatar_team_order_list = 13;</code>
      * @return A list containing the backupAvatarTeamOrderList.
@@ -68,30 +91,8 @@ public final class AvatarTeamAllDataNotifyOuterClass {
      * @return The backupAvatarTeamOrderList at the given index.
      */
     int getBackupAvatarTeamOrderList(int index);
-
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return A list containing the tempAvatarGuidList.
-     */
-    java.util.List<java.lang.Long> getTempAvatarGuidListList();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    int getTempAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The tempAvatarGuidList at the given index.
-     */
-    long getTempAvatarGuidList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 9854
-   * Obf: HHLJIKIGMOG
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamAllDataNotify}
    */
   public static final class AvatarTeamAllDataNotify extends
@@ -104,8 +105,8 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       super(builder);
     }
     private AvatarTeamAllDataNotify() {
-      backupAvatarTeamOrderList_ = emptyIntList();
       tempAvatarGuidList_ = emptyLongList();
+      backupAvatarTeamOrderList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -139,11 +140,32 @@ public final class AvatarTeamAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              tempAvatarGuidList_.addLong(input.readUInt64());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tempAvatarGuidList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 avatarTeamMap_ = com.google.protobuf.MapField.newMapField(
                     AvatarTeamMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
               avatarTeamMap__ = input.readMessage(
@@ -152,31 +174,15 @@ public final class AvatarTeamAllDataNotifyOuterClass {
                   avatarTeamMap__.getKey(), avatarTeamMap__.getValue());
               break;
             }
-            case 64: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              tempAvatarGuidList_.addLong(input.readUInt64());
-              break;
-            }
-            case 66: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                tempAvatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                tempAvatarGuidList_.addLong(input.readUInt64());
-              }
-              input.popLimit(limit);
+            case 80: {
+
+              curAvatarTeamId_ = input.readUInt32();
               break;
             }
             case 104: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               backupAvatarTeamOrderList_.addInt(input.readUInt32());
               break;
@@ -184,9 +190,9 @@ public final class AvatarTeamAllDataNotifyOuterClass {
             case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 backupAvatarTeamOrderList_.addInt(input.readUInt32());
@@ -209,10 +215,10 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tempAvatarGuidList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           backupAvatarTeamOrderList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -229,7 +235,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 2:
+        case 7:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -244,7 +250,35 @@ public final class AvatarTeamAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.class, emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.Builder.class);
     }
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 2;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</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 = 3;</code>
+     * @return The count of tempAvatarGuidList.
+     */
+    public int getTempAvatarGuidListCount() {
+      return tempAvatarGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 temp_avatar_guid_list = 3;</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 AVATAR_TEAM_MAP_FIELD_NUMBER = 7;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -271,7 +305,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
 
     @java.lang.Override
@@ -289,7 +323,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -297,7 +331,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -310,7 +344,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
      */
     @java.lang.Override
 
@@ -325,6 +359,17 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return map.get(key);
     }
 
+    public static final int CUR_AVATAR_TEAM_ID_FIELD_NUMBER = 10;
+    private int curAvatarTeamId_;
+    /**
+     * <code>uint32 cur_avatar_team_id = 10;</code>
+     * @return The curAvatarTeamId.
+     */
+    @java.lang.Override
+    public int getCurAvatarTeamId() {
+      return curAvatarTeamId_;
+    }
+
     public static final int BACKUP_AVATAR_TEAM_ORDER_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_;
     /**
@@ -353,34 +398,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     }
     private int backupAvatarTeamOrderListMemoizedSerializedSize = -1;
 
-    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 8;
-    private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</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 = 8;</code>
-     * @return The count of tempAvatarGuidList.
-     */
-    public int getTempAvatarGuidListCount() {
-      return tempAvatarGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 temp_avatar_guid_list = 8;</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() {
@@ -396,18 +413,21 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (getTempAvatarGuidListList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
+        output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
+      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetAvatarTeamMap(),
           AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          2);
-      if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
-        output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
+          7);
+      if (curAvatarTeamId_ != 0) {
+        output.writeUInt32(10, curAvatarTeamId_);
       }
       if (getBackupAvatarTeamOrderListList().size() > 0) {
         output.writeUInt32NoTag(106);
@@ -425,16 +445,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      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(2, avatarTeamMap__);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -449,6 +459,20 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         }
         tempAvatarGuidListMemoizedSerializedSize = 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(7, avatarTeamMap__);
+      }
+      if (curAvatarTeamId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, curAvatarTeamId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < backupAvatarTeamOrderList_.size(); i++) {
@@ -478,12 +502,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify other = (emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify) obj;
 
-      if (!internalGetAvatarTeamMap().equals(
-          other.internalGetAvatarTeamMap())) return false;
-      if (!getBackupAvatarTeamOrderListList()
-          .equals(other.getBackupAvatarTeamOrderListList())) return false;
       if (!getTempAvatarGuidListList()
           .equals(other.getTempAvatarGuidListList())) return false;
+      if (!internalGetAvatarTeamMap().equals(
+          other.internalGetAvatarTeamMap())) return false;
+      if (getCurAvatarTeamId()
+          != other.getCurAvatarTeamId()) return false;
+      if (!getBackupAvatarTeamOrderListList()
+          .equals(other.getBackupAvatarTeamOrderListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -495,18 +521,20 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getTempAvatarGuidListCount() > 0) {
+        hash = (37 * hash) + TEMP_AVATAR_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTempAvatarGuidListList().hashCode();
+      }
       if (!internalGetAvatarTeamMap().getMap().isEmpty()) {
         hash = (37 * hash) + AVATAR_TEAM_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetAvatarTeamMap().hashCode();
       }
+      hash = (37 * hash) + CUR_AVATAR_TEAM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurAvatarTeamId();
       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;
@@ -603,11 +631,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9854
-     * Obf: HHLJIKIGMOG
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamAllDataNotify}
      */
     public static final class Builder extends
@@ -623,7 +646,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 7:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -634,7 +657,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 7:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -667,10 +690,12 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableAvatarTeamMap().clear();
-        backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        internalGetMutableAvatarTeamMap().clear();
+        curAvatarTeamId_ = 0;
+
+        backupAvatarTeamOrderList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
@@ -699,18 +724,19 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       public emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify result = new emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify(this);
         int from_bitField0_ = bitField0_;
-        result.avatarTeamMap_ = internalGetAvatarTeamMap();
-        result.avatarTeamMap_.makeImmutable();
-        if (((bitField0_ & 0x00000002) != 0)) {
-          backupAvatarTeamOrderList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000001) != 0)) {
           tempAvatarGuidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tempAvatarGuidList_ = tempAvatarGuidList_;
+        result.avatarTeamMap_ = internalGetAvatarTeamMap();
+        result.avatarTeamMap_.makeImmutable();
+        result.curAvatarTeamId_ = curAvatarTeamId_;
+        if (((bitField0_ & 0x00000004) != 0)) {
+          backupAvatarTeamOrderList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.backupAvatarTeamOrderList_ = backupAvatarTeamOrderList_;
         onBuilt();
         return result;
       }
@@ -759,28 +785,31 @@ public final class AvatarTeamAllDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarTeamAllDataNotifyOuterClass.AvatarTeamAllDataNotify.getDefaultInstance()) return this;
-        internalGetMutableAvatarTeamMap().mergeFrom(
-            other.internalGetAvatarTeamMap());
-        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
-          if (backupAvatarTeamOrderList_.isEmpty()) {
-            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureBackupAvatarTeamOrderListIsMutable();
-            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
-          }
-          onChanged();
-        }
         if (!other.tempAvatarGuidList_.isEmpty()) {
           if (tempAvatarGuidList_.isEmpty()) {
             tempAvatarGuidList_ = other.tempAvatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureTempAvatarGuidListIsMutable();
             tempAvatarGuidList_.addAll(other.tempAvatarGuidList_);
           }
           onChanged();
         }
+        internalGetMutableAvatarTeamMap().mergeFrom(
+            other.internalGetAvatarTeamMap());
+        if (other.getCurAvatarTeamId() != 0) {
+          setCurAvatarTeamId(other.getCurAvatarTeamId());
+        }
+        if (!other.backupAvatarTeamOrderList_.isEmpty()) {
+          if (backupAvatarTeamOrderList_.isEmpty()) {
+            backupAvatarTeamOrderList_ = other.backupAvatarTeamOrderList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureBackupAvatarTeamOrderListIsMutable();
+            backupAvatarTeamOrderList_.addAll(other.backupAvatarTeamOrderList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -811,6 +840,85 @@ public final class AvatarTeamAllDataNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.LongList tempAvatarGuidList_ = emptyLongList();
+      private void ensureTempAvatarGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          tempAvatarGuidList_ = mutableCopy(tempAvatarGuidList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @return A list containing the tempAvatarGuidList.
+       */
+      public java.util.List<java.lang.Long>
+          getTempAvatarGuidListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</code>
+       * @return The count of tempAvatarGuidList.
+       */
+      public int getTempAvatarGuidListCount() {
+        return tempAvatarGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 temp_avatar_guid_list = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTempAvatarGuidList() {
+        tempAvatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> avatarTeamMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
@@ -838,7 +946,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       @java.lang.Override
@@ -856,7 +964,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -864,7 +972,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -877,7 +985,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       @java.lang.Override
 
@@ -898,7 +1006,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -917,7 +1025,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -929,7 +1037,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 2;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 7;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -939,11 +1047,42 @@ public final class AvatarTeamAllDataNotifyOuterClass {
         return this;
       }
 
+      private int curAvatarTeamId_ ;
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @return The curAvatarTeamId.
+       */
+      @java.lang.Override
+      public int getCurAvatarTeamId() {
+        return curAvatarTeamId_;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @param value The curAvatarTeamId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurAvatarTeamId(int value) {
+        
+        curAvatarTeamId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_avatar_team_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarTeamId() {
+        
+        curAvatarTeamId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList backupAvatarTeamOrderList_ = emptyIntList();
       private void ensureBackupAvatarTeamOrderListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           backupAvatarTeamOrderList_ = mutableCopy(backupAvatarTeamOrderList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000004;
          }
       }
       /**
@@ -952,7 +1091,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        */
       public java.util.List<java.lang.Integer>
           getBackupAvatarTeamOrderListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000004) != 0) ?
                  java.util.Collections.unmodifiableList(backupAvatarTeamOrderList_) : backupAvatarTeamOrderList_;
       }
       /**
@@ -1013,85 +1152,6 @@ public final class AvatarTeamAllDataNotifyOuterClass {
        */
       public Builder clearBackupAvatarTeamOrderList() {
         backupAvatarTeamOrderList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        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 = 8;</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 = 8;</code>
-       * @return The count of tempAvatarGuidList.
-       */
-      public int getTempAvatarGuidListCount() {
-        return tempAvatarGuidList_.size();
-      }
-      /**
-       * <code>repeated uint64 temp_avatar_guid_list = 8;</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 = 8;</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 = 8;</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 = 8;</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 = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTempAvatarGuidList() {
-        tempAvatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -1169,14 +1229,14 @@ public final class AvatarTeamAllDataNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarTeamAllDataNotify.proto\032\020AvatarT" +
-      "eam.proto\"\350\001\n\027AvatarTeamAllDataNotify\022D\n" +
-      "\017avatar_team_map\030\002 \003(\0132+.AvatarTeamAllDa" +
-      "taNotify.AvatarTeamMapEntry\022%\n\035backup_av" +
-      "atar_team_order_list\030\r \003(\r\022\035\n\025temp_avata" +
-      "r_guid_list\030\010 \003(\004\032A\n\022AvatarTeamMapEntry\022" +
-      "\013\n\003key\030\001 \001(\r\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam" +
-      ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
+      "eam.proto\"\204\002\n\027AvatarTeamAllDataNotify\022\035\n" +
+      "\025temp_avatar_guid_list\030\003 \003(\004\022D\n\017avatar_t" +
+      "eam_map\030\007 \003(\0132+.AvatarTeamAllDataNotify." +
+      "AvatarTeamMapEntry\022\032\n\022cur_avatar_team_id" +
+      "\030\n \001(\r\022%\n\035backup_avatar_team_order_list\030" +
+      "\r \003(\r\032A\n\022AvatarTeamMapEntry\022\013\n\003key\030\001 \001(\r" +
+      "\022\032\n\005value\030\002 \001(\0132\013.AvatarTeam:\0028\001B\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1188,7 +1248,7 @@ public final class AvatarTeamAllDataNotifyOuterClass {
     internal_static_AvatarTeamAllDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarTeamAllDataNotify_descriptor,
-        new java.lang.String[] { "AvatarTeamMap", "BackupAvatarTeamOrderList", "TempAvatarGuidList", });
+        new java.lang.String[] { "TempAvatarGuidList", "AvatarTeamMap", "CurAvatarTeamId", "BackupAvatarTeamOrderList", });
     internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_descriptor =
       internal_static_AvatarTeamAllDataNotify_descriptor.getNestedTypes().get(0);
     internal_static_AvatarTeamAllDataNotify_AvatarTeamMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamOuterClass.java
index e0953e8fd..9518f4407 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamOuterClass.java
@@ -19,39 +19,35 @@ public final class AvatarTeamOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The teamName.
      */
     java.lang.String getTeamName();
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The bytes for teamName.
      */
     com.google.protobuf.ByteString
         getTeamNameBytes();
 
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return A list containing the avatarGuidList.
      */
     java.util.List<java.lang.Long> getAvatarGuidListList();
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return The count of avatarGuidList.
      */
     int getAvatarGuidListCount();
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
     long getAvatarGuidList(int index);
   }
   /**
-   * <pre>
-   * Obf: CFFANBDNDEG
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeam}
    */
   public static final class AvatarTeam extends
@@ -99,13 +95,13 @@ public final class AvatarTeamOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 42: {
               java.lang.String s = input.readStringRequireUtf8();
 
               teamName_ = s;
               break;
             }
-            case 32: {
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,7 +109,7 @@ public final class AvatarTeamOuterClass {
               avatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 34: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -161,10 +157,10 @@ public final class AvatarTeamOuterClass {
               emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.class, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam.Builder.class);
     }
 
-    public static final int TEAM_NAME_FIELD_NUMBER = 1;
+    public static final int TEAM_NAME_FIELD_NUMBER = 5;
     private volatile java.lang.Object teamName_;
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The teamName.
      */
     @java.lang.Override
@@ -181,7 +177,7 @@ public final class AvatarTeamOuterClass {
       }
     }
     /**
-     * <code>string team_name = 1;</code>
+     * <code>string team_name = 5;</code>
      * @return The bytes for teamName.
      */
     @java.lang.Override
@@ -199,10 +195,10 @@ public final class AvatarTeamOuterClass {
       }
     }
 
-    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.LongList avatarGuidList_;
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return A list containing the avatarGuidList.
      */
     @java.lang.Override
@@ -211,14 +207,14 @@ public final class AvatarTeamOuterClass {
       return avatarGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @return The count of avatarGuidList.
      */
     public int getAvatarGuidListCount() {
       return avatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 4;</code>
+     * <code>repeated uint64 avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
@@ -243,10 +239,10 @@ public final class AvatarTeamOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, teamName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, teamName_);
       }
       if (getAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -262,7 +258,7 @@ public final class AvatarTeamOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, teamName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, teamName_);
       }
       {
         int dataSize = 0;
@@ -410,10 +406,6 @@ public final class AvatarTeamOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CFFANBDNDEG
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeam}
      */
     public static final class Builder extends
@@ -582,7 +574,7 @@ public final class AvatarTeamOuterClass {
 
       private java.lang.Object teamName_ = "";
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return The teamName.
        */
       public java.lang.String getTeamName() {
@@ -598,7 +590,7 @@ public final class AvatarTeamOuterClass {
         }
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return The bytes for teamName.
        */
       public com.google.protobuf.ByteString
@@ -615,7 +607,7 @@ public final class AvatarTeamOuterClass {
         }
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @param value The teamName to set.
        * @return This builder for chaining.
        */
@@ -630,7 +622,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamName() {
@@ -640,7 +632,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 1;</code>
+       * <code>string team_name = 5;</code>
        * @param value The bytes for teamName to set.
        * @return This builder for chaining.
        */
@@ -664,7 +656,7 @@ public final class AvatarTeamOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return A list containing the avatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -673,14 +665,14 @@ public final class AvatarTeamOuterClass {
                  java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return The count of avatarGuidList.
        */
       public int getAvatarGuidListCount() {
         return avatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param index The index of the element to return.
        * @return The avatarGuidList at the given index.
        */
@@ -688,7 +680,7 @@ public final class AvatarTeamOuterClass {
         return avatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The avatarGuidList to set.
        * @return This builder for chaining.
@@ -701,7 +693,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param value The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -712,7 +704,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @param values The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -725,7 +717,7 @@ public final class AvatarTeamOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 4;</code>
+       * <code>repeated uint64 avatar_guid_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuidList() {
@@ -802,7 +794,7 @@ public final class AvatarTeamOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020AvatarTeam.proto\"9\n\nAvatarTeam\022\021\n\tteam" +
-      "_name\030\001 \001(\t\022\030\n\020avatar_guid_list\030\004 \003(\004B\033\n" +
+      "_name\030\005 \001(\t\022\030\n\020avatar_guid_list\030\n \003(\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/AvatarTeamResonanceInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamResonanceInfoOuterClass.java
index 4a09a2b32..b20592d5b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamResonanceInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTeamResonanceInfoOuterClass.java
@@ -19,56 +19,52 @@ public final class AvatarTeamResonanceInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
-     * @return A list containing the aPADELCPLGE.
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+     * @return A list containing the aJMOCMHLEOI.
      */
-    java.util.List<java.lang.Integer> getAPADELCPLGEList();
+    java.util.List<java.lang.Integer> getAJMOCMHLEOIList();
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
-     * @return The count of aPADELCPLGE.
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+     * @return The count of aJMOCMHLEOI.
      */
-    int getAPADELCPLGECount();
+    int getAJMOCMHLEOICount();
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
      * @param index The index of the element to return.
-     * @return The aPADELCPLGE at the given index.
+     * @return The aJMOCMHLEOI at the given index.
      */
-    int getAPADELCPLGE(int index);
+    int getAJMOCMHLEOI(int index);
 
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return A list containing the dGAGDLKNFFP.
+     */
+    java.util.List<java.lang.Integer> getDGAGDLKNFFPList();
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return The count of dGAGDLKNFFP.
+     */
+    int getDGAGDLKNFFPCount();
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @param index The index of the element to return.
+     * @return The dGAGDLKNFFP at the given index.
+     */
+    int getDGAGDLKNFFP(int index);
+
+    /**
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
-
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return A list containing the gFJMLEAFNBM.
-     */
-    java.util.List<java.lang.Integer> getGFJMLEAFNBMList();
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return The count of gFJMLEAFNBM.
-     */
-    int getGFJMLEAFNBMCount();
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @param index The index of the element to return.
-     * @return The gFJMLEAFNBM at the given index.
-     */
-    int getGFJMLEAFNBM(int index);
   }
   /**
-   * <pre>
-   * Obf: COBALHBKFBJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamResonanceInfo}
    */
   public static final class AvatarTeamResonanceInfo extends
@@ -81,8 +77,8 @@ public final class AvatarTeamResonanceInfoOuterClass {
       super(builder);
     }
     private AvatarTeamResonanceInfo() {
-      aPADELCPLGE_ = emptyIntList();
-      gFJMLEAFNBM_ = emptyIntList();
+      aJMOCMHLEOI_ = emptyIntList();
+      dGAGDLKNFFP_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -117,57 +113,57 @@ public final class AvatarTeamResonanceInfoOuterClass {
               done = true;
               break;
             case 8: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                aPADELCPLGE_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              aPADELCPLGE_.addInt(input.readUInt32());
-              break;
-            }
-            case 10: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                aPADELCPLGE_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                aPADELCPLGE_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 48: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 56: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                gFJMLEAFNBM_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                aJMOCMHLEOI_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              gFJMLEAFNBM_.addInt(input.readUInt32());
+              aJMOCMHLEOI_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                aJMOCMHLEOI_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                aJMOCMHLEOI_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                dGAGDLKNFFP_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              dGAGDLKNFFP_.addInt(input.readUInt32());
+              break;
+            }
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                gFJMLEAFNBM_ = newIntList();
+                dGAGDLKNFFP_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                gFJMLEAFNBM_.addInt(input.readUInt32());
+                dGAGDLKNFFP_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
+            case 120: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -184,10 +180,10 @@ public final class AvatarTeamResonanceInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_.makeImmutable(); // C
+          aJMOCMHLEOI_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_.makeImmutable(); // C
+          dGAGDLKNFFP_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -206,10 +202,10 @@ public final class AvatarTeamResonanceInfoOuterClass {
               emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.class, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder.class);
     }
 
-    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>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -217,38 +213,66 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return entityId_;
     }
 
-    public static final int APADELCPLGE_FIELD_NUMBER = 1;
-    private com.google.protobuf.Internal.IntList aPADELCPLGE_;
+    public static final int AJMOCMHLEOI_FIELD_NUMBER = 7;
+    private com.google.protobuf.Internal.IntList aJMOCMHLEOI_;
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
-     * @return A list containing the aPADELCPLGE.
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+     * @return A list containing the aJMOCMHLEOI.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getAPADELCPLGEList() {
-      return aPADELCPLGE_;
+        getAJMOCMHLEOIList() {
+      return aJMOCMHLEOI_;
     }
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
-     * @return The count of aPADELCPLGE.
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+     * @return The count of aJMOCMHLEOI.
      */
-    public int getAPADELCPLGECount() {
-      return aPADELCPLGE_.size();
+    public int getAJMOCMHLEOICount() {
+      return aJMOCMHLEOI_.size();
     }
     /**
-     * <code>repeated uint32 APADELCPLGE = 1;</code>
+     * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
      * @param index The index of the element to return.
-     * @return The aPADELCPLGE at the given index.
+     * @return The aJMOCMHLEOI at the given index.
      */
-    public int getAPADELCPLGE(int index) {
-      return aPADELCPLGE_.getInt(index);
+    public int getAJMOCMHLEOI(int index) {
+      return aJMOCMHLEOI_.getInt(index);
     }
-    private int aPADELCPLGEMemoizedSerializedSize = -1;
+    private int aJMOCMHLEOIMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
+    public static final int DGAGDLKNFFP_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList dGAGDLKNFFP_;
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return A list containing the dGAGDLKNFFP.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getDGAGDLKNFFPList() {
+      return dGAGDLKNFFP_;
+    }
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @return The count of dGAGDLKNFFP.
+     */
+    public int getDGAGDLKNFFPCount() {
+      return dGAGDLKNFFP_.size();
+    }
+    /**
+     * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+     * @param index The index of the element to return.
+     * @return The dGAGDLKNFFP at the given index.
+     */
+    public int getDGAGDLKNFFP(int index) {
+      return dGAGDLKNFFP_.getInt(index);
+    }
+    private int dGAGDLKNFFPMemoizedSerializedSize = -1;
+
+    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 6;</code>
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -256,34 +280,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return avatarGuid_;
     }
 
-    public static final int GFJMLEAFNBM_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList gFJMLEAFNBM_;
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return A list containing the gFJMLEAFNBM.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getGFJMLEAFNBMList() {
-      return gFJMLEAFNBM_;
-    }
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @return The count of gFJMLEAFNBM.
-     */
-    public int getGFJMLEAFNBMCount() {
-      return gFJMLEAFNBM_.size();
-    }
-    /**
-     * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-     * @param index The index of the element to return.
-     * @return The gFJMLEAFNBM at the given index.
-     */
-    public int getGFJMLEAFNBM(int index) {
-      return gFJMLEAFNBM_.getInt(index);
-    }
-    private int gFJMLEAFNBMMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -299,25 +295,25 @@ public final class AvatarTeamResonanceInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getAPADELCPLGEList().size() > 0) {
-        output.writeUInt32NoTag(10);
-        output.writeUInt32NoTag(aPADELCPLGEMemoizedSerializedSize);
+      if (entityId_ != 0) {
+        output.writeUInt32(1, entityId_);
       }
-      for (int i = 0; i < aPADELCPLGE_.size(); i++) {
-        output.writeUInt32NoTag(aPADELCPLGE_.getInt(i));
+      if (getAJMOCMHLEOIList().size() > 0) {
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(aJMOCMHLEOIMemoizedSerializedSize);
+      }
+      for (int i = 0; i < aJMOCMHLEOI_.size(); i++) {
+        output.writeUInt32NoTag(aJMOCMHLEOI_.getInt(i));
+      }
+      if (getDGAGDLKNFFPList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(dGAGDLKNFFPMemoizedSerializedSize);
+      }
+      for (int i = 0; i < dGAGDLKNFFP_.size(); i++) {
+        output.writeUInt32NoTag(dGAGDLKNFFP_.getInt(i));
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(6, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
-      }
-      if (getGFJMLEAFNBMList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(gFJMLEAFNBMMemoizedSerializedSize);
-      }
-      for (int i = 0; i < gFJMLEAFNBM_.size(); i++) {
-        output.writeUInt32NoTag(gFJMLEAFNBM_.getInt(i));
+        output.writeUInt64(15, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -328,41 +324,41 @@ public final class AvatarTeamResonanceInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, entityId_);
+      }
       {
         int dataSize = 0;
-        for (int i = 0; i < aPADELCPLGE_.size(); i++) {
+        for (int i = 0; i < aJMOCMHLEOI_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(aPADELCPLGE_.getInt(i));
+            .computeUInt32SizeNoTag(aJMOCMHLEOI_.getInt(i));
         }
         size += dataSize;
-        if (!getAPADELCPLGEList().isEmpty()) {
+        if (!getAJMOCMHLEOIList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        aPADELCPLGEMemoizedSerializedSize = dataSize;
+        aJMOCMHLEOIMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < dGAGDLKNFFP_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dGAGDLKNFFP_.getInt(i));
+        }
+        size += dataSize;
+        if (!getDGAGDLKNFFPList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        dGAGDLKNFFPMemoizedSerializedSize = dataSize;
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, avatarGuid_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < gFJMLEAFNBM_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(gFJMLEAFNBM_.getInt(i));
-        }
-        size += dataSize;
-        if (!getGFJMLEAFNBMList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        gFJMLEAFNBMMemoizedSerializedSize = dataSize;
+          .computeUInt64Size(15, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -381,12 +377,12 @@ public final class AvatarTeamResonanceInfoOuterClass {
 
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (!getAPADELCPLGEList()
-          .equals(other.getAPADELCPLGEList())) return false;
+      if (!getAJMOCMHLEOIList()
+          .equals(other.getAJMOCMHLEOIList())) return false;
+      if (!getDGAGDLKNFFPList()
+          .equals(other.getDGAGDLKNFFPList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (!getGFJMLEAFNBMList()
-          .equals(other.getGFJMLEAFNBMList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -400,17 +396,17 @@ public final class AvatarTeamResonanceInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      if (getAPADELCPLGECount() > 0) {
-        hash = (37 * hash) + APADELCPLGE_FIELD_NUMBER;
-        hash = (53 * hash) + getAPADELCPLGEList().hashCode();
+      if (getAJMOCMHLEOICount() > 0) {
+        hash = (37 * hash) + AJMOCMHLEOI_FIELD_NUMBER;
+        hash = (53 * hash) + getAJMOCMHLEOIList().hashCode();
+      }
+      if (getDGAGDLKNFFPCount() > 0) {
+        hash = (37 * hash) + DGAGDLKNFFP_FIELD_NUMBER;
+        hash = (53 * hash) + getDGAGDLKNFFPList().hashCode();
       }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      if (getGFJMLEAFNBMCount() > 0) {
-        hash = (37 * hash) + GFJMLEAFNBM_FIELD_NUMBER;
-        hash = (53 * hash) + getGFJMLEAFNBMList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -507,10 +503,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: COBALHBKFBJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamResonanceInfo}
      */
     public static final class Builder extends
@@ -550,12 +542,12 @@ public final class AvatarTeamResonanceInfoOuterClass {
         super.clear();
         entityId_ = 0;
 
-        aPADELCPLGE_ = emptyIntList();
+        aJMOCMHLEOI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        dGAGDLKNFFP_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         avatarGuid_ = 0L;
 
-        gFJMLEAFNBM_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -585,16 +577,16 @@ public final class AvatarTeamResonanceInfoOuterClass {
         int from_bitField0_ = bitField0_;
         result.entityId_ = entityId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_.makeImmutable();
+          aJMOCMHLEOI_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.aPADELCPLGE_ = aPADELCPLGE_;
-        result.avatarGuid_ = avatarGuid_;
+        result.aJMOCMHLEOI_ = aJMOCMHLEOI_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_.makeImmutable();
+          dGAGDLKNFFP_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.gFJMLEAFNBM_ = gFJMLEAFNBM_;
+        result.dGAGDLKNFFP_ = dGAGDLKNFFP_;
+        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -646,29 +638,29 @@ public final class AvatarTeamResonanceInfoOuterClass {
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (!other.aPADELCPLGE_.isEmpty()) {
-          if (aPADELCPLGE_.isEmpty()) {
-            aPADELCPLGE_ = other.aPADELCPLGE_;
+        if (!other.aJMOCMHLEOI_.isEmpty()) {
+          if (aJMOCMHLEOI_.isEmpty()) {
+            aJMOCMHLEOI_ = other.aJMOCMHLEOI_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureAPADELCPLGEIsMutable();
-            aPADELCPLGE_.addAll(other.aPADELCPLGE_);
+            ensureAJMOCMHLEOIIsMutable();
+            aJMOCMHLEOI_.addAll(other.aJMOCMHLEOI_);
+          }
+          onChanged();
+        }
+        if (!other.dGAGDLKNFFP_.isEmpty()) {
+          if (dGAGDLKNFFP_.isEmpty()) {
+            dGAGDLKNFFP_ = other.dGAGDLKNFFP_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureDGAGDLKNFFPIsMutable();
+            dGAGDLKNFFP_.addAll(other.dGAGDLKNFFP_);
           }
           onChanged();
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (!other.gFJMLEAFNBM_.isEmpty()) {
-          if (gFJMLEAFNBM_.isEmpty()) {
-            gFJMLEAFNBM_ = other.gFJMLEAFNBM_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureGFJMLEAFNBMIsMutable();
-            gFJMLEAFNBM_.addAll(other.gFJMLEAFNBM_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -701,7 +693,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -709,7 +701,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -720,7 +712,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 7;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -730,88 +722,167 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList aPADELCPLGE_ = emptyIntList();
-      private void ensureAPADELCPLGEIsMutable() {
+      private com.google.protobuf.Internal.IntList aJMOCMHLEOI_ = emptyIntList();
+      private void ensureAJMOCMHLEOIIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          aPADELCPLGE_ = mutableCopy(aPADELCPLGE_);
+          aJMOCMHLEOI_ = mutableCopy(aJMOCMHLEOI_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
-       * @return A list containing the aPADELCPLGE.
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+       * @return A list containing the aJMOCMHLEOI.
        */
       public java.util.List<java.lang.Integer>
-          getAPADELCPLGEList() {
+          getAJMOCMHLEOIList() {
         return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(aPADELCPLGE_) : aPADELCPLGE_;
+                 java.util.Collections.unmodifiableList(aJMOCMHLEOI_) : aJMOCMHLEOI_;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
-       * @return The count of aPADELCPLGE.
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+       * @return The count of aJMOCMHLEOI.
        */
-      public int getAPADELCPLGECount() {
-        return aPADELCPLGE_.size();
+      public int getAJMOCMHLEOICount() {
+        return aJMOCMHLEOI_.size();
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @param index The index of the element to return.
-       * @return The aPADELCPLGE at the given index.
+       * @return The aJMOCMHLEOI at the given index.
        */
-      public int getAPADELCPLGE(int index) {
-        return aPADELCPLGE_.getInt(index);
+      public int getAJMOCMHLEOI(int index) {
+        return aJMOCMHLEOI_.getInt(index);
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @param index The index to set the value at.
-       * @param value The aPADELCPLGE to set.
+       * @param value The aJMOCMHLEOI to set.
        * @return This builder for chaining.
        */
-      public Builder setAPADELCPLGE(
+      public Builder setAJMOCMHLEOI(
           int index, int value) {
-        ensureAPADELCPLGEIsMutable();
-        aPADELCPLGE_.setInt(index, value);
+        ensureAJMOCMHLEOIIsMutable();
+        aJMOCMHLEOI_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
-       * @param value The aPADELCPLGE to add.
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+       * @param value The aJMOCMHLEOI to add.
        * @return This builder for chaining.
        */
-      public Builder addAPADELCPLGE(int value) {
-        ensureAPADELCPLGEIsMutable();
-        aPADELCPLGE_.addInt(value);
+      public Builder addAJMOCMHLEOI(int value) {
+        ensureAJMOCMHLEOIIsMutable();
+        aJMOCMHLEOI_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
-       * @param values The aPADELCPLGE to add.
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
+       * @param values The aJMOCMHLEOI to add.
        * @return This builder for chaining.
        */
-      public Builder addAllAPADELCPLGE(
+      public Builder addAllAJMOCMHLEOI(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureAPADELCPLGEIsMutable();
+        ensureAJMOCMHLEOIIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, aPADELCPLGE_);
+            values, aJMOCMHLEOI_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 APADELCPLGE = 1;</code>
+       * <code>repeated uint32 AJMOCMHLEOI = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAPADELCPLGE() {
-        aPADELCPLGE_ = emptyIntList();
+      public Builder clearAJMOCMHLEOI() {
+        aJMOCMHLEOI_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
+      private com.google.protobuf.Internal.IntList dGAGDLKNFFP_ = emptyIntList();
+      private void ensureDGAGDLKNFFPIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          dGAGDLKNFFP_ = mutableCopy(dGAGDLKNFFP_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return A list containing the dGAGDLKNFFP.
+       */
+      public java.util.List<java.lang.Integer>
+          getDGAGDLKNFFPList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(dGAGDLKNFFP_) : dGAGDLKNFFP_;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return The count of dGAGDLKNFFP.
+       */
+      public int getDGAGDLKNFFPCount() {
+        return dGAGDLKNFFP_.size();
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param index The index of the element to return.
+       * @return The dGAGDLKNFFP at the given index.
+       */
+      public int getDGAGDLKNFFP(int index) {
+        return dGAGDLKNFFP_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The dGAGDLKNFFP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDGAGDLKNFFP(
+          int index, int value) {
+        ensureDGAGDLKNFFPIsMutable();
+        dGAGDLKNFFP_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param value The dGAGDLKNFFP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addDGAGDLKNFFP(int value) {
+        ensureDGAGDLKNFFPIsMutable();
+        dGAGDLKNFFP_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @param values The dGAGDLKNFFP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllDGAGDLKNFFP(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureDGAGDLKNFFPIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, dGAGDLKNFFP_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DGAGDLKNFFP = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDGAGDLKNFFP() {
+        dGAGDLKNFFP_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -819,7 +890,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -830,7 +901,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 6;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -839,85 +910,6 @@ public final class AvatarTeamResonanceInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList gFJMLEAFNBM_ = emptyIntList();
-      private void ensureGFJMLEAFNBMIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          gFJMLEAFNBM_ = mutableCopy(gFJMLEAFNBM_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return A list containing the gFJMLEAFNBM.
-       */
-      public java.util.List<java.lang.Integer>
-          getGFJMLEAFNBMList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(gFJMLEAFNBM_) : gFJMLEAFNBM_;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return The count of gFJMLEAFNBM.
-       */
-      public int getGFJMLEAFNBMCount() {
-        return gFJMLEAFNBM_.size();
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param index The index of the element to return.
-       * @return The gFJMLEAFNBM at the given index.
-       */
-      public int getGFJMLEAFNBM(int index) {
-        return gFJMLEAFNBM_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The gFJMLEAFNBM to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGFJMLEAFNBM(
-          int index, int value) {
-        ensureGFJMLEAFNBMIsMutable();
-        gFJMLEAFNBM_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param value The gFJMLEAFNBM to add.
-       * @return This builder for chaining.
-       */
-      public Builder addGFJMLEAFNBM(int value) {
-        ensureGFJMLEAFNBMIsMutable();
-        gFJMLEAFNBM_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @param values The gFJMLEAFNBM to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllGFJMLEAFNBM(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureGFJMLEAFNBMIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, gFJMLEAFNBM_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 GFJMLEAFNBM = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGFJMLEAFNBM() {
-        gFJMLEAFNBM_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -986,9 +978,9 @@ public final class AvatarTeamResonanceInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035AvatarTeamResonanceInfo.proto\"k\n\027Avata" +
-      "rTeamResonanceInfo\022\021\n\tentity_id\030\007 \001(\r\022\023\n" +
-      "\013APADELCPLGE\030\001 \003(\r\022\023\n\013avatar_guid\030\006 \001(\004\022" +
-      "\023\n\013GFJMLEAFNBM\030\016 \003(\rB\033\n\031emu.grasscutter." +
+      "rTeamResonanceInfo\022\021\n\tentity_id\030\001 \001(\r\022\023\n" +
+      "\013AJMOCMHLEOI\030\007 \003(\r\022\023\n\013DGAGDLKNFFP\030\013 \003(\r\022" +
+      "\023\n\013avatar_guid\030\017 \001(\004B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1000,7 +992,7 @@ public final class AvatarTeamResonanceInfoOuterClass {
     internal_static_AvatarTeamResonanceInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarTeamResonanceInfo_descriptor,
-        new java.lang.String[] { "EntityId", "APADELCPLGE", "AvatarGuid", "GFJMLEAFNBM", });
+        new java.lang.String[] { "EntityId", "AJMOCMHLEOI", "DGAGDLKNFFP", "AvatarGuid", });
   }
 
   // @@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 c3dac6830..181330ed7 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,28 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     java.util.List<java.lang.Long> getTempAvatarGuidListList();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return The count of tempAvatarGuidList.
      */
     int getTempAvatarGuidListCount();
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</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 = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     int getAvatarTeamMapCount();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     boolean containsAvatarTeamMap(
         int key);
@@ -51,30 +51,25 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam>
     getAvatarTeamMapMap();
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</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 = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam getAvatarTeamMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 7828
-   * Obf: OLBHAPJCKDM
-   * </pre>
-   *
    * Protobuf type {@code AvatarTeamUpdateNotify}
    */
   public static final class AvatarTeamUpdateNotify extends
@@ -121,20 +116,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
-              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;
-            }
-            case 112: {
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tempAvatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -142,7 +124,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               tempAvatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 114: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -155,6 +137,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 98: {
+              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)) {
@@ -187,7 +182,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 12:
           return internalGetAvatarTeamMap();
         default:
           throw new RuntimeException(
@@ -202,10 +197,10 @@ public final class AvatarTeamUpdateNotifyOuterClass {
               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 = 14;
+    public static final int TEMP_AVATAR_GUID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.LongList tempAvatarGuidList_;
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return A list containing the tempAvatarGuidList.
      */
     @java.lang.Override
@@ -214,14 +209,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return tempAvatarGuidList_;
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @return The count of tempAvatarGuidList.
      */
     public int getTempAvatarGuidListCount() {
       return tempAvatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+     * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The tempAvatarGuidList at the given index.
      */
@@ -230,7 +225,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     }
     private int tempAvatarGuidListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 3;
+    public static final int AVATAR_TEAM_MAP_FIELD_NUMBER = 12;
     private static final class AvatarTeamMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AvatarTeamOuterClass.AvatarTeam> defaultEntry =
@@ -257,7 +252,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
 
     @java.lang.Override
@@ -275,7 +270,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return getAvatarTeamMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -283,7 +278,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return internalGetAvatarTeamMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -296,7 +291,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+     * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
      */
     @java.lang.Override
 
@@ -326,19 +321,19 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetAvatarTeamMap(),
-          AvatarTeamMapDefaultEntryHolder.defaultEntry,
-          3);
       if (getTempAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(tempAvatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
         output.writeUInt64NoTag(tempAvatarGuidList_.getLong(i));
       }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetAvatarTeamMap(),
+          AvatarTeamMapDefaultEntryHolder.defaultEntry,
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -348,16 +343,6 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      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(3, avatarTeamMap__);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < tempAvatarGuidList_.size(); i++) {
@@ -372,6 +357,16 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         }
         tempAvatarGuidListMemoizedSerializedSize = 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(12, avatarTeamMap__);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -506,11 +501,6 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7828
-     * Obf: OLBHAPJCKDM
-     * </pre>
-     *
      * Protobuf type {@code AvatarTeamUpdateNotify}
      */
     public static final class Builder extends
@@ -526,7 +516,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 12:
             return internalGetAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -537,7 +527,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 12:
             return internalGetMutableAvatarTeamMap();
           default:
             throw new RuntimeException(
@@ -705,7 +695,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return A list containing the tempAvatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -714,14 +704,14 @@ public final class AvatarTeamUpdateNotifyOuterClass {
                  java.util.Collections.unmodifiableList(tempAvatarGuidList_) : tempAvatarGuidList_;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return The count of tempAvatarGuidList.
        */
       public int getTempAvatarGuidListCount() {
         return tempAvatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param index The index of the element to return.
        * @return The tempAvatarGuidList at the given index.
        */
@@ -729,7 +719,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return tempAvatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The tempAvatarGuidList to set.
        * @return This builder for chaining.
@@ -742,7 +732,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param value The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -753,7 +743,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @param values The tempAvatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -766,7 +756,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 temp_avatar_guid_list = 14;</code>
+       * <code>repeated uint64 temp_avatar_guid_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTempAvatarGuidList() {
@@ -803,7 +793,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       @java.lang.Override
@@ -821,7 +811,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return getAvatarTeamMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -829,7 +819,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetAvatarTeamMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -842,7 +832,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       @java.lang.Override
 
@@ -863,7 +853,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       public Builder removeAvatarTeamMap(
@@ -882,7 +872,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return internalGetMutableAvatarTeamMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
       public Builder putAvatarTeamMap(
           int key,
@@ -894,7 +884,7 @@ public final class AvatarTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 3;</code>
+       * <code>map&lt;uint32, .AvatarTeam&gt; avatar_team_map = 12;</code>
        */
 
       public Builder putAllAvatarTeamMap(
@@ -977,8 +967,8 @@ public final class AvatarTeamUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034AvatarTeamUpdateNotify.proto\032\020AvatarTe" +
       "am.proto\"\277\001\n\026AvatarTeamUpdateNotify\022\035\n\025t" +
-      "emp_avatar_guid_list\030\016 \003(\004\022C\n\017avatar_tea" +
-      "m_map\030\003 \003(\0132*.AvatarTeamUpdateNotify.Ava" +
+      "emp_avatar_guid_list\030\n \003(\004\022C\n\017avatar_tea" +
+      "m_map\030\014 \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/AvatarTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTypeOuterClass.java
index 903f3a51c..f5bc32754 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class AvatarTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OPLFNKHAOBP
-   * </pre>
-   *
    * Protobuf enum {@code AvatarType}
    */
   public enum AvatarType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java
index 2e665ab92..a3bc0f866 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUnlockTalentNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 talent_id = 3;</code>
-     * @return The talentId.
-     */
-    int getTalentId();
-
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>uint32 skill_depot_id = 8;</code>
+     * <code>uint32 skill_depot_id = 1;</code>
      * @return The skillDepotId.
      */
     int getSkillDepotId();
 
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>uint32 talent_id = 14;</code>
+     * @return The talentId.
+     */
+    int getTalentId();
   }
   /**
-   * <pre>
-   * CmdId: 1805
-   * Obf: KNLJFLHONOK
-   * </pre>
-   *
    * Protobuf type {@code AvatarUnlockTalentNotify}
    */
   public static final class AvatarUnlockTalentNotify extends
@@ -94,22 +89,22 @@ public final class AvatarUnlockTalentNotifyOuterClass {
               break;
             case 8: {
 
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              talentId_ = input.readUInt32();
+              skillDepotId_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              skillDepotId_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 80: {
 
-              avatarGuid_ = input.readUInt64();
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              talentId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,32 +139,10 @@ public final class AvatarUnlockTalentNotifyOuterClass {
               emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.class, emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.Builder.class);
     }
 
-    public static final int TALENT_ID_FIELD_NUMBER = 3;
-    private int talentId_;
-    /**
-     * <code>uint32 talent_id = 3;</code>
-     * @return The talentId.
-     */
-    @java.lang.Override
-    public int getTalentId() {
-      return talentId_;
-    }
-
-    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 SKILL_DEPOT_ID_FIELD_NUMBER = 8;
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 1;
     private int skillDepotId_;
     /**
-     * <code>uint32 skill_depot_id = 8;</code>
+     * <code>uint32 skill_depot_id = 1;</code>
      * @return The skillDepotId.
      */
     @java.lang.Override
@@ -177,10 +150,21 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return skillDepotId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 1;</code>
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -188,6 +172,17 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return entityId_;
     }
 
+    public static final int TALENT_ID_FIELD_NUMBER = 14;
+    private int talentId_;
+    /**
+     * <code>uint32 talent_id = 14;</code>
+     * @return The talentId.
+     */
+    @java.lang.Override
+    public int getTalentId() {
+      return talentId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class AvatarUnlockTalentNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(1, entityId_);
-      }
-      if (talentId_ != 0) {
-        output.writeUInt32(3, talentId_);
-      }
       if (skillDepotId_ != 0) {
-        output.writeUInt32(8, skillDepotId_);
+        output.writeUInt32(1, skillDepotId_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(10, entityId_);
+      }
+      if (talentId_ != 0) {
+        output.writeUInt32(14, talentId_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, entityId_);
-      }
-      if (talentId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, talentId_);
-      }
       if (skillDepotId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, skillDepotId_);
+          .computeUInt32Size(1, skillDepotId_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, entityId_);
+      }
+      if (talentId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, talentId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +249,14 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       }
       emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other = (emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify) obj;
 
-      if (getTalentId()
-          != other.getTalentId()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getSkillDepotId()
           != other.getSkillDepotId()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (getTalentId()
+          != other.getTalentId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +268,15 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TALENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTalentId();
+      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + TALENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTalentId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1805
-     * Obf: KNLJFLHONOK
-     * </pre>
-     *
      * Protobuf type {@code AvatarUnlockTalentNotify}
      */
     public static final class Builder extends
@@ -420,14 +410,14 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        talentId_ = 0;
+        skillDepotId_ = 0;
 
         avatarGuid_ = 0L;
 
-        skillDepotId_ = 0;
-
         entityId_ = 0;
 
+        talentId_ = 0;
+
         return this;
       }
 
@@ -454,10 +444,10 @@ public final class AvatarUnlockTalentNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify buildPartial() {
         emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify result = new emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify(this);
-        result.talentId_ = talentId_;
-        result.avatarGuid_ = avatarGuid_;
         result.skillDepotId_ = skillDepotId_;
+        result.avatarGuid_ = avatarGuid_;
         result.entityId_ = entityId_;
+        result.talentId_ = talentId_;
         onBuilt();
         return result;
       }
@@ -506,18 +496,18 @@ public final class AvatarUnlockTalentNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify other) {
         if (other == emu.grasscutter.net.proto.AvatarUnlockTalentNotifyOuterClass.AvatarUnlockTalentNotify.getDefaultInstance()) return this;
-        if (other.getTalentId() != 0) {
-          setTalentId(other.getTalentId());
+        if (other.getSkillDepotId() != 0) {
+          setSkillDepotId(other.getSkillDepotId());
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getSkillDepotId() != 0) {
-          setSkillDepotId(other.getSkillDepotId());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.getTalentId() != 0) {
+          setTalentId(other.getTalentId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,71 +537,9 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
 
-      private int talentId_ ;
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @return The talentId.
-       */
-      @java.lang.Override
-      public int getTalentId() {
-        return talentId_;
-      }
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @param value The talentId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTalentId(int value) {
-        
-        talentId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 talent_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTalentId() {
-        
-        talentId_ = 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 skillDepotId_ ;
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @return The skillDepotId.
        */
       @java.lang.Override
@@ -619,7 +547,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return skillDepotId_;
       }
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @param value The skillDepotId to set.
        * @return This builder for chaining.
        */
@@ -630,7 +558,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_depot_id = 8;</code>
+       * <code>uint32 skill_depot_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillDepotId() {
@@ -640,9 +568,40 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 8;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 8;</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 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -650,7 +609,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -661,7 +620,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 1;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -670,6 +629,37 @@ public final class AvatarUnlockTalentNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int talentId_ ;
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @return The talentId.
+       */
+      @java.lang.Override
+      public int getTalentId() {
+        return talentId_;
+      }
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @param value The talentId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTalentId(int value) {
+        
+        talentId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 talent_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTalentId() {
+        
+        talentId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +728,9 @@ public final class AvatarUnlockTalentNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036AvatarUnlockTalentNotify.proto\"m\n\030Avat" +
-      "arUnlockTalentNotify\022\021\n\ttalent_id\030\003 \001(\r\022" +
-      "\023\n\013avatar_guid\030\t \001(\004\022\026\n\016skill_depot_id\030\010" +
-      " \001(\r\022\021\n\tentity_id\030\001 \001(\rB\033\n\031emu.grasscutt" +
+      "arUnlockTalentNotify\022\026\n\016skill_depot_id\030\001" +
+      " \001(\r\022\023\n\013avatar_guid\030\010 \001(\004\022\021\n\tentity_id\030\n" +
+      " \001(\r\022\021\n\ttalent_id\030\016 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class AvatarUnlockTalentNotifyOuterClass {
     internal_static_AvatarUnlockTalentNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUnlockTalentNotify_descriptor,
-        new java.lang.String[] { "TalentId", "AvatarGuid", "SkillDepotId", "EntityId", });
+        new java.lang.String[] { "SkillDepotId", "AvatarGuid", "EntityId", "TalentId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java
index 5ea7080c3..35f0dcc20 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeReqOuterClass.java
@@ -19,27 +19,38 @@ public final class AvatarUpgradeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 item_id = 5;</code>
-     * @return The itemId.
+     * <code>repeated .ItemParam item_param_list = 13;</code>
      */
-    int getItemId();
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getItemParamListList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    int getItemParamListCount();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index);
 
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <code>uint64 avatar_guid = 9;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
-
-    /**
-     * <code>uint32 count = 1;</code>
-     * @return The count.
-     */
-    int getCount();
   }
   /**
    * <pre>
-   * CmdId: 28204
-   * Obf: CFIFEHLBHPM
+   * CmdId: 1568
    * </pre>
    *
    * Protobuf type {@code AvatarUpgradeReq}
@@ -54,6 +65,7 @@ public final class AvatarUpgradeReqOuterClass {
       super(builder);
     }
     private AvatarUpgradeReq() {
+      itemParamList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -76,6 +88,7 @@ public final class AvatarUpgradeReqOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -86,21 +99,20 @@ public final class AvatarUpgradeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              count_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              itemId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
+            case 72: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              itemParamList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -116,6 +128,9 @@ public final class AvatarUpgradeReqOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -133,21 +148,50 @@ public final class AvatarUpgradeReqOuterClass {
               emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.class, emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.Builder.class);
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 5;
-    private int itemId_;
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 13;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
     /**
-     * <code>uint32 item_id = 5;</code>
-     * @return The itemId.
+     * <code>repeated .ItemParam item_param_list = 13;</code>
      */
     @java.lang.Override
-    public int getItemId() {
-      return itemId_;
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public int getItemParamListCount() {
+      return itemParamList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+      return itemParamList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index) {
+      return itemParamList_.get(index);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 10;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 10;</code>
+     * <code>uint64 avatar_guid = 9;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -155,17 +199,6 @@ public final class AvatarUpgradeReqOuterClass {
       return avatarGuid_;
     }
 
-    public static final int COUNT_FIELD_NUMBER = 1;
-    private int count_;
-    /**
-     * <code>uint32 count = 1;</code>
-     * @return The count.
-     */
-    @java.lang.Override
-    public int getCount() {
-      return count_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +213,11 @@ public final class AvatarUpgradeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (count_ != 0) {
-        output.writeUInt32(1, count_);
-      }
-      if (itemId_ != 0) {
-        output.writeUInt32(5, itemId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(10, avatarGuid_);
+        output.writeUInt64(9, avatarGuid_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        output.writeMessage(13, itemParamList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +228,13 @@ public final class AvatarUpgradeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (count_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, count_);
-      }
-      if (itemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, itemId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, avatarGuid_);
+          .computeUInt64Size(9, avatarGuid_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, itemParamList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +251,10 @@ public final class AvatarUpgradeReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other = (emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq) obj;
 
-      if (getItemId()
-          != other.getItemId()) return false;
+      if (!getItemParamListList()
+          .equals(other.getItemParamListList())) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
-      if (getCount()
-          != other.getCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +266,13 @@ public final class AvatarUpgradeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getItemId();
+      if (getItemParamListCount() > 0) {
+        hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getItemParamListList().hashCode();
+      }
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getCount();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,8 +370,7 @@ public final class AvatarUpgradeReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 28204
-     * Obf: CFIFEHLBHPM
+     * CmdId: 1568
      * </pre>
      *
      * Protobuf type {@code AvatarUpgradeReq}
@@ -382,17 +405,20 @@ public final class AvatarUpgradeReqOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getItemParamListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        itemId_ = 0;
-
+        if (itemParamListBuilder_ == null) {
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          itemParamListBuilder_.clear();
+        }
         avatarGuid_ = 0L;
 
-        count_ = 0;
-
         return this;
       }
 
@@ -419,9 +445,17 @@ public final class AvatarUpgradeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq buildPartial() {
         emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq result = new emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq(this);
-        result.itemId_ = itemId_;
+        int from_bitField0_ = bitField0_;
+        if (itemParamListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.itemParamList_ = itemParamList_;
+        } else {
+          result.itemParamList_ = itemParamListBuilder_.build();
+        }
         result.avatarGuid_ = avatarGuid_;
-        result.count_ = count_;
         onBuilt();
         return result;
       }
@@ -470,15 +504,35 @@ public final class AvatarUpgradeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq other) {
         if (other == emu.grasscutter.net.proto.AvatarUpgradeReqOuterClass.AvatarUpgradeReq.getDefaultInstance()) return this;
-        if (other.getItemId() != 0) {
-          setItemId(other.getItemId());
+        if (itemParamListBuilder_ == null) {
+          if (!other.itemParamList_.isEmpty()) {
+            if (itemParamList_.isEmpty()) {
+              itemParamList_ = other.itemParamList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureItemParamListIsMutable();
+              itemParamList_.addAll(other.itemParamList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.itemParamList_.isEmpty()) {
+            if (itemParamListBuilder_.isEmpty()) {
+              itemParamListBuilder_.dispose();
+              itemParamListBuilder_ = null;
+              itemParamList_ = other.itemParamList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              itemParamListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getItemParamListFieldBuilder() : null;
+            } else {
+              itemParamListBuilder_.addAllMessages(other.itemParamList_);
+            }
+          }
         }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
-        if (other.getCount() != 0) {
-          setCount(other.getCount());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,41 +561,251 @@ public final class AvatarUpgradeReqOuterClass {
         }
         return this;
       }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
+        java.util.Collections.emptyList();
+      private void ensureItemParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
 
-      private int itemId_ ;
       /**
-       * <code>uint32 item_id = 5;</code>
-       * @return The itemId.
+       * <code>repeated .ItemParam item_param_list = 13;</code>
        */
-      @java.lang.Override
-      public int getItemId() {
-        return itemId_;
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+        if (itemParamListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        } else {
+          return itemParamListBuilder_.getMessageList();
+        }
       }
       /**
-       * <code>uint32 item_id = 5;</code>
-       * @param value The itemId to set.
-       * @return This builder for chaining.
+       * <code>repeated .ItemParam item_param_list = 13;</code>
        */
-      public Builder setItemId(int value) {
-        
-        itemId_ = value;
-        onChanged();
+      public int getItemParamListCount() {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.size();
+        } else {
+          return itemParamListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);
+        } else {
+          return itemParamListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, value);
+        }
         return this;
       }
       /**
-       * <code>uint32 item_id = 5;</code>
-       * @return This builder for chaining.
+       * <code>repeated .ItemParam item_param_list = 13;</code>
        */
-      public Builder clearItemId() {
-        
-        itemId_ = 0;
-        onChanged();
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, builderForValue.build());
+        }
         return this;
       }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder addAllItemParamList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, itemParamList_);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder clearItemParamList() {
+        if (itemParamListBuilder_ == null) {
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          itemParamListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public Builder removeItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.remove(index);
+          onChanged();
+        } else {
+          itemParamListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+          int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);  } else {
+          return itemParamListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getItemParamListOrBuilderList() {
+        if (itemParamListBuilder_ != null) {
+          return itemParamListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
+        return getItemParamListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getItemParamListBuilderList() {
+        return getItemParamListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getItemParamListFieldBuilder() {
+        if (itemParamListBuilder_ == null) {
+          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  itemParamList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          itemParamList_ = null;
+        }
+        return itemParamListBuilder_;
+      }
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -549,7 +813,7 @@ public final class AvatarUpgradeReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -560,7 +824,7 @@ public final class AvatarUpgradeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 10;</code>
+       * <code>uint64 avatar_guid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -569,37 +833,6 @@ public final class AvatarUpgradeReqOuterClass {
         onChanged();
         return this;
       }
-
-      private int count_ ;
-      /**
-       * <code>uint32 count = 1;</code>
-       * @return The count.
-       */
-      @java.lang.Override
-      public int getCount() {
-        return count_;
-      }
-      /**
-       * <code>uint32 count = 1;</code>
-       * @param value The count to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCount(int value) {
-        
-        count_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 count = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCount() {
-        
-        count_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,21 +900,23 @@ public final class AvatarUpgradeReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026AvatarUpgradeReq.proto\"G\n\020AvatarUpgrad" +
-      "eReq\022\017\n\007item_id\030\005 \001(\r\022\023\n\013avatar_guid\030\n \001" +
-      "(\004\022\r\n\005count\030\001 \001(\rB\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "\n\026AvatarUpgradeReq.proto\032\017ItemParam.prot" +
+      "o\"L\n\020AvatarUpgradeReq\022#\n\017item_param_list" +
+      "\030\r \003(\0132\n.ItemParam\022\023\n\013avatar_guid\030\t \001(\004B" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(),
         });
     internal_static_AvatarUpgradeReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_AvatarUpgradeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUpgradeReq_descriptor,
-        new java.lang.String[] { "ItemId", "AvatarGuid", "Count", });
+        new java.lang.String[] { "ItemParamList", "AvatarGuid", });
+    emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
index 7dc385345..ae0a9c2ba 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarUpgradeRspOuterClass.java
@@ -19,78 +19,16 @@ public final class AvatarUpgradeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_level = 3;</code>
-     * @return The curLevel.
+     * <code>uint64 avatar_guid = 2;</code>
+     * @return The avatarGuid.
      */
-    int getCurLevel();
+    long getAvatarGuid();
 
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
+     * <code>uint32 old_level = 4;</code>
+     * @return The oldLevel.
      */
-    int getCurFightPropMapCount();
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-    boolean containsCurFightPropMap(
-        int key);
-    /**
-     * Use {@link #getCurFightPropMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Float>
-    getCurFightPropMap();
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Float>
-    getCurFightPropMapMap();
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-
-    float getCurFightPropMapOrDefault(
-        int key,
-        float defaultValue);
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-
-    float getCurFightPropMapOrThrow(
-        int key);
-
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    int getOldFightPropMapCount();
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    boolean containsOldFightPropMap(
-        int key);
-    /**
-     * Use {@link #getOldFightPropMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Float>
-    getOldFightPropMap();
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Float>
-    getOldFightPropMapMap();
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-
-    float getOldFightPropMapOrDefault(
-        int key,
-        float defaultValue);
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-
-    float getOldFightPropMapOrThrow(
-        int key);
+    int getOldLevel();
 
     /**
      * <code>int32 retcode = 9;</code>
@@ -99,21 +37,14 @@ public final class AvatarUpgradeRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint32 old_level = 5;</code>
-     * @return The oldLevel.
+     * <code>uint32 cur_level = 12;</code>
+     * @return The curLevel.
      */
-    int getOldLevel();
-
-    /**
-     * <code>uint64 avatar_guid = 14;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
+    int getCurLevel();
   }
   /**
    * <pre>
-   * CmdId: 24216
-   * Obf: GOMCDJDBLPG
+   * CmdId: 512
    * </pre>
    *
    * Protobuf type {@code AvatarUpgradeRsp}
@@ -150,7 +81,6 @@ public final class AvatarUpgradeRspOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -161,50 +91,24 @@ public final class AvatarUpgradeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                curFightPropMap_ = com.google.protobuf.MapField.newMapField(
-                    CurFightPropMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000001;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-              curFightPropMap__ = input.readMessage(
-                  CurFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              curFightPropMap_.getMutableMap().put(
-                  curFightPropMap__.getKey(), curFightPropMap__.getValue());
-              break;
-            }
-            case 24: {
+            case 16: {
 
-              curLevel_ = input.readUInt32();
+              avatarGuid_ = input.readUInt64();
               break;
             }
-            case 40: {
+            case 32: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                oldFightPropMap_ = com.google.protobuf.MapField.newMapField(
-                    OldFightPropMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-              oldFightPropMap__ = input.readMessage(
-                  OldFightPropMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              oldFightPropMap_.getMutableMap().put(
-                  oldFightPropMap__.getKey(), oldFightPropMap__.getValue());
-              break;
-            }
             case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 112: {
+            case 96: {
 
-              avatarGuid_ = input.readUInt64();
+              curLevel_ = input.readUInt32();
               break;
             }
             default: {
@@ -231,20 +135,6 @@ public final class AvatarUpgradeRspOuterClass {
       return emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.internal_static_AvatarUpgradeRsp_descriptor;
     }
 
-    @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
-      switch (number) {
-        case 2:
-          return internalGetCurFightPropMap();
-        case 6:
-          return internalGetOldFightPropMap();
-        default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
-      }
-    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -253,177 +143,26 @@ public final class AvatarUpgradeRspOuterClass {
               emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp.class, emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp.Builder.class);
     }
 
-    public static final int CUR_LEVEL_FIELD_NUMBER = 3;
-    private int curLevel_;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 2;
+    private long avatarGuid_;
     /**
-     * <code>uint32 cur_level = 3;</code>
-     * @return The curLevel.
+     * <code>uint64 avatar_guid = 2;</code>
+     * @return The avatarGuid.
      */
     @java.lang.Override
-    public int getCurLevel() {
-      return curLevel_;
+    public long getAvatarGuid() {
+      return avatarGuid_;
     }
 
-    public static final int CUR_FIGHT_PROP_MAP_FIELD_NUMBER = 2;
-    private static final class CurFightPropMapDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.Integer, java.lang.Float> defaultEntry =
-              com.google.protobuf.MapEntry
-              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
-                  emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0,
-                  com.google.protobuf.WireFormat.FieldType.FLOAT,
-                  0F);
-    }
-    private com.google.protobuf.MapField<
-        java.lang.Integer, java.lang.Float> curFightPropMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-    internalGetCurFightPropMap() {
-      if (curFightPropMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            CurFightPropMapDefaultEntryHolder.defaultEntry);
-      }
-      return curFightPropMap_;
-    }
-
-    public int getCurFightPropMapCount() {
-      return internalGetCurFightPropMap().getMap().size();
-    }
+    public static final int OLD_LEVEL_FIELD_NUMBER = 4;
+    private int oldLevel_;
     /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsCurFightPropMap(
-        int key) {
-      
-      return internalGetCurFightPropMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getCurFightPropMapMap()} instead.
+     * <code>uint32 old_level = 4;</code>
+     * @return The oldLevel.
      */
     @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Float> getCurFightPropMap() {
-      return getCurFightPropMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Float> getCurFightPropMapMap() {
-      return internalGetCurFightPropMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-    @java.lang.Override
-
-    public float getCurFightPropMapOrDefault(
-        int key,
-        float defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Float> map =
-          internalGetCurFightPropMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-     */
-    @java.lang.Override
-
-    public float getCurFightPropMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Float> map =
-          internalGetCurFightPropMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int OLD_FIGHT_PROP_MAP_FIELD_NUMBER = 6;
-    private static final class OldFightPropMapDefaultEntryHolder {
-      static final com.google.protobuf.MapEntry<
-          java.lang.Integer, java.lang.Float> defaultEntry =
-              com.google.protobuf.MapEntry
-              .<java.lang.Integer, java.lang.Float>newDefaultInstance(
-                  emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_descriptor, 
-                  com.google.protobuf.WireFormat.FieldType.UINT32,
-                  0,
-                  com.google.protobuf.WireFormat.FieldType.FLOAT,
-                  0F);
-    }
-    private com.google.protobuf.MapField<
-        java.lang.Integer, java.lang.Float> oldFightPropMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-    internalGetOldFightPropMap() {
-      if (oldFightPropMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            OldFightPropMapDefaultEntryHolder.defaultEntry);
-      }
-      return oldFightPropMap_;
-    }
-
-    public int getOldFightPropMapCount() {
-      return internalGetOldFightPropMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsOldFightPropMap(
-        int key) {
-      
-      return internalGetOldFightPropMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getOldFightPropMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Float> getOldFightPropMap() {
-      return getOldFightPropMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Float> getOldFightPropMapMap() {
-      return internalGetOldFightPropMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public float getOldFightPropMapOrDefault(
-        int key,
-        float defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Float> map =
-          internalGetOldFightPropMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-     */
-    @java.lang.Override
-
-    public float getOldFightPropMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Float> map =
-          internalGetOldFightPropMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
+    public int getOldLevel() {
+      return oldLevel_;
     }
 
     public static final int RETCODE_FIELD_NUMBER = 9;
@@ -437,26 +176,15 @@ public final class AvatarUpgradeRspOuterClass {
       return retcode_;
     }
 
-    public static final int OLD_LEVEL_FIELD_NUMBER = 5;
-    private int oldLevel_;
+    public static final int CUR_LEVEL_FIELD_NUMBER = 12;
+    private int curLevel_;
     /**
-     * <code>uint32 old_level = 5;</code>
-     * @return The oldLevel.
+     * <code>uint32 cur_level = 12;</code>
+     * @return The curLevel.
      */
     @java.lang.Override
-    public int getOldLevel() {
-      return oldLevel_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 14;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 14;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
+    public int getCurLevel() {
+      return curLevel_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -473,29 +201,17 @@ public final class AvatarUpgradeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetCurFightPropMap(),
-          CurFightPropMapDefaultEntryHolder.defaultEntry,
-          2);
-      if (curLevel_ != 0) {
-        output.writeUInt32(3, curLevel_);
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(2, avatarGuid_);
       }
       if (oldLevel_ != 0) {
-        output.writeUInt32(5, oldLevel_);
+        output.writeUInt32(4, oldLevel_);
       }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetOldFightPropMap(),
-          OldFightPropMapDefaultEntryHolder.defaultEntry,
-          6);
       if (retcode_ != 0) {
         output.writeInt32(9, retcode_);
       }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(14, avatarGuid_);
+      if (curLevel_ != 0) {
+        output.writeUInt32(12, curLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -506,41 +222,21 @@ public final class AvatarUpgradeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
-           : internalGetCurFightPropMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-        curFightPropMap__ = CurFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
+      if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2, curFightPropMap__);
-      }
-      if (curLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, curLevel_);
+          .computeUInt64Size(2, avatarGuid_);
       }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, oldLevel_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
-           : internalGetOldFightPropMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
-        oldFightPropMap__ = OldFightPropMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(6, oldFightPropMap__);
+          .computeUInt32Size(4, oldLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(9, retcode_);
       }
-      if (avatarGuid_ != 0L) {
+      if (curLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, avatarGuid_);
+          .computeUInt32Size(12, curLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -557,18 +253,14 @@ public final class AvatarUpgradeRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp other = (emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp) obj;
 
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
-      if (!internalGetCurFightPropMap().equals(
-          other.internalGetCurFightPropMap())) return false;
-      if (!internalGetOldFightPropMap().equals(
-          other.internalGetOldFightPropMap())) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getOldLevel()
-          != other.getOldLevel()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getOldLevel()
+          != other.getOldLevel()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -580,23 +272,15 @@ public final class AvatarUpgradeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
-      if (!internalGetCurFightPropMap().getMap().isEmpty()) {
-        hash = (37 * hash) + CUR_FIGHT_PROP_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetCurFightPropMap().hashCode();
-      }
-      if (!internalGetOldFightPropMap().getMap().isEmpty()) {
-        hash = (37 * hash) + OLD_FIGHT_PROP_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetOldFightPropMap().hashCode();
-      }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldLevel();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -694,8 +378,7 @@ public final class AvatarUpgradeRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 24216
-     * Obf: GOMCDJDBLPG
+     * CmdId: 512
      * </pre>
      *
      * Protobuf type {@code AvatarUpgradeRsp}
@@ -709,32 +392,6 @@ public final class AvatarUpgradeRspOuterClass {
         return emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.internal_static_AvatarUpgradeRsp_descriptor;
       }
 
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMapField(
-          int number) {
-        switch (number) {
-          case 2:
-            return internalGetCurFightPropMap();
-          case 6:
-            return internalGetOldFightPropMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMutableMapField(
-          int number) {
-        switch (number) {
-          case 2:
-            return internalGetMutableCurFightPropMap();
-          case 6:
-            return internalGetMutableOldFightPropMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
@@ -761,15 +418,13 @@ public final class AvatarUpgradeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curLevel_ = 0;
-
-        internalGetMutableCurFightPropMap().clear();
-        internalGetMutableOldFightPropMap().clear();
-        retcode_ = 0;
+        avatarGuid_ = 0L;
 
         oldLevel_ = 0;
 
-        avatarGuid_ = 0L;
+        retcode_ = 0;
+
+        curLevel_ = 0;
 
         return this;
       }
@@ -797,15 +452,10 @@ public final class AvatarUpgradeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp result = new emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp(this);
-        int from_bitField0_ = bitField0_;
-        result.curLevel_ = curLevel_;
-        result.curFightPropMap_ = internalGetCurFightPropMap();
-        result.curFightPropMap_.makeImmutable();
-        result.oldFightPropMap_ = internalGetOldFightPropMap();
-        result.oldFightPropMap_.makeImmutable();
-        result.retcode_ = retcode_;
-        result.oldLevel_ = oldLevel_;
         result.avatarGuid_ = avatarGuid_;
+        result.oldLevel_ = oldLevel_;
+        result.retcode_ = retcode_;
+        result.curLevel_ = curLevel_;
         onBuilt();
         return result;
       }
@@ -854,21 +504,17 @@ public final class AvatarUpgradeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarUpgradeRspOuterClass.AvatarUpgradeRsp.getDefaultInstance()) return this;
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
-        internalGetMutableCurFightPropMap().mergeFrom(
-            other.internalGetCurFightPropMap());
-        internalGetMutableOldFightPropMap().mergeFrom(
-            other.internalGetOldFightPropMap());
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
         }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -898,292 +544,66 @@ public final class AvatarUpgradeRspOuterClass {
         }
         return this;
       }
-      private int bitField0_;
 
-      private int curLevel_ ;
+      private long avatarGuid_ ;
       /**
-       * <code>uint32 cur_level = 3;</code>
-       * @return The curLevel.
+       * <code>uint64 avatar_guid = 2;</code>
+       * @return The avatarGuid.
        */
       @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
+      public long getAvatarGuid() {
+        return avatarGuid_;
       }
       /**
-       * <code>uint32 cur_level = 3;</code>
-       * @param value The curLevel to set.
+       * <code>uint64 avatar_guid = 2;</code>
+       * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
-      public Builder setCurLevel(int value) {
+      public Builder setAvatarGuid(long value) {
         
-        curLevel_ = value;
+        avatarGuid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_level = 3;</code>
+       * <code>uint64 avatar_guid = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurLevel() {
+      public Builder clearAvatarGuid() {
         
-        curLevel_ = 0;
+        avatarGuid_ = 0L;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Float> curFightPropMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-      internalGetCurFightPropMap() {
-        if (curFightPropMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              CurFightPropMapDefaultEntryHolder.defaultEntry);
-        }
-        return curFightPropMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-      internalGetMutableCurFightPropMap() {
-        onChanged();;
-        if (curFightPropMap_ == null) {
-          curFightPropMap_ = com.google.protobuf.MapField.newMapField(
-              CurFightPropMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!curFightPropMap_.isMutable()) {
-          curFightPropMap_ = curFightPropMap_.copy();
-        }
-        return curFightPropMap_;
-      }
-
-      public int getCurFightPropMapCount() {
-        return internalGetCurFightPropMap().getMap().size();
+      private int oldLevel_ ;
+      /**
+       * <code>uint32 old_level = 4;</code>
+       * @return The oldLevel.
+       */
+      @java.lang.Override
+      public int getOldLevel() {
+        return oldLevel_;
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
+       * <code>uint32 old_level = 4;</code>
+       * @param value The oldLevel to set.
+       * @return This builder for chaining.
        */
-
-      @java.lang.Override
-      public boolean containsCurFightPropMap(
-          int key) {
+      public Builder setOldLevel(int value) {
         
-        return internalGetCurFightPropMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getCurFightPropMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float> getCurFightPropMap() {
-        return getCurFightPropMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Float> getCurFightPropMapMap() {
-        return internalGetCurFightPropMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-       */
-      @java.lang.Override
-
-      public float getCurFightPropMapOrDefault(
-          int key,
-          float defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Float> map =
-            internalGetCurFightPropMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-       */
-      @java.lang.Override
-
-      public float getCurFightPropMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Float> map =
-            internalGetCurFightPropMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearCurFightPropMap() {
-        internalGetMutableCurFightPropMap().getMutableMap()
-            .clear();
+        oldLevel_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
+       * <code>uint32 old_level = 4;</code>
+       * @return This builder for chaining.
        */
-
-      public Builder removeCurFightPropMap(
-          int key) {
+      public Builder clearOldLevel() {
         
-        internalGetMutableCurFightPropMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float>
-      getMutableCurFightPropMap() {
-        return internalGetMutableCurFightPropMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-       */
-      public Builder putCurFightPropMap(
-          int key,
-          float value) {
-        
-        
-        internalGetMutableCurFightPropMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; cur_fight_prop_map = 2;</code>
-       */
-
-      public Builder putAllCurFightPropMap(
-          java.util.Map<java.lang.Integer, java.lang.Float> values) {
-        internalGetMutableCurFightPropMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Float> oldFightPropMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-      internalGetOldFightPropMap() {
-        if (oldFightPropMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              OldFightPropMapDefaultEntryHolder.defaultEntry);
-        }
-        return oldFightPropMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
-      internalGetMutableOldFightPropMap() {
-        onChanged();;
-        if (oldFightPropMap_ == null) {
-          oldFightPropMap_ = com.google.protobuf.MapField.newMapField(
-              OldFightPropMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!oldFightPropMap_.isMutable()) {
-          oldFightPropMap_ = oldFightPropMap_.copy();
-        }
-        return oldFightPropMap_;
-      }
-
-      public int getOldFightPropMapCount() {
-        return internalGetOldFightPropMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsOldFightPropMap(
-          int key) {
-        
-        return internalGetOldFightPropMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getOldFightPropMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float> getOldFightPropMap() {
-        return getOldFightPropMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Float> getOldFightPropMapMap() {
-        return internalGetOldFightPropMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public float getOldFightPropMapOrDefault(
-          int key,
-          float defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Float> map =
-            internalGetOldFightPropMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-      @java.lang.Override
-
-      public float getOldFightPropMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Float> map =
-            internalGetOldFightPropMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearOldFightPropMap() {
-        internalGetMutableOldFightPropMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-
-      public Builder removeOldFightPropMap(
-          int key) {
-        
-        internalGetMutableOldFightPropMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Float>
-      getMutableOldFightPropMap() {
-        return internalGetMutableOldFightPropMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-      public Builder putOldFightPropMap(
-          int key,
-          float value) {
-        
-        
-        internalGetMutableOldFightPropMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, float&gt; old_fight_prop_map = 6;</code>
-       */
-
-      public Builder putAllOldFightPropMap(
-          java.util.Map<java.lang.Integer, java.lang.Float> values) {
-        internalGetMutableOldFightPropMap().getMutableMap()
-            .putAll(values);
+        oldLevel_ = 0;
+        onChanged();
         return this;
       }
 
@@ -1218,64 +638,33 @@ public final class AvatarUpgradeRspOuterClass {
         return this;
       }
 
-      private int oldLevel_ ;
+      private int curLevel_ ;
       /**
-       * <code>uint32 old_level = 5;</code>
-       * @return The oldLevel.
+       * <code>uint32 cur_level = 12;</code>
+       * @return The curLevel.
        */
       @java.lang.Override
-      public int getOldLevel() {
-        return oldLevel_;
+      public int getCurLevel() {
+        return curLevel_;
       }
       /**
-       * <code>uint32 old_level = 5;</code>
-       * @param value The oldLevel to set.
+       * <code>uint32 cur_level = 12;</code>
+       * @param value The curLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setOldLevel(int value) {
+      public Builder setCurLevel(int value) {
         
-        oldLevel_ = value;
+        curLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 old_level = 5;</code>
+       * <code>uint32 cur_level = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOldLevel() {
+      public Builder clearCurLevel() {
         
-        oldLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 14;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <code>uint64 avatar_guid = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 0L;
+        curLevel_ = 0;
         onChanged();
         return this;
       }
@@ -1337,16 +726,6 @@ public final class AvatarUpgradeRspOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_AvatarUpgradeRsp_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1356,17 +735,10 @@ public final class AvatarUpgradeRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026AvatarUpgradeRsp.proto\"\326\002\n\020AvatarUpgra" +
-      "deRsp\022\021\n\tcur_level\030\003 \001(\r\022B\n\022cur_fight_pr" +
-      "op_map\030\002 \003(\0132&.AvatarUpgradeRsp.CurFight" +
-      "PropMapEntry\022B\n\022old_fight_prop_map\030\006 \003(\013" +
-      "2&.AvatarUpgradeRsp.OldFightPropMapEntry" +
-      "\022\017\n\007retcode\030\t \001(\005\022\021\n\told_level\030\005 \001(\r\022\023\n\013" +
-      "avatar_guid\030\016 \001(\004\0326\n\024CurFightPropMapEntr" +
-      "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001\0326\n\024Old" +
-      "FightPropMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
-      "\002 \001(\002:\0028\001B\033\n\031emu.grasscutter.net.protob\006" +
-      "proto3"
+      "\n\026AvatarUpgradeRsp.proto\"^\n\020AvatarUpgrad" +
+      "eRsp\022\023\n\013avatar_guid\030\002 \001(\004\022\021\n\told_level\030\004" +
+      " \001(\r\022\017\n\007retcode\030\t \001(\005\022\021\n\tcur_level\030\014 \001(\r" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1377,19 +749,7 @@ public final class AvatarUpgradeRspOuterClass {
     internal_static_AvatarUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarUpgradeRsp_descriptor,
-        new java.lang.String[] { "CurLevel", "CurFightPropMap", "OldFightPropMap", "Retcode", "OldLevel", "AvatarGuid", });
-    internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_descriptor =
-      internal_static_AvatarUpgradeRsp_descriptor.getNestedTypes().get(0);
-    internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AvatarUpgradeRsp_CurFightPropMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
-    internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_descriptor =
-      internal_static_AvatarUpgradeRsp_descriptor.getNestedTypes().get(1);
-    internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_AvatarUpgradeRsp_OldFightPropMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "AvatarGuid", "OldLevel", "Retcode", "CurLevel", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java
index aa659e7b5..fcc9a9fb5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakReqOuterClass.java
@@ -19,23 +19,18 @@ public final class AvatarWearFlycloakReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 flycloak_id = 7;</code>
-     * @return The flycloakId.
-     */
-    int getFlycloakId();
-
-    /**
-     * <code>uint64 avatar_guid = 1;</code>
+     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
+
+    /**
+     * <code>uint32 flycloak_id = 10;</code>
+     * @return The flycloakId.
+     */
+    int getFlycloakId();
   }
   /**
-   * <pre>
-   * CmdId: 824
-   * Obf: LNDKKJJEFBJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarWearFlycloakReq}
    */
   public static final class AvatarWearFlycloakReq extends
@@ -80,12 +75,12 @@ public final class AvatarWearFlycloakReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 56: {
+            case 80: {
 
               flycloakId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class AvatarWearFlycloakReqOuterClass {
               emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.class, emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.Builder.class);
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 7;
-    private int flycloakId_;
-    /**
-     * <code>uint32 flycloak_id = 7;</code>
-     * @return The flycloakId.
-     */
-    @java.lang.Override
-    public int getFlycloakId() {
-      return flycloakId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 1;</code>
+     * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class AvatarWearFlycloakReqOuterClass {
       return avatarGuid_;
     }
 
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 10;
+    private int flycloakId_;
+    /**
+     * <code>uint32 flycloak_id = 10;</code>
+     * @return The flycloakId.
+     */
+    @java.lang.Override
+    public int getFlycloakId() {
+      return flycloakId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class AvatarWearFlycloakReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(1, avatarGuid_);
+        output.writeUInt64(4, avatarGuid_);
       }
       if (flycloakId_ != 0) {
-        output.writeUInt32(7, flycloakId_);
+        output.writeUInt32(10, flycloakId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class AvatarWearFlycloakReqOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, avatarGuid_);
+          .computeUInt64Size(4, avatarGuid_);
       }
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, flycloakId_);
+          .computeUInt32Size(10, flycloakId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class AvatarWearFlycloakReqOuterClass {
       }
       emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other = (emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq) obj;
 
-      if (getFlycloakId()
-          != other.getFlycloakId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getFlycloakId()
+          != other.getFlycloakId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class AvatarWearFlycloakReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFlycloakId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getFlycloakId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class AvatarWearFlycloakReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 824
-     * Obf: LNDKKJJEFBJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarWearFlycloakReq}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class AvatarWearFlycloakReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        flycloakId_ = 0;
-
         avatarGuid_ = 0L;
 
+        flycloakId_ = 0;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class AvatarWearFlycloakReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq buildPartial() {
         emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq result = new emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq(this);
-        result.flycloakId_ = flycloakId_;
         result.avatarGuid_ = avatarGuid_;
+        result.flycloakId_ = flycloakId_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class AvatarWearFlycloakReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq other) {
         if (other == emu.grasscutter.net.proto.AvatarWearFlycloakReqOuterClass.AvatarWearFlycloakReq.getDefaultInstance()) return this;
-        if (other.getFlycloakId() != 0) {
-          setFlycloakId(other.getFlycloakId());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
+        if (other.getFlycloakId() != 0) {
+          setFlycloakId(other.getFlycloakId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class AvatarWearFlycloakReqOuterClass {
         return this;
       }
 
-      private int flycloakId_ ;
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @return The flycloakId.
-       */
-      @java.lang.Override
-      public int getFlycloakId() {
-        return flycloakId_;
-      }
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @param value The flycloakId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFlycloakId(int value) {
-        
-        flycloakId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 flycloak_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFlycloakId() {
-        
-        flycloakId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class AvatarWearFlycloakReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class AvatarWearFlycloakReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 1;</code>
+       * <code>uint64 avatar_guid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -530,6 +489,37 @@ public final class AvatarWearFlycloakReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int flycloakId_ ;
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @return The flycloakId.
+       */
+      @java.lang.Override
+      public int getFlycloakId() {
+        return flycloakId_;
+      }
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @param value The flycloakId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFlycloakId(int value) {
+        
+        flycloakId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 flycloak_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFlycloakId() {
+        
+        flycloakId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +588,8 @@ public final class AvatarWearFlycloakReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarWearFlycloakReq.proto\"A\n\025AvatarW" +
-      "earFlycloakReq\022\023\n\013flycloak_id\030\007 \001(\r\022\023\n\013a" +
-      "vatar_guid\030\001 \001(\004B\033\n\031emu.grasscutter.net." +
+      "earFlycloakReq\022\023\n\013avatar_guid\030\004 \001(\004\022\023\n\013f" +
+      "lycloak_id\030\n \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class AvatarWearFlycloakReqOuterClass {
     internal_static_AvatarWearFlycloakReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarWearFlycloakReq_descriptor,
-        new java.lang.String[] { "FlycloakId", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "FlycloakId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java
index 2cb876042..52be90b07 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/AvatarWearFlycloakRspOuterClass.java
@@ -19,29 +19,24 @@ public final class AvatarWearFlycloakRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
      */
-    int getRetcode();
+    long getAvatarGuid();
 
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 9;</code>
      * @return The flycloakId.
      */
     int getFlycloakId();
 
     /**
-     * <code>uint64 avatar_guid = 3;</code>
-     * @return The avatarGuid.
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
      */
-    long getAvatarGuid();
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 21633
-   * Obf: BCLNBCGCHKJ
-   * </pre>
-   *
    * Protobuf type {@code AvatarWearFlycloakRsp}
    */
   public static final class AvatarWearFlycloakRsp extends
@@ -86,17 +81,17 @@ public final class AvatarWearFlycloakRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 64: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 48: {
+            case 72: {
 
               flycloakId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -133,21 +128,21 @@ public final class AvatarWearFlycloakRspOuterClass {
               emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.class, emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
-    private int retcode_;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
+    private long avatarGuid_;
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint64 avatar_guid = 8;</code>
+     * @return The avatarGuid.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public long getAvatarGuid() {
+      return avatarGuid_;
     }
 
-    public static final int FLYCLOAK_ID_FIELD_NUMBER = 6;
+    public static final int FLYCLOAK_ID_FIELD_NUMBER = 9;
     private int flycloakId_;
     /**
-     * <code>uint32 flycloak_id = 6;</code>
+     * <code>uint32 flycloak_id = 9;</code>
      * @return The flycloakId.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class AvatarWearFlycloakRspOuterClass {
       return flycloakId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 3;
-    private long avatarGuid_;
+    public static final int RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
     /**
-     * <code>uint64 avatar_guid = 3;</code>
-     * @return The avatarGuid.
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -181,13 +176,13 @@ public final class AvatarWearFlycloakRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(3, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
       }
       if (flycloakId_ != 0) {
-        output.writeUInt32(6, flycloakId_);
+        output.writeUInt32(9, flycloakId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class AvatarWearFlycloakRspOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
       }
       if (flycloakId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, flycloakId_);
+          .computeUInt32Size(9, flycloakId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class AvatarWearFlycloakRspOuterClass {
       }
       emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other = (emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getFlycloakId()
-          != other.getFlycloakId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
+      if (getFlycloakId()
+          != other.getFlycloakId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,13 +237,13 @@ public final class AvatarWearFlycloakRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getFlycloakId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
+      hash = (37 * hash) + FLYCLOAK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getFlycloakId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class AvatarWearFlycloakRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21633
-     * Obf: BCLNBCGCHKJ
-     * </pre>
-     *
      * Protobuf type {@code AvatarWearFlycloakRsp}
      */
     public static final class Builder extends
@@ -387,11 +377,11 @@ public final class AvatarWearFlycloakRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        avatarGuid_ = 0L;
 
         flycloakId_ = 0;
 
-        avatarGuid_ = 0L;
+        retcode_ = 0;
 
         return this;
       }
@@ -419,9 +409,9 @@ public final class AvatarWearFlycloakRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp buildPartial() {
         emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp result = new emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp(this);
-        result.retcode_ = retcode_;
-        result.flycloakId_ = flycloakId_;
         result.avatarGuid_ = avatarGuid_;
+        result.flycloakId_ = flycloakId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -470,14 +460,14 @@ public final class AvatarWearFlycloakRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp other) {
         if (other == emu.grasscutter.net.proto.AvatarWearFlycloakRspOuterClass.AvatarWearFlycloakRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
         }
         if (other.getFlycloakId() != 0) {
           setFlycloakId(other.getFlycloakId());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -508,71 +498,9 @@ public final class AvatarWearFlycloakRspOuterClass {
         return this;
       }
 
-      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 int flycloakId_ ;
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @return The flycloakId.
-       */
-      @java.lang.Override
-      public int getFlycloakId() {
-        return flycloakId_;
-      }
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @param value The flycloakId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFlycloakId(int value) {
-        
-        flycloakId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 flycloak_id = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFlycloakId() {
-        
-        flycloakId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -580,7 +508,7 @@ public final class AvatarWearFlycloakRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -591,7 +519,7 @@ public final class AvatarWearFlycloakRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 3;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -600,6 +528,68 @@ public final class AvatarWearFlycloakRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int flycloakId_ ;
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @return The flycloakId.
+       */
+      @java.lang.Override
+      public int getFlycloakId() {
+        return flycloakId_;
+      }
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @param value The flycloakId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFlycloakId(int value) {
+        
+        flycloakId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 flycloak_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFlycloakId() {
+        
+        flycloakId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</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) {
@@ -668,8 +658,8 @@ public final class AvatarWearFlycloakRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033AvatarWearFlycloakRsp.proto\"R\n\025AvatarW" +
-      "earFlycloakRsp\022\017\n\007retcode\030\n \001(\005\022\023\n\013flycl" +
-      "oak_id\030\006 \001(\r\022\023\n\013avatar_guid\030\003 \001(\004B\033\n\031emu" +
+      "earFlycloakRsp\022\023\n\013avatar_guid\030\010 \001(\004\022\023\n\013f" +
+      "lycloak_id\030\t \001(\r\022\017\n\007retcode\030\r \001(\005B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class AvatarWearFlycloakRspOuterClass {
     internal_static_AvatarWearFlycloakRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_AvatarWearFlycloakRsp_descriptor,
-        new java.lang.String[] { "Retcode", "FlycloakId", "AvatarGuid", });
+        new java.lang.String[] { "AvatarGuid", "FlycloakId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldReqOuterClass.java
index 886007c51..3efeeca37 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldReqOuterClass.java
@@ -19,11 +19,6 @@ public final class BackMyWorldReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 7284
-   * Obf: KMDLHONLMJH
-   * </pre>
-   *
    * Protobuf type {@code BackMyWorldReq}
    */
   public static final class BackMyWorldReq extends
@@ -245,11 +240,6 @@ public final class BackMyWorldReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7284
-     * Obf: KMDLHONLMJH
-     * </pre>
-     *
      * Protobuf type {@code BackMyWorldReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldRspOuterClass.java
index ee93917bc..164449460 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BackMyWorldRspOuterClass.java
@@ -19,17 +19,12 @@ public final class BackMyWorldRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 25964
-   * Obf: CLFDBEPFLAI
-   * </pre>
-   *
    * Protobuf type {@code BackMyWorldRsp}
    */
   public static final class BackMyWorldRsp extends
@@ -74,7 +69,7 @@ public final class BackMyWorldRspOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 24: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class BackMyWorldRspOuterClass {
               emu.grasscutter.net.proto.BackMyWorldRspOuterClass.BackMyWorldRsp.class, emu.grasscutter.net.proto.BackMyWorldRspOuterClass.BackMyWorldRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class BackMyWorldRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(3, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class BackMyWorldRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(3, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class BackMyWorldRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25964
-     * Obf: CLFDBEPFLAI
-     * </pre>
-     *
      * Protobuf type {@code BackMyWorldRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class BackMyWorldRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class BackMyWorldRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class BackMyWorldRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class BackMyWorldRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024BackMyWorldRsp.proto\"!\n\016BackMyWorldRsp" +
-      "\022\017\n\007retcode\030\t \001(\005B\033\n\031emu.grasscutter.net" +
+      "\022\017\n\007retcode\030\003 \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/BatchDelMapMarkReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BatchDelMapMarkReqOuterClass.java
new file mode 100644
index 000000000..77e5ea669
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BatchDelMapMarkReqOuterClass.java
@@ -0,0 +1,844 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: BatchDelMapMarkReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class BatchDelMapMarkReqOuterClass {
+  private BatchDelMapMarkReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface BatchDelMapMarkReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:BatchDelMapMarkReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> 
+        getMarkListList();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index);
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    int getMarkListCount();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+        getMarkListOrBuilderList();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code BatchDelMapMarkReq}
+   */
+  public static final class BatchDelMapMarkReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:BatchDelMapMarkReq)
+      BatchDelMapMarkReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BatchDelMapMarkReq.newBuilder() to construct.
+    private BatchDelMapMarkReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private BatchDelMapMarkReq() {
+      markList_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BatchDelMapMarkReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private BatchDelMapMarkReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              markList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          markList_ = java.util.Collections.unmodifiableList(markList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.internal_static_BatchDelMapMarkReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.internal_static_BatchDelMapMarkReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.class, emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.Builder.class);
+    }
+
+    public static final int MARK_LIST_FIELD_NUMBER = 12;
+    private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_;
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
+      return markList_;
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+        getMarkListOrBuilderList() {
+      return markList_;
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    @java.lang.Override
+    public int getMarkListCount() {
+      return markList_.size();
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
+      return markList_.get(index);
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+        int index) {
+      return markList_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < markList_.size(); i++) {
+        output.writeMessage(12, markList_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < markList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, markList_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq other = (emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq) obj;
+
+      if (!getMarkListList()
+          .equals(other.getMarkListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getMarkListCount() > 0) {
+        hash = (37 * hash) + MARK_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getMarkListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code BatchDelMapMarkReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:BatchDelMapMarkReq)
+        emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.internal_static_BatchDelMapMarkReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.internal_static_BatchDelMapMarkReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.class, emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getMarkListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (markListBuilder_ == null) {
+          markList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          markListBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.internal_static_BatchDelMapMarkReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq build() {
+        emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq buildPartial() {
+        emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq result = new emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq(this);
+        int from_bitField0_ = bitField0_;
+        if (markListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            markList_ = java.util.Collections.unmodifiableList(markList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.markList_ = markList_;
+        } else {
+          result.markList_ = markListBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq) {
+          return mergeFrom((emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq other) {
+        if (other == emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq.getDefaultInstance()) return this;
+        if (markListBuilder_ == null) {
+          if (!other.markList_.isEmpty()) {
+            if (markList_.isEmpty()) {
+              markList_ = other.markList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureMarkListIsMutable();
+              markList_.addAll(other.markList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.markList_.isEmpty()) {
+            if (markListBuilder_.isEmpty()) {
+              markListBuilder_.dispose();
+              markListBuilder_ = null;
+              markList_ = other.markList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              markListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getMarkListFieldBuilder() : null;
+            } else {
+              markListBuilder_.addAllMessages(other.markList_);
+            }
+          }
+        }
+        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.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_ =
+        java.util.Collections.emptyList();
+      private void ensureMarkListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>(markList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markListBuilder_;
+
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
+        if (markListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(markList_);
+        } else {
+          return markListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public int getMarkListCount() {
+        if (markListBuilder_ == null) {
+          return markList_.size();
+        } else {
+          return markListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
+        if (markListBuilder_ == null) {
+          return markList_.get(index);
+        } else {
+          return markListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder setMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.set(index, value);
+          onChanged();
+        } else {
+          markListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder setMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder addMarkList(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.add(value);
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder addMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.add(index, value);
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder addMarkList(
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder addMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder addAllMarkList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> values) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, markList_);
+          onChanged();
+        } else {
+          markListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder clearMarkList() {
+        if (markListBuilder_ == null) {
+          markList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          markListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public Builder removeMarkList(int index) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.remove(index);
+          onChanged();
+        } else {
+          markListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkListBuilder(
+          int index) {
+        return getMarkListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+          int index) {
+        if (markListBuilder_ == null) {
+          return markList_.get(index);  } else {
+          return markListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+           getMarkListOrBuilderList() {
+        if (markListBuilder_ != null) {
+          return markListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(markList_);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder() {
+        return getMarkListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder(
+          int index) {
+        return getMarkListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder> 
+           getMarkListBuilderList() {
+        return getMarkListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+          getMarkListFieldBuilder() {
+        if (markListBuilder_ == null) {
+          markListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder>(
+                  markList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          markList_ = null;
+        }
+        return markListBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:BatchDelMapMarkReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:BatchDelMapMarkReq)
+    private static final emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq();
+    }
+
+    public static emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<BatchDelMapMarkReq>
+        PARSER = new com.google.protobuf.AbstractParser<BatchDelMapMarkReq>() {
+      @java.lang.Override
+      public BatchDelMapMarkReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BatchDelMapMarkReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<BatchDelMapMarkReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BatchDelMapMarkReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BatchDelMapMarkReqOuterClass.BatchDelMapMarkReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_BatchDelMapMarkReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_BatchDelMapMarkReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\030BatchDelMapMarkReq.proto\032\022MapMarkPoint" +
+      ".proto\"6\n\022BatchDelMapMarkReq\022 \n\tmark_lis" +
+      "t\030\014 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor(),
+        });
+    internal_static_BatchDelMapMarkReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_BatchDelMapMarkReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_BatchDelMapMarkReq_descriptor,
+        new java.lang.String[] { "MarkList", });
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BatchDelMapMarkRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BatchDelMapMarkRspOuterClass.java
new file mode 100644
index 000000000..25dcaacd8
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BatchDelMapMarkRspOuterClass.java
@@ -0,0 +1,914 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: BatchDelMapMarkRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class BatchDelMapMarkRspOuterClass {
+  private BatchDelMapMarkRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface BatchDelMapMarkRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:BatchDelMapMarkRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> 
+        getMarkListList();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index);
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    int getMarkListCount();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+        getMarkListOrBuilderList();
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code BatchDelMapMarkRsp}
+   */
+  public static final class BatchDelMapMarkRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:BatchDelMapMarkRsp)
+      BatchDelMapMarkRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BatchDelMapMarkRsp.newBuilder() to construct.
+    private BatchDelMapMarkRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private BatchDelMapMarkRsp() {
+      markList_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BatchDelMapMarkRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private BatchDelMapMarkRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 32: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              markList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          markList_ = java.util.Collections.unmodifiableList(markList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.internal_static_BatchDelMapMarkRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.internal_static_BatchDelMapMarkRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.class, emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.Builder.class);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int MARK_LIST_FIELD_NUMBER = 14;
+    private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_;
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
+      return markList_;
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+        getMarkListOrBuilderList() {
+      return markList_;
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    @java.lang.Override
+    public int getMarkListCount() {
+      return markList_.size();
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
+      return markList_.get(index);
+    }
+    /**
+     * <code>repeated .MapMarkPoint mark_list = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+        int index) {
+      return markList_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (retcode_ != 0) {
+        output.writeInt32(4, retcode_);
+      }
+      for (int i = 0; i < markList_.size(); i++) {
+        output.writeMessage(14, markList_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, retcode_);
+      }
+      for (int i = 0; i < markList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, markList_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp other = (emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp) obj;
+
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!getMarkListList()
+          .equals(other.getMarkListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      if (getMarkListCount() > 0) {
+        hash = (37 * hash) + MARK_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getMarkListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code BatchDelMapMarkRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:BatchDelMapMarkRsp)
+        emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.internal_static_BatchDelMapMarkRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.internal_static_BatchDelMapMarkRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.class, emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getMarkListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        retcode_ = 0;
+
+        if (markListBuilder_ == null) {
+          markList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          markListBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.internal_static_BatchDelMapMarkRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp build() {
+        emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp buildPartial() {
+        emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp result = new emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp(this);
+        int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
+        if (markListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            markList_ = java.util.Collections.unmodifiableList(markList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.markList_ = markList_;
+        } else {
+          result.markList_ = markListBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp other) {
+        if (other == emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (markListBuilder_ == null) {
+          if (!other.markList_.isEmpty()) {
+            if (markList_.isEmpty()) {
+              markList_ = other.markList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureMarkListIsMutable();
+              markList_.addAll(other.markList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.markList_.isEmpty()) {
+            if (markListBuilder_.isEmpty()) {
+              markListBuilder_.dispose();
+              markListBuilder_ = null;
+              markList_ = other.markList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              markListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getMarkListFieldBuilder() : null;
+            } else {
+              markListBuilder_.addAllMessages(other.markList_);
+            }
+          }
+        }
+        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.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_ =
+        java.util.Collections.emptyList();
+      private void ensureMarkListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>(markList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markListBuilder_;
+
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
+        if (markListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(markList_);
+        } else {
+          return markListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public int getMarkListCount() {
+        if (markListBuilder_ == null) {
+          return markList_.size();
+        } else {
+          return markListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
+        if (markListBuilder_ == null) {
+          return markList_.get(index);
+        } else {
+          return markListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder setMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.set(index, value);
+          onChanged();
+        } else {
+          markListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder setMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder addMarkList(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.add(value);
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder addMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
+        if (markListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureMarkListIsMutable();
+          markList_.add(index, value);
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder addMarkList(
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder addMarkList(
+          int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          markListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder addAllMarkList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> values) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, markList_);
+          onChanged();
+        } else {
+          markListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder clearMarkList() {
+        if (markListBuilder_ == null) {
+          markList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          markListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public Builder removeMarkList(int index) {
+        if (markListBuilder_ == null) {
+          ensureMarkListIsMutable();
+          markList_.remove(index);
+          onChanged();
+        } else {
+          markListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkListBuilder(
+          int index) {
+        return getMarkListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
+          int index) {
+        if (markListBuilder_ == null) {
+          return markList_.get(index);  } else {
+          return markListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+           getMarkListOrBuilderList() {
+        if (markListBuilder_ != null) {
+          return markListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(markList_);
+        }
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder() {
+        return getMarkListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder(
+          int index) {
+        return getMarkListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .MapMarkPoint mark_list = 14;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder> 
+           getMarkListBuilderList() {
+        return getMarkListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
+          getMarkListFieldBuilder() {
+        if (markListBuilder_ == null) {
+          markListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder>(
+                  markList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          markList_ = null;
+        }
+        return markListBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:BatchDelMapMarkRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:BatchDelMapMarkRsp)
+    private static final emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp();
+    }
+
+    public static emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<BatchDelMapMarkRsp>
+        PARSER = new com.google.protobuf.AbstractParser<BatchDelMapMarkRsp>() {
+      @java.lang.Override
+      public BatchDelMapMarkRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BatchDelMapMarkRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<BatchDelMapMarkRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BatchDelMapMarkRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BatchDelMapMarkRspOuterClass.BatchDelMapMarkRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_BatchDelMapMarkRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_BatchDelMapMarkRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\030BatchDelMapMarkRsp.proto\032\022MapMarkPoint" +
+      ".proto\"G\n\022BatchDelMapMarkRsp\022\017\n\007retcode\030" +
+      "\004 \001(\005\022 \n\tmark_list\030\016 \003(\0132\r.MapMarkPointB" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor(),
+        });
+    internal_static_BatchDelMapMarkRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_BatchDelMapMarkRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_BatchDelMapMarkRsp_descriptor,
+        new java.lang.String[] { "Retcode", "MarkList", });
+    emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassAllDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassAllDataNotifyOuterClass.java
index 955640b4c..2dac9f530 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassAllDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassAllDataNotifyOuterClass.java
@@ -19,56 +19,69 @@ public final class BattlePassAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>bool have_cur_schedule = 1;</code>
+     * @return The haveCurSchedule.
+     */
+    boolean getHaveCurSchedule();
+
+    /**
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      * @return Whether the curSchedule field is set.
      */
     boolean hasCurSchedule();
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      * @return The curSchedule.
      */
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule();
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      */
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder();
 
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>bool HNDKICJJANM = 8;</code>
+     * @return The hNDKICJJANM.
+     */
+    boolean getHNDKICJJANM();
+
+    /**
+     * <code>bool is_viewed = 9;</code>
+     * @return The isViewed.
+     */
+    boolean getIsViewed();
+
+    /**
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> 
         getMissionListList();
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index);
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     int getMissionListCount();
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
         getMissionListOrBuilderList();
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
         int index);
 
     /**
-     * <code>bool have_cur_schedule = 2;</code>
-     * @return The haveCurSchedule.
+     * <code>uint32 default_reward_type = 13;</code>
+     * @return The defaultRewardType.
      */
-    boolean getHaveCurSchedule();
+    int getDefaultRewardType();
   }
   /**
-   * <pre>
-   * CmdId: 3474
-   * Obf: HDENJJOGGKA
-   * </pre>
-   *
    * Protobuf type {@code BattlePassAllDataNotify}
    */
   public static final class BattlePassAllDataNotify extends
@@ -115,7 +128,12 @@ public final class BattlePassAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 8: {
+
+              haveCurSchedule_ = input.readBool();
+              break;
+            }
+            case 26: {
               emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder subBuilder = null;
               if (curSchedule_ != null) {
                 subBuilder = curSchedule_.toBuilder();
@@ -128,12 +146,17 @@ public final class BattlePassAllDataNotifyOuterClass {
 
               break;
             }
-            case 16: {
+            case 64: {
 
-              haveCurSchedule_ = input.readBool();
+              hNDKICJJANM_ = input.readBool();
               break;
             }
-            case 74: {
+            case 72: {
+
+              isViewed_ = input.readBool();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 missionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission>();
                 mutable_bitField0_ |= 0x00000001;
@@ -142,6 +165,11 @@ public final class BattlePassAllDataNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.parser(), extensionRegistry));
               break;
             }
+            case 104: {
+
+              defaultRewardType_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -177,10 +205,21 @@ public final class BattlePassAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify.class, emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify.Builder.class);
     }
 
-    public static final int CUR_SCHEDULE_FIELD_NUMBER = 1;
+    public static final int HAVE_CUR_SCHEDULE_FIELD_NUMBER = 1;
+    private boolean haveCurSchedule_;
+    /**
+     * <code>bool have_cur_schedule = 1;</code>
+     * @return The haveCurSchedule.
+     */
+    @java.lang.Override
+    public boolean getHaveCurSchedule() {
+      return haveCurSchedule_;
+    }
+
+    public static final int CUR_SCHEDULE_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      * @return Whether the curSchedule field is set.
      */
     @java.lang.Override
@@ -188,7 +227,7 @@ public final class BattlePassAllDataNotifyOuterClass {
       return curSchedule_ != null;
     }
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      * @return The curSchedule.
      */
     @java.lang.Override
@@ -196,24 +235,46 @@ public final class BattlePassAllDataNotifyOuterClass {
       return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
     }
     /**
-     * <code>.BattlePassSchedule cur_schedule = 1;</code>
+     * <code>.BattlePassSchedule cur_schedule = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
       return getCurSchedule();
     }
 
-    public static final int MISSION_LIST_FIELD_NUMBER = 9;
+    public static final int HNDKICJJANM_FIELD_NUMBER = 8;
+    private boolean hNDKICJJANM_;
+    /**
+     * <code>bool HNDKICJJANM = 8;</code>
+     * @return The hNDKICJJANM.
+     */
+    @java.lang.Override
+    public boolean getHNDKICJJANM() {
+      return hNDKICJJANM_;
+    }
+
+    public static final int IS_VIEWED_FIELD_NUMBER = 9;
+    private boolean isViewed_;
+    /**
+     * <code>bool is_viewed = 9;</code>
+     * @return The isViewed.
+     */
+    @java.lang.Override
+    public boolean getIsViewed() {
+      return isViewed_;
+    }
+
+    public static final int MISSION_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> missionList_;
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> getMissionListList() {
       return missionList_;
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
@@ -221,21 +282,21 @@ public final class BattlePassAllDataNotifyOuterClass {
       return missionList_;
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     @java.lang.Override
     public int getMissionListCount() {
       return missionList_.size();
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index) {
       return missionList_.get(index);
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 9;</code>
+     * <code>repeated .BattlePassMission mission_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
@@ -243,15 +304,15 @@ public final class BattlePassAllDataNotifyOuterClass {
       return missionList_.get(index);
     }
 
-    public static final int HAVE_CUR_SCHEDULE_FIELD_NUMBER = 2;
-    private boolean haveCurSchedule_;
+    public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 13;
+    private int defaultRewardType_;
     /**
-     * <code>bool have_cur_schedule = 2;</code>
-     * @return The haveCurSchedule.
+     * <code>uint32 default_reward_type = 13;</code>
+     * @return The defaultRewardType.
      */
     @java.lang.Override
-    public boolean getHaveCurSchedule() {
-      return haveCurSchedule_;
+    public int getDefaultRewardType() {
+      return defaultRewardType_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -268,14 +329,23 @@ public final class BattlePassAllDataNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curSchedule_ != null) {
-        output.writeMessage(1, getCurSchedule());
-      }
       if (haveCurSchedule_ != false) {
-        output.writeBool(2, haveCurSchedule_);
+        output.writeBool(1, haveCurSchedule_);
+      }
+      if (curSchedule_ != null) {
+        output.writeMessage(3, getCurSchedule());
+      }
+      if (hNDKICJJANM_ != false) {
+        output.writeBool(8, hNDKICJJANM_);
+      }
+      if (isViewed_ != false) {
+        output.writeBool(9, isViewed_);
       }
       for (int i = 0; i < missionList_.size(); i++) {
-        output.writeMessage(9, missionList_.get(i));
+        output.writeMessage(12, missionList_.get(i));
+      }
+      if (defaultRewardType_ != 0) {
+        output.writeUInt32(13, defaultRewardType_);
       }
       unknownFields.writeTo(output);
     }
@@ -286,17 +356,29 @@ public final class BattlePassAllDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curSchedule_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getCurSchedule());
-      }
       if (haveCurSchedule_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, haveCurSchedule_);
+          .computeBoolSize(1, haveCurSchedule_);
+      }
+      if (curSchedule_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, getCurSchedule());
+      }
+      if (hNDKICJJANM_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(8, hNDKICJJANM_);
+      }
+      if (isViewed_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isViewed_);
       }
       for (int i = 0; i < missionList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, missionList_.get(i));
+          .computeMessageSize(12, missionList_.get(i));
+      }
+      if (defaultRewardType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, defaultRewardType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,15 +395,21 @@ public final class BattlePassAllDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify other = (emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify) obj;
 
+      if (getHaveCurSchedule()
+          != other.getHaveCurSchedule()) return false;
       if (hasCurSchedule() != other.hasCurSchedule()) return false;
       if (hasCurSchedule()) {
         if (!getCurSchedule()
             .equals(other.getCurSchedule())) return false;
       }
+      if (getHNDKICJJANM()
+          != other.getHNDKICJJANM()) return false;
+      if (getIsViewed()
+          != other.getIsViewed()) return false;
       if (!getMissionListList()
           .equals(other.getMissionListList())) return false;
-      if (getHaveCurSchedule()
-          != other.getHaveCurSchedule()) return false;
+      if (getDefaultRewardType()
+          != other.getDefaultRewardType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -333,17 +421,25 @@ public final class BattlePassAllDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + HAVE_CUR_SCHEDULE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHaveCurSchedule());
       if (hasCurSchedule()) {
         hash = (37 * hash) + CUR_SCHEDULE_FIELD_NUMBER;
         hash = (53 * hash) + getCurSchedule().hashCode();
       }
+      hash = (37 * hash) + HNDKICJJANM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHNDKICJJANM());
+      hash = (37 * hash) + IS_VIEWED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsViewed());
       if (getMissionListCount() > 0) {
         hash = (37 * hash) + MISSION_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMissionListList().hashCode();
       }
-      hash = (37 * hash) + HAVE_CUR_SCHEDULE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getHaveCurSchedule());
+      hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDefaultRewardType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -440,11 +536,6 @@ public final class BattlePassAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3474
-     * Obf: HDENJJOGGKA
-     * </pre>
-     *
      * Protobuf type {@code BattlePassAllDataNotify}
      */
     public static final class Builder extends
@@ -483,19 +574,25 @@ public final class BattlePassAllDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        haveCurSchedule_ = false;
+
         if (curScheduleBuilder_ == null) {
           curSchedule_ = null;
         } else {
           curSchedule_ = null;
           curScheduleBuilder_ = null;
         }
+        hNDKICJJANM_ = false;
+
+        isViewed_ = false;
+
         if (missionListBuilder_ == null) {
           missionList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           missionListBuilder_.clear();
         }
-        haveCurSchedule_ = false;
+        defaultRewardType_ = 0;
 
         return this;
       }
@@ -524,11 +621,14 @@ public final class BattlePassAllDataNotifyOuterClass {
       public emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify buildPartial() {
         emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify result = new emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify(this);
         int from_bitField0_ = bitField0_;
+        result.haveCurSchedule_ = haveCurSchedule_;
         if (curScheduleBuilder_ == null) {
           result.curSchedule_ = curSchedule_;
         } else {
           result.curSchedule_ = curScheduleBuilder_.build();
         }
+        result.hNDKICJJANM_ = hNDKICJJANM_;
+        result.isViewed_ = isViewed_;
         if (missionListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             missionList_ = java.util.Collections.unmodifiableList(missionList_);
@@ -538,7 +638,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         } else {
           result.missionList_ = missionListBuilder_.build();
         }
-        result.haveCurSchedule_ = haveCurSchedule_;
+        result.defaultRewardType_ = defaultRewardType_;
         onBuilt();
         return result;
       }
@@ -587,9 +687,18 @@ public final class BattlePassAllDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify other) {
         if (other == emu.grasscutter.net.proto.BattlePassAllDataNotifyOuterClass.BattlePassAllDataNotify.getDefaultInstance()) return this;
+        if (other.getHaveCurSchedule() != false) {
+          setHaveCurSchedule(other.getHaveCurSchedule());
+        }
         if (other.hasCurSchedule()) {
           mergeCurSchedule(other.getCurSchedule());
         }
+        if (other.getHNDKICJJANM() != false) {
+          setHNDKICJJANM(other.getHNDKICJJANM());
+        }
+        if (other.getIsViewed() != false) {
+          setIsViewed(other.getIsViewed());
+        }
         if (missionListBuilder_ == null) {
           if (!other.missionList_.isEmpty()) {
             if (missionList_.isEmpty()) {
@@ -616,8 +725,8 @@ public final class BattlePassAllDataNotifyOuterClass {
             }
           }
         }
-        if (other.getHaveCurSchedule() != false) {
-          setHaveCurSchedule(other.getHaveCurSchedule());
+        if (other.getDefaultRewardType() != 0) {
+          setDefaultRewardType(other.getDefaultRewardType());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -649,18 +758,49 @@ public final class BattlePassAllDataNotifyOuterClass {
       }
       private int bitField0_;
 
+      private boolean haveCurSchedule_ ;
+      /**
+       * <code>bool have_cur_schedule = 1;</code>
+       * @return The haveCurSchedule.
+       */
+      @java.lang.Override
+      public boolean getHaveCurSchedule() {
+        return haveCurSchedule_;
+      }
+      /**
+       * <code>bool have_cur_schedule = 1;</code>
+       * @param value The haveCurSchedule to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHaveCurSchedule(boolean value) {
+        
+        haveCurSchedule_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool have_cur_schedule = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHaveCurSchedule() {
+        
+        haveCurSchedule_ = false;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> curScheduleBuilder_;
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        * @return Whether the curSchedule field is set.
        */
       public boolean hasCurSchedule() {
         return curScheduleBuilder_ != null || curSchedule_ != null;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        * @return The curSchedule.
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
@@ -671,7 +811,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public Builder setCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
         if (curScheduleBuilder_ == null) {
@@ -687,7 +827,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public Builder setCurSchedule(
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder builderForValue) {
@@ -701,7 +841,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public Builder mergeCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
         if (curScheduleBuilder_ == null) {
@@ -719,7 +859,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public Builder clearCurSchedule() {
         if (curScheduleBuilder_ == null) {
@@ -733,7 +873,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder getCurScheduleBuilder() {
         
@@ -741,7 +881,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return getCurScheduleFieldBuilder().getBuilder();
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
         if (curScheduleBuilder_ != null) {
@@ -752,7 +892,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 1;</code>
+       * <code>.BattlePassSchedule cur_schedule = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> 
@@ -768,6 +908,68 @@ public final class BattlePassAllDataNotifyOuterClass {
         return curScheduleBuilder_;
       }
 
+      private boolean hNDKICJJANM_ ;
+      /**
+       * <code>bool HNDKICJJANM = 8;</code>
+       * @return The hNDKICJJANM.
+       */
+      @java.lang.Override
+      public boolean getHNDKICJJANM() {
+        return hNDKICJJANM_;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 8;</code>
+       * @param value The hNDKICJJANM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHNDKICJJANM(boolean value) {
+        
+        hNDKICJJANM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHNDKICJJANM() {
+        
+        hNDKICJJANM_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isViewed_ ;
+      /**
+       * <code>bool is_viewed = 9;</code>
+       * @return The isViewed.
+       */
+      @java.lang.Override
+      public boolean getIsViewed() {
+        return isViewed_;
+      }
+      /**
+       * <code>bool is_viewed = 9;</code>
+       * @param value The isViewed to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsViewed(boolean value) {
+        
+        isViewed_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_viewed = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsViewed() {
+        
+        isViewed_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> missionList_ =
         java.util.Collections.emptyList();
       private void ensureMissionListIsMutable() {
@@ -781,7 +983,7 @@ public final class BattlePassAllDataNotifyOuterClass {
           emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> missionListBuilder_;
 
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> getMissionListList() {
         if (missionListBuilder_ == null) {
@@ -791,7 +993,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public int getMissionListCount() {
         if (missionListBuilder_ == null) {
@@ -801,7 +1003,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index) {
         if (missionListBuilder_ == null) {
@@ -811,7 +1013,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder setMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
@@ -828,7 +1030,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder setMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -842,7 +1044,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder addMissionList(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
         if (missionListBuilder_ == null) {
@@ -858,7 +1060,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder addMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
@@ -875,7 +1077,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder addMissionList(
           emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -889,7 +1091,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder addMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -903,7 +1105,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder addAllMissionList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> values) {
@@ -918,7 +1120,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder clearMissionList() {
         if (missionListBuilder_ == null) {
@@ -931,7 +1133,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public Builder removeMissionList(int index) {
         if (missionListBuilder_ == null) {
@@ -944,14 +1146,14 @@ public final class BattlePassAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder getMissionListBuilder(
           int index) {
         return getMissionListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
           int index) {
@@ -961,7 +1163,7 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
            getMissionListOrBuilderList() {
@@ -972,14 +1174,14 @@ public final class BattlePassAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder addMissionListBuilder() {
         return getMissionListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance());
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder addMissionListBuilder(
           int index) {
@@ -987,7 +1189,7 @@ public final class BattlePassAllDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance());
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 9;</code>
+       * <code>repeated .BattlePassMission mission_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder> 
            getMissionListBuilderList() {
@@ -1008,33 +1210,33 @@ public final class BattlePassAllDataNotifyOuterClass {
         return missionListBuilder_;
       }
 
-      private boolean haveCurSchedule_ ;
+      private int defaultRewardType_ ;
       /**
-       * <code>bool have_cur_schedule = 2;</code>
-       * @return The haveCurSchedule.
+       * <code>uint32 default_reward_type = 13;</code>
+       * @return The defaultRewardType.
        */
       @java.lang.Override
-      public boolean getHaveCurSchedule() {
-        return haveCurSchedule_;
+      public int getDefaultRewardType() {
+        return defaultRewardType_;
       }
       /**
-       * <code>bool have_cur_schedule = 2;</code>
-       * @param value The haveCurSchedule to set.
+       * <code>uint32 default_reward_type = 13;</code>
+       * @param value The defaultRewardType to set.
        * @return This builder for chaining.
        */
-      public Builder setHaveCurSchedule(boolean value) {
+      public Builder setDefaultRewardType(int value) {
         
-        haveCurSchedule_ = value;
+        defaultRewardType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool have_cur_schedule = 2;</code>
+       * <code>uint32 default_reward_type = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHaveCurSchedule() {
+      public Builder clearDefaultRewardType() {
         
-        haveCurSchedule_ = false;
+        defaultRewardType_ = 0;
         onChanged();
         return this;
       }
@@ -1107,11 +1309,13 @@ public final class BattlePassAllDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035BattlePassAllDataNotify.proto\032\030BattleP" +
       "assSchedule.proto\032\027BattlePassMission.pro" +
-      "to\"\211\001\n\027BattlePassAllDataNotify\022)\n\014cur_sc" +
-      "hedule\030\001 \001(\0132\023.BattlePassSchedule\022(\n\014mis" +
-      "sion_list\030\t \003(\0132\022.BattlePassMission\022\031\n\021h" +
-      "ave_cur_schedule\030\002 \001(\010B\033\n\031emu.grasscutte" +
-      "r.net.protob\006proto3"
+      "to\"\316\001\n\027BattlePassAllDataNotify\022\031\n\021have_c" +
+      "ur_schedule\030\001 \001(\010\022)\n\014cur_schedule\030\003 \001(\0132" +
+      "\023.BattlePassSchedule\022\023\n\013HNDKICJJANM\030\010 \001(" +
+      "\010\022\021\n\tis_viewed\030\t \001(\010\022(\n\014mission_list\030\014 \003" +
+      "(\0132\022.BattlePassMission\022\033\n\023default_reward" +
+      "_type\030\r \001(\rB\033\n\031emu.grasscutter.net.proto" +
+      "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1124,7 +1328,7 @@ public final class BattlePassAllDataNotifyOuterClass {
     internal_static_BattlePassAllDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassAllDataNotify_descriptor,
-        new java.lang.String[] { "CurSchedule", "MissionList", "HaveCurSchedule", });
+        new java.lang.String[] { "HaveCurSchedule", "CurSchedule", "HNDKICJJANM", "IsViewed", "MissionList", "DefaultRewardType", });
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.getDescriptor();
     emu.grasscutter.net.proto.BattlePassMissionOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanReqOuterClass.java
new file mode 100644
index 000000000..c4d153f88
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanReqOuterClass.java
@@ -0,0 +1,609 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: BattlePassChangeRewardPlanReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class BattlePassChangeRewardPlanReqOuterClass {
+  private BattlePassChangeRewardPlanReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface BattlePassChangeRewardPlanReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:BattlePassChangeRewardPlanReq)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool is_all_future_bp = 4;</code>
+     * @return The isAllFutureBp.
+     */
+    boolean getIsAllFutureBp();
+
+    /**
+     * <code>uint32 default_reward_type = 1;</code>
+     * @return The defaultRewardType.
+     */
+    int getDefaultRewardType();
+  }
+  /**
+   * Protobuf type {@code BattlePassChangeRewardPlanReq}
+   */
+  public static final class BattlePassChangeRewardPlanReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:BattlePassChangeRewardPlanReq)
+      BattlePassChangeRewardPlanReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BattlePassChangeRewardPlanReq.newBuilder() to construct.
+    private BattlePassChangeRewardPlanReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private BattlePassChangeRewardPlanReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BattlePassChangeRewardPlanReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private BattlePassChangeRewardPlanReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              defaultRewardType_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+
+              isAllFutureBp_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.internal_static_BattlePassChangeRewardPlanReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.internal_static_BattlePassChangeRewardPlanReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.class, emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.Builder.class);
+    }
+
+    public static final int IS_ALL_FUTURE_BP_FIELD_NUMBER = 4;
+    private boolean isAllFutureBp_;
+    /**
+     * <code>bool is_all_future_bp = 4;</code>
+     * @return The isAllFutureBp.
+     */
+    @java.lang.Override
+    public boolean getIsAllFutureBp() {
+      return isAllFutureBp_;
+    }
+
+    public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 1;
+    private int defaultRewardType_;
+    /**
+     * <code>uint32 default_reward_type = 1;</code>
+     * @return The defaultRewardType.
+     */
+    @java.lang.Override
+    public int getDefaultRewardType() {
+      return defaultRewardType_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (defaultRewardType_ != 0) {
+        output.writeUInt32(1, defaultRewardType_);
+      }
+      if (isAllFutureBp_ != false) {
+        output.writeBool(4, isAllFutureBp_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (defaultRewardType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, defaultRewardType_);
+      }
+      if (isAllFutureBp_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, isAllFutureBp_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq other = (emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq) obj;
+
+      if (getIsAllFutureBp()
+          != other.getIsAllFutureBp()) return false;
+      if (getDefaultRewardType()
+          != other.getDefaultRewardType()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_ALL_FUTURE_BP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsAllFutureBp());
+      hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDefaultRewardType();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code BattlePassChangeRewardPlanReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:BattlePassChangeRewardPlanReq)
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.internal_static_BattlePassChangeRewardPlanReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.internal_static_BattlePassChangeRewardPlanReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.class, emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        isAllFutureBp_ = false;
+
+        defaultRewardType_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.internal_static_BattlePassChangeRewardPlanReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq build() {
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq buildPartial() {
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq result = new emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq(this);
+        result.isAllFutureBp_ = isAllFutureBp_;
+        result.defaultRewardType_ = defaultRewardType_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq) {
+          return mergeFrom((emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq other) {
+        if (other == emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq.getDefaultInstance()) return this;
+        if (other.getIsAllFutureBp() != false) {
+          setIsAllFutureBp(other.getIsAllFutureBp());
+        }
+        if (other.getDefaultRewardType() != 0) {
+          setDefaultRewardType(other.getDefaultRewardType());
+        }
+        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.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean isAllFutureBp_ ;
+      /**
+       * <code>bool is_all_future_bp = 4;</code>
+       * @return The isAllFutureBp.
+       */
+      @java.lang.Override
+      public boolean getIsAllFutureBp() {
+        return isAllFutureBp_;
+      }
+      /**
+       * <code>bool is_all_future_bp = 4;</code>
+       * @param value The isAllFutureBp to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsAllFutureBp(boolean value) {
+        
+        isAllFutureBp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_all_future_bp = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsAllFutureBp() {
+        
+        isAllFutureBp_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int defaultRewardType_ ;
+      /**
+       * <code>uint32 default_reward_type = 1;</code>
+       * @return The defaultRewardType.
+       */
+      @java.lang.Override
+      public int getDefaultRewardType() {
+        return defaultRewardType_;
+      }
+      /**
+       * <code>uint32 default_reward_type = 1;</code>
+       * @param value The defaultRewardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDefaultRewardType(int value) {
+        
+        defaultRewardType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 default_reward_type = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDefaultRewardType() {
+        
+        defaultRewardType_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:BattlePassChangeRewardPlanReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:BattlePassChangeRewardPlanReq)
+    private static final emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq();
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<BattlePassChangeRewardPlanReq>
+        PARSER = new com.google.protobuf.AbstractParser<BattlePassChangeRewardPlanReq>() {
+      @java.lang.Override
+      public BattlePassChangeRewardPlanReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BattlePassChangeRewardPlanReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<BattlePassChangeRewardPlanReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BattlePassChangeRewardPlanReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassChangeRewardPlanReqOuterClass.BattlePassChangeRewardPlanReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_BattlePassChangeRewardPlanReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_BattlePassChangeRewardPlanReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n#BattlePassChangeRewardPlanReq.proto\"V\n" +
+      "\035BattlePassChangeRewardPlanReq\022\030\n\020is_all" +
+      "_future_bp\030\004 \001(\010\022\033\n\023default_reward_type\030" +
+      "\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "o3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_BattlePassChangeRewardPlanReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_BattlePassChangeRewardPlanReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_BattlePassChangeRewardPlanReq_descriptor,
+        new java.lang.String[] { "IsAllFutureBp", "DefaultRewardType", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanRspOuterClass.java
new file mode 100644
index 000000000..1c8f72bd0
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassChangeRewardPlanRspOuterClass.java
@@ -0,0 +1,948 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: BattlePassChangeRewardPlanRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class BattlePassChangeRewardPlanRspOuterClass {
+  private BattlePassChangeRewardPlanRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface BattlePassChangeRewardPlanRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:BattlePassChangeRewardPlanRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool HNDKICJJANM = 4;</code>
+     * @return The hNDKICJJANM.
+     */
+    boolean getHNDKICJJANM();
+
+    /**
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @return A list containing the affectedTierIdList.
+     */
+    java.util.List<java.lang.Integer> getAffectedTierIdListList();
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @return The count of affectedTierIdList.
+     */
+    int getAffectedTierIdListCount();
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The affectedTierIdList at the given index.
+     */
+    int getAffectedTierIdList(int index);
+
+    /**
+     * <code>uint32 default_reward_type = 9;</code>
+     * @return The defaultRewardType.
+     */
+    int getDefaultRewardType();
+
+    /**
+     * <code>bool FKKMIHOEGMG = 12;</code>
+     * @return The fKKMIHOEGMG.
+     */
+    boolean getFKKMIHOEGMG();
+  }
+  /**
+   * Protobuf type {@code BattlePassChangeRewardPlanRsp}
+   */
+  public static final class BattlePassChangeRewardPlanRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:BattlePassChangeRewardPlanRsp)
+      BattlePassChangeRewardPlanRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BattlePassChangeRewardPlanRsp.newBuilder() to construct.
+    private BattlePassChangeRewardPlanRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private BattlePassChangeRewardPlanRsp() {
+      affectedTierIdList_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BattlePassChangeRewardPlanRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private BattlePassChangeRewardPlanRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 32: {
+
+              hNDKICJJANM_ = input.readBool();
+              break;
+            }
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 48: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                affectedTierIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              affectedTierIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 50: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                affectedTierIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                affectedTierIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 72: {
+
+              defaultRewardType_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              fKKMIHOEGMG_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          affectedTierIdList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.internal_static_BattlePassChangeRewardPlanRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.internal_static_BattlePassChangeRewardPlanRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.class, emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.Builder.class);
+    }
+
+    public static final int HNDKICJJANM_FIELD_NUMBER = 4;
+    private boolean hNDKICJJANM_;
+    /**
+     * <code>bool HNDKICJJANM = 4;</code>
+     * @return The hNDKICJJANM.
+     */
+    @java.lang.Override
+    public boolean getHNDKICJJANM() {
+      return hNDKICJJANM_;
+    }
+
+    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 AFFECTED_TIER_ID_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList affectedTierIdList_;
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @return A list containing the affectedTierIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getAffectedTierIdListList() {
+      return affectedTierIdList_;
+    }
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @return The count of affectedTierIdList.
+     */
+    public int getAffectedTierIdListCount() {
+      return affectedTierIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 affected_tier_id_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The affectedTierIdList at the given index.
+     */
+    public int getAffectedTierIdList(int index) {
+      return affectedTierIdList_.getInt(index);
+    }
+    private int affectedTierIdListMemoizedSerializedSize = -1;
+
+    public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 9;
+    private int defaultRewardType_;
+    /**
+     * <code>uint32 default_reward_type = 9;</code>
+     * @return The defaultRewardType.
+     */
+    @java.lang.Override
+    public int getDefaultRewardType() {
+      return defaultRewardType_;
+    }
+
+    public static final int FKKMIHOEGMG_FIELD_NUMBER = 12;
+    private boolean fKKMIHOEGMG_;
+    /**
+     * <code>bool FKKMIHOEGMG = 12;</code>
+     * @return The fKKMIHOEGMG.
+     */
+    @java.lang.Override
+    public boolean getFKKMIHOEGMG() {
+      return fKKMIHOEGMG_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (hNDKICJJANM_ != false) {
+        output.writeBool(4, hNDKICJJANM_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(5, retcode_);
+      }
+      if (getAffectedTierIdListList().size() > 0) {
+        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(affectedTierIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < affectedTierIdList_.size(); i++) {
+        output.writeUInt32NoTag(affectedTierIdList_.getInt(i));
+      }
+      if (defaultRewardType_ != 0) {
+        output.writeUInt32(9, defaultRewardType_);
+      }
+      if (fKKMIHOEGMG_ != false) {
+        output.writeBool(12, fKKMIHOEGMG_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (hNDKICJJANM_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, hNDKICJJANM_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(5, retcode_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < affectedTierIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(affectedTierIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getAffectedTierIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        affectedTierIdListMemoizedSerializedSize = dataSize;
+      }
+      if (defaultRewardType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, defaultRewardType_);
+      }
+      if (fKKMIHOEGMG_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, fKKMIHOEGMG_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp other = (emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp) obj;
+
+      if (getHNDKICJJANM()
+          != other.getHNDKICJJANM()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!getAffectedTierIdListList()
+          .equals(other.getAffectedTierIdListList())) return false;
+      if (getDefaultRewardType()
+          != other.getDefaultRewardType()) return false;
+      if (getFKKMIHOEGMG()
+          != other.getFKKMIHOEGMG()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + HNDKICJJANM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHNDKICJJANM());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      if (getAffectedTierIdListCount() > 0) {
+        hash = (37 * hash) + AFFECTED_TIER_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAffectedTierIdListList().hashCode();
+      }
+      hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDefaultRewardType();
+      hash = (37 * hash) + FKKMIHOEGMG_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getFKKMIHOEGMG());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code BattlePassChangeRewardPlanRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:BattlePassChangeRewardPlanRsp)
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.internal_static_BattlePassChangeRewardPlanRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.internal_static_BattlePassChangeRewardPlanRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.class, emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        hNDKICJJANM_ = false;
+
+        retcode_ = 0;
+
+        affectedTierIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        defaultRewardType_ = 0;
+
+        fKKMIHOEGMG_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.internal_static_BattlePassChangeRewardPlanRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp build() {
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp buildPartial() {
+        emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp result = new emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp(this);
+        int from_bitField0_ = bitField0_;
+        result.hNDKICJJANM_ = hNDKICJJANM_;
+        result.retcode_ = retcode_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          affectedTierIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.affectedTierIdList_ = affectedTierIdList_;
+        result.defaultRewardType_ = defaultRewardType_;
+        result.fKKMIHOEGMG_ = fKKMIHOEGMG_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp other) {
+        if (other == emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp.getDefaultInstance()) return this;
+        if (other.getHNDKICJJANM() != false) {
+          setHNDKICJJANM(other.getHNDKICJJANM());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (!other.affectedTierIdList_.isEmpty()) {
+          if (affectedTierIdList_.isEmpty()) {
+            affectedTierIdList_ = other.affectedTierIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureAffectedTierIdListIsMutable();
+            affectedTierIdList_.addAll(other.affectedTierIdList_);
+          }
+          onChanged();
+        }
+        if (other.getDefaultRewardType() != 0) {
+          setDefaultRewardType(other.getDefaultRewardType());
+        }
+        if (other.getFKKMIHOEGMG() != false) {
+          setFKKMIHOEGMG(other.getFKKMIHOEGMG());
+        }
+        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.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private boolean hNDKICJJANM_ ;
+      /**
+       * <code>bool HNDKICJJANM = 4;</code>
+       * @return The hNDKICJJANM.
+       */
+      @java.lang.Override
+      public boolean getHNDKICJJANM() {
+        return hNDKICJJANM_;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 4;</code>
+       * @param value The hNDKICJJANM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHNDKICJJANM(boolean value) {
+        
+        hNDKICJJANM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHNDKICJJANM() {
+        
+        hNDKICJJANM_ = false;
+        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 com.google.protobuf.Internal.IntList affectedTierIdList_ = emptyIntList();
+      private void ensureAffectedTierIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          affectedTierIdList_ = mutableCopy(affectedTierIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @return A list containing the affectedTierIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getAffectedTierIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(affectedTierIdList_) : affectedTierIdList_;
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @return The count of affectedTierIdList.
+       */
+      public int getAffectedTierIdListCount() {
+        return affectedTierIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @param index The index of the element to return.
+       * @return The affectedTierIdList at the given index.
+       */
+      public int getAffectedTierIdList(int index) {
+        return affectedTierIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @param index The index to set the value at.
+       * @param value The affectedTierIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAffectedTierIdList(
+          int index, int value) {
+        ensureAffectedTierIdListIsMutable();
+        affectedTierIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @param value The affectedTierIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAffectedTierIdList(int value) {
+        ensureAffectedTierIdListIsMutable();
+        affectedTierIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @param values The affectedTierIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllAffectedTierIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureAffectedTierIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, affectedTierIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 affected_tier_id_list = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAffectedTierIdList() {
+        affectedTierIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int defaultRewardType_ ;
+      /**
+       * <code>uint32 default_reward_type = 9;</code>
+       * @return The defaultRewardType.
+       */
+      @java.lang.Override
+      public int getDefaultRewardType() {
+        return defaultRewardType_;
+      }
+      /**
+       * <code>uint32 default_reward_type = 9;</code>
+       * @param value The defaultRewardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDefaultRewardType(int value) {
+        
+        defaultRewardType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 default_reward_type = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDefaultRewardType() {
+        
+        defaultRewardType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean fKKMIHOEGMG_ ;
+      /**
+       * <code>bool FKKMIHOEGMG = 12;</code>
+       * @return The fKKMIHOEGMG.
+       */
+      @java.lang.Override
+      public boolean getFKKMIHOEGMG() {
+        return fKKMIHOEGMG_;
+      }
+      /**
+       * <code>bool FKKMIHOEGMG = 12;</code>
+       * @param value The fKKMIHOEGMG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFKKMIHOEGMG(boolean value) {
+        
+        fKKMIHOEGMG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool FKKMIHOEGMG = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFKKMIHOEGMG() {
+        
+        fKKMIHOEGMG_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:BattlePassChangeRewardPlanRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:BattlePassChangeRewardPlanRsp)
+    private static final emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp();
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<BattlePassChangeRewardPlanRsp>
+        PARSER = new com.google.protobuf.AbstractParser<BattlePassChangeRewardPlanRsp>() {
+      @java.lang.Override
+      public BattlePassChangeRewardPlanRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BattlePassChangeRewardPlanRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<BattlePassChangeRewardPlanRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BattlePassChangeRewardPlanRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassChangeRewardPlanRspOuterClass.BattlePassChangeRewardPlanRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_BattlePassChangeRewardPlanRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_BattlePassChangeRewardPlanRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n#BattlePassChangeRewardPlanRsp.proto\"\226\001" +
+      "\n\035BattlePassChangeRewardPlanRsp\022\023\n\013HNDKI" +
+      "CJJANM\030\004 \001(\010\022\017\n\007retcode\030\005 \001(\005\022\035\n\025affecte" +
+      "d_tier_id_list\030\006 \003(\r\022\033\n\023default_reward_t" +
+      "ype\030\t \001(\r\022\023\n\013FKKMIHOEGMG\030\014 \001(\010B\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_BattlePassChangeRewardPlanRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_BattlePassChangeRewardPlanRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_BattlePassChangeRewardPlanRsp_descriptor,
+        new java.lang.String[] { "HNDKICJJANM", "Retcode", "AffectedTierIdList", "DefaultRewardType", "FKKMIHOEGMG", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCurScheduleUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCurScheduleUpdateNotifyOuterClass.java
index c51c8caf7..dc691b56c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCurScheduleUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCurScheduleUpdateNotifyOuterClass.java
@@ -19,32 +19,45 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>uint32 default_reward_type = 2;</code>
+     * @return The defaultRewardType.
+     */
+    int getDefaultRewardType();
+
+    /**
+     * <code>bool is_viewed = 3;</code>
+     * @return The isViewed.
+     */
+    boolean getIsViewed();
+
+    /**
+     * <code>bool have_cur_schedule = 7;</code>
+     * @return The haveCurSchedule.
+     */
+    boolean getHaveCurSchedule();
+
+    /**
+     * <code>bool HNDKICJJANM = 9;</code>
+     * @return The hNDKICJJANM.
+     */
+    boolean getHNDKICJJANM();
+
+    /**
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      * @return Whether the curSchedule field is set.
      */
     boolean hasCurSchedule();
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      * @return The curSchedule.
      */
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule();
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      */
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder();
-
-    /**
-     * <code>bool have_cur_schedule = 11;</code>
-     * @return The haveCurSchedule.
-     */
-    boolean getHaveCurSchedule();
   }
   /**
-   * <pre>
-   * CmdId: 27464
-   * Obf: AFCLFFABLPC
-   * </pre>
-   *
    * Protobuf type {@code BattlePassCurScheduleUpdateNotify}
    */
   public static final class BattlePassCurScheduleUpdateNotify extends
@@ -89,7 +102,27 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 74: {
+            case 16: {
+
+              defaultRewardType_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              isViewed_ = input.readBool();
+              break;
+            }
+            case 56: {
+
+              haveCurSchedule_ = input.readBool();
+              break;
+            }
+            case 72: {
+
+              hNDKICJJANM_ = input.readBool();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder subBuilder = null;
               if (curSchedule_ != null) {
                 subBuilder = curSchedule_.toBuilder();
@@ -102,11 +135,6 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
 
               break;
             }
-            case 88: {
-
-              haveCurSchedule_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +167,54 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify.class, emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify.Builder.class);
     }
 
-    public static final int CUR_SCHEDULE_FIELD_NUMBER = 9;
+    public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 2;
+    private int defaultRewardType_;
+    /**
+     * <code>uint32 default_reward_type = 2;</code>
+     * @return The defaultRewardType.
+     */
+    @java.lang.Override
+    public int getDefaultRewardType() {
+      return defaultRewardType_;
+    }
+
+    public static final int IS_VIEWED_FIELD_NUMBER = 3;
+    private boolean isViewed_;
+    /**
+     * <code>bool is_viewed = 3;</code>
+     * @return The isViewed.
+     */
+    @java.lang.Override
+    public boolean getIsViewed() {
+      return isViewed_;
+    }
+
+    public static final int HAVE_CUR_SCHEDULE_FIELD_NUMBER = 7;
+    private boolean haveCurSchedule_;
+    /**
+     * <code>bool have_cur_schedule = 7;</code>
+     * @return The haveCurSchedule.
+     */
+    @java.lang.Override
+    public boolean getHaveCurSchedule() {
+      return haveCurSchedule_;
+    }
+
+    public static final int HNDKICJJANM_FIELD_NUMBER = 9;
+    private boolean hNDKICJJANM_;
+    /**
+     * <code>bool HNDKICJJANM = 9;</code>
+     * @return The hNDKICJJANM.
+     */
+    @java.lang.Override
+    public boolean getHNDKICJJANM() {
+      return hNDKICJJANM_;
+    }
+
+    public static final int CUR_SCHEDULE_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      * @return Whether the curSchedule field is set.
      */
     @java.lang.Override
@@ -150,7 +222,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       return curSchedule_ != null;
     }
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      * @return The curSchedule.
      */
     @java.lang.Override
@@ -158,24 +230,13 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       return curSchedule_ == null ? emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance() : curSchedule_;
     }
     /**
-     * <code>.BattlePassSchedule cur_schedule = 9;</code>
+     * <code>.BattlePassSchedule cur_schedule = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
       return getCurSchedule();
     }
 
-    public static final int HAVE_CUR_SCHEDULE_FIELD_NUMBER = 11;
-    private boolean haveCurSchedule_;
-    /**
-     * <code>bool have_cur_schedule = 11;</code>
-     * @return The haveCurSchedule.
-     */
-    @java.lang.Override
-    public boolean getHaveCurSchedule() {
-      return haveCurSchedule_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +251,20 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curSchedule_ != null) {
-        output.writeMessage(9, getCurSchedule());
+      if (defaultRewardType_ != 0) {
+        output.writeUInt32(2, defaultRewardType_);
+      }
+      if (isViewed_ != false) {
+        output.writeBool(3, isViewed_);
       }
       if (haveCurSchedule_ != false) {
-        output.writeBool(11, haveCurSchedule_);
+        output.writeBool(7, haveCurSchedule_);
+      }
+      if (hNDKICJJANM_ != false) {
+        output.writeBool(9, hNDKICJJANM_);
+      }
+      if (curSchedule_ != null) {
+        output.writeMessage(12, getCurSchedule());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +275,25 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curSchedule_ != null) {
+      if (defaultRewardType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getCurSchedule());
+          .computeUInt32Size(2, defaultRewardType_);
+      }
+      if (isViewed_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, isViewed_);
       }
       if (haveCurSchedule_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, haveCurSchedule_);
+          .computeBoolSize(7, haveCurSchedule_);
+      }
+      if (hNDKICJJANM_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, hNDKICJJANM_);
+      }
+      if (curSchedule_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getCurSchedule());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +310,19 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify other = (emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify) obj;
 
+      if (getDefaultRewardType()
+          != other.getDefaultRewardType()) return false;
+      if (getIsViewed()
+          != other.getIsViewed()) return false;
+      if (getHaveCurSchedule()
+          != other.getHaveCurSchedule()) return false;
+      if (getHNDKICJJANM()
+          != other.getHNDKICJJANM()) return false;
       if (hasCurSchedule() != other.hasCurSchedule()) return false;
       if (hasCurSchedule()) {
         if (!getCurSchedule()
             .equals(other.getCurSchedule())) return false;
       }
-      if (getHaveCurSchedule()
-          != other.getHaveCurSchedule()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,13 +334,21 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDefaultRewardType();
+      hash = (37 * hash) + IS_VIEWED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsViewed());
+      hash = (37 * hash) + HAVE_CUR_SCHEDULE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHaveCurSchedule());
+      hash = (37 * hash) + HNDKICJJANM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHNDKICJJANM());
       if (hasCurSchedule()) {
         hash = (37 * hash) + CUR_SCHEDULE_FIELD_NUMBER;
         hash = (53 * hash) + getCurSchedule().hashCode();
       }
-      hash = (37 * hash) + HAVE_CUR_SCHEDULE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getHaveCurSchedule());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -349,11 +445,6 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27464
-     * Obf: AFCLFFABLPC
-     * </pre>
-     *
      * Protobuf type {@code BattlePassCurScheduleUpdateNotify}
      */
     public static final class Builder extends
@@ -391,14 +482,20 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        defaultRewardType_ = 0;
+
+        isViewed_ = false;
+
+        haveCurSchedule_ = false;
+
+        hNDKICJJANM_ = false;
+
         if (curScheduleBuilder_ == null) {
           curSchedule_ = null;
         } else {
           curSchedule_ = null;
           curScheduleBuilder_ = null;
         }
-        haveCurSchedule_ = false;
-
         return this;
       }
 
@@ -425,12 +522,15 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify result = new emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify(this);
+        result.defaultRewardType_ = defaultRewardType_;
+        result.isViewed_ = isViewed_;
+        result.haveCurSchedule_ = haveCurSchedule_;
+        result.hNDKICJJANM_ = hNDKICJJANM_;
         if (curScheduleBuilder_ == null) {
           result.curSchedule_ = curSchedule_;
         } else {
           result.curSchedule_ = curScheduleBuilder_.build();
         }
-        result.haveCurSchedule_ = haveCurSchedule_;
         onBuilt();
         return result;
       }
@@ -479,12 +579,21 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.BattlePassCurScheduleUpdateNotifyOuterClass.BattlePassCurScheduleUpdateNotify.getDefaultInstance()) return this;
-        if (other.hasCurSchedule()) {
-          mergeCurSchedule(other.getCurSchedule());
+        if (other.getDefaultRewardType() != 0) {
+          setDefaultRewardType(other.getDefaultRewardType());
+        }
+        if (other.getIsViewed() != false) {
+          setIsViewed(other.getIsViewed());
         }
         if (other.getHaveCurSchedule() != false) {
           setHaveCurSchedule(other.getHaveCurSchedule());
         }
+        if (other.getHNDKICJJANM() != false) {
+          setHNDKICJJANM(other.getHNDKICJJANM());
+        }
+        if (other.hasCurSchedule()) {
+          mergeCurSchedule(other.getCurSchedule());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -514,18 +623,142 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return this;
       }
 
+      private int defaultRewardType_ ;
+      /**
+       * <code>uint32 default_reward_type = 2;</code>
+       * @return The defaultRewardType.
+       */
+      @java.lang.Override
+      public int getDefaultRewardType() {
+        return defaultRewardType_;
+      }
+      /**
+       * <code>uint32 default_reward_type = 2;</code>
+       * @param value The defaultRewardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDefaultRewardType(int value) {
+        
+        defaultRewardType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 default_reward_type = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDefaultRewardType() {
+        
+        defaultRewardType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isViewed_ ;
+      /**
+       * <code>bool is_viewed = 3;</code>
+       * @return The isViewed.
+       */
+      @java.lang.Override
+      public boolean getIsViewed() {
+        return isViewed_;
+      }
+      /**
+       * <code>bool is_viewed = 3;</code>
+       * @param value The isViewed to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsViewed(boolean value) {
+        
+        isViewed_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_viewed = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsViewed() {
+        
+        isViewed_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean haveCurSchedule_ ;
+      /**
+       * <code>bool have_cur_schedule = 7;</code>
+       * @return The haveCurSchedule.
+       */
+      @java.lang.Override
+      public boolean getHaveCurSchedule() {
+        return haveCurSchedule_;
+      }
+      /**
+       * <code>bool have_cur_schedule = 7;</code>
+       * @param value The haveCurSchedule to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHaveCurSchedule(boolean value) {
+        
+        haveCurSchedule_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool have_cur_schedule = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHaveCurSchedule() {
+        
+        haveCurSchedule_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean hNDKICJJANM_ ;
+      /**
+       * <code>bool HNDKICJJANM = 9;</code>
+       * @return The hNDKICJJANM.
+       */
+      @java.lang.Override
+      public boolean getHNDKICJJANM() {
+        return hNDKICJJANM_;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 9;</code>
+       * @param value The hNDKICJJANM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHNDKICJJANM(boolean value) {
+        
+        hNDKICJJANM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HNDKICJJANM = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHNDKICJJANM() {
+        
+        hNDKICJJANM_ = false;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule curSchedule_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> curScheduleBuilder_;
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        * @return Whether the curSchedule field is set.
        */
       public boolean hasCurSchedule() {
         return curScheduleBuilder_ != null || curSchedule_ != null;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        * @return The curSchedule.
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule getCurSchedule() {
@@ -536,7 +769,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public Builder setCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
         if (curScheduleBuilder_ == null) {
@@ -552,7 +785,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public Builder setCurSchedule(
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder builderForValue) {
@@ -566,7 +799,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public Builder mergeCurSchedule(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule value) {
         if (curScheduleBuilder_ == null) {
@@ -584,7 +817,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public Builder clearCurSchedule() {
         if (curScheduleBuilder_ == null) {
@@ -598,7 +831,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder getCurScheduleBuilder() {
         
@@ -606,7 +839,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         return getCurScheduleFieldBuilder().getBuilder();
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder getCurScheduleOrBuilder() {
         if (curScheduleBuilder_ != null) {
@@ -617,7 +850,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>.BattlePassSchedule cur_schedule = 9;</code>
+       * <code>.BattlePassSchedule cur_schedule = 12;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassScheduleOrBuilder> 
@@ -632,37 +865,6 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
         }
         return curScheduleBuilder_;
       }
-
-      private boolean haveCurSchedule_ ;
-      /**
-       * <code>bool have_cur_schedule = 11;</code>
-       * @return The haveCurSchedule.
-       */
-      @java.lang.Override
-      public boolean getHaveCurSchedule() {
-        return haveCurSchedule_;
-      }
-      /**
-       * <code>bool have_cur_schedule = 11;</code>
-       * @param value The haveCurSchedule to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHaveCurSchedule(boolean value) {
-        
-        haveCurSchedule_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool have_cur_schedule = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHaveCurSchedule() {
-        
-        haveCurSchedule_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,11 +933,13 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\'BattlePassCurScheduleUpdateNotify.prot" +
-      "o\032\030BattlePassSchedule.proto\"i\n!BattlePas" +
-      "sCurScheduleUpdateNotify\022)\n\014cur_schedule" +
-      "\030\t \001(\0132\023.BattlePassSchedule\022\031\n\021have_cur_" +
-      "schedule\030\013 \001(\010B\033\n\031emu.grasscutter.net.pr" +
-      "otob\006proto3"
+      "o\032\030BattlePassSchedule.proto\"\256\001\n!BattlePa" +
+      "ssCurScheduleUpdateNotify\022\033\n\023default_rew" +
+      "ard_type\030\002 \001(\r\022\021\n\tis_viewed\030\003 \001(\010\022\031\n\021hav" +
+      "e_cur_schedule\030\007 \001(\010\022\023\n\013HNDKICJJANM\030\t \001(" +
+      "\010\022)\n\014cur_schedule\030\014 \001(\0132\023.BattlePassSche" +
+      "duleB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -747,7 +951,7 @@ public final class BattlePassCurScheduleUpdateNotifyOuterClass {
     internal_static_BattlePassCurScheduleUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassCurScheduleUpdateNotify_descriptor,
-        new java.lang.String[] { "CurSchedule", "HaveCurSchedule", });
+        new java.lang.String[] { "DefaultRewardType", "IsViewed", "HaveCurSchedule", "HNDKICJJANM", "CurSchedule", });
     emu.grasscutter.net.proto.BattlePassScheduleOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCycleOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCycleOuterClass.java
index ee83ea83e..d757d26ed 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCycleOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassCycleOuterClass.java
@@ -19,28 +19,24 @@ public final class BattlePassCycleOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cycle_idx = 15;</code>
-     * @return The cycleIdx.
-     */
-    int getCycleIdx();
-
-    /**
-     * <code>uint32 begin_time = 2;</code>
+     * <code>uint32 begin_time = 1;</code>
      * @return The beginTime.
      */
     int getBeginTime();
 
     /**
-     * <code>uint32 end_time = 12;</code>
+     * <code>uint32 cycle_idx = 13;</code>
+     * @return The cycleIdx.
+     */
+    int getCycleIdx();
+
+    /**
+     * <code>uint32 end_time = 14;</code>
      * @return The endTime.
      */
     int getEndTime();
   }
   /**
-   * <pre>
-   * Obf: JDHFCEDALOK
-   * </pre>
-   *
    * Protobuf type {@code BattlePassCycle}
    */
   public static final class BattlePassCycle extends
@@ -85,21 +81,21 @@ public final class BattlePassCycleOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
               beginTime_ = input.readUInt32();
               break;
             }
-            case 96: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 104: {
 
               cycleIdx_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              endTime_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -132,21 +128,10 @@ public final class BattlePassCycleOuterClass {
               emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.class, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder.class);
     }
 
-    public static final int CYCLE_IDX_FIELD_NUMBER = 15;
-    private int cycleIdx_;
-    /**
-     * <code>uint32 cycle_idx = 15;</code>
-     * @return The cycleIdx.
-     */
-    @java.lang.Override
-    public int getCycleIdx() {
-      return cycleIdx_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 2;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 1;
     private int beginTime_;
     /**
-     * <code>uint32 begin_time = 2;</code>
+     * <code>uint32 begin_time = 1;</code>
      * @return The beginTime.
      */
     @java.lang.Override
@@ -154,10 +139,21 @@ public final class BattlePassCycleOuterClass {
       return beginTime_;
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 12;
+    public static final int CYCLE_IDX_FIELD_NUMBER = 13;
+    private int cycleIdx_;
+    /**
+     * <code>uint32 cycle_idx = 13;</code>
+     * @return The cycleIdx.
+     */
+    @java.lang.Override
+    public int getCycleIdx() {
+      return cycleIdx_;
+    }
+
+    public static final int END_TIME_FIELD_NUMBER = 14;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 12;</code>
+     * <code>uint32 end_time = 14;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -180,13 +176,13 @@ public final class BattlePassCycleOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (beginTime_ != 0) {
-        output.writeUInt32(2, beginTime_);
-      }
-      if (endTime_ != 0) {
-        output.writeUInt32(12, endTime_);
+        output.writeUInt32(1, beginTime_);
       }
       if (cycleIdx_ != 0) {
-        output.writeUInt32(15, cycleIdx_);
+        output.writeUInt32(13, cycleIdx_);
+      }
+      if (endTime_ != 0) {
+        output.writeUInt32(14, endTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +195,15 @@ public final class BattlePassCycleOuterClass {
       size = 0;
       if (beginTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, beginTime_);
-      }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, endTime_);
+          .computeUInt32Size(1, beginTime_);
       }
       if (cycleIdx_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, cycleIdx_);
+          .computeUInt32Size(13, cycleIdx_);
+      }
+      if (endTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, endTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,10 +220,10 @@ public final class BattlePassCycleOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other = (emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle) obj;
 
-      if (getCycleIdx()
-          != other.getCycleIdx()) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
+      if (getCycleIdx()
+          != other.getCycleIdx()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -241,10 +237,10 @@ public final class BattlePassCycleOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
-      hash = (53 * hash) + getCycleIdx();
       hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + CYCLE_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + getCycleIdx();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -343,10 +339,6 @@ public final class BattlePassCycleOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JDHFCEDALOK
-     * </pre>
-     *
      * Protobuf type {@code BattlePassCycle}
      */
     public static final class Builder extends
@@ -384,10 +376,10 @@ public final class BattlePassCycleOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        cycleIdx_ = 0;
-
         beginTime_ = 0;
 
+        cycleIdx_ = 0;
+
         endTime_ = 0;
 
         return this;
@@ -416,8 +408,8 @@ public final class BattlePassCycleOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle buildPartial() {
         emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle result = new emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle(this);
-        result.cycleIdx_ = cycleIdx_;
         result.beginTime_ = beginTime_;
+        result.cycleIdx_ = cycleIdx_;
         result.endTime_ = endTime_;
         onBuilt();
         return result;
@@ -467,12 +459,12 @@ public final class BattlePassCycleOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle other) {
         if (other == emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance()) return this;
-        if (other.getCycleIdx() != 0) {
-          setCycleIdx(other.getCycleIdx());
-        }
         if (other.getBeginTime() != 0) {
           setBeginTime(other.getBeginTime());
         }
+        if (other.getCycleIdx() != 0) {
+          setCycleIdx(other.getCycleIdx());
+        }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
@@ -505,40 +497,9 @@ public final class BattlePassCycleOuterClass {
         return this;
       }
 
-      private int cycleIdx_ ;
-      /**
-       * <code>uint32 cycle_idx = 15;</code>
-       * @return The cycleIdx.
-       */
-      @java.lang.Override
-      public int getCycleIdx() {
-        return cycleIdx_;
-      }
-      /**
-       * <code>uint32 cycle_idx = 15;</code>
-       * @param value The cycleIdx to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCycleIdx(int value) {
-        
-        cycleIdx_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cycle_idx = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCycleIdx() {
-        
-        cycleIdx_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int beginTime_ ;
       /**
-       * <code>uint32 begin_time = 2;</code>
+       * <code>uint32 begin_time = 1;</code>
        * @return The beginTime.
        */
       @java.lang.Override
@@ -546,7 +507,7 @@ public final class BattlePassCycleOuterClass {
         return beginTime_;
       }
       /**
-       * <code>uint32 begin_time = 2;</code>
+       * <code>uint32 begin_time = 1;</code>
        * @param value The beginTime to set.
        * @return This builder for chaining.
        */
@@ -557,7 +518,7 @@ public final class BattlePassCycleOuterClass {
         return this;
       }
       /**
-       * <code>uint32 begin_time = 2;</code>
+       * <code>uint32 begin_time = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeginTime() {
@@ -567,9 +528,40 @@ public final class BattlePassCycleOuterClass {
         return this;
       }
 
+      private int cycleIdx_ ;
+      /**
+       * <code>uint32 cycle_idx = 13;</code>
+       * @return The cycleIdx.
+       */
+      @java.lang.Override
+      public int getCycleIdx() {
+        return cycleIdx_;
+      }
+      /**
+       * <code>uint32 cycle_idx = 13;</code>
+       * @param value The cycleIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCycleIdx(int value) {
+        
+        cycleIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cycle_idx = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCycleIdx() {
+        
+        cycleIdx_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 12;</code>
+       * <code>uint32 end_time = 14;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -577,7 +569,7 @@ public final class BattlePassCycleOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 12;</code>
+       * <code>uint32 end_time = 14;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -588,7 +580,7 @@ public final class BattlePassCycleOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 12;</code>
+       * <code>uint32 end_time = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -665,8 +657,8 @@ public final class BattlePassCycleOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025BattlePassCycle.proto\"J\n\017BattlePassCyc" +
-      "le\022\021\n\tcycle_idx\030\017 \001(\r\022\022\n\nbegin_time\030\002 \001(" +
-      "\r\022\020\n\010end_time\030\014 \001(\rB\033\n\031emu.grasscutter.n" +
+      "le\022\022\n\nbegin_time\030\001 \001(\r\022\021\n\tcycle_idx\030\r \001(" +
+      "\r\022\020\n\010end_time\030\016 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -678,7 +670,7 @@ public final class BattlePassCycleOuterClass {
     internal_static_BattlePassCycle_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassCycle_descriptor,
-        new java.lang.String[] { "CycleIdx", "BeginTime", "EndTime", });
+        new java.lang.String[] { "BeginTime", "CycleIdx", "EndTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionOuterClass.java
index f0312ef81..1f5a7e5de 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionOuterClass.java
@@ -19,51 +19,47 @@ public final class BattlePassMissionOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 total_progress = 7;</code>
-     * @return The totalProgress.
-     */
-    int getTotalProgress();
-
-    /**
-     * <code>uint32 mission_type = 3;</code>
-     * @return The missionType.
-     */
-    int getMissionType();
-
-    /**
-     * <code>uint32 cur_progress = 2;</code>
-     * @return The curProgress.
-     */
-    int getCurProgress();
-
-    /**
-     * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
-     * @return The enum numeric value on the wire for missionStatus.
-     */
-    int getMissionStatusValue();
-    /**
-     * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
-     * @return The missionStatus.
-     */
-    emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus();
-
-    /**
-     * <code>uint32 mission_id = 8;</code>
+     * <code>uint32 mission_id = 7;</code>
      * @return The missionId.
      */
     int getMissionId();
 
     /**
-     * <code>uint32 reward_battle_pass_point = 9;</code>
+     * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
+     * @return The enum numeric value on the wire for missionStatus.
+     */
+    int getMissionStatusValue();
+    /**
+     * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
+     * @return The missionStatus.
+     */
+    emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus();
+
+    /**
+     * <code>uint32 reward_battle_pass_point = 10;</code>
      * @return The rewardBattlePassPoint.
      */
     int getRewardBattlePassPoint();
+
+    /**
+     * <code>uint32 total_progress = 13;</code>
+     * @return The totalProgress.
+     */
+    int getTotalProgress();
+
+    /**
+     * <code>uint32 cur_progress = 14;</code>
+     * @return The curProgress.
+     */
+    int getCurProgress();
+
+    /**
+     * <code>uint32 mission_type = 15;</code>
+     * @return The missionType.
+     */
+    int getMissionType();
   }
   /**
-   * <pre>
-   * Obf: ELGGKMAOOGA
-   * </pre>
-   *
    * Protobuf type {@code BattlePassMission}
    */
   public static final class BattlePassMission extends
@@ -109,35 +105,35 @@ public final class BattlePassMissionOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              curProgress_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              missionType_ = input.readUInt32();
-              break;
-            }
             case 56: {
 
-              totalProgress_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
               missionId_ = input.readUInt32();
               break;
             }
             case 72: {
+              int rawValue = input.readEnum();
+
+              missionStatus_ = rawValue;
+              break;
+            }
+            case 80: {
 
               rewardBattlePassPoint_ = input.readUInt32();
               break;
             }
-            case 120: {
-              int rawValue = input.readEnum();
+            case 104: {
 
-              missionStatus_ = rawValue;
+              totalProgress_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              curProgress_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              missionType_ = input.readUInt32();
               break;
             }
             default: {
@@ -173,10 +169,6 @@ public final class BattlePassMissionOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: JAOFNPAFHIB
-     * </pre>
-     *
      * Protobuf enum {@code BattlePassMission.MissionStatus}
      */
     public enum MissionStatus
@@ -302,50 +294,28 @@ public final class BattlePassMissionOuterClass {
       // @@protoc_insertion_point(enum_scope:BattlePassMission.MissionStatus)
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 7;
-    private int totalProgress_;
+    public static final int MISSION_ID_FIELD_NUMBER = 7;
+    private int missionId_;
     /**
-     * <code>uint32 total_progress = 7;</code>
-     * @return The totalProgress.
+     * <code>uint32 mission_id = 7;</code>
+     * @return The missionId.
      */
     @java.lang.Override
-    public int getTotalProgress() {
-      return totalProgress_;
+    public int getMissionId() {
+      return missionId_;
     }
 
-    public static final int MISSION_TYPE_FIELD_NUMBER = 3;
-    private int missionType_;
-    /**
-     * <code>uint32 mission_type = 3;</code>
-     * @return The missionType.
-     */
-    @java.lang.Override
-    public int getMissionType() {
-      return missionType_;
-    }
-
-    public static final int CUR_PROGRESS_FIELD_NUMBER = 2;
-    private int curProgress_;
-    /**
-     * <code>uint32 cur_progress = 2;</code>
-     * @return The curProgress.
-     */
-    @java.lang.Override
-    public int getCurProgress() {
-      return curProgress_;
-    }
-
-    public static final int MISSION_STATUS_FIELD_NUMBER = 15;
+    public static final int MISSION_STATUS_FIELD_NUMBER = 9;
     private int missionStatus_;
     /**
-     * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+     * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
      * @return The enum numeric value on the wire for missionStatus.
      */
     @java.lang.Override public int getMissionStatusValue() {
       return missionStatus_;
     }
     /**
-     * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+     * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
      * @return The missionStatus.
      */
     @java.lang.Override public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus getMissionStatus() {
@@ -354,21 +324,10 @@ public final class BattlePassMissionOuterClass {
       return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
     }
 
-    public static final int MISSION_ID_FIELD_NUMBER = 8;
-    private int missionId_;
-    /**
-     * <code>uint32 mission_id = 8;</code>
-     * @return The missionId.
-     */
-    @java.lang.Override
-    public int getMissionId() {
-      return missionId_;
-    }
-
-    public static final int REWARD_BATTLE_PASS_POINT_FIELD_NUMBER = 9;
+    public static final int REWARD_BATTLE_PASS_POINT_FIELD_NUMBER = 10;
     private int rewardBattlePassPoint_;
     /**
-     * <code>uint32 reward_battle_pass_point = 9;</code>
+     * <code>uint32 reward_battle_pass_point = 10;</code>
      * @return The rewardBattlePassPoint.
      */
     @java.lang.Override
@@ -376,6 +335,39 @@ public final class BattlePassMissionOuterClass {
       return rewardBattlePassPoint_;
     }
 
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 13;
+    private int totalProgress_;
+    /**
+     * <code>uint32 total_progress = 13;</code>
+     * @return The totalProgress.
+     */
+    @java.lang.Override
+    public int getTotalProgress() {
+      return totalProgress_;
+    }
+
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 14;
+    private int curProgress_;
+    /**
+     * <code>uint32 cur_progress = 14;</code>
+     * @return The curProgress.
+     */
+    @java.lang.Override
+    public int getCurProgress() {
+      return curProgress_;
+    }
+
+    public static final int MISSION_TYPE_FIELD_NUMBER = 15;
+    private int missionType_;
+    /**
+     * <code>uint32 mission_type = 15;</code>
+     * @return The missionType.
+     */
+    @java.lang.Override
+    public int getMissionType() {
+      return missionType_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -390,23 +382,23 @@ public final class BattlePassMissionOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curProgress_ != 0) {
-        output.writeUInt32(2, curProgress_);
-      }
-      if (missionType_ != 0) {
-        output.writeUInt32(3, missionType_);
-      }
-      if (totalProgress_ != 0) {
-        output.writeUInt32(7, totalProgress_);
-      }
       if (missionId_ != 0) {
-        output.writeUInt32(8, missionId_);
-      }
-      if (rewardBattlePassPoint_ != 0) {
-        output.writeUInt32(9, rewardBattlePassPoint_);
+        output.writeUInt32(7, missionId_);
       }
       if (missionStatus_ != emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.MISSION_STATUS_INVALID.getNumber()) {
-        output.writeEnum(15, missionStatus_);
+        output.writeEnum(9, missionStatus_);
+      }
+      if (rewardBattlePassPoint_ != 0) {
+        output.writeUInt32(10, rewardBattlePassPoint_);
+      }
+      if (totalProgress_ != 0) {
+        output.writeUInt32(13, totalProgress_);
+      }
+      if (curProgress_ != 0) {
+        output.writeUInt32(14, curProgress_);
+      }
+      if (missionType_ != 0) {
+        output.writeUInt32(15, missionType_);
       }
       unknownFields.writeTo(output);
     }
@@ -417,29 +409,29 @@ public final class BattlePassMissionOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, curProgress_);
-      }
-      if (missionType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, missionType_);
-      }
-      if (totalProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, totalProgress_);
-      }
       if (missionId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, missionId_);
-      }
-      if (rewardBattlePassPoint_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, rewardBattlePassPoint_);
+          .computeUInt32Size(7, missionId_);
       }
       if (missionStatus_ != emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.MISSION_STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, missionStatus_);
+          .computeEnumSize(9, missionStatus_);
+      }
+      if (rewardBattlePassPoint_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, rewardBattlePassPoint_);
+      }
+      if (totalProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, totalProgress_);
+      }
+      if (curProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, curProgress_);
+      }
+      if (missionType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, missionType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -456,17 +448,17 @@ public final class BattlePassMissionOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission other = (emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission) obj;
 
-      if (getTotalProgress()
-          != other.getTotalProgress()) return false;
-      if (getMissionType()
-          != other.getMissionType()) return false;
-      if (getCurProgress()
-          != other.getCurProgress()) return false;
-      if (missionStatus_ != other.missionStatus_) return false;
       if (getMissionId()
           != other.getMissionId()) return false;
+      if (missionStatus_ != other.missionStatus_) return false;
       if (getRewardBattlePassPoint()
           != other.getRewardBattlePassPoint()) return false;
+      if (getTotalProgress()
+          != other.getTotalProgress()) return false;
+      if (getCurProgress()
+          != other.getCurProgress()) return false;
+      if (getMissionType()
+          != other.getMissionType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -478,18 +470,18 @@ public final class BattlePassMissionOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getTotalProgress();
-      hash = (37 * hash) + MISSION_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getMissionType();
-      hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getCurProgress();
-      hash = (37 * hash) + MISSION_STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + missionStatus_;
       hash = (37 * hash) + MISSION_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMissionId();
+      hash = (37 * hash) + MISSION_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + missionStatus_;
       hash = (37 * hash) + REWARD_BATTLE_PASS_POINT_FIELD_NUMBER;
       hash = (53 * hash) + getRewardBattlePassPoint();
+      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) + MISSION_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getMissionType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -586,10 +578,6 @@ public final class BattlePassMissionOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ELGGKMAOOGA
-     * </pre>
-     *
      * Protobuf type {@code BattlePassMission}
      */
     public static final class Builder extends
@@ -627,18 +615,18 @@ public final class BattlePassMissionOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        totalProgress_ = 0;
-
-        missionType_ = 0;
-
-        curProgress_ = 0;
+        missionId_ = 0;
 
         missionStatus_ = 0;
 
-        missionId_ = 0;
-
         rewardBattlePassPoint_ = 0;
 
+        totalProgress_ = 0;
+
+        curProgress_ = 0;
+
+        missionType_ = 0;
+
         return this;
       }
 
@@ -665,12 +653,12 @@ public final class BattlePassMissionOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission buildPartial() {
         emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission result = new emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission(this);
-        result.totalProgress_ = totalProgress_;
-        result.missionType_ = missionType_;
-        result.curProgress_ = curProgress_;
-        result.missionStatus_ = missionStatus_;
         result.missionId_ = missionId_;
+        result.missionStatus_ = missionStatus_;
         result.rewardBattlePassPoint_ = rewardBattlePassPoint_;
+        result.totalProgress_ = totalProgress_;
+        result.curProgress_ = curProgress_;
+        result.missionType_ = missionType_;
         onBuilt();
         return result;
       }
@@ -719,24 +707,24 @@ public final class BattlePassMissionOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission other) {
         if (other == emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance()) return this;
-        if (other.getTotalProgress() != 0) {
-          setTotalProgress(other.getTotalProgress());
-        }
-        if (other.getMissionType() != 0) {
-          setMissionType(other.getMissionType());
-        }
-        if (other.getCurProgress() != 0) {
-          setCurProgress(other.getCurProgress());
+        if (other.getMissionId() != 0) {
+          setMissionId(other.getMissionId());
         }
         if (other.missionStatus_ != 0) {
           setMissionStatusValue(other.getMissionStatusValue());
         }
-        if (other.getMissionId() != 0) {
-          setMissionId(other.getMissionId());
-        }
         if (other.getRewardBattlePassPoint() != 0) {
           setRewardBattlePassPoint(other.getRewardBattlePassPoint());
         }
+        if (other.getTotalProgress() != 0) {
+          setTotalProgress(other.getTotalProgress());
+        }
+        if (other.getCurProgress() != 0) {
+          setCurProgress(other.getCurProgress());
+        }
+        if (other.getMissionType() != 0) {
+          setMissionType(other.getMissionType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -766,109 +754,47 @@ public final class BattlePassMissionOuterClass {
         return this;
       }
 
-      private int totalProgress_ ;
+      private int missionId_ ;
       /**
-       * <code>uint32 total_progress = 7;</code>
-       * @return The totalProgress.
+       * <code>uint32 mission_id = 7;</code>
+       * @return The missionId.
        */
       @java.lang.Override
-      public int getTotalProgress() {
-        return totalProgress_;
+      public int getMissionId() {
+        return missionId_;
       }
       /**
-       * <code>uint32 total_progress = 7;</code>
-       * @param value The totalProgress to set.
+       * <code>uint32 mission_id = 7;</code>
+       * @param value The missionId to set.
        * @return This builder for chaining.
        */
-      public Builder setTotalProgress(int value) {
+      public Builder setMissionId(int value) {
         
-        totalProgress_ = value;
+        missionId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 total_progress = 7;</code>
+       * <code>uint32 mission_id = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTotalProgress() {
+      public Builder clearMissionId() {
         
-        totalProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int missionType_ ;
-      /**
-       * <code>uint32 mission_type = 3;</code>
-       * @return The missionType.
-       */
-      @java.lang.Override
-      public int getMissionType() {
-        return missionType_;
-      }
-      /**
-       * <code>uint32 mission_type = 3;</code>
-       * @param value The missionType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMissionType(int value) {
-        
-        missionType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 mission_type = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMissionType() {
-        
-        missionType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curProgress_ ;
-      /**
-       * <code>uint32 cur_progress = 2;</code>
-       * @return The curProgress.
-       */
-      @java.lang.Override
-      public int getCurProgress() {
-        return curProgress_;
-      }
-      /**
-       * <code>uint32 cur_progress = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurProgress() {
-        
-        curProgress_ = 0;
+        missionId_ = 0;
         onChanged();
         return this;
       }
 
       private int missionStatus_ = 0;
       /**
-       * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+       * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
        * @return The enum numeric value on the wire for missionStatus.
        */
       @java.lang.Override public int getMissionStatusValue() {
         return missionStatus_;
       }
       /**
-       * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+       * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
        * @param value The enum numeric value on the wire for missionStatus to set.
        * @return This builder for chaining.
        */
@@ -879,7 +805,7 @@ public final class BattlePassMissionOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+       * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
        * @return The missionStatus.
        */
       @java.lang.Override
@@ -889,7 +815,7 @@ public final class BattlePassMissionOuterClass {
         return result == null ? emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.MissionStatus.UNRECOGNIZED : result;
       }
       /**
-       * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+       * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
        * @param value The missionStatus to set.
        * @return This builder for chaining.
        */
@@ -903,7 +829,7 @@ public final class BattlePassMissionOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassMission.MissionStatus mission_status = 15;</code>
+       * <code>.BattlePassMission.MissionStatus mission_status = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearMissionStatus() {
@@ -913,40 +839,9 @@ public final class BattlePassMissionOuterClass {
         return this;
       }
 
-      private int missionId_ ;
-      /**
-       * <code>uint32 mission_id = 8;</code>
-       * @return The missionId.
-       */
-      @java.lang.Override
-      public int getMissionId() {
-        return missionId_;
-      }
-      /**
-       * <code>uint32 mission_id = 8;</code>
-       * @param value The missionId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMissionId(int value) {
-        
-        missionId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 mission_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMissionId() {
-        
-        missionId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int rewardBattlePassPoint_ ;
       /**
-       * <code>uint32 reward_battle_pass_point = 9;</code>
+       * <code>uint32 reward_battle_pass_point = 10;</code>
        * @return The rewardBattlePassPoint.
        */
       @java.lang.Override
@@ -954,7 +849,7 @@ public final class BattlePassMissionOuterClass {
         return rewardBattlePassPoint_;
       }
       /**
-       * <code>uint32 reward_battle_pass_point = 9;</code>
+       * <code>uint32 reward_battle_pass_point = 10;</code>
        * @param value The rewardBattlePassPoint to set.
        * @return This builder for chaining.
        */
@@ -965,7 +860,7 @@ public final class BattlePassMissionOuterClass {
         return this;
       }
       /**
-       * <code>uint32 reward_battle_pass_point = 9;</code>
+       * <code>uint32 reward_battle_pass_point = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRewardBattlePassPoint() {
@@ -974,6 +869,99 @@ public final class BattlePassMissionOuterClass {
         onChanged();
         return this;
       }
+
+      private int totalProgress_ ;
+      /**
+       * <code>uint32 total_progress = 13;</code>
+       * @return The totalProgress.
+       */
+      @java.lang.Override
+      public int getTotalProgress() {
+        return totalProgress_;
+      }
+      /**
+       * <code>uint32 total_progress = 13;</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 = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalProgress() {
+        
+        totalProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int curProgress_ ;
+      /**
+       * <code>uint32 cur_progress = 14;</code>
+       * @return The curProgress.
+       */
+      @java.lang.Override
+      public int getCurProgress() {
+        return curProgress_;
+      }
+      /**
+       * <code>uint32 cur_progress = 14;</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 = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurProgress() {
+        
+        curProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int missionType_ ;
+      /**
+       * <code>uint32 mission_type = 15;</code>
+       * @return The missionType.
+       */
+      @java.lang.Override
+      public int getMissionType() {
+        return missionType_;
+      }
+      /**
+       * <code>uint32 mission_type = 15;</code>
+       * @param value The missionType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMissionType(int value) {
+        
+        missionType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 mission_type = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMissionType() {
+        
+        missionType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1042,11 +1030,11 @@ public final class BattlePassMissionOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027BattlePassMission.proto\"\321\002\n\021BattlePass" +
-      "Mission\022\026\n\016total_progress\030\007 \001(\r\022\024\n\014missi" +
-      "on_type\030\003 \001(\r\022\024\n\014cur_progress\030\002 \001(\r\0228\n\016m" +
-      "ission_status\030\017 \001(\0162 .BattlePassMission." +
-      "MissionStatus\022\022\n\nmission_id\030\010 \001(\r\022 \n\030rew" +
-      "ard_battle_pass_point\030\t \001(\r\"\207\001\n\rMissionS" +
+      "Mission\022\022\n\nmission_id\030\007 \001(\r\0228\n\016mission_s" +
+      "tatus\030\t \001(\0162 .BattlePassMission.MissionS" +
+      "tatus\022 \n\030reward_battle_pass_point\030\n \001(\r\022" +
+      "\026\n\016total_progress\030\r \001(\r\022\024\n\014cur_progress\030" +
+      "\016 \001(\r\022\024\n\014mission_type\030\017 \001(\r\"\207\001\n\rMissionS" +
       "tatus\022\032\n\026MISSION_STATUS_INVALID\020\000\022\035\n\031MIS" +
       "SION_STATUS_UNFINISHED\020\001\022\033\n\027MISSION_STAT" +
       "US_FINISHED\020\002\022\036\n\032MISSION_STATUS_POINT_TA" +
@@ -1062,7 +1050,7 @@ public final class BattlePassMissionOuterClass {
     internal_static_BattlePassMission_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassMission_descriptor,
-        new java.lang.String[] { "TotalProgress", "MissionType", "CurProgress", "MissionStatus", "MissionId", "RewardBattlePassPoint", });
+        new java.lang.String[] { "MissionId", "MissionStatus", "RewardBattlePassPoint", "TotalProgress", "CurProgress", "MissionType", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionUpdateNotifyOuterClass.java
index d0c86ae1f..aa46e3ec0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassMissionUpdateNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> 
         getMissionListList();
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index);
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     int getMissionListCount();
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
         getMissionListOrBuilderList();
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 24008
-   * Obf: HNPGDHAKAEB
-   * </pre>
-   *
    * Protobuf type {@code BattlePassMissionUpdateNotify}
    */
   public static final class BattlePassMissionUpdateNotify extends
@@ -94,7 +89,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 missionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.BattlePassMissionUpdateNotifyOuterClass.BattlePassMissionUpdateNotify.class, emu.grasscutter.net.proto.BattlePassMissionUpdateNotifyOuterClass.BattlePassMissionUpdateNotify.Builder.class);
     }
 
-    public static final int MISSION_LIST_FIELD_NUMBER = 7;
+    public static final int MISSION_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> missionList_;
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> getMissionListList() {
       return missionList_;
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
@@ -156,21 +151,21 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
       return missionList_;
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     @java.lang.Override
     public int getMissionListCount() {
       return missionList_.size();
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index) {
       return missionList_.get(index);
     }
     /**
-     * <code>repeated .BattlePassMission mission_list = 7;</code>
+     * <code>repeated .BattlePassMission mission_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
@@ -193,7 +188,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < missionList_.size(); i++) {
-        output.writeMessage(7, missionList_.get(i));
+        output.writeMessage(11, missionList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
       size = 0;
       for (int i = 0; i < missionList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, missionList_.get(i));
+          .computeMessageSize(11, missionList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24008
-     * Obf: HNPGDHAKAEB
-     * </pre>
-     *
      * Protobuf type {@code BattlePassMissionUpdateNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
           emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> missionListBuilder_;
 
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> getMissionListList() {
         if (missionListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public int getMissionListCount() {
         if (missionListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission getMissionList(int index) {
         if (missionListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder setMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
@@ -585,7 +575,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder setMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder addMissionList(emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
         if (missionListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder addMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission value) {
@@ -632,7 +622,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder addMissionList(
           emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder addMissionList(
           int index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder addAllMissionList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission> values) {
@@ -675,7 +665,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder clearMissionList() {
         if (missionListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public Builder removeMissionList(int index) {
         if (missionListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder getMissionListBuilder(
           int index) {
         return getMissionListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder getMissionListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMissionOrBuilder> 
            getMissionListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder addMissionListBuilder() {
         return getMissionListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance());
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder addMissionListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
             index, emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.getDefaultInstance());
       }
       /**
-       * <code>repeated .BattlePassMission mission_list = 7;</code>
+       * <code>repeated .BattlePassMission mission_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.BattlePassMissionOuterClass.BattlePassMission.Builder> 
            getMissionListBuilderList() {
@@ -833,7 +823,7 @@ public final class BattlePassMissionUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n#BattlePassMissionUpdateNotify.proto\032\027B" +
       "attlePassMission.proto\"I\n\035BattlePassMiss" +
-      "ionUpdateNotify\022(\n\014mission_list\030\007 \003(\0132\022." +
+      "ionUpdateNotify\022(\n\014mission_list\030\013 \003(\0132\022." +
       "BattlePassMissionB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassProductOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassProductOuterClass.java
index 8f0875134..62fa6e823 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassProductOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassProductOuterClass.java
@@ -19,46 +19,42 @@ public final class BattlePassProductOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string HOJKADLEFBP = 7;</code>
-     * @return The hOJKADLEFBP.
+     * <code>string normal_product_id = 2;</code>
+     * @return The normalProductId.
      */
-    java.lang.String getHOJKADLEFBP();
+    java.lang.String getNormalProductId();
     /**
-     * <code>string HOJKADLEFBP = 7;</code>
-     * @return The bytes for hOJKADLEFBP.
+     * <code>string normal_product_id = 2;</code>
+     * @return The bytes for normalProductId.
      */
     com.google.protobuf.ByteString
-        getHOJKADLEFBPBytes();
+        getNormalProductIdBytes();
 
     /**
-     * <code>string CHOKHINHNGH = 14;</code>
-     * @return The cHOKHINHNGH.
+     * <code>string extra_product_id = 10;</code>
+     * @return The extraProductId.
      */
-    java.lang.String getCHOKHINHNGH();
+    java.lang.String getExtraProductId();
     /**
-     * <code>string CHOKHINHNGH = 14;</code>
-     * @return The bytes for cHOKHINHNGH.
+     * <code>string extra_product_id = 10;</code>
+     * @return The bytes for extraProductId.
      */
     com.google.protobuf.ByteString
-        getCHOKHINHNGHBytes();
+        getExtraProductIdBytes();
 
     /**
-     * <code>string NJCCJEMGKDJ = 5;</code>
-     * @return The nJCCJEMGKDJ.
+     * <code>string upgrade_product_id = 15;</code>
+     * @return The upgradeProductId.
      */
-    java.lang.String getNJCCJEMGKDJ();
+    java.lang.String getUpgradeProductId();
     /**
-     * <code>string NJCCJEMGKDJ = 5;</code>
-     * @return The bytes for nJCCJEMGKDJ.
+     * <code>string upgrade_product_id = 15;</code>
+     * @return The bytes for upgradeProductId.
      */
     com.google.protobuf.ByteString
-        getNJCCJEMGKDJBytes();
+        getUpgradeProductIdBytes();
   }
   /**
-   * <pre>
-   * Obf: GCJOGKGADPD
-   * </pre>
-   *
    * Protobuf type {@code BattlePassProduct}
    */
   public static final class BattlePassProduct extends
@@ -71,9 +67,9 @@ public final class BattlePassProductOuterClass {
       super(builder);
     }
     private BattlePassProduct() {
-      hOJKADLEFBP_ = "";
-      cHOKHINHNGH_ = "";
-      nJCCJEMGKDJ_ = "";
+      normalProductId_ = "";
+      extraProductId_ = "";
+      upgradeProductId_ = "";
     }
 
     @java.lang.Override
@@ -106,22 +102,22 @@ public final class BattlePassProductOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              nJCCJEMGKDJ_ = s;
+              normalProductId_ = s;
               break;
             }
-            case 58: {
+            case 82: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              hOJKADLEFBP_ = s;
+              extraProductId_ = s;
               break;
             }
-            case 114: {
+            case 122: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              cHOKHINHNGH_ = s;
+              upgradeProductId_ = s;
               break;
             }
             default: {
@@ -156,114 +152,114 @@ public final class BattlePassProductOuterClass {
               emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.class, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder.class);
     }
 
-    public static final int HOJKADLEFBP_FIELD_NUMBER = 7;
-    private volatile java.lang.Object hOJKADLEFBP_;
+    public static final int NORMAL_PRODUCT_ID_FIELD_NUMBER = 2;
+    private volatile java.lang.Object normalProductId_;
     /**
-     * <code>string HOJKADLEFBP = 7;</code>
-     * @return The hOJKADLEFBP.
+     * <code>string normal_product_id = 2;</code>
+     * @return The normalProductId.
      */
     @java.lang.Override
-    public java.lang.String getHOJKADLEFBP() {
-      java.lang.Object ref = hOJKADLEFBP_;
+    public java.lang.String getNormalProductId() {
+      java.lang.Object ref = normalProductId_;
       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();
-        hOJKADLEFBP_ = s;
+        normalProductId_ = s;
         return s;
       }
     }
     /**
-     * <code>string HOJKADLEFBP = 7;</code>
-     * @return The bytes for hOJKADLEFBP.
+     * <code>string normal_product_id = 2;</code>
+     * @return The bytes for normalProductId.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getHOJKADLEFBPBytes() {
-      java.lang.Object ref = hOJKADLEFBP_;
+        getNormalProductIdBytes() {
+      java.lang.Object ref = normalProductId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        hOJKADLEFBP_ = b;
+        normalProductId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int CHOKHINHNGH_FIELD_NUMBER = 14;
-    private volatile java.lang.Object cHOKHINHNGH_;
+    public static final int EXTRA_PRODUCT_ID_FIELD_NUMBER = 10;
+    private volatile java.lang.Object extraProductId_;
     /**
-     * <code>string CHOKHINHNGH = 14;</code>
-     * @return The cHOKHINHNGH.
+     * <code>string extra_product_id = 10;</code>
+     * @return The extraProductId.
      */
     @java.lang.Override
-    public java.lang.String getCHOKHINHNGH() {
-      java.lang.Object ref = cHOKHINHNGH_;
+    public java.lang.String getExtraProductId() {
+      java.lang.Object ref = extraProductId_;
       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();
-        cHOKHINHNGH_ = s;
+        extraProductId_ = s;
         return s;
       }
     }
     /**
-     * <code>string CHOKHINHNGH = 14;</code>
-     * @return The bytes for cHOKHINHNGH.
+     * <code>string extra_product_id = 10;</code>
+     * @return The bytes for extraProductId.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getCHOKHINHNGHBytes() {
-      java.lang.Object ref = cHOKHINHNGH_;
+        getExtraProductIdBytes() {
+      java.lang.Object ref = extraProductId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        cHOKHINHNGH_ = b;
+        extraProductId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int NJCCJEMGKDJ_FIELD_NUMBER = 5;
-    private volatile java.lang.Object nJCCJEMGKDJ_;
+    public static final int UPGRADE_PRODUCT_ID_FIELD_NUMBER = 15;
+    private volatile java.lang.Object upgradeProductId_;
     /**
-     * <code>string NJCCJEMGKDJ = 5;</code>
-     * @return The nJCCJEMGKDJ.
+     * <code>string upgrade_product_id = 15;</code>
+     * @return The upgradeProductId.
      */
     @java.lang.Override
-    public java.lang.String getNJCCJEMGKDJ() {
-      java.lang.Object ref = nJCCJEMGKDJ_;
+    public java.lang.String getUpgradeProductId() {
+      java.lang.Object ref = upgradeProductId_;
       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();
-        nJCCJEMGKDJ_ = s;
+        upgradeProductId_ = s;
         return s;
       }
     }
     /**
-     * <code>string NJCCJEMGKDJ = 5;</code>
-     * @return The bytes for nJCCJEMGKDJ.
+     * <code>string upgrade_product_id = 15;</code>
+     * @return The bytes for upgradeProductId.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getNJCCJEMGKDJBytes() {
-      java.lang.Object ref = nJCCJEMGKDJ_;
+        getUpgradeProductIdBytes() {
+      java.lang.Object ref = upgradeProductId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        nJCCJEMGKDJ_ = b;
+        upgradeProductId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
@@ -284,14 +280,14 @@ public final class BattlePassProductOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nJCCJEMGKDJ_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, nJCCJEMGKDJ_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(normalProductId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, normalProductId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hOJKADLEFBP_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, hOJKADLEFBP_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(extraProductId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, extraProductId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cHOKHINHNGH_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, cHOKHINHNGH_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(upgradeProductId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, upgradeProductId_);
       }
       unknownFields.writeTo(output);
     }
@@ -302,14 +298,14 @@ public final class BattlePassProductOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nJCCJEMGKDJ_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, nJCCJEMGKDJ_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(normalProductId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, normalProductId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hOJKADLEFBP_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, hOJKADLEFBP_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(extraProductId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, extraProductId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cHOKHINHNGH_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, cHOKHINHNGH_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(upgradeProductId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, upgradeProductId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -326,12 +322,12 @@ public final class BattlePassProductOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct other = (emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct) obj;
 
-      if (!getHOJKADLEFBP()
-          .equals(other.getHOJKADLEFBP())) return false;
-      if (!getCHOKHINHNGH()
-          .equals(other.getCHOKHINHNGH())) return false;
-      if (!getNJCCJEMGKDJ()
-          .equals(other.getNJCCJEMGKDJ())) return false;
+      if (!getNormalProductId()
+          .equals(other.getNormalProductId())) return false;
+      if (!getExtraProductId()
+          .equals(other.getExtraProductId())) return false;
+      if (!getUpgradeProductId()
+          .equals(other.getUpgradeProductId())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -343,12 +339,12 @@ public final class BattlePassProductOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + HOJKADLEFBP_FIELD_NUMBER;
-      hash = (53 * hash) + getHOJKADLEFBP().hashCode();
-      hash = (37 * hash) + CHOKHINHNGH_FIELD_NUMBER;
-      hash = (53 * hash) + getCHOKHINHNGH().hashCode();
-      hash = (37 * hash) + NJCCJEMGKDJ_FIELD_NUMBER;
-      hash = (53 * hash) + getNJCCJEMGKDJ().hashCode();
+      hash = (37 * hash) + NORMAL_PRODUCT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getNormalProductId().hashCode();
+      hash = (37 * hash) + EXTRA_PRODUCT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getExtraProductId().hashCode();
+      hash = (37 * hash) + UPGRADE_PRODUCT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getUpgradeProductId().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -445,10 +441,6 @@ public final class BattlePassProductOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GCJOGKGADPD
-     * </pre>
-     *
      * Protobuf type {@code BattlePassProduct}
      */
     public static final class Builder extends
@@ -486,11 +478,11 @@ public final class BattlePassProductOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        hOJKADLEFBP_ = "";
+        normalProductId_ = "";
 
-        cHOKHINHNGH_ = "";
+        extraProductId_ = "";
 
-        nJCCJEMGKDJ_ = "";
+        upgradeProductId_ = "";
 
         return this;
       }
@@ -518,9 +510,9 @@ public final class BattlePassProductOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct buildPartial() {
         emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct result = new emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct(this);
-        result.hOJKADLEFBP_ = hOJKADLEFBP_;
-        result.cHOKHINHNGH_ = cHOKHINHNGH_;
-        result.nJCCJEMGKDJ_ = nJCCJEMGKDJ_;
+        result.normalProductId_ = normalProductId_;
+        result.extraProductId_ = extraProductId_;
+        result.upgradeProductId_ = upgradeProductId_;
         onBuilt();
         return result;
       }
@@ -569,16 +561,16 @@ public final class BattlePassProductOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct other) {
         if (other == emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance()) return this;
-        if (!other.getHOJKADLEFBP().isEmpty()) {
-          hOJKADLEFBP_ = other.hOJKADLEFBP_;
+        if (!other.getNormalProductId().isEmpty()) {
+          normalProductId_ = other.normalProductId_;
           onChanged();
         }
-        if (!other.getCHOKHINHNGH().isEmpty()) {
-          cHOKHINHNGH_ = other.cHOKHINHNGH_;
+        if (!other.getExtraProductId().isEmpty()) {
+          extraProductId_ = other.extraProductId_;
           onChanged();
         }
-        if (!other.getNJCCJEMGKDJ().isEmpty()) {
-          nJCCJEMGKDJ_ = other.nJCCJEMGKDJ_;
+        if (!other.getUpgradeProductId().isEmpty()) {
+          upgradeProductId_ = other.upgradeProductId_;
           onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
@@ -610,230 +602,230 @@ public final class BattlePassProductOuterClass {
         return this;
       }
 
-      private java.lang.Object hOJKADLEFBP_ = "";
+      private java.lang.Object normalProductId_ = "";
       /**
-       * <code>string HOJKADLEFBP = 7;</code>
-       * @return The hOJKADLEFBP.
+       * <code>string normal_product_id = 2;</code>
+       * @return The normalProductId.
        */
-      public java.lang.String getHOJKADLEFBP() {
-        java.lang.Object ref = hOJKADLEFBP_;
+      public java.lang.String getNormalProductId() {
+        java.lang.Object ref = normalProductId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          hOJKADLEFBP_ = s;
+          normalProductId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string HOJKADLEFBP = 7;</code>
-       * @return The bytes for hOJKADLEFBP.
+       * <code>string normal_product_id = 2;</code>
+       * @return The bytes for normalProductId.
        */
       public com.google.protobuf.ByteString
-          getHOJKADLEFBPBytes() {
-        java.lang.Object ref = hOJKADLEFBP_;
+          getNormalProductIdBytes() {
+        java.lang.Object ref = normalProductId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          hOJKADLEFBP_ = b;
+          normalProductId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string HOJKADLEFBP = 7;</code>
-       * @param value The hOJKADLEFBP to set.
+       * <code>string normal_product_id = 2;</code>
+       * @param value The normalProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setHOJKADLEFBP(
+      public Builder setNormalProductId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        hOJKADLEFBP_ = value;
+        normalProductId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string HOJKADLEFBP = 7;</code>
+       * <code>string normal_product_id = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHOJKADLEFBP() {
+      public Builder clearNormalProductId() {
         
-        hOJKADLEFBP_ = getDefaultInstance().getHOJKADLEFBP();
+        normalProductId_ = getDefaultInstance().getNormalProductId();
         onChanged();
         return this;
       }
       /**
-       * <code>string HOJKADLEFBP = 7;</code>
-       * @param value The bytes for hOJKADLEFBP to set.
+       * <code>string normal_product_id = 2;</code>
+       * @param value The bytes for normalProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setHOJKADLEFBPBytes(
+      public Builder setNormalProductIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        hOJKADLEFBP_ = value;
+        normalProductId_ = value;
         onChanged();
         return this;
       }
 
-      private java.lang.Object cHOKHINHNGH_ = "";
+      private java.lang.Object extraProductId_ = "";
       /**
-       * <code>string CHOKHINHNGH = 14;</code>
-       * @return The cHOKHINHNGH.
+       * <code>string extra_product_id = 10;</code>
+       * @return The extraProductId.
        */
-      public java.lang.String getCHOKHINHNGH() {
-        java.lang.Object ref = cHOKHINHNGH_;
+      public java.lang.String getExtraProductId() {
+        java.lang.Object ref = extraProductId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          cHOKHINHNGH_ = s;
+          extraProductId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string CHOKHINHNGH = 14;</code>
-       * @return The bytes for cHOKHINHNGH.
+       * <code>string extra_product_id = 10;</code>
+       * @return The bytes for extraProductId.
        */
       public com.google.protobuf.ByteString
-          getCHOKHINHNGHBytes() {
-        java.lang.Object ref = cHOKHINHNGH_;
+          getExtraProductIdBytes() {
+        java.lang.Object ref = extraProductId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          cHOKHINHNGH_ = b;
+          extraProductId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string CHOKHINHNGH = 14;</code>
-       * @param value The cHOKHINHNGH to set.
+       * <code>string extra_product_id = 10;</code>
+       * @param value The extraProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setCHOKHINHNGH(
+      public Builder setExtraProductId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        cHOKHINHNGH_ = value;
+        extraProductId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string CHOKHINHNGH = 14;</code>
+       * <code>string extra_product_id = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCHOKHINHNGH() {
+      public Builder clearExtraProductId() {
         
-        cHOKHINHNGH_ = getDefaultInstance().getCHOKHINHNGH();
+        extraProductId_ = getDefaultInstance().getExtraProductId();
         onChanged();
         return this;
       }
       /**
-       * <code>string CHOKHINHNGH = 14;</code>
-       * @param value The bytes for cHOKHINHNGH to set.
+       * <code>string extra_product_id = 10;</code>
+       * @param value The bytes for extraProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setCHOKHINHNGHBytes(
+      public Builder setExtraProductIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        cHOKHINHNGH_ = value;
+        extraProductId_ = value;
         onChanged();
         return this;
       }
 
-      private java.lang.Object nJCCJEMGKDJ_ = "";
+      private java.lang.Object upgradeProductId_ = "";
       /**
-       * <code>string NJCCJEMGKDJ = 5;</code>
-       * @return The nJCCJEMGKDJ.
+       * <code>string upgrade_product_id = 15;</code>
+       * @return The upgradeProductId.
        */
-      public java.lang.String getNJCCJEMGKDJ() {
-        java.lang.Object ref = nJCCJEMGKDJ_;
+      public java.lang.String getUpgradeProductId() {
+        java.lang.Object ref = upgradeProductId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          nJCCJEMGKDJ_ = s;
+          upgradeProductId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string NJCCJEMGKDJ = 5;</code>
-       * @return The bytes for nJCCJEMGKDJ.
+       * <code>string upgrade_product_id = 15;</code>
+       * @return The bytes for upgradeProductId.
        */
       public com.google.protobuf.ByteString
-          getNJCCJEMGKDJBytes() {
-        java.lang.Object ref = nJCCJEMGKDJ_;
+          getUpgradeProductIdBytes() {
+        java.lang.Object ref = upgradeProductId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          nJCCJEMGKDJ_ = b;
+          upgradeProductId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string NJCCJEMGKDJ = 5;</code>
-       * @param value The nJCCJEMGKDJ to set.
+       * <code>string upgrade_product_id = 15;</code>
+       * @param value The upgradeProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setNJCCJEMGKDJ(
+      public Builder setUpgradeProductId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        nJCCJEMGKDJ_ = value;
+        upgradeProductId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string NJCCJEMGKDJ = 5;</code>
+       * <code>string upgrade_product_id = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNJCCJEMGKDJ() {
+      public Builder clearUpgradeProductId() {
         
-        nJCCJEMGKDJ_ = getDefaultInstance().getNJCCJEMGKDJ();
+        upgradeProductId_ = getDefaultInstance().getUpgradeProductId();
         onChanged();
         return this;
       }
       /**
-       * <code>string NJCCJEMGKDJ = 5;</code>
-       * @param value The bytes for nJCCJEMGKDJ to set.
+       * <code>string upgrade_product_id = 15;</code>
+       * @param value The bytes for upgradeProductId to set.
        * @return This builder for chaining.
        */
-      public Builder setNJCCJEMGKDJBytes(
+      public Builder setUpgradeProductIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        nJCCJEMGKDJ_ = value;
+        upgradeProductId_ = value;
         onChanged();
         return this;
       }
@@ -904,10 +896,11 @@ public final class BattlePassProductOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027BattlePassProduct.proto\"R\n\021BattlePassP" +
-      "roduct\022\023\n\013HOJKADLEFBP\030\007 \001(\t\022\023\n\013CHOKHINHN" +
-      "GH\030\016 \001(\t\022\023\n\013NJCCJEMGKDJ\030\005 \001(\tB\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\n\027BattlePassProduct.proto\"d\n\021BattlePassP" +
+      "roduct\022\031\n\021normal_product_id\030\002 \001(\t\022\030\n\020ext" +
+      "ra_product_id\030\n \001(\t\022\032\n\022upgrade_product_i" +
+      "d\030\017 \001(\tB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -918,7 +911,7 @@ public final class BattlePassProductOuterClass {
     internal_static_BattlePassProduct_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassProduct_descriptor,
-        new java.lang.String[] { "HOJKADLEFBP", "CHOKHINHNGH", "NJCCJEMGKDJ", });
+        new java.lang.String[] { "NormalProductId", "ExtraProductId", "UpgradeProductId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardPlanOptionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardPlanOptionOuterClass.java
new file mode 100644
index 000000000..4c9c8ff3a
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardPlanOptionOuterClass.java
@@ -0,0 +1,679 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: BattlePassRewardPlanOption.proto
+
+package emu.grasscutter.net.proto;
+
+public final class BattlePassRewardPlanOptionOuterClass {
+  private BattlePassRewardPlanOptionOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface BattlePassRewardPlanOptionOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:BattlePassRewardPlanOption)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool OCACCJODDDO = 4;</code>
+     * @return The oCACCJODDDO.
+     */
+    boolean getOCACCJODDDO();
+
+    /**
+     * <code>uint32 default_reward_type = 6;</code>
+     * @return The defaultRewardType.
+     */
+    int getDefaultRewardType();
+
+    /**
+     * <code>uint32 IOIHAODNIKF = 14;</code>
+     * @return The iOIHAODNIKF.
+     */
+    int getIOIHAODNIKF();
+  }
+  /**
+   * Protobuf type {@code BattlePassRewardPlanOption}
+   */
+  public static final class BattlePassRewardPlanOption extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:BattlePassRewardPlanOption)
+      BattlePassRewardPlanOptionOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use BattlePassRewardPlanOption.newBuilder() to construct.
+    private BattlePassRewardPlanOption(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private BattlePassRewardPlanOption() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new BattlePassRewardPlanOption();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private BattlePassRewardPlanOption(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 32: {
+
+              oCACCJODDDO_ = input.readBool();
+              break;
+            }
+            case 48: {
+
+              defaultRewardType_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              iOIHAODNIKF_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.internal_static_BattlePassRewardPlanOption_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.internal_static_BattlePassRewardPlanOption_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.class, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder.class);
+    }
+
+    public static final int OCACCJODDDO_FIELD_NUMBER = 4;
+    private boolean oCACCJODDDO_;
+    /**
+     * <code>bool OCACCJODDDO = 4;</code>
+     * @return The oCACCJODDDO.
+     */
+    @java.lang.Override
+    public boolean getOCACCJODDDO() {
+      return oCACCJODDDO_;
+    }
+
+    public static final int DEFAULT_REWARD_TYPE_FIELD_NUMBER = 6;
+    private int defaultRewardType_;
+    /**
+     * <code>uint32 default_reward_type = 6;</code>
+     * @return The defaultRewardType.
+     */
+    @java.lang.Override
+    public int getDefaultRewardType() {
+      return defaultRewardType_;
+    }
+
+    public static final int IOIHAODNIKF_FIELD_NUMBER = 14;
+    private int iOIHAODNIKF_;
+    /**
+     * <code>uint32 IOIHAODNIKF = 14;</code>
+     * @return The iOIHAODNIKF.
+     */
+    @java.lang.Override
+    public int getIOIHAODNIKF() {
+      return iOIHAODNIKF_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (oCACCJODDDO_ != false) {
+        output.writeBool(4, oCACCJODDDO_);
+      }
+      if (defaultRewardType_ != 0) {
+        output.writeUInt32(6, defaultRewardType_);
+      }
+      if (iOIHAODNIKF_ != 0) {
+        output.writeUInt32(14, iOIHAODNIKF_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (oCACCJODDDO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, oCACCJODDDO_);
+      }
+      if (defaultRewardType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, defaultRewardType_);
+      }
+      if (iOIHAODNIKF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, iOIHAODNIKF_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption other = (emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption) obj;
+
+      if (getOCACCJODDDO()
+          != other.getOCACCJODDDO()) return false;
+      if (getDefaultRewardType()
+          != other.getDefaultRewardType()) return false;
+      if (getIOIHAODNIKF()
+          != other.getIOIHAODNIKF()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + OCACCJODDDO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOCACCJODDDO());
+      hash = (37 * hash) + DEFAULT_REWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDefaultRewardType();
+      hash = (37 * hash) + IOIHAODNIKF_FIELD_NUMBER;
+      hash = (53 * hash) + getIOIHAODNIKF();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code BattlePassRewardPlanOption}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:BattlePassRewardPlanOption)
+        emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.internal_static_BattlePassRewardPlanOption_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.internal_static_BattlePassRewardPlanOption_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.class, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        oCACCJODDDO_ = false;
+
+        defaultRewardType_ = 0;
+
+        iOIHAODNIKF_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.internal_static_BattlePassRewardPlanOption_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption build() {
+        emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption buildPartial() {
+        emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption result = new emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption(this);
+        result.oCACCJODDDO_ = oCACCJODDDO_;
+        result.defaultRewardType_ = defaultRewardType_;
+        result.iOIHAODNIKF_ = iOIHAODNIKF_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption) {
+          return mergeFrom((emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption other) {
+        if (other == emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.getDefaultInstance()) return this;
+        if (other.getOCACCJODDDO() != false) {
+          setOCACCJODDDO(other.getOCACCJODDDO());
+        }
+        if (other.getDefaultRewardType() != 0) {
+          setDefaultRewardType(other.getDefaultRewardType());
+        }
+        if (other.getIOIHAODNIKF() != 0) {
+          setIOIHAODNIKF(other.getIOIHAODNIKF());
+        }
+        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.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean oCACCJODDDO_ ;
+      /**
+       * <code>bool OCACCJODDDO = 4;</code>
+       * @return The oCACCJODDDO.
+       */
+      @java.lang.Override
+      public boolean getOCACCJODDDO() {
+        return oCACCJODDDO_;
+      }
+      /**
+       * <code>bool OCACCJODDDO = 4;</code>
+       * @param value The oCACCJODDDO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOCACCJODDDO(boolean value) {
+        
+        oCACCJODDDO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool OCACCJODDDO = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOCACCJODDDO() {
+        
+        oCACCJODDDO_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int defaultRewardType_ ;
+      /**
+       * <code>uint32 default_reward_type = 6;</code>
+       * @return The defaultRewardType.
+       */
+      @java.lang.Override
+      public int getDefaultRewardType() {
+        return defaultRewardType_;
+      }
+      /**
+       * <code>uint32 default_reward_type = 6;</code>
+       * @param value The defaultRewardType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDefaultRewardType(int value) {
+        
+        defaultRewardType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 default_reward_type = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDefaultRewardType() {
+        
+        defaultRewardType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int iOIHAODNIKF_ ;
+      /**
+       * <code>uint32 IOIHAODNIKF = 14;</code>
+       * @return The iOIHAODNIKF.
+       */
+      @java.lang.Override
+      public int getIOIHAODNIKF() {
+        return iOIHAODNIKF_;
+      }
+      /**
+       * <code>uint32 IOIHAODNIKF = 14;</code>
+       * @param value The iOIHAODNIKF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIOIHAODNIKF(int value) {
+        
+        iOIHAODNIKF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IOIHAODNIKF = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIOIHAODNIKF() {
+        
+        iOIHAODNIKF_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:BattlePassRewardPlanOption)
+    }
+
+    // @@protoc_insertion_point(class_scope:BattlePassRewardPlanOption)
+    private static final emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption();
+    }
+
+    public static emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<BattlePassRewardPlanOption>
+        PARSER = new com.google.protobuf.AbstractParser<BattlePassRewardPlanOption>() {
+      @java.lang.Override
+      public BattlePassRewardPlanOption parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new BattlePassRewardPlanOption(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<BattlePassRewardPlanOption> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<BattlePassRewardPlanOption> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_BattlePassRewardPlanOption_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_BattlePassRewardPlanOption_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n BattlePassRewardPlanOption.proto\"c\n\032Ba" +
+      "ttlePassRewardPlanOption\022\023\n\013OCACCJODDDO\030" +
+      "\004 \001(\010\022\033\n\023default_reward_type\030\006 \001(\r\022\023\n\013IO" +
+      "IHAODNIKF\030\016 \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_BattlePassRewardPlanOption_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_BattlePassRewardPlanOption_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_BattlePassRewardPlanOption_descriptor,
+        new java.lang.String[] { "OCACCJODDDO", "DefaultRewardType", "IOIHAODNIKF", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTagOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTagOuterClass.java
index eeff1dbc0..2ab242f12 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTagOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassRewardTagOuterClass.java
@@ -19,33 +19,35 @@ public final class BattlePassRewardTagOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 level = 12;</code>
+     * <code>uint32 DJCKCHACLME = 1;</code>
+     * @return The dJCKCHACLME.
+     */
+    int getDJCKCHACLME();
+
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
+     * @return The enum numeric value on the wire for unlockStatus.
+     */
+    int getUnlockStatusValue();
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
+     * @return The unlockStatus.
+     */
+    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus();
+
+    /**
+     * <code>uint32 level = 10;</code>
      * @return The level.
      */
     int getLevel();
 
     /**
-     * <code>uint32 reward_id = 8;</code>
+     * <code>uint32 reward_id = 11;</code>
      * @return The rewardId.
      */
     int getRewardId();
-
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
-     * @return The enum numeric value on the wire for unlockStatus.
-     */
-    int getUnlockStatusValue();
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
-     * @return The unlockStatus.
-     */
-    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus();
   }
   /**
-   * <pre>
-   * Obf: MMDANGGKGCL
-   * </pre>
-   *
    * Protobuf type {@code BattlePassRewardTag}
    */
   public static final class BattlePassRewardTag extends
@@ -92,21 +94,26 @@ public final class BattlePassRewardTagOuterClass {
               done = true;
               break;
             case 8: {
+
+              dJCKCHACLME_ = input.readUInt32();
+              break;
+            }
+            case 40: {
               int rawValue = input.readEnum();
 
               unlockStatus_ = rawValue;
               break;
             }
-            case 64: {
-
-              rewardId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 80: {
 
               level_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              rewardId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +146,40 @@ public final class BattlePassRewardTagOuterClass {
               emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.class, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder.class);
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 12;
+    public static final int DJCKCHACLME_FIELD_NUMBER = 1;
+    private int dJCKCHACLME_;
+    /**
+     * <code>uint32 DJCKCHACLME = 1;</code>
+     * @return The dJCKCHACLME.
+     */
+    @java.lang.Override
+    public int getDJCKCHACLME() {
+      return dJCKCHACLME_;
+    }
+
+    public static final int UNLOCK_STATUS_FIELD_NUMBER = 5;
+    private int unlockStatus_;
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
+     * @return The enum numeric value on the wire for unlockStatus.
+     */
+    @java.lang.Override public int getUnlockStatusValue() {
+      return unlockStatus_;
+    }
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
+     * @return The unlockStatus.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus result = emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.valueOf(unlockStatus_);
+      return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
+    }
+
+    public static final int LEVEL_FIELD_NUMBER = 10;
     private int level_;
     /**
-     * <code>uint32 level = 12;</code>
+     * <code>uint32 level = 10;</code>
      * @return The level.
      */
     @java.lang.Override
@@ -150,10 +187,10 @@ public final class BattlePassRewardTagOuterClass {
       return level_;
     }
 
-    public static final int REWARD_ID_FIELD_NUMBER = 8;
+    public static final int REWARD_ID_FIELD_NUMBER = 11;
     private int rewardId_;
     /**
-     * <code>uint32 reward_id = 8;</code>
+     * <code>uint32 reward_id = 11;</code>
      * @return The rewardId.
      */
     @java.lang.Override
@@ -161,25 +198,6 @@ public final class BattlePassRewardTagOuterClass {
       return rewardId_;
     }
 
-    public static final int UNLOCK_STATUS_FIELD_NUMBER = 1;
-    private int unlockStatus_;
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
-     * @return The enum numeric value on the wire for unlockStatus.
-     */
-    @java.lang.Override public int getUnlockStatusValue() {
-      return unlockStatus_;
-    }
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
-     * @return The unlockStatus.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus result = emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.valueOf(unlockStatus_);
-      return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -194,14 +212,17 @@ public final class BattlePassRewardTagOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
-        output.writeEnum(1, unlockStatus_);
+      if (dJCKCHACLME_ != 0) {
+        output.writeUInt32(1, dJCKCHACLME_);
       }
-      if (rewardId_ != 0) {
-        output.writeUInt32(8, rewardId_);
+      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
+        output.writeEnum(5, unlockStatus_);
       }
       if (level_ != 0) {
-        output.writeUInt32(12, level_);
+        output.writeUInt32(10, level_);
+      }
+      if (rewardId_ != 0) {
+        output.writeUInt32(11, rewardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -212,17 +233,21 @@ public final class BattlePassRewardTagOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (dJCKCHACLME_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, dJCKCHACLME_);
+      }
       if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, unlockStatus_);
-      }
-      if (rewardId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, rewardId_);
+          .computeEnumSize(5, unlockStatus_);
       }
       if (level_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, level_);
+          .computeUInt32Size(10, level_);
+      }
+      if (rewardId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, rewardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -239,11 +264,13 @@ public final class BattlePassRewardTagOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag other = (emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag) obj;
 
+      if (getDJCKCHACLME()
+          != other.getDJCKCHACLME()) return false;
+      if (unlockStatus_ != other.unlockStatus_) return false;
       if (getLevel()
           != other.getLevel()) return false;
       if (getRewardId()
           != other.getRewardId()) return false;
-      if (unlockStatus_ != other.unlockStatus_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -255,12 +282,14 @@ public final class BattlePassRewardTagOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DJCKCHACLME_FIELD_NUMBER;
+      hash = (53 * hash) + getDJCKCHACLME();
+      hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + unlockStatus_;
       hash = (37 * hash) + LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getLevel();
       hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRewardId();
-      hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + unlockStatus_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -357,10 +386,6 @@ public final class BattlePassRewardTagOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MMDANGGKGCL
-     * </pre>
-     *
      * Protobuf type {@code BattlePassRewardTag}
      */
     public static final class Builder extends
@@ -398,12 +423,14 @@ public final class BattlePassRewardTagOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        dJCKCHACLME_ = 0;
+
+        unlockStatus_ = 0;
+
         level_ = 0;
 
         rewardId_ = 0;
 
-        unlockStatus_ = 0;
-
         return this;
       }
 
@@ -430,9 +457,10 @@ public final class BattlePassRewardTagOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag buildPartial() {
         emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag result = new emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag(this);
+        result.dJCKCHACLME_ = dJCKCHACLME_;
+        result.unlockStatus_ = unlockStatus_;
         result.level_ = level_;
         result.rewardId_ = rewardId_;
-        result.unlockStatus_ = unlockStatus_;
         onBuilt();
         return result;
       }
@@ -481,15 +509,18 @@ public final class BattlePassRewardTagOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag other) {
         if (other == emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance()) return this;
+        if (other.getDJCKCHACLME() != 0) {
+          setDJCKCHACLME(other.getDJCKCHACLME());
+        }
+        if (other.unlockStatus_ != 0) {
+          setUnlockStatusValue(other.getUnlockStatusValue());
+        }
         if (other.getLevel() != 0) {
           setLevel(other.getLevel());
         }
         if (other.getRewardId() != 0) {
           setRewardId(other.getRewardId());
         }
-        if (other.unlockStatus_ != 0) {
-          setUnlockStatusValue(other.getUnlockStatusValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -519,78 +550,47 @@ public final class BattlePassRewardTagOuterClass {
         return this;
       }
 
-      private int level_ ;
+      private int dJCKCHACLME_ ;
       /**
-       * <code>uint32 level = 12;</code>
-       * @return The level.
+       * <code>uint32 DJCKCHACLME = 1;</code>
+       * @return The dJCKCHACLME.
        */
       @java.lang.Override
-      public int getLevel() {
-        return level_;
+      public int getDJCKCHACLME() {
+        return dJCKCHACLME_;
       }
       /**
-       * <code>uint32 level = 12;</code>
-       * @param value The level to set.
+       * <code>uint32 DJCKCHACLME = 1;</code>
+       * @param value The dJCKCHACLME to set.
        * @return This builder for chaining.
        */
-      public Builder setLevel(int value) {
+      public Builder setDJCKCHACLME(int value) {
         
-        level_ = value;
+        dJCKCHACLME_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 level = 12;</code>
+       * <code>uint32 DJCKCHACLME = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLevel() {
+      public Builder clearDJCKCHACLME() {
         
-        level_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int rewardId_ ;
-      /**
-       * <code>uint32 reward_id = 8;</code>
-       * @return The rewardId.
-       */
-      @java.lang.Override
-      public int getRewardId() {
-        return rewardId_;
-      }
-      /**
-       * <code>uint32 reward_id = 8;</code>
-       * @param value The rewardId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardId(int value) {
-        
-        rewardId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reward_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardId() {
-        
-        rewardId_ = 0;
+        dJCKCHACLME_ = 0;
         onChanged();
         return this;
       }
 
       private int unlockStatus_ = 0;
       /**
-       * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
+       * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
        * @return The enum numeric value on the wire for unlockStatus.
        */
       @java.lang.Override public int getUnlockStatusValue() {
         return unlockStatus_;
       }
       /**
-       * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
+       * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
        * @param value The enum numeric value on the wire for unlockStatus to set.
        * @return This builder for chaining.
        */
@@ -601,7 +601,7 @@ public final class BattlePassRewardTagOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
+       * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
        * @return The unlockStatus.
        */
       @java.lang.Override
@@ -611,7 +611,7 @@ public final class BattlePassRewardTagOuterClass {
         return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
       }
       /**
-       * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
+       * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
        * @param value The unlockStatus to set.
        * @return This builder for chaining.
        */
@@ -625,7 +625,7 @@ public final class BattlePassRewardTagOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassUnlockStatus unlock_status = 1;</code>
+       * <code>.BattlePassUnlockStatus unlock_status = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnlockStatus() {
@@ -634,6 +634,68 @@ public final class BattlePassRewardTagOuterClass {
         onChanged();
         return this;
       }
+
+      private int level_ ;
+      /**
+       * <code>uint32 level = 10;</code>
+       * @return The level.
+       */
+      @java.lang.Override
+      public int getLevel() {
+        return level_;
+      }
+      /**
+       * <code>uint32 level = 10;</code>
+       * @param value The level to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevel(int value) {
+        
+        level_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 level = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevel() {
+        
+        level_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int rewardId_ ;
+      /**
+       * <code>uint32 reward_id = 11;</code>
+       * @return The rewardId.
+       */
+      @java.lang.Override
+      public int getRewardId() {
+        return rewardId_;
+      }
+      /**
+       * <code>uint32 reward_id = 11;</code>
+       * @param value The rewardId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardId(int value) {
+        
+        rewardId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reward_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardId() {
+        
+        rewardId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -702,10 +764,11 @@ public final class BattlePassRewardTagOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031BattlePassRewardTag.proto\032\034BattlePassU" +
-      "nlockStatus.proto\"g\n\023BattlePassRewardTag" +
-      "\022\r\n\005level\030\014 \001(\r\022\021\n\treward_id\030\010 \001(\r\022.\n\run" +
-      "lock_status\030\001 \001(\0162\027.BattlePassUnlockStat" +
-      "usB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "nlockStatus.proto\"|\n\023BattlePassRewardTag" +
+      "\022\023\n\013DJCKCHACLME\030\001 \001(\r\022.\n\runlock_status\030\005" +
+      " \001(\0162\027.BattlePassUnlockStatus\022\r\n\005level\030\n" +
+      " \001(\r\022\021\n\treward_id\030\013 \001(\rB\033\n\031emu.grasscutt" +
+      "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -717,7 +780,7 @@ public final class BattlePassRewardTagOuterClass {
     internal_static_BattlePassRewardTag_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassRewardTag_descriptor,
-        new java.lang.String[] { "Level", "RewardId", "UnlockStatus", });
+        new java.lang.String[] { "DJCKCHACLME", "UnlockStatus", "Level", "RewardId", });
     emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassScheduleOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassScheduleOuterClass.java
index 7e23e7e55..b3b3cbc4a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassScheduleOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassScheduleOuterClass.java
@@ -19,129 +19,155 @@ public final class BattlePassScheduleOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_extra_paid_reward_taken = 7;</code>
-     * @return The isExtraPaidRewardTaken.
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     * @return Whether the curCycle field is set.
      */
-    boolean getIsExtraPaidRewardTaken();
+    boolean hasCurCycle();
+    /**
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     * @return The curCycle.
+     */
+    emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle();
+    /**
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     */
+    emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder();
 
     /**
-     * <code>uint32 end_time = 15;</code>
-     * @return The endTime.
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
-    int getEndTime();
+    java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> 
+        getRewardPlanOptionListList();
+    /**
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getRewardPlanOptionList(int index);
+    /**
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+     */
+    int getRewardPlanOptionListCount();
+    /**
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder> 
+        getRewardPlanOptionListOrBuilderList();
+    /**
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder getRewardPlanOptionListOrBuilder(
+        int index);
 
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>.BattlePassProduct product_info = 3;</code>
+     * @return Whether the productInfo field is set.
+     */
+    boolean hasProductInfo();
+    /**
+     * <code>.BattlePassProduct product_info = 3;</code>
+     * @return The productInfo.
+     */
+    emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct getProductInfo();
+    /**
+     * <code>.BattlePassProduct product_info = 3;</code>
+     */
+    emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder();
+
+    /**
+     * <code>bool LOPPMEONNEG = 4;</code>
+     * @return The lOPPMEONNEG.
+     */
+    boolean getLOPPMEONNEG();
+
+    /**
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> 
         getRewardTakenListList();
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getRewardTakenList(int index);
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     int getRewardTakenListCount();
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
         getRewardTakenListOrBuilderList();
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getRewardTakenListOrBuilder(
         int index);
 
     /**
-     * <code>.BattlePassProduct product_info = 4;</code>
-     * @return Whether the productInfo field is set.
-     */
-    boolean hasProductInfo();
-    /**
-     * <code>.BattlePassProduct product_info = 4;</code>
-     * @return The productInfo.
-     */
-    emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct getProductInfo();
-    /**
-     * <code>.BattlePassProduct product_info = 4;</code>
-     */
-    emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder();
-
-    /**
-     * <code>uint32 level = 8;</code>
-     * @return The level.
-     */
-    int getLevel();
-
-    /**
-     * <code>uint32 paid_platform_flags = 12;</code>
-     * @return The paidPlatformFlags.
-     */
-    int getPaidPlatformFlags();
-
-    /**
-     * <code>uint32 schedule_id = 10;</code>
-     * @return The scheduleId.
-     */
-    int getScheduleId();
-
-    /**
-     * <code>uint32 begin_time = 13;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-
-    /**
-     * <code>uint32 point = 2;</code>
-     * @return The point.
-     */
-    int getPoint();
-
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-     * @return The enum numeric value on the wire for unlockStatus.
-     */
-    int getUnlockStatusValue();
-    /**
-     * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-     * @return The unlockStatus.
-     */
-    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus();
-
-    /**
-     * <code>uint32 cur_cycle_points = 1;</code>
+     * <code>uint32 cur_cycle_points = 6;</code>
      * @return The curCyclePoints.
      */
     int getCurCyclePoints();
 
     /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     * @return Whether the curCycle field is set.
+     * <code>uint32 begin_time = 7;</code>
+     * @return The beginTime.
      */
-    boolean hasCurCycle();
-    /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     * @return The curCycle.
-     */
-    emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle();
-    /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     */
-    emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder();
+    int getBeginTime();
 
     /**
-     * <code>bool is_viewed = 14;</code>
+     * <code>bool is_extra_paid_reward_taken = 8;</code>
+     * @return The isExtraPaidRewardTaken.
+     */
+    boolean getIsExtraPaidRewardTaken();
+
+    /**
+     * <code>uint32 end_time = 9;</code>
+     * @return The endTime.
+     */
+    int getEndTime();
+
+    /**
+     * <code>uint32 point = 10;</code>
+     * @return The point.
+     */
+    int getPoint();
+
+    /**
+     * <code>uint32 paid_platform_flags = 11;</code>
+     * @return The paidPlatformFlags.
+     */
+    int getPaidPlatformFlags();
+
+    /**
+     * <code>uint32 schedule_id = 12;</code>
+     * @return The scheduleId.
+     */
+    int getScheduleId();
+
+    /**
+     * <code>bool is_viewed = 13;</code>
      * @return The isViewed.
      */
     boolean getIsViewed();
+
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+     * @return The enum numeric value on the wire for unlockStatus.
+     */
+    int getUnlockStatusValue();
+    /**
+     * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+     * @return The unlockStatus.
+     */
+    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus();
+
+    /**
+     * <code>uint32 level = 15;</code>
+     * @return The level.
+     */
+    int getLevel();
   }
   /**
-   * <pre>
-   * Obf: KFAIKMBDAIC
-   * </pre>
-   *
    * Protobuf type {@code BattlePassSchedule}
    */
   public static final class BattlePassSchedule extends
@@ -154,6 +180,7 @@ public final class BattlePassScheduleOuterClass {
       super(builder);
     }
     private BattlePassSchedule() {
+      rewardPlanOptionList_ = java.util.Collections.emptyList();
       rewardTakenList_ = java.util.Collections.emptyList();
       unlockStatus_ = 0;
     }
@@ -189,17 +216,7 @@ public final class BattlePassScheduleOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              curCyclePoints_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-
-              point_ = input.readUInt32();
-              break;
-            }
-            case 26: {
+            case 10: {
               emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder subBuilder = null;
               if (curCycle_ != null) {
                 subBuilder = curCycle_.toBuilder();
@@ -212,7 +229,16 @@ public final class BattlePassScheduleOuterClass {
 
               break;
             }
-            case 34: {
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                rewardPlanOptionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              rewardPlanOptionList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.parser(), extensionRegistry));
+              break;
+            }
+            case 26: {
               emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder subBuilder = null;
               if (productInfo_ != null) {
                 subBuilder = productInfo_.toBuilder();
@@ -225,54 +251,69 @@ public final class BattlePassScheduleOuterClass {
 
               break;
             }
-            case 56: {
+            case 32: {
 
-              isExtraPaidRewardTaken_ = input.readBool();
+              lOPPMEONNEG_ = input.readBool();
               break;
             }
-            case 64: {
-
-              level_ = input.readUInt32();
-              break;
-            }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 42: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 rewardTakenList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               rewardTakenList_.add(
                   input.readMessage(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.parser(), extensionRegistry));
               break;
             }
+            case 48: {
+
+              curCyclePoints_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              beginTime_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              isExtraPaidRewardTaken_ = input.readBool();
+              break;
+            }
+            case 72: {
+
+              endTime_ = input.readUInt32();
+              break;
+            }
             case 80: {
 
+              point_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              paidPlatformFlags_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
               scheduleId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 104: {
+
+              isViewed_ = input.readBool();
+              break;
+            }
+            case 112: {
               int rawValue = input.readEnum();
 
               unlockStatus_ = rawValue;
               break;
             }
-            case 96: {
-
-              paidPlatformFlags_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              beginTime_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              isViewed_ = input.readBool();
-              break;
-            }
             case 120: {
 
-              endTime_ = input.readUInt32();
+              level_ = input.readUInt32();
               break;
             }
             default: {
@@ -291,6 +332,9 @@ public final class BattlePassScheduleOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          rewardPlanOptionList_ = java.util.Collections.unmodifiableList(rewardPlanOptionList_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           rewardTakenList_ = java.util.Collections.unmodifiableList(rewardTakenList_);
         }
         this.unknownFields = unknownFields.build();
@@ -310,72 +354,76 @@ public final class BattlePassScheduleOuterClass {
               emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.class, emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.Builder.class);
     }
 
-    public static final int IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER = 7;
-    private boolean isExtraPaidRewardTaken_;
+    public static final int CUR_CYCLE_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
     /**
-     * <code>bool is_extra_paid_reward_taken = 7;</code>
-     * @return The isExtraPaidRewardTaken.
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     * @return Whether the curCycle field is set.
      */
     @java.lang.Override
-    public boolean getIsExtraPaidRewardTaken() {
-      return isExtraPaidRewardTaken_;
+    public boolean hasCurCycle() {
+      return curCycle_ != null;
+    }
+    /**
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     * @return The curCycle.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
+      return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
+    }
+    /**
+     * <code>.BattlePassCycle cur_cycle = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
+      return getCurCycle();
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 15;
-    private int endTime_;
+    public static final int REWARD_PLAN_OPTION_LIST_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> rewardPlanOptionList_;
     /**
-     * <code>uint32 end_time = 15;</code>
-     * @return The endTime.
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
     @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int REWARD_TAKEN_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> rewardTakenList_;
-    /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> getRewardTakenListList() {
-      return rewardTakenList_;
+    public java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> getRewardPlanOptionListList() {
+      return rewardPlanOptionList_;
     }
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
-        getRewardTakenListOrBuilderList() {
-      return rewardTakenList_;
+    public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder> 
+        getRewardPlanOptionListOrBuilderList() {
+      return rewardPlanOptionList_;
     }
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
     @java.lang.Override
-    public int getRewardTakenListCount() {
-      return rewardTakenList_.size();
+    public int getRewardPlanOptionListCount() {
+      return rewardPlanOptionList_.size();
     }
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getRewardTakenList(int index) {
-      return rewardTakenList_.get(index);
+    public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getRewardPlanOptionList(int index) {
+      return rewardPlanOptionList_.get(index);
     }
     /**
-     * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
+     * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getRewardTakenListOrBuilder(
+    public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder getRewardPlanOptionListOrBuilder(
         int index) {
-      return rewardTakenList_.get(index);
+      return rewardPlanOptionList_.get(index);
     }
 
-    public static final int PRODUCT_INFO_FIELD_NUMBER = 4;
+    public static final int PRODUCT_INFO_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct productInfo_;
     /**
-     * <code>.BattlePassProduct product_info = 4;</code>
+     * <code>.BattlePassProduct product_info = 3;</code>
      * @return Whether the productInfo field is set.
      */
     @java.lang.Override
@@ -383,7 +431,7 @@ public final class BattlePassScheduleOuterClass {
       return productInfo_ != null;
     }
     /**
-     * <code>.BattlePassProduct product_info = 4;</code>
+     * <code>.BattlePassProduct product_info = 3;</code>
      * @return The productInfo.
      */
     @java.lang.Override
@@ -391,50 +439,79 @@ public final class BattlePassScheduleOuterClass {
       return productInfo_ == null ? emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance() : productInfo_;
     }
     /**
-     * <code>.BattlePassProduct product_info = 4;</code>
+     * <code>.BattlePassProduct product_info = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder() {
       return getProductInfo();
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 8;
-    private int level_;
+    public static final int LOPPMEONNEG_FIELD_NUMBER = 4;
+    private boolean lOPPMEONNEG_;
     /**
-     * <code>uint32 level = 8;</code>
-     * @return The level.
+     * <code>bool LOPPMEONNEG = 4;</code>
+     * @return The lOPPMEONNEG.
      */
     @java.lang.Override
-    public int getLevel() {
-      return level_;
+    public boolean getLOPPMEONNEG() {
+      return lOPPMEONNEG_;
     }
 
-    public static final int PAID_PLATFORM_FLAGS_FIELD_NUMBER = 12;
-    private int paidPlatformFlags_;
+    public static final int REWARD_TAKEN_LIST_FIELD_NUMBER = 5;
+    private java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> rewardTakenList_;
     /**
-     * <code>uint32 paid_platform_flags = 12;</code>
-     * @return The paidPlatformFlags.
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     @java.lang.Override
-    public int getPaidPlatformFlags() {
-      return paidPlatformFlags_;
+    public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> getRewardTakenListList() {
+      return rewardTakenList_;
     }
-
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 10;
-    private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 10;</code>
-     * @return The scheduleId.
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
      */
     @java.lang.Override
-    public int getScheduleId() {
-      return scheduleId_;
+    public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
+        getRewardTakenListOrBuilderList() {
+      return rewardTakenList_;
+    }
+    /**
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+     */
+    @java.lang.Override
+    public int getRewardTakenListCount() {
+      return rewardTakenList_.size();
+    }
+    /**
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getRewardTakenList(int index) {
+      return rewardTakenList_.get(index);
+    }
+    /**
+     * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getRewardTakenListOrBuilder(
+        int index) {
+      return rewardTakenList_.get(index);
     }
 
-    public static final int BEGIN_TIME_FIELD_NUMBER = 13;
+    public static final int CUR_CYCLE_POINTS_FIELD_NUMBER = 6;
+    private int curCyclePoints_;
+    /**
+     * <code>uint32 cur_cycle_points = 6;</code>
+     * @return The curCyclePoints.
+     */
+    @java.lang.Override
+    public int getCurCyclePoints() {
+      return curCyclePoints_;
+    }
+
+    public static final int BEGIN_TIME_FIELD_NUMBER = 7;
     private int beginTime_;
     /**
-     * <code>uint32 begin_time = 13;</code>
+     * <code>uint32 begin_time = 7;</code>
      * @return The beginTime.
      */
     @java.lang.Override
@@ -442,10 +519,32 @@ public final class BattlePassScheduleOuterClass {
       return beginTime_;
     }
 
-    public static final int POINT_FIELD_NUMBER = 2;
+    public static final int IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER = 8;
+    private boolean isExtraPaidRewardTaken_;
+    /**
+     * <code>bool is_extra_paid_reward_taken = 8;</code>
+     * @return The isExtraPaidRewardTaken.
+     */
+    @java.lang.Override
+    public boolean getIsExtraPaidRewardTaken() {
+      return isExtraPaidRewardTaken_;
+    }
+
+    public static final int END_TIME_FIELD_NUMBER = 9;
+    private int endTime_;
+    /**
+     * <code>uint32 end_time = 9;</code>
+     * @return The endTime.
+     */
+    @java.lang.Override
+    public int getEndTime() {
+      return endTime_;
+    }
+
+    public static final int POINT_FIELD_NUMBER = 10;
     private int point_;
     /**
-     * <code>uint32 point = 2;</code>
+     * <code>uint32 point = 10;</code>
      * @return The point.
      */
     @java.lang.Override
@@ -453,17 +552,50 @@ public final class BattlePassScheduleOuterClass {
       return point_;
     }
 
-    public static final int UNLOCK_STATUS_FIELD_NUMBER = 11;
+    public static final int PAID_PLATFORM_FLAGS_FIELD_NUMBER = 11;
+    private int paidPlatformFlags_;
+    /**
+     * <code>uint32 paid_platform_flags = 11;</code>
+     * @return The paidPlatformFlags.
+     */
+    @java.lang.Override
+    public int getPaidPlatformFlags() {
+      return paidPlatformFlags_;
+    }
+
+    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 IS_VIEWED_FIELD_NUMBER = 13;
+    private boolean isViewed_;
+    /**
+     * <code>bool is_viewed = 13;</code>
+     * @return The isViewed.
+     */
+    @java.lang.Override
+    public boolean getIsViewed() {
+      return isViewed_;
+    }
+
+    public static final int UNLOCK_STATUS_FIELD_NUMBER = 14;
     private int unlockStatus_;
     /**
-     * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
+     * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
      * @return The enum numeric value on the wire for unlockStatus.
      */
     @java.lang.Override public int getUnlockStatusValue() {
       return unlockStatus_;
     }
     /**
-     * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
+     * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
      * @return The unlockStatus.
      */
     @java.lang.Override public emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus() {
@@ -472,52 +604,15 @@ public final class BattlePassScheduleOuterClass {
       return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
     }
 
-    public static final int CUR_CYCLE_POINTS_FIELD_NUMBER = 1;
-    private int curCyclePoints_;
+    public static final int LEVEL_FIELD_NUMBER = 15;
+    private int level_;
     /**
-     * <code>uint32 cur_cycle_points = 1;</code>
-     * @return The curCyclePoints.
+     * <code>uint32 level = 15;</code>
+     * @return The level.
      */
     @java.lang.Override
-    public int getCurCyclePoints() {
-      return curCyclePoints_;
-    }
-
-    public static final int CUR_CYCLE_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
-    /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     * @return Whether the curCycle field is set.
-     */
-    @java.lang.Override
-    public boolean hasCurCycle() {
-      return curCycle_ != null;
-    }
-    /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     * @return The curCycle.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
-      return curCycle_ == null ? emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.getDefaultInstance() : curCycle_;
-    }
-    /**
-     * <code>.BattlePassCycle cur_cycle = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
-      return getCurCycle();
-    }
-
-    public static final int IS_VIEWED_FIELD_NUMBER = 14;
-    private boolean isViewed_;
-    /**
-     * <code>bool is_viewed = 14;</code>
-     * @return The isViewed.
-     */
-    @java.lang.Override
-    public boolean getIsViewed() {
-      return isViewed_;
+    public int getLevel() {
+      return level_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -534,44 +629,50 @@ public final class BattlePassScheduleOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curCyclePoints_ != 0) {
-        output.writeUInt32(1, curCyclePoints_);
-      }
-      if (point_ != 0) {
-        output.writeUInt32(2, point_);
-      }
       if (curCycle_ != null) {
-        output.writeMessage(3, getCurCycle());
+        output.writeMessage(1, getCurCycle());
+      }
+      for (int i = 0; i < rewardPlanOptionList_.size(); i++) {
+        output.writeMessage(2, rewardPlanOptionList_.get(i));
       }
       if (productInfo_ != null) {
-        output.writeMessage(4, getProductInfo());
+        output.writeMessage(3, getProductInfo());
       }
-      if (isExtraPaidRewardTaken_ != false) {
-        output.writeBool(7, isExtraPaidRewardTaken_);
-      }
-      if (level_ != 0) {
-        output.writeUInt32(8, level_);
+      if (lOPPMEONNEG_ != false) {
+        output.writeBool(4, lOPPMEONNEG_);
       }
       for (int i = 0; i < rewardTakenList_.size(); i++) {
-        output.writeMessage(9, rewardTakenList_.get(i));
+        output.writeMessage(5, rewardTakenList_.get(i));
       }
-      if (scheduleId_ != 0) {
-        output.writeUInt32(10, scheduleId_);
-      }
-      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
-        output.writeEnum(11, unlockStatus_);
-      }
-      if (paidPlatformFlags_ != 0) {
-        output.writeUInt32(12, paidPlatformFlags_);
+      if (curCyclePoints_ != 0) {
+        output.writeUInt32(6, curCyclePoints_);
       }
       if (beginTime_ != 0) {
-        output.writeUInt32(13, beginTime_);
+        output.writeUInt32(7, beginTime_);
       }
-      if (isViewed_ != false) {
-        output.writeBool(14, isViewed_);
+      if (isExtraPaidRewardTaken_ != false) {
+        output.writeBool(8, isExtraPaidRewardTaken_);
       }
       if (endTime_ != 0) {
-        output.writeUInt32(15, endTime_);
+        output.writeUInt32(9, endTime_);
+      }
+      if (point_ != 0) {
+        output.writeUInt32(10, point_);
+      }
+      if (paidPlatformFlags_ != 0) {
+        output.writeUInt32(11, paidPlatformFlags_);
+      }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(12, scheduleId_);
+      }
+      if (isViewed_ != false) {
+        output.writeBool(13, isViewed_);
+      }
+      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
+        output.writeEnum(14, unlockStatus_);
+      }
+      if (level_ != 0) {
+        output.writeUInt32(15, level_);
       }
       unknownFields.writeTo(output);
     }
@@ -582,57 +683,65 @@ public final class BattlePassScheduleOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curCyclePoints_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, curCyclePoints_);
-      }
-      if (point_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, point_);
-      }
       if (curCycle_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getCurCycle());
+          .computeMessageSize(1, getCurCycle());
+      }
+      for (int i = 0; i < rewardPlanOptionList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, rewardPlanOptionList_.get(i));
       }
       if (productInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getProductInfo());
+          .computeMessageSize(3, getProductInfo());
       }
-      if (isExtraPaidRewardTaken_ != false) {
+      if (lOPPMEONNEG_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isExtraPaidRewardTaken_);
-      }
-      if (level_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, level_);
+          .computeBoolSize(4, lOPPMEONNEG_);
       }
       for (int i = 0; i < rewardTakenList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, rewardTakenList_.get(i));
+          .computeMessageSize(5, rewardTakenList_.get(i));
       }
-      if (scheduleId_ != 0) {
+      if (curCyclePoints_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, scheduleId_);
-      }
-      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, unlockStatus_);
-      }
-      if (paidPlatformFlags_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, paidPlatformFlags_);
+          .computeUInt32Size(6, curCyclePoints_);
       }
       if (beginTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, beginTime_);
+          .computeUInt32Size(7, beginTime_);
       }
-      if (isViewed_ != false) {
+      if (isExtraPaidRewardTaken_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isViewed_);
+          .computeBoolSize(8, isExtraPaidRewardTaken_);
       }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, endTime_);
+          .computeUInt32Size(9, endTime_);
+      }
+      if (point_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, point_);
+      }
+      if (paidPlatformFlags_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, paidPlatformFlags_);
+      }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, scheduleId_);
+      }
+      if (isViewed_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, isViewed_);
+      }
+      if (unlockStatus_ != emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.BATTLE_PASS_UNLOCK_STATUS_INVALID.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(14, unlockStatus_);
+      }
+      if (level_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, level_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -649,37 +758,41 @@ public final class BattlePassScheduleOuterClass {
       }
       emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule other = (emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule) obj;
 
-      if (getIsExtraPaidRewardTaken()
-          != other.getIsExtraPaidRewardTaken()) return false;
-      if (getEndTime()
-          != other.getEndTime()) return false;
-      if (!getRewardTakenListList()
-          .equals(other.getRewardTakenListList())) return false;
-      if (hasProductInfo() != other.hasProductInfo()) return false;
-      if (hasProductInfo()) {
-        if (!getProductInfo()
-            .equals(other.getProductInfo())) return false;
-      }
-      if (getLevel()
-          != other.getLevel()) return false;
-      if (getPaidPlatformFlags()
-          != other.getPaidPlatformFlags()) return false;
-      if (getScheduleId()
-          != other.getScheduleId()) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
-      if (getPoint()
-          != other.getPoint()) return false;
-      if (unlockStatus_ != other.unlockStatus_) return false;
-      if (getCurCyclePoints()
-          != other.getCurCyclePoints()) return false;
       if (hasCurCycle() != other.hasCurCycle()) return false;
       if (hasCurCycle()) {
         if (!getCurCycle()
             .equals(other.getCurCycle())) return false;
       }
+      if (!getRewardPlanOptionListList()
+          .equals(other.getRewardPlanOptionListList())) return false;
+      if (hasProductInfo() != other.hasProductInfo()) return false;
+      if (hasProductInfo()) {
+        if (!getProductInfo()
+            .equals(other.getProductInfo())) return false;
+      }
+      if (getLOPPMEONNEG()
+          != other.getLOPPMEONNEG()) return false;
+      if (!getRewardTakenListList()
+          .equals(other.getRewardTakenListList())) return false;
+      if (getCurCyclePoints()
+          != other.getCurCyclePoints()) return false;
+      if (getBeginTime()
+          != other.getBeginTime()) return false;
+      if (getIsExtraPaidRewardTaken()
+          != other.getIsExtraPaidRewardTaken()) return false;
+      if (getEndTime()
+          != other.getEndTime()) return false;
+      if (getPoint()
+          != other.getPoint()) return false;
+      if (getPaidPlatformFlags()
+          != other.getPaidPlatformFlags()) return false;
+      if (getScheduleId()
+          != other.getScheduleId()) return false;
       if (getIsViewed()
           != other.getIsViewed()) return false;
+      if (unlockStatus_ != other.unlockStatus_) return false;
+      if (getLevel()
+          != other.getLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -691,40 +804,47 @@ public final class BattlePassScheduleOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsExtraPaidRewardTaken());
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
-      if (getRewardTakenListCount() > 0) {
-        hash = (37 * hash) + REWARD_TAKEN_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getRewardTakenListList().hashCode();
+      if (hasCurCycle()) {
+        hash = (37 * hash) + CUR_CYCLE_FIELD_NUMBER;
+        hash = (53 * hash) + getCurCycle().hashCode();
+      }
+      if (getRewardPlanOptionListCount() > 0) {
+        hash = (37 * hash) + REWARD_PLAN_OPTION_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getRewardPlanOptionListList().hashCode();
       }
       if (hasProductInfo()) {
         hash = (37 * hash) + PRODUCT_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getProductInfo().hashCode();
       }
-      hash = (37 * hash) + LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getLevel();
+      hash = (37 * hash) + LOPPMEONNEG_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getLOPPMEONNEG());
+      if (getRewardTakenListCount() > 0) {
+        hash = (37 * hash) + REWARD_TAKEN_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getRewardTakenListList().hashCode();
+      }
+      hash = (37 * hash) + CUR_CYCLE_POINTS_FIELD_NUMBER;
+      hash = (53 * hash) + getCurCyclePoints();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + IS_EXTRA_PAID_REWARD_TAKEN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsExtraPaidRewardTaken());
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + POINT_FIELD_NUMBER;
+      hash = (53 * hash) + getPoint();
       hash = (37 * hash) + PAID_PLATFORM_FLAGS_FIELD_NUMBER;
       hash = (53 * hash) + getPaidPlatformFlags();
       hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + POINT_FIELD_NUMBER;
-      hash = (53 * hash) + getPoint();
-      hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + unlockStatus_;
-      hash = (37 * hash) + CUR_CYCLE_POINTS_FIELD_NUMBER;
-      hash = (53 * hash) + getCurCyclePoints();
-      if (hasCurCycle()) {
-        hash = (37 * hash) + CUR_CYCLE_FIELD_NUMBER;
-        hash = (53 * hash) + getCurCycle().hashCode();
-      }
       hash = (37 * hash) + IS_VIEWED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsViewed());
+      hash = (37 * hash) + UNLOCK_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + unlockStatus_;
+      hash = (37 * hash) + LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -821,10 +941,6 @@ public final class BattlePassScheduleOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KFAIKMBDAIC
-     * </pre>
-     *
      * Protobuf type {@code BattlePassSchedule}
      */
     public static final class Builder extends
@@ -857,21 +973,24 @@ public final class BattlePassScheduleOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getRewardPlanOptionListFieldBuilder();
           getRewardTakenListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isExtraPaidRewardTaken_ = false;
-
-        endTime_ = 0;
-
-        if (rewardTakenListBuilder_ == null) {
-          rewardTakenList_ = java.util.Collections.emptyList();
+        if (curCycleBuilder_ == null) {
+          curCycle_ = null;
+        } else {
+          curCycle_ = null;
+          curCycleBuilder_ = null;
+        }
+        if (rewardPlanOptionListBuilder_ == null) {
+          rewardPlanOptionList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
-          rewardTakenListBuilder_.clear();
+          rewardPlanOptionListBuilder_.clear();
         }
         if (productInfoBuilder_ == null) {
           productInfo_ = null;
@@ -879,27 +998,33 @@ public final class BattlePassScheduleOuterClass {
           productInfo_ = null;
           productInfoBuilder_ = null;
         }
-        level_ = 0;
+        lOPPMEONNEG_ = false;
+
+        if (rewardTakenListBuilder_ == null) {
+          rewardTakenList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          rewardTakenListBuilder_.clear();
+        }
+        curCyclePoints_ = 0;
+
+        beginTime_ = 0;
+
+        isExtraPaidRewardTaken_ = false;
+
+        endTime_ = 0;
+
+        point_ = 0;
 
         paidPlatformFlags_ = 0;
 
         scheduleId_ = 0;
 
-        beginTime_ = 0;
-
-        point_ = 0;
+        isViewed_ = false;
 
         unlockStatus_ = 0;
 
-        curCyclePoints_ = 0;
-
-        if (curCycleBuilder_ == null) {
-          curCycle_ = null;
-        } else {
-          curCycle_ = null;
-          curCycleBuilder_ = null;
-        }
-        isViewed_ = false;
+        level_ = 0;
 
         return this;
       }
@@ -928,35 +1053,45 @@ public final class BattlePassScheduleOuterClass {
       public emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule buildPartial() {
         emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule result = new emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule(this);
         int from_bitField0_ = bitField0_;
-        result.isExtraPaidRewardTaken_ = isExtraPaidRewardTaken_;
-        result.endTime_ = endTime_;
-        if (rewardTakenListBuilder_ == null) {
+        if (curCycleBuilder_ == null) {
+          result.curCycle_ = curCycle_;
+        } else {
+          result.curCycle_ = curCycleBuilder_.build();
+        }
+        if (rewardPlanOptionListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            rewardTakenList_ = java.util.Collections.unmodifiableList(rewardTakenList_);
+            rewardPlanOptionList_ = java.util.Collections.unmodifiableList(rewardPlanOptionList_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
-          result.rewardTakenList_ = rewardTakenList_;
+          result.rewardPlanOptionList_ = rewardPlanOptionList_;
         } else {
-          result.rewardTakenList_ = rewardTakenListBuilder_.build();
+          result.rewardPlanOptionList_ = rewardPlanOptionListBuilder_.build();
         }
         if (productInfoBuilder_ == null) {
           result.productInfo_ = productInfo_;
         } else {
           result.productInfo_ = productInfoBuilder_.build();
         }
-        result.level_ = level_;
+        result.lOPPMEONNEG_ = lOPPMEONNEG_;
+        if (rewardTakenListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            rewardTakenList_ = java.util.Collections.unmodifiableList(rewardTakenList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.rewardTakenList_ = rewardTakenList_;
+        } else {
+          result.rewardTakenList_ = rewardTakenListBuilder_.build();
+        }
+        result.curCyclePoints_ = curCyclePoints_;
+        result.beginTime_ = beginTime_;
+        result.isExtraPaidRewardTaken_ = isExtraPaidRewardTaken_;
+        result.endTime_ = endTime_;
+        result.point_ = point_;
         result.paidPlatformFlags_ = paidPlatformFlags_;
         result.scheduleId_ = scheduleId_;
-        result.beginTime_ = beginTime_;
-        result.point_ = point_;
-        result.unlockStatus_ = unlockStatus_;
-        result.curCyclePoints_ = curCyclePoints_;
-        if (curCycleBuilder_ == null) {
-          result.curCycle_ = curCycle_;
-        } else {
-          result.curCycle_ = curCycleBuilder_.build();
-        }
         result.isViewed_ = isViewed_;
+        result.unlockStatus_ = unlockStatus_;
+        result.level_ = level_;
         onBuilt();
         return result;
       }
@@ -1005,17 +1140,46 @@ public final class BattlePassScheduleOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule other) {
         if (other == emu.grasscutter.net.proto.BattlePassScheduleOuterClass.BattlePassSchedule.getDefaultInstance()) return this;
-        if (other.getIsExtraPaidRewardTaken() != false) {
-          setIsExtraPaidRewardTaken(other.getIsExtraPaidRewardTaken());
+        if (other.hasCurCycle()) {
+          mergeCurCycle(other.getCurCycle());
         }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
+        if (rewardPlanOptionListBuilder_ == null) {
+          if (!other.rewardPlanOptionList_.isEmpty()) {
+            if (rewardPlanOptionList_.isEmpty()) {
+              rewardPlanOptionList_ = other.rewardPlanOptionList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureRewardPlanOptionListIsMutable();
+              rewardPlanOptionList_.addAll(other.rewardPlanOptionList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.rewardPlanOptionList_.isEmpty()) {
+            if (rewardPlanOptionListBuilder_.isEmpty()) {
+              rewardPlanOptionListBuilder_.dispose();
+              rewardPlanOptionListBuilder_ = null;
+              rewardPlanOptionList_ = other.rewardPlanOptionList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              rewardPlanOptionListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getRewardPlanOptionListFieldBuilder() : null;
+            } else {
+              rewardPlanOptionListBuilder_.addAllMessages(other.rewardPlanOptionList_);
+            }
+          }
+        }
+        if (other.hasProductInfo()) {
+          mergeProductInfo(other.getProductInfo());
+        }
+        if (other.getLOPPMEONNEG() != false) {
+          setLOPPMEONNEG(other.getLOPPMEONNEG());
         }
         if (rewardTakenListBuilder_ == null) {
           if (!other.rewardTakenList_.isEmpty()) {
             if (rewardTakenList_.isEmpty()) {
               rewardTakenList_ = other.rewardTakenList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureRewardTakenListIsMutable();
               rewardTakenList_.addAll(other.rewardTakenList_);
@@ -1028,7 +1192,7 @@ public final class BattlePassScheduleOuterClass {
               rewardTakenListBuilder_.dispose();
               rewardTakenListBuilder_ = null;
               rewardTakenList_ = other.rewardTakenList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               rewardTakenListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRewardTakenListFieldBuilder() : null;
@@ -1037,11 +1201,20 @@ public final class BattlePassScheduleOuterClass {
             }
           }
         }
-        if (other.hasProductInfo()) {
-          mergeProductInfo(other.getProductInfo());
+        if (other.getCurCyclePoints() != 0) {
+          setCurCyclePoints(other.getCurCyclePoints());
         }
-        if (other.getLevel() != 0) {
-          setLevel(other.getLevel());
+        if (other.getBeginTime() != 0) {
+          setBeginTime(other.getBeginTime());
+        }
+        if (other.getIsExtraPaidRewardTaken() != false) {
+          setIsExtraPaidRewardTaken(other.getIsExtraPaidRewardTaken());
+        }
+        if (other.getEndTime() != 0) {
+          setEndTime(other.getEndTime());
+        }
+        if (other.getPoint() != 0) {
+          setPoint(other.getPoint());
         }
         if (other.getPaidPlatformFlags() != 0) {
           setPaidPlatformFlags(other.getPaidPlatformFlags());
@@ -1049,23 +1222,14 @@ public final class BattlePassScheduleOuterClass {
         if (other.getScheduleId() != 0) {
           setScheduleId(other.getScheduleId());
         }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
-        }
-        if (other.getPoint() != 0) {
-          setPoint(other.getPoint());
+        if (other.getIsViewed() != false) {
+          setIsViewed(other.getIsViewed());
         }
         if (other.unlockStatus_ != 0) {
           setUnlockStatusValue(other.getUnlockStatusValue());
         }
-        if (other.getCurCyclePoints() != 0) {
-          setCurCyclePoints(other.getCurCyclePoints());
-        }
-        if (other.hasCurCycle()) {
-          mergeCurCycle(other.getCurCycle());
-        }
-        if (other.getIsViewed() != false) {
-          setIsViewed(other.getIsViewed());
+        if (other.getLevel() != 0) {
+          setLevel(other.getLevel());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1097,679 +1261,18 @@ public final class BattlePassScheduleOuterClass {
       }
       private int bitField0_;
 
-      private boolean isExtraPaidRewardTaken_ ;
-      /**
-       * <code>bool is_extra_paid_reward_taken = 7;</code>
-       * @return The isExtraPaidRewardTaken.
-       */
-      @java.lang.Override
-      public boolean getIsExtraPaidRewardTaken() {
-        return isExtraPaidRewardTaken_;
-      }
-      /**
-       * <code>bool is_extra_paid_reward_taken = 7;</code>
-       * @param value The isExtraPaidRewardTaken to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsExtraPaidRewardTaken(boolean value) {
-        
-        isExtraPaidRewardTaken_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_extra_paid_reward_taken = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsExtraPaidRewardTaken() {
-        
-        isExtraPaidRewardTaken_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 15;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 15;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> rewardTakenList_ =
-        java.util.Collections.emptyList();
-      private void ensureRewardTakenListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          rewardTakenList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag>(rewardTakenList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> rewardTakenListBuilder_;
-
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> getRewardTakenListList() {
-        if (rewardTakenListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(rewardTakenList_);
-        } else {
-          return rewardTakenListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public int getRewardTakenListCount() {
-        if (rewardTakenListBuilder_ == null) {
-          return rewardTakenList_.size();
-        } else {
-          return rewardTakenListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getRewardTakenList(int index) {
-        if (rewardTakenListBuilder_ == null) {
-          return rewardTakenList_.get(index);
-        } else {
-          return rewardTakenListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder setRewardTakenList(
-          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
-        if (rewardTakenListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.set(index, value);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder setRewardTakenList(
-          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
-        if (rewardTakenListBuilder_ == null) {
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder addRewardTakenList(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
-        if (rewardTakenListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.add(value);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder addRewardTakenList(
-          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
-        if (rewardTakenListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.add(index, value);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder addRewardTakenList(
-          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
-        if (rewardTakenListBuilder_ == null) {
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder addRewardTakenList(
-          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
-        if (rewardTakenListBuilder_ == null) {
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder addAllRewardTakenList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> values) {
-        if (rewardTakenListBuilder_ == null) {
-          ensureRewardTakenListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, rewardTakenList_);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder clearRewardTakenList() {
-        if (rewardTakenListBuilder_ == null) {
-          rewardTakenList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public Builder removeRewardTakenList(int index) {
-        if (rewardTakenListBuilder_ == null) {
-          ensureRewardTakenListIsMutable();
-          rewardTakenList_.remove(index);
-          onChanged();
-        } else {
-          rewardTakenListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder getRewardTakenListBuilder(
-          int index) {
-        return getRewardTakenListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getRewardTakenListOrBuilder(
-          int index) {
-        if (rewardTakenListBuilder_ == null) {
-          return rewardTakenList_.get(index);  } else {
-          return rewardTakenListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
-           getRewardTakenListOrBuilderList() {
-        if (rewardTakenListBuilder_ != null) {
-          return rewardTakenListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(rewardTakenList_);
-        }
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder addRewardTakenListBuilder() {
-        return getRewardTakenListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder addRewardTakenListBuilder(
-          int index) {
-        return getRewardTakenListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .BattlePassRewardTag reward_taken_list = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder> 
-           getRewardTakenListBuilderList() {
-        return getRewardTakenListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
-          getRewardTakenListFieldBuilder() {
-        if (rewardTakenListBuilder_ == null) {
-          rewardTakenListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder>(
-                  rewardTakenList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          rewardTakenList_ = null;
-        }
-        return rewardTakenListBuilder_;
-      }
-
-      private emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct productInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder> productInfoBuilder_;
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       * @return Whether the productInfo field is set.
-       */
-      public boolean hasProductInfo() {
-        return productInfoBuilder_ != null || productInfo_ != null;
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       * @return The productInfo.
-       */
-      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct getProductInfo() {
-        if (productInfoBuilder_ == null) {
-          return productInfo_ == null ? emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance() : productInfo_;
-        } else {
-          return productInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public Builder setProductInfo(emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct value) {
-        if (productInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          productInfo_ = value;
-          onChanged();
-        } else {
-          productInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public Builder setProductInfo(
-          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder builderForValue) {
-        if (productInfoBuilder_ == null) {
-          productInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          productInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public Builder mergeProductInfo(emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct value) {
-        if (productInfoBuilder_ == null) {
-          if (productInfo_ != null) {
-            productInfo_ =
-              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.newBuilder(productInfo_).mergeFrom(value).buildPartial();
-          } else {
-            productInfo_ = value;
-          }
-          onChanged();
-        } else {
-          productInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public Builder clearProductInfo() {
-        if (productInfoBuilder_ == null) {
-          productInfo_ = null;
-          onChanged();
-        } else {
-          productInfo_ = null;
-          productInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder getProductInfoBuilder() {
-        
-        onChanged();
-        return getProductInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder() {
-        if (productInfoBuilder_ != null) {
-          return productInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return productInfo_ == null ?
-              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance() : productInfo_;
-        }
-      }
-      /**
-       * <code>.BattlePassProduct product_info = 4;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder> 
-          getProductInfoFieldBuilder() {
-        if (productInfoBuilder_ == null) {
-          productInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder>(
-                  getProductInfo(),
-                  getParentForChildren(),
-                  isClean());
-          productInfo_ = null;
-        }
-        return productInfoBuilder_;
-      }
-
-      private int level_ ;
-      /**
-       * <code>uint32 level = 8;</code>
-       * @return The level.
-       */
-      @java.lang.Override
-      public int getLevel() {
-        return level_;
-      }
-      /**
-       * <code>uint32 level = 8;</code>
-       * @param value The level to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLevel(int value) {
-        
-        level_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 level = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLevel() {
-        
-        level_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int paidPlatformFlags_ ;
-      /**
-       * <code>uint32 paid_platform_flags = 12;</code>
-       * @return The paidPlatformFlags.
-       */
-      @java.lang.Override
-      public int getPaidPlatformFlags() {
-        return paidPlatformFlags_;
-      }
-      /**
-       * <code>uint32 paid_platform_flags = 12;</code>
-       * @param value The paidPlatformFlags to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPaidPlatformFlags(int value) {
-        
-        paidPlatformFlags_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 paid_platform_flags = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPaidPlatformFlags() {
-        
-        paidPlatformFlags_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int scheduleId_ ;
-      /**
-       * <code>uint32 schedule_id = 10;</code>
-       * @return The scheduleId.
-       */
-      @java.lang.Override
-      public int getScheduleId() {
-        return scheduleId_;
-      }
-      /**
-       * <code>uint32 schedule_id = 10;</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 = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScheduleId() {
-        
-        scheduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int point_ ;
-      /**
-       * <code>uint32 point = 2;</code>
-       * @return The point.
-       */
-      @java.lang.Override
-      public int getPoint() {
-        return point_;
-      }
-      /**
-       * <code>uint32 point = 2;</code>
-       * @param value The point to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPoint(int value) {
-        
-        point_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPoint() {
-        
-        point_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int unlockStatus_ = 0;
-      /**
-       * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-       * @return The enum numeric value on the wire for unlockStatus.
-       */
-      @java.lang.Override public int getUnlockStatusValue() {
-        return unlockStatus_;
-      }
-      /**
-       * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-       * @param value The enum numeric value on the wire for unlockStatus to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnlockStatusValue(int value) {
-        
-        unlockStatus_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-       * @return The unlockStatus.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus result = emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.valueOf(unlockStatus_);
-        return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-       * @param value The unlockStatus to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnlockStatus(emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        unlockStatus_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.BattlePassUnlockStatus unlock_status = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnlockStatus() {
-        
-        unlockStatus_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curCyclePoints_ ;
-      /**
-       * <code>uint32 cur_cycle_points = 1;</code>
-       * @return The curCyclePoints.
-       */
-      @java.lang.Override
-      public int getCurCyclePoints() {
-        return curCyclePoints_;
-      }
-      /**
-       * <code>uint32 cur_cycle_points = 1;</code>
-       * @param value The curCyclePoints to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurCyclePoints(int value) {
-        
-        curCyclePoints_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_cycle_points = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurCyclePoints() {
-        
-        curCyclePoints_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle curCycle_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder> curCycleBuilder_;
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        * @return Whether the curCycle field is set.
        */
       public boolean hasCurCycle() {
         return curCycleBuilder_ != null || curCycle_ != null;
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        * @return The curCycle.
        */
       public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle getCurCycle() {
@@ -1780,7 +1283,7 @@ public final class BattlePassScheduleOuterClass {
         }
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public Builder setCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
         if (curCycleBuilder_ == null) {
@@ -1796,7 +1299,7 @@ public final class BattlePassScheduleOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public Builder setCurCycle(
           emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder builderForValue) {
@@ -1810,7 +1313,7 @@ public final class BattlePassScheduleOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public Builder mergeCurCycle(emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle value) {
         if (curCycleBuilder_ == null) {
@@ -1828,7 +1331,7 @@ public final class BattlePassScheduleOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public Builder clearCurCycle() {
         if (curCycleBuilder_ == null) {
@@ -1842,7 +1345,7 @@ public final class BattlePassScheduleOuterClass {
         return this;
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder getCurCycleBuilder() {
         
@@ -1850,7 +1353,7 @@ public final class BattlePassScheduleOuterClass {
         return getCurCycleFieldBuilder().getBuilder();
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       public emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder getCurCycleOrBuilder() {
         if (curCycleBuilder_ != null) {
@@ -1861,7 +1364,7 @@ public final class BattlePassScheduleOuterClass {
         }
       }
       /**
-       * <code>.BattlePassCycle cur_cycle = 3;</code>
+       * <code>.BattlePassCycle cur_cycle = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle.Builder, emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycleOrBuilder> 
@@ -1877,9 +1380,856 @@ public final class BattlePassScheduleOuterClass {
         return curCycleBuilder_;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> rewardPlanOptionList_ =
+        java.util.Collections.emptyList();
+      private void ensureRewardPlanOptionListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          rewardPlanOptionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption>(rewardPlanOptionList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder> rewardPlanOptionListBuilder_;
+
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> getRewardPlanOptionListList() {
+        if (rewardPlanOptionListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(rewardPlanOptionList_);
+        } else {
+          return rewardPlanOptionListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public int getRewardPlanOptionListCount() {
+        if (rewardPlanOptionListBuilder_ == null) {
+          return rewardPlanOptionList_.size();
+        } else {
+          return rewardPlanOptionListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption getRewardPlanOptionList(int index) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          return rewardPlanOptionList_.get(index);
+        } else {
+          return rewardPlanOptionListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder setRewardPlanOptionList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption value) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.set(index, value);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder setRewardPlanOptionList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder builderForValue) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder addRewardPlanOptionList(emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption value) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.add(value);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder addRewardPlanOptionList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption value) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.add(index, value);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder addRewardPlanOptionList(
+          emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder builderForValue) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder addRewardPlanOptionList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder builderForValue) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder addAllRewardPlanOptionList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption> values) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          ensureRewardPlanOptionListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, rewardPlanOptionList_);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder clearRewardPlanOptionList() {
+        if (rewardPlanOptionListBuilder_ == null) {
+          rewardPlanOptionList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public Builder removeRewardPlanOptionList(int index) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          ensureRewardPlanOptionListIsMutable();
+          rewardPlanOptionList_.remove(index);
+          onChanged();
+        } else {
+          rewardPlanOptionListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder getRewardPlanOptionListBuilder(
+          int index) {
+        return getRewardPlanOptionListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder getRewardPlanOptionListOrBuilder(
+          int index) {
+        if (rewardPlanOptionListBuilder_ == null) {
+          return rewardPlanOptionList_.get(index);  } else {
+          return rewardPlanOptionListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder> 
+           getRewardPlanOptionListOrBuilderList() {
+        if (rewardPlanOptionListBuilder_ != null) {
+          return rewardPlanOptionListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(rewardPlanOptionList_);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder addRewardPlanOptionListBuilder() {
+        return getRewardPlanOptionListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder addRewardPlanOptionListBuilder(
+          int index) {
+        return getRewardPlanOptionListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .BattlePassRewardPlanOption reward_plan_option_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder> 
+           getRewardPlanOptionListBuilderList() {
+        return getRewardPlanOptionListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder> 
+          getRewardPlanOptionListFieldBuilder() {
+        if (rewardPlanOptionListBuilder_ == null) {
+          rewardPlanOptionListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOption.Builder, emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.BattlePassRewardPlanOptionOrBuilder>(
+                  rewardPlanOptionList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          rewardPlanOptionList_ = null;
+        }
+        return rewardPlanOptionListBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct productInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder> productInfoBuilder_;
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       * @return Whether the productInfo field is set.
+       */
+      public boolean hasProductInfo() {
+        return productInfoBuilder_ != null || productInfo_ != null;
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       * @return The productInfo.
+       */
+      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct getProductInfo() {
+        if (productInfoBuilder_ == null) {
+          return productInfo_ == null ? emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance() : productInfo_;
+        } else {
+          return productInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public Builder setProductInfo(emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct value) {
+        if (productInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          productInfo_ = value;
+          onChanged();
+        } else {
+          productInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public Builder setProductInfo(
+          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder builderForValue) {
+        if (productInfoBuilder_ == null) {
+          productInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          productInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public Builder mergeProductInfo(emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct value) {
+        if (productInfoBuilder_ == null) {
+          if (productInfo_ != null) {
+            productInfo_ =
+              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.newBuilder(productInfo_).mergeFrom(value).buildPartial();
+          } else {
+            productInfo_ = value;
+          }
+          onChanged();
+        } else {
+          productInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public Builder clearProductInfo() {
+        if (productInfoBuilder_ == null) {
+          productInfo_ = null;
+          onChanged();
+        } else {
+          productInfo_ = null;
+          productInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder getProductInfoBuilder() {
+        
+        onChanged();
+        return getProductInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder getProductInfoOrBuilder() {
+        if (productInfoBuilder_ != null) {
+          return productInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return productInfo_ == null ?
+              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.getDefaultInstance() : productInfo_;
+        }
+      }
+      /**
+       * <code>.BattlePassProduct product_info = 3;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder> 
+          getProductInfoFieldBuilder() {
+        if (productInfoBuilder_ == null) {
+          productInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct.Builder, emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProductOrBuilder>(
+                  getProductInfo(),
+                  getParentForChildren(),
+                  isClean());
+          productInfo_ = null;
+        }
+        return productInfoBuilder_;
+      }
+
+      private boolean lOPPMEONNEG_ ;
+      /**
+       * <code>bool LOPPMEONNEG = 4;</code>
+       * @return The lOPPMEONNEG.
+       */
+      @java.lang.Override
+      public boolean getLOPPMEONNEG() {
+        return lOPPMEONNEG_;
+      }
+      /**
+       * <code>bool LOPPMEONNEG = 4;</code>
+       * @param value The lOPPMEONNEG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLOPPMEONNEG(boolean value) {
+        
+        lOPPMEONNEG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool LOPPMEONNEG = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLOPPMEONNEG() {
+        
+        lOPPMEONNEG_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> rewardTakenList_ =
+        java.util.Collections.emptyList();
+      private void ensureRewardTakenListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          rewardTakenList_ = new java.util.ArrayList<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag>(rewardTakenList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> rewardTakenListBuilder_;
+
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> getRewardTakenListList() {
+        if (rewardTakenListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(rewardTakenList_);
+        } else {
+          return rewardTakenListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public int getRewardTakenListCount() {
+        if (rewardTakenListBuilder_ == null) {
+          return rewardTakenList_.size();
+        } else {
+          return rewardTakenListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag getRewardTakenList(int index) {
+        if (rewardTakenListBuilder_ == null) {
+          return rewardTakenList_.get(index);
+        } else {
+          return rewardTakenListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder setRewardTakenList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
+        if (rewardTakenListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.set(index, value);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder setRewardTakenList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
+        if (rewardTakenListBuilder_ == null) {
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder addRewardTakenList(emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
+        if (rewardTakenListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.add(value);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder addRewardTakenList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag value) {
+        if (rewardTakenListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.add(index, value);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder addRewardTakenList(
+          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
+        if (rewardTakenListBuilder_ == null) {
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder addRewardTakenList(
+          int index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder builderForValue) {
+        if (rewardTakenListBuilder_ == null) {
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder addAllRewardTakenList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag> values) {
+        if (rewardTakenListBuilder_ == null) {
+          ensureRewardTakenListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, rewardTakenList_);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder clearRewardTakenList() {
+        if (rewardTakenListBuilder_ == null) {
+          rewardTakenList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public Builder removeRewardTakenList(int index) {
+        if (rewardTakenListBuilder_ == null) {
+          ensureRewardTakenListIsMutable();
+          rewardTakenList_.remove(index);
+          onChanged();
+        } else {
+          rewardTakenListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder getRewardTakenListBuilder(
+          int index) {
+        return getRewardTakenListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder getRewardTakenListOrBuilder(
+          int index) {
+        if (rewardTakenListBuilder_ == null) {
+          return rewardTakenList_.get(index);  } else {
+          return rewardTakenListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
+           getRewardTakenListOrBuilderList() {
+        if (rewardTakenListBuilder_ != null) {
+          return rewardTakenListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(rewardTakenList_);
+        }
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder addRewardTakenListBuilder() {
+        return getRewardTakenListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder addRewardTakenListBuilder(
+          int index) {
+        return getRewardTakenListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .BattlePassRewardTag reward_taken_list = 5;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder> 
+           getRewardTakenListBuilderList() {
+        return getRewardTakenListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder> 
+          getRewardTakenListFieldBuilder() {
+        if (rewardTakenListBuilder_ == null) {
+          rewardTakenListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag.Builder, emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTagOrBuilder>(
+                  rewardTakenList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          rewardTakenList_ = null;
+        }
+        return rewardTakenListBuilder_;
+      }
+
+      private int curCyclePoints_ ;
+      /**
+       * <code>uint32 cur_cycle_points = 6;</code>
+       * @return The curCyclePoints.
+       */
+      @java.lang.Override
+      public int getCurCyclePoints() {
+        return curCyclePoints_;
+      }
+      /**
+       * <code>uint32 cur_cycle_points = 6;</code>
+       * @param value The curCyclePoints to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurCyclePoints(int value) {
+        
+        curCyclePoints_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_cycle_points = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurCyclePoints() {
+        
+        curCyclePoints_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int beginTime_ ;
+      /**
+       * <code>uint32 begin_time = 7;</code>
+       * @return The beginTime.
+       */
+      @java.lang.Override
+      public int getBeginTime() {
+        return beginTime_;
+      }
+      /**
+       * <code>uint32 begin_time = 7;</code>
+       * @param value The beginTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBeginTime(int value) {
+        
+        beginTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 begin_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBeginTime() {
+        
+        beginTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isExtraPaidRewardTaken_ ;
+      /**
+       * <code>bool is_extra_paid_reward_taken = 8;</code>
+       * @return The isExtraPaidRewardTaken.
+       */
+      @java.lang.Override
+      public boolean getIsExtraPaidRewardTaken() {
+        return isExtraPaidRewardTaken_;
+      }
+      /**
+       * <code>bool is_extra_paid_reward_taken = 8;</code>
+       * @param value The isExtraPaidRewardTaken to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsExtraPaidRewardTaken(boolean value) {
+        
+        isExtraPaidRewardTaken_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_extra_paid_reward_taken = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsExtraPaidRewardTaken() {
+        
+        isExtraPaidRewardTaken_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int endTime_ ;
+      /**
+       * <code>uint32 end_time = 9;</code>
+       * @return The endTime.
+       */
+      @java.lang.Override
+      public int getEndTime() {
+        return endTime_;
+      }
+      /**
+       * <code>uint32 end_time = 9;</code>
+       * @param value The endTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndTime(int value) {
+        
+        endTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 end_time = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndTime() {
+        
+        endTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int point_ ;
+      /**
+       * <code>uint32 point = 10;</code>
+       * @return The point.
+       */
+      @java.lang.Override
+      public int getPoint() {
+        return point_;
+      }
+      /**
+       * <code>uint32 point = 10;</code>
+       * @param value The point to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPoint(int value) {
+        
+        point_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPoint() {
+        
+        point_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int paidPlatformFlags_ ;
+      /**
+       * <code>uint32 paid_platform_flags = 11;</code>
+       * @return The paidPlatformFlags.
+       */
+      @java.lang.Override
+      public int getPaidPlatformFlags() {
+        return paidPlatformFlags_;
+      }
+      /**
+       * <code>uint32 paid_platform_flags = 11;</code>
+       * @param value The paidPlatformFlags to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPaidPlatformFlags(int value) {
+        
+        paidPlatformFlags_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 paid_platform_flags = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPaidPlatformFlags() {
+        
+        paidPlatformFlags_ = 0;
+        onChanged();
+        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 boolean isViewed_ ;
       /**
-       * <code>bool is_viewed = 14;</code>
+       * <code>bool is_viewed = 13;</code>
        * @return The isViewed.
        */
       @java.lang.Override
@@ -1887,7 +2237,7 @@ public final class BattlePassScheduleOuterClass {
         return isViewed_;
       }
       /**
-       * <code>bool is_viewed = 14;</code>
+       * <code>bool is_viewed = 13;</code>
        * @param value The isViewed to set.
        * @return This builder for chaining.
        */
@@ -1898,7 +2248,7 @@ public final class BattlePassScheduleOuterClass {
         return this;
       }
       /**
-       * <code>bool is_viewed = 14;</code>
+       * <code>bool is_viewed = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsViewed() {
@@ -1907,6 +2257,91 @@ public final class BattlePassScheduleOuterClass {
         onChanged();
         return this;
       }
+
+      private int unlockStatus_ = 0;
+      /**
+       * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+       * @return The enum numeric value on the wire for unlockStatus.
+       */
+      @java.lang.Override public int getUnlockStatusValue() {
+        return unlockStatus_;
+      }
+      /**
+       * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+       * @param value The enum numeric value on the wire for unlockStatus to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockStatusValue(int value) {
+        
+        unlockStatus_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+       * @return The unlockStatus.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus getUnlockStatus() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus result = emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.valueOf(unlockStatus_);
+        return result == null ? emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+       * @param value The unlockStatus to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockStatus(emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        unlockStatus_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.BattlePassUnlockStatus unlock_status = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockStatus() {
+        
+        unlockStatus_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int level_ ;
+      /**
+       * <code>uint32 level = 15;</code>
+       * @return The level.
+       */
+      @java.lang.Override
+      public int getLevel() {
+        return level_;
+      }
+      /**
+       * <code>uint32 level = 15;</code>
+       * @param value The level to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevel(int value) {
+        
+        level_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 level = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevel() {
+        
+        level_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1974,40 +2409,45 @@ public final class BattlePassScheduleOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030BattlePassSchedule.proto\032\031BattlePassRe" +
-      "wardTag.proto\032\027BattlePassProduct.proto\032\034" +
-      "BattlePassUnlockStatus.proto\032\025BattlePass" +
-      "Cycle.proto\"\213\003\n\022BattlePassSchedule\022\"\n\032is" +
-      "_extra_paid_reward_taken\030\007 \001(\010\022\020\n\010end_ti" +
-      "me\030\017 \001(\r\022/\n\021reward_taken_list\030\t \003(\0132\024.Ba" +
-      "ttlePassRewardTag\022(\n\014product_info\030\004 \001(\0132" +
-      "\022.BattlePassProduct\022\r\n\005level\030\010 \001(\r\022\033\n\023pa" +
-      "id_platform_flags\030\014 \001(\r\022\023\n\013schedule_id\030\n" +
-      " \001(\r\022\022\n\nbegin_time\030\r \001(\r\022\r\n\005point\030\002 \001(\r\022" +
-      ".\n\runlock_status\030\013 \001(\0162\027.BattlePassUnloc" +
-      "kStatus\022\030\n\020cur_cycle_points\030\001 \001(\r\022#\n\tcur" +
-      "_cycle\030\003 \001(\0132\020.BattlePassCycle\022\021\n\tis_vie" +
-      "wed\030\016 \001(\010B\033\n\031emu.grasscutter.net.protob\006" +
-      "proto3"
+      "\n\030BattlePassSchedule.proto\032\025BattlePassCy" +
+      "cle.proto\032 BattlePassRewardPlanOption.pr" +
+      "oto\032\027BattlePassProduct.proto\032\031BattlePass" +
+      "RewardTag.proto\032\034BattlePassUnlockStatus." +
+      "proto\"\336\003\n\022BattlePassSchedule\022#\n\tcur_cycl" +
+      "e\030\001 \001(\0132\020.BattlePassCycle\022<\n\027reward_plan" +
+      "_option_list\030\002 \003(\0132\033.BattlePassRewardPla" +
+      "nOption\022(\n\014product_info\030\003 \001(\0132\022.BattlePa" +
+      "ssProduct\022\023\n\013LOPPMEONNEG\030\004 \001(\010\022/\n\021reward" +
+      "_taken_list\030\005 \003(\0132\024.BattlePassRewardTag\022" +
+      "\030\n\020cur_cycle_points\030\006 \001(\r\022\022\n\nbegin_time\030" +
+      "\007 \001(\r\022\"\n\032is_extra_paid_reward_taken\030\010 \001(" +
+      "\010\022\020\n\010end_time\030\t \001(\r\022\r\n\005point\030\n \001(\r\022\033\n\023pa" +
+      "id_platform_flags\030\013 \001(\r\022\023\n\013schedule_id\030\014" +
+      " \001(\r\022\021\n\tis_viewed\030\r \001(\010\022.\n\runlock_status" +
+      "\030\016 \001(\0162\027.BattlePassUnlockStatus\022\r\n\005level" +
+      "\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.BattlePassCycleOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor(),
         });
     internal_static_BattlePassSchedule_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_BattlePassSchedule_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BattlePassSchedule_descriptor,
-        new java.lang.String[] { "IsExtraPaidRewardTaken", "EndTime", "RewardTakenList", "ProductInfo", "Level", "PaidPlatformFlags", "ScheduleId", "BeginTime", "Point", "UnlockStatus", "CurCyclePoints", "CurCycle", "IsViewed", });
-    emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
+        new java.lang.String[] { "CurCycle", "RewardPlanOptionList", "ProductInfo", "LOPPMEONNEG", "RewardTakenList", "CurCyclePoints", "BeginTime", "IsExtraPaidRewardTaken", "EndTime", "Point", "PaidPlatformFlags", "ScheduleId", "IsViewed", "UnlockStatus", "Level", });
     emu.grasscutter.net.proto.BattlePassCycleOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.BattlePassRewardPlanOptionOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.BattlePassProductOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassUnlockStatusOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassUnlockStatusOuterClass.java
index 267d1000c..c9918f361 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BattlePassUnlockStatusOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BattlePassUnlockStatusOuterClass.java
@@ -15,10 +15,6 @@ public final class BattlePassUnlockStatusOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: ANLKFPJIOMK
-   * </pre>
-   *
    * Protobuf enum {@code BattlePassUnlockStatus}
    */
   public enum BattlePassUnlockStatus
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BirthdayOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BirthdayOuterClass.java
index 6d4ddc049..d06d120f7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BirthdayOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BirthdayOuterClass.java
@@ -31,10 +31,6 @@ public final class BirthdayOuterClass {
     int getDay();
   }
   /**
-   * <pre>
-   * Obf: PJENMAMNPEI
-   * </pre>
-   *
    * Protobuf type {@code Birthday}
    */
   public static final class Birthday extends
@@ -310,10 +306,6 @@ public final class BirthdayOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PJENMAMNPEI
-     * </pre>
-     *
      * Protobuf type {@code Birthday}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BlockInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BlockInfoOuterClass.java
index 590c185c2..f04cf3808 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BlockInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BlockInfoOuterClass.java
@@ -25,28 +25,24 @@ public final class BlockInfoOuterClass {
     int getBlockId();
 
     /**
-     * <code>uint32 data_version = 2;</code>
-     * @return The dataVersion.
+     * <code>uint32 GFKFJJOADMH = 2;</code>
+     * @return The gFKFJJOADMH.
      */
-    int getDataVersion();
+    int getGFKFJJOADMH();
 
     /**
-     * <code>bytes bin_data = 3;</code>
-     * @return The binData.
+     * <code>bytes NEHMEMLKIPP = 3;</code>
+     * @return The nEHMEMLKIPP.
      */
-    com.google.protobuf.ByteString getBinData();
+    com.google.protobuf.ByteString getNEHMEMLKIPP();
 
     /**
-     * <code>bool is_dirty = 4;</code>
-     * @return The isDirty.
+     * <code>bool GLAFBCFFAEG = 4;</code>
+     * @return The gLAFBCFFAEG.
      */
-    boolean getIsDirty();
+    boolean getGLAFBCFFAEG();
   }
   /**
-   * <pre>
-   * Obf: EGHIPFGJCJG
-   * </pre>
-   *
    * Protobuf type {@code BlockInfo}
    */
   public static final class BlockInfo extends
@@ -59,7 +55,7 @@ public final class BlockInfoOuterClass {
       super(builder);
     }
     private BlockInfo() {
-      binData_ = com.google.protobuf.ByteString.EMPTY;
+      nEHMEMLKIPP_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -99,17 +95,17 @@ public final class BlockInfoOuterClass {
             }
             case 16: {
 
-              dataVersion_ = input.readUInt32();
+              gFKFJJOADMH_ = input.readUInt32();
               break;
             }
             case 26: {
 
-              binData_ = input.readBytes();
+              nEHMEMLKIPP_ = input.readBytes();
               break;
             }
             case 32: {
 
-              isDirty_ = input.readBool();
+              gLAFBCFFAEG_ = input.readBool();
               break;
             }
             default: {
@@ -155,37 +151,37 @@ public final class BlockInfoOuterClass {
       return blockId_;
     }
 
-    public static final int DATA_VERSION_FIELD_NUMBER = 2;
-    private int dataVersion_;
+    public static final int GFKFJJOADMH_FIELD_NUMBER = 2;
+    private int gFKFJJOADMH_;
     /**
-     * <code>uint32 data_version = 2;</code>
-     * @return The dataVersion.
+     * <code>uint32 GFKFJJOADMH = 2;</code>
+     * @return The gFKFJJOADMH.
      */
     @java.lang.Override
-    public int getDataVersion() {
-      return dataVersion_;
+    public int getGFKFJJOADMH() {
+      return gFKFJJOADMH_;
     }
 
-    public static final int BIN_DATA_FIELD_NUMBER = 3;
-    private com.google.protobuf.ByteString binData_;
+    public static final int NEHMEMLKIPP_FIELD_NUMBER = 3;
+    private com.google.protobuf.ByteString nEHMEMLKIPP_;
     /**
-     * <code>bytes bin_data = 3;</code>
-     * @return The binData.
+     * <code>bytes NEHMEMLKIPP = 3;</code>
+     * @return The nEHMEMLKIPP.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getBinData() {
-      return binData_;
+    public com.google.protobuf.ByteString getNEHMEMLKIPP() {
+      return nEHMEMLKIPP_;
     }
 
-    public static final int IS_DIRTY_FIELD_NUMBER = 4;
-    private boolean isDirty_;
+    public static final int GLAFBCFFAEG_FIELD_NUMBER = 4;
+    private boolean gLAFBCFFAEG_;
     /**
-     * <code>bool is_dirty = 4;</code>
-     * @return The isDirty.
+     * <code>bool GLAFBCFFAEG = 4;</code>
+     * @return The gLAFBCFFAEG.
      */
     @java.lang.Override
-    public boolean getIsDirty() {
-      return isDirty_;
+    public boolean getGLAFBCFFAEG() {
+      return gLAFBCFFAEG_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -205,14 +201,14 @@ public final class BlockInfoOuterClass {
       if (blockId_ != 0) {
         output.writeUInt32(1, blockId_);
       }
-      if (dataVersion_ != 0) {
-        output.writeUInt32(2, dataVersion_);
+      if (gFKFJJOADMH_ != 0) {
+        output.writeUInt32(2, gFKFJJOADMH_);
       }
-      if (!binData_.isEmpty()) {
-        output.writeBytes(3, binData_);
+      if (!nEHMEMLKIPP_.isEmpty()) {
+        output.writeBytes(3, nEHMEMLKIPP_);
       }
-      if (isDirty_ != false) {
-        output.writeBool(4, isDirty_);
+      if (gLAFBCFFAEG_ != false) {
+        output.writeBool(4, gLAFBCFFAEG_);
       }
       unknownFields.writeTo(output);
     }
@@ -227,17 +223,17 @@ public final class BlockInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1, blockId_);
       }
-      if (dataVersion_ != 0) {
+      if (gFKFJJOADMH_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, dataVersion_);
+          .computeUInt32Size(2, gFKFJJOADMH_);
       }
-      if (!binData_.isEmpty()) {
+      if (!nEHMEMLKIPP_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(3, binData_);
+          .computeBytesSize(3, nEHMEMLKIPP_);
       }
-      if (isDirty_ != false) {
+      if (gLAFBCFFAEG_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(4, isDirty_);
+          .computeBoolSize(4, gLAFBCFFAEG_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +252,12 @@ public final class BlockInfoOuterClass {
 
       if (getBlockId()
           != other.getBlockId()) return false;
-      if (getDataVersion()
-          != other.getDataVersion()) return false;
-      if (!getBinData()
-          .equals(other.getBinData())) return false;
-      if (getIsDirty()
-          != other.getIsDirty()) return false;
+      if (getGFKFJJOADMH()
+          != other.getGFKFJJOADMH()) return false;
+      if (!getNEHMEMLKIPP()
+          .equals(other.getNEHMEMLKIPP())) return false;
+      if (getGLAFBCFFAEG()
+          != other.getGLAFBCFFAEG()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,13 +271,13 @@ public final class BlockInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + BLOCK_ID_FIELD_NUMBER;
       hash = (53 * hash) + getBlockId();
-      hash = (37 * hash) + DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getDataVersion();
-      hash = (37 * hash) + BIN_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getBinData().hashCode();
-      hash = (37 * hash) + IS_DIRTY_FIELD_NUMBER;
+      hash = (37 * hash) + GFKFJJOADMH_FIELD_NUMBER;
+      hash = (53 * hash) + getGFKFJJOADMH();
+      hash = (37 * hash) + NEHMEMLKIPP_FIELD_NUMBER;
+      hash = (53 * hash) + getNEHMEMLKIPP().hashCode();
+      hash = (37 * hash) + GLAFBCFFAEG_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsDirty());
+          getGLAFBCFFAEG());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,10 +374,6 @@ public final class BlockInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EGHIPFGJCJG
-     * </pre>
-     *
      * Protobuf type {@code BlockInfo}
      */
     public static final class Builder extends
@@ -421,11 +413,11 @@ public final class BlockInfoOuterClass {
         super.clear();
         blockId_ = 0;
 
-        dataVersion_ = 0;
+        gFKFJJOADMH_ = 0;
 
-        binData_ = com.google.protobuf.ByteString.EMPTY;
+        nEHMEMLKIPP_ = com.google.protobuf.ByteString.EMPTY;
 
-        isDirty_ = false;
+        gLAFBCFFAEG_ = false;
 
         return this;
       }
@@ -454,9 +446,9 @@ public final class BlockInfoOuterClass {
       public emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo buildPartial() {
         emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo result = new emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo(this);
         result.blockId_ = blockId_;
-        result.dataVersion_ = dataVersion_;
-        result.binData_ = binData_;
-        result.isDirty_ = isDirty_;
+        result.gFKFJJOADMH_ = gFKFJJOADMH_;
+        result.nEHMEMLKIPP_ = nEHMEMLKIPP_;
+        result.gLAFBCFFAEG_ = gLAFBCFFAEG_;
         onBuilt();
         return result;
       }
@@ -508,14 +500,14 @@ public final class BlockInfoOuterClass {
         if (other.getBlockId() != 0) {
           setBlockId(other.getBlockId());
         }
-        if (other.getDataVersion() != 0) {
-          setDataVersion(other.getDataVersion());
+        if (other.getGFKFJJOADMH() != 0) {
+          setGFKFJJOADMH(other.getGFKFJJOADMH());
         }
-        if (other.getBinData() != com.google.protobuf.ByteString.EMPTY) {
-          setBinData(other.getBinData());
+        if (other.getNEHMEMLKIPP() != com.google.protobuf.ByteString.EMPTY) {
+          setNEHMEMLKIPP(other.getNEHMEMLKIPP());
         }
-        if (other.getIsDirty() != false) {
-          setIsDirty(other.getIsDirty());
+        if (other.getGLAFBCFFAEG() != false) {
+          setGLAFBCFFAEG(other.getGLAFBCFFAEG());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -577,98 +569,98 @@ public final class BlockInfoOuterClass {
         return this;
       }
 
-      private int dataVersion_ ;
+      private int gFKFJJOADMH_ ;
       /**
-       * <code>uint32 data_version = 2;</code>
-       * @return The dataVersion.
+       * <code>uint32 GFKFJJOADMH = 2;</code>
+       * @return The gFKFJJOADMH.
        */
       @java.lang.Override
-      public int getDataVersion() {
-        return dataVersion_;
+      public int getGFKFJJOADMH() {
+        return gFKFJJOADMH_;
       }
       /**
-       * <code>uint32 data_version = 2;</code>
-       * @param value The dataVersion to set.
+       * <code>uint32 GFKFJJOADMH = 2;</code>
+       * @param value The gFKFJJOADMH to set.
        * @return This builder for chaining.
        */
-      public Builder setDataVersion(int value) {
+      public Builder setGFKFJJOADMH(int value) {
         
-        dataVersion_ = value;
+        gFKFJJOADMH_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 data_version = 2;</code>
+       * <code>uint32 GFKFJJOADMH = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDataVersion() {
+      public Builder clearGFKFJJOADMH() {
         
-        dataVersion_ = 0;
+        gFKFJJOADMH_ = 0;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.ByteString binData_ = com.google.protobuf.ByteString.EMPTY;
+      private com.google.protobuf.ByteString nEHMEMLKIPP_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes bin_data = 3;</code>
-       * @return The binData.
+       * <code>bytes NEHMEMLKIPP = 3;</code>
+       * @return The nEHMEMLKIPP.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getBinData() {
-        return binData_;
+      public com.google.protobuf.ByteString getNEHMEMLKIPP() {
+        return nEHMEMLKIPP_;
       }
       /**
-       * <code>bytes bin_data = 3;</code>
-       * @param value The binData to set.
+       * <code>bytes NEHMEMLKIPP = 3;</code>
+       * @param value The nEHMEMLKIPP to set.
        * @return This builder for chaining.
        */
-      public Builder setBinData(com.google.protobuf.ByteString value) {
+      public Builder setNEHMEMLKIPP(com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        binData_ = value;
+        nEHMEMLKIPP_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes bin_data = 3;</code>
+       * <code>bytes NEHMEMLKIPP = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBinData() {
+      public Builder clearNEHMEMLKIPP() {
         
-        binData_ = getDefaultInstance().getBinData();
+        nEHMEMLKIPP_ = getDefaultInstance().getNEHMEMLKIPP();
         onChanged();
         return this;
       }
 
-      private boolean isDirty_ ;
+      private boolean gLAFBCFFAEG_ ;
       /**
-       * <code>bool is_dirty = 4;</code>
-       * @return The isDirty.
+       * <code>bool GLAFBCFFAEG = 4;</code>
+       * @return The gLAFBCFFAEG.
        */
       @java.lang.Override
-      public boolean getIsDirty() {
-        return isDirty_;
+      public boolean getGLAFBCFFAEG() {
+        return gLAFBCFFAEG_;
       }
       /**
-       * <code>bool is_dirty = 4;</code>
-       * @param value The isDirty to set.
+       * <code>bool GLAFBCFFAEG = 4;</code>
+       * @param value The gLAFBCFFAEG to set.
        * @return This builder for chaining.
        */
-      public Builder setIsDirty(boolean value) {
+      public Builder setGLAFBCFFAEG(boolean value) {
         
-        isDirty_ = value;
+        gLAFBCFFAEG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_dirty = 4;</code>
+       * <code>bool GLAFBCFFAEG = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsDirty() {
+      public Builder clearGLAFBCFFAEG() {
         
-        isDirty_ = false;
+        gLAFBCFFAEG_ = false;
         onChanged();
         return this;
       }
@@ -739,10 +731,10 @@ public final class BlockInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017BlockInfo.proto\"W\n\tBlockInfo\022\020\n\010block_" +
-      "id\030\001 \001(\r\022\024\n\014data_version\030\002 \001(\r\022\020\n\010bin_da" +
-      "ta\030\003 \001(\014\022\020\n\010is_dirty\030\004 \001(\010B\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "\n\017BlockInfo.proto\"\\\n\tBlockInfo\022\020\n\010block_" +
+      "id\030\001 \001(\r\022\023\n\013GFKFJJOADMH\030\002 \001(\r\022\023\n\013NEHMEML" +
+      "KIPP\030\003 \001(\014\022\023\n\013GLAFBCFFAEG\030\004 \001(\010B\033\n\031emu.g" +
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -753,7 +745,7 @@ public final class BlockInfoOuterClass {
     internal_static_BlockInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BlockInfo_descriptor,
-        new java.lang.String[] { "BlockId", "DataVersion", "BinData", "IsDirty", });
+        new java.lang.String[] { "BlockId", "GFKFJJOADMH", "NEHMEMLKIPP", "GLAFBCFFAEG", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BlossomChestInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BlossomChestInfoOuterClass.java
index 63abaea56..0cf34b1a6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BlossomChestInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BlossomChestInfoOuterClass.java
@@ -78,7 +78,7 @@ public final class BlossomChestInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: OGDABNFHACL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BlossomChestInfo}
@@ -573,7 +573,7 @@ public final class BlossomChestInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: OGDABNFHACL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BlossomChestInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BossChestInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BossChestInfoOuterClass.java
index a8613fa63..8e39b8c9c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BossChestInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BossChestInfoOuterClass.java
@@ -100,7 +100,7 @@ public final class BossChestInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: CBKAOHFJIND
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BossChestInfo}
@@ -669,7 +669,7 @@ public final class BossChestInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: CBKAOHFJIND
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BossChestInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutActionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutActionOuterClass.java
index 2c1cc61fd..ed17fd58b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutActionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutActionOuterClass.java
@@ -153,14 +153,15 @@ public final class BreakoutActionOuterClass {
     int getOffset();
 
     /**
-     * <code>uint64 FCCNGNCIFAI = 18;</code>
-     * @return The fCCNGNCIFAI.
+     * <code>uint64 CLKEPICNJJD = 18;</code>
+     * @return The cLKEPICNJJD.
      */
-    long getFCCNGNCIFAI();
+    long getCLKEPICNJJD();
   }
   /**
    * <pre>
-   * Obf: JBHHKOPAEFB
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code BreakoutAction}
@@ -320,7 +321,7 @@ public final class BreakoutActionOuterClass {
             }
             case 144: {
 
-              fCCNGNCIFAI_ = input.readUInt64();
+              cLKEPICNJJD_ = input.readUInt64();
               break;
             }
             default: {
@@ -356,10 +357,6 @@ public final class BreakoutActionOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: BGLHJHMLHAI
-     * </pre>
-     *
      * Protobuf enum {@code BreakoutAction.BreakoutActionType}
      */
     public enum BreakoutActionType
@@ -734,15 +731,15 @@ public final class BreakoutActionOuterClass {
       return offset_;
     }
 
-    public static final int FCCNGNCIFAI_FIELD_NUMBER = 18;
-    private long fCCNGNCIFAI_;
+    public static final int CLKEPICNJJD_FIELD_NUMBER = 18;
+    private long cLKEPICNJJD_;
     /**
-     * <code>uint64 FCCNGNCIFAI = 18;</code>
-     * @return The fCCNGNCIFAI.
+     * <code>uint64 CLKEPICNJJD = 18;</code>
+     * @return The cLKEPICNJJD.
      */
     @java.lang.Override
-    public long getFCCNGNCIFAI() {
-      return fCCNGNCIFAI_;
+    public long getCLKEPICNJJD() {
+      return cLKEPICNJJD_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -810,8 +807,8 @@ public final class BreakoutActionOuterClass {
       if (offset_ != 0) {
         output.writeInt32(17, offset_);
       }
-      if (fCCNGNCIFAI_ != 0L) {
-        output.writeUInt64(18, fCCNGNCIFAI_);
+      if (cLKEPICNJJD_ != 0L) {
+        output.writeUInt64(18, cLKEPICNJJD_);
       }
       unknownFields.writeTo(output);
     }
@@ -890,9 +887,9 @@ public final class BreakoutActionOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(17, offset_);
       }
-      if (fCCNGNCIFAI_ != 0L) {
+      if (cLKEPICNJJD_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(18, fCCNGNCIFAI_);
+          .computeUInt64Size(18, cLKEPICNJJD_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -951,8 +948,8 @@ public final class BreakoutActionOuterClass {
           != other.getExtraBallIndex()) return false;
       if (getOffset()
           != other.getOffset()) return false;
-      if (getFCCNGNCIFAI()
-          != other.getFCCNGNCIFAI()) return false;
+      if (getCLKEPICNJJD()
+          != other.getCLKEPICNJJD()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1008,9 +1005,9 @@ public final class BreakoutActionOuterClass {
       hash = (53 * hash) + getExtraBallIndex();
       hash = (37 * hash) + OFFSET_FIELD_NUMBER;
       hash = (53 * hash) + getOffset();
-      hash = (37 * hash) + FCCNGNCIFAI_FIELD_NUMBER;
+      hash = (37 * hash) + CLKEPICNJJD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getFCCNGNCIFAI());
+          getCLKEPICNJJD());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1108,7 +1105,8 @@ public final class BreakoutActionOuterClass {
     }
     /**
      * <pre>
-     * Obf: JBHHKOPAEFB
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code BreakoutAction}
@@ -1194,7 +1192,7 @@ public final class BreakoutActionOuterClass {
 
         offset_ = 0;
 
-        fCCNGNCIFAI_ = 0L;
+        cLKEPICNJJD_ = 0L;
 
         return this;
       }
@@ -1251,7 +1249,7 @@ public final class BreakoutActionOuterClass {
         }
         result.extraBallIndex_ = extraBallIndex_;
         result.offset_ = offset_;
-        result.fCCNGNCIFAI_ = fCCNGNCIFAI_;
+        result.cLKEPICNJJD_ = cLKEPICNJJD_;
         onBuilt();
         return result;
       }
@@ -1351,8 +1349,8 @@ public final class BreakoutActionOuterClass {
         if (other.getOffset() != 0) {
           setOffset(other.getOffset());
         }
-        if (other.getFCCNGNCIFAI() != 0L) {
-          setFCCNGNCIFAI(other.getFCCNGNCIFAI());
+        if (other.getCLKEPICNJJD() != 0L) {
+          setCLKEPICNJJD(other.getCLKEPICNJJD());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -2197,33 +2195,33 @@ public final class BreakoutActionOuterClass {
         return this;
       }
 
-      private long fCCNGNCIFAI_ ;
+      private long cLKEPICNJJD_ ;
       /**
-       * <code>uint64 FCCNGNCIFAI = 18;</code>
-       * @return The fCCNGNCIFAI.
+       * <code>uint64 CLKEPICNJJD = 18;</code>
+       * @return The cLKEPICNJJD.
        */
       @java.lang.Override
-      public long getFCCNGNCIFAI() {
-        return fCCNGNCIFAI_;
+      public long getCLKEPICNJJD() {
+        return cLKEPICNJJD_;
       }
       /**
-       * <code>uint64 FCCNGNCIFAI = 18;</code>
-       * @param value The fCCNGNCIFAI to set.
+       * <code>uint64 CLKEPICNJJD = 18;</code>
+       * @param value The cLKEPICNJJD to set.
        * @return This builder for chaining.
        */
-      public Builder setFCCNGNCIFAI(long value) {
+      public Builder setCLKEPICNJJD(long value) {
         
-        fCCNGNCIFAI_ = value;
+        cLKEPICNJJD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint64 FCCNGNCIFAI = 18;</code>
+       * <code>uint64 CLKEPICNJJD = 18;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFCCNGNCIFAI() {
+      public Builder clearCLKEPICNJJD() {
         
-        fCCNGNCIFAI_ = 0L;
+        cLKEPICNJJD_ = 0L;
         onChanged();
         return this;
       }
@@ -2307,7 +2305,7 @@ public final class BreakoutActionOuterClass {
       "_count\030\r \001(\r\022\026\n\016has_extra_ball\030\016 \001(\010\022(\n\016" +
       "extra_ball_dir\030\017 \001(\0132\020.BreakoutVector2\022\030" +
       "\n\020extra_ball_index\030\020 \001(\r\022\016\n\006offset\030\021 \001(\005" +
-      "\022\023\n\013FCCNGNCIFAI\030\022 \001(\004\"\236\001\n\022BreakoutAction" +
+      "\022\023\n\013CLKEPICNJJD\030\022 \001(\004\"\236\001\n\022BreakoutAction" +
       "Type\022\024\n\020ACTION_TYPE_NONE\020\000\022\033\n\027ACTION_TYP" +
       "E_LAUNCH_BALL\020\001\022\034\n\030ACTION_TYPE_DESTROY_B" +
       "ALL\020\002\022\036\n\032ACTION_TYPE_FALLING_OBJECT\020\003\022\027\n" +
@@ -2324,7 +2322,7 @@ public final class BreakoutActionOuterClass {
     internal_static_BreakoutAction_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BreakoutAction_descriptor,
-        new java.lang.String[] { "ActionType", "ClientGameTime", "ServerGameTime", "IsFailed", "PreIndex", "NewIndex", "Pos", "MoveDir", "Speed", "PeerId", "ElementType", "ElementReactionBuff", "SpeedIncreaseCount", "HasExtraBall", "ExtraBallDir", "ExtraBallIndex", "Offset", "FCCNGNCIFAI", });
+        new java.lang.String[] { "ActionType", "ClientGameTime", "ServerGameTime", "IsFailed", "PreIndex", "NewIndex", "Pos", "MoveDir", "Speed", "PeerId", "ElementType", "ElementReactionBuff", "SpeedIncreaseCount", "HasExtraBall", "ExtraBallDir", "ExtraBallIndex", "Offset", "CLKEPICNJJD", });
     emu.grasscutter.net.proto.BreakoutVector2OuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutBrickInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutBrickInfoOuterClass.java
index fa0b37528..74d205af9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutBrickInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutBrickInfoOuterClass.java
@@ -32,7 +32,7 @@ public final class BreakoutBrickInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: DGMFFJIKOKD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutBrickInfo}
@@ -311,7 +311,7 @@ public final class BreakoutBrickInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: DGMFFJIKOKD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutBrickInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutElementReactionCounterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutElementReactionCounterOuterClass.java
index d820747d3..c5fa55675 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutElementReactionCounterOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutElementReactionCounterOuterClass.java
@@ -32,7 +32,7 @@ public final class BreakoutElementReactionCounterOuterClass {
   }
   /**
    * <pre>
-   * Obf: KGJJJGIPNLE
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutElementReactionCounter}
@@ -311,7 +311,7 @@ public final class BreakoutElementReactionCounterOuterClass {
     }
     /**
      * <pre>
-     * Obf: KGJJJGIPNLE
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutElementReactionCounter}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectModifierOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectModifierOuterClass.java
index eee918279..3cfe94878 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectModifierOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectModifierOuterClass.java
@@ -116,7 +116,7 @@ public final class BreakoutPhysicalObjectModifierOuterClass {
   }
   /**
    * <pre>
-   * Obf: NFKLEIMGKJD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutPhysicalObjectModifier}
@@ -774,7 +774,7 @@ public final class BreakoutPhysicalObjectModifierOuterClass {
     }
     /**
      * <pre>
-     * Obf: NFKLEIMGKJD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutPhysicalObjectModifier}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectOuterClass.java
index 3f3e16ac4..ef85a649f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutPhysicalObjectOuterClass.java
@@ -170,7 +170,8 @@ public final class BreakoutPhysicalObjectOuterClass {
   }
   /**
    * <pre>
-   * Obf: NFMHCAILCIF
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code BreakoutPhysicalObject}
@@ -963,7 +964,8 @@ public final class BreakoutPhysicalObjectOuterClass {
     }
     /**
      * <pre>
-     * Obf: NFMHCAILCIF
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code BreakoutPhysicalObject}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSnapShotOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSnapShotOuterClass.java
index 26063c645..154853fec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSnapShotOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSnapShotOuterClass.java
@@ -295,7 +295,8 @@ public final class BreakoutSnapShotOuterClass {
   }
   /**
    * <pre>
-   * Obf: OLKOKCBEABM
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code BreakoutSnapShot}
@@ -1430,7 +1431,8 @@ public final class BreakoutSnapShotOuterClass {
     }
     /**
      * <pre>
-     * Obf: OLKOKCBEABM
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code BreakoutSnapShot}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSpawnPointOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSpawnPointOuterClass.java
index 739a3b05c..29da251b4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSpawnPointOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSpawnPointOuterClass.java
@@ -56,7 +56,7 @@ public final class BreakoutSpawnPointOuterClass {
   }
   /**
    * <pre>
-   * Obf: COLAAGNOBFN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutSpawnPoint}
@@ -402,7 +402,7 @@ public final class BreakoutSpawnPointOuterClass {
     }
     /**
      * <pre>
-     * Obf: COLAAGNOBFN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutSpawnPoint}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSyncConnectUidInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSyncConnectUidInfoOuterClass.java
index d4874be04..22803c3c5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSyncConnectUidInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutSyncConnectUidInfoOuterClass.java
@@ -60,7 +60,7 @@ public final class BreakoutSyncConnectUidInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: BKGOLPBLKMN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutSyncConnectUidInfo}
@@ -474,7 +474,7 @@ public final class BreakoutSyncConnectUidInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: BKGOLPBLKMN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutSyncConnectUidInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutVector2OuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutVector2OuterClass.java
index 95a7e3b5e..abaf4d28b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BreakoutVector2OuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BreakoutVector2OuterClass.java
@@ -32,7 +32,7 @@ public final class BreakoutVector2OuterClass {
   }
   /**
    * <pre>
-   * Obf: FIGLCLAIOJM
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code BreakoutVector2}
@@ -311,7 +311,7 @@ public final class BreakoutVector2OuterClass {
     }
     /**
      * <pre>
-     * Obf: FIGLCLAIOJM
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code BreakoutVector2}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java
index 824d5bd07..fb9051580 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsReqOuterClass.java
@@ -19,38 +19,33 @@ public final class BuyGoodsReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 shop_type = 13;</code>
+     * <code>.ShopGoods goods = 1;</code>
+     * @return Whether the goods field is set.
+     */
+    boolean hasGoods();
+    /**
+     * <code>.ShopGoods goods = 1;</code>
+     * @return The goods.
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
+    /**
+     * <code>.ShopGoods goods = 1;</code>
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
+
+    /**
+     * <code>uint32 shop_type = 14;</code>
      * @return The shopType.
      */
     int getShopType();
 
     /**
-     * <code>uint32 buy_count = 15;</code>
+     * <code>uint32 buy_count = 6;</code>
      * @return The buyCount.
      */
     int getBuyCount();
-
-    /**
-     * <code>.ShopGoods goods = 12;</code>
-     * @return Whether the goods field is set.
-     */
-    boolean hasGoods();
-    /**
-     * <code>.ShopGoods goods = 12;</code>
-     * @return The goods.
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
-    /**
-     * <code>.ShopGoods goods = 12;</code>
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 8034
-   * Obf: MKAEIILDGBN
-   * </pre>
-   *
    * Protobuf type {@code BuyGoodsReq}
    */
   public static final class BuyGoodsReq extends
@@ -95,7 +90,7 @@ public final class BuyGoodsReqOuterClass {
             case 0:
               done = true;
               break;
-            case 98: {
+            case 10: {
               emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder subBuilder = null;
               if (goods_ != null) {
                 subBuilder = goods_.toBuilder();
@@ -108,16 +103,16 @@ public final class BuyGoodsReqOuterClass {
 
               break;
             }
-            case 104: {
-
-              shopType_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 48: {
 
               buyCount_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              shopType_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -150,32 +145,10 @@ public final class BuyGoodsReqOuterClass {
               emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.class, emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.Builder.class);
     }
 
-    public static final int SHOP_TYPE_FIELD_NUMBER = 13;
-    private int shopType_;
-    /**
-     * <code>uint32 shop_type = 13;</code>
-     * @return The shopType.
-     */
-    @java.lang.Override
-    public int getShopType() {
-      return shopType_;
-    }
-
-    public static final int BUY_COUNT_FIELD_NUMBER = 15;
-    private int buyCount_;
-    /**
-     * <code>uint32 buy_count = 15;</code>
-     * @return The buyCount.
-     */
-    @java.lang.Override
-    public int getBuyCount() {
-      return buyCount_;
-    }
-
-    public static final int GOODS_FIELD_NUMBER = 12;
+    public static final int GOODS_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
     /**
-     * <code>.ShopGoods goods = 12;</code>
+     * <code>.ShopGoods goods = 1;</code>
      * @return Whether the goods field is set.
      */
     @java.lang.Override
@@ -183,7 +156,7 @@ public final class BuyGoodsReqOuterClass {
       return goods_ != null;
     }
     /**
-     * <code>.ShopGoods goods = 12;</code>
+     * <code>.ShopGoods goods = 1;</code>
      * @return The goods.
      */
     @java.lang.Override
@@ -191,13 +164,35 @@ public final class BuyGoodsReqOuterClass {
       return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
     }
     /**
-     * <code>.ShopGoods goods = 12;</code>
+     * <code>.ShopGoods goods = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
       return getGoods();
     }
 
+    public static final int SHOP_TYPE_FIELD_NUMBER = 14;
+    private int shopType_;
+    /**
+     * <code>uint32 shop_type = 14;</code>
+     * @return The shopType.
+     */
+    @java.lang.Override
+    public int getShopType() {
+      return shopType_;
+    }
+
+    public static final int BUY_COUNT_FIELD_NUMBER = 6;
+    private int buyCount_;
+    /**
+     * <code>uint32 buy_count = 6;</code>
+     * @return The buyCount.
+     */
+    @java.lang.Override
+    public int getBuyCount() {
+      return buyCount_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -213,13 +208,13 @@ public final class BuyGoodsReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (goods_ != null) {
-        output.writeMessage(12, getGoods());
-      }
-      if (shopType_ != 0) {
-        output.writeUInt32(13, shopType_);
+        output.writeMessage(1, getGoods());
       }
       if (buyCount_ != 0) {
-        output.writeUInt32(15, buyCount_);
+        output.writeUInt32(6, buyCount_);
+      }
+      if (shopType_ != 0) {
+        output.writeUInt32(14, shopType_);
       }
       unknownFields.writeTo(output);
     }
@@ -232,15 +227,15 @@ public final class BuyGoodsReqOuterClass {
       size = 0;
       if (goods_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getGoods());
-      }
-      if (shopType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, shopType_);
+          .computeMessageSize(1, getGoods());
       }
       if (buyCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, buyCount_);
+          .computeUInt32Size(6, buyCount_);
+      }
+      if (shopType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, shopType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +252,15 @@ public final class BuyGoodsReqOuterClass {
       }
       emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq other = (emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq) obj;
 
-      if (getShopType()
-          != other.getShopType()) return false;
-      if (getBuyCount()
-          != other.getBuyCount()) return false;
       if (hasGoods() != other.hasGoods()) return false;
       if (hasGoods()) {
         if (!getGoods()
             .equals(other.getGoods())) return false;
       }
+      if (getShopType()
+          != other.getShopType()) return false;
+      if (getBuyCount()
+          != other.getBuyCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,14 +272,14 @@ public final class BuyGoodsReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getShopType();
-      hash = (37 * hash) + BUY_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getBuyCount();
       if (hasGoods()) {
         hash = (37 * hash) + GOODS_FIELD_NUMBER;
         hash = (53 * hash) + getGoods().hashCode();
       }
+      hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getShopType();
+      hash = (37 * hash) + BUY_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getBuyCount();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -381,11 +376,6 @@ public final class BuyGoodsReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8034
-     * Obf: MKAEIILDGBN
-     * </pre>
-     *
      * Protobuf type {@code BuyGoodsReq}
      */
     public static final class Builder extends
@@ -423,16 +413,16 @@ public final class BuyGoodsReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        shopType_ = 0;
-
-        buyCount_ = 0;
-
         if (goodsBuilder_ == null) {
           goods_ = null;
         } else {
           goods_ = null;
           goodsBuilder_ = null;
         }
+        shopType_ = 0;
+
+        buyCount_ = 0;
+
         return this;
       }
 
@@ -459,13 +449,13 @@ public final class BuyGoodsReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq buildPartial() {
         emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq result = new emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq(this);
-        result.shopType_ = shopType_;
-        result.buyCount_ = buyCount_;
         if (goodsBuilder_ == null) {
           result.goods_ = goods_;
         } else {
           result.goods_ = goodsBuilder_.build();
         }
+        result.shopType_ = shopType_;
+        result.buyCount_ = buyCount_;
         onBuilt();
         return result;
       }
@@ -514,15 +504,15 @@ public final class BuyGoodsReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq other) {
         if (other == emu.grasscutter.net.proto.BuyGoodsReqOuterClass.BuyGoodsReq.getDefaultInstance()) return this;
+        if (other.hasGoods()) {
+          mergeGoods(other.getGoods());
+        }
         if (other.getShopType() != 0) {
           setShopType(other.getShopType());
         }
         if (other.getBuyCount() != 0) {
           setBuyCount(other.getBuyCount());
         }
-        if (other.hasGoods()) {
-          mergeGoods(other.getGoods());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -552,80 +542,18 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
 
-      private int shopType_ ;
-      /**
-       * <code>uint32 shop_type = 13;</code>
-       * @return The shopType.
-       */
-      @java.lang.Override
-      public int getShopType() {
-        return shopType_;
-      }
-      /**
-       * <code>uint32 shop_type = 13;</code>
-       * @param value The shopType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setShopType(int value) {
-        
-        shopType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 shop_type = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearShopType() {
-        
-        shopType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int buyCount_ ;
-      /**
-       * <code>uint32 buy_count = 15;</code>
-       * @return The buyCount.
-       */
-      @java.lang.Override
-      public int getBuyCount() {
-        return buyCount_;
-      }
-      /**
-       * <code>uint32 buy_count = 15;</code>
-       * @param value The buyCount to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBuyCount(int value) {
-        
-        buyCount_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 buy_count = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBuyCount() {
-        
-        buyCount_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsBuilder_;
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        * @return Whether the goods field is set.
        */
       public boolean hasGoods() {
         return goodsBuilder_ != null || goods_ != null;
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        * @return The goods.
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
@@ -636,7 +564,7 @@ public final class BuyGoodsReqOuterClass {
         }
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
         if (goodsBuilder_ == null) {
@@ -652,7 +580,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public Builder setGoods(
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -666,7 +594,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
         if (goodsBuilder_ == null) {
@@ -684,7 +612,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public Builder clearGoods() {
         if (goodsBuilder_ == null) {
@@ -698,7 +626,7 @@ public final class BuyGoodsReqOuterClass {
         return this;
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
         
@@ -706,7 +634,7 @@ public final class BuyGoodsReqOuterClass {
         return getGoodsFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
         if (goodsBuilder_ != null) {
@@ -717,7 +645,7 @@ public final class BuyGoodsReqOuterClass {
         }
       }
       /**
-       * <code>.ShopGoods goods = 12;</code>
+       * <code>.ShopGoods goods = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
@@ -732,6 +660,68 @@ public final class BuyGoodsReqOuterClass {
         }
         return goodsBuilder_;
       }
+
+      private int shopType_ ;
+      /**
+       * <code>uint32 shop_type = 14;</code>
+       * @return The shopType.
+       */
+      @java.lang.Override
+      public int getShopType() {
+        return shopType_;
+      }
+      /**
+       * <code>uint32 shop_type = 14;</code>
+       * @param value The shopType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setShopType(int value) {
+        
+        shopType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 shop_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearShopType() {
+        
+        shopType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int buyCount_ ;
+      /**
+       * <code>uint32 buy_count = 6;</code>
+       * @return The buyCount.
+       */
+      @java.lang.Override
+      public int getBuyCount() {
+        return buyCount_;
+      }
+      /**
+       * <code>uint32 buy_count = 6;</code>
+       * @param value The buyCount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBuyCount(int value) {
+        
+        buyCount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 buy_count = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBuyCount() {
+        
+        buyCount_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -800,8 +790,8 @@ public final class BuyGoodsReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021BuyGoodsReq.proto\032\017ShopGoods.proto\"N\n\013" +
-      "BuyGoodsReq\022\021\n\tshop_type\030\r \001(\r\022\021\n\tbuy_co" +
-      "unt\030\017 \001(\r\022\031\n\005goods\030\014 \001(\0132\n.ShopGoodsB\033\n\031" +
+      "BuyGoodsReq\022\031\n\005goods\030\001 \001(\0132\n.ShopGoods\022\021" +
+      "\n\tshop_type\030\016 \001(\r\022\021\n\tbuy_count\030\006 \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +804,7 @@ public final class BuyGoodsReqOuterClass {
     internal_static_BuyGoodsReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BuyGoodsReq_descriptor,
-        new java.lang.String[] { "ShopType", "BuyCount", "Goods", });
+        new java.lang.String[] { "Goods", "ShopType", "BuyCount", });
     emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java
index b9b1213da..0e457a687 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/BuyGoodsRspOuterClass.java
@@ -19,68 +19,63 @@ public final class BuyGoodsRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 buy_count = 3;</code>
+     * <code>uint32 buy_count = 6;</code>
      * @return The buyCount.
      */
     int getBuyCount();
 
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>.ShopGoods goods = 9;</code>
-     * @return Whether the goods field is set.
-     */
-    boolean hasGoods();
-    /**
-     * <code>.ShopGoods goods = 9;</code>
-     * @return The goods.
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
-    /**
-     * <code>.ShopGoods goods = 9;</code>
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
-
-    /**
-     * <code>uint32 shop_type = 4;</code>
-     * @return The shopType.
-     */
-    int getShopType();
-
-    /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> 
         getGoodsListList();
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index);
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     int getGoodsListCount();
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
         getGoodsListOrBuilderList();
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
         int index);
+
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     * @return Whether the goods field is set.
+     */
+    boolean hasGoods();
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     * @return The goods.
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods();
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder();
+
+    /**
+     * <code>uint32 shop_type = 15;</code>
+     * @return The shopType.
+     */
+    int getShopType();
   }
   /**
-   * <pre>
-   * CmdId: 611
-   * Obf: ODFCPEHCGFK
-   * </pre>
-   *
    * Protobuf type {@code BuyGoodsRsp}
    */
   public static final class BuyGoodsRsp extends
@@ -127,22 +122,26 @@ public final class BuyGoodsRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 24: {
+            case 48: {
 
               buyCount_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 64: {
 
-              shopType_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             case 74: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              goodsList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.parser(), extensionRegistry));
+              break;
+            }
+            case 114: {
               emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder subBuilder = null;
               if (goods_ != null) {
                 subBuilder = goods_.toBuilder();
@@ -155,13 +154,9 @@ public final class BuyGoodsRspOuterClass {
 
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              goodsList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.parser(), extensionRegistry));
+            case 120: {
+
+              shopType_ = input.readUInt32();
               break;
             }
             default: {
@@ -199,10 +194,10 @@ public final class BuyGoodsRspOuterClass {
               emu.grasscutter.net.proto.BuyGoodsRspOuterClass.BuyGoodsRsp.class, emu.grasscutter.net.proto.BuyGoodsRspOuterClass.BuyGoodsRsp.Builder.class);
     }
 
-    public static final int BUY_COUNT_FIELD_NUMBER = 3;
+    public static final int BUY_COUNT_FIELD_NUMBER = 6;
     private int buyCount_;
     /**
-     * <code>uint32 buy_count = 3;</code>
+     * <code>uint32 buy_count = 6;</code>
      * @return The buyCount.
      */
     @java.lang.Override
@@ -210,10 +205,10 @@ public final class BuyGoodsRspOuterClass {
       return buyCount_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -221,54 +216,17 @@ public final class BuyGoodsRspOuterClass {
       return retcode_;
     }
 
-    public static final int GOODS_FIELD_NUMBER = 9;
-    private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
-    /**
-     * <code>.ShopGoods goods = 9;</code>
-     * @return Whether the goods field is set.
-     */
-    @java.lang.Override
-    public boolean hasGoods() {
-      return goods_ != null;
-    }
-    /**
-     * <code>.ShopGoods goods = 9;</code>
-     * @return The goods.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
-      return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
-    }
-    /**
-     * <code>.ShopGoods goods = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
-      return getGoods();
-    }
-
-    public static final int SHOP_TYPE_FIELD_NUMBER = 4;
-    private int shopType_;
-    /**
-     * <code>uint32 shop_type = 4;</code>
-     * @return The shopType.
-     */
-    @java.lang.Override
-    public int getShopType() {
-      return shopType_;
-    }
-
-    public static final int GOODS_LIST_FIELD_NUMBER = 15;
+    public static final int GOODS_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_;
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
       return goodsList_;
     }
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
@@ -276,21 +234,21 @@ public final class BuyGoodsRspOuterClass {
       return goodsList_;
     }
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     @java.lang.Override
     public int getGoodsListCount() {
       return goodsList_.size();
     }
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
       return goodsList_.get(index);
     }
     /**
-     * <code>repeated .ShopGoods goods_list = 15;</code>
+     * <code>repeated .ShopGoods goods_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
@@ -298,6 +256,43 @@ public final class BuyGoodsRspOuterClass {
       return goodsList_.get(index);
     }
 
+    public static final int GOODS_FIELD_NUMBER = 14;
+    private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     * @return Whether the goods field is set.
+     */
+    @java.lang.Override
+    public boolean hasGoods() {
+      return goods_ != null;
+    }
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     * @return The goods.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
+      return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
+    }
+    /**
+     * <code>.ShopGoods goods = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
+      return getGoods();
+    }
+
+    public static final int SHOP_TYPE_FIELD_NUMBER = 15;
+    private int shopType_;
+    /**
+     * <code>uint32 shop_type = 15;</code>
+     * @return The shopType.
+     */
+    @java.lang.Override
+    public int getShopType() {
+      return shopType_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -312,20 +307,20 @@ public final class BuyGoodsRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
       if (buyCount_ != 0) {
-        output.writeUInt32(3, buyCount_);
+        output.writeUInt32(6, buyCount_);
       }
-      if (shopType_ != 0) {
-        output.writeUInt32(4, shopType_);
-      }
-      if (goods_ != null) {
-        output.writeMessage(9, getGoods());
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
       }
       for (int i = 0; i < goodsList_.size(); i++) {
-        output.writeMessage(15, goodsList_.get(i));
+        output.writeMessage(9, goodsList_.get(i));
+      }
+      if (goods_ != null) {
+        output.writeMessage(14, getGoods());
+      }
+      if (shopType_ != 0) {
+        output.writeUInt32(15, shopType_);
       }
       unknownFields.writeTo(output);
     }
@@ -336,25 +331,25 @@ public final class BuyGoodsRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
-      }
       if (buyCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, buyCount_);
+          .computeUInt32Size(6, buyCount_);
       }
-      if (shopType_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, shopType_);
-      }
-      if (goods_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getGoods());
+          .computeInt32Size(8, retcode_);
       }
       for (int i = 0; i < goodsList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, goodsList_.get(i));
+          .computeMessageSize(9, goodsList_.get(i));
+      }
+      if (goods_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getGoods());
+      }
+      if (shopType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, shopType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -375,6 +370,8 @@ public final class BuyGoodsRspOuterClass {
           != other.getBuyCount()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getGoodsListList()
+          .equals(other.getGoodsListList())) return false;
       if (hasGoods() != other.hasGoods()) return false;
       if (hasGoods()) {
         if (!getGoods()
@@ -382,8 +379,6 @@ public final class BuyGoodsRspOuterClass {
       }
       if (getShopType()
           != other.getShopType()) return false;
-      if (!getGoodsListList()
-          .equals(other.getGoodsListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -399,16 +394,16 @@ public final class BuyGoodsRspOuterClass {
       hash = (53 * hash) + getBuyCount();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      if (getGoodsListCount() > 0) {
+        hash = (37 * hash) + GOODS_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getGoodsListList().hashCode();
+      }
       if (hasGoods()) {
         hash = (37 * hash) + GOODS_FIELD_NUMBER;
         hash = (53 * hash) + getGoods().hashCode();
       }
       hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getShopType();
-      if (getGoodsListCount() > 0) {
-        hash = (37 * hash) + GOODS_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getGoodsListList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -505,11 +500,6 @@ public final class BuyGoodsRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 611
-     * Obf: ODFCPEHCGFK
-     * </pre>
-     *
      * Protobuf type {@code BuyGoodsRsp}
      */
     public static final class Builder extends
@@ -552,6 +542,12 @@ public final class BuyGoodsRspOuterClass {
 
         retcode_ = 0;
 
+        if (goodsListBuilder_ == null) {
+          goodsList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          goodsListBuilder_.clear();
+        }
         if (goodsBuilder_ == null) {
           goods_ = null;
         } else {
@@ -560,12 +556,6 @@ public final class BuyGoodsRspOuterClass {
         }
         shopType_ = 0;
 
-        if (goodsListBuilder_ == null) {
-          goodsList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          goodsListBuilder_.clear();
-        }
         return this;
       }
 
@@ -595,12 +585,6 @@ public final class BuyGoodsRspOuterClass {
         int from_bitField0_ = bitField0_;
         result.buyCount_ = buyCount_;
         result.retcode_ = retcode_;
-        if (goodsBuilder_ == null) {
-          result.goods_ = goods_;
-        } else {
-          result.goods_ = goodsBuilder_.build();
-        }
-        result.shopType_ = shopType_;
         if (goodsListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             goodsList_ = java.util.Collections.unmodifiableList(goodsList_);
@@ -610,6 +594,12 @@ public final class BuyGoodsRspOuterClass {
         } else {
           result.goodsList_ = goodsListBuilder_.build();
         }
+        if (goodsBuilder_ == null) {
+          result.goods_ = goods_;
+        } else {
+          result.goods_ = goodsBuilder_.build();
+        }
+        result.shopType_ = shopType_;
         onBuilt();
         return result;
       }
@@ -664,12 +654,6 @@ public final class BuyGoodsRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.hasGoods()) {
-          mergeGoods(other.getGoods());
-        }
-        if (other.getShopType() != 0) {
-          setShopType(other.getShopType());
-        }
         if (goodsListBuilder_ == null) {
           if (!other.goodsList_.isEmpty()) {
             if (goodsList_.isEmpty()) {
@@ -696,6 +680,12 @@ public final class BuyGoodsRspOuterClass {
             }
           }
         }
+        if (other.hasGoods()) {
+          mergeGoods(other.getGoods());
+        }
+        if (other.getShopType() != 0) {
+          setShopType(other.getShopType());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -728,7 +718,7 @@ public final class BuyGoodsRspOuterClass {
 
       private int buyCount_ ;
       /**
-       * <code>uint32 buy_count = 3;</code>
+       * <code>uint32 buy_count = 6;</code>
        * @return The buyCount.
        */
       @java.lang.Override
@@ -736,7 +726,7 @@ public final class BuyGoodsRspOuterClass {
         return buyCount_;
       }
       /**
-       * <code>uint32 buy_count = 3;</code>
+       * <code>uint32 buy_count = 6;</code>
        * @param value The buyCount to set.
        * @return This builder for chaining.
        */
@@ -747,7 +737,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 buy_count = 3;</code>
+       * <code>uint32 buy_count = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearBuyCount() {
@@ -759,7 +749,7 @@ public final class BuyGoodsRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -767,7 +757,7 @@ public final class BuyGoodsRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -778,7 +768,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -788,156 +778,6 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsBuilder_;
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       * @return Whether the goods field is set.
-       */
-      public boolean hasGoods() {
-        return goodsBuilder_ != null || goods_ != null;
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       * @return The goods.
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
-        if (goodsBuilder_ == null) {
-          return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
-        } else {
-          return goodsBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
-        if (goodsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          goods_ = value;
-          onChanged();
-        } else {
-          goodsBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public Builder setGoods(
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
-        if (goodsBuilder_ == null) {
-          goods_ = builderForValue.build();
-          onChanged();
-        } else {
-          goodsBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
-        if (goodsBuilder_ == null) {
-          if (goods_ != null) {
-            goods_ =
-              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.newBuilder(goods_).mergeFrom(value).buildPartial();
-          } else {
-            goods_ = value;
-          }
-          onChanged();
-        } else {
-          goodsBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public Builder clearGoods() {
-        if (goodsBuilder_ == null) {
-          goods_ = null;
-          onChanged();
-        } else {
-          goods_ = null;
-          goodsBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
-        
-        onChanged();
-        return getGoodsFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
-        if (goodsBuilder_ != null) {
-          return goodsBuilder_.getMessageOrBuilder();
-        } else {
-          return goods_ == null ?
-              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
-        }
-      }
-      /**
-       * <code>.ShopGoods goods = 9;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
-          getGoodsFieldBuilder() {
-        if (goodsBuilder_ == null) {
-          goodsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder>(
-                  getGoods(),
-                  getParentForChildren(),
-                  isClean());
-          goods_ = null;
-        }
-        return goodsBuilder_;
-      }
-
-      private int shopType_ ;
-      /**
-       * <code>uint32 shop_type = 4;</code>
-       * @return The shopType.
-       */
-      @java.lang.Override
-      public int getShopType() {
-        return shopType_;
-      }
-      /**
-       * <code>uint32 shop_type = 4;</code>
-       * @param value The shopType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setShopType(int value) {
-        
-        shopType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 shop_type = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearShopType() {
-        
-        shopType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_ =
         java.util.Collections.emptyList();
       private void ensureGoodsListIsMutable() {
@@ -951,7 +791,7 @@ public final class BuyGoodsRspOuterClass {
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsListBuilder_;
 
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
         if (goodsListBuilder_ == null) {
@@ -961,7 +801,7 @@ public final class BuyGoodsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public int getGoodsListCount() {
         if (goodsListBuilder_ == null) {
@@ -971,7 +811,7 @@ public final class BuyGoodsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
         if (goodsListBuilder_ == null) {
@@ -981,7 +821,7 @@ public final class BuyGoodsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder setGoodsList(
           int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
@@ -998,7 +838,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder setGoodsList(
           int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -1012,7 +852,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder addGoodsList(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
         if (goodsListBuilder_ == null) {
@@ -1028,7 +868,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder addGoodsList(
           int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
@@ -1045,7 +885,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder addGoodsList(
           emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -1059,7 +899,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder addGoodsList(
           int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
@@ -1073,7 +913,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder addAllGoodsList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> values) {
@@ -1088,7 +928,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder clearGoodsList() {
         if (goodsListBuilder_ == null) {
@@ -1101,7 +941,7 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public Builder removeGoodsList(int index) {
         if (goodsListBuilder_ == null) {
@@ -1114,14 +954,14 @@ public final class BuyGoodsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsListBuilder(
           int index) {
         return getGoodsListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
           int index) {
@@ -1131,7 +971,7 @@ public final class BuyGoodsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
            getGoodsListOrBuilderList() {
@@ -1142,14 +982,14 @@ public final class BuyGoodsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder() {
         return getGoodsListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder(
           int index) {
@@ -1157,7 +997,7 @@ public final class BuyGoodsRspOuterClass {
             index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShopGoods goods_list = 15;</code>
+       * <code>repeated .ShopGoods goods_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder> 
            getGoodsListBuilderList() {
@@ -1177,6 +1017,156 @@ public final class BuyGoodsRspOuterClass {
         }
         return goodsListBuilder_;
       }
+
+      private emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods goods_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsBuilder_;
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       * @return Whether the goods field is set.
+       */
+      public boolean hasGoods() {
+        return goodsBuilder_ != null || goods_ != null;
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       * @return The goods.
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoods() {
+        if (goodsBuilder_ == null) {
+          return goods_ == null ? emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
+        } else {
+          return goodsBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public Builder setGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
+        if (goodsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          goods_ = value;
+          onChanged();
+        } else {
+          goodsBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public Builder setGoods(
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
+        if (goodsBuilder_ == null) {
+          goods_ = builderForValue.build();
+          onChanged();
+        } else {
+          goodsBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public Builder mergeGoods(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
+        if (goodsBuilder_ == null) {
+          if (goods_ != null) {
+            goods_ =
+              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.newBuilder(goods_).mergeFrom(value).buildPartial();
+          } else {
+            goods_ = value;
+          }
+          onChanged();
+        } else {
+          goodsBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public Builder clearGoods() {
+        if (goodsBuilder_ == null) {
+          goods_ = null;
+          onChanged();
+        } else {
+          goods_ = null;
+          goodsBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsBuilder() {
+        
+        onChanged();
+        return getGoodsFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsOrBuilder() {
+        if (goodsBuilder_ != null) {
+          return goodsBuilder_.getMessageOrBuilder();
+        } else {
+          return goods_ == null ?
+              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance() : goods_;
+        }
+      }
+      /**
+       * <code>.ShopGoods goods = 14;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
+          getGoodsFieldBuilder() {
+        if (goodsBuilder_ == null) {
+          goodsBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder>(
+                  getGoods(),
+                  getParentForChildren(),
+                  isClean());
+          goods_ = null;
+        }
+        return goodsBuilder_;
+      }
+
+      private int shopType_ ;
+      /**
+       * <code>uint32 shop_type = 15;</code>
+       * @return The shopType.
+       */
+      @java.lang.Override
+      public int getShopType() {
+        return shopType_;
+      }
+      /**
+       * <code>uint32 shop_type = 15;</code>
+       * @param value The shopType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setShopType(int value) {
+        
+        shopType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 shop_type = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearShopType() {
+        
+        shopType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1245,10 +1235,10 @@ public final class BuyGoodsRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021BuyGoodsRsp.proto\032\017ShopGoods.proto\"\177\n\013" +
-      "BuyGoodsRsp\022\021\n\tbuy_count\030\003 \001(\r\022\017\n\007retcod" +
-      "e\030\001 \001(\005\022\031\n\005goods\030\t \001(\0132\n.ShopGoods\022\021\n\tsh" +
-      "op_type\030\004 \001(\r\022\036\n\ngoods_list\030\017 \003(\0132\n.Shop" +
-      "GoodsB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "BuyGoodsRsp\022\021\n\tbuy_count\030\006 \001(\r\022\017\n\007retcod" +
+      "e\030\010 \001(\005\022\036\n\ngoods_list\030\t \003(\0132\n.ShopGoods\022" +
+      "\031\n\005goods\030\016 \001(\0132\n.ShopGoods\022\021\n\tshop_type\030" +
+      "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1261,7 +1251,7 @@ public final class BuyGoodsRspOuterClass {
     internal_static_BuyGoodsRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_BuyGoodsRsp_descriptor,
-        new java.lang.String[] { "BuyCount", "Retcode", "Goods", "ShopType", "GoodsList", });
+        new java.lang.String[] { "BuyCount", "Retcode", "GoodsList", "Goods", "ShopType", });
     emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java
index f26077d4f..244b8445a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsReqOuterClass.java
@@ -19,58 +19,53 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getItemParamListList();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     int getItemParamListCount();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getItemParamListOrBuilderList();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
         int index);
 
     /**
-     * <code>uint64 target_weapon_guid = 1;</code>
-     * @return The targetWeaponGuid.
-     */
-    long getTargetWeaponGuid();
-
-    /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @return A list containing the foodWeaponGuidList.
      */
     java.util.List<java.lang.Long> getFoodWeaponGuidListList();
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @return The count of foodWeaponGuidList.
      */
     int getFoodWeaponGuidListCount();
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The foodWeaponGuidList at the given index.
      */
     long getFoodWeaponGuidList(int index);
+
+    /**
+     * <code>uint64 target_weapon_guid = 4;</code>
+     * @return The targetWeaponGuid.
+     */
+    long getTargetWeaponGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23232
-   * Obf: GJIAADPBGKA
-   * </pre>
-   *
    * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq}
    */
   public static final class CalcWeaponUpgradeReturnItemsReq extends
@@ -119,11 +114,6 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
               done = true;
               break;
             case 8: {
-
-              targetWeaponGuid_ = input.readUInt64();
-              break;
-            }
-            case 112: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 foodWeaponGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000002;
@@ -131,7 +121,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
               foodWeaponGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 114: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -144,7 +134,12 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 122: {
+            case 32: {
+
+              targetWeaponGuid_ = input.readUInt64();
+              break;
+            }
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -191,17 +186,17 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
               emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcWeaponUpgradeReturnItemsReq.class, emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsReqOuterClass.CalcWeaponUpgradeReturnItemsReq.Builder.class);
     }
 
-    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15;
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
       return itemParamList_;
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -209,21 +204,21 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       return itemParamList_;
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     @java.lang.Override
     public int getItemParamListCount() {
       return itemParamList_.size();
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
       return itemParamList_.get(index);
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
@@ -231,21 +226,10 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       return itemParamList_.get(index);
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 1;
-    private long targetWeaponGuid_;
-    /**
-     * <code>uint64 target_weapon_guid = 1;</code>
-     * @return The targetWeaponGuid.
-     */
-    @java.lang.Override
-    public long getTargetWeaponGuid() {
-      return targetWeaponGuid_;
-    }
-
-    public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 14;
+    public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.LongList foodWeaponGuidList_;
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @return A list containing the foodWeaponGuidList.
      */
     @java.lang.Override
@@ -254,14 +238,14 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       return foodWeaponGuidList_;
     }
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @return The count of foodWeaponGuidList.
      */
     public int getFoodWeaponGuidListCount() {
       return foodWeaponGuidList_.size();
     }
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The foodWeaponGuidList at the given index.
      */
@@ -270,6 +254,17 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
     }
     private int foodWeaponGuidListMemoizedSerializedSize = -1;
 
+    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 4;
+    private long targetWeaponGuid_;
+    /**
+     * <code>uint64 target_weapon_guid = 4;</code>
+     * @return The targetWeaponGuid.
+     */
+    @java.lang.Override
+    public long getTargetWeaponGuid() {
+      return targetWeaponGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -285,18 +280,18 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(1, targetWeaponGuid_);
-      }
       if (getFoodWeaponGuidListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(foodWeaponGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < foodWeaponGuidList_.size(); i++) {
         output.writeUInt64NoTag(foodWeaponGuidList_.getLong(i));
       }
+      if (targetWeaponGuid_ != 0L) {
+        output.writeUInt64(4, targetWeaponGuid_);
+      }
       for (int i = 0; i < itemParamList_.size(); i++) {
-        output.writeMessage(15, itemParamList_.get(i));
+        output.writeMessage(10, itemParamList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -307,10 +302,6 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetWeaponGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, targetWeaponGuid_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < foodWeaponGuidList_.size(); i++) {
@@ -325,9 +316,13 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
         foodWeaponGuidListMemoizedSerializedSize = dataSize;
       }
+      if (targetWeaponGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(4, targetWeaponGuid_);
+      }
       for (int i = 0; i < itemParamList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, itemParamList_.get(i));
+          .computeMessageSize(10, itemParamList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,10 +341,10 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
 
       if (!getItemParamListList()
           .equals(other.getItemParamListList())) return false;
-      if (getTargetWeaponGuid()
-          != other.getTargetWeaponGuid()) return false;
       if (!getFoodWeaponGuidListList()
           .equals(other.getFoodWeaponGuidListList())) return false;
+      if (getTargetWeaponGuid()
+          != other.getTargetWeaponGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -365,13 +360,13 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemParamListList().hashCode();
       }
-      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getTargetWeaponGuid());
       if (getFoodWeaponGuidListCount() > 0) {
         hash = (37 * hash) + FOOD_WEAPON_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFoodWeaponGuidListList().hashCode();
       }
+      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTargetWeaponGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -468,11 +463,6 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23232
-     * Obf: GJIAADPBGKA
-     * </pre>
-     *
      * Protobuf type {@code CalcWeaponUpgradeReturnItemsReq}
      */
     public static final class Builder extends
@@ -517,10 +507,10 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         } else {
           itemParamListBuilder_.clear();
         }
-        targetWeaponGuid_ = 0L;
-
         foodWeaponGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000002);
+        targetWeaponGuid_ = 0L;
+
         return this;
       }
 
@@ -557,12 +547,12 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         } else {
           result.itemParamList_ = itemParamListBuilder_.build();
         }
-        result.targetWeaponGuid_ = targetWeaponGuid_;
         if (((bitField0_ & 0x00000002) != 0)) {
           foodWeaponGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.foodWeaponGuidList_ = foodWeaponGuidList_;
+        result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
         return result;
       }
@@ -637,9 +627,6 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
             }
           }
         }
-        if (other.getTargetWeaponGuid() != 0L) {
-          setTargetWeaponGuid(other.getTargetWeaponGuid());
-        }
         if (!other.foodWeaponGuidList_.isEmpty()) {
           if (foodWeaponGuidList_.isEmpty()) {
             foodWeaponGuidList_ = other.foodWeaponGuidList_;
@@ -650,6 +637,9 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
           }
           onChanged();
         }
+        if (other.getTargetWeaponGuid() != 0L) {
+          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -693,7 +683,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
 
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
         if (itemParamListBuilder_ == null) {
@@ -703,7 +693,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public int getItemParamListCount() {
         if (itemParamListBuilder_ == null) {
@@ -713,7 +703,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
         if (itemParamListBuilder_ == null) {
@@ -723,7 +713,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder setItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -740,7 +730,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder setItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -754,7 +744,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemParamListBuilder_ == null) {
@@ -770,7 +760,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder addItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -787,7 +777,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder addItemParamList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -801,7 +791,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder addItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -815,7 +805,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder addAllItemParamList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -830,7 +820,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder clearItemParamList() {
         if (itemParamListBuilder_ == null) {
@@ -843,7 +833,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public Builder removeItemParamList(int index) {
         if (itemParamListBuilder_ == null) {
@@ -856,14 +846,14 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
           int index) {
         return getItemParamListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
           int index) {
@@ -873,7 +863,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getItemParamListOrBuilderList() {
@@ -884,14 +874,14 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
         return getItemParamListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
           int index) {
@@ -899,7 +889,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
+       * <code>repeated .ItemParam item_param_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getItemParamListBuilderList() {
@@ -920,37 +910,6 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return itemParamListBuilder_;
       }
 
-      private long targetWeaponGuid_ ;
-      /**
-       * <code>uint64 target_weapon_guid = 1;</code>
-       * @return The targetWeaponGuid.
-       */
-      @java.lang.Override
-      public long getTargetWeaponGuid() {
-        return targetWeaponGuid_;
-      }
-      /**
-       * <code>uint64 target_weapon_guid = 1;</code>
-       * @param value The targetWeaponGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetWeaponGuid(long value) {
-        
-        targetWeaponGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 target_weapon_guid = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetWeaponGuid() {
-        
-        targetWeaponGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList();
       private void ensureFoodWeaponGuidListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
@@ -959,7 +918,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @return A list containing the foodWeaponGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -968,14 +927,14 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
                  java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_;
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @return The count of foodWeaponGuidList.
        */
       public int getFoodWeaponGuidListCount() {
         return foodWeaponGuidList_.size();
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @param index The index of the element to return.
        * @return The foodWeaponGuidList at the given index.
        */
@@ -983,7 +942,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return foodWeaponGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The foodWeaponGuidList to set.
        * @return This builder for chaining.
@@ -996,7 +955,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @param value The foodWeaponGuidList to add.
        * @return This builder for chaining.
        */
@@ -1007,7 +966,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @param values The foodWeaponGuidList to add.
        * @return This builder for chaining.
        */
@@ -1020,7 +979,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 food_weapon_guid_list = 14;</code>
+       * <code>repeated uint64 food_weapon_guid_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearFoodWeaponGuidList() {
@@ -1029,6 +988,37 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long targetWeaponGuid_ ;
+      /**
+       * <code>uint64 target_weapon_guid = 4;</code>
+       * @return The targetWeaponGuid.
+       */
+      @java.lang.Override
+      public long getTargetWeaponGuid() {
+        return targetWeaponGuid_;
+      }
+      /**
+       * <code>uint64 target_weapon_guid = 4;</code>
+       * @param value The targetWeaponGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetWeaponGuid(long value) {
+        
+        targetWeaponGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 target_weapon_guid = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetWeaponGuid() {
+        
+        targetWeaponGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1098,9 +1088,9 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n%CalcWeaponUpgradeReturnItemsReq.proto\032" +
       "\017ItemParam.proto\"\201\001\n\037CalcWeaponUpgradeRe" +
-      "turnItemsReq\022#\n\017item_param_list\030\017 \003(\0132\n." +
-      "ItemParam\022\032\n\022target_weapon_guid\030\001 \001(\004\022\035\n" +
-      "\025food_weapon_guid_list\030\016 \003(\004B\033\n\031emu.gras" +
+      "turnItemsReq\022#\n\017item_param_list\030\n \003(\0132\n." +
+      "ItemParam\022\035\n\025food_weapon_guid_list\030\001 \003(\004" +
+      "\022\032\n\022target_weapon_guid\030\004 \001(\004B\033\n\031emu.gras" +
       "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1113,7 +1103,7 @@ public final class CalcWeaponUpgradeReturnItemsReqOuterClass {
     internal_static_CalcWeaponUpgradeReturnItemsReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CalcWeaponUpgradeReturnItemsReq_descriptor,
-        new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "FoodWeaponGuidList", });
+        new java.lang.String[] { "ItemParamList", "FoodWeaponGuidList", "TargetWeaponGuid", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java
index f708eb827..b98f428e2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CalcWeaponUpgradeReturnItemsRspOuterClass.java
@@ -19,47 +19,42 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>int32 retcode = 3;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getItemParamListList();
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     int getItemParamListCount();
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getItemParamListOrBuilderList();
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
         int index);
 
     /**
-     * <code>uint64 target_weapon_guid = 15;</code>
+     * <code>uint64 target_weapon_guid = 7;</code>
      * @return The targetWeaponGuid.
      */
     long getTargetWeaponGuid();
-
-    /**
-     * <code>int32 retcode = 14;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 24299
-   * Obf: EFEMOPJBOBD
-   * </pre>
-   *
    * Protobuf type {@code CalcWeaponUpgradeReturnItemsRsp}
    */
   public static final class CalcWeaponUpgradeReturnItemsRsp extends
@@ -106,7 +101,12 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
             case 0:
               done = true;
               break;
-            case 82: {
+            case 24: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -115,12 +115,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 120: {
+            case 56: {
 
               targetWeaponGuid_ = input.readUInt64();
               break;
@@ -160,17 +155,28 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
               emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.class, emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.Builder.class);
     }
 
-    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 10;
+    public static final int RETCODE_FIELD_NUMBER = 3;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 3;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
       return itemParamList_;
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -178,21 +184,21 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       return itemParamList_;
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     @java.lang.Override
     public int getItemParamListCount() {
       return itemParamList_.size();
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
       return itemParamList_.get(index);
     }
     /**
-     * <code>repeated .ItemParam item_param_list = 10;</code>
+     * <code>repeated .ItemParam item_param_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
@@ -200,10 +206,10 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       return itemParamList_.get(index);
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 15;
+    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 7;
     private long targetWeaponGuid_;
     /**
-     * <code>uint64 target_weapon_guid = 15;</code>
+     * <code>uint64 target_weapon_guid = 7;</code>
      * @return The targetWeaponGuid.
      */
     @java.lang.Override
@@ -211,17 +217,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       return targetWeaponGuid_;
     }
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -236,14 +231,14 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        output.writeMessage(10, itemParamList_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        output.writeMessage(6, itemParamList_.get(i));
       }
       if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(15, targetWeaponGuid_);
+        output.writeUInt64(7, targetWeaponGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, itemParamList_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(3, retcode_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, itemParamList_.get(i));
       }
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, targetWeaponGuid_);
+          .computeUInt64Size(7, targetWeaponGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -281,12 +276,12 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       }
       emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp other = (emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp) obj;
 
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!getItemParamListList()
           .equals(other.getItemParamListList())) return false;
       if (getTargetWeaponGuid()
           != other.getTargetWeaponGuid()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -298,6 +293,8 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getItemParamListCount() > 0) {
         hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemParamListList().hashCode();
@@ -305,8 +302,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetWeaponGuid());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -403,11 +398,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24299
-     * Obf: EFEMOPJBOBD
-     * </pre>
-     *
      * Protobuf type {@code CalcWeaponUpgradeReturnItemsRsp}
      */
     public static final class Builder extends
@@ -446,6 +436,8 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (itemParamListBuilder_ == null) {
           itemParamList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -454,8 +446,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
         targetWeaponGuid_ = 0L;
 
-        retcode_ = 0;
-
         return this;
       }
 
@@ -483,6 +473,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       public emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp buildPartial() {
         emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp result = new emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (itemParamListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
@@ -493,7 +484,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
           result.itemParamList_ = itemParamListBuilder_.build();
         }
         result.targetWeaponGuid_ = targetWeaponGuid_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -542,6 +532,9 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp other) {
         if (other == emu.grasscutter.net.proto.CalcWeaponUpgradeReturnItemsRspOuterClass.CalcWeaponUpgradeReturnItemsRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (itemParamListBuilder_ == null) {
           if (!other.itemParamList_.isEmpty()) {
             if (itemParamList_.isEmpty()) {
@@ -571,9 +564,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         if (other.getTargetWeaponGuid() != 0L) {
           setTargetWeaponGuid(other.getTargetWeaponGuid());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -604,6 +594,37 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 3;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 3;</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 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
         java.util.Collections.emptyList();
       private void ensureItemParamListIsMutable() {
@@ -617,7 +638,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
 
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
         if (itemParamListBuilder_ == null) {
@@ -627,7 +648,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public int getItemParamListCount() {
         if (itemParamListBuilder_ == null) {
@@ -637,7 +658,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
         if (itemParamListBuilder_ == null) {
@@ -647,7 +668,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder setItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -664,7 +685,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder setItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -678,7 +699,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemParamListBuilder_ == null) {
@@ -694,7 +715,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder addItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -711,7 +732,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder addItemParamList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -725,7 +746,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder addItemParamList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -739,7 +760,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder addAllItemParamList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -754,7 +775,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder clearItemParamList() {
         if (itemParamListBuilder_ == null) {
@@ -767,7 +788,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public Builder removeItemParamList(int index) {
         if (itemParamListBuilder_ == null) {
@@ -780,14 +801,14 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
           int index) {
         return getItemParamListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
           int index) {
@@ -797,7 +818,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getItemParamListOrBuilderList() {
@@ -808,14 +829,14 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
         return getItemParamListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
           int index) {
@@ -823,7 +844,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_param_list = 10;</code>
+       * <code>repeated .ItemParam item_param_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getItemParamListBuilderList() {
@@ -846,7 +867,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
 
       private long targetWeaponGuid_ ;
       /**
-       * <code>uint64 target_weapon_guid = 15;</code>
+       * <code>uint64 target_weapon_guid = 7;</code>
        * @return The targetWeaponGuid.
        */
       @java.lang.Override
@@ -854,7 +875,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return targetWeaponGuid_;
       }
       /**
-       * <code>uint64 target_weapon_guid = 15;</code>
+       * <code>uint64 target_weapon_guid = 7;</code>
        * @param value The targetWeaponGuid to set.
        * @return This builder for chaining.
        */
@@ -865,7 +886,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_weapon_guid = 15;</code>
+       * <code>uint64 target_weapon_guid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetWeaponGuid() {
@@ -874,37 +895,6 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
         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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -974,9 +964,9 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n%CalcWeaponUpgradeReturnItemsRsp.proto\032" +
       "\017ItemParam.proto\"s\n\037CalcWeaponUpgradeRet" +
-      "urnItemsRsp\022#\n\017item_param_list\030\n \003(\0132\n.I" +
-      "temParam\022\032\n\022target_weapon_guid\030\017 \001(\004\022\017\n\007" +
-      "retcode\030\016 \001(\005B\033\n\031emu.grasscutter.net.pro" +
+      "urnItemsRsp\022\017\n\007retcode\030\003 \001(\005\022#\n\017item_par" +
+      "am_list\030\006 \003(\0132\n.ItemParam\022\032\n\022target_weap" +
+      "on_guid\030\007 \001(\004B\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -989,7 +979,7 @@ public final class CalcWeaponUpgradeReturnItemsRspOuterClass {
     internal_static_CalcWeaponUpgradeReturnItemsRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CalcWeaponUpgradeReturnItemsRsp_descriptor,
-        new java.lang.String[] { "ItemParamList", "TargetWeaponGuid", "Retcode", });
+        new java.lang.String[] { "Retcode", "ItemParamList", "TargetWeaponGuid", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeBriefOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeBriefOuterClass.java
index 36a788cf8..5ac5b2683 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeBriefOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeBriefOuterClass.java
@@ -19,34 +19,30 @@ public final class ChallengeBriefOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 challenge_id = 14;</code>
-     * @return The challengeId.
+     * <code>uint32 challenge_index = 1;</code>
+     * @return The challengeIndex.
      */
-    int getChallengeId();
+    int getChallengeIndex();
 
     /**
-     * <code>uint32 cur_progress = 3;</code>
-     * @return The curProgress.
-     */
-    int getCurProgress();
-
-    /**
-     * <code>bool is_success = 9;</code>
+     * <code>bool is_success = 8;</code>
      * @return The isSuccess.
      */
     boolean getIsSuccess();
 
     /**
-     * <code>uint32 challenge_index = 15;</code>
-     * @return The challengeIndex.
+     * <code>uint32 challenge_id = 9;</code>
+     * @return The challengeId.
      */
-    int getChallengeIndex();
+    int getChallengeId();
+
+    /**
+     * <code>uint32 cur_progress = 12;</code>
+     * @return The curProgress.
+     */
+    int getCurProgress();
   }
   /**
-   * <pre>
-   * Obf: LECFLFKFOOL
-   * </pre>
-   *
    * Protobuf type {@code ChallengeBrief}
    */
   public static final class ChallengeBrief extends
@@ -91,24 +87,24 @@ public final class ChallengeBriefOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
-              curProgress_ = input.readUInt32();
+              challengeIndex_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 64: {
 
               isSuccess_ = input.readBool();
               break;
             }
-            case 112: {
+            case 72: {
 
               challengeId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 96: {
 
-              challengeIndex_ = input.readUInt32();
+              curProgress_ = input.readUInt32();
               break;
             }
             default: {
@@ -143,32 +139,21 @@ public final class ChallengeBriefOuterClass {
               emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.class, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder.class);
     }
 
-    public static final int CHALLENGE_ID_FIELD_NUMBER = 14;
-    private int challengeId_;
+    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 1;
+    private int challengeIndex_;
     /**
-     * <code>uint32 challenge_id = 14;</code>
-     * @return The challengeId.
+     * <code>uint32 challenge_index = 1;</code>
+     * @return The challengeIndex.
      */
     @java.lang.Override
-    public int getChallengeId() {
-      return challengeId_;
+    public int getChallengeIndex() {
+      return challengeIndex_;
     }
 
-    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 IS_SUCCESS_FIELD_NUMBER = 9;
+    public static final int IS_SUCCESS_FIELD_NUMBER = 8;
     private boolean isSuccess_;
     /**
-     * <code>bool is_success = 9;</code>
+     * <code>bool is_success = 8;</code>
      * @return The isSuccess.
      */
     @java.lang.Override
@@ -176,15 +161,26 @@ public final class ChallengeBriefOuterClass {
       return isSuccess_;
     }
 
-    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 15;
-    private int challengeIndex_;
+    public static final int CHALLENGE_ID_FIELD_NUMBER = 9;
+    private int challengeId_;
     /**
-     * <code>uint32 challenge_index = 15;</code>
-     * @return The challengeIndex.
+     * <code>uint32 challenge_id = 9;</code>
+     * @return The challengeId.
      */
     @java.lang.Override
-    public int getChallengeIndex() {
-      return challengeIndex_;
+    public int getChallengeId() {
+      return challengeId_;
+    }
+
+    public static final int CUR_PROGRESS_FIELD_NUMBER = 12;
+    private int curProgress_;
+    /**
+     * <code>uint32 cur_progress = 12;</code>
+     * @return The curProgress.
+     */
+    @java.lang.Override
+    public int getCurProgress() {
+      return curProgress_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -201,17 +197,17 @@ public final class ChallengeBriefOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curProgress_ != 0) {
-        output.writeUInt32(3, curProgress_);
+      if (challengeIndex_ != 0) {
+        output.writeUInt32(1, challengeIndex_);
       }
       if (isSuccess_ != false) {
-        output.writeBool(9, isSuccess_);
+        output.writeBool(8, isSuccess_);
       }
       if (challengeId_ != 0) {
-        output.writeUInt32(14, challengeId_);
+        output.writeUInt32(9, challengeId_);
       }
-      if (challengeIndex_ != 0) {
-        output.writeUInt32(15, challengeIndex_);
+      if (curProgress_ != 0) {
+        output.writeUInt32(12, curProgress_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +218,21 @@ public final class ChallengeBriefOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curProgress_ != 0) {
+      if (challengeIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, curProgress_);
+          .computeUInt32Size(1, challengeIndex_);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isSuccess_);
+          .computeBoolSize(8, isSuccess_);
       }
       if (challengeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, challengeId_);
+          .computeUInt32Size(9, challengeId_);
       }
-      if (challengeIndex_ != 0) {
+      if (curProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, challengeIndex_);
+          .computeUInt32Size(12, curProgress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +249,14 @@ public final class ChallengeBriefOuterClass {
       }
       emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief other = (emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief) obj;
 
+      if (getChallengeIndex()
+          != other.getChallengeIndex()) return false;
+      if (getIsSuccess()
+          != other.getIsSuccess()) return false;
       if (getChallengeId()
           != other.getChallengeId()) return false;
       if (getCurProgress()
           != other.getCurProgress()) return false;
-      if (getIsSuccess()
-          != other.getIsSuccess()) return false;
-      if (getChallengeIndex()
-          != other.getChallengeIndex()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,15 +268,15 @@ public final class ChallengeBriefOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeIndex();
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSuccess());
       hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeId();
       hash = (37 * hash) + CUR_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getCurProgress();
-      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSuccess());
-      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeIndex();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +373,6 @@ public final class ChallengeBriefOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LECFLFKFOOL
-     * </pre>
-     *
      * Protobuf type {@code ChallengeBrief}
      */
     public static final class Builder extends
@@ -418,13 +410,13 @@ public final class ChallengeBriefOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        challengeId_ = 0;
-
-        curProgress_ = 0;
+        challengeIndex_ = 0;
 
         isSuccess_ = false;
 
-        challengeIndex_ = 0;
+        challengeId_ = 0;
+
+        curProgress_ = 0;
 
         return this;
       }
@@ -452,10 +444,10 @@ public final class ChallengeBriefOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief buildPartial() {
         emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief result = new emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief(this);
+        result.challengeIndex_ = challengeIndex_;
+        result.isSuccess_ = isSuccess_;
         result.challengeId_ = challengeId_;
         result.curProgress_ = curProgress_;
-        result.isSuccess_ = isSuccess_;
-        result.challengeIndex_ = challengeIndex_;
         onBuilt();
         return result;
       }
@@ -504,18 +496,18 @@ public final class ChallengeBriefOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief other) {
         if (other == emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.getDefaultInstance()) return this;
+        if (other.getChallengeIndex() != 0) {
+          setChallengeIndex(other.getChallengeIndex());
+        }
+        if (other.getIsSuccess() != false) {
+          setIsSuccess(other.getIsSuccess());
+        }
         if (other.getChallengeId() != 0) {
           setChallengeId(other.getChallengeId());
         }
         if (other.getCurProgress() != 0) {
           setCurProgress(other.getCurProgress());
         }
-        if (other.getIsSuccess() != false) {
-          setIsSuccess(other.getIsSuccess());
-        }
-        if (other.getChallengeIndex() != 0) {
-          setChallengeIndex(other.getChallengeIndex());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,9 +537,71 @@ public final class ChallengeBriefOuterClass {
         return this;
       }
 
+      private int challengeIndex_ ;
+      /**
+       * <code>uint32 challenge_index = 1;</code>
+       * @return The challengeIndex.
+       */
+      @java.lang.Override
+      public int getChallengeIndex() {
+        return challengeIndex_;
+      }
+      /**
+       * <code>uint32 challenge_index = 1;</code>
+       * @param value The challengeIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeIndex(int value) {
+        
+        challengeIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_index = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeIndex() {
+        
+        challengeIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isSuccess_ ;
+      /**
+       * <code>bool is_success = 8;</code>
+       * @return The isSuccess.
+       */
+      @java.lang.Override
+      public boolean getIsSuccess() {
+        return isSuccess_;
+      }
+      /**
+       * <code>bool is_success = 8;</code>
+       * @param value The isSuccess to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSuccess(boolean value) {
+        
+        isSuccess_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_success = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSuccess() {
+        
+        isSuccess_ = false;
+        onChanged();
+        return this;
+      }
+
       private int challengeId_ ;
       /**
-       * <code>uint32 challenge_id = 14;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @return The challengeId.
        */
       @java.lang.Override
@@ -555,7 +609,7 @@ public final class ChallengeBriefOuterClass {
         return challengeId_;
       }
       /**
-       * <code>uint32 challenge_id = 14;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @param value The challengeId to set.
        * @return This builder for chaining.
        */
@@ -566,7 +620,7 @@ public final class ChallengeBriefOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_id = 14;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeId() {
@@ -578,7 +632,7 @@ public final class ChallengeBriefOuterClass {
 
       private int curProgress_ ;
       /**
-       * <code>uint32 cur_progress = 3;</code>
+       * <code>uint32 cur_progress = 12;</code>
        * @return The curProgress.
        */
       @java.lang.Override
@@ -586,7 +640,7 @@ public final class ChallengeBriefOuterClass {
         return curProgress_;
       }
       /**
-       * <code>uint32 cur_progress = 3;</code>
+       * <code>uint32 cur_progress = 12;</code>
        * @param value The curProgress to set.
        * @return This builder for chaining.
        */
@@ -597,7 +651,7 @@ public final class ChallengeBriefOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_progress = 3;</code>
+       * <code>uint32 cur_progress = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurProgress() {
@@ -606,68 +660,6 @@ public final class ChallengeBriefOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean isSuccess_ ;
-      /**
-       * <code>bool is_success = 9;</code>
-       * @return The isSuccess.
-       */
-      @java.lang.Override
-      public boolean getIsSuccess() {
-        return isSuccess_;
-      }
-      /**
-       * <code>bool is_success = 9;</code>
-       * @param value The isSuccess to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSuccess(boolean value) {
-        
-        isSuccess_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_success = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSuccess() {
-        
-        isSuccess_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int challengeIndex_ ;
-      /**
-       * <code>uint32 challenge_index = 15;</code>
-       * @return The challengeIndex.
-       */
-      @java.lang.Override
-      public int getChallengeIndex() {
-        return challengeIndex_;
-      }
-      /**
-       * <code>uint32 challenge_index = 15;</code>
-       * @param value The challengeIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeIndex(int value) {
-        
-        challengeIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_index = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeIndex() {
-        
-        challengeIndex_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +728,9 @@ public final class ChallengeBriefOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024ChallengeBrief.proto\"i\n\016ChallengeBrief" +
-      "\022\024\n\014challenge_id\030\016 \001(\r\022\024\n\014cur_progress\030\003" +
-      " \001(\r\022\022\n\nis_success\030\t \001(\010\022\027\n\017challenge_in" +
-      "dex\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "\022\027\n\017challenge_index\030\001 \001(\r\022\022\n\nis_success\030" +
+      "\010 \001(\010\022\024\n\014challenge_id\030\t \001(\r\022\024\n\014cur_progr" +
+      "ess\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class ChallengeBriefOuterClass {
     internal_static_ChallengeBrief_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChallengeBrief_descriptor,
-        new java.lang.String[] { "ChallengeId", "CurProgress", "IsSuccess", "ChallengeIndex", });
+        new java.lang.String[] { "ChallengeIndex", "IsSuccess", "ChallengeId", "CurProgress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeDataNotifyOuterClass.java
index 42f2ac653..7b6f24379 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeDataNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class ChallengeDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 challenge_index = 5;</code>
-     * @return The challengeIndex.
+     * <code>uint32 value = 2;</code>
+     * @return The value.
      */
-    int getChallengeIndex();
+    int getValue();
 
     /**
-     * <code>uint32 param_index = 9;</code>
+     * <code>uint32 param_index = 7;</code>
      * @return The paramIndex.
      */
     int getParamIndex();
 
     /**
-     * <code>uint32 value = 8;</code>
-     * @return The value.
+     * <code>uint32 challenge_index = 13;</code>
+     * @return The challengeIndex.
      */
-    int getValue();
+    int getChallengeIndex();
   }
   /**
-   * <pre>
-   * CmdId: 2864
-   * Obf: MFANHHFJIBJ
-   * </pre>
-   *
    * Protobuf type {@code ChallengeDataNotify}
    */
   public static final class ChallengeDataNotify extends
@@ -86,21 +81,21 @@ public final class ChallengeDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              challengeIndex_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 16: {
 
               value_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 56: {
 
               paramIndex_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              challengeIndex_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,21 @@ public final class ChallengeDataNotifyOuterClass {
               emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify.class, emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify.Builder.class);
     }
 
-    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 5;
-    private int challengeIndex_;
+    public static final int VALUE_FIELD_NUMBER = 2;
+    private int value_;
     /**
-     * <code>uint32 challenge_index = 5;</code>
-     * @return The challengeIndex.
+     * <code>uint32 value = 2;</code>
+     * @return The value.
      */
     @java.lang.Override
-    public int getChallengeIndex() {
-      return challengeIndex_;
+    public int getValue() {
+      return value_;
     }
 
-    public static final int PARAM_INDEX_FIELD_NUMBER = 9;
+    public static final int PARAM_INDEX_FIELD_NUMBER = 7;
     private int paramIndex_;
     /**
-     * <code>uint32 param_index = 9;</code>
+     * <code>uint32 param_index = 7;</code>
      * @return The paramIndex.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class ChallengeDataNotifyOuterClass {
       return paramIndex_;
     }
 
-    public static final int VALUE_FIELD_NUMBER = 8;
-    private int value_;
+    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 13;
+    private int challengeIndex_;
     /**
-     * <code>uint32 value = 8;</code>
-     * @return The value.
+     * <code>uint32 challenge_index = 13;</code>
+     * @return The challengeIndex.
      */
     @java.lang.Override
-    public int getValue() {
-      return value_;
+    public int getChallengeIndex() {
+      return challengeIndex_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +175,14 @@ public final class ChallengeDataNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (challengeIndex_ != 0) {
-        output.writeUInt32(5, challengeIndex_);
-      }
       if (value_ != 0) {
-        output.writeUInt32(8, value_);
+        output.writeUInt32(2, value_);
       }
       if (paramIndex_ != 0) {
-        output.writeUInt32(9, paramIndex_);
+        output.writeUInt32(7, paramIndex_);
+      }
+      if (challengeIndex_ != 0) {
+        output.writeUInt32(13, challengeIndex_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class ChallengeDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (challengeIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, challengeIndex_);
-      }
       if (value_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, value_);
+          .computeUInt32Size(2, value_);
       }
       if (paramIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, paramIndex_);
+          .computeUInt32Size(7, paramIndex_);
+      }
+      if (challengeIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, challengeIndex_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class ChallengeDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify other = (emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify) obj;
 
-      if (getChallengeIndex()
-          != other.getChallengeIndex()) return false;
-      if (getParamIndex()
-          != other.getParamIndex()) return false;
       if (getValue()
           != other.getValue()) return false;
+      if (getParamIndex()
+          != other.getParamIndex()) return false;
+      if (getChallengeIndex()
+          != other.getChallengeIndex()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class ChallengeDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeIndex();
-      hash = (37 * hash) + PARAM_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getParamIndex();
       hash = (37 * hash) + VALUE_FIELD_NUMBER;
       hash = (53 * hash) + getValue();
+      hash = (37 * hash) + PARAM_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getParamIndex();
+      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeIndex();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class ChallengeDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2864
-     * Obf: MFANHHFJIBJ
-     * </pre>
-     *
      * Protobuf type {@code ChallengeDataNotify}
      */
     public static final class Builder extends
@@ -386,11 +376,11 @@ public final class ChallengeDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        challengeIndex_ = 0;
+        value_ = 0;
 
         paramIndex_ = 0;
 
-        value_ = 0;
+        challengeIndex_ = 0;
 
         return this;
       }
@@ -418,9 +408,9 @@ public final class ChallengeDataNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify buildPartial() {
         emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify result = new emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify(this);
-        result.challengeIndex_ = challengeIndex_;
-        result.paramIndex_ = paramIndex_;
         result.value_ = value_;
+        result.paramIndex_ = paramIndex_;
+        result.challengeIndex_ = challengeIndex_;
         onBuilt();
         return result;
       }
@@ -469,14 +459,14 @@ public final class ChallengeDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify other) {
         if (other == emu.grasscutter.net.proto.ChallengeDataNotifyOuterClass.ChallengeDataNotify.getDefaultInstance()) return this;
-        if (other.getChallengeIndex() != 0) {
-          setChallengeIndex(other.getChallengeIndex());
+        if (other.getValue() != 0) {
+          setValue(other.getValue());
         }
         if (other.getParamIndex() != 0) {
           setParamIndex(other.getParamIndex());
         }
-        if (other.getValue() != 0) {
-          setValue(other.getValue());
+        if (other.getChallengeIndex() != 0) {
+          setChallengeIndex(other.getChallengeIndex());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +497,9 @@ public final class ChallengeDataNotifyOuterClass {
         return this;
       }
 
-      private int challengeIndex_ ;
-      /**
-       * <code>uint32 challenge_index = 5;</code>
-       * @return The challengeIndex.
-       */
-      @java.lang.Override
-      public int getChallengeIndex() {
-        return challengeIndex_;
-      }
-      /**
-       * <code>uint32 challenge_index = 5;</code>
-       * @param value The challengeIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeIndex(int value) {
-        
-        challengeIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_index = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeIndex() {
-        
-        challengeIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int paramIndex_ ;
-      /**
-       * <code>uint32 param_index = 9;</code>
-       * @return The paramIndex.
-       */
-      @java.lang.Override
-      public int getParamIndex() {
-        return paramIndex_;
-      }
-      /**
-       * <code>uint32 param_index = 9;</code>
-       * @param value The paramIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParamIndex(int value) {
-        
-        paramIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 param_index = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParamIndex() {
-        
-        paramIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int value_ ;
       /**
-       * <code>uint32 value = 8;</code>
+       * <code>uint32 value = 2;</code>
        * @return The value.
        */
       @java.lang.Override
@@ -579,7 +507,7 @@ public final class ChallengeDataNotifyOuterClass {
         return value_;
       }
       /**
-       * <code>uint32 value = 8;</code>
+       * <code>uint32 value = 2;</code>
        * @param value The value to set.
        * @return This builder for chaining.
        */
@@ -590,7 +518,7 @@ public final class ChallengeDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 value = 8;</code>
+       * <code>uint32 value = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearValue() {
@@ -599,6 +527,68 @@ public final class ChallengeDataNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int paramIndex_ ;
+      /**
+       * <code>uint32 param_index = 7;</code>
+       * @return The paramIndex.
+       */
+      @java.lang.Override
+      public int getParamIndex() {
+        return paramIndex_;
+      }
+      /**
+       * <code>uint32 param_index = 7;</code>
+       * @param value The paramIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamIndex(int value) {
+        
+        paramIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 param_index = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamIndex() {
+        
+        paramIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int challengeIndex_ ;
+      /**
+       * <code>uint32 challenge_index = 13;</code>
+       * @return The challengeIndex.
+       */
+      @java.lang.Override
+      public int getChallengeIndex() {
+        return challengeIndex_;
+      }
+      /**
+       * <code>uint32 challenge_index = 13;</code>
+       * @param value The challengeIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeIndex(int value) {
+        
+        challengeIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_index = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeIndex() {
+        
+        challengeIndex_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class ChallengeDataNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031ChallengeDataNotify.proto\"R\n\023Challenge" +
-      "DataNotify\022\027\n\017challenge_index\030\005 \001(\r\022\023\n\013p" +
-      "aram_index\030\t \001(\r\022\r\n\005value\030\010 \001(\rB\033\n\031emu.g" +
+      "DataNotify\022\r\n\005value\030\002 \001(\r\022\023\n\013param_index" +
+      "\030\007 \001(\r\022\027\n\017challenge_index\030\r \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class ChallengeDataNotifyOuterClass {
     internal_static_ChallengeDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChallengeDataNotify_descriptor,
-        new java.lang.String[] { "ChallengeIndex", "ParamIndex", "Value", });
+        new java.lang.String[] { "Value", "ParamIndex", "ChallengeIndex", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeFinishTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeFinishTypeOuterClass.java
index 7d57dc0d0..e40907876 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChallengeFinishTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChallengeFinishTypeOuterClass.java
@@ -16,7 +16,7 @@ public final class ChallengeFinishTypeOuterClass {
   }
   /**
    * <pre>
-   * Obf: KKEOIBNCMCK
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code ChallengeFinishType}
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 9e7ea50ba..1d1d2598b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarReqOuterClass.java
@@ -19,44 +19,45 @@ public final class ChangeAvatarReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      * @return Whether the movePos field is set.
      */
     boolean hasMovePos();
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      * @return The movePos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos();
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder();
 
     /**
-     * <code>uint64 guid = 4;</code>
-     * @return The guid.
+     * <code>uint32 skill_id = 8;</code>
+     * @return The skillId.
      */
-    long getGuid();
+    int getSkillId();
 
     /**
-     * <code>bool is_move = 3;</code>
+     * <code>bool IMPLCNKLFED = 9;</code>
+     * @return The iMPLCNKLFED.
+     */
+    boolean getIMPLCNKLFED();
+
+    /**
+     * <code>bool is_move = 5;</code>
      * @return The isMove.
      */
     boolean getIsMove();
 
     /**
-     * <code>uint32 skill_id = 7;</code>
-     * @return The skillId.
+     * <code>uint64 guid = 10;</code>
+     * @return The guid.
      */
-    int getSkillId();
+    long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23169
-   * Obf: JENKJBLNBMD
-   * </pre>
-   *
    * Protobuf type {@code ChangeAvatarReq}
    */
   public static final class ChangeAvatarReq extends
@@ -101,22 +102,7 @@ public final class ChangeAvatarReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              isMove_ = input.readBool();
-              break;
-            }
-            case 32: {
-
-              guid_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 34: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (movePos_ != null) {
                 subBuilder = movePos_.toBuilder();
@@ -129,6 +115,26 @@ public final class ChangeAvatarReqOuterClass {
 
               break;
             }
+            case 40: {
+
+              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)) {
@@ -161,10 +167,10 @@ public final class ChangeAvatarReqOuterClass {
               emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq.class, emu.grasscutter.net.proto.ChangeAvatarReqOuterClass.ChangeAvatarReq.Builder.class);
     }
 
-    public static final int MOVE_POS_FIELD_NUMBER = 9;
+    public static final int MOVE_POS_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector movePos_;
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      * @return Whether the movePos field is set.
      */
     @java.lang.Override
@@ -172,7 +178,7 @@ public final class ChangeAvatarReqOuterClass {
       return movePos_ != null;
     }
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      * @return The movePos.
      */
     @java.lang.Override
@@ -180,28 +186,39 @@ public final class ChangeAvatarReqOuterClass {
       return movePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : movePos_;
     }
     /**
-     * <code>.Vector move_pos = 9;</code>
+     * <code>.Vector move_pos = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder() {
       return getMovePos();
     }
 
-    public static final int GUID_FIELD_NUMBER = 4;
-    private long guid_;
+    public static final int SKILL_ID_FIELD_NUMBER = 8;
+    private int skillId_;
     /**
-     * <code>uint64 guid = 4;</code>
-     * @return The guid.
+     * <code>uint32 skill_id = 8;</code>
+     * @return The skillId.
      */
     @java.lang.Override
-    public long getGuid() {
-      return guid_;
+    public int getSkillId() {
+      return skillId_;
     }
 
-    public static final int IS_MOVE_FIELD_NUMBER = 3;
+    public static final int IMPLCNKLFED_FIELD_NUMBER = 9;
+    private boolean iMPLCNKLFED_;
+    /**
+     * <code>bool IMPLCNKLFED = 9;</code>
+     * @return The iMPLCNKLFED.
+     */
+    @java.lang.Override
+    public boolean getIMPLCNKLFED() {
+      return iMPLCNKLFED_;
+    }
+
+    public static final int IS_MOVE_FIELD_NUMBER = 5;
     private boolean isMove_;
     /**
-     * <code>bool is_move = 3;</code>
+     * <code>bool is_move = 5;</code>
      * @return The isMove.
      */
     @java.lang.Override
@@ -209,15 +226,15 @@ public final class ChangeAvatarReqOuterClass {
       return isMove_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 7;
-    private int skillId_;
+    public static final int GUID_FIELD_NUMBER = 10;
+    private long guid_;
     /**
-     * <code>uint32 skill_id = 7;</code>
-     * @return The skillId.
+     * <code>uint64 guid = 10;</code>
+     * @return The guid.
      */
     @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
+    public long getGuid() {
+      return guid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -234,17 +251,20 @@ public final class ChangeAvatarReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isMove_ != false) {
-        output.writeBool(3, isMove_);
+      if (movePos_ != null) {
+        output.writeMessage(4, getMovePos());
       }
-      if (guid_ != 0L) {
-        output.writeUInt64(4, guid_);
+      if (isMove_ != false) {
+        output.writeBool(5, isMove_);
       }
       if (skillId_ != 0) {
-        output.writeUInt32(7, skillId_);
+        output.writeUInt32(8, skillId_);
       }
-      if (movePos_ != null) {
-        output.writeMessage(9, getMovePos());
+      if (iMPLCNKLFED_ != false) {
+        output.writeBool(9, iMPLCNKLFED_);
+      }
+      if (guid_ != 0L) {
+        output.writeUInt64(10, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -255,21 +275,25 @@ public final class ChangeAvatarReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (movePos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getMovePos());
+      }
       if (isMove_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isMove_);
-      }
-      if (guid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, guid_);
+          .computeBoolSize(5, isMove_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, skillId_);
+          .computeUInt32Size(8, skillId_);
       }
-      if (movePos_ != null) {
+      if (iMPLCNKLFED_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getMovePos());
+          .computeBoolSize(9, iMPLCNKLFED_);
+      }
+      if (guid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(10, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -291,12 +315,14 @@ public final class ChangeAvatarReqOuterClass {
         if (!getMovePos()
             .equals(other.getMovePos())) return false;
       }
-      if (getGuid()
-          != other.getGuid()) return false;
-      if (getIsMove()
-          != other.getIsMove()) return false;
       if (getSkillId()
           != other.getSkillId()) return false;
+      if (getIMPLCNKLFED()
+          != other.getIMPLCNKLFED()) return false;
+      if (getIsMove()
+          != other.getIsMove()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -312,14 +338,17 @@ public final class ChangeAvatarReqOuterClass {
         hash = (37 * hash) + MOVE_POS_FIELD_NUMBER;
         hash = (53 * hash) + getMovePos().hashCode();
       }
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getGuid());
+      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) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,11 +445,6 @@ public final class ChangeAvatarReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23169
-     * Obf: JENKJBLNBMD
-     * </pre>
-     *
      * Protobuf type {@code ChangeAvatarReq}
      */
     public static final class Builder extends
@@ -464,11 +488,13 @@ public final class ChangeAvatarReqOuterClass {
           movePos_ = null;
           movePosBuilder_ = null;
         }
-        guid_ = 0L;
+        skillId_ = 0;
+
+        iMPLCNKLFED_ = false;
 
         isMove_ = false;
 
-        skillId_ = 0;
+        guid_ = 0L;
 
         return this;
       }
@@ -501,9 +527,10 @@ public final class ChangeAvatarReqOuterClass {
         } else {
           result.movePos_ = movePosBuilder_.build();
         }
-        result.guid_ = guid_;
-        result.isMove_ = isMove_;
         result.skillId_ = skillId_;
+        result.iMPLCNKLFED_ = iMPLCNKLFED_;
+        result.isMove_ = isMove_;
+        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -555,14 +582,17 @@ public final class ChangeAvatarReqOuterClass {
         if (other.hasMovePos()) {
           mergeMovePos(other.getMovePos());
         }
-        if (other.getGuid() != 0L) {
-          setGuid(other.getGuid());
+        if (other.getSkillId() != 0) {
+          setSkillId(other.getSkillId());
+        }
+        if (other.getIMPLCNKLFED() != false) {
+          setIMPLCNKLFED(other.getIMPLCNKLFED());
         }
         if (other.getIsMove() != false) {
           setIsMove(other.getIsMove());
         }
-        if (other.getSkillId() != 0) {
-          setSkillId(other.getSkillId());
+        if (other.getGuid() != 0L) {
+          setGuid(other.getGuid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -597,14 +627,14 @@ public final class ChangeAvatarReqOuterClass {
       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 = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        * @return Whether the movePos field is set.
        */
       public boolean hasMovePos() {
         return movePosBuilder_ != null || movePos_ != null;
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        * @return The movePos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getMovePos() {
@@ -615,7 +645,7 @@ public final class ChangeAvatarReqOuterClass {
         }
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public Builder setMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (movePosBuilder_ == null) {
@@ -631,7 +661,7 @@ public final class ChangeAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public Builder setMovePos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -645,7 +675,7 @@ public final class ChangeAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public Builder mergeMovePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (movePosBuilder_ == null) {
@@ -663,7 +693,7 @@ public final class ChangeAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public Builder clearMovePos() {
         if (movePosBuilder_ == null) {
@@ -677,7 +707,7 @@ public final class ChangeAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMovePosBuilder() {
         
@@ -685,7 +715,7 @@ public final class ChangeAvatarReqOuterClass {
         return getMovePosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMovePosOrBuilder() {
         if (movePosBuilder_ != null) {
@@ -696,7 +726,7 @@ public final class ChangeAvatarReqOuterClass {
         }
       }
       /**
-       * <code>.Vector move_pos = 9;</code>
+       * <code>.Vector move_pos = 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> 
@@ -712,71 +742,9 @@ public final class ChangeAvatarReqOuterClass {
         return movePosBuilder_;
       }
 
-      private long guid_ ;
-      /**
-       * <code>uint64 guid = 4;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public long getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint64 guid = 4;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(long value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 guid = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private boolean isMove_ ;
-      /**
-       * <code>bool is_move = 3;</code>
-       * @return The isMove.
-       */
-      @java.lang.Override
-      public boolean getIsMove() {
-        return isMove_;
-      }
-      /**
-       * <code>bool is_move = 3;</code>
-       * @param value The isMove to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsMove(boolean value) {
-        
-        isMove_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_move = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsMove() {
-        
-        isMove_ = false;
-        onChanged();
-        return this;
-      }
-
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -784,7 +752,7 @@ public final class ChangeAvatarReqOuterClass {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -795,7 +763,7 @@ public final class ChangeAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 7;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -804,6 +772,99 @@ public final class ChangeAvatarReqOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean iMPLCNKLFED_ ;
+      /**
+       * <code>bool IMPLCNKLFED = 9;</code>
+       * @return The iMPLCNKLFED.
+       */
+      @java.lang.Override
+      public boolean getIMPLCNKLFED() {
+        return iMPLCNKLFED_;
+      }
+      /**
+       * <code>bool IMPLCNKLFED = 9;</code>
+       * @param value The iMPLCNKLFED to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIMPLCNKLFED(boolean value) {
+        
+        iMPLCNKLFED_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool IMPLCNKLFED = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIMPLCNKLFED() {
+        
+        iMPLCNKLFED_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isMove_ ;
+      /**
+       * <code>bool is_move = 5;</code>
+       * @return The isMove.
+       */
+      @java.lang.Override
+      public boolean getIsMove() {
+        return isMove_;
+      }
+      /**
+       * <code>bool is_move = 5;</code>
+       * @param value The isMove to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsMove(boolean value) {
+        
+        isMove_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_move = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsMove() {
+        
+        isMove_ = false;
+        onChanged();
+        return this;
+      }
+
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 10;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 10;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -871,11 +932,11 @@ public final class ChangeAvatarReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025ChangeAvatarReq.proto\032\014Vector.proto\"]\n" +
-      "\017ChangeAvatarReq\022\031\n\010move_pos\030\t \001(\0132\007.Vec" +
-      "tor\022\014\n\004guid\030\004 \001(\004\022\017\n\007is_move\030\003 \001(\010\022\020\n\010sk" +
-      "ill_id\030\007 \001(\rB\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\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" +
+      ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -887,7 +948,7 @@ public final class ChangeAvatarReqOuterClass {
     internal_static_ChangeAvatarReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeAvatarReq_descriptor,
-        new java.lang.String[] { "MovePos", "Guid", "IsMove", "SkillId", });
+        new java.lang.String[] { "MovePos", "SkillId", "IMPLCNKLFED", "IsMove", "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 c1072f5b8..007f46aa7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeAvatarRspOuterClass.java
@@ -19,29 +19,24 @@ public final class ChangeAvatarRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 cur_guid = 2;</code>
-     * @return The curGuid.
-     */
-    long getCurGuid();
-
-    /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 skill_id = 9;</code>
+     * <code>uint64 cur_guid = 6;</code>
+     * @return The curGuid.
+     */
+    long getCurGuid();
+
+    /**
+     * <code>uint32 skill_id = 8;</code>
      * @return The skillId.
      */
     int getSkillId();
   }
   /**
-   * <pre>
-   * CmdId: 22163
-   * Obf: DPMLHHKHGFF
-   * </pre>
-   *
    * Protobuf type {@code ChangeAvatarRsp}
    */
   public static final class ChangeAvatarRsp extends
@@ -86,17 +81,17 @@ public final class ChangeAvatarRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              curGuid_ = input.readUInt64();
-              break;
-            }
-            case 32: {
+            case 24: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 72: {
+            case 48: {
+
+              curGuid_ = input.readUInt64();
+              break;
+            }
+            case 64: {
 
               skillId_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class ChangeAvatarRspOuterClass {
               emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.class, emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.Builder.class);
     }
 
-    public static final int CUR_GUID_FIELD_NUMBER = 2;
-    private long curGuid_;
-    /**
-     * <code>uint64 cur_guid = 2;</code>
-     * @return The curGuid.
-     */
-    @java.lang.Override
-    public long getCurGuid() {
-      return curGuid_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,10 +139,21 @@ public final class ChangeAvatarRspOuterClass {
       return retcode_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 9;
+    public static final int CUR_GUID_FIELD_NUMBER = 6;
+    private long curGuid_;
+    /**
+     * <code>uint64 cur_guid = 6;</code>
+     * @return The curGuid.
+     */
+    @java.lang.Override
+    public long getCurGuid() {
+      return curGuid_;
+    }
+
+    public static final int SKILL_ID_FIELD_NUMBER = 8;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 9;</code>
+     * <code>uint32 skill_id = 8;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class ChangeAvatarRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curGuid_ != 0L) {
-        output.writeUInt64(2, curGuid_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      if (curGuid_ != 0L) {
+        output.writeUInt64(6, curGuid_);
       }
       if (skillId_ != 0) {
-        output.writeUInt32(9, skillId_);
+        output.writeUInt32(8, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class ChangeAvatarRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, curGuid_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(3, retcode_);
+      }
+      if (curGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(6, curGuid_);
       }
       if (skillId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, skillId_);
+          .computeUInt32Size(8, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class ChangeAvatarRspOuterClass {
       }
       emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp other = (emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp) obj;
 
-      if (getCurGuid()
-          != other.getCurGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCurGuid()
+          != other.getCurGuid()) return false;
       if (getSkillId()
           != other.getSkillId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,11 +237,11 @@ public final class ChangeAvatarRspOuterClass {
       }
       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,11 +340,6 @@ public final class ChangeAvatarRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22163
-     * Obf: DPMLHHKHGFF
-     * </pre>
-     *
      * Protobuf type {@code ChangeAvatarRsp}
      */
     public static final class Builder extends
@@ -387,10 +377,10 @@ public final class ChangeAvatarRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curGuid_ = 0L;
-
         retcode_ = 0;
 
+        curGuid_ = 0L;
+
         skillId_ = 0;
 
         return this;
@@ -419,8 +409,8 @@ public final class ChangeAvatarRspOuterClass {
       @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.curGuid_ = curGuid_;
         result.retcode_ = retcode_;
+        result.curGuid_ = curGuid_;
         result.skillId_ = skillId_;
         onBuilt();
         return result;
@@ -470,12 +460,12 @@ public final class ChangeAvatarRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp other) {
         if (other == emu.grasscutter.net.proto.ChangeAvatarRspOuterClass.ChangeAvatarRsp.getDefaultInstance()) return this;
-        if (other.getCurGuid() != 0L) {
-          setCurGuid(other.getCurGuid());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCurGuid() != 0L) {
+          setCurGuid(other.getCurGuid());
+        }
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
@@ -508,40 +498,9 @@ public final class ChangeAvatarRspOuterClass {
         return this;
       }
 
-      private long curGuid_ ;
-      /**
-       * <code>uint64 cur_guid = 2;</code>
-       * @return The curGuid.
-       */
-      @java.lang.Override
-      public long getCurGuid() {
-        return curGuid_;
-      }
-      /**
-       * <code>uint64 cur_guid = 2;</code>
-       * @param value The curGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurGuid(long value) {
-        
-        curGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 cur_guid = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurGuid() {
-        
-        curGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -549,7 +508,7 @@ public final class ChangeAvatarRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -560,7 +519,7 @@ public final class ChangeAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -570,9 +529,40 @@ public final class ChangeAvatarRspOuterClass {
         return this;
       }
 
+      private long curGuid_ ;
+      /**
+       * <code>uint64 cur_guid = 6;</code>
+       * @return The curGuid.
+       */
+      @java.lang.Override
+      public long getCurGuid() {
+        return curGuid_;
+      }
+      /**
+       * <code>uint64 cur_guid = 6;</code>
+       * @param value The curGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurGuid(long value) {
+        
+        curGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 cur_guid = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurGuid() {
+        
+        curGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 9;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class ChangeAvatarRspOuterClass {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 9;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class ChangeAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 9;</code>
+       * <code>uint32 skill_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -668,8 +658,8 @@ public final class ChangeAvatarRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025ChangeAvatarRsp.proto\"F\n\017ChangeAvatarR" +
-      "sp\022\020\n\010cur_guid\030\002 \001(\004\022\017\n\007retcode\030\004 \001(\005\022\020\n" +
-      "\010skill_id\030\t \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "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" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class ChangeAvatarRspOuterClass {
     internal_static_ChangeAvatarRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeAvatarRsp_descriptor,
-        new java.lang.String[] { "CurGuid", "Retcode", "SkillId", });
+        new java.lang.String[] { "Retcode", "CurGuid", "SkillId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeEnergyReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeEnergyReasonOuterClass.java
index 75fefc62d..2590c82e6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeEnergyReasonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeEnergyReasonOuterClass.java
@@ -15,10 +15,6 @@ public final class ChangeEnergyReasonOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OHNCBLIFLLB
-   * </pre>
-   *
    * Protobuf enum {@code ChangeEnergyReason}
    */
   public enum ChangeEnergyReason
@@ -31,6 +27,26 @@ public final class ChangeEnergyReasonOuterClass {
      * <code>CHANGE_ENERGY_REASON_SKILL_START = 1;</code>
      */
     CHANGE_ENERGY_REASON_SKILL_START(1),
+    /**
+     * <code>CHANGE_ENERGY_REASON_BALL = 2;</code>
+     */
+    CHANGE_ENERGY_REASON_BALL(2),
+    /**
+     * <code>CHANGE_ENERGY_REASON_QUEST = 3;</code>
+     */
+    CHANGE_ENERGY_REASON_QUEST(3),
+    /**
+     * <code>CHANGE_ENERGY_REASON_ABILITY = 4;</code>
+     */
+    CHANGE_ENERGY_REASON_ABILITY(4),
+    /**
+     * <code>CHANGE_ENERGY_REASON_DIE = 5;</code>
+     */
+    CHANGE_ENERGY_REASON_DIE(5),
+    /**
+     * <code>CHANGE_ENERGY_REASON_SKILL_DEPOT = 6;</code>
+     */
+    CHANGE_ENERGY_REASON_SKILL_DEPOT(6),
     UNRECOGNIZED(-1),
     ;
 
@@ -42,6 +58,26 @@ public final class ChangeEnergyReasonOuterClass {
      * <code>CHANGE_ENERGY_REASON_SKILL_START = 1;</code>
      */
     public static final int CHANGE_ENERGY_REASON_SKILL_START_VALUE = 1;
+    /**
+     * <code>CHANGE_ENERGY_REASON_BALL = 2;</code>
+     */
+    public static final int CHANGE_ENERGY_REASON_BALL_VALUE = 2;
+    /**
+     * <code>CHANGE_ENERGY_REASON_QUEST = 3;</code>
+     */
+    public static final int CHANGE_ENERGY_REASON_QUEST_VALUE = 3;
+    /**
+     * <code>CHANGE_ENERGY_REASON_ABILITY = 4;</code>
+     */
+    public static final int CHANGE_ENERGY_REASON_ABILITY_VALUE = 4;
+    /**
+     * <code>CHANGE_ENERGY_REASON_DIE = 5;</code>
+     */
+    public static final int CHANGE_ENERGY_REASON_DIE_VALUE = 5;
+    /**
+     * <code>CHANGE_ENERGY_REASON_SKILL_DEPOT = 6;</code>
+     */
+    public static final int CHANGE_ENERGY_REASON_SKILL_DEPOT_VALUE = 6;
 
 
     public final int getNumber() {
@@ -70,6 +106,11 @@ public final class ChangeEnergyReasonOuterClass {
       switch (value) {
         case 0: return CHANGE_ENERGY_REASON_NONE;
         case 1: return CHANGE_ENERGY_REASON_SKILL_START;
+        case 2: return CHANGE_ENERGY_REASON_BALL;
+        case 3: return CHANGE_ENERGY_REASON_QUEST;
+        case 4: return CHANGE_ENERGY_REASON_ABILITY;
+        case 5: return CHANGE_ENERGY_REASON_DIE;
+        case 6: return CHANGE_ENERGY_REASON_SKILL_DEPOT;
         default: return null;
       }
     }
@@ -135,10 +176,14 @@ public final class ChangeEnergyReasonOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030ChangeEnergyReason.proto*Y\n\022ChangeEner" +
-      "gyReason\022\035\n\031CHANGE_ENERGY_REASON_NONE\020\000\022" +
-      "$\n CHANGE_ENERGY_REASON_SKILL_START\020\001B\033\n" +
-      "\031emu.grasscutter.net.protob\006proto3"
+      "\n\030ChangeEnergyReason.proto*\376\001\n\022ChangeEne" +
+      "rgyReason\022\035\n\031CHANGE_ENERGY_REASON_NONE\020\000" +
+      "\022$\n CHANGE_ENERGY_REASON_SKILL_START\020\001\022\035" +
+      "\n\031CHANGE_ENERGY_REASON_BALL\020\002\022\036\n\032CHANGE_" +
+      "ENERGY_REASON_QUEST\020\003\022 \n\034CHANGE_ENERGY_R" +
+      "EASON_ABILITY\020\004\022\034\n\030CHANGE_ENERGY_REASON_" +
+      "DIE\020\005\022$\n CHANGE_ENERGY_REASON_SKILL_DEPO" +
+      "T\020\006B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java
new file mode 100644
index 000000000..11aa3ef1d
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpDebtsOuterClass.java
@@ -0,0 +1,185 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ChangeHpDebts.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ChangeHpDebtsOuterClass {
+  private ChangeHpDebtsOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code ChangeHpDebts}
+   */
+  public enum ChangeHpDebts
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>CHANGE_HP_DEBTS_NONE = 0;</code>
+     */
+    CHANGE_HP_DEBTS_NONE(0),
+    /**
+     * <code>CHANGE_HP_DEBTS_PAY = 1;</code>
+     */
+    CHANGE_HP_DEBTS_PAY(1),
+    /**
+     * <code>CHANGE_HP_DEBTS_PAYFINISH = 2;</code>
+     */
+    CHANGE_HP_DEBTS_PAYFINISH(2),
+    /**
+     * <code>CHANGE_HP_DEBTS_CLEAR = 21;</code>
+     */
+    CHANGE_HP_DEBTS_CLEAR(21),
+    /**
+     * <code>CHANGE_HP_DEBTS_REDUCE_ABILITY = 41;</code>
+     */
+    CHANGE_HP_DEBTS_REDUCE_ABILITY(41),
+    /**
+     * <code>CHANGE_HP_DEBTS_ADDABILITY = 51;</code>
+     */
+    CHANGE_HP_DEBTS_ADDABILITY(51),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>CHANGE_HP_DEBTS_NONE = 0;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_NONE_VALUE = 0;
+    /**
+     * <code>CHANGE_HP_DEBTS_PAY = 1;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_PAY_VALUE = 1;
+    /**
+     * <code>CHANGE_HP_DEBTS_PAYFINISH = 2;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_PAYFINISH_VALUE = 2;
+    /**
+     * <code>CHANGE_HP_DEBTS_CLEAR = 21;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_CLEAR_VALUE = 21;
+    /**
+     * <code>CHANGE_HP_DEBTS_REDUCE_ABILITY = 41;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_REDUCE_ABILITY_VALUE = 41;
+    /**
+     * <code>CHANGE_HP_DEBTS_ADDABILITY = 51;</code>
+     */
+    public static final int CHANGE_HP_DEBTS_ADDABILITY_VALUE = 51;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ChangeHpDebts valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ChangeHpDebts forNumber(int value) {
+      switch (value) {
+        case 0: return CHANGE_HP_DEBTS_NONE;
+        case 1: return CHANGE_HP_DEBTS_PAY;
+        case 2: return CHANGE_HP_DEBTS_PAYFINISH;
+        case 21: return CHANGE_HP_DEBTS_CLEAR;
+        case 41: return CHANGE_HP_DEBTS_REDUCE_ABILITY;
+        case 51: return CHANGE_HP_DEBTS_ADDABILITY;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ChangeHpDebts>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ChangeHpDebts> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ChangeHpDebts>() {
+            public ChangeHpDebts findValueByNumber(int number) {
+              return ChangeHpDebts.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ChangeHpDebts[] VALUES = values();
+
+    public static ChangeHpDebts valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ChangeHpDebts(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:ChangeHpDebts)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\023ChangeHpDebts.proto*\300\001\n\rChangeHpDebts\022" +
+      "\030\n\024CHANGE_HP_DEBTS_NONE\020\000\022\027\n\023CHANGE_HP_D" +
+      "EBTS_PAY\020\001\022\035\n\031CHANGE_HP_DEBTS_PAYFINISH\020" +
+      "\002\022\031\n\025CHANGE_HP_DEBTS_CLEAR\020\025\022\"\n\036CHANGE_H" +
+      "P_DEBTS_REDUCE_ABILITY\020)\022\036\n\032CHANGE_HP_DE" +
+      "BTS_ADDABILITY\0203B\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java
index 969a7b09a..bf5d93d88 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeHpReasonOuterClass.java
@@ -15,10 +15,6 @@ public final class ChangeHpReasonOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: HANDEHKHMKN
-   * </pre>
-   *
    * Protobuf enum {@code ChangeHpReason}
    */
   public enum ChangeHpReason
@@ -151,6 +147,10 @@ public final class ChangeHpReasonOuterClass {
      * <code>CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109;</code>
      */
     CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING(109),
+    /**
+     * <code>CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5 = 110;</code>
+     */
+    CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5(110),
     UNRECOGNIZED(-1),
     ;
 
@@ -282,6 +282,10 @@ public final class ChangeHpReasonOuterClass {
      * <code>CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING = 109;</code>
      */
     public static final int CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING_VALUE = 109;
+    /**
+     * <code>CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5 = 110;</code>
+     */
+    public static final int CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5_VALUE = 110;
 
 
     public final int getNumber() {
@@ -340,6 +344,7 @@ public final class ChangeHpReasonOuterClass {
         case 107: return CHANGE_HP_REASON_ADD_GM;
         case 108: return CHANGE_HP_REASON_ADD_TRIAL_AVATAR_ACTIVITY;
         case 109: return CHANGE_HP_REASON_ADD_ROGUELIKE_SPRING;
+        case 110: return CHANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5;
         default: return null;
       }
     }
@@ -405,7 +410,7 @@ public final class ChangeHpReasonOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024ChangeHpReason.proto*\352\010\n\016ChangeHpReaso" +
+      "\n\024ChangeHpReason.proto*\231\t\n\016ChangeHpReaso" +
       "n\022\031\n\025CHANGE_HP_REASON_NONE\020\000\022\037\n\033CHANGE_H" +
       "P_REASON_SUB_AVATAR\020\001\022 \n\034CHANGE_HP_REASO" +
       "N_SUB_MONSTER\020\002\022\035\n\031CHANGE_HP_REASON_SUB_" +
@@ -433,8 +438,9 @@ public final class ChangeHpReasonOuterClass {
       "\n\037CHANGE_HP_REASON_ADD_BACKGROUND\020j\022\033\n\027C" +
       "HANGE_HP_REASON_ADD_GM\020k\022.\n*CHANGE_HP_RE" +
       "ASON_ADD_TRIAL_AVATAR_ACTIVITY\020l\022)\n%CHAN" +
-      "GE_HP_REASON_ADD_ROGUELIKE_SPRING\020mB\033\n\031e" +
-      "mu.grasscutter.net.protob\006proto3"
+      "GE_HP_REASON_ADD_ROGUELIKE_SPRING\020m\022-\n)C" +
+      "HANGE_HP_REASON_ADD_EFFIGY_CHALLENGE_V_5" +
+      "\020nB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMailStarNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMailStarNotifyOuterClass.java
index 47315a50d..9cc03835e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMailStarNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMailStarNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class ChangeMailStarNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_star = 13;</code>
-     * @return The isStar.
-     */
-    boolean getIsStar();
-
-    /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
+
+    /**
+     * <code>bool is_star = 9;</code>
+     * @return The isStar.
+     */
+    boolean getIsStar();
   }
   /**
-   * <pre>
-   * CmdId: 2285
-   * Obf: BNOGMFJDHHL
-   * </pre>
-   *
    * Protobuf type {@code ChangeMailStarNotify}
    */
   public static final class ChangeMailStarNotify extends
@@ -93,12 +88,12 @@ public final class ChangeMailStarNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 104: {
+            case 72: {
 
               isStar_ = input.readBool();
               break;
             }
-            case 120: {
+            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +101,7 @@ public final class ChangeMailStarNotifyOuterClass {
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -154,21 +149,10 @@ public final class ChangeMailStarNotifyOuterClass {
               emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.class, emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.Builder.class);
     }
 
-    public static final int IS_STAR_FIELD_NUMBER = 13;
-    private boolean isStar_;
-    /**
-     * <code>bool is_star = 13;</code>
-     * @return The isStar.
-     */
-    @java.lang.Override
-    public boolean getIsStar() {
-      return isStar_;
-    }
-
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 15;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -177,14 +161,14 @@ public final class ChangeMailStarNotifyOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 15;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -193,6 +177,17 @@ public final class ChangeMailStarNotifyOuterClass {
     }
     private int mailIdListMemoizedSerializedSize = -1;
 
+    public static final int IS_STAR_FIELD_NUMBER = 9;
+    private boolean isStar_;
+    /**
+     * <code>bool is_star = 9;</code>
+     * @return The isStar.
+     */
+    @java.lang.Override
+    public boolean getIsStar() {
+      return isStar_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -209,10 +204,10 @@ public final class ChangeMailStarNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (isStar_ != false) {
-        output.writeBool(13, isStar_);
+        output.writeBool(9, isStar_);
       }
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
@@ -229,7 +224,7 @@ public final class ChangeMailStarNotifyOuterClass {
       size = 0;
       if (isStar_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isStar_);
+          .computeBoolSize(9, isStar_);
       }
       {
         int dataSize = 0;
@@ -260,10 +255,10 @@ public final class ChangeMailStarNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify other = (emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify) obj;
 
-      if (getIsStar()
-          != other.getIsStar()) return false;
       if (!getMailIdListList()
           .equals(other.getMailIdListList())) return false;
+      if (getIsStar()
+          != other.getIsStar()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,13 +270,13 @@ public final class ChangeMailStarNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_STAR_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsStar());
       if (getMailIdListCount() > 0) {
         hash = (37 * hash) + MAIL_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMailIdListList().hashCode();
       }
+      hash = (37 * hash) + IS_STAR_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsStar());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class ChangeMailStarNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2285
-     * Obf: BNOGMFJDHHL
-     * </pre>
-     *
      * Protobuf type {@code ChangeMailStarNotify}
      */
     public static final class Builder extends
@@ -420,10 +410,10 @@ public final class ChangeMailStarNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isStar_ = false;
-
         mailIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        isStar_ = false;
+
         return this;
       }
 
@@ -451,12 +441,12 @@ public final class ChangeMailStarNotifyOuterClass {
       public emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify buildPartial() {
         emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify result = new emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify(this);
         int from_bitField0_ = bitField0_;
-        result.isStar_ = isStar_;
         if (((bitField0_ & 0x00000001) != 0)) {
           mailIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.mailIdList_ = mailIdList_;
+        result.isStar_ = isStar_;
         onBuilt();
         return result;
       }
@@ -505,9 +495,6 @@ public final class ChangeMailStarNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify other) {
         if (other == emu.grasscutter.net.proto.ChangeMailStarNotifyOuterClass.ChangeMailStarNotify.getDefaultInstance()) return this;
-        if (other.getIsStar() != false) {
-          setIsStar(other.getIsStar());
-        }
         if (!other.mailIdList_.isEmpty()) {
           if (mailIdList_.isEmpty()) {
             mailIdList_ = other.mailIdList_;
@@ -518,6 +505,9 @@ public final class ChangeMailStarNotifyOuterClass {
           }
           onChanged();
         }
+        if (other.getIsStar() != false) {
+          setIsStar(other.getIsStar());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -548,37 +538,6 @@ public final class ChangeMailStarNotifyOuterClass {
       }
       private int bitField0_;
 
-      private boolean isStar_ ;
-      /**
-       * <code>bool is_star = 13;</code>
-       * @return The isStar.
-       */
-      @java.lang.Override
-      public boolean getIsStar() {
-        return isStar_;
-      }
-      /**
-       * <code>bool is_star = 13;</code>
-       * @param value The isStar to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsStar(boolean value) {
-        
-        isStar_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_star = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsStar() {
-        
-        isStar_ = false;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList mailIdList_ = emptyIntList();
       private void ensureMailIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -587,7 +546,7 @@ public final class ChangeMailStarNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return A list containing the mailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -596,14 +555,14 @@ public final class ChangeMailStarNotifyOuterClass {
                  java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return The count of mailIdList.
        */
       public int getMailIdListCount() {
         return mailIdList_.size();
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param index The index of the element to return.
        * @return The mailIdList at the given index.
        */
@@ -611,7 +570,7 @@ public final class ChangeMailStarNotifyOuterClass {
         return mailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The mailIdList to set.
        * @return This builder for chaining.
@@ -624,7 +583,7 @@ public final class ChangeMailStarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param value The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -635,7 +594,7 @@ public final class ChangeMailStarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param values The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -648,7 +607,7 @@ public final class ChangeMailStarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 15;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailIdList() {
@@ -657,6 +616,37 @@ public final class ChangeMailStarNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isStar_ ;
+      /**
+       * <code>bool is_star = 9;</code>
+       * @return The isStar.
+       */
+      @java.lang.Override
+      public boolean getIsStar() {
+        return isStar_;
+      }
+      /**
+       * <code>bool is_star = 9;</code>
+       * @param value The isStar to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsStar(boolean value) {
+        
+        isStar_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_star = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsStar() {
+        
+        isStar_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -725,8 +715,8 @@ public final class ChangeMailStarNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ChangeMailStarNotify.proto\"=\n\024ChangeMa" +
-      "ilStarNotify\022\017\n\007is_star\030\r \001(\010\022\024\n\014mail_id" +
-      "_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.proto" +
+      "ilStarNotify\022\024\n\014mail_id_list\030\016 \003(\r\022\017\n\007is" +
+      "_star\030\t \001(\010B\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -738,7 +728,7 @@ public final class ChangeMailStarNotifyOuterClass {
     internal_static_ChangeMailStarNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeMailStarNotify_descriptor,
-        new java.lang.String[] { "IsStar", "MailIdList", });
+        new java.lang.String[] { "MailIdList", "IsStar", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java
index 39c2477a8..1adb7ad87 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarReqOuterClass.java
@@ -19,32 +19,31 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 cur_avatar_guid = 2;</code>
-     * @return The curAvatarGuid.
-     */
-    long getCurAvatarGuid();
-
-    /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @return A list containing the avatarGuidList.
      */
     java.util.List<java.lang.Long> getAvatarGuidListList();
     /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @return The count of avatarGuidList.
      */
     int getAvatarGuidListCount();
     /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
     long getAvatarGuidList(int index);
+
+    /**
+     * <code>uint64 cur_avatar_guid = 4;</code>
+     * @return The curAvatarGuid.
+     */
+    long getCurAvatarGuid();
   }
   /**
    * <pre>
-   * CmdId: 29260
-   * Obf: GIEGGDAJFBE
+   * CmdId: 28747
    * </pre>
    *
    * Protobuf type {@code ChangeMpTeamAvatarReq}
@@ -93,12 +92,12 @@ public final class ChangeMpTeamAvatarReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
               curAvatarGuid_ = input.readUInt64();
               break;
             }
-            case 96: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +105,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
               avatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 98: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -154,21 +153,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
               emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.class, emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.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 AVATAR_GUID_LIST_FIELD_NUMBER = 12;
+    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.LongList avatarGuidList_;
     /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @return A list containing the avatarGuidList.
      */
     @java.lang.Override
@@ -177,14 +165,14 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       return avatarGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @return The count of avatarGuidList.
      */
     public int getAvatarGuidListCount() {
       return avatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
@@ -193,6 +181,17 @@ public final class ChangeMpTeamAvatarReqOuterClass {
     }
     private int avatarGuidListMemoizedSerializedSize = -1;
 
+    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 4;
+    private long curAvatarGuid_;
+    /**
+     * <code>uint64 cur_avatar_guid = 4;</code>
+     * @return The curAvatarGuid.
+     */
+    @java.lang.Override
+    public long getCurAvatarGuid() {
+      return curAvatarGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -209,10 +208,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(2, curAvatarGuid_);
+        output.writeUInt64(4, curAvatarGuid_);
       }
       if (getAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarGuidList_.size(); i++) {
@@ -229,7 +228,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       size = 0;
       if (curAvatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, curAvatarGuid_);
+          .computeUInt64Size(4, curAvatarGuid_);
       }
       {
         int dataSize = 0;
@@ -260,10 +259,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       }
       emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq other = (emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq) obj;
 
-      if (getCurAvatarGuid()
-          != other.getCurAvatarGuid()) return false;
       if (!getAvatarGuidListList()
           .equals(other.getAvatarGuidListList())) return false;
+      if (getCurAvatarGuid()
+          != other.getCurAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,13 +274,13 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getCurAvatarGuid());
       if (getAvatarGuidListCount() > 0) {
         hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarGuidListList().hashCode();
       }
+      hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getCurAvatarGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,8 +378,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 29260
-     * Obf: GIEGGDAJFBE
+     * CmdId: 28747
      * </pre>
      *
      * Protobuf type {@code ChangeMpTeamAvatarReq}
@@ -420,10 +418,10 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curAvatarGuid_ = 0L;
-
         avatarGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        curAvatarGuid_ = 0L;
+
         return this;
       }
 
@@ -451,12 +449,12 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       public emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq buildPartial() {
         emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq result = new emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq(this);
         int from_bitField0_ = bitField0_;
-        result.curAvatarGuid_ = curAvatarGuid_;
         if (((bitField0_ & 0x00000001) != 0)) {
           avatarGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.avatarGuidList_ = avatarGuidList_;
+        result.curAvatarGuid_ = curAvatarGuid_;
         onBuilt();
         return result;
       }
@@ -505,9 +503,6 @@ public final class ChangeMpTeamAvatarReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq other) {
         if (other == emu.grasscutter.net.proto.ChangeMpTeamAvatarReqOuterClass.ChangeMpTeamAvatarReq.getDefaultInstance()) return this;
-        if (other.getCurAvatarGuid() != 0L) {
-          setCurAvatarGuid(other.getCurAvatarGuid());
-        }
         if (!other.avatarGuidList_.isEmpty()) {
           if (avatarGuidList_.isEmpty()) {
             avatarGuidList_ = other.avatarGuidList_;
@@ -518,6 +513,9 @@ public final class ChangeMpTeamAvatarReqOuterClass {
           }
           onChanged();
         }
+        if (other.getCurAvatarGuid() != 0L) {
+          setCurAvatarGuid(other.getCurAvatarGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -548,37 +546,6 @@ public final class ChangeMpTeamAvatarReqOuterClass {
       }
       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 com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
       private void ensureAvatarGuidListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -587,7 +554,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return A list containing the avatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -596,14 +563,14 @@ public final class ChangeMpTeamAvatarReqOuterClass {
                  java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return The count of avatarGuidList.
        */
       public int getAvatarGuidListCount() {
         return avatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param index The index of the element to return.
        * @return The avatarGuidList at the given index.
        */
@@ -611,7 +578,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
         return avatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The avatarGuidList to set.
        * @return This builder for chaining.
@@ -624,7 +591,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param value The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -635,7 +602,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param values The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -648,7 +615,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuidList() {
@@ -657,6 +624,37 @@ public final class ChangeMpTeamAvatarReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long curAvatarGuid_ ;
+      /**
+       * <code>uint64 cur_avatar_guid = 4;</code>
+       * @return The curAvatarGuid.
+       */
+      @java.lang.Override
+      public long getCurAvatarGuid() {
+        return curAvatarGuid_;
+      }
+      /**
+       * <code>uint64 cur_avatar_guid = 4;</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 = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarGuid() {
+        
+        curAvatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -725,8 +723,8 @@ public final class ChangeMpTeamAvatarReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033ChangeMpTeamAvatarReq.proto\"J\n\025ChangeM" +
-      "pTeamAvatarReq\022\027\n\017cur_avatar_guid\030\002 \001(\004\022" +
-      "\030\n\020avatar_guid_list\030\014 \003(\004B\033\n\031emu.grasscu" +
+      "pTeamAvatarReq\022\030\n\020avatar_guid_list\030\013 \003(\004" +
+      "\022\027\n\017cur_avatar_guid\030\004 \001(\004B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -738,7 +736,7 @@ public final class ChangeMpTeamAvatarReqOuterClass {
     internal_static_ChangeMpTeamAvatarReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeMpTeamAvatarReq_descriptor,
-        new java.lang.String[] { "CurAvatarGuid", "AvatarGuidList", });
+        new java.lang.String[] { "AvatarGuidList", "CurAvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java
index 99b1ec027..fa9fc3851 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeMpTeamAvatarRspOuterClass.java
@@ -19,38 +19,37 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
-     * @return A list containing the avatarGuidList.
-     */
-    java.util.List<java.lang.Long> getAvatarGuidListList();
-    /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
-     * @return The count of avatarGuidList.
-     */
-    int getAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The avatarGuidList at the given index.
-     */
-    long getAvatarGuidList(int index);
-
-    /**
-     * <code>uint64 cur_avatar_guid = 13;</code>
+     * <code>uint64 cur_avatar_guid = 2;</code>
      * @return The curAvatarGuid.
      */
     long getCurAvatarGuid();
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
+     * @return A list containing the avatarGuidList.
+     */
+    java.util.List<java.lang.Long> getAvatarGuidListList();
+    /**
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
+     * @return The count of avatarGuidList.
+     */
+    int getAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The avatarGuidList at the given index.
+     */
+    long getAvatarGuidList(int index);
   }
   /**
    * <pre>
-   * CmdId: 352
-   * Obf: LFHCFAFFODE
+   * CmdId: 28252
    * </pre>
    *
    * Protobuf type {@code ChangeMpTeamAvatarRsp}
@@ -99,12 +98,17 @@ public final class ChangeMpTeamAvatarRspOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 16: {
+
+              curAvatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 120: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -112,7 +116,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
               avatarGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 82: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -125,11 +129,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 104: {
-
-              curAvatarGuid_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +164,32 @@ public final class ChangeMpTeamAvatarRspOuterClass {
               emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.class, emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.Builder.class);
     }
 
-    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 10;
+    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 RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.LongList avatarGuidList_;
     /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
      * @return A list containing the avatarGuidList.
      */
     @java.lang.Override
@@ -177,14 +198,14 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       return avatarGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
      * @return The count of avatarGuidList.
      */
     public int getAvatarGuidListCount() {
       return avatarGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_guid_list = 10;</code>
+     * <code>repeated uint64 avatar_guid_list = 15;</code>
      * @param index The index of the element to return.
      * @return The avatarGuidList at the given index.
      */
@@ -193,28 +214,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
     }
     private int avatarGuidListMemoizedSerializedSize = -1;
 
-    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 13;
-    private long curAvatarGuid_;
-    /**
-     * <code>uint64 cur_avatar_guid = 13;</code>
-     * @return The curAvatarGuid.
-     */
-    @java.lang.Override
-    public long getCurAvatarGuid() {
-      return curAvatarGuid_;
-    }
-
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -230,19 +229,19 @@ public final class ChangeMpTeamAvatarRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (curAvatarGuid_ != 0L) {
+        output.writeUInt64(2, curAvatarGuid_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(13, retcode_);
       }
       if (getAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(122);
         output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarGuidList_.size(); i++) {
         output.writeUInt64NoTag(avatarGuidList_.getLong(i));
       }
-      if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(13, curAvatarGuid_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -252,9 +251,13 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (curAvatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(2, curAvatarGuid_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       {
         int dataSize = 0;
@@ -270,10 +273,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         }
         avatarGuidListMemoizedSerializedSize = dataSize;
       }
-      if (curAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, curAvatarGuid_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -289,12 +288,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       }
       emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp other = (emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp) obj;
 
-      if (!getAvatarGuidListList()
-          .equals(other.getAvatarGuidListList())) return false;
       if (getCurAvatarGuid()
           != other.getCurAvatarGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getAvatarGuidListList()
+          .equals(other.getAvatarGuidListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -306,15 +305,15 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getAvatarGuidListCount() > 0) {
-        hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarGuidListList().hashCode();
-      }
       hash = (37 * hash) + CUR_AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getCurAvatarGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      if (getAvatarGuidListCount() > 0) {
+        hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarGuidListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -412,8 +411,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 352
-     * Obf: LFHCFAFFODE
+     * CmdId: 28252
      * </pre>
      *
      * Protobuf type {@code ChangeMpTeamAvatarRsp}
@@ -453,12 +451,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         curAvatarGuid_ = 0L;
 
         retcode_ = 0;
 
+        avatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -486,13 +484,13 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       public emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp buildPartial() {
         emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp result = new emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp(this);
         int from_bitField0_ = bitField0_;
+        result.curAvatarGuid_ = curAvatarGuid_;
+        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           avatarGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.avatarGuidList_ = avatarGuidList_;
-        result.curAvatarGuid_ = curAvatarGuid_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -541,6 +539,12 @@ public final class ChangeMpTeamAvatarRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp other) {
         if (other == emu.grasscutter.net.proto.ChangeMpTeamAvatarRspOuterClass.ChangeMpTeamAvatarRsp.getDefaultInstance()) return this;
+        if (other.getCurAvatarGuid() != 0L) {
+          setCurAvatarGuid(other.getCurAvatarGuid());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (!other.avatarGuidList_.isEmpty()) {
           if (avatarGuidList_.isEmpty()) {
             avatarGuidList_ = other.avatarGuidList_;
@@ -551,12 +555,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
           }
           onChanged();
         }
-        if (other.getCurAvatarGuid() != 0L) {
-          setCurAvatarGuid(other.getCurAvatarGuid());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -587,6 +585,68 @@ public final class ChangeMpTeamAvatarRspOuterClass {
       }
       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 retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
       private void ensureAvatarGuidListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -595,7 +655,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @return A list containing the avatarGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -604,14 +664,14 @@ public final class ChangeMpTeamAvatarRspOuterClass {
                  java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @return The count of avatarGuidList.
        */
       public int getAvatarGuidListCount() {
         return avatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @param index The index of the element to return.
        * @return The avatarGuidList at the given index.
        */
@@ -619,7 +679,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         return avatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @param index The index to set the value at.
        * @param value The avatarGuidList to set.
        * @return This builder for chaining.
@@ -632,7 +692,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @param value The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -643,7 +703,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @param values The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -656,7 +716,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 10;</code>
+       * <code>repeated uint64 avatar_guid_list = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuidList() {
@@ -665,68 +725,6 @@ public final class ChangeMpTeamAvatarRspOuterClass {
         onChanged();
         return this;
       }
-
-      private long curAvatarGuid_ ;
-      /**
-       * <code>uint64 cur_avatar_guid = 13;</code>
-       * @return The curAvatarGuid.
-       */
-      @java.lang.Override
-      public long getCurAvatarGuid() {
-        return curAvatarGuid_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint64 cur_avatar_guid = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurAvatarGuid() {
-        
-        curAvatarGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -795,9 +793,9 @@ public final class ChangeMpTeamAvatarRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033ChangeMpTeamAvatarRsp.proto\"[\n\025ChangeM" +
-      "pTeamAvatarRsp\022\030\n\020avatar_guid_list\030\n \003(\004" +
-      "\022\027\n\017cur_avatar_guid\030\r \001(\004\022\017\n\007retcode\030\t \001" +
-      "(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "pTeamAvatarRsp\022\027\n\017cur_avatar_guid\030\002 \001(\004\022" +
+      "\017\n\007retcode\030\r \001(\005\022\030\n\020avatar_guid_list\030\017 \003" +
+      "(\004B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -808,7 +806,7 @@ public final class ChangeMpTeamAvatarRspOuterClass {
     internal_static_ChangeMpTeamAvatarRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeMpTeamAvatarRsp_descriptor,
-        new java.lang.String[] { "AvatarGuidList", "CurAvatarGuid", "Retcode", });
+        new java.lang.String[] { "CurAvatarGuid", "Retcode", "AvatarGuidList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameReqOuterClass.java
index 4288f23ad..18b6f4afa 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameReqOuterClass.java
@@ -19,29 +19,24 @@ public final class ChangeTeamNameReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string team_name = 14;</code>
+     * <code>string team_name = 11;</code>
      * @return The teamName.
      */
     java.lang.String getTeamName();
     /**
-     * <code>string team_name = 14;</code>
+     * <code>string team_name = 11;</code>
      * @return The bytes for teamName.
      */
     com.google.protobuf.ByteString
         getTeamNameBytes();
 
     /**
-     * <code>int32 team_id = 3;</code>
+     * <code>int32 team_id = 1;</code>
      * @return The teamId.
      */
     int getTeamId();
   }
   /**
-   * <pre>
-   * CmdId: 24187
-   * Obf: PJLNPGJDAIG
-   * </pre>
-   *
    * Protobuf type {@code ChangeTeamNameReq}
    */
   public static final class ChangeTeamNameReq extends
@@ -87,12 +82,12 @@ public final class ChangeTeamNameReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
               teamId_ = input.readInt32();
               break;
             }
-            case 114: {
+            case 90: {
               java.lang.String s = input.readStringRequireUtf8();
 
               teamName_ = s;
@@ -130,10 +125,10 @@ public final class ChangeTeamNameReqOuterClass {
               emu.grasscutter.net.proto.ChangeTeamNameReqOuterClass.ChangeTeamNameReq.class, emu.grasscutter.net.proto.ChangeTeamNameReqOuterClass.ChangeTeamNameReq.Builder.class);
     }
 
-    public static final int TEAM_NAME_FIELD_NUMBER = 14;
+    public static final int TEAM_NAME_FIELD_NUMBER = 11;
     private volatile java.lang.Object teamName_;
     /**
-     * <code>string team_name = 14;</code>
+     * <code>string team_name = 11;</code>
      * @return The teamName.
      */
     @java.lang.Override
@@ -150,7 +145,7 @@ public final class ChangeTeamNameReqOuterClass {
       }
     }
     /**
-     * <code>string team_name = 14;</code>
+     * <code>string team_name = 11;</code>
      * @return The bytes for teamName.
      */
     @java.lang.Override
@@ -168,10 +163,10 @@ public final class ChangeTeamNameReqOuterClass {
       }
     }
 
-    public static final int TEAM_ID_FIELD_NUMBER = 3;
+    public static final int TEAM_ID_FIELD_NUMBER = 1;
     private int teamId_;
     /**
-     * <code>int32 team_id = 3;</code>
+     * <code>int32 team_id = 1;</code>
      * @return The teamId.
      */
     @java.lang.Override
@@ -194,10 +189,10 @@ public final class ChangeTeamNameReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (teamId_ != 0) {
-        output.writeInt32(3, teamId_);
+        output.writeInt32(1, teamId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, teamName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, teamName_);
       }
       unknownFields.writeTo(output);
     }
@@ -210,10 +205,10 @@ public final class ChangeTeamNameReqOuterClass {
       size = 0;
       if (teamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, teamId_);
+          .computeInt32Size(1, teamId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, teamName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, teamName_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class ChangeTeamNameReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24187
-     * Obf: PJLNPGJDAIG
-     * </pre>
-     *
      * Protobuf type {@code ChangeTeamNameReq}
      */
     public static final class Builder extends
@@ -505,7 +495,7 @@ public final class ChangeTeamNameReqOuterClass {
 
       private java.lang.Object teamName_ = "";
       /**
-       * <code>string team_name = 14;</code>
+       * <code>string team_name = 11;</code>
        * @return The teamName.
        */
       public java.lang.String getTeamName() {
@@ -521,7 +511,7 @@ public final class ChangeTeamNameReqOuterClass {
         }
       }
       /**
-       * <code>string team_name = 14;</code>
+       * <code>string team_name = 11;</code>
        * @return The bytes for teamName.
        */
       public com.google.protobuf.ByteString
@@ -538,7 +528,7 @@ public final class ChangeTeamNameReqOuterClass {
         }
       }
       /**
-       * <code>string team_name = 14;</code>
+       * <code>string team_name = 11;</code>
        * @param value The teamName to set.
        * @return This builder for chaining.
        */
@@ -553,7 +543,7 @@ public final class ChangeTeamNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 14;</code>
+       * <code>string team_name = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamName() {
@@ -563,7 +553,7 @@ public final class ChangeTeamNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 14;</code>
+       * <code>string team_name = 11;</code>
        * @param value The bytes for teamName to set.
        * @return This builder for chaining.
        */
@@ -581,7 +571,7 @@ public final class ChangeTeamNameReqOuterClass {
 
       private int teamId_ ;
       /**
-       * <code>int32 team_id = 3;</code>
+       * <code>int32 team_id = 1;</code>
        * @return The teamId.
        */
       @java.lang.Override
@@ -589,7 +579,7 @@ public final class ChangeTeamNameReqOuterClass {
         return teamId_;
       }
       /**
-       * <code>int32 team_id = 3;</code>
+       * <code>int32 team_id = 1;</code>
        * @param value The teamId to set.
        * @return This builder for chaining.
        */
@@ -600,7 +590,7 @@ public final class ChangeTeamNameReqOuterClass {
         return this;
       }
       /**
-       * <code>int32 team_id = 3;</code>
+       * <code>int32 team_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamId() {
@@ -677,7 +667,7 @@ public final class ChangeTeamNameReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027ChangeTeamNameReq.proto\"7\n\021ChangeTeamN" +
-      "ameReq\022\021\n\tteam_name\030\016 \001(\t\022\017\n\007team_id\030\003 \001" +
+      "ameReq\022\021\n\tteam_name\030\013 \001(\t\022\017\n\007team_id\030\001 \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/ChangeTeamNameRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameRspOuterClass.java
index 03eef3be0..01bafcdc6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChangeTeamNameRspOuterClass.java
@@ -19,35 +19,30 @@ public final class ChangeTeamNameRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>int32 team_id = 12;</code>
+     * <code>int32 team_id = 6;</code>
      * @return The teamId.
      */
     int getTeamId();
 
     /**
-     * <code>string team_name = 15;</code>
+     * <code>string team_name = 8;</code>
      * @return The teamName.
      */
     java.lang.String getTeamName();
     /**
-     * <code>string team_name = 15;</code>
+     * <code>string team_name = 8;</code>
      * @return The bytes for teamName.
      */
     com.google.protobuf.ByteString
         getTeamNameBytes();
+
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 29496
-   * Obf: JKAKFOEKEDH
-   * </pre>
-   *
    * Protobuf type {@code ChangeTeamNameRsp}
    */
   public static final class ChangeTeamNameRsp extends
@@ -93,22 +88,22 @@ public final class ChangeTeamNameRspOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 96: {
+            case 48: {
 
               teamId_ = input.readInt32();
               break;
             }
-            case 122: {
+            case 66: {
               java.lang.String s = input.readStringRequireUtf8();
 
               teamName_ = s;
               break;
             }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -141,21 +136,10 @@ public final class ChangeTeamNameRspOuterClass {
               emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp.class, emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp.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 TEAM_ID_FIELD_NUMBER = 12;
+    public static final int TEAM_ID_FIELD_NUMBER = 6;
     private int teamId_;
     /**
-     * <code>int32 team_id = 12;</code>
+     * <code>int32 team_id = 6;</code>
      * @return The teamId.
      */
     @java.lang.Override
@@ -163,10 +147,10 @@ public final class ChangeTeamNameRspOuterClass {
       return teamId_;
     }
 
-    public static final int TEAM_NAME_FIELD_NUMBER = 15;
+    public static final int TEAM_NAME_FIELD_NUMBER = 8;
     private volatile java.lang.Object teamName_;
     /**
-     * <code>string team_name = 15;</code>
+     * <code>string team_name = 8;</code>
      * @return The teamName.
      */
     @java.lang.Override
@@ -183,7 +167,7 @@ public final class ChangeTeamNameRspOuterClass {
       }
     }
     /**
-     * <code>string team_name = 15;</code>
+     * <code>string team_name = 8;</code>
      * @return The bytes for teamName.
      */
     @java.lang.Override
@@ -201,6 +185,17 @@ public final class ChangeTeamNameRspOuterClass {
       }
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -215,14 +210,14 @@ public final class ChangeTeamNameRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
       if (teamId_ != 0) {
-        output.writeInt32(12, teamId_);
+        output.writeInt32(6, teamId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, teamName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, teamName_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -233,16 +228,16 @@ public final class ChangeTeamNameRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
-      }
       if (teamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, teamId_);
+          .computeInt32Size(6, teamId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(teamName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, teamName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, teamName_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -259,12 +254,12 @@ public final class ChangeTeamNameRspOuterClass {
       }
       emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp other = (emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getTeamId()
           != other.getTeamId()) return false;
       if (!getTeamName()
           .equals(other.getTeamName())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -276,12 +271,12 @@ public final class ChangeTeamNameRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TEAM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTeamId();
       hash = (37 * hash) + TEAM_NAME_FIELD_NUMBER;
       hash = (53 * hash) + getTeamName().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class ChangeTeamNameRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29496
-     * Obf: JKAKFOEKEDH
-     * </pre>
-     *
      * Protobuf type {@code ChangeTeamNameRsp}
      */
     public static final class Builder extends
@@ -420,12 +410,12 @@ public final class ChangeTeamNameRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         teamId_ = 0;
 
         teamName_ = "";
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -452,9 +442,9 @@ public final class ChangeTeamNameRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp buildPartial() {
         emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp result = new emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp(this);
-        result.retcode_ = retcode_;
         result.teamId_ = teamId_;
         result.teamName_ = teamName_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -503,9 +493,6 @@ public final class ChangeTeamNameRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp other) {
         if (other == emu.grasscutter.net.proto.ChangeTeamNameRspOuterClass.ChangeTeamNameRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getTeamId() != 0) {
           setTeamId(other.getTeamId());
         }
@@ -513,6 +500,9 @@ public final class ChangeTeamNameRspOuterClass {
           teamName_ = other.teamName_;
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -542,40 +532,9 @@ public final class ChangeTeamNameRspOuterClass {
         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 teamId_ ;
       /**
-       * <code>int32 team_id = 12;</code>
+       * <code>int32 team_id = 6;</code>
        * @return The teamId.
        */
       @java.lang.Override
@@ -583,7 +542,7 @@ public final class ChangeTeamNameRspOuterClass {
         return teamId_;
       }
       /**
-       * <code>int32 team_id = 12;</code>
+       * <code>int32 team_id = 6;</code>
        * @param value The teamId to set.
        * @return This builder for chaining.
        */
@@ -594,7 +553,7 @@ public final class ChangeTeamNameRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 team_id = 12;</code>
+       * <code>int32 team_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamId() {
@@ -606,7 +565,7 @@ public final class ChangeTeamNameRspOuterClass {
 
       private java.lang.Object teamName_ = "";
       /**
-       * <code>string team_name = 15;</code>
+       * <code>string team_name = 8;</code>
        * @return The teamName.
        */
       public java.lang.String getTeamName() {
@@ -622,7 +581,7 @@ public final class ChangeTeamNameRspOuterClass {
         }
       }
       /**
-       * <code>string team_name = 15;</code>
+       * <code>string team_name = 8;</code>
        * @return The bytes for teamName.
        */
       public com.google.protobuf.ByteString
@@ -639,7 +598,7 @@ public final class ChangeTeamNameRspOuterClass {
         }
       }
       /**
-       * <code>string team_name = 15;</code>
+       * <code>string team_name = 8;</code>
        * @param value The teamName to set.
        * @return This builder for chaining.
        */
@@ -654,7 +613,7 @@ public final class ChangeTeamNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 15;</code>
+       * <code>string team_name = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamName() {
@@ -664,7 +623,7 @@ public final class ChangeTeamNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string team_name = 15;</code>
+       * <code>string team_name = 8;</code>
        * @param value The bytes for teamName to set.
        * @return This builder for chaining.
        */
@@ -679,6 +638,37 @@ public final class ChangeTeamNameRspOuterClass {
         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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -747,8 +737,8 @@ public final class ChangeTeamNameRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027ChangeTeamNameRsp.proto\"H\n\021ChangeTeamN" +
-      "ameRsp\022\017\n\007retcode\030\005 \001(\005\022\017\n\007team_id\030\014 \001(\005" +
-      "\022\021\n\tteam_name\030\017 \001(\tB\033\n\031emu.grasscutter.n" +
+      "ameRsp\022\017\n\007team_id\030\006 \001(\005\022\021\n\tteam_name\030\010 \001" +
+      "(\t\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -760,7 +750,7 @@ public final class ChangeTeamNameRspOuterClass {
     internal_static_ChangeTeamNameRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChangeTeamNameRsp_descriptor,
-        new java.lang.String[] { "Retcode", "TeamId", "TeamName", });
+        new java.lang.String[] { "TeamId", "TeamName", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonResultInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonResultInfoOuterClass.java
index 84277a194..c15209fdc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonResultInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChannellerSlabLoopDungeonResultInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 challenge_max_score = 4;</code>
-     * @return The challengeMaxScore.
-     */
-    int getChallengeMaxScore();
-
-    /**
-     * <code>uint32 dungeon_index = 11;</code>
+     * <code>uint32 dungeon_index = 3;</code>
      * @return The dungeonIndex.
      */
     int getDungeonIndex();
 
     /**
-     * <code>bool is_success = 10;</code>
-     * @return The isSuccess.
-     */
-    boolean getIsSuccess();
-
-    /**
-     * <code>bool is_in_time_limit = 7;</code>
+     * <code>bool is_in_time_limit = 5;</code>
      * @return The isInTimeLimit.
      */
     boolean getIsInTimeLimit();
 
     /**
-     * <code>uint32 challenge_score = 1;</code>
+     * <code>uint32 challenge_score = 6;</code>
      * @return The challengeScore.
      */
     int getChallengeScore();
+
+    /**
+     * <code>bool is_success = 13;</code>
+     * @return The isSuccess.
+     */
+    boolean getIsSuccess();
+
+    /**
+     * <code>uint32 challenge_max_score = 14;</code>
+     * @return The challengeMaxScore.
+     */
+    int getChallengeMaxScore();
   }
   /**
-   * <pre>
-   * Obf: BIMIBAHBDAC
-   * </pre>
-   *
    * Protobuf type {@code ChannellerSlabLoopDungeonResultInfo}
    */
   public static final class ChannellerSlabLoopDungeonResultInfo extends
@@ -97,29 +93,29 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
-              challengeScore_ = input.readUInt32();
+              dungeonIndex_ = input.readUInt32();
               break;
             }
-            case 32: {
-
-              challengeMaxScore_ = input.readUInt32();
-              break;
-            }
-            case 56: {
+            case 40: {
 
               isInTimeLimit_ = input.readBool();
               break;
             }
-            case 80: {
+            case 48: {
+
+              challengeScore_ = input.readUInt32();
+              break;
+            }
+            case 104: {
 
               isSuccess_ = input.readBool();
               break;
             }
-            case 88: {
+            case 112: {
 
-              dungeonIndex_ = input.readUInt32();
+              challengeMaxScore_ = input.readUInt32();
               break;
             }
             default: {
@@ -154,21 +150,10 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
               emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.class, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder.class);
     }
 
-    public static final int CHALLENGE_MAX_SCORE_FIELD_NUMBER = 4;
-    private int challengeMaxScore_;
-    /**
-     * <code>uint32 challenge_max_score = 4;</code>
-     * @return The challengeMaxScore.
-     */
-    @java.lang.Override
-    public int getChallengeMaxScore() {
-      return challengeMaxScore_;
-    }
-
-    public static final int DUNGEON_INDEX_FIELD_NUMBER = 11;
+    public static final int DUNGEON_INDEX_FIELD_NUMBER = 3;
     private int dungeonIndex_;
     /**
-     * <code>uint32 dungeon_index = 11;</code>
+     * <code>uint32 dungeon_index = 3;</code>
      * @return The dungeonIndex.
      */
     @java.lang.Override
@@ -176,21 +161,10 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       return dungeonIndex_;
     }
 
-    public static final int IS_SUCCESS_FIELD_NUMBER = 10;
-    private boolean isSuccess_;
-    /**
-     * <code>bool is_success = 10;</code>
-     * @return The isSuccess.
-     */
-    @java.lang.Override
-    public boolean getIsSuccess() {
-      return isSuccess_;
-    }
-
-    public static final int IS_IN_TIME_LIMIT_FIELD_NUMBER = 7;
+    public static final int IS_IN_TIME_LIMIT_FIELD_NUMBER = 5;
     private boolean isInTimeLimit_;
     /**
-     * <code>bool is_in_time_limit = 7;</code>
+     * <code>bool is_in_time_limit = 5;</code>
      * @return The isInTimeLimit.
      */
     @java.lang.Override
@@ -198,10 +172,10 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       return isInTimeLimit_;
     }
 
-    public static final int CHALLENGE_SCORE_FIELD_NUMBER = 1;
+    public static final int CHALLENGE_SCORE_FIELD_NUMBER = 6;
     private int challengeScore_;
     /**
-     * <code>uint32 challenge_score = 1;</code>
+     * <code>uint32 challenge_score = 6;</code>
      * @return The challengeScore.
      */
     @java.lang.Override
@@ -209,6 +183,28 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       return challengeScore_;
     }
 
+    public static final int IS_SUCCESS_FIELD_NUMBER = 13;
+    private boolean isSuccess_;
+    /**
+     * <code>bool is_success = 13;</code>
+     * @return The isSuccess.
+     */
+    @java.lang.Override
+    public boolean getIsSuccess() {
+      return isSuccess_;
+    }
+
+    public static final int CHALLENGE_MAX_SCORE_FIELD_NUMBER = 14;
+    private int challengeMaxScore_;
+    /**
+     * <code>uint32 challenge_max_score = 14;</code>
+     * @return The challengeMaxScore.
+     */
+    @java.lang.Override
+    public int getChallengeMaxScore() {
+      return challengeMaxScore_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -223,20 +219,20 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (challengeScore_ != 0) {
-        output.writeUInt32(1, challengeScore_);
-      }
-      if (challengeMaxScore_ != 0) {
-        output.writeUInt32(4, challengeMaxScore_);
+      if (dungeonIndex_ != 0) {
+        output.writeUInt32(3, dungeonIndex_);
       }
       if (isInTimeLimit_ != false) {
-        output.writeBool(7, isInTimeLimit_);
+        output.writeBool(5, isInTimeLimit_);
+      }
+      if (challengeScore_ != 0) {
+        output.writeUInt32(6, challengeScore_);
       }
       if (isSuccess_ != false) {
-        output.writeBool(10, isSuccess_);
+        output.writeBool(13, isSuccess_);
       }
-      if (dungeonIndex_ != 0) {
-        output.writeUInt32(11, dungeonIndex_);
+      if (challengeMaxScore_ != 0) {
+        output.writeUInt32(14, challengeMaxScore_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,25 +243,25 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (challengeScore_ != 0) {
+      if (dungeonIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, challengeScore_);
-      }
-      if (challengeMaxScore_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, challengeMaxScore_);
+          .computeUInt32Size(3, dungeonIndex_);
       }
       if (isInTimeLimit_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isInTimeLimit_);
+          .computeBoolSize(5, isInTimeLimit_);
+      }
+      if (challengeScore_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, challengeScore_);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(10, isSuccess_);
+          .computeBoolSize(13, isSuccess_);
       }
-      if (dungeonIndex_ != 0) {
+      if (challengeMaxScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, dungeonIndex_);
+          .computeUInt32Size(14, challengeMaxScore_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -282,16 +278,16 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       }
       emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo other = (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) obj;
 
-      if (getChallengeMaxScore()
-          != other.getChallengeMaxScore()) return false;
       if (getDungeonIndex()
           != other.getDungeonIndex()) return false;
-      if (getIsSuccess()
-          != other.getIsSuccess()) return false;
       if (getIsInTimeLimit()
           != other.getIsInTimeLimit()) return false;
       if (getChallengeScore()
           != other.getChallengeScore()) return false;
+      if (getIsSuccess()
+          != other.getIsSuccess()) return false;
+      if (getChallengeMaxScore()
+          != other.getChallengeMaxScore()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -303,18 +299,18 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CHALLENGE_MAX_SCORE_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeMaxScore();
       hash = (37 * hash) + DUNGEON_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonIndex();
-      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSuccess());
       hash = (37 * hash) + IS_IN_TIME_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsInTimeLimit());
       hash = (37 * hash) + CHALLENGE_SCORE_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeScore();
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSuccess());
+      hash = (37 * hash) + CHALLENGE_MAX_SCORE_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeMaxScore();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -411,10 +407,6 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BIMIBAHBDAC
-     * </pre>
-     *
      * Protobuf type {@code ChannellerSlabLoopDungeonResultInfo}
      */
     public static final class Builder extends
@@ -452,16 +444,16 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        challengeMaxScore_ = 0;
-
         dungeonIndex_ = 0;
 
-        isSuccess_ = false;
-
         isInTimeLimit_ = false;
 
         challengeScore_ = 0;
 
+        isSuccess_ = false;
+
+        challengeMaxScore_ = 0;
+
         return this;
       }
 
@@ -488,11 +480,11 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo buildPartial() {
         emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo result = new emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo(this);
-        result.challengeMaxScore_ = challengeMaxScore_;
         result.dungeonIndex_ = dungeonIndex_;
-        result.isSuccess_ = isSuccess_;
         result.isInTimeLimit_ = isInTimeLimit_;
         result.challengeScore_ = challengeScore_;
+        result.isSuccess_ = isSuccess_;
+        result.challengeMaxScore_ = challengeMaxScore_;
         onBuilt();
         return result;
       }
@@ -541,21 +533,21 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo other) {
         if (other == emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance()) return this;
-        if (other.getChallengeMaxScore() != 0) {
-          setChallengeMaxScore(other.getChallengeMaxScore());
-        }
         if (other.getDungeonIndex() != 0) {
           setDungeonIndex(other.getDungeonIndex());
         }
-        if (other.getIsSuccess() != false) {
-          setIsSuccess(other.getIsSuccess());
-        }
         if (other.getIsInTimeLimit() != false) {
           setIsInTimeLimit(other.getIsInTimeLimit());
         }
         if (other.getChallengeScore() != 0) {
           setChallengeScore(other.getChallengeScore());
         }
+        if (other.getIsSuccess() != false) {
+          setIsSuccess(other.getIsSuccess());
+        }
+        if (other.getChallengeMaxScore() != 0) {
+          setChallengeMaxScore(other.getChallengeMaxScore());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -585,40 +577,9 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return this;
       }
 
-      private int challengeMaxScore_ ;
-      /**
-       * <code>uint32 challenge_max_score = 4;</code>
-       * @return The challengeMaxScore.
-       */
-      @java.lang.Override
-      public int getChallengeMaxScore() {
-        return challengeMaxScore_;
-      }
-      /**
-       * <code>uint32 challenge_max_score = 4;</code>
-       * @param value The challengeMaxScore to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeMaxScore(int value) {
-        
-        challengeMaxScore_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_max_score = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeMaxScore() {
-        
-        challengeMaxScore_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int dungeonIndex_ ;
       /**
-       * <code>uint32 dungeon_index = 11;</code>
+       * <code>uint32 dungeon_index = 3;</code>
        * @return The dungeonIndex.
        */
       @java.lang.Override
@@ -626,7 +587,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return dungeonIndex_;
       }
       /**
-       * <code>uint32 dungeon_index = 11;</code>
+       * <code>uint32 dungeon_index = 3;</code>
        * @param value The dungeonIndex to set.
        * @return This builder for chaining.
        */
@@ -637,7 +598,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 dungeon_index = 11;</code>
+       * <code>uint32 dungeon_index = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearDungeonIndex() {
@@ -647,40 +608,9 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return this;
       }
 
-      private boolean isSuccess_ ;
-      /**
-       * <code>bool is_success = 10;</code>
-       * @return The isSuccess.
-       */
-      @java.lang.Override
-      public boolean getIsSuccess() {
-        return isSuccess_;
-      }
-      /**
-       * <code>bool is_success = 10;</code>
-       * @param value The isSuccess to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSuccess(boolean value) {
-        
-        isSuccess_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_success = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSuccess() {
-        
-        isSuccess_ = false;
-        onChanged();
-        return this;
-      }
-
       private boolean isInTimeLimit_ ;
       /**
-       * <code>bool is_in_time_limit = 7;</code>
+       * <code>bool is_in_time_limit = 5;</code>
        * @return The isInTimeLimit.
        */
       @java.lang.Override
@@ -688,7 +618,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return isInTimeLimit_;
       }
       /**
-       * <code>bool is_in_time_limit = 7;</code>
+       * <code>bool is_in_time_limit = 5;</code>
        * @param value The isInTimeLimit to set.
        * @return This builder for chaining.
        */
@@ -699,7 +629,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_in_time_limit = 7;</code>
+       * <code>bool is_in_time_limit = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInTimeLimit() {
@@ -711,7 +641,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
 
       private int challengeScore_ ;
       /**
-       * <code>uint32 challenge_score = 1;</code>
+       * <code>uint32 challenge_score = 6;</code>
        * @return The challengeScore.
        */
       @java.lang.Override
@@ -719,7 +649,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return challengeScore_;
       }
       /**
-       * <code>uint32 challenge_score = 1;</code>
+       * <code>uint32 challenge_score = 6;</code>
        * @param value The challengeScore to set.
        * @return This builder for chaining.
        */
@@ -730,7 +660,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_score = 1;</code>
+       * <code>uint32 challenge_score = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeScore() {
@@ -739,6 +669,68 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isSuccess_ ;
+      /**
+       * <code>bool is_success = 13;</code>
+       * @return The isSuccess.
+       */
+      @java.lang.Override
+      public boolean getIsSuccess() {
+        return isSuccess_;
+      }
+      /**
+       * <code>bool is_success = 13;</code>
+       * @param value The isSuccess to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSuccess(boolean value) {
+        
+        isSuccess_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_success = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSuccess() {
+        
+        isSuccess_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int challengeMaxScore_ ;
+      /**
+       * <code>uint32 challenge_max_score = 14;</code>
+       * @return The challengeMaxScore.
+       */
+      @java.lang.Override
+      public int getChallengeMaxScore() {
+        return challengeMaxScore_;
+      }
+      /**
+       * <code>uint32 challenge_max_score = 14;</code>
+       * @param value The challengeMaxScore to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeMaxScore(int value) {
+        
+        challengeMaxScore_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_max_score = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeMaxScore() {
+        
+        challengeMaxScore_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -808,10 +800,10 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n)ChannellerSlabLoopDungeonResultInfo.pr" +
       "oto\"\240\001\n#ChannellerSlabLoopDungeonResultI" +
-      "nfo\022\033\n\023challenge_max_score\030\004 \001(\r\022\025\n\rdung" +
-      "eon_index\030\013 \001(\r\022\022\n\nis_success\030\n \001(\010\022\030\n\020i" +
-      "s_in_time_limit\030\007 \001(\010\022\027\n\017challenge_score" +
-      "\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "nfo\022\025\n\rdungeon_index\030\003 \001(\r\022\030\n\020is_in_time" +
+      "_limit\030\005 \001(\010\022\027\n\017challenge_score\030\006 \001(\r\022\022\n" +
+      "\nis_success\030\r \001(\010\022\033\n\023challenge_max_score" +
+      "\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -823,7 +815,7 @@ public final class ChannellerSlabLoopDungeonResultInfoOuterClass {
     internal_static_ChannellerSlabLoopDungeonResultInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChannellerSlabLoopDungeonResultInfo_descriptor,
-        new java.lang.String[] { "ChallengeMaxScore", "DungeonIndex", "IsSuccess", "IsInTimeLimit", "ChallengeScore", });
+        new java.lang.String[] { "DungeonIndex", "IsInTimeLimit", "ChallengeScore", "IsSuccess", "ChallengeMaxScore", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateNotifyOuterClass.java
index bfa1eaea2..2e5dca35b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateNotifyOuterClass.java
@@ -19,58 +19,53 @@ public final class ChapterStateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     * @return Whether the needBeginTime field is set.
+     * <code>uint32 chapter_id = 1;</code>
+     * @return The chapterId.
      */
-    boolean hasNeedBeginTime();
-    /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     * @return The needBeginTime.
-     */
-    emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getNeedBeginTime();
-    /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     */
-    emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder();
+    int getChapterId();
 
     /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     * @return Whether the needPlayerLevel field is set.
-     */
-    boolean hasNeedPlayerLevel();
-    /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     * @return The needPlayerLevel.
-     */
-    emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getNeedPlayerLevel();
-    /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     */
-    emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder();
-
-    /**
-     * <code>.ChapterState chapter_state = 7;</code>
+     * <code>.ChapterState chapter_state = 2;</code>
      * @return The enum numeric value on the wire for chapterState.
      */
     int getChapterStateValue();
     /**
-     * <code>.ChapterState chapter_state = 7;</code>
+     * <code>.ChapterState chapter_state = 2;</code>
      * @return The chapterState.
      */
     emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState getChapterState();
 
     /**
-     * <code>uint32 chapter_id = 4;</code>
-     * @return The chapterId.
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     * @return Whether the needPlayerLevel field is set.
      */
-    int getChapterId();
+    boolean hasNeedPlayerLevel();
+    /**
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     * @return The needPlayerLevel.
+     */
+    emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getNeedPlayerLevel();
+    /**
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     */
+    emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder();
+
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     * @return Whether the needBeginTime field is set.
+     */
+    boolean hasNeedBeginTime();
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     * @return The needBeginTime.
+     */
+    emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getNeedBeginTime();
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     */
+    emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 21508
-   * Obf: MCCCGABFHBK
-   * </pre>
-   *
    * Protobuf type {@code ChapterStateNotify}
    */
   public static final class ChapterStateNotify extends
@@ -116,12 +111,23 @@ public final class ChapterStateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder subBuilder = null;
+            case 8: {
+
+              chapterId_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+              int rawValue = input.readEnum();
+
+              chapterState_ = rawValue;
+              break;
+            }
+            case 66: {
+              emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder subBuilder = null;
               if (needPlayerLevel_ != null) {
                 subBuilder = needPlayerLevel_.toBuilder();
               }
-              needPlayerLevel_ = input.readMessage(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.parser(), extensionRegistry);
+              needPlayerLevel_ = input.readMessage(emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(needPlayerLevel_);
                 needPlayerLevel_ = subBuilder.buildPartial();
@@ -129,23 +135,12 @@ public final class ChapterStateNotifyOuterClass {
 
               break;
             }
-            case 32: {
-
-              chapterId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-              int rawValue = input.readEnum();
-
-              chapterState_ = rawValue;
-              break;
-            }
-            case 82: {
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder subBuilder = null;
+            case 90: {
+              emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder subBuilder = null;
               if (needBeginTime_ != null) {
                 subBuilder = needBeginTime_.toBuilder();
               }
-              needBeginTime_ = input.readMessage(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.parser(), extensionRegistry);
+              needBeginTime_ = input.readMessage(emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(needBeginTime_);
                 needBeginTime_ = subBuilder.buildPartial();
@@ -185,1203 +180,28 @@ public final class ChapterStateNotifyOuterClass {
               emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.class, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.Builder.class);
     }
 
-    public interface NeedPlayerLevelOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:ChapterStateNotify.NeedPlayerLevel)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * <code>bool is_limit = 1;</code>
-       * @return The isLimit.
-       */
-      boolean getIsLimit();
-
-      /**
-       * <code>uint32 configNeedPlayerLevel = 11;</code>
-       * @return The configNeedPlayerLevel.
-       */
-      int getConfigNeedPlayerLevel();
-    }
+    public static final int CHAPTER_ID_FIELD_NUMBER = 1;
+    private int chapterId_;
     /**
-     * <pre>
-     * Obf: MOEEEKPMIAO
-     * </pre>
-     *
-     * Protobuf type {@code ChapterStateNotify.NeedPlayerLevel}
-     */
-    public static final class NeedPlayerLevel extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:ChapterStateNotify.NeedPlayerLevel)
-        NeedPlayerLevelOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use NeedPlayerLevel.newBuilder() to construct.
-      private NeedPlayerLevel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-        super(builder);
-      }
-      private NeedPlayerLevel() {
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          UnusedPrivateParameter unused) {
-        return new NeedPlayerLevel();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private NeedPlayerLevel(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-
-                isLimit_ = input.readBool();
-                break;
-              }
-              case 88: {
-
-                configNeedPlayerLevel_ = input.readUInt32();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedPlayerLevel_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.class, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder.class);
-      }
-
-      public static final int IS_LIMIT_FIELD_NUMBER = 1;
-      private boolean isLimit_;
-      /**
-       * <code>bool is_limit = 1;</code>
-       * @return The isLimit.
-       */
-      @java.lang.Override
-      public boolean getIsLimit() {
-        return isLimit_;
-      }
-
-      public static final int CONFIGNEEDPLAYERLEVEL_FIELD_NUMBER = 11;
-      private int configNeedPlayerLevel_;
-      /**
-       * <code>uint32 configNeedPlayerLevel = 11;</code>
-       * @return The configNeedPlayerLevel.
-       */
-      @java.lang.Override
-      public int getConfigNeedPlayerLevel() {
-        return configNeedPlayerLevel_;
-      }
-
-      private byte memoizedIsInitialized = -1;
-      @java.lang.Override
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (isLimit_ != false) {
-          output.writeBool(1, isLimit_);
-        }
-        if (configNeedPlayerLevel_ != 0) {
-          output.writeUInt32(11, configNeedPlayerLevel_);
-        }
-        unknownFields.writeTo(output);
-      }
-
-      @java.lang.Override
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (isLimit_ != false) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeBoolSize(1, isLimit_);
-        }
-        if (configNeedPlayerLevel_ != 0) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeUInt32Size(11, configNeedPlayerLevel_);
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel)) {
-          return super.equals(obj);
-        }
-        emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel other = (emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel) obj;
-
-        if (getIsLimit()
-            != other.getIsLimit()) return false;
-        if (getConfigNeedPlayerLevel()
-            != other.getConfigNeedPlayerLevel()) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
-        return true;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + IS_LIMIT_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getIsLimit());
-        hash = (37 * hash) + CONFIGNEEDPLAYERLEVEL_FIELD_NUMBER;
-        hash = (53 * hash) + getConfigNeedPlayerLevel();
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      @java.lang.Override
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      @java.lang.Override
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * <pre>
-       * Obf: MOEEEKPMIAO
-       * </pre>
-       *
-       * Protobuf type {@code ChapterStateNotify.NeedPlayerLevel}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-          // @@protoc_insertion_point(builder_implements:ChapterStateNotify.NeedPlayerLevel)
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor;
-        }
-
-        @java.lang.Override
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedPlayerLevel_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.class, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder.class);
-        }
-
-        // Construct using emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
-        }
-        @java.lang.Override
-        public Builder clear() {
-          super.clear();
-          isLimit_ = false;
-
-          configNeedPlayerLevel_ = 0;
-
-          return this;
-        }
-
-        @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getDefaultInstanceForType() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.getDefaultInstance();
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel build() {
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel buildPartial() {
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel result = new emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel(this);
-          result.isLimit_ = isLimit_;
-          result.configNeedPlayerLevel_ = configNeedPlayerLevel_;
-          onBuilt();
-          return result;
-        }
-
-        @java.lang.Override
-        public Builder clone() {
-          return super.clone();
-        }
-        @java.lang.Override
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.setField(field, value);
-        }
-        @java.lang.Override
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return super.clearField(field);
-        }
-        @java.lang.Override
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return super.clearOneof(oneof);
-        }
-        @java.lang.Override
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return super.setRepeatedField(field, index, value);
-        }
-        @java.lang.Override
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.addRepeatedField(field, value);
-        }
-        @java.lang.Override
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel) {
-            return mergeFrom((emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel other) {
-          if (other == emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.getDefaultInstance()) return this;
-          if (other.getIsLimit() != false) {
-            setIsLimit(other.getIsLimit());
-          }
-          if (other.getConfigNeedPlayerLevel() != 0) {
-            setConfigNeedPlayerLevel(other.getConfigNeedPlayerLevel());
-          }
-          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.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-
-        private boolean isLimit_ ;
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @return The isLimit.
-         */
-        @java.lang.Override
-        public boolean getIsLimit() {
-          return isLimit_;
-        }
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @param value The isLimit to set.
-         * @return This builder for chaining.
-         */
-        public Builder setIsLimit(boolean value) {
-          
-          isLimit_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearIsLimit() {
-          
-          isLimit_ = false;
-          onChanged();
-          return this;
-        }
-
-        private int configNeedPlayerLevel_ ;
-        /**
-         * <code>uint32 configNeedPlayerLevel = 11;</code>
-         * @return The configNeedPlayerLevel.
-         */
-        @java.lang.Override
-        public int getConfigNeedPlayerLevel() {
-          return configNeedPlayerLevel_;
-        }
-        /**
-         * <code>uint32 configNeedPlayerLevel = 11;</code>
-         * @param value The configNeedPlayerLevel to set.
-         * @return This builder for chaining.
-         */
-        public Builder setConfigNeedPlayerLevel(int value) {
-          
-          configNeedPlayerLevel_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>uint32 configNeedPlayerLevel = 11;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearConfigNeedPlayerLevel() {
-          
-          configNeedPlayerLevel_ = 0;
-          onChanged();
-          return this;
-        }
-        @java.lang.Override
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFields(unknownFields);
-        }
-
-        @java.lang.Override
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:ChapterStateNotify.NeedPlayerLevel)
-      }
-
-      // @@protoc_insertion_point(class_scope:ChapterStateNotify.NeedPlayerLevel)
-      private static final emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel();
-      }
-
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser<NeedPlayerLevel>
-          PARSER = new com.google.protobuf.AbstractParser<NeedPlayerLevel>() {
-        @java.lang.Override
-        public NeedPlayerLevel parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new NeedPlayerLevel(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser<NeedPlayerLevel> parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<NeedPlayerLevel> getParserForType() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public interface NeedBeginTimeOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:ChapterStateNotify.NeedBeginTime)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * <code>uint32 configNeedBeginTime = 5;</code>
-       * @return The configNeedBeginTime.
-       */
-      int getConfigNeedBeginTime();
-
-      /**
-       * <code>bool is_limit = 1;</code>
-       * @return The isLimit.
-       */
-      boolean getIsLimit();
-    }
-    /**
-     * <pre>
-     * Obf: GEFDHMJCBLD
-     * </pre>
-     *
-     * Protobuf type {@code ChapterStateNotify.NeedBeginTime}
-     */
-    public static final class NeedBeginTime extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:ChapterStateNotify.NeedBeginTime)
-        NeedBeginTimeOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use NeedBeginTime.newBuilder() to construct.
-      private NeedBeginTime(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-        super(builder);
-      }
-      private NeedBeginTime() {
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          UnusedPrivateParameter unused) {
-        return new NeedBeginTime();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private NeedBeginTime(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-
-                isLimit_ = input.readBool();
-                break;
-              }
-              case 40: {
-
-                configNeedBeginTime_ = input.readUInt32();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedBeginTime_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedBeginTime_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.class, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder.class);
-      }
-
-      public static final int CONFIGNEEDBEGINTIME_FIELD_NUMBER = 5;
-      private int configNeedBeginTime_;
-      /**
-       * <code>uint32 configNeedBeginTime = 5;</code>
-       * @return The configNeedBeginTime.
-       */
-      @java.lang.Override
-      public int getConfigNeedBeginTime() {
-        return configNeedBeginTime_;
-      }
-
-      public static final int IS_LIMIT_FIELD_NUMBER = 1;
-      private boolean isLimit_;
-      /**
-       * <code>bool is_limit = 1;</code>
-       * @return The isLimit.
-       */
-      @java.lang.Override
-      public boolean getIsLimit() {
-        return isLimit_;
-      }
-
-      private byte memoizedIsInitialized = -1;
-      @java.lang.Override
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (isLimit_ != false) {
-          output.writeBool(1, isLimit_);
-        }
-        if (configNeedBeginTime_ != 0) {
-          output.writeUInt32(5, configNeedBeginTime_);
-        }
-        unknownFields.writeTo(output);
-      }
-
-      @java.lang.Override
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (isLimit_ != false) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeBoolSize(1, isLimit_);
-        }
-        if (configNeedBeginTime_ != 0) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeUInt32Size(5, configNeedBeginTime_);
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime)) {
-          return super.equals(obj);
-        }
-        emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime other = (emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime) obj;
-
-        if (getConfigNeedBeginTime()
-            != other.getConfigNeedBeginTime()) return false;
-        if (getIsLimit()
-            != other.getIsLimit()) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
-        return true;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + CONFIGNEEDBEGINTIME_FIELD_NUMBER;
-        hash = (53 * hash) + getConfigNeedBeginTime();
-        hash = (37 * hash) + IS_LIMIT_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getIsLimit());
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      @java.lang.Override
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      @java.lang.Override
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * <pre>
-       * Obf: GEFDHMJCBLD
-       * </pre>
-       *
-       * Protobuf type {@code ChapterStateNotify.NeedBeginTime}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-          // @@protoc_insertion_point(builder_implements:ChapterStateNotify.NeedBeginTime)
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedBeginTime_descriptor;
-        }
-
-        @java.lang.Override
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedBeginTime_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.class, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder.class);
-        }
-
-        // Construct using emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
-        }
-        @java.lang.Override
-        public Builder clear() {
-          super.clear();
-          configNeedBeginTime_ = 0;
-
-          isLimit_ = false;
-
-          return this;
-        }
-
-        @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.internal_static_ChapterStateNotify_NeedBeginTime_descriptor;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getDefaultInstanceForType() {
-          return emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.getDefaultInstance();
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime build() {
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime buildPartial() {
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime result = new emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime(this);
-          result.configNeedBeginTime_ = configNeedBeginTime_;
-          result.isLimit_ = isLimit_;
-          onBuilt();
-          return result;
-        }
-
-        @java.lang.Override
-        public Builder clone() {
-          return super.clone();
-        }
-        @java.lang.Override
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.setField(field, value);
-        }
-        @java.lang.Override
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return super.clearField(field);
-        }
-        @java.lang.Override
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return super.clearOneof(oneof);
-        }
-        @java.lang.Override
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return super.setRepeatedField(field, index, value);
-        }
-        @java.lang.Override
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.addRepeatedField(field, value);
-        }
-        @java.lang.Override
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime) {
-            return mergeFrom((emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime other) {
-          if (other == emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.getDefaultInstance()) return this;
-          if (other.getConfigNeedBeginTime() != 0) {
-            setConfigNeedBeginTime(other.getConfigNeedBeginTime());
-          }
-          if (other.getIsLimit() != false) {
-            setIsLimit(other.getIsLimit());
-          }
-          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.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-
-        private int configNeedBeginTime_ ;
-        /**
-         * <code>uint32 configNeedBeginTime = 5;</code>
-         * @return The configNeedBeginTime.
-         */
-        @java.lang.Override
-        public int getConfigNeedBeginTime() {
-          return configNeedBeginTime_;
-        }
-        /**
-         * <code>uint32 configNeedBeginTime = 5;</code>
-         * @param value The configNeedBeginTime to set.
-         * @return This builder for chaining.
-         */
-        public Builder setConfigNeedBeginTime(int value) {
-          
-          configNeedBeginTime_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>uint32 configNeedBeginTime = 5;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearConfigNeedBeginTime() {
-          
-          configNeedBeginTime_ = 0;
-          onChanged();
-          return this;
-        }
-
-        private boolean isLimit_ ;
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @return The isLimit.
-         */
-        @java.lang.Override
-        public boolean getIsLimit() {
-          return isLimit_;
-        }
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @param value The isLimit to set.
-         * @return This builder for chaining.
-         */
-        public Builder setIsLimit(boolean value) {
-          
-          isLimit_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>bool is_limit = 1;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearIsLimit() {
-          
-          isLimit_ = false;
-          onChanged();
-          return this;
-        }
-        @java.lang.Override
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFields(unknownFields);
-        }
-
-        @java.lang.Override
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:ChapterStateNotify.NeedBeginTime)
-      }
-
-      // @@protoc_insertion_point(class_scope:ChapterStateNotify.NeedBeginTime)
-      private static final emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime();
-      }
-
-      public static emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser<NeedBeginTime>
-          PARSER = new com.google.protobuf.AbstractParser<NeedBeginTime>() {
-        @java.lang.Override
-        public NeedBeginTime parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new NeedBeginTime(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser<NeedBeginTime> parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<NeedBeginTime> getParserForType() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
-    public static final int NEED_BEGIN_TIME_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime needBeginTime_;
-    /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     * @return Whether the needBeginTime field is set.
+     * <code>uint32 chapter_id = 1;</code>
+     * @return The chapterId.
      */
     @java.lang.Override
-    public boolean hasNeedBeginTime() {
-      return needBeginTime_ != null;
-    }
-    /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     * @return The needBeginTime.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getNeedBeginTime() {
-      return needBeginTime_ == null ? emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.getDefaultInstance() : needBeginTime_;
-    }
-    /**
-     * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder() {
-      return getNeedBeginTime();
+    public int getChapterId() {
+      return chapterId_;
     }
 
-    public static final int NEED_PLAYER_LEVEL_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel needPlayerLevel_;
-    /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     * @return Whether the needPlayerLevel field is set.
-     */
-    @java.lang.Override
-    public boolean hasNeedPlayerLevel() {
-      return needPlayerLevel_ != null;
-    }
-    /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     * @return The needPlayerLevel.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getNeedPlayerLevel() {
-      return needPlayerLevel_ == null ? emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
-    }
-    /**
-     * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder() {
-      return getNeedPlayerLevel();
-    }
-
-    public static final int CHAPTER_STATE_FIELD_NUMBER = 7;
+    public static final int CHAPTER_STATE_FIELD_NUMBER = 2;
     private int chapterState_;
     /**
-     * <code>.ChapterState chapter_state = 7;</code>
+     * <code>.ChapterState chapter_state = 2;</code>
      * @return The enum numeric value on the wire for chapterState.
      */
     @java.lang.Override public int getChapterStateValue() {
       return chapterState_;
     }
     /**
-     * <code>.ChapterState chapter_state = 7;</code>
+     * <code>.ChapterState chapter_state = 2;</code>
      * @return The chapterState.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState getChapterState() {
@@ -1390,15 +210,56 @@ public final class ChapterStateNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState.UNRECOGNIZED : result;
     }
 
-    public static final int CHAPTER_ID_FIELD_NUMBER = 4;
-    private int chapterId_;
+    public static final int NEED_PLAYER_LEVEL_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel needPlayerLevel_;
     /**
-     * <code>uint32 chapter_id = 4;</code>
-     * @return The chapterId.
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     * @return Whether the needPlayerLevel field is set.
      */
     @java.lang.Override
-    public int getChapterId() {
-      return chapterId_;
+    public boolean hasNeedPlayerLevel() {
+      return needPlayerLevel_ != null;
+    }
+    /**
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     * @return The needPlayerLevel.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getNeedPlayerLevel() {
+      return needPlayerLevel_ == null ? emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
+    }
+    /**
+     * <code>.NeedPlayerLevel need_player_level = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder() {
+      return getNeedPlayerLevel();
+    }
+
+    public static final int NEED_BEGIN_TIME_FIELD_NUMBER = 11;
+    private emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime needBeginTime_;
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     * @return Whether the needBeginTime field is set.
+     */
+    @java.lang.Override
+    public boolean hasNeedBeginTime() {
+      return needBeginTime_ != null;
+    }
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     * @return The needBeginTime.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getNeedBeginTime() {
+      return needBeginTime_ == null ? emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.getDefaultInstance() : needBeginTime_;
+    }
+    /**
+     * <code>.NeedBeginTime need_begin_time = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder() {
+      return getNeedBeginTime();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1415,17 +276,17 @@ public final class ChapterStateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (needPlayerLevel_ != null) {
-        output.writeMessage(3, getNeedPlayerLevel());
-      }
       if (chapterId_ != 0) {
-        output.writeUInt32(4, chapterId_);
+        output.writeUInt32(1, chapterId_);
       }
       if (chapterState_ != emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState.CHAPTER_STATE_INVALID.getNumber()) {
-        output.writeEnum(7, chapterState_);
+        output.writeEnum(2, chapterState_);
+      }
+      if (needPlayerLevel_ != null) {
+        output.writeMessage(8, getNeedPlayerLevel());
       }
       if (needBeginTime_ != null) {
-        output.writeMessage(10, getNeedBeginTime());
+        output.writeMessage(11, getNeedBeginTime());
       }
       unknownFields.writeTo(output);
     }
@@ -1436,21 +297,21 @@ public final class ChapterStateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (needPlayerLevel_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getNeedPlayerLevel());
-      }
       if (chapterId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, chapterId_);
+          .computeUInt32Size(1, chapterId_);
       }
       if (chapterState_ != emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState.CHAPTER_STATE_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, chapterState_);
+          .computeEnumSize(2, chapterState_);
+      }
+      if (needPlayerLevel_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getNeedPlayerLevel());
       }
       if (needBeginTime_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getNeedBeginTime());
+          .computeMessageSize(11, getNeedBeginTime());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1467,19 +328,19 @@ public final class ChapterStateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify other = (emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify) obj;
 
-      if (hasNeedBeginTime() != other.hasNeedBeginTime()) return false;
-      if (hasNeedBeginTime()) {
-        if (!getNeedBeginTime()
-            .equals(other.getNeedBeginTime())) return false;
-      }
+      if (getChapterId()
+          != other.getChapterId()) return false;
+      if (chapterState_ != other.chapterState_) return false;
       if (hasNeedPlayerLevel() != other.hasNeedPlayerLevel()) return false;
       if (hasNeedPlayerLevel()) {
         if (!getNeedPlayerLevel()
             .equals(other.getNeedPlayerLevel())) return false;
       }
-      if (chapterState_ != other.chapterState_) return false;
-      if (getChapterId()
-          != other.getChapterId()) return false;
+      if (hasNeedBeginTime() != other.hasNeedBeginTime()) return false;
+      if (hasNeedBeginTime()) {
+        if (!getNeedBeginTime()
+            .equals(other.getNeedBeginTime())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1491,18 +352,18 @@ public final class ChapterStateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasNeedBeginTime()) {
-        hash = (37 * hash) + NEED_BEGIN_TIME_FIELD_NUMBER;
-        hash = (53 * hash) + getNeedBeginTime().hashCode();
-      }
+      hash = (37 * hash) + CHAPTER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChapterId();
+      hash = (37 * hash) + CHAPTER_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + chapterState_;
       if (hasNeedPlayerLevel()) {
         hash = (37 * hash) + NEED_PLAYER_LEVEL_FIELD_NUMBER;
         hash = (53 * hash) + getNeedPlayerLevel().hashCode();
       }
-      hash = (37 * hash) + CHAPTER_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + chapterState_;
-      hash = (37 * hash) + CHAPTER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChapterId();
+      if (hasNeedBeginTime()) {
+        hash = (37 * hash) + NEED_BEGIN_TIME_FIELD_NUMBER;
+        hash = (53 * hash) + getNeedBeginTime().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1599,11 +460,6 @@ public final class ChapterStateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21508
-     * Obf: MCCCGABFHBK
-     * </pre>
-     *
      * Protobuf type {@code ChapterStateNotify}
      */
     public static final class Builder extends
@@ -1641,22 +497,22 @@ public final class ChapterStateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (needBeginTimeBuilder_ == null) {
-          needBeginTime_ = null;
-        } else {
-          needBeginTime_ = null;
-          needBeginTimeBuilder_ = null;
-        }
+        chapterId_ = 0;
+
+        chapterState_ = 0;
+
         if (needPlayerLevelBuilder_ == null) {
           needPlayerLevel_ = null;
         } else {
           needPlayerLevel_ = null;
           needPlayerLevelBuilder_ = null;
         }
-        chapterState_ = 0;
-
-        chapterId_ = 0;
-
+        if (needBeginTimeBuilder_ == null) {
+          needBeginTime_ = null;
+        } else {
+          needBeginTime_ = null;
+          needBeginTimeBuilder_ = null;
+        }
         return this;
       }
 
@@ -1683,18 +539,18 @@ public final class ChapterStateNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify buildPartial() {
         emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify result = new emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify(this);
-        if (needBeginTimeBuilder_ == null) {
-          result.needBeginTime_ = needBeginTime_;
-        } else {
-          result.needBeginTime_ = needBeginTimeBuilder_.build();
-        }
+        result.chapterId_ = chapterId_;
+        result.chapterState_ = chapterState_;
         if (needPlayerLevelBuilder_ == null) {
           result.needPlayerLevel_ = needPlayerLevel_;
         } else {
           result.needPlayerLevel_ = needPlayerLevelBuilder_.build();
         }
-        result.chapterState_ = chapterState_;
-        result.chapterId_ = chapterId_;
+        if (needBeginTimeBuilder_ == null) {
+          result.needBeginTime_ = needBeginTime_;
+        } else {
+          result.needBeginTime_ = needBeginTimeBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1743,17 +599,17 @@ public final class ChapterStateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify other) {
         if (other == emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.getDefaultInstance()) return this;
-        if (other.hasNeedBeginTime()) {
-          mergeNeedBeginTime(other.getNeedBeginTime());
-        }
-        if (other.hasNeedPlayerLevel()) {
-          mergeNeedPlayerLevel(other.getNeedPlayerLevel());
+        if (other.getChapterId() != 0) {
+          setChapterId(other.getChapterId());
         }
         if (other.chapterState_ != 0) {
           setChapterStateValue(other.getChapterStateValue());
         }
-        if (other.getChapterId() != 0) {
-          setChapterId(other.getChapterId());
+        if (other.hasNeedPlayerLevel()) {
+          mergeNeedPlayerLevel(other.getNeedPlayerLevel());
+        }
+        if (other.hasNeedBeginTime()) {
+          mergeNeedBeginTime(other.getNeedBeginTime());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1784,254 +640,47 @@ public final class ChapterStateNotifyOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime needBeginTime_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder> needBeginTimeBuilder_;
+      private int chapterId_ ;
       /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       * @return Whether the needBeginTime field is set.
+       * <code>uint32 chapter_id = 1;</code>
+       * @return The chapterId.
        */
-      public boolean hasNeedBeginTime() {
-        return needBeginTimeBuilder_ != null || needBeginTime_ != null;
+      @java.lang.Override
+      public int getChapterId() {
+        return chapterId_;
       }
       /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       * @return The needBeginTime.
+       * <code>uint32 chapter_id = 1;</code>
+       * @param value The chapterId to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime getNeedBeginTime() {
-        if (needBeginTimeBuilder_ == null) {
-          return needBeginTime_ == null ? emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.getDefaultInstance() : needBeginTime_;
-        } else {
-          return needBeginTimeBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public Builder setNeedBeginTime(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime value) {
-        if (needBeginTimeBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          needBeginTime_ = value;
-          onChanged();
-        } else {
-          needBeginTimeBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public Builder setNeedBeginTime(
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder builderForValue) {
-        if (needBeginTimeBuilder_ == null) {
-          needBeginTime_ = builderForValue.build();
-          onChanged();
-        } else {
-          needBeginTimeBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public Builder mergeNeedBeginTime(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime value) {
-        if (needBeginTimeBuilder_ == null) {
-          if (needBeginTime_ != null) {
-            needBeginTime_ =
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.newBuilder(needBeginTime_).mergeFrom(value).buildPartial();
-          } else {
-            needBeginTime_ = value;
-          }
-          onChanged();
-        } else {
-          needBeginTimeBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public Builder clearNeedBeginTime() {
-        if (needBeginTimeBuilder_ == null) {
-          needBeginTime_ = null;
-          onChanged();
-        } else {
-          needBeginTime_ = null;
-          needBeginTimeBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder getNeedBeginTimeBuilder() {
+      public Builder setChapterId(int value) {
         
+        chapterId_ = value;
         onChanged();
-        return getNeedBeginTimeFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder() {
-        if (needBeginTimeBuilder_ != null) {
-          return needBeginTimeBuilder_.getMessageOrBuilder();
-        } else {
-          return needBeginTime_ == null ?
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.getDefaultInstance() : needBeginTime_;
-        }
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedBeginTime need_begin_time = 10;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder> 
-          getNeedBeginTimeFieldBuilder() {
-        if (needBeginTimeBuilder_ == null) {
-          needBeginTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTime.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedBeginTimeOrBuilder>(
-                  getNeedBeginTime(),
-                  getParentForChildren(),
-                  isClean());
-          needBeginTime_ = null;
-        }
-        return needBeginTimeBuilder_;
-      }
-
-      private emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel needPlayerLevel_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder> needPlayerLevelBuilder_;
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       * @return Whether the needPlayerLevel field is set.
-       */
-      public boolean hasNeedPlayerLevel() {
-        return needPlayerLevelBuilder_ != null || needPlayerLevel_ != null;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       * @return The needPlayerLevel.
-       */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel getNeedPlayerLevel() {
-        if (needPlayerLevelBuilder_ == null) {
-          return needPlayerLevel_ == null ? emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
-        } else {
-          return needPlayerLevelBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      public Builder setNeedPlayerLevel(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel value) {
-        if (needPlayerLevelBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          needPlayerLevel_ = value;
-          onChanged();
-        } else {
-          needPlayerLevelBuilder_.setMessage(value);
-        }
-
         return this;
       }
       /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
+       * <code>uint32 chapter_id = 1;</code>
+       * @return This builder for chaining.
        */
-      public Builder setNeedPlayerLevel(
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder builderForValue) {
-        if (needPlayerLevelBuilder_ == null) {
-          needPlayerLevel_ = builderForValue.build();
-          onChanged();
-        } else {
-          needPlayerLevelBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      public Builder mergeNeedPlayerLevel(emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel value) {
-        if (needPlayerLevelBuilder_ == null) {
-          if (needPlayerLevel_ != null) {
-            needPlayerLevel_ =
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.newBuilder(needPlayerLevel_).mergeFrom(value).buildPartial();
-          } else {
-            needPlayerLevel_ = value;
-          }
-          onChanged();
-        } else {
-          needPlayerLevelBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      public Builder clearNeedPlayerLevel() {
-        if (needPlayerLevelBuilder_ == null) {
-          needPlayerLevel_ = null;
-          onChanged();
-        } else {
-          needPlayerLevel_ = null;
-          needPlayerLevelBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder getNeedPlayerLevelBuilder() {
+      public Builder clearChapterId() {
         
+        chapterId_ = 0;
         onChanged();
-        return getNeedPlayerLevelFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      public emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder() {
-        if (needPlayerLevelBuilder_ != null) {
-          return needPlayerLevelBuilder_.getMessageOrBuilder();
-        } else {
-          return needPlayerLevel_ == null ?
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
-        }
-      }
-      /**
-       * <code>.ChapterStateNotify.NeedPlayerLevel need_player_level = 3;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder> 
-          getNeedPlayerLevelFieldBuilder() {
-        if (needPlayerLevelBuilder_ == null) {
-          needPlayerLevelBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.ChapterStateNotifyOuterClass.ChapterStateNotify.NeedPlayerLevelOrBuilder>(
-                  getNeedPlayerLevel(),
-                  getParentForChildren(),
-                  isClean());
-          needPlayerLevel_ = null;
-        }
-        return needPlayerLevelBuilder_;
+        return this;
       }
 
       private int chapterState_ = 0;
       /**
-       * <code>.ChapterState chapter_state = 7;</code>
+       * <code>.ChapterState chapter_state = 2;</code>
        * @return The enum numeric value on the wire for chapterState.
        */
       @java.lang.Override public int getChapterStateValue() {
         return chapterState_;
       }
       /**
-       * <code>.ChapterState chapter_state = 7;</code>
+       * <code>.ChapterState chapter_state = 2;</code>
        * @param value The enum numeric value on the wire for chapterState to set.
        * @return This builder for chaining.
        */
@@ -2042,7 +691,7 @@ public final class ChapterStateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChapterState chapter_state = 7;</code>
+       * <code>.ChapterState chapter_state = 2;</code>
        * @return The chapterState.
        */
       @java.lang.Override
@@ -2052,7 +701,7 @@ public final class ChapterStateNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ChapterStateOuterClass.ChapterState.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ChapterState chapter_state = 7;</code>
+       * <code>.ChapterState chapter_state = 2;</code>
        * @param value The chapterState to set.
        * @return This builder for chaining.
        */
@@ -2066,7 +715,7 @@ public final class ChapterStateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChapterState chapter_state = 7;</code>
+       * <code>.ChapterState chapter_state = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearChapterState() {
@@ -2076,36 +725,243 @@ public final class ChapterStateNotifyOuterClass {
         return this;
       }
 
-      private int chapterId_ ;
+      private emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel needPlayerLevel_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder> needPlayerLevelBuilder_;
       /**
-       * <code>uint32 chapter_id = 4;</code>
-       * @return The chapterId.
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       * @return Whether the needPlayerLevel field is set.
        */
-      @java.lang.Override
-      public int getChapterId() {
-        return chapterId_;
+      public boolean hasNeedPlayerLevel() {
+        return needPlayerLevelBuilder_ != null || needPlayerLevel_ != null;
       }
       /**
-       * <code>uint32 chapter_id = 4;</code>
-       * @param value The chapterId to set.
-       * @return This builder for chaining.
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       * @return The needPlayerLevel.
        */
-      public Builder setChapterId(int value) {
-        
-        chapterId_ = value;
-        onChanged();
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getNeedPlayerLevel() {
+        if (needPlayerLevelBuilder_ == null) {
+          return needPlayerLevel_ == null ? emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
+        } else {
+          return needPlayerLevelBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      public Builder setNeedPlayerLevel(emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel value) {
+        if (needPlayerLevelBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          needPlayerLevel_ = value;
+          onChanged();
+        } else {
+          needPlayerLevelBuilder_.setMessage(value);
+        }
+
         return this;
       }
       /**
-       * <code>uint32 chapter_id = 4;</code>
-       * @return This builder for chaining.
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
        */
-      public Builder clearChapterId() {
-        
-        chapterId_ = 0;
-        onChanged();
+      public Builder setNeedPlayerLevel(
+          emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder builderForValue) {
+        if (needPlayerLevelBuilder_ == null) {
+          needPlayerLevel_ = builderForValue.build();
+          onChanged();
+        } else {
+          needPlayerLevelBuilder_.setMessage(builderForValue.build());
+        }
+
         return this;
       }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      public Builder mergeNeedPlayerLevel(emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel value) {
+        if (needPlayerLevelBuilder_ == null) {
+          if (needPlayerLevel_ != null) {
+            needPlayerLevel_ =
+              emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.newBuilder(needPlayerLevel_).mergeFrom(value).buildPartial();
+          } else {
+            needPlayerLevel_ = value;
+          }
+          onChanged();
+        } else {
+          needPlayerLevelBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      public Builder clearNeedPlayerLevel() {
+        if (needPlayerLevelBuilder_ == null) {
+          needPlayerLevel_ = null;
+          onChanged();
+        } else {
+          needPlayerLevel_ = null;
+          needPlayerLevelBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder getNeedPlayerLevelBuilder() {
+        
+        onChanged();
+        return getNeedPlayerLevelFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder getNeedPlayerLevelOrBuilder() {
+        if (needPlayerLevelBuilder_ != null) {
+          return needPlayerLevelBuilder_.getMessageOrBuilder();
+        } else {
+          return needPlayerLevel_ == null ?
+              emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.getDefaultInstance() : needPlayerLevel_;
+        }
+      }
+      /**
+       * <code>.NeedPlayerLevel need_player_level = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder> 
+          getNeedPlayerLevelFieldBuilder() {
+        if (needPlayerLevelBuilder_ == null) {
+          needPlayerLevelBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder>(
+                  getNeedPlayerLevel(),
+                  getParentForChildren(),
+                  isClean());
+          needPlayerLevel_ = null;
+        }
+        return needPlayerLevelBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime needBeginTime_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder> needBeginTimeBuilder_;
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       * @return Whether the needBeginTime field is set.
+       */
+      public boolean hasNeedBeginTime() {
+        return needBeginTimeBuilder_ != null || needBeginTime_ != null;
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       * @return The needBeginTime.
+       */
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getNeedBeginTime() {
+        if (needBeginTimeBuilder_ == null) {
+          return needBeginTime_ == null ? emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.getDefaultInstance() : needBeginTime_;
+        } else {
+          return needBeginTimeBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public Builder setNeedBeginTime(emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime value) {
+        if (needBeginTimeBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          needBeginTime_ = value;
+          onChanged();
+        } else {
+          needBeginTimeBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public Builder setNeedBeginTime(
+          emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder builderForValue) {
+        if (needBeginTimeBuilder_ == null) {
+          needBeginTime_ = builderForValue.build();
+          onChanged();
+        } else {
+          needBeginTimeBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public Builder mergeNeedBeginTime(emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime value) {
+        if (needBeginTimeBuilder_ == null) {
+          if (needBeginTime_ != null) {
+            needBeginTime_ =
+              emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.newBuilder(needBeginTime_).mergeFrom(value).buildPartial();
+          } else {
+            needBeginTime_ = value;
+          }
+          onChanged();
+        } else {
+          needBeginTimeBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public Builder clearNeedBeginTime() {
+        if (needBeginTimeBuilder_ == null) {
+          needBeginTime_ = null;
+          onChanged();
+        } else {
+          needBeginTime_ = null;
+          needBeginTimeBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder getNeedBeginTimeBuilder() {
+        
+        onChanged();
+        return getNeedBeginTimeFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder getNeedBeginTimeOrBuilder() {
+        if (needBeginTimeBuilder_ != null) {
+          return needBeginTimeBuilder_.getMessageOrBuilder();
+        } else {
+          return needBeginTime_ == null ?
+              emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.getDefaultInstance() : needBeginTime_;
+        }
+      }
+      /**
+       * <code>.NeedBeginTime need_begin_time = 11;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder> 
+          getNeedBeginTimeFieldBuilder() {
+        if (needBeginTimeBuilder_ == null) {
+          needBeginTimeBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder>(
+                  getNeedBeginTime(),
+                  getParentForChildren(),
+                  isClean());
+          needBeginTime_ = null;
+        }
+        return needBeginTimeBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2164,16 +1020,6 @@ public final class ChapterStateNotifyOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ChapterStateNotify_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ChapterStateNotify_NeedPlayerLevel_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ChapterStateNotify_NeedBeginTime_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ChapterStateNotify_NeedBeginTime_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2184,41 +1030,30 @@ public final class ChapterStateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030ChapterStateNotify.proto\032\022ChapterState" +
-      ".proto\"\316\002\n\022ChapterStateNotify\022:\n\017need_be" +
-      "gin_time\030\n \001(\0132!.ChapterStateNotify.Need" +
-      "BeginTime\022>\n\021need_player_level\030\003 \001(\0132#.C" +
-      "hapterStateNotify.NeedPlayerLevel\022$\n\rcha" +
-      "pter_state\030\007 \001(\0162\r.ChapterState\022\022\n\nchapt" +
-      "er_id\030\004 \001(\r\032B\n\017NeedPlayerLevel\022\020\n\010is_lim" +
-      "it\030\001 \001(\010\022\035\n\025configNeedPlayerLevel\030\013 \001(\r\032" +
-      ">\n\rNeedBeginTime\022\033\n\023configNeedBeginTime\030" +
-      "\005 \001(\r\022\020\n\010is_limit\030\001 \001(\010B\033\n\031emu.grasscutt" +
-      "er.net.protob\006proto3"
+      ".proto\032\025NeedPlayerLevel.proto\032\023NeedBegin" +
+      "Time.proto\"\244\001\n\022ChapterStateNotify\022\022\n\ncha" +
+      "pter_id\030\001 \001(\r\022$\n\rchapter_state\030\002 \001(\0162\r.C" +
+      "hapterState\022+\n\021need_player_level\030\010 \001(\0132\020" +
+      ".NeedPlayerLevel\022\'\n\017need_begin_time\030\013 \001(" +
+      "\0132\016.NeedBeginTimeB\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.ChapterStateOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.NeedBeginTimeOuterClass.getDescriptor(),
         });
     internal_static_ChapterStateNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_ChapterStateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChapterStateNotify_descriptor,
-        new java.lang.String[] { "NeedBeginTime", "NeedPlayerLevel", "ChapterState", "ChapterId", });
-    internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor =
-      internal_static_ChapterStateNotify_descriptor.getNestedTypes().get(0);
-    internal_static_ChapterStateNotify_NeedPlayerLevel_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ChapterStateNotify_NeedPlayerLevel_descriptor,
-        new java.lang.String[] { "IsLimit", "ConfigNeedPlayerLevel", });
-    internal_static_ChapterStateNotify_NeedBeginTime_descriptor =
-      internal_static_ChapterStateNotify_descriptor.getNestedTypes().get(1);
-    internal_static_ChapterStateNotify_NeedBeginTime_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ChapterStateNotify_NeedBeginTime_descriptor,
-        new java.lang.String[] { "ConfigNeedBeginTime", "IsLimit", });
+        new java.lang.String[] { "ChapterId", "ChapterState", "NeedPlayerLevel", "NeedBeginTime", });
     emu.grasscutter.net.proto.ChapterStateOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.NeedBeginTimeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateOuterClass.java
index ca458d660..a40929987 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChapterStateOuterClass.java
@@ -15,10 +15,6 @@ public final class ChapterStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: IGBMFOLFJLJ
-   * </pre>
-   *
    * Protobuf enum {@code ChapterState}
    */
   public enum ChapterState
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoNotifyOuterClass.java
index 1d23d873c..a88838c25 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class ChatChannelInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      * @return Whether the channelInfo field is set.
      */
     boolean hasChannelInfo();
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      * @return The channelInfo.
      */
     emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo getChannelInfo();
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      */
     emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 5319
-   * Obf: BMILFLEIHON
-   * </pre>
-   *
    * Protobuf type {@code ChatChannelInfoNotify}
    */
   public static final class ChatChannelInfoNotify extends
@@ -83,7 +78,7 @@ public final class ChatChannelInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 122: {
               emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder subBuilder = null;
               if (channelInfo_ != null) {
                 subBuilder = channelInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class ChatChannelInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ChatChannelInfoNotifyOuterClass.ChatChannelInfoNotify.class, emu.grasscutter.net.proto.ChatChannelInfoNotifyOuterClass.ChatChannelInfoNotify.Builder.class);
     }
 
-    public static final int CHANNEL_INFO_FIELD_NUMBER = 4;
+    public static final int CHANNEL_INFO_FIELD_NUMBER = 15;
     private emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo channelInfo_;
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      * @return Whether the channelInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class ChatChannelInfoNotifyOuterClass {
       return channelInfo_ != null;
     }
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      * @return The channelInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class ChatChannelInfoNotifyOuterClass {
       return channelInfo_ == null ? emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.getDefaultInstance() : channelInfo_;
     }
     /**
-     * <code>.ChatChannelInfo channel_info = 4;</code>
+     * <code>.ChatChannelInfo channel_info = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class ChatChannelInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (channelInfo_ != null) {
-        output.writeMessage(4, getChannelInfo());
+        output.writeMessage(15, getChannelInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class ChatChannelInfoNotifyOuterClass {
       size = 0;
       if (channelInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getChannelInfo());
+          .computeMessageSize(15, getChannelInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class ChatChannelInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5319
-     * Obf: BMILFLEIHON
-     * </pre>
-     *
      * Protobuf type {@code ChatChannelInfoNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class ChatChannelInfoNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder> channelInfoBuilder_;
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        * @return Whether the channelInfo field is set.
        */
       public boolean hasChannelInfo() {
         return channelInfoBuilder_ != null || channelInfo_ != null;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        * @return The channelInfo.
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo getChannelInfo() {
@@ -496,7 +486,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public Builder setChannelInfo(emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo value) {
         if (channelInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public Builder setChannelInfo(
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public Builder mergeChannelInfo(emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo value) {
         if (channelInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public Builder clearChannelInfo() {
         if (channelInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder getChannelInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         return getChannelInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder() {
         if (channelInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class ChatChannelInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 4;</code>
+       * <code>.ChatChannelInfo channel_info = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder> 
@@ -661,7 +651,7 @@ public final class ChatChannelInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033ChatChannelInfoNotify.proto\032\025ChatChann" +
       "elInfo.proto\"?\n\025ChatChannelInfoNotify\022&\n" +
-      "\014channel_info\030\004 \001(\0132\020.ChatChannelInfoB\033\n" +
+      "\014channel_info\030\017 \001(\0132\020.ChatChannelInfoB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoOuterClass.java
index e36abe015..db309ac09 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelInfoOuterClass.java
@@ -19,20 +19,20 @@ public final class ChatChannelInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 channel_id = 13;</code>
+     * <code>uint32 channel_id = 2;</code>
      * @return The channelId.
      */
     int getChannelId();
 
     /**
-     * <code>bool is_shield = 4;</code>
+     * <code>bool is_shield = 3;</code>
      * @return The isShield.
      */
     boolean getIsShield();
   }
   /**
    * <pre>
-   * Obf: KDHDHJBABKP
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ChatChannelInfo}
@@ -79,16 +79,16 @@ public final class ChatChannelInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              isShield_ = input.readBool();
-              break;
-            }
-            case 104: {
+            case 16: {
 
               channelId_ = input.readUInt32();
               break;
             }
+            case 24: {
+
+              isShield_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -121,10 +121,10 @@ public final class ChatChannelInfoOuterClass {
               emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.class, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder.class);
     }
 
-    public static final int CHANNEL_ID_FIELD_NUMBER = 13;
+    public static final int CHANNEL_ID_FIELD_NUMBER = 2;
     private int channelId_;
     /**
-     * <code>uint32 channel_id = 13;</code>
+     * <code>uint32 channel_id = 2;</code>
      * @return The channelId.
      */
     @java.lang.Override
@@ -132,10 +132,10 @@ public final class ChatChannelInfoOuterClass {
       return channelId_;
     }
 
-    public static final int IS_SHIELD_FIELD_NUMBER = 4;
+    public static final int IS_SHIELD_FIELD_NUMBER = 3;
     private boolean isShield_;
     /**
-     * <code>bool is_shield = 4;</code>
+     * <code>bool is_shield = 3;</code>
      * @return The isShield.
      */
     @java.lang.Override
@@ -157,11 +157,11 @@ public final class ChatChannelInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isShield_ != false) {
-        output.writeBool(4, isShield_);
-      }
       if (channelId_ != 0) {
-        output.writeUInt32(13, channelId_);
+        output.writeUInt32(2, channelId_);
+      }
+      if (isShield_ != false) {
+        output.writeBool(3, isShield_);
       }
       unknownFields.writeTo(output);
     }
@@ -172,13 +172,13 @@ public final class ChatChannelInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isShield_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(4, isShield_);
-      }
       if (channelId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, channelId_);
+          .computeUInt32Size(2, channelId_);
+      }
+      if (isShield_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(3, isShield_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,7 +312,7 @@ public final class ChatChannelInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: KDHDHJBABKP
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ChatChannelInfo}
@@ -469,7 +469,7 @@ public final class ChatChannelInfoOuterClass {
 
       private int channelId_ ;
       /**
-       * <code>uint32 channel_id = 13;</code>
+       * <code>uint32 channel_id = 2;</code>
        * @return The channelId.
        */
       @java.lang.Override
@@ -477,7 +477,7 @@ public final class ChatChannelInfoOuterClass {
         return channelId_;
       }
       /**
-       * <code>uint32 channel_id = 13;</code>
+       * <code>uint32 channel_id = 2;</code>
        * @param value The channelId to set.
        * @return This builder for chaining.
        */
@@ -488,7 +488,7 @@ public final class ChatChannelInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 channel_id = 13;</code>
+       * <code>uint32 channel_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearChannelId() {
@@ -500,7 +500,7 @@ public final class ChatChannelInfoOuterClass {
 
       private boolean isShield_ ;
       /**
-       * <code>bool is_shield = 4;</code>
+       * <code>bool is_shield = 3;</code>
        * @return The isShield.
        */
       @java.lang.Override
@@ -508,7 +508,7 @@ public final class ChatChannelInfoOuterClass {
         return isShield_;
       }
       /**
-       * <code>bool is_shield = 4;</code>
+       * <code>bool is_shield = 3;</code>
        * @param value The isShield to set.
        * @return This builder for chaining.
        */
@@ -519,7 +519,7 @@ public final class ChatChannelInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_shield = 4;</code>
+       * <code>bool is_shield = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsShield() {
@@ -596,7 +596,7 @@ public final class ChatChannelInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025ChatChannelInfo.proto\"8\n\017ChatChannelIn" +
-      "fo\022\022\n\nchannel_id\030\r \001(\r\022\021\n\tis_shield\030\004 \001(" +
+      "fo\022\022\n\nchannel_id\030\002 \001(\r\022\021\n\tis_shield\030\003 \001(" +
       "\010B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelUpdateNotifyOuterClass.java
index dc4ec660d..0da365ac2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatChannelUpdateNotifyOuterClass.java
@@ -19,38 +19,33 @@ public final class ChatChannelUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 channel_id = 1;</code>
+     * <code>.ChatChannelInfo channel_info = 8;</code>
+     * @return Whether the channelInfo field is set.
+     */
+    boolean hasChannelInfo();
+    /**
+     * <code>.ChatChannelInfo channel_info = 8;</code>
+     * @return The channelInfo.
+     */
+    emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo getChannelInfo();
+    /**
+     * <code>.ChatChannelInfo channel_info = 8;</code>
+     */
+    emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder();
+
+    /**
+     * <code>uint32 channel_id = 12;</code>
      * @return The channelId.
      */
     int getChannelId();
 
     /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
-     * @return Whether the channelInfo field is set.
-     */
-    boolean hasChannelInfo();
-    /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
-     * @return The channelInfo.
-     */
-    emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo getChannelInfo();
-    /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
-     */
-    emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder();
-
-    /**
-     * <code>bool is_create = 15;</code>
+     * <code>bool is_create = 14;</code>
      * @return The isCreate.
      */
     boolean getIsCreate();
   }
   /**
-   * <pre>
-   * CmdId: 28285
-   * Obf: FCEBEKGCPLB
-   * </pre>
-   *
    * Protobuf type {@code ChatChannelUpdateNotify}
    */
   public static final class ChatChannelUpdateNotify extends
@@ -95,12 +90,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              channelId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 66: {
               emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder subBuilder = null;
               if (channelInfo_ != null) {
                 subBuilder = channelInfo_.toBuilder();
@@ -113,7 +103,12 @@ public final class ChatChannelUpdateNotifyOuterClass {
 
               break;
             }
-            case 120: {
+            case 96: {
+
+              channelId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
 
               isCreate_ = input.readBool();
               break;
@@ -150,21 +145,10 @@ public final class ChatChannelUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify.class, emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify.Builder.class);
     }
 
-    public static final int CHANNEL_ID_FIELD_NUMBER = 1;
-    private int channelId_;
-    /**
-     * <code>uint32 channel_id = 1;</code>
-     * @return The channelId.
-     */
-    @java.lang.Override
-    public int getChannelId() {
-      return channelId_;
-    }
-
-    public static final int CHANNEL_INFO_FIELD_NUMBER = 9;
+    public static final int CHANNEL_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo channelInfo_;
     /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
+     * <code>.ChatChannelInfo channel_info = 8;</code>
      * @return Whether the channelInfo field is set.
      */
     @java.lang.Override
@@ -172,7 +156,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
       return channelInfo_ != null;
     }
     /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
+     * <code>.ChatChannelInfo channel_info = 8;</code>
      * @return The channelInfo.
      */
     @java.lang.Override
@@ -180,17 +164,28 @@ public final class ChatChannelUpdateNotifyOuterClass {
       return channelInfo_ == null ? emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.getDefaultInstance() : channelInfo_;
     }
     /**
-     * <code>.ChatChannelInfo channel_info = 9;</code>
+     * <code>.ChatChannelInfo channel_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder() {
       return getChannelInfo();
     }
 
-    public static final int IS_CREATE_FIELD_NUMBER = 15;
+    public static final int CHANNEL_ID_FIELD_NUMBER = 12;
+    private int channelId_;
+    /**
+     * <code>uint32 channel_id = 12;</code>
+     * @return The channelId.
+     */
+    @java.lang.Override
+    public int getChannelId() {
+      return channelId_;
+    }
+
+    public static final int IS_CREATE_FIELD_NUMBER = 14;
     private boolean isCreate_;
     /**
-     * <code>bool is_create = 15;</code>
+     * <code>bool is_create = 14;</code>
      * @return The isCreate.
      */
     @java.lang.Override
@@ -212,14 +207,14 @@ public final class ChatChannelUpdateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (channelId_ != 0) {
-        output.writeUInt32(1, channelId_);
-      }
       if (channelInfo_ != null) {
-        output.writeMessage(9, getChannelInfo());
+        output.writeMessage(8, getChannelInfo());
+      }
+      if (channelId_ != 0) {
+        output.writeUInt32(12, channelId_);
       }
       if (isCreate_ != false) {
-        output.writeBool(15, isCreate_);
+        output.writeBool(14, isCreate_);
       }
       unknownFields.writeTo(output);
     }
@@ -230,17 +225,17 @@ public final class ChatChannelUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (channelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, channelId_);
-      }
       if (channelInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getChannelInfo());
+          .computeMessageSize(8, getChannelInfo());
+      }
+      if (channelId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, channelId_);
       }
       if (isCreate_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isCreate_);
+          .computeBoolSize(14, isCreate_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,13 +252,13 @@ public final class ChatChannelUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify other = (emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify) obj;
 
-      if (getChannelId()
-          != other.getChannelId()) return false;
       if (hasChannelInfo() != other.hasChannelInfo()) return false;
       if (hasChannelInfo()) {
         if (!getChannelInfo()
             .equals(other.getChannelInfo())) return false;
       }
+      if (getChannelId()
+          != other.getChannelId()) return false;
       if (getIsCreate()
           != other.getIsCreate()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -277,12 +272,12 @@ public final class ChatChannelUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChannelId();
       if (hasChannelInfo()) {
         hash = (37 * hash) + CHANNEL_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getChannelInfo().hashCode();
       }
+      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChannelId();
       hash = (37 * hash) + IS_CREATE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsCreate());
@@ -382,11 +377,6 @@ public final class ChatChannelUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28285
-     * Obf: FCEBEKGCPLB
-     * </pre>
-     *
      * Protobuf type {@code ChatChannelUpdateNotify}
      */
     public static final class Builder extends
@@ -424,14 +414,14 @@ public final class ChatChannelUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        channelId_ = 0;
-
         if (channelInfoBuilder_ == null) {
           channelInfo_ = null;
         } else {
           channelInfo_ = null;
           channelInfoBuilder_ = null;
         }
+        channelId_ = 0;
+
         isCreate_ = false;
 
         return this;
@@ -460,12 +450,12 @@ public final class ChatChannelUpdateNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify result = new emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify(this);
-        result.channelId_ = channelId_;
         if (channelInfoBuilder_ == null) {
           result.channelInfo_ = channelInfo_;
         } else {
           result.channelInfo_ = channelInfoBuilder_.build();
         }
+        result.channelId_ = channelId_;
         result.isCreate_ = isCreate_;
         onBuilt();
         return result;
@@ -515,12 +505,12 @@ public final class ChatChannelUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.ChatChannelUpdateNotifyOuterClass.ChatChannelUpdateNotify.getDefaultInstance()) return this;
-        if (other.getChannelId() != 0) {
-          setChannelId(other.getChannelId());
-        }
         if (other.hasChannelInfo()) {
           mergeChannelInfo(other.getChannelInfo());
         }
+        if (other.getChannelId() != 0) {
+          setChannelId(other.getChannelId());
+        }
         if (other.getIsCreate() != false) {
           setIsCreate(other.getIsCreate());
         }
@@ -553,49 +543,18 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
 
-      private int channelId_ ;
-      /**
-       * <code>uint32 channel_id = 1;</code>
-       * @return The channelId.
-       */
-      @java.lang.Override
-      public int getChannelId() {
-        return channelId_;
-      }
-      /**
-       * <code>uint32 channel_id = 1;</code>
-       * @param value The channelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChannelId(int value) {
-        
-        channelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 channel_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChannelId() {
-        
-        channelId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo channelInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder> channelInfoBuilder_;
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        * @return Whether the channelInfo field is set.
        */
       public boolean hasChannelInfo() {
         return channelInfoBuilder_ != null || channelInfo_ != null;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        * @return The channelInfo.
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo getChannelInfo() {
@@ -606,7 +565,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public Builder setChannelInfo(emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo value) {
         if (channelInfoBuilder_ == null) {
@@ -622,7 +581,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public Builder setChannelInfo(
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder builderForValue) {
@@ -636,7 +595,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public Builder mergeChannelInfo(emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo value) {
         if (channelInfoBuilder_ == null) {
@@ -654,7 +613,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public Builder clearChannelInfo() {
         if (channelInfoBuilder_ == null) {
@@ -668,7 +627,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder getChannelInfoBuilder() {
         
@@ -676,7 +635,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return getChannelInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       public emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder getChannelInfoOrBuilder() {
         if (channelInfoBuilder_ != null) {
@@ -687,7 +646,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatChannelInfo channel_info = 9;</code>
+       * <code>.ChatChannelInfo channel_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfo.Builder, emu.grasscutter.net.proto.ChatChannelInfoOuterClass.ChatChannelInfoOrBuilder> 
@@ -703,9 +662,40 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return channelInfoBuilder_;
       }
 
+      private int channelId_ ;
+      /**
+       * <code>uint32 channel_id = 12;</code>
+       * @return The channelId.
+       */
+      @java.lang.Override
+      public int getChannelId() {
+        return channelId_;
+      }
+      /**
+       * <code>uint32 channel_id = 12;</code>
+       * @param value The channelId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChannelId(int value) {
+        
+        channelId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 channel_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChannelId() {
+        
+        channelId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private boolean isCreate_ ;
       /**
-       * <code>bool is_create = 15;</code>
+       * <code>bool is_create = 14;</code>
        * @return The isCreate.
        */
       @java.lang.Override
@@ -713,7 +703,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return isCreate_;
       }
       /**
-       * <code>bool is_create = 15;</code>
+       * <code>bool is_create = 14;</code>
        * @param value The isCreate to set.
        * @return This builder for chaining.
        */
@@ -724,7 +714,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_create = 15;</code>
+       * <code>bool is_create = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsCreate() {
@@ -802,8 +792,8 @@ public final class ChatChannelUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035ChatChannelUpdateNotify.proto\032\025ChatCha" +
       "nnelInfo.proto\"h\n\027ChatChannelUpdateNotif" +
-      "y\022\022\n\nchannel_id\030\001 \001(\r\022&\n\014channel_info\030\t " +
-      "\001(\0132\020.ChatChannelInfo\022\021\n\tis_create\030\017 \001(\010" +
+      "y\022&\n\014channel_info\030\010 \001(\0132\020.ChatChannelInf" +
+      "o\022\022\n\nchannel_id\030\014 \001(\r\022\021\n\tis_create\030\016 \001(\010" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -816,7 +806,7 @@ public final class ChatChannelUpdateNotifyOuterClass {
     internal_static_ChatChannelUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChatChannelUpdateNotify_descriptor,
-        new java.lang.String[] { "ChannelId", "ChannelInfo", "IsCreate", });
+        new java.lang.String[] { "ChannelInfo", "ChannelId", "IsCreate", });
     emu.grasscutter.net.proto.ChatChannelInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
index e9ecd7432..f9a09355c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChatInfoOuterClass.java
@@ -19,85 +19,81 @@ public final class ChatInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 to_uid = 10;</code>
-     * @return The toUid.
+     * <code>bool is_read = 4;</code>
+     * @return The isRead.
      */
-    int getToUid();
+    boolean getIsRead();
 
     /**
-     * <code>uint32 time = 13;</code>
+     * <code>uint32 time = 8;</code>
      * @return The time.
      */
     int getTime();
 
     /**
-     * <code>uint32 uid = 4;</code>
+     * <code>uint32 to_uid = 5;</code>
+     * @return The toUid.
+     */
+    int getToUid();
+
+    /**
+     * <code>uint32 sequence = 7;</code>
+     * @return The sequence.
+     */
+    int getSequence();
+
+    /**
+     * <code>uint32 uid = 10;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>string text = 962;</code>
+     * <code>uint32 icon = 21;</code>
+     * @return Whether the icon field is set.
+     */
+    boolean hasIcon();
+    /**
+     * <code>uint32 icon = 21;</code>
+     * @return The icon.
+     */
+    int getIcon();
+
+    /**
+     * <code>string text = 357;</code>
      * @return Whether the text field is set.
      */
     boolean hasText();
     /**
-     * <code>string text = 962;</code>
+     * <code>string text = 357;</code>
      * @return The text.
      */
     java.lang.String getText();
     /**
-     * <code>string text = 962;</code>
+     * <code>string text = 357;</code>
      * @return The bytes for text.
      */
     com.google.protobuf.ByteString
         getTextBytes();
 
     /**
-     * <code>uint32 icon = 1562;</code>
-     * @return Whether the icon field is set.
-     */
-    boolean hasIcon();
-    /**
-     * <code>uint32 icon = 1562;</code>
-     * @return The icon.
-     */
-    int getIcon();
-
-    /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      * @return Whether the systemHint field is set.
      */
     boolean hasSystemHint();
     /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      * @return The systemHint.
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint getSystemHint();
     /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintOrBuilder getSystemHintOrBuilder();
 
-    /**
-     * <code>bool is_read = 7;</code>
-     * @return The isRead.
-     */
-    boolean getIsRead();
-
-    /**
-     * <code>uint32 sequence = 5;</code>
-     * @return The sequence.
-     */
-    int getSequence();
-
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.ContentCase getContentCase();
   }
   /**
-   * <pre>
-   * Obf: KFPJAAEHBNB
-   * </pre>
-   *
    * Protobuf type {@code ChatInfo}
    */
   public static final class ChatInfo extends
@@ -144,32 +140,43 @@ public final class ChatInfoOuterClass {
               break;
             case 32: {
 
-              uid_ = input.readUInt32();
+              isRead_ = input.readBool();
               break;
             }
             case 40: {
 
-              sequence_ = input.readUInt32();
+              toUid_ = input.readUInt32();
               break;
             }
             case 56: {
 
-              isRead_ = input.readBool();
+              sequence_ = input.readUInt32();
               break;
             }
-            case 80: {
-
-              toUid_ = input.readUInt32();
-              break;
-            }
-            case 104: {
+            case 64: {
 
               time_ = input.readUInt32();
               break;
             }
-            case 6730: {
+            case 80: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
+            case 168: {
+              contentCase_ = 21;
+              content_ = input.readUInt32();
+              break;
+            }
+            case 2858: {
+              java.lang.String s = input.readStringRequireUtf8();
+              contentCase_ = 357;
+              content_ = s;
+              break;
+            }
+            case 7378: {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.Builder subBuilder = null;
-              if (contentCase_ == 841) {
+              if (contentCase_ == 922) {
                 subBuilder = ((emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_).toBuilder();
               }
               content_ =
@@ -178,18 +185,7 @@ public final class ChatInfoOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_);
                 content_ = subBuilder.buildPartial();
               }
-              contentCase_ = 841;
-              break;
-            }
-            case 7698: {
-              java.lang.String s = input.readStringRequireUtf8();
-              contentCase_ = 962;
-              content_ = s;
-              break;
-            }
-            case 12496: {
-              contentCase_ = 1562;
-              content_ = input.readUInt32();
+              contentCase_ = 922;
               break;
             }
             default: {
@@ -225,10 +221,6 @@ public final class ChatInfoOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: LGDLFPKODMA
-     * </pre>
-     *
      * Protobuf enum {@code ChatInfo.SystemHintType}
      */
     public enum SystemHintType
@@ -838,9 +830,9 @@ public final class ChatInfoOuterClass {
     public enum ContentCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      TEXT(962),
-      ICON(1562),
-      SYSTEM_HINT(841),
+      ICON(21),
+      TEXT(357),
+      SYSTEM_HINT(922),
       CONTENT_NOT_SET(0);
       private final int value;
       private ContentCase(int value) {
@@ -858,9 +850,9 @@ public final class ChatInfoOuterClass {
 
       public static ContentCase forNumber(int value) {
         switch (value) {
-          case 962: return TEXT;
-          case 1562: return ICON;
-          case 841: return SYSTEM_HINT;
+          case 21: return ICON;
+          case 357: return TEXT;
+          case 922: return SYSTEM_HINT;
           case 0: return CONTENT_NOT_SET;
           default: return null;
         }
@@ -876,21 +868,21 @@ public final class ChatInfoOuterClass {
           contentCase_);
     }
 
-    public static final int TO_UID_FIELD_NUMBER = 10;
-    private int toUid_;
+    public static final int IS_READ_FIELD_NUMBER = 4;
+    private boolean isRead_;
     /**
-     * <code>uint32 to_uid = 10;</code>
-     * @return The toUid.
+     * <code>bool is_read = 4;</code>
+     * @return The isRead.
      */
     @java.lang.Override
-    public int getToUid() {
-      return toUid_;
+    public boolean getIsRead() {
+      return isRead_;
     }
 
-    public static final int TIME_FIELD_NUMBER = 13;
+    public static final int TIME_FIELD_NUMBER = 8;
     private int time_;
     /**
-     * <code>uint32 time = 13;</code>
+     * <code>uint32 time = 8;</code>
      * @return The time.
      */
     @java.lang.Override
@@ -898,10 +890,32 @@ public final class ChatInfoOuterClass {
       return time_;
     }
 
-    public static final int UID_FIELD_NUMBER = 4;
+    public static final int TO_UID_FIELD_NUMBER = 5;
+    private int toUid_;
+    /**
+     * <code>uint32 to_uid = 5;</code>
+     * @return The toUid.
+     */
+    @java.lang.Override
+    public int getToUid() {
+      return toUid_;
+    }
+
+    public static final int SEQUENCE_FIELD_NUMBER = 7;
+    private int sequence_;
+    /**
+     * <code>uint32 sequence = 7;</code>
+     * @return The sequence.
+     */
+    @java.lang.Override
+    public int getSequence() {
+      return sequence_;
+    }
+
+    public static final int UID_FIELD_NUMBER = 10;
     private int uid_;
     /**
-     * <code>uint32 uid = 4;</code>
+     * <code>uint32 uid = 10;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -909,21 +923,42 @@ public final class ChatInfoOuterClass {
       return uid_;
     }
 
-    public static final int TEXT_FIELD_NUMBER = 962;
+    public static final int ICON_FIELD_NUMBER = 21;
     /**
-     * <code>string text = 962;</code>
+     * <code>uint32 icon = 21;</code>
+     * @return Whether the icon field is set.
+     */
+    @java.lang.Override
+    public boolean hasIcon() {
+      return contentCase_ == 21;
+    }
+    /**
+     * <code>uint32 icon = 21;</code>
+     * @return The icon.
+     */
+    @java.lang.Override
+    public int getIcon() {
+      if (contentCase_ == 21) {
+        return (java.lang.Integer) content_;
+      }
+      return 0;
+    }
+
+    public static final int TEXT_FIELD_NUMBER = 357;
+    /**
+     * <code>string text = 357;</code>
      * @return Whether the text field is set.
      */
     public boolean hasText() {
-      return contentCase_ == 962;
+      return contentCase_ == 357;
     }
     /**
-     * <code>string text = 962;</code>
+     * <code>string text = 357;</code>
      * @return The text.
      */
     public java.lang.String getText() {
       java.lang.Object ref = "";
-      if (contentCase_ == 962) {
+      if (contentCase_ == 357) {
         ref = content_;
       }
       if (ref instanceof java.lang.String) {
@@ -932,27 +967,27 @@ public final class ChatInfoOuterClass {
         com.google.protobuf.ByteString bs = 
             (com.google.protobuf.ByteString) ref;
         java.lang.String s = bs.toStringUtf8();
-        if (contentCase_ == 962) {
+        if (contentCase_ == 357) {
           content_ = s;
         }
         return s;
       }
     }
     /**
-     * <code>string text = 962;</code>
+     * <code>string text = 357;</code>
      * @return The bytes for text.
      */
     public com.google.protobuf.ByteString
         getTextBytes() {
       java.lang.Object ref = "";
-      if (contentCase_ == 962) {
+      if (contentCase_ == 357) {
         ref = content_;
       }
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        if (contentCase_ == 962) {
+        if (contentCase_ == 357) {
           content_ = b;
         }
         return b;
@@ -961,80 +996,37 @@ public final class ChatInfoOuterClass {
       }
     }
 
-    public static final int ICON_FIELD_NUMBER = 1562;
+    public static final int SYSTEM_HINT_FIELD_NUMBER = 922;
     /**
-     * <code>uint32 icon = 1562;</code>
-     * @return Whether the icon field is set.
-     */
-    @java.lang.Override
-    public boolean hasIcon() {
-      return contentCase_ == 1562;
-    }
-    /**
-     * <code>uint32 icon = 1562;</code>
-     * @return The icon.
-     */
-    @java.lang.Override
-    public int getIcon() {
-      if (contentCase_ == 1562) {
-        return (java.lang.Integer) content_;
-      }
-      return 0;
-    }
-
-    public static final int SYSTEM_HINT_FIELD_NUMBER = 841;
-    /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      * @return Whether the systemHint field is set.
      */
     @java.lang.Override
     public boolean hasSystemHint() {
-      return contentCase_ == 841;
+      return contentCase_ == 922;
     }
     /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      * @return The systemHint.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint getSystemHint() {
-      if (contentCase_ == 841) {
+      if (contentCase_ == 922) {
          return (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_;
       }
       return emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
     }
     /**
-     * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+     * <code>.ChatInfo.SystemHint system_hint = 922;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintOrBuilder getSystemHintOrBuilder() {
-      if (contentCase_ == 841) {
+      if (contentCase_ == 922) {
          return (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_;
       }
       return emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
     }
 
-    public static final int IS_READ_FIELD_NUMBER = 7;
-    private boolean isRead_;
-    /**
-     * <code>bool is_read = 7;</code>
-     * @return The isRead.
-     */
-    @java.lang.Override
-    public boolean getIsRead() {
-      return isRead_;
-    }
-
-    public static final int SEQUENCE_FIELD_NUMBER = 5;
-    private int sequence_;
-    /**
-     * <code>uint32 sequence = 5;</code>
-     * @return The sequence.
-     */
-    @java.lang.Override
-    public int getSequence() {
-      return sequence_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1049,30 +1041,30 @@ public final class ChatInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (uid_ != 0) {
-        output.writeUInt32(4, uid_);
-      }
-      if (sequence_ != 0) {
-        output.writeUInt32(5, sequence_);
-      }
       if (isRead_ != false) {
-        output.writeBool(7, isRead_);
+        output.writeBool(4, isRead_);
       }
       if (toUid_ != 0) {
-        output.writeUInt32(10, toUid_);
+        output.writeUInt32(5, toUid_);
+      }
+      if (sequence_ != 0) {
+        output.writeUInt32(7, sequence_);
       }
       if (time_ != 0) {
-        output.writeUInt32(13, time_);
+        output.writeUInt32(8, time_);
       }
-      if (contentCase_ == 841) {
-        output.writeMessage(841, (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_);
+      if (uid_ != 0) {
+        output.writeUInt32(10, uid_);
       }
-      if (contentCase_ == 962) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 962, content_);
-      }
-      if (contentCase_ == 1562) {
+      if (contentCase_ == 21) {
         output.writeUInt32(
-            1562, (int)((java.lang.Integer) content_));
+            21, (int)((java.lang.Integer) content_));
+      }
+      if (contentCase_ == 357) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 357, content_);
+      }
+      if (contentCase_ == 922) {
+        output.writeMessage(922, (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_);
       }
       unknownFields.writeTo(output);
     }
@@ -1083,37 +1075,37 @@ public final class ChatInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, uid_);
-      }
-      if (sequence_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sequence_);
-      }
       if (isRead_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isRead_);
+          .computeBoolSize(4, isRead_);
       }
       if (toUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, toUid_);
+          .computeUInt32Size(5, toUid_);
+      }
+      if (sequence_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, sequence_);
       }
       if (time_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, time_);
+          .computeUInt32Size(8, time_);
       }
-      if (contentCase_ == 841) {
+      if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(841, (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_);
+          .computeUInt32Size(10, uid_);
       }
-      if (contentCase_ == 962) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(962, content_);
-      }
-      if (contentCase_ == 1562) {
+      if (contentCase_ == 21) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(
-              1562, (int)((java.lang.Integer) content_));
+              21, (int)((java.lang.Integer) content_));
+      }
+      if (contentCase_ == 357) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(357, content_);
+      }
+      if (contentCase_ == 922) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(922, (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1130,27 +1122,27 @@ public final class ChatInfoOuterClass {
       }
       emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo other = (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo) obj;
 
-      if (getToUid()
-          != other.getToUid()) return false;
-      if (getTime()
-          != other.getTime()) return false;
-      if (getUid()
-          != other.getUid()) return false;
       if (getIsRead()
           != other.getIsRead()) return false;
+      if (getTime()
+          != other.getTime()) return false;
+      if (getToUid()
+          != other.getToUid()) return false;
       if (getSequence()
           != other.getSequence()) return false;
+      if (getUid()
+          != other.getUid()) return false;
       if (!getContentCase().equals(other.getContentCase())) return false;
       switch (contentCase_) {
-        case 962:
-          if (!getText()
-              .equals(other.getText())) return false;
-          break;
-        case 1562:
+        case 21:
           if (getIcon()
               != other.getIcon()) return false;
           break;
-        case 841:
+        case 357:
+          if (!getText()
+              .equals(other.getText())) return false;
+          break;
+        case 922:
           if (!getSystemHint()
               .equals(other.getSystemHint())) return false;
           break;
@@ -1168,27 +1160,27 @@ public final class ChatInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TO_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getToUid();
-      hash = (37 * hash) + TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getTime();
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
       hash = (37 * hash) + IS_READ_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsRead());
+      hash = (37 * hash) + TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getTime();
+      hash = (37 * hash) + TO_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getToUid();
       hash = (37 * hash) + SEQUENCE_FIELD_NUMBER;
       hash = (53 * hash) + getSequence();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       switch (contentCase_) {
-        case 962:
-          hash = (37 * hash) + TEXT_FIELD_NUMBER;
-          hash = (53 * hash) + getText().hashCode();
-          break;
-        case 1562:
+        case 21:
           hash = (37 * hash) + ICON_FIELD_NUMBER;
           hash = (53 * hash) + getIcon();
           break;
-        case 841:
+        case 357:
+          hash = (37 * hash) + TEXT_FIELD_NUMBER;
+          hash = (53 * hash) + getText().hashCode();
+          break;
+        case 922:
           hash = (37 * hash) + SYSTEM_HINT_FIELD_NUMBER;
           hash = (53 * hash) + getSystemHint().hashCode();
           break;
@@ -1291,10 +1283,6 @@ public final class ChatInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KFPJAAEHBNB
-     * </pre>
-     *
      * Protobuf type {@code ChatInfo}
      */
     public static final class Builder extends
@@ -1332,16 +1320,16 @@ public final class ChatInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        toUid_ = 0;
+        isRead_ = false;
 
         time_ = 0;
 
-        uid_ = 0;
-
-        isRead_ = false;
+        toUid_ = 0;
 
         sequence_ = 0;
 
+        uid_ = 0;
+
         contentCase_ = 0;
         content_ = null;
         return this;
@@ -1370,24 +1358,24 @@ public final class ChatInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo buildPartial() {
         emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo result = new emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo(this);
-        result.toUid_ = toUid_;
+        result.isRead_ = isRead_;
         result.time_ = time_;
+        result.toUid_ = toUid_;
+        result.sequence_ = sequence_;
         result.uid_ = uid_;
-        if (contentCase_ == 962) {
+        if (contentCase_ == 21) {
           result.content_ = content_;
         }
-        if (contentCase_ == 1562) {
+        if (contentCase_ == 357) {
           result.content_ = content_;
         }
-        if (contentCase_ == 841) {
+        if (contentCase_ == 922) {
           if (systemHintBuilder_ == null) {
             result.content_ = content_;
           } else {
             result.content_ = systemHintBuilder_.build();
           }
         }
-        result.isRead_ = isRead_;
-        result.sequence_ = sequence_;
         result.contentCase_ = contentCase_;
         onBuilt();
         return result;
@@ -1437,32 +1425,32 @@ public final class ChatInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo other) {
         if (other == emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance()) return this;
-        if (other.getToUid() != 0) {
-          setToUid(other.getToUid());
+        if (other.getIsRead() != false) {
+          setIsRead(other.getIsRead());
         }
         if (other.getTime() != 0) {
           setTime(other.getTime());
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
-        if (other.getIsRead() != false) {
-          setIsRead(other.getIsRead());
+        if (other.getToUid() != 0) {
+          setToUid(other.getToUid());
         }
         if (other.getSequence() != 0) {
           setSequence(other.getSequence());
         }
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         switch (other.getContentCase()) {
-          case TEXT: {
-            contentCase_ = 962;
-            content_ = other.content_;
-            onChanged();
-            break;
-          }
           case ICON: {
             setIcon(other.getIcon());
             break;
           }
+          case TEXT: {
+            contentCase_ = 357;
+            content_ = other.content_;
+            onChanged();
+            break;
+          }
           case SYSTEM_HINT: {
             mergeSystemHint(other.getSystemHint());
             break;
@@ -1515,40 +1503,40 @@ public final class ChatInfoOuterClass {
       }
 
 
-      private int toUid_ ;
+      private boolean isRead_ ;
       /**
-       * <code>uint32 to_uid = 10;</code>
-       * @return The toUid.
+       * <code>bool is_read = 4;</code>
+       * @return The isRead.
        */
       @java.lang.Override
-      public int getToUid() {
-        return toUid_;
+      public boolean getIsRead() {
+        return isRead_;
       }
       /**
-       * <code>uint32 to_uid = 10;</code>
-       * @param value The toUid to set.
+       * <code>bool is_read = 4;</code>
+       * @param value The isRead to set.
        * @return This builder for chaining.
        */
-      public Builder setToUid(int value) {
+      public Builder setIsRead(boolean value) {
         
-        toUid_ = value;
+        isRead_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 to_uid = 10;</code>
+       * <code>bool is_read = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearToUid() {
+      public Builder clearIsRead() {
         
-        toUid_ = 0;
+        isRead_ = false;
         onChanged();
         return this;
       }
 
       private int time_ ;
       /**
-       * <code>uint32 time = 13;</code>
+       * <code>uint32 time = 8;</code>
        * @return The time.
        */
       @java.lang.Override
@@ -1556,7 +1544,7 @@ public final class ChatInfoOuterClass {
         return time_;
       }
       /**
-       * <code>uint32 time = 13;</code>
+       * <code>uint32 time = 8;</code>
        * @param value The time to set.
        * @return This builder for chaining.
        */
@@ -1567,7 +1555,7 @@ public final class ChatInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 time = 13;</code>
+       * <code>uint32 time = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearTime() {
@@ -1577,9 +1565,71 @@ public final class ChatInfoOuterClass {
         return this;
       }
 
+      private int toUid_ ;
+      /**
+       * <code>uint32 to_uid = 5;</code>
+       * @return The toUid.
+       */
+      @java.lang.Override
+      public int getToUid() {
+        return toUid_;
+      }
+      /**
+       * <code>uint32 to_uid = 5;</code>
+       * @param value The toUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setToUid(int value) {
+        
+        toUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 to_uid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearToUid() {
+        
+        toUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int sequence_ ;
+      /**
+       * <code>uint32 sequence = 7;</code>
+       * @return The sequence.
+       */
+      @java.lang.Override
+      public int getSequence() {
+        return sequence_;
+      }
+      /**
+       * <code>uint32 sequence = 7;</code>
+       * @param value The sequence to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSequence(int value) {
+        
+        sequence_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 sequence = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSequence() {
+        
+        sequence_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int uid_ ;
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 10;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -1587,7 +1637,7 @@ public final class ChatInfoOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 10;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -1598,7 +1648,7 @@ public final class ChatInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -1609,28 +1659,69 @@ public final class ChatInfoOuterClass {
       }
 
       /**
-       * <code>string text = 962;</code>
+       * <code>uint32 icon = 21;</code>
+       * @return Whether the icon field is set.
+       */
+      public boolean hasIcon() {
+        return contentCase_ == 21;
+      }
+      /**
+       * <code>uint32 icon = 21;</code>
+       * @return The icon.
+       */
+      public int getIcon() {
+        if (contentCase_ == 21) {
+          return (java.lang.Integer) content_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 icon = 21;</code>
+       * @param value The icon to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIcon(int value) {
+        contentCase_ = 21;
+        content_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 icon = 21;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIcon() {
+        if (contentCase_ == 21) {
+          contentCase_ = 0;
+          content_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>string text = 357;</code>
        * @return Whether the text field is set.
        */
       @java.lang.Override
       public boolean hasText() {
-        return contentCase_ == 962;
+        return contentCase_ == 357;
       }
       /**
-       * <code>string text = 962;</code>
+       * <code>string text = 357;</code>
        * @return The text.
        */
       @java.lang.Override
       public java.lang.String getText() {
         java.lang.Object ref = "";
-        if (contentCase_ == 962) {
+        if (contentCase_ == 357) {
           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_ == 962) {
+          if (contentCase_ == 357) {
             content_ = s;
           }
           return s;
@@ -1639,21 +1730,21 @@ public final class ChatInfoOuterClass {
         }
       }
       /**
-       * <code>string text = 962;</code>
+       * <code>string text = 357;</code>
        * @return The bytes for text.
        */
       @java.lang.Override
       public com.google.protobuf.ByteString
           getTextBytes() {
         java.lang.Object ref = "";
-        if (contentCase_ == 962) {
+        if (contentCase_ == 357) {
           ref = content_;
         }
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          if (contentCase_ == 962) {
+          if (contentCase_ == 357) {
             content_ = b;
           }
           return b;
@@ -1662,7 +1753,7 @@ public final class ChatInfoOuterClass {
         }
       }
       /**
-       * <code>string text = 962;</code>
+       * <code>string text = 357;</code>
        * @param value The text to set.
        * @return This builder for chaining.
        */
@@ -1671,17 +1762,17 @@ public final class ChatInfoOuterClass {
         if (value == null) {
     throw new NullPointerException();
   }
-  contentCase_ = 962;
+  contentCase_ = 357;
         content_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string text = 962;</code>
+       * <code>string text = 357;</code>
        * @return This builder for chaining.
        */
       public Builder clearText() {
-        if (contentCase_ == 962) {
+        if (contentCase_ == 357) {
           contentCase_ = 0;
           content_ = null;
           onChanged();
@@ -1689,7 +1780,7 @@ public final class ChatInfoOuterClass {
         return this;
       }
       /**
-       * <code>string text = 962;</code>
+       * <code>string text = 357;</code>
        * @param value The bytes for text to set.
        * @return This builder for chaining.
        */
@@ -1699,83 +1790,42 @@ public final class ChatInfoOuterClass {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
-        contentCase_ = 962;
+        contentCase_ = 357;
         content_ = value;
         onChanged();
         return this;
       }
 
-      /**
-       * <code>uint32 icon = 1562;</code>
-       * @return Whether the icon field is set.
-       */
-      public boolean hasIcon() {
-        return contentCase_ == 1562;
-      }
-      /**
-       * <code>uint32 icon = 1562;</code>
-       * @return The icon.
-       */
-      public int getIcon() {
-        if (contentCase_ == 1562) {
-          return (java.lang.Integer) content_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 icon = 1562;</code>
-       * @param value The icon to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIcon(int value) {
-        contentCase_ = 1562;
-        content_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 icon = 1562;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIcon() {
-        if (contentCase_ == 1562) {
-          contentCase_ = 0;
-          content_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintOrBuilder> systemHintBuilder_;
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        * @return Whether the systemHint field is set.
        */
       @java.lang.Override
       public boolean hasSystemHint() {
-        return contentCase_ == 841;
+        return contentCase_ == 922;
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        * @return The systemHint.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint getSystemHint() {
         if (systemHintBuilder_ == null) {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             return (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_;
           }
           return emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
         } else {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             return systemHintBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
         }
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       public Builder setSystemHint(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint value) {
         if (systemHintBuilder_ == null) {
@@ -1787,11 +1837,11 @@ public final class ChatInfoOuterClass {
         } else {
           systemHintBuilder_.setMessage(value);
         }
-        contentCase_ = 841;
+        contentCase_ = 922;
         return this;
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       public Builder setSystemHint(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.Builder builderForValue) {
@@ -1801,15 +1851,15 @@ public final class ChatInfoOuterClass {
         } else {
           systemHintBuilder_.setMessage(builderForValue.build());
         }
-        contentCase_ = 841;
+        contentCase_ = 922;
         return this;
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       public Builder mergeSystemHint(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint value) {
         if (systemHintBuilder_ == null) {
-          if (contentCase_ == 841 &&
+          if (contentCase_ == 922 &&
               content_ != emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance()) {
             content_ = emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.newBuilder((emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_)
                 .mergeFrom(value).buildPartial();
@@ -1818,26 +1868,26 @@ public final class ChatInfoOuterClass {
           }
           onChanged();
         } else {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             systemHintBuilder_.mergeFrom(value);
           }
           systemHintBuilder_.setMessage(value);
         }
-        contentCase_ = 841;
+        contentCase_ = 922;
         return this;
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       public Builder clearSystemHint() {
         if (systemHintBuilder_ == null) {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             contentCase_ = 0;
             content_ = null;
             onChanged();
           }
         } else {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             contentCase_ = 0;
             content_ = null;
           }
@@ -1846,33 +1896,33 @@ public final class ChatInfoOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.Builder getSystemHintBuilder() {
         return getSystemHintFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintOrBuilder getSystemHintOrBuilder() {
-        if ((contentCase_ == 841) && (systemHintBuilder_ != null)) {
+        if ((contentCase_ == 922) && (systemHintBuilder_ != null)) {
           return systemHintBuilder_.getMessageOrBuilder();
         } else {
-          if (contentCase_ == 841) {
+          if (contentCase_ == 922) {
             return (emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint) content_;
           }
           return emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
         }
       }
       /**
-       * <code>.ChatInfo.SystemHint system_hint = 841;</code>
+       * <code>.ChatInfo.SystemHint system_hint = 922;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHintOrBuilder> 
           getSystemHintFieldBuilder() {
         if (systemHintBuilder_ == null) {
-          if (!(contentCase_ == 841)) {
+          if (!(contentCase_ == 922)) {
             content_ = emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.SystemHint.getDefaultInstance();
           }
           systemHintBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -1882,72 +1932,10 @@ public final class ChatInfoOuterClass {
                   isClean());
           content_ = null;
         }
-        contentCase_ = 841;
+        contentCase_ = 922;
         onChanged();;
         return systemHintBuilder_;
       }
-
-      private boolean isRead_ ;
-      /**
-       * <code>bool is_read = 7;</code>
-       * @return The isRead.
-       */
-      @java.lang.Override
-      public boolean getIsRead() {
-        return isRead_;
-      }
-      /**
-       * <code>bool is_read = 7;</code>
-       * @param value The isRead to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsRead(boolean value) {
-        
-        isRead_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_read = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsRead() {
-        
-        isRead_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int sequence_ ;
-      /**
-       * <code>uint32 sequence = 5;</code>
-       * @return The sequence.
-       */
-      @java.lang.Override
-      public int getSequence() {
-        return sequence_;
-      }
-      /**
-       * <code>uint32 sequence = 5;</code>
-       * @param value The sequence to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSequence(int value) {
-        
-        sequence_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sequence = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSequence() {
-        
-        sequence_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2020,16 +2008,16 @@ public final class ChatInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016ChatInfo.proto\"\317\002\n\010ChatInfo\022\016\n\006to_uid\030" +
-      "\n \001(\r\022\014\n\004time\030\r \001(\r\022\013\n\003uid\030\004 \001(\r\022\017\n\004text" +
-      "\030\302\007 \001(\tH\000\022\017\n\004icon\030\232\014 \001(\rH\000\022,\n\013system_hin" +
-      "t\030\311\006 \001(\0132\024.ChatInfo.SystemHintH\000\022\017\n\007is_r" +
-      "ead\030\007 \001(\010\022\020\n\010sequence\030\005 \001(\r\032\032\n\nSystemHin" +
-      "t\022\014\n\004type\030\017 \001(\r\"~\n\016SystemHintType\022\036\n\032SYS" +
-      "TEM_HINT_TYPE_CHAT_NONE\020\000\022%\n!SYSTEM_HINT" +
-      "_TYPE_CHAT_ENTER_WORLD\020\001\022%\n!SYSTEM_HINT_" +
-      "TYPE_CHAT_LEAVE_WORLD\020\002B\t\n\007contentB\033\n\031em" +
-      "u.grasscutter.net.protob\006proto3"
+      "\n\016ChatInfo.proto\"\316\002\n\010ChatInfo\022\017\n\007is_read" +
+      "\030\004 \001(\010\022\014\n\004time\030\010 \001(\r\022\016\n\006to_uid\030\005 \001(\r\022\020\n\010" +
+      "sequence\030\007 \001(\r\022\013\n\003uid\030\n \001(\r\022\016\n\004icon\030\025 \001(" +
+      "\rH\000\022\017\n\004text\030\345\002 \001(\tH\000\022,\n\013system_hint\030\232\007 \001" +
+      "(\0132\024.ChatInfo.SystemHintH\000\032\032\n\nSystemHint" +
+      "\022\014\n\004type\030\017 \001(\r\"~\n\016SystemHintType\022\036\n\032SYST" +
+      "EM_HINT_TYPE_CHAT_NONE\020\000\022%\n!SYSTEM_HINT_" +
+      "TYPE_CHAT_ENTER_WORLD\020\001\022%\n!SYSTEM_HINT_T" +
+      "YPE_CHAT_LEAVE_WORLD\020\002B\t\n\007contentB\033\n\031emu" +
+      ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2040,7 +2028,7 @@ public final class ChatInfoOuterClass {
     internal_static_ChatInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChatInfo_descriptor,
-        new java.lang.String[] { "ToUid", "Time", "Uid", "Text", "Icon", "SystemHint", "IsRead", "Sequence", "Content", });
+        new java.lang.String[] { "IsRead", "Time", "ToUid", "Sequence", "Uid", "Icon", "Text", "SystemHint", "Content", });
     internal_static_ChatInfo_SystemHint_descriptor =
       internal_static_ChatInfo_descriptor.getNestedTypes().get(0);
     internal_static_ChatInfo_SystemHint_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChestOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChestOuterClass.java
new file mode 100644
index 000000000..eb0aef568
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChestOuterClass.java
@@ -0,0 +1,607 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: Chest.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ChestOuterClass {
+  private ChestOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface ChestOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:Chest)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 chest_drop_id = 1;</code>
+     * @return The chestDropId.
+     */
+    int getChestDropId();
+
+    /**
+     * <code>bool is_show_cutscene = 2;</code>
+     * @return The isShowCutscene.
+     */
+    boolean getIsShowCutscene();
+  }
+  /**
+   * Protobuf type {@code Chest}
+   */
+  public static final class Chest extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:Chest)
+      ChestOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use Chest.newBuilder() to construct.
+    private Chest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private Chest() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new Chest();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private Chest(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              chestDropId_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+
+              isShowCutscene_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ChestOuterClass.internal_static_Chest_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.ChestOuterClass.internal_static_Chest_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.ChestOuterClass.Chest.class, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder.class);
+    }
+
+    public static final int CHEST_DROP_ID_FIELD_NUMBER = 1;
+    private int chestDropId_;
+    /**
+     * <code>uint32 chest_drop_id = 1;</code>
+     * @return The chestDropId.
+     */
+    @java.lang.Override
+    public int getChestDropId() {
+      return chestDropId_;
+    }
+
+    public static final int IS_SHOW_CUTSCENE_FIELD_NUMBER = 2;
+    private boolean isShowCutscene_;
+    /**
+     * <code>bool is_show_cutscene = 2;</code>
+     * @return The isShowCutscene.
+     */
+    @java.lang.Override
+    public boolean getIsShowCutscene() {
+      return isShowCutscene_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (chestDropId_ != 0) {
+        output.writeUInt32(1, chestDropId_);
+      }
+      if (isShowCutscene_ != false) {
+        output.writeBool(2, isShowCutscene_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (chestDropId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, chestDropId_);
+      }
+      if (isShowCutscene_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(2, isShowCutscene_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.ChestOuterClass.Chest)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.ChestOuterClass.Chest other = (emu.grasscutter.net.proto.ChestOuterClass.Chest) obj;
+
+      if (getChestDropId()
+          != other.getChestDropId()) return false;
+      if (getIsShowCutscene()
+          != other.getIsShowCutscene()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CHEST_DROP_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChestDropId();
+      hash = (37 * hash) + IS_SHOW_CUTSCENE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsShowCutscene());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.ChestOuterClass.Chest prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code Chest}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:Chest)
+        emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.ChestOuterClass.internal_static_Chest_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.ChestOuterClass.internal_static_Chest_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.ChestOuterClass.Chest.class, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.ChestOuterClass.Chest.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        chestDropId_ = 0;
+
+        isShowCutscene_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.ChestOuterClass.internal_static_Chest_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChestOuterClass.Chest getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChestOuterClass.Chest build() {
+        emu.grasscutter.net.proto.ChestOuterClass.Chest result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChestOuterClass.Chest buildPartial() {
+        emu.grasscutter.net.proto.ChestOuterClass.Chest result = new emu.grasscutter.net.proto.ChestOuterClass.Chest(this);
+        result.chestDropId_ = chestDropId_;
+        result.isShowCutscene_ = isShowCutscene_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.ChestOuterClass.Chest) {
+          return mergeFrom((emu.grasscutter.net.proto.ChestOuterClass.Chest)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.ChestOuterClass.Chest other) {
+        if (other == emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance()) return this;
+        if (other.getChestDropId() != 0) {
+          setChestDropId(other.getChestDropId());
+        }
+        if (other.getIsShowCutscene() != false) {
+          setIsShowCutscene(other.getIsShowCutscene());
+        }
+        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.ChestOuterClass.Chest parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.ChestOuterClass.Chest) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int chestDropId_ ;
+      /**
+       * <code>uint32 chest_drop_id = 1;</code>
+       * @return The chestDropId.
+       */
+      @java.lang.Override
+      public int getChestDropId() {
+        return chestDropId_;
+      }
+      /**
+       * <code>uint32 chest_drop_id = 1;</code>
+       * @param value The chestDropId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChestDropId(int value) {
+        
+        chestDropId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 chest_drop_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChestDropId() {
+        
+        chestDropId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isShowCutscene_ ;
+      /**
+       * <code>bool is_show_cutscene = 2;</code>
+       * @return The isShowCutscene.
+       */
+      @java.lang.Override
+      public boolean getIsShowCutscene() {
+        return isShowCutscene_;
+      }
+      /**
+       * <code>bool is_show_cutscene = 2;</code>
+       * @param value The isShowCutscene to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsShowCutscene(boolean value) {
+        
+        isShowCutscene_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_show_cutscene = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsShowCutscene() {
+        
+        isShowCutscene_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:Chest)
+    }
+
+    // @@protoc_insertion_point(class_scope:Chest)
+    private static final emu.grasscutter.net.proto.ChestOuterClass.Chest DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ChestOuterClass.Chest();
+    }
+
+    public static emu.grasscutter.net.proto.ChestOuterClass.Chest getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<Chest>
+        PARSER = new com.google.protobuf.AbstractParser<Chest>() {
+      @java.lang.Override
+      public Chest parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new Chest(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<Chest> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<Chest> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ChestOuterClass.Chest getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_Chest_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_Chest_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\013Chest.proto\"8\n\005Chest\022\025\n\rchest_drop_id\030" +
+      "\001 \001(\r\022\030\n\020is_show_cutscene\030\002 \001(\010B\033\n\031emu.g" +
+      "rasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_Chest_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_Chest_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_Chest_descriptor,
+        new java.lang.String[] { "ChestDropId", "IsShowCutscene", });
+  }
+
+  // @@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 ee3f4252f..3472db5af 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChildQuestOuterClass.java
@@ -19,7 +19,7 @@ public final class ChildQuestOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 quest_config_id = 6;</code>
+     * <code>uint32 quest_config_id = 2;</code>
      * @return The questConfigId.
      */
     int getQuestConfigId();
@@ -31,16 +31,12 @@ public final class ChildQuestOuterClass {
     int getQuestId();
 
     /**
-     * <code>uint32 state = 2;</code>
+     * <code>uint32 state = 14;</code>
      * @return The state.
      */
     int getState();
   }
   /**
-   * <pre>
-   * Obf: DHJCFBHIJFE
-   * </pre>
-   *
    * Protobuf type {@code ChildQuest}
    */
   public static final class ChildQuest extends
@@ -87,11 +83,6 @@ public final class ChildQuestOuterClass {
               break;
             case 16: {
 
-              state_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
               questConfigId_ = input.readUInt32();
               break;
             }
@@ -100,6 +91,11 @@ public final class ChildQuestOuterClass {
               questId_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              state_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -132,10 +128,10 @@ public final class ChildQuestOuterClass {
               emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.class, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder.class);
     }
 
-    public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 6;
+    public static final int QUEST_CONFIG_ID_FIELD_NUMBER = 2;
     private int questConfigId_;
     /**
-     * <code>uint32 quest_config_id = 6;</code>
+     * <code>uint32 quest_config_id = 2;</code>
      * @return The questConfigId.
      */
     @java.lang.Override
@@ -154,10 +150,10 @@ public final class ChildQuestOuterClass {
       return questId_;
     }
 
-    public static final int STATE_FIELD_NUMBER = 2;
+    public static final int STATE_FIELD_NUMBER = 14;
     private int state_;
     /**
-     * <code>uint32 state = 2;</code>
+     * <code>uint32 state = 14;</code>
      * @return The state.
      */
     @java.lang.Override
@@ -179,15 +175,15 @@ public final class ChildQuestOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (state_ != 0) {
-        output.writeUInt32(2, state_);
-      }
       if (questConfigId_ != 0) {
-        output.writeUInt32(6, questConfigId_);
+        output.writeUInt32(2, questConfigId_);
       }
       if (questId_ != 0) {
         output.writeUInt32(11, questId_);
       }
+      if (state_ != 0) {
+        output.writeUInt32(14, state_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -197,18 +193,18 @@ public final class ChildQuestOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (state_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, state_);
-      }
       if (questConfigId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, questConfigId_);
+          .computeUInt32Size(2, questConfigId_);
       }
       if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, questId_);
       }
+      if (state_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, state_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -343,10 +339,6 @@ public final class ChildQuestOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DHJCFBHIJFE
-     * </pre>
-     *
      * Protobuf type {@code ChildQuest}
      */
     public static final class Builder extends
@@ -507,7 +499,7 @@ public final class ChildQuestOuterClass {
 
       private int questConfigId_ ;
       /**
-       * <code>uint32 quest_config_id = 6;</code>
+       * <code>uint32 quest_config_id = 2;</code>
        * @return The questConfigId.
        */
       @java.lang.Override
@@ -515,7 +507,7 @@ public final class ChildQuestOuterClass {
         return questConfigId_;
       }
       /**
-       * <code>uint32 quest_config_id = 6;</code>
+       * <code>uint32 quest_config_id = 2;</code>
        * @param value The questConfigId to set.
        * @return This builder for chaining.
        */
@@ -526,7 +518,7 @@ public final class ChildQuestOuterClass {
         return this;
       }
       /**
-       * <code>uint32 quest_config_id = 6;</code>
+       * <code>uint32 quest_config_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestConfigId() {
@@ -569,7 +561,7 @@ public final class ChildQuestOuterClass {
 
       private int state_ ;
       /**
-       * <code>uint32 state = 2;</code>
+       * <code>uint32 state = 14;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -577,7 +569,7 @@ public final class ChildQuestOuterClass {
         return state_;
       }
       /**
-       * <code>uint32 state = 2;</code>
+       * <code>uint32 state = 14;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -588,7 +580,7 @@ public final class ChildQuestOuterClass {
         return this;
       }
       /**
-       * <code>uint32 state = 2;</code>
+       * <code>uint32 state = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -665,8 +657,8 @@ public final class ChildQuestOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020ChildQuest.proto\"F\n\nChildQuest\022\027\n\017ques" +
-      "t_config_id\030\006 \001(\r\022\020\n\010quest_id\030\013 \001(\r\022\r\n\005s" +
-      "tate\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "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" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java
index 457b0510c..c0f68a8a1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamReqOuterClass.java
@@ -19,15 +19,14 @@ public final class ChooseCurAvatarTeamReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 team_id = 10;</code>
+     * <code>uint32 team_id = 13;</code>
      * @return The teamId.
      */
     int getTeamId();
   }
   /**
    * <pre>
-   * CmdId: 9406
-   * Obf: GFGPACAMELF
+   * CmdId: 29682
    * </pre>
    *
    * Protobuf type {@code ChooseCurAvatarTeamReq}
@@ -74,7 +73,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 104: {
 
               teamId_ = input.readUInt32();
               break;
@@ -111,10 +110,10 @@ public final class ChooseCurAvatarTeamReqOuterClass {
               emu.grasscutter.net.proto.ChooseCurAvatarTeamReqOuterClass.ChooseCurAvatarTeamReq.class, emu.grasscutter.net.proto.ChooseCurAvatarTeamReqOuterClass.ChooseCurAvatarTeamReq.Builder.class);
     }
 
-    public static final int TEAM_ID_FIELD_NUMBER = 10;
+    public static final int TEAM_ID_FIELD_NUMBER = 13;
     private int teamId_;
     /**
-     * <code>uint32 team_id = 10;</code>
+     * <code>uint32 team_id = 13;</code>
      * @return The teamId.
      */
     @java.lang.Override
@@ -137,7 +136,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (teamId_ != 0) {
-        output.writeUInt32(10, teamId_);
+        output.writeUInt32(13, teamId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +149,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
       size = 0;
       if (teamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, teamId_);
+          .computeUInt32Size(13, teamId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +278,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 9406
-     * Obf: GFGPACAMELF
+     * CmdId: 29682
      * </pre>
      *
      * Protobuf type {@code ChooseCurAvatarTeamReq}
@@ -431,7 +429,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
 
       private int teamId_ ;
       /**
-       * <code>uint32 team_id = 10;</code>
+       * <code>uint32 team_id = 13;</code>
        * @return The teamId.
        */
       @java.lang.Override
@@ -439,7 +437,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
         return teamId_;
       }
       /**
-       * <code>uint32 team_id = 10;</code>
+       * <code>uint32 team_id = 13;</code>
        * @param value The teamId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +448,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 team_id = 10;</code>
+       * <code>uint32 team_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamId() {
@@ -527,7 +525,7 @@ public final class ChooseCurAvatarTeamReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034ChooseCurAvatarTeamReq.proto\")\n\026Choose" +
-      "CurAvatarTeamReq\022\017\n\007team_id\030\n \001(\rB\033\n\031emu" +
+      "CurAvatarTeamReq\022\017\n\007team_id\030\r \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/ChooseCurAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java
index bd99718b7..ef0173d4e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ChooseCurAvatarTeamRspOuterClass.java
@@ -19,21 +19,20 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_team_id = 10;</code>
-     * @return The curTeamId.
-     */
-    int getCurTeamId();
-
-    /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 cur_team_id = 8;</code>
+     * @return The curTeamId.
+     */
+    int getCurTeamId();
   }
   /**
    * <pre>
-   * CmdId: 4031
-   * Obf: GCKFCHMIFPD
+   * CmdId: 5985
    * </pre>
    *
    * Protobuf type {@code ChooseCurAvatarTeamRsp}
@@ -80,12 +79,12 @@ public final class ChooseCurAvatarTeamRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 56: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 64: {
 
               curTeamId_ = input.readUInt32();
               break;
@@ -122,21 +121,10 @@ public final class ChooseCurAvatarTeamRspOuterClass {
               emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp.class, emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp.Builder.class);
     }
 
-    public static final int CUR_TEAM_ID_FIELD_NUMBER = 10;
-    private int curTeamId_;
-    /**
-     * <code>uint32 cur_team_id = 10;</code>
-     * @return The curTeamId.
-     */
-    @java.lang.Override
-    public int getCurTeamId() {
-      return curTeamId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 7;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +132,17 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       return retcode_;
     }
 
+    public static final int CUR_TEAM_ID_FIELD_NUMBER = 8;
+    private int curTeamId_;
+    /**
+     * <code>uint32 cur_team_id = 8;</code>
+     * @return The curTeamId.
+     */
+    @java.lang.Override
+    public int getCurTeamId() {
+      return curTeamId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +158,10 @@ public final class ChooseCurAvatarTeamRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(7, retcode_);
       }
       if (curTeamId_ != 0) {
-        output.writeUInt32(10, curTeamId_);
+        output.writeUInt32(8, curTeamId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +174,11 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(7, retcode_);
       }
       if (curTeamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, curTeamId_);
+          .computeUInt32Size(8, curTeamId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +195,10 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       }
       emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp other = (emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp) obj;
 
-      if (getCurTeamId()
-          != other.getCurTeamId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCurTeamId()
+          != other.getCurTeamId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +210,10 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_TEAM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCurTeamId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CUR_TEAM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurTeamId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,8 +311,7 @@ public final class ChooseCurAvatarTeamRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 4031
-     * Obf: GCKFCHMIFPD
+     * CmdId: 5985
      * </pre>
      *
      * Protobuf type {@code ChooseCurAvatarTeamRsp}
@@ -353,10 +351,10 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curTeamId_ = 0;
-
         retcode_ = 0;
 
+        curTeamId_ = 0;
+
         return this;
       }
 
@@ -383,8 +381,8 @@ public final class ChooseCurAvatarTeamRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp buildPartial() {
         emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp result = new emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp(this);
-        result.curTeamId_ = curTeamId_;
         result.retcode_ = retcode_;
+        result.curTeamId_ = curTeamId_;
         onBuilt();
         return result;
       }
@@ -433,12 +431,12 @@ public final class ChooseCurAvatarTeamRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp other) {
         if (other == emu.grasscutter.net.proto.ChooseCurAvatarTeamRspOuterClass.ChooseCurAvatarTeamRsp.getDefaultInstance()) return this;
-        if (other.getCurTeamId() != 0) {
-          setCurTeamId(other.getCurTeamId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCurTeamId() != 0) {
+          setCurTeamId(other.getCurTeamId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +466,9 @@ public final class ChooseCurAvatarTeamRspOuterClass {
         return this;
       }
 
-      private int curTeamId_ ;
-      /**
-       * <code>uint32 cur_team_id = 10;</code>
-       * @return The curTeamId.
-       */
-      @java.lang.Override
-      public int getCurTeamId() {
-        return curTeamId_;
-      }
-      /**
-       * <code>uint32 cur_team_id = 10;</code>
-       * @param value The curTeamId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurTeamId(int value) {
-        
-        curTeamId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_team_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurTeamId() {
-        
-        curTeamId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 7;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +476,7 @@ public final class ChooseCurAvatarTeamRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 7;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +487,7 @@ public final class ChooseCurAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +496,37 @@ public final class ChooseCurAvatarTeamRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int curTeamId_ ;
+      /**
+       * <code>uint32 cur_team_id = 8;</code>
+       * @return The curTeamId.
+       */
+      @java.lang.Override
+      public int getCurTeamId() {
+        return curTeamId_;
+      }
+      /**
+       * <code>uint32 cur_team_id = 8;</code>
+       * @param value The curTeamId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurTeamId(int value) {
+        
+        curTeamId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_team_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurTeamId() {
+        
+        curTeamId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +595,8 @@ public final class ChooseCurAvatarTeamRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034ChooseCurAvatarTeamRsp.proto\">\n\026Choose" +
-      "CurAvatarTeamRsp\022\023\n\013cur_team_id\030\n \001(\r\022\017\n" +
-      "\007retcode\030\002 \001(\005B\033\n\031emu.grasscutter.net.pr" +
+      "CurAvatarTeamRsp\022\017\n\007retcode\030\007 \001(\005\022\023\n\013cur" +
+      "_team_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +608,7 @@ public final class ChooseCurAvatarTeamRspOuterClass {
     internal_static_ChooseCurAvatarTeamRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ChooseCurAvatarTeamRsp_descriptor,
-        new java.lang.String[] { "CurTeamId", "Retcode", });
+        new java.lang.String[] { "Retcode", "CurTeamId", });
   }
 
   // @@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 0edb6ce9e..24a3276c1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CityInfoOuterClass.java
@@ -19,28 +19,24 @@ public final class CityInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 level = 4;</code>
-     * @return The level.
-     */
-    int getLevel();
-
-    /**
-     * <code>uint32 crystal_num = 15;</code>
+     * <code>uint32 crystal_num = 2;</code>
      * @return The crystalNum.
      */
     int getCrystalNum();
 
     /**
-     * <code>uint32 city_id = 9;</code>
+     * <code>uint32 city_id = 12;</code>
      * @return The cityId.
      */
     int getCityId();
+
+    /**
+     * <code>uint32 level = 15;</code>
+     * @return The level.
+     */
+    int getLevel();
   }
   /**
-   * <pre>
-   * Obf: ADHJGFHHPLP
-   * </pre>
-   *
    * Protobuf type {@code CityInfo}
    */
   public static final class CityInfo extends
@@ -85,19 +81,19 @@ public final class CityInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 16: {
 
-              level_ = input.readUInt32();
+              crystalNum_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 96: {
 
               cityId_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              crystalNum_ = input.readUInt32();
+              level_ = input.readUInt32();
               break;
             }
             default: {
@@ -132,21 +128,10 @@ public final class CityInfoOuterClass {
               emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.class, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder.class);
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 4;
-    private int level_;
-    /**
-     * <code>uint32 level = 4;</code>
-     * @return The level.
-     */
-    @java.lang.Override
-    public int getLevel() {
-      return level_;
-    }
-
-    public static final int CRYSTAL_NUM_FIELD_NUMBER = 15;
+    public static final int CRYSTAL_NUM_FIELD_NUMBER = 2;
     private int crystalNum_;
     /**
-     * <code>uint32 crystal_num = 15;</code>
+     * <code>uint32 crystal_num = 2;</code>
      * @return The crystalNum.
      */
     @java.lang.Override
@@ -154,10 +139,10 @@ public final class CityInfoOuterClass {
       return crystalNum_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 9;
+    public static final int CITY_ID_FIELD_NUMBER = 12;
     private int cityId_;
     /**
-     * <code>uint32 city_id = 9;</code>
+     * <code>uint32 city_id = 12;</code>
      * @return The cityId.
      */
     @java.lang.Override
@@ -165,6 +150,17 @@ public final class CityInfoOuterClass {
       return cityId_;
     }
 
+    public static final int LEVEL_FIELD_NUMBER = 15;
+    private int level_;
+    /**
+     * <code>uint32 level = 15;</code>
+     * @return The level.
+     */
+    @java.lang.Override
+    public int getLevel() {
+      return level_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -179,14 +175,14 @@ public final class CityInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (level_ != 0) {
-        output.writeUInt32(4, level_);
+      if (crystalNum_ != 0) {
+        output.writeUInt32(2, crystalNum_);
       }
       if (cityId_ != 0) {
-        output.writeUInt32(9, cityId_);
+        output.writeUInt32(12, cityId_);
       }
-      if (crystalNum_ != 0) {
-        output.writeUInt32(15, crystalNum_);
+      if (level_ != 0) {
+        output.writeUInt32(15, level_);
       }
       unknownFields.writeTo(output);
     }
@@ -197,17 +193,17 @@ public final class CityInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (level_ != 0) {
+      if (crystalNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, level_);
+          .computeUInt32Size(2, crystalNum_);
       }
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, cityId_);
+          .computeUInt32Size(12, cityId_);
       }
-      if (crystalNum_ != 0) {
+      if (level_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, crystalNum_);
+          .computeUInt32Size(15, level_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +220,12 @@ public final class CityInfoOuterClass {
       }
       emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other = (emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo) obj;
 
-      if (getLevel()
-          != other.getLevel()) return false;
       if (getCrystalNum()
           != other.getCrystalNum()) return false;
       if (getCityId()
           != other.getCityId()) return false;
+      if (getLevel()
+          != other.getLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,12 +237,12 @@ public final class CityInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getLevel();
       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) + LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -343,10 +339,6 @@ public final class CityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ADHJGFHHPLP
-     * </pre>
-     *
      * Protobuf type {@code CityInfo}
      */
     public static final class Builder extends
@@ -384,12 +376,12 @@ public final class CityInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        level_ = 0;
-
         crystalNum_ = 0;
 
         cityId_ = 0;
 
+        level_ = 0;
+
         return this;
       }
 
@@ -416,9 +408,9 @@ public final class CityInfoOuterClass {
       @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.level_ = level_;
         result.crystalNum_ = crystalNum_;
         result.cityId_ = cityId_;
+        result.level_ = level_;
         onBuilt();
         return result;
       }
@@ -467,15 +459,15 @@ public final class CityInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo other) {
         if (other == emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance()) return this;
-        if (other.getLevel() != 0) {
-          setLevel(other.getLevel());
-        }
         if (other.getCrystalNum() != 0) {
           setCrystalNum(other.getCrystalNum());
         }
         if (other.getCityId() != 0) {
           setCityId(other.getCityId());
         }
+        if (other.getLevel() != 0) {
+          setLevel(other.getLevel());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -505,40 +497,9 @@ public final class CityInfoOuterClass {
         return this;
       }
 
-      private int level_ ;
-      /**
-       * <code>uint32 level = 4;</code>
-       * @return The level.
-       */
-      @java.lang.Override
-      public int getLevel() {
-        return level_;
-      }
-      /**
-       * <code>uint32 level = 4;</code>
-       * @param value The level to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLevel(int value) {
-        
-        level_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 level = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLevel() {
-        
-        level_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int crystalNum_ ;
       /**
-       * <code>uint32 crystal_num = 15;</code>
+       * <code>uint32 crystal_num = 2;</code>
        * @return The crystalNum.
        */
       @java.lang.Override
@@ -546,7 +507,7 @@ public final class CityInfoOuterClass {
         return crystalNum_;
       }
       /**
-       * <code>uint32 crystal_num = 15;</code>
+       * <code>uint32 crystal_num = 2;</code>
        * @param value The crystalNum to set.
        * @return This builder for chaining.
        */
@@ -557,7 +518,7 @@ public final class CityInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 crystal_num = 15;</code>
+       * <code>uint32 crystal_num = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCrystalNum() {
@@ -569,7 +530,7 @@ public final class CityInfoOuterClass {
 
       private int cityId_ ;
       /**
-       * <code>uint32 city_id = 9;</code>
+       * <code>uint32 city_id = 12;</code>
        * @return The cityId.
        */
       @java.lang.Override
@@ -577,7 +538,7 @@ public final class CityInfoOuterClass {
         return cityId_;
       }
       /**
-       * <code>uint32 city_id = 9;</code>
+       * <code>uint32 city_id = 12;</code>
        * @param value The cityId to set.
        * @return This builder for chaining.
        */
@@ -588,7 +549,7 @@ public final class CityInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 city_id = 9;</code>
+       * <code>uint32 city_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCityId() {
@@ -597,6 +558,37 @@ public final class CityInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int level_ ;
+      /**
+       * <code>uint32 level = 15;</code>
+       * @return The level.
+       */
+      @java.lang.Override
+      public int getLevel() {
+        return level_;
+      }
+      /**
+       * <code>uint32 level = 15;</code>
+       * @param value The level to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevel(int value) {
+        
+        level_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 level = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevel() {
+        
+        level_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -664,8 +656,8 @@ public final class CityInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016CityInfo.proto\"?\n\010CityInfo\022\r\n\005level\030\004 " +
-      "\001(\r\022\023\n\013crystal_num\030\017 \001(\r\022\017\n\007city_id\030\t \001(" +
+      "\n\016CityInfo.proto\"?\n\010CityInfo\022\023\n\013crystal_" +
+      "num\030\002 \001(\r\022\017\n\007city_id\030\014 \001(\r\022\r\n\005level\030\017 \001(" +
       "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -677,7 +669,7 @@ public final class CityInfoOuterClass {
     internal_static_CityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CityInfo_descriptor,
-        new java.lang.String[] { "Level", "CrystalNum", "CityId", });
+        new java.lang.String[] { "CrystalNum", "CityId", "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 0f5379ef5..7240a55e5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityChangeNotifyOuterClass.java
@@ -19,10 +19,10 @@ public final class ClientAbilityChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_init_hash = 5;</code>
-     * @return The isInitHash.
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
      */
-    boolean getIsInitHash();
+    int getEntityId();
 
     /**
      * <code>repeated .AbilityInvokeEntry invokes = 3;</code>
@@ -49,17 +49,12 @@ public final class ClientAbilityChangeNotifyOuterClass {
         int index);
 
     /**
-     * <code>uint32 entity_id = 12;</code>
-     * @return The entityId.
+     * <code>bool is_init_hash = 4;</code>
+     * @return The isInitHash.
      */
-    int getEntityId();
+    boolean getIsInitHash();
   }
   /**
-   * <pre>
-   * CmdId: 8174
-   * Obf: IPNNHNHPLAK
-   * </pre>
-   *
    * Protobuf type {@code ClientAbilityChangeNotify}
    */
   public static final class ClientAbilityChangeNotify extends
@@ -106,6 +101,11 @@ public final class ClientAbilityChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
+            case 8: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
             case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
@@ -115,16 +115,11 @@ public final class ClientAbilityChangeNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.parser(), extensionRegistry));
               break;
             }
-            case 40: {
+            case 32: {
 
               isInitHash_ = input.readBool();
               break;
             }
-            case 96: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,15 +155,15 @@ public final class ClientAbilityChangeNotifyOuterClass {
               emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.class, emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.Builder.class);
     }
 
-    public static final int IS_INIT_HASH_FIELD_NUMBER = 5;
-    private boolean isInitHash_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
+    private int entityId_;
     /**
-     * <code>bool is_init_hash = 5;</code>
-     * @return The isInitHash.
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public boolean getIsInitHash() {
-      return isInitHash_;
+    public int getEntityId() {
+      return entityId_;
     }
 
     public static final int INVOKES_FIELD_NUMBER = 3;
@@ -211,15 +206,15 @@ public final class ClientAbilityChangeNotifyOuterClass {
       return invokes_.get(index);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 12;
-    private int entityId_;
+    public static final int IS_INIT_HASH_FIELD_NUMBER = 4;
+    private boolean isInitHash_;
     /**
-     * <code>uint32 entity_id = 12;</code>
-     * @return The entityId.
+     * <code>bool is_init_hash = 4;</code>
+     * @return The isInitHash.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public boolean getIsInitHash() {
+      return isInitHash_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -236,14 +231,14 @@ public final class ClientAbilityChangeNotifyOuterClass {
     @java.lang.Override
     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));
       }
       if (isInitHash_ != false) {
-        output.writeBool(5, isInitHash_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(12, entityId_);
+        output.writeBool(4, isInitHash_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class ClientAbilityChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, entityId_);
+      }
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, invokes_.get(i));
       }
       if (isInitHash_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isInitHash_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, entityId_);
+          .computeBoolSize(4, isInitHash_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -281,12 +276,12 @@ public final class ClientAbilityChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other = (emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify) obj;
 
-      if (getIsInitHash()
-          != other.getIsInitHash()) return false;
-      if (!getInvokesList()
-          .equals(other.getInvokesList())) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (!getInvokesList()
+          .equals(other.getInvokesList())) return false;
+      if (getIsInitHash()
+          != other.getIsInitHash()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -298,15 +293,15 @@ public final class ClientAbilityChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().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();
       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 = (37 * hash) + IS_INIT_HASH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsInitHash());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -403,11 +398,6 @@ public final class ClientAbilityChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8174
-     * Obf: IPNNHNHPLAK
-     * </pre>
-     *
      * Protobuf type {@code ClientAbilityChangeNotify}
      */
     public static final class Builder extends
@@ -446,7 +436,7 @@ public final class ClientAbilityChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isInitHash_ = false;
+        entityId_ = 0;
 
         if (invokesBuilder_ == null) {
           invokes_ = java.util.Collections.emptyList();
@@ -454,7 +444,7 @@ public final class ClientAbilityChangeNotifyOuterClass {
         } else {
           invokesBuilder_.clear();
         }
-        entityId_ = 0;
+        isInitHash_ = false;
 
         return this;
       }
@@ -483,7 +473,7 @@ public final class ClientAbilityChangeNotifyOuterClass {
       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.isInitHash_ = isInitHash_;
+        result.entityId_ = entityId_;
         if (invokesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             invokes_ = java.util.Collections.unmodifiableList(invokes_);
@@ -493,7 +483,7 @@ public final class ClientAbilityChangeNotifyOuterClass {
         } else {
           result.invokes_ = invokesBuilder_.build();
         }
-        result.entityId_ = entityId_;
+        result.isInitHash_ = isInitHash_;
         onBuilt();
         return result;
       }
@@ -542,8 +532,8 @@ public final class ClientAbilityChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ClientAbilityChangeNotifyOuterClass.ClientAbilityChangeNotify.getDefaultInstance()) return this;
-        if (other.getIsInitHash() != false) {
-          setIsInitHash(other.getIsInitHash());
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
         }
         if (invokesBuilder_ == null) {
           if (!other.invokes_.isEmpty()) {
@@ -571,8 +561,8 @@ public final class ClientAbilityChangeNotifyOuterClass {
             }
           }
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        if (other.getIsInitHash() != false) {
+          setIsInitHash(other.getIsInitHash());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -604,33 +594,33 @@ public final class ClientAbilityChangeNotifyOuterClass {
       }
       private int bitField0_;
 
-      private boolean isInitHash_ ;
+      private int entityId_ ;
       /**
-       * <code>bool is_init_hash = 5;</code>
-       * @return The isInitHash.
+       * <code>uint32 entity_id = 1;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public boolean getIsInitHash() {
-        return isInitHash_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>bool is_init_hash = 5;</code>
-       * @param value The isInitHash to set.
+       * <code>uint32 entity_id = 1;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setIsInitHash(boolean value) {
+      public Builder setEntityId(int value) {
         
-        isInitHash_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_init_hash = 5;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsInitHash() {
+      public Builder clearEntityId() {
         
-        isInitHash_ = false;
+        entityId_ = 0;
         onChanged();
         return this;
       }
@@ -875,33 +865,33 @@ public final class ClientAbilityChangeNotifyOuterClass {
         return invokesBuilder_;
       }
 
-      private int entityId_ ;
+      private boolean isInitHash_ ;
       /**
-       * <code>uint32 entity_id = 12;</code>
-       * @return The entityId.
+       * <code>bool is_init_hash = 4;</code>
+       * @return The isInitHash.
        */
       @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
+      public boolean getIsInitHash() {
+        return isInitHash_;
       }
       /**
-       * <code>uint32 entity_id = 12;</code>
-       * @param value The entityId to set.
+       * <code>bool is_init_hash = 4;</code>
+       * @param value The isInitHash to set.
        * @return This builder for chaining.
        */
-      public Builder setEntityId(int value) {
+      public Builder setIsInitHash(boolean value) {
         
-        entityId_ = value;
+        isInitHash_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 entity_id = 12;</code>
+       * <code>bool is_init_hash = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEntityId() {
+      public Builder clearIsInitHash() {
         
-        entityId_ = 0;
+        isInitHash_ = false;
         onChanged();
         return this;
       }
@@ -974,9 +964,9 @@ public final class ClientAbilityChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037ClientAbilityChangeNotify.proto\032\030Abili" +
       "tyInvokeEntry.proto\"j\n\031ClientAbilityChan" +
-      "geNotify\022\024\n\014is_init_hash\030\005 \001(\010\022$\n\007invoke" +
-      "s\030\003 \003(\0132\023.AbilityInvokeEntry\022\021\n\tentity_i" +
-      "d\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "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" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -989,7 +979,7 @@ public final class ClientAbilityChangeNotifyOuterClass {
     internal_static_ClientAbilityChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClientAbilityChangeNotify_descriptor,
-        new java.lang.String[] { "IsInitHash", "Invokes", "EntityId", });
+        new java.lang.String[] { "EntityId", "Invokes", "IsInitHash", });
     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 1fea2c2b0..c32fa1b63 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientAbilityInitFinishNotifyOuterClass.java
@@ -25,35 +25,30 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
     int getEntityId();
 
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> 
         getInvokesList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index);
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     int getInvokesCount();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
         getInvokesOrBuilderList();
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 8666
-   * Obf: PJIHLINBLNG
-   * </pre>
-   *
    * Protobuf type {@code ClientAbilityInitFinishNotify}
    */
   public static final class ClientAbilityInitFinishNotify extends
@@ -105,7 +100,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
               entityId_ = input.readUInt32();
               break;
             }
-            case 74: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokes_ = new java.util.ArrayList<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -160,17 +155,17 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int INVOKES_FIELD_NUMBER = 9;
+    public static final int INVOKES_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> invokes_;
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
@@ -178,21 +173,21 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
       return invokes_;
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     @java.lang.Override
     public int getInvokesCount() {
       return invokes_.size();
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
       return invokes_.get(index);
     }
     /**
-     * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+     * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
@@ -218,7 +213,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         output.writeUInt32(4, entityId_);
       }
       for (int i = 0; i < invokes_.size(); i++) {
-        output.writeMessage(9, invokes_.get(i));
+        output.writeMessage(6, invokes_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -235,7 +230,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
       }
       for (int i = 0; i < invokes_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, invokes_.get(i));
+          .computeMessageSize(6, invokes_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -369,11 +364,6 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8666
-     * Obf: PJIHLINBLNG
-     * </pre>
-     *
      * Protobuf type {@code ClientAbilityInitFinishNotify}
      */
     public static final class Builder extends
@@ -608,7 +598,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> invokesBuilder_;
 
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> getInvokesList() {
         if (invokesBuilder_ == null) {
@@ -618,7 +608,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public int getInvokesCount() {
         if (invokesBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry getInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -638,7 +628,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -655,7 +645,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder setInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -669,7 +659,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder addInvokes(emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
         if (invokesBuilder_ == null) {
@@ -685,7 +675,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry value) {
@@ -702,7 +692,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder addInvokes(
           emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -716,7 +706,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder addInvokes(
           int index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder builderForValue) {
@@ -730,7 +720,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder addAllInvokes(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry> values) {
@@ -745,7 +735,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder clearInvokes() {
         if (invokesBuilder_ == null) {
@@ -758,7 +748,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public Builder removeInvokes(int index) {
         if (invokesBuilder_ == null) {
@@ -771,14 +761,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder getInvokesBuilder(
           int index) {
         return getInvokesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder getInvokesOrBuilder(
           int index) {
@@ -788,7 +778,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntryOrBuilder> 
            getInvokesOrBuilderList() {
@@ -799,14 +789,14 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder() {
         return getInvokesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder addInvokesBuilder(
           int index) {
@@ -814,7 +804,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
             index, emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .AbilityInvokeEntry invokes = 9;</code>
+       * <code>repeated .AbilityInvokeEntry invokes = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AbilityInvokeEntryOuterClass.AbilityInvokeEntry.Builder> 
            getInvokesBuilderList() {
@@ -904,7 +894,7 @@ public final class ClientAbilityInitFinishNotifyOuterClass {
       "\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\t \003(\0132\023.AbilityInvokeEntryB\033\n\031emu" +
+      "nvokes\030\006 \003(\0132\023.AbilityInvokeEntryB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientGadgetInfoOuterClass.java
index d0e51955d..06a576cd5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientGadgetInfoOuterClass.java
@@ -96,7 +96,7 @@ public final class ClientGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: KCPDCBKPNNL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ClientGadgetInfo}
@@ -675,7 +675,7 @@ public final class ClientGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: KCPDCBKPNNL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ClientGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ClientLoadingCostumeVerificationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ClientLoadingCostumeVerificationNotifyOuterClass.java
index a2692dade..62ec8f0b7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ClientLoadingCostumeVerificationNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ClientLoadingCostumeVerificationNotifyOuterClass.java
@@ -19,27 +19,26 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costume_id = 13;</code>
+     * <code>uint64 prefab_hash = 1;</code>
+     * @return The prefabHash.
+     */
+    long getPrefabHash();
+
+    /**
+     * <code>uint32 costume_id = 5;</code>
      * @return The costumeId.
      */
     int getCostumeId();
 
     /**
-     * <code>uint64 guid = 9;</code>
+     * <code>uint64 guid = 15;</code>
      * @return The guid.
      */
     long getGuid();
-
-    /**
-     * <code>uint64 prefab_hash = 14;</code>
-     * @return The prefabHash.
-     */
-    long getPrefabHash();
   }
   /**
    * <pre>
-   * CmdId: 21932
-   * Obf: IPHKDOMBFFJ
+   * CmdId: 6382
    * </pre>
    *
    * Protobuf type {@code ClientLoadingCostumeVerificationNotify}
@@ -86,19 +85,19 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 8: {
 
-              guid_ = input.readUInt64();
+              prefabHash_ = input.readUInt64();
               break;
             }
-            case 104: {
+            case 40: {
 
               costumeId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 120: {
 
-              prefabHash_ = input.readUInt64();
+              guid_ = input.readUInt64();
               break;
             }
             default: {
@@ -133,10 +132,21 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
               emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify.class, emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify.Builder.class);
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 13;
+    public static final int PREFAB_HASH_FIELD_NUMBER = 1;
+    private long prefabHash_;
+    /**
+     * <code>uint64 prefab_hash = 1;</code>
+     * @return The prefabHash.
+     */
+    @java.lang.Override
+    public long getPrefabHash() {
+      return prefabHash_;
+    }
+
+    public static final int COSTUME_ID_FIELD_NUMBER = 5;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 13;</code>
+     * <code>uint32 costume_id = 5;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -144,10 +154,10 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       return costumeId_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 9;
+    public static final int GUID_FIELD_NUMBER = 15;
     private long guid_;
     /**
-     * <code>uint64 guid = 9;</code>
+     * <code>uint64 guid = 15;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -155,17 +165,6 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       return guid_;
     }
 
-    public static final int PREFAB_HASH_FIELD_NUMBER = 14;
-    private long prefabHash_;
-    /**
-     * <code>uint64 prefab_hash = 14;</code>
-     * @return The prefabHash.
-     */
-    @java.lang.Override
-    public long getPrefabHash() {
-      return prefabHash_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +179,14 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (guid_ != 0L) {
-        output.writeUInt64(9, guid_);
+      if (prefabHash_ != 0L) {
+        output.writeUInt64(1, prefabHash_);
       }
       if (costumeId_ != 0) {
-        output.writeUInt32(13, costumeId_);
+        output.writeUInt32(5, costumeId_);
       }
-      if (prefabHash_ != 0L) {
-        output.writeUInt64(14, prefabHash_);
+      if (guid_ != 0L) {
+        output.writeUInt64(15, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (guid_ != 0L) {
+      if (prefabHash_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, guid_);
+          .computeUInt64Size(1, prefabHash_);
       }
       if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, costumeId_);
+          .computeUInt32Size(5, costumeId_);
       }
-      if (prefabHash_ != 0L) {
+      if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, prefabHash_);
+          .computeUInt64Size(15, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +224,12 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify other = (emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify) obj;
 
+      if (getPrefabHash()
+          != other.getPrefabHash()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
       if (getGuid()
           != other.getGuid()) return false;
-      if (getPrefabHash()
-          != other.getPrefabHash()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,14 +241,14 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PREFAB_HASH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getPrefabHash());
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
-      hash = (37 * hash) + PREFAB_HASH_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getPrefabHash());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -347,8 +346,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 21932
-     * Obf: IPHKDOMBFFJ
+     * CmdId: 6382
      * </pre>
      *
      * Protobuf type {@code ClientLoadingCostumeVerificationNotify}
@@ -388,12 +386,12 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        prefabHash_ = 0L;
+
         costumeId_ = 0;
 
         guid_ = 0L;
 
-        prefabHash_ = 0L;
-
         return this;
       }
 
@@ -420,9 +418,9 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify buildPartial() {
         emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify result = new emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify(this);
+        result.prefabHash_ = prefabHash_;
         result.costumeId_ = costumeId_;
         result.guid_ = guid_;
-        result.prefabHash_ = prefabHash_;
         onBuilt();
         return result;
       }
@@ -471,15 +469,15 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify other) {
         if (other == emu.grasscutter.net.proto.ClientLoadingCostumeVerificationNotifyOuterClass.ClientLoadingCostumeVerificationNotify.getDefaultInstance()) return this;
+        if (other.getPrefabHash() != 0L) {
+          setPrefabHash(other.getPrefabHash());
+        }
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
-        if (other.getPrefabHash() != 0L) {
-          setPrefabHash(other.getPrefabHash());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,9 +507,40 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         return this;
       }
 
+      private long prefabHash_ ;
+      /**
+       * <code>uint64 prefab_hash = 1;</code>
+       * @return The prefabHash.
+       */
+      @java.lang.Override
+      public long getPrefabHash() {
+        return prefabHash_;
+      }
+      /**
+       * <code>uint64 prefab_hash = 1;</code>
+       * @param value The prefabHash to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPrefabHash(long value) {
+        
+        prefabHash_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 prefab_hash = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPrefabHash() {
+        
+        prefabHash_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 13;</code>
+       * <code>uint32 costume_id = 5;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -519,7 +548,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 13;</code>
+       * <code>uint32 costume_id = 5;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -530,7 +559,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 13;</code>
+       * <code>uint32 costume_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -542,7 +571,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 9;</code>
+       * <code>uint64 guid = 15;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -550,7 +579,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 9;</code>
+       * <code>uint64 guid = 15;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -561,7 +590,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 9;</code>
+       * <code>uint64 guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -570,37 +599,6 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private long prefabHash_ ;
-      /**
-       * <code>uint64 prefab_hash = 14;</code>
-       * @return The prefabHash.
-       */
-      @java.lang.Override
-      public long getPrefabHash() {
-        return prefabHash_;
-      }
-      /**
-       * <code>uint64 prefab_hash = 14;</code>
-       * @param value The prefabHash to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPrefabHash(long value) {
-        
-        prefabHash_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 prefab_hash = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPrefabHash() {
-        
-        prefabHash_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -670,8 +668,8 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n,ClientLoadingCostumeVerificationNotify" +
       ".proto\"_\n&ClientLoadingCostumeVerificati" +
-      "onNotify\022\022\n\ncostume_id\030\r \001(\r\022\014\n\004guid\030\t \001" +
-      "(\004\022\023\n\013prefab_hash\030\016 \001(\004B\033\n\031emu.grasscutt" +
+      "onNotify\022\023\n\013prefab_hash\030\001 \001(\004\022\022\n\ncostume" +
+      "_id\030\005 \001(\r\022\014\n\004guid\030\017 \001(\004B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +681,7 @@ public final class ClientLoadingCostumeVerificationNotifyOuterClass {
     internal_static_ClientLoadingCostumeVerificationNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ClientLoadingCostumeVerificationNotify_descriptor,
-        new java.lang.String[] { "CostumeId", "Guid", "PrefabHash", });
+        new java.lang.String[] { "PrefabHash", "CostumeId", "Guid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CodexDataUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CodexDataUpdateNotifyOuterClass.java
index 2a596244a..d14d070a8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CodexDataUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CodexDataUpdateNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class CodexDataUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 weapon_max_promote_level = 3;</code>
-     * @return The weaponMaxPromoteLevel.
+     * <code>uint32 id = 1;</code>
+     * @return The id.
      */
-    int getWeaponMaxPromoteLevel();
+    int getId();
 
     /**
-     * <code>.CodexType type = 5;</code>
+     * <code>.CodexType type = 2;</code>
      * @return The enum numeric value on the wire for type.
      */
     int getTypeValue();
     /**
-     * <code>.CodexType type = 5;</code>
+     * <code>.CodexType type = 2;</code>
      * @return The type.
      */
     emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType();
 
     /**
-     * <code>uint32 id = 2;</code>
-     * @return The id.
+     * <code>uint32 weapon_max_promote_level = 14;</code>
+     * @return The weaponMaxPromoteLevel.
      */
-    int getId();
+    int getWeaponMaxPromoteLevel();
   }
   /**
-   * <pre>
-   * CmdId: 6551
-   * Obf: NOPKDGNAPIK
-   * </pre>
-   *
    * Protobuf type {@code CodexDataUpdateNotify}
    */
   public static final class CodexDataUpdateNotify extends
@@ -92,22 +87,22 @@ public final class CodexDataUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 24: {
-
-              weaponMaxPromoteLevel_ = input.readUInt32();
-              break;
-            }
-            case 40: {
+            case 16: {
               int rawValue = input.readEnum();
 
               type_ = rawValue;
               break;
             }
+            case 112: {
+
+              weaponMaxPromoteLevel_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -140,28 +135,28 @@ public final class CodexDataUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.class, emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.Builder.class);
     }
 
-    public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 3;
-    private int weaponMaxPromoteLevel_;
+    public static final int ID_FIELD_NUMBER = 1;
+    private int id_;
     /**
-     * <code>uint32 weapon_max_promote_level = 3;</code>
-     * @return The weaponMaxPromoteLevel.
+     * <code>uint32 id = 1;</code>
+     * @return The id.
      */
     @java.lang.Override
-    public int getWeaponMaxPromoteLevel() {
-      return weaponMaxPromoteLevel_;
+    public int getId() {
+      return id_;
     }
 
-    public static final int TYPE_FIELD_NUMBER = 5;
+    public static final int TYPE_FIELD_NUMBER = 2;
     private int type_;
     /**
-     * <code>.CodexType type = 5;</code>
+     * <code>.CodexType type = 2;</code>
      * @return The enum numeric value on the wire for type.
      */
     @java.lang.Override public int getTypeValue() {
       return type_;
     }
     /**
-     * <code>.CodexType type = 5;</code>
+     * <code>.CodexType type = 2;</code>
      * @return The type.
      */
     @java.lang.Override public emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType getType() {
@@ -170,15 +165,15 @@ public final class CodexDataUpdateNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
     }
 
-    public static final int ID_FIELD_NUMBER = 2;
-    private int id_;
+    public static final int WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER = 14;
+    private int weaponMaxPromoteLevel_;
     /**
-     * <code>uint32 id = 2;</code>
-     * @return The id.
+     * <code>uint32 weapon_max_promote_level = 14;</code>
+     * @return The weaponMaxPromoteLevel.
      */
     @java.lang.Override
-    public int getId() {
-      return id_;
+    public int getWeaponMaxPromoteLevel() {
+      return weaponMaxPromoteLevel_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -196,13 +191,13 @@ public final class CodexDataUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (id_ != 0) {
-        output.writeUInt32(2, id_);
-      }
-      if (weaponMaxPromoteLevel_ != 0) {
-        output.writeUInt32(3, weaponMaxPromoteLevel_);
+        output.writeUInt32(1, id_);
       }
       if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
-        output.writeEnum(5, type_);
+        output.writeEnum(2, type_);
+      }
+      if (weaponMaxPromoteLevel_ != 0) {
+        output.writeUInt32(14, weaponMaxPromoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -215,15 +210,15 @@ public final class CodexDataUpdateNotifyOuterClass {
       size = 0;
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, id_);
-      }
-      if (weaponMaxPromoteLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, weaponMaxPromoteLevel_);
+          .computeUInt32Size(1, id_);
       }
       if (type_ != emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.CODEX_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, type_);
+          .computeEnumSize(2, type_);
+      }
+      if (weaponMaxPromoteLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, weaponMaxPromoteLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -240,11 +235,11 @@ public final class CodexDataUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other = (emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify) obj;
 
-      if (getWeaponMaxPromoteLevel()
-          != other.getWeaponMaxPromoteLevel()) return false;
-      if (type_ != other.type_) return false;
       if (getId()
           != other.getId()) return false;
+      if (type_ != other.type_) return false;
+      if (getWeaponMaxPromoteLevel()
+          != other.getWeaponMaxPromoteLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -256,12 +251,12 @@ public final class CodexDataUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getWeaponMaxPromoteLevel();
-      hash = (37 * hash) + TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + type_;
       hash = (37 * hash) + ID_FIELD_NUMBER;
       hash = (53 * hash) + getId();
+      hash = (37 * hash) + TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + type_;
+      hash = (37 * hash) + WEAPON_MAX_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getWeaponMaxPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -358,11 +353,6 @@ public final class CodexDataUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6551
-     * Obf: NOPKDGNAPIK
-     * </pre>
-     *
      * Protobuf type {@code CodexDataUpdateNotify}
      */
     public static final class Builder extends
@@ -400,11 +390,11 @@ public final class CodexDataUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        weaponMaxPromoteLevel_ = 0;
+        id_ = 0;
 
         type_ = 0;
 
-        id_ = 0;
+        weaponMaxPromoteLevel_ = 0;
 
         return this;
       }
@@ -432,9 +422,9 @@ public final class CodexDataUpdateNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify result = new emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify(this);
-        result.weaponMaxPromoteLevel_ = weaponMaxPromoteLevel_;
-        result.type_ = type_;
         result.id_ = id_;
+        result.type_ = type_;
+        result.weaponMaxPromoteLevel_ = weaponMaxPromoteLevel_;
         onBuilt();
         return result;
       }
@@ -483,14 +473,14 @@ public final class CodexDataUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.CodexDataUpdateNotifyOuterClass.CodexDataUpdateNotify.getDefaultInstance()) return this;
-        if (other.getWeaponMaxPromoteLevel() != 0) {
-          setWeaponMaxPromoteLevel(other.getWeaponMaxPromoteLevel());
+        if (other.getId() != 0) {
+          setId(other.getId());
         }
         if (other.type_ != 0) {
           setTypeValue(other.getTypeValue());
         }
-        if (other.getId() != 0) {
-          setId(other.getId());
+        if (other.getWeaponMaxPromoteLevel() != 0) {
+          setWeaponMaxPromoteLevel(other.getWeaponMaxPromoteLevel());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -521,47 +511,47 @@ public final class CodexDataUpdateNotifyOuterClass {
         return this;
       }
 
-      private int weaponMaxPromoteLevel_ ;
+      private int id_ ;
       /**
-       * <code>uint32 weapon_max_promote_level = 3;</code>
-       * @return The weaponMaxPromoteLevel.
+       * <code>uint32 id = 1;</code>
+       * @return The id.
        */
       @java.lang.Override
-      public int getWeaponMaxPromoteLevel() {
-        return weaponMaxPromoteLevel_;
+      public int getId() {
+        return id_;
       }
       /**
-       * <code>uint32 weapon_max_promote_level = 3;</code>
-       * @param value The weaponMaxPromoteLevel to set.
+       * <code>uint32 id = 1;</code>
+       * @param value The id to set.
        * @return This builder for chaining.
        */
-      public Builder setWeaponMaxPromoteLevel(int value) {
+      public Builder setId(int value) {
         
-        weaponMaxPromoteLevel_ = value;
+        id_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 weapon_max_promote_level = 3;</code>
+       * <code>uint32 id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWeaponMaxPromoteLevel() {
+      public Builder clearId() {
         
-        weaponMaxPromoteLevel_ = 0;
+        id_ = 0;
         onChanged();
         return this;
       }
 
       private int type_ = 0;
       /**
-       * <code>.CodexType type = 5;</code>
+       * <code>.CodexType type = 2;</code>
        * @return The enum numeric value on the wire for type.
        */
       @java.lang.Override public int getTypeValue() {
         return type_;
       }
       /**
-       * <code>.CodexType type = 5;</code>
+       * <code>.CodexType type = 2;</code>
        * @param value The enum numeric value on the wire for type to set.
        * @return This builder for chaining.
        */
@@ -572,7 +562,7 @@ public final class CodexDataUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.CodexType type = 5;</code>
+       * <code>.CodexType type = 2;</code>
        * @return The type.
        */
       @java.lang.Override
@@ -582,7 +572,7 @@ public final class CodexDataUpdateNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.CodexTypeOuterClass.CodexType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.CodexType type = 5;</code>
+       * <code>.CodexType type = 2;</code>
        * @param value The type to set.
        * @return This builder for chaining.
        */
@@ -596,7 +586,7 @@ public final class CodexDataUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.CodexType type = 5;</code>
+       * <code>.CodexType type = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearType() {
@@ -606,33 +596,33 @@ public final class CodexDataUpdateNotifyOuterClass {
         return this;
       }
 
-      private int id_ ;
+      private int weaponMaxPromoteLevel_ ;
       /**
-       * <code>uint32 id = 2;</code>
-       * @return The id.
+       * <code>uint32 weapon_max_promote_level = 14;</code>
+       * @return The weaponMaxPromoteLevel.
        */
       @java.lang.Override
-      public int getId() {
-        return id_;
+      public int getWeaponMaxPromoteLevel() {
+        return weaponMaxPromoteLevel_;
       }
       /**
-       * <code>uint32 id = 2;</code>
-       * @param value The id to set.
+       * <code>uint32 weapon_max_promote_level = 14;</code>
+       * @param value The weaponMaxPromoteLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setId(int value) {
+      public Builder setWeaponMaxPromoteLevel(int value) {
         
-        id_ = value;
+        weaponMaxPromoteLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 id = 2;</code>
+       * <code>uint32 weapon_max_promote_level = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearId() {
+      public Builder clearWeaponMaxPromoteLevel() {
         
-        id_ = 0;
+        weaponMaxPromoteLevel_ = 0;
         onChanged();
         return this;
       }
@@ -704,9 +694,9 @@ public final class CodexDataUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033CodexDataUpdateNotify.proto\032\017CodexType" +
-      ".proto\"_\n\025CodexDataUpdateNotify\022 \n\030weapo" +
-      "n_max_promote_level\030\003 \001(\r\022\030\n\004type\030\005 \001(\0162" +
-      "\n.CodexType\022\n\n\002id\030\002 \001(\rB\033\n\031emu.grasscutt" +
+      ".proto\"_\n\025CodexDataUpdateNotify\022\n\n\002id\030\001 " +
+      "\001(\r\022\030\n\004type\030\002 \001(\0162\n.CodexType\022 \n\030weapon_" +
+      "max_promote_level\030\016 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -719,7 +709,7 @@ public final class CodexDataUpdateNotifyOuterClass {
     internal_static_CodexDataUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CodexDataUpdateNotify_descriptor,
-        new java.lang.String[] { "WeaponMaxPromoteLevel", "Type", "Id", });
+        new java.lang.String[] { "Id", "Type", "WeaponMaxPromoteLevel", });
     emu.grasscutter.net.proto.CodexTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CodexTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CodexTypeOuterClass.java
index 2d6e83732..23db97c1c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CodexTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CodexTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class CodexTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LHGEGGKAFLM
-   * </pre>
-   *
    * Protobuf enum {@code CodexType}
    */
   public enum CodexType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CoinCollectOperatorInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CoinCollectOperatorInfoOuterClass.java
index c43defbd4..b60f022e0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CoinCollectOperatorInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CoinCollectOperatorInfoOuterClass.java
@@ -26,7 +26,7 @@ public final class CoinCollectOperatorInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: NFEECFHHDLJ
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code CoinCollectOperatorInfo}
@@ -278,7 +278,7 @@ public final class CoinCollectOperatorInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: NFEECFHHDLJ
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code CoinCollectOperatorInfo}
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 140a4930e..282386300 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CombatInvocationsNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class CombatInvocationsNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> 
         getInvokeListList();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index);
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     int getInvokeListCount();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
         getInvokeListOrBuilderList();
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 20271
-   * Obf: BLEFDDJFMLO
-   * </pre>
-   *
    * Protobuf type {@code CombatInvocationsNotify}
    */
   public static final class CombatInvocationsNotify extends
@@ -94,7 +89,7 @@ public final class CombatInvocationsNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 invokeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class CombatInvocationsNotifyOuterClass {
               emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify.class, emu.grasscutter.net.proto.CombatInvocationsNotifyOuterClass.CombatInvocationsNotify.Builder.class);
     }
 
-    public static final int INVOKE_LIST_FIELD_NUMBER = 15;
+    public static final int INVOKE_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> invokeList_;
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> getInvokeListList() {
       return invokeList_;
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
@@ -156,21 +151,21 @@ public final class CombatInvocationsNotifyOuterClass {
       return invokeList_;
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     @java.lang.Override
     public int getInvokeListCount() {
       return invokeList_.size();
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index) {
       return invokeList_.get(index);
     }
     /**
-     * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+     * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
@@ -193,7 +188,7 @@ public final class CombatInvocationsNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < invokeList_.size(); i++) {
-        output.writeMessage(15, invokeList_.get(i));
+        output.writeMessage(1, invokeList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class CombatInvocationsNotifyOuterClass {
       size = 0;
       for (int i = 0; i < invokeList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, invokeList_.get(i));
+          .computeMessageSize(1, invokeList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class CombatInvocationsNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20271
-     * Obf: BLEFDDJFMLO
-     * </pre>
-     *
      * Protobuf type {@code CombatInvocationsNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class CombatInvocationsNotifyOuterClass {
           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 = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> getInvokeListList() {
         if (invokeListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class CombatInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public int getInvokeListCount() {
         if (invokeListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class CombatInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry getInvokeList(int index) {
         if (invokeListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class CombatInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder setInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
@@ -585,7 +575,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder setInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder addInvokeList(emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
         if (invokeListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder addInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry value) {
@@ -632,7 +622,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder addInvokeList(
           emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder addInvokeList(
           int index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder addAllInvokeList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry> values) {
@@ -675,7 +665,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder clearInvokeList() {
         if (invokeListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public Builder removeInvokeList(int index) {
         if (invokeListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class CombatInvocationsNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder getInvokeListBuilder(
           int index) {
         return getInvokeListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder getInvokeListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class CombatInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntryOrBuilder> 
            getInvokeListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class CombatInvocationsNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</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 = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder addInvokeListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class CombatInvocationsNotifyOuterClass {
             index, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.getDefaultInstance());
       }
       /**
-       * <code>repeated .CombatInvokeEntry invoke_list = 15;</code>
+       * <code>repeated .CombatInvokeEntry invoke_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder> 
            getInvokeListBuilderList() {
@@ -833,7 +823,7 @@ public final class CombatInvocationsNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035CombatInvocationsNotify.proto\032\027CombatI" +
       "nvokeEntry.proto\"B\n\027CombatInvocationsNot" +
-      "ify\022\'\n\013invoke_list\030\017 \003(\0132\022.CombatInvokeE" +
+      "ify\022\'\n\013invoke_list\030\001 \003(\0132\022.CombatInvokeE" +
       "ntryB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombatInvokeEntryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombatInvokeEntryOuterClass.java
index e0c4f1072..1708d2215 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CombatInvokeEntryOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CombatInvokeEntryOuterClass.java
@@ -19,38 +19,34 @@ public final class CombatInvokeEntryOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ForwardType forward_type = 14;</code>
+     * <code>.ForwardType forward_type = 4;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 14;</code>
+     * <code>.ForwardType forward_type = 4;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
 
     /**
-     * <code>.CombatTypeArgument argument_type = 9;</code>
+     * <code>.CombatTypeArgument argument_type = 8;</code>
      * @return The enum numeric value on the wire for argumentType.
      */
     int getArgumentTypeValue();
     /**
-     * <code>.CombatTypeArgument argument_type = 9;</code>
+     * <code>.CombatTypeArgument argument_type = 8;</code>
      * @return The argumentType.
      */
     emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument getArgumentType();
 
     /**
-     * <code>bytes combat_data = 11;</code>
+     * <code>bytes combat_data = 14;</code>
      * @return The combatData.
      */
     com.google.protobuf.ByteString getCombatData();
   }
   /**
-   * <pre>
-   * Obf: CDKBNNNPIIC
-   * </pre>
-   *
    * Protobuf type {@code CombatInvokeEntry}
    */
   public static final class CombatInvokeEntry extends
@@ -98,23 +94,23 @@ public final class CombatInvokeEntryOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 32: {
+              int rawValue = input.readEnum();
+
+              forwardType_ = rawValue;
+              break;
+            }
+            case 64: {
               int rawValue = input.readEnum();
 
               argumentType_ = rawValue;
               break;
             }
-            case 90: {
+            case 114: {
 
               combatData_ = input.readBytes();
               break;
             }
-            case 112: {
-              int rawValue = input.readEnum();
-
-              forwardType_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -147,17 +143,17 @@ public final class CombatInvokeEntryOuterClass {
               emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.class, emu.grasscutter.net.proto.CombatInvokeEntryOuterClass.CombatInvokeEntry.Builder.class);
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 14;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 4;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 14;</code>
+     * <code>.ForwardType forward_type = 4;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     @java.lang.Override public int getForwardTypeValue() {
       return forwardType_;
     }
     /**
-     * <code>.ForwardType forward_type = 14;</code>
+     * <code>.ForwardType forward_type = 4;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -166,17 +162,17 @@ public final class CombatInvokeEntryOuterClass {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
-    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 9;
+    public static final int ARGUMENT_TYPE_FIELD_NUMBER = 8;
     private int argumentType_;
     /**
-     * <code>.CombatTypeArgument argument_type = 9;</code>
+     * <code>.CombatTypeArgument argument_type = 8;</code>
      * @return The enum numeric value on the wire for argumentType.
      */
     @java.lang.Override public int getArgumentTypeValue() {
       return argumentType_;
     }
     /**
-     * <code>.CombatTypeArgument argument_type = 9;</code>
+     * <code>.CombatTypeArgument argument_type = 8;</code>
      * @return The argumentType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument getArgumentType() {
@@ -185,10 +181,10 @@ public final class CombatInvokeEntryOuterClass {
       return result == null ? emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument.UNRECOGNIZED : result;
     }
 
-    public static final int COMBAT_DATA_FIELD_NUMBER = 11;
+    public static final int COMBAT_DATA_FIELD_NUMBER = 14;
     private com.google.protobuf.ByteString combatData_;
     /**
-     * <code>bytes combat_data = 11;</code>
+     * <code>bytes combat_data = 14;</code>
      * @return The combatData.
      */
     @java.lang.Override
@@ -210,14 +206,14 @@ public final class CombatInvokeEntryOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        output.writeEnum(4, forwardType_);
+      }
       if (argumentType_ != emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument.COMBAT_TYPE_ARGUMENT_NONE.getNumber()) {
-        output.writeEnum(9, argumentType_);
+        output.writeEnum(8, argumentType_);
       }
       if (!combatData_.isEmpty()) {
-        output.writeBytes(11, combatData_);
-      }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(14, forwardType_);
+        output.writeBytes(14, combatData_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,17 +224,17 @@ public final class CombatInvokeEntryOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(4, forwardType_);
+      }
       if (argumentType_ != emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument.COMBAT_TYPE_ARGUMENT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, argumentType_);
+          .computeEnumSize(8, argumentType_);
       }
       if (!combatData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(11, combatData_);
-      }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, forwardType_);
+          .computeBytesSize(14, combatData_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -372,10 +368,6 @@ public final class CombatInvokeEntryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CDKBNNNPIIC
-     * </pre>
-     *
      * Protobuf type {@code CombatInvokeEntry}
      */
     public static final class Builder extends
@@ -536,14 +528,14 @@ public final class CombatInvokeEntryOuterClass {
 
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 4;</code>
        * @return The enum numeric value on the wire for forwardType.
        */
       @java.lang.Override public int getForwardTypeValue() {
         return forwardType_;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 4;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -554,7 +546,7 @@ public final class CombatInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 4;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -564,7 +556,7 @@ public final class CombatInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 4;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -578,7 +570,7 @@ public final class CombatInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 14;</code>
+       * <code>.ForwardType forward_type = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -590,14 +582,14 @@ public final class CombatInvokeEntryOuterClass {
 
       private int argumentType_ = 0;
       /**
-       * <code>.CombatTypeArgument argument_type = 9;</code>
+       * <code>.CombatTypeArgument argument_type = 8;</code>
        * @return The enum numeric value on the wire for argumentType.
        */
       @java.lang.Override public int getArgumentTypeValue() {
         return argumentType_;
       }
       /**
-       * <code>.CombatTypeArgument argument_type = 9;</code>
+       * <code>.CombatTypeArgument argument_type = 8;</code>
        * @param value The enum numeric value on the wire for argumentType to set.
        * @return This builder for chaining.
        */
@@ -608,7 +600,7 @@ public final class CombatInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.CombatTypeArgument argument_type = 9;</code>
+       * <code>.CombatTypeArgument argument_type = 8;</code>
        * @return The argumentType.
        */
       @java.lang.Override
@@ -618,7 +610,7 @@ public final class CombatInvokeEntryOuterClass {
         return result == null ? emu.grasscutter.net.proto.CombatTypeArgumentOuterClass.CombatTypeArgument.UNRECOGNIZED : result;
       }
       /**
-       * <code>.CombatTypeArgument argument_type = 9;</code>
+       * <code>.CombatTypeArgument argument_type = 8;</code>
        * @param value The argumentType to set.
        * @return This builder for chaining.
        */
@@ -632,7 +624,7 @@ public final class CombatInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>.CombatTypeArgument argument_type = 9;</code>
+       * <code>.CombatTypeArgument argument_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearArgumentType() {
@@ -644,7 +636,7 @@ public final class CombatInvokeEntryOuterClass {
 
       private com.google.protobuf.ByteString combatData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes combat_data = 11;</code>
+       * <code>bytes combat_data = 14;</code>
        * @return The combatData.
        */
       @java.lang.Override
@@ -652,7 +644,7 @@ public final class CombatInvokeEntryOuterClass {
         return combatData_;
       }
       /**
-       * <code>bytes combat_data = 11;</code>
+       * <code>bytes combat_data = 14;</code>
        * @param value The combatData to set.
        * @return This builder for chaining.
        */
@@ -666,7 +658,7 @@ public final class CombatInvokeEntryOuterClass {
         return this;
       }
       /**
-       * <code>bytes combat_data = 11;</code>
+       * <code>bytes combat_data = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearCombatData() {
@@ -744,9 +736,9 @@ public final class CombatInvokeEntryOuterClass {
     java.lang.String[] descriptorData = {
       "\n\027CombatInvokeEntry.proto\032\021ForwardType.p" +
       "roto\032\030CombatTypeArgument.proto\"x\n\021Combat" +
-      "InvokeEntry\022\"\n\014forward_type\030\016 \001(\0162\014.Forw" +
-      "ardType\022*\n\rargument_type\030\t \001(\0162\023.CombatT" +
-      "ypeArgument\022\023\n\013combat_data\030\013 \001(\014B\033\n\031emu." +
+      "InvokeEntry\022\"\n\014forward_type\030\004 \001(\0162\014.Forw" +
+      "ardType\022*\n\rargument_type\030\010 \001(\0162\023.CombatT" +
+      "ypeArgument\022\023\n\013combat_data\030\016 \001(\014B\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CombatTypeArgumentOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CombatTypeArgumentOuterClass.java
index 27b34ffcd..60c85245b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CombatTypeArgumentOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CombatTypeArgumentOuterClass.java
@@ -15,10 +15,6 @@ public final class CombatTypeArgumentOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: ADBGJCJNCPF
-   * </pre>
-   *
    * Protobuf enum {@code CombatTypeArgument}
    */
   public enum CombatTypeArgument
@@ -100,9 +96,21 @@ public final class CombatTypeArgumentOuterClass {
      */
     COMBAT_TYPE_ARGUMENT_GRAPPLING_HOOK_MOVE(18),
     /**
-     * <code>ADBGJCJNCPF_CombatSpecialMotionInfo = 19;</code>
+     * <code>COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO = 19;</code>
      */
-    ADBGJCJNCPF_CombatSpecialMotionInfo(19),
+    COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO(19),
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE = 20;</code>
+     */
+    COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE(20),
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM = 21;</code>
+     */
+    COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM(21),
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION = 22;</code>
+     */
+    COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION(22),
     UNRECOGNIZED(-1),
     ;
 
@@ -183,9 +191,21 @@ public final class CombatTypeArgumentOuterClass {
      */
     public static final int COMBAT_TYPE_ARGUMENT_GRAPPLING_HOOK_MOVE_VALUE = 18;
     /**
-     * <code>ADBGJCJNCPF_CombatSpecialMotionInfo = 19;</code>
+     * <code>COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO = 19;</code>
      */
-    public static final int ADBGJCJNCPF_CombatSpecialMotionInfo_VALUE = 19;
+    public static final int COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO_VALUE = 19;
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE = 20;</code>
+     */
+    public static final int COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE_VALUE = 20;
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM = 21;</code>
+     */
+    public static final int COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM_VALUE = 21;
+    /**
+     * <code>COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION = 22;</code>
+     */
+    public static final int COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION_VALUE = 22;
 
 
     public final int getNumber() {
@@ -231,7 +251,10 @@ public final class CombatTypeArgumentOuterClass {
         case 16: return COMBAT_TYPE_ARGUMENT_BEING_HEALED_NTF;
         case 17: return COMBAT_TYPE_ARGUMENT_SKILL_ANCHOR_POSITION_NTF;
         case 18: return COMBAT_TYPE_ARGUMENT_GRAPPLING_HOOK_MOVE;
-        case 19: return ADBGJCJNCPF_CombatSpecialMotionInfo;
+        case 19: return COMBAT_TYPE_ARGUMENT_SPECIAL_MOTION_INFO;
+        case 20: return COMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_MOVE;
+        case 21: return COMBAT_TYPE_ARGUMENT_MULTI_OVERRIDE_ANIM;
+        case 22: return COMBAT_TYPE_ARGUMENT_DEBUG_SYNC_MOTION;
         default: return null;
       }
     }
@@ -297,7 +320,7 @@ public final class CombatTypeArgumentOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030CombatTypeArgument.proto*\361\006\n\022CombatTyp" +
+      "\n\030CombatTypeArgument.proto*\202\010\n\022CombatTyp" +
       "eArgument\022\035\n\031COMBAT_TYPE_ARGUMENT_NONE\020\000" +
       "\022&\n\"COMBAT_TYPE_ARGUMENT_EVT_BEING_HIT\020\001" +
       "\022/\n+COMBAT_TYPE_ARGUMENT_ANIMATOR_STATE_" +
@@ -318,9 +341,13 @@ public final class CombatTypeArgumentOuterClass {
       "E_MOVE\020\017\022)\n%COMBAT_TYPE_ARGUMENT_BEING_H" +
       "EALED_NTF\020\020\0222\n.COMBAT_TYPE_ARGUMENT_SKIL" +
       "L_ANCHOR_POSITION_NTF\020\021\022,\n(COMBAT_TYPE_A" +
-      "RGUMENT_GRAPPLING_HOOK_MOVE\020\022\022\'\n#ADBGJCJ" +
-      "NCPF_CombatSpecialMotionInfo\020\023B\033\n\031emu.gr" +
-      "asscutter.net.protob\006proto3"
+      "RGUMENT_GRAPPLING_HOOK_MOVE\020\022\022,\n(COMBAT_" +
+      "TYPE_ARGUMENT_SPECIAL_MOTION_INFO\020\023\0220\n,C" +
+      "OMBAT_TYPE_ARGUMENT_FIXED_AVATAR_FLASH_M" +
+      "OVE\020\024\022,\n(COMBAT_TYPE_ARGUMENT_MULTI_OVER" +
+      "RIDE_ANIM\020\025\022*\n&COMBAT_TYPE_ARGUMENT_DEBU" +
+      "G_SYNC_MOTION\020\026B\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CountDownDeleteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CountDownDeleteOuterClass.java
new file mode 100644
index 000000000..1641d20f3
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CountDownDeleteOuterClass.java
@@ -0,0 +1,870 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: CountDownDelete.proto
+
+package emu.grasscutter.net.proto;
+
+public final class CountDownDeleteOuterClass {
+  private CountDownDeleteOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface CountDownDeleteOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:CountDownDelete)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    int getDeleteTimeNumMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    boolean containsDeleteTimeNumMap(
+        int key);
+    /**
+     * Use {@link #getDeleteTimeNumMapMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getDeleteTimeNumMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getDeleteTimeNumMapMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    int getDeleteTimeNumMapOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    int getDeleteTimeNumMapOrThrow(
+        int key);
+
+    /**
+     * <code>uint32 config_count_down_time = 2;</code>
+     * @return The configCountDownTime.
+     */
+    int getConfigCountDownTime();
+  }
+  /**
+   * Protobuf type {@code CountDownDelete}
+   */
+  public static final class CountDownDelete extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:CountDownDelete)
+      CountDownDeleteOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use CountDownDelete.newBuilder() to construct.
+    private CountDownDelete(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private CountDownDelete() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new CountDownDelete();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private CountDownDelete(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                deleteTimeNumMap_ = com.google.protobuf.MapField.newMapField(
+                    DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              deleteTimeNumMap__ = input.readMessage(
+                  DeleteTimeNumMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              deleteTimeNumMap_.getMutableMap().put(
+                  deleteTimeNumMap__.getKey(), deleteTimeNumMap__.getValue());
+              break;
+            }
+            case 16: {
+
+              configCountDownTime_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.CountDownDeleteOuterClass.internal_static_CountDownDelete_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetDeleteTimeNumMap();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.CountDownDeleteOuterClass.internal_static_CountDownDelete_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.class, emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.Builder.class);
+    }
+
+    public static final int DELETE_TIME_NUM_MAP_FIELD_NUMBER = 1;
+    private static final class DeleteTimeNumMapDefaultEntryHolder {
+      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.CountDownDeleteOuterClass.internal_static_CountDownDelete_DeleteTimeNumMapEntry_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> deleteTimeNumMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetDeleteTimeNumMap() {
+      if (deleteTimeNumMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+      }
+      return deleteTimeNumMap_;
+    }
+
+    public int getDeleteTimeNumMapCount() {
+      return internalGetDeleteTimeNumMap().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsDeleteTimeNumMap(
+        int key) {
+      
+      return internalGetDeleteTimeNumMap().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getDeleteTimeNumMapMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMap() {
+      return getDeleteTimeNumMapMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMapMap() {
+      return internalGetDeleteTimeNumMap().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public int getDeleteTimeNumMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetDeleteTimeNumMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public int getDeleteTimeNumMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetDeleteTimeNumMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int CONFIG_COUNT_DOWN_TIME_FIELD_NUMBER = 2;
+    private int configCountDownTime_;
+    /**
+     * <code>uint32 config_count_down_time = 2;</code>
+     * @return The configCountDownTime.
+     */
+    @java.lang.Override
+    public int getConfigCountDownTime() {
+      return configCountDownTime_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetDeleteTimeNumMap(),
+          DeleteTimeNumMapDefaultEntryHolder.defaultEntry,
+          1);
+      if (configCountDownTime_ != 0) {
+        output.writeUInt32(2, configCountDownTime_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetDeleteTimeNumMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        deleteTimeNumMap__ = DeleteTimeNumMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(1, deleteTimeNumMap__);
+      }
+      if (configCountDownTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, configCountDownTime_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete other = (emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete) obj;
+
+      if (!internalGetDeleteTimeNumMap().equals(
+          other.internalGetDeleteTimeNumMap())) return false;
+      if (getConfigCountDownTime()
+          != other.getConfigCountDownTime()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (!internalGetDeleteTimeNumMap().getMap().isEmpty()) {
+        hash = (37 * hash) + DELETE_TIME_NUM_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetDeleteTimeNumMap().hashCode();
+      }
+      hash = (37 * hash) + CONFIG_COUNT_DOWN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigCountDownTime();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code CountDownDelete}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:CountDownDelete)
+        emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDeleteOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.CountDownDeleteOuterClass.internal_static_CountDownDelete_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMapField(
+          int number) {
+        switch (number) {
+          case 1:
+            return internalGetDeleteTimeNumMap();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMutableMapField(
+          int number) {
+        switch (number) {
+          case 1:
+            return internalGetMutableDeleteTimeNumMap();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.CountDownDeleteOuterClass.internal_static_CountDownDelete_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.class, emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        internalGetMutableDeleteTimeNumMap().clear();
+        configCountDownTime_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.CountDownDeleteOuterClass.internal_static_CountDownDelete_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete build() {
+        emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete buildPartial() {
+        emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete result = new emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete(this);
+        int from_bitField0_ = bitField0_;
+        result.deleteTimeNumMap_ = internalGetDeleteTimeNumMap();
+        result.deleteTimeNumMap_.makeImmutable();
+        result.configCountDownTime_ = configCountDownTime_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete) {
+          return mergeFrom((emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete other) {
+        if (other == emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete.getDefaultInstance()) return this;
+        internalGetMutableDeleteTimeNumMap().mergeFrom(
+            other.internalGetDeleteTimeNumMap());
+        if (other.getConfigCountDownTime() != 0) {
+          setConfigCountDownTime(other.getConfigCountDownTime());
+        }
+        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.CountDownDeleteOuterClass.CountDownDelete parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> deleteTimeNumMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetDeleteTimeNumMap() {
+        if (deleteTimeNumMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+        }
+        return deleteTimeNumMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableDeleteTimeNumMap() {
+        onChanged();;
+        if (deleteTimeNumMap_ == null) {
+          deleteTimeNumMap_ = com.google.protobuf.MapField.newMapField(
+              DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!deleteTimeNumMap_.isMutable()) {
+          deleteTimeNumMap_ = deleteTimeNumMap_.copy();
+        }
+        return deleteTimeNumMap_;
+      }
+
+      public int getDeleteTimeNumMapCount() {
+        return internalGetDeleteTimeNumMap().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsDeleteTimeNumMap(
+          int key) {
+        
+        return internalGetDeleteTimeNumMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getDeleteTimeNumMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMap() {
+        return getDeleteTimeNumMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMapMap() {
+        return internalGetDeleteTimeNumMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public int getDeleteTimeNumMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetDeleteTimeNumMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public int getDeleteTimeNumMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetDeleteTimeNumMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearDeleteTimeNumMap() {
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      public Builder removeDeleteTimeNumMap(
+          int key) {
+        
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableDeleteTimeNumMap() {
+        return internalGetMutableDeleteTimeNumMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      public Builder putDeleteTimeNumMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      public Builder putAllDeleteTimeNumMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private int configCountDownTime_ ;
+      /**
+       * <code>uint32 config_count_down_time = 2;</code>
+       * @return The configCountDownTime.
+       */
+      @java.lang.Override
+      public int getConfigCountDownTime() {
+        return configCountDownTime_;
+      }
+      /**
+       * <code>uint32 config_count_down_time = 2;</code>
+       * @param value The configCountDownTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigCountDownTime(int value) {
+        
+        configCountDownTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_count_down_time = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigCountDownTime() {
+        
+        configCountDownTime_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:CountDownDelete)
+    }
+
+    // @@protoc_insertion_point(class_scope:CountDownDelete)
+    private static final emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete();
+    }
+
+    public static emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<CountDownDelete>
+        PARSER = new com.google.protobuf.AbstractParser<CountDownDelete>() {
+      @java.lang.Override
+      public CountDownDelete parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new CountDownDelete(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<CountDownDelete> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<CountDownDelete> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CountDownDeleteOuterClass.CountDownDelete getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_CountDownDelete_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_CountDownDelete_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_CountDownDelete_DeleteTimeNumMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_CountDownDelete_DeleteTimeNumMapEntry_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\025CountDownDelete.proto\"\257\001\n\017CountDownDel" +
+      "ete\022C\n\023delete_time_num_map\030\001 \003(\0132&.Count" +
+      "DownDelete.DeleteTimeNumMapEntry\022\036\n\026conf" +
+      "ig_count_down_time\030\002 \001(\r\0327\n\025DeleteTimeNu" +
+      "mMapEntry\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"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_CountDownDelete_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_CountDownDelete_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_CountDownDelete_descriptor,
+        new java.lang.String[] { "DeleteTimeNumMap", "ConfigCountDownTime", });
+    internal_static_CountDownDelete_DeleteTimeNumMapEntry_descriptor =
+      internal_static_CountDownDelete_descriptor.getNestedTypes().get(0);
+    internal_static_CountDownDelete_DeleteTimeNumMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_CountDownDelete_DeleteTimeNumMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java
index 97e899e06..15e1e3178 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateEntityInfoOuterClass.java
@@ -18,50 +18,6 @@ public final class CreateEntityInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:CreateEntityInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 monster_id = 1;</code>
-     * @return Whether the monsterId field is set.
-     */
-    boolean hasMonsterId();
-    /**
-     * <code>uint32 monster_id = 1;</code>
-     * @return The monsterId.
-     */
-    int getMonsterId();
-
-    /**
-     * <code>uint32 npc_id = 2;</code>
-     * @return Whether the npcId field is set.
-     */
-    boolean hasNpcId();
-    /**
-     * <code>uint32 npc_id = 2;</code>
-     * @return The npcId.
-     */
-    int getNpcId();
-
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return Whether the gadgetId field is set.
-     */
-    boolean hasGadgetId();
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return The gadgetId.
-     */
-    int getGadgetId();
-
-    /**
-     * <code>uint32 item_id = 4;</code>
-     * @return Whether the itemId field is set.
-     */
-    boolean hasItemId();
-    /**
-     * <code>uint32 item_id = 4;</code>
-     * @return The itemId.
-     */
-    int getItemId();
-
     /**
      * <code>uint32 level = 5;</code>
      * @return The level.
@@ -117,27 +73,69 @@ public final class CreateEntityInfoOuterClass {
     int getClientUniqueId();
 
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>uint32 monster_id = 1;</code>
+     * @return Whether the monsterId field is set.
+     */
+    boolean hasMonsterId();
+    /**
+     * <code>uint32 monster_id = 1;</code>
+     * @return The monsterId.
+     */
+    int getMonsterId();
+
+    /**
+     * <code>uint32 npc_id = 2;</code>
+     * @return Whether the npcId field is set.
+     */
+    boolean hasNpcId();
+    /**
+     * <code>uint32 npc_id = 2;</code>
+     * @return The npcId.
+     */
+    int getNpcId();
+
+    /**
+     * <code>uint32 gadget_id = 3;</code>
+     * @return Whether the gadgetId field is set.
+     */
+    boolean hasGadgetId();
+    /**
+     * <code>uint32 gadget_id = 3;</code>
+     * @return The gadgetId.
+     */
+    int getGadgetId();
+
+    /**
+     * <code>uint32 item_id = 4;</code>
+     * @return Whether the itemId field is set.
+     */
+    boolean hasItemId();
+    /**
+     * <code>uint32 item_id = 4;</code>
+     * @return The itemId.
+     */
+    int getItemId();
+
+    /**
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      * @return Whether the gadget field is set.
      */
     boolean hasGadget();
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      * @return The gadget.
      */
     emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget();
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      */
     emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder();
 
     public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.EntityCase getEntityCase();
+
+    public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.EntityCreateInfoCase getEntityCreateInfoCase();
   }
   /**
-   * <pre>
-   * Obf: CIDLLJOHEFL
-   * </pre>
-   *
    * Protobuf type {@code CreateEntityInfo}
    */
   public static final class CreateEntityInfo extends
@@ -172,7 +170,6 @@ public final class CreateEntityInfoOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -251,15 +248,16 @@ public final class CreateEntityInfoOuterClass {
             }
             case 106: {
               emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = gadget_.toBuilder();
+              if (entityCreateInfoCase_ == 13) {
+                subBuilder = ((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_).toBuilder();
               }
-              gadget_ = input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.parser(), extensionRegistry);
+              entityCreateInfo_ =
+                  input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(gadget_);
-                gadget_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_);
+                entityCreateInfo_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00000001;
+              entityCreateInfoCase_ = 13;
               break;
             }
             default: {
@@ -294,7 +292,6 @@ public final class CreateEntityInfoOuterClass {
               emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.class, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder.class);
     }
 
-    private int bitField0_;
     private int entityCase_ = 0;
     private java.lang.Object entity_;
     public enum EntityCase
@@ -340,88 +337,43 @@ public final class CreateEntityInfoOuterClass {
           entityCase_);
     }
 
-    public static final int MONSTER_ID_FIELD_NUMBER = 1;
-    /**
-     * <code>uint32 monster_id = 1;</code>
-     * @return Whether the monsterId field is set.
-     */
-    @java.lang.Override
-    public boolean hasMonsterId() {
-      return entityCase_ == 1;
-    }
-    /**
-     * <code>uint32 monster_id = 1;</code>
-     * @return The monsterId.
-     */
-    @java.lang.Override
-    public int getMonsterId() {
-      if (entityCase_ == 1) {
-        return (java.lang.Integer) entity_;
+    private int entityCreateInfoCase_ = 0;
+    private java.lang.Object entityCreateInfo_;
+    public enum EntityCreateInfoCase
+        implements com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      GADGET(13),
+      ENTITYCREATEINFO_NOT_SET(0);
+      private final int value;
+      private EntityCreateInfoCase(int value) {
+        this.value = value;
+      }
+      /**
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
+       */
+      @java.lang.Deprecated
+      public static EntityCreateInfoCase valueOf(int value) {
+        return forNumber(value);
       }
-      return 0;
-    }
 
-    public static final int NPC_ID_FIELD_NUMBER = 2;
-    /**
-     * <code>uint32 npc_id = 2;</code>
-     * @return Whether the npcId field is set.
-     */
-    @java.lang.Override
-    public boolean hasNpcId() {
-      return entityCase_ == 2;
-    }
-    /**
-     * <code>uint32 npc_id = 2;</code>
-     * @return The npcId.
-     */
-    @java.lang.Override
-    public int getNpcId() {
-      if (entityCase_ == 2) {
-        return (java.lang.Integer) entity_;
+      public static EntityCreateInfoCase forNumber(int value) {
+        switch (value) {
+          case 13: return GADGET;
+          case 0: return ENTITYCREATEINFO_NOT_SET;
+          default: return null;
+        }
       }
-      return 0;
-    }
+      public int getNumber() {
+        return this.value;
+      }
+    };
 
-    public static final int GADGET_ID_FIELD_NUMBER = 3;
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return Whether the gadgetId field is set.
-     */
-    @java.lang.Override
-    public boolean hasGadgetId() {
-      return entityCase_ == 3;
-    }
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return The gadgetId.
-     */
-    @java.lang.Override
-    public int getGadgetId() {
-      if (entityCase_ == 3) {
-        return (java.lang.Integer) entity_;
-      }
-      return 0;
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 4;
-    /**
-     * <code>uint32 item_id = 4;</code>
-     * @return Whether the itemId field is set.
-     */
-    @java.lang.Override
-    public boolean hasItemId() {
-      return entityCase_ == 4;
-    }
-    /**
-     * <code>uint32 item_id = 4;</code>
-     * @return The itemId.
-     */
-    @java.lang.Override
-    public int getItemId() {
-      if (entityCase_ == 4) {
-        return (java.lang.Integer) entity_;
-      }
-      return 0;
+    public EntityCreateInfoCase
+    getEntityCreateInfoCase() {
+      return EntityCreateInfoCase.forNumber(
+          entityCreateInfoCase_);
     }
 
     public static final int LEVEL_FIELD_NUMBER = 5;
@@ -520,30 +472,119 @@ public final class CreateEntityInfoOuterClass {
       return clientUniqueId_;
     }
 
-    public static final int GADGET_FIELD_NUMBER = 13;
-    private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo gadget_;
+    public static final int MONSTER_ID_FIELD_NUMBER = 1;
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>uint32 monster_id = 1;</code>
+     * @return Whether the monsterId field is set.
+     */
+    @java.lang.Override
+    public boolean hasMonsterId() {
+      return entityCase_ == 1;
+    }
+    /**
+     * <code>uint32 monster_id = 1;</code>
+     * @return The monsterId.
+     */
+    @java.lang.Override
+    public int getMonsterId() {
+      if (entityCase_ == 1) {
+        return (java.lang.Integer) entity_;
+      }
+      return 0;
+    }
+
+    public static final int NPC_ID_FIELD_NUMBER = 2;
+    /**
+     * <code>uint32 npc_id = 2;</code>
+     * @return Whether the npcId field is set.
+     */
+    @java.lang.Override
+    public boolean hasNpcId() {
+      return entityCase_ == 2;
+    }
+    /**
+     * <code>uint32 npc_id = 2;</code>
+     * @return The npcId.
+     */
+    @java.lang.Override
+    public int getNpcId() {
+      if (entityCase_ == 2) {
+        return (java.lang.Integer) entity_;
+      }
+      return 0;
+    }
+
+    public static final int GADGET_ID_FIELD_NUMBER = 3;
+    /**
+     * <code>uint32 gadget_id = 3;</code>
+     * @return Whether the gadgetId field is set.
+     */
+    @java.lang.Override
+    public boolean hasGadgetId() {
+      return entityCase_ == 3;
+    }
+    /**
+     * <code>uint32 gadget_id = 3;</code>
+     * @return The gadgetId.
+     */
+    @java.lang.Override
+    public int getGadgetId() {
+      if (entityCase_ == 3) {
+        return (java.lang.Integer) entity_;
+      }
+      return 0;
+    }
+
+    public static final int ITEM_ID_FIELD_NUMBER = 4;
+    /**
+     * <code>uint32 item_id = 4;</code>
+     * @return Whether the itemId field is set.
+     */
+    @java.lang.Override
+    public boolean hasItemId() {
+      return entityCase_ == 4;
+    }
+    /**
+     * <code>uint32 item_id = 4;</code>
+     * @return The itemId.
+     */
+    @java.lang.Override
+    public int getItemId() {
+      if (entityCase_ == 4) {
+        return (java.lang.Integer) entity_;
+      }
+      return 0;
+    }
+
+    public static final int GADGET_FIELD_NUMBER = 13;
+    /**
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      * @return Whether the gadget field is set.
      */
     @java.lang.Override
     public boolean hasGadget() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return entityCreateInfoCase_ == 13;
     }
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      * @return The gadget.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget() {
-      return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_;
+      if (entityCreateInfoCase_ == 13) {
+         return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_;
+      }
+      return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
     }
     /**
-     * <code>optional .CreateGadgetInfo gadget = 13;</code>
+     * <code>.CreateGadgetInfo gadget = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder() {
-      return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_;
+      if (entityCreateInfoCase_ == 13) {
+         return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_;
+      }
+      return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -594,8 +635,8 @@ public final class CreateEntityInfoOuterClass {
       if (clientUniqueId_ != 0) {
         output.writeUInt32(12, clientUniqueId_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
-        output.writeMessage(13, getGadget());
+      if (entityCreateInfoCase_ == 13) {
+        output.writeMessage(13, (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_);
       }
       unknownFields.writeTo(output);
     }
@@ -650,9 +691,9 @@ public final class CreateEntityInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(12, clientUniqueId_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (entityCreateInfoCase_ == 13) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getGadget());
+          .computeMessageSize(13, (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -687,11 +728,6 @@ public final class CreateEntityInfoOuterClass {
           != other.getRoomId()) return false;
       if (getClientUniqueId()
           != other.getClientUniqueId()) return false;
-      if (hasGadget() != other.hasGadget()) return false;
-      if (hasGadget()) {
-        if (!getGadget()
-            .equals(other.getGadget())) return false;
-      }
       if (!getEntityCase().equals(other.getEntityCase())) return false;
       switch (entityCase_) {
         case 1:
@@ -713,6 +749,15 @@ public final class CreateEntityInfoOuterClass {
         case 0:
         default:
       }
+      if (!getEntityCreateInfoCase().equals(other.getEntityCreateInfoCase())) return false;
+      switch (entityCreateInfoCase_) {
+        case 13:
+          if (!getGadget()
+              .equals(other.getGadget())) return false;
+          break;
+        case 0:
+        default:
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -740,10 +785,6 @@ public final class CreateEntityInfoOuterClass {
       hash = (53 * hash) + getRoomId();
       hash = (37 * hash) + CLIENT_UNIQUE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getClientUniqueId();
-      if (hasGadget()) {
-        hash = (37 * hash) + GADGET_FIELD_NUMBER;
-        hash = (53 * hash) + getGadget().hashCode();
-      }
       switch (entityCase_) {
         case 1:
           hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
@@ -764,6 +805,14 @@ public final class CreateEntityInfoOuterClass {
         case 0:
         default:
       }
+      switch (entityCreateInfoCase_) {
+        case 13:
+          hash = (37 * hash) + GADGET_FIELD_NUMBER;
+          hash = (53 * hash) + getGadget().hashCode();
+          break;
+        case 0:
+        default:
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -860,10 +909,6 @@ public final class CreateEntityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CIDLLJOHEFL
-     * </pre>
-     *
      * Protobuf type {@code CreateEntityInfo}
      */
     public static final class Builder extends
@@ -896,7 +941,6 @@ public final class CreateEntityInfoOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getGadgetFieldBuilder();
         }
       }
       @java.lang.Override
@@ -922,14 +966,10 @@ public final class CreateEntityInfoOuterClass {
 
         clientUniqueId_ = 0;
 
-        if (gadgetBuilder_ == null) {
-          gadget_ = null;
-        } else {
-          gadgetBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
         entityCase_ = 0;
         entity_ = null;
+        entityCreateInfoCase_ = 0;
+        entityCreateInfo_ = null;
         return this;
       }
 
@@ -956,20 +996,6 @@ public final class CreateEntityInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo buildPartial() {
         emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo result = new emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
-        if (entityCase_ == 1) {
-          result.entity_ = entity_;
-        }
-        if (entityCase_ == 2) {
-          result.entity_ = entity_;
-        }
-        if (entityCase_ == 3) {
-          result.entity_ = entity_;
-        }
-        if (entityCase_ == 4) {
-          result.entity_ = entity_;
-        }
         result.level_ = level_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
@@ -984,16 +1010,27 @@ public final class CreateEntityInfoOuterClass {
         result.sceneId_ = sceneId_;
         result.roomId_ = roomId_;
         result.clientUniqueId_ = clientUniqueId_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
-          if (gadgetBuilder_ == null) {
-            result.gadget_ = gadget_;
-          } else {
-            result.gadget_ = gadgetBuilder_.build();
-          }
-          to_bitField0_ |= 0x00000001;
+        if (entityCase_ == 1) {
+          result.entity_ = entity_;
+        }
+        if (entityCase_ == 2) {
+          result.entity_ = entity_;
+        }
+        if (entityCase_ == 3) {
+          result.entity_ = entity_;
+        }
+        if (entityCase_ == 4) {
+          result.entity_ = entity_;
+        }
+        if (entityCreateInfoCase_ == 13) {
+          if (gadgetBuilder_ == null) {
+            result.entityCreateInfo_ = entityCreateInfo_;
+          } else {
+            result.entityCreateInfo_ = gadgetBuilder_.build();
+          }
         }
-        result.bitField0_ = to_bitField0_;
         result.entityCase_ = entityCase_;
+        result.entityCreateInfoCase_ = entityCreateInfoCase_;
         onBuilt();
         return result;
       }
@@ -1060,9 +1097,6 @@ public final class CreateEntityInfoOuterClass {
         if (other.getClientUniqueId() != 0) {
           setClientUniqueId(other.getClientUniqueId());
         }
-        if (other.hasGadget()) {
-          mergeGadget(other.getGadget());
-        }
         switch (other.getEntityCase()) {
           case MONSTER_ID: {
             setMonsterId(other.getMonsterId());
@@ -1084,6 +1118,15 @@ public final class CreateEntityInfoOuterClass {
             break;
           }
         }
+        switch (other.getEntityCreateInfoCase()) {
+          case GADGET: {
+            mergeGadget(other.getGadget());
+            break;
+          }
+          case ENTITYCREATEINFO_NOT_SET: {
+            break;
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1127,171 +1170,21 @@ public final class CreateEntityInfoOuterClass {
         return this;
       }
 
-      private int bitField0_;
+      private int entityCreateInfoCase_ = 0;
+      private java.lang.Object entityCreateInfo_;
+      public EntityCreateInfoCase
+          getEntityCreateInfoCase() {
+        return EntityCreateInfoCase.forNumber(
+            entityCreateInfoCase_);
+      }
 
-      /**
-       * <code>uint32 monster_id = 1;</code>
-       * @return Whether the monsterId field is set.
-       */
-      public boolean hasMonsterId() {
-        return entityCase_ == 1;
-      }
-      /**
-       * <code>uint32 monster_id = 1;</code>
-       * @return The monsterId.
-       */
-      public int getMonsterId() {
-        if (entityCase_ == 1) {
-          return (java.lang.Integer) entity_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 monster_id = 1;</code>
-       * @param value The monsterId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMonsterId(int value) {
-        entityCase_ = 1;
-        entity_ = value;
+      public Builder clearEntityCreateInfo() {
+        entityCreateInfoCase_ = 0;
+        entityCreateInfo_ = null;
         onChanged();
         return this;
       }
-      /**
-       * <code>uint32 monster_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMonsterId() {
-        if (entityCase_ == 1) {
-          entityCase_ = 0;
-          entity_ = null;
-          onChanged();
-        }
-        return this;
-      }
 
-      /**
-       * <code>uint32 npc_id = 2;</code>
-       * @return Whether the npcId field is set.
-       */
-      public boolean hasNpcId() {
-        return entityCase_ == 2;
-      }
-      /**
-       * <code>uint32 npc_id = 2;</code>
-       * @return The npcId.
-       */
-      public int getNpcId() {
-        if (entityCase_ == 2) {
-          return (java.lang.Integer) entity_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 npc_id = 2;</code>
-       * @param value The npcId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNpcId(int value) {
-        entityCase_ = 2;
-        entity_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 npc_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNpcId() {
-        if (entityCase_ == 2) {
-          entityCase_ = 0;
-          entity_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      /**
-       * <code>uint32 gadget_id = 3;</code>
-       * @return Whether the gadgetId field is set.
-       */
-      public boolean hasGadgetId() {
-        return entityCase_ == 3;
-      }
-      /**
-       * <code>uint32 gadget_id = 3;</code>
-       * @return The gadgetId.
-       */
-      public int getGadgetId() {
-        if (entityCase_ == 3) {
-          return (java.lang.Integer) entity_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 gadget_id = 3;</code>
-       * @param value The gadgetId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGadgetId(int value) {
-        entityCase_ = 3;
-        entity_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gadget_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetId() {
-        if (entityCase_ == 3) {
-          entityCase_ = 0;
-          entity_ = null;
-          onChanged();
-        }
-        return this;
-      }
-
-      /**
-       * <code>uint32 item_id = 4;</code>
-       * @return Whether the itemId field is set.
-       */
-      public boolean hasItemId() {
-        return entityCase_ == 4;
-      }
-      /**
-       * <code>uint32 item_id = 4;</code>
-       * @return The itemId.
-       */
-      public int getItemId() {
-        if (entityCase_ == 4) {
-          return (java.lang.Integer) entity_;
-        }
-        return 0;
-      }
-      /**
-       * <code>uint32 item_id = 4;</code>
-       * @param value The itemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setItemId(int value) {
-        entityCase_ = 4;
-        entity_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 item_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearItemId() {
-        if (entityCase_ == 4) {
-          entityCase_ = 0;
-          entity_ = null;
-          onChanged();
-        }
-        return this;
-      }
 
       private int level_ ;
       /**
@@ -1655,123 +1548,308 @@ public final class CreateEntityInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo gadget_;
+      /**
+       * <code>uint32 monster_id = 1;</code>
+       * @return Whether the monsterId field is set.
+       */
+      public boolean hasMonsterId() {
+        return entityCase_ == 1;
+      }
+      /**
+       * <code>uint32 monster_id = 1;</code>
+       * @return The monsterId.
+       */
+      public int getMonsterId() {
+        if (entityCase_ == 1) {
+          return (java.lang.Integer) entity_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 monster_id = 1;</code>
+       * @param value The monsterId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMonsterId(int value) {
+        entityCase_ = 1;
+        entity_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 monster_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMonsterId() {
+        if (entityCase_ == 1) {
+          entityCase_ = 0;
+          entity_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint32 npc_id = 2;</code>
+       * @return Whether the npcId field is set.
+       */
+      public boolean hasNpcId() {
+        return entityCase_ == 2;
+      }
+      /**
+       * <code>uint32 npc_id = 2;</code>
+       * @return The npcId.
+       */
+      public int getNpcId() {
+        if (entityCase_ == 2) {
+          return (java.lang.Integer) entity_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 npc_id = 2;</code>
+       * @param value The npcId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNpcId(int value) {
+        entityCase_ = 2;
+        entity_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 npc_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNpcId() {
+        if (entityCase_ == 2) {
+          entityCase_ = 0;
+          entity_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint32 gadget_id = 3;</code>
+       * @return Whether the gadgetId field is set.
+       */
+      public boolean hasGadgetId() {
+        return entityCase_ == 3;
+      }
+      /**
+       * <code>uint32 gadget_id = 3;</code>
+       * @return The gadgetId.
+       */
+      public int getGadgetId() {
+        if (entityCase_ == 3) {
+          return (java.lang.Integer) entity_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 gadget_id = 3;</code>
+       * @param value The gadgetId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGadgetId(int value) {
+        entityCase_ = 3;
+        entity_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gadget_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetId() {
+        if (entityCase_ == 3) {
+          entityCase_ = 0;
+          entity_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
+      /**
+       * <code>uint32 item_id = 4;</code>
+       * @return Whether the itemId field is set.
+       */
+      public boolean hasItemId() {
+        return entityCase_ == 4;
+      }
+      /**
+       * <code>uint32 item_id = 4;</code>
+       * @return The itemId.
+       */
+      public int getItemId() {
+        if (entityCase_ == 4) {
+          return (java.lang.Integer) entity_;
+        }
+        return 0;
+      }
+      /**
+       * <code>uint32 item_id = 4;</code>
+       * @param value The itemId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setItemId(int value) {
+        entityCase_ = 4;
+        entity_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 item_id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearItemId() {
+        if (entityCase_ == 4) {
+          entityCase_ = 0;
+          entity_ = null;
+          onChanged();
+        }
+        return this;
+      }
+
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder> gadgetBuilder_;
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        * @return Whether the gadget field is set.
        */
+      @java.lang.Override
       public boolean hasGadget() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return entityCreateInfoCase_ == 13;
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        * @return The gadget.
        */
+      @java.lang.Override
       public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo getGadget() {
         if (gadgetBuilder_ == null) {
-          return gadget_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_;
+          if (entityCreateInfoCase_ == 13) {
+            return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_;
+          }
+          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
         } else {
-          return gadgetBuilder_.getMessage();
+          if (entityCreateInfoCase_ == 13) {
+            return gadgetBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       public Builder setGadget(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo value) {
         if (gadgetBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          gadget_ = value;
+          entityCreateInfo_ = value;
           onChanged();
         } else {
           gadgetBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
+        entityCreateInfoCase_ = 13;
         return this;
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       public Builder setGadget(
           emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder builderForValue) {
         if (gadgetBuilder_ == null) {
-          gadget_ = builderForValue.build();
+          entityCreateInfo_ = builderForValue.build();
           onChanged();
         } else {
           gadgetBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
+        entityCreateInfoCase_ = 13;
         return this;
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       public Builder mergeGadget(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo value) {
         if (gadgetBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0) &&
-              gadget_ != null &&
-              gadget_ != emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance()) {
-            gadget_ =
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.newBuilder(gadget_).mergeFrom(value).buildPartial();
+          if (entityCreateInfoCase_ == 13 &&
+              entityCreateInfo_ != emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance()) {
+            entityCreateInfo_ = emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.newBuilder((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_)
+                .mergeFrom(value).buildPartial();
           } else {
-            gadget_ = value;
+            entityCreateInfo_ = value;
           }
           onChanged();
         } else {
-          gadgetBuilder_.mergeFrom(value);
+          if (entityCreateInfoCase_ == 13) {
+            gadgetBuilder_.mergeFrom(value);
+          }
+          gadgetBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
+        entityCreateInfoCase_ = 13;
         return this;
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       public Builder clearGadget() {
         if (gadgetBuilder_ == null) {
-          gadget_ = null;
-          onChanged();
+          if (entityCreateInfoCase_ == 13) {
+            entityCreateInfoCase_ = 0;
+            entityCreateInfo_ = null;
+            onChanged();
+          }
         } else {
+          if (entityCreateInfoCase_ == 13) {
+            entityCreateInfoCase_ = 0;
+            entityCreateInfo_ = null;
+          }
           gadgetBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder getGadgetBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
         return getGadgetFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
+      @java.lang.Override
       public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder getGadgetOrBuilder() {
-        if (gadgetBuilder_ != null) {
+        if ((entityCreateInfoCase_ == 13) && (gadgetBuilder_ != null)) {
           return gadgetBuilder_.getMessageOrBuilder();
         } else {
-          return gadget_ == null ?
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance() : gadget_;
+          if (entityCreateInfoCase_ == 13) {
+            return (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_;
+          }
+          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>optional .CreateGadgetInfo gadget = 13;</code>
+       * <code>.CreateGadgetInfo gadget = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder> 
           getGadgetFieldBuilder() {
         if (gadgetBuilder_ == null) {
+          if (!(entityCreateInfoCase_ == 13)) {
+            entityCreateInfo_ = emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.getDefaultInstance();
+          }
           gadgetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfoOrBuilder>(
-                  getGadget(),
+                  (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo) entityCreateInfo_,
                   getParentForChildren(),
                   isClean());
-          gadget_ = null;
+          entityCreateInfo_ = null;
         }
+        entityCreateInfoCase_ = 13;
+        onChanged();;
         return gadgetBuilder_;
       }
       @java.lang.Override
@@ -1842,15 +1920,15 @@ public final class CreateEntityInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026CreateEntityInfo.proto\032\014Vector.proto\032\026" +
-      "CreateGadgetInfo.proto\"\227\002\n\020CreateEntityI" +
-      "nfo\022\024\n\nmonster_id\030\001 \001(\rH\000\022\020\n\006npc_id\030\002 \001(" +
-      "\rH\000\022\023\n\tgadget_id\030\003 \001(\rH\000\022\021\n\007item_id\030\004 \001(" +
-      "\rH\000\022\r\n\005level\030\005 \001(\r\022\024\n\003pos\030\006 \001(\0132\007.Vector" +
+      "CreateGadgetInfo.proto\"\237\002\n\020CreateEntityI" +
+      "nfo\022\r\n\005level\030\005 \001(\r\022\024\n\003pos\030\006 \001(\0132\007.Vector" +
       "\022\024\n\003rot\030\007 \001(\0132\007.Vector\022\020\n\010scene_id\030\n \001(\r" +
       "\022\017\n\007room_id\030\013 \001(\r\022\030\n\020client_unique_id\030\014 " +
-      "\001(\r\022&\n\006gadget\030\r \001(\0132\021.CreateGadgetInfoH\001" +
-      "\210\001\001B\010\n\006entityB\t\n\007_gadgetB\033\n\031emu.grasscut" +
-      "ter.net.protob\006proto3"
+      "\001(\r\022\024\n\nmonster_id\030\001 \001(\rH\000\022\020\n\006npc_id\030\002 \001(" +
+      "\rH\000\022\023\n\tgadget_id\030\003 \001(\rH\000\022\021\n\007item_id\030\004 \001(" +
+      "\rH\000\022#\n\006gadget\030\r \001(\0132\021.CreateGadgetInfoH\001" +
+      "B\010\n\006EntityB\024\n\022entity_create_infoB\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1863,7 +1941,7 @@ public final class CreateEntityInfoOuterClass {
     internal_static_CreateEntityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CreateEntityInfo_descriptor,
-        new java.lang.String[] { "MonsterId", "NpcId", "GadgetId", "ItemId", "Level", "Pos", "Rot", "SceneId", "RoomId", "ClientUniqueId", "Gadget", "Entity", "Gadget", });
+        new java.lang.String[] { "Level", "Pos", "Rot", "SceneId", "RoomId", "ClientUniqueId", "MonsterId", "NpcId", "GadgetId", "ItemId", "Gadget", "Entity", "EntityCreateInfo", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java
index 6ef55fa89..7c58e75fe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateGadgetInfoOuterClass.java
@@ -30,25 +30,21 @@ public final class CreateGadgetInfoOuterClass {
     emu.grasscutter.net.proto.GadgetBornTypeOuterClass.GadgetBornType getBornType();
 
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      * @return Whether the chest field is set.
      */
     boolean hasChest();
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      * @return The chest.
      */
-    emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest();
+    emu.grasscutter.net.proto.ChestOuterClass.Chest getChest();
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      */
-    emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder();
+    emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: NDJJNLJIAKO
-   * </pre>
-   *
    * Protobuf type {@code CreateGadgetInfo}
    */
   public static final class CreateGadgetInfo extends
@@ -101,11 +97,11 @@ public final class CreateGadgetInfoOuterClass {
               break;
             }
             case 18: {
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder subBuilder = null;
+              emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder subBuilder = null;
               if (chest_ != null) {
                 subBuilder = chest_.toBuilder();
               }
-              chest_ = input.readMessage(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.parser(), extensionRegistry);
+              chest_ = input.readMessage(emu.grasscutter.net.proto.ChestOuterClass.Chest.parser(), extensionRegistry);
               if (subBuilder != null) {
                 subBuilder.mergeFrom(chest_);
                 chest_ = subBuilder.buildPartial();
@@ -145,573 +141,6 @@ public final class CreateGadgetInfoOuterClass {
               emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Builder.class);
     }
 
-    public interface ChestOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:CreateGadgetInfo.Chest)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * <code>uint32 chest_drop_id = 1;</code>
-       * @return The chestDropId.
-       */
-      int getChestDropId();
-
-      /**
-       * <code>bool is_show_cutscene = 2;</code>
-       * @return The isShowCutscene.
-       */
-      boolean getIsShowCutscene();
-    }
-    /**
-     * <pre>
-     * Obf: FGAGBNDOGCB
-     * </pre>
-     *
-     * Protobuf type {@code CreateGadgetInfo.Chest}
-     */
-    public static final class Chest extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:CreateGadgetInfo.Chest)
-        ChestOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use Chest.newBuilder() to construct.
-      private Chest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-        super(builder);
-      }
-      private Chest() {
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          UnusedPrivateParameter unused) {
-        return new Chest();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private Chest(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 8: {
-
-                chestDropId_ = input.readUInt32();
-                break;
-              }
-              case 16: {
-
-                isShowCutscene_ = input.readBool();
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder.class);
-      }
-
-      public static final int CHEST_DROP_ID_FIELD_NUMBER = 1;
-      private int chestDropId_;
-      /**
-       * <code>uint32 chest_drop_id = 1;</code>
-       * @return The chestDropId.
-       */
-      @java.lang.Override
-      public int getChestDropId() {
-        return chestDropId_;
-      }
-
-      public static final int IS_SHOW_CUTSCENE_FIELD_NUMBER = 2;
-      private boolean isShowCutscene_;
-      /**
-       * <code>bool is_show_cutscene = 2;</code>
-       * @return The isShowCutscene.
-       */
-      @java.lang.Override
-      public boolean getIsShowCutscene() {
-        return isShowCutscene_;
-      }
-
-      private byte memoizedIsInitialized = -1;
-      @java.lang.Override
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        if (chestDropId_ != 0) {
-          output.writeUInt32(1, chestDropId_);
-        }
-        if (isShowCutscene_ != false) {
-          output.writeBool(2, isShowCutscene_);
-        }
-        unknownFields.writeTo(output);
-      }
-
-      @java.lang.Override
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        if (chestDropId_ != 0) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeUInt32Size(1, chestDropId_);
-        }
-        if (isShowCutscene_ != false) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeBoolSize(2, isShowCutscene_);
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest)) {
-          return super.equals(obj);
-        }
-        emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest other = (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) obj;
-
-        if (getChestDropId()
-            != other.getChestDropId()) return false;
-        if (getIsShowCutscene()
-            != other.getIsShowCutscene()) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
-        return true;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        hash = (37 * hash) + CHEST_DROP_ID_FIELD_NUMBER;
-        hash = (53 * hash) + getChestDropId();
-        hash = (37 * hash) + IS_SHOW_CUTSCENE_FIELD_NUMBER;
-        hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-            getIsShowCutscene());
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      @java.lang.Override
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      @java.lang.Override
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * <pre>
-       * Obf: FGAGBNDOGCB
-       * </pre>
-       *
-       * Protobuf type {@code CreateGadgetInfo.Chest}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-          // @@protoc_insertion_point(builder_implements:CreateGadgetInfo.Chest)
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor;
-        }
-
-        @java.lang.Override
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.class, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder.class);
-        }
-
-        // Construct using emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-          }
-        }
-        @java.lang.Override
-        public Builder clear() {
-          super.clear();
-          chestDropId_ = 0;
-
-          isShowCutscene_ = false;
-
-          return this;
-        }
-
-        @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.internal_static_CreateGadgetInfo_Chest_descriptor;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstanceForType() {
-          return emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance();
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest build() {
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest buildPartial() {
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest result = new emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest(this);
-          result.chestDropId_ = chestDropId_;
-          result.isShowCutscene_ = isShowCutscene_;
-          onBuilt();
-          return result;
-        }
-
-        @java.lang.Override
-        public Builder clone() {
-          return super.clone();
-        }
-        @java.lang.Override
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.setField(field, value);
-        }
-        @java.lang.Override
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return super.clearField(field);
-        }
-        @java.lang.Override
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return super.clearOneof(oneof);
-        }
-        @java.lang.Override
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return super.setRepeatedField(field, index, value);
-        }
-        @java.lang.Override
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.addRepeatedField(field, value);
-        }
-        @java.lang.Override
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) {
-            return mergeFrom((emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest other) {
-          if (other == emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance()) return this;
-          if (other.getChestDropId() != 0) {
-            setChestDropId(other.getChestDropId());
-          }
-          if (other.getIsShowCutscene() != false) {
-            setIsShowCutscene(other.getIsShowCutscene());
-          }
-          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.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-
-        private int chestDropId_ ;
-        /**
-         * <code>uint32 chest_drop_id = 1;</code>
-         * @return The chestDropId.
-         */
-        @java.lang.Override
-        public int getChestDropId() {
-          return chestDropId_;
-        }
-        /**
-         * <code>uint32 chest_drop_id = 1;</code>
-         * @param value The chestDropId to set.
-         * @return This builder for chaining.
-         */
-        public Builder setChestDropId(int value) {
-          
-          chestDropId_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>uint32 chest_drop_id = 1;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearChestDropId() {
-          
-          chestDropId_ = 0;
-          onChanged();
-          return this;
-        }
-
-        private boolean isShowCutscene_ ;
-        /**
-         * <code>bool is_show_cutscene = 2;</code>
-         * @return The isShowCutscene.
-         */
-        @java.lang.Override
-        public boolean getIsShowCutscene() {
-          return isShowCutscene_;
-        }
-        /**
-         * <code>bool is_show_cutscene = 2;</code>
-         * @param value The isShowCutscene to set.
-         * @return This builder for chaining.
-         */
-        public Builder setIsShowCutscene(boolean value) {
-          
-          isShowCutscene_ = value;
-          onChanged();
-          return this;
-        }
-        /**
-         * <code>bool is_show_cutscene = 2;</code>
-         * @return This builder for chaining.
-         */
-        public Builder clearIsShowCutscene() {
-          
-          isShowCutscene_ = false;
-          onChanged();
-          return this;
-        }
-        @java.lang.Override
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFields(unknownFields);
-        }
-
-        @java.lang.Override
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:CreateGadgetInfo.Chest)
-      }
-
-      // @@protoc_insertion_point(class_scope:CreateGadgetInfo.Chest)
-      private static final emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest();
-      }
-
-      public static emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser<Chest>
-          PARSER = new com.google.protobuf.AbstractParser<Chest>() {
-        @java.lang.Override
-        public Chest parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Chest(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser<Chest> parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<Chest> getParserForType() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
-      }
-
-    }
-
     public static final int BORN_TYPE_FIELD_NUMBER = 1;
     private int bornType_;
     /**
@@ -732,9 +161,9 @@ public final class CreateGadgetInfoOuterClass {
     }
 
     public static final int CHEST_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest chest_;
+    private emu.grasscutter.net.proto.ChestOuterClass.Chest chest_;
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      * @return Whether the chest field is set.
      */
     @java.lang.Override
@@ -742,18 +171,18 @@ public final class CreateGadgetInfoOuterClass {
       return chest_ != null;
     }
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      * @return The chest.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest() {
-      return chest_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_;
+    public emu.grasscutter.net.proto.ChestOuterClass.Chest getChest() {
+      return chest_ == null ? emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_;
     }
     /**
-     * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+     * <code>.Chest chest = 2;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder() {
+    public emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder() {
       return getChest();
     }
 
@@ -928,10 +357,6 @@ public final class CreateGadgetInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NDJJNLJIAKO
-     * </pre>
-     *
      * Protobuf type {@code CreateGadgetInfo}
      */
     public static final class Builder extends
@@ -1146,31 +571,31 @@ public final class CreateGadgetInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest chest_;
+      private emu.grasscutter.net.proto.ChestOuterClass.Chest chest_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder> chestBuilder_;
+          emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder> chestBuilder_;
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        * @return Whether the chest field is set.
        */
       public boolean hasChest() {
         return chestBuilder_ != null || chest_ != null;
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        * @return The chest.
        */
-      public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest getChest() {
+      public emu.grasscutter.net.proto.ChestOuterClass.Chest getChest() {
         if (chestBuilder_ == null) {
-          return chest_ == null ? emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_;
+          return chest_ == null ? emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_;
         } else {
           return chestBuilder_.getMessage();
         }
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
-      public Builder setChest(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest value) {
+      public Builder setChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) {
         if (chestBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -1184,10 +609,10 @@ public final class CreateGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
       public Builder setChest(
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder builderForValue) {
+          emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder builderForValue) {
         if (chestBuilder_ == null) {
           chest_ = builderForValue.build();
           onChanged();
@@ -1198,13 +623,13 @@ public final class CreateGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
-      public Builder mergeChest(emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest value) {
+      public Builder mergeChest(emu.grasscutter.net.proto.ChestOuterClass.Chest value) {
         if (chestBuilder_ == null) {
           if (chest_ != null) {
             chest_ =
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.newBuilder(chest_).mergeFrom(value).buildPartial();
+              emu.grasscutter.net.proto.ChestOuterClass.Chest.newBuilder(chest_).mergeFrom(value).buildPartial();
           } else {
             chest_ = value;
           }
@@ -1216,7 +641,7 @@ public final class CreateGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
       public Builder clearChest() {
         if (chestBuilder_ == null) {
@@ -1230,33 +655,33 @@ public final class CreateGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
-      public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder getChestBuilder() {
+      public emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder getChestBuilder() {
         
         onChanged();
         return getChestFieldBuilder().getBuilder();
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
-      public emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder getChestOrBuilder() {
+      public emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder getChestOrBuilder() {
         if (chestBuilder_ != null) {
           return chestBuilder_.getMessageOrBuilder();
         } else {
           return chest_ == null ?
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.getDefaultInstance() : chest_;
+              emu.grasscutter.net.proto.ChestOuterClass.Chest.getDefaultInstance() : chest_;
         }
       }
       /**
-       * <code>.CreateGadgetInfo.Chest chest = 2;</code>
+       * <code>.Chest chest = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder> 
+          emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder> 
           getChestFieldBuilder() {
         if (chestBuilder_ == null) {
           chestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.Chest.Builder, emu.grasscutter.net.proto.CreateGadgetInfoOuterClass.CreateGadgetInfo.ChestOrBuilder>(
+              emu.grasscutter.net.proto.ChestOuterClass.Chest, emu.grasscutter.net.proto.ChestOuterClass.Chest.Builder, emu.grasscutter.net.proto.ChestOuterClass.ChestOrBuilder>(
                   getChest(),
                   getParentForChildren(),
                   isClean());
@@ -1322,11 +747,6 @@ public final class CreateGadgetInfoOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_CreateGadgetInfo_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_CreateGadgetInfo_Chest_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_CreateGadgetInfo_Chest_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1337,16 +757,16 @@ public final class CreateGadgetInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026CreateGadgetInfo.proto\032\024GadgetBornType" +
-      ".proto\"\230\001\n\020CreateGadgetInfo\022\"\n\tborn_type" +
-      "\030\001 \001(\0162\017.GadgetBornType\022&\n\005chest\030\002 \001(\0132\027" +
-      ".CreateGadgetInfo.Chest\0328\n\005Chest\022\025\n\rches" +
-      "t_drop_id\030\001 \001(\r\022\030\n\020is_show_cutscene\030\002 \001(" +
-      "\010B\033\n\031emu.grasscutter.net.protob\006proto3"
+      ".proto\032\013Chest.proto\"M\n\020CreateGadgetInfo\022" +
+      "\"\n\tborn_type\030\001 \001(\0162\017.GadgetBornType\022\025\n\005c" +
+      "hest\030\002 \001(\0132\006.ChestB\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ChestOuterClass.getDescriptor(),
         });
     internal_static_CreateGadgetInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -1354,13 +774,8 @@ public final class CreateGadgetInfoOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CreateGadgetInfo_descriptor,
         new java.lang.String[] { "BornType", "Chest", });
-    internal_static_CreateGadgetInfo_Chest_descriptor =
-      internal_static_CreateGadgetInfo_descriptor.getNestedTypes().get(0);
-    internal_static_CreateGadgetInfo_Chest_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_CreateGadgetInfo_Chest_descriptor,
-        new java.lang.String[] { "ChestDropId", "IsShowCutscene", });
     emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ChestOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateReasonOuterClass.java
index 0ac283219..f803566a8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CreateReasonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateReasonOuterClass.java
@@ -15,10 +15,6 @@ public final class CreateReasonOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DDPMPGDLDEN
-   * </pre>
-   *
    * Protobuf enum {@code CreateReason}
    */
   public enum CreateReason
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleReqOuterClass.java
index 44c0404d1..b984ecceb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleReqOuterClass.java
@@ -19,53 +19,48 @@ public final class CreateVehicleReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_point_id = 4;</code>
-     * @return The scenePointId.
+     * <code>.Vector rot = 11;</code>
+     * @return Whether the rot field is set.
      */
-    int getScenePointId();
+    boolean hasRot();
+    /**
+     * <code>.Vector rot = 11;</code>
+     * @return The rot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
+    /**
+     * <code>.Vector rot = 11;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
 
     /**
-     * <code>.Vector pos = 10;</code>
+     * <code>.Vector pos = 15;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 10;</code>
+     * <code>.Vector pos = 15;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 10;</code>
+     * <code>.Vector pos = 15;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
     /**
-     * <code>uint32 vehicle_id = 11;</code>
+     * <code>uint32 vehicle_id = 7;</code>
      * @return The vehicleId.
      */
     int getVehicleId();
 
     /**
-     * <code>.Vector rot = 5;</code>
-     * @return Whether the rot field is set.
+     * <code>uint32 scene_point_id = 13;</code>
+     * @return The scenePointId.
      */
-    boolean hasRot();
-    /**
-     * <code>.Vector rot = 5;</code>
-     * @return The rot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
-    /**
-     * <code>.Vector rot = 5;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
+    int getScenePointId();
   }
   /**
-   * <pre>
-   * CmdId: 29875
-   * Obf: FJIDLNFEHBG
-   * </pre>
-   *
    * Protobuf type {@code CreateVehicleReq}
    */
   public static final class CreateVehicleReq extends
@@ -110,12 +105,12 @@ public final class CreateVehicleReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 56: {
 
-              scenePointId_ = input.readUInt32();
+              vehicleId_ = input.readUInt32();
               break;
             }
-            case 42: {
+            case 90: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -128,7 +123,12 @@ public final class CreateVehicleReqOuterClass {
 
               break;
             }
-            case 82: {
+            case 104: {
+
+              scenePointId_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -141,11 +141,6 @@ public final class CreateVehicleReqOuterClass {
 
               break;
             }
-            case 88: {
-
-              vehicleId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -178,58 +173,10 @@ public final class CreateVehicleReqOuterClass {
               emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq.class, emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq.Builder.class);
     }
 
-    public static final int SCENE_POINT_ID_FIELD_NUMBER = 4;
-    private int scenePointId_;
-    /**
-     * <code>uint32 scene_point_id = 4;</code>
-     * @return The scenePointId.
-     */
-    @java.lang.Override
-    public int getScenePointId() {
-      return scenePointId_;
-    }
-
-    public static final int POS_FIELD_NUMBER = 10;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-    /**
-     * <code>.Vector pos = 10;</code>
-     * @return Whether the pos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPos() {
-      return pos_ != null;
-    }
-    /**
-     * <code>.Vector pos = 10;</code>
-     * @return The pos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
-    }
-
-    public static final int VEHICLE_ID_FIELD_NUMBER = 11;
-    private int vehicleId_;
-    /**
-     * <code>uint32 vehicle_id = 11;</code>
-     * @return The vehicleId.
-     */
-    @java.lang.Override
-    public int getVehicleId() {
-      return vehicleId_;
-    }
-
-    public static final int ROT_FIELD_NUMBER = 5;
+    public static final int ROT_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 5;</code>
+     * <code>.Vector rot = 11;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -237,7 +184,7 @@ public final class CreateVehicleReqOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 5;</code>
+     * <code>.Vector rot = 11;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -245,13 +192,61 @@ public final class CreateVehicleReqOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 5;</code>
+     * <code>.Vector rot = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
       return getRot();
     }
 
+    public static final int POS_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return Whether the pos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPos() {
+      return pos_ != null;
+    }
+    /**
+     * <code>.Vector pos = 15;</code>
+     * @return The pos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
+    }
+
+    public static final int VEHICLE_ID_FIELD_NUMBER = 7;
+    private int vehicleId_;
+    /**
+     * <code>uint32 vehicle_id = 7;</code>
+     * @return The vehicleId.
+     */
+    @java.lang.Override
+    public int getVehicleId() {
+      return vehicleId_;
+    }
+
+    public static final int SCENE_POINT_ID_FIELD_NUMBER = 13;
+    private int scenePointId_;
+    /**
+     * <code>uint32 scene_point_id = 13;</code>
+     * @return The scenePointId.
+     */
+    @java.lang.Override
+    public int getScenePointId() {
+      return scenePointId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -266,17 +261,17 @@ public final class CreateVehicleReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (scenePointId_ != 0) {
-        output.writeUInt32(4, scenePointId_);
+      if (vehicleId_ != 0) {
+        output.writeUInt32(7, vehicleId_);
       }
       if (rot_ != null) {
-        output.writeMessage(5, getRot());
+        output.writeMessage(11, getRot());
+      }
+      if (scenePointId_ != 0) {
+        output.writeUInt32(13, scenePointId_);
       }
       if (pos_ != null) {
-        output.writeMessage(10, getPos());
-      }
-      if (vehicleId_ != 0) {
-        output.writeUInt32(11, vehicleId_);
+        output.writeMessage(15, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -287,21 +282,21 @@ public final class CreateVehicleReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (scenePointId_ != 0) {
+      if (vehicleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, scenePointId_);
+          .computeUInt32Size(7, vehicleId_);
       }
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getRot());
+          .computeMessageSize(11, getRot());
+      }
+      if (scenePointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, scenePointId_);
       }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getPos());
-      }
-      if (vehicleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, vehicleId_);
+          .computeMessageSize(15, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -318,8 +313,11 @@ public final class CreateVehicleReqOuterClass {
       }
       emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq other = (emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq) obj;
 
-      if (getScenePointId()
-          != other.getScenePointId()) return false;
+      if (hasRot() != other.hasRot()) return false;
+      if (hasRot()) {
+        if (!getRot()
+            .equals(other.getRot())) return false;
+      }
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
@@ -327,11 +325,8 @@ public final class CreateVehicleReqOuterClass {
       }
       if (getVehicleId()
           != other.getVehicleId()) return false;
-      if (hasRot() != other.hasRot()) return false;
-      if (hasRot()) {
-        if (!getRot()
-            .equals(other.getRot())) return false;
-      }
+      if (getScenePointId()
+          != other.getScenePointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -343,18 +338,18 @@ public final class CreateVehicleReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCENE_POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getScenePointId();
+      if (hasRot()) {
+        hash = (37 * hash) + ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getRot().hashCode();
+      }
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
       hash = (37 * hash) + VEHICLE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getVehicleId();
-      if (hasRot()) {
-        hash = (37 * hash) + ROT_FIELD_NUMBER;
-        hash = (53 * hash) + getRot().hashCode();
-      }
+      hash = (37 * hash) + SCENE_POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getScenePointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -451,11 +446,6 @@ public final class CreateVehicleReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29875
-     * Obf: FJIDLNFEHBG
-     * </pre>
-     *
      * Protobuf type {@code CreateVehicleReq}
      */
     public static final class Builder extends
@@ -493,8 +483,12 @@ public final class CreateVehicleReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        scenePointId_ = 0;
-
+        if (rotBuilder_ == null) {
+          rot_ = null;
+        } else {
+          rot_ = null;
+          rotBuilder_ = null;
+        }
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
@@ -503,12 +497,8 @@ public final class CreateVehicleReqOuterClass {
         }
         vehicleId_ = 0;
 
-        if (rotBuilder_ == null) {
-          rot_ = null;
-        } else {
-          rot_ = null;
-          rotBuilder_ = null;
-        }
+        scenePointId_ = 0;
+
         return this;
       }
 
@@ -535,18 +525,18 @@ public final class CreateVehicleReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq buildPartial() {
         emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq result = new emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq(this);
-        result.scenePointId_ = scenePointId_;
+        if (rotBuilder_ == null) {
+          result.rot_ = rot_;
+        } else {
+          result.rot_ = rotBuilder_.build();
+        }
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
         result.vehicleId_ = vehicleId_;
-        if (rotBuilder_ == null) {
-          result.rot_ = rot_;
-        } else {
-          result.rot_ = rotBuilder_.build();
-        }
+        result.scenePointId_ = scenePointId_;
         onBuilt();
         return result;
       }
@@ -595,8 +585,8 @@ public final class CreateVehicleReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq other) {
         if (other == emu.grasscutter.net.proto.CreateVehicleReqOuterClass.CreateVehicleReq.getDefaultInstance()) return this;
-        if (other.getScenePointId() != 0) {
-          setScenePointId(other.getScenePointId());
+        if (other.hasRot()) {
+          mergeRot(other.getRot());
         }
         if (other.hasPos()) {
           mergePos(other.getPos());
@@ -604,8 +594,8 @@ public final class CreateVehicleReqOuterClass {
         if (other.getVehicleId() != 0) {
           setVehicleId(other.getVehicleId());
         }
-        if (other.hasRot()) {
-          mergeRot(other.getRot());
+        if (other.getScenePointId() != 0) {
+          setScenePointId(other.getScenePointId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -636,199 +626,18 @@ public final class CreateVehicleReqOuterClass {
         return this;
       }
 
-      private int scenePointId_ ;
-      /**
-       * <code>uint32 scene_point_id = 4;</code>
-       * @return The scenePointId.
-       */
-      @java.lang.Override
-      public int getScenePointId() {
-        return scenePointId_;
-      }
-      /**
-       * <code>uint32 scene_point_id = 4;</code>
-       * @param value The scenePointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setScenePointId(int value) {
-        
-        scenePointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 scene_point_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScenePointId() {
-        
-        scenePointId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-      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 = 10;</code>
-       * @return Whether the pos field is set.
-       */
-      public boolean hasPos() {
-        return posBuilder_ != null || pos_ != null;
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       * @return The pos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-        if (posBuilder_ == null) {
-          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        } else {
-          return posBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pos_ = value;
-          onChanged();
-        } else {
-          posBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public Builder setPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (posBuilder_ == null) {
-          pos_ = builderForValue.build();
-          onChanged();
-        } else {
-          posBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (pos_ != null) {
-            pos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
-          } else {
-            pos_ = value;
-          }
-          onChanged();
-        } else {
-          posBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public Builder clearPos() {
-        if (posBuilder_ == null) {
-          pos_ = null;
-          onChanged();
-        } else {
-          pos_ = null;
-          posBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
-        
-        onChanged();
-        return getPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector pos = 10;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-        if (posBuilder_ != null) {
-          return posBuilder_.getMessageOrBuilder();
-        } else {
-          return pos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        }
-      }
-      /**
-       * <code>.Vector pos = 10;</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> 
-          getPosFieldBuilder() {
-        if (posBuilder_ == null) {
-          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getPos(),
-                  getParentForChildren(),
-                  isClean());
-          pos_ = null;
-        }
-        return posBuilder_;
-      }
-
-      private int vehicleId_ ;
-      /**
-       * <code>uint32 vehicle_id = 11;</code>
-       * @return The vehicleId.
-       */
-      @java.lang.Override
-      public int getVehicleId() {
-        return vehicleId_;
-      }
-      /**
-       * <code>uint32 vehicle_id = 11;</code>
-       * @param value The vehicleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setVehicleId(int value) {
-        
-        vehicleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 vehicle_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearVehicleId() {
-        
-        vehicleId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -839,7 +648,7 @@ public final class CreateVehicleReqOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -855,7 +664,7 @@ public final class CreateVehicleReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -869,7 +678,7 @@ public final class CreateVehicleReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -887,7 +696,7 @@ public final class CreateVehicleReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -901,7 +710,7 @@ public final class CreateVehicleReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -909,7 +718,7 @@ public final class CreateVehicleReqOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -920,7 +729,7 @@ public final class CreateVehicleReqOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 5;</code>
+       * <code>.Vector rot = 11;</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> 
@@ -935,6 +744,187 @@ public final class CreateVehicleReqOuterClass {
         }
         return rotBuilder_;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+      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 = 15;</code>
+       * @return Whether the pos field is set.
+       */
+      public boolean hasPos() {
+        return posBuilder_ != null || pos_ != null;
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       * @return The pos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+        if (posBuilder_ == null) {
+          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        } else {
+          return posBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          pos_ = value;
+          onChanged();
+        } else {
+          posBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public Builder setPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (posBuilder_ == null) {
+          pos_ = builderForValue.build();
+          onChanged();
+        } else {
+          posBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (pos_ != null) {
+            pos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
+          } else {
+            pos_ = value;
+          }
+          onChanged();
+        } else {
+          posBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public Builder clearPos() {
+        if (posBuilder_ == null) {
+          pos_ = null;
+          onChanged();
+        } else {
+          pos_ = null;
+          posBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
+        
+        onChanged();
+        return getPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector pos = 15;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+        if (posBuilder_ != null) {
+          return posBuilder_.getMessageOrBuilder();
+        } else {
+          return pos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        }
+      }
+      /**
+       * <code>.Vector 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> 
+          getPosFieldBuilder() {
+        if (posBuilder_ == null) {
+          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getPos(),
+                  getParentForChildren(),
+                  isClean());
+          pos_ = null;
+        }
+        return posBuilder_;
+      }
+
+      private int vehicleId_ ;
+      /**
+       * <code>uint32 vehicle_id = 7;</code>
+       * @return The vehicleId.
+       */
+      @java.lang.Override
+      public int getVehicleId() {
+        return vehicleId_;
+      }
+      /**
+       * <code>uint32 vehicle_id = 7;</code>
+       * @param value The vehicleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVehicleId(int value) {
+        
+        vehicleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 vehicle_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVehicleId() {
+        
+        vehicleId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int scenePointId_ ;
+      /**
+       * <code>uint32 scene_point_id = 13;</code>
+       * @return The scenePointId.
+       */
+      @java.lang.Override
+      public int getScenePointId() {
+        return scenePointId_;
+      }
+      /**
+       * <code>uint32 scene_point_id = 13;</code>
+       * @param value The scenePointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setScenePointId(int value) {
+        
+        scenePointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 scene_point_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearScenePointId() {
+        
+        scenePointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1003,9 +993,9 @@ public final class CreateVehicleReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026CreateVehicleReq.proto\032\014Vector.proto\"j" +
-      "\n\020CreateVehicleReq\022\026\n\016scene_point_id\030\004 \001" +
-      "(\r\022\024\n\003pos\030\n \001(\0132\007.Vector\022\022\n\nvehicle_id\030\013" +
-      " \001(\r\022\024\n\003rot\030\005 \001(\0132\007.VectorB\033\n\031emu.grassc" +
+      "\n\020CreateVehicleReq\022\024\n\003rot\030\013 \001(\0132\007.Vector" +
+      "\022\024\n\003pos\030\017 \001(\0132\007.Vector\022\022\n\nvehicle_id\030\007 \001" +
+      "(\r\022\026\n\016scene_point_id\030\r \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1018,7 +1008,7 @@ public final class CreateVehicleReqOuterClass {
     internal_static_CreateVehicleReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CreateVehicleReq_descriptor,
-        new java.lang.String[] { "ScenePointId", "Pos", "VehicleId", "Rot", });
+        new java.lang.String[] { "Rot", "Pos", "VehicleId", "ScenePointId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleRspOuterClass.java
index 67a1af1b5..d015ea69a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CreateVehicleRspOuterClass.java
@@ -19,29 +19,24 @@ public final class CreateVehicleRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 vehicle_id = 9;</code>
-     * @return The vehicleId.
-     */
-    int getVehicleId();
-
-    /**
-     * <code>uint32 entity_id = 11;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 vehicle_id = 13;</code>
+     * @return The vehicleId.
+     */
+    int getVehicleId();
   }
   /**
-   * <pre>
-   * CmdId: 958
-   * Obf: PGCCKGDHLME
-   * </pre>
-   *
    * Protobuf type {@code CreateVehicleRsp}
    */
   public static final class CreateVehicleRsp extends
@@ -86,21 +81,21 @@ public final class CreateVehicleRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 72: {
+            case 104: {
 
               vehicleId_ = input.readUInt32();
               break;
             }
-            case 88: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class CreateVehicleRspOuterClass {
               emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp.class, emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp.Builder.class);
     }
 
-    public static final int VEHICLE_ID_FIELD_NUMBER = 9;
-    private int vehicleId_;
-    /**
-     * <code>uint32 vehicle_id = 9;</code>
-     * @return The vehicleId.
-     */
-    @java.lang.Override
-    public int getVehicleId() {
-      return vehicleId_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 11;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class CreateVehicleRspOuterClass {
       return entityId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class CreateVehicleRspOuterClass {
       return retcode_;
     }
 
+    public static final int VEHICLE_ID_FIELD_NUMBER = 13;
+    private int vehicleId_;
+    /**
+     * <code>uint32 vehicle_id = 13;</code>
+     * @return The vehicleId.
+     */
+    @java.lang.Override
+    public int getVehicleId() {
+      return vehicleId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class CreateVehicleRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (entityId_ != 0) {
+        output.writeUInt32(1, entityId_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(8, retcode_);
       }
       if (vehicleId_ != 0) {
-        output.writeUInt32(9, vehicleId_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(11, entityId_);
+        output.writeUInt32(13, vehicleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class CreateVehicleRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, entityId_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(8, retcode_);
       }
       if (vehicleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, vehicleId_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, entityId_);
+          .computeUInt32Size(13, vehicleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class CreateVehicleRspOuterClass {
       }
       emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp other = (emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp) obj;
 
-      if (getVehicleId()
-          != other.getVehicleId()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getVehicleId()
+          != other.getVehicleId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class CreateVehicleRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + VEHICLE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getVehicleId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + VEHICLE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getVehicleId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class CreateVehicleRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 958
-     * Obf: PGCCKGDHLME
-     * </pre>
-     *
      * Protobuf type {@code CreateVehicleRsp}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class CreateVehicleRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        vehicleId_ = 0;
-
         entityId_ = 0;
 
         retcode_ = 0;
 
+        vehicleId_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class CreateVehicleRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp buildPartial() {
         emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp result = new emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp(this);
-        result.vehicleId_ = vehicleId_;
         result.entityId_ = entityId_;
         result.retcode_ = retcode_;
+        result.vehicleId_ = vehicleId_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class CreateVehicleRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp other) {
         if (other == emu.grasscutter.net.proto.CreateVehicleRspOuterClass.CreateVehicleRsp.getDefaultInstance()) return this;
-        if (other.getVehicleId() != 0) {
-          setVehicleId(other.getVehicleId());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getVehicleId() != 0) {
+          setVehicleId(other.getVehicleId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +497,9 @@ public final class CreateVehicleRspOuterClass {
         return this;
       }
 
-      private int vehicleId_ ;
-      /**
-       * <code>uint32 vehicle_id = 9;</code>
-       * @return The vehicleId.
-       */
-      @java.lang.Override
-      public int getVehicleId() {
-        return vehicleId_;
-      }
-      /**
-       * <code>uint32 vehicle_id = 9;</code>
-       * @param value The vehicleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setVehicleId(int value) {
-        
-        vehicleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 vehicle_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearVehicleId() {
-        
-        vehicleId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -548,7 +507,7 @@ public final class CreateVehicleRspOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -559,7 +518,7 @@ public final class CreateVehicleRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 11;</code>
+       * <code>uint32 entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -571,7 +530,7 @@ public final class CreateVehicleRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class CreateVehicleRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class CreateVehicleRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -599,6 +558,37 @@ public final class CreateVehicleRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int vehicleId_ ;
+      /**
+       * <code>uint32 vehicle_id = 13;</code>
+       * @return The vehicleId.
+       */
+      @java.lang.Override
+      public int getVehicleId() {
+        return vehicleId_;
+      }
+      /**
+       * <code>uint32 vehicle_id = 13;</code>
+       * @param value The vehicleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVehicleId(int value) {
+        
+        vehicleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 vehicle_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVehicleId() {
+        
+        vehicleId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class CreateVehicleRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026CreateVehicleRsp.proto\"J\n\020CreateVehicl" +
-      "eRsp\022\022\n\nvehicle_id\030\t \001(\r\022\021\n\tentity_id\030\013 " +
-      "\001(\r\022\017\n\007retcode\030\002 \001(\005B\033\n\031emu.grasscutter." +
+      "eRsp\022\021\n\tentity_id\030\001 \001(\r\022\017\n\007retcode\030\010 \001(\005" +
+      "\022\022\n\nvehicle_id\030\r \001(\rB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class CreateVehicleRspOuterClass {
     internal_static_CreateVehicleRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CreateVehicleRsp_descriptor,
-        new java.lang.String[] { "VehicleId", "EntityId", "Retcode", });
+        new java.lang.String[] { "EntityId", "Retcode", "VehicleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CurVehicleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CurVehicleInfoOuterClass.java
index 3f6d52024..638e2236e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CurVehicleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CurVehicleInfoOuterClass.java
@@ -37,46 +37,42 @@ public final class CurVehicleInfoOuterClass {
     int getGadgetId();
 
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return Whether the kKDFCJENDNI field is set.
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
+     * @return Whether the bNDOCLLEBEA field is set.
      */
-    boolean hasKKDFCJENDNI();
+    boolean hasBNDOCLLEBEA();
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return The kKDFCJENDNI.
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
+     * @return The bNDOCLLEBEA.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getBNDOCLLEBEA();
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBNDOCLLEBEAOrBuilder();
 
     /**
-     * <code>uint32 CJIMMADJKHD = 5;</code>
-     * @return The cJIMMADJKHD.
+     * <code>uint32 GIICKAOFKDB = 5;</code>
+     * @return The gIICKAOFKDB.
      */
-    int getCJIMMADJKHD();
+    int getGIICKAOFKDB();
 
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
-     * @return Whether the jGOGBMEKOPP field is set.
+     * <code>.Vector BELIOKMDLGB = 6;</code>
+     * @return Whether the bELIOKMDLGB field is set.
      */
-    boolean hasJGOGBMEKOPP();
+    boolean hasBELIOKMDLGB();
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
-     * @return The jGOGBMEKOPP.
+     * <code>.Vector BELIOKMDLGB = 6;</code>
+     * @return The bELIOKMDLGB.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getBELIOKMDLGB();
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
+     * <code>.Vector BELIOKMDLGB = 6;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBELIOKMDLGBOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: LNHHODFOLCP
-   * </pre>
-   *
    * Protobuf type {@code CurVehicleInfo}
    */
   public static final class CurVehicleInfo extends
@@ -138,31 +134,31 @@ public final class CurVehicleInfoOuterClass {
             }
             case 34: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (kKDFCJENDNI_ != null) {
-                subBuilder = kKDFCJENDNI_.toBuilder();
+              if (bNDOCLLEBEA_ != null) {
+                subBuilder = bNDOCLLEBEA_.toBuilder();
               }
-              kKDFCJENDNI_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              bNDOCLLEBEA_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(kKDFCJENDNI_);
-                kKDFCJENDNI_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(bNDOCLLEBEA_);
+                bNDOCLLEBEA_ = subBuilder.buildPartial();
               }
 
               break;
             }
             case 40: {
 
-              cJIMMADJKHD_ = input.readUInt32();
+              gIICKAOFKDB_ = input.readUInt32();
               break;
             }
             case 50: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (jGOGBMEKOPP_ != null) {
-                subBuilder = jGOGBMEKOPP_.toBuilder();
+              if (bELIOKMDLGB_ != null) {
+                subBuilder = bELIOKMDLGB_.toBuilder();
               }
-              jGOGBMEKOPP_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              bELIOKMDLGB_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(jGOGBMEKOPP_);
-                jGOGBMEKOPP_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(bELIOKMDLGB_);
+                bELIOKMDLGB_ = subBuilder.buildPartial();
               }
 
               break;
@@ -232,67 +228,67 @@ public final class CurVehicleInfoOuterClass {
       return gadgetId_;
     }
 
-    public static final int KKDFCJENDNI_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector kKDFCJENDNI_;
+    public static final int BNDOCLLEBEA_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector bNDOCLLEBEA_;
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return Whether the kKDFCJENDNI field is set.
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
+     * @return Whether the bNDOCLLEBEA field is set.
      */
     @java.lang.Override
-    public boolean hasKKDFCJENDNI() {
-      return kKDFCJENDNI_ != null;
+    public boolean hasBNDOCLLEBEA() {
+      return bNDOCLLEBEA_ != null;
     }
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return The kKDFCJENDNI.
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
+     * @return The bNDOCLLEBEA.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI() {
-      return kKDFCJENDNI_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getBNDOCLLEBEA() {
+      return bNDOCLLEBEA_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bNDOCLLEBEA_;
     }
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
+     * <code>.Vector BNDOCLLEBEA = 4;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder() {
-      return getKKDFCJENDNI();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBNDOCLLEBEAOrBuilder() {
+      return getBNDOCLLEBEA();
     }
 
-    public static final int CJIMMADJKHD_FIELD_NUMBER = 5;
-    private int cJIMMADJKHD_;
+    public static final int GIICKAOFKDB_FIELD_NUMBER = 5;
+    private int gIICKAOFKDB_;
     /**
-     * <code>uint32 CJIMMADJKHD = 5;</code>
-     * @return The cJIMMADJKHD.
+     * <code>uint32 GIICKAOFKDB = 5;</code>
+     * @return The gIICKAOFKDB.
      */
     @java.lang.Override
-    public int getCJIMMADJKHD() {
-      return cJIMMADJKHD_;
+    public int getGIICKAOFKDB() {
+      return gIICKAOFKDB_;
     }
 
-    public static final int JGOGBMEKOPP_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector jGOGBMEKOPP_;
+    public static final int BELIOKMDLGB_FIELD_NUMBER = 6;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector bELIOKMDLGB_;
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
-     * @return Whether the jGOGBMEKOPP field is set.
+     * <code>.Vector BELIOKMDLGB = 6;</code>
+     * @return Whether the bELIOKMDLGB field is set.
      */
     @java.lang.Override
-    public boolean hasJGOGBMEKOPP() {
-      return jGOGBMEKOPP_ != null;
+    public boolean hasBELIOKMDLGB() {
+      return bELIOKMDLGB_ != null;
     }
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
-     * @return The jGOGBMEKOPP.
+     * <code>.Vector BELIOKMDLGB = 6;</code>
+     * @return The bELIOKMDLGB.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP() {
-      return jGOGBMEKOPP_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getBELIOKMDLGB() {
+      return bELIOKMDLGB_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bELIOKMDLGB_;
     }
     /**
-     * <code>.Vector JGOGBMEKOPP = 6;</code>
+     * <code>.Vector BELIOKMDLGB = 6;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder() {
-      return getJGOGBMEKOPP();
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBELIOKMDLGBOrBuilder() {
+      return getBELIOKMDLGB();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -318,14 +314,14 @@ public final class CurVehicleInfoOuterClass {
       if (gadgetId_ != 0) {
         output.writeUInt32(3, gadgetId_);
       }
-      if (kKDFCJENDNI_ != null) {
-        output.writeMessage(4, getKKDFCJENDNI());
+      if (bNDOCLLEBEA_ != null) {
+        output.writeMessage(4, getBNDOCLLEBEA());
       }
-      if (cJIMMADJKHD_ != 0) {
-        output.writeUInt32(5, cJIMMADJKHD_);
+      if (gIICKAOFKDB_ != 0) {
+        output.writeUInt32(5, gIICKAOFKDB_);
       }
-      if (jGOGBMEKOPP_ != null) {
-        output.writeMessage(6, getJGOGBMEKOPP());
+      if (bELIOKMDLGB_ != null) {
+        output.writeMessage(6, getBELIOKMDLGB());
       }
       unknownFields.writeTo(output);
     }
@@ -348,17 +344,17 @@ public final class CurVehicleInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(3, gadgetId_);
       }
-      if (kKDFCJENDNI_ != null) {
+      if (bNDOCLLEBEA_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getKKDFCJENDNI());
+          .computeMessageSize(4, getBNDOCLLEBEA());
       }
-      if (cJIMMADJKHD_ != 0) {
+      if (gIICKAOFKDB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, cJIMMADJKHD_);
+          .computeUInt32Size(5, gIICKAOFKDB_);
       }
-      if (jGOGBMEKOPP_ != null) {
+      if (bELIOKMDLGB_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getJGOGBMEKOPP());
+          .computeMessageSize(6, getBELIOKMDLGB());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -381,17 +377,17 @@ public final class CurVehicleInfoOuterClass {
           != other.getPos()) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
-      if (hasKKDFCJENDNI() != other.hasKKDFCJENDNI()) return false;
-      if (hasKKDFCJENDNI()) {
-        if (!getKKDFCJENDNI()
-            .equals(other.getKKDFCJENDNI())) return false;
+      if (hasBNDOCLLEBEA() != other.hasBNDOCLLEBEA()) return false;
+      if (hasBNDOCLLEBEA()) {
+        if (!getBNDOCLLEBEA()
+            .equals(other.getBNDOCLLEBEA())) return false;
       }
-      if (getCJIMMADJKHD()
-          != other.getCJIMMADJKHD()) return false;
-      if (hasJGOGBMEKOPP() != other.hasJGOGBMEKOPP()) return false;
-      if (hasJGOGBMEKOPP()) {
-        if (!getJGOGBMEKOPP()
-            .equals(other.getJGOGBMEKOPP())) return false;
+      if (getGIICKAOFKDB()
+          != other.getGIICKAOFKDB()) return false;
+      if (hasBELIOKMDLGB() != other.hasBELIOKMDLGB()) return false;
+      if (hasBELIOKMDLGB()) {
+        if (!getBELIOKMDLGB()
+            .equals(other.getBELIOKMDLGB())) return false;
       }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -410,15 +406,15 @@ public final class CurVehicleInfoOuterClass {
       hash = (53 * hash) + getPos();
       hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetId();
-      if (hasKKDFCJENDNI()) {
-        hash = (37 * hash) + KKDFCJENDNI_FIELD_NUMBER;
-        hash = (53 * hash) + getKKDFCJENDNI().hashCode();
+      if (hasBNDOCLLEBEA()) {
+        hash = (37 * hash) + BNDOCLLEBEA_FIELD_NUMBER;
+        hash = (53 * hash) + getBNDOCLLEBEA().hashCode();
       }
-      hash = (37 * hash) + CJIMMADJKHD_FIELD_NUMBER;
-      hash = (53 * hash) + getCJIMMADJKHD();
-      if (hasJGOGBMEKOPP()) {
-        hash = (37 * hash) + JGOGBMEKOPP_FIELD_NUMBER;
-        hash = (53 * hash) + getJGOGBMEKOPP().hashCode();
+      hash = (37 * hash) + GIICKAOFKDB_FIELD_NUMBER;
+      hash = (53 * hash) + getGIICKAOFKDB();
+      if (hasBELIOKMDLGB()) {
+        hash = (37 * hash) + BELIOKMDLGB_FIELD_NUMBER;
+        hash = (53 * hash) + getBELIOKMDLGB().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -516,10 +512,6 @@ public final class CurVehicleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LNHHODFOLCP
-     * </pre>
-     *
      * Protobuf type {@code CurVehicleInfo}
      */
     public static final class Builder extends
@@ -563,19 +555,19 @@ public final class CurVehicleInfoOuterClass {
 
         gadgetId_ = 0;
 
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = null;
+        if (bNDOCLLEBEABuilder_ == null) {
+          bNDOCLLEBEA_ = null;
         } else {
-          kKDFCJENDNI_ = null;
-          kKDFCJENDNIBuilder_ = null;
+          bNDOCLLEBEA_ = null;
+          bNDOCLLEBEABuilder_ = null;
         }
-        cJIMMADJKHD_ = 0;
+        gIICKAOFKDB_ = 0;
 
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = null;
+        if (bELIOKMDLGBBuilder_ == null) {
+          bELIOKMDLGB_ = null;
         } else {
-          jGOGBMEKOPP_ = null;
-          jGOGBMEKOPPBuilder_ = null;
+          bELIOKMDLGB_ = null;
+          bELIOKMDLGBBuilder_ = null;
         }
         return this;
       }
@@ -606,16 +598,16 @@ public final class CurVehicleInfoOuterClass {
         result.entityId_ = entityId_;
         result.pos_ = pos_;
         result.gadgetId_ = gadgetId_;
-        if (kKDFCJENDNIBuilder_ == null) {
-          result.kKDFCJENDNI_ = kKDFCJENDNI_;
+        if (bNDOCLLEBEABuilder_ == null) {
+          result.bNDOCLLEBEA_ = bNDOCLLEBEA_;
         } else {
-          result.kKDFCJENDNI_ = kKDFCJENDNIBuilder_.build();
+          result.bNDOCLLEBEA_ = bNDOCLLEBEABuilder_.build();
         }
-        result.cJIMMADJKHD_ = cJIMMADJKHD_;
-        if (jGOGBMEKOPPBuilder_ == null) {
-          result.jGOGBMEKOPP_ = jGOGBMEKOPP_;
+        result.gIICKAOFKDB_ = gIICKAOFKDB_;
+        if (bELIOKMDLGBBuilder_ == null) {
+          result.bELIOKMDLGB_ = bELIOKMDLGB_;
         } else {
-          result.jGOGBMEKOPP_ = jGOGBMEKOPPBuilder_.build();
+          result.bELIOKMDLGB_ = bELIOKMDLGBBuilder_.build();
         }
         onBuilt();
         return result;
@@ -674,14 +666,14 @@ public final class CurVehicleInfoOuterClass {
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
-        if (other.hasKKDFCJENDNI()) {
-          mergeKKDFCJENDNI(other.getKKDFCJENDNI());
+        if (other.hasBNDOCLLEBEA()) {
+          mergeBNDOCLLEBEA(other.getBNDOCLLEBEA());
         }
-        if (other.getCJIMMADJKHD() != 0) {
-          setCJIMMADJKHD(other.getCJIMMADJKHD());
+        if (other.getGIICKAOFKDB() != 0) {
+          setGIICKAOFKDB(other.getGIICKAOFKDB());
         }
-        if (other.hasJGOGBMEKOPP()) {
-          mergeJGOGBMEKOPP(other.getJGOGBMEKOPP());
+        if (other.hasBELIOKMDLGB()) {
+          mergeBELIOKMDLGB(other.getBELIOKMDLGB());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -805,273 +797,273 @@ public final class CurVehicleInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector kKDFCJENDNI_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector bNDOCLLEBEA_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> kKDFCJENDNIBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> bNDOCLLEBEABuilder_;
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       * @return Whether the kKDFCJENDNI field is set.
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
+       * @return Whether the bNDOCLLEBEA field is set.
        */
-      public boolean hasKKDFCJENDNI() {
-        return kKDFCJENDNIBuilder_ != null || kKDFCJENDNI_ != null;
+      public boolean hasBNDOCLLEBEA() {
+        return bNDOCLLEBEABuilder_ != null || bNDOCLLEBEA_ != null;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       * @return The kKDFCJENDNI.
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
+       * @return The bNDOCLLEBEA.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          return kKDFCJENDNI_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getBNDOCLLEBEA() {
+        if (bNDOCLLEBEABuilder_ == null) {
+          return bNDOCLLEBEA_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bNDOCLLEBEA_;
         } else {
-          return kKDFCJENDNIBuilder_.getMessage();
+          return bNDOCLLEBEABuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public Builder setKKDFCJENDNI(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kKDFCJENDNIBuilder_ == null) {
+      public Builder setBNDOCLLEBEA(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (bNDOCLLEBEABuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          kKDFCJENDNI_ = value;
+          bNDOCLLEBEA_ = value;
           onChanged();
         } else {
-          kKDFCJENDNIBuilder_.setMessage(value);
+          bNDOCLLEBEABuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public Builder setKKDFCJENDNI(
+      public Builder setBNDOCLLEBEA(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = builderForValue.build();
+        if (bNDOCLLEBEABuilder_ == null) {
+          bNDOCLLEBEA_ = builderForValue.build();
           onChanged();
         } else {
-          kKDFCJENDNIBuilder_.setMessage(builderForValue.build());
+          bNDOCLLEBEABuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public Builder mergeKKDFCJENDNI(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kKDFCJENDNIBuilder_ == null) {
-          if (kKDFCJENDNI_ != null) {
-            kKDFCJENDNI_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(kKDFCJENDNI_).mergeFrom(value).buildPartial();
+      public Builder mergeBNDOCLLEBEA(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (bNDOCLLEBEABuilder_ == null) {
+          if (bNDOCLLEBEA_ != null) {
+            bNDOCLLEBEA_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(bNDOCLLEBEA_).mergeFrom(value).buildPartial();
           } else {
-            kKDFCJENDNI_ = value;
+            bNDOCLLEBEA_ = value;
           }
           onChanged();
         } else {
-          kKDFCJENDNIBuilder_.mergeFrom(value);
+          bNDOCLLEBEABuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public Builder clearKKDFCJENDNI() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = null;
+      public Builder clearBNDOCLLEBEA() {
+        if (bNDOCLLEBEABuilder_ == null) {
+          bNDOCLLEBEA_ = null;
           onChanged();
         } else {
-          kKDFCJENDNI_ = null;
-          kKDFCJENDNIBuilder_ = null;
+          bNDOCLLEBEA_ = null;
+          bNDOCLLEBEABuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getKKDFCJENDNIBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getBNDOCLLEBEABuilder() {
         
         onChanged();
-        return getKKDFCJENDNIFieldBuilder().getBuilder();
+        return getBNDOCLLEBEAFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 4;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder() {
-        if (kKDFCJENDNIBuilder_ != null) {
-          return kKDFCJENDNIBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBNDOCLLEBEAOrBuilder() {
+        if (bNDOCLLEBEABuilder_ != null) {
+          return bNDOCLLEBEABuilder_.getMessageOrBuilder();
         } else {
-          return kKDFCJENDNI_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
+          return bNDOCLLEBEA_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bNDOCLLEBEA_;
         }
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>.Vector BNDOCLLEBEA = 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> 
-          getKKDFCJENDNIFieldBuilder() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNIBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getBNDOCLLEBEAFieldBuilder() {
+        if (bNDOCLLEBEABuilder_ == null) {
+          bNDOCLLEBEABuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getKKDFCJENDNI(),
+                  getBNDOCLLEBEA(),
                   getParentForChildren(),
                   isClean());
-          kKDFCJENDNI_ = null;
+          bNDOCLLEBEA_ = null;
         }
-        return kKDFCJENDNIBuilder_;
+        return bNDOCLLEBEABuilder_;
       }
 
-      private int cJIMMADJKHD_ ;
+      private int gIICKAOFKDB_ ;
       /**
-       * <code>uint32 CJIMMADJKHD = 5;</code>
-       * @return The cJIMMADJKHD.
+       * <code>uint32 GIICKAOFKDB = 5;</code>
+       * @return The gIICKAOFKDB.
        */
       @java.lang.Override
-      public int getCJIMMADJKHD() {
-        return cJIMMADJKHD_;
+      public int getGIICKAOFKDB() {
+        return gIICKAOFKDB_;
       }
       /**
-       * <code>uint32 CJIMMADJKHD = 5;</code>
-       * @param value The cJIMMADJKHD to set.
+       * <code>uint32 GIICKAOFKDB = 5;</code>
+       * @param value The gIICKAOFKDB to set.
        * @return This builder for chaining.
        */
-      public Builder setCJIMMADJKHD(int value) {
+      public Builder setGIICKAOFKDB(int value) {
         
-        cJIMMADJKHD_ = value;
+        gIICKAOFKDB_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 CJIMMADJKHD = 5;</code>
+       * <code>uint32 GIICKAOFKDB = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCJIMMADJKHD() {
+      public Builder clearGIICKAOFKDB() {
         
-        cJIMMADJKHD_ = 0;
+        gIICKAOFKDB_ = 0;
         onChanged();
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector jGOGBMEKOPP_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector bELIOKMDLGB_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> jGOGBMEKOPPBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> bELIOKMDLGBBuilder_;
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
-       * @return Whether the jGOGBMEKOPP field is set.
+       * <code>.Vector BELIOKMDLGB = 6;</code>
+       * @return Whether the bELIOKMDLGB field is set.
        */
-      public boolean hasJGOGBMEKOPP() {
-        return jGOGBMEKOPPBuilder_ != null || jGOGBMEKOPP_ != null;
+      public boolean hasBELIOKMDLGB() {
+        return bELIOKMDLGBBuilder_ != null || bELIOKMDLGB_ != null;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
-       * @return The jGOGBMEKOPP.
+       * <code>.Vector BELIOKMDLGB = 6;</code>
+       * @return The bELIOKMDLGB.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          return jGOGBMEKOPP_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getBELIOKMDLGB() {
+        if (bELIOKMDLGBBuilder_ == null) {
+          return bELIOKMDLGB_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bELIOKMDLGB_;
         } else {
-          return jGOGBMEKOPPBuilder_.getMessage();
+          return bELIOKMDLGBBuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public Builder setJGOGBMEKOPP(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (jGOGBMEKOPPBuilder_ == null) {
+      public Builder setBELIOKMDLGB(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (bELIOKMDLGBBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          jGOGBMEKOPP_ = value;
+          bELIOKMDLGB_ = value;
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.setMessage(value);
+          bELIOKMDLGBBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public Builder setJGOGBMEKOPP(
+      public Builder setBELIOKMDLGB(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = builderForValue.build();
+        if (bELIOKMDLGBBuilder_ == null) {
+          bELIOKMDLGB_ = builderForValue.build();
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.setMessage(builderForValue.build());
+          bELIOKMDLGBBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public Builder mergeJGOGBMEKOPP(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          if (jGOGBMEKOPP_ != null) {
-            jGOGBMEKOPP_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(jGOGBMEKOPP_).mergeFrom(value).buildPartial();
+      public Builder mergeBELIOKMDLGB(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (bELIOKMDLGBBuilder_ == null) {
+          if (bELIOKMDLGB_ != null) {
+            bELIOKMDLGB_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(bELIOKMDLGB_).mergeFrom(value).buildPartial();
           } else {
-            jGOGBMEKOPP_ = value;
+            bELIOKMDLGB_ = value;
           }
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.mergeFrom(value);
+          bELIOKMDLGBBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public Builder clearJGOGBMEKOPP() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = null;
+      public Builder clearBELIOKMDLGB() {
+        if (bELIOKMDLGBBuilder_ == null) {
+          bELIOKMDLGB_ = null;
           onChanged();
         } else {
-          jGOGBMEKOPP_ = null;
-          jGOGBMEKOPPBuilder_ = null;
+          bELIOKMDLGB_ = null;
+          bELIOKMDLGBBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getJGOGBMEKOPPBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getBELIOKMDLGBBuilder() {
         
         onChanged();
-        return getJGOGBMEKOPPFieldBuilder().getBuilder();
+        return getBELIOKMDLGBFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder() {
-        if (jGOGBMEKOPPBuilder_ != null) {
-          return jGOGBMEKOPPBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBELIOKMDLGBOrBuilder() {
+        if (bELIOKMDLGBBuilder_ != null) {
+          return bELIOKMDLGBBuilder_.getMessageOrBuilder();
         } else {
-          return jGOGBMEKOPP_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+          return bELIOKMDLGB_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bELIOKMDLGB_;
         }
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 6;</code>
+       * <code>.Vector BELIOKMDLGB = 6;</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> 
-          getJGOGBMEKOPPFieldBuilder() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPPBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getBELIOKMDLGBFieldBuilder() {
+        if (bELIOKMDLGBBuilder_ == null) {
+          bELIOKMDLGBBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getJGOGBMEKOPP(),
+                  getBELIOKMDLGB(),
                   getParentForChildren(),
                   isClean());
-          jGOGBMEKOPP_ = null;
+          bELIOKMDLGB_ = null;
         }
-        return jGOGBMEKOPPBuilder_;
+        return bELIOKMDLGBBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1142,9 +1134,9 @@ public final class CurVehicleInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\024CurVehicleInfo.proto\032\014Vector.proto\"\224\001\n" +
       "\016CurVehicleInfo\022\021\n\tentity_id\030\001 \001(\r\022\013\n\003po" +
-      "s\030\002 \001(\r\022\021\n\tgadget_id\030\003 \001(\r\022\034\n\013KKDFCJENDN" +
-      "I\030\004 \001(\0132\007.Vector\022\023\n\013CJIMMADJKHD\030\005 \001(\r\022\034\n" +
-      "\013JGOGBMEKOPP\030\006 \001(\0132\007.VectorB\033\n\031emu.grass" +
+      "s\030\002 \001(\r\022\021\n\tgadget_id\030\003 \001(\r\022\034\n\013BNDOCLLEBE" +
+      "A\030\004 \001(\0132\007.Vector\022\023\n\013GIICKAOFKDB\030\005 \001(\r\022\034\n" +
+      "\013BELIOKMDLGB\030\006 \001(\0132\007.VectorB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1157,7 +1149,7 @@ public final class CurVehicleInfoOuterClass {
     internal_static_CurVehicleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CurVehicleInfo_descriptor,
-        new java.lang.String[] { "EntityId", "Pos", "GadgetId", "KKDFCJENDNI", "CJIMMADJKHD", "JGOGBMEKOPP", });
+        new java.lang.String[] { "EntityId", "Pos", "GadgetId", "BNDOCLLEBEA", "GIICKAOFKDB", "BELIOKMDLGB", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomCommonNodeInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomCommonNodeInfoOuterClass.java
index 6d970f596..b50e4f2b3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomCommonNodeInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomCommonNodeInfoOuterClass.java
@@ -41,10 +41,27 @@ public final class CustomCommonNodeInfoOuterClass {
      */
     com.google.protobuf.ByteString
         getSlotIdentifierBytes();
+
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @return A list containing the paramList.
+     */
+    java.util.List<java.lang.Integer> getParamListList();
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @return The count of paramList.
+     */
+    int getParamListCount();
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    int getParamList(int index);
   }
   /**
    * <pre>
-   * Obf: IGADMBECIDG
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code CustomCommonNodeInfo}
@@ -60,6 +77,7 @@ public final class CustomCommonNodeInfoOuterClass {
     }
     private CustomCommonNodeInfo() {
       slotIdentifier_ = "";
+      paramList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -82,6 +100,7 @@ public final class CustomCommonNodeInfoOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -108,6 +127,27 @@ public final class CustomCommonNodeInfoOuterClass {
               slotIdentifier_ = s;
               break;
             }
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                paramList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              paramList_.addInt(input.readInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                paramList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                paramList_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -123,6 +163,9 @@ public final class CustomCommonNodeInfoOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          paramList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -200,6 +243,34 @@ public final class CustomCommonNodeInfoOuterClass {
       }
     }
 
+    public static final int PARAM_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList paramList_;
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @return A list containing the paramList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getParamListList() {
+      return paramList_;
+    }
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @return The count of paramList.
+     */
+    public int getParamListCount() {
+      return paramList_.size();
+    }
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    public int getParamList(int index) {
+      return paramList_.getInt(index);
+    }
+    private int paramListMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,6 +285,7 @@ public final class CustomCommonNodeInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       if (parentIndex_ != 0) {
         output.writeInt32(1, parentIndex_);
       }
@@ -223,6 +295,13 @@ public final class CustomCommonNodeInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(slotIdentifier_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 3, slotIdentifier_);
       }
+      if (getParamListList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(paramListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < paramList_.size(); i++) {
+        output.writeInt32NoTag(paramList_.getInt(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -243,6 +322,20 @@ public final class CustomCommonNodeInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(slotIdentifier_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, slotIdentifier_);
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < paramList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(paramList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getParamListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        paramListMemoizedSerializedSize = dataSize;
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -264,6 +357,8 @@ public final class CustomCommonNodeInfoOuterClass {
           != other.getConfigId()) return false;
       if (!getSlotIdentifier()
           .equals(other.getSlotIdentifier())) return false;
+      if (!getParamListList()
+          .equals(other.getParamListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -281,6 +376,10 @@ public final class CustomCommonNodeInfoOuterClass {
       hash = (53 * hash) + getConfigId();
       hash = (37 * hash) + SLOT_IDENTIFIER_FIELD_NUMBER;
       hash = (53 * hash) + getSlotIdentifier().hashCode();
+      if (getParamListCount() > 0) {
+        hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getParamListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,7 +477,7 @@ public final class CustomCommonNodeInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: IGADMBECIDG
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code CustomCommonNodeInfo}
@@ -424,6 +523,8 @@ public final class CustomCommonNodeInfoOuterClass {
 
         slotIdentifier_ = "";
 
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -450,9 +551,15 @@ public final class CustomCommonNodeInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CustomCommonNodeInfoOuterClass.CustomCommonNodeInfo buildPartial() {
         emu.grasscutter.net.proto.CustomCommonNodeInfoOuterClass.CustomCommonNodeInfo result = new emu.grasscutter.net.proto.CustomCommonNodeInfoOuterClass.CustomCommonNodeInfo(this);
+        int from_bitField0_ = bitField0_;
         result.parentIndex_ = parentIndex_;
         result.configId_ = configId_;
         result.slotIdentifier_ = slotIdentifier_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          paramList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.paramList_ = paramList_;
         onBuilt();
         return result;
       }
@@ -511,6 +618,16 @@ public final class CustomCommonNodeInfoOuterClass {
           slotIdentifier_ = other.slotIdentifier_;
           onChanged();
         }
+        if (!other.paramList_.isEmpty()) {
+          if (paramList_.isEmpty()) {
+            paramList_ = other.paramList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureParamListIsMutable();
+            paramList_.addAll(other.paramList_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -539,6 +656,7 @@ public final class CustomCommonNodeInfoOuterClass {
         }
         return this;
       }
+      private int bitField0_;
 
       private int parentIndex_ ;
       /**
@@ -677,6 +795,85 @@ public final class CustomCommonNodeInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
+      private void ensureParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          paramList_ = mutableCopy(paramList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @return A list containing the paramList.
+       */
+      public java.util.List<java.lang.Integer>
+          getParamListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @return The count of paramList.
+       */
+      public int getParamListCount() {
+        return paramList_.size();
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @param index The index of the element to return.
+       * @return The paramList at the given index.
+       */
+      public int getParamList(int index) {
+        return paramList_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The paramList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamList(
+          int index, int value) {
+        ensureParamListIsMutable();
+        paramList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @param value The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addParamList(int value) {
+        ensureParamListIsMutable();
+        paramList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @param values The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllParamList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureParamListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, paramList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 param_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamList() {
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -744,10 +941,11 @@ public final class CustomCommonNodeInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032CustomCommonNodeInfo.proto\"X\n\024CustomCo" +
+      "\n\032CustomCommonNodeInfo.proto\"l\n\024CustomCo" +
       "mmonNodeInfo\022\024\n\014parent_index\030\001 \001(\005\022\021\n\tco" +
-      "nfig_id\030\002 \001(\r\022\027\n\017slot_identifier\030\003 \001(\tB\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "nfig_id\030\002 \001(\r\022\027\n\017slot_identifier\030\003 \001(\t\022\022" +
+      "\n\nparam_list\030\004 \003(\005B\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -758,7 +956,7 @@ public final class CustomCommonNodeInfoOuterClass {
     internal_static_CustomCommonNodeInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CustomCommonNodeInfo_descriptor,
-        new java.lang.String[] { "ParentIndex", "ConfigId", "SlotIdentifier", });
+        new java.lang.String[] { "ParentIndex", "ConfigId", "SlotIdentifier", "ParamList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonBlockOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonBlockOuterClass.java
index d833180bd..1ded090ee 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonBlockOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonBlockOuterClass.java
@@ -19,38 +19,38 @@ public final class CustomDungeonBlockOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 guid = 15;</code>
+     * <code>.Vector rot = 1;</code>
+     * @return Whether the rot field is set.
+     */
+    boolean hasRot();
+    /**
+     * <code>.Vector rot = 1;</code>
+     * @return The rot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
+    /**
+     * <code>.Vector rot = 1;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
+
+    /**
+     * <code>uint32 guid = 4;</code>
      * @return The guid.
      */
     int getGuid();
 
     /**
-     * <code>.Vector rot = 9;</code>
-     * @return Whether the rot field is set.
-     */
-    boolean hasRot();
-    /**
-     * <code>.Vector rot = 9;</code>
-     * @return The rot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
-    /**
-     * <code>.Vector rot = 9;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
-
-    /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
@@ -61,10 +61,6 @@ public final class CustomDungeonBlockOuterClass {
     int getBlockId();
   }
   /**
-   * <pre>
-   * Obf: AEPAOCNLPHA
-   * </pre>
-   *
    * Protobuf type {@code CustomDungeonBlock}
    */
   public static final class CustomDungeonBlock extends
@@ -109,20 +105,7 @@ public final class CustomDungeonBlockOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (pos_ != null) {
-                subBuilder = pos_.toBuilder();
-              }
-              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pos_);
-                pos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 74: {
+            case 10: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -135,16 +118,29 @@ public final class CustomDungeonBlockOuterClass {
 
               break;
             }
+            case 32: {
+
+              guid_ = input.readUInt32();
+              break;
+            }
+            case 74: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (pos_ != null) {
+                subBuilder = pos_.toBuilder();
+              }
+              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pos_);
+                pos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             case 80: {
 
               blockId_ = input.readUInt32();
               break;
             }
-            case 120: {
-
-              guid_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -177,21 +173,10 @@ public final class CustomDungeonBlockOuterClass {
               emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.class, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 15;
-    private int guid_;
-    /**
-     * <code>uint32 guid = 15;</code>
-     * @return The guid.
-     */
-    @java.lang.Override
-    public int getGuid() {
-      return guid_;
-    }
-
-    public static final int ROT_FIELD_NUMBER = 9;
+    public static final int ROT_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 9;</code>
+     * <code>.Vector rot = 1;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -199,7 +184,7 @@ public final class CustomDungeonBlockOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 9;</code>
+     * <code>.Vector rot = 1;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -207,17 +192,28 @@ public final class CustomDungeonBlockOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 9;</code>
+     * <code>.Vector rot = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
       return getRot();
     }
 
-    public static final int POS_FIELD_NUMBER = 5;
+    public static final int GUID_FIELD_NUMBER = 4;
+    private int guid_;
+    /**
+     * <code>uint32 guid = 4;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public int getGuid() {
+      return guid_;
+    }
+
+    public static final int POS_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -225,7 +221,7 @@ public final class CustomDungeonBlockOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -233,7 +229,7 @@ public final class CustomDungeonBlockOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 5;</code>
+     * <code>.Vector pos = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
@@ -265,18 +261,18 @@ public final class CustomDungeonBlockOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pos_ != null) {
-        output.writeMessage(5, getPos());
-      }
       if (rot_ != null) {
-        output.writeMessage(9, getRot());
+        output.writeMessage(1, getRot());
+      }
+      if (guid_ != 0) {
+        output.writeUInt32(4, guid_);
+      }
+      if (pos_ != null) {
+        output.writeMessage(9, getPos());
       }
       if (blockId_ != 0) {
         output.writeUInt32(10, blockId_);
       }
-      if (guid_ != 0) {
-        output.writeUInt32(15, guid_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -286,22 +282,22 @@ public final class CustomDungeonBlockOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getPos());
-      }
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getRot());
+          .computeMessageSize(1, getRot());
+      }
+      if (guid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, guid_);
+      }
+      if (pos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getPos());
       }
       if (blockId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(10, blockId_);
       }
-      if (guid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, guid_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -317,13 +313,13 @@ public final class CustomDungeonBlockOuterClass {
       }
       emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock other = (emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock) obj;
 
-      if (getGuid()
-          != other.getGuid()) return false;
       if (hasRot() != other.hasRot()) return false;
       if (hasRot()) {
         if (!getRot()
             .equals(other.getRot())) return false;
       }
+      if (getGuid()
+          != other.getGuid()) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
@@ -342,12 +338,12 @@ public final class CustomDungeonBlockOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + getGuid();
       if (hasRot()) {
         hash = (37 * hash) + ROT_FIELD_NUMBER;
         hash = (53 * hash) + getRot().hashCode();
       }
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + getGuid();
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
@@ -450,10 +446,6 @@ public final class CustomDungeonBlockOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AEPAOCNLPHA
-     * </pre>
-     *
      * Protobuf type {@code CustomDungeonBlock}
      */
     public static final class Builder extends
@@ -491,14 +483,14 @@ public final class CustomDungeonBlockOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        guid_ = 0;
-
         if (rotBuilder_ == null) {
           rot_ = null;
         } else {
           rot_ = null;
           rotBuilder_ = null;
         }
+        guid_ = 0;
+
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
@@ -533,12 +525,12 @@ public final class CustomDungeonBlockOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock buildPartial() {
         emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock result = new emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock(this);
-        result.guid_ = guid_;
         if (rotBuilder_ == null) {
           result.rot_ = rot_;
         } else {
           result.rot_ = rotBuilder_.build();
         }
+        result.guid_ = guid_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
@@ -593,12 +585,12 @@ public final class CustomDungeonBlockOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock other) {
         if (other == emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.getDefaultInstance()) return this;
-        if (other.getGuid() != 0) {
-          setGuid(other.getGuid());
-        }
         if (other.hasRot()) {
           mergeRot(other.getRot());
         }
+        if (other.getGuid() != 0) {
+          setGuid(other.getGuid());
+        }
         if (other.hasPos()) {
           mergePos(other.getPos());
         }
@@ -634,49 +626,18 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
 
-      private int guid_ ;
-      /**
-       * <code>uint32 guid = 15;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public int getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint32 guid = 15;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(int value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 guid = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -687,7 +648,7 @@ public final class CustomDungeonBlockOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -703,7 +664,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -717,7 +678,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -735,7 +696,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -749,7 +710,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -757,7 +718,7 @@ public final class CustomDungeonBlockOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -768,7 +729,7 @@ public final class CustomDungeonBlockOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 9;</code>
+       * <code>.Vector rot = 1;</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> 
@@ -784,18 +745,49 @@ public final class CustomDungeonBlockOuterClass {
         return rotBuilder_;
       }
 
+      private int guid_ ;
+      /**
+       * <code>uint32 guid = 4;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public int getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint32 guid = 4;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(int value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 guid = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       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 = 5;</code>
+       * <code>.Vector pos = 9;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -806,7 +798,7 @@ public final class CustomDungeonBlockOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -822,7 +814,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -836,7 +828,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -854,7 +846,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -868,7 +860,7 @@ public final class CustomDungeonBlockOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -876,7 +868,7 @@ public final class CustomDungeonBlockOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -887,7 +879,7 @@ public final class CustomDungeonBlockOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 5;</code>
+       * <code>.Vector pos = 9;</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> 
@@ -1001,8 +993,8 @@ public final class CustomDungeonBlockOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030CustomDungeonBlock.proto\032\014Vector.proto" +
-      "\"`\n\022CustomDungeonBlock\022\014\n\004guid\030\017 \001(\r\022\024\n\003" +
-      "rot\030\t \001(\0132\007.Vector\022\024\n\003pos\030\005 \001(\0132\007.Vector" +
+      "\"`\n\022CustomDungeonBlock\022\024\n\003rot\030\001 \001(\0132\007.Ve" +
+      "ctor\022\014\n\004guid\030\004 \001(\r\022\024\n\003pos\030\t \001(\0132\007.Vector" +
       "\022\020\n\010block_id\030\n \001(\rB\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
@@ -1016,7 +1008,7 @@ public final class CustomDungeonBlockOuterClass {
     internal_static_CustomDungeonBlock_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CustomDungeonBlock_descriptor,
-        new java.lang.String[] { "Guid", "Rot", "Pos", "BlockId", });
+        new java.lang.String[] { "Rot", "Guid", "Pos", "BlockId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonFinishTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonFinishTypeOuterClass.java
index c2f1c9f4f..f4ae1e564 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonFinishTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonFinishTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class CustomDungeonFinishTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: AJGOAOOHDHK
-   * </pre>
-   *
    * Protobuf enum {@code CustomDungeonFinishType}
    */
   public enum CustomDungeonFinishType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonOuterClass.java
index 21da40386..8a71a793b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonOuterClass.java
@@ -19,61 +19,57 @@ public final class CustomDungeonOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     * @return Whether the setting field is set.
-     */
-    boolean hasSetting();
-    /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     * @return The setting.
-     */
-    emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting getSetting();
-    /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     */
-    emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder getSettingOrBuilder();
-
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> 
-        getRoomListList();
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom getRoomList(int index);
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    int getRoomListCount();
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> 
-        getRoomListOrBuilderList();
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder getRoomListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint64 dungeon_guid = 3;</code>
+     * <code>uint64 dungeon_guid = 1;</code>
      * @return The dungeonGuid.
      */
     long getDungeonGuid();
 
     /**
-     * <code>uint32 dungeon_id = 8;</code>
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     * @return Whether the setting field is set.
+     */
+    boolean hasSetting();
+    /**
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     * @return The setting.
+     */
+    emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting getSetting();
+    /**
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     */
+    emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder getSettingOrBuilder();
+
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> 
+        getRoomListList();
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom getRoomList(int index);
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    int getRoomListCount();
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> 
+        getRoomListOrBuilderList();
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder getRoomListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 dungeon_id = 15;</code>
      * @return The dungeonId.
      */
     int getDungeonId();
   }
   /**
-   * <pre>
-   * Obf: JLKPGHBFPHE
-   * </pre>
-   *
    * Protobuf type {@code CustomDungeon}
    */
   public static final class CustomDungeon extends
@@ -120,26 +116,12 @@ public final class CustomDungeonOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
               dungeonGuid_ = input.readUInt64();
               break;
             }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                roomList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              roomList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.parser(), extensionRegistry));
-              break;
-            }
-            case 64: {
-
-              dungeonId_ = input.readUInt32();
-              break;
-            }
-            case 114: {
+            case 82: {
               emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder subBuilder = null;
               if (setting_ != null) {
                 subBuilder = setting_.toBuilder();
@@ -152,6 +134,20 @@ public final class CustomDungeonOuterClass {
 
               break;
             }
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                roomList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              roomList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.parser(), extensionRegistry));
+              break;
+            }
+            case 120: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -187,76 +183,10 @@ public final class CustomDungeonOuterClass {
               emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.class, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder.class);
     }
 
-    public static final int SETTING_FIELD_NUMBER = 14;
-    private emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting setting_;
-    /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     * @return Whether the setting field is set.
-     */
-    @java.lang.Override
-    public boolean hasSetting() {
-      return setting_ != null;
-    }
-    /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     * @return The setting.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting getSetting() {
-      return setting_ == null ? emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.getDefaultInstance() : setting_;
-    }
-    /**
-     * <code>.CustomDungeonSetting setting = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder getSettingOrBuilder() {
-      return getSetting();
-    }
-
-    public static final int ROOM_LIST_FIELD_NUMBER = 7;
-    private java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> roomList_;
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> getRoomListList() {
-      return roomList_;
-    }
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> 
-        getRoomListOrBuilderList() {
-      return roomList_;
-    }
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    @java.lang.Override
-    public int getRoomListCount() {
-      return roomList_.size();
-    }
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom getRoomList(int index) {
-      return roomList_.get(index);
-    }
-    /**
-     * <code>repeated .CustomDungeonRoom room_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder getRoomListOrBuilder(
-        int index) {
-      return roomList_.get(index);
-    }
-
-    public static final int DUNGEON_GUID_FIELD_NUMBER = 3;
+    public static final int DUNGEON_GUID_FIELD_NUMBER = 1;
     private long dungeonGuid_;
     /**
-     * <code>uint64 dungeon_guid = 3;</code>
+     * <code>uint64 dungeon_guid = 1;</code>
      * @return The dungeonGuid.
      */
     @java.lang.Override
@@ -264,10 +194,76 @@ public final class CustomDungeonOuterClass {
       return dungeonGuid_;
     }
 
-    public static final int DUNGEON_ID_FIELD_NUMBER = 8;
+    public static final int SETTING_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting setting_;
+    /**
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     * @return Whether the setting field is set.
+     */
+    @java.lang.Override
+    public boolean hasSetting() {
+      return setting_ != null;
+    }
+    /**
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     * @return The setting.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting getSetting() {
+      return setting_ == null ? emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.getDefaultInstance() : setting_;
+    }
+    /**
+     * <code>.CustomDungeonSetting setting = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder getSettingOrBuilder() {
+      return getSetting();
+    }
+
+    public static final int ROOM_LIST_FIELD_NUMBER = 12;
+    private java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> roomList_;
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> getRoomListList() {
+      return roomList_;
+    }
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> 
+        getRoomListOrBuilderList() {
+      return roomList_;
+    }
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    @java.lang.Override
+    public int getRoomListCount() {
+      return roomList_.size();
+    }
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom getRoomList(int index) {
+      return roomList_.get(index);
+    }
+    /**
+     * <code>repeated .CustomDungeonRoom room_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder getRoomListOrBuilder(
+        int index) {
+      return roomList_.get(index);
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 15;
     private int dungeonId_;
     /**
-     * <code>uint32 dungeon_id = 8;</code>
+     * <code>uint32 dungeon_id = 15;</code>
      * @return The dungeonId.
      */
     @java.lang.Override
@@ -290,16 +286,16 @@ public final class CustomDungeonOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (dungeonGuid_ != 0L) {
-        output.writeUInt64(3, dungeonGuid_);
-      }
-      for (int i = 0; i < roomList_.size(); i++) {
-        output.writeMessage(7, roomList_.get(i));
-      }
-      if (dungeonId_ != 0) {
-        output.writeUInt32(8, dungeonId_);
+        output.writeUInt64(1, dungeonGuid_);
       }
       if (setting_ != null) {
-        output.writeMessage(14, getSetting());
+        output.writeMessage(10, getSetting());
+      }
+      for (int i = 0; i < roomList_.size(); i++) {
+        output.writeMessage(12, roomList_.get(i));
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(15, dungeonId_);
       }
       unknownFields.writeTo(output);
     }
@@ -312,19 +308,19 @@ public final class CustomDungeonOuterClass {
       size = 0;
       if (dungeonGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, dungeonGuid_);
-      }
-      for (int i = 0; i < roomList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, roomList_.get(i));
-      }
-      if (dungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, dungeonId_);
+          .computeUInt64Size(1, dungeonGuid_);
       }
       if (setting_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSetting());
+          .computeMessageSize(10, getSetting());
+      }
+      for (int i = 0; i < roomList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, roomList_.get(i));
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, dungeonId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -341,6 +337,8 @@ public final class CustomDungeonOuterClass {
       }
       emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon other = (emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon) obj;
 
+      if (getDungeonGuid()
+          != other.getDungeonGuid()) return false;
       if (hasSetting() != other.hasSetting()) return false;
       if (hasSetting()) {
         if (!getSetting()
@@ -348,8 +346,6 @@ public final class CustomDungeonOuterClass {
       }
       if (!getRoomListList()
           .equals(other.getRoomListList())) return false;
-      if (getDungeonGuid()
-          != other.getDungeonGuid()) return false;
       if (getDungeonId()
           != other.getDungeonId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -363,6 +359,9 @@ public final class CustomDungeonOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDungeonGuid());
       if (hasSetting()) {
         hash = (37 * hash) + SETTING_FIELD_NUMBER;
         hash = (53 * hash) + getSetting().hashCode();
@@ -371,9 +370,6 @@ public final class CustomDungeonOuterClass {
         hash = (37 * hash) + ROOM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getRoomListList().hashCode();
       }
-      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getDungeonGuid());
       hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -472,10 +468,6 @@ public final class CustomDungeonOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JLKPGHBFPHE
-     * </pre>
-     *
      * Protobuf type {@code CustomDungeon}
      */
     public static final class Builder extends
@@ -514,6 +506,8 @@ public final class CustomDungeonOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        dungeonGuid_ = 0L;
+
         if (settingBuilder_ == null) {
           setting_ = null;
         } else {
@@ -526,8 +520,6 @@ public final class CustomDungeonOuterClass {
         } else {
           roomListBuilder_.clear();
         }
-        dungeonGuid_ = 0L;
-
         dungeonId_ = 0;
 
         return this;
@@ -557,6 +549,7 @@ public final class CustomDungeonOuterClass {
       public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon buildPartial() {
         emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon result = new emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon(this);
         int from_bitField0_ = bitField0_;
+        result.dungeonGuid_ = dungeonGuid_;
         if (settingBuilder_ == null) {
           result.setting_ = setting_;
         } else {
@@ -571,7 +564,6 @@ public final class CustomDungeonOuterClass {
         } else {
           result.roomList_ = roomListBuilder_.build();
         }
-        result.dungeonGuid_ = dungeonGuid_;
         result.dungeonId_ = dungeonId_;
         onBuilt();
         return result;
@@ -621,6 +613,9 @@ public final class CustomDungeonOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon other) {
         if (other == emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance()) return this;
+        if (other.getDungeonGuid() != 0L) {
+          setDungeonGuid(other.getDungeonGuid());
+        }
         if (other.hasSetting()) {
           mergeSetting(other.getSetting());
         }
@@ -650,9 +645,6 @@ public final class CustomDungeonOuterClass {
             }
           }
         }
-        if (other.getDungeonGuid() != 0L) {
-          setDungeonGuid(other.getDungeonGuid());
-        }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
@@ -686,18 +678,49 @@ public final class CustomDungeonOuterClass {
       }
       private int bitField0_;
 
+      private long dungeonGuid_ ;
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @return The dungeonGuid.
+       */
+      @java.lang.Override
+      public long getDungeonGuid() {
+        return dungeonGuid_;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @param value The dungeonGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonGuid(long value) {
+        
+        dungeonGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonGuid() {
+        
+        dungeonGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting setting_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting, emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder, emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder> settingBuilder_;
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        * @return Whether the setting field is set.
        */
       public boolean hasSetting() {
         return settingBuilder_ != null || setting_ != null;
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        * @return The setting.
        */
       public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting getSetting() {
@@ -708,7 +731,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public Builder setSetting(emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting value) {
         if (settingBuilder_ == null) {
@@ -724,7 +747,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public Builder setSetting(
           emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder builderForValue) {
@@ -738,7 +761,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public Builder mergeSetting(emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting value) {
         if (settingBuilder_ == null) {
@@ -756,7 +779,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public Builder clearSetting() {
         if (settingBuilder_ == null) {
@@ -770,7 +793,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder getSettingBuilder() {
         
@@ -778,7 +801,7 @@ public final class CustomDungeonOuterClass {
         return getSettingFieldBuilder().getBuilder();
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder getSettingOrBuilder() {
         if (settingBuilder_ != null) {
@@ -789,7 +812,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>.CustomDungeonSetting setting = 14;</code>
+       * <code>.CustomDungeonSetting setting = 10;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting, emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder, emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSettingOrBuilder> 
@@ -818,7 +841,7 @@ public final class CustomDungeonOuterClass {
           emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> roomListBuilder_;
 
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> getRoomListList() {
         if (roomListBuilder_ == null) {
@@ -828,7 +851,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public int getRoomListCount() {
         if (roomListBuilder_ == null) {
@@ -838,7 +861,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom getRoomList(int index) {
         if (roomListBuilder_ == null) {
@@ -848,7 +871,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder setRoomList(
           int index, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom value) {
@@ -865,7 +888,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder setRoomList(
           int index, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder builderForValue) {
@@ -879,7 +902,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder addRoomList(emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom value) {
         if (roomListBuilder_ == null) {
@@ -895,7 +918,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder addRoomList(
           int index, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom value) {
@@ -912,7 +935,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder addRoomList(
           emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder builderForValue) {
@@ -926,7 +949,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder addRoomList(
           int index, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder builderForValue) {
@@ -940,7 +963,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder addAllRoomList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom> values) {
@@ -955,7 +978,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder clearRoomList() {
         if (roomListBuilder_ == null) {
@@ -968,7 +991,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public Builder removeRoomList(int index) {
         if (roomListBuilder_ == null) {
@@ -981,14 +1004,14 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder getRoomListBuilder(
           int index) {
         return getRoomListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder getRoomListOrBuilder(
           int index) {
@@ -998,7 +1021,7 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoomOrBuilder> 
            getRoomListOrBuilderList() {
@@ -1009,14 +1032,14 @@ public final class CustomDungeonOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder addRoomListBuilder() {
         return getRoomListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.getDefaultInstance());
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder addRoomListBuilder(
           int index) {
@@ -1024,7 +1047,7 @@ public final class CustomDungeonOuterClass {
             index, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.getDefaultInstance());
       }
       /**
-       * <code>repeated .CustomDungeonRoom room_list = 7;</code>
+       * <code>repeated .CustomDungeonRoom room_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder> 
            getRoomListBuilderList() {
@@ -1045,40 +1068,9 @@ public final class CustomDungeonOuterClass {
         return roomListBuilder_;
       }
 
-      private long dungeonGuid_ ;
-      /**
-       * <code>uint64 dungeon_guid = 3;</code>
-       * @return The dungeonGuid.
-       */
-      @java.lang.Override
-      public long getDungeonGuid() {
-        return dungeonGuid_;
-      }
-      /**
-       * <code>uint64 dungeon_guid = 3;</code>
-       * @param value The dungeonGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonGuid(long value) {
-        
-        dungeonGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 dungeon_guid = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonGuid() {
-        
-        dungeonGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int dungeonId_ ;
       /**
-       * <code>uint32 dungeon_id = 8;</code>
+       * <code>uint32 dungeon_id = 15;</code>
        * @return The dungeonId.
        */
       @java.lang.Override
@@ -1086,7 +1078,7 @@ public final class CustomDungeonOuterClass {
         return dungeonId_;
       }
       /**
-       * <code>uint32 dungeon_id = 8;</code>
+       * <code>uint32 dungeon_id = 15;</code>
        * @param value The dungeonId to set.
        * @return This builder for chaining.
        */
@@ -1097,7 +1089,7 @@ public final class CustomDungeonOuterClass {
         return this;
       }
       /**
-       * <code>uint32 dungeon_id = 8;</code>
+       * <code>uint32 dungeon_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearDungeonId() {
@@ -1175,10 +1167,10 @@ public final class CustomDungeonOuterClass {
     java.lang.String[] descriptorData = {
       "\n\023CustomDungeon.proto\032\032CustomDungeonSett" +
       "ing.proto\032\027CustomDungeonRoom.proto\"\210\001\n\rC" +
-      "ustomDungeon\022&\n\007setting\030\016 \001(\0132\025.CustomDu" +
-      "ngeonSetting\022%\n\troom_list\030\007 \003(\0132\022.Custom" +
-      "DungeonRoom\022\024\n\014dungeon_guid\030\003 \001(\004\022\022\n\ndun" +
-      "geon_id\030\010 \001(\rB\033\n\031emu.grasscutter.net.pro" +
+      "ustomDungeon\022\024\n\014dungeon_guid\030\001 \001(\004\022&\n\007se" +
+      "tting\030\n \001(\0132\025.CustomDungeonSetting\022%\n\tro" +
+      "om_list\030\014 \003(\0132\022.CustomDungeonRoom\022\022\n\ndun" +
+      "geon_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1192,7 +1184,7 @@ public final class CustomDungeonOuterClass {
     internal_static_CustomDungeon_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CustomDungeon_descriptor,
-        new java.lang.String[] { "Setting", "RoomList", "DungeonGuid", "DungeonId", });
+        new java.lang.String[] { "DungeonGuid", "Setting", "RoomList", "DungeonId", });
     emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.getDescriptor();
     emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonResultInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonResultInfoOuterClass.java
index 07e1e7f04..b4f5bbf56 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonResultInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonResultInfoOuterClass.java
@@ -18,6 +18,30 @@ public final class CustomDungeonResultInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:CustomDungeonResultInfo)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> 
+        getChildChallengeListList();
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index);
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    int getChildChallengeListCount();
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
+        getChildChallengeListOrBuilderList();
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
+        int index);
+
     /**
      * <code>uint32 got_coin_num = 3;</code>
      * @return The gotCoinNum.
@@ -25,75 +49,47 @@ public final class CustomDungeonResultInfoOuterClass {
     int getGotCoinNum();
 
     /**
-     * <code>.CustomDungeonFinishType finish_type = 14;</code>
+     * <code>bool FOLIKAAIKIE = 5;</code>
+     * @return The fOLIKAAIKIE.
+     */
+    boolean getFOLIKAAIKIE();
+
+    /**
+     * <code>bool GBLHFAEONKM = 6;</code>
+     * @return The gBLHFAEONKM.
+     */
+    boolean getGBLHFAEONKM();
+
+    /**
+     * <code>.CustomDungeonFinishType finish_type = 10;</code>
      * @return The enum numeric value on the wire for finishType.
      */
     int getFinishTypeValue();
     /**
-     * <code>.CustomDungeonFinishType finish_type = 14;</code>
+     * <code>.CustomDungeonFinishType finish_type = 10;</code>
      * @return The finishType.
      */
     emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType getFinishType();
 
     /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> 
-        getChildChallengeListList();
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index);
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    int getChildChallengeListCount();
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
-        getChildChallengeListOrBuilderList();
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint64 dungeon_guid = 11;</code>
-     * @return The dungeonGuid.
-     */
-    long getDungeonGuid();
-
-    /**
-     * <code>bool is_liked = 7;</code>
-     * @return The isLiked.
-     */
-    boolean getIsLiked();
-
-    /**
-     * <code>uint32 time_cost = 2;</code>
+     * <code>uint32 time_cost = 11;</code>
      * @return The timeCost.
      */
     int getTimeCost();
 
     /**
-     * <code>bool is_stored = 15;</code>
-     * @return The isStored.
-     */
-    boolean getIsStored();
-
-    /**
-     * <code>bool is_arrive_finish = 5;</code>
+     * <code>bool is_arrive_finish = 14;</code>
      * @return The isArriveFinish.
      */
     boolean getIsArriveFinish();
+
+    /**
+     * <code>uint64 dungeon_guid = 15;</code>
+     * @return The dungeonGuid.
+     */
+    long getDungeonGuid();
   }
   /**
-   * <pre>
-   * Obf: HMBINEDPAHO
-   * </pre>
-   *
    * Protobuf type {@code CustomDungeonResultInfo}
    */
   public static final class CustomDungeonResultInfo extends
@@ -106,8 +102,8 @@ public final class CustomDungeonResultInfoOuterClass {
       super(builder);
     }
     private CustomDungeonResultInfo() {
-      finishType_ = 0;
       childChallengeList_ = java.util.Collections.emptyList();
+      finishType_ = 0;
     }
 
     @java.lang.Override
@@ -141,9 +137,13 @@ public final class CustomDungeonResultInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              timeCost_ = input.readUInt32();
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                childChallengeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              childChallengeList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.parser(), extensionRegistry));
               break;
             }
             case 24: {
@@ -153,37 +153,33 @@ public final class CustomDungeonResultInfoOuterClass {
             }
             case 40: {
 
-              isArriveFinish_ = input.readBool();
+              fOLIKAAIKIE_ = input.readBool();
               break;
             }
-            case 56: {
+            case 48: {
 
-              isLiked_ = input.readBool();
+              gBLHFAEONKM_ = input.readBool();
               break;
             }
-            case 88: {
-
-              dungeonGuid_ = input.readUInt64();
-              break;
-            }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                childChallengeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              childChallengeList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.parser(), extensionRegistry));
-              break;
-            }
-            case 112: {
+            case 80: {
               int rawValue = input.readEnum();
 
               finishType_ = rawValue;
               break;
             }
+            case 88: {
+
+              timeCost_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isArriveFinish_ = input.readBool();
+              break;
+            }
             case 120: {
 
-              isStored_ = input.readBool();
+              dungeonGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -221,6 +217,46 @@ public final class CustomDungeonResultInfoOuterClass {
               emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.class, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder.class);
     }
 
+    public static final int CHILD_CHALLENGE_LIST_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> childChallengeList_;
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> getChildChallengeListList() {
+      return childChallengeList_;
+    }
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
+        getChildChallengeListOrBuilderList() {
+      return childChallengeList_;
+    }
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    @java.lang.Override
+    public int getChildChallengeListCount() {
+      return childChallengeList_.size();
+    }
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index) {
+      return childChallengeList_.get(index);
+    }
+    /**
+     * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
+        int index) {
+      return childChallengeList_.get(index);
+    }
+
     public static final int GOT_COIN_NUM_FIELD_NUMBER = 3;
     private int gotCoinNum_;
     /**
@@ -232,17 +268,39 @@ public final class CustomDungeonResultInfoOuterClass {
       return gotCoinNum_;
     }
 
-    public static final int FINISH_TYPE_FIELD_NUMBER = 14;
+    public static final int FOLIKAAIKIE_FIELD_NUMBER = 5;
+    private boolean fOLIKAAIKIE_;
+    /**
+     * <code>bool FOLIKAAIKIE = 5;</code>
+     * @return The fOLIKAAIKIE.
+     */
+    @java.lang.Override
+    public boolean getFOLIKAAIKIE() {
+      return fOLIKAAIKIE_;
+    }
+
+    public static final int GBLHFAEONKM_FIELD_NUMBER = 6;
+    private boolean gBLHFAEONKM_;
+    /**
+     * <code>bool GBLHFAEONKM = 6;</code>
+     * @return The gBLHFAEONKM.
+     */
+    @java.lang.Override
+    public boolean getGBLHFAEONKM() {
+      return gBLHFAEONKM_;
+    }
+
+    public static final int FINISH_TYPE_FIELD_NUMBER = 10;
     private int finishType_;
     /**
-     * <code>.CustomDungeonFinishType finish_type = 14;</code>
+     * <code>.CustomDungeonFinishType finish_type = 10;</code>
      * @return The enum numeric value on the wire for finishType.
      */
     @java.lang.Override public int getFinishTypeValue() {
       return finishType_;
     }
     /**
-     * <code>.CustomDungeonFinishType finish_type = 14;</code>
+     * <code>.CustomDungeonFinishType finish_type = 10;</code>
      * @return The finishType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType getFinishType() {
@@ -251,72 +309,10 @@ public final class CustomDungeonResultInfoOuterClass {
       return result == null ? emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType.UNRECOGNIZED : result;
     }
 
-    public static final int CHILD_CHALLENGE_LIST_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> childChallengeList_;
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> getChildChallengeListList() {
-      return childChallengeList_;
-    }
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
-        getChildChallengeListOrBuilderList() {
-      return childChallengeList_;
-    }
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    @java.lang.Override
-    public int getChildChallengeListCount() {
-      return childChallengeList_.size();
-    }
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index) {
-      return childChallengeList_.get(index);
-    }
-    /**
-     * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
-        int index) {
-      return childChallengeList_.get(index);
-    }
-
-    public static final int DUNGEON_GUID_FIELD_NUMBER = 11;
-    private long dungeonGuid_;
-    /**
-     * <code>uint64 dungeon_guid = 11;</code>
-     * @return The dungeonGuid.
-     */
-    @java.lang.Override
-    public long getDungeonGuid() {
-      return dungeonGuid_;
-    }
-
-    public static final int IS_LIKED_FIELD_NUMBER = 7;
-    private boolean isLiked_;
-    /**
-     * <code>bool is_liked = 7;</code>
-     * @return The isLiked.
-     */
-    @java.lang.Override
-    public boolean getIsLiked() {
-      return isLiked_;
-    }
-
-    public static final int TIME_COST_FIELD_NUMBER = 2;
+    public static final int TIME_COST_FIELD_NUMBER = 11;
     private int timeCost_;
     /**
-     * <code>uint32 time_cost = 2;</code>
+     * <code>uint32 time_cost = 11;</code>
      * @return The timeCost.
      */
     @java.lang.Override
@@ -324,21 +320,10 @@ public final class CustomDungeonResultInfoOuterClass {
       return timeCost_;
     }
 
-    public static final int IS_STORED_FIELD_NUMBER = 15;
-    private boolean isStored_;
-    /**
-     * <code>bool is_stored = 15;</code>
-     * @return The isStored.
-     */
-    @java.lang.Override
-    public boolean getIsStored() {
-      return isStored_;
-    }
-
-    public static final int IS_ARRIVE_FINISH_FIELD_NUMBER = 5;
+    public static final int IS_ARRIVE_FINISH_FIELD_NUMBER = 14;
     private boolean isArriveFinish_;
     /**
-     * <code>bool is_arrive_finish = 5;</code>
+     * <code>bool is_arrive_finish = 14;</code>
      * @return The isArriveFinish.
      */
     @java.lang.Override
@@ -346,6 +331,17 @@ public final class CustomDungeonResultInfoOuterClass {
       return isArriveFinish_;
     }
 
+    public static final int DUNGEON_GUID_FIELD_NUMBER = 15;
+    private long dungeonGuid_;
+    /**
+     * <code>uint64 dungeon_guid = 15;</code>
+     * @return The dungeonGuid.
+     */
+    @java.lang.Override
+    public long getDungeonGuid() {
+      return dungeonGuid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -360,29 +356,29 @@ public final class CustomDungeonResultInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (timeCost_ != 0) {
-        output.writeUInt32(2, timeCost_);
+      for (int i = 0; i < childChallengeList_.size(); i++) {
+        output.writeMessage(2, childChallengeList_.get(i));
       }
       if (gotCoinNum_ != 0) {
         output.writeUInt32(3, gotCoinNum_);
       }
-      if (isArriveFinish_ != false) {
-        output.writeBool(5, isArriveFinish_);
+      if (fOLIKAAIKIE_ != false) {
+        output.writeBool(5, fOLIKAAIKIE_);
       }
-      if (isLiked_ != false) {
-        output.writeBool(7, isLiked_);
-      }
-      if (dungeonGuid_ != 0L) {
-        output.writeUInt64(11, dungeonGuid_);
-      }
-      for (int i = 0; i < childChallengeList_.size(); i++) {
-        output.writeMessage(12, childChallengeList_.get(i));
+      if (gBLHFAEONKM_ != false) {
+        output.writeBool(6, gBLHFAEONKM_);
       }
       if (finishType_ != emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType.CUSTOM_DUNGEON_FINISH_PLAY_NORMAL.getNumber()) {
-        output.writeEnum(14, finishType_);
+        output.writeEnum(10, finishType_);
       }
-      if (isStored_ != false) {
-        output.writeBool(15, isStored_);
+      if (timeCost_ != 0) {
+        output.writeUInt32(11, timeCost_);
+      }
+      if (isArriveFinish_ != false) {
+        output.writeBool(14, isArriveFinish_);
+      }
+      if (dungeonGuid_ != 0L) {
+        output.writeUInt64(15, dungeonGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -393,37 +389,37 @@ public final class CustomDungeonResultInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (timeCost_ != 0) {
+      for (int i = 0; i < childChallengeList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, timeCost_);
+          .computeMessageSize(2, childChallengeList_.get(i));
       }
       if (gotCoinNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(3, gotCoinNum_);
       }
-      if (isArriveFinish_ != false) {
+      if (fOLIKAAIKIE_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isArriveFinish_);
+          .computeBoolSize(5, fOLIKAAIKIE_);
       }
-      if (isLiked_ != false) {
+      if (gBLHFAEONKM_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isLiked_);
-      }
-      if (dungeonGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, dungeonGuid_);
-      }
-      for (int i = 0; i < childChallengeList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, childChallengeList_.get(i));
+          .computeBoolSize(6, gBLHFAEONKM_);
       }
       if (finishType_ != emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType.CUSTOM_DUNGEON_FINISH_PLAY_NORMAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, finishType_);
+          .computeEnumSize(10, finishType_);
       }
-      if (isStored_ != false) {
+      if (timeCost_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isStored_);
+          .computeUInt32Size(11, timeCost_);
+      }
+      if (isArriveFinish_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isArriveFinish_);
+      }
+      if (dungeonGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(15, dungeonGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -440,21 +436,21 @@ public final class CustomDungeonResultInfoOuterClass {
       }
       emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo other = (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) obj;
 
-      if (getGotCoinNum()
-          != other.getGotCoinNum()) return false;
-      if (finishType_ != other.finishType_) return false;
       if (!getChildChallengeListList()
           .equals(other.getChildChallengeListList())) return false;
-      if (getDungeonGuid()
-          != other.getDungeonGuid()) return false;
-      if (getIsLiked()
-          != other.getIsLiked()) return false;
+      if (getGotCoinNum()
+          != other.getGotCoinNum()) return false;
+      if (getFOLIKAAIKIE()
+          != other.getFOLIKAAIKIE()) return false;
+      if (getGBLHFAEONKM()
+          != other.getGBLHFAEONKM()) return false;
+      if (finishType_ != other.finishType_) return false;
       if (getTimeCost()
           != other.getTimeCost()) return false;
-      if (getIsStored()
-          != other.getIsStored()) return false;
       if (getIsArriveFinish()
           != other.getIsArriveFinish()) return false;
+      if (getDungeonGuid()
+          != other.getDungeonGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -466,28 +462,28 @@ public final class CustomDungeonResultInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GOT_COIN_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getGotCoinNum();
-      hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + finishType_;
       if (getChildChallengeListCount() > 0) {
         hash = (37 * hash) + CHILD_CHALLENGE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getChildChallengeListList().hashCode();
       }
-      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getDungeonGuid());
-      hash = (37 * hash) + IS_LIKED_FIELD_NUMBER;
+      hash = (37 * hash) + GOT_COIN_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getGotCoinNum();
+      hash = (37 * hash) + FOLIKAAIKIE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsLiked());
+          getFOLIKAAIKIE());
+      hash = (37 * hash) + GBLHFAEONKM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getGBLHFAEONKM());
+      hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + finishType_;
       hash = (37 * hash) + TIME_COST_FIELD_NUMBER;
       hash = (53 * hash) + getTimeCost();
-      hash = (37 * hash) + IS_STORED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsStored());
       hash = (37 * hash) + IS_ARRIVE_FINISH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsArriveFinish());
+      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDungeonGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -584,10 +580,6 @@ public final class CustomDungeonResultInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HMBINEDPAHO
-     * </pre>
-     *
      * Protobuf type {@code CustomDungeonResultInfo}
      */
     public static final class Builder extends
@@ -626,26 +618,26 @@ public final class CustomDungeonResultInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gotCoinNum_ = 0;
-
-        finishType_ = 0;
-
         if (childChallengeListBuilder_ == null) {
           childChallengeList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           childChallengeListBuilder_.clear();
         }
-        dungeonGuid_ = 0L;
+        gotCoinNum_ = 0;
 
-        isLiked_ = false;
+        fOLIKAAIKIE_ = false;
+
+        gBLHFAEONKM_ = false;
+
+        finishType_ = 0;
 
         timeCost_ = 0;
 
-        isStored_ = false;
-
         isArriveFinish_ = false;
 
+        dungeonGuid_ = 0L;
+
         return this;
       }
 
@@ -673,8 +665,6 @@ public final class CustomDungeonResultInfoOuterClass {
       public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo buildPartial() {
         emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo result = new emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo(this);
         int from_bitField0_ = bitField0_;
-        result.gotCoinNum_ = gotCoinNum_;
-        result.finishType_ = finishType_;
         if (childChallengeListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             childChallengeList_ = java.util.Collections.unmodifiableList(childChallengeList_);
@@ -684,11 +674,13 @@ public final class CustomDungeonResultInfoOuterClass {
         } else {
           result.childChallengeList_ = childChallengeListBuilder_.build();
         }
-        result.dungeonGuid_ = dungeonGuid_;
-        result.isLiked_ = isLiked_;
+        result.gotCoinNum_ = gotCoinNum_;
+        result.fOLIKAAIKIE_ = fOLIKAAIKIE_;
+        result.gBLHFAEONKM_ = gBLHFAEONKM_;
+        result.finishType_ = finishType_;
         result.timeCost_ = timeCost_;
-        result.isStored_ = isStored_;
         result.isArriveFinish_ = isArriveFinish_;
+        result.dungeonGuid_ = dungeonGuid_;
         onBuilt();
         return result;
       }
@@ -737,12 +729,6 @@ public final class CustomDungeonResultInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo other) {
         if (other == emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance()) return this;
-        if (other.getGotCoinNum() != 0) {
-          setGotCoinNum(other.getGotCoinNum());
-        }
-        if (other.finishType_ != 0) {
-          setFinishTypeValue(other.getFinishTypeValue());
-        }
         if (childChallengeListBuilder_ == null) {
           if (!other.childChallengeList_.isEmpty()) {
             if (childChallengeList_.isEmpty()) {
@@ -769,21 +755,27 @@ public final class CustomDungeonResultInfoOuterClass {
             }
           }
         }
-        if (other.getDungeonGuid() != 0L) {
-          setDungeonGuid(other.getDungeonGuid());
+        if (other.getGotCoinNum() != 0) {
+          setGotCoinNum(other.getGotCoinNum());
         }
-        if (other.getIsLiked() != false) {
-          setIsLiked(other.getIsLiked());
+        if (other.getFOLIKAAIKIE() != false) {
+          setFOLIKAAIKIE(other.getFOLIKAAIKIE());
+        }
+        if (other.getGBLHFAEONKM() != false) {
+          setGBLHFAEONKM(other.getGBLHFAEONKM());
+        }
+        if (other.finishType_ != 0) {
+          setFinishTypeValue(other.getFinishTypeValue());
         }
         if (other.getTimeCost() != 0) {
           setTimeCost(other.getTimeCost());
         }
-        if (other.getIsStored() != false) {
-          setIsStored(other.getIsStored());
-        }
         if (other.getIsArriveFinish() != false) {
           setIsArriveFinish(other.getIsArriveFinish());
         }
+        if (other.getDungeonGuid() != 0L) {
+          setDungeonGuid(other.getDungeonGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -814,6 +806,246 @@ public final class CustomDungeonResultInfoOuterClass {
       }
       private int bitField0_;
 
+      private java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> childChallengeList_ =
+        java.util.Collections.emptyList();
+      private void ensureChildChallengeListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          childChallengeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief>(childChallengeList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> childChallengeListBuilder_;
+
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> getChildChallengeListList() {
+        if (childChallengeListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(childChallengeList_);
+        } else {
+          return childChallengeListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public int getChildChallengeListCount() {
+        if (childChallengeListBuilder_ == null) {
+          return childChallengeList_.size();
+        } else {
+          return childChallengeListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index) {
+        if (childChallengeListBuilder_ == null) {
+          return childChallengeList_.get(index);
+        } else {
+          return childChallengeListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder setChildChallengeList(
+          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
+        if (childChallengeListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.set(index, value);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder setChildChallengeList(
+          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
+        if (childChallengeListBuilder_ == null) {
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          childChallengeListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder addChildChallengeList(emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
+        if (childChallengeListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.add(value);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder addChildChallengeList(
+          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
+        if (childChallengeListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.add(index, value);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder addChildChallengeList(
+          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
+        if (childChallengeListBuilder_ == null) {
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          childChallengeListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder addChildChallengeList(
+          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
+        if (childChallengeListBuilder_ == null) {
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          childChallengeListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder addAllChildChallengeList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> values) {
+        if (childChallengeListBuilder_ == null) {
+          ensureChildChallengeListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, childChallengeList_);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder clearChildChallengeList() {
+        if (childChallengeListBuilder_ == null) {
+          childChallengeList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public Builder removeChildChallengeList(int index) {
+        if (childChallengeListBuilder_ == null) {
+          ensureChildChallengeListIsMutable();
+          childChallengeList_.remove(index);
+          onChanged();
+        } else {
+          childChallengeListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder getChildChallengeListBuilder(
+          int index) {
+        return getChildChallengeListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
+          int index) {
+        if (childChallengeListBuilder_ == null) {
+          return childChallengeList_.get(index);  } else {
+          return childChallengeListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
+           getChildChallengeListOrBuilderList() {
+        if (childChallengeListBuilder_ != null) {
+          return childChallengeListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(childChallengeList_);
+        }
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder addChildChallengeListBuilder() {
+        return getChildChallengeListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder addChildChallengeListBuilder(
+          int index) {
+        return getChildChallengeListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ChallengeBrief child_challenge_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder> 
+           getChildChallengeListBuilderList() {
+        return getChildChallengeListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
+          getChildChallengeListFieldBuilder() {
+        if (childChallengeListBuilder_ == null) {
+          childChallengeListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder>(
+                  childChallengeList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          childChallengeList_ = null;
+        }
+        return childChallengeListBuilder_;
+      }
+
       private int gotCoinNum_ ;
       /**
        * <code>uint32 got_coin_num = 3;</code>
@@ -845,16 +1077,78 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
 
+      private boolean fOLIKAAIKIE_ ;
+      /**
+       * <code>bool FOLIKAAIKIE = 5;</code>
+       * @return The fOLIKAAIKIE.
+       */
+      @java.lang.Override
+      public boolean getFOLIKAAIKIE() {
+        return fOLIKAAIKIE_;
+      }
+      /**
+       * <code>bool FOLIKAAIKIE = 5;</code>
+       * @param value The fOLIKAAIKIE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFOLIKAAIKIE(boolean value) {
+        
+        fOLIKAAIKIE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool FOLIKAAIKIE = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFOLIKAAIKIE() {
+        
+        fOLIKAAIKIE_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean gBLHFAEONKM_ ;
+      /**
+       * <code>bool GBLHFAEONKM = 6;</code>
+       * @return The gBLHFAEONKM.
+       */
+      @java.lang.Override
+      public boolean getGBLHFAEONKM() {
+        return gBLHFAEONKM_;
+      }
+      /**
+       * <code>bool GBLHFAEONKM = 6;</code>
+       * @param value The gBLHFAEONKM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGBLHFAEONKM(boolean value) {
+        
+        gBLHFAEONKM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool GBLHFAEONKM = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGBLHFAEONKM() {
+        
+        gBLHFAEONKM_ = false;
+        onChanged();
+        return this;
+      }
+
       private int finishType_ = 0;
       /**
-       * <code>.CustomDungeonFinishType finish_type = 14;</code>
+       * <code>.CustomDungeonFinishType finish_type = 10;</code>
        * @return The enum numeric value on the wire for finishType.
        */
       @java.lang.Override public int getFinishTypeValue() {
         return finishType_;
       }
       /**
-       * <code>.CustomDungeonFinishType finish_type = 14;</code>
+       * <code>.CustomDungeonFinishType finish_type = 10;</code>
        * @param value The enum numeric value on the wire for finishType to set.
        * @return This builder for chaining.
        */
@@ -865,7 +1159,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonFinishType finish_type = 14;</code>
+       * <code>.CustomDungeonFinishType finish_type = 10;</code>
        * @return The finishType.
        */
       @java.lang.Override
@@ -875,7 +1169,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return result == null ? emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.CustomDungeonFinishType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.CustomDungeonFinishType finish_type = 14;</code>
+       * <code>.CustomDungeonFinishType finish_type = 10;</code>
        * @param value The finishType to set.
        * @return This builder for chaining.
        */
@@ -889,7 +1183,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonFinishType finish_type = 14;</code>
+       * <code>.CustomDungeonFinishType finish_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishType() {
@@ -899,311 +1193,9 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> childChallengeList_ =
-        java.util.Collections.emptyList();
-      private void ensureChildChallengeListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          childChallengeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief>(childChallengeList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> childChallengeListBuilder_;
-
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> getChildChallengeListList() {
-        if (childChallengeListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(childChallengeList_);
-        } else {
-          return childChallengeListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public int getChildChallengeListCount() {
-        if (childChallengeListBuilder_ == null) {
-          return childChallengeList_.size();
-        } else {
-          return childChallengeListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief getChildChallengeList(int index) {
-        if (childChallengeListBuilder_ == null) {
-          return childChallengeList_.get(index);
-        } else {
-          return childChallengeListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder setChildChallengeList(
-          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
-        if (childChallengeListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.set(index, value);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder setChildChallengeList(
-          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
-        if (childChallengeListBuilder_ == null) {
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          childChallengeListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder addChildChallengeList(emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
-        if (childChallengeListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.add(value);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder addChildChallengeList(
-          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief value) {
-        if (childChallengeListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.add(index, value);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder addChildChallengeList(
-          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
-        if (childChallengeListBuilder_ == null) {
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          childChallengeListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder addChildChallengeList(
-          int index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder builderForValue) {
-        if (childChallengeListBuilder_ == null) {
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          childChallengeListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder addAllChildChallengeList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief> values) {
-        if (childChallengeListBuilder_ == null) {
-          ensureChildChallengeListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, childChallengeList_);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder clearChildChallengeList() {
-        if (childChallengeListBuilder_ == null) {
-          childChallengeList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public Builder removeChildChallengeList(int index) {
-        if (childChallengeListBuilder_ == null) {
-          ensureChildChallengeListIsMutable();
-          childChallengeList_.remove(index);
-          onChanged();
-        } else {
-          childChallengeListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder getChildChallengeListBuilder(
-          int index) {
-        return getChildChallengeListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder getChildChallengeListOrBuilder(
-          int index) {
-        if (childChallengeListBuilder_ == null) {
-          return childChallengeList_.get(index);  } else {
-          return childChallengeListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
-           getChildChallengeListOrBuilderList() {
-        if (childChallengeListBuilder_ != null) {
-          return childChallengeListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(childChallengeList_);
-        }
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder addChildChallengeListBuilder() {
-        return getChildChallengeListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder addChildChallengeListBuilder(
-          int index) {
-        return getChildChallengeListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ChallengeBrief child_challenge_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder> 
-           getChildChallengeListBuilderList() {
-        return getChildChallengeListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder> 
-          getChildChallengeListFieldBuilder() {
-        if (childChallengeListBuilder_ == null) {
-          childChallengeListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBrief.Builder, emu.grasscutter.net.proto.ChallengeBriefOuterClass.ChallengeBriefOrBuilder>(
-                  childChallengeList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          childChallengeList_ = null;
-        }
-        return childChallengeListBuilder_;
-      }
-
-      private long dungeonGuid_ ;
-      /**
-       * <code>uint64 dungeon_guid = 11;</code>
-       * @return The dungeonGuid.
-       */
-      @java.lang.Override
-      public long getDungeonGuid() {
-        return dungeonGuid_;
-      }
-      /**
-       * <code>uint64 dungeon_guid = 11;</code>
-       * @param value The dungeonGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonGuid(long value) {
-        
-        dungeonGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 dungeon_guid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonGuid() {
-        
-        dungeonGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private boolean isLiked_ ;
-      /**
-       * <code>bool is_liked = 7;</code>
-       * @return The isLiked.
-       */
-      @java.lang.Override
-      public boolean getIsLiked() {
-        return isLiked_;
-      }
-      /**
-       * <code>bool is_liked = 7;</code>
-       * @param value The isLiked to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsLiked(boolean value) {
-        
-        isLiked_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_liked = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsLiked() {
-        
-        isLiked_ = false;
-        onChanged();
-        return this;
-      }
-
       private int timeCost_ ;
       /**
-       * <code>uint32 time_cost = 2;</code>
+       * <code>uint32 time_cost = 11;</code>
        * @return The timeCost.
        */
       @java.lang.Override
@@ -1211,7 +1203,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return timeCost_;
       }
       /**
-       * <code>uint32 time_cost = 2;</code>
+       * <code>uint32 time_cost = 11;</code>
        * @param value The timeCost to set.
        * @return This builder for chaining.
        */
@@ -1222,7 +1214,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 time_cost = 2;</code>
+       * <code>uint32 time_cost = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTimeCost() {
@@ -1232,40 +1224,9 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
 
-      private boolean isStored_ ;
-      /**
-       * <code>bool is_stored = 15;</code>
-       * @return The isStored.
-       */
-      @java.lang.Override
-      public boolean getIsStored() {
-        return isStored_;
-      }
-      /**
-       * <code>bool is_stored = 15;</code>
-       * @param value The isStored to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsStored(boolean value) {
-        
-        isStored_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_stored = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsStored() {
-        
-        isStored_ = false;
-        onChanged();
-        return this;
-      }
-
       private boolean isArriveFinish_ ;
       /**
-       * <code>bool is_arrive_finish = 5;</code>
+       * <code>bool is_arrive_finish = 14;</code>
        * @return The isArriveFinish.
        */
       @java.lang.Override
@@ -1273,7 +1234,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return isArriveFinish_;
       }
       /**
-       * <code>bool is_arrive_finish = 5;</code>
+       * <code>bool is_arrive_finish = 14;</code>
        * @param value The isArriveFinish to set.
        * @return This builder for chaining.
        */
@@ -1284,7 +1245,7 @@ public final class CustomDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_arrive_finish = 5;</code>
+       * <code>bool is_arrive_finish = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsArriveFinish() {
@@ -1293,6 +1254,37 @@ public final class CustomDungeonResultInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private long dungeonGuid_ ;
+      /**
+       * <code>uint64 dungeon_guid = 15;</code>
+       * @return The dungeonGuid.
+       */
+      @java.lang.Override
+      public long getDungeonGuid() {
+        return dungeonGuid_;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 15;</code>
+       * @param value The dungeonGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonGuid(long value) {
+        
+        dungeonGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonGuid() {
+        
+        dungeonGuid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1360,31 +1352,31 @@ public final class CustomDungeonResultInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\035CustomDungeonResultInfo.proto\032\035CustomD" +
-      "ungeonFinishType.proto\032\024ChallengeBrief.p" +
-      "roto\"\365\001\n\027CustomDungeonResultInfo\022\024\n\014got_" +
-      "coin_num\030\003 \001(\r\022-\n\013finish_type\030\016 \001(\0162\030.Cu" +
-      "stomDungeonFinishType\022-\n\024child_challenge" +
-      "_list\030\014 \003(\0132\017.ChallengeBrief\022\024\n\014dungeon_" +
-      "guid\030\013 \001(\004\022\020\n\010is_liked\030\007 \001(\010\022\021\n\ttime_cos" +
-      "t\030\002 \001(\r\022\021\n\tis_stored\030\017 \001(\010\022\030\n\020is_arrive_" +
-      "finish\030\005 \001(\010B\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\n\035CustomDungeonResultInfo.proto\032\024Challen" +
+      "geBrief.proto\032\035CustomDungeonFinishType.p" +
+      "roto\"\372\001\n\027CustomDungeonResultInfo\022-\n\024chil" +
+      "d_challenge_list\030\002 \003(\0132\017.ChallengeBrief\022" +
+      "\024\n\014got_coin_num\030\003 \001(\r\022\023\n\013FOLIKAAIKIE\030\005 \001" +
+      "(\010\022\023\n\013GBLHFAEONKM\030\006 \001(\010\022-\n\013finish_type\030\n" +
+      " \001(\0162\030.CustomDungeonFinishType\022\021\n\ttime_c" +
+      "ost\030\013 \001(\r\022\030\n\020is_arrive_finish\030\016 \001(\010\022\024\n\014d" +
+      "ungeon_guid\030\017 \001(\004B\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ChallengeBriefOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.getDescriptor(),
         });
     internal_static_CustomDungeonResultInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_CustomDungeonResultInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CustomDungeonResultInfo_descriptor,
-        new java.lang.String[] { "GotCoinNum", "FinishType", "ChildChallengeList", "DungeonGuid", "IsLiked", "TimeCost", "IsStored", "IsArriveFinish", });
-    emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "ChildChallengeList", "GotCoinNum", "FOLIKAAIKIE", "GBLHFAEONKM", "FinishType", "TimeCost", "IsArriveFinish", "DungeonGuid", });
     emu.grasscutter.net.proto.ChallengeBriefOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.CustomDungeonFinishTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonRoomOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonRoomOuterClass.java
index dd0a93002..d57b6646c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonRoomOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonRoomOuterClass.java
@@ -19,40 +19,36 @@ public final class CustomDungeonRoomOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock> 
         getBlockListList();
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock getBlockList(int index);
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     int getBlockListCount();
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder> 
         getBlockListOrBuilderList();
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder getBlockListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 room_id = 12;</code>
+     * <code>uint32 room_id = 10;</code>
      * @return The roomId.
      */
     int getRoomId();
   }
   /**
-   * <pre>
-   * Obf: MMBJOBCADNI
-   * </pre>
-   *
    * Protobuf type {@code CustomDungeonRoom}
    */
   public static final class CustomDungeonRoom extends
@@ -99,12 +95,7 @@ public final class CustomDungeonRoomOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
-
-              roomId_ = input.readUInt32();
-              break;
-            }
-            case 106: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 blockList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock>();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,6 +104,11 @@ public final class CustomDungeonRoomOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.parser(), extensionRegistry));
               break;
             }
+            case 80: {
+
+              roomId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -148,17 +144,17 @@ public final class CustomDungeonRoomOuterClass {
               emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.class, emu.grasscutter.net.proto.CustomDungeonRoomOuterClass.CustomDungeonRoom.Builder.class);
     }
 
-    public static final int BLOCK_LIST_FIELD_NUMBER = 13;
+    public static final int BLOCK_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock> blockList_;
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock> getBlockListList() {
       return blockList_;
     }
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder> 
@@ -166,21 +162,21 @@ public final class CustomDungeonRoomOuterClass {
       return blockList_;
     }
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     @java.lang.Override
     public int getBlockListCount() {
       return blockList_.size();
     }
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock getBlockList(int index) {
       return blockList_.get(index);
     }
     /**
-     * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+     * <code>repeated .CustomDungeonBlock block_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder getBlockListOrBuilder(
@@ -188,10 +184,10 @@ public final class CustomDungeonRoomOuterClass {
       return blockList_.get(index);
     }
 
-    public static final int ROOM_ID_FIELD_NUMBER = 12;
+    public static final int ROOM_ID_FIELD_NUMBER = 10;
     private int roomId_;
     /**
-     * <code>uint32 room_id = 12;</code>
+     * <code>uint32 room_id = 10;</code>
      * @return The roomId.
      */
     @java.lang.Override
@@ -213,11 +209,11 @@ public final class CustomDungeonRoomOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (roomId_ != 0) {
-        output.writeUInt32(12, roomId_);
-      }
       for (int i = 0; i < blockList_.size(); i++) {
-        output.writeMessage(13, blockList_.get(i));
+        output.writeMessage(8, blockList_.get(i));
+      }
+      if (roomId_ != 0) {
+        output.writeUInt32(10, roomId_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,13 +224,13 @@ public final class CustomDungeonRoomOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (roomId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, roomId_);
-      }
       for (int i = 0; i < blockList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, blockList_.get(i));
+          .computeMessageSize(8, blockList_.get(i));
+      }
+      if (roomId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, roomId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -368,10 +364,6 @@ public final class CustomDungeonRoomOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MMBJOBCADNI
-     * </pre>
-     *
      * Protobuf type {@code CustomDungeonRoom}
      */
     public static final class Builder extends
@@ -575,7 +567,7 @@ public final class CustomDungeonRoomOuterClass {
           emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder> blockListBuilder_;
 
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock> getBlockListList() {
         if (blockListBuilder_ == null) {
@@ -585,7 +577,7 @@ public final class CustomDungeonRoomOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public int getBlockListCount() {
         if (blockListBuilder_ == null) {
@@ -595,7 +587,7 @@ public final class CustomDungeonRoomOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock getBlockList(int index) {
         if (blockListBuilder_ == null) {
@@ -605,7 +597,7 @@ public final class CustomDungeonRoomOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder setBlockList(
           int index, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock value) {
@@ -622,7 +614,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder setBlockList(
           int index, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder builderForValue) {
@@ -636,7 +628,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder addBlockList(emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock value) {
         if (blockListBuilder_ == null) {
@@ -652,7 +644,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder addBlockList(
           int index, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock value) {
@@ -669,7 +661,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder addBlockList(
           emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder builderForValue) {
@@ -683,7 +675,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder addBlockList(
           int index, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder builderForValue) {
@@ -697,7 +689,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder addAllBlockList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock> values) {
@@ -712,7 +704,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder clearBlockList() {
         if (blockListBuilder_ == null) {
@@ -725,7 +717,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public Builder removeBlockList(int index) {
         if (blockListBuilder_ == null) {
@@ -738,14 +730,14 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder getBlockListBuilder(
           int index) {
         return getBlockListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder getBlockListOrBuilder(
           int index) {
@@ -755,7 +747,7 @@ public final class CustomDungeonRoomOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlockOrBuilder> 
            getBlockListOrBuilderList() {
@@ -766,14 +758,14 @@ public final class CustomDungeonRoomOuterClass {
         }
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder addBlockListBuilder() {
         return getBlockListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.getDefaultInstance());
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder addBlockListBuilder(
           int index) {
@@ -781,7 +773,7 @@ public final class CustomDungeonRoomOuterClass {
             index, emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.getDefaultInstance());
       }
       /**
-       * <code>repeated .CustomDungeonBlock block_list = 13;</code>
+       * <code>repeated .CustomDungeonBlock block_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CustomDungeonBlockOuterClass.CustomDungeonBlock.Builder> 
            getBlockListBuilderList() {
@@ -804,7 +796,7 @@ public final class CustomDungeonRoomOuterClass {
 
       private int roomId_ ;
       /**
-       * <code>uint32 room_id = 12;</code>
+       * <code>uint32 room_id = 10;</code>
        * @return The roomId.
        */
       @java.lang.Override
@@ -812,7 +804,7 @@ public final class CustomDungeonRoomOuterClass {
         return roomId_;
       }
       /**
-       * <code>uint32 room_id = 12;</code>
+       * <code>uint32 room_id = 10;</code>
        * @param value The roomId to set.
        * @return This builder for chaining.
        */
@@ -823,7 +815,7 @@ public final class CustomDungeonRoomOuterClass {
         return this;
       }
       /**
-       * <code>uint32 room_id = 12;</code>
+       * <code>uint32 room_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRoomId() {
@@ -901,8 +893,8 @@ public final class CustomDungeonRoomOuterClass {
     java.lang.String[] descriptorData = {
       "\n\027CustomDungeonRoom.proto\032\030CustomDungeon" +
       "Block.proto\"M\n\021CustomDungeonRoom\022\'\n\nbloc" +
-      "k_list\030\r \003(\0132\023.CustomDungeonBlock\022\017\n\007roo" +
-      "m_id\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "k_list\030\010 \003(\0132\023.CustomDungeonBlock\022\017\n\007roo" +
+      "m_id\030\n \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/CustomDungeonSettingOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonSettingOuterClass.java
index 279644773..c3c2aa941 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonSettingOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomDungeonSettingOuterClass.java
@@ -19,63 +19,59 @@ public final class CustomDungeonSettingOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_forbid_skill = 8;</code>
+     * <code>bool is_arrive_finish = 1;</code>
+     * @return The isArriveFinish.
+     */
+    boolean getIsArriveFinish();
+
+    /**
+     * <code>uint32 PPBAAMIOPGF = 2;</code>
+     * @return The pPBAAMIOPGF.
+     */
+    int getPPBAAMIOPGF();
+
+    /**
+     * <code>bool is_forbid_skill = 9;</code>
      * @return The isForbidSkill.
      */
     boolean getIsForbidSkill();
 
     /**
-     * <code>uint32 KADOPMBDBPG = 5;</code>
-     * @return The kADOPMBDBPG.
+     * <code>uint32 FCEACKKGHCL = 11;</code>
+     * @return The fCEACKKGHCL.
      */
-    int getKADOPMBDBPG();
+    int getFCEACKKGHCL();
 
     /**
-     * <code>uint32 KHCGPFHNHMP = 4;</code>
-     * @return The kHCGPFHNHMP.
+     * <code>uint32 HMFACEEJJDM = 12;</code>
+     * @return The hMFACEEJJDM.
      */
-    int getKHCGPFHNHMP();
+    int getHMFACEEJJDM();
 
     /**
-     * <code>uint32 ACMIGHKKLKJ = 1;</code>
-     * @return The aCMIGHKKLKJ.
-     */
-    int getACMIGHKKLKJ();
-
-    /**
-     * <code>uint32 HPFNIKCNFEE = 7;</code>
-     * @return The hPFNIKCNFEE.
-     */
-    int getHPFNIKCNFEE();
-
-    /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @return A list containing the openRoomList.
      */
     java.util.List<java.lang.Integer> getOpenRoomListList();
     /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @return The count of openRoomList.
      */
     int getOpenRoomListCount();
     /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @param index The index of the element to return.
      * @return The openRoomList at the given index.
      */
     int getOpenRoomList(int index);
 
     /**
-     * <code>bool is_arrive_finish = 10;</code>
-     * @return The isArriveFinish.
+     * <code>uint32 PMAEONPOMJE = 14;</code>
+     * @return The pMAEONPOMJE.
      */
-    boolean getIsArriveFinish();
+    int getPMAEONPOMJE();
   }
   /**
-   * <pre>
-   * Obf: KDLMJBEFIOD
-   * </pre>
-   *
    * Protobuf type {@code CustomDungeonSetting}
    */
   public static final class CustomDungeonSetting extends
@@ -124,20 +120,30 @@ public final class CustomDungeonSettingOuterClass {
               break;
             case 8: {
 
-              aCMIGHKKLKJ_ = input.readUInt32();
+              isArriveFinish_ = input.readBool();
               break;
             }
-            case 32: {
+            case 16: {
 
-              kHCGPFHNHMP_ = input.readUInt32();
+              pPBAAMIOPGF_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 72: {
 
-              kADOPMBDBPG_ = input.readUInt32();
+              isForbidSkill_ = input.readBool();
               break;
             }
-            case 48: {
+            case 88: {
+
+              fCEACKKGHCL_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              hMFACEEJJDM_ = input.readUInt32();
+              break;
+            }
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 openRoomList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -145,7 +151,7 @@ public final class CustomDungeonSettingOuterClass {
               openRoomList_.addInt(input.readUInt32());
               break;
             }
-            case 50: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -158,19 +164,9 @@ public final class CustomDungeonSettingOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 56: {
+            case 112: {
 
-              hPFNIKCNFEE_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              isForbidSkill_ = input.readBool();
-              break;
-            }
-            case 80: {
-
-              isArriveFinish_ = input.readBool();
+              pMAEONPOMJE_ = input.readUInt32();
               break;
             }
             default: {
@@ -208,10 +204,32 @@ public final class CustomDungeonSettingOuterClass {
               emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.class, emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.Builder.class);
     }
 
-    public static final int IS_FORBID_SKILL_FIELD_NUMBER = 8;
+    public static final int IS_ARRIVE_FINISH_FIELD_NUMBER = 1;
+    private boolean isArriveFinish_;
+    /**
+     * <code>bool is_arrive_finish = 1;</code>
+     * @return The isArriveFinish.
+     */
+    @java.lang.Override
+    public boolean getIsArriveFinish() {
+      return isArriveFinish_;
+    }
+
+    public static final int PPBAAMIOPGF_FIELD_NUMBER = 2;
+    private int pPBAAMIOPGF_;
+    /**
+     * <code>uint32 PPBAAMIOPGF = 2;</code>
+     * @return The pPBAAMIOPGF.
+     */
+    @java.lang.Override
+    public int getPPBAAMIOPGF() {
+      return pPBAAMIOPGF_;
+    }
+
+    public static final int IS_FORBID_SKILL_FIELD_NUMBER = 9;
     private boolean isForbidSkill_;
     /**
-     * <code>bool is_forbid_skill = 8;</code>
+     * <code>bool is_forbid_skill = 9;</code>
      * @return The isForbidSkill.
      */
     @java.lang.Override
@@ -219,54 +237,32 @@ public final class CustomDungeonSettingOuterClass {
       return isForbidSkill_;
     }
 
-    public static final int KADOPMBDBPG_FIELD_NUMBER = 5;
-    private int kADOPMBDBPG_;
+    public static final int FCEACKKGHCL_FIELD_NUMBER = 11;
+    private int fCEACKKGHCL_;
     /**
-     * <code>uint32 KADOPMBDBPG = 5;</code>
-     * @return The kADOPMBDBPG.
+     * <code>uint32 FCEACKKGHCL = 11;</code>
+     * @return The fCEACKKGHCL.
      */
     @java.lang.Override
-    public int getKADOPMBDBPG() {
-      return kADOPMBDBPG_;
+    public int getFCEACKKGHCL() {
+      return fCEACKKGHCL_;
     }
 
-    public static final int KHCGPFHNHMP_FIELD_NUMBER = 4;
-    private int kHCGPFHNHMP_;
+    public static final int HMFACEEJJDM_FIELD_NUMBER = 12;
+    private int hMFACEEJJDM_;
     /**
-     * <code>uint32 KHCGPFHNHMP = 4;</code>
-     * @return The kHCGPFHNHMP.
+     * <code>uint32 HMFACEEJJDM = 12;</code>
+     * @return The hMFACEEJJDM.
      */
     @java.lang.Override
-    public int getKHCGPFHNHMP() {
-      return kHCGPFHNHMP_;
+    public int getHMFACEEJJDM() {
+      return hMFACEEJJDM_;
     }
 
-    public static final int ACMIGHKKLKJ_FIELD_NUMBER = 1;
-    private int aCMIGHKKLKJ_;
-    /**
-     * <code>uint32 ACMIGHKKLKJ = 1;</code>
-     * @return The aCMIGHKKLKJ.
-     */
-    @java.lang.Override
-    public int getACMIGHKKLKJ() {
-      return aCMIGHKKLKJ_;
-    }
-
-    public static final int HPFNIKCNFEE_FIELD_NUMBER = 7;
-    private int hPFNIKCNFEE_;
-    /**
-     * <code>uint32 HPFNIKCNFEE = 7;</code>
-     * @return The hPFNIKCNFEE.
-     */
-    @java.lang.Override
-    public int getHPFNIKCNFEE() {
-      return hPFNIKCNFEE_;
-    }
-
-    public static final int OPEN_ROOM_LIST_FIELD_NUMBER = 6;
+    public static final int OPEN_ROOM_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList openRoomList_;
     /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @return A list containing the openRoomList.
      */
     @java.lang.Override
@@ -275,14 +271,14 @@ public final class CustomDungeonSettingOuterClass {
       return openRoomList_;
     }
     /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @return The count of openRoomList.
      */
     public int getOpenRoomListCount() {
       return openRoomList_.size();
     }
     /**
-     * <code>repeated uint32 open_room_list = 6;</code>
+     * <code>repeated uint32 open_room_list = 13;</code>
      * @param index The index of the element to return.
      * @return The openRoomList at the given index.
      */
@@ -291,15 +287,15 @@ public final class CustomDungeonSettingOuterClass {
     }
     private int openRoomListMemoizedSerializedSize = -1;
 
-    public static final int IS_ARRIVE_FINISH_FIELD_NUMBER = 10;
-    private boolean isArriveFinish_;
+    public static final int PMAEONPOMJE_FIELD_NUMBER = 14;
+    private int pMAEONPOMJE_;
     /**
-     * <code>bool is_arrive_finish = 10;</code>
-     * @return The isArriveFinish.
+     * <code>uint32 PMAEONPOMJE = 14;</code>
+     * @return The pMAEONPOMJE.
      */
     @java.lang.Override
-    public boolean getIsArriveFinish() {
-      return isArriveFinish_;
+    public int getPMAEONPOMJE() {
+      return pMAEONPOMJE_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -317,30 +313,30 @@ public final class CustomDungeonSettingOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (aCMIGHKKLKJ_ != 0) {
-        output.writeUInt32(1, aCMIGHKKLKJ_);
+      if (isArriveFinish_ != false) {
+        output.writeBool(1, isArriveFinish_);
       }
-      if (kHCGPFHNHMP_ != 0) {
-        output.writeUInt32(4, kHCGPFHNHMP_);
+      if (pPBAAMIOPGF_ != 0) {
+        output.writeUInt32(2, pPBAAMIOPGF_);
       }
-      if (kADOPMBDBPG_ != 0) {
-        output.writeUInt32(5, kADOPMBDBPG_);
+      if (isForbidSkill_ != false) {
+        output.writeBool(9, isForbidSkill_);
+      }
+      if (fCEACKKGHCL_ != 0) {
+        output.writeUInt32(11, fCEACKKGHCL_);
+      }
+      if (hMFACEEJJDM_ != 0) {
+        output.writeUInt32(12, hMFACEEJJDM_);
       }
       if (getOpenRoomListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(openRoomListMemoizedSerializedSize);
       }
       for (int i = 0; i < openRoomList_.size(); i++) {
         output.writeUInt32NoTag(openRoomList_.getInt(i));
       }
-      if (hPFNIKCNFEE_ != 0) {
-        output.writeUInt32(7, hPFNIKCNFEE_);
-      }
-      if (isForbidSkill_ != false) {
-        output.writeBool(8, isForbidSkill_);
-      }
-      if (isArriveFinish_ != false) {
-        output.writeBool(10, isArriveFinish_);
+      if (pMAEONPOMJE_ != 0) {
+        output.writeUInt32(14, pMAEONPOMJE_);
       }
       unknownFields.writeTo(output);
     }
@@ -351,17 +347,25 @@ public final class CustomDungeonSettingOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (aCMIGHKKLKJ_ != 0) {
+      if (isArriveFinish_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, aCMIGHKKLKJ_);
+          .computeBoolSize(1, isArriveFinish_);
       }
-      if (kHCGPFHNHMP_ != 0) {
+      if (pPBAAMIOPGF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, kHCGPFHNHMP_);
+          .computeUInt32Size(2, pPBAAMIOPGF_);
       }
-      if (kADOPMBDBPG_ != 0) {
+      if (isForbidSkill_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, kADOPMBDBPG_);
+          .computeBoolSize(9, isForbidSkill_);
+      }
+      if (fCEACKKGHCL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, fCEACKKGHCL_);
+      }
+      if (hMFACEEJJDM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, hMFACEEJJDM_);
       }
       {
         int dataSize = 0;
@@ -377,17 +381,9 @@ public final class CustomDungeonSettingOuterClass {
         }
         openRoomListMemoizedSerializedSize = dataSize;
       }
-      if (hPFNIKCNFEE_ != 0) {
+      if (pMAEONPOMJE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, hPFNIKCNFEE_);
-      }
-      if (isForbidSkill_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isForbidSkill_);
-      }
-      if (isArriveFinish_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(10, isArriveFinish_);
+          .computeUInt32Size(14, pMAEONPOMJE_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -404,20 +400,20 @@ public final class CustomDungeonSettingOuterClass {
       }
       emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting other = (emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting) obj;
 
-      if (getIsForbidSkill()
-          != other.getIsForbidSkill()) return false;
-      if (getKADOPMBDBPG()
-          != other.getKADOPMBDBPG()) return false;
-      if (getKHCGPFHNHMP()
-          != other.getKHCGPFHNHMP()) return false;
-      if (getACMIGHKKLKJ()
-          != other.getACMIGHKKLKJ()) return false;
-      if (getHPFNIKCNFEE()
-          != other.getHPFNIKCNFEE()) return false;
-      if (!getOpenRoomListList()
-          .equals(other.getOpenRoomListList())) return false;
       if (getIsArriveFinish()
           != other.getIsArriveFinish()) return false;
+      if (getPPBAAMIOPGF()
+          != other.getPPBAAMIOPGF()) return false;
+      if (getIsForbidSkill()
+          != other.getIsForbidSkill()) return false;
+      if (getFCEACKKGHCL()
+          != other.getFCEACKKGHCL()) return false;
+      if (getHMFACEEJJDM()
+          != other.getHMFACEEJJDM()) return false;
+      if (!getOpenRoomListList()
+          .equals(other.getOpenRoomListList())) return false;
+      if (getPMAEONPOMJE()
+          != other.getPMAEONPOMJE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -429,24 +425,24 @@ public final class CustomDungeonSettingOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_ARRIVE_FINISH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsArriveFinish());
+      hash = (37 * hash) + PPBAAMIOPGF_FIELD_NUMBER;
+      hash = (53 * hash) + getPPBAAMIOPGF();
       hash = (37 * hash) + IS_FORBID_SKILL_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsForbidSkill());
-      hash = (37 * hash) + KADOPMBDBPG_FIELD_NUMBER;
-      hash = (53 * hash) + getKADOPMBDBPG();
-      hash = (37 * hash) + KHCGPFHNHMP_FIELD_NUMBER;
-      hash = (53 * hash) + getKHCGPFHNHMP();
-      hash = (37 * hash) + ACMIGHKKLKJ_FIELD_NUMBER;
-      hash = (53 * hash) + getACMIGHKKLKJ();
-      hash = (37 * hash) + HPFNIKCNFEE_FIELD_NUMBER;
-      hash = (53 * hash) + getHPFNIKCNFEE();
+      hash = (37 * hash) + FCEACKKGHCL_FIELD_NUMBER;
+      hash = (53 * hash) + getFCEACKKGHCL();
+      hash = (37 * hash) + HMFACEEJJDM_FIELD_NUMBER;
+      hash = (53 * hash) + getHMFACEEJJDM();
       if (getOpenRoomListCount() > 0) {
         hash = (37 * hash) + OPEN_ROOM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getOpenRoomListList().hashCode();
       }
-      hash = (37 * hash) + IS_ARRIVE_FINISH_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsArriveFinish());
+      hash = (37 * hash) + PMAEONPOMJE_FIELD_NUMBER;
+      hash = (53 * hash) + getPMAEONPOMJE();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -543,10 +539,6 @@ public final class CustomDungeonSettingOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KDLMJBEFIOD
-     * </pre>
-     *
      * Protobuf type {@code CustomDungeonSetting}
      */
     public static final class Builder extends
@@ -584,19 +576,19 @@ public final class CustomDungeonSettingOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isArriveFinish_ = false;
+
+        pPBAAMIOPGF_ = 0;
+
         isForbidSkill_ = false;
 
-        kADOPMBDBPG_ = 0;
+        fCEACKKGHCL_ = 0;
 
-        kHCGPFHNHMP_ = 0;
-
-        aCMIGHKKLKJ_ = 0;
-
-        hPFNIKCNFEE_ = 0;
+        hMFACEEJJDM_ = 0;
 
         openRoomList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        isArriveFinish_ = false;
+        pMAEONPOMJE_ = 0;
 
         return this;
       }
@@ -625,17 +617,17 @@ public final class CustomDungeonSettingOuterClass {
       public emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting buildPartial() {
         emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting result = new emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting(this);
         int from_bitField0_ = bitField0_;
+        result.isArriveFinish_ = isArriveFinish_;
+        result.pPBAAMIOPGF_ = pPBAAMIOPGF_;
         result.isForbidSkill_ = isForbidSkill_;
-        result.kADOPMBDBPG_ = kADOPMBDBPG_;
-        result.kHCGPFHNHMP_ = kHCGPFHNHMP_;
-        result.aCMIGHKKLKJ_ = aCMIGHKKLKJ_;
-        result.hPFNIKCNFEE_ = hPFNIKCNFEE_;
+        result.fCEACKKGHCL_ = fCEACKKGHCL_;
+        result.hMFACEEJJDM_ = hMFACEEJJDM_;
         if (((bitField0_ & 0x00000001) != 0)) {
           openRoomList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.openRoomList_ = openRoomList_;
-        result.isArriveFinish_ = isArriveFinish_;
+        result.pMAEONPOMJE_ = pMAEONPOMJE_;
         onBuilt();
         return result;
       }
@@ -684,20 +676,20 @@ public final class CustomDungeonSettingOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting other) {
         if (other == emu.grasscutter.net.proto.CustomDungeonSettingOuterClass.CustomDungeonSetting.getDefaultInstance()) return this;
+        if (other.getIsArriveFinish() != false) {
+          setIsArriveFinish(other.getIsArriveFinish());
+        }
+        if (other.getPPBAAMIOPGF() != 0) {
+          setPPBAAMIOPGF(other.getPPBAAMIOPGF());
+        }
         if (other.getIsForbidSkill() != false) {
           setIsForbidSkill(other.getIsForbidSkill());
         }
-        if (other.getKADOPMBDBPG() != 0) {
-          setKADOPMBDBPG(other.getKADOPMBDBPG());
+        if (other.getFCEACKKGHCL() != 0) {
+          setFCEACKKGHCL(other.getFCEACKKGHCL());
         }
-        if (other.getKHCGPFHNHMP() != 0) {
-          setKHCGPFHNHMP(other.getKHCGPFHNHMP());
-        }
-        if (other.getACMIGHKKLKJ() != 0) {
-          setACMIGHKKLKJ(other.getACMIGHKKLKJ());
-        }
-        if (other.getHPFNIKCNFEE() != 0) {
-          setHPFNIKCNFEE(other.getHPFNIKCNFEE());
+        if (other.getHMFACEEJJDM() != 0) {
+          setHMFACEEJJDM(other.getHMFACEEJJDM());
         }
         if (!other.openRoomList_.isEmpty()) {
           if (openRoomList_.isEmpty()) {
@@ -709,8 +701,8 @@ public final class CustomDungeonSettingOuterClass {
           }
           onChanged();
         }
-        if (other.getIsArriveFinish() != false) {
-          setIsArriveFinish(other.getIsArriveFinish());
+        if (other.getPMAEONPOMJE() != 0) {
+          setPMAEONPOMJE(other.getPMAEONPOMJE());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -742,9 +734,71 @@ public final class CustomDungeonSettingOuterClass {
       }
       private int bitField0_;
 
+      private boolean isArriveFinish_ ;
+      /**
+       * <code>bool is_arrive_finish = 1;</code>
+       * @return The isArriveFinish.
+       */
+      @java.lang.Override
+      public boolean getIsArriveFinish() {
+        return isArriveFinish_;
+      }
+      /**
+       * <code>bool is_arrive_finish = 1;</code>
+       * @param value The isArriveFinish to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsArriveFinish(boolean value) {
+        
+        isArriveFinish_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_arrive_finish = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsArriveFinish() {
+        
+        isArriveFinish_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int pPBAAMIOPGF_ ;
+      /**
+       * <code>uint32 PPBAAMIOPGF = 2;</code>
+       * @return The pPBAAMIOPGF.
+       */
+      @java.lang.Override
+      public int getPPBAAMIOPGF() {
+        return pPBAAMIOPGF_;
+      }
+      /**
+       * <code>uint32 PPBAAMIOPGF = 2;</code>
+       * @param value The pPBAAMIOPGF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPPBAAMIOPGF(int value) {
+        
+        pPBAAMIOPGF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 PPBAAMIOPGF = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPPBAAMIOPGF() {
+        
+        pPBAAMIOPGF_ = 0;
+        onChanged();
+        return this;
+      }
+
       private boolean isForbidSkill_ ;
       /**
-       * <code>bool is_forbid_skill = 8;</code>
+       * <code>bool is_forbid_skill = 9;</code>
        * @return The isForbidSkill.
        */
       @java.lang.Override
@@ -752,7 +806,7 @@ public final class CustomDungeonSettingOuterClass {
         return isForbidSkill_;
       }
       /**
-       * <code>bool is_forbid_skill = 8;</code>
+       * <code>bool is_forbid_skill = 9;</code>
        * @param value The isForbidSkill to set.
        * @return This builder for chaining.
        */
@@ -763,7 +817,7 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
       /**
-       * <code>bool is_forbid_skill = 8;</code>
+       * <code>bool is_forbid_skill = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsForbidSkill() {
@@ -773,126 +827,64 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
 
-      private int kADOPMBDBPG_ ;
+      private int fCEACKKGHCL_ ;
       /**
-       * <code>uint32 KADOPMBDBPG = 5;</code>
-       * @return The kADOPMBDBPG.
+       * <code>uint32 FCEACKKGHCL = 11;</code>
+       * @return The fCEACKKGHCL.
        */
       @java.lang.Override
-      public int getKADOPMBDBPG() {
-        return kADOPMBDBPG_;
+      public int getFCEACKKGHCL() {
+        return fCEACKKGHCL_;
       }
       /**
-       * <code>uint32 KADOPMBDBPG = 5;</code>
-       * @param value The kADOPMBDBPG to set.
+       * <code>uint32 FCEACKKGHCL = 11;</code>
+       * @param value The fCEACKKGHCL to set.
        * @return This builder for chaining.
        */
-      public Builder setKADOPMBDBPG(int value) {
+      public Builder setFCEACKKGHCL(int value) {
         
-        kADOPMBDBPG_ = value;
+        fCEACKKGHCL_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KADOPMBDBPG = 5;</code>
+       * <code>uint32 FCEACKKGHCL = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKADOPMBDBPG() {
+      public Builder clearFCEACKKGHCL() {
         
-        kADOPMBDBPG_ = 0;
+        fCEACKKGHCL_ = 0;
         onChanged();
         return this;
       }
 
-      private int kHCGPFHNHMP_ ;
+      private int hMFACEEJJDM_ ;
       /**
-       * <code>uint32 KHCGPFHNHMP = 4;</code>
-       * @return The kHCGPFHNHMP.
+       * <code>uint32 HMFACEEJJDM = 12;</code>
+       * @return The hMFACEEJJDM.
        */
       @java.lang.Override
-      public int getKHCGPFHNHMP() {
-        return kHCGPFHNHMP_;
+      public int getHMFACEEJJDM() {
+        return hMFACEEJJDM_;
       }
       /**
-       * <code>uint32 KHCGPFHNHMP = 4;</code>
-       * @param value The kHCGPFHNHMP to set.
+       * <code>uint32 HMFACEEJJDM = 12;</code>
+       * @param value The hMFACEEJJDM to set.
        * @return This builder for chaining.
        */
-      public Builder setKHCGPFHNHMP(int value) {
+      public Builder setHMFACEEJJDM(int value) {
         
-        kHCGPFHNHMP_ = value;
+        hMFACEEJJDM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KHCGPFHNHMP = 4;</code>
+       * <code>uint32 HMFACEEJJDM = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKHCGPFHNHMP() {
+      public Builder clearHMFACEEJJDM() {
         
-        kHCGPFHNHMP_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int aCMIGHKKLKJ_ ;
-      /**
-       * <code>uint32 ACMIGHKKLKJ = 1;</code>
-       * @return The aCMIGHKKLKJ.
-       */
-      @java.lang.Override
-      public int getACMIGHKKLKJ() {
-        return aCMIGHKKLKJ_;
-      }
-      /**
-       * <code>uint32 ACMIGHKKLKJ = 1;</code>
-       * @param value The aCMIGHKKLKJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setACMIGHKKLKJ(int value) {
-        
-        aCMIGHKKLKJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 ACMIGHKKLKJ = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearACMIGHKKLKJ() {
-        
-        aCMIGHKKLKJ_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int hPFNIKCNFEE_ ;
-      /**
-       * <code>uint32 HPFNIKCNFEE = 7;</code>
-       * @return The hPFNIKCNFEE.
-       */
-      @java.lang.Override
-      public int getHPFNIKCNFEE() {
-        return hPFNIKCNFEE_;
-      }
-      /**
-       * <code>uint32 HPFNIKCNFEE = 7;</code>
-       * @param value The hPFNIKCNFEE to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHPFNIKCNFEE(int value) {
-        
-        hPFNIKCNFEE_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 HPFNIKCNFEE = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHPFNIKCNFEE() {
-        
-        hPFNIKCNFEE_ = 0;
+        hMFACEEJJDM_ = 0;
         onChanged();
         return this;
       }
@@ -905,7 +897,7 @@ public final class CustomDungeonSettingOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @return A list containing the openRoomList.
        */
       public java.util.List<java.lang.Integer>
@@ -914,14 +906,14 @@ public final class CustomDungeonSettingOuterClass {
                  java.util.Collections.unmodifiableList(openRoomList_) : openRoomList_;
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @return The count of openRoomList.
        */
       public int getOpenRoomListCount() {
         return openRoomList_.size();
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @param index The index of the element to return.
        * @return The openRoomList at the given index.
        */
@@ -929,7 +921,7 @@ public final class CustomDungeonSettingOuterClass {
         return openRoomList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @param index The index to set the value at.
        * @param value The openRoomList to set.
        * @return This builder for chaining.
@@ -942,7 +934,7 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @param value The openRoomList to add.
        * @return This builder for chaining.
        */
@@ -953,7 +945,7 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @param values The openRoomList to add.
        * @return This builder for chaining.
        */
@@ -966,7 +958,7 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 open_room_list = 6;</code>
+       * <code>repeated uint32 open_room_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearOpenRoomList() {
@@ -976,33 +968,33 @@ public final class CustomDungeonSettingOuterClass {
         return this;
       }
 
-      private boolean isArriveFinish_ ;
+      private int pMAEONPOMJE_ ;
       /**
-       * <code>bool is_arrive_finish = 10;</code>
-       * @return The isArriveFinish.
+       * <code>uint32 PMAEONPOMJE = 14;</code>
+       * @return The pMAEONPOMJE.
        */
       @java.lang.Override
-      public boolean getIsArriveFinish() {
-        return isArriveFinish_;
+      public int getPMAEONPOMJE() {
+        return pMAEONPOMJE_;
       }
       /**
-       * <code>bool is_arrive_finish = 10;</code>
-       * @param value The isArriveFinish to set.
+       * <code>uint32 PMAEONPOMJE = 14;</code>
+       * @param value The pMAEONPOMJE to set.
        * @return This builder for chaining.
        */
-      public Builder setIsArriveFinish(boolean value) {
+      public Builder setPMAEONPOMJE(int value) {
         
-        isArriveFinish_ = value;
+        pMAEONPOMJE_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_arrive_finish = 10;</code>
+       * <code>uint32 PMAEONPOMJE = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsArriveFinish() {
+      public Builder clearPMAEONPOMJE() {
         
-        isArriveFinish_ = false;
+        pMAEONPOMJE_ = 0;
         onChanged();
         return this;
       }
@@ -1074,11 +1066,11 @@ public final class CustomDungeonSettingOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032CustomDungeonSetting.proto\"\265\001\n\024CustomD" +
-      "ungeonSetting\022\027\n\017is_forbid_skill\030\010 \001(\010\022\023" +
-      "\n\013KADOPMBDBPG\030\005 \001(\r\022\023\n\013KHCGPFHNHMP\030\004 \001(\r" +
-      "\022\023\n\013ACMIGHKKLKJ\030\001 \001(\r\022\023\n\013HPFNIKCNFEE\030\007 \001" +
-      "(\r\022\026\n\016open_room_list\030\006 \003(\r\022\030\n\020is_arrive_" +
-      "finish\030\n \001(\010B\033\n\031emu.grasscutter.net.prot" +
+      "ungeonSetting\022\030\n\020is_arrive_finish\030\001 \001(\010\022" +
+      "\023\n\013PPBAAMIOPGF\030\002 \001(\r\022\027\n\017is_forbid_skill\030" +
+      "\t \001(\010\022\023\n\013FCEACKKGHCL\030\013 \001(\r\022\023\n\013HMFACEEJJD" +
+      "M\030\014 \001(\r\022\026\n\016open_room_list\030\r \003(\r\022\023\n\013PMAEO" +
+      "NPOMJE\030\016 \001(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1090,7 +1082,7 @@ public final class CustomDungeonSettingOuterClass {
     internal_static_CustomDungeonSetting_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CustomDungeonSetting_descriptor,
-        new java.lang.String[] { "IsForbidSkill", "KADOPMBDBPG", "KHCGPFHNHMP", "ACMIGHKKLKJ", "HPFNIKCNFEE", "OpenRoomList", "IsArriveFinish", });
+        new java.lang.String[] { "IsArriveFinish", "PPBAAMIOPGF", "IsForbidSkill", "FCEACKKGHCL", "HMFACEEJJDM", "OpenRoomList", "PMAEONPOMJE", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CustomGadgetTreeInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CustomGadgetTreeInfoOuterClass.java
index 333a7fe6b..4784c030a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CustomGadgetTreeInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CustomGadgetTreeInfoOuterClass.java
@@ -44,7 +44,7 @@ public final class CustomGadgetTreeInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: POAIMCJGABA
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code CustomGadgetTreeInfo}
@@ -336,7 +336,7 @@ public final class CustomGadgetTreeInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: POAIMCJGABA
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code CustomGadgetTreeInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java
index c9604a420..a58c35ddd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneBeginNotifyOuterClass.java
@@ -19,47 +19,42 @@ public final class CutSceneBeginNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cutscene_id = 11;</code>
+     * <code>uint32 cutscene_id = 2;</code>
      * @return The cutsceneId.
      */
     int getCutsceneId();
 
     /**
-     * <code>bool is_wait_others = 8;</code>
+     * <code>bool is_wait_others = 7;</code>
      * @return The isWaitOthers.
      */
     boolean getIsWaitOthers();
 
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam> 
         getExtraParamListList();
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam getExtraParamList(int index);
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     int getExtraParamListCount();
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder> 
         getExtraParamListOrBuilderList();
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder getExtraParamListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 418
-   * Obf: LKBOJOLENCC
-   * </pre>
-   *
    * Protobuf type {@code CutSceneBeginNotify}
    */
   public static final class CutSceneBeginNotify extends
@@ -106,17 +101,17 @@ public final class CutSceneBeginNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              isWaitOthers_ = input.readBool();
-              break;
-            }
-            case 88: {
+            case 16: {
 
               cutsceneId_ = input.readUInt32();
               break;
             }
-            case 122: {
+            case 56: {
+
+              isWaitOthers_ = input.readBool();
+              break;
+            }
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 extraParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -160,10 +155,10 @@ public final class CutSceneBeginNotifyOuterClass {
               emu.grasscutter.net.proto.CutSceneBeginNotifyOuterClass.CutSceneBeginNotify.class, emu.grasscutter.net.proto.CutSceneBeginNotifyOuterClass.CutSceneBeginNotify.Builder.class);
     }
 
-    public static final int CUTSCENE_ID_FIELD_NUMBER = 11;
+    public static final int CUTSCENE_ID_FIELD_NUMBER = 2;
     private int cutsceneId_;
     /**
-     * <code>uint32 cutscene_id = 11;</code>
+     * <code>uint32 cutscene_id = 2;</code>
      * @return The cutsceneId.
      */
     @java.lang.Override
@@ -171,10 +166,10 @@ public final class CutSceneBeginNotifyOuterClass {
       return cutsceneId_;
     }
 
-    public static final int IS_WAIT_OTHERS_FIELD_NUMBER = 8;
+    public static final int IS_WAIT_OTHERS_FIELD_NUMBER = 7;
     private boolean isWaitOthers_;
     /**
-     * <code>bool is_wait_others = 8;</code>
+     * <code>bool is_wait_others = 7;</code>
      * @return The isWaitOthers.
      */
     @java.lang.Override
@@ -182,17 +177,17 @@ public final class CutSceneBeginNotifyOuterClass {
       return isWaitOthers_;
     }
 
-    public static final int EXTRA_PARAM_LIST_FIELD_NUMBER = 15;
+    public static final int EXTRA_PARAM_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam> extraParamList_;
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam> getExtraParamListList() {
       return extraParamList_;
     }
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder> 
@@ -200,21 +195,21 @@ public final class CutSceneBeginNotifyOuterClass {
       return extraParamList_;
     }
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     @java.lang.Override
     public int getExtraParamListCount() {
       return extraParamList_.size();
     }
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam getExtraParamList(int index) {
       return extraParamList_.get(index);
     }
     /**
-     * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+     * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder getExtraParamListOrBuilder(
@@ -236,14 +231,14 @@ public final class CutSceneBeginNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isWaitOthers_ != false) {
-        output.writeBool(8, isWaitOthers_);
-      }
       if (cutsceneId_ != 0) {
-        output.writeUInt32(11, cutsceneId_);
+        output.writeUInt32(2, cutsceneId_);
+      }
+      if (isWaitOthers_ != false) {
+        output.writeBool(7, isWaitOthers_);
       }
       for (int i = 0; i < extraParamList_.size(); i++) {
-        output.writeMessage(15, extraParamList_.get(i));
+        output.writeMessage(14, extraParamList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class CutSceneBeginNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isWaitOthers_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isWaitOthers_);
-      }
       if (cutsceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, cutsceneId_);
+          .computeUInt32Size(2, cutsceneId_);
+      }
+      if (isWaitOthers_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(7, isWaitOthers_);
       }
       for (int i = 0; i < extraParamList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, extraParamList_.get(i));
+          .computeMessageSize(14, extraParamList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -403,11 +398,6 @@ public final class CutSceneBeginNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 418
-     * Obf: LKBOJOLENCC
-     * </pre>
-     *
      * Protobuf type {@code CutSceneBeginNotify}
      */
     public static final class Builder extends
@@ -606,7 +596,7 @@ public final class CutSceneBeginNotifyOuterClass {
 
       private int cutsceneId_ ;
       /**
-       * <code>uint32 cutscene_id = 11;</code>
+       * <code>uint32 cutscene_id = 2;</code>
        * @return The cutsceneId.
        */
       @java.lang.Override
@@ -614,7 +604,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return cutsceneId_;
       }
       /**
-       * <code>uint32 cutscene_id = 11;</code>
+       * <code>uint32 cutscene_id = 2;</code>
        * @param value The cutsceneId to set.
        * @return This builder for chaining.
        */
@@ -625,7 +615,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cutscene_id = 11;</code>
+       * <code>uint32 cutscene_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCutsceneId() {
@@ -637,7 +627,7 @@ public final class CutSceneBeginNotifyOuterClass {
 
       private boolean isWaitOthers_ ;
       /**
-       * <code>bool is_wait_others = 8;</code>
+       * <code>bool is_wait_others = 7;</code>
        * @return The isWaitOthers.
        */
       @java.lang.Override
@@ -645,7 +635,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return isWaitOthers_;
       }
       /**
-       * <code>bool is_wait_others = 8;</code>
+       * <code>bool is_wait_others = 7;</code>
        * @param value The isWaitOthers to set.
        * @return This builder for chaining.
        */
@@ -656,7 +646,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_wait_others = 8;</code>
+       * <code>bool is_wait_others = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsWaitOthers() {
@@ -679,7 +669,7 @@ public final class CutSceneBeginNotifyOuterClass {
           emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder> extraParamListBuilder_;
 
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam> getExtraParamListList() {
         if (extraParamListBuilder_ == null) {
@@ -689,7 +679,7 @@ public final class CutSceneBeginNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public int getExtraParamListCount() {
         if (extraParamListBuilder_ == null) {
@@ -699,7 +689,7 @@ public final class CutSceneBeginNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam getExtraParamList(int index) {
         if (extraParamListBuilder_ == null) {
@@ -709,7 +699,7 @@ public final class CutSceneBeginNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder setExtraParamList(
           int index, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam value) {
@@ -726,7 +716,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder setExtraParamList(
           int index, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder builderForValue) {
@@ -740,7 +730,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder addExtraParamList(emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam value) {
         if (extraParamListBuilder_ == null) {
@@ -756,7 +746,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder addExtraParamList(
           int index, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam value) {
@@ -773,7 +763,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder addExtraParamList(
           emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder builderForValue) {
@@ -787,7 +777,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder addExtraParamList(
           int index, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder builderForValue) {
@@ -801,7 +791,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder addAllExtraParamList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam> values) {
@@ -816,7 +806,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder clearExtraParamList() {
         if (extraParamListBuilder_ == null) {
@@ -829,7 +819,7 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public Builder removeExtraParamList(int index) {
         if (extraParamListBuilder_ == null) {
@@ -842,14 +832,14 @@ public final class CutSceneBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder getExtraParamListBuilder(
           int index) {
         return getExtraParamListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder getExtraParamListOrBuilder(
           int index) {
@@ -859,7 +849,7 @@ public final class CutSceneBeginNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParamOrBuilder> 
            getExtraParamListOrBuilderList() {
@@ -870,14 +860,14 @@ public final class CutSceneBeginNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder addExtraParamListBuilder() {
         return getExtraParamListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder addExtraParamListBuilder(
           int index) {
@@ -885,7 +875,7 @@ public final class CutSceneBeginNotifyOuterClass {
             index, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .CutSceneExtraParam extra_param_list = 15;</code>
+       * <code>repeated .CutSceneExtraParam extra_param_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder> 
            getExtraParamListBuilderList() {
@@ -974,8 +964,8 @@ public final class CutSceneBeginNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031CutSceneBeginNotify.proto\032\030CutSceneExt" +
       "raParam.proto\"q\n\023CutSceneBeginNotify\022\023\n\013" +
-      "cutscene_id\030\013 \001(\r\022\026\n\016is_wait_others\030\010 \001(" +
-      "\010\022-\n\020extra_param_list\030\017 \003(\0132\023.CutSceneEx" +
+      "cutscene_id\030\002 \001(\r\022\026\n\016is_wait_others\030\007 \001(" +
+      "\010\022-\n\020extra_param_list\030\016 \003(\0132\023.CutSceneEx" +
       "traParamB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneEndNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneEndNotifyOuterClass.java
index 84acdba6d..be9cc5874 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneEndNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneEndNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class CutSceneEndNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cutscene_id = 8;</code>
-     * @return The cutsceneId.
-     */
-    int getCutsceneId();
-
-    /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 cutscene_id = 10;</code>
+     * @return The cutsceneId.
+     */
+    int getCutsceneId();
   }
   /**
-   * <pre>
-   * CmdId: 3904
-   * Obf: PKEJONCMDIC
-   * </pre>
-   *
    * Protobuf type {@code CutSceneEndNotify}
    */
   public static final class CutSceneEndNotify extends
@@ -80,12 +75,12 @@ public final class CutSceneEndNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 64: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 64: {
+            case 80: {
 
               cutsceneId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class CutSceneEndNotifyOuterClass {
               emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify.class, emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify.Builder.class);
     }
 
-    public static final int CUTSCENE_ID_FIELD_NUMBER = 8;
-    private int cutsceneId_;
-    /**
-     * <code>uint32 cutscene_id = 8;</code>
-     * @return The cutsceneId.
-     */
-    @java.lang.Override
-    public int getCutsceneId() {
-      return cutsceneId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class CutSceneEndNotifyOuterClass {
       return retcode_;
     }
 
+    public static final int CUTSCENE_ID_FIELD_NUMBER = 10;
+    private int cutsceneId_;
+    /**
+     * <code>uint32 cutscene_id = 10;</code>
+     * @return The cutsceneId.
+     */
+    @java.lang.Override
+    public int getCutsceneId() {
+      return cutsceneId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class CutSceneEndNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+        output.writeInt32(8, retcode_);
       }
       if (cutsceneId_ != 0) {
-        output.writeUInt32(8, cutsceneId_);
+        output.writeUInt32(10, cutsceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class CutSceneEndNotifyOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeInt32Size(8, retcode_);
       }
       if (cutsceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, cutsceneId_);
+          .computeUInt32Size(10, cutsceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class CutSceneEndNotifyOuterClass {
       }
       emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify other = (emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify) obj;
 
-      if (getCutsceneId()
-          != other.getCutsceneId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getCutsceneId()
+          != other.getCutsceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class CutSceneEndNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUTSCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCutsceneId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CUTSCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCutsceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class CutSceneEndNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3904
-     * Obf: PKEJONCMDIC
-     * </pre>
-     *
      * Protobuf type {@code CutSceneEndNotify}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class CutSceneEndNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        cutsceneId_ = 0;
-
         retcode_ = 0;
 
+        cutsceneId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class CutSceneEndNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify buildPartial() {
         emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify result = new emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify(this);
-        result.cutsceneId_ = cutsceneId_;
         result.retcode_ = retcode_;
+        result.cutsceneId_ = cutsceneId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class CutSceneEndNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify other) {
         if (other == emu.grasscutter.net.proto.CutSceneEndNotifyOuterClass.CutSceneEndNotify.getDefaultInstance()) return this;
-        if (other.getCutsceneId() != 0) {
-          setCutsceneId(other.getCutsceneId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getCutsceneId() != 0) {
+          setCutsceneId(other.getCutsceneId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class CutSceneEndNotifyOuterClass {
         return this;
       }
 
-      private int cutsceneId_ ;
-      /**
-       * <code>uint32 cutscene_id = 8;</code>
-       * @return The cutsceneId.
-       */
-      @java.lang.Override
-      public int getCutsceneId() {
-        return cutsceneId_;
-      }
-      /**
-       * <code>uint32 cutscene_id = 8;</code>
-       * @param value The cutsceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCutsceneId(int value) {
-        
-        cutsceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cutscene_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCutsceneId() {
-        
-        cutsceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class CutSceneEndNotifyOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class CutSceneEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class CutSceneEndNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int cutsceneId_ ;
+      /**
+       * <code>uint32 cutscene_id = 10;</code>
+       * @return The cutsceneId.
+       */
+      @java.lang.Override
+      public int getCutsceneId() {
+        return cutsceneId_;
+      }
+      /**
+       * <code>uint32 cutscene_id = 10;</code>
+       * @param value The cutsceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCutsceneId(int value) {
+        
+        cutsceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cutscene_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCutsceneId() {
+        
+        cutsceneId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class CutSceneEndNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027CutSceneEndNotify.proto\"9\n\021CutSceneEnd" +
-      "Notify\022\023\n\013cutscene_id\030\010 \001(\r\022\017\n\007retcode\030\003" +
-      " \001(\005B\033\n\031emu.grasscutter.net.protob\006proto" +
+      "Notify\022\017\n\007retcode\030\010 \001(\005\022\023\n\013cutscene_id\030\n" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class CutSceneEndNotifyOuterClass {
     internal_static_CutSceneEndNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_CutSceneEndNotify_descriptor,
-        new java.lang.String[] { "CutsceneId", "Retcode", });
+        new java.lang.String[] { "Retcode", "CutsceneId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java
index 614d686c6..fd667dc72 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneExtraParamOuterClass.java
@@ -19,27 +19,23 @@ public final class CutSceneExtraParamOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @return A list containing the detailParamList.
      */
     java.util.List<java.lang.Double> getDetailParamListList();
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @return The count of detailParamList.
      */
     int getDetailParamListCount();
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @param index The index of the element to return.
      * @return The detailParamList at the given index.
      */
     double getDetailParamList(int index);
   }
   /**
-   * <pre>
-   * Obf: LHEBFKHNPDH
-   * </pre>
-   *
    * Protobuf type {@code CutSceneExtraParam}
    */
   public static final class CutSceneExtraParam extends
@@ -86,7 +82,7 @@ public final class CutSceneExtraParamOuterClass {
             case 0:
               done = true;
               break;
-            case 113: {
+            case 81: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 detailParamList_ = newDoubleList();
                 mutable_bitField0_ |= 0x00000001;
@@ -94,7 +90,7 @@ public final class CutSceneExtraParamOuterClass {
               detailParamList_.addDouble(input.readDouble());
               break;
             }
-            case 114: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -142,10 +138,10 @@ public final class CutSceneExtraParamOuterClass {
               emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.class, emu.grasscutter.net.proto.CutSceneExtraParamOuterClass.CutSceneExtraParam.Builder.class);
     }
 
-    public static final int DETAIL_PARAM_LIST_FIELD_NUMBER = 14;
+    public static final int DETAIL_PARAM_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.DoubleList detailParamList_;
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @return A list containing the detailParamList.
      */
     @java.lang.Override
@@ -154,14 +150,14 @@ public final class CutSceneExtraParamOuterClass {
       return detailParamList_;
     }
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @return The count of detailParamList.
      */
     public int getDetailParamListCount() {
       return detailParamList_.size();
     }
     /**
-     * <code>repeated double detail_param_list = 14;</code>
+     * <code>repeated double detail_param_list = 10;</code>
      * @param index The index of the element to return.
      * @return The detailParamList at the given index.
      */
@@ -186,7 +182,7 @@ public final class CutSceneExtraParamOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getDetailParamListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(detailParamListMemoizedSerializedSize);
       }
       for (int i = 0; i < detailParamList_.size(); i++) {
@@ -340,10 +336,6 @@ public final class CutSceneExtraParamOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LHEBFKHNPDH
-     * </pre>
-     *
      * Protobuf type {@code CutSceneExtraParam}
      */
     public static final class Builder extends
@@ -511,7 +503,7 @@ public final class CutSceneExtraParamOuterClass {
          }
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @return A list containing the detailParamList.
        */
       public java.util.List<java.lang.Double>
@@ -520,14 +512,14 @@ public final class CutSceneExtraParamOuterClass {
                  java.util.Collections.unmodifiableList(detailParamList_) : detailParamList_;
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @return The count of detailParamList.
        */
       public int getDetailParamListCount() {
         return detailParamList_.size();
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @param index The index of the element to return.
        * @return The detailParamList at the given index.
        */
@@ -535,7 +527,7 @@ public final class CutSceneExtraParamOuterClass {
         return detailParamList_.getDouble(index);
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The detailParamList to set.
        * @return This builder for chaining.
@@ -548,7 +540,7 @@ public final class CutSceneExtraParamOuterClass {
         return this;
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @param value The detailParamList to add.
        * @return This builder for chaining.
        */
@@ -559,7 +551,7 @@ public final class CutSceneExtraParamOuterClass {
         return this;
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @param values The detailParamList to add.
        * @return This builder for chaining.
        */
@@ -572,7 +564,7 @@ public final class CutSceneExtraParamOuterClass {
         return this;
       }
       /**
-       * <code>repeated double detail_param_list = 14;</code>
+       * <code>repeated double detail_param_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDetailParamList() {
@@ -649,7 +641,7 @@ public final class CutSceneExtraParamOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030CutSceneExtraParam.proto\"/\n\022CutSceneEx" +
-      "traParam\022\031\n\021detail_param_list\030\016 \003(\001B\033\n\031e" +
+      "traParam\022\031\n\021detail_param_list\030\n \003(\001B\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/CutSceneFinishNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneFinishNotifyOuterClass.java
index 43c017daf..8e871abd9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/CutSceneFinishNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/CutSceneFinishNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class CutSceneFinishNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cutscene_id = 4;</code>
+     * <code>uint32 cutscene_id = 5;</code>
      * @return The cutsceneId.
      */
     int getCutsceneId();
   }
   /**
-   * <pre>
-   * CmdId: 21199
-   * Obf: NIJEOCGLPPB
-   * </pre>
-   *
    * Protobuf type {@code CutSceneFinishNotify}
    */
   public static final class CutSceneFinishNotify extends
@@ -74,7 +69,7 @@ public final class CutSceneFinishNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 40: {
 
               cutsceneId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class CutSceneFinishNotifyOuterClass {
               emu.grasscutter.net.proto.CutSceneFinishNotifyOuterClass.CutSceneFinishNotify.class, emu.grasscutter.net.proto.CutSceneFinishNotifyOuterClass.CutSceneFinishNotify.Builder.class);
     }
 
-    public static final int CUTSCENE_ID_FIELD_NUMBER = 4;
+    public static final int CUTSCENE_ID_FIELD_NUMBER = 5;
     private int cutsceneId_;
     /**
-     * <code>uint32 cutscene_id = 4;</code>
+     * <code>uint32 cutscene_id = 5;</code>
      * @return The cutsceneId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class CutSceneFinishNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (cutsceneId_ != 0) {
-        output.writeUInt32(4, cutsceneId_);
+        output.writeUInt32(5, cutsceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class CutSceneFinishNotifyOuterClass {
       size = 0;
       if (cutsceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, cutsceneId_);
+          .computeUInt32Size(5, cutsceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class CutSceneFinishNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21199
-     * Obf: NIJEOCGLPPB
-     * </pre>
-     *
      * Protobuf type {@code CutSceneFinishNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class CutSceneFinishNotifyOuterClass {
 
       private int cutsceneId_ ;
       /**
-       * <code>uint32 cutscene_id = 4;</code>
+       * <code>uint32 cutscene_id = 5;</code>
        * @return The cutsceneId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class CutSceneFinishNotifyOuterClass {
         return cutsceneId_;
       }
       /**
-       * <code>uint32 cutscene_id = 4;</code>
+       * <code>uint32 cutscene_id = 5;</code>
        * @param value The cutsceneId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class CutSceneFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cutscene_id = 4;</code>
+       * <code>uint32 cutscene_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCutsceneId() {
@@ -527,7 +517,7 @@ public final class CutSceneFinishNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032CutSceneFinishNotify.proto\"+\n\024CutScene" +
-      "FinishNotify\022\023\n\013cutscene_id\030\004 \001(\rB\033\n\031emu" +
+      "FinishNotify\022\023\n\013cutscene_id\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/DailyDungeonEntryInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DailyDungeonEntryInfoOuterClass.java
index 4d7da84ac..f209d1fa4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DailyDungeonEntryInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DailyDungeonEntryInfoOuterClass.java
@@ -19,43 +19,51 @@ public final class DailyDungeonEntryInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     * @return Whether the recommendDungeonEntryInfo field is set.
+     * <code>bool EPEBCOBLKII = 1;</code>
+     * @return The ePEBCOBLKII.
      */
-    boolean hasRecommendDungeonEntryInfo();
-    /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     * @return The recommendDungeonEntryInfo.
-     */
-    emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getRecommendDungeonEntryInfo();
-    /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     */
-    emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getRecommendDungeonEntryInfoOrBuilder();
+    boolean getEPEBCOBLKII();
 
     /**
-     * <code>uint32 recommend_dungeon_id = 10;</code>
-     * @return The recommendDungeonId.
+     * <code>uint32 dungeon_entry_config_id = 4;</code>
+     * @return The dungeonEntryConfigId.
      */
-    int getRecommendDungeonId();
+    int getDungeonEntryConfigId();
 
     /**
-     * <code>uint32 dungeon_entry_id = 2;</code>
+     * <code>uint32 dungeon_entry_id = 7;</code>
      * @return The dungeonEntryId.
      */
     int getDungeonEntryId();
 
     /**
-     * <code>uint32 dungeon_entry_config_id = 15;</code>
-     * @return The dungeonEntryConfigId.
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     * @return Whether the recommendDungeonEntryInfo field is set.
      */
-    int getDungeonEntryConfigId();
+    boolean hasRecommendDungeonEntryInfo();
+    /**
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     * @return The recommendDungeonEntryInfo.
+     */
+    emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getRecommendDungeonEntryInfo();
+    /**
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     */
+    emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getRecommendDungeonEntryInfoOrBuilder();
+
+    /**
+     * <code>bool LCHFFKHPJIO = 14;</code>
+     * @return The lCHFFKHPJIO.
+     */
+    boolean getLCHFFKHPJIO();
+
+    /**
+     * <code>uint32 recommend_dungeon_id = 15;</code>
+     * @return The recommendDungeonId.
+     */
+    int getRecommendDungeonId();
   }
   /**
-   * <pre>
-   * Obf: FMKJAHHOCBE
-   * </pre>
-   *
    * Protobuf type {@code DailyDungeonEntryInfo}
    */
   public static final class DailyDungeonEntryInfo extends
@@ -100,12 +108,22 @@ public final class DailyDungeonEntryInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
+
+              ePEBCOBLKII_ = input.readBool();
+              break;
+            }
+            case 32: {
+
+              dungeonEntryConfigId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
 
               dungeonEntryId_ = input.readUInt32();
               break;
             }
-            case 66: {
+            case 74: {
               emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder subBuilder = null;
               if (recommendDungeonEntryInfo_ != null) {
                 subBuilder = recommendDungeonEntryInfo_.toBuilder();
@@ -118,14 +136,14 @@ public final class DailyDungeonEntryInfoOuterClass {
 
               break;
             }
-            case 80: {
+            case 112: {
 
-              recommendDungeonId_ = input.readUInt32();
+              lCHFFKHPJIO_ = input.readBool();
               break;
             }
             case 120: {
 
-              dungeonEntryConfigId_ = input.readUInt32();
+              recommendDungeonId_ = input.readUInt32();
               break;
             }
             default: {
@@ -160,47 +178,32 @@ public final class DailyDungeonEntryInfoOuterClass {
               emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.class, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder.class);
     }
 
-    public static final int RECOMMEND_DUNGEON_ENTRY_INFO_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo recommendDungeonEntryInfo_;
+    public static final int EPEBCOBLKII_FIELD_NUMBER = 1;
+    private boolean ePEBCOBLKII_;
     /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     * @return Whether the recommendDungeonEntryInfo field is set.
+     * <code>bool EPEBCOBLKII = 1;</code>
+     * @return The ePEBCOBLKII.
      */
     @java.lang.Override
-    public boolean hasRecommendDungeonEntryInfo() {
-      return recommendDungeonEntryInfo_ != null;
-    }
-    /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     * @return The recommendDungeonEntryInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getRecommendDungeonEntryInfo() {
-      return recommendDungeonEntryInfo_ == null ? emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance() : recommendDungeonEntryInfo_;
-    }
-    /**
-     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getRecommendDungeonEntryInfoOrBuilder() {
-      return getRecommendDungeonEntryInfo();
+    public boolean getEPEBCOBLKII() {
+      return ePEBCOBLKII_;
     }
 
-    public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 10;
-    private int recommendDungeonId_;
+    public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 4;
+    private int dungeonEntryConfigId_;
     /**
-     * <code>uint32 recommend_dungeon_id = 10;</code>
-     * @return The recommendDungeonId.
+     * <code>uint32 dungeon_entry_config_id = 4;</code>
+     * @return The dungeonEntryConfigId.
      */
     @java.lang.Override
-    public int getRecommendDungeonId() {
-      return recommendDungeonId_;
+    public int getDungeonEntryConfigId() {
+      return dungeonEntryConfigId_;
     }
 
-    public static final int DUNGEON_ENTRY_ID_FIELD_NUMBER = 2;
+    public static final int DUNGEON_ENTRY_ID_FIELD_NUMBER = 7;
     private int dungeonEntryId_;
     /**
-     * <code>uint32 dungeon_entry_id = 2;</code>
+     * <code>uint32 dungeon_entry_id = 7;</code>
      * @return The dungeonEntryId.
      */
     @java.lang.Override
@@ -208,15 +211,52 @@ public final class DailyDungeonEntryInfoOuterClass {
       return dungeonEntryId_;
     }
 
-    public static final int DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER = 15;
-    private int dungeonEntryConfigId_;
+    public static final int RECOMMEND_DUNGEON_ENTRY_INFO_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo recommendDungeonEntryInfo_;
     /**
-     * <code>uint32 dungeon_entry_config_id = 15;</code>
-     * @return The dungeonEntryConfigId.
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     * @return Whether the recommendDungeonEntryInfo field is set.
      */
     @java.lang.Override
-    public int getDungeonEntryConfigId() {
-      return dungeonEntryConfigId_;
+    public boolean hasRecommendDungeonEntryInfo() {
+      return recommendDungeonEntryInfo_ != null;
+    }
+    /**
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     * @return The recommendDungeonEntryInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getRecommendDungeonEntryInfo() {
+      return recommendDungeonEntryInfo_ == null ? emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance() : recommendDungeonEntryInfo_;
+    }
+    /**
+     * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getRecommendDungeonEntryInfoOrBuilder() {
+      return getRecommendDungeonEntryInfo();
+    }
+
+    public static final int LCHFFKHPJIO_FIELD_NUMBER = 14;
+    private boolean lCHFFKHPJIO_;
+    /**
+     * <code>bool LCHFFKHPJIO = 14;</code>
+     * @return The lCHFFKHPJIO.
+     */
+    @java.lang.Override
+    public boolean getLCHFFKHPJIO() {
+      return lCHFFKHPJIO_;
+    }
+
+    public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 15;
+    private int recommendDungeonId_;
+    /**
+     * <code>uint32 recommend_dungeon_id = 15;</code>
+     * @return The recommendDungeonId.
+     */
+    @java.lang.Override
+    public int getRecommendDungeonId() {
+      return recommendDungeonId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -233,17 +273,23 @@ public final class DailyDungeonEntryInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dungeonEntryId_ != 0) {
-        output.writeUInt32(2, dungeonEntryId_);
-      }
-      if (recommendDungeonEntryInfo_ != null) {
-        output.writeMessage(8, getRecommendDungeonEntryInfo());
-      }
-      if (recommendDungeonId_ != 0) {
-        output.writeUInt32(10, recommendDungeonId_);
+      if (ePEBCOBLKII_ != false) {
+        output.writeBool(1, ePEBCOBLKII_);
       }
       if (dungeonEntryConfigId_ != 0) {
-        output.writeUInt32(15, dungeonEntryConfigId_);
+        output.writeUInt32(4, dungeonEntryConfigId_);
+      }
+      if (dungeonEntryId_ != 0) {
+        output.writeUInt32(7, dungeonEntryId_);
+      }
+      if (recommendDungeonEntryInfo_ != null) {
+        output.writeMessage(9, getRecommendDungeonEntryInfo());
+      }
+      if (lCHFFKHPJIO_ != false) {
+        output.writeBool(14, lCHFFKHPJIO_);
+      }
+      if (recommendDungeonId_ != 0) {
+        output.writeUInt32(15, recommendDungeonId_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,21 +300,29 @@ public final class DailyDungeonEntryInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dungeonEntryId_ != 0) {
+      if (ePEBCOBLKII_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, dungeonEntryId_);
-      }
-      if (recommendDungeonEntryInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getRecommendDungeonEntryInfo());
-      }
-      if (recommendDungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, recommendDungeonId_);
+          .computeBoolSize(1, ePEBCOBLKII_);
       }
       if (dungeonEntryConfigId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, dungeonEntryConfigId_);
+          .computeUInt32Size(4, dungeonEntryConfigId_);
+      }
+      if (dungeonEntryId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, dungeonEntryId_);
+      }
+      if (recommendDungeonEntryInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getRecommendDungeonEntryInfo());
+      }
+      if (lCHFFKHPJIO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, lCHFFKHPJIO_);
+      }
+      if (recommendDungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, recommendDungeonId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -285,17 +339,21 @@ public final class DailyDungeonEntryInfoOuterClass {
       }
       emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo other = (emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo) obj;
 
+      if (getEPEBCOBLKII()
+          != other.getEPEBCOBLKII()) return false;
+      if (getDungeonEntryConfigId()
+          != other.getDungeonEntryConfigId()) return false;
+      if (getDungeonEntryId()
+          != other.getDungeonEntryId()) return false;
       if (hasRecommendDungeonEntryInfo() != other.hasRecommendDungeonEntryInfo()) return false;
       if (hasRecommendDungeonEntryInfo()) {
         if (!getRecommendDungeonEntryInfo()
             .equals(other.getRecommendDungeonEntryInfo())) return false;
       }
+      if (getLCHFFKHPJIO()
+          != other.getLCHFFKHPJIO()) return false;
       if (getRecommendDungeonId()
           != other.getRecommendDungeonId()) return false;
-      if (getDungeonEntryId()
-          != other.getDungeonEntryId()) return false;
-      if (getDungeonEntryConfigId()
-          != other.getDungeonEntryConfigId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -307,16 +365,22 @@ public final class DailyDungeonEntryInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + EPEBCOBLKII_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getEPEBCOBLKII());
+      hash = (37 * hash) + DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonEntryConfigId();
+      hash = (37 * hash) + DUNGEON_ENTRY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonEntryId();
       if (hasRecommendDungeonEntryInfo()) {
         hash = (37 * hash) + RECOMMEND_DUNGEON_ENTRY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getRecommendDungeonEntryInfo().hashCode();
       }
+      hash = (37 * hash) + LCHFFKHPJIO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getLCHFFKHPJIO());
       hash = (37 * hash) + RECOMMEND_DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRecommendDungeonId();
-      hash = (37 * hash) + DUNGEON_ENTRY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonEntryId();
-      hash = (37 * hash) + DUNGEON_ENTRY_CONFIG_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonEntryConfigId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -413,10 +477,6 @@ public final class DailyDungeonEntryInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FMKJAHHOCBE
-     * </pre>
-     *
      * Protobuf type {@code DailyDungeonEntryInfo}
      */
     public static final class Builder extends
@@ -454,18 +514,22 @@ public final class DailyDungeonEntryInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        ePEBCOBLKII_ = false;
+
+        dungeonEntryConfigId_ = 0;
+
+        dungeonEntryId_ = 0;
+
         if (recommendDungeonEntryInfoBuilder_ == null) {
           recommendDungeonEntryInfo_ = null;
         } else {
           recommendDungeonEntryInfo_ = null;
           recommendDungeonEntryInfoBuilder_ = null;
         }
+        lCHFFKHPJIO_ = false;
+
         recommendDungeonId_ = 0;
 
-        dungeonEntryId_ = 0;
-
-        dungeonEntryConfigId_ = 0;
-
         return this;
       }
 
@@ -492,14 +556,16 @@ public final class DailyDungeonEntryInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo buildPartial() {
         emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo result = new emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo(this);
+        result.ePEBCOBLKII_ = ePEBCOBLKII_;
+        result.dungeonEntryConfigId_ = dungeonEntryConfigId_;
+        result.dungeonEntryId_ = dungeonEntryId_;
         if (recommendDungeonEntryInfoBuilder_ == null) {
           result.recommendDungeonEntryInfo_ = recommendDungeonEntryInfo_;
         } else {
           result.recommendDungeonEntryInfo_ = recommendDungeonEntryInfoBuilder_.build();
         }
+        result.lCHFFKHPJIO_ = lCHFFKHPJIO_;
         result.recommendDungeonId_ = recommendDungeonId_;
-        result.dungeonEntryId_ = dungeonEntryId_;
-        result.dungeonEntryConfigId_ = dungeonEntryConfigId_;
         onBuilt();
         return result;
       }
@@ -548,17 +614,23 @@ public final class DailyDungeonEntryInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo other) {
         if (other == emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.getDefaultInstance()) return this;
-        if (other.hasRecommendDungeonEntryInfo()) {
-          mergeRecommendDungeonEntryInfo(other.getRecommendDungeonEntryInfo());
+        if (other.getEPEBCOBLKII() != false) {
+          setEPEBCOBLKII(other.getEPEBCOBLKII());
         }
-        if (other.getRecommendDungeonId() != 0) {
-          setRecommendDungeonId(other.getRecommendDungeonId());
+        if (other.getDungeonEntryConfigId() != 0) {
+          setDungeonEntryConfigId(other.getDungeonEntryConfigId());
         }
         if (other.getDungeonEntryId() != 0) {
           setDungeonEntryId(other.getDungeonEntryId());
         }
-        if (other.getDungeonEntryConfigId() != 0) {
-          setDungeonEntryConfigId(other.getDungeonEntryConfigId());
+        if (other.hasRecommendDungeonEntryInfo()) {
+          mergeRecommendDungeonEntryInfo(other.getRecommendDungeonEntryInfo());
+        }
+        if (other.getLCHFFKHPJIO() != false) {
+          setLCHFFKHPJIO(other.getLCHFFKHPJIO());
+        }
+        if (other.getRecommendDungeonId() != 0) {
+          setRecommendDungeonId(other.getRecommendDungeonId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -589,18 +661,111 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
 
+      private boolean ePEBCOBLKII_ ;
+      /**
+       * <code>bool EPEBCOBLKII = 1;</code>
+       * @return The ePEBCOBLKII.
+       */
+      @java.lang.Override
+      public boolean getEPEBCOBLKII() {
+        return ePEBCOBLKII_;
+      }
+      /**
+       * <code>bool EPEBCOBLKII = 1;</code>
+       * @param value The ePEBCOBLKII to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEPEBCOBLKII(boolean value) {
+        
+        ePEBCOBLKII_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool EPEBCOBLKII = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEPEBCOBLKII() {
+        
+        ePEBCOBLKII_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dungeonEntryConfigId_ ;
+      /**
+       * <code>uint32 dungeon_entry_config_id = 4;</code>
+       * @return The dungeonEntryConfigId.
+       */
+      @java.lang.Override
+      public int getDungeonEntryConfigId() {
+        return dungeonEntryConfigId_;
+      }
+      /**
+       * <code>uint32 dungeon_entry_config_id = 4;</code>
+       * @param value The dungeonEntryConfigId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonEntryConfigId(int value) {
+        
+        dungeonEntryConfigId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_entry_config_id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonEntryConfigId() {
+        
+        dungeonEntryConfigId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int dungeonEntryId_ ;
+      /**
+       * <code>uint32 dungeon_entry_id = 7;</code>
+       * @return The dungeonEntryId.
+       */
+      @java.lang.Override
+      public int getDungeonEntryId() {
+        return dungeonEntryId_;
+      }
+      /**
+       * <code>uint32 dungeon_entry_id = 7;</code>
+       * @param value The dungeonEntryId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonEntryId(int value) {
+        
+        dungeonEntryId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_entry_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonEntryId() {
+        
+        dungeonEntryId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo recommendDungeonEntryInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> recommendDungeonEntryInfoBuilder_;
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        * @return Whether the recommendDungeonEntryInfo field is set.
        */
       public boolean hasRecommendDungeonEntryInfo() {
         return recommendDungeonEntryInfoBuilder_ != null || recommendDungeonEntryInfo_ != null;
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        * @return The recommendDungeonEntryInfo.
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getRecommendDungeonEntryInfo() {
@@ -611,7 +776,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         }
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public Builder setRecommendDungeonEntryInfo(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
         if (recommendDungeonEntryInfoBuilder_ == null) {
@@ -627,7 +792,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public Builder setRecommendDungeonEntryInfo(
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -641,7 +806,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public Builder mergeRecommendDungeonEntryInfo(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
         if (recommendDungeonEntryInfoBuilder_ == null) {
@@ -659,7 +824,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public Builder clearRecommendDungeonEntryInfo() {
         if (recommendDungeonEntryInfoBuilder_ == null) {
@@ -673,7 +838,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder getRecommendDungeonEntryInfoBuilder() {
         
@@ -681,7 +846,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return getRecommendDungeonEntryInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getRecommendDungeonEntryInfoOrBuilder() {
         if (recommendDungeonEntryInfoBuilder_ != null) {
@@ -692,7 +857,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         }
       }
       /**
-       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 8;</code>
+       * <code>.DungeonEntryInfo recommend_dungeon_entry_info = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
@@ -708,9 +873,40 @@ public final class DailyDungeonEntryInfoOuterClass {
         return recommendDungeonEntryInfoBuilder_;
       }
 
+      private boolean lCHFFKHPJIO_ ;
+      /**
+       * <code>bool LCHFFKHPJIO = 14;</code>
+       * @return The lCHFFKHPJIO.
+       */
+      @java.lang.Override
+      public boolean getLCHFFKHPJIO() {
+        return lCHFFKHPJIO_;
+      }
+      /**
+       * <code>bool LCHFFKHPJIO = 14;</code>
+       * @param value The lCHFFKHPJIO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLCHFFKHPJIO(boolean value) {
+        
+        lCHFFKHPJIO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool LCHFFKHPJIO = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLCHFFKHPJIO() {
+        
+        lCHFFKHPJIO_ = false;
+        onChanged();
+        return this;
+      }
+
       private int recommendDungeonId_ ;
       /**
-       * <code>uint32 recommend_dungeon_id = 10;</code>
+       * <code>uint32 recommend_dungeon_id = 15;</code>
        * @return The recommendDungeonId.
        */
       @java.lang.Override
@@ -718,7 +914,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return recommendDungeonId_;
       }
       /**
-       * <code>uint32 recommend_dungeon_id = 10;</code>
+       * <code>uint32 recommend_dungeon_id = 15;</code>
        * @param value The recommendDungeonId to set.
        * @return This builder for chaining.
        */
@@ -729,7 +925,7 @@ public final class DailyDungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 recommend_dungeon_id = 10;</code>
+       * <code>uint32 recommend_dungeon_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRecommendDungeonId() {
@@ -738,68 +934,6 @@ public final class DailyDungeonEntryInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int dungeonEntryId_ ;
-      /**
-       * <code>uint32 dungeon_entry_id = 2;</code>
-       * @return The dungeonEntryId.
-       */
-      @java.lang.Override
-      public int getDungeonEntryId() {
-        return dungeonEntryId_;
-      }
-      /**
-       * <code>uint32 dungeon_entry_id = 2;</code>
-       * @param value The dungeonEntryId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonEntryId(int value) {
-        
-        dungeonEntryId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_entry_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonEntryId() {
-        
-        dungeonEntryId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int dungeonEntryConfigId_ ;
-      /**
-       * <code>uint32 dungeon_entry_config_id = 15;</code>
-       * @return The dungeonEntryConfigId.
-       */
-      @java.lang.Override
-      public int getDungeonEntryConfigId() {
-        return dungeonEntryConfigId_;
-      }
-      /**
-       * <code>uint32 dungeon_entry_config_id = 15;</code>
-       * @param value The dungeonEntryConfigId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonEntryConfigId(int value) {
-        
-        dungeonEntryConfigId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_entry_config_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonEntryConfigId() {
-        
-        dungeonEntryConfigId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -868,12 +1002,13 @@ public final class DailyDungeonEntryInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033DailyDungeonEntryInfo.proto\032\026DungeonEn" +
-      "tryInfo.proto\"\251\001\n\025DailyDungeonEntryInfo\022" +
-      "7\n\034recommend_dungeon_entry_info\030\010 \001(\0132\021." +
-      "DungeonEntryInfo\022\034\n\024recommend_dungeon_id" +
-      "\030\n \001(\r\022\030\n\020dungeon_entry_id\030\002 \001(\r\022\037\n\027dung" +
-      "eon_entry_config_id\030\017 \001(\rB\033\n\031emu.grasscu" +
-      "tter.net.protob\006proto3"
+      "tryInfo.proto\"\323\001\n\025DailyDungeonEntryInfo\022" +
+      "\023\n\013EPEBCOBLKII\030\001 \001(\010\022\037\n\027dungeon_entry_co" +
+      "nfig_id\030\004 \001(\r\022\030\n\020dungeon_entry_id\030\007 \001(\r\022" +
+      "7\n\034recommend_dungeon_entry_info\030\t \001(\0132\021." +
+      "DungeonEntryInfo\022\023\n\013LCHFFKHPJIO\030\016 \001(\010\022\034\n" +
+      "\024recommend_dungeon_id\030\017 \001(\rB\033\n\031emu.grass" +
+      "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -885,7 +1020,7 @@ public final class DailyDungeonEntryInfoOuterClass {
     internal_static_DailyDungeonEntryInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DailyDungeonEntryInfo_descriptor,
-        new java.lang.String[] { "RecommendDungeonEntryInfo", "RecommendDungeonId", "DungeonEntryId", "DungeonEntryConfigId", });
+        new java.lang.String[] { "EPEBCOBLKII", "DungeonEntryConfigId", "DungeonEntryId", "RecommendDungeonEntryInfo", "LCHFFKHPJIO", "RecommendDungeonId", });
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionNotifyOuterClass.java
index ab3b7ab09..2e3450098 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionNotifyOuterClass.java
@@ -19,103 +19,98 @@ public final class DataResVersionNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string client_version_suffix = 9;</code>
+     * <code>string PKEKLEEOLJL = 3;</code>
+     * @return The pKEKLEEOLJL.
+     */
+    java.lang.String getPKEKLEEOLJL();
+    /**
+     * <code>string PKEKLEEOLJL = 3;</code>
+     * @return The bytes for pKEKLEEOLJL.
+     */
+    com.google.protobuf.ByteString
+        getPKEKLEEOLJLBytes();
+
+    /**
+     * <code>string client_version_suffix = 4;</code>
      * @return The clientVersionSuffix.
      */
     java.lang.String getClientVersionSuffix();
     /**
-     * <code>string client_version_suffix = 9;</code>
+     * <code>string client_version_suffix = 4;</code>
      * @return The bytes for clientVersionSuffix.
      */
     com.google.protobuf.ByteString
         getClientVersionSuffixBytes();
 
     /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     * @return Whether the resVersionConfig field is set.
-     */
-    boolean hasResVersionConfig();
-    /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     * @return The resVersionConfig.
-     */
-    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig();
-    /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     */
-    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder();
-
-    /**
-     * <code>string client_md5 = 5;</code>
-     * @return The clientMd5.
-     */
-    java.lang.String getClientMd5();
-    /**
-     * <code>string client_md5 = 5;</code>
-     * @return The bytes for clientMd5.
-     */
-    com.google.protobuf.ByteString
-        getClientMd5Bytes();
-
-    /**
-     * <code>bool is_data_need_relogin = 11;</code>
+     * <code>bool is_data_need_relogin = 7;</code>
      * @return The isDataNeedRelogin.
      */
     boolean getIsDataNeedRelogin();
 
     /**
-     * <code>string client_silence_version_suffix = 6;</code>
+     * <code>uint32 client_silence_data_version = 9;</code>
+     * @return The clientSilenceDataVersion.
+     */
+    int getClientSilenceDataVersion();
+
+    /**
+     * <code>string JKANELMFGEP = 10;</code>
+     * @return The jKANELMFGEP.
+     */
+    java.lang.String getJKANELMFGEP();
+    /**
+     * <code>string JKANELMFGEP = 10;</code>
+     * @return The bytes for jKANELMFGEP.
+     */
+    com.google.protobuf.ByteString
+        getJKANELMFGEPBytes();
+
+    /**
+     * <code>.DataResVersionOpType op_type = 11;</code>
+     * @return The enum numeric value on the wire for opType.
+     */
+    int getOpTypeValue();
+    /**
+     * <code>.DataResVersionOpType op_type = 11;</code>
+     * @return The opType.
+     */
+    emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType getOpType();
+
+    /**
+     * <code>string client_silence_version_suffix = 13;</code>
      * @return The clientSilenceVersionSuffix.
      */
     java.lang.String getClientSilenceVersionSuffix();
     /**
-     * <code>string client_silence_version_suffix = 6;</code>
+     * <code>string client_silence_version_suffix = 13;</code>
      * @return The bytes for clientSilenceVersionSuffix.
      */
     com.google.protobuf.ByteString
         getClientSilenceVersionSuffixBytes();
 
     /**
-     * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-     * @return The enum numeric value on the wire for opType.
-     */
-    int getOpTypeValue();
-    /**
-     * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-     * @return The opType.
-     */
-    emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType getOpType();
-
-    /**
-     * <code>uint32 client_silence_data_version = 4;</code>
-     * @return The clientSilenceDataVersion.
-     */
-    int getClientSilenceDataVersion();
-
-    /**
-     * <code>uint32 client_data_version = 3;</code>
+     * <code>uint32 client_data_version = 14;</code>
      * @return The clientDataVersion.
      */
     int getClientDataVersion();
 
     /**
-     * <code>string client_silence_md5 = 12;</code>
-     * @return The clientSilenceMd5.
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     * @return Whether the resVersionConfig field is set.
      */
-    java.lang.String getClientSilenceMd5();
+    boolean hasResVersionConfig();
     /**
-     * <code>string client_silence_md5 = 12;</code>
-     * @return The bytes for clientSilenceMd5.
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     * @return The resVersionConfig.
      */
-    com.google.protobuf.ByteString
-        getClientSilenceMd5Bytes();
+    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig();
+    /**
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     */
+    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 4819
-   * Obf: LICDGGFHBKO
-   * </pre>
-   *
    * Protobuf type {@code DataResVersionNotify}
    */
   public static final class DataResVersionNotify extends
@@ -128,11 +123,11 @@ public final class DataResVersionNotifyOuterClass {
       super(builder);
     }
     private DataResVersionNotify() {
+      pKEKLEEOLJL_ = "";
       clientVersionSuffix_ = "";
-      clientMd5_ = "";
-      clientSilenceVersionSuffix_ = "";
+      jKANELMFGEP_ = "";
       opType_ = 0;
-      clientSilenceMd5_ = "";
+      clientSilenceVersionSuffix_ = "";
     }
 
     @java.lang.Override
@@ -165,7 +160,52 @@ public final class DataResVersionNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 26: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pKEKLEEOLJL_ = s;
+              break;
+            }
+            case 34: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              clientVersionSuffix_ = s;
+              break;
+            }
+            case 56: {
+
+              isDataNeedRelogin_ = input.readBool();
+              break;
+            }
+            case 72: {
+
+              clientSilenceDataVersion_ = input.readUInt32();
+              break;
+            }
+            case 82: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              jKANELMFGEP_ = s;
+              break;
+            }
+            case 88: {
+              int rawValue = input.readEnum();
+
+              opType_ = rawValue;
+              break;
+            }
+            case 106: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              clientSilenceVersionSuffix_ = s;
+              break;
+            }
+            case 112: {
+
+              clientDataVersion_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
               if (resVersionConfig_ != null) {
                 subBuilder = resVersionConfig_.toBuilder();
@@ -178,51 +218,6 @@ public final class DataResVersionNotifyOuterClass {
 
               break;
             }
-            case 24: {
-
-              clientDataVersion_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              clientSilenceDataVersion_ = input.readUInt32();
-              break;
-            }
-            case 42: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientMd5_ = s;
-              break;
-            }
-            case 50: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientSilenceVersionSuffix_ = s;
-              break;
-            }
-            case 74: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientVersionSuffix_ = s;
-              break;
-            }
-            case 88: {
-
-              isDataNeedRelogin_ = input.readBool();
-              break;
-            }
-            case 98: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientSilenceMd5_ = s;
-              break;
-            }
-            case 112: {
-              int rawValue = input.readEnum();
-
-              opType_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -255,131 +250,48 @@ public final class DataResVersionNotifyOuterClass {
               emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.class, emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.Builder.class);
     }
 
+    public static final int PKEKLEEOLJL_FIELD_NUMBER = 3;
+    private volatile java.lang.Object pKEKLEEOLJL_;
     /**
-     * <pre>
-     * Obf: KHCAEHFNOBI
-     * </pre>
-     *
-     * Protobuf enum {@code DataResVersionNotify.DataResVersionOpType}
+     * <code>string PKEKLEEOLJL = 3;</code>
+     * @return The pKEKLEEOLJL.
      */
-    public enum DataResVersionOpType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>OP_TYPE_NONE = 0;</code>
-       */
-      OP_TYPE_NONE(0),
-      /**
-       * <code>OP_TYPE_RELOGIN = 1;</code>
-       */
-      OP_TYPE_RELOGIN(1),
-      /**
-       * <code>OP_TYPE_MP_RELOGIN = 2;</code>
-       */
-      OP_TYPE_MP_RELOGIN(2),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>OP_TYPE_NONE = 0;</code>
-       */
-      public static final int OP_TYPE_NONE_VALUE = 0;
-      /**
-       * <code>OP_TYPE_RELOGIN = 1;</code>
-       */
-      public static final int OP_TYPE_RELOGIN_VALUE = 1;
-      /**
-       * <code>OP_TYPE_MP_RELOGIN = 2;</code>
-       */
-      public static final int OP_TYPE_MP_RELOGIN_VALUE = 2;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
+    @java.lang.Override
+    public java.lang.String getPKEKLEEOLJL() {
+      java.lang.Object ref = pKEKLEEOLJL_;
+      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();
+        pKEKLEEOLJL_ = s;
+        return s;
       }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static DataResVersionOpType valueOf(int value) {
-        return forNumber(value);
+    }
+    /**
+     * <code>string PKEKLEEOLJL = 3;</code>
+     * @return The bytes for pKEKLEEOLJL.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getPKEKLEEOLJLBytes() {
+      java.lang.Object ref = pKEKLEEOLJL_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pKEKLEEOLJL_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
       }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static DataResVersionOpType forNumber(int value) {
-        switch (value) {
-          case 0: return OP_TYPE_NONE;
-          case 1: return OP_TYPE_RELOGIN;
-          case 2: return OP_TYPE_MP_RELOGIN;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<DataResVersionOpType>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          DataResVersionOpType> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<DataResVersionOpType>() {
-              public DataResVersionOpType findValueByNumber(int number) {
-                return DataResVersionOpType.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final DataResVersionOpType[] VALUES = values();
-
-      public static DataResVersionOpType valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private DataResVersionOpType(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:DataResVersionNotify.DataResVersionOpType)
     }
 
-    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 9;
+    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 4;
     private volatile java.lang.Object clientVersionSuffix_;
     /**
-     * <code>string client_version_suffix = 9;</code>
+     * <code>string client_version_suffix = 4;</code>
      * @return The clientVersionSuffix.
      */
     @java.lang.Override
@@ -396,7 +308,7 @@ public final class DataResVersionNotifyOuterClass {
       }
     }
     /**
-     * <code>string client_version_suffix = 9;</code>
+     * <code>string client_version_suffix = 4;</code>
      * @return The bytes for clientVersionSuffix.
      */
     @java.lang.Override
@@ -414,74 +326,10 @@ public final class DataResVersionNotifyOuterClass {
       }
     }
 
-    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
-    /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     * @return Whether the resVersionConfig field is set.
-     */
-    @java.lang.Override
-    public boolean hasResVersionConfig() {
-      return resVersionConfig_ != null;
-    }
-    /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     * @return The resVersionConfig.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
-      return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
-    }
-    /**
-     * <code>.ResVersionConfig res_version_config = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
-      return getResVersionConfig();
-    }
-
-    public static final int CLIENT_MD5_FIELD_NUMBER = 5;
-    private volatile java.lang.Object clientMd5_;
-    /**
-     * <code>string client_md5 = 5;</code>
-     * @return The clientMd5.
-     */
-    @java.lang.Override
-    public java.lang.String getClientMd5() {
-      java.lang.Object ref = clientMd5_;
-      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();
-        clientMd5_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_md5 = 5;</code>
-     * @return The bytes for clientMd5.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientMd5Bytes() {
-      java.lang.Object ref = clientMd5_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientMd5_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int IS_DATA_NEED_RELOGIN_FIELD_NUMBER = 11;
+    public static final int IS_DATA_NEED_RELOGIN_FIELD_NUMBER = 7;
     private boolean isDataNeedRelogin_;
     /**
-     * <code>bool is_data_need_relogin = 11;</code>
+     * <code>bool is_data_need_relogin = 7;</code>
      * @return The isDataNeedRelogin.
      */
     @java.lang.Override
@@ -489,10 +337,78 @@ public final class DataResVersionNotifyOuterClass {
       return isDataNeedRelogin_;
     }
 
-    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 6;
+    public static final int CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER = 9;
+    private int clientSilenceDataVersion_;
+    /**
+     * <code>uint32 client_silence_data_version = 9;</code>
+     * @return The clientSilenceDataVersion.
+     */
+    @java.lang.Override
+    public int getClientSilenceDataVersion() {
+      return clientSilenceDataVersion_;
+    }
+
+    public static final int JKANELMFGEP_FIELD_NUMBER = 10;
+    private volatile java.lang.Object jKANELMFGEP_;
+    /**
+     * <code>string JKANELMFGEP = 10;</code>
+     * @return The jKANELMFGEP.
+     */
+    @java.lang.Override
+    public java.lang.String getJKANELMFGEP() {
+      java.lang.Object ref = jKANELMFGEP_;
+      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();
+        jKANELMFGEP_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string JKANELMFGEP = 10;</code>
+     * @return The bytes for jKANELMFGEP.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getJKANELMFGEPBytes() {
+      java.lang.Object ref = jKANELMFGEP_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        jKANELMFGEP_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OP_TYPE_FIELD_NUMBER = 11;
+    private int opType_;
+    /**
+     * <code>.DataResVersionOpType op_type = 11;</code>
+     * @return The enum numeric value on the wire for opType.
+     */
+    @java.lang.Override public int getOpTypeValue() {
+      return opType_;
+    }
+    /**
+     * <code>.DataResVersionOpType op_type = 11;</code>
+     * @return The opType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType getOpType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType result = emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.valueOf(opType_);
+      return result == null ? emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.UNRECOGNIZED : result;
+    }
+
+    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 13;
     private volatile java.lang.Object clientSilenceVersionSuffix_;
     /**
-     * <code>string client_silence_version_suffix = 6;</code>
+     * <code>string client_silence_version_suffix = 13;</code>
      * @return The clientSilenceVersionSuffix.
      */
     @java.lang.Override
@@ -509,7 +425,7 @@ public final class DataResVersionNotifyOuterClass {
       }
     }
     /**
-     * <code>string client_silence_version_suffix = 6;</code>
+     * <code>string client_silence_version_suffix = 13;</code>
      * @return The bytes for clientSilenceVersionSuffix.
      */
     @java.lang.Override
@@ -527,40 +443,10 @@ public final class DataResVersionNotifyOuterClass {
       }
     }
 
-    public static final int OP_TYPE_FIELD_NUMBER = 14;
-    private int opType_;
-    /**
-     * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-     * @return The enum numeric value on the wire for opType.
-     */
-    @java.lang.Override public int getOpTypeValue() {
-      return opType_;
-    }
-    /**
-     * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-     * @return The opType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType getOpType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType result = emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.valueOf(opType_);
-      return result == null ? emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.UNRECOGNIZED : result;
-    }
-
-    public static final int CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER = 4;
-    private int clientSilenceDataVersion_;
-    /**
-     * <code>uint32 client_silence_data_version = 4;</code>
-     * @return The clientSilenceDataVersion.
-     */
-    @java.lang.Override
-    public int getClientSilenceDataVersion() {
-      return clientSilenceDataVersion_;
-    }
-
-    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 3;
+    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 14;
     private int clientDataVersion_;
     /**
-     * <code>uint32 client_data_version = 3;</code>
+     * <code>uint32 client_data_version = 14;</code>
      * @return The clientDataVersion.
      */
     @java.lang.Override
@@ -568,42 +454,30 @@ public final class DataResVersionNotifyOuterClass {
       return clientDataVersion_;
     }
 
-    public static final int CLIENT_SILENCE_MD5_FIELD_NUMBER = 12;
-    private volatile java.lang.Object clientSilenceMd5_;
+    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
     /**
-     * <code>string client_silence_md5 = 12;</code>
-     * @return The clientSilenceMd5.
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     * @return Whether the resVersionConfig field is set.
      */
     @java.lang.Override
-    public java.lang.String getClientSilenceMd5() {
-      java.lang.Object ref = clientSilenceMd5_;
-      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();
-        clientSilenceMd5_ = s;
-        return s;
-      }
+    public boolean hasResVersionConfig() {
+      return resVersionConfig_ != null;
     }
     /**
-     * <code>string client_silence_md5 = 12;</code>
-     * @return The bytes for clientSilenceMd5.
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     * @return The resVersionConfig.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientSilenceMd5Bytes() {
-      java.lang.Object ref = clientSilenceMd5_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientSilenceMd5_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
+      return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
+    }
+    /**
+     * <code>.ResVersionConfig res_version_config = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
+      return getResVersionConfig();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -620,32 +494,32 @@ public final class DataResVersionNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (resVersionConfig_ != null) {
-        output.writeMessage(2, getResVersionConfig());
-      }
-      if (clientDataVersion_ != 0) {
-        output.writeUInt32(3, clientDataVersion_);
-      }
-      if (clientSilenceDataVersion_ != 0) {
-        output.writeUInt32(4, clientSilenceDataVersion_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, clientMd5_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, clientSilenceVersionSuffix_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pKEKLEEOLJL_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, pKEKLEEOLJL_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, clientVersionSuffix_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, clientVersionSuffix_);
       }
       if (isDataNeedRelogin_ != false) {
-        output.writeBool(11, isDataNeedRelogin_);
+        output.writeBool(7, isDataNeedRelogin_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, clientSilenceMd5_);
+      if (clientSilenceDataVersion_ != 0) {
+        output.writeUInt32(9, clientSilenceDataVersion_);
       }
-      if (opType_ != emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.OP_TYPE_NONE.getNumber()) {
-        output.writeEnum(14, opType_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jKANELMFGEP_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, jKANELMFGEP_);
+      }
+      if (opType_ != emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.OP_TYPE_NONE.getNumber()) {
+        output.writeEnum(11, opType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, clientSilenceVersionSuffix_);
+      }
+      if (clientDataVersion_ != 0) {
+        output.writeUInt32(14, clientDataVersion_);
+      }
+      if (resVersionConfig_ != null) {
+        output.writeMessage(15, getResVersionConfig());
       }
       unknownFields.writeTo(output);
     }
@@ -656,37 +530,37 @@ public final class DataResVersionNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (resVersionConfig_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getResVersionConfig());
-      }
-      if (clientDataVersion_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, clientDataVersion_);
-      }
-      if (clientSilenceDataVersion_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, clientSilenceDataVersion_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, clientMd5_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, clientSilenceVersionSuffix_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pKEKLEEOLJL_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, pKEKLEEOLJL_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, clientVersionSuffix_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, clientVersionSuffix_);
       }
       if (isDataNeedRelogin_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isDataNeedRelogin_);
+          .computeBoolSize(7, isDataNeedRelogin_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, clientSilenceMd5_);
-      }
-      if (opType_ != emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.OP_TYPE_NONE.getNumber()) {
+      if (clientSilenceDataVersion_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, opType_);
+          .computeUInt32Size(9, clientSilenceDataVersion_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jKANELMFGEP_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, jKANELMFGEP_);
+      }
+      if (opType_ != emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.OP_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(11, opType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, clientSilenceVersionSuffix_);
+      }
+      if (clientDataVersion_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, clientDataVersion_);
+      }
+      if (resVersionConfig_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getResVersionConfig());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -703,26 +577,26 @@ public final class DataResVersionNotifyOuterClass {
       }
       emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify other = (emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify) obj;
 
+      if (!getPKEKLEEOLJL()
+          .equals(other.getPKEKLEEOLJL())) return false;
       if (!getClientVersionSuffix()
           .equals(other.getClientVersionSuffix())) return false;
+      if (getIsDataNeedRelogin()
+          != other.getIsDataNeedRelogin()) return false;
+      if (getClientSilenceDataVersion()
+          != other.getClientSilenceDataVersion()) return false;
+      if (!getJKANELMFGEP()
+          .equals(other.getJKANELMFGEP())) return false;
+      if (opType_ != other.opType_) return false;
+      if (!getClientSilenceVersionSuffix()
+          .equals(other.getClientSilenceVersionSuffix())) return false;
+      if (getClientDataVersion()
+          != other.getClientDataVersion()) return false;
       if (hasResVersionConfig() != other.hasResVersionConfig()) return false;
       if (hasResVersionConfig()) {
         if (!getResVersionConfig()
             .equals(other.getResVersionConfig())) return false;
       }
-      if (!getClientMd5()
-          .equals(other.getClientMd5())) return false;
-      if (getIsDataNeedRelogin()
-          != other.getIsDataNeedRelogin()) return false;
-      if (!getClientSilenceVersionSuffix()
-          .equals(other.getClientSilenceVersionSuffix())) return false;
-      if (opType_ != other.opType_) return false;
-      if (getClientSilenceDataVersion()
-          != other.getClientSilenceDataVersion()) return false;
-      if (getClientDataVersion()
-          != other.getClientDataVersion()) return false;
-      if (!getClientSilenceMd5()
-          .equals(other.getClientSilenceMd5())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -734,27 +608,27 @@ public final class DataResVersionNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PKEKLEEOLJL_FIELD_NUMBER;
+      hash = (53 * hash) + getPKEKLEEOLJL().hashCode();
       hash = (37 * hash) + CLIENT_VERSION_SUFFIX_FIELD_NUMBER;
       hash = (53 * hash) + getClientVersionSuffix().hashCode();
+      hash = (37 * hash) + IS_DATA_NEED_RELOGIN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsDataNeedRelogin());
+      hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getClientSilenceDataVersion();
+      hash = (37 * hash) + JKANELMFGEP_FIELD_NUMBER;
+      hash = (53 * hash) + getJKANELMFGEP().hashCode();
+      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + opType_;
+      hash = (37 * hash) + CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER;
+      hash = (53 * hash) + getClientSilenceVersionSuffix().hashCode();
+      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getClientDataVersion();
       if (hasResVersionConfig()) {
         hash = (37 * hash) + RES_VERSION_CONFIG_FIELD_NUMBER;
         hash = (53 * hash) + getResVersionConfig().hashCode();
       }
-      hash = (37 * hash) + CLIENT_MD5_FIELD_NUMBER;
-      hash = (53 * hash) + getClientMd5().hashCode();
-      hash = (37 * hash) + IS_DATA_NEED_RELOGIN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsDataNeedRelogin());
-      hash = (37 * hash) + CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceVersionSuffix().hashCode();
-      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + opType_;
-      hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceDataVersion();
-      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientDataVersion();
-      hash = (37 * hash) + CLIENT_SILENCE_MD5_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceMd5().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -851,11 +725,6 @@ public final class DataResVersionNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4819
-     * Obf: LICDGGFHBKO
-     * </pre>
-     *
      * Protobuf type {@code DataResVersionNotify}
      */
     public static final class Builder extends
@@ -893,28 +762,28 @@ public final class DataResVersionNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        pKEKLEEOLJL_ = "";
+
         clientVersionSuffix_ = "";
 
+        isDataNeedRelogin_ = false;
+
+        clientSilenceDataVersion_ = 0;
+
+        jKANELMFGEP_ = "";
+
+        opType_ = 0;
+
+        clientSilenceVersionSuffix_ = "";
+
+        clientDataVersion_ = 0;
+
         if (resVersionConfigBuilder_ == null) {
           resVersionConfig_ = null;
         } else {
           resVersionConfig_ = null;
           resVersionConfigBuilder_ = null;
         }
-        clientMd5_ = "";
-
-        isDataNeedRelogin_ = false;
-
-        clientSilenceVersionSuffix_ = "";
-
-        opType_ = 0;
-
-        clientSilenceDataVersion_ = 0;
-
-        clientDataVersion_ = 0;
-
-        clientSilenceMd5_ = "";
-
         return this;
       }
 
@@ -941,19 +810,19 @@ public final class DataResVersionNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify buildPartial() {
         emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify result = new emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify(this);
+        result.pKEKLEEOLJL_ = pKEKLEEOLJL_;
         result.clientVersionSuffix_ = clientVersionSuffix_;
+        result.isDataNeedRelogin_ = isDataNeedRelogin_;
+        result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
+        result.jKANELMFGEP_ = jKANELMFGEP_;
+        result.opType_ = opType_;
+        result.clientSilenceVersionSuffix_ = clientSilenceVersionSuffix_;
+        result.clientDataVersion_ = clientDataVersion_;
         if (resVersionConfigBuilder_ == null) {
           result.resVersionConfig_ = resVersionConfig_;
         } else {
           result.resVersionConfig_ = resVersionConfigBuilder_.build();
         }
-        result.clientMd5_ = clientMd5_;
-        result.isDataNeedRelogin_ = isDataNeedRelogin_;
-        result.clientSilenceVersionSuffix_ = clientSilenceVersionSuffix_;
-        result.opType_ = opType_;
-        result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
-        result.clientDataVersion_ = clientDataVersion_;
-        result.clientSilenceMd5_ = clientSilenceMd5_;
         onBuilt();
         return result;
       }
@@ -1002,36 +871,36 @@ public final class DataResVersionNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify other) {
         if (other == emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.getDefaultInstance()) return this;
-        if (!other.getClientVersionSuffix().isEmpty()) {
-          clientVersionSuffix_ = other.clientVersionSuffix_;
+        if (!other.getPKEKLEEOLJL().isEmpty()) {
+          pKEKLEEOLJL_ = other.pKEKLEEOLJL_;
           onChanged();
         }
-        if (other.hasResVersionConfig()) {
-          mergeResVersionConfig(other.getResVersionConfig());
-        }
-        if (!other.getClientMd5().isEmpty()) {
-          clientMd5_ = other.clientMd5_;
+        if (!other.getClientVersionSuffix().isEmpty()) {
+          clientVersionSuffix_ = other.clientVersionSuffix_;
           onChanged();
         }
         if (other.getIsDataNeedRelogin() != false) {
           setIsDataNeedRelogin(other.getIsDataNeedRelogin());
         }
-        if (!other.getClientSilenceVersionSuffix().isEmpty()) {
-          clientSilenceVersionSuffix_ = other.clientSilenceVersionSuffix_;
+        if (other.getClientSilenceDataVersion() != 0) {
+          setClientSilenceDataVersion(other.getClientSilenceDataVersion());
+        }
+        if (!other.getJKANELMFGEP().isEmpty()) {
+          jKANELMFGEP_ = other.jKANELMFGEP_;
           onChanged();
         }
         if (other.opType_ != 0) {
           setOpTypeValue(other.getOpTypeValue());
         }
-        if (other.getClientSilenceDataVersion() != 0) {
-          setClientSilenceDataVersion(other.getClientSilenceDataVersion());
+        if (!other.getClientSilenceVersionSuffix().isEmpty()) {
+          clientSilenceVersionSuffix_ = other.clientSilenceVersionSuffix_;
+          onChanged();
         }
         if (other.getClientDataVersion() != 0) {
           setClientDataVersion(other.getClientDataVersion());
         }
-        if (!other.getClientSilenceMd5().isEmpty()) {
-          clientSilenceMd5_ = other.clientSilenceMd5_;
-          onChanged();
+        if (other.hasResVersionConfig()) {
+          mergeResVersionConfig(other.getResVersionConfig());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1062,9 +931,85 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
 
+      private java.lang.Object pKEKLEEOLJL_ = "";
+      /**
+       * <code>string PKEKLEEOLJL = 3;</code>
+       * @return The pKEKLEEOLJL.
+       */
+      public java.lang.String getPKEKLEEOLJL() {
+        java.lang.Object ref = pKEKLEEOLJL_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          pKEKLEEOLJL_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 3;</code>
+       * @return The bytes for pKEKLEEOLJL.
+       */
+      public com.google.protobuf.ByteString
+          getPKEKLEEOLJLBytes() {
+        java.lang.Object ref = pKEKLEEOLJL_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          pKEKLEEOLJL_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 3;</code>
+       * @param value The pKEKLEEOLJL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPKEKLEEOLJL(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        pKEKLEEOLJL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPKEKLEEOLJL() {
+        
+        pKEKLEEOLJL_ = getDefaultInstance().getPKEKLEEOLJL();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 3;</code>
+       * @param value The bytes for pKEKLEEOLJL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPKEKLEEOLJLBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        pKEKLEEOLJL_ = value;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object clientVersionSuffix_ = "";
       /**
-       * <code>string client_version_suffix = 9;</code>
+       * <code>string client_version_suffix = 4;</code>
        * @return The clientVersionSuffix.
        */
       public java.lang.String getClientVersionSuffix() {
@@ -1080,7 +1025,7 @@ public final class DataResVersionNotifyOuterClass {
         }
       }
       /**
-       * <code>string client_version_suffix = 9;</code>
+       * <code>string client_version_suffix = 4;</code>
        * @return The bytes for clientVersionSuffix.
        */
       public com.google.protobuf.ByteString
@@ -1097,7 +1042,7 @@ public final class DataResVersionNotifyOuterClass {
         }
       }
       /**
-       * <code>string client_version_suffix = 9;</code>
+       * <code>string client_version_suffix = 4;</code>
        * @param value The clientVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -1112,7 +1057,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string client_version_suffix = 9;</code>
+       * <code>string client_version_suffix = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientVersionSuffix() {
@@ -1122,7 +1067,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string client_version_suffix = 9;</code>
+       * <code>string client_version_suffix = 4;</code>
        * @param value The bytes for clientVersionSuffix to set.
        * @return This builder for chaining.
        */
@@ -1138,18 +1083,317 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
 
+      private boolean isDataNeedRelogin_ ;
+      /**
+       * <code>bool is_data_need_relogin = 7;</code>
+       * @return The isDataNeedRelogin.
+       */
+      @java.lang.Override
+      public boolean getIsDataNeedRelogin() {
+        return isDataNeedRelogin_;
+      }
+      /**
+       * <code>bool is_data_need_relogin = 7;</code>
+       * @param value The isDataNeedRelogin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsDataNeedRelogin(boolean value) {
+        
+        isDataNeedRelogin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_data_need_relogin = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsDataNeedRelogin() {
+        
+        isDataNeedRelogin_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int clientSilenceDataVersion_ ;
+      /**
+       * <code>uint32 client_silence_data_version = 9;</code>
+       * @return The clientSilenceDataVersion.
+       */
+      @java.lang.Override
+      public int getClientSilenceDataVersion() {
+        return clientSilenceDataVersion_;
+      }
+      /**
+       * <code>uint32 client_silence_data_version = 9;</code>
+       * @param value The clientSilenceDataVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientSilenceDataVersion(int value) {
+        
+        clientSilenceDataVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 client_silence_data_version = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientSilenceDataVersion() {
+        
+        clientSilenceDataVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object jKANELMFGEP_ = "";
+      /**
+       * <code>string JKANELMFGEP = 10;</code>
+       * @return The jKANELMFGEP.
+       */
+      public java.lang.String getJKANELMFGEP() {
+        java.lang.Object ref = jKANELMFGEP_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          jKANELMFGEP_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string JKANELMFGEP = 10;</code>
+       * @return The bytes for jKANELMFGEP.
+       */
+      public com.google.protobuf.ByteString
+          getJKANELMFGEPBytes() {
+        java.lang.Object ref = jKANELMFGEP_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          jKANELMFGEP_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string JKANELMFGEP = 10;</code>
+       * @param value The jKANELMFGEP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJKANELMFGEP(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        jKANELMFGEP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JKANELMFGEP = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJKANELMFGEP() {
+        
+        jKANELMFGEP_ = getDefaultInstance().getJKANELMFGEP();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JKANELMFGEP = 10;</code>
+       * @param value The bytes for jKANELMFGEP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJKANELMFGEPBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        jKANELMFGEP_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int opType_ = 0;
+      /**
+       * <code>.DataResVersionOpType op_type = 11;</code>
+       * @return The enum numeric value on the wire for opType.
+       */
+      @java.lang.Override public int getOpTypeValue() {
+        return opType_;
+      }
+      /**
+       * <code>.DataResVersionOpType op_type = 11;</code>
+       * @param value The enum numeric value on the wire for opType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOpTypeValue(int value) {
+        
+        opType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.DataResVersionOpType op_type = 11;</code>
+       * @return The opType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType getOpType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType result = emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.valueOf(opType_);
+        return result == null ? emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.DataResVersionOpType op_type = 11;</code>
+       * @param value The opType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOpType(emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.DataResVersionOpType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        opType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.DataResVersionOpType op_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOpType() {
+        
+        opType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object clientSilenceVersionSuffix_ = "";
+      /**
+       * <code>string client_silence_version_suffix = 13;</code>
+       * @return The clientSilenceVersionSuffix.
+       */
+      public java.lang.String getClientSilenceVersionSuffix() {
+        java.lang.Object ref = clientSilenceVersionSuffix_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          clientSilenceVersionSuffix_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string client_silence_version_suffix = 13;</code>
+       * @return The bytes for clientSilenceVersionSuffix.
+       */
+      public com.google.protobuf.ByteString
+          getClientSilenceVersionSuffixBytes() {
+        java.lang.Object ref = clientSilenceVersionSuffix_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          clientSilenceVersionSuffix_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string client_silence_version_suffix = 13;</code>
+       * @param value The clientSilenceVersionSuffix to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientSilenceVersionSuffix(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientSilenceVersionSuffix_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_silence_version_suffix = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientSilenceVersionSuffix() {
+        
+        clientSilenceVersionSuffix_ = getDefaultInstance().getClientSilenceVersionSuffix();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_silence_version_suffix = 13;</code>
+       * @param value The bytes for clientSilenceVersionSuffix to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientSilenceVersionSuffixBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        clientSilenceVersionSuffix_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int clientDataVersion_ ;
+      /**
+       * <code>uint32 client_data_version = 14;</code>
+       * @return The clientDataVersion.
+       */
+      @java.lang.Override
+      public int getClientDataVersion() {
+        return clientDataVersion_;
+      }
+      /**
+       * <code>uint32 client_data_version = 14;</code>
+       * @param value The clientDataVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientDataVersion(int value) {
+        
+        clientDataVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 client_data_version = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientDataVersion() {
+        
+        clientDataVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
       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 = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        * @return Whether the resVersionConfig field is set.
        */
       public boolean hasResVersionConfig() {
         return resVersionConfigBuilder_ != null || resVersionConfig_ != null;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        * @return The resVersionConfig.
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
@@ -1160,7 +1404,7 @@ public final class DataResVersionNotifyOuterClass {
         }
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public Builder setResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (resVersionConfigBuilder_ == null) {
@@ -1176,7 +1420,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public Builder setResVersionConfig(
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder builderForValue) {
@@ -1190,7 +1434,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public Builder mergeResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (resVersionConfigBuilder_ == null) {
@@ -1208,7 +1452,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public Builder clearResVersionConfig() {
         if (resVersionConfigBuilder_ == null) {
@@ -1222,7 +1466,7 @@ public final class DataResVersionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder getResVersionConfigBuilder() {
         
@@ -1230,7 +1474,7 @@ public final class DataResVersionNotifyOuterClass {
         return getResVersionConfigFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
         if (resVersionConfigBuilder_ != null) {
@@ -1241,7 +1485,7 @@ public final class DataResVersionNotifyOuterClass {
         }
       }
       /**
-       * <code>.ResVersionConfig res_version_config = 2;</code>
+       * <code>.ResVersionConfig res_version_config = 15;</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> 
@@ -1256,381 +1500,6 @@ public final class DataResVersionNotifyOuterClass {
         }
         return resVersionConfigBuilder_;
       }
-
-      private java.lang.Object clientMd5_ = "";
-      /**
-       * <code>string client_md5 = 5;</code>
-       * @return The clientMd5.
-       */
-      public java.lang.String getClientMd5() {
-        java.lang.Object ref = clientMd5_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientMd5_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_md5 = 5;</code>
-       * @return The bytes for clientMd5.
-       */
-      public com.google.protobuf.ByteString
-          getClientMd5Bytes() {
-        java.lang.Object ref = clientMd5_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientMd5_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_md5 = 5;</code>
-       * @param value The clientMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientMd5(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientMd5_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_md5 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientMd5() {
-        
-        clientMd5_ = getDefaultInstance().getClientMd5();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_md5 = 5;</code>
-       * @param value The bytes for clientMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientMd5Bytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientMd5_ = value;
-        onChanged();
-        return this;
-      }
-
-      private boolean isDataNeedRelogin_ ;
-      /**
-       * <code>bool is_data_need_relogin = 11;</code>
-       * @return The isDataNeedRelogin.
-       */
-      @java.lang.Override
-      public boolean getIsDataNeedRelogin() {
-        return isDataNeedRelogin_;
-      }
-      /**
-       * <code>bool is_data_need_relogin = 11;</code>
-       * @param value The isDataNeedRelogin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsDataNeedRelogin(boolean value) {
-        
-        isDataNeedRelogin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_data_need_relogin = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsDataNeedRelogin() {
-        
-        isDataNeedRelogin_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientSilenceVersionSuffix_ = "";
-      /**
-       * <code>string client_silence_version_suffix = 6;</code>
-       * @return The clientSilenceVersionSuffix.
-       */
-      public java.lang.String getClientSilenceVersionSuffix() {
-        java.lang.Object ref = clientSilenceVersionSuffix_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientSilenceVersionSuffix_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_version_suffix = 6;</code>
-       * @return The bytes for clientSilenceVersionSuffix.
-       */
-      public com.google.protobuf.ByteString
-          getClientSilenceVersionSuffixBytes() {
-        java.lang.Object ref = clientSilenceVersionSuffix_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientSilenceVersionSuffix_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_version_suffix = 6;</code>
-       * @param value The clientSilenceVersionSuffix to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceVersionSuffix(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientSilenceVersionSuffix_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_version_suffix = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientSilenceVersionSuffix() {
-        
-        clientSilenceVersionSuffix_ = getDefaultInstance().getClientSilenceVersionSuffix();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_version_suffix = 6;</code>
-       * @param value The bytes for clientSilenceVersionSuffix to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceVersionSuffixBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientSilenceVersionSuffix_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int opType_ = 0;
-      /**
-       * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-       * @return The enum numeric value on the wire for opType.
-       */
-      @java.lang.Override public int getOpTypeValue() {
-        return opType_;
-      }
-      /**
-       * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-       * @param value The enum numeric value on the wire for opType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpTypeValue(int value) {
-        
-        opType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-       * @return The opType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType getOpType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType result = emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.valueOf(opType_);
-        return result == null ? emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-       * @param value The opType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpType(emu.grasscutter.net.proto.DataResVersionNotifyOuterClass.DataResVersionNotify.DataResVersionOpType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        opType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.DataResVersionNotify.DataResVersionOpType op_type = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOpType() {
-        
-        opType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int clientSilenceDataVersion_ ;
-      /**
-       * <code>uint32 client_silence_data_version = 4;</code>
-       * @return The clientSilenceDataVersion.
-       */
-      @java.lang.Override
-      public int getClientSilenceDataVersion() {
-        return clientSilenceDataVersion_;
-      }
-      /**
-       * <code>uint32 client_silence_data_version = 4;</code>
-       * @param value The clientSilenceDataVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceDataVersion(int value) {
-        
-        clientSilenceDataVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 client_silence_data_version = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientSilenceDataVersion() {
-        
-        clientSilenceDataVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int clientDataVersion_ ;
-      /**
-       * <code>uint32 client_data_version = 3;</code>
-       * @return The clientDataVersion.
-       */
-      @java.lang.Override
-      public int getClientDataVersion() {
-        return clientDataVersion_;
-      }
-      /**
-       * <code>uint32 client_data_version = 3;</code>
-       * @param value The clientDataVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientDataVersion(int value) {
-        
-        clientDataVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 client_data_version = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientDataVersion() {
-        
-        clientDataVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientSilenceMd5_ = "";
-      /**
-       * <code>string client_silence_md5 = 12;</code>
-       * @return The clientSilenceMd5.
-       */
-      public java.lang.String getClientSilenceMd5() {
-        java.lang.Object ref = clientSilenceMd5_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientSilenceMd5_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_md5 = 12;</code>
-       * @return The bytes for clientSilenceMd5.
-       */
-      public com.google.protobuf.ByteString
-          getClientSilenceMd5Bytes() {
-        java.lang.Object ref = clientSilenceMd5_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientSilenceMd5_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_md5 = 12;</code>
-       * @param value The clientSilenceMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceMd5(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientSilenceMd5_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_md5 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientSilenceMd5() {
-        
-        clientSilenceMd5_ = getDefaultInstance().getClientSilenceMd5();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_md5 = 12;</code>
-       * @param value The bytes for clientSilenceMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceMd5Bytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientSilenceMd5_ = value;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1698,24 +1567,22 @@ public final class DataResVersionNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032DataResVersionNotify.proto\032\026ResVersion" +
-      "Config.proto\"\257\003\n\024DataResVersionNotify\022\035\n" +
-      "\025client_version_suffix\030\t \001(\t\022-\n\022res_vers" +
-      "ion_config\030\002 \001(\0132\021.ResVersionConfig\022\022\n\nc" +
-      "lient_md5\030\005 \001(\t\022\034\n\024is_data_need_relogin\030" +
-      "\013 \001(\010\022%\n\035client_silence_version_suffix\030\006" +
-      " \001(\t\022;\n\007op_type\030\016 \001(\0162*.DataResVersionNo" +
-      "tify.DataResVersionOpType\022#\n\033client_sile" +
-      "nce_data_version\030\004 \001(\r\022\033\n\023client_data_ve" +
-      "rsion\030\003 \001(\r\022\032\n\022client_silence_md5\030\014 \001(\t\"" +
-      "U\n\024DataResVersionOpType\022\020\n\014OP_TYPE_NONE\020" +
-      "\000\022\023\n\017OP_TYPE_RELOGIN\020\001\022\026\n\022OP_TYPE_MP_REL" +
-      "OGIN\020\002B\033\n\031emu.grasscutter.net.protob\006pro" +
-      "to3"
+      "\n\032DataResVersionNotify.proto\032\032DataResVer" +
+      "sionOpType.proto\032\026ResVersionConfig.proto" +
+      "\"\275\002\n\024DataResVersionNotify\022\023\n\013PKEKLEEOLJL" +
+      "\030\003 \001(\t\022\035\n\025client_version_suffix\030\004 \001(\t\022\034\n" +
+      "\024is_data_need_relogin\030\007 \001(\010\022#\n\033client_si" +
+      "lence_data_version\030\t \001(\r\022\023\n\013JKANELMFGEP\030" +
+      "\n \001(\t\022&\n\007op_type\030\013 \001(\0162\025.DataResVersionO" +
+      "pType\022%\n\035client_silence_version_suffix\030\r" +
+      " \001(\t\022\033\n\023client_data_version\030\016 \001(\r\022-\n\022res" +
+      "_version_config\030\017 \001(\0132\021.ResVersionConfig" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.getDescriptor(),
         });
     internal_static_DataResVersionNotify_descriptor =
@@ -1723,7 +1590,8 @@ public final class DataResVersionNotifyOuterClass {
     internal_static_DataResVersionNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DataResVersionNotify_descriptor,
-        new java.lang.String[] { "ClientVersionSuffix", "ResVersionConfig", "ClientMd5", "IsDataNeedRelogin", "ClientSilenceVersionSuffix", "OpType", "ClientSilenceDataVersion", "ClientDataVersion", "ClientSilenceMd5", });
+        new java.lang.String[] { "PKEKLEEOLJL", "ClientVersionSuffix", "IsDataNeedRelogin", "ClientSilenceDataVersion", "JKANELMFGEP", "OpType", "ClientSilenceVersionSuffix", "ClientDataVersion", "ResVersionConfig", });
+    emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionOpTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionOpTypeOuterClass.java
new file mode 100644
index 000000000..6ea92d70d
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DataResVersionOpTypeOuterClass.java
@@ -0,0 +1,155 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DataResVersionOpType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class DataResVersionOpTypeOuterClass {
+  private DataResVersionOpTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code DataResVersionOpType}
+   */
+  public enum DataResVersionOpType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>OP_TYPE_NONE = 0;</code>
+     */
+    OP_TYPE_NONE(0),
+    /**
+     * <code>OP_TYPE_RELOGIN = 1;</code>
+     */
+    OP_TYPE_RELOGIN(1),
+    /**
+     * <code>OP_TYPE_MP_RELOGIN = 2;</code>
+     */
+    OP_TYPE_MP_RELOGIN(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>OP_TYPE_NONE = 0;</code>
+     */
+    public static final int OP_TYPE_NONE_VALUE = 0;
+    /**
+     * <code>OP_TYPE_RELOGIN = 1;</code>
+     */
+    public static final int OP_TYPE_RELOGIN_VALUE = 1;
+    /**
+     * <code>OP_TYPE_MP_RELOGIN = 2;</code>
+     */
+    public static final int OP_TYPE_MP_RELOGIN_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static DataResVersionOpType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static DataResVersionOpType forNumber(int value) {
+      switch (value) {
+        case 0: return OP_TYPE_NONE;
+        case 1: return OP_TYPE_RELOGIN;
+        case 2: return OP_TYPE_MP_RELOGIN;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<DataResVersionOpType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        DataResVersionOpType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<DataResVersionOpType>() {
+            public DataResVersionOpType findValueByNumber(int number) {
+              return DataResVersionOpType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.DataResVersionOpTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final DataResVersionOpType[] VALUES = values();
+
+    public static DataResVersionOpType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private DataResVersionOpType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:DataResVersionOpType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\032DataResVersionOpType.proto*U\n\024DataResV" +
+      "ersionOpType\022\020\n\014OP_TYPE_NONE\020\000\022\023\n\017OP_TYP" +
+      "E_RELOGIN\020\001\022\026\n\022OP_TYPE_MP_RELOGIN\020\002B\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DateTimeDeleteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DateTimeDeleteOuterClass.java
new file mode 100644
index 000000000..20dedc1ca
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DateTimeDeleteOuterClass.java
@@ -0,0 +1,536 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DateTimeDelete.proto
+
+package emu.grasscutter.net.proto;
+
+public final class DateTimeDeleteOuterClass {
+  private DateTimeDeleteOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface DateTimeDeleteOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:DateTimeDelete)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 delete_time = 1;</code>
+     * @return The deleteTime.
+     */
+    int getDeleteTime();
+  }
+  /**
+   * Protobuf type {@code DateTimeDelete}
+   */
+  public static final class DateTimeDelete extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:DateTimeDelete)
+      DateTimeDeleteOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use DateTimeDelete.newBuilder() to construct.
+    private DateTimeDelete(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private DateTimeDelete() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new DateTimeDelete();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DateTimeDelete(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              deleteTime_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.internal_static_DateTimeDelete_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.internal_static_DateTimeDelete_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.class, emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.Builder.class);
+    }
+
+    public static final int DELETE_TIME_FIELD_NUMBER = 1;
+    private int deleteTime_;
+    /**
+     * <code>uint32 delete_time = 1;</code>
+     * @return The deleteTime.
+     */
+    @java.lang.Override
+    public int getDeleteTime() {
+      return deleteTime_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (deleteTime_ != 0) {
+        output.writeUInt32(1, deleteTime_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (deleteTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, deleteTime_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete other = (emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete) obj;
+
+      if (getDeleteTime()
+          != other.getDeleteTime()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DELETE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getDeleteTime();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code DateTimeDelete}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:DateTimeDelete)
+        emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDeleteOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.internal_static_DateTimeDelete_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.internal_static_DateTimeDelete_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.class, emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        deleteTime_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.internal_static_DateTimeDelete_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete build() {
+        emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete buildPartial() {
+        emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete result = new emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete(this);
+        result.deleteTime_ = deleteTime_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete) {
+          return mergeFrom((emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete other) {
+        if (other == emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete.getDefaultInstance()) return this;
+        if (other.getDeleteTime() != 0) {
+          setDeleteTime(other.getDeleteTime());
+        }
+        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.DateTimeDeleteOuterClass.DateTimeDelete parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int deleteTime_ ;
+      /**
+       * <code>uint32 delete_time = 1;</code>
+       * @return The deleteTime.
+       */
+      @java.lang.Override
+      public int getDeleteTime() {
+        return deleteTime_;
+      }
+      /**
+       * <code>uint32 delete_time = 1;</code>
+       * @param value The deleteTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDeleteTime(int value) {
+        
+        deleteTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 delete_time = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDeleteTime() {
+        
+        deleteTime_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:DateTimeDelete)
+    }
+
+    // @@protoc_insertion_point(class_scope:DateTimeDelete)
+    private static final emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete();
+    }
+
+    public static emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<DateTimeDelete>
+        PARSER = new com.google.protobuf.AbstractParser<DateTimeDelete>() {
+      @java.lang.Override
+      public DateTimeDelete parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DateTimeDelete(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<DateTimeDelete> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DateTimeDelete> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DateTimeDeleteOuterClass.DateTimeDelete getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_DateTimeDelete_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_DateTimeDelete_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\024DateTimeDelete.proto\"%\n\016DateTimeDelete" +
+      "\022\023\n\013delete_time\030\001 \001(\rB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_DateTimeDelete_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_DateTimeDelete_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_DateTimeDelete_descriptor,
+        new java.lang.String[] { "DeleteTime", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendReqOuterClass.java
index e460cee2e..3b90b0c21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendReqOuterClass.java
@@ -19,28 +19,23 @@ public final class DealAddFriendReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
      * @return The enum numeric value on the wire for dealAddFriendResult.
      */
     int getDealAddFriendResultValue();
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
      * @return The dealAddFriendResult.
      */
     emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType getDealAddFriendResult();
 
     /**
-     * <code>uint32 target_uid = 1;</code>
+     * <code>uint32 target_uid = 5;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 25212
-   * Obf: FAIFBJNFCAG
-   * </pre>
-   *
    * Protobuf type {@code DealAddFriendReq}
    */
   public static final class DealAddFriendReq extends
@@ -86,12 +81,12 @@ public final class DealAddFriendReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 40: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 80: {
               int rawValue = input.readEnum();
 
               dealAddFriendResult_ = rawValue;
@@ -129,17 +124,17 @@ public final class DealAddFriendReqOuterClass {
               emu.grasscutter.net.proto.DealAddFriendReqOuterClass.DealAddFriendReq.class, emu.grasscutter.net.proto.DealAddFriendReqOuterClass.DealAddFriendReq.Builder.class);
     }
 
-    public static final int DEAL_ADD_FRIEND_RESULT_FIELD_NUMBER = 11;
+    public static final int DEAL_ADD_FRIEND_RESULT_FIELD_NUMBER = 10;
     private int dealAddFriendResult_;
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
      * @return The enum numeric value on the wire for dealAddFriendResult.
      */
     @java.lang.Override public int getDealAddFriendResultValue() {
       return dealAddFriendResult_;
     }
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
      * @return The dealAddFriendResult.
      */
     @java.lang.Override public emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType getDealAddFriendResult() {
@@ -148,10 +143,10 @@ public final class DealAddFriendReqOuterClass {
       return result == null ? emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.UNRECOGNIZED : result;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 1;
+    public static final int TARGET_UID_FIELD_NUMBER = 5;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 1;</code>
+     * <code>uint32 target_uid = 5;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -174,10 +169,10 @@ public final class DealAddFriendReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(1, targetUid_);
+        output.writeUInt32(5, targetUid_);
       }
       if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
-        output.writeEnum(11, dealAddFriendResult_);
+        output.writeEnum(10, dealAddFriendResult_);
       }
       unknownFields.writeTo(output);
     }
@@ -190,11 +185,11 @@ public final class DealAddFriendReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, targetUid_);
+          .computeUInt32Size(5, targetUid_);
       }
       if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, dealAddFriendResult_);
+          .computeEnumSize(10, dealAddFriendResult_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -325,11 +320,6 @@ public final class DealAddFriendReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25212
-     * Obf: FAIFBJNFCAG
-     * </pre>
-     *
      * Protobuf type {@code DealAddFriendReq}
      */
     public static final class Builder extends
@@ -484,14 +474,14 @@ public final class DealAddFriendReqOuterClass {
 
       private int dealAddFriendResult_ = 0;
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
        * @return The enum numeric value on the wire for dealAddFriendResult.
        */
       @java.lang.Override public int getDealAddFriendResultValue() {
         return dealAddFriendResult_;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
        * @param value The enum numeric value on the wire for dealAddFriendResult to set.
        * @return This builder for chaining.
        */
@@ -502,7 +492,7 @@ public final class DealAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
        * @return The dealAddFriendResult.
        */
       @java.lang.Override
@@ -512,7 +502,7 @@ public final class DealAddFriendReqOuterClass {
         return result == null ? emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
        * @param value The dealAddFriendResult to set.
        * @return This builder for chaining.
        */
@@ -526,7 +516,7 @@ public final class DealAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 11;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDealAddFriendResult() {
@@ -538,7 +528,7 @@ public final class DealAddFriendReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -546,7 +536,7 @@ public final class DealAddFriendReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -557,7 +547,7 @@ public final class DealAddFriendReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -635,8 +625,8 @@ public final class DealAddFriendReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\026DealAddFriendReq.proto\032\035DealAddFriendR" +
       "esultType.proto\"`\n\020DealAddFriendReq\0228\n\026d" +
-      "eal_add_friend_result\030\013 \001(\0162\030.DealAddFri" +
-      "endResultType\022\022\n\ntarget_uid\030\001 \001(\rB\033\n\031emu" +
+      "eal_add_friend_result\030\n \001(\0162\030.DealAddFri" +
+      "endResultType\022\022\n\ntarget_uid\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/DealAddFriendResultTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendResultTypeOuterClass.java
index 2b25b7b4e..7ad7bfe94 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendResultTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendResultTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class DealAddFriendResultTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: AIMELHBOBLC
-   * </pre>
-   *
    * Protobuf enum {@code DealAddFriendResultType}
    */
   public enum DealAddFriendResultType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendRspOuterClass.java
index 042584a34..e2fcabf54 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DealAddFriendRspOuterClass.java
@@ -19,34 +19,29 @@ public final class DealAddFriendRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 target_uid = 12;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
      * @return The enum numeric value on the wire for dealAddFriendResult.
      */
     int getDealAddFriendResultValue();
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
      * @return The dealAddFriendResult.
      */
     emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType getDealAddFriendResult();
   }
   /**
-   * <pre>
-   * CmdId: 9178
-   * Obf: BCEPNMLPFLB
-   * </pre>
-   *
    * Protobuf type {@code DealAddFriendRsp}
    */
   public static final class DealAddFriendRsp extends
@@ -92,20 +87,20 @@ public final class DealAddFriendRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 16: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
-              int rawValue = input.readEnum();
+            case 80: {
 
-              dealAddFriendResult_ = rawValue;
+              targetUid_ = input.readUInt32();
               break;
             }
             case 96: {
+              int rawValue = input.readEnum();
 
-              targetUid_ = input.readUInt32();
+              dealAddFriendResult_ = rawValue;
               break;
             }
             default: {
@@ -140,10 +135,10 @@ public final class DealAddFriendRspOuterClass {
               emu.grasscutter.net.proto.DealAddFriendRspOuterClass.DealAddFriendRsp.class, emu.grasscutter.net.proto.DealAddFriendRspOuterClass.DealAddFriendRsp.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>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -151,10 +146,10 @@ public final class DealAddFriendRspOuterClass {
       return retcode_;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 12;
+    public static final int TARGET_UID_FIELD_NUMBER = 10;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 12;</code>
+     * <code>uint32 target_uid = 10;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -162,17 +157,17 @@ public final class DealAddFriendRspOuterClass {
       return targetUid_;
     }
 
-    public static final int DEAL_ADD_FRIEND_RESULT_FIELD_NUMBER = 7;
+    public static final int DEAL_ADD_FRIEND_RESULT_FIELD_NUMBER = 12;
     private int dealAddFriendResult_;
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
      * @return The enum numeric value on the wire for dealAddFriendResult.
      */
     @java.lang.Override public int getDealAddFriendResultValue() {
       return dealAddFriendResult_;
     }
     /**
-     * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+     * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
      * @return The dealAddFriendResult.
      */
     @java.lang.Override public emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType getDealAddFriendResult() {
@@ -196,13 +191,13 @@ public final class DealAddFriendRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
-        output.writeEnum(7, dealAddFriendResult_);
+        output.writeInt32(2, retcode_);
       }
       if (targetUid_ != 0) {
-        output.writeUInt32(12, targetUid_);
+        output.writeUInt32(10, targetUid_);
+      }
+      if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
+        output.writeEnum(12, dealAddFriendResult_);
       }
       unknownFields.writeTo(output);
     }
@@ -215,15 +210,15 @@ public final class DealAddFriendRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, dealAddFriendResult_);
+          .computeInt32Size(2, retcode_);
       }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, targetUid_);
+          .computeUInt32Size(10, targetUid_);
+      }
+      if (dealAddFriendResult_ != emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.DEAL_ADD_FRIEND_RESULT_TYPE_REJECT.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(12, dealAddFriendResult_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -358,11 +353,6 @@ public final class DealAddFriendRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9178
-     * Obf: BCEPNMLPFLB
-     * </pre>
-     *
      * Protobuf type {@code DealAddFriendRsp}
      */
     public static final class Builder extends
@@ -523,7 +513,7 @@ public final class DealAddFriendRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -531,7 +521,7 @@ public final class DealAddFriendRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -542,7 +532,7 @@ public final class DealAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -554,7 +544,7 @@ public final class DealAddFriendRspOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -562,7 +552,7 @@ public final class DealAddFriendRspOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -573,7 +563,7 @@ public final class DealAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 12;</code>
+       * <code>uint32 target_uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -585,14 +575,14 @@ public final class DealAddFriendRspOuterClass {
 
       private int dealAddFriendResult_ = 0;
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
        * @return The enum numeric value on the wire for dealAddFriendResult.
        */
       @java.lang.Override public int getDealAddFriendResultValue() {
         return dealAddFriendResult_;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
        * @param value The enum numeric value on the wire for dealAddFriendResult to set.
        * @return This builder for chaining.
        */
@@ -603,7 +593,7 @@ public final class DealAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
        * @return The dealAddFriendResult.
        */
       @java.lang.Override
@@ -613,7 +603,7 @@ public final class DealAddFriendRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.DealAddFriendResultTypeOuterClass.DealAddFriendResultType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
        * @param value The dealAddFriendResult to set.
        * @return This builder for chaining.
        */
@@ -627,7 +617,7 @@ public final class DealAddFriendRspOuterClass {
         return this;
       }
       /**
-       * <code>.DealAddFriendResultType deal_add_friend_result = 7;</code>
+       * <code>.DealAddFriendResultType deal_add_friend_result = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearDealAddFriendResult() {
@@ -705,8 +695,8 @@ public final class DealAddFriendRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\026DealAddFriendRsp.proto\032\035DealAddFriendR" +
       "esultType.proto\"q\n\020DealAddFriendRsp\022\017\n\007r" +
-      "etcode\030\006 \001(\005\022\022\n\ntarget_uid\030\014 \001(\r\0228\n\026deal" +
-      "_add_friend_result\030\007 \001(\0162\030.DealAddFriend" +
+      "etcode\030\002 \001(\005\022\022\n\ntarget_uid\030\n \001(\r\0228\n\026deal" +
+      "_add_friend_result\030\014 \001(\0162\030.DealAddFriend" +
       "ResultTypeB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoNotifyOuterClass.java
index e99b845d2..7a2c9efa4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class DeathZoneInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo> 
         getDeathZoneInfoListList();
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo getDeathZoneInfoList(int index);
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     int getDeathZoneInfoListCount();
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder> 
         getDeathZoneInfoListOrBuilderList();
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder getDeathZoneInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 25105
-   * Obf: FIGCIIMFGEK
-   * </pre>
-   *
    * Protobuf type {@code DeathZoneInfoNotify}
    */
   public static final class DeathZoneInfoNotify extends
@@ -94,7 +89,7 @@ public final class DeathZoneInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 114: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 deathZoneInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class DeathZoneInfoNotifyOuterClass {
               emu.grasscutter.net.proto.DeathZoneInfoNotifyOuterClass.DeathZoneInfoNotify.class, emu.grasscutter.net.proto.DeathZoneInfoNotifyOuterClass.DeathZoneInfoNotify.Builder.class);
     }
 
-    public static final int DEATH_ZONE_INFO_LIST_FIELD_NUMBER = 14;
+    public static final int DEATH_ZONE_INFO_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo> deathZoneInfoList_;
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo> getDeathZoneInfoListList() {
       return deathZoneInfoList_;
     }
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class DeathZoneInfoNotifyOuterClass {
       return deathZoneInfoList_;
     }
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     @java.lang.Override
     public int getDeathZoneInfoListCount() {
       return deathZoneInfoList_.size();
     }
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo getDeathZoneInfoList(int index) {
       return deathZoneInfoList_.get(index);
     }
     /**
-     * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+     * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder getDeathZoneInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class DeathZoneInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < deathZoneInfoList_.size(); i++) {
-        output.writeMessage(14, deathZoneInfoList_.get(i));
+        output.writeMessage(1, deathZoneInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class DeathZoneInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < deathZoneInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, deathZoneInfoList_.get(i));
+          .computeMessageSize(1, deathZoneInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class DeathZoneInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25105
-     * Obf: FIGCIIMFGEK
-     * </pre>
-     *
      * Protobuf type {@code DeathZoneInfoNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class DeathZoneInfoNotifyOuterClass {
           emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder> deathZoneInfoListBuilder_;
 
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo> getDeathZoneInfoListList() {
         if (deathZoneInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public int getDeathZoneInfoListCount() {
         if (deathZoneInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo getDeathZoneInfoList(int index) {
         if (deathZoneInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder setDeathZoneInfoList(
           int index, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo value) {
@@ -585,7 +575,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder setDeathZoneInfoList(
           int index, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder addDeathZoneInfoList(emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo value) {
         if (deathZoneInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder addDeathZoneInfoList(
           int index, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo value) {
@@ -632,7 +622,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder addDeathZoneInfoList(
           emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder addDeathZoneInfoList(
           int index, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder addAllDeathZoneInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo> values) {
@@ -675,7 +665,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder clearDeathZoneInfoList() {
         if (deathZoneInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public Builder removeDeathZoneInfoList(int index) {
         if (deathZoneInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class DeathZoneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder getDeathZoneInfoListBuilder(
           int index) {
         return getDeathZoneInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder getDeathZoneInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class DeathZoneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfoOrBuilder> 
            getDeathZoneInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class DeathZoneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder addDeathZoneInfoListBuilder() {
         return getDeathZoneInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder addDeathZoneInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class DeathZoneInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DeathZoneInfo death_zone_info_list = 14;</code>
+       * <code>repeated .DeathZoneInfo death_zone_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder> 
            getDeathZoneInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class DeathZoneInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031DeathZoneInfoNotify.proto\032\023DeathZoneIn" +
       "fo.proto\"C\n\023DeathZoneInfoNotify\022,\n\024death" +
-      "_zone_info_list\030\016 \003(\0132\016.DeathZoneInfoB\033\n" +
+      "_zone_info_list\030\001 \003(\0132\016.DeathZoneInfoB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoOuterClass.java
index 8be6b465a..2bcab912f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DeathZoneInfoOuterClass.java
@@ -19,22 +19,18 @@ public final class DeathZoneInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_open = 14;</code>
-     * @return The isOpen.
-     */
-    boolean getIsOpen();
-
-    /**
-     * <code>uint32 id = 10;</code>
+     * <code>uint32 id = 11;</code>
      * @return The id.
      */
     int getId();
+
+    /**
+     * <code>bool is_open = 15;</code>
+     * @return The isOpen.
+     */
+    boolean getIsOpen();
   }
   /**
-   * <pre>
-   * Obf: BHEIDECNLJB
-   * </pre>
-   *
    * Protobuf type {@code DeathZoneInfo}
    */
   public static final class DeathZoneInfo extends
@@ -79,12 +75,12 @@ public final class DeathZoneInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 88: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 120: {
 
               isOpen_ = input.readBool();
               break;
@@ -121,21 +117,10 @@ public final class DeathZoneInfoOuterClass {
               emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.class, emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.Builder.class);
     }
 
-    public static final int IS_OPEN_FIELD_NUMBER = 14;
-    private boolean isOpen_;
-    /**
-     * <code>bool is_open = 14;</code>
-     * @return The isOpen.
-     */
-    @java.lang.Override
-    public boolean getIsOpen() {
-      return isOpen_;
-    }
-
-    public static final int ID_FIELD_NUMBER = 10;
+    public static final int ID_FIELD_NUMBER = 11;
     private int id_;
     /**
-     * <code>uint32 id = 10;</code>
+     * <code>uint32 id = 11;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -143,6 +128,17 @@ public final class DeathZoneInfoOuterClass {
       return id_;
     }
 
+    public static final int IS_OPEN_FIELD_NUMBER = 15;
+    private boolean isOpen_;
+    /**
+     * <code>bool is_open = 15;</code>
+     * @return The isOpen.
+     */
+    @java.lang.Override
+    public boolean getIsOpen() {
+      return isOpen_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,10 +154,10 @@ public final class DeathZoneInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (id_ != 0) {
-        output.writeUInt32(10, id_);
+        output.writeUInt32(11, id_);
       }
       if (isOpen_ != false) {
-        output.writeBool(14, isOpen_);
+        output.writeBool(15, isOpen_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +170,11 @@ public final class DeathZoneInfoOuterClass {
       size = 0;
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, id_);
+          .computeUInt32Size(11, id_);
       }
       if (isOpen_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isOpen_);
+          .computeBoolSize(15, isOpen_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +191,10 @@ public final class DeathZoneInfoOuterClass {
       }
       emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo other = (emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo) obj;
 
-      if (getIsOpen()
-          != other.getIsOpen()) return false;
       if (getId()
           != other.getId()) return false;
+      if (getIsOpen()
+          != other.getIsOpen()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,11 +206,11 @@ public final class DeathZoneInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
       hash = (37 * hash) + IS_OPEN_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOpen());
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,10 +307,6 @@ public final class DeathZoneInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BHEIDECNLJB
-     * </pre>
-     *
      * Protobuf type {@code DeathZoneInfo}
      */
     public static final class Builder extends
@@ -352,10 +344,10 @@ public final class DeathZoneInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isOpen_ = false;
-
         id_ = 0;
 
+        isOpen_ = false;
+
         return this;
       }
 
@@ -382,8 +374,8 @@ public final class DeathZoneInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo buildPartial() {
         emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo result = new emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo(this);
-        result.isOpen_ = isOpen_;
         result.id_ = id_;
+        result.isOpen_ = isOpen_;
         onBuilt();
         return result;
       }
@@ -432,12 +424,12 @@ public final class DeathZoneInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo other) {
         if (other == emu.grasscutter.net.proto.DeathZoneInfoOuterClass.DeathZoneInfo.getDefaultInstance()) return this;
-        if (other.getIsOpen() != false) {
-          setIsOpen(other.getIsOpen());
-        }
         if (other.getId() != 0) {
           setId(other.getId());
         }
+        if (other.getIsOpen() != false) {
+          setIsOpen(other.getIsOpen());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -467,40 +459,9 @@ public final class DeathZoneInfoOuterClass {
         return this;
       }
 
-      private boolean isOpen_ ;
-      /**
-       * <code>bool is_open = 14;</code>
-       * @return The isOpen.
-       */
-      @java.lang.Override
-      public boolean getIsOpen() {
-        return isOpen_;
-      }
-      /**
-       * <code>bool is_open = 14;</code>
-       * @param value The isOpen to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsOpen(boolean value) {
-        
-        isOpen_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_open = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsOpen() {
-        
-        isOpen_ = false;
-        onChanged();
-        return this;
-      }
-
       private int id_ ;
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 11;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -508,7 +469,7 @@ public final class DeathZoneInfoOuterClass {
         return id_;
       }
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 11;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -519,7 +480,7 @@ public final class DeathZoneInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -528,6 +489,37 @@ public final class DeathZoneInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isOpen_ ;
+      /**
+       * <code>bool is_open = 15;</code>
+       * @return The isOpen.
+       */
+      @java.lang.Override
+      public boolean getIsOpen() {
+        return isOpen_;
+      }
+      /**
+       * <code>bool is_open = 15;</code>
+       * @param value The isOpen to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsOpen(boolean value) {
+        
+        isOpen_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_open = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsOpen() {
+        
+        isOpen_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -595,8 +587,8 @@ public final class DeathZoneInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023DeathZoneInfo.proto\",\n\rDeathZoneInfo\022\017" +
-      "\n\007is_open\030\016 \001(\010\022\n\n\002id\030\n \001(\rB\033\n\031emu.grass" +
+      "\n\023DeathZoneInfo.proto\",\n\rDeathZoneInfo\022\n" +
+      "\n\002id\030\013 \001(\r\022\017\n\007is_open\030\017 \001(\010B\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -608,7 +600,7 @@ public final class DeathZoneInfoOuterClass {
     internal_static_DeathZoneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DeathZoneInfo_descriptor,
-        new java.lang.String[] { "IsOpen", "Id", });
+        new java.lang.String[] { "Id", "IsOpen", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java
index 17e99c7c0..02b81658e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamReqOuterClass.java
@@ -19,15 +19,14 @@ public final class DelBackupAvatarTeamReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 backup_avatar_team_id = 10;</code>
+     * <code>uint32 backup_avatar_team_id = 12;</code>
      * @return The backupAvatarTeamId.
      */
     int getBackupAvatarTeamId();
   }
   /**
    * <pre>
-   * CmdId: 9455
-   * Obf: KIFNLHMNCMM
+   * CmdId: 8721
    * </pre>
    *
    * Protobuf type {@code DelBackupAvatarTeamReq}
@@ -74,7 +73,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 96: {
 
               backupAvatarTeamId_ = input.readUInt32();
               break;
@@ -111,10 +110,10 @@ public final class DelBackupAvatarTeamReqOuterClass {
               emu.grasscutter.net.proto.DelBackupAvatarTeamReqOuterClass.DelBackupAvatarTeamReq.class, emu.grasscutter.net.proto.DelBackupAvatarTeamReqOuterClass.DelBackupAvatarTeamReq.Builder.class);
     }
 
-    public static final int BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER = 10;
+    public static final int BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER = 12;
     private int backupAvatarTeamId_;
     /**
-     * <code>uint32 backup_avatar_team_id = 10;</code>
+     * <code>uint32 backup_avatar_team_id = 12;</code>
      * @return The backupAvatarTeamId.
      */
     @java.lang.Override
@@ -137,7 +136,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (backupAvatarTeamId_ != 0) {
-        output.writeUInt32(10, backupAvatarTeamId_);
+        output.writeUInt32(12, backupAvatarTeamId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +149,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
       size = 0;
       if (backupAvatarTeamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, backupAvatarTeamId_);
+          .computeUInt32Size(12, backupAvatarTeamId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +278,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 9455
-     * Obf: KIFNLHMNCMM
+     * CmdId: 8721
      * </pre>
      *
      * Protobuf type {@code DelBackupAvatarTeamReq}
@@ -431,7 +429,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
 
       private int backupAvatarTeamId_ ;
       /**
-       * <code>uint32 backup_avatar_team_id = 10;</code>
+       * <code>uint32 backup_avatar_team_id = 12;</code>
        * @return The backupAvatarTeamId.
        */
       @java.lang.Override
@@ -439,7 +437,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
         return backupAvatarTeamId_;
       }
       /**
-       * <code>uint32 backup_avatar_team_id = 10;</code>
+       * <code>uint32 backup_avatar_team_id = 12;</code>
        * @param value The backupAvatarTeamId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +448,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 backup_avatar_team_id = 10;</code>
+       * <code>uint32 backup_avatar_team_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearBackupAvatarTeamId() {
@@ -528,7 +526,7 @@ public final class DelBackupAvatarTeamReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034DelBackupAvatarTeamReq.proto\"7\n\026DelBac" +
       "kupAvatarTeamReq\022\035\n\025backup_avatar_team_i" +
-      "d\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "d\030\014 \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/DelBackupAvatarTeamRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java
index 89b694277..4f8be8517 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DelBackupAvatarTeamRspOuterClass.java
@@ -19,21 +19,20 @@ public final class DelBackupAvatarTeamRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 backup_avatar_team_id = 14;</code>
+     * <code>uint32 backup_avatar_team_id = 5;</code>
      * @return The backupAvatarTeamId.
      */
     int getBackupAvatarTeamId();
+
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
    * <pre>
-   * CmdId: 3661
-   * Obf: FFNGPJOGGAC
+   * CmdId: 7408
    * </pre>
    *
    * Protobuf type {@code DelBackupAvatarTeamRsp}
@@ -80,14 +79,14 @@ public final class DelBackupAvatarTeamRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 40: {
 
-              retcode_ = input.readInt32();
+              backupAvatarTeamId_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              backupAvatarTeamId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -122,21 +121,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
               emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.class, emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER = 14;
+    public static final int BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER = 5;
     private int backupAvatarTeamId_;
     /**
-     * <code>uint32 backup_avatar_team_id = 14;</code>
+     * <code>uint32 backup_avatar_team_id = 5;</code>
      * @return The backupAvatarTeamId.
      */
     @java.lang.Override
@@ -144,6 +132,17 @@ public final class DelBackupAvatarTeamRspOuterClass {
       return backupAvatarTeamId_;
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +157,11 @@ public final class DelBackupAvatarTeamRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
       if (backupAvatarTeamId_ != 0) {
-        output.writeUInt32(14, backupAvatarTeamId_);
+        output.writeUInt32(5, backupAvatarTeamId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +172,13 @@ public final class DelBackupAvatarTeamRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
       if (backupAvatarTeamId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, backupAvatarTeamId_);
+          .computeUInt32Size(5, backupAvatarTeamId_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +195,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
       }
       emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp other = (emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getBackupAvatarTeamId()
           != other.getBackupAvatarTeamId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +210,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + BACKUP_AVATAR_TEAM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getBackupAvatarTeamId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,8 +311,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3661
-     * Obf: FFNGPJOGGAC
+     * CmdId: 7408
      * </pre>
      *
      * Protobuf type {@code DelBackupAvatarTeamRsp}
@@ -353,10 +351,10 @@ public final class DelBackupAvatarTeamRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         backupAvatarTeamId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +381,8 @@ public final class DelBackupAvatarTeamRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp buildPartial() {
         emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp result = new emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp(this);
-        result.retcode_ = retcode_;
         result.backupAvatarTeamId_ = backupAvatarTeamId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +431,12 @@ public final class DelBackupAvatarTeamRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp other) {
         if (other == emu.grasscutter.net.proto.DelBackupAvatarTeamRspOuterClass.DelBackupAvatarTeamRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getBackupAvatarTeamId() != 0) {
           setBackupAvatarTeamId(other.getBackupAvatarTeamId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +466,9 @@ public final class DelBackupAvatarTeamRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int backupAvatarTeamId_ ;
       /**
-       * <code>uint32 backup_avatar_team_id = 14;</code>
+       * <code>uint32 backup_avatar_team_id = 5;</code>
        * @return The backupAvatarTeamId.
        */
       @java.lang.Override
@@ -509,7 +476,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
         return backupAvatarTeamId_;
       }
       /**
-       * <code>uint32 backup_avatar_team_id = 14;</code>
+       * <code>uint32 backup_avatar_team_id = 5;</code>
        * @param value The backupAvatarTeamId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +487,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 backup_avatar_team_id = 14;</code>
+       * <code>uint32 backup_avatar_team_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearBackupAvatarTeamId() {
@@ -529,6 +496,37 @@ public final class DelBackupAvatarTeamRspOuterClass {
         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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +595,8 @@ public final class DelBackupAvatarTeamRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034DelBackupAvatarTeamRsp.proto\"H\n\026DelBac" +
-      "kupAvatarTeamRsp\022\017\n\007retcode\030\006 \001(\005\022\035\n\025bac" +
-      "kup_avatar_team_id\030\016 \001(\rB\033\n\031emu.grasscut" +
+      "kupAvatarTeamRsp\022\035\n\025backup_avatar_team_i" +
+      "d\030\005 \001(\r\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +608,7 @@ public final class DelBackupAvatarTeamRspOuterClass {
     internal_static_DelBackupAvatarTeamRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DelBackupAvatarTeamRsp_descriptor,
-        new java.lang.String[] { "Retcode", "BackupAvatarTeamId", });
+        new java.lang.String[] { "BackupAvatarTeamId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelMailReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelMailReqOuterClass.java
index fa7c41321..da2451bd3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DelMailReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DelMailReqOuterClass.java
@@ -19,28 +19,23 @@ public final class DelMailReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 9893
-   * Obf: GCJNHCHGLEL
-   * </pre>
-   *
    * Protobuf type {@code DelMailReq}
    */
   public static final class DelMailReq extends
@@ -87,7 +82,7 @@ public final class DelMailReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class DelMailReqOuterClass {
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 66: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class DelMailReqOuterClass {
               emu.grasscutter.net.proto.DelMailReqOuterClass.DelMailReq.class, emu.grasscutter.net.proto.DelMailReqOuterClass.DelMailReq.Builder.class);
     }
 
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 8;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class DelMailReqOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 8;</code>
+     * <code>repeated uint32 mail_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class DelMailReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class DelMailReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9893
-     * Obf: GCJNHCHGLEL
-     * </pre>
-     *
      * Protobuf type {@code DelMailReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class DelMailReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @return A list containing the mailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class DelMailReqOuterClass {
                  java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @return The count of mailIdList.
        */
       public int getMailIdListCount() {
         return mailIdList_.size();
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The mailIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class DelMailReqOuterClass {
         return mailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The mailIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class DelMailReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @param value The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class DelMailReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @param values The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class DelMailReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 8;</code>
+       * <code>repeated uint32 mail_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailIdList() {
@@ -654,7 +644,7 @@ public final class DelMailReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020DelMailReq.proto\"\"\n\nDelMailReq\022\024\n\014mail" +
-      "_id_list\030\010 \003(\rB\033\n\031emu.grasscutter.net.pr" +
+      "_id_list\030\005 \003(\rB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelMailRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelMailRspOuterClass.java
index 70d494d45..1ac98a1b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DelMailRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DelMailRspOuterClass.java
@@ -19,34 +19,29 @@ public final class DelMailRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
 
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8328
-   * Obf: EJOGFBHOJKI
-   * </pre>
-   *
    * Protobuf type {@code DelMailRsp}
    */
   public static final class DelMailRsp extends
@@ -93,12 +88,7 @@ public final class DelMailRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 104: {
+            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +96,7 @@ public final class DelMailRspOuterClass {
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -119,6 +109,11 @@ public final class DelMailRspOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 120: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +149,10 @@ public final class DelMailRspOuterClass {
               emu.grasscutter.net.proto.DelMailRspOuterClass.DelMailRsp.class, emu.grasscutter.net.proto.DelMailRspOuterClass.DelMailRsp.Builder.class);
     }
 
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 13;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -166,14 +161,14 @@ public final class DelMailRspOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 14;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -182,10 +177,10 @@ public final class DelMailRspOuterClass {
     }
     private int mailIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -208,16 +203,16 @@ public final class DelMailRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
-      }
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
         output.writeUInt32NoTag(mailIdList_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -227,10 +222,6 @@ public final class DelMailRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < mailIdList_.size(); i++) {
@@ -245,6 +236,10 @@ public final class DelMailRspOuterClass {
         }
         mailIdListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -377,11 +372,6 @@ public final class DelMailRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8328
-     * Obf: EJOGFBHOJKI
-     * </pre>
-     *
      * Protobuf type {@code DelMailRsp}
      */
     public static final class Builder extends
@@ -555,7 +545,7 @@ public final class DelMailRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return A list containing the mailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -564,14 +554,14 @@ public final class DelMailRspOuterClass {
                  java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return The count of mailIdList.
        */
       public int getMailIdListCount() {
         return mailIdList_.size();
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param index The index of the element to return.
        * @return The mailIdList at the given index.
        */
@@ -579,7 +569,7 @@ public final class DelMailRspOuterClass {
         return mailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The mailIdList to set.
        * @return This builder for chaining.
@@ -592,7 +582,7 @@ public final class DelMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param value The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -603,7 +593,7 @@ public final class DelMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @param values The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -616,7 +606,7 @@ public final class DelMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
+       * <code>repeated uint32 mail_id_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailIdList() {
@@ -628,7 +618,7 @@ public final class DelMailRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 15;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -636,7 +626,7 @@ public final class DelMailRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 15;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -647,7 +637,7 @@ public final class DelMailRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -724,7 +714,7 @@ public final class DelMailRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020DelMailRsp.proto\"3\n\nDelMailRsp\022\024\n\014mail" +
-      "_id_list\030\r \003(\r\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.g" +
+      "_id_list\030\016 \003(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DelayWeekCountDownDeleteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DelayWeekCountDownDeleteOuterClass.java
new file mode 100644
index 000000000..0876baa30
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DelayWeekCountDownDeleteOuterClass.java
@@ -0,0 +1,942 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DelayWeekCountDownDelete.proto
+
+package emu.grasscutter.net.proto;
+
+public final class DelayWeekCountDownDeleteOuterClass {
+  private DelayWeekCountDownDeleteOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface DelayWeekCountDownDeleteOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:DelayWeekCountDownDelete)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    int getDeleteTimeNumMapCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    boolean containsDeleteTimeNumMap(
+        int key);
+    /**
+     * Use {@link #getDeleteTimeNumMapMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getDeleteTimeNumMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getDeleteTimeNumMapMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    int getDeleteTimeNumMapOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    int getDeleteTimeNumMapOrThrow(
+        int key);
+
+    /**
+     * <code>uint32 config_delay_week = 2;</code>
+     * @return The configDelayWeek.
+     */
+    int getConfigDelayWeek();
+
+    /**
+     * <code>uint32 config_count_down_time = 3;</code>
+     * @return The configCountDownTime.
+     */
+    int getConfigCountDownTime();
+  }
+  /**
+   * Protobuf type {@code DelayWeekCountDownDelete}
+   */
+  public static final class DelayWeekCountDownDelete extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:DelayWeekCountDownDelete)
+      DelayWeekCountDownDeleteOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use DelayWeekCountDownDelete.newBuilder() to construct.
+    private DelayWeekCountDownDelete(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private DelayWeekCountDownDelete() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new DelayWeekCountDownDelete();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DelayWeekCountDownDelete(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                deleteTimeNumMap_ = com.google.protobuf.MapField.newMapField(
+                    DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000001;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              deleteTimeNumMap__ = input.readMessage(
+                  DeleteTimeNumMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              deleteTimeNumMap_.getMutableMap().put(
+                  deleteTimeNumMap__.getKey(), deleteTimeNumMap__.getValue());
+              break;
+            }
+            case 16: {
+
+              configDelayWeek_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              configCountDownTime_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 1:
+          return internalGetDeleteTimeNumMap();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.class, emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.Builder.class);
+    }
+
+    public static final int DELETE_TIME_NUM_MAP_FIELD_NUMBER = 1;
+    private static final class DeleteTimeNumMapDefaultEntryHolder {
+      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.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_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> deleteTimeNumMap_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetDeleteTimeNumMap() {
+      if (deleteTimeNumMap_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+      }
+      return deleteTimeNumMap_;
+    }
+
+    public int getDeleteTimeNumMapCount() {
+      return internalGetDeleteTimeNumMap().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsDeleteTimeNumMap(
+        int key) {
+      
+      return internalGetDeleteTimeNumMap().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getDeleteTimeNumMapMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMap() {
+      return getDeleteTimeNumMapMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMapMap() {
+      return internalGetDeleteTimeNumMap().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public int getDeleteTimeNumMapOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetDeleteTimeNumMap().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+     */
+    @java.lang.Override
+
+    public int getDeleteTimeNumMapOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetDeleteTimeNumMap().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int CONFIG_DELAY_WEEK_FIELD_NUMBER = 2;
+    private int configDelayWeek_;
+    /**
+     * <code>uint32 config_delay_week = 2;</code>
+     * @return The configDelayWeek.
+     */
+    @java.lang.Override
+    public int getConfigDelayWeek() {
+      return configDelayWeek_;
+    }
+
+    public static final int CONFIG_COUNT_DOWN_TIME_FIELD_NUMBER = 3;
+    private int configCountDownTime_;
+    /**
+     * <code>uint32 config_count_down_time = 3;</code>
+     * @return The configCountDownTime.
+     */
+    @java.lang.Override
+    public int getConfigCountDownTime() {
+      return configCountDownTime_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetDeleteTimeNumMap(),
+          DeleteTimeNumMapDefaultEntryHolder.defaultEntry,
+          1);
+      if (configDelayWeek_ != 0) {
+        output.writeUInt32(2, configDelayWeek_);
+      }
+      if (configCountDownTime_ != 0) {
+        output.writeUInt32(3, configCountDownTime_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetDeleteTimeNumMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        deleteTimeNumMap__ = DeleteTimeNumMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(1, deleteTimeNumMap__);
+      }
+      if (configDelayWeek_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, configDelayWeek_);
+      }
+      if (configCountDownTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, configCountDownTime_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete other = (emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete) obj;
+
+      if (!internalGetDeleteTimeNumMap().equals(
+          other.internalGetDeleteTimeNumMap())) return false;
+      if (getConfigDelayWeek()
+          != other.getConfigDelayWeek()) return false;
+      if (getConfigCountDownTime()
+          != other.getConfigCountDownTime()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (!internalGetDeleteTimeNumMap().getMap().isEmpty()) {
+        hash = (37 * hash) + DELETE_TIME_NUM_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetDeleteTimeNumMap().hashCode();
+      }
+      hash = (37 * hash) + CONFIG_DELAY_WEEK_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigDelayWeek();
+      hash = (37 * hash) + CONFIG_COUNT_DOWN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigCountDownTime();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code DelayWeekCountDownDelete}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:DelayWeekCountDownDelete)
+        emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDeleteOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMapField(
+          int number) {
+        switch (number) {
+          case 1:
+            return internalGetDeleteTimeNumMap();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMutableMapField(
+          int number) {
+        switch (number) {
+          case 1:
+            return internalGetMutableDeleteTimeNumMap();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.class, emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        internalGetMutableDeleteTimeNumMap().clear();
+        configDelayWeek_ = 0;
+
+        configCountDownTime_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.internal_static_DelayWeekCountDownDelete_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete build() {
+        emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete buildPartial() {
+        emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete result = new emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete(this);
+        int from_bitField0_ = bitField0_;
+        result.deleteTimeNumMap_ = internalGetDeleteTimeNumMap();
+        result.deleteTimeNumMap_.makeImmutable();
+        result.configDelayWeek_ = configDelayWeek_;
+        result.configCountDownTime_ = configCountDownTime_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete) {
+          return mergeFrom((emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete other) {
+        if (other == emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete.getDefaultInstance()) return this;
+        internalGetMutableDeleteTimeNumMap().mergeFrom(
+            other.internalGetDeleteTimeNumMap());
+        if (other.getConfigDelayWeek() != 0) {
+          setConfigDelayWeek(other.getConfigDelayWeek());
+        }
+        if (other.getConfigCountDownTime() != 0) {
+          setConfigCountDownTime(other.getConfigCountDownTime());
+        }
+        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.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> deleteTimeNumMap_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetDeleteTimeNumMap() {
+        if (deleteTimeNumMap_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+        }
+        return deleteTimeNumMap_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableDeleteTimeNumMap() {
+        onChanged();;
+        if (deleteTimeNumMap_ == null) {
+          deleteTimeNumMap_ = com.google.protobuf.MapField.newMapField(
+              DeleteTimeNumMapDefaultEntryHolder.defaultEntry);
+        }
+        if (!deleteTimeNumMap_.isMutable()) {
+          deleteTimeNumMap_ = deleteTimeNumMap_.copy();
+        }
+        return deleteTimeNumMap_;
+      }
+
+      public int getDeleteTimeNumMapCount() {
+        return internalGetDeleteTimeNumMap().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsDeleteTimeNumMap(
+          int key) {
+        
+        return internalGetDeleteTimeNumMap().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getDeleteTimeNumMapMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMap() {
+        return getDeleteTimeNumMapMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getDeleteTimeNumMapMap() {
+        return internalGetDeleteTimeNumMap().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public int getDeleteTimeNumMapOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetDeleteTimeNumMap().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      @java.lang.Override
+
+      public int getDeleteTimeNumMapOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetDeleteTimeNumMap().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearDeleteTimeNumMap() {
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      public Builder removeDeleteTimeNumMap(
+          int key) {
+        
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableDeleteTimeNumMap() {
+        return internalGetMutableDeleteTimeNumMap().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+      public Builder putDeleteTimeNumMap(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; delete_time_num_map = 1;</code>
+       */
+
+      public Builder putAllDeleteTimeNumMap(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableDeleteTimeNumMap().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private int configDelayWeek_ ;
+      /**
+       * <code>uint32 config_delay_week = 2;</code>
+       * @return The configDelayWeek.
+       */
+      @java.lang.Override
+      public int getConfigDelayWeek() {
+        return configDelayWeek_;
+      }
+      /**
+       * <code>uint32 config_delay_week = 2;</code>
+       * @param value The configDelayWeek to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigDelayWeek(int value) {
+        
+        configDelayWeek_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_delay_week = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigDelayWeek() {
+        
+        configDelayWeek_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int configCountDownTime_ ;
+      /**
+       * <code>uint32 config_count_down_time = 3;</code>
+       * @return The configCountDownTime.
+       */
+      @java.lang.Override
+      public int getConfigCountDownTime() {
+        return configCountDownTime_;
+      }
+      /**
+       * <code>uint32 config_count_down_time = 3;</code>
+       * @param value The configCountDownTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigCountDownTime(int value) {
+        
+        configCountDownTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_count_down_time = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigCountDownTime() {
+        
+        configCountDownTime_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:DelayWeekCountDownDelete)
+    }
+
+    // @@protoc_insertion_point(class_scope:DelayWeekCountDownDelete)
+    private static final emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete();
+    }
+
+    public static emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<DelayWeekCountDownDelete>
+        PARSER = new com.google.protobuf.AbstractParser<DelayWeekCountDownDelete>() {
+      @java.lang.Override
+      public DelayWeekCountDownDelete parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DelayWeekCountDownDelete(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<DelayWeekCountDownDelete> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DelayWeekCountDownDelete> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DelayWeekCountDownDeleteOuterClass.DelayWeekCountDownDelete getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_DelayWeekCountDownDelete_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_DelayWeekCountDownDelete_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\036DelayWeekCountDownDelete.proto\"\334\001\n\030Del" +
+      "ayWeekCountDownDelete\022L\n\023delete_time_num" +
+      "_map\030\001 \003(\0132/.DelayWeekCountDownDelete.De" +
+      "leteTimeNumMapEntry\022\031\n\021config_delay_week" +
+      "\030\002 \001(\r\022\036\n\026config_count_down_time\030\003 \001(\r\0327" +
+      "\n\025DeleteTimeNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005" +
+      "value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_DelayWeekCountDownDelete_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_DelayWeekCountDownDelete_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_DelayWeekCountDownDelete_descriptor,
+        new java.lang.String[] { "DeleteTimeNumMap", "ConfigDelayWeek", "ConfigCountDownTime", });
+    internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_descriptor =
+      internal_static_DelayWeekCountDownDelete_descriptor.getNestedTypes().get(0);
+    internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_DelayWeekCountDownDelete_DeleteTimeNumMapEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DeshretObeliskGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DeshretObeliskGadgetInfoOuterClass.java
index db2cfe222..be7725f9a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DeshretObeliskGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DeshretObeliskGadgetInfoOuterClass.java
@@ -37,7 +37,7 @@ public final class DeshretObeliskGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: HBNLGHJLHNL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code DeshretObeliskGadgetInfo}
@@ -344,7 +344,7 @@ public final class DeshretObeliskGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: HBNLGHJLHNL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code DeshretObeliskGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DoGachaReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DoGachaReqOuterClass.java
index f645f9f68..b87590719 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DoGachaReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DoGachaReqOuterClass.java
@@ -19,47 +19,42 @@ public final class DoGachaReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gachaTimes = 8;</code>
-     * @return The gachaTimes.
+     * <code>string gacha_tag = 13;</code>
+     * @return The gachaTag.
      */
-    int getGachaTimes();
+    java.lang.String getGachaTag();
+    /**
+     * <code>string gacha_tag = 13;</code>
+     * @return The bytes for gachaTag.
+     */
+    com.google.protobuf.ByteString
+        getGachaTagBytes();
 
     /**
-     * <code>uint32 gachaScheduleId = 5;</code>
+     * <code>uint32 gacha_schedule_id = 1;</code>
      * @return The gachaScheduleId.
      */
     int getGachaScheduleId();
 
     /**
-     * <code>uint32 gachaRandom = 6;</code>
-     * @return The gachaRandom.
-     */
-    int getGachaRandom();
-
-    /**
-     * <code>uint32 gachaType = 3;</code>
+     * <code>uint32 gacha_type = 6;</code>
      * @return The gachaType.
      */
     int getGachaType();
 
     /**
-     * <code>string gachaTag = 15;</code>
-     * @return The gachaTag.
+     * <code>uint32 gacha_random = 14;</code>
+     * @return The gachaRandom.
      */
-    java.lang.String getGachaTag();
+    int getGachaRandom();
+
     /**
-     * <code>string gachaTag = 15;</code>
-     * @return The bytes for gachaTag.
+     * <code>uint32 gacha_times = 10;</code>
+     * @return The gachaTimes.
      */
-    com.google.protobuf.ByteString
-        getGachaTagBytes();
+    int getGachaTimes();
   }
   /**
-   * <pre>
-   * CmdId: 6499
-   * Obf: JHEFDEDCGBA
-   * </pre>
-   *
    * Protobuf type {@code DoGachaReq}
    */
   public static final class DoGachaReq extends
@@ -105,32 +100,32 @@ public final class DoGachaReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              gachaType_ = input.readUInt32();
-              break;
-            }
-            case 40: {
+            case 8: {
 
               gachaScheduleId_ = input.readUInt32();
               break;
             }
             case 48: {
 
-              gachaRandom_ = input.readUInt32();
+              gachaType_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 80: {
 
               gachaTimes_ = input.readUInt32();
               break;
             }
-            case 122: {
+            case 106: {
               java.lang.String s = input.readStringRequireUtf8();
 
               gachaTag_ = s;
               break;
             }
+            case 112: {
+
+              gachaRandom_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -163,54 +158,10 @@ public final class DoGachaReqOuterClass {
               emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.class, emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.Builder.class);
     }
 
-    public static final int GACHATIMES_FIELD_NUMBER = 8;
-    private int gachaTimes_;
-    /**
-     * <code>uint32 gachaTimes = 8;</code>
-     * @return The gachaTimes.
-     */
-    @java.lang.Override
-    public int getGachaTimes() {
-      return gachaTimes_;
-    }
-
-    public static final int GACHASCHEDULEID_FIELD_NUMBER = 5;
-    private int gachaScheduleId_;
-    /**
-     * <code>uint32 gachaScheduleId = 5;</code>
-     * @return The gachaScheduleId.
-     */
-    @java.lang.Override
-    public int getGachaScheduleId() {
-      return gachaScheduleId_;
-    }
-
-    public static final int GACHARANDOM_FIELD_NUMBER = 6;
-    private int gachaRandom_;
-    /**
-     * <code>uint32 gachaRandom = 6;</code>
-     * @return The gachaRandom.
-     */
-    @java.lang.Override
-    public int getGachaRandom() {
-      return gachaRandom_;
-    }
-
-    public static final int GACHATYPE_FIELD_NUMBER = 3;
-    private int gachaType_;
-    /**
-     * <code>uint32 gachaType = 3;</code>
-     * @return The gachaType.
-     */
-    @java.lang.Override
-    public int getGachaType() {
-      return gachaType_;
-    }
-
-    public static final int GACHATAG_FIELD_NUMBER = 15;
+    public static final int GACHA_TAG_FIELD_NUMBER = 13;
     private volatile java.lang.Object gachaTag_;
     /**
-     * <code>string gachaTag = 15;</code>
+     * <code>string gacha_tag = 13;</code>
      * @return The gachaTag.
      */
     @java.lang.Override
@@ -227,7 +178,7 @@ public final class DoGachaReqOuterClass {
       }
     }
     /**
-     * <code>string gachaTag = 15;</code>
+     * <code>string gacha_tag = 13;</code>
      * @return The bytes for gachaTag.
      */
     @java.lang.Override
@@ -245,6 +196,50 @@ public final class DoGachaReqOuterClass {
       }
     }
 
+    public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 1;
+    private int gachaScheduleId_;
+    /**
+     * <code>uint32 gacha_schedule_id = 1;</code>
+     * @return The gachaScheduleId.
+     */
+    @java.lang.Override
+    public int getGachaScheduleId() {
+      return gachaScheduleId_;
+    }
+
+    public static final int GACHA_TYPE_FIELD_NUMBER = 6;
+    private int gachaType_;
+    /**
+     * <code>uint32 gacha_type = 6;</code>
+     * @return The gachaType.
+     */
+    @java.lang.Override
+    public int getGachaType() {
+      return gachaType_;
+    }
+
+    public static final int GACHA_RANDOM_FIELD_NUMBER = 14;
+    private int gachaRandom_;
+    /**
+     * <code>uint32 gacha_random = 14;</code>
+     * @return The gachaRandom.
+     */
+    @java.lang.Override
+    public int getGachaRandom() {
+      return gachaRandom_;
+    }
+
+    public static final int GACHA_TIMES_FIELD_NUMBER = 10;
+    private int gachaTimes_;
+    /**
+     * <code>uint32 gacha_times = 10;</code>
+     * @return The gachaTimes.
+     */
+    @java.lang.Override
+    public int getGachaTimes() {
+      return gachaTimes_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -259,20 +254,20 @@ public final class DoGachaReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (gachaType_ != 0) {
-        output.writeUInt32(3, gachaType_);
-      }
       if (gachaScheduleId_ != 0) {
-        output.writeUInt32(5, gachaScheduleId_);
+        output.writeUInt32(1, gachaScheduleId_);
       }
-      if (gachaRandom_ != 0) {
-        output.writeUInt32(6, gachaRandom_);
+      if (gachaType_ != 0) {
+        output.writeUInt32(6, gachaType_);
       }
       if (gachaTimes_ != 0) {
-        output.writeUInt32(8, gachaTimes_);
+        output.writeUInt32(10, gachaTimes_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, gachaTag_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, gachaTag_);
+      }
+      if (gachaRandom_ != 0) {
+        output.writeUInt32(14, gachaRandom_);
       }
       unknownFields.writeTo(output);
     }
@@ -283,24 +278,24 @@ public final class DoGachaReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (gachaType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, gachaType_);
-      }
       if (gachaScheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, gachaScheduleId_);
+          .computeUInt32Size(1, gachaScheduleId_);
       }
-      if (gachaRandom_ != 0) {
+      if (gachaType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, gachaRandom_);
+          .computeUInt32Size(6, gachaType_);
       }
       if (gachaTimes_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, gachaTimes_);
+          .computeUInt32Size(10, gachaTimes_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaTag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, gachaTag_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, gachaTag_);
+      }
+      if (gachaRandom_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, gachaRandom_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -317,16 +312,16 @@ public final class DoGachaReqOuterClass {
       }
       emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq other = (emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq) obj;
 
-      if (getGachaTimes()
-          != other.getGachaTimes()) return false;
-      if (getGachaScheduleId()
-          != other.getGachaScheduleId()) return false;
-      if (getGachaRandom()
-          != other.getGachaRandom()) return false;
-      if (getGachaType()
-          != other.getGachaType()) return false;
       if (!getGachaTag()
           .equals(other.getGachaTag())) return false;
+      if (getGachaScheduleId()
+          != other.getGachaScheduleId()) return false;
+      if (getGachaType()
+          != other.getGachaType()) return false;
+      if (getGachaRandom()
+          != other.getGachaRandom()) return false;
+      if (getGachaTimes()
+          != other.getGachaTimes()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -338,16 +333,16 @@ public final class DoGachaReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaTimes();
-      hash = (37 * hash) + GACHASCHEDULEID_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaScheduleId();
-      hash = (37 * hash) + GACHARANDOM_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaRandom();
-      hash = (37 * hash) + GACHATYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaType();
-      hash = (37 * hash) + GACHATAG_FIELD_NUMBER;
+      hash = (37 * hash) + GACHA_TAG_FIELD_NUMBER;
       hash = (53 * hash) + getGachaTag().hashCode();
+      hash = (37 * hash) + GACHA_SCHEDULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaScheduleId();
+      hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaType();
+      hash = (37 * hash) + GACHA_RANDOM_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaRandom();
+      hash = (37 * hash) + GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaTimes();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -444,11 +439,6 @@ public final class DoGachaReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6499
-     * Obf: JHEFDEDCGBA
-     * </pre>
-     *
      * Protobuf type {@code DoGachaReq}
      */
     public static final class Builder extends
@@ -486,15 +476,15 @@ public final class DoGachaReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gachaTimes_ = 0;
+        gachaTag_ = "";
 
         gachaScheduleId_ = 0;
 
-        gachaRandom_ = 0;
-
         gachaType_ = 0;
 
-        gachaTag_ = "";
+        gachaRandom_ = 0;
+
+        gachaTimes_ = 0;
 
         return this;
       }
@@ -522,11 +512,11 @@ public final class DoGachaReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq buildPartial() {
         emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq result = new emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq(this);
-        result.gachaTimes_ = gachaTimes_;
-        result.gachaScheduleId_ = gachaScheduleId_;
-        result.gachaRandom_ = gachaRandom_;
-        result.gachaType_ = gachaType_;
         result.gachaTag_ = gachaTag_;
+        result.gachaScheduleId_ = gachaScheduleId_;
+        result.gachaType_ = gachaType_;
+        result.gachaRandom_ = gachaRandom_;
+        result.gachaTimes_ = gachaTimes_;
         onBuilt();
         return result;
       }
@@ -575,21 +565,21 @@ public final class DoGachaReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq other) {
         if (other == emu.grasscutter.net.proto.DoGachaReqOuterClass.DoGachaReq.getDefaultInstance()) return this;
-        if (other.getGachaTimes() != 0) {
-          setGachaTimes(other.getGachaTimes());
+        if (!other.getGachaTag().isEmpty()) {
+          gachaTag_ = other.gachaTag_;
+          onChanged();
         }
         if (other.getGachaScheduleId() != 0) {
           setGachaScheduleId(other.getGachaScheduleId());
         }
-        if (other.getGachaRandom() != 0) {
-          setGachaRandom(other.getGachaRandom());
-        }
         if (other.getGachaType() != 0) {
           setGachaType(other.getGachaType());
         }
-        if (!other.getGachaTag().isEmpty()) {
-          gachaTag_ = other.gachaTag_;
-          onChanged();
+        if (other.getGachaRandom() != 0) {
+          setGachaRandom(other.getGachaRandom());
+        }
+        if (other.getGachaTimes() != 0) {
+          setGachaTimes(other.getGachaTimes());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -620,133 +610,9 @@ public final class DoGachaReqOuterClass {
         return this;
       }
 
-      private int gachaTimes_ ;
-      /**
-       * <code>uint32 gachaTimes = 8;</code>
-       * @return The gachaTimes.
-       */
-      @java.lang.Override
-      public int getGachaTimes() {
-        return gachaTimes_;
-      }
-      /**
-       * <code>uint32 gachaTimes = 8;</code>
-       * @param value The gachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaTimes(int value) {
-        
-        gachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaTimes = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaTimes() {
-        
-        gachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gachaScheduleId_ ;
-      /**
-       * <code>uint32 gachaScheduleId = 5;</code>
-       * @return The gachaScheduleId.
-       */
-      @java.lang.Override
-      public int getGachaScheduleId() {
-        return gachaScheduleId_;
-      }
-      /**
-       * <code>uint32 gachaScheduleId = 5;</code>
-       * @param value The gachaScheduleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaScheduleId(int value) {
-        
-        gachaScheduleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaScheduleId = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaScheduleId() {
-        
-        gachaScheduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gachaRandom_ ;
-      /**
-       * <code>uint32 gachaRandom = 6;</code>
-       * @return The gachaRandom.
-       */
-      @java.lang.Override
-      public int getGachaRandom() {
-        return gachaRandom_;
-      }
-      /**
-       * <code>uint32 gachaRandom = 6;</code>
-       * @param value The gachaRandom to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaRandom(int value) {
-        
-        gachaRandom_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaRandom = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaRandom() {
-        
-        gachaRandom_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gachaType_ ;
-      /**
-       * <code>uint32 gachaType = 3;</code>
-       * @return The gachaType.
-       */
-      @java.lang.Override
-      public int getGachaType() {
-        return gachaType_;
-      }
-      /**
-       * <code>uint32 gachaType = 3;</code>
-       * @param value The gachaType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaType(int value) {
-        
-        gachaType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaType = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaType() {
-        
-        gachaType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object gachaTag_ = "";
       /**
-       * <code>string gachaTag = 15;</code>
+       * <code>string gacha_tag = 13;</code>
        * @return The gachaTag.
        */
       public java.lang.String getGachaTag() {
@@ -762,7 +628,7 @@ public final class DoGachaReqOuterClass {
         }
       }
       /**
-       * <code>string gachaTag = 15;</code>
+       * <code>string gacha_tag = 13;</code>
        * @return The bytes for gachaTag.
        */
       public com.google.protobuf.ByteString
@@ -779,7 +645,7 @@ public final class DoGachaReqOuterClass {
         }
       }
       /**
-       * <code>string gachaTag = 15;</code>
+       * <code>string gacha_tag = 13;</code>
        * @param value The gachaTag to set.
        * @return This builder for chaining.
        */
@@ -794,7 +660,7 @@ public final class DoGachaReqOuterClass {
         return this;
       }
       /**
-       * <code>string gachaTag = 15;</code>
+       * <code>string gacha_tag = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaTag() {
@@ -804,7 +670,7 @@ public final class DoGachaReqOuterClass {
         return this;
       }
       /**
-       * <code>string gachaTag = 15;</code>
+       * <code>string gacha_tag = 13;</code>
        * @param value The bytes for gachaTag to set.
        * @return This builder for chaining.
        */
@@ -819,6 +685,130 @@ public final class DoGachaReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int gachaScheduleId_ ;
+      /**
+       * <code>uint32 gacha_schedule_id = 1;</code>
+       * @return The gachaScheduleId.
+       */
+      @java.lang.Override
+      public int getGachaScheduleId() {
+        return gachaScheduleId_;
+      }
+      /**
+       * <code>uint32 gacha_schedule_id = 1;</code>
+       * @param value The gachaScheduleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaScheduleId(int value) {
+        
+        gachaScheduleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_schedule_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaScheduleId() {
+        
+        gachaScheduleId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaType_ ;
+      /**
+       * <code>uint32 gacha_type = 6;</code>
+       * @return The gachaType.
+       */
+      @java.lang.Override
+      public int getGachaType() {
+        return gachaType_;
+      }
+      /**
+       * <code>uint32 gacha_type = 6;</code>
+       * @param value The gachaType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaType(int value) {
+        
+        gachaType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_type = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaType() {
+        
+        gachaType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaRandom_ ;
+      /**
+       * <code>uint32 gacha_random = 14;</code>
+       * @return The gachaRandom.
+       */
+      @java.lang.Override
+      public int getGachaRandom() {
+        return gachaRandom_;
+      }
+      /**
+       * <code>uint32 gacha_random = 14;</code>
+       * @param value The gachaRandom to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaRandom(int value) {
+        
+        gachaRandom_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_random = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaRandom() {
+        
+        gachaRandom_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaTimes_ ;
+      /**
+       * <code>uint32 gacha_times = 10;</code>
+       * @return The gachaTimes.
+       */
+      @java.lang.Override
+      public int getGachaTimes() {
+        return gachaTimes_;
+      }
+      /**
+       * <code>uint32 gacha_times = 10;</code>
+       * @param value The gachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaTimes(int value) {
+        
+        gachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_times = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaTimes() {
+        
+        gachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -886,11 +876,11 @@ public final class DoGachaReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020DoGachaReq.proto\"s\n\nDoGachaReq\022\022\n\ngach" +
-      "aTimes\030\010 \001(\r\022\027\n\017gachaScheduleId\030\005 \001(\r\022\023\n" +
-      "\013gachaRandom\030\006 \001(\r\022\021\n\tgachaType\030\003 \001(\r\022\020\n" +
-      "\010gachaTag\030\017 \001(\tB\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "\n\020DoGachaReq.proto\"y\n\nDoGachaReq\022\021\n\tgach" +
+      "a_tag\030\r \001(\t\022\031\n\021gacha_schedule_id\030\001 \001(\r\022\022" +
+      "\n\ngacha_type\030\006 \001(\r\022\024\n\014gacha_random\030\016 \001(\r" +
+      "\022\023\n\013gacha_times\030\n \001(\rB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -901,7 +891,7 @@ public final class DoGachaReqOuterClass {
     internal_static_DoGachaReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DoGachaReq_descriptor,
-        new java.lang.String[] { "GachaTimes", "GachaScheduleId", "GachaRandom", "GachaType", "GachaTag", });
+        new java.lang.String[] { "GachaTag", "GachaScheduleId", "GachaType", "GachaRandom", "GachaTimes", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DoGachaRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DoGachaRspOuterClass.java
index cb9a7b47d..cc2a4ea96 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DoGachaRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DoGachaRspOuterClass.java
@@ -19,52 +19,10 @@ public final class DoGachaRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 tenCostItemNum = 8;</code>
-     * @return The tenCostItemNum.
+     * <code>uint32 wish_item_id = 1;</code>
+     * @return The wishItemId.
      */
-    int getTenCostItemNum();
-
-    /**
-     * <code>uint32 gachaTimes = 5;</code>
-     * @return The gachaTimes.
-     */
-    int getGachaTimes();
-
-    /**
-     * <code>uint32 wishMaxProgress = 9;</code>
-     * @return The wishMaxProgress.
-     */
-    int getWishMaxProgress();
-
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> 
-        getGachaItemListList();
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index);
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    int getGachaItemListCount();
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
-        getGachaItemListOrBuilderList();
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 leftGachaTimes = 11;</code>
-     * @return The leftGachaTimes.
-     */
-    int getLeftGachaTimes();
+    int getWishItemId();
 
     /**
      * <code>int32 retcode = 2;</code>
@@ -73,89 +31,142 @@ public final class DoGachaRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint32 costItemNum = 10;</code>
-     * @return The costItemNum.
-     */
-    int getCostItemNum();
-
-    /**
-     * <code>uint32 curScheduleDailyGachaTimes = 706;</code>
-     * @return The curScheduleDailyGachaTimes.
-     */
-    int getCurScheduleDailyGachaTimes();
-
-    /**
-     * <code>uint32 wishProgress = 4;</code>
-     * @return The wishProgress.
-     */
-    int getWishProgress();
-
-    /**
-     * <code>bool is_under_general_restrict = 1054;</code>
-     * @return The isUnderGeneralRestrict.
-     */
-    boolean getIsUnderGeneralRestrict();
-
-    /**
-     * <code>uint32 gachaType = 14;</code>
-     * @return The gachaType.
-     */
-    int getGachaType();
-
-    /**
-     * <code>uint32 dailyGachaTimes = 509;</code>
-     * @return The dailyGachaTimes.
-     */
-    int getDailyGachaTimes();
-
-    /**
-     * <code>uint32 newGachaRandom = 7;</code>
-     * @return The newGachaRandom.
-     */
-    int getNewGachaRandom();
-
-    /**
-     * <code>bool is_under_minors_restrict = 1446;</code>
-     * @return The isUnderMinorsRestrict.
-     */
-    boolean getIsUnderMinorsRestrict();
-
-    /**
-     * <code>uint32 gachaScheduleId = 13;</code>
+     * <code>uint32 gacha_schedule_id = 3;</code>
      * @return The gachaScheduleId.
      */
     int getGachaScheduleId();
 
     /**
-     * <code>uint32 costItemId = 12;</code>
+     * <code>uint32 ten_cost_item_num = 4;</code>
+     * @return The tenCostItemNum.
+     */
+    int getTenCostItemNum();
+
+    /**
+     * <code>uint32 cost_item_id = 5;</code>
      * @return The costItemId.
      */
     int getCostItemId();
 
     /**
-     * <code>uint32 tenCostItemId = 3;</code>
-     * @return The tenCostItemId.
+     * <code>uint32 left_gacha_times = 6;</code>
+     * @return The leftGachaTimes.
      */
-    int getTenCostItemId();
+    int getLeftGachaTimes();
 
     /**
-     * <code>uint32 gachaTimesLimit = 15;</code>
+     * <code>uint32 gacha_times_limit = 7;</code>
      * @return The gachaTimesLimit.
      */
     int getGachaTimesLimit();
 
     /**
-     * <code>uint32 wishItemId = 1;</code>
-     * @return The wishItemId.
+     * <code>uint32 ten_cost_item_id = 8;</code>
+     * @return The tenCostItemId.
      */
-    int getWishItemId();
+    int getTenCostItemId();
+
+    /**
+     * <code>uint32 gacha_sort_id = 9;</code>
+     * @return The gachaSortId.
+     */
+    int getGachaSortId();
+
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> 
+        getGachaItemListList();
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index);
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    int getGachaItemListCount();
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
+        getGachaItemListOrBuilderList();
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 gacha_times = 11;</code>
+     * @return The gachaTimes.
+     */
+    int getGachaTimes();
+
+    /**
+     * <code>uint32 cost_item_num = 12;</code>
+     * @return The costItemNum.
+     */
+    int getCostItemNum();
+
+    /**
+     * <code>uint32 wish_progress = 13;</code>
+     * @return The wishProgress.
+     */
+    int getWishProgress();
+
+    /**
+     * <code>uint32 gacha_type = 14;</code>
+     * @return The gachaType.
+     */
+    int getGachaType();
+
+    /**
+     * <code>uint32 wish_max_progress = 15;</code>
+     * @return The wishMaxProgress.
+     */
+    int getWishMaxProgress();
+
+    /**
+     * <pre>
+     * custom field
+     * </pre>
+     *
+     * <code>uint32 new_gacha_random = 16;</code>
+     * @return The newGachaRandom.
+     */
+    int getNewGachaRandom();
+
+    /**
+     * <code>uint32 cur_schedule_daily_gacha_times = 378;</code>
+     * @return The curScheduleDailyGachaTimes.
+     */
+    int getCurScheduleDailyGachaTimes();
+
+    /**
+     * <code>bool DBNKDMFDCNG = 380;</code>
+     * @return The dBNKDMFDCNG.
+     */
+    boolean getDBNKDMFDCNG();
+
+    /**
+     * <code>bool is_under_minors_restrict = 1019;</code>
+     * @return The isUnderMinorsRestrict.
+     */
+    boolean getIsUnderMinorsRestrict();
+
+    /**
+     * <code>uint32 daily_gacha_times = 1528;</code>
+     * @return The dailyGachaTimes.
+     */
+    int getDailyGachaTimes();
+
+    /**
+     * <code>bool is_under_general_restrict = 1604;</code>
+     * @return The isUnderGeneralRestrict.
+     */
+    boolean getIsUnderGeneralRestrict();
   }
   /**
-   * <pre>
-   * CmdId: 25647
-   * Obf: LDCEEHGLDNN
-   * </pre>
-   *
    * Protobuf type {@code DoGachaRsp}
    */
   public static final class DoGachaRsp extends
@@ -214,20 +225,40 @@ public final class DoGachaRspOuterClass {
             }
             case 24: {
 
-              tenCostItemId_ = input.readUInt32();
+              gachaScheduleId_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              wishProgress_ = input.readUInt32();
+              tenCostItemNum_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              gachaTimes_ = input.readUInt32();
+              costItemId_ = input.readUInt32();
               break;
             }
-            case 50: {
+            case 48: {
+
+              leftGachaTimes_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              gachaTimesLimit_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              tenCostItemId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              gachaSortId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 gachaItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem>();
                 mutable_bitField0_ |= 0x00000001;
@@ -236,39 +267,19 @@ public final class DoGachaRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.parser(), extensionRegistry));
               break;
             }
-            case 56: {
-
-              newGachaRandom_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              tenCostItemNum_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              wishMaxProgress_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              costItemNum_ = input.readUInt32();
-              break;
-            }
             case 88: {
 
-              leftGachaTimes_ = input.readUInt32();
+              gachaTimes_ = input.readUInt32();
               break;
             }
             case 96: {
 
-              costItemId_ = input.readUInt32();
+              costItemNum_ = input.readUInt32();
               break;
             }
             case 104: {
 
-              gachaScheduleId_ = input.readUInt32();
+              wishProgress_ = input.readUInt32();
               break;
             }
             case 112: {
@@ -278,29 +289,39 @@ public final class DoGachaRspOuterClass {
             }
             case 120: {
 
-              gachaTimesLimit_ = input.readUInt32();
+              wishMaxProgress_ = input.readUInt32();
               break;
             }
-            case 4072: {
+            case 128: {
 
-              dailyGachaTimes_ = input.readUInt32();
+              newGachaRandom_ = input.readUInt32();
               break;
             }
-            case 5648: {
+            case 3024: {
 
               curScheduleDailyGachaTimes_ = input.readUInt32();
               break;
             }
-            case 8432: {
+            case 3040: {
 
-              isUnderGeneralRestrict_ = input.readBool();
+              dBNKDMFDCNG_ = input.readBool();
               break;
             }
-            case 11568: {
+            case 8152: {
 
               isUnderMinorsRestrict_ = input.readBool();
               break;
             }
+            case 12224: {
+
+              dailyGachaTimes_ = input.readUInt32();
+              break;
+            }
+            case 12832: {
+
+              isUnderGeneralRestrict_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -336,88 +357,15 @@ public final class DoGachaRspOuterClass {
               emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp.class, emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp.Builder.class);
     }
 
-    public static final int TENCOSTITEMNUM_FIELD_NUMBER = 8;
-    private int tenCostItemNum_;
+    public static final int WISH_ITEM_ID_FIELD_NUMBER = 1;
+    private int wishItemId_;
     /**
-     * <code>uint32 tenCostItemNum = 8;</code>
-     * @return The tenCostItemNum.
+     * <code>uint32 wish_item_id = 1;</code>
+     * @return The wishItemId.
      */
     @java.lang.Override
-    public int getTenCostItemNum() {
-      return tenCostItemNum_;
-    }
-
-    public static final int GACHATIMES_FIELD_NUMBER = 5;
-    private int gachaTimes_;
-    /**
-     * <code>uint32 gachaTimes = 5;</code>
-     * @return The gachaTimes.
-     */
-    @java.lang.Override
-    public int getGachaTimes() {
-      return gachaTimes_;
-    }
-
-    public static final int WISHMAXPROGRESS_FIELD_NUMBER = 9;
-    private int wishMaxProgress_;
-    /**
-     * <code>uint32 wishMaxProgress = 9;</code>
-     * @return The wishMaxProgress.
-     */
-    @java.lang.Override
-    public int getWishMaxProgress() {
-      return wishMaxProgress_;
-    }
-
-    public static final int GACHA_ITEM_LIST_FIELD_NUMBER = 6;
-    private java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> gachaItemList_;
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> getGachaItemListList() {
-      return gachaItemList_;
-    }
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
-        getGachaItemListOrBuilderList() {
-      return gachaItemList_;
-    }
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    @java.lang.Override
-    public int getGachaItemListCount() {
-      return gachaItemList_.size();
-    }
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index) {
-      return gachaItemList_.get(index);
-    }
-    /**
-     * <code>repeated .GachaItem gacha_item_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
-        int index) {
-      return gachaItemList_.get(index);
-    }
-
-    public static final int LEFTGACHATIMES_FIELD_NUMBER = 11;
-    private int leftGachaTimes_;
-    /**
-     * <code>uint32 leftGachaTimes = 11;</code>
-     * @return The leftGachaTimes.
-     */
-    @java.lang.Override
-    public int getLeftGachaTimes() {
-      return leftGachaTimes_;
+    public int getWishItemId() {
+      return wishItemId_;
     }
 
     public static final int RETCODE_FIELD_NUMBER = 2;
@@ -431,98 +379,10 @@ public final class DoGachaRspOuterClass {
       return retcode_;
     }
 
-    public static final int COSTITEMNUM_FIELD_NUMBER = 10;
-    private int costItemNum_;
-    /**
-     * <code>uint32 costItemNum = 10;</code>
-     * @return The costItemNum.
-     */
-    @java.lang.Override
-    public int getCostItemNum() {
-      return costItemNum_;
-    }
-
-    public static final int CURSCHEDULEDAILYGACHATIMES_FIELD_NUMBER = 706;
-    private int curScheduleDailyGachaTimes_;
-    /**
-     * <code>uint32 curScheduleDailyGachaTimes = 706;</code>
-     * @return The curScheduleDailyGachaTimes.
-     */
-    @java.lang.Override
-    public int getCurScheduleDailyGachaTimes() {
-      return curScheduleDailyGachaTimes_;
-    }
-
-    public static final int WISHPROGRESS_FIELD_NUMBER = 4;
-    private int wishProgress_;
-    /**
-     * <code>uint32 wishProgress = 4;</code>
-     * @return The wishProgress.
-     */
-    @java.lang.Override
-    public int getWishProgress() {
-      return wishProgress_;
-    }
-
-    public static final int IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER = 1054;
-    private boolean isUnderGeneralRestrict_;
-    /**
-     * <code>bool is_under_general_restrict = 1054;</code>
-     * @return The isUnderGeneralRestrict.
-     */
-    @java.lang.Override
-    public boolean getIsUnderGeneralRestrict() {
-      return isUnderGeneralRestrict_;
-    }
-
-    public static final int GACHATYPE_FIELD_NUMBER = 14;
-    private int gachaType_;
-    /**
-     * <code>uint32 gachaType = 14;</code>
-     * @return The gachaType.
-     */
-    @java.lang.Override
-    public int getGachaType() {
-      return gachaType_;
-    }
-
-    public static final int DAILYGACHATIMES_FIELD_NUMBER = 509;
-    private int dailyGachaTimes_;
-    /**
-     * <code>uint32 dailyGachaTimes = 509;</code>
-     * @return The dailyGachaTimes.
-     */
-    @java.lang.Override
-    public int getDailyGachaTimes() {
-      return dailyGachaTimes_;
-    }
-
-    public static final int NEWGACHARANDOM_FIELD_NUMBER = 7;
-    private int newGachaRandom_;
-    /**
-     * <code>uint32 newGachaRandom = 7;</code>
-     * @return The newGachaRandom.
-     */
-    @java.lang.Override
-    public int getNewGachaRandom() {
-      return newGachaRandom_;
-    }
-
-    public static final int IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER = 1446;
-    private boolean isUnderMinorsRestrict_;
-    /**
-     * <code>bool is_under_minors_restrict = 1446;</code>
-     * @return The isUnderMinorsRestrict.
-     */
-    @java.lang.Override
-    public boolean getIsUnderMinorsRestrict() {
-      return isUnderMinorsRestrict_;
-    }
-
-    public static final int GACHASCHEDULEID_FIELD_NUMBER = 13;
+    public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 3;
     private int gachaScheduleId_;
     /**
-     * <code>uint32 gachaScheduleId = 13;</code>
+     * <code>uint32 gacha_schedule_id = 3;</code>
      * @return The gachaScheduleId.
      */
     @java.lang.Override
@@ -530,10 +390,21 @@ public final class DoGachaRspOuterClass {
       return gachaScheduleId_;
     }
 
-    public static final int COSTITEMID_FIELD_NUMBER = 12;
+    public static final int TEN_COST_ITEM_NUM_FIELD_NUMBER = 4;
+    private int tenCostItemNum_;
+    /**
+     * <code>uint32 ten_cost_item_num = 4;</code>
+     * @return The tenCostItemNum.
+     */
+    @java.lang.Override
+    public int getTenCostItemNum() {
+      return tenCostItemNum_;
+    }
+
+    public static final int COST_ITEM_ID_FIELD_NUMBER = 5;
     private int costItemId_;
     /**
-     * <code>uint32 costItemId = 12;</code>
+     * <code>uint32 cost_item_id = 5;</code>
      * @return The costItemId.
      */
     @java.lang.Override
@@ -541,21 +412,21 @@ public final class DoGachaRspOuterClass {
       return costItemId_;
     }
 
-    public static final int TENCOSTITEMID_FIELD_NUMBER = 3;
-    private int tenCostItemId_;
+    public static final int LEFT_GACHA_TIMES_FIELD_NUMBER = 6;
+    private int leftGachaTimes_;
     /**
-     * <code>uint32 tenCostItemId = 3;</code>
-     * @return The tenCostItemId.
+     * <code>uint32 left_gacha_times = 6;</code>
+     * @return The leftGachaTimes.
      */
     @java.lang.Override
-    public int getTenCostItemId() {
-      return tenCostItemId_;
+    public int getLeftGachaTimes() {
+      return leftGachaTimes_;
     }
 
-    public static final int GACHATIMESLIMIT_FIELD_NUMBER = 15;
+    public static final int GACHA_TIMES_LIMIT_FIELD_NUMBER = 7;
     private int gachaTimesLimit_;
     /**
-     * <code>uint32 gachaTimesLimit = 15;</code>
+     * <code>uint32 gacha_times_limit = 7;</code>
      * @return The gachaTimesLimit.
      */
     @java.lang.Override
@@ -563,15 +434,191 @@ public final class DoGachaRspOuterClass {
       return gachaTimesLimit_;
     }
 
-    public static final int WISHITEMID_FIELD_NUMBER = 1;
-    private int wishItemId_;
+    public static final int TEN_COST_ITEM_ID_FIELD_NUMBER = 8;
+    private int tenCostItemId_;
     /**
-     * <code>uint32 wishItemId = 1;</code>
-     * @return The wishItemId.
+     * <code>uint32 ten_cost_item_id = 8;</code>
+     * @return The tenCostItemId.
      */
     @java.lang.Override
-    public int getWishItemId() {
-      return wishItemId_;
+    public int getTenCostItemId() {
+      return tenCostItemId_;
+    }
+
+    public static final int GACHA_SORT_ID_FIELD_NUMBER = 9;
+    private int gachaSortId_;
+    /**
+     * <code>uint32 gacha_sort_id = 9;</code>
+     * @return The gachaSortId.
+     */
+    @java.lang.Override
+    public int getGachaSortId() {
+      return gachaSortId_;
+    }
+
+    public static final int GACHA_ITEM_LIST_FIELD_NUMBER = 10;
+    private java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> gachaItemList_;
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> getGachaItemListList() {
+      return gachaItemList_;
+    }
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
+        getGachaItemListOrBuilderList() {
+      return gachaItemList_;
+    }
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    @java.lang.Override
+    public int getGachaItemListCount() {
+      return gachaItemList_.size();
+    }
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index) {
+      return gachaItemList_.get(index);
+    }
+    /**
+     * <code>repeated .GachaItem gacha_item_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
+        int index) {
+      return gachaItemList_.get(index);
+    }
+
+    public static final int GACHA_TIMES_FIELD_NUMBER = 11;
+    private int gachaTimes_;
+    /**
+     * <code>uint32 gacha_times = 11;</code>
+     * @return The gachaTimes.
+     */
+    @java.lang.Override
+    public int getGachaTimes() {
+      return gachaTimes_;
+    }
+
+    public static final int COST_ITEM_NUM_FIELD_NUMBER = 12;
+    private int costItemNum_;
+    /**
+     * <code>uint32 cost_item_num = 12;</code>
+     * @return The costItemNum.
+     */
+    @java.lang.Override
+    public int getCostItemNum() {
+      return costItemNum_;
+    }
+
+    public static final int WISH_PROGRESS_FIELD_NUMBER = 13;
+    private int wishProgress_;
+    /**
+     * <code>uint32 wish_progress = 13;</code>
+     * @return The wishProgress.
+     */
+    @java.lang.Override
+    public int getWishProgress() {
+      return wishProgress_;
+    }
+
+    public static final int GACHA_TYPE_FIELD_NUMBER = 14;
+    private int gachaType_;
+    /**
+     * <code>uint32 gacha_type = 14;</code>
+     * @return The gachaType.
+     */
+    @java.lang.Override
+    public int getGachaType() {
+      return gachaType_;
+    }
+
+    public static final int WISH_MAX_PROGRESS_FIELD_NUMBER = 15;
+    private int wishMaxProgress_;
+    /**
+     * <code>uint32 wish_max_progress = 15;</code>
+     * @return The wishMaxProgress.
+     */
+    @java.lang.Override
+    public int getWishMaxProgress() {
+      return wishMaxProgress_;
+    }
+
+    public static final int NEW_GACHA_RANDOM_FIELD_NUMBER = 16;
+    private int newGachaRandom_;
+    /**
+     * <pre>
+     * custom field
+     * </pre>
+     *
+     * <code>uint32 new_gacha_random = 16;</code>
+     * @return The newGachaRandom.
+     */
+    @java.lang.Override
+    public int getNewGachaRandom() {
+      return newGachaRandom_;
+    }
+
+    public static final int CUR_SCHEDULE_DAILY_GACHA_TIMES_FIELD_NUMBER = 378;
+    private int curScheduleDailyGachaTimes_;
+    /**
+     * <code>uint32 cur_schedule_daily_gacha_times = 378;</code>
+     * @return The curScheduleDailyGachaTimes.
+     */
+    @java.lang.Override
+    public int getCurScheduleDailyGachaTimes() {
+      return curScheduleDailyGachaTimes_;
+    }
+
+    public static final int DBNKDMFDCNG_FIELD_NUMBER = 380;
+    private boolean dBNKDMFDCNG_;
+    /**
+     * <code>bool DBNKDMFDCNG = 380;</code>
+     * @return The dBNKDMFDCNG.
+     */
+    @java.lang.Override
+    public boolean getDBNKDMFDCNG() {
+      return dBNKDMFDCNG_;
+    }
+
+    public static final int IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER = 1019;
+    private boolean isUnderMinorsRestrict_;
+    /**
+     * <code>bool is_under_minors_restrict = 1019;</code>
+     * @return The isUnderMinorsRestrict.
+     */
+    @java.lang.Override
+    public boolean getIsUnderMinorsRestrict() {
+      return isUnderMinorsRestrict_;
+    }
+
+    public static final int DAILY_GACHA_TIMES_FIELD_NUMBER = 1528;
+    private int dailyGachaTimes_;
+    /**
+     * <code>uint32 daily_gacha_times = 1528;</code>
+     * @return The dailyGachaTimes.
+     */
+    @java.lang.Override
+    public int getDailyGachaTimes() {
+      return dailyGachaTimes_;
+    }
+
+    public static final int IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER = 1604;
+    private boolean isUnderGeneralRestrict_;
+    /**
+     * <code>bool is_under_general_restrict = 1604;</code>
+     * @return The isUnderGeneralRestrict.
+     */
+    @java.lang.Override
+    public boolean getIsUnderGeneralRestrict() {
+      return isUnderGeneralRestrict_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -594,56 +641,62 @@ public final class DoGachaRspOuterClass {
       if (retcode_ != 0) {
         output.writeInt32(2, retcode_);
       }
-      if (tenCostItemId_ != 0) {
-        output.writeUInt32(3, tenCostItemId_);
-      }
-      if (wishProgress_ != 0) {
-        output.writeUInt32(4, wishProgress_);
-      }
-      if (gachaTimes_ != 0) {
-        output.writeUInt32(5, gachaTimes_);
-      }
-      for (int i = 0; i < gachaItemList_.size(); i++) {
-        output.writeMessage(6, gachaItemList_.get(i));
-      }
-      if (newGachaRandom_ != 0) {
-        output.writeUInt32(7, newGachaRandom_);
+      if (gachaScheduleId_ != 0) {
+        output.writeUInt32(3, gachaScheduleId_);
       }
       if (tenCostItemNum_ != 0) {
-        output.writeUInt32(8, tenCostItemNum_);
-      }
-      if (wishMaxProgress_ != 0) {
-        output.writeUInt32(9, wishMaxProgress_);
-      }
-      if (costItemNum_ != 0) {
-        output.writeUInt32(10, costItemNum_);
-      }
-      if (leftGachaTimes_ != 0) {
-        output.writeUInt32(11, leftGachaTimes_);
+        output.writeUInt32(4, tenCostItemNum_);
       }
       if (costItemId_ != 0) {
-        output.writeUInt32(12, costItemId_);
+        output.writeUInt32(5, costItemId_);
       }
-      if (gachaScheduleId_ != 0) {
-        output.writeUInt32(13, gachaScheduleId_);
+      if (leftGachaTimes_ != 0) {
+        output.writeUInt32(6, leftGachaTimes_);
+      }
+      if (gachaTimesLimit_ != 0) {
+        output.writeUInt32(7, gachaTimesLimit_);
+      }
+      if (tenCostItemId_ != 0) {
+        output.writeUInt32(8, tenCostItemId_);
+      }
+      if (gachaSortId_ != 0) {
+        output.writeUInt32(9, gachaSortId_);
+      }
+      for (int i = 0; i < gachaItemList_.size(); i++) {
+        output.writeMessage(10, gachaItemList_.get(i));
+      }
+      if (gachaTimes_ != 0) {
+        output.writeUInt32(11, gachaTimes_);
+      }
+      if (costItemNum_ != 0) {
+        output.writeUInt32(12, costItemNum_);
+      }
+      if (wishProgress_ != 0) {
+        output.writeUInt32(13, wishProgress_);
       }
       if (gachaType_ != 0) {
         output.writeUInt32(14, gachaType_);
       }
-      if (gachaTimesLimit_ != 0) {
-        output.writeUInt32(15, gachaTimesLimit_);
+      if (wishMaxProgress_ != 0) {
+        output.writeUInt32(15, wishMaxProgress_);
       }
-      if (dailyGachaTimes_ != 0) {
-        output.writeUInt32(509, dailyGachaTimes_);
+      if (newGachaRandom_ != 0) {
+        output.writeUInt32(16, newGachaRandom_);
       }
       if (curScheduleDailyGachaTimes_ != 0) {
-        output.writeUInt32(706, curScheduleDailyGachaTimes_);
+        output.writeUInt32(378, curScheduleDailyGachaTimes_);
       }
-      if (isUnderGeneralRestrict_ != false) {
-        output.writeBool(1054, isUnderGeneralRestrict_);
+      if (dBNKDMFDCNG_ != false) {
+        output.writeBool(380, dBNKDMFDCNG_);
       }
       if (isUnderMinorsRestrict_ != false) {
-        output.writeBool(1446, isUnderMinorsRestrict_);
+        output.writeBool(1019, isUnderMinorsRestrict_);
+      }
+      if (dailyGachaTimes_ != 0) {
+        output.writeUInt32(1528, dailyGachaTimes_);
+      }
+      if (isUnderGeneralRestrict_ != false) {
+        output.writeBool(1604, isUnderGeneralRestrict_);
       }
       unknownFields.writeTo(output);
     }
@@ -662,73 +715,81 @@ public final class DoGachaRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, retcode_);
       }
-      if (tenCostItemId_ != 0) {
+      if (gachaScheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, tenCostItemId_);
-      }
-      if (wishProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, wishProgress_);
-      }
-      if (gachaTimes_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, gachaTimes_);
-      }
-      for (int i = 0; i < gachaItemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, gachaItemList_.get(i));
-      }
-      if (newGachaRandom_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, newGachaRandom_);
+          .computeUInt32Size(3, gachaScheduleId_);
       }
       if (tenCostItemNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, tenCostItemNum_);
-      }
-      if (wishMaxProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, wishMaxProgress_);
-      }
-      if (costItemNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, costItemNum_);
-      }
-      if (leftGachaTimes_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, leftGachaTimes_);
+          .computeUInt32Size(4, tenCostItemNum_);
       }
       if (costItemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, costItemId_);
+          .computeUInt32Size(5, costItemId_);
       }
-      if (gachaScheduleId_ != 0) {
+      if (leftGachaTimes_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, gachaScheduleId_);
+          .computeUInt32Size(6, leftGachaTimes_);
+      }
+      if (gachaTimesLimit_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, gachaTimesLimit_);
+      }
+      if (tenCostItemId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, tenCostItemId_);
+      }
+      if (gachaSortId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, gachaSortId_);
+      }
+      for (int i = 0; i < gachaItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, gachaItemList_.get(i));
+      }
+      if (gachaTimes_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, gachaTimes_);
+      }
+      if (costItemNum_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, costItemNum_);
+      }
+      if (wishProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, wishProgress_);
       }
       if (gachaType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, gachaType_);
       }
-      if (gachaTimesLimit_ != 0) {
+      if (wishMaxProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, gachaTimesLimit_);
+          .computeUInt32Size(15, wishMaxProgress_);
       }
-      if (dailyGachaTimes_ != 0) {
+      if (newGachaRandom_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(509, dailyGachaTimes_);
+          .computeUInt32Size(16, newGachaRandom_);
       }
       if (curScheduleDailyGachaTimes_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(706, curScheduleDailyGachaTimes_);
+          .computeUInt32Size(378, curScheduleDailyGachaTimes_);
       }
-      if (isUnderGeneralRestrict_ != false) {
+      if (dBNKDMFDCNG_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1054, isUnderGeneralRestrict_);
+          .computeBoolSize(380, dBNKDMFDCNG_);
       }
       if (isUnderMinorsRestrict_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1446, isUnderMinorsRestrict_);
+          .computeBoolSize(1019, isUnderMinorsRestrict_);
+      }
+      if (dailyGachaTimes_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1528, dailyGachaTimes_);
+      }
+      if (isUnderGeneralRestrict_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1604, isUnderGeneralRestrict_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -745,44 +806,48 @@ public final class DoGachaRspOuterClass {
       }
       emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp other = (emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp) obj;
 
-      if (getTenCostItemNum()
-          != other.getTenCostItemNum()) return false;
-      if (getGachaTimes()
-          != other.getGachaTimes()) return false;
-      if (getWishMaxProgress()
-          != other.getWishMaxProgress()) return false;
-      if (!getGachaItemListList()
-          .equals(other.getGachaItemListList())) return false;
-      if (getLeftGachaTimes()
-          != other.getLeftGachaTimes()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getCostItemNum()
-          != other.getCostItemNum()) return false;
-      if (getCurScheduleDailyGachaTimes()
-          != other.getCurScheduleDailyGachaTimes()) return false;
-      if (getWishProgress()
-          != other.getWishProgress()) return false;
-      if (getIsUnderGeneralRestrict()
-          != other.getIsUnderGeneralRestrict()) return false;
-      if (getGachaType()
-          != other.getGachaType()) return false;
-      if (getDailyGachaTimes()
-          != other.getDailyGachaTimes()) return false;
-      if (getNewGachaRandom()
-          != other.getNewGachaRandom()) return false;
-      if (getIsUnderMinorsRestrict()
-          != other.getIsUnderMinorsRestrict()) return false;
-      if (getGachaScheduleId()
-          != other.getGachaScheduleId()) return false;
-      if (getCostItemId()
-          != other.getCostItemId()) return false;
-      if (getTenCostItemId()
-          != other.getTenCostItemId()) return false;
-      if (getGachaTimesLimit()
-          != other.getGachaTimesLimit()) return false;
       if (getWishItemId()
           != other.getWishItemId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getGachaScheduleId()
+          != other.getGachaScheduleId()) return false;
+      if (getTenCostItemNum()
+          != other.getTenCostItemNum()) return false;
+      if (getCostItemId()
+          != other.getCostItemId()) return false;
+      if (getLeftGachaTimes()
+          != other.getLeftGachaTimes()) return false;
+      if (getGachaTimesLimit()
+          != other.getGachaTimesLimit()) return false;
+      if (getTenCostItemId()
+          != other.getTenCostItemId()) return false;
+      if (getGachaSortId()
+          != other.getGachaSortId()) return false;
+      if (!getGachaItemListList()
+          .equals(other.getGachaItemListList())) return false;
+      if (getGachaTimes()
+          != other.getGachaTimes()) return false;
+      if (getCostItemNum()
+          != other.getCostItemNum()) return false;
+      if (getWishProgress()
+          != other.getWishProgress()) return false;
+      if (getGachaType()
+          != other.getGachaType()) return false;
+      if (getWishMaxProgress()
+          != other.getWishMaxProgress()) return false;
+      if (getNewGachaRandom()
+          != other.getNewGachaRandom()) return false;
+      if (getCurScheduleDailyGachaTimes()
+          != other.getCurScheduleDailyGachaTimes()) return false;
+      if (getDBNKDMFDCNG()
+          != other.getDBNKDMFDCNG()) return false;
+      if (getIsUnderMinorsRestrict()
+          != other.getIsUnderMinorsRestrict()) return false;
+      if (getDailyGachaTimes()
+          != other.getDailyGachaTimes()) return false;
+      if (getIsUnderGeneralRestrict()
+          != other.getIsUnderGeneralRestrict()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -794,48 +859,53 @@ public final class DoGachaRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TENCOSTITEMNUM_FIELD_NUMBER;
+      hash = (37 * hash) + WISH_ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWishItemId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + GACHA_SCHEDULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaScheduleId();
+      hash = (37 * hash) + TEN_COST_ITEM_NUM_FIELD_NUMBER;
       hash = (53 * hash) + getTenCostItemNum();
-      hash = (37 * hash) + GACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaTimes();
-      hash = (37 * hash) + WISHMAXPROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getWishMaxProgress();
+      hash = (37 * hash) + COST_ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCostItemId();
+      hash = (37 * hash) + LEFT_GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getLeftGachaTimes();
+      hash = (37 * hash) + GACHA_TIMES_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaTimesLimit();
+      hash = (37 * hash) + TEN_COST_ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTenCostItemId();
+      hash = (37 * hash) + GACHA_SORT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaSortId();
       if (getGachaItemListCount() > 0) {
         hash = (37 * hash) + GACHA_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGachaItemListList().hashCode();
       }
-      hash = (37 * hash) + LEFTGACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getLeftGachaTimes();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + COSTITEMNUM_FIELD_NUMBER;
+      hash = (37 * hash) + GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaTimes();
+      hash = (37 * hash) + COST_ITEM_NUM_FIELD_NUMBER;
       hash = (53 * hash) + getCostItemNum();
-      hash = (37 * hash) + CURSCHEDULEDAILYGACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getCurScheduleDailyGachaTimes();
-      hash = (37 * hash) + WISHPROGRESS_FIELD_NUMBER;
+      hash = (37 * hash) + WISH_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getWishProgress();
-      hash = (37 * hash) + IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsUnderGeneralRestrict());
-      hash = (37 * hash) + GACHATYPE_FIELD_NUMBER;
+      hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getGachaType();
-      hash = (37 * hash) + DAILYGACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getDailyGachaTimes();
-      hash = (37 * hash) + NEWGACHARANDOM_FIELD_NUMBER;
+      hash = (37 * hash) + WISH_MAX_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getWishMaxProgress();
+      hash = (37 * hash) + NEW_GACHA_RANDOM_FIELD_NUMBER;
       hash = (53 * hash) + getNewGachaRandom();
+      hash = (37 * hash) + CUR_SCHEDULE_DAILY_GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getCurScheduleDailyGachaTimes();
+      hash = (37 * hash) + DBNKDMFDCNG_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getDBNKDMFDCNG());
       hash = (37 * hash) + IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsUnderMinorsRestrict());
-      hash = (37 * hash) + GACHASCHEDULEID_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaScheduleId();
-      hash = (37 * hash) + COSTITEMID_FIELD_NUMBER;
-      hash = (53 * hash) + getCostItemId();
-      hash = (37 * hash) + TENCOSTITEMID_FIELD_NUMBER;
-      hash = (53 * hash) + getTenCostItemId();
-      hash = (37 * hash) + GACHATIMESLIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaTimesLimit();
-      hash = (37 * hash) + WISHITEMID_FIELD_NUMBER;
-      hash = (53 * hash) + getWishItemId();
+      hash = (37 * hash) + DAILY_GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getDailyGachaTimes();
+      hash = (37 * hash) + IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsUnderGeneralRestrict());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -932,11 +1002,6 @@ public final class DoGachaRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25647
-     * Obf: LDCEEHGLDNN
-     * </pre>
-     *
      * Protobuf type {@code DoGachaRsp}
      */
     public static final class Builder extends
@@ -975,11 +1040,23 @@ public final class DoGachaRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        wishItemId_ = 0;
+
+        retcode_ = 0;
+
+        gachaScheduleId_ = 0;
+
         tenCostItemNum_ = 0;
 
-        gachaTimes_ = 0;
+        costItemId_ = 0;
 
-        wishMaxProgress_ = 0;
+        leftGachaTimes_ = 0;
+
+        gachaTimesLimit_ = 0;
+
+        tenCostItemId_ = 0;
+
+        gachaSortId_ = 0;
 
         if (gachaItemListBuilder_ == null) {
           gachaItemList_ = java.util.Collections.emptyList();
@@ -987,35 +1064,27 @@ public final class DoGachaRspOuterClass {
         } else {
           gachaItemListBuilder_.clear();
         }
-        leftGachaTimes_ = 0;
-
-        retcode_ = 0;
+        gachaTimes_ = 0;
 
         costItemNum_ = 0;
 
-        curScheduleDailyGachaTimes_ = 0;
-
         wishProgress_ = 0;
 
-        isUnderGeneralRestrict_ = false;
-
         gachaType_ = 0;
 
-        dailyGachaTimes_ = 0;
+        wishMaxProgress_ = 0;
 
         newGachaRandom_ = 0;
 
+        curScheduleDailyGachaTimes_ = 0;
+
+        dBNKDMFDCNG_ = false;
+
         isUnderMinorsRestrict_ = false;
 
-        gachaScheduleId_ = 0;
+        dailyGachaTimes_ = 0;
 
-        costItemId_ = 0;
-
-        tenCostItemId_ = 0;
-
-        gachaTimesLimit_ = 0;
-
-        wishItemId_ = 0;
+        isUnderGeneralRestrict_ = false;
 
         return this;
       }
@@ -1044,9 +1113,15 @@ public final class DoGachaRspOuterClass {
       public emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp buildPartial() {
         emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp result = new emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp(this);
         int from_bitField0_ = bitField0_;
+        result.wishItemId_ = wishItemId_;
+        result.retcode_ = retcode_;
+        result.gachaScheduleId_ = gachaScheduleId_;
         result.tenCostItemNum_ = tenCostItemNum_;
-        result.gachaTimes_ = gachaTimes_;
-        result.wishMaxProgress_ = wishMaxProgress_;
+        result.costItemId_ = costItemId_;
+        result.leftGachaTimes_ = leftGachaTimes_;
+        result.gachaTimesLimit_ = gachaTimesLimit_;
+        result.tenCostItemId_ = tenCostItemId_;
+        result.gachaSortId_ = gachaSortId_;
         if (gachaItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             gachaItemList_ = java.util.Collections.unmodifiableList(gachaItemList_);
@@ -1056,21 +1131,17 @@ public final class DoGachaRspOuterClass {
         } else {
           result.gachaItemList_ = gachaItemListBuilder_.build();
         }
-        result.leftGachaTimes_ = leftGachaTimes_;
-        result.retcode_ = retcode_;
+        result.gachaTimes_ = gachaTimes_;
         result.costItemNum_ = costItemNum_;
-        result.curScheduleDailyGachaTimes_ = curScheduleDailyGachaTimes_;
         result.wishProgress_ = wishProgress_;
-        result.isUnderGeneralRestrict_ = isUnderGeneralRestrict_;
         result.gachaType_ = gachaType_;
-        result.dailyGachaTimes_ = dailyGachaTimes_;
+        result.wishMaxProgress_ = wishMaxProgress_;
         result.newGachaRandom_ = newGachaRandom_;
+        result.curScheduleDailyGachaTimes_ = curScheduleDailyGachaTimes_;
+        result.dBNKDMFDCNG_ = dBNKDMFDCNG_;
         result.isUnderMinorsRestrict_ = isUnderMinorsRestrict_;
-        result.gachaScheduleId_ = gachaScheduleId_;
-        result.costItemId_ = costItemId_;
-        result.tenCostItemId_ = tenCostItemId_;
-        result.gachaTimesLimit_ = gachaTimesLimit_;
-        result.wishItemId_ = wishItemId_;
+        result.dailyGachaTimes_ = dailyGachaTimes_;
+        result.isUnderGeneralRestrict_ = isUnderGeneralRestrict_;
         onBuilt();
         return result;
       }
@@ -1119,14 +1190,32 @@ public final class DoGachaRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp other) {
         if (other == emu.grasscutter.net.proto.DoGachaRspOuterClass.DoGachaRsp.getDefaultInstance()) return this;
+        if (other.getWishItemId() != 0) {
+          setWishItemId(other.getWishItemId());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getGachaScheduleId() != 0) {
+          setGachaScheduleId(other.getGachaScheduleId());
+        }
         if (other.getTenCostItemNum() != 0) {
           setTenCostItemNum(other.getTenCostItemNum());
         }
-        if (other.getGachaTimes() != 0) {
-          setGachaTimes(other.getGachaTimes());
+        if (other.getCostItemId() != 0) {
+          setCostItemId(other.getCostItemId());
         }
-        if (other.getWishMaxProgress() != 0) {
-          setWishMaxProgress(other.getWishMaxProgress());
+        if (other.getLeftGachaTimes() != 0) {
+          setLeftGachaTimes(other.getLeftGachaTimes());
+        }
+        if (other.getGachaTimesLimit() != 0) {
+          setGachaTimesLimit(other.getGachaTimesLimit());
+        }
+        if (other.getTenCostItemId() != 0) {
+          setTenCostItemId(other.getTenCostItemId());
+        }
+        if (other.getGachaSortId() != 0) {
+          setGachaSortId(other.getGachaSortId());
         }
         if (gachaItemListBuilder_ == null) {
           if (!other.gachaItemList_.isEmpty()) {
@@ -1154,50 +1243,38 @@ public final class DoGachaRspOuterClass {
             }
           }
         }
-        if (other.getLeftGachaTimes() != 0) {
-          setLeftGachaTimes(other.getLeftGachaTimes());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getGachaTimes() != 0) {
+          setGachaTimes(other.getGachaTimes());
         }
         if (other.getCostItemNum() != 0) {
           setCostItemNum(other.getCostItemNum());
         }
-        if (other.getCurScheduleDailyGachaTimes() != 0) {
-          setCurScheduleDailyGachaTimes(other.getCurScheduleDailyGachaTimes());
-        }
         if (other.getWishProgress() != 0) {
           setWishProgress(other.getWishProgress());
         }
-        if (other.getIsUnderGeneralRestrict() != false) {
-          setIsUnderGeneralRestrict(other.getIsUnderGeneralRestrict());
-        }
         if (other.getGachaType() != 0) {
           setGachaType(other.getGachaType());
         }
-        if (other.getDailyGachaTimes() != 0) {
-          setDailyGachaTimes(other.getDailyGachaTimes());
+        if (other.getWishMaxProgress() != 0) {
+          setWishMaxProgress(other.getWishMaxProgress());
         }
         if (other.getNewGachaRandom() != 0) {
           setNewGachaRandom(other.getNewGachaRandom());
         }
+        if (other.getCurScheduleDailyGachaTimes() != 0) {
+          setCurScheduleDailyGachaTimes(other.getCurScheduleDailyGachaTimes());
+        }
+        if (other.getDBNKDMFDCNG() != false) {
+          setDBNKDMFDCNG(other.getDBNKDMFDCNG());
+        }
         if (other.getIsUnderMinorsRestrict() != false) {
           setIsUnderMinorsRestrict(other.getIsUnderMinorsRestrict());
         }
-        if (other.getGachaScheduleId() != 0) {
-          setGachaScheduleId(other.getGachaScheduleId());
+        if (other.getDailyGachaTimes() != 0) {
+          setDailyGachaTimes(other.getDailyGachaTimes());
         }
-        if (other.getCostItemId() != 0) {
-          setCostItemId(other.getCostItemId());
-        }
-        if (other.getTenCostItemId() != 0) {
-          setTenCostItemId(other.getTenCostItemId());
-        }
-        if (other.getGachaTimesLimit() != 0) {
-          setGachaTimesLimit(other.getGachaTimesLimit());
-        }
-        if (other.getWishItemId() != 0) {
-          setWishItemId(other.getWishItemId());
+        if (other.getIsUnderGeneralRestrict() != false) {
+          setIsUnderGeneralRestrict(other.getIsUnderGeneralRestrict());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1229,366 +1306,33 @@ public final class DoGachaRspOuterClass {
       }
       private int bitField0_;
 
-      private int tenCostItemNum_ ;
+      private int wishItemId_ ;
       /**
-       * <code>uint32 tenCostItemNum = 8;</code>
-       * @return The tenCostItemNum.
+       * <code>uint32 wish_item_id = 1;</code>
+       * @return The wishItemId.
        */
       @java.lang.Override
-      public int getTenCostItemNum() {
-        return tenCostItemNum_;
+      public int getWishItemId() {
+        return wishItemId_;
       }
       /**
-       * <code>uint32 tenCostItemNum = 8;</code>
-       * @param value The tenCostItemNum to set.
+       * <code>uint32 wish_item_id = 1;</code>
+       * @param value The wishItemId to set.
        * @return This builder for chaining.
        */
-      public Builder setTenCostItemNum(int value) {
+      public Builder setWishItemId(int value) {
         
-        tenCostItemNum_ = value;
+        wishItemId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 tenCostItemNum = 8;</code>
+       * <code>uint32 wish_item_id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTenCostItemNum() {
+      public Builder clearWishItemId() {
         
-        tenCostItemNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gachaTimes_ ;
-      /**
-       * <code>uint32 gachaTimes = 5;</code>
-       * @return The gachaTimes.
-       */
-      @java.lang.Override
-      public int getGachaTimes() {
-        return gachaTimes_;
-      }
-      /**
-       * <code>uint32 gachaTimes = 5;</code>
-       * @param value The gachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaTimes(int value) {
-        
-        gachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaTimes = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaTimes() {
-        
-        gachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int wishMaxProgress_ ;
-      /**
-       * <code>uint32 wishMaxProgress = 9;</code>
-       * @return The wishMaxProgress.
-       */
-      @java.lang.Override
-      public int getWishMaxProgress() {
-        return wishMaxProgress_;
-      }
-      /**
-       * <code>uint32 wishMaxProgress = 9;</code>
-       * @param value The wishMaxProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWishMaxProgress(int value) {
-        
-        wishMaxProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wishMaxProgress = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWishMaxProgress() {
-        
-        wishMaxProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> gachaItemList_ =
-        java.util.Collections.emptyList();
-      private void ensureGachaItemListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          gachaItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem>(gachaItemList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> gachaItemListBuilder_;
-
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> getGachaItemListList() {
-        if (gachaItemListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(gachaItemList_);
-        } else {
-          return gachaItemListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public int getGachaItemListCount() {
-        if (gachaItemListBuilder_ == null) {
-          return gachaItemList_.size();
-        } else {
-          return gachaItemListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index) {
-        if (gachaItemListBuilder_ == null) {
-          return gachaItemList_.get(index);
-        } else {
-          return gachaItemListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder setGachaItemList(
-          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
-        if (gachaItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaItemListIsMutable();
-          gachaItemList_.set(index, value);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder setGachaItemList(
-          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
-        if (gachaItemListBuilder_ == null) {
-          ensureGachaItemListIsMutable();
-          gachaItemList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          gachaItemListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder addGachaItemList(emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
-        if (gachaItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaItemListIsMutable();
-          gachaItemList_.add(value);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder addGachaItemList(
-          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
-        if (gachaItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaItemListIsMutable();
-          gachaItemList_.add(index, value);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder addGachaItemList(
-          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
-        if (gachaItemListBuilder_ == null) {
-          ensureGachaItemListIsMutable();
-          gachaItemList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          gachaItemListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder addGachaItemList(
-          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
-        if (gachaItemListBuilder_ == null) {
-          ensureGachaItemListIsMutable();
-          gachaItemList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          gachaItemListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder addAllGachaItemList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> values) {
-        if (gachaItemListBuilder_ == null) {
-          ensureGachaItemListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, gachaItemList_);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder clearGachaItemList() {
-        if (gachaItemListBuilder_ == null) {
-          gachaItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public Builder removeGachaItemList(int index) {
-        if (gachaItemListBuilder_ == null) {
-          ensureGachaItemListIsMutable();
-          gachaItemList_.remove(index);
-          onChanged();
-        } else {
-          gachaItemListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder getGachaItemListBuilder(
-          int index) {
-        return getGachaItemListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
-          int index) {
-        if (gachaItemListBuilder_ == null) {
-          return gachaItemList_.get(index);  } else {
-          return gachaItemListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
-           getGachaItemListOrBuilderList() {
-        if (gachaItemListBuilder_ != null) {
-          return gachaItemListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(gachaItemList_);
-        }
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder addGachaItemListBuilder() {
-        return getGachaItemListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder addGachaItemListBuilder(
-          int index) {
-        return getGachaItemListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .GachaItem gacha_item_list = 6;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder> 
-           getGachaItemListBuilderList() {
-        return getGachaItemListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
-          getGachaItemListFieldBuilder() {
-        if (gachaItemListBuilder_ == null) {
-          gachaItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder>(
-                  gachaItemList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          gachaItemList_ = null;
-        }
-        return gachaItemListBuilder_;
-      }
-
-      private int leftGachaTimes_ ;
-      /**
-       * <code>uint32 leftGachaTimes = 11;</code>
-       * @return The leftGachaTimes.
-       */
-      @java.lang.Override
-      public int getLeftGachaTimes() {
-        return leftGachaTimes_;
-      }
-      /**
-       * <code>uint32 leftGachaTimes = 11;</code>
-       * @param value The leftGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLeftGachaTimes(int value) {
-        
-        leftGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 leftGachaTimes = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLeftGachaTimes() {
-        
-        leftGachaTimes_ = 0;
+        wishItemId_ = 0;
         onChanged();
         return this;
       }
@@ -1624,257 +1368,9 @@ public final class DoGachaRspOuterClass {
         return this;
       }
 
-      private int costItemNum_ ;
-      /**
-       * <code>uint32 costItemNum = 10;</code>
-       * @return The costItemNum.
-       */
-      @java.lang.Override
-      public int getCostItemNum() {
-        return costItemNum_;
-      }
-      /**
-       * <code>uint32 costItemNum = 10;</code>
-       * @param value The costItemNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCostItemNum(int value) {
-        
-        costItemNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 costItemNum = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCostItemNum() {
-        
-        costItemNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curScheduleDailyGachaTimes_ ;
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 706;</code>
-       * @return The curScheduleDailyGachaTimes.
-       */
-      @java.lang.Override
-      public int getCurScheduleDailyGachaTimes() {
-        return curScheduleDailyGachaTimes_;
-      }
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 706;</code>
-       * @param value The curScheduleDailyGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurScheduleDailyGachaTimes(int value) {
-        
-        curScheduleDailyGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 706;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurScheduleDailyGachaTimes() {
-        
-        curScheduleDailyGachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int wishProgress_ ;
-      /**
-       * <code>uint32 wishProgress = 4;</code>
-       * @return The wishProgress.
-       */
-      @java.lang.Override
-      public int getWishProgress() {
-        return wishProgress_;
-      }
-      /**
-       * <code>uint32 wishProgress = 4;</code>
-       * @param value The wishProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWishProgress(int value) {
-        
-        wishProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wishProgress = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWishProgress() {
-        
-        wishProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isUnderGeneralRestrict_ ;
-      /**
-       * <code>bool is_under_general_restrict = 1054;</code>
-       * @return The isUnderGeneralRestrict.
-       */
-      @java.lang.Override
-      public boolean getIsUnderGeneralRestrict() {
-        return isUnderGeneralRestrict_;
-      }
-      /**
-       * <code>bool is_under_general_restrict = 1054;</code>
-       * @param value The isUnderGeneralRestrict to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsUnderGeneralRestrict(boolean value) {
-        
-        isUnderGeneralRestrict_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_under_general_restrict = 1054;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUnderGeneralRestrict() {
-        
-        isUnderGeneralRestrict_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int gachaType_ ;
-      /**
-       * <code>uint32 gachaType = 14;</code>
-       * @return The gachaType.
-       */
-      @java.lang.Override
-      public int getGachaType() {
-        return gachaType_;
-      }
-      /**
-       * <code>uint32 gachaType = 14;</code>
-       * @param value The gachaType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaType(int value) {
-        
-        gachaType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaType = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaType() {
-        
-        gachaType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int dailyGachaTimes_ ;
-      /**
-       * <code>uint32 dailyGachaTimes = 509;</code>
-       * @return The dailyGachaTimes.
-       */
-      @java.lang.Override
-      public int getDailyGachaTimes() {
-        return dailyGachaTimes_;
-      }
-      /**
-       * <code>uint32 dailyGachaTimes = 509;</code>
-       * @param value The dailyGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDailyGachaTimes(int value) {
-        
-        dailyGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dailyGachaTimes = 509;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDailyGachaTimes() {
-        
-        dailyGachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int newGachaRandom_ ;
-      /**
-       * <code>uint32 newGachaRandom = 7;</code>
-       * @return The newGachaRandom.
-       */
-      @java.lang.Override
-      public int getNewGachaRandom() {
-        return newGachaRandom_;
-      }
-      /**
-       * <code>uint32 newGachaRandom = 7;</code>
-       * @param value The newGachaRandom to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNewGachaRandom(int value) {
-        
-        newGachaRandom_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 newGachaRandom = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNewGachaRandom() {
-        
-        newGachaRandom_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isUnderMinorsRestrict_ ;
-      /**
-       * <code>bool is_under_minors_restrict = 1446;</code>
-       * @return The isUnderMinorsRestrict.
-       */
-      @java.lang.Override
-      public boolean getIsUnderMinorsRestrict() {
-        return isUnderMinorsRestrict_;
-      }
-      /**
-       * <code>bool is_under_minors_restrict = 1446;</code>
-       * @param value The isUnderMinorsRestrict to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsUnderMinorsRestrict(boolean value) {
-        
-        isUnderMinorsRestrict_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_under_minors_restrict = 1446;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUnderMinorsRestrict() {
-        
-        isUnderMinorsRestrict_ = false;
-        onChanged();
-        return this;
-      }
-
       private int gachaScheduleId_ ;
       /**
-       * <code>uint32 gachaScheduleId = 13;</code>
+       * <code>uint32 gacha_schedule_id = 3;</code>
        * @return The gachaScheduleId.
        */
       @java.lang.Override
@@ -1882,7 +1378,7 @@ public final class DoGachaRspOuterClass {
         return gachaScheduleId_;
       }
       /**
-       * <code>uint32 gachaScheduleId = 13;</code>
+       * <code>uint32 gacha_schedule_id = 3;</code>
        * @param value The gachaScheduleId to set.
        * @return This builder for chaining.
        */
@@ -1893,7 +1389,7 @@ public final class DoGachaRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gachaScheduleId = 13;</code>
+       * <code>uint32 gacha_schedule_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaScheduleId() {
@@ -1903,9 +1399,40 @@ public final class DoGachaRspOuterClass {
         return this;
       }
 
+      private int tenCostItemNum_ ;
+      /**
+       * <code>uint32 ten_cost_item_num = 4;</code>
+       * @return The tenCostItemNum.
+       */
+      @java.lang.Override
+      public int getTenCostItemNum() {
+        return tenCostItemNum_;
+      }
+      /**
+       * <code>uint32 ten_cost_item_num = 4;</code>
+       * @param value The tenCostItemNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTenCostItemNum(int value) {
+        
+        tenCostItemNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 ten_cost_item_num = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTenCostItemNum() {
+        
+        tenCostItemNum_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int costItemId_ ;
       /**
-       * <code>uint32 costItemId = 12;</code>
+       * <code>uint32 cost_item_id = 5;</code>
        * @return The costItemId.
        */
       @java.lang.Override
@@ -1913,7 +1440,7 @@ public final class DoGachaRspOuterClass {
         return costItemId_;
       }
       /**
-       * <code>uint32 costItemId = 12;</code>
+       * <code>uint32 cost_item_id = 5;</code>
        * @param value The costItemId to set.
        * @return This builder for chaining.
        */
@@ -1924,7 +1451,7 @@ public final class DoGachaRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costItemId = 12;</code>
+       * <code>uint32 cost_item_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostItemId() {
@@ -1934,40 +1461,40 @@ public final class DoGachaRspOuterClass {
         return this;
       }
 
-      private int tenCostItemId_ ;
+      private int leftGachaTimes_ ;
       /**
-       * <code>uint32 tenCostItemId = 3;</code>
-       * @return The tenCostItemId.
+       * <code>uint32 left_gacha_times = 6;</code>
+       * @return The leftGachaTimes.
        */
       @java.lang.Override
-      public int getTenCostItemId() {
-        return tenCostItemId_;
+      public int getLeftGachaTimes() {
+        return leftGachaTimes_;
       }
       /**
-       * <code>uint32 tenCostItemId = 3;</code>
-       * @param value The tenCostItemId to set.
+       * <code>uint32 left_gacha_times = 6;</code>
+       * @param value The leftGachaTimes to set.
        * @return This builder for chaining.
        */
-      public Builder setTenCostItemId(int value) {
+      public Builder setLeftGachaTimes(int value) {
         
-        tenCostItemId_ = value;
+        leftGachaTimes_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 tenCostItemId = 3;</code>
+       * <code>uint32 left_gacha_times = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTenCostItemId() {
+      public Builder clearLeftGachaTimes() {
         
-        tenCostItemId_ = 0;
+        leftGachaTimes_ = 0;
         onChanged();
         return this;
       }
 
       private int gachaTimesLimit_ ;
       /**
-       * <code>uint32 gachaTimesLimit = 15;</code>
+       * <code>uint32 gacha_times_limit = 7;</code>
        * @return The gachaTimesLimit.
        */
       @java.lang.Override
@@ -1975,7 +1502,7 @@ public final class DoGachaRspOuterClass {
         return gachaTimesLimit_;
       }
       /**
-       * <code>uint32 gachaTimesLimit = 15;</code>
+       * <code>uint32 gacha_times_limit = 7;</code>
        * @param value The gachaTimesLimit to set.
        * @return This builder for chaining.
        */
@@ -1986,7 +1513,7 @@ public final class DoGachaRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gachaTimesLimit = 15;</code>
+       * <code>uint32 gacha_times_limit = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaTimesLimit() {
@@ -1996,33 +1523,657 @@ public final class DoGachaRspOuterClass {
         return this;
       }
 
-      private int wishItemId_ ;
+      private int tenCostItemId_ ;
       /**
-       * <code>uint32 wishItemId = 1;</code>
-       * @return The wishItemId.
+       * <code>uint32 ten_cost_item_id = 8;</code>
+       * @return The tenCostItemId.
        */
       @java.lang.Override
-      public int getWishItemId() {
-        return wishItemId_;
+      public int getTenCostItemId() {
+        return tenCostItemId_;
       }
       /**
-       * <code>uint32 wishItemId = 1;</code>
-       * @param value The wishItemId to set.
+       * <code>uint32 ten_cost_item_id = 8;</code>
+       * @param value The tenCostItemId to set.
        * @return This builder for chaining.
        */
-      public Builder setWishItemId(int value) {
+      public Builder setTenCostItemId(int value) {
         
-        wishItemId_ = value;
+        tenCostItemId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 wishItemId = 1;</code>
+       * <code>uint32 ten_cost_item_id = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWishItemId() {
+      public Builder clearTenCostItemId() {
         
-        wishItemId_ = 0;
+        tenCostItemId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaSortId_ ;
+      /**
+       * <code>uint32 gacha_sort_id = 9;</code>
+       * @return The gachaSortId.
+       */
+      @java.lang.Override
+      public int getGachaSortId() {
+        return gachaSortId_;
+      }
+      /**
+       * <code>uint32 gacha_sort_id = 9;</code>
+       * @param value The gachaSortId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaSortId(int value) {
+        
+        gachaSortId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_sort_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaSortId() {
+        
+        gachaSortId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> gachaItemList_ =
+        java.util.Collections.emptyList();
+      private void ensureGachaItemListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          gachaItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem>(gachaItemList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> gachaItemListBuilder_;
+
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> getGachaItemListList() {
+        if (gachaItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(gachaItemList_);
+        } else {
+          return gachaItemListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public int getGachaItemListCount() {
+        if (gachaItemListBuilder_ == null) {
+          return gachaItemList_.size();
+        } else {
+          return gachaItemListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem getGachaItemList(int index) {
+        if (gachaItemListBuilder_ == null) {
+          return gachaItemList_.get(index);
+        } else {
+          return gachaItemListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder setGachaItemList(
+          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
+        if (gachaItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaItemListIsMutable();
+          gachaItemList_.set(index, value);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder setGachaItemList(
+          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
+        if (gachaItemListBuilder_ == null) {
+          ensureGachaItemListIsMutable();
+          gachaItemList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          gachaItemListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder addGachaItemList(emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
+        if (gachaItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaItemListIsMutable();
+          gachaItemList_.add(value);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder addGachaItemList(
+          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem value) {
+        if (gachaItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaItemListIsMutable();
+          gachaItemList_.add(index, value);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder addGachaItemList(
+          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
+        if (gachaItemListBuilder_ == null) {
+          ensureGachaItemListIsMutable();
+          gachaItemList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          gachaItemListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder addGachaItemList(
+          int index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder builderForValue) {
+        if (gachaItemListBuilder_ == null) {
+          ensureGachaItemListIsMutable();
+          gachaItemList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          gachaItemListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder addAllGachaItemList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem> values) {
+        if (gachaItemListBuilder_ == null) {
+          ensureGachaItemListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, gachaItemList_);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder clearGachaItemList() {
+        if (gachaItemListBuilder_ == null) {
+          gachaItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public Builder removeGachaItemList(int index) {
+        if (gachaItemListBuilder_ == null) {
+          ensureGachaItemListIsMutable();
+          gachaItemList_.remove(index);
+          onChanged();
+        } else {
+          gachaItemListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder getGachaItemListBuilder(
+          int index) {
+        return getGachaItemListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder getGachaItemListOrBuilder(
+          int index) {
+        if (gachaItemListBuilder_ == null) {
+          return gachaItemList_.get(index);  } else {
+          return gachaItemListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
+           getGachaItemListOrBuilderList() {
+        if (gachaItemListBuilder_ != null) {
+          return gachaItemListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(gachaItemList_);
+        }
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder addGachaItemListBuilder() {
+        return getGachaItemListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder addGachaItemListBuilder(
+          int index) {
+        return getGachaItemListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .GachaItem gacha_item_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder> 
+           getGachaItemListBuilderList() {
+        return getGachaItemListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder> 
+          getGachaItemListFieldBuilder() {
+        if (gachaItemListBuilder_ == null) {
+          gachaItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItemOrBuilder>(
+                  gachaItemList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          gachaItemList_ = null;
+        }
+        return gachaItemListBuilder_;
+      }
+
+      private int gachaTimes_ ;
+      /**
+       * <code>uint32 gacha_times = 11;</code>
+       * @return The gachaTimes.
+       */
+      @java.lang.Override
+      public int getGachaTimes() {
+        return gachaTimes_;
+      }
+      /**
+       * <code>uint32 gacha_times = 11;</code>
+       * @param value The gachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaTimes(int value) {
+        
+        gachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_times = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaTimes() {
+        
+        gachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int costItemNum_ ;
+      /**
+       * <code>uint32 cost_item_num = 12;</code>
+       * @return The costItemNum.
+       */
+      @java.lang.Override
+      public int getCostItemNum() {
+        return costItemNum_;
+      }
+      /**
+       * <code>uint32 cost_item_num = 12;</code>
+       * @param value The costItemNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCostItemNum(int value) {
+        
+        costItemNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cost_item_num = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCostItemNum() {
+        
+        costItemNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int wishProgress_ ;
+      /**
+       * <code>uint32 wish_progress = 13;</code>
+       * @return The wishProgress.
+       */
+      @java.lang.Override
+      public int getWishProgress() {
+        return wishProgress_;
+      }
+      /**
+       * <code>uint32 wish_progress = 13;</code>
+       * @param value The wishProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWishProgress(int value) {
+        
+        wishProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wish_progress = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWishProgress() {
+        
+        wishProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaType_ ;
+      /**
+       * <code>uint32 gacha_type = 14;</code>
+       * @return The gachaType.
+       */
+      @java.lang.Override
+      public int getGachaType() {
+        return gachaType_;
+      }
+      /**
+       * <code>uint32 gacha_type = 14;</code>
+       * @param value The gachaType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaType(int value) {
+        
+        gachaType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaType() {
+        
+        gachaType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int wishMaxProgress_ ;
+      /**
+       * <code>uint32 wish_max_progress = 15;</code>
+       * @return The wishMaxProgress.
+       */
+      @java.lang.Override
+      public int getWishMaxProgress() {
+        return wishMaxProgress_;
+      }
+      /**
+       * <code>uint32 wish_max_progress = 15;</code>
+       * @param value The wishMaxProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWishMaxProgress(int value) {
+        
+        wishMaxProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wish_max_progress = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWishMaxProgress() {
+        
+        wishMaxProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int newGachaRandom_ ;
+      /**
+       * <pre>
+       * custom field
+       * </pre>
+       *
+       * <code>uint32 new_gacha_random = 16;</code>
+       * @return The newGachaRandom.
+       */
+      @java.lang.Override
+      public int getNewGachaRandom() {
+        return newGachaRandom_;
+      }
+      /**
+       * <pre>
+       * custom field
+       * </pre>
+       *
+       * <code>uint32 new_gacha_random = 16;</code>
+       * @param value The newGachaRandom to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNewGachaRandom(int value) {
+        
+        newGachaRandom_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * custom field
+       * </pre>
+       *
+       * <code>uint32 new_gacha_random = 16;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNewGachaRandom() {
+        
+        newGachaRandom_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int curScheduleDailyGachaTimes_ ;
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 378;</code>
+       * @return The curScheduleDailyGachaTimes.
+       */
+      @java.lang.Override
+      public int getCurScheduleDailyGachaTimes() {
+        return curScheduleDailyGachaTimes_;
+      }
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 378;</code>
+       * @param value The curScheduleDailyGachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurScheduleDailyGachaTimes(int value) {
+        
+        curScheduleDailyGachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 378;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurScheduleDailyGachaTimes() {
+        
+        curScheduleDailyGachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean dBNKDMFDCNG_ ;
+      /**
+       * <code>bool DBNKDMFDCNG = 380;</code>
+       * @return The dBNKDMFDCNG.
+       */
+      @java.lang.Override
+      public boolean getDBNKDMFDCNG() {
+        return dBNKDMFDCNG_;
+      }
+      /**
+       * <code>bool DBNKDMFDCNG = 380;</code>
+       * @param value The dBNKDMFDCNG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDBNKDMFDCNG(boolean value) {
+        
+        dBNKDMFDCNG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool DBNKDMFDCNG = 380;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDBNKDMFDCNG() {
+        
+        dBNKDMFDCNG_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isUnderMinorsRestrict_ ;
+      /**
+       * <code>bool is_under_minors_restrict = 1019;</code>
+       * @return The isUnderMinorsRestrict.
+       */
+      @java.lang.Override
+      public boolean getIsUnderMinorsRestrict() {
+        return isUnderMinorsRestrict_;
+      }
+      /**
+       * <code>bool is_under_minors_restrict = 1019;</code>
+       * @param value The isUnderMinorsRestrict to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsUnderMinorsRestrict(boolean value) {
+        
+        isUnderMinorsRestrict_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_under_minors_restrict = 1019;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsUnderMinorsRestrict() {
+        
+        isUnderMinorsRestrict_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dailyGachaTimes_ ;
+      /**
+       * <code>uint32 daily_gacha_times = 1528;</code>
+       * @return The dailyGachaTimes.
+       */
+      @java.lang.Override
+      public int getDailyGachaTimes() {
+        return dailyGachaTimes_;
+      }
+      /**
+       * <code>uint32 daily_gacha_times = 1528;</code>
+       * @param value The dailyGachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDailyGachaTimes(int value) {
+        
+        dailyGachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 daily_gacha_times = 1528;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDailyGachaTimes() {
+        
+        dailyGachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isUnderGeneralRestrict_ ;
+      /**
+       * <code>bool is_under_general_restrict = 1604;</code>
+       * @return The isUnderGeneralRestrict.
+       */
+      @java.lang.Override
+      public boolean getIsUnderGeneralRestrict() {
+        return isUnderGeneralRestrict_;
+      }
+      /**
+       * <code>bool is_under_general_restrict = 1604;</code>
+       * @param value The isUnderGeneralRestrict to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsUnderGeneralRestrict(boolean value) {
+        
+        isUnderGeneralRestrict_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_under_general_restrict = 1604;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsUnderGeneralRestrict() {
+        
+        isUnderGeneralRestrict_ = false;
         onChanged();
         return this;
       }
@@ -2093,21 +2244,23 @@ public final class DoGachaRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020DoGachaRsp.proto\032\017GachaItem.proto\"\354\003\n\n" +
-      "DoGachaRsp\022\026\n\016tenCostItemNum\030\010 \001(\r\022\022\n\nga" +
-      "chaTimes\030\005 \001(\r\022\027\n\017wishMaxProgress\030\t \001(\r\022" +
-      "#\n\017gacha_item_list\030\006 \003(\0132\n.GachaItem\022\026\n\016" +
-      "leftGachaTimes\030\013 \001(\r\022\017\n\007retcode\030\002 \001(\005\022\023\n" +
-      "\013costItemNum\030\n \001(\r\022#\n\032curScheduleDailyGa" +
-      "chaTimes\030\302\005 \001(\r\022\024\n\014wishProgress\030\004 \001(\r\022\"\n" +
-      "\031is_under_general_restrict\030\236\010 \001(\010\022\021\n\tgac" +
-      "haType\030\016 \001(\r\022\030\n\017dailyGachaTimes\030\375\003 \001(\r\022\026" +
-      "\n\016newGachaRandom\030\007 \001(\r\022!\n\030is_under_minor" +
-      "s_restrict\030\246\013 \001(\010\022\027\n\017gachaScheduleId\030\r \001" +
-      "(\r\022\022\n\ncostItemId\030\014 \001(\r\022\025\n\rtenCostItemId\030" +
-      "\003 \001(\r\022\027\n\017gachaTimesLimit\030\017 \001(\r\022\022\n\nwishIt" +
-      "emId\030\001 \001(\rB\033\n\031emu.grasscutter.net.protob" +
-      "\006proto3"
+      "\n\020DoGachaRsp.proto\032\017GachaItem.proto\"\270\004\n\n" +
+      "DoGachaRsp\022\024\n\014wish_item_id\030\001 \001(\r\022\017\n\007retc" +
+      "ode\030\002 \001(\005\022\031\n\021gacha_schedule_id\030\003 \001(\r\022\031\n\021" +
+      "ten_cost_item_num\030\004 \001(\r\022\024\n\014cost_item_id\030" +
+      "\005 \001(\r\022\030\n\020left_gacha_times\030\006 \001(\r\022\031\n\021gacha" +
+      "_times_limit\030\007 \001(\r\022\030\n\020ten_cost_item_id\030\010" +
+      " \001(\r\022\025\n\rgacha_sort_id\030\t \001(\r\022#\n\017gacha_ite" +
+      "m_list\030\n \003(\0132\n.GachaItem\022\023\n\013gacha_times\030" +
+      "\013 \001(\r\022\025\n\rcost_item_num\030\014 \001(\r\022\025\n\rwish_pro" +
+      "gress\030\r \001(\r\022\022\n\ngacha_type\030\016 \001(\r\022\031\n\021wish_" +
+      "max_progress\030\017 \001(\r\022\030\n\020new_gacha_random\030\020" +
+      " \001(\r\022\'\n\036cur_schedule_daily_gacha_times\030\372" +
+      "\002 \001(\r\022\024\n\013DBNKDMFDCNG\030\374\002 \001(\010\022!\n\030is_under_" +
+      "minors_restrict\030\373\007 \001(\010\022\032\n\021daily_gacha_ti" +
+      "mes\030\370\013 \001(\r\022\"\n\031is_under_general_restrict\030" +
+      "\304\014 \001(\010B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2119,7 +2272,7 @@ public final class DoGachaRspOuterClass {
     internal_static_DoGachaRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DoGachaRsp_descriptor,
-        new java.lang.String[] { "TenCostItemNum", "GachaTimes", "WishMaxProgress", "GachaItemList", "LeftGachaTimes", "Retcode", "CostItemNum", "CurScheduleDailyGachaTimes", "WishProgress", "IsUnderGeneralRestrict", "GachaType", "DailyGachaTimes", "NewGachaRandom", "IsUnderMinorsRestrict", "GachaScheduleId", "CostItemId", "TenCostItemId", "GachaTimesLimit", "WishItemId", });
+        new java.lang.String[] { "WishItemId", "Retcode", "GachaScheduleId", "TenCostItemNum", "CostItemId", "LeftGachaTimes", "GachaTimesLimit", "TenCostItemId", "GachaSortId", "GachaItemList", "GachaTimes", "CostItemNum", "WishProgress", "GachaType", "WishMaxProgress", "NewGachaRandom", "CurScheduleDailyGachaTimes", "DBNKDMFDCNG", "IsUnderMinorsRestrict", "DailyGachaTimes", "IsUnderGeneralRestrict", });
     emu.grasscutter.net.proto.GachaItemOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DoSetPlayerBornDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DoSetPlayerBornDataNotifyOuterClass.java
index 1bfdc9ea5..7443955f4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DoSetPlayerBornDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DoSetPlayerBornDataNotifyOuterClass.java
@@ -19,11 +19,6 @@ public final class DoSetPlayerBornDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 5710
-   * Obf: JJKIDLCAPLA
-   * </pre>
-   *
    * Protobuf type {@code DoSetPlayerBornDataNotify}
    */
   public static final class DoSetPlayerBornDataNotify extends
@@ -245,11 +240,6 @@ public final class DoSetPlayerBornDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5710
-     * Obf: JJKIDLCAPLA
-     * </pre>
-     *
      * Protobuf type {@code DoSetPlayerBornDataNotify}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java
index fb867b424..1d9614100 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DropHintNotifyOuterClass.java
@@ -19,32 +19,32 @@ public final class DropHintNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      * @return Whether the position field is set.
      */
     boolean hasPosition();
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      * @return The position.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
 
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @return A list containing the itemIdList.
      */
     java.util.List<java.lang.Integer> getItemIdListList();
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @return The count of itemIdList.
      */
     int getItemIdListCount();
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The itemIdList at the given index.
      */
@@ -52,8 +52,7 @@ public final class DropHintNotifyOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 1884
-   * Obf: NMODMKDKNDF
+   * CmdId: 3881
    * </pre>
    *
    * Protobuf type {@code DropHintNotify}
@@ -102,7 +101,7 @@ public final class DropHintNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 10: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -115,7 +114,7 @@ public final class DropHintNotifyOuterClass {
 
               break;
             }
-            case 48: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -123,7 +122,7 @@ public final class DropHintNotifyOuterClass {
               itemIdList_.addInt(input.readUInt32());
               break;
             }
-            case 50: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -171,10 +170,10 @@ public final class DropHintNotifyOuterClass {
               emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.class, emu.grasscutter.net.proto.DropHintNotifyOuterClass.DropHintNotify.Builder.class);
     }
 
-    public static final int POSITION_FIELD_NUMBER = 3;
+    public static final int POSITION_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      * @return Whether the position field is set.
      */
     @java.lang.Override
@@ -182,7 +181,7 @@ public final class DropHintNotifyOuterClass {
       return position_ != null;
     }
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      * @return The position.
      */
     @java.lang.Override
@@ -190,17 +189,17 @@ public final class DropHintNotifyOuterClass {
       return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
     }
     /**
-     * <code>.Vector position = 3;</code>
+     * <code>.Vector position = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
       return getPosition();
     }
 
-    public static final int ITEM_ID_LIST_FIELD_NUMBER = 6;
+    public static final int ITEM_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList itemIdList_;
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @return A list containing the itemIdList.
      */
     @java.lang.Override
@@ -209,14 +208,14 @@ public final class DropHintNotifyOuterClass {
       return itemIdList_;
     }
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @return The count of itemIdList.
      */
     public int getItemIdListCount() {
       return itemIdList_.size();
     }
     /**
-     * <code>repeated uint32 item_id_list = 6;</code>
+     * <code>repeated uint32 item_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The itemIdList at the given index.
      */
@@ -241,10 +240,10 @@ public final class DropHintNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (position_ != null) {
-        output.writeMessage(3, getPosition());
+        output.writeMessage(1, getPosition());
       }
       if (getItemIdListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < itemIdList_.size(); i++) {
@@ -261,7 +260,7 @@ public final class DropHintNotifyOuterClass {
       size = 0;
       if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getPosition());
+          .computeMessageSize(1, getPosition());
       }
       {
         int dataSize = 0;
@@ -415,8 +414,7 @@ public final class DropHintNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 1884
-     * Obf: NMODMKDKNDF
+     * CmdId: 3881
      * </pre>
      *
      * Protobuf type {@code DropHintNotify}
@@ -596,14 +594,14 @@ public final class DropHintNotifyOuterClass {
       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 = 3;</code>
+       * <code>.Vector position = 1;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -614,7 +612,7 @@ public final class DropHintNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -630,7 +628,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -644,7 +642,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -662,7 +660,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -676,7 +674,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -684,7 +682,7 @@ public final class DropHintNotifyOuterClass {
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -695,7 +693,7 @@ public final class DropHintNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 1;</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> 
@@ -719,7 +717,7 @@ public final class DropHintNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @return A list containing the itemIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -728,14 +726,14 @@ public final class DropHintNotifyOuterClass {
                  java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @return The count of itemIdList.
        */
       public int getItemIdListCount() {
         return itemIdList_.size();
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The itemIdList at the given index.
        */
@@ -743,7 +741,7 @@ public final class DropHintNotifyOuterClass {
         return itemIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The itemIdList to set.
        * @return This builder for chaining.
@@ -756,7 +754,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @param value The itemIdList to add.
        * @return This builder for chaining.
        */
@@ -767,7 +765,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @param values The itemIdList to add.
        * @return This builder for chaining.
        */
@@ -780,7 +778,7 @@ public final class DropHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 6;</code>
+       * <code>repeated uint32 item_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemIdList() {
@@ -857,8 +855,8 @@ public final class DropHintNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024DropHintNotify.proto\032\014Vector.proto\"A\n\016" +
-      "DropHintNotify\022\031\n\010position\030\003 \001(\0132\007.Vecto" +
-      "r\022\024\n\014item_id_list\030\006 \003(\rB\033\n\031emu.grasscutt" +
+      "DropHintNotify\022\031\n\010position\030\001 \001(\0132\007.Vecto" +
+      "r\022\024\n\014item_id_list\030\005 \003(\rB\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/DropItemReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DropItemReqOuterClass.java
index 1bd69564d..9673c6435 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DropItemReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DropItemReqOuterClass.java
@@ -19,49 +19,44 @@ public final class DropItemReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 count = 10;</code>
-     * @return The count.
+     * <code>.Vector pos = 14;</code>
+     * @return Whether the pos field is set.
      */
-    int getCount();
+    boolean hasPos();
+    /**
+     * <code>.Vector pos = 14;</code>
+     * @return The pos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
+    /**
+     * <code>.Vector pos = 14;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
     /**
-     * <code>uint64 guid = 15;</code>
-     * @return The guid.
-     */
-    long getGuid();
-
-    /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 11;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 11;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
 
     /**
-     * <code>.Vector pos = 1;</code>
-     * @return Whether the pos field is set.
+     * <code>uint32 count = 13;</code>
+     * @return The count.
      */
-    boolean hasPos();
+    int getCount();
+
     /**
-     * <code>.Vector pos = 1;</code>
-     * @return The pos.
+     * <code>uint64 guid = 8;</code>
+     * @return The guid.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
-    /**
-     * <code>.Vector pos = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+    long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 28541
-   * Obf: ALHJAJDGNDA
-   * </pre>
-   *
    * Protobuf type {@code DropItemReq}
    */
   public static final class DropItemReq extends
@@ -107,7 +102,23 @@ public final class DropItemReqOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 64: {
+
+              guid_ = input.readUInt64();
+              break;
+            }
+            case 88: {
+              int rawValue = input.readEnum();
+
+              storeType_ = rawValue;
+              break;
+            }
+            case 104: {
+
+              count_ = input.readUInt32();
+              break;
+            }
+            case 114: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -120,22 +131,6 @@ public final class DropItemReqOuterClass {
 
               break;
             }
-            case 64: {
-              int rawValue = input.readEnum();
-
-              storeType_ = rawValue;
-              break;
-            }
-            case 80: {
-
-              count_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              guid_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -168,39 +163,43 @@ public final class DropItemReqOuterClass {
               emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq.class, emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq.Builder.class);
     }
 
-    public static final int COUNT_FIELD_NUMBER = 10;
-    private int count_;
+    public static final int POS_FIELD_NUMBER = 14;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>uint32 count = 10;</code>
-     * @return The count.
+     * <code>.Vector pos = 14;</code>
+     * @return Whether the pos field is set.
      */
     @java.lang.Override
-    public int getCount() {
-      return count_;
+    public boolean hasPos() {
+      return pos_ != null;
     }
-
-    public static final int GUID_FIELD_NUMBER = 15;
-    private long guid_;
     /**
-     * <code>uint64 guid = 15;</code>
-     * @return The guid.
+     * <code>.Vector pos = 14;</code>
+     * @return The pos.
      */
     @java.lang.Override
-    public long getGuid() {
-      return guid_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 8;
+    public static final int STORE_TYPE_FIELD_NUMBER = 11;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 11;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 11;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -209,30 +208,26 @@ public final class DropItemReqOuterClass {
       return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
     }
 
-    public static final int POS_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    public static final int COUNT_FIELD_NUMBER = 13;
+    private int count_;
     /**
-     * <code>.Vector pos = 1;</code>
-     * @return Whether the pos field is set.
+     * <code>uint32 count = 13;</code>
+     * @return The count.
      */
     @java.lang.Override
-    public boolean hasPos() {
-      return pos_ != null;
+    public int getCount() {
+      return count_;
     }
+
+    public static final int GUID_FIELD_NUMBER = 8;
+    private long guid_;
     /**
-     * <code>.Vector pos = 1;</code>
-     * @return The pos.
+     * <code>uint64 guid = 8;</code>
+     * @return The guid.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
+    public long getGuid() {
+      return guid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -249,17 +244,17 @@ public final class DropItemReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pos_ != null) {
-        output.writeMessage(1, getPos());
+      if (guid_ != 0L) {
+        output.writeUInt64(8, guid_);
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(8, storeType_);
+        output.writeEnum(11, storeType_);
       }
       if (count_ != 0) {
-        output.writeUInt32(10, count_);
+        output.writeUInt32(13, count_);
       }
-      if (guid_ != 0L) {
-        output.writeUInt64(15, guid_);
+      if (pos_ != null) {
+        output.writeMessage(14, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -270,21 +265,21 @@ public final class DropItemReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pos_ != null) {
+      if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getPos());
+          .computeUInt64Size(8, guid_);
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, storeType_);
+          .computeEnumSize(11, storeType_);
       }
       if (count_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, count_);
+          .computeUInt32Size(13, count_);
       }
-      if (guid_ != 0L) {
+      if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, guid_);
+          .computeMessageSize(14, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -301,16 +296,16 @@ public final class DropItemReqOuterClass {
       }
       emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq other = (emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq) obj;
 
-      if (getCount()
-          != other.getCount()) return false;
-      if (getGuid()
-          != other.getGuid()) return false;
-      if (storeType_ != other.storeType_) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
+      if (storeType_ != other.storeType_) return false;
+      if (getCount()
+          != other.getCount()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,17 +317,17 @@ public final class DropItemReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasPos()) {
+        hash = (37 * hash) + POS_FIELD_NUMBER;
+        hash = (53 * hash) + getPos().hashCode();
+      }
+      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + storeType_;
       hash = (37 * hash) + COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getCount();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
-      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + storeType_;
-      if (hasPos()) {
-        hash = (37 * hash) + POS_FIELD_NUMBER;
-        hash = (53 * hash) + getPos().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -429,11 +424,6 @@ public final class DropItemReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28541
-     * Obf: ALHJAJDGNDA
-     * </pre>
-     *
      * Protobuf type {@code DropItemReq}
      */
     public static final class Builder extends
@@ -471,18 +461,18 @@ public final class DropItemReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        count_ = 0;
-
-        guid_ = 0L;
-
-        storeType_ = 0;
-
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
           pos_ = null;
           posBuilder_ = null;
         }
+        storeType_ = 0;
+
+        count_ = 0;
+
+        guid_ = 0L;
+
         return this;
       }
 
@@ -509,14 +499,14 @@ public final class DropItemReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq buildPartial() {
         emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq result = new emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq(this);
-        result.count_ = count_;
-        result.guid_ = guid_;
-        result.storeType_ = storeType_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
+        result.storeType_ = storeType_;
+        result.count_ = count_;
+        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -565,18 +555,18 @@ public final class DropItemReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq other) {
         if (other == emu.grasscutter.net.proto.DropItemReqOuterClass.DropItemReq.getDefaultInstance()) return this;
+        if (other.hasPos()) {
+          mergePos(other.getPos());
+        }
+        if (other.storeType_ != 0) {
+          setStoreTypeValue(other.getStoreTypeValue());
+        }
         if (other.getCount() != 0) {
           setCount(other.getCount());
         }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
-        if (other.storeType_ != 0) {
-          setStoreTypeValue(other.getStoreTypeValue());
-        }
-        if (other.hasPos()) {
-          mergePos(other.getPos());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -606,134 +596,18 @@ public final class DropItemReqOuterClass {
         return this;
       }
 
-      private int count_ ;
-      /**
-       * <code>uint32 count = 10;</code>
-       * @return The count.
-       */
-      @java.lang.Override
-      public int getCount() {
-        return count_;
-      }
-      /**
-       * <code>uint32 count = 10;</code>
-       * @param value The count to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCount(int value) {
-        
-        count_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 count = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCount() {
-        
-        count_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long guid_ ;
-      /**
-       * <code>uint64 guid = 15;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public long getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint64 guid = 15;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(long value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 guid = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int storeType_ = 0;
-      /**
-       * <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 = 8;</code>
-       * @param value The enum numeric value on the wire for storeType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStoreTypeValue(int value) {
-        
-        storeType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @return The storeType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
-        return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @param value The storeType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        storeType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStoreType() {
-        
-        storeType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       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 = 1;</code>
+       * <code>.Vector pos = 14;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -744,7 +618,7 @@ public final class DropItemReqOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -760,7 +634,7 @@ public final class DropItemReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -774,7 +648,7 @@ public final class DropItemReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -792,7 +666,7 @@ public final class DropItemReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -806,7 +680,7 @@ public final class DropItemReqOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -814,7 +688,7 @@ public final class DropItemReqOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -825,7 +699,7 @@ public final class DropItemReqOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 1;</code>
+       * <code>.Vector pos = 14;</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> 
@@ -840,6 +714,122 @@ public final class DropItemReqOuterClass {
         }
         return posBuilder_;
       }
+
+      private int storeType_ = 0;
+      /**
+       * <code>.StoreType store_type = 11;</code>
+       * @return The enum numeric value on the wire for storeType.
+       */
+      @java.lang.Override public int getStoreTypeValue() {
+        return storeType_;
+      }
+      /**
+       * <code>.StoreType store_type = 11;</code>
+       * @param value The enum numeric value on the wire for storeType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStoreTypeValue(int value) {
+        
+        storeType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.StoreType store_type = 11;</code>
+       * @return The storeType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
+        return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.StoreType store_type = 11;</code>
+       * @param value The storeType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        storeType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.StoreType store_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearStoreType() {
+        
+        storeType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int count_ ;
+      /**
+       * <code>uint32 count = 13;</code>
+       * @return The count.
+       */
+      @java.lang.Override
+      public int getCount() {
+        return count_;
+      }
+      /**
+       * <code>uint32 count = 13;</code>
+       * @param value The count to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCount(int value) {
+        
+        count_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 count = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCount() {
+        
+        count_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 8;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 8;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -907,26 +897,26 @@ public final class DropItemReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021DropItemReq.proto\032\017StoreType.proto\032\014Ve" +
-      "ctor.proto\"`\n\013DropItemReq\022\r\n\005count\030\n \001(\r" +
-      "\022\014\n\004guid\030\017 \001(\004\022\036\n\nstore_type\030\010 \001(\0162\n.Sto" +
-      "reType\022\024\n\003pos\030\001 \001(\0132\007.VectorB\033\n\031emu.gras" +
+      "\n\021DropItemReq.proto\032\014Vector.proto\032\017Store" +
+      "Type.proto\"`\n\013DropItemReq\022\024\n\003pos\030\016 \001(\0132\007" +
+      ".Vector\022\036\n\nstore_type\030\013 \001(\0162\n.StoreType\022" +
+      "\r\n\005count\030\r \001(\r\022\014\n\004guid\030\010 \001(\004B\033\n\031emu.gras" +
       "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor(),
         });
     internal_static_DropItemReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_DropItemReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DropItemReq_descriptor,
-        new java.lang.String[] { "Count", "Guid", "StoreType", "Pos", });
-    emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "Pos", "StoreType", "Count", "Guid", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DropItemRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DropItemRspOuterClass.java
index e1a88ece0..67a885826 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DropItemRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DropItemRspOuterClass.java
@@ -19,34 +19,29 @@ public final class DropItemRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.StoreType store_type = 6;</code>
-     * @return The enum numeric value on the wire for storeType.
-     */
-    int getStoreTypeValue();
-    /**
-     * <code>.StoreType store_type = 6;</code>
-     * @return The storeType.
-     */
-    emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
-
-    /**
-     * <code>uint64 guid = 12;</code>
+     * <code>uint64 guid = 3;</code>
      * @return The guid.
      */
     long getGuid();
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>.StoreType store_type = 9;</code>
+     * @return The enum numeric value on the wire for storeType.
+     */
+    int getStoreTypeValue();
+    /**
+     * <code>.StoreType store_type = 9;</code>
+     * @return The storeType.
+     */
+    emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
   }
   /**
-   * <pre>
-   * CmdId: 25342
-   * Obf: BFNMHPECFGC
-   * </pre>
-   *
    * Protobuf type {@code DropItemRsp}
    */
   public static final class DropItemRsp extends
@@ -92,20 +87,20 @@ public final class DropItemRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-              int rawValue = input.readEnum();
+            case 24: {
 
-              storeType_ = rawValue;
+              guid_ = input.readUInt64();
               break;
             }
-            case 72: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 72: {
+              int rawValue = input.readEnum();
 
-              guid_ = input.readUInt64();
+              storeType_ = rawValue;
               break;
             }
             default: {
@@ -140,29 +135,10 @@ public final class DropItemRspOuterClass {
               emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp.class, emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp.Builder.class);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 6;
-    private int storeType_;
-    /**
-     * <code>.StoreType store_type = 6;</code>
-     * @return The enum numeric value on the wire for storeType.
-     */
-    @java.lang.Override public int getStoreTypeValue() {
-      return storeType_;
-    }
-    /**
-     * <code>.StoreType store_type = 6;</code>
-     * @return The storeType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
-      return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
-    }
-
-    public static final int GUID_FIELD_NUMBER = 12;
+    public static final int GUID_FIELD_NUMBER = 3;
     private long guid_;
     /**
-     * <code>uint64 guid = 12;</code>
+     * <code>uint64 guid = 3;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -170,10 +146,10 @@ public final class DropItemRspOuterClass {
       return guid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -181,6 +157,25 @@ public final class DropItemRspOuterClass {
       return retcode_;
     }
 
+    public static final int STORE_TYPE_FIELD_NUMBER = 9;
+    private int storeType_;
+    /**
+     * <code>.StoreType store_type = 9;</code>
+     * @return The enum numeric value on the wire for storeType.
+     */
+    @java.lang.Override public int getStoreTypeValue() {
+      return storeType_;
+    }
+    /**
+     * <code>.StoreType store_type = 9;</code>
+     * @return The storeType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
+      return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -195,14 +190,14 @@ public final class DropItemRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(6, storeType_);
+      if (guid_ != 0L) {
+        output.writeUInt64(3, guid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(5, retcode_);
       }
-      if (guid_ != 0L) {
-        output.writeUInt64(12, guid_);
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        output.writeEnum(9, storeType_);
       }
       unknownFields.writeTo(output);
     }
@@ -213,17 +208,17 @@ public final class DropItemRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+      if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, storeType_);
+          .computeUInt64Size(3, guid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(5, retcode_);
       }
-      if (guid_ != 0L) {
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, guid_);
+          .computeEnumSize(9, storeType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -240,11 +235,11 @@ public final class DropItemRspOuterClass {
       }
       emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp other = (emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp) obj;
 
-      if (storeType_ != other.storeType_) return false;
       if (getGuid()
           != other.getGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (storeType_ != other.storeType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -256,13 +251,13 @@ public final class DropItemRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + storeType_;
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + storeType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -359,11 +354,6 @@ public final class DropItemRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25342
-     * Obf: BFNMHPECFGC
-     * </pre>
-     *
      * Protobuf type {@code DropItemRsp}
      */
     public static final class Builder extends
@@ -401,12 +391,12 @@ public final class DropItemRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        storeType_ = 0;
-
         guid_ = 0L;
 
         retcode_ = 0;
 
+        storeType_ = 0;
+
         return this;
       }
 
@@ -433,9 +423,9 @@ public final class DropItemRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp buildPartial() {
         emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp result = new emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp(this);
-        result.storeType_ = storeType_;
         result.guid_ = guid_;
         result.retcode_ = retcode_;
+        result.storeType_ = storeType_;
         onBuilt();
         return result;
       }
@@ -484,15 +474,15 @@ public final class DropItemRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp other) {
         if (other == emu.grasscutter.net.proto.DropItemRspOuterClass.DropItemRsp.getDefaultInstance()) return this;
-        if (other.storeType_ != 0) {
-          setStoreTypeValue(other.getStoreTypeValue());
-        }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.storeType_ != 0) {
+          setStoreTypeValue(other.getStoreTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -522,16 +512,78 @@ public final class DropItemRspOuterClass {
         return this;
       }
 
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 3;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 3;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
+        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 storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 6;</code>
+       * <code>.StoreType store_type = 9;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 6;</code>
+       * <code>.StoreType store_type = 9;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -542,7 +594,7 @@ public final class DropItemRspOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 6;</code>
+       * <code>.StoreType store_type = 9;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -552,7 +604,7 @@ public final class DropItemRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 6;</code>
+       * <code>.StoreType store_type = 9;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -566,7 +618,7 @@ public final class DropItemRspOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 6;</code>
+       * <code>.StoreType store_type = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -575,68 +627,6 @@ public final class DropItemRspOuterClass {
         onChanged();
         return this;
       }
-
-      private long guid_ ;
-      /**
-       * <code>uint64 guid = 12;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public long getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint64 guid = 12;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(long value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 guid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -705,8 +695,8 @@ public final class DropItemRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021DropItemRsp.proto\032\017StoreType.proto\"L\n\013" +
-      "DropItemRsp\022\036\n\nstore_type\030\006 \001(\0162\n.StoreT" +
-      "ype\022\014\n\004guid\030\014 \001(\004\022\017\n\007retcode\030\t \001(\005B\033\n\031em" +
+      "DropItemRsp\022\014\n\004guid\030\003 \001(\004\022\017\n\007retcode\030\005 \001" +
+      "(\005\022\036\n\nstore_type\030\t \001(\0162\n.StoreTypeB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -719,7 +709,7 @@ public final class DropItemRspOuterClass {
     internal_static_DropItemRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DropItemRsp_descriptor,
-        new java.lang.String[] { "StoreType", "Guid", "Retcode", });
+        new java.lang.String[] { "Guid", "Retcode", "StoreType", });
     emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java
index 55b5918dd..d0c573d80 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeBeginNotifyOuterClass.java
@@ -19,69 +19,64 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 challenge_index = 11;</code>
+     * <code>repeated uint32 param_list = 3;</code>
+     * @return A list containing the paramList.
+     */
+    java.util.List<java.lang.Integer> getParamListList();
+    /**
+     * <code>repeated uint32 param_list = 3;</code>
+     * @return The count of paramList.
+     */
+    int getParamListCount();
+    /**
+     * <code>repeated uint32 param_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    int getParamList(int index);
+
+    /**
+     * <code>uint32 challenge_index = 5;</code>
      * @return The challengeIndex.
      */
     int getChallengeIndex();
 
     /**
-     * <code>uint32 group_id = 10;</code>
-     * @return The groupId.
+     * <code>uint32 father_index = 7;</code>
+     * @return The fatherIndex.
      */
-    int getGroupId();
+    int getFatherIndex();
 
     /**
-     * <code>repeated uint32 uid_list = 15;</code>
+     * <code>repeated uint32 uid_list = 8;</code>
      * @return A list containing the uidList.
      */
     java.util.List<java.lang.Integer> getUidListList();
     /**
-     * <code>repeated uint32 uid_list = 15;</code>
+     * <code>repeated uint32 uid_list = 8;</code>
      * @return The count of uidList.
      */
     int getUidListCount();
     /**
-     * <code>repeated uint32 uid_list = 15;</code>
+     * <code>repeated uint32 uid_list = 8;</code>
      * @param index The index of the element to return.
      * @return The uidList at the given index.
      */
     int getUidList(int index);
 
     /**
-     * <code>uint32 father_index = 4;</code>
-     * @return The fatherIndex.
-     */
-    int getFatherIndex();
-
-    /**
-     * <code>uint32 challenge_id = 3;</code>
+     * <code>uint32 challenge_id = 9;</code>
      * @return The challengeId.
      */
     int getChallengeId();
 
     /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @return A list containing the paramList.
+     * <code>uint32 group_id = 10;</code>
+     * @return The groupId.
      */
-    java.util.List<java.lang.Integer> getParamListList();
-    /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @return The count of paramList.
-     */
-    int getParamListCount();
-    /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    int getParamList(int index);
+    int getGroupId();
   }
   /**
-   * <pre>
-   * CmdId: 8891
-   * Obf: FPMGJHAEAML
-   * </pre>
-   *
    * Protobuf type {@code DungeonChallengeBeginNotify}
    */
   public static final class DungeonChallengeBeginNotify extends
@@ -94,8 +89,8 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       super(builder);
     }
     private DungeonChallengeBeginNotify() {
-      uidList_ = emptyIntList();
       paramList_ = emptyIntList();
+      uidList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -130,29 +125,19 @@ public final class DungeonChallengeBeginNotifyOuterClass {
               done = true;
               break;
             case 24: {
-
-              challengeId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              fatherIndex_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               paramList_.addInt(input.readUInt32());
               break;
             }
-            case 50: {
+            case 26: {
               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) {
                 paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 paramList_.addInt(input.readUInt32());
@@ -160,30 +145,30 @@ public final class DungeonChallengeBeginNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 80: {
-
-              groupId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
+            case 40: {
 
               challengeIndex_ = input.readUInt32();
               break;
             }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 56: {
+
+              fatherIndex_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 uidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               uidList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 uidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 uidList_.addInt(input.readUInt32());
@@ -191,6 +176,16 @@ public final class DungeonChallengeBeginNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 72: {
+
+              challengeId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              groupId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -206,10 +201,10 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           paramList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           uidList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -229,10 +224,38 @@ public final class DungeonChallengeBeginNotifyOuterClass {
               emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.class, emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.Builder.class);
     }
 
-    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 11;
+    public static final int PARAM_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList paramList_;
+    /**
+     * <code>repeated uint32 param_list = 3;</code>
+     * @return A list containing the paramList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getParamListList() {
+      return paramList_;
+    }
+    /**
+     * <code>repeated uint32 param_list = 3;</code>
+     * @return The count of paramList.
+     */
+    public int getParamListCount() {
+      return paramList_.size();
+    }
+    /**
+     * <code>repeated uint32 param_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    public int getParamList(int index) {
+      return paramList_.getInt(index);
+    }
+    private int paramListMemoizedSerializedSize = -1;
+
+    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 5;
     private int challengeIndex_;
     /**
-     * <code>uint32 challenge_index = 11;</code>
+     * <code>uint32 challenge_index = 5;</code>
      * @return The challengeIndex.
      */
     @java.lang.Override
@@ -240,6 +263,56 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       return challengeIndex_;
     }
 
+    public static final int FATHER_INDEX_FIELD_NUMBER = 7;
+    private int fatherIndex_;
+    /**
+     * <code>uint32 father_index = 7;</code>
+     * @return The fatherIndex.
+     */
+    @java.lang.Override
+    public int getFatherIndex() {
+      return fatherIndex_;
+    }
+
+    public static final int UID_LIST_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList uidList_;
+    /**
+     * <code>repeated uint32 uid_list = 8;</code>
+     * @return A list containing the uidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUidListList() {
+      return uidList_;
+    }
+    /**
+     * <code>repeated uint32 uid_list = 8;</code>
+     * @return The count of uidList.
+     */
+    public int getUidListCount() {
+      return uidList_.size();
+    }
+    /**
+     * <code>repeated uint32 uid_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The uidList at the given index.
+     */
+    public int getUidList(int index) {
+      return uidList_.getInt(index);
+    }
+    private int uidListMemoizedSerializedSize = -1;
+
+    public static final int CHALLENGE_ID_FIELD_NUMBER = 9;
+    private int challengeId_;
+    /**
+     * <code>uint32 challenge_id = 9;</code>
+     * @return The challengeId.
+     */
+    @java.lang.Override
+    public int getChallengeId() {
+      return challengeId_;
+    }
+
     public static final int GROUP_ID_FIELD_NUMBER = 10;
     private int groupId_;
     /**
@@ -251,84 +324,6 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       return groupId_;
     }
 
-    public static final int UID_LIST_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList uidList_;
-    /**
-     * <code>repeated uint32 uid_list = 15;</code>
-     * @return A list containing the uidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getUidListList() {
-      return uidList_;
-    }
-    /**
-     * <code>repeated uint32 uid_list = 15;</code>
-     * @return The count of uidList.
-     */
-    public int getUidListCount() {
-      return uidList_.size();
-    }
-    /**
-     * <code>repeated uint32 uid_list = 15;</code>
-     * @param index The index of the element to return.
-     * @return The uidList at the given index.
-     */
-    public int getUidList(int index) {
-      return uidList_.getInt(index);
-    }
-    private int uidListMemoizedSerializedSize = -1;
-
-    public static final int FATHER_INDEX_FIELD_NUMBER = 4;
-    private int fatherIndex_;
-    /**
-     * <code>uint32 father_index = 4;</code>
-     * @return The fatherIndex.
-     */
-    @java.lang.Override
-    public int getFatherIndex() {
-      return fatherIndex_;
-    }
-
-    public static final int CHALLENGE_ID_FIELD_NUMBER = 3;
-    private int challengeId_;
-    /**
-     * <code>uint32 challenge_id = 3;</code>
-     * @return The challengeId.
-     */
-    @java.lang.Override
-    public int getChallengeId() {
-      return challengeId_;
-    }
-
-    public static final int PARAM_LIST_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList paramList_;
-    /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @return A list containing the paramList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getParamListList() {
-      return paramList_;
-    }
-    /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @return The count of paramList.
-     */
-    public int getParamListCount() {
-      return paramList_.size();
-    }
-    /**
-     * <code>repeated uint32 param_list = 6;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    public int getParamList(int index) {
-      return paramList_.getInt(index);
-    }
-    private int paramListMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -344,32 +339,32 @@ public final class DungeonChallengeBeginNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (challengeId_ != 0) {
-        output.writeUInt32(3, challengeId_);
-      }
-      if (fatherIndex_ != 0) {
-        output.writeUInt32(4, fatherIndex_);
-      }
       if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(paramListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramList_.size(); i++) {
         output.writeUInt32NoTag(paramList_.getInt(i));
       }
-      if (groupId_ != 0) {
-        output.writeUInt32(10, groupId_);
-      }
       if (challengeIndex_ != 0) {
-        output.writeUInt32(11, challengeIndex_);
+        output.writeUInt32(5, challengeIndex_);
+      }
+      if (fatherIndex_ != 0) {
+        output.writeUInt32(7, fatherIndex_);
       }
       if (getUidListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(uidListMemoizedSerializedSize);
       }
       for (int i = 0; i < uidList_.size(); i++) {
         output.writeUInt32NoTag(uidList_.getInt(i));
       }
+      if (challengeId_ != 0) {
+        output.writeUInt32(9, challengeId_);
+      }
+      if (groupId_ != 0) {
+        output.writeUInt32(10, groupId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -379,14 +374,6 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (challengeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, challengeId_);
-      }
-      if (fatherIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, fatherIndex_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < paramList_.size(); i++) {
@@ -401,13 +388,13 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         }
         paramListMemoizedSerializedSize = dataSize;
       }
-      if (groupId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, groupId_);
-      }
       if (challengeIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, challengeIndex_);
+          .computeUInt32Size(5, challengeIndex_);
+      }
+      if (fatherIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, fatherIndex_);
       }
       {
         int dataSize = 0;
@@ -423,6 +410,14 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         }
         uidListMemoizedSerializedSize = dataSize;
       }
+      if (challengeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, challengeId_);
+      }
+      if (groupId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, groupId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -438,18 +433,18 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       }
       emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify other = (emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify) obj;
 
-      if (getChallengeIndex()
-          != other.getChallengeIndex()) return false;
-      if (getGroupId()
-          != other.getGroupId()) return false;
-      if (!getUidListList()
-          .equals(other.getUidListList())) return false;
-      if (getFatherIndex()
-          != other.getFatherIndex()) return false;
-      if (getChallengeId()
-          != other.getChallengeId()) return false;
       if (!getParamListList()
           .equals(other.getParamListList())) return false;
+      if (getChallengeIndex()
+          != other.getChallengeIndex()) return false;
+      if (getFatherIndex()
+          != other.getFatherIndex()) return false;
+      if (!getUidListList()
+          .equals(other.getUidListList())) return false;
+      if (getChallengeId()
+          != other.getChallengeId()) return false;
+      if (getGroupId()
+          != other.getGroupId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -461,22 +456,22 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeIndex();
-      hash = (37 * hash) + GROUP_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGroupId();
-      if (getUidListCount() > 0) {
-        hash = (37 * hash) + UID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUidListList().hashCode();
-      }
-      hash = (37 * hash) + FATHER_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getFatherIndex();
-      hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeId();
       if (getParamListCount() > 0) {
         hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamListList().hashCode();
       }
+      hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeIndex();
+      hash = (37 * hash) + FATHER_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getFatherIndex();
+      if (getUidListCount() > 0) {
+        hash = (37 * hash) + UID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUidListList().hashCode();
+      }
+      hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeId();
+      hash = (37 * hash) + GROUP_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGroupId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -573,11 +568,6 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8891
-     * Obf: FPMGJHAEAML
-     * </pre>
-     *
      * Protobuf type {@code DungeonChallengeBeginNotify}
      */
     public static final class Builder extends
@@ -615,18 +605,18 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         challengeIndex_ = 0;
 
+        fatherIndex_ = 0;
+
+        uidList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        challengeId_ = 0;
+
         groupId_ = 0;
 
-        uidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        fatherIndex_ = 0;
-
-        challengeId_ = 0;
-
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -654,20 +644,20 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       public emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify buildPartial() {
         emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify result = new emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify(this);
         int from_bitField0_ = bitField0_;
-        result.challengeIndex_ = challengeIndex_;
-        result.groupId_ = groupId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          uidList_.makeImmutable();
+          paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.uidList_ = uidList_;
+        result.paramList_ = paramList_;
+        result.challengeIndex_ = challengeIndex_;
         result.fatherIndex_ = fatherIndex_;
-        result.challengeId_ = challengeId_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          paramList_.makeImmutable();
+          uidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.paramList_ = paramList_;
+        result.uidList_ = uidList_;
+        result.challengeId_ = challengeId_;
+        result.groupId_ = groupId_;
         onBuilt();
         return result;
       }
@@ -716,37 +706,37 @@ public final class DungeonChallengeBeginNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify other) {
         if (other == emu.grasscutter.net.proto.DungeonChallengeBeginNotifyOuterClass.DungeonChallengeBeginNotify.getDefaultInstance()) return this;
+        if (!other.paramList_.isEmpty()) {
+          if (paramList_.isEmpty()) {
+            paramList_ = other.paramList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureParamListIsMutable();
+            paramList_.addAll(other.paramList_);
+          }
+          onChanged();
+        }
         if (other.getChallengeIndex() != 0) {
           setChallengeIndex(other.getChallengeIndex());
         }
-        if (other.getGroupId() != 0) {
-          setGroupId(other.getGroupId());
+        if (other.getFatherIndex() != 0) {
+          setFatherIndex(other.getFatherIndex());
         }
         if (!other.uidList_.isEmpty()) {
           if (uidList_.isEmpty()) {
             uidList_ = other.uidList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureUidListIsMutable();
             uidList_.addAll(other.uidList_);
           }
           onChanged();
         }
-        if (other.getFatherIndex() != 0) {
-          setFatherIndex(other.getFatherIndex());
-        }
         if (other.getChallengeId() != 0) {
           setChallengeId(other.getChallengeId());
         }
-        if (!other.paramList_.isEmpty()) {
-          if (paramList_.isEmpty()) {
-            paramList_ = other.paramList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureParamListIsMutable();
-            paramList_.addAll(other.paramList_);
-          }
-          onChanged();
+        if (other.getGroupId() != 0) {
+          setGroupId(other.getGroupId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -778,9 +768,88 @@ public final class DungeonChallengeBeginNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
+      private void ensureParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          paramList_ = mutableCopy(paramList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @return A list containing the paramList.
+       */
+      public java.util.List<java.lang.Integer>
+          getParamListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @return The count of paramList.
+       */
+      public int getParamListCount() {
+        return paramList_.size();
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The paramList at the given index.
+       */
+      public int getParamList(int index) {
+        return paramList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The paramList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamList(
+          int index, int value) {
+        ensureParamListIsMutable();
+        paramList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @param value The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addParamList(int value) {
+        ensureParamListIsMutable();
+        paramList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @param values The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllParamList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureParamListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, paramList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamList() {
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private int challengeIndex_ ;
       /**
-       * <code>uint32 challenge_index = 11;</code>
+       * <code>uint32 challenge_index = 5;</code>
        * @return The challengeIndex.
        */
       @java.lang.Override
@@ -788,7 +857,7 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         return challengeIndex_;
       }
       /**
-       * <code>uint32 challenge_index = 11;</code>
+       * <code>uint32 challenge_index = 5;</code>
        * @param value The challengeIndex to set.
        * @return This builder for chaining.
        */
@@ -799,7 +868,7 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_index = 11;</code>
+       * <code>uint32 challenge_index = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeIndex() {
@@ -809,6 +878,147 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         return this;
       }
 
+      private int fatherIndex_ ;
+      /**
+       * <code>uint32 father_index = 7;</code>
+       * @return The fatherIndex.
+       */
+      @java.lang.Override
+      public int getFatherIndex() {
+        return fatherIndex_;
+      }
+      /**
+       * <code>uint32 father_index = 7;</code>
+       * @param value The fatherIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFatherIndex(int value) {
+        
+        fatherIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 father_index = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFatherIndex() {
+        
+        fatherIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList uidList_ = emptyIntList();
+      private void ensureUidListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          uidList_ = mutableCopy(uidList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @return A list containing the uidList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUidListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(uidList_) : uidList_;
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @return The count of uidList.
+       */
+      public int getUidListCount() {
+        return uidList_.size();
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @param index The index of the element to return.
+       * @return The uidList at the given index.
+       */
+      public int getUidList(int index) {
+        return uidList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The uidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUidList(
+          int index, int value) {
+        ensureUidListIsMutable();
+        uidList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @param value The uidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUidList(int value) {
+        ensureUidListIsMutable();
+        uidList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @param values The uidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUidList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, uidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 uid_list = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUidList() {
+        uidList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private int challengeId_ ;
+      /**
+       * <code>uint32 challenge_id = 9;</code>
+       * @return The challengeId.
+       */
+      @java.lang.Override
+      public int getChallengeId() {
+        return challengeId_;
+      }
+      /**
+       * <code>uint32 challenge_id = 9;</code>
+       * @param value The challengeId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeId(int value) {
+        
+        challengeId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeId() {
+        
+        challengeId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int groupId_ ;
       /**
        * <code>uint32 group_id = 10;</code>
@@ -839,226 +1049,6 @@ public final class DungeonChallengeBeginNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList uidList_ = emptyIntList();
-      private void ensureUidListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          uidList_ = mutableCopy(uidList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @return A list containing the uidList.
-       */
-      public java.util.List<java.lang.Integer>
-          getUidListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(uidList_) : uidList_;
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @return The count of uidList.
-       */
-      public int getUidListCount() {
-        return uidList_.size();
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @param index The index of the element to return.
-       * @return The uidList at the given index.
-       */
-      public int getUidList(int index) {
-        return uidList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @param index The index to set the value at.
-       * @param value The uidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUidList(
-          int index, int value) {
-        ensureUidListIsMutable();
-        uidList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @param value The uidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addUidList(int value) {
-        ensureUidListIsMutable();
-        uidList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @param values The uidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllUidList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, uidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 uid_list = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUidList() {
-        uidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private int fatherIndex_ ;
-      /**
-       * <code>uint32 father_index = 4;</code>
-       * @return The fatherIndex.
-       */
-      @java.lang.Override
-      public int getFatherIndex() {
-        return fatherIndex_;
-      }
-      /**
-       * <code>uint32 father_index = 4;</code>
-       * @param value The fatherIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFatherIndex(int value) {
-        
-        fatherIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 father_index = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFatherIndex() {
-        
-        fatherIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int challengeId_ ;
-      /**
-       * <code>uint32 challenge_id = 3;</code>
-       * @return The challengeId.
-       */
-      @java.lang.Override
-      public int getChallengeId() {
-        return challengeId_;
-      }
-      /**
-       * <code>uint32 challenge_id = 3;</code>
-       * @param value The challengeId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeId(int value) {
-        
-        challengeId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeId() {
-        
-        challengeId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
-      private void ensureParamListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          paramList_ = mutableCopy(paramList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @return A list containing the paramList.
-       */
-      public java.util.List<java.lang.Integer>
-          getParamListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @return The count of paramList.
-       */
-      public int getParamListCount() {
-        return paramList_.size();
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @param index The index of the element to return.
-       * @return The paramList at the given index.
-       */
-      public int getParamList(int index) {
-        return paramList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @param index The index to set the value at.
-       * @param value The paramList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParamList(
-          int index, int value) {
-        ensureParamListIsMutable();
-        paramList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @param value The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addParamList(int value) {
-        ensureParamListIsMutable();
-        paramList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @param values The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllParamList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureParamListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, paramList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParamList() {
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1127,10 +1117,10 @@ public final class DungeonChallengeBeginNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!DungeonChallengeBeginNotify.proto\"\232\001\n\033" +
-      "DungeonChallengeBeginNotify\022\027\n\017challenge" +
-      "_index\030\013 \001(\r\022\020\n\010group_id\030\n \001(\r\022\020\n\010uid_li" +
-      "st\030\017 \003(\r\022\024\n\014father_index\030\004 \001(\r\022\024\n\014challe" +
-      "nge_id\030\003 \001(\r\022\022\n\nparam_list\030\006 \003(\rB\033\n\031emu." +
+      "DungeonChallengeBeginNotify\022\022\n\nparam_lis" +
+      "t\030\003 \003(\r\022\027\n\017challenge_index\030\005 \001(\r\022\024\n\014fath" +
+      "er_index\030\007 \001(\r\022\020\n\010uid_list\030\010 \003(\r\022\024\n\014chal" +
+      "lenge_id\030\t \001(\r\022\020\n\010group_id\030\n \001(\rB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1142,7 +1132,7 @@ public final class DungeonChallengeBeginNotifyOuterClass {
     internal_static_DungeonChallengeBeginNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonChallengeBeginNotify_descriptor,
-        new java.lang.String[] { "ChallengeIndex", "GroupId", "UidList", "FatherIndex", "ChallengeId", "ParamList", });
+        new java.lang.String[] { "ParamList", "ChallengeIndex", "FatherIndex", "UidList", "ChallengeId", "GroupId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java
index b4b9ba762..003031576 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonChallengeFinishNotifyOuterClass.java
@@ -19,52 +19,17 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChallengeFinishType finish_type = 7;</code>
-     * @return The enum numeric value on the wire for finishType.
-     */
-    int getFinishTypeValue();
-    /**
-     * <code>.ChallengeFinishType finish_type = 7;</code>
-     * @return The finishType.
-     */
-    emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType();
-
-    /**
-     * <code>bool is_success = 11;</code>
-     * @return The isSuccess.
-     */
-    boolean getIsSuccess();
-
-    /**
-     * <code>uint32 challenge_index = 8;</code>
+     * <code>uint32 challenge_index = 2;</code>
      * @return The challengeIndex.
      */
     int getChallengeIndex();
 
     /**
-     * <code>uint32 currentValue = 14;</code>
-     * @return The currentValue.
-     */
-    int getCurrentValue();
-
-    /**
-     * <code>bool is_new_record = 15;</code>
-     * @return The isNewRecord.
-     */
-    boolean getIsNewRecord();
-
-    /**
-     * <code>uint32 time_cost = 13;</code>
-     * @return The timeCost.
-     */
-    int getTimeCost();
-
-    /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     int getStrengthenPointDataMapCount();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     boolean containsStrengthenPointDataMap(
         int key);
@@ -75,98 +40,140 @@ public final class DungeonChallengeFinishNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMapMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault(
         int key,
         emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue);
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow(
         int key);
 
     /**
-     * <code>uint32 challengeRecordType = 4;</code>
+     * <code>bool is_success = 5;</code>
+     * @return The isSuccess.
+     */
+    boolean getIsSuccess();
+
+    /**
+     * <code>uint32 current_value = 6;</code>
+     * @return The currentValue.
+     */
+    int getCurrentValue();
+
+    /**
+     * <code>uint32 time_cost = 8;</code>
+     * @return The timeCost.
+     */
+    int getTimeCost();
+
+    /**
+     * <code>uint32 challenge_record_type = 10;</code>
      * @return The challengeRecordType.
      */
     int getChallengeRecordType();
 
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>bool is_new_record = 13;</code>
+     * @return The isNewRecord.
+     */
+    boolean getIsNewRecord();
+
+    /**
+     * <code>.ChallengeFinishType finish_type = 14;</code>
+     * @return The enum numeric value on the wire for finishType.
+     */
+    int getFinishTypeValue();
+    /**
+     * <code>.ChallengeFinishType finish_type = 14;</code>
+     * @return The finishType.
+     */
+    emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType();
+
+    /**
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
      */
     boolean hasChannellerSlabLoopDungeonResultInfo();
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      * @return The channellerSlabLoopDungeonResultInfo.
      */
     emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo();
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      */
     emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder();
 
     /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     * @return Whether the effigyChallengeDungeonResultInfo field is set.
-     */
-    boolean hasEffigyChallengeDungeonResultInfo();
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     * @return The effigyChallengeDungeonResultInfo.
-     */
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo();
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     */
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder();
-
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     * @return Whether the potionDungeonResultInfo field is set.
-     */
-    boolean hasPotionDungeonResultInfo();
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     * @return The potionDungeonResultInfo.
-     */
-    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo();
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     */
-    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder();
-
-    /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      * @return Whether the customDungeonResultInfo field is set.
      */
     boolean hasCustomDungeonResultInfo();
     /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      * @return The customDungeonResultInfo.
      */
     emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo();
     /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      */
     emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder();
 
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     * @return Whether the potionDungeonResultInfo field is set.
+     */
+    boolean hasPotionDungeonResultInfo();
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     * @return The potionDungeonResultInfo.
+     */
+    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo();
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     */
+    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder();
+
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     * @return Whether the effigyChallengeDungeonResultInfo field is set.
+     */
+    boolean hasEffigyChallengeDungeonResultInfo();
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     * @return The effigyChallengeDungeonResultInfo.
+     */
+    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo();
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder();
+
     public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * CmdId: 5847
-   * Obf: JBNHPHABEGG
-   * </pre>
-   *
    * Protobuf type {@code DungeonChallengeFinishNotify}
    */
   public static final class DungeonChallengeFinishNotify extends
@@ -213,12 +220,12 @@ public final class DungeonChallengeFinishNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 16: {
 
-              challengeRecordType_ = input.readUInt32();
+              challengeIndex_ = input.readUInt32();
               break;
             }
-            case 42: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField(
                     StrengthenPointDataMapDefaultEntryHolder.defaultEntry);
@@ -231,82 +238,40 @@ public final class DungeonChallengeFinishNotifyOuterClass {
                   strengthenPointDataMap__.getKey(), strengthenPointDataMap__.getValue());
               break;
             }
-            case 56: {
+            case 40: {
+
+              isSuccess_ = input.readBool();
+              break;
+            }
+            case 48: {
+
+              currentValue_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              timeCost_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              challengeRecordType_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              isNewRecord_ = input.readBool();
+              break;
+            }
+            case 112: {
               int rawValue = input.readEnum();
 
               finishType_ = rawValue;
               break;
             }
-            case 64: {
-
-              challengeIndex_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              isSuccess_ = input.readBool();
-              break;
-            }
-            case 104: {
-
-              timeCost_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              currentValue_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              isNewRecord_ = input.readBool();
-              break;
-            }
-            case 2714: {
-              emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 339) {
-                subBuilder = ((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 339;
-              break;
-            }
-            case 2810: {
-              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 351) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 351;
-              break;
-            }
-            case 7322: {
-              emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 915) {
-                subBuilder = ((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 915;
-              break;
-            }
-            case 8890: {
+            case 1434: {
               emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 1111) {
+              if (detailCase_ == 179) {
                 subBuilder = ((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_).toBuilder();
               }
               detail_ =
@@ -315,7 +280,49 @@ public final class DungeonChallengeFinishNotifyOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
                 detail_ = subBuilder.buildPartial();
               }
-              detailCase_ = 1111;
+              detailCase_ = 179;
+              break;
+            }
+            case 1658: {
+              emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder subBuilder = null;
+              if (detailCase_ == 207) {
+                subBuilder = ((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_).toBuilder();
+              }
+              detail_ =
+                  input.readMessage(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
+                detail_ = subBuilder.buildPartial();
+              }
+              detailCase_ = 207;
+              break;
+            }
+            case 2834: {
+              emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder subBuilder = null;
+              if (detailCase_ == 354) {
+                subBuilder = ((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_).toBuilder();
+              }
+              detail_ =
+                  input.readMessage(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
+                detail_ = subBuilder.buildPartial();
+              }
+              detailCase_ = 354;
+              break;
+            }
+            case 9098: {
+              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null;
+              if (detailCase_ == 1137) {
+                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder();
+              }
+              detail_ =
+                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
+                detail_ = subBuilder.buildPartial();
+              }
+              detailCase_ = 1137;
               break;
             }
             default: {
@@ -347,7 +354,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 5:
+        case 4:
           return internalGetStrengthenPointDataMap();
         default:
           throw new RuntimeException(
@@ -367,10 +374,10 @@ public final class DungeonChallengeFinishNotifyOuterClass {
     public enum DetailCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(1111),
-      EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(351),
-      POTION_DUNGEON_RESULT_INFO(339),
-      CUSTOM_DUNGEON_RESULT_INFO(915),
+      CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(179),
+      CUSTOM_DUNGEON_RESULT_INFO(207),
+      POTION_DUNGEON_RESULT_INFO(354),
+      EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(1137),
       DETAIL_NOT_SET(0);
       private final int value;
       private DetailCase(int value) {
@@ -388,10 +395,10 @@ public final class DungeonChallengeFinishNotifyOuterClass {
 
       public static DetailCase forNumber(int value) {
         switch (value) {
-          case 1111: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO;
-          case 351: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO;
-          case 339: return POTION_DUNGEON_RESULT_INFO;
-          case 915: return CUSTOM_DUNGEON_RESULT_INFO;
+          case 179: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO;
+          case 207: return CUSTOM_DUNGEON_RESULT_INFO;
+          case 354: return POTION_DUNGEON_RESULT_INFO;
+          case 1137: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO;
           case 0: return DETAIL_NOT_SET;
           default: return null;
         }
@@ -407,40 +414,10 @@ public final class DungeonChallengeFinishNotifyOuterClass {
           detailCase_);
     }
 
-    public static final int FINISH_TYPE_FIELD_NUMBER = 7;
-    private int finishType_;
-    /**
-     * <code>.ChallengeFinishType finish_type = 7;</code>
-     * @return The enum numeric value on the wire for finishType.
-     */
-    @java.lang.Override public int getFinishTypeValue() {
-      return finishType_;
-    }
-    /**
-     * <code>.ChallengeFinishType finish_type = 7;</code>
-     * @return The finishType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_);
-      return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result;
-    }
-
-    public static final int IS_SUCCESS_FIELD_NUMBER = 11;
-    private boolean isSuccess_;
-    /**
-     * <code>bool is_success = 11;</code>
-     * @return The isSuccess.
-     */
-    @java.lang.Override
-    public boolean getIsSuccess() {
-      return isSuccess_;
-    }
-
-    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 8;
+    public static final int CHALLENGE_INDEX_FIELD_NUMBER = 2;
     private int challengeIndex_;
     /**
-     * <code>uint32 challenge_index = 8;</code>
+     * <code>uint32 challenge_index = 2;</code>
      * @return The challengeIndex.
      */
     @java.lang.Override
@@ -448,40 +425,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return challengeIndex_;
     }
 
-    public static final int CURRENTVALUE_FIELD_NUMBER = 14;
-    private int currentValue_;
-    /**
-     * <code>uint32 currentValue = 14;</code>
-     * @return The currentValue.
-     */
-    @java.lang.Override
-    public int getCurrentValue() {
-      return currentValue_;
-    }
-
-    public static final int IS_NEW_RECORD_FIELD_NUMBER = 15;
-    private boolean isNewRecord_;
-    /**
-     * <code>bool is_new_record = 15;</code>
-     * @return The isNewRecord.
-     */
-    @java.lang.Override
-    public boolean getIsNewRecord() {
-      return isNewRecord_;
-    }
-
-    public static final int TIME_COST_FIELD_NUMBER = 13;
-    private int timeCost_;
-    /**
-     * <code>uint32 time_cost = 13;</code>
-     * @return The timeCost.
-     */
-    @java.lang.Override
-    public int getTimeCost() {
-      return timeCost_;
-    }
-
-    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 5;
+    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 4;
     private static final class StrengthenPointDataMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> defaultEntry =
@@ -508,7 +452,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
 
     @java.lang.Override
@@ -526,7 +470,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return getStrengthenPointDataMapMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     @java.lang.Override
 
@@ -534,7 +478,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     @java.lang.Override
 
@@ -547,7 +491,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
      */
     @java.lang.Override
 
@@ -562,10 +506,43 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int CHALLENGERECORDTYPE_FIELD_NUMBER = 4;
+    public static final int IS_SUCCESS_FIELD_NUMBER = 5;
+    private boolean isSuccess_;
+    /**
+     * <code>bool is_success = 5;</code>
+     * @return The isSuccess.
+     */
+    @java.lang.Override
+    public boolean getIsSuccess() {
+      return isSuccess_;
+    }
+
+    public static final int CURRENT_VALUE_FIELD_NUMBER = 6;
+    private int currentValue_;
+    /**
+     * <code>uint32 current_value = 6;</code>
+     * @return The currentValue.
+     */
+    @java.lang.Override
+    public int getCurrentValue() {
+      return currentValue_;
+    }
+
+    public static final int TIME_COST_FIELD_NUMBER = 8;
+    private int timeCost_;
+    /**
+     * <code>uint32 time_cost = 8;</code>
+     * @return The timeCost.
+     */
+    @java.lang.Override
+    public int getTimeCost() {
+      return timeCost_;
+    }
+
+    public static final int CHALLENGE_RECORD_TYPE_FIELD_NUMBER = 10;
     private int challengeRecordType_;
     /**
-     * <code>uint32 challengeRecordType = 4;</code>
+     * <code>uint32 challenge_record_type = 10;</code>
      * @return The challengeRecordType.
      */
     @java.lang.Override
@@ -573,130 +550,172 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return challengeRecordType_;
     }
 
-    public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1111;
+    public static final int IS_NEW_RECORD_FIELD_NUMBER = 13;
+    private boolean isNewRecord_;
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>bool is_new_record = 13;</code>
+     * @return The isNewRecord.
+     */
+    @java.lang.Override
+    public boolean getIsNewRecord() {
+      return isNewRecord_;
+    }
+
+    public static final int FINISH_TYPE_FIELD_NUMBER = 14;
+    private int finishType_;
+    /**
+     * <code>.ChallengeFinishType finish_type = 14;</code>
+     * @return The enum numeric value on the wire for finishType.
+     */
+    @java.lang.Override public int getFinishTypeValue() {
+      return finishType_;
+    }
+    /**
+     * <code>.ChallengeFinishType finish_type = 14;</code>
+     * @return The finishType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_);
+      return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result;
+    }
+
+    public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 179;
+    /**
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
      */
     @java.lang.Override
     public boolean hasChannellerSlabLoopDungeonResultInfo() {
-      return detailCase_ == 1111;
+      return detailCase_ == 179;
     }
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      * @return The channellerSlabLoopDungeonResultInfo.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() {
-      if (detailCase_ == 1111) {
+      if (detailCase_ == 179) {
          return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
       }
       return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
     }
     /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 1111) {
+      if (detailCase_ == 179) {
          return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
       }
       return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
     }
 
-    public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 351;
+    public static final int CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER = 207;
     /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     * @return Whether the effigyChallengeDungeonResultInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyChallengeDungeonResultInfo() {
-      return detailCase_ == 351;
-    }
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     * @return The effigyChallengeDungeonResultInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
-      if (detailCase_ == 351) {
-         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 351) {
-         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-    }
-
-    public static final int POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER = 339;
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     * @return Whether the potionDungeonResultInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPotionDungeonResultInfo() {
-      return detailCase_ == 339;
-    }
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     * @return The potionDungeonResultInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() {
-      if (detailCase_ == 339) {
-         return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 339) {
-         return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-    }
-
-    public static final int CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER = 915;
-    /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      * @return Whether the customDungeonResultInfo field is set.
      */
     @java.lang.Override
     public boolean hasCustomDungeonResultInfo() {
-      return detailCase_ == 915;
+      return detailCase_ == 207;
     }
     /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      * @return The customDungeonResultInfo.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo() {
-      if (detailCase_ == 915) {
+      if (detailCase_ == 207) {
          return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_;
       }
       return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
     }
     /**
-     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+     * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 915) {
+      if (detailCase_ == 207) {
          return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_;
       }
       return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
     }
 
+    public static final int POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER = 354;
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     * @return Whether the potionDungeonResultInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasPotionDungeonResultInfo() {
+      return detailCase_ == 354;
+    }
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     * @return The potionDungeonResultInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() {
+      if (detailCase_ == 354) {
+         return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
+      }
+      return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+    }
+    /**
+     * <pre>
+     * proto
+     * </pre>
+     *
+     * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() {
+      if (detailCase_ == 354) {
+         return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
+      }
+      return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+    }
+
+    public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 1137;
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     * @return Whether the effigyChallengeDungeonResultInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasEffigyChallengeDungeonResultInfo() {
+      return detailCase_ == 1137;
+    }
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     * @return The effigyChallengeDungeonResultInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
+      if (detailCase_ == 1137) {
+         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
+      }
+      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+    }
+    /**
+     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
+      if (detailCase_ == 1137) {
+         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
+      }
+      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -711,44 +730,44 @@ public final class DungeonChallengeFinishNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (challengeRecordType_ != 0) {
-        output.writeUInt32(4, challengeRecordType_);
+      if (challengeIndex_ != 0) {
+        output.writeUInt32(2, challengeIndex_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetStrengthenPointDataMap(),
           StrengthenPointDataMapDefaultEntryHolder.defaultEntry,
-          5);
-      if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) {
-        output.writeEnum(7, finishType_);
-      }
-      if (challengeIndex_ != 0) {
-        output.writeUInt32(8, challengeIndex_);
-      }
+          4);
       if (isSuccess_ != false) {
-        output.writeBool(11, isSuccess_);
-      }
-      if (timeCost_ != 0) {
-        output.writeUInt32(13, timeCost_);
+        output.writeBool(5, isSuccess_);
       }
       if (currentValue_ != 0) {
-        output.writeUInt32(14, currentValue_);
+        output.writeUInt32(6, currentValue_);
+      }
+      if (timeCost_ != 0) {
+        output.writeUInt32(8, timeCost_);
+      }
+      if (challengeRecordType_ != 0) {
+        output.writeUInt32(10, challengeRecordType_);
       }
       if (isNewRecord_ != false) {
-        output.writeBool(15, isNewRecord_);
+        output.writeBool(13, isNewRecord_);
       }
-      if (detailCase_ == 339) {
-        output.writeMessage(339, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
+      if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) {
+        output.writeEnum(14, finishType_);
       }
-      if (detailCase_ == 351) {
-        output.writeMessage(351, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
+      if (detailCase_ == 179) {
+        output.writeMessage(179, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
       }
-      if (detailCase_ == 915) {
-        output.writeMessage(915, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
+      if (detailCase_ == 207) {
+        output.writeMessage(207, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
       }
-      if (detailCase_ == 1111) {
-        output.writeMessage(1111, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
+      if (detailCase_ == 354) {
+        output.writeMessage(354, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
+      }
+      if (detailCase_ == 1137) {
+        output.writeMessage(1137, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
       }
       unknownFields.writeTo(output);
     }
@@ -759,9 +778,9 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (challengeRecordType_ != 0) {
+      if (challengeIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, challengeRecordType_);
+          .computeUInt32Size(2, challengeIndex_);
       }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> entry
            : internalGetStrengthenPointDataMap().getMap().entrySet()) {
@@ -771,47 +790,47 @@ public final class DungeonChallengeFinishNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(5, strengthenPointDataMap__);
-      }
-      if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, finishType_);
-      }
-      if (challengeIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, challengeIndex_);
+            .computeMessageSize(4, strengthenPointDataMap__);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isSuccess_);
-      }
-      if (timeCost_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, timeCost_);
+          .computeBoolSize(5, isSuccess_);
       }
       if (currentValue_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, currentValue_);
+          .computeUInt32Size(6, currentValue_);
+      }
+      if (timeCost_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, timeCost_);
+      }
+      if (challengeRecordType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, challengeRecordType_);
       }
       if (isNewRecord_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isNewRecord_);
+          .computeBoolSize(13, isNewRecord_);
       }
-      if (detailCase_ == 339) {
+      if (finishType_ != emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.CHALLENGE_FINISH_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(339, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
+          .computeEnumSize(14, finishType_);
       }
-      if (detailCase_ == 351) {
+      if (detailCase_ == 179) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(351, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
+          .computeMessageSize(179, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
       }
-      if (detailCase_ == 915) {
+      if (detailCase_ == 207) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(915, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
+          .computeMessageSize(207, (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_);
       }
-      if (detailCase_ == 1111) {
+      if (detailCase_ == 354) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1111, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
+          .computeMessageSize(354, (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_);
+      }
+      if (detailCase_ == 1137) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1137, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -828,38 +847,38 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       }
       emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify other = (emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify) obj;
 
-      if (finishType_ != other.finishType_) return false;
-      if (getIsSuccess()
-          != other.getIsSuccess()) return false;
       if (getChallengeIndex()
           != other.getChallengeIndex()) return false;
-      if (getCurrentValue()
-          != other.getCurrentValue()) return false;
-      if (getIsNewRecord()
-          != other.getIsNewRecord()) return false;
-      if (getTimeCost()
-          != other.getTimeCost()) return false;
       if (!internalGetStrengthenPointDataMap().equals(
           other.internalGetStrengthenPointDataMap())) return false;
+      if (getIsSuccess()
+          != other.getIsSuccess()) return false;
+      if (getCurrentValue()
+          != other.getCurrentValue()) return false;
+      if (getTimeCost()
+          != other.getTimeCost()) return false;
       if (getChallengeRecordType()
           != other.getChallengeRecordType()) return false;
+      if (getIsNewRecord()
+          != other.getIsNewRecord()) return false;
+      if (finishType_ != other.finishType_) return false;
       if (!getDetailCase().equals(other.getDetailCase())) return false;
       switch (detailCase_) {
-        case 1111:
+        case 179:
           if (!getChannellerSlabLoopDungeonResultInfo()
               .equals(other.getChannellerSlabLoopDungeonResultInfo())) return false;
           break;
-        case 351:
-          if (!getEffigyChallengeDungeonResultInfo()
-              .equals(other.getEffigyChallengeDungeonResultInfo())) return false;
+        case 207:
+          if (!getCustomDungeonResultInfo()
+              .equals(other.getCustomDungeonResultInfo())) return false;
           break;
-        case 339:
+        case 354:
           if (!getPotionDungeonResultInfo()
               .equals(other.getPotionDungeonResultInfo())) return false;
           break;
-        case 915:
-          if (!getCustomDungeonResultInfo()
-              .equals(other.getCustomDungeonResultInfo())) return false;
+        case 1137:
+          if (!getEffigyChallengeDungeonResultInfo()
+              .equals(other.getEffigyChallengeDungeonResultInfo())) return false;
           break;
         case 0:
         default:
@@ -875,42 +894,42 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + finishType_;
-      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSuccess());
       hash = (37 * hash) + CHALLENGE_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeIndex();
-      hash = (37 * hash) + CURRENTVALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getCurrentValue();
-      hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsNewRecord());
-      hash = (37 * hash) + TIME_COST_FIELD_NUMBER;
-      hash = (53 * hash) + getTimeCost();
       if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) {
         hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode();
       }
-      hash = (37 * hash) + CHALLENGERECORDTYPE_FIELD_NUMBER;
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSuccess());
+      hash = (37 * hash) + CURRENT_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getCurrentValue();
+      hash = (37 * hash) + TIME_COST_FIELD_NUMBER;
+      hash = (53 * hash) + getTimeCost();
+      hash = (37 * hash) + CHALLENGE_RECORD_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeRecordType();
+      hash = (37 * hash) + IS_NEW_RECORD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsNewRecord());
+      hash = (37 * hash) + FINISH_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + finishType_;
       switch (detailCase_) {
-        case 1111:
+        case 179:
           hash = (37 * hash) + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER;
           hash = (53 * hash) + getChannellerSlabLoopDungeonResultInfo().hashCode();
           break;
-        case 351:
-          hash = (37 * hash) + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyChallengeDungeonResultInfo().hashCode();
+        case 207:
+          hash = (37 * hash) + CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER;
+          hash = (53 * hash) + getCustomDungeonResultInfo().hashCode();
           break;
-        case 339:
+        case 354:
           hash = (37 * hash) + POTION_DUNGEON_RESULT_INFO_FIELD_NUMBER;
           hash = (53 * hash) + getPotionDungeonResultInfo().hashCode();
           break;
-        case 915:
-          hash = (37 * hash) + CUSTOM_DUNGEON_RESULT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCustomDungeonResultInfo().hashCode();
+        case 1137:
+          hash = (37 * hash) + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER;
+          hash = (53 * hash) + getEffigyChallengeDungeonResultInfo().hashCode();
           break;
         case 0:
         default:
@@ -1011,11 +1030,6 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5847
-     * Obf: JBNHPHABEGG
-     * </pre>
-     *
      * Protobuf type {@code DungeonChallengeFinishNotify}
      */
     public static final class Builder extends
@@ -1031,7 +1045,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 5:
+          case 4:
             return internalGetStrengthenPointDataMap();
           default:
             throw new RuntimeException(
@@ -1042,7 +1056,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 5:
+          case 4:
             return internalGetMutableStrengthenPointDataMap();
           default:
             throw new RuntimeException(
@@ -1075,21 +1089,21 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        finishType_ = 0;
-
-        isSuccess_ = false;
-
         challengeIndex_ = 0;
 
+        internalGetMutableStrengthenPointDataMap().clear();
+        isSuccess_ = false;
+
         currentValue_ = 0;
 
-        isNewRecord_ = false;
-
         timeCost_ = 0;
 
-        internalGetMutableStrengthenPointDataMap().clear();
         challengeRecordType_ = 0;
 
+        isNewRecord_ = false;
+
+        finishType_ = 0;
+
         detailCase_ = 0;
         detail_ = null;
         return this;
@@ -1119,41 +1133,41 @@ public final class DungeonChallengeFinishNotifyOuterClass {
       public emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify buildPartial() {
         emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify result = new emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify(this);
         int from_bitField0_ = bitField0_;
-        result.finishType_ = finishType_;
-        result.isSuccess_ = isSuccess_;
         result.challengeIndex_ = challengeIndex_;
-        result.currentValue_ = currentValue_;
-        result.isNewRecord_ = isNewRecord_;
-        result.timeCost_ = timeCost_;
         result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap();
         result.strengthenPointDataMap_.makeImmutable();
+        result.isSuccess_ = isSuccess_;
+        result.currentValue_ = currentValue_;
+        result.timeCost_ = timeCost_;
         result.challengeRecordType_ = challengeRecordType_;
-        if (detailCase_ == 1111) {
+        result.isNewRecord_ = isNewRecord_;
+        result.finishType_ = finishType_;
+        if (detailCase_ == 179) {
           if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
             result.detail_ = detail_;
           } else {
             result.detail_ = channellerSlabLoopDungeonResultInfoBuilder_.build();
           }
         }
-        if (detailCase_ == 351) {
-          if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+        if (detailCase_ == 207) {
+          if (customDungeonResultInfoBuilder_ == null) {
             result.detail_ = detail_;
           } else {
-            result.detail_ = effigyChallengeDungeonResultInfoBuilder_.build();
+            result.detail_ = customDungeonResultInfoBuilder_.build();
           }
         }
-        if (detailCase_ == 339) {
+        if (detailCase_ == 354) {
           if (potionDungeonResultInfoBuilder_ == null) {
             result.detail_ = detail_;
           } else {
             result.detail_ = potionDungeonResultInfoBuilder_.build();
           }
         }
-        if (detailCase_ == 915) {
-          if (customDungeonResultInfoBuilder_ == null) {
+        if (detailCase_ == 1137) {
+          if (effigyChallengeDungeonResultInfoBuilder_ == null) {
             result.detail_ = detail_;
           } else {
-            result.detail_ = customDungeonResultInfoBuilder_.build();
+            result.detail_ = effigyChallengeDungeonResultInfoBuilder_.build();
           }
         }
         result.detailCase_ = detailCase_;
@@ -1205,44 +1219,44 @@ public final class DungeonChallengeFinishNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify other) {
         if (other == emu.grasscutter.net.proto.DungeonChallengeFinishNotifyOuterClass.DungeonChallengeFinishNotify.getDefaultInstance()) return this;
-        if (other.finishType_ != 0) {
-          setFinishTypeValue(other.getFinishTypeValue());
-        }
-        if (other.getIsSuccess() != false) {
-          setIsSuccess(other.getIsSuccess());
-        }
         if (other.getChallengeIndex() != 0) {
           setChallengeIndex(other.getChallengeIndex());
         }
+        internalGetMutableStrengthenPointDataMap().mergeFrom(
+            other.internalGetStrengthenPointDataMap());
+        if (other.getIsSuccess() != false) {
+          setIsSuccess(other.getIsSuccess());
+        }
         if (other.getCurrentValue() != 0) {
           setCurrentValue(other.getCurrentValue());
         }
-        if (other.getIsNewRecord() != false) {
-          setIsNewRecord(other.getIsNewRecord());
-        }
         if (other.getTimeCost() != 0) {
           setTimeCost(other.getTimeCost());
         }
-        internalGetMutableStrengthenPointDataMap().mergeFrom(
-            other.internalGetStrengthenPointDataMap());
         if (other.getChallengeRecordType() != 0) {
           setChallengeRecordType(other.getChallengeRecordType());
         }
+        if (other.getIsNewRecord() != false) {
+          setIsNewRecord(other.getIsNewRecord());
+        }
+        if (other.finishType_ != 0) {
+          setFinishTypeValue(other.getFinishTypeValue());
+        }
         switch (other.getDetailCase()) {
           case CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO: {
             mergeChannellerSlabLoopDungeonResultInfo(other.getChannellerSlabLoopDungeonResultInfo());
             break;
           }
-          case EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO: {
-            mergeEffigyChallengeDungeonResultInfo(other.getEffigyChallengeDungeonResultInfo());
+          case CUSTOM_DUNGEON_RESULT_INFO: {
+            mergeCustomDungeonResultInfo(other.getCustomDungeonResultInfo());
             break;
           }
           case POTION_DUNGEON_RESULT_INFO: {
             mergePotionDungeonResultInfo(other.getPotionDungeonResultInfo());
             break;
           }
-          case CUSTOM_DUNGEON_RESULT_INFO: {
-            mergeCustomDungeonResultInfo(other.getCustomDungeonResultInfo());
+          case EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO: {
+            mergeEffigyChallengeDungeonResultInfo(other.getEffigyChallengeDungeonResultInfo());
             break;
           }
           case DETAIL_NOT_SET: {
@@ -1294,94 +1308,9 @@ public final class DungeonChallengeFinishNotifyOuterClass {
 
       private int bitField0_;
 
-      private int finishType_ = 0;
-      /**
-       * <code>.ChallengeFinishType finish_type = 7;</code>
-       * @return The enum numeric value on the wire for finishType.
-       */
-      @java.lang.Override public int getFinishTypeValue() {
-        return finishType_;
-      }
-      /**
-       * <code>.ChallengeFinishType finish_type = 7;</code>
-       * @param value The enum numeric value on the wire for finishType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishTypeValue(int value) {
-        
-        finishType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChallengeFinishType finish_type = 7;</code>
-       * @return The finishType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_);
-        return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.ChallengeFinishType finish_type = 7;</code>
-       * @param value The finishType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishType(emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        finishType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChallengeFinishType finish_type = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinishType() {
-        
-        finishType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isSuccess_ ;
-      /**
-       * <code>bool is_success = 11;</code>
-       * @return The isSuccess.
-       */
-      @java.lang.Override
-      public boolean getIsSuccess() {
-        return isSuccess_;
-      }
-      /**
-       * <code>bool is_success = 11;</code>
-       * @param value The isSuccess to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSuccess(boolean value) {
-        
-        isSuccess_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_success = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSuccess() {
-        
-        isSuccess_ = false;
-        onChanged();
-        return this;
-      }
-
       private int challengeIndex_ ;
       /**
-       * <code>uint32 challenge_index = 8;</code>
+       * <code>uint32 challenge_index = 2;</code>
        * @return The challengeIndex.
        */
       @java.lang.Override
@@ -1389,7 +1318,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return challengeIndex_;
       }
       /**
-       * <code>uint32 challenge_index = 8;</code>
+       * <code>uint32 challenge_index = 2;</code>
        * @param value The challengeIndex to set.
        * @return This builder for chaining.
        */
@@ -1400,7 +1329,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_index = 8;</code>
+       * <code>uint32 challenge_index = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeIndex() {
@@ -1410,99 +1339,6 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
 
-      private int currentValue_ ;
-      /**
-       * <code>uint32 currentValue = 14;</code>
-       * @return The currentValue.
-       */
-      @java.lang.Override
-      public int getCurrentValue() {
-        return currentValue_;
-      }
-      /**
-       * <code>uint32 currentValue = 14;</code>
-       * @param value The currentValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurrentValue(int value) {
-        
-        currentValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 currentValue = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurrentValue() {
-        
-        currentValue_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isNewRecord_ ;
-      /**
-       * <code>bool is_new_record = 15;</code>
-       * @return The isNewRecord.
-       */
-      @java.lang.Override
-      public boolean getIsNewRecord() {
-        return isNewRecord_;
-      }
-      /**
-       * <code>bool is_new_record = 15;</code>
-       * @param value The isNewRecord to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsNewRecord(boolean value) {
-        
-        isNewRecord_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_new_record = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsNewRecord() {
-        
-        isNewRecord_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int timeCost_ ;
-      /**
-       * <code>uint32 time_cost = 13;</code>
-       * @return The timeCost.
-       */
-      @java.lang.Override
-      public int getTimeCost() {
-        return timeCost_;
-      }
-      /**
-       * <code>uint32 time_cost = 13;</code>
-       * @param value The timeCost to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTimeCost(int value) {
-        
-        timeCost_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 time_cost = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTimeCost() {
-        
-        timeCost_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> strengthenPointDataMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
@@ -1530,7 +1366,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
 
       @java.lang.Override
@@ -1548,7 +1384,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return getStrengthenPointDataMapMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
       @java.lang.Override
 
@@ -1556,7 +1392,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
       @java.lang.Override
 
@@ -1569,7 +1405,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
       @java.lang.Override
 
@@ -1590,7 +1426,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
 
       public Builder removeStrengthenPointDataMap(
@@ -1609,7 +1445,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return internalGetMutableStrengthenPointDataMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
       public Builder putStrengthenPointDataMap(
           int key,
@@ -1621,7 +1457,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 5;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 4;</code>
        */
 
       public Builder putAllStrengthenPointDataMap(
@@ -1631,9 +1467,102 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
 
+      private boolean isSuccess_ ;
+      /**
+       * <code>bool is_success = 5;</code>
+       * @return The isSuccess.
+       */
+      @java.lang.Override
+      public boolean getIsSuccess() {
+        return isSuccess_;
+      }
+      /**
+       * <code>bool is_success = 5;</code>
+       * @param value The isSuccess to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSuccess(boolean value) {
+        
+        isSuccess_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_success = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSuccess() {
+        
+        isSuccess_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int currentValue_ ;
+      /**
+       * <code>uint32 current_value = 6;</code>
+       * @return The currentValue.
+       */
+      @java.lang.Override
+      public int getCurrentValue() {
+        return currentValue_;
+      }
+      /**
+       * <code>uint32 current_value = 6;</code>
+       * @param value The currentValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurrentValue(int value) {
+        
+        currentValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 current_value = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurrentValue() {
+        
+        currentValue_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int timeCost_ ;
+      /**
+       * <code>uint32 time_cost = 8;</code>
+       * @return The timeCost.
+       */
+      @java.lang.Override
+      public int getTimeCost() {
+        return timeCost_;
+      }
+      /**
+       * <code>uint32 time_cost = 8;</code>
+       * @param value The timeCost to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTimeCost(int value) {
+        
+        timeCost_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 time_cost = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTimeCost() {
+        
+        timeCost_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int challengeRecordType_ ;
       /**
-       * <code>uint32 challengeRecordType = 4;</code>
+       * <code>uint32 challenge_record_type = 10;</code>
        * @return The challengeRecordType.
        */
       @java.lang.Override
@@ -1641,7 +1570,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return challengeRecordType_;
       }
       /**
-       * <code>uint32 challengeRecordType = 4;</code>
+       * <code>uint32 challenge_record_type = 10;</code>
        * @param value The challengeRecordType to set.
        * @return This builder for chaining.
        */
@@ -1652,7 +1581,7 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challengeRecordType = 4;</code>
+       * <code>uint32 challenge_record_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeRecordType() {
@@ -1662,36 +1591,121 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
 
+      private boolean isNewRecord_ ;
+      /**
+       * <code>bool is_new_record = 13;</code>
+       * @return The isNewRecord.
+       */
+      @java.lang.Override
+      public boolean getIsNewRecord() {
+        return isNewRecord_;
+      }
+      /**
+       * <code>bool is_new_record = 13;</code>
+       * @param value The isNewRecord to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsNewRecord(boolean value) {
+        
+        isNewRecord_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_new_record = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewRecord() {
+        
+        isNewRecord_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int finishType_ = 0;
+      /**
+       * <code>.ChallengeFinishType finish_type = 14;</code>
+       * @return The enum numeric value on the wire for finishType.
+       */
+      @java.lang.Override public int getFinishTypeValue() {
+        return finishType_;
+      }
+      /**
+       * <code>.ChallengeFinishType finish_type = 14;</code>
+       * @param value The enum numeric value on the wire for finishType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishTypeValue(int value) {
+        
+        finishType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ChallengeFinishType finish_type = 14;</code>
+       * @return The finishType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType getFinishType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType result = emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.valueOf(finishType_);
+        return result == null ? emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.ChallengeFinishType finish_type = 14;</code>
+       * @param value The finishType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishType(emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.ChallengeFinishType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        finishType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ChallengeFinishType finish_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinishType() {
+        
+        finishType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> channellerSlabLoopDungeonResultInfoBuilder_;
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
        */
       @java.lang.Override
       public boolean hasChannellerSlabLoopDungeonResultInfo() {
-        return detailCase_ == 1111;
+        return detailCase_ == 179;
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        * @return The channellerSlabLoopDungeonResultInfo.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() {
         if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
           }
           return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
         } else {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             return channellerSlabLoopDungeonResultInfoBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       public Builder setChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) {
         if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
@@ -1703,11 +1717,11 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         } else {
           channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 1111;
+        detailCase_ = 179;
         return this;
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       public Builder setChannellerSlabLoopDungeonResultInfo(
           emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder builderForValue) {
@@ -1717,15 +1731,15 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         } else {
           channellerSlabLoopDungeonResultInfoBuilder_.setMessage(builderForValue.build());
         }
-        detailCase_ = 1111;
+        detailCase_ = 179;
         return this;
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       public Builder mergeChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) {
         if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 1111 &&
+          if (detailCase_ == 179 &&
               detail_ != emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_)
                 .mergeFrom(value).buildPartial();
@@ -1734,26 +1748,26 @@ public final class DungeonChallengeFinishNotifyOuterClass {
           }
           onChanged();
         } else {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             channellerSlabLoopDungeonResultInfoBuilder_.mergeFrom(value);
           }
           channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 1111;
+        detailCase_ = 179;
         return this;
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       public Builder clearChannellerSlabLoopDungeonResultInfo() {
         if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             detailCase_ = 0;
             detail_ = null;
             onChanged();
           }
         } else {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             detailCase_ = 0;
             detail_ = null;
           }
@@ -1762,33 +1776,33 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder getChannellerSlabLoopDungeonResultInfoBuilder() {
         return getChannellerSlabLoopDungeonResultInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 1111) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) {
+        if ((detailCase_ == 179) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) {
           return channellerSlabLoopDungeonResultInfoBuilder_.getMessageOrBuilder();
         } else {
-          if (detailCase_ == 1111) {
+          if (detailCase_ == 179) {
             return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
           }
           return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 1111;</code>
+       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 179;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> 
           getChannellerSlabLoopDungeonResultInfoFieldBuilder() {
         if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 1111)) {
+          if (!(detailCase_ == 179)) {
             detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
           }
           channellerSlabLoopDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -1798,323 +1812,41 @@ public final class DungeonChallengeFinishNotifyOuterClass {
                   isClean());
           detail_ = null;
         }
-        detailCase_ = 1111;
+        detailCase_ = 179;
         onChanged();;
         return channellerSlabLoopDungeonResultInfoBuilder_;
       }
 
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> effigyChallengeDungeonResultInfoBuilder_;
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       * @return Whether the effigyChallengeDungeonResultInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyChallengeDungeonResultInfo() {
-        return detailCase_ == 351;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       * @return The effigyChallengeDungeonResultInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 351) {
-            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 351) {
-            return effigyChallengeDungeonResultInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 351;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      public Builder setEffigyChallengeDungeonResultInfo(
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder builderForValue) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 351;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 351 &&
-              detail_ != emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 351) {
-            effigyChallengeDungeonResultInfoBuilder_.mergeFrom(value);
-          }
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 351;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      public Builder clearEffigyChallengeDungeonResultInfo() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 351) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 351) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyChallengeDungeonResultInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder getEffigyChallengeDungeonResultInfoBuilder() {
-        return getEffigyChallengeDungeonResultInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 351) && (effigyChallengeDungeonResultInfoBuilder_ != null)) {
-          return effigyChallengeDungeonResultInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 351) {
-            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 351;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> 
-          getEffigyChallengeDungeonResultInfoFieldBuilder() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 351)) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-          }
-          effigyChallengeDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 351;
-        onChanged();;
-        return effigyChallengeDungeonResultInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> potionDungeonResultInfoBuilder_;
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       * @return Whether the potionDungeonResultInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPotionDungeonResultInfo() {
-        return detailCase_ == 339;
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       * @return The potionDungeonResultInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 339) {
-            return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 339) {
-            return potionDungeonResultInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      public Builder setPotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          potionDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 339;
-        return this;
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      public Builder setPotionDungeonResultInfo(
-          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder builderForValue) {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          potionDungeonResultInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 339;
-        return this;
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      public Builder mergePotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 339 &&
-              detail_ != emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 339) {
-            potionDungeonResultInfoBuilder_.mergeFrom(value);
-          }
-          potionDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 339;
-        return this;
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      public Builder clearPotionDungeonResultInfo() {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 339) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 339) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          potionDungeonResultInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder getPotionDungeonResultInfoBuilder() {
-        return getPotionDungeonResultInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 339) && (potionDungeonResultInfoBuilder_ != null)) {
-          return potionDungeonResultInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 339) {
-            return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 339;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> 
-          getPotionDungeonResultInfoFieldBuilder() {
-        if (potionDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 339)) {
-            detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
-          }
-          potionDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 339;
-        onChanged();;
-        return potionDungeonResultInfoBuilder_;
-      }
-
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder> customDungeonResultInfoBuilder_;
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        * @return Whether the customDungeonResultInfo field is set.
        */
       @java.lang.Override
       public boolean hasCustomDungeonResultInfo() {
-        return detailCase_ == 915;
+        return detailCase_ == 207;
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        * @return The customDungeonResultInfo.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo getCustomDungeonResultInfo() {
         if (customDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_;
           }
           return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
         } else {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             return customDungeonResultInfoBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       public Builder setCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo value) {
         if (customDungeonResultInfoBuilder_ == null) {
@@ -2126,11 +1858,11 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         } else {
           customDungeonResultInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 915;
+        detailCase_ = 207;
         return this;
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       public Builder setCustomDungeonResultInfo(
           emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder builderForValue) {
@@ -2140,15 +1872,15 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         } else {
           customDungeonResultInfoBuilder_.setMessage(builderForValue.build());
         }
-        detailCase_ = 915;
+        detailCase_ = 207;
         return this;
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       public Builder mergeCustomDungeonResultInfo(emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo value) {
         if (customDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 915 &&
+          if (detailCase_ == 207 &&
               detail_ != emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_)
                 .mergeFrom(value).buildPartial();
@@ -2157,26 +1889,26 @@ public final class DungeonChallengeFinishNotifyOuterClass {
           }
           onChanged();
         } else {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             customDungeonResultInfoBuilder_.mergeFrom(value);
           }
           customDungeonResultInfoBuilder_.setMessage(value);
         }
-        detailCase_ = 915;
+        detailCase_ = 207;
         return this;
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       public Builder clearCustomDungeonResultInfo() {
         if (customDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             detailCase_ = 0;
             detail_ = null;
             onChanged();
           }
         } else {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             detailCase_ = 0;
             detail_ = null;
           }
@@ -2185,33 +1917,33 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder getCustomDungeonResultInfoBuilder() {
         return getCustomDungeonResultInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder getCustomDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 915) && (customDungeonResultInfoBuilder_ != null)) {
+        if ((detailCase_ == 207) && (customDungeonResultInfoBuilder_ != null)) {
           return customDungeonResultInfoBuilder_.getMessageOrBuilder();
         } else {
-          if (detailCase_ == 915) {
+          if (detailCase_ == 207) {
             return (emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo) detail_;
           }
           return emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 915;</code>
+       * <code>.CustomDungeonResultInfo custom_dungeon_result_info = 207;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.Builder, emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfoOrBuilder> 
           getCustomDungeonResultInfoFieldBuilder() {
         if (customDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 915)) {
+          if (!(detailCase_ == 207)) {
             detail_ = emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.CustomDungeonResultInfo.getDefaultInstance();
           }
           customDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -2221,10 +1953,328 @@ public final class DungeonChallengeFinishNotifyOuterClass {
                   isClean());
           detail_ = null;
         }
-        detailCase_ = 915;
+        detailCase_ = 207;
         onChanged();;
         return customDungeonResultInfoBuilder_;
       }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> potionDungeonResultInfoBuilder_;
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       * @return Whether the potionDungeonResultInfo field is set.
+       */
+      @java.lang.Override
+      public boolean hasPotionDungeonResultInfo() {
+        return detailCase_ == 354;
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       * @return The potionDungeonResultInfo.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo getPotionDungeonResultInfo() {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 354) {
+            return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
+          }
+          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+        } else {
+          if (detailCase_ == 354) {
+            return potionDungeonResultInfoBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      public Builder setPotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          detail_ = value;
+          onChanged();
+        } else {
+          potionDungeonResultInfoBuilder_.setMessage(value);
+        }
+        detailCase_ = 354;
+        return this;
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      public Builder setPotionDungeonResultInfo(
+          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder builderForValue) {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          detail_ = builderForValue.build();
+          onChanged();
+        } else {
+          potionDungeonResultInfoBuilder_.setMessage(builderForValue.build());
+        }
+        detailCase_ = 354;
+        return this;
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      public Builder mergePotionDungeonResultInfo(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo value) {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 354 &&
+              detail_ != emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance()) {
+            detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            detail_ = value;
+          }
+          onChanged();
+        } else {
+          if (detailCase_ == 354) {
+            potionDungeonResultInfoBuilder_.mergeFrom(value);
+          }
+          potionDungeonResultInfoBuilder_.setMessage(value);
+        }
+        detailCase_ = 354;
+        return this;
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      public Builder clearPotionDungeonResultInfo() {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 354) {
+            detailCase_ = 0;
+            detail_ = null;
+            onChanged();
+          }
+        } else {
+          if (detailCase_ == 354) {
+            detailCase_ = 0;
+            detail_ = null;
+          }
+          potionDungeonResultInfoBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder getPotionDungeonResultInfoBuilder() {
+        return getPotionDungeonResultInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder getPotionDungeonResultInfoOrBuilder() {
+        if ((detailCase_ == 354) && (potionDungeonResultInfoBuilder_ != null)) {
+          return potionDungeonResultInfoBuilder_.getMessageOrBuilder();
+        } else {
+          if (detailCase_ == 354) {
+            return (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_;
+          }
+          return emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <pre>
+       * proto
+       * </pre>
+       *
+       * <code>.PotionDungeonResultInfo potion_dungeon_result_info = 354;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder> 
+          getPotionDungeonResultInfoFieldBuilder() {
+        if (potionDungeonResultInfoBuilder_ == null) {
+          if (!(detailCase_ == 354)) {
+            detail_ = emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance();
+          }
+          potionDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) detail_,
+                  getParentForChildren(),
+                  isClean());
+          detail_ = null;
+        }
+        detailCase_ = 354;
+        onChanged();;
+        return potionDungeonResultInfoBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> effigyChallengeDungeonResultInfoBuilder_;
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       * @return Whether the effigyChallengeDungeonResultInfo field is set.
+       */
+      @java.lang.Override
+      public boolean hasEffigyChallengeDungeonResultInfo() {
+        return detailCase_ == 1137;
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       * @return The effigyChallengeDungeonResultInfo.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 1137) {
+            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
+          }
+          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+        } else {
+          if (detailCase_ == 1137) {
+            return effigyChallengeDungeonResultInfoBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          detail_ = value;
+          onChanged();
+        } else {
+          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
+        }
+        detailCase_ = 1137;
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      public Builder setEffigyChallengeDungeonResultInfo(
+          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder builderForValue) {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          detail_ = builderForValue.build();
+          onChanged();
+        } else {
+          effigyChallengeDungeonResultInfoBuilder_.setMessage(builderForValue.build());
+        }
+        detailCase_ = 1137;
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 1137 &&
+              detail_ != emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance()) {
+            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            detail_ = value;
+          }
+          onChanged();
+        } else {
+          if (detailCase_ == 1137) {
+            effigyChallengeDungeonResultInfoBuilder_.mergeFrom(value);
+          }
+          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
+        }
+        detailCase_ = 1137;
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      public Builder clearEffigyChallengeDungeonResultInfo() {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          if (detailCase_ == 1137) {
+            detailCase_ = 0;
+            detail_ = null;
+            onChanged();
+          }
+        } else {
+          if (detailCase_ == 1137) {
+            detailCase_ = 0;
+            detail_ = null;
+          }
+          effigyChallengeDungeonResultInfoBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder getEffigyChallengeDungeonResultInfoBuilder() {
+        return getEffigyChallengeDungeonResultInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
+        if ((detailCase_ == 1137) && (effigyChallengeDungeonResultInfoBuilder_ != null)) {
+          return effigyChallengeDungeonResultInfoBuilder_.getMessageOrBuilder();
+        } else {
+          if (detailCase_ == 1137) {
+            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
+          }
+          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 1137;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> 
+          getEffigyChallengeDungeonResultInfoFieldBuilder() {
+        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
+          if (!(detailCase_ == 1137)) {
+            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
+          }
+          effigyChallengeDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_,
+                  getParentForChildren(),
+                  isClean());
+          detail_ = null;
+        }
+        detailCase_ = 1137;
+        onChanged();;
+        return effigyChallengeDungeonResultInfoBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2298,47 +2348,47 @@ public final class DungeonChallengeFinishNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\"DungeonChallengeFinishNotify.proto\032\031Ch" +
-      "allengeFinishType.proto\032\031StrengthenPoint" +
-      "Data.proto\032)ChannellerSlabLoopDungeonRes" +
-      "ultInfo.proto\032&EffigyChallengeDungeonRes" +
-      "ultInfo.proto\032\035PotionDungeonResultInfo.p" +
-      "roto\032\035CustomDungeonResultInfo.proto\"\301\005\n\034" +
-      "DungeonChallengeFinishNotify\022)\n\013finish_t" +
-      "ype\030\007 \001(\0162\024.ChallengeFinishType\022\022\n\nis_su" +
-      "ccess\030\013 \001(\010\022\027\n\017challenge_index\030\010 \001(\r\022\024\n\014" +
-      "currentValue\030\016 \001(\r\022\025\n\ris_new_record\030\017 \001(" +
-      "\010\022\021\n\ttime_cost\030\r \001(\r\022\\\n\031strengthen_point" +
-      "_data_map\030\005 \003(\01329.DungeonChallengeFinish" +
-      "Notify.StrengthenPointDataMapEntry\022\033\n\023ch" +
-      "allengeRecordType\030\004 \001(\r\022Y\n(channeller_sl" +
-      "ab_loop_dungeon_result_info\030\327\010 \001(\0132$.Cha" +
-      "nnellerSlabLoopDungeonResultInfoH\000\022R\n$ef" +
-      "figy_challenge_dungeon_result_info\030\337\002 \001(" +
-      "\0132!.EffigyChallengeDungeonResultInfoH\000\022?" +
-      "\n\032potion_dungeon_result_info\030\323\002 \001(\0132\030.Po" +
-      "tionDungeonResultInfoH\000\022?\n\032custom_dungeo" +
-      "n_result_info\030\223\007 \001(\0132\030.CustomDungeonResu" +
-      "ltInfoH\000\032S\n\033StrengthenPointDataMapEntry\022" +
-      "\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengthen" +
-      "PointData:\0028\001B\010\n\006detailB\033\n\031emu.grasscutt" +
-      "er.net.protob\006proto3"
+      "allengeFinishType.proto\032)ChannellerSlabL" +
+      "oopDungeonResultInfo.proto\032\035CustomDungeo" +
+      "nResultInfo.proto\032\035PotionDungeonResultIn" +
+      "fo.proto\032&EffigyChallengeDungeonResultIn" +
+      "fo.proto\032\031StrengthenPointData.proto\"\304\005\n\034" +
+      "DungeonChallengeFinishNotify\022\027\n\017challeng" +
+      "e_index\030\002 \001(\r\022\\\n\031strengthen_point_data_m" +
+      "ap\030\004 \003(\01329.DungeonChallengeFinishNotify." +
+      "StrengthenPointDataMapEntry\022\022\n\nis_succes" +
+      "s\030\005 \001(\010\022\025\n\rcurrent_value\030\006 \001(\r\022\021\n\ttime_c" +
+      "ost\030\010 \001(\r\022\035\n\025challenge_record_type\030\n \001(\r" +
+      "\022\025\n\ris_new_record\030\r \001(\010\022)\n\013finish_type\030\016" +
+      " \001(\0162\024.ChallengeFinishType\022Y\n(channeller" +
+      "_slab_loop_dungeon_result_info\030\263\001 \001(\0132$." +
+      "ChannellerSlabLoopDungeonResultInfoH\000\022?\n" +
+      "\032custom_dungeon_result_info\030\317\001 \001(\0132\030.Cus" +
+      "tomDungeonResultInfoH\000\022?\n\032potion_dungeon" +
+      "_result_info\030\342\002 \001(\0132\030.PotionDungeonResul" +
+      "tInfoH\000\022R\n$effigy_challenge_dungeon_resu" +
+      "lt_info\030\361\010 \001(\0132!.EffigyChallengeDungeonR" +
+      "esultInfoH\000\032S\n\033StrengthenPointDataMapEnt" +
+      "ry\022\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengt" +
+      "henPointData:\0028\001B\010\n\006detailB\033\n\031emu.grassc" +
+      "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(),
         });
     internal_static_DungeonChallengeFinishNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_DungeonChallengeFinishNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonChallengeFinishNotify_descriptor,
-        new java.lang.String[] { "FinishType", "IsSuccess", "ChallengeIndex", "CurrentValue", "IsNewRecord", "TimeCost", "StrengthenPointDataMap", "ChallengeRecordType", "ChannellerSlabLoopDungeonResultInfo", "EffigyChallengeDungeonResultInfo", "PotionDungeonResultInfo", "CustomDungeonResultInfo", "Detail", });
+        new java.lang.String[] { "ChallengeIndex", "StrengthenPointDataMap", "IsSuccess", "CurrentValue", "TimeCost", "ChallengeRecordType", "IsNewRecord", "FinishType", "ChannellerSlabLoopDungeonResultInfo", "CustomDungeonResultInfo", "PotionDungeonResultInfo", "EffigyChallengeDungeonResultInfo", "Detail", });
     internal_static_DungeonChallengeFinishNotify_StrengthenPointDataMapEntry_descriptor =
       internal_static_DungeonChallengeFinishNotify_descriptor.getNestedTypes().get(0);
     internal_static_DungeonChallengeFinishNotify_StrengthenPointDataMapEntry_fieldAccessorTable = new
@@ -2346,11 +2396,11 @@ public final class DungeonChallengeFinishNotifyOuterClass {
         internal_static_DungeonChallengeFinishNotify_StrengthenPointDataMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     emu.grasscutter.net.proto.ChallengeFinishTypeOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.CustomDungeonResultInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java
index b8379c7f0..fb98bbdba 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionReqOuterClass.java
@@ -19,28 +19,23 @@ public final class DungeonDieOptionReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_quit_immediately = 13;</code>
+     * <code>bool is_quit_immediately = 5;</code>
      * @return The isQuitImmediately.
      */
     boolean getIsQuitImmediately();
 
     /**
-     * <code>.PlayerDieOption die_option = 8;</code>
+     * <code>.PlayerDieOption die_option = 2;</code>
      * @return The enum numeric value on the wire for dieOption.
      */
     int getDieOptionValue();
     /**
-     * <code>.PlayerDieOption die_option = 8;</code>
+     * <code>.PlayerDieOption die_option = 2;</code>
      * @return The dieOption.
      */
     emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption();
   }
   /**
-   * <pre>
-   * CmdId: 3884
-   * Obf: MOHIGAEGAKN
-   * </pre>
-   *
    * Protobuf type {@code DungeonDieOptionReq}
    */
   public static final class DungeonDieOptionReq extends
@@ -86,13 +81,13 @@ public final class DungeonDieOptionReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 16: {
               int rawValue = input.readEnum();
 
               dieOption_ = rawValue;
               break;
             }
-            case 104: {
+            case 40: {
 
               isQuitImmediately_ = input.readBool();
               break;
@@ -129,10 +124,10 @@ public final class DungeonDieOptionReqOuterClass {
               emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq.class, emu.grasscutter.net.proto.DungeonDieOptionReqOuterClass.DungeonDieOptionReq.Builder.class);
     }
 
-    public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 13;
+    public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 5;
     private boolean isQuitImmediately_;
     /**
-     * <code>bool is_quit_immediately = 13;</code>
+     * <code>bool is_quit_immediately = 5;</code>
      * @return The isQuitImmediately.
      */
     @java.lang.Override
@@ -140,17 +135,17 @@ public final class DungeonDieOptionReqOuterClass {
       return isQuitImmediately_;
     }
 
-    public static final int DIE_OPTION_FIELD_NUMBER = 8;
+    public static final int DIE_OPTION_FIELD_NUMBER = 2;
     private int dieOption_;
     /**
-     * <code>.PlayerDieOption die_option = 8;</code>
+     * <code>.PlayerDieOption die_option = 2;</code>
      * @return The enum numeric value on the wire for dieOption.
      */
     @java.lang.Override public int getDieOptionValue() {
       return dieOption_;
     }
     /**
-     * <code>.PlayerDieOption die_option = 8;</code>
+     * <code>.PlayerDieOption die_option = 2;</code>
      * @return The dieOption.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() {
@@ -174,10 +169,10 @@ public final class DungeonDieOptionReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
-        output.writeEnum(8, dieOption_);
+        output.writeEnum(2, dieOption_);
       }
       if (isQuitImmediately_ != false) {
-        output.writeBool(13, isQuitImmediately_);
+        output.writeBool(5, isQuitImmediately_);
       }
       unknownFields.writeTo(output);
     }
@@ -190,11 +185,11 @@ public final class DungeonDieOptionReqOuterClass {
       size = 0;
       if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, dieOption_);
+          .computeEnumSize(2, dieOption_);
       }
       if (isQuitImmediately_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isQuitImmediately_);
+          .computeBoolSize(5, isQuitImmediately_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -326,11 +321,6 @@ public final class DungeonDieOptionReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3884
-     * Obf: MOHIGAEGAKN
-     * </pre>
-     *
      * Protobuf type {@code DungeonDieOptionReq}
      */
     public static final class Builder extends
@@ -485,7 +475,7 @@ public final class DungeonDieOptionReqOuterClass {
 
       private boolean isQuitImmediately_ ;
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 5;</code>
        * @return The isQuitImmediately.
        */
       @java.lang.Override
@@ -493,7 +483,7 @@ public final class DungeonDieOptionReqOuterClass {
         return isQuitImmediately_;
       }
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 5;</code>
        * @param value The isQuitImmediately to set.
        * @return This builder for chaining.
        */
@@ -504,7 +494,7 @@ public final class DungeonDieOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsQuitImmediately() {
@@ -516,14 +506,14 @@ public final class DungeonDieOptionReqOuterClass {
 
       private int dieOption_ = 0;
       /**
-       * <code>.PlayerDieOption die_option = 8;</code>
+       * <code>.PlayerDieOption die_option = 2;</code>
        * @return The enum numeric value on the wire for dieOption.
        */
       @java.lang.Override public int getDieOptionValue() {
         return dieOption_;
       }
       /**
-       * <code>.PlayerDieOption die_option = 8;</code>
+       * <code>.PlayerDieOption die_option = 2;</code>
        * @param value The enum numeric value on the wire for dieOption to set.
        * @return This builder for chaining.
        */
@@ -534,7 +524,7 @@ public final class DungeonDieOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieOption die_option = 8;</code>
+       * <code>.PlayerDieOption die_option = 2;</code>
        * @return The dieOption.
        */
       @java.lang.Override
@@ -544,7 +534,7 @@ public final class DungeonDieOptionReqOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerDieOption die_option = 8;</code>
+       * <code>.PlayerDieOption die_option = 2;</code>
        * @param value The dieOption to set.
        * @return This builder for chaining.
        */
@@ -558,7 +548,7 @@ public final class DungeonDieOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieOption die_option = 8;</code>
+       * <code>.PlayerDieOption die_option = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieOption() {
@@ -636,7 +626,7 @@ public final class DungeonDieOptionReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031DungeonDieOptionReq.proto\032\025PlayerDieOp" +
       "tion.proto\"X\n\023DungeonDieOptionReq\022\033\n\023is_" +
-      "quit_immediately\030\r \001(\010\022$\n\ndie_option\030\010 \001" +
+      "quit_immediately\030\005 \001(\010\022$\n\ndie_option\030\002 \001" +
       "(\0162\020.PlayerDieOptionB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java
index 0e9c1d8ac..8b559a5d8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonDieOptionRspOuterClass.java
@@ -19,34 +19,29 @@ public final class DungeonDieOptionRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 revive_count = 5;</code>
+     * <code>uint32 revive_count = 1;</code>
      * @return The reviveCount.
      */
     int getReviveCount();
 
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>.PlayerDieOption die_option = 1;</code>
+     * <code>.PlayerDieOption die_option = 15;</code>
      * @return The enum numeric value on the wire for dieOption.
      */
     int getDieOptionValue();
     /**
-     * <code>.PlayerDieOption die_option = 1;</code>
+     * <code>.PlayerDieOption die_option = 15;</code>
      * @return The dieOption.
      */
     emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption();
   }
   /**
-   * <pre>
-   * CmdId: 28454
-   * Obf: JBMMJNEGEKF
-   * </pre>
-   *
    * Protobuf type {@code DungeonDieOptionRsp}
    */
   public static final class DungeonDieOptionRsp extends
@@ -93,21 +88,21 @@ public final class DungeonDieOptionRspOuterClass {
               done = true;
               break;
             case 8: {
-              int rawValue = input.readEnum();
-
-              dieOption_ = rawValue;
-              break;
-            }
-            case 40: {
 
               reviveCount_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 64: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 120: {
+              int rawValue = input.readEnum();
+
+              dieOption_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -140,10 +135,10 @@ public final class DungeonDieOptionRspOuterClass {
               emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp.class, emu.grasscutter.net.proto.DungeonDieOptionRspOuterClass.DungeonDieOptionRsp.Builder.class);
     }
 
-    public static final int REVIVE_COUNT_FIELD_NUMBER = 5;
+    public static final int REVIVE_COUNT_FIELD_NUMBER = 1;
     private int reviveCount_;
     /**
-     * <code>uint32 revive_count = 5;</code>
+     * <code>uint32 revive_count = 1;</code>
      * @return The reviveCount.
      */
     @java.lang.Override
@@ -151,10 +146,10 @@ public final class DungeonDieOptionRspOuterClass {
       return reviveCount_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -162,17 +157,17 @@ public final class DungeonDieOptionRspOuterClass {
       return retcode_;
     }
 
-    public static final int DIE_OPTION_FIELD_NUMBER = 1;
+    public static final int DIE_OPTION_FIELD_NUMBER = 15;
     private int dieOption_;
     /**
-     * <code>.PlayerDieOption die_option = 1;</code>
+     * <code>.PlayerDieOption die_option = 15;</code>
      * @return The enum numeric value on the wire for dieOption.
      */
     @java.lang.Override public int getDieOptionValue() {
       return dieOption_;
     }
     /**
-     * <code>.PlayerDieOption die_option = 1;</code>
+     * <code>.PlayerDieOption die_option = 15;</code>
      * @return The dieOption.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption getDieOption() {
@@ -195,14 +190,14 @@ public final class DungeonDieOptionRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
-        output.writeEnum(1, dieOption_);
-      }
       if (reviveCount_ != 0) {
-        output.writeUInt32(5, reviveCount_);
+        output.writeUInt32(1, reviveCount_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
+        output.writeInt32(8, retcode_);
+      }
+      if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
+        output.writeEnum(15, dieOption_);
       }
       unknownFields.writeTo(output);
     }
@@ -213,17 +208,17 @@ public final class DungeonDieOptionRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, dieOption_);
-      }
       if (reviveCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, reviveCount_);
+          .computeUInt32Size(1, reviveCount_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeInt32Size(8, retcode_);
+      }
+      if (dieOption_ != emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.DIE_OPT_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(15, dieOption_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -358,11 +353,6 @@ public final class DungeonDieOptionRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28454
-     * Obf: JBMMJNEGEKF
-     * </pre>
-     *
      * Protobuf type {@code DungeonDieOptionRsp}
      */
     public static final class Builder extends
@@ -523,7 +513,7 @@ public final class DungeonDieOptionRspOuterClass {
 
       private int reviveCount_ ;
       /**
-       * <code>uint32 revive_count = 5;</code>
+       * <code>uint32 revive_count = 1;</code>
        * @return The reviveCount.
        */
       @java.lang.Override
@@ -531,7 +521,7 @@ public final class DungeonDieOptionRspOuterClass {
         return reviveCount_;
       }
       /**
-       * <code>uint32 revive_count = 5;</code>
+       * <code>uint32 revive_count = 1;</code>
        * @param value The reviveCount to set.
        * @return This builder for chaining.
        */
@@ -542,7 +532,7 @@ public final class DungeonDieOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 revive_count = 5;</code>
+       * <code>uint32 revive_count = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearReviveCount() {
@@ -554,7 +544,7 @@ public final class DungeonDieOptionRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -562,7 +552,7 @@ public final class DungeonDieOptionRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -573,7 +563,7 @@ public final class DungeonDieOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -585,14 +575,14 @@ public final class DungeonDieOptionRspOuterClass {
 
       private int dieOption_ = 0;
       /**
-       * <code>.PlayerDieOption die_option = 1;</code>
+       * <code>.PlayerDieOption die_option = 15;</code>
        * @return The enum numeric value on the wire for dieOption.
        */
       @java.lang.Override public int getDieOptionValue() {
         return dieOption_;
       }
       /**
-       * <code>.PlayerDieOption die_option = 1;</code>
+       * <code>.PlayerDieOption die_option = 15;</code>
        * @param value The enum numeric value on the wire for dieOption to set.
        * @return This builder for chaining.
        */
@@ -603,7 +593,7 @@ public final class DungeonDieOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieOption die_option = 1;</code>
+       * <code>.PlayerDieOption die_option = 15;</code>
        * @return The dieOption.
        */
       @java.lang.Override
@@ -613,7 +603,7 @@ public final class DungeonDieOptionRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerDieOptionOuterClass.PlayerDieOption.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerDieOption die_option = 1;</code>
+       * <code>.PlayerDieOption die_option = 15;</code>
        * @param value The dieOption to set.
        * @return This builder for chaining.
        */
@@ -627,7 +617,7 @@ public final class DungeonDieOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieOption die_option = 1;</code>
+       * <code>.PlayerDieOption die_option = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieOption() {
@@ -705,8 +695,8 @@ public final class DungeonDieOptionRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031DungeonDieOptionRsp.proto\032\025PlayerDieOp" +
       "tion.proto\"b\n\023DungeonDieOptionRsp\022\024\n\014rev" +
-      "ive_count\030\005 \001(\r\022\017\n\007retcode\030\n \001(\005\022$\n\ndie_" +
-      "option\030\001 \001(\0162\020.PlayerDieOptionB\033\n\031emu.gr" +
+      "ive_count\030\001 \001(\r\022\017\n\007retcode\030\010 \001(\005\022$\n\ndie_" +
+      "option\030\017 \001(\0162\020.PlayerDieOptionB\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/DungeonEnterPosInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java
index 675c424b5..a7d7fa763 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEnterPosInfoOuterClass.java
@@ -19,22 +19,18 @@ public final class DungeonEnterPosInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 13;</code>
-     * @return The pointId.
-     */
-    int getPointId();
-
-    /**
-     * <code>uint32 quest_id = 12;</code>
+     * <code>uint32 quest_id = 8;</code>
      * @return The questId.
      */
     int getQuestId();
+
+    /**
+     * <code>uint32 point_id = 12;</code>
+     * @return The pointId.
+     */
+    int getPointId();
   }
   /**
-   * <pre>
-   * Obf: DALBJGGPCNF
-   * </pre>
-   *
    * Protobuf type {@code DungeonEnterPosInfo}
    */
   public static final class DungeonEnterPosInfo extends
@@ -79,12 +75,12 @@ public final class DungeonEnterPosInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 64: {
 
               questId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 96: {
 
               pointId_ = input.readUInt32();
               break;
@@ -121,21 +117,10 @@ public final class DungeonEnterPosInfoOuterClass {
               emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.class, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 13;
-    private int pointId_;
-    /**
-     * <code>uint32 point_id = 13;</code>
-     * @return The pointId.
-     */
-    @java.lang.Override
-    public int getPointId() {
-      return pointId_;
-    }
-
-    public static final int QUEST_ID_FIELD_NUMBER = 12;
+    public static final int QUEST_ID_FIELD_NUMBER = 8;
     private int questId_;
     /**
-     * <code>uint32 quest_id = 12;</code>
+     * <code>uint32 quest_id = 8;</code>
      * @return The questId.
      */
     @java.lang.Override
@@ -143,6 +128,17 @@ public final class DungeonEnterPosInfoOuterClass {
       return questId_;
     }
 
+    public static final int POINT_ID_FIELD_NUMBER = 12;
+    private int pointId_;
+    /**
+     * <code>uint32 point_id = 12;</code>
+     * @return The pointId.
+     */
+    @java.lang.Override
+    public int getPointId() {
+      return pointId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,10 +154,10 @@ public final class DungeonEnterPosInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (questId_ != 0) {
-        output.writeUInt32(12, questId_);
+        output.writeUInt32(8, questId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(13, pointId_);
+        output.writeUInt32(12, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,11 +170,11 @@ public final class DungeonEnterPosInfoOuterClass {
       size = 0;
       if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, questId_);
+          .computeUInt32Size(8, questId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pointId_);
+          .computeUInt32Size(12, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +191,10 @@ public final class DungeonEnterPosInfoOuterClass {
       }
       emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo other = (emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo) obj;
 
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getQuestId()
           != other.getQuestId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +206,10 @@ public final class DungeonEnterPosInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPointId();
       hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
       hash = (53 * hash) + getQuestId();
+      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -310,10 +306,6 @@ public final class DungeonEnterPosInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DALBJGGPCNF
-     * </pre>
-     *
      * Protobuf type {@code DungeonEnterPosInfo}
      */
     public static final class Builder extends
@@ -351,10 +343,10 @@ public final class DungeonEnterPosInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pointId_ = 0;
-
         questId_ = 0;
 
+        pointId_ = 0;
+
         return this;
       }
 
@@ -381,8 +373,8 @@ public final class DungeonEnterPosInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo buildPartial() {
         emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo result = new emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo(this);
-        result.pointId_ = pointId_;
         result.questId_ = questId_;
+        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -431,12 +423,12 @@ public final class DungeonEnterPosInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo other) {
         if (other == emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.getDefaultInstance()) return this;
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         if (other.getQuestId() != 0) {
           setQuestId(other.getQuestId());
         }
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -466,40 +458,9 @@ public final class DungeonEnterPosInfoOuterClass {
         return this;
       }
 
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -507,7 +468,7 @@ public final class DungeonEnterPosInfoOuterClass {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -518,7 +479,7 @@ public final class DungeonEnterPosInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 12;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -527,6 +488,37 @@ public final class DungeonEnterPosInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -595,7 +587,7 @@ public final class DungeonEnterPosInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031DungeonEnterPosInfo.proto\"9\n\023DungeonEn" +
-      "terPosInfo\022\020\n\010point_id\030\r \001(\r\022\020\n\010quest_id" +
+      "terPosInfo\022\020\n\010quest_id\030\010 \001(\r\022\020\n\010point_id" +
       "\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
@@ -608,7 +600,7 @@ public final class DungeonEnterPosInfoOuterClass {
     internal_static_DungeonEnterPosInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonEnterPosInfo_descriptor,
-        new java.lang.String[] { "PointId", "QuestId", });
+        new java.lang.String[] { "QuestId", "PointId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java
index 8964bf837..f1f9a1993 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoOuterClass.java
@@ -19,53 +19,17 @@ public final class DungeonEntryInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 next_refresh_time = 12;</code>
-     * @return The nextRefreshTime.
-     */
-    int getNextRefreshTime();
-
-    /**
-     * <code>uint32 CFAFALIPFEN = 9;</code>
-     * @return The cFAFALIPFEN.
-     */
-    int getCFAFALIPFEN();
-
-    /**
-     * <code>uint32 EOLGBLICEIA = 14;</code>
-     * @return The eOLGBLICEIA.
-     */
-    int getEOLGBLICEIA();
-
-    /**
-     * <code>uint32 max_boss_chest_num = 11;</code>
-     * @return The maxBossChestNum.
-     */
-    int getMaxBossChestNum();
-
-    /**
-     * <code>uint32 dungeon_id = 13;</code>
-     * @return The dungeonId.
-     */
-    int getDungeonId();
-
-    /**
-     * <code>uint32 end_time = 7;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
-    /**
-     * <code>uint32 start_time = 2;</code>
-     * @return The startTime.
-     */
-    int getStartTime();
-
-    /**
-     * <code>bool is_passed = 5;</code>
+     * <code>bool is_passed = 1;</code>
      * @return The isPassed.
      */
     boolean getIsPassed();
 
+    /**
+     * <code>uint32 dungeon_id = 3;</code>
+     * @return The dungeonId.
+     */
+    int getDungeonId();
+
     /**
      * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6;</code>
      * @return Whether the weeklyBossResinDiscountInfo field is set.
@@ -80,12 +44,26 @@ public final class DungeonEntryInfoOuterClass {
      * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 6;</code>
      */
     emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder();
+
+    /**
+     * <code>uint32 boss_chest_num = 9;</code>
+     * @return The bossChestNum.
+     */
+    int getBossChestNum();
+
+    /**
+     * <code>uint32 next_refresh_time = 14;</code>
+     * @return The nextRefreshTime.
+     */
+    int getNextRefreshTime();
+
+    /**
+     * <code>uint32 max_boss_chest_num = 15;</code>
+     * @return The maxBossChestNum.
+     */
+    int getMaxBossChestNum();
   }
   /**
-   * <pre>
-   * Obf: HFIHEBKHMPP
-   * </pre>
-   *
    * Protobuf type {@code DungeonEntryInfo}
    */
   public static final class DungeonEntryInfo extends
@@ -130,16 +108,16 @@ public final class DungeonEntryInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              startTime_ = input.readUInt32();
-              break;
-            }
-            case 40: {
+            case 8: {
 
               isPassed_ = input.readBool();
               break;
             }
+            case 24: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
             case 50: {
               emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder subBuilder = null;
               if (weeklyBossResinDiscountInfo_ != null) {
@@ -153,34 +131,19 @@ public final class DungeonEntryInfoOuterClass {
 
               break;
             }
-            case 56: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
             case 72: {
 
-              cFAFALIPFEN_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              maxBossChestNum_ = input.readUInt32();
-              break;
-            }
-            case 96: {
-
-              nextRefreshTime_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              dungeonId_ = input.readUInt32();
+              bossChestNum_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              eOLGBLICEIA_ = input.readUInt32();
+              nextRefreshTime_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              maxBossChestNum_ = input.readUInt32();
               break;
             }
             default: {
@@ -215,87 +178,10 @@ public final class DungeonEntryInfoOuterClass {
               emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.class, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder.class);
     }
 
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 12;
-    private int nextRefreshTime_;
-    /**
-     * <code>uint32 next_refresh_time = 12;</code>
-     * @return The nextRefreshTime.
-     */
-    @java.lang.Override
-    public int getNextRefreshTime() {
-      return nextRefreshTime_;
-    }
-
-    public static final int CFAFALIPFEN_FIELD_NUMBER = 9;
-    private int cFAFALIPFEN_;
-    /**
-     * <code>uint32 CFAFALIPFEN = 9;</code>
-     * @return The cFAFALIPFEN.
-     */
-    @java.lang.Override
-    public int getCFAFALIPFEN() {
-      return cFAFALIPFEN_;
-    }
-
-    public static final int EOLGBLICEIA_FIELD_NUMBER = 14;
-    private int eOLGBLICEIA_;
-    /**
-     * <code>uint32 EOLGBLICEIA = 14;</code>
-     * @return The eOLGBLICEIA.
-     */
-    @java.lang.Override
-    public int getEOLGBLICEIA() {
-      return eOLGBLICEIA_;
-    }
-
-    public static final int MAX_BOSS_CHEST_NUM_FIELD_NUMBER = 11;
-    private int maxBossChestNum_;
-    /**
-     * <code>uint32 max_boss_chest_num = 11;</code>
-     * @return The maxBossChestNum.
-     */
-    @java.lang.Override
-    public int getMaxBossChestNum() {
-      return maxBossChestNum_;
-    }
-
-    public static final int DUNGEON_ID_FIELD_NUMBER = 13;
-    private int dungeonId_;
-    /**
-     * <code>uint32 dungeon_id = 13;</code>
-     * @return The dungeonId.
-     */
-    @java.lang.Override
-    public int getDungeonId() {
-      return dungeonId_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 7;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 7;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int START_TIME_FIELD_NUMBER = 2;
-    private int startTime_;
-    /**
-     * <code>uint32 start_time = 2;</code>
-     * @return The startTime.
-     */
-    @java.lang.Override
-    public int getStartTime() {
-      return startTime_;
-    }
-
-    public static final int IS_PASSED_FIELD_NUMBER = 5;
+    public static final int IS_PASSED_FIELD_NUMBER = 1;
     private boolean isPassed_;
     /**
-     * <code>bool is_passed = 5;</code>
+     * <code>bool is_passed = 1;</code>
      * @return The isPassed.
      */
     @java.lang.Override
@@ -303,6 +189,17 @@ public final class DungeonEntryInfoOuterClass {
       return isPassed_;
     }
 
+    public static final int DUNGEON_ID_FIELD_NUMBER = 3;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 3;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
     public static final int WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
     /**
@@ -329,6 +226,39 @@ public final class DungeonEntryInfoOuterClass {
       return getWeeklyBossResinDiscountInfo();
     }
 
+    public static final int BOSS_CHEST_NUM_FIELD_NUMBER = 9;
+    private int bossChestNum_;
+    /**
+     * <code>uint32 boss_chest_num = 9;</code>
+     * @return The bossChestNum.
+     */
+    @java.lang.Override
+    public int getBossChestNum() {
+      return bossChestNum_;
+    }
+
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 14;
+    private int nextRefreshTime_;
+    /**
+     * <code>uint32 next_refresh_time = 14;</code>
+     * @return The nextRefreshTime.
+     */
+    @java.lang.Override
+    public int getNextRefreshTime() {
+      return nextRefreshTime_;
+    }
+
+    public static final int MAX_BOSS_CHEST_NUM_FIELD_NUMBER = 15;
+    private int maxBossChestNum_;
+    /**
+     * <code>uint32 max_boss_chest_num = 15;</code>
+     * @return The maxBossChestNum.
+     */
+    @java.lang.Override
+    public int getMaxBossChestNum() {
+      return maxBossChestNum_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -343,32 +273,23 @@ public final class DungeonEntryInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (startTime_ != 0) {
-        output.writeUInt32(2, startTime_);
-      }
       if (isPassed_ != false) {
-        output.writeBool(5, isPassed_);
+        output.writeBool(1, isPassed_);
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(3, dungeonId_);
       }
       if (weeklyBossResinDiscountInfo_ != null) {
         output.writeMessage(6, getWeeklyBossResinDiscountInfo());
       }
-      if (endTime_ != 0) {
-        output.writeUInt32(7, endTime_);
-      }
-      if (cFAFALIPFEN_ != 0) {
-        output.writeUInt32(9, cFAFALIPFEN_);
-      }
-      if (maxBossChestNum_ != 0) {
-        output.writeUInt32(11, maxBossChestNum_);
+      if (bossChestNum_ != 0) {
+        output.writeUInt32(9, bossChestNum_);
       }
       if (nextRefreshTime_ != 0) {
-        output.writeUInt32(12, nextRefreshTime_);
+        output.writeUInt32(14, nextRefreshTime_);
       }
-      if (dungeonId_ != 0) {
-        output.writeUInt32(13, dungeonId_);
-      }
-      if (eOLGBLICEIA_ != 0) {
-        output.writeUInt32(14, eOLGBLICEIA_);
+      if (maxBossChestNum_ != 0) {
+        output.writeUInt32(15, maxBossChestNum_);
       }
       unknownFields.writeTo(output);
     }
@@ -379,41 +300,29 @@ public final class DungeonEntryInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (startTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, startTime_);
-      }
       if (isPassed_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isPassed_);
+          .computeBoolSize(1, isPassed_);
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, dungeonId_);
       }
       if (weeklyBossResinDiscountInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(6, getWeeklyBossResinDiscountInfo());
       }
-      if (endTime_ != 0) {
+      if (bossChestNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, endTime_);
-      }
-      if (cFAFALIPFEN_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, cFAFALIPFEN_);
-      }
-      if (maxBossChestNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, maxBossChestNum_);
+          .computeUInt32Size(9, bossChestNum_);
       }
       if (nextRefreshTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, nextRefreshTime_);
+          .computeUInt32Size(14, nextRefreshTime_);
       }
-      if (dungeonId_ != 0) {
+      if (maxBossChestNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, dungeonId_);
-      }
-      if (eOLGBLICEIA_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, eOLGBLICEIA_);
+          .computeUInt32Size(15, maxBossChestNum_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -430,27 +339,21 @@ public final class DungeonEntryInfoOuterClass {
       }
       emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo other = (emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo) obj;
 
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
-      if (getCFAFALIPFEN()
-          != other.getCFAFALIPFEN()) return false;
-      if (getEOLGBLICEIA()
-          != other.getEOLGBLICEIA()) return false;
-      if (getMaxBossChestNum()
-          != other.getMaxBossChestNum()) return false;
-      if (getDungeonId()
-          != other.getDungeonId()) return false;
-      if (getEndTime()
-          != other.getEndTime()) return false;
-      if (getStartTime()
-          != other.getStartTime()) return false;
       if (getIsPassed()
           != other.getIsPassed()) return false;
+      if (getDungeonId()
+          != other.getDungeonId()) return false;
       if (hasWeeklyBossResinDiscountInfo() != other.hasWeeklyBossResinDiscountInfo()) return false;
       if (hasWeeklyBossResinDiscountInfo()) {
         if (!getWeeklyBossResinDiscountInfo()
             .equals(other.getWeeklyBossResinDiscountInfo())) return false;
       }
+      if (getBossChestNum()
+          != other.getBossChestNum()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getMaxBossChestNum()
+          != other.getMaxBossChestNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -462,27 +365,21 @@ public final class DungeonEntryInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
-      hash = (37 * hash) + CFAFALIPFEN_FIELD_NUMBER;
-      hash = (53 * hash) + getCFAFALIPFEN();
-      hash = (37 * hash) + EOLGBLICEIA_FIELD_NUMBER;
-      hash = (53 * hash) + getEOLGBLICEIA();
-      hash = (37 * hash) + MAX_BOSS_CHEST_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxBossChestNum();
-      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonId();
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
-      hash = (37 * hash) + START_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getStartTime();
       hash = (37 * hash) + IS_PASSED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsPassed());
+      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonId();
       if (hasWeeklyBossResinDiscountInfo()) {
         hash = (37 * hash) + WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getWeeklyBossResinDiscountInfo().hashCode();
       }
+      hash = (37 * hash) + BOSS_CHEST_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getBossChestNum();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + MAX_BOSS_CHEST_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxBossChestNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -579,10 +476,6 @@ public final class DungeonEntryInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HFIHEBKHMPP
-     * </pre>
-     *
      * Protobuf type {@code DungeonEntryInfo}
      */
     public static final class Builder extends
@@ -620,28 +513,22 @@ public final class DungeonEntryInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nextRefreshTime_ = 0;
-
-        cFAFALIPFEN_ = 0;
-
-        eOLGBLICEIA_ = 0;
-
-        maxBossChestNum_ = 0;
+        isPassed_ = false;
 
         dungeonId_ = 0;
 
-        endTime_ = 0;
-
-        startTime_ = 0;
-
-        isPassed_ = false;
-
         if (weeklyBossResinDiscountInfoBuilder_ == null) {
           weeklyBossResinDiscountInfo_ = null;
         } else {
           weeklyBossResinDiscountInfo_ = null;
           weeklyBossResinDiscountInfoBuilder_ = null;
         }
+        bossChestNum_ = 0;
+
+        nextRefreshTime_ = 0;
+
+        maxBossChestNum_ = 0;
+
         return this;
       }
 
@@ -668,19 +555,16 @@ public final class DungeonEntryInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo buildPartial() {
         emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo result = new emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo(this);
-        result.nextRefreshTime_ = nextRefreshTime_;
-        result.cFAFALIPFEN_ = cFAFALIPFEN_;
-        result.eOLGBLICEIA_ = eOLGBLICEIA_;
-        result.maxBossChestNum_ = maxBossChestNum_;
-        result.dungeonId_ = dungeonId_;
-        result.endTime_ = endTime_;
-        result.startTime_ = startTime_;
         result.isPassed_ = isPassed_;
+        result.dungeonId_ = dungeonId_;
         if (weeklyBossResinDiscountInfoBuilder_ == null) {
           result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfo_;
         } else {
           result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfoBuilder_.build();
         }
+        result.bossChestNum_ = bossChestNum_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.maxBossChestNum_ = maxBossChestNum_;
         onBuilt();
         return result;
       }
@@ -729,33 +613,24 @@ public final class DungeonEntryInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo other) {
         if (other == emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance()) return this;
-        if (other.getNextRefreshTime() != 0) {
-          setNextRefreshTime(other.getNextRefreshTime());
-        }
-        if (other.getCFAFALIPFEN() != 0) {
-          setCFAFALIPFEN(other.getCFAFALIPFEN());
-        }
-        if (other.getEOLGBLICEIA() != 0) {
-          setEOLGBLICEIA(other.getEOLGBLICEIA());
-        }
-        if (other.getMaxBossChestNum() != 0) {
-          setMaxBossChestNum(other.getMaxBossChestNum());
+        if (other.getIsPassed() != false) {
+          setIsPassed(other.getIsPassed());
         }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
-        if (other.getStartTime() != 0) {
-          setStartTime(other.getStartTime());
-        }
-        if (other.getIsPassed() != false) {
-          setIsPassed(other.getIsPassed());
-        }
         if (other.hasWeeklyBossResinDiscountInfo()) {
           mergeWeeklyBossResinDiscountInfo(other.getWeeklyBossResinDiscountInfo());
         }
+        if (other.getBossChestNum() != 0) {
+          setBossChestNum(other.getBossChestNum());
+        }
+        if (other.getNextRefreshTime() != 0) {
+          setNextRefreshTime(other.getNextRefreshTime());
+        }
+        if (other.getMaxBossChestNum() != 0) {
+          setMaxBossChestNum(other.getMaxBossChestNum());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -785,226 +660,9 @@ public final class DungeonEntryInfoOuterClass {
         return this;
       }
 
-      private int nextRefreshTime_ ;
-      /**
-       * <code>uint32 next_refresh_time = 12;</code>
-       * @return The nextRefreshTime.
-       */
-      @java.lang.Override
-      public int getNextRefreshTime() {
-        return nextRefreshTime_;
-      }
-      /**
-       * <code>uint32 next_refresh_time = 12;</code>
-       * @param value The nextRefreshTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNextRefreshTime(int value) {
-        
-        nextRefreshTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 next_refresh_time = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNextRefreshTime() {
-        
-        nextRefreshTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int cFAFALIPFEN_ ;
-      /**
-       * <code>uint32 CFAFALIPFEN = 9;</code>
-       * @return The cFAFALIPFEN.
-       */
-      @java.lang.Override
-      public int getCFAFALIPFEN() {
-        return cFAFALIPFEN_;
-      }
-      /**
-       * <code>uint32 CFAFALIPFEN = 9;</code>
-       * @param value The cFAFALIPFEN to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCFAFALIPFEN(int value) {
-        
-        cFAFALIPFEN_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 CFAFALIPFEN = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCFAFALIPFEN() {
-        
-        cFAFALIPFEN_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int eOLGBLICEIA_ ;
-      /**
-       * <code>uint32 EOLGBLICEIA = 14;</code>
-       * @return The eOLGBLICEIA.
-       */
-      @java.lang.Override
-      public int getEOLGBLICEIA() {
-        return eOLGBLICEIA_;
-      }
-      /**
-       * <code>uint32 EOLGBLICEIA = 14;</code>
-       * @param value The eOLGBLICEIA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEOLGBLICEIA(int value) {
-        
-        eOLGBLICEIA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 EOLGBLICEIA = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEOLGBLICEIA() {
-        
-        eOLGBLICEIA_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int maxBossChestNum_ ;
-      /**
-       * <code>uint32 max_boss_chest_num = 11;</code>
-       * @return The maxBossChestNum.
-       */
-      @java.lang.Override
-      public int getMaxBossChestNum() {
-        return maxBossChestNum_;
-      }
-      /**
-       * <code>uint32 max_boss_chest_num = 11;</code>
-       * @param value The maxBossChestNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMaxBossChestNum(int value) {
-        
-        maxBossChestNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 max_boss_chest_num = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaxBossChestNum() {
-        
-        maxBossChestNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int dungeonId_ ;
-      /**
-       * <code>uint32 dungeon_id = 13;</code>
-       * @return The dungeonId.
-       */
-      @java.lang.Override
-      public int getDungeonId() {
-        return dungeonId_;
-      }
-      /**
-       * <code>uint32 dungeon_id = 13;</code>
-       * @param value The dungeonId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonId(int value) {
-        
-        dungeonId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonId() {
-        
-        dungeonId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 7;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 7;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int startTime_ ;
-      /**
-       * <code>uint32 start_time = 2;</code>
-       * @return The startTime.
-       */
-      @java.lang.Override
-      public int getStartTime() {
-        return startTime_;
-      }
-      /**
-       * <code>uint32 start_time = 2;</code>
-       * @param value The startTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStartTime(int value) {
-        
-        startTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 start_time = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStartTime() {
-        
-        startTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isPassed_ ;
       /**
-       * <code>bool is_passed = 5;</code>
+       * <code>bool is_passed = 1;</code>
        * @return The isPassed.
        */
       @java.lang.Override
@@ -1012,7 +670,7 @@ public final class DungeonEntryInfoOuterClass {
         return isPassed_;
       }
       /**
-       * <code>bool is_passed = 5;</code>
+       * <code>bool is_passed = 1;</code>
        * @param value The isPassed to set.
        * @return This builder for chaining.
        */
@@ -1023,7 +681,7 @@ public final class DungeonEntryInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_passed = 5;</code>
+       * <code>bool is_passed = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPassed() {
@@ -1033,6 +691,37 @@ public final class DungeonEntryInfoOuterClass {
         return this;
       }
 
+      private int dungeonId_ ;
+      /**
+       * <code>uint32 dungeon_id = 3;</code>
+       * @return The dungeonId.
+       */
+      @java.lang.Override
+      public int getDungeonId() {
+        return dungeonId_;
+      }
+      /**
+       * <code>uint32 dungeon_id = 3;</code>
+       * @param value The dungeonId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonId(int value) {
+        
+        dungeonId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonId() {
+        
+        dungeonId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> weeklyBossResinDiscountInfoBuilder_;
@@ -1151,6 +840,99 @@ public final class DungeonEntryInfoOuterClass {
         }
         return weeklyBossResinDiscountInfoBuilder_;
       }
+
+      private int bossChestNum_ ;
+      /**
+       * <code>uint32 boss_chest_num = 9;</code>
+       * @return The bossChestNum.
+       */
+      @java.lang.Override
+      public int getBossChestNum() {
+        return bossChestNum_;
+      }
+      /**
+       * <code>uint32 boss_chest_num = 9;</code>
+       * @param value The bossChestNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBossChestNum(int value) {
+        
+        bossChestNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 boss_chest_num = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBossChestNum() {
+        
+        bossChestNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nextRefreshTime_ ;
+      /**
+       * <code>uint32 next_refresh_time = 14;</code>
+       * @return The nextRefreshTime.
+       */
+      @java.lang.Override
+      public int getNextRefreshTime() {
+        return nextRefreshTime_;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 14;</code>
+       * @param value The nextRefreshTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextRefreshTime(int value) {
+        
+        nextRefreshTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextRefreshTime() {
+        
+        nextRefreshTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int maxBossChestNum_ ;
+      /**
+       * <code>uint32 max_boss_chest_num = 15;</code>
+       * @return The maxBossChestNum.
+       */
+      @java.lang.Override
+      public int getMaxBossChestNum() {
+        return maxBossChestNum_;
+      }
+      /**
+       * <code>uint32 max_boss_chest_num = 15;</code>
+       * @param value The maxBossChestNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMaxBossChestNum(int value) {
+        
+        maxBossChestNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 max_boss_chest_num = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaxBossChestNum() {
+        
+        maxBossChestNum_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1219,15 +1001,13 @@ public final class DungeonEntryInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026DungeonEntryInfo.proto\032!WeeklyBossResi" +
-      "nDiscountInfo.proto\"\207\002\n\020DungeonEntryInfo" +
-      "\022\031\n\021next_refresh_time\030\014 \001(\r\022\023\n\013CFAFALIPF" +
-      "EN\030\t \001(\r\022\023\n\013EOLGBLICEIA\030\016 \001(\r\022\032\n\022max_bos" +
-      "s_chest_num\030\013 \001(\r\022\022\n\ndungeon_id\030\r \001(\r\022\020\n" +
-      "\010end_time\030\007 \001(\r\022\022\n\nstart_time\030\002 \001(\r\022\021\n\ti" +
-      "s_passed\030\005 \001(\010\022E\n\037weekly_boss_resin_disc" +
-      "ount_info\030\006 \001(\0132\034.WeeklyBossResinDiscoun" +
-      "tInfoB\033\n\031emu.grasscutter.net.protob\006prot" +
-      "o3"
+      "nDiscountInfo.proto\"\317\001\n\020DungeonEntryInfo" +
+      "\022\021\n\tis_passed\030\001 \001(\010\022\022\n\ndungeon_id\030\003 \001(\r\022" +
+      "E\n\037weekly_boss_resin_discount_info\030\006 \001(\013" +
+      "2\034.WeeklyBossResinDiscountInfo\022\026\n\016boss_c" +
+      "hest_num\030\t \001(\r\022\031\n\021next_refresh_time\030\016 \001(" +
+      "\r\022\032\n\022max_boss_chest_num\030\017 \001(\rB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1239,7 +1019,7 @@ public final class DungeonEntryInfoOuterClass {
     internal_static_DungeonEntryInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonEntryInfo_descriptor,
-        new java.lang.String[] { "NextRefreshTime", "CFAFALIPFEN", "EOLGBLICEIA", "MaxBossChestNum", "DungeonId", "EndTime", "StartTime", "IsPassed", "WeeklyBossResinDiscountInfo", });
+        new java.lang.String[] { "IsPassed", "DungeonId", "WeeklyBossResinDiscountInfo", "BossChestNum", "NextRefreshTime", "MaxBossChestNum", });
     emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java
index 79fabd85c..12645309a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoReqOuterClass.java
@@ -19,47 +19,42 @@ public final class DungeonEntryInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
         getScenePointIdListList();
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index);
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     int getScenePointIdListCount();
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
         getScenePointIdListOrBuilderList();
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 point_id = 11;</code>
-     * @return The pointId.
-     */
-    int getPointId();
-
-    /**
-     * <code>uint32 scene_id = 3;</code>
+     * <code>uint32 scene_id = 10;</code>
      * @return The sceneId.
      */
     int getSceneId();
+
+    /**
+     * <code>uint32 point_id = 4;</code>
+     * @return The pointId.
+     */
+    int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 782
-   * Obf: JJMKBALLDNB
-   * </pre>
-   *
    * Protobuf type {@code DungeonEntryInfoReq}
    */
   public static final class DungeonEntryInfoReq extends
@@ -106,12 +101,12 @@ public final class DungeonEntryInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 32: {
 
-              sceneId_ = input.readUInt32();
+              pointId_ = input.readUInt32();
               break;
             }
-            case 66: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 scenePointIdList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>();
                 mutable_bitField0_ |= 0x00000001;
@@ -120,9 +115,9 @@ public final class DungeonEntryInfoReqOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.parser(), extensionRegistry));
               break;
             }
-            case 88: {
+            case 80: {
 
-              pointId_ = input.readUInt32();
+              sceneId_ = input.readUInt32();
               break;
             }
             default: {
@@ -160,17 +155,17 @@ public final class DungeonEntryInfoReqOuterClass {
               emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoReq.class, emu.grasscutter.net.proto.DungeonEntryInfoReqOuterClass.DungeonEntryInfoReq.Builder.class);
     }
 
-    public static final int SCENE_POINT_ID_LIST_FIELD_NUMBER = 8;
+    public static final int SCENE_POINT_ID_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> scenePointIdList_;
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getScenePointIdListList() {
       return scenePointIdList_;
     }
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
@@ -178,21 +173,21 @@ public final class DungeonEntryInfoReqOuterClass {
       return scenePointIdList_;
     }
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     @java.lang.Override
     public int getScenePointIdListCount() {
       return scenePointIdList_.size();
     }
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index) {
       return scenePointIdList_.get(index);
     }
     /**
-     * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+     * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder(
@@ -200,21 +195,10 @@ public final class DungeonEntryInfoReqOuterClass {
       return scenePointIdList_.get(index);
     }
 
-    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_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 3;
+    public static final int SCENE_ID_FIELD_NUMBER = 10;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 3;</code>
+     * <code>uint32 scene_id = 10;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -222,6 +206,17 @@ public final class DungeonEntryInfoReqOuterClass {
       return sceneId_;
     }
 
+    public static final int POINT_ID_FIELD_NUMBER = 4;
+    private int pointId_;
+    /**
+     * <code>uint32 point_id = 4;</code>
+     * @return The pointId.
+     */
+    @java.lang.Override
+    public int getPointId() {
+      return pointId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -236,14 +231,14 @@ public final class DungeonEntryInfoReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneId_ != 0) {
-        output.writeUInt32(3, sceneId_);
+      if (pointId_ != 0) {
+        output.writeUInt32(4, pointId_);
       }
       for (int i = 0; i < scenePointIdList_.size(); i++) {
-        output.writeMessage(8, scenePointIdList_.get(i));
+        output.writeMessage(5, scenePointIdList_.get(i));
       }
-      if (pointId_ != 0) {
-        output.writeUInt32(11, pointId_);
+      if (sceneId_ != 0) {
+        output.writeUInt32(10, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class DungeonEntryInfoReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneId_ != 0) {
+      if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, sceneId_);
+          .computeUInt32Size(4, pointId_);
       }
       for (int i = 0; i < scenePointIdList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, scenePointIdList_.get(i));
+          .computeMessageSize(5, scenePointIdList_.get(i));
       }
-      if (pointId_ != 0) {
+      if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, pointId_);
+          .computeUInt32Size(10, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,10 +278,10 @@ public final class DungeonEntryInfoReqOuterClass {
 
       if (!getScenePointIdListList()
           .equals(other.getScenePointIdListList())) return false;
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -302,10 +297,10 @@ public final class DungeonEntryInfoReqOuterClass {
         hash = (37 * hash) + SCENE_POINT_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getScenePointIdListList().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) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,11 +397,6 @@ public final class DungeonEntryInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 782
-     * Obf: JJMKBALLDNB
-     * </pre>
-     *
      * Protobuf type {@code DungeonEntryInfoReq}
      */
     public static final class Builder extends
@@ -451,10 +441,10 @@ public final class DungeonEntryInfoReqOuterClass {
         } else {
           scenePointIdListBuilder_.clear();
         }
-        pointId_ = 0;
-
         sceneId_ = 0;
 
+        pointId_ = 0;
+
         return this;
       }
 
@@ -491,8 +481,8 @@ public final class DungeonEntryInfoReqOuterClass {
         } else {
           result.scenePointIdList_ = scenePointIdListBuilder_.build();
         }
-        result.pointId_ = pointId_;
         result.sceneId_ = sceneId_;
+        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -567,12 +557,12 @@ public final class DungeonEntryInfoReqOuterClass {
             }
           }
         }
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -616,7 +606,7 @@ public final class DungeonEntryInfoReqOuterClass {
           emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> scenePointIdListBuilder_;
 
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getScenePointIdListList() {
         if (scenePointIdListBuilder_ == null) {
@@ -626,7 +616,7 @@ public final class DungeonEntryInfoReqOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public int getScenePointIdListCount() {
         if (scenePointIdListBuilder_ == null) {
@@ -636,7 +626,7 @@ public final class DungeonEntryInfoReqOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getScenePointIdList(int index) {
         if (scenePointIdListBuilder_ == null) {
@@ -646,7 +636,7 @@ public final class DungeonEntryInfoReqOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder setScenePointIdList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -663,7 +653,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder setScenePointIdList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -677,7 +667,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder addScenePointIdList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
         if (scenePointIdListBuilder_ == null) {
@@ -693,7 +683,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder addScenePointIdList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -710,7 +700,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder addScenePointIdList(
           emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -724,7 +714,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder addScenePointIdList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -738,7 +728,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder addAllScenePointIdList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> values) {
@@ -753,7 +743,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder clearScenePointIdList() {
         if (scenePointIdListBuilder_ == null) {
@@ -766,7 +756,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public Builder removeScenePointIdList(int index) {
         if (scenePointIdListBuilder_ == null) {
@@ -779,14 +769,14 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getScenePointIdListBuilder(
           int index) {
         return getScenePointIdListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getScenePointIdListOrBuilder(
           int index) {
@@ -796,7 +786,7 @@ public final class DungeonEntryInfoReqOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
            getScenePointIdListOrBuilderList() {
@@ -807,14 +797,14 @@ public final class DungeonEntryInfoReqOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScenePointIdListBuilder() {
         return getScenePointIdListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addScenePointIdListBuilder(
           int index) {
@@ -822,7 +812,7 @@ public final class DungeonEntryInfoReqOuterClass {
             index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
       }
       /**
-       * <code>repeated .Uint32Pair scene_point_id_list = 8;</code>
+       * <code>repeated .Uint32Pair scene_point_id_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder> 
            getScenePointIdListBuilderList() {
@@ -843,40 +833,9 @@ public final class DungeonEntryInfoReqOuterClass {
         return scenePointIdListBuilder_;
       }
 
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 11;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 11;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 10;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -884,7 +843,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 10;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -895,7 +854,7 @@ public final class DungeonEntryInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -904,6 +863,37 @@ public final class DungeonEntryInfoReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 4;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 4;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -973,8 +963,8 @@ public final class DungeonEntryInfoReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031DungeonEntryInfoReq.proto\032\020Uint32Pair." +
       "proto\"c\n\023DungeonEntryInfoReq\022(\n\023scene_po" +
-      "int_id_list\030\010 \003(\0132\013.Uint32Pair\022\020\n\010point_" +
-      "id\030\013 \001(\r\022\020\n\010scene_id\030\003 \001(\rB\033\n\031emu.grassc" +
+      "int_id_list\030\005 \003(\0132\013.Uint32Pair\022\020\n\010scene_" +
+      "id\030\n \001(\r\022\020\n\010point_id\030\004 \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -987,7 +977,7 @@ public final class DungeonEntryInfoReqOuterClass {
     internal_static_DungeonEntryInfoReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonEntryInfoReq_descriptor,
-        new java.lang.String[] { "ScenePointIdList", "PointId", "SceneId", });
+        new java.lang.String[] { "ScenePointIdList", "SceneId", "PointId", });
     emu.grasscutter.net.proto.Uint32PairOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java
index 6aedf7523..070f477b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryInfoRspOuterClass.java
@@ -19,77 +19,72 @@ public final class DungeonEntryInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> 
         getDungeonEntryListList();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index);
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     int getDungeonEntryListCount();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
         getDungeonEntryListOrBuilderList();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
         int index);
 
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo> 
         getDungeonEntryPointListList();
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index);
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     int getDungeonEntryPointListCount();
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder> 
         getDungeonEntryPointListOrBuilderList();
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder(
         int index);
 
     /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
+     * <code>uint32 recommend_dungeon_id = 10;</code>
+     * @return The recommendDungeonId.
      */
-    int getRetcode();
+    int getRecommendDungeonId();
 
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     int getPointId();
 
     /**
-     * <code>uint32 recommend_dungeon_id = 2;</code>
-     * @return The recommendDungeonId.
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
      */
-    int getRecommendDungeonId();
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28381
-   * Obf: FJKAAALHLDG
-   * </pre>
-   *
    * Protobuf type {@code DungeonEntryInfoRsp}
    */
   public static final class DungeonEntryInfoRsp extends
@@ -137,12 +132,7 @@ public final class DungeonEntryInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              recommendDungeonId_ = input.readUInt32();
-              break;
-            }
-            case 34: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 dungeonEntryList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -151,12 +141,7 @@ public final class DungeonEntryInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.parser(), extensionRegistry));
               break;
             }
-            case 40: {
-
-              pointId_ = input.readUInt32();
-              break;
-            }
-            case 90: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 dungeonEntryPointList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo>();
                 mutable_bitField0_ |= 0x00000002;
@@ -165,8 +150,18 @@ public final class DungeonEntryInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.parser(), extensionRegistry));
               break;
             }
+            case 80: {
+
+              recommendDungeonId_ = input.readUInt32();
+              break;
+            }
             case 104: {
 
+              pointId_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
               retcode_ = input.readInt32();
               break;
             }
@@ -208,17 +203,17 @@ public final class DungeonEntryInfoRspOuterClass {
               emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp.class, emu.grasscutter.net.proto.DungeonEntryInfoRspOuterClass.DungeonEntryInfoRsp.Builder.class);
     }
 
-    public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 4;
+    public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> dungeonEntryList_;
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> getDungeonEntryListList() {
       return dungeonEntryList_;
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
@@ -226,21 +221,21 @@ public final class DungeonEntryInfoRspOuterClass {
       return dungeonEntryList_;
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public int getDungeonEntryListCount() {
       return dungeonEntryList_.size();
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) {
       return dungeonEntryList_.get(index);
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
@@ -248,17 +243,17 @@ public final class DungeonEntryInfoRspOuterClass {
       return dungeonEntryList_.get(index);
     }
 
-    public static final int DUNGEON_ENTRY_POINT_LIST_FIELD_NUMBER = 11;
+    public static final int DUNGEON_ENTRY_POINT_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo> dungeonEntryPointList_;
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo> getDungeonEntryPointListList() {
       return dungeonEntryPointList_;
     }
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder> 
@@ -266,21 +261,21 @@ public final class DungeonEntryInfoRspOuterClass {
       return dungeonEntryPointList_;
     }
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     @java.lang.Override
     public int getDungeonEntryPointListCount() {
       return dungeonEntryPointList_.size();
     }
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index) {
       return dungeonEntryPointList_.get(index);
     }
     /**
-     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+     * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder(
@@ -288,21 +283,21 @@ public final class DungeonEntryInfoRspOuterClass {
       return dungeonEntryPointList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 13;
-    private int retcode_;
+    public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 10;
+    private int recommendDungeonId_;
     /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
+     * <code>uint32 recommend_dungeon_id = 10;</code>
+     * @return The recommendDungeonId.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getRecommendDungeonId() {
+      return recommendDungeonId_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 5;
+    public static final int POINT_ID_FIELD_NUMBER = 13;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -310,15 +305,15 @@ public final class DungeonEntryInfoRspOuterClass {
       return pointId_;
     }
 
-    public static final int RECOMMEND_DUNGEON_ID_FIELD_NUMBER = 2;
-    private int recommendDungeonId_;
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
     /**
-     * <code>uint32 recommend_dungeon_id = 2;</code>
-     * @return The recommendDungeonId.
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getRecommendDungeonId() {
-      return recommendDungeonId_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -335,20 +330,20 @@ public final class DungeonEntryInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (recommendDungeonId_ != 0) {
-        output.writeUInt32(2, recommendDungeonId_);
-      }
       for (int i = 0; i < dungeonEntryList_.size(); i++) {
-        output.writeMessage(4, dungeonEntryList_.get(i));
-      }
-      if (pointId_ != 0) {
-        output.writeUInt32(5, pointId_);
+        output.writeMessage(1, dungeonEntryList_.get(i));
       }
       for (int i = 0; i < dungeonEntryPointList_.size(); i++) {
-        output.writeMessage(11, dungeonEntryPointList_.get(i));
+        output.writeMessage(9, dungeonEntryPointList_.get(i));
+      }
+      if (recommendDungeonId_ != 0) {
+        output.writeUInt32(10, recommendDungeonId_);
+      }
+      if (pointId_ != 0) {
+        output.writeUInt32(13, pointId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(13, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -359,25 +354,25 @@ public final class DungeonEntryInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (recommendDungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, recommendDungeonId_);
-      }
       for (int i = 0; i < dungeonEntryList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, dungeonEntryList_.get(i));
-      }
-      if (pointId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, pointId_);
+          .computeMessageSize(1, dungeonEntryList_.get(i));
       }
       for (int i = 0; i < dungeonEntryPointList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, dungeonEntryPointList_.get(i));
+          .computeMessageSize(9, dungeonEntryPointList_.get(i));
+      }
+      if (recommendDungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, recommendDungeonId_);
+      }
+      if (pointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, pointId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -398,12 +393,12 @@ public final class DungeonEntryInfoRspOuterClass {
           .equals(other.getDungeonEntryListList())) return false;
       if (!getDungeonEntryPointListList()
           .equals(other.getDungeonEntryPointListList())) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getRecommendDungeonId()
           != other.getRecommendDungeonId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -423,12 +418,12 @@ public final class DungeonEntryInfoRspOuterClass {
         hash = (37 * hash) + DUNGEON_ENTRY_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDungeonEntryPointListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPointId();
       hash = (37 * hash) + RECOMMEND_DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRecommendDungeonId();
+      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -525,11 +520,6 @@ public final class DungeonEntryInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28381
-     * Obf: FJKAAALHLDG
-     * </pre>
-     *
      * Protobuf type {@code DungeonEntryInfoRsp}
      */
     public static final class Builder extends
@@ -581,11 +571,11 @@ public final class DungeonEntryInfoRspOuterClass {
         } else {
           dungeonEntryPointListBuilder_.clear();
         }
-        retcode_ = 0;
+        recommendDungeonId_ = 0;
 
         pointId_ = 0;
 
-        recommendDungeonId_ = 0;
+        retcode_ = 0;
 
         return this;
       }
@@ -632,9 +622,9 @@ public final class DungeonEntryInfoRspOuterClass {
         } else {
           result.dungeonEntryPointList_ = dungeonEntryPointListBuilder_.build();
         }
-        result.retcode_ = retcode_;
-        result.pointId_ = pointId_;
         result.recommendDungeonId_ = recommendDungeonId_;
+        result.pointId_ = pointId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -735,14 +725,14 @@ public final class DungeonEntryInfoRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getRecommendDungeonId() != 0) {
+          setRecommendDungeonId(other.getRecommendDungeonId());
         }
         if (other.getPointId() != 0) {
           setPointId(other.getPointId());
         }
-        if (other.getRecommendDungeonId() != 0) {
-          setRecommendDungeonId(other.getRecommendDungeonId());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -787,7 +777,7 @@ public final class DungeonEntryInfoRspOuterClass {
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> dungeonEntryListBuilder_;
 
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> getDungeonEntryListList() {
         if (dungeonEntryListBuilder_ == null) {
@@ -797,7 +787,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public int getDungeonEntryListCount() {
         if (dungeonEntryListBuilder_ == null) {
@@ -807,7 +797,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) {
         if (dungeonEntryListBuilder_ == null) {
@@ -817,7 +807,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder setDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
@@ -834,7 +824,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder setDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -848,7 +838,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
         if (dungeonEntryListBuilder_ == null) {
@@ -864,7 +854,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
@@ -881,7 +871,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -895,7 +885,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -909,7 +899,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addAllDungeonEntryList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> values) {
@@ -924,7 +914,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder clearDungeonEntryList() {
         if (dungeonEntryListBuilder_ == null) {
@@ -937,7 +927,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder removeDungeonEntryList(int index) {
         if (dungeonEntryListBuilder_ == null) {
@@ -950,14 +940,14 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder getDungeonEntryListBuilder(
           int index) {
         return getDungeonEntryListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
           int index) {
@@ -967,7 +957,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
            getDungeonEntryListOrBuilderList() {
@@ -978,14 +968,14 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder() {
         return getDungeonEntryListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder(
           int index) {
@@ -993,7 +983,7 @@ public final class DungeonEntryInfoRspOuterClass {
             index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 4;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder> 
            getDungeonEntryListBuilderList() {
@@ -1027,7 +1017,7 @@ public final class DungeonEntryInfoRspOuterClass {
           emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder> dungeonEntryPointListBuilder_;
 
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo> getDungeonEntryPointListList() {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1037,7 +1027,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public int getDungeonEntryPointListCount() {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1047,7 +1037,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo getDungeonEntryPointList(int index) {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1057,7 +1047,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder setDungeonEntryPointList(
           int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) {
@@ -1074,7 +1064,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder setDungeonEntryPointList(
           int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) {
@@ -1088,7 +1078,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder addDungeonEntryPointList(emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1104,7 +1094,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder addDungeonEntryPointList(
           int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo value) {
@@ -1121,7 +1111,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder addDungeonEntryPointList(
           emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) {
@@ -1135,7 +1125,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder addDungeonEntryPointList(
           int index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder builderForValue) {
@@ -1149,7 +1139,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder addAllDungeonEntryPointList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo> values) {
@@ -1164,7 +1154,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder clearDungeonEntryPointList() {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1177,7 +1167,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public Builder removeDungeonEntryPointList(int index) {
         if (dungeonEntryPointListBuilder_ == null) {
@@ -1190,14 +1180,14 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder getDungeonEntryPointListBuilder(
           int index) {
         return getDungeonEntryPointListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder getDungeonEntryPointListOrBuilder(
           int index) {
@@ -1207,7 +1197,7 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfoOrBuilder> 
            getDungeonEntryPointListOrBuilderList() {
@@ -1218,14 +1208,14 @@ public final class DungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder addDungeonEntryPointListBuilder() {
         return getDungeonEntryPointListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder addDungeonEntryPointListBuilder(
           int index) {
@@ -1233,7 +1223,7 @@ public final class DungeonEntryInfoRspOuterClass {
             index, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 11;</code>
+       * <code>repeated .DungeonEntryPointInfo dungeon_entry_point_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder> 
            getDungeonEntryPointListBuilderList() {
@@ -1254,71 +1244,9 @@ public final class DungeonEntryInfoRspOuterClass {
         return dungeonEntryPointListBuilder_;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 5;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 5;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int recommendDungeonId_ ;
       /**
-       * <code>uint32 recommend_dungeon_id = 2;</code>
+       * <code>uint32 recommend_dungeon_id = 10;</code>
        * @return The recommendDungeonId.
        */
       @java.lang.Override
@@ -1326,7 +1254,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return recommendDungeonId_;
       }
       /**
-       * <code>uint32 recommend_dungeon_id = 2;</code>
+       * <code>uint32 recommend_dungeon_id = 10;</code>
        * @param value The recommendDungeonId to set.
        * @return This builder for chaining.
        */
@@ -1337,7 +1265,7 @@ public final class DungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 recommend_dungeon_id = 2;</code>
+       * <code>uint32 recommend_dungeon_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRecommendDungeonId() {
@@ -1346,6 +1274,68 @@ public final class DungeonEntryInfoRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -1416,10 +1406,10 @@ public final class DungeonEntryInfoRspOuterClass {
       "\n\031DungeonEntryInfoRsp.proto\032\026DungeonEntr" +
       "yInfo.proto\032\033DungeonEntryPointInfo.proto" +
       "\"\277\001\n\023DungeonEntryInfoRsp\022-\n\022dungeon_entr" +
-      "y_list\030\004 \003(\0132\021.DungeonEntryInfo\0228\n\030dunge" +
-      "on_entry_point_list\030\013 \003(\0132\026.DungeonEntry" +
-      "PointInfo\022\017\n\007retcode\030\r \001(\005\022\020\n\010point_id\030\005" +
-      " \001(\r\022\034\n\024recommend_dungeon_id\030\002 \001(\rB\033\n\031em" +
+      "y_list\030\001 \003(\0132\021.DungeonEntryInfo\0228\n\030dunge" +
+      "on_entry_point_list\030\t \003(\0132\026.DungeonEntry" +
+      "PointInfo\022\034\n\024recommend_dungeon_id\030\n \001(\r\022" +
+      "\020\n\010point_id\030\r \001(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1433,7 +1423,7 @@ public final class DungeonEntryInfoRspOuterClass {
     internal_static_DungeonEntryInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonEntryInfoRsp_descriptor,
-        new java.lang.String[] { "DungeonEntryList", "DungeonEntryPointList", "Retcode", "PointId", "RecommendDungeonId", });
+        new java.lang.String[] { "DungeonEntryList", "DungeonEntryPointList", "RecommendDungeonId", "PointId", "Retcode", });
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java
index f6e1404ba..b19da9696 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonEntryPointInfoOuterClass.java
@@ -19,31 +19,31 @@ public final class DungeonEntryPointInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> 
         getDungeonEntryListList();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index);
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     int getDungeonEntryListCount();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
         getDungeonEntryListOrBuilderList();
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 point_id = 2;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     int getPointId();
@@ -61,10 +61,6 @@ public final class DungeonEntryPointInfoOuterClass {
     int getSceneId();
   }
   /**
-   * <pre>
-   * Obf: CECCCBKAFKN
-   * </pre>
-   *
    * Protobuf type {@code DungeonEntryPointInfo}
    */
   public static final class DungeonEntryPointInfo extends
@@ -111,12 +107,7 @@ public final class DungeonEntryPointInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              pointId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 dungeonEntryList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -125,6 +116,11 @@ public final class DungeonEntryPointInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.parser(), extensionRegistry));
               break;
             }
+            case 48: {
+
+              pointId_ = input.readUInt32();
+              break;
+            }
             case 80: {
 
               recommendDungeonId_ = input.readUInt32();
@@ -170,17 +166,17 @@ public final class DungeonEntryPointInfoOuterClass {
               emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.class, emu.grasscutter.net.proto.DungeonEntryPointInfoOuterClass.DungeonEntryPointInfo.Builder.class);
     }
 
-    public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 9;
+    public static final int DUNGEON_ENTRY_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> dungeonEntryList_;
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> getDungeonEntryListList() {
       return dungeonEntryList_;
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
@@ -188,21 +184,21 @@ public final class DungeonEntryPointInfoOuterClass {
       return dungeonEntryList_;
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public int getDungeonEntryListCount() {
       return dungeonEntryList_.size();
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) {
       return dungeonEntryList_.get(index);
     }
     /**
-     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+     * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
@@ -210,10 +206,10 @@ public final class DungeonEntryPointInfoOuterClass {
       return dungeonEntryList_.get(index);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 2;
+    public static final int POINT_ID_FIELD_NUMBER = 6;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 2;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -257,11 +253,11 @@ public final class DungeonEntryPointInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pointId_ != 0) {
-        output.writeUInt32(2, pointId_);
-      }
       for (int i = 0; i < dungeonEntryList_.size(); i++) {
-        output.writeMessage(9, dungeonEntryList_.get(i));
+        output.writeMessage(1, dungeonEntryList_.get(i));
+      }
+      if (pointId_ != 0) {
+        output.writeUInt32(6, pointId_);
       }
       if (recommendDungeonId_ != 0) {
         output.writeUInt32(10, recommendDungeonId_);
@@ -278,13 +274,13 @@ public final class DungeonEntryPointInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pointId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, pointId_);
-      }
       for (int i = 0; i < dungeonEntryList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, dungeonEntryList_.get(i));
+          .computeMessageSize(1, dungeonEntryList_.get(i));
+      }
+      if (pointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, pointId_);
       }
       if (recommendDungeonId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -434,10 +430,6 @@ public final class DungeonEntryPointInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CECCCBKAFKN
-     * </pre>
-     *
      * Protobuf type {@code DungeonEntryPointInfo}
      */
     public static final class Builder extends
@@ -653,7 +645,7 @@ public final class DungeonEntryPointInfoOuterClass {
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> dungeonEntryListBuilder_;
 
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> getDungeonEntryListList() {
         if (dungeonEntryListBuilder_ == null) {
@@ -663,7 +655,7 @@ public final class DungeonEntryPointInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public int getDungeonEntryListCount() {
         if (dungeonEntryListBuilder_ == null) {
@@ -673,7 +665,7 @@ public final class DungeonEntryPointInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo getDungeonEntryList(int index) {
         if (dungeonEntryListBuilder_ == null) {
@@ -683,7 +675,7 @@ public final class DungeonEntryPointInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder setDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
@@ -700,7 +692,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder setDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -714,7 +706,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
         if (dungeonEntryListBuilder_ == null) {
@@ -730,7 +722,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo value) {
@@ -747,7 +739,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -761,7 +753,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addDungeonEntryList(
           int index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder builderForValue) {
@@ -775,7 +767,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder addAllDungeonEntryList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo> values) {
@@ -790,7 +782,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder clearDungeonEntryList() {
         if (dungeonEntryListBuilder_ == null) {
@@ -803,7 +795,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public Builder removeDungeonEntryList(int index) {
         if (dungeonEntryListBuilder_ == null) {
@@ -816,14 +808,14 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder getDungeonEntryListBuilder(
           int index) {
         return getDungeonEntryListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder getDungeonEntryListOrBuilder(
           int index) {
@@ -833,7 +825,7 @@ public final class DungeonEntryPointInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfoOrBuilder> 
            getDungeonEntryListOrBuilderList() {
@@ -844,14 +836,14 @@ public final class DungeonEntryPointInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder() {
         return getDungeonEntryListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder addDungeonEntryListBuilder(
           int index) {
@@ -859,7 +851,7 @@ public final class DungeonEntryPointInfoOuterClass {
             index, emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 9;</code>
+       * <code>repeated .DungeonEntryInfo dungeon_entry_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DungeonEntryInfoOuterClass.DungeonEntryInfo.Builder> 
            getDungeonEntryListBuilderList() {
@@ -882,7 +874,7 @@ public final class DungeonEntryPointInfoOuterClass {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 2;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -890,7 +882,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 2;</code>
+       * <code>uint32 point_id = 6;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -901,7 +893,7 @@ public final class DungeonEntryPointInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 2;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -1041,8 +1033,8 @@ public final class DungeonEntryPointInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033DungeonEntryPointInfo.proto\032\026DungeonEn" +
       "tryInfo.proto\"\210\001\n\025DungeonEntryPointInfo\022" +
-      "-\n\022dungeon_entry_list\030\t \003(\0132\021.DungeonEnt" +
-      "ryInfo\022\020\n\010point_id\030\002 \001(\r\022\034\n\024recommend_du" +
+      "-\n\022dungeon_entry_list\030\001 \003(\0132\021.DungeonEnt" +
+      "ryInfo\022\020\n\010point_id\030\006 \001(\r\022\034\n\024recommend_du" +
       "ngeon_id\030\n \001(\r\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieNotifyOuterClass.java
index 2401acd6d..74fb7e75b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPlayerDieNotifyOuterClass.java
@@ -19,17 +19,65 @@ public final class DungeonPlayerDieNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 revive_count = 6;</code>
+     * <code>.PlayerDieType die_type = 1;</code>
+     * @return The enum numeric value on the wire for dieType.
+     */
+    int getDieTypeValue();
+    /**
+     * <code>.PlayerDieType die_type = 1;</code>
+     * @return The dieType.
+     */
+    emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
+
+    /**
+     * <code>uint32 revive_count = 3;</code>
      * @return The reviveCount.
      */
     int getReviveCount();
 
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>uint32 wait_time = 7;</code>
+     * @return The waitTime.
+     */
+    int getWaitTime();
+
+    /**
+     * <code>uint32 dungeon_id = 9;</code>
+     * @return The dungeonId.
+     */
+    int getDungeonId();
+
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     * @return Whether the gOEACHAMIAF field is set.
+     */
+    boolean hasGOEACHAMIAF();
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     * @return The gOEACHAMIAF.
+     */
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF();
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     */
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder();
+
+    /**
+     * <pre>
+     * 13
+     * </pre>
+     *
+     * <code>uint32 murderer_entity_id = 11;</code>
+     * @return The murdererEntityId.
+     */
+    int getMurdererEntityId();
+
+    /**
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     int getStrengthenPointDataMapCount();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     boolean containsStrengthenPointDataMap(
         int key);
@@ -40,83 +88,55 @@ public final class DungeonPlayerDieNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMapMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault(
         int key,
         emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue);
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow(
         int key);
 
     /**
-     * <code>.PlayerDieType die_type = 11;</code>
-     * @return The enum numeric value on the wire for dieType.
+     * <code>uint32 GKHNLKAADNG = 13;</code>
+     * @return The gKHNLKAADNG.
      */
-    int getDieTypeValue();
-    /**
-     * <code>.PlayerDieType die_type = 11;</code>
-     * @return The dieType.
-     */
-    emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
+    int getGKHNLKAADNG();
 
     /**
-     * <code>uint32 wait_time = 9;</code>
-     * @return The waitTime.
-     */
-    int getWaitTime();
-
-    /**
-     * <code>uint32 dungeon_id = 4;</code>
-     * @return The dungeonId.
-     */
-    int getDungeonId();
-
-    /**
-     * <code>uint32 monster_id = 3;</code>
+     * <code>uint32 monster_id = 2;</code>
      * @return Whether the monsterId field is set.
      */
     boolean hasMonsterId();
     /**
-     * <code>uint32 monster_id = 3;</code>
+     * <code>uint32 monster_id = 2;</code>
      * @return The monsterId.
      */
     int getMonsterId();
 
     /**
-     * <code>uint32 gadget_id = 10;</code>
+     * <code>uint32 gadget_id = 8;</code>
      * @return Whether the gadgetId field is set.
      */
     boolean hasGadgetId();
     /**
-     * <code>uint32 gadget_id = 10;</code>
+     * <code>uint32 gadget_id = 8;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
-    /**
-     * <code>uint32 murderer_entity_id = 15;</code>
-     * @return The murdererEntityId.
-     */
-    int getMurdererEntityId();
-
     public emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify.EntityCase getEntityCase();
   }
   /**
-   * <pre>
-   * CmdId: 28240
-   * Obf: JNJBBMEHNOL
-   * </pre>
-   *
    * Protobuf type {@code DungeonPlayerDieNotify}
    */
   public static final class DungeonPlayerDieNotify extends
@@ -163,7 +183,56 @@ public final class DungeonPlayerDieNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 8: {
+              int rawValue = input.readEnum();
+
+              dieType_ = rawValue;
+              break;
+            }
+            case 16: {
+              entityCase_ = 2;
+              entity_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              reviveCount_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              waitTime_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+              entityCase_ = 8;
+              entity_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null;
+              if (gOEACHAMIAF_ != null) {
+                subBuilder = gOEACHAMIAF_.toBuilder();
+              }
+              gOEACHAMIAF_ = input.readMessage(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(gOEACHAMIAF_);
+                gOEACHAMIAF_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 88: {
+
+              murdererEntityId_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField(
                     StrengthenPointDataMapDefaultEntryHolder.defaultEntry);
@@ -176,40 +245,9 @@ public final class DungeonPlayerDieNotifyOuterClass {
                   strengthenPointDataMap__.getKey(), strengthenPointDataMap__.getValue());
               break;
             }
-            case 24: {
-              entityCase_ = 3;
-              entity_ = input.readUInt32();
-              break;
-            }
-            case 32: {
+            case 104: {
 
-              dungeonId_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              reviveCount_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              waitTime_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-              entityCase_ = 10;
-              entity_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-              int rawValue = input.readEnum();
-
-              dieType_ = rawValue;
-              break;
-            }
-            case 120: {
-
-              murdererEntityId_ = input.readUInt32();
+              gKHNLKAADNG_ = input.readUInt32();
               break;
             }
             default: {
@@ -241,7 +279,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 1:
+        case 12:
           return internalGetStrengthenPointDataMap();
         default:
           throw new RuntimeException(
@@ -261,8 +299,8 @@ public final class DungeonPlayerDieNotifyOuterClass {
     public enum EntityCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      MONSTER_ID(3),
-      GADGET_ID(10),
+      MONSTER_ID(2),
+      GADGET_ID(8),
       ENTITY_NOT_SET(0);
       private final int value;
       private EntityCase(int value) {
@@ -280,8 +318,8 @@ public final class DungeonPlayerDieNotifyOuterClass {
 
       public static EntityCase forNumber(int value) {
         switch (value) {
-          case 3: return MONSTER_ID;
-          case 10: return GADGET_ID;
+          case 2: return MONSTER_ID;
+          case 8: return GADGET_ID;
           case 0: return ENTITY_NOT_SET;
           default: return null;
         }
@@ -297,10 +335,29 @@ public final class DungeonPlayerDieNotifyOuterClass {
           entityCase_);
     }
 
-    public static final int REVIVE_COUNT_FIELD_NUMBER = 6;
+    public static final int DIE_TYPE_FIELD_NUMBER = 1;
+    private int dieType_;
+    /**
+     * <code>.PlayerDieType die_type = 1;</code>
+     * @return The enum numeric value on the wire for dieType.
+     */
+    @java.lang.Override public int getDieTypeValue() {
+      return dieType_;
+    }
+    /**
+     * <code>.PlayerDieType die_type = 1;</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 REVIVE_COUNT_FIELD_NUMBER = 3;
     private int reviveCount_;
     /**
-     * <code>uint32 revive_count = 6;</code>
+     * <code>uint32 revive_count = 3;</code>
      * @return The reviveCount.
      */
     @java.lang.Override
@@ -308,7 +365,70 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return reviveCount_;
     }
 
-    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 1;
+    public static final int WAIT_TIME_FIELD_NUMBER = 7;
+    private int waitTime_;
+    /**
+     * <code>uint32 wait_time = 7;</code>
+     * @return The waitTime.
+     */
+    @java.lang.Override
+    public int getWaitTime() {
+      return waitTime_;
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 9;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 9;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
+    public static final int GOEACHAMIAF_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString gOEACHAMIAF_;
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     * @return Whether the gOEACHAMIAF field is set.
+     */
+    @java.lang.Override
+    public boolean hasGOEACHAMIAF() {
+      return gOEACHAMIAF_ != null;
+    }
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     * @return The gOEACHAMIAF.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF() {
+      return gOEACHAMIAF_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+    }
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder() {
+      return getGOEACHAMIAF();
+    }
+
+    public static final int MURDERER_ENTITY_ID_FIELD_NUMBER = 11;
+    private int murdererEntityId_;
+    /**
+     * <pre>
+     * 13
+     * </pre>
+     *
+     * <code>uint32 murderer_entity_id = 11;</code>
+     * @return The murdererEntityId.
+     */
+    @java.lang.Override
+    public int getMurdererEntityId() {
+      return murdererEntityId_;
+    }
+
+    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 12;
     private static final class StrengthenPointDataMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> defaultEntry =
@@ -335,7 +455,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
 
     @java.lang.Override
@@ -353,7 +473,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return getStrengthenPointDataMapMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     @java.lang.Override
 
@@ -361,7 +481,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     @java.lang.Override
 
@@ -374,7 +494,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
      */
     @java.lang.Override
 
@@ -389,100 +509,59 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int DIE_TYPE_FIELD_NUMBER = 11;
-    private int dieType_;
+    public static final int GKHNLKAADNG_FIELD_NUMBER = 13;
+    private int gKHNLKAADNG_;
     /**
-     * <code>.PlayerDieType die_type = 11;</code>
-     * @return The enum numeric value on the wire for dieType.
-     */
-    @java.lang.Override public int getDieTypeValue() {
-      return dieType_;
-    }
-    /**
-     * <code>.PlayerDieType die_type = 11;</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 WAIT_TIME_FIELD_NUMBER = 9;
-    private int waitTime_;
-    /**
-     * <code>uint32 wait_time = 9;</code>
-     * @return The waitTime.
+     * <code>uint32 GKHNLKAADNG = 13;</code>
+     * @return The gKHNLKAADNG.
      */
     @java.lang.Override
-    public int getWaitTime() {
-      return waitTime_;
+    public int getGKHNLKAADNG() {
+      return gKHNLKAADNG_;
     }
 
-    public static final int DUNGEON_ID_FIELD_NUMBER = 4;
-    private int dungeonId_;
+    public static final int MONSTER_ID_FIELD_NUMBER = 2;
     /**
-     * <code>uint32 dungeon_id = 4;</code>
-     * @return The dungeonId.
-     */
-    @java.lang.Override
-    public int getDungeonId() {
-      return dungeonId_;
-    }
-
-    public static final int MONSTER_ID_FIELD_NUMBER = 3;
-    /**
-     * <code>uint32 monster_id = 3;</code>
+     * <code>uint32 monster_id = 2;</code>
      * @return Whether the monsterId field is set.
      */
     @java.lang.Override
     public boolean hasMonsterId() {
-      return entityCase_ == 3;
+      return entityCase_ == 2;
     }
     /**
-     * <code>uint32 monster_id = 3;</code>
+     * <code>uint32 monster_id = 2;</code>
      * @return The monsterId.
      */
     @java.lang.Override
     public int getMonsterId() {
-      if (entityCase_ == 3) {
+      if (entityCase_ == 2) {
         return (java.lang.Integer) entity_;
       }
       return 0;
     }
 
-    public static final int GADGET_ID_FIELD_NUMBER = 10;
+    public static final int GADGET_ID_FIELD_NUMBER = 8;
     /**
-     * <code>uint32 gadget_id = 10;</code>
+     * <code>uint32 gadget_id = 8;</code>
      * @return Whether the gadgetId field is set.
      */
     @java.lang.Override
     public boolean hasGadgetId() {
-      return entityCase_ == 10;
+      return entityCase_ == 8;
     }
     /**
-     * <code>uint32 gadget_id = 10;</code>
+     * <code>uint32 gadget_id = 8;</code>
      * @return The gadgetId.
      */
     @java.lang.Override
     public int getGadgetId() {
-      if (entityCase_ == 10) {
+      if (entityCase_ == 8) {
         return (java.lang.Integer) entity_;
       }
       return 0;
     }
 
-    public static final int MURDERER_ENTITY_ID_FIELD_NUMBER = 15;
-    private int murdererEntityId_;
-    /**
-     * <code>uint32 murderer_entity_id = 15;</code>
-     * @return The murdererEntityId.
-     */
-    @java.lang.Override
-    public int getMurdererEntityId() {
-      return murdererEntityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -497,34 +576,40 @@ public final class DungeonPlayerDieNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+        output.writeEnum(1, dieType_);
+      }
+      if (entityCase_ == 2) {
+        output.writeUInt32(
+            2, (int)((java.lang.Integer) entity_));
+      }
+      if (reviveCount_ != 0) {
+        output.writeUInt32(3, reviveCount_);
+      }
+      if (waitTime_ != 0) {
+        output.writeUInt32(7, waitTime_);
+      }
+      if (entityCase_ == 8) {
+        output.writeUInt32(
+            8, (int)((java.lang.Integer) entity_));
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(9, dungeonId_);
+      }
+      if (gOEACHAMIAF_ != null) {
+        output.writeMessage(10, getGOEACHAMIAF());
+      }
+      if (murdererEntityId_ != 0) {
+        output.writeUInt32(11, murdererEntityId_);
+      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetStrengthenPointDataMap(),
           StrengthenPointDataMapDefaultEntryHolder.defaultEntry,
-          1);
-      if (entityCase_ == 3) {
-        output.writeUInt32(
-            3, (int)((java.lang.Integer) entity_));
-      }
-      if (dungeonId_ != 0) {
-        output.writeUInt32(4, dungeonId_);
-      }
-      if (reviveCount_ != 0) {
-        output.writeUInt32(6, reviveCount_);
-      }
-      if (waitTime_ != 0) {
-        output.writeUInt32(9, waitTime_);
-      }
-      if (entityCase_ == 10) {
-        output.writeUInt32(
-            10, (int)((java.lang.Integer) entity_));
-      }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(11, dieType_);
-      }
-      if (murdererEntityId_ != 0) {
-        output.writeUInt32(15, murdererEntityId_);
+          12);
+      if (gKHNLKAADNG_ != 0) {
+        output.writeUInt32(13, gKHNLKAADNG_);
       }
       unknownFields.writeTo(output);
     }
@@ -535,6 +620,40 @@ public final class DungeonPlayerDieNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(1, dieType_);
+      }
+      if (entityCase_ == 2) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              2, (int)((java.lang.Integer) entity_));
+      }
+      if (reviveCount_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, reviveCount_);
+      }
+      if (waitTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, waitTime_);
+      }
+      if (entityCase_ == 8) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              8, (int)((java.lang.Integer) entity_));
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, dungeonId_);
+      }
+      if (gOEACHAMIAF_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getGOEACHAMIAF());
+      }
+      if (murdererEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, murdererEntityId_);
+      }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> entry
            : internalGetStrengthenPointDataMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
@@ -543,37 +662,11 @@ public final class DungeonPlayerDieNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, strengthenPointDataMap__);
+            .computeMessageSize(12, strengthenPointDataMap__);
       }
-      if (entityCase_ == 3) {
+      if (gKHNLKAADNG_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(
-              3, (int)((java.lang.Integer) entity_));
-      }
-      if (dungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, dungeonId_);
-      }
-      if (reviveCount_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, reviveCount_);
-      }
-      if (waitTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, waitTime_);
-      }
-      if (entityCase_ == 10) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(
-              10, (int)((java.lang.Integer) entity_));
-      }
-      if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, dieType_);
-      }
-      if (murdererEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, murdererEntityId_);
+          .computeUInt32Size(13, gKHNLKAADNG_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -590,24 +683,31 @@ public final class DungeonPlayerDieNotifyOuterClass {
       }
       emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify other = (emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify) obj;
 
+      if (dieType_ != other.dieType_) return false;
       if (getReviveCount()
           != other.getReviveCount()) return false;
-      if (!internalGetStrengthenPointDataMap().equals(
-          other.internalGetStrengthenPointDataMap())) return false;
-      if (dieType_ != other.dieType_) return false;
       if (getWaitTime()
           != other.getWaitTime()) return false;
       if (getDungeonId()
           != other.getDungeonId()) return false;
+      if (hasGOEACHAMIAF() != other.hasGOEACHAMIAF()) return false;
+      if (hasGOEACHAMIAF()) {
+        if (!getGOEACHAMIAF()
+            .equals(other.getGOEACHAMIAF())) return false;
+      }
       if (getMurdererEntityId()
           != other.getMurdererEntityId()) return false;
+      if (!internalGetStrengthenPointDataMap().equals(
+          other.internalGetStrengthenPointDataMap())) return false;
+      if (getGKHNLKAADNG()
+          != other.getGKHNLKAADNG()) return false;
       if (!getEntityCase().equals(other.getEntityCase())) return false;
       switch (entityCase_) {
-        case 3:
+        case 2:
           if (getMonsterId()
               != other.getMonsterId()) return false;
           break;
-        case 10:
+        case 8:
           if (getGadgetId()
               != other.getGadgetId()) return false;
           break;
@@ -625,26 +725,32 @@ public final class DungeonPlayerDieNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + REVIVE_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getReviveCount();
-      if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) {
-        hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode();
-      }
       hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + dieType_;
+      hash = (37 * hash) + REVIVE_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getReviveCount();
       hash = (37 * hash) + WAIT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getWaitTime();
       hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonId();
+      if (hasGOEACHAMIAF()) {
+        hash = (37 * hash) + GOEACHAMIAF_FIELD_NUMBER;
+        hash = (53 * hash) + getGOEACHAMIAF().hashCode();
+      }
       hash = (37 * hash) + MURDERER_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMurdererEntityId();
+      if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) {
+        hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode();
+      }
+      hash = (37 * hash) + GKHNLKAADNG_FIELD_NUMBER;
+      hash = (53 * hash) + getGKHNLKAADNG();
       switch (entityCase_) {
-        case 3:
+        case 2:
           hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
           hash = (53 * hash) + getMonsterId();
           break;
-        case 10:
+        case 8:
           hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
           hash = (53 * hash) + getGadgetId();
           break;
@@ -747,11 +853,6 @@ public final class DungeonPlayerDieNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28240
-     * Obf: JNJBBMEHNOL
-     * </pre>
-     *
      * Protobuf type {@code DungeonPlayerDieNotify}
      */
     public static final class Builder extends
@@ -767,7 +868,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 1:
+          case 12:
             return internalGetStrengthenPointDataMap();
           default:
             throw new RuntimeException(
@@ -778,7 +879,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 1:
+          case 12:
             return internalGetMutableStrengthenPointDataMap();
           default:
             throw new RuntimeException(
@@ -811,17 +912,25 @@ public final class DungeonPlayerDieNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        reviveCount_ = 0;
-
-        internalGetMutableStrengthenPointDataMap().clear();
         dieType_ = 0;
 
+        reviveCount_ = 0;
+
         waitTime_ = 0;
 
         dungeonId_ = 0;
 
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = null;
+        } else {
+          gOEACHAMIAF_ = null;
+          gOEACHAMIAFBuilder_ = null;
+        }
         murdererEntityId_ = 0;
 
+        internalGetMutableStrengthenPointDataMap().clear();
+        gKHNLKAADNG_ = 0;
+
         entityCase_ = 0;
         entity_ = null;
         return this;
@@ -851,19 +960,25 @@ public final class DungeonPlayerDieNotifyOuterClass {
       public emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify buildPartial() {
         emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify result = new emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify(this);
         int from_bitField0_ = bitField0_;
-        result.reviveCount_ = reviveCount_;
-        result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap();
-        result.strengthenPointDataMap_.makeImmutable();
         result.dieType_ = dieType_;
+        result.reviveCount_ = reviveCount_;
         result.waitTime_ = waitTime_;
         result.dungeonId_ = dungeonId_;
-        if (entityCase_ == 3) {
-          result.entity_ = entity_;
-        }
-        if (entityCase_ == 10) {
-          result.entity_ = entity_;
+        if (gOEACHAMIAFBuilder_ == null) {
+          result.gOEACHAMIAF_ = gOEACHAMIAF_;
+        } else {
+          result.gOEACHAMIAF_ = gOEACHAMIAFBuilder_.build();
         }
         result.murdererEntityId_ = murdererEntityId_;
+        result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap();
+        result.strengthenPointDataMap_.makeImmutable();
+        result.gKHNLKAADNG_ = gKHNLKAADNG_;
+        if (entityCase_ == 2) {
+          result.entity_ = entity_;
+        }
+        if (entityCase_ == 8) {
+          result.entity_ = entity_;
+        }
         result.entityCase_ = entityCase_;
         onBuilt();
         return result;
@@ -913,23 +1028,29 @@ public final class DungeonPlayerDieNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify other) {
         if (other == emu.grasscutter.net.proto.DungeonPlayerDieNotifyOuterClass.DungeonPlayerDieNotify.getDefaultInstance()) return this;
-        if (other.getReviveCount() != 0) {
-          setReviveCount(other.getReviveCount());
-        }
-        internalGetMutableStrengthenPointDataMap().mergeFrom(
-            other.internalGetStrengthenPointDataMap());
         if (other.dieType_ != 0) {
           setDieTypeValue(other.getDieTypeValue());
         }
+        if (other.getReviveCount() != 0) {
+          setReviveCount(other.getReviveCount());
+        }
         if (other.getWaitTime() != 0) {
           setWaitTime(other.getWaitTime());
         }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
+        if (other.hasGOEACHAMIAF()) {
+          mergeGOEACHAMIAF(other.getGOEACHAMIAF());
+        }
         if (other.getMurdererEntityId() != 0) {
           setMurdererEntityId(other.getMurdererEntityId());
         }
+        internalGetMutableStrengthenPointDataMap().mergeFrom(
+            other.internalGetStrengthenPointDataMap());
+        if (other.getGKHNLKAADNG() != 0) {
+          setGKHNLKAADNG(other.getGKHNLKAADNG());
+        }
         switch (other.getEntityCase()) {
           case MONSTER_ID: {
             setMonsterId(other.getMonsterId());
@@ -988,9 +1109,63 @@ public final class DungeonPlayerDieNotifyOuterClass {
 
       private int bitField0_;
 
+      private int dieType_ = 0;
+      /**
+       * <code>.PlayerDieType die_type = 1;</code>
+       * @return The enum numeric value on the wire for dieType.
+       */
+      @java.lang.Override public int getDieTypeValue() {
+        return dieType_;
+      }
+      /**
+       * <code>.PlayerDieType die_type = 1;</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 = 1;</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 = 1;</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;
+      }
+      /**
+       * <code>.PlayerDieType die_type = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieType() {
+        
+        dieType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int reviveCount_ ;
       /**
-       * <code>uint32 revive_count = 6;</code>
+       * <code>uint32 revive_count = 3;</code>
        * @return The reviveCount.
        */
       @java.lang.Override
@@ -998,7 +1173,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return reviveCount_;
       }
       /**
-       * <code>uint32 revive_count = 6;</code>
+       * <code>uint32 revive_count = 3;</code>
        * @param value The reviveCount to set.
        * @return This builder for chaining.
        */
@@ -1009,7 +1184,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 revive_count = 6;</code>
+       * <code>uint32 revive_count = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearReviveCount() {
@@ -1019,6 +1194,230 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return this;
       }
 
+      private int waitTime_ ;
+      /**
+       * <code>uint32 wait_time = 7;</code>
+       * @return The waitTime.
+       */
+      @java.lang.Override
+      public int getWaitTime() {
+        return waitTime_;
+      }
+      /**
+       * <code>uint32 wait_time = 7;</code>
+       * @param value The waitTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWaitTime(int value) {
+        
+        waitTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wait_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWaitTime() {
+        
+        waitTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int dungeonId_ ;
+      /**
+       * <code>uint32 dungeon_id = 9;</code>
+       * @return The dungeonId.
+       */
+      @java.lang.Override
+      public int getDungeonId() {
+        return dungeonId_;
+      }
+      /**
+       * <code>uint32 dungeon_id = 9;</code>
+       * @param value The dungeonId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonId(int value) {
+        
+        dungeonId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonId() {
+        
+        dungeonId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString gOEACHAMIAF_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> gOEACHAMIAFBuilder_;
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       * @return Whether the gOEACHAMIAF field is set.
+       */
+      public boolean hasGOEACHAMIAF() {
+        return gOEACHAMIAFBuilder_ != null || gOEACHAMIAF_ != null;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       * @return The gOEACHAMIAF.
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          return gOEACHAMIAF_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+        } else {
+          return gOEACHAMIAFBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public Builder setGOEACHAMIAF(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          gOEACHAMIAF_ = value;
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public Builder setGOEACHAMIAF(
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = builderForValue.build();
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public Builder mergeGOEACHAMIAF(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          if (gOEACHAMIAF_ != null) {
+            gOEACHAMIAF_ =
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.newBuilder(gOEACHAMIAF_).mergeFrom(value).buildPartial();
+          } else {
+            gOEACHAMIAF_ = value;
+          }
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public Builder clearGOEACHAMIAF() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = null;
+          onChanged();
+        } else {
+          gOEACHAMIAF_ = null;
+          gOEACHAMIAFBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getGOEACHAMIAFBuilder() {
+        
+        onChanged();
+        return getGOEACHAMIAFFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder() {
+        if (gOEACHAMIAFBuilder_ != null) {
+          return gOEACHAMIAFBuilder_.getMessageOrBuilder();
+        } else {
+          return gOEACHAMIAF_ == null ?
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+        }
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 10;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> 
+          getGOEACHAMIAFFieldBuilder() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAFBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder>(
+                  getGOEACHAMIAF(),
+                  getParentForChildren(),
+                  isClean());
+          gOEACHAMIAF_ = null;
+        }
+        return gOEACHAMIAFBuilder_;
+      }
+
+      private int murdererEntityId_ ;
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 11;</code>
+       * @return The murdererEntityId.
+       */
+      @java.lang.Override
+      public int getMurdererEntityId() {
+        return murdererEntityId_;
+      }
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 11;</code>
+       * @param value The murdererEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMurdererEntityId(int value) {
+        
+        murdererEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMurdererEntityId() {
+        
+        murdererEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> strengthenPointDataMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
@@ -1046,7 +1445,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
 
       @java.lang.Override
@@ -1064,7 +1463,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return getStrengthenPointDataMapMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
       @java.lang.Override
 
@@ -1072,7 +1471,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
       @java.lang.Override
 
@@ -1085,7 +1484,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
       @java.lang.Override
 
@@ -1106,7 +1505,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
 
       public Builder removeStrengthenPointDataMap(
@@ -1125,7 +1524,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return internalGetMutableStrengthenPointDataMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
       public Builder putStrengthenPointDataMap(
           int key,
@@ -1137,7 +1536,7 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 12;</code>
        */
 
       public Builder putAllStrengthenPointDataMap(
@@ -1147,156 +1546,71 @@ public final class DungeonPlayerDieNotifyOuterClass {
         return this;
       }
 
-      private int dieType_ = 0;
+      private int gKHNLKAADNG_ ;
       /**
-       * <code>.PlayerDieType die_type = 11;</code>
-       * @return The enum numeric value on the wire for dieType.
-       */
-      @java.lang.Override public int getDieTypeValue() {
-        return dieType_;
-      }
-      /**
-       * <code>.PlayerDieType die_type = 11;</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 = 11;</code>
-       * @return The dieType.
+       * <code>uint32 GKHNLKAADNG = 13;</code>
+       * @return The gKHNLKAADNG.
        */
       @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 int getGKHNLKAADNG() {
+        return gKHNLKAADNG_;
       }
       /**
-       * <code>.PlayerDieType die_type = 11;</code>
-       * @param value The dieType to set.
+       * <code>uint32 GKHNLKAADNG = 13;</code>
+       * @param value The gKHNLKAADNG to set.
        * @return This builder for chaining.
        */
-      public Builder setDieType(emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setGKHNLKAADNG(int value) {
         
-        dieType_ = value.getNumber();
+        gKHNLKAADNG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 11;</code>
+       * <code>uint32 GKHNLKAADNG = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDieType() {
+      public Builder clearGKHNLKAADNG() {
         
-        dieType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int waitTime_ ;
-      /**
-       * <code>uint32 wait_time = 9;</code>
-       * @return The waitTime.
-       */
-      @java.lang.Override
-      public int getWaitTime() {
-        return waitTime_;
-      }
-      /**
-       * <code>uint32 wait_time = 9;</code>
-       * @param value The waitTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWaitTime(int value) {
-        
-        waitTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wait_time = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWaitTime() {
-        
-        waitTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int dungeonId_ ;
-      /**
-       * <code>uint32 dungeon_id = 4;</code>
-       * @return The dungeonId.
-       */
-      @java.lang.Override
-      public int getDungeonId() {
-        return dungeonId_;
-      }
-      /**
-       * <code>uint32 dungeon_id = 4;</code>
-       * @param value The dungeonId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonId(int value) {
-        
-        dungeonId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonId() {
-        
-        dungeonId_ = 0;
+        gKHNLKAADNG_ = 0;
         onChanged();
         return this;
       }
 
       /**
-       * <code>uint32 monster_id = 3;</code>
+       * <code>uint32 monster_id = 2;</code>
        * @return Whether the monsterId field is set.
        */
       public boolean hasMonsterId() {
-        return entityCase_ == 3;
+        return entityCase_ == 2;
       }
       /**
-       * <code>uint32 monster_id = 3;</code>
+       * <code>uint32 monster_id = 2;</code>
        * @return The monsterId.
        */
       public int getMonsterId() {
-        if (entityCase_ == 3) {
+        if (entityCase_ == 2) {
           return (java.lang.Integer) entity_;
         }
         return 0;
       }
       /**
-       * <code>uint32 monster_id = 3;</code>
+       * <code>uint32 monster_id = 2;</code>
        * @param value The monsterId to set.
        * @return This builder for chaining.
        */
       public Builder setMonsterId(int value) {
-        entityCase_ = 3;
+        entityCase_ = 2;
         entity_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 monster_id = 3;</code>
+       * <code>uint32 monster_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearMonsterId() {
-        if (entityCase_ == 3) {
+        if (entityCase_ == 2) {
           entityCase_ = 0;
           entity_ = null;
           onChanged();
@@ -1305,76 +1619,45 @@ public final class DungeonPlayerDieNotifyOuterClass {
       }
 
       /**
-       * <code>uint32 gadget_id = 10;</code>
+       * <code>uint32 gadget_id = 8;</code>
        * @return Whether the gadgetId field is set.
        */
       public boolean hasGadgetId() {
-        return entityCase_ == 10;
+        return entityCase_ == 8;
       }
       /**
-       * <code>uint32 gadget_id = 10;</code>
+       * <code>uint32 gadget_id = 8;</code>
        * @return The gadgetId.
        */
       public int getGadgetId() {
-        if (entityCase_ == 10) {
+        if (entityCase_ == 8) {
           return (java.lang.Integer) entity_;
         }
         return 0;
       }
       /**
-       * <code>uint32 gadget_id = 10;</code>
+       * <code>uint32 gadget_id = 8;</code>
        * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
       public Builder setGadgetId(int value) {
-        entityCase_ = 10;
+        entityCase_ = 8;
         entity_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 gadget_id = 10;</code>
+       * <code>uint32 gadget_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetId() {
-        if (entityCase_ == 10) {
+        if (entityCase_ == 8) {
           entityCase_ = 0;
           entity_ = null;
           onChanged();
         }
         return this;
       }
-
-      private int murdererEntityId_ ;
-      /**
-       * <code>uint32 murderer_entity_id = 15;</code>
-       * @return The murdererEntityId.
-       */
-      @java.lang.Override
-      public int getMurdererEntityId() {
-        return murdererEntityId_;
-      }
-      /**
-       * <code>uint32 murderer_entity_id = 15;</code>
-       * @param value The murdererEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMurdererEntityId(int value) {
-        
-        murdererEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 murderer_entity_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMurdererEntityId() {
-        
-        murdererEntityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1447,40 +1730,44 @@ public final class DungeonPlayerDieNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034DungeonPlayerDieNotify.proto\032\031Strength" +
-      "enPointData.proto\032\023PlayerDieType.proto\"\365" +
-      "\002\n\026DungeonPlayerDieNotify\022\024\n\014revive_coun" +
-      "t\030\006 \001(\r\022V\n\031strengthen_point_data_map\030\001 \003" +
-      "(\01323.DungeonPlayerDieNotify.StrengthenPo" +
-      "intDataMapEntry\022 \n\010die_type\030\013 \001(\0162\016.Play" +
-      "erDieType\022\021\n\twait_time\030\t \001(\r\022\022\n\ndungeon_" +
-      "id\030\004 \001(\r\022\024\n\nmonster_id\030\003 \001(\rH\000\022\023\n\tgadget" +
-      "_id\030\n \001(\rH\000\022\032\n\022murderer_entity_id\030\017 \001(\r\032" +
-      "S\n\033StrengthenPointDataMapEntry\022\013\n\003key\030\001 " +
-      "\001(\r\022#\n\005value\030\002 \001(\0132\024.StrengthenPointData" +
-      ":\0028\001B\010\n\006entityB\033\n\031emu.grasscutter.net.pr" +
-      "otob\006proto3"
+      "\n\034DungeonPlayerDieNotify.proto\032\023PlayerDi" +
+      "eType.proto\032\023AbilityString.proto\032\031Streng" +
+      "thenPointData.proto\"\257\003\n\026DungeonPlayerDie" +
+      "Notify\022 \n\010die_type\030\001 \001(\0162\016.PlayerDieType" +
+      "\022\024\n\014revive_count\030\003 \001(\r\022\021\n\twait_time\030\007 \001(" +
+      "\r\022\022\n\ndungeon_id\030\t \001(\r\022#\n\013GOEACHAMIAF\030\n \001" +
+      "(\0132\016.AbilityString\022\032\n\022murderer_entity_id" +
+      "\030\013 \001(\r\022V\n\031strengthen_point_data_map\030\014 \003(" +
+      "\01323.DungeonPlayerDieNotify.StrengthenPoi" +
+      "ntDataMapEntry\022\023\n\013GKHNLKAADNG\030\r \001(\r\022\024\n\nm" +
+      "onster_id\030\002 \001(\rH\000\022\023\n\tgadget_id\030\010 \001(\rH\000\032S" +
+      "\n\033StrengthenPointDataMapEntry\022\013\n\003key\030\001 \001" +
+      "(\r\022#\n\005value\030\002 \001(\0132\024.StrengthenPointData:" +
+      "\0028\001B\010\n\006EntityB\033\n\031emu.grasscutter.net.pro" +
+      "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(),
         });
     internal_static_DungeonPlayerDieNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_DungeonPlayerDieNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonPlayerDieNotify_descriptor,
-        new java.lang.String[] { "ReviveCount", "StrengthenPointDataMap", "DieType", "WaitTime", "DungeonId", "MonsterId", "GadgetId", "MurdererEntityId", "Entity", });
+        new java.lang.String[] { "DieType", "ReviveCount", "WaitTime", "DungeonId", "GOEACHAMIAF", "MurdererEntityId", "StrengthenPointDataMap", "GKHNLKAADNG", "MonsterId", "GadgetId", "Entity", });
     internal_static_DungeonPlayerDieNotify_StrengthenPointDataMapEntry_descriptor =
       internal_static_DungeonPlayerDieNotify_descriptor.getNestedTypes().get(0);
     internal_static_DungeonPlayerDieNotify_StrengthenPointDataMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonPlayerDieNotify_StrengthenPointDataMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
-    emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonPreloadMonsterNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPreloadMonsterNotifyOuterClass.java
new file mode 100644
index 000000000..de89f6c45
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonPreloadMonsterNotifyOuterClass.java
@@ -0,0 +1,962 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DungeonPreloadMonsterNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class DungeonPreloadMonsterNotifyOuterClass {
+  private DungeonPreloadMonsterNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface DungeonPreloadMonsterNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:DungeonPreloadMonsterNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return A list containing the platformList.
+     */
+    java.util.List<emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType> getPlatformListList();
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return The count of platformList.
+     */
+    int getPlatformListCount();
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @param index The index of the element to return.
+     * @return The platformList at the given index.
+     */
+    emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType getPlatformList(int index);
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return A list containing the enum numeric values on the wire for platformList.
+     */
+    java.util.List<java.lang.Integer>
+    getPlatformListValueList();
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @param index The index of the value to return.
+     * @return The enum numeric value on the wire of platformList at the given index.
+     */
+    int getPlatformListValue(int index);
+
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @return A list containing the monsterIdList.
+     */
+    java.util.List<java.lang.Integer> getMonsterIdListList();
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @return The count of monsterIdList.
+     */
+    int getMonsterIdListCount();
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The monsterIdList at the given index.
+     */
+    int getMonsterIdList(int index);
+  }
+  /**
+   * Protobuf type {@code DungeonPreloadMonsterNotify}
+   */
+  public static final class DungeonPreloadMonsterNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:DungeonPreloadMonsterNotify)
+      DungeonPreloadMonsterNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use DungeonPreloadMonsterNotify.newBuilder() to construct.
+    private DungeonPreloadMonsterNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private DungeonPreloadMonsterNotify() {
+      platformList_ = java.util.Collections.emptyList();
+      monsterIdList_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new DungeonPreloadMonsterNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private DungeonPreloadMonsterNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 16: {
+              int rawValue = input.readEnum();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                platformList_ = new java.util.ArrayList<java.lang.Integer>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              platformList_.add(rawValue);
+              break;
+            }
+            case 18: {
+              int length = input.readRawVarint32();
+              int oldLimit = input.pushLimit(length);
+              while(input.getBytesUntilLimit() > 0) {
+                int rawValue = input.readEnum();
+                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                  platformList_ = new java.util.ArrayList<java.lang.Integer>();
+                  mutable_bitField0_ |= 0x00000001;
+                }
+                platformList_.add(rawValue);
+              }
+              input.popLimit(oldLimit);
+              break;
+            }
+            case 64: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                monsterIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              monsterIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 66: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                monsterIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                monsterIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          platformList_ = java.util.Collections.unmodifiableList(platformList_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          monsterIdList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.internal_static_DungeonPreloadMonsterNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.internal_static_DungeonPreloadMonsterNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.class, emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.Builder.class);
+    }
+
+    public static final int PLATFORM_LIST_FIELD_NUMBER = 2;
+    private java.util.List<java.lang.Integer> platformList_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType> platformList_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType>() {
+              public emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType convert(java.lang.Integer from) {
+                @SuppressWarnings("deprecation")
+                emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType result = emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType.valueOf(from);
+                return result == null ? emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType.UNRECOGNIZED : result;
+              }
+            };
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return A list containing the platformList.
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType> getPlatformListList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType>(platformList_, platformList_converter_);
+    }
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return The count of platformList.
+     */
+    @java.lang.Override
+    public int getPlatformListCount() {
+      return platformList_.size();
+    }
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @param index The index of the element to return.
+     * @return The platformList at the given index.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType getPlatformList(int index) {
+      return platformList_converter_.convert(platformList_.get(index));
+    }
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @return A list containing the enum numeric values on the wire for platformList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+    getPlatformListValueList() {
+      return platformList_;
+    }
+    /**
+     * <code>repeated .PlatformType platform_list = 2;</code>
+     * @param index The index of the value to return.
+     * @return The enum numeric value on the wire of platformList at the given index.
+     */
+    @java.lang.Override
+    public int getPlatformListValue(int index) {
+      return platformList_.get(index);
+    }
+    private int platformListMemoizedSerializedSize;
+
+    public static final int MONSTER_ID_LIST_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList monsterIdList_;
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @return A list containing the monsterIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getMonsterIdListList() {
+      return monsterIdList_;
+    }
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @return The count of monsterIdList.
+     */
+    public int getMonsterIdListCount() {
+      return monsterIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 monster_id_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The monsterIdList at the given index.
+     */
+    public int getMonsterIdList(int index) {
+      return monsterIdList_.getInt(index);
+    }
+    private int monsterIdListMemoizedSerializedSize = -1;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (getPlatformListList().size() > 0) {
+        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(platformListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < platformList_.size(); i++) {
+        output.writeEnumNoTag(platformList_.get(i));
+      }
+      if (getMonsterIdListList().size() > 0) {
+        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(monsterIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < monsterIdList_.size(); i++) {
+        output.writeUInt32NoTag(monsterIdList_.getInt(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < platformList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeEnumSizeNoTag(platformList_.get(i));
+        }
+        size += dataSize;
+        if (!getPlatformListList().isEmpty()) {  size += 1;
+          size += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(dataSize);
+        }platformListMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < monsterIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(monsterIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getMonsterIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        monsterIdListMemoizedSerializedSize = dataSize;
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify other = (emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify) obj;
+
+      if (!platformList_.equals(other.platformList_)) return false;
+      if (!getMonsterIdListList()
+          .equals(other.getMonsterIdListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getPlatformListCount() > 0) {
+        hash = (37 * hash) + PLATFORM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + platformList_.hashCode();
+      }
+      if (getMonsterIdListCount() > 0) {
+        hash = (37 * hash) + MONSTER_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getMonsterIdListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code DungeonPreloadMonsterNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:DungeonPreloadMonsterNotify)
+        emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.internal_static_DungeonPreloadMonsterNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.internal_static_DungeonPreloadMonsterNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.class, emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        platformList_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        monsterIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.internal_static_DungeonPreloadMonsterNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify build() {
+        emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify buildPartial() {
+        emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify result = new emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify(this);
+        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          platformList_ = java.util.Collections.unmodifiableList(platformList_);
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.platformList_ = platformList_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          monsterIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.monsterIdList_ = monsterIdList_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify other) {
+        if (other == emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify.getDefaultInstance()) return this;
+        if (!other.platformList_.isEmpty()) {
+          if (platformList_.isEmpty()) {
+            platformList_ = other.platformList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensurePlatformListIsMutable();
+            platformList_.addAll(other.platformList_);
+          }
+          onChanged();
+        }
+        if (!other.monsterIdList_.isEmpty()) {
+          if (monsterIdList_.isEmpty()) {
+            monsterIdList_ = other.monsterIdList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureMonsterIdListIsMutable();
+            monsterIdList_.addAll(other.monsterIdList_);
+          }
+          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.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<java.lang.Integer> platformList_ =
+        java.util.Collections.emptyList();
+      private void ensurePlatformListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          platformList_ = new java.util.ArrayList<java.lang.Integer>(platformList_);
+          bitField0_ |= 0x00000001;
+        }
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @return A list containing the platformList.
+       */
+      public java.util.List<emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType> getPlatformListList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType>(platformList_, platformList_converter_);
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @return The count of platformList.
+       */
+      public int getPlatformListCount() {
+        return platformList_.size();
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param index The index of the element to return.
+       * @return The platformList at the given index.
+       */
+      public emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType getPlatformList(int index) {
+        return platformList_converter_.convert(platformList_.get(index));
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param index The index to set the value at.
+       * @param value The platformList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlatformList(
+          int index, emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePlatformListIsMutable();
+        platformList_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param value The platformList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPlatformList(emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensurePlatformListIsMutable();
+        platformList_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param values The platformList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPlatformList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType> values) {
+        ensurePlatformListIsMutable();
+        for (emu.grasscutter.net.proto.PlatformTypeOuterClass.PlatformType value : values) {
+          platformList_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlatformList() {
+        platformList_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @return A list containing the enum numeric values on the wire for platformList.
+       */
+      public java.util.List<java.lang.Integer>
+      getPlatformListValueList() {
+        return java.util.Collections.unmodifiableList(platformList_);
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param index The index of the value to return.
+       * @return The enum numeric value on the wire of platformList at the given index.
+       */
+      public int getPlatformListValue(int index) {
+        return platformList_.get(index);
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param index The index of the value to return.
+       * @return The enum numeric value on the wire of platformList at the given index.
+       * @return This builder for chaining.
+       */
+      public Builder setPlatformListValue(
+          int index, int value) {
+        ensurePlatformListIsMutable();
+        platformList_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param value The enum numeric value on the wire for platformList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPlatformListValue(int value) {
+        ensurePlatformListIsMutable();
+        platformList_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .PlatformType platform_list = 2;</code>
+       * @param values The enum numeric values on the wire for platformList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPlatformListValue(
+          java.lang.Iterable<java.lang.Integer> values) {
+        ensurePlatformListIsMutable();
+        for (int value : values) {
+          platformList_.add(value);
+        }
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList monsterIdList_ = emptyIntList();
+      private void ensureMonsterIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          monsterIdList_ = mutableCopy(monsterIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @return A list containing the monsterIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getMonsterIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(monsterIdList_) : monsterIdList_;
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @return The count of monsterIdList.
+       */
+      public int getMonsterIdListCount() {
+        return monsterIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @param index The index of the element to return.
+       * @return The monsterIdList at the given index.
+       */
+      public int getMonsterIdList(int index) {
+        return monsterIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The monsterIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMonsterIdList(
+          int index, int value) {
+        ensureMonsterIdListIsMutable();
+        monsterIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @param value The monsterIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addMonsterIdList(int value) {
+        ensureMonsterIdListIsMutable();
+        monsterIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @param values The monsterIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllMonsterIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMonsterIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, monsterIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 monster_id_list = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMonsterIdList() {
+        monsterIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:DungeonPreloadMonsterNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:DungeonPreloadMonsterNotify)
+    private static final emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify();
+    }
+
+    public static emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<DungeonPreloadMonsterNotify>
+        PARSER = new com.google.protobuf.AbstractParser<DungeonPreloadMonsterNotify>() {
+      @java.lang.Override
+      public DungeonPreloadMonsterNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new DungeonPreloadMonsterNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<DungeonPreloadMonsterNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<DungeonPreloadMonsterNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DungeonPreloadMonsterNotifyOuterClass.DungeonPreloadMonsterNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_DungeonPreloadMonsterNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_DungeonPreloadMonsterNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n!DungeonPreloadMonsterNotify.proto\032\022Pla" +
+      "tformType.proto\"\\\n\033DungeonPreloadMonster" +
+      "Notify\022$\n\rplatform_list\030\002 \003(\0162\r.Platform" +
+      "Type\022\027\n\017monster_id_list\030\010 \003(\rB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.PlatformTypeOuterClass.getDescriptor(),
+        });
+    internal_static_DungeonPreloadMonsterNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_DungeonPreloadMonsterNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_DungeonPreloadMonsterNotify_descriptor,
+        new java.lang.String[] { "PlatformList", "MonsterIdList", });
+    emu.grasscutter.net.proto.PlatformTypeOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java
index 00332c29c..dcf3c47fd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleExhibitionInfoOuterClass.java
@@ -34,32 +34,33 @@ public final class DungeonSettleExhibitionInfoOuterClass {
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoOrBuilder();
 
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo> 
         getCardListList();
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo getCardList(int index);
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     int getCardListCount();
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder> 
         getCardListOrBuilderList();
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder getCardListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * Obf: EKCOLEKCJKB
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code DungeonSettleExhibitionInfo}
@@ -121,7 +122,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
 
               break;
             }
-            case 98: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 cardList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -191,17 +192,17 @@ public final class DungeonSettleExhibitionInfoOuterClass {
       return getPlayerInfo();
     }
 
-    public static final int CARD_LIST_FIELD_NUMBER = 12;
+    public static final int CARD_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo> cardList_;
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo> getCardListList() {
       return cardList_;
     }
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder> 
@@ -209,21 +210,21 @@ public final class DungeonSettleExhibitionInfoOuterClass {
       return cardList_;
     }
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     @java.lang.Override
     public int getCardListCount() {
       return cardList_.size();
     }
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo getCardList(int index) {
       return cardList_.get(index);
     }
     /**
-     * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+     * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder getCardListOrBuilder(
@@ -249,7 +250,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         output.writeMessage(3, getPlayerInfo());
       }
       for (int i = 0; i < cardList_.size(); i++) {
-        output.writeMessage(12, cardList_.get(i));
+        output.writeMessage(8, cardList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -266,7 +267,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
       }
       for (int i = 0; i < cardList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, cardList_.get(i));
+          .computeMessageSize(8, cardList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -406,7 +407,8 @@ public final class DungeonSettleExhibitionInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: EKCOLEKCJKB
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code DungeonSettleExhibitionInfo}
@@ -739,7 +741,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
           emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder> cardListBuilder_;
 
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo> getCardListList() {
         if (cardListBuilder_ == null) {
@@ -749,7 +751,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public int getCardListCount() {
         if (cardListBuilder_ == null) {
@@ -759,7 +761,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo getCardList(int index) {
         if (cardListBuilder_ == null) {
@@ -769,7 +771,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder setCardList(
           int index, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo value) {
@@ -786,7 +788,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder setCardList(
           int index, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder builderForValue) {
@@ -800,7 +802,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder addCardList(emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo value) {
         if (cardListBuilder_ == null) {
@@ -816,7 +818,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder addCardList(
           int index, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo value) {
@@ -833,7 +835,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder addCardList(
           emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder builderForValue) {
@@ -847,7 +849,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder addCardList(
           int index, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder builderForValue) {
@@ -861,7 +863,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder addAllCardList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo> values) {
@@ -876,7 +878,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder clearCardList() {
         if (cardListBuilder_ == null) {
@@ -889,7 +891,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public Builder removeCardList(int index) {
         if (cardListBuilder_ == null) {
@@ -902,14 +904,14 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder getCardListBuilder(
           int index) {
         return getCardListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder getCardListOrBuilder(
           int index) {
@@ -919,7 +921,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfoOrBuilder> 
            getCardListOrBuilderList() {
@@ -930,14 +932,14 @@ public final class DungeonSettleExhibitionInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder addCardListBuilder() {
         return getCardListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder addCardListBuilder(
           int index) {
@@ -945,7 +947,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
             index, emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ExhibitionDisplayInfo card_list = 12;</code>
+       * <code>repeated .ExhibitionDisplayInfo card_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ExhibitionDisplayInfoOuterClass.ExhibitionDisplayInfo.Builder> 
            getCardListBuilderList() {
@@ -1036,7 +1038,7 @@ public final class DungeonSettleExhibitionInfoOuterClass {
       "inePlayerInfo.proto\032\033ExhibitionDisplayIn" +
       "fo.proto\"p\n\033DungeonSettleExhibitionInfo\022" +
       "&\n\013player_info\030\003 \001(\0132\021.OnlinePlayerInfo\022" +
-      ")\n\tcard_list\030\014 \003(\0132\026.ExhibitionDisplayIn" +
+      ")\n\tcard_list\030\010 \003(\0132\026.ExhibitionDisplayIn" +
       "foB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java
index a7b7134a8..10ee443b8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/DungeonSettleNotifyOuterClass.java
@@ -19,41 +19,11 @@ public final class DungeonSettleNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_success = 3;</code>
-     * @return The isSuccess.
-     */
-    boolean getIsSuccess();
-
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> 
-        getExhibitionInfoListList();
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index);
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    int getExhibitionInfoListCount();
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
-        getExhibitionInfoListOrBuilderList();
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     int getStrengthenPointDataMapCount();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     boolean containsStrengthenPointDataMap(
         int key);
@@ -64,30 +34,95 @@ public final class DungeonSettleNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
     getStrengthenPointDataMapMap();
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrDefault(
         int key,
         emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData defaultValue);
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
 
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData getStrengthenPointDataMapOrThrow(
         int key);
 
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>bool is_success = 4;</code>
+     * @return The isSuccess.
+     */
+    boolean getIsSuccess();
+
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @return A list containing the failCondList.
+     */
+    java.util.List<java.lang.Integer> getFailCondListList();
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @return The count of failCondList.
+     */
+    int getFailCondListCount();
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The failCondList at the given index.
+     */
+    int getFailCondList(int index);
+
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> 
+        getExhibitionInfoListList();
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index);
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    int getExhibitionInfoListCount();
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
+        getExhibitionInfoListOrBuilderList();
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 dungeon_id = 8;</code>
+     * @return The dungeonId.
+     */
+    int getDungeonId();
+
+    /**
+     * <code>uint32 use_time = 9;</code>
+     * @return The useTime.
+     */
+    int getUseTime();
+
+    /**
+     * <code>uint32 close_time = 10;</code>
+     * @return The closeTime.
+     */
+    int getCloseTime();
+
+    /**
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     int getSettleShowCount();
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     boolean containsSettleShow(
         int key);
@@ -98,304 +133,69 @@ public final class DungeonSettleNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList>
     getSettleShow();
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList>
     getSettleShowMap();
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
 
     emu.grasscutter.net.proto.ParamListOuterClass.ParamList getSettleShowOrDefault(
         int key,
         emu.grasscutter.net.proto.ParamListOuterClass.ParamList defaultValue);
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
 
     emu.grasscutter.net.proto.ParamListOuterClass.ParamList getSettleShowOrThrow(
         int key);
 
     /**
-     * <code>uint32 create_player_uid = 1;</code>
+     * <code>uint32 create_player_uid = 12;</code>
      * @return The createPlayerUid.
      */
     int getCreatePlayerUid();
 
     /**
-     * <code>uint32 dungeon_id = 7;</code>
-     * @return The dungeonId.
-     */
-    int getDungeonId();
-
-    /**
-     * <code>uint32 close_time = 6;</code>
-     * @return The closeTime.
-     */
-    int getCloseTime();
-
-    /**
-     * <code>uint32 result = 5;</code>
+     * <code>uint32 result = 14;</code>
      * @return The result.
      */
     int getResult();
 
     /**
-     * <code>uint32 use_time = 15;</code>
-     * @return The useTime.
-     */
-    int getUseTime();
-
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @return A list containing the failCondList.
-     */
-    java.util.List<java.lang.Integer> getFailCondListList();
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @return The count of failCondList.
-     */
-    int getFailCondListCount();
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @param index The index of the element to return.
-     * @return The failCondList at the given index.
-     */
-    int getFailCondList(int index);
-
-    /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      * @return Whether the towerLevelEndNotify field is set.
      */
     boolean hasTowerLevelEndNotify();
     /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      * @return The towerLevelEndNotify.
      */
     emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify();
     /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      */
     emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder();
 
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      * @return Whether the trialAvatarFirstPassDungeonNotify field is set.
      */
     boolean hasTrialAvatarFirstPassDungeonNotify();
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      * @return The trialAvatarFirstPassDungeonNotify.
      */
     emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify getTrialAvatarFirstPassDungeonNotify();
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      */
     emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder();
 
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
-     */
-    boolean hasChannellerSlabLoopDungeonResultInfo();
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     * @return The channellerSlabLoopDungeonResultInfo.
-     */
-    emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo();
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     */
-    emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder();
-
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     * @return Whether the effigyChallengeDungeonResultInfo field is set.
-     */
-    boolean hasEffigyChallengeDungeonResultInfo();
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     * @return The effigyChallengeDungeonResultInfo.
-     */
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo();
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     */
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder();
-
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     * @return Whether the roguelikeDungeonSettleInfo field is set.
-     */
-    boolean hasRoguelikeDungeonSettleInfo();
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     * @return The roguelikeDungeonSettleInfo.
-     */
-    emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo();
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     */
-    emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder();
-
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     * @return Whether the crystalLinkSettleInfo field is set.
-     */
-    boolean hasCrystalLinkSettleInfo();
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     * @return The crystalLinkSettleInfo.
-     */
-    emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo();
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     */
-    emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder();
-
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     * @return Whether the summerTimeV2DungeonSettleInfo field is set.
-     */
-    boolean hasSummerTimeV2DungeonSettleInfo();
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     * @return The summerTimeV2DungeonSettleInfo.
-     */
-    emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo();
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     */
-    emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder();
-
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     * @return Whether the instableSpraySettleInfo field is set.
-     */
-    boolean hasInstableSpraySettleInfo();
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     * @return The instableSpraySettleInfo.
-     */
-    emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo();
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     */
-    emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder();
-
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     * @return Whether the windFieldDungeonSettleInfo field is set.
-     */
-    boolean hasWindFieldDungeonSettleInfo();
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     * @return The windFieldDungeonSettleInfo.
-     */
-    emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo();
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     */
-    emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder();
-
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     * @return Whether the effigyChallengeV2SettleInfo field is set.
-     */
-    boolean hasEffigyChallengeV2SettleInfo();
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     * @return The effigyChallengeV2SettleInfo.
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo();
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     */
-    emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder();
-
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     * @return Whether the teamChainSettleInfo field is set.
-     */
-    boolean hasTeamChainSettleInfo();
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     * @return The teamChainSettleInfo.
-     */
-    emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo();
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     */
-    emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder();
-
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     * @return Whether the pacmanSettleInfo field is set.
-     */
-    boolean hasPacmanSettleInfo();
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     * @return The pacmanSettleInfo.
-     */
-    emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo();
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     */
-    emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder();
-
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     * @return Whether the fungusFighterV2SettleInfo field is set.
-     */
-    boolean hasFungusFighterV2SettleInfo();
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     * @return The fungusFighterV2SettleInfo.
-     */
-    emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo();
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     */
-    emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder();
-
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     * @return Whether the bladeDanceSettleInfo field is set.
-     */
-    boolean hasBladeDanceSettleInfo();
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     * @return The bladeDanceSettleInfo.
-     */
-    emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo();
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     */
-    emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder();
-
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     * @return Whether the multiCharacterDungeonSettleInfo field is set.
-     */
-    boolean hasMultiCharacterDungeonSettleInfo();
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     * @return The multiCharacterDungeonSettleInfo.
-     */
-    emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo();
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     */
-    emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder();
-
     public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * CmdId: 22323
-   * Obf: OHGJJKADNFH
-   * </pre>
-   *
    * Protobuf type {@code DungeonSettleNotify}
    */
   public static final class DungeonSettleNotify extends
@@ -408,8 +208,8 @@ public final class DungeonSettleNotifyOuterClass {
       super(builder);
     }
     private DungeonSettleNotify() {
-      exhibitionInfoList_ = java.util.Collections.emptyList();
       failCondList_ = emptyIntList();
+      exhibitionInfoList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -443,16 +243,11 @@ public final class DungeonSettleNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              createPlayerUid_ = input.readUInt32();
-              break;
-            }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 strengthenPointDataMap_ = com.google.protobuf.MapField.newMapField(
                     StrengthenPointDataMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
               strengthenPointDataMap__ = input.readMessage(
@@ -461,40 +256,25 @@ public final class DungeonSettleNotifyOuterClass {
                   strengthenPointDataMap__.getKey(), strengthenPointDataMap__.getValue());
               break;
             }
-            case 24: {
+            case 32: {
 
               isSuccess_ = input.readBool();
               break;
             }
             case 40: {
-
-              result_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              closeTime_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              dungeonId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 failCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               failCondList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 failCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 failCondList_.addInt(input.readUInt32());
@@ -502,20 +282,35 @@ public final class DungeonSettleNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 exhibitionInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000004;
               }
               exhibitionInfoList_.add(
                   input.readMessage(emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.parser(), extensionRegistry));
               break;
             }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 64: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              useTime_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              closeTime_ = input.readUInt32();
+              break;
+            }
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 settleShow_ = com.google.protobuf.MapField.newMapField(
                     SettleShowDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000008;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList>
               settleShow__ = input.readMessage(
@@ -524,112 +319,19 @@ public final class DungeonSettleNotifyOuterClass {
                   settleShow__.getKey(), settleShow__.getValue());
               break;
             }
-            case 120: {
+            case 96: {
 
-              useTime_ = input.readUInt32();
+              createPlayerUid_ = input.readUInt32();
               break;
             }
-            case 1394: {
-              emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 174) {
-                subBuilder = ((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 174;
+            case 112: {
+
+              result_ = input.readUInt32();
               break;
             }
-            case 4626: {
-              emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 578) {
-                subBuilder = ((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 578;
-              break;
-            }
-            case 4770: {
-              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 596) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 596;
-              break;
-            }
-            case 5618: {
-              emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 702) {
-                subBuilder = ((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 702;
-              break;
-            }
-            case 5714: {
-              emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 714) {
-                subBuilder = ((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 714;
-              break;
-            }
-            case 6042: {
-              emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 755) {
-                subBuilder = ((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 755;
-              break;
-            }
-            case 6466: {
-              emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder subBuilder = null;
-              if (detailCase_ == 808) {
-                subBuilder = ((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 808;
-              break;
-            }
-            case 9298: {
+            case 5458: {
               emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder subBuilder = null;
-              if (detailCase_ == 1162) {
+              if (detailCase_ == 682) {
                 subBuilder = ((emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_).toBuilder();
               }
               detail_ =
@@ -638,96 +340,12 @@ public final class DungeonSettleNotifyOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_);
                 detail_ = subBuilder.buildPartial();
               }
-              detailCase_ = 1162;
+              detailCase_ = 682;
               break;
             }
-            case 10506: {
-              emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 1313) {
-                subBuilder = ((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1313;
-              break;
-            }
-            case 12354: {
-              emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 1544) {
-                subBuilder = ((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1544;
-              break;
-            }
-            case 13034: {
-              emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 1629) {
-                subBuilder = ((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1629;
-              break;
-            }
-            case 15090: {
-              emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 1886) {
-                subBuilder = ((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1886;
-              break;
-            }
-            case 15210: {
-              emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 1901) {
-                subBuilder = ((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 1901;
-              break;
-            }
-            case 16082: {
-              emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder subBuilder = null;
-              if (detailCase_ == 2010) {
-                subBuilder = ((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_).toBuilder();
-              }
-              detail_ =
-                  input.readMessage(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_);
-                detail_ = subBuilder.buildPartial();
-              }
-              detailCase_ = 2010;
-              break;
-            }
-            case 16290: {
+            case 15378: {
               emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder subBuilder = null;
-              if (detailCase_ == 2036) {
+              if (detailCase_ == 1922) {
                 subBuilder = ((emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_).toBuilder();
               }
               detail_ =
@@ -736,7 +354,7 @@ public final class DungeonSettleNotifyOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_);
                 detail_ = subBuilder.buildPartial();
               }
-              detailCase_ = 2036;
+              detailCase_ = 1922;
               break;
             }
             default: {
@@ -754,10 +372,10 @@ public final class DungeonSettleNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           failCondList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           exhibitionInfoList_ = java.util.Collections.unmodifiableList(exhibitionInfoList_);
         }
         this.unknownFields = unknownFields.build();
@@ -774,9 +392,9 @@ public final class DungeonSettleNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 2:
+        case 1:
           return internalGetStrengthenPointDataMap();
-        case 13:
+        case 11:
           return internalGetSettleShow();
         default:
           throw new RuntimeException(
@@ -796,21 +414,8 @@ public final class DungeonSettleNotifyOuterClass {
     public enum DetailCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      TOWER_LEVEL_END_NOTIFY(1162),
-      TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY(2036),
-      CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO(808),
-      EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO(596),
-      ROGUELIKE_DUNGEON_SETTLE_INFO(2010),
-      CRYSTAL_LINK_SETTLE_INFO(1313),
-      SUMMER_TIME_V2_DUNGEON_SETTLE_INFO(174),
-      INSTABLE_SPRAY_SETTLE_INFO(702),
-      WIND_FIELD_DUNGEON_SETTLE_INFO(714),
-      EFFIGY_CHALLENGE_V2_SETTLE_INFO(1629),
-      TEAM_CHAIN_SETTLE_INFO(755),
-      PACMAN_SETTLE_INFO(1544),
-      FUNGUS_FIGHTER_V2_SETTLE_INFO(1886),
-      BLADE_DANCE_SETTLE_INFO(578),
-      MULTI_CHARACTER_DUNGEON_SETTLE_INFO(1901),
+      TOWER_LEVEL_END_NOTIFY(682),
+      TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY(1922),
       DETAIL_NOT_SET(0);
       private final int value;
       private DetailCase(int value) {
@@ -828,21 +433,8 @@ public final class DungeonSettleNotifyOuterClass {
 
       public static DetailCase forNumber(int value) {
         switch (value) {
-          case 1162: return TOWER_LEVEL_END_NOTIFY;
-          case 2036: return TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY;
-          case 808: return CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO;
-          case 596: return EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO;
-          case 2010: return ROGUELIKE_DUNGEON_SETTLE_INFO;
-          case 1313: return CRYSTAL_LINK_SETTLE_INFO;
-          case 174: return SUMMER_TIME_V2_DUNGEON_SETTLE_INFO;
-          case 702: return INSTABLE_SPRAY_SETTLE_INFO;
-          case 714: return WIND_FIELD_DUNGEON_SETTLE_INFO;
-          case 1629: return EFFIGY_CHALLENGE_V2_SETTLE_INFO;
-          case 755: return TEAM_CHAIN_SETTLE_INFO;
-          case 1544: return PACMAN_SETTLE_INFO;
-          case 1886: return FUNGUS_FIGHTER_V2_SETTLE_INFO;
-          case 578: return BLADE_DANCE_SETTLE_INFO;
-          case 1901: return MULTI_CHARACTER_DUNGEON_SETTLE_INFO;
+          case 682: return TOWER_LEVEL_END_NOTIFY;
+          case 1922: return TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY;
           case 0: return DETAIL_NOT_SET;
           default: return null;
         }
@@ -858,58 +450,7 @@ public final class DungeonSettleNotifyOuterClass {
           detailCase_);
     }
 
-    public static final int IS_SUCCESS_FIELD_NUMBER = 3;
-    private boolean isSuccess_;
-    /**
-     * <code>bool is_success = 3;</code>
-     * @return The isSuccess.
-     */
-    @java.lang.Override
-    public boolean getIsSuccess() {
-      return isSuccess_;
-    }
-
-    public static final int EXHIBITION_INFO_LIST_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> exhibitionInfoList_;
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> getExhibitionInfoListList() {
-      return exhibitionInfoList_;
-    }
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
-        getExhibitionInfoListOrBuilderList() {
-      return exhibitionInfoList_;
-    }
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    @java.lang.Override
-    public int getExhibitionInfoListCount() {
-      return exhibitionInfoList_.size();
-    }
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index) {
-      return exhibitionInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
-        int index) {
-      return exhibitionInfoList_.get(index);
-    }
-
-    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 2;
+    public static final int STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER = 1;
     private static final class StrengthenPointDataMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> defaultEntry =
@@ -936,7 +477,7 @@ public final class DungeonSettleNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
 
     @java.lang.Override
@@ -954,7 +495,7 @@ public final class DungeonSettleNotifyOuterClass {
       return getStrengthenPointDataMapMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     @java.lang.Override
 
@@ -962,7 +503,7 @@ public final class DungeonSettleNotifyOuterClass {
       return internalGetStrengthenPointDataMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     @java.lang.Override
 
@@ -975,7 +516,7 @@ public final class DungeonSettleNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+     * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
      */
     @java.lang.Override
 
@@ -990,7 +531,119 @@ public final class DungeonSettleNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int SETTLE_SHOW_FIELD_NUMBER = 13;
+    public static final int IS_SUCCESS_FIELD_NUMBER = 4;
+    private boolean isSuccess_;
+    /**
+     * <code>bool is_success = 4;</code>
+     * @return The isSuccess.
+     */
+    @java.lang.Override
+    public boolean getIsSuccess() {
+      return isSuccess_;
+    }
+
+    public static final int FAIL_COND_LIST_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList failCondList_;
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @return A list containing the failCondList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getFailCondListList() {
+      return failCondList_;
+    }
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @return The count of failCondList.
+     */
+    public int getFailCondListCount() {
+      return failCondList_.size();
+    }
+    /**
+     * <code>repeated uint32 fail_cond_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The failCondList at the given index.
+     */
+    public int getFailCondList(int index) {
+      return failCondList_.getInt(index);
+    }
+    private int failCondListMemoizedSerializedSize = -1;
+
+    public static final int EXHIBITION_INFO_LIST_FIELD_NUMBER = 6;
+    private java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> exhibitionInfoList_;
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> getExhibitionInfoListList() {
+      return exhibitionInfoList_;
+    }
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
+        getExhibitionInfoListOrBuilderList() {
+      return exhibitionInfoList_;
+    }
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public int getExhibitionInfoListCount() {
+      return exhibitionInfoList_.size();
+    }
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index) {
+      return exhibitionInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
+        int index) {
+      return exhibitionInfoList_.get(index);
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 8;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 8;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
+    public static final int USE_TIME_FIELD_NUMBER = 9;
+    private int useTime_;
+    /**
+     * <code>uint32 use_time = 9;</code>
+     * @return The useTime.
+     */
+    @java.lang.Override
+    public int getUseTime() {
+      return useTime_;
+    }
+
+    public static final int CLOSE_TIME_FIELD_NUMBER = 10;
+    private int closeTime_;
+    /**
+     * <code>uint32 close_time = 10;</code>
+     * @return The closeTime.
+     */
+    @java.lang.Override
+    public int getCloseTime() {
+      return closeTime_;
+    }
+
+    public static final int SETTLE_SHOW_FIELD_NUMBER = 11;
     private static final class SettleShowDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList> defaultEntry =
@@ -1017,7 +670,7 @@ public final class DungeonSettleNotifyOuterClass {
       return internalGetSettleShow().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
 
     @java.lang.Override
@@ -1035,7 +688,7 @@ public final class DungeonSettleNotifyOuterClass {
       return getSettleShowMap();
     }
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     @java.lang.Override
 
@@ -1043,7 +696,7 @@ public final class DungeonSettleNotifyOuterClass {
       return internalGetSettleShow().getMap();
     }
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     @java.lang.Override
 
@@ -1056,7 +709,7 @@ public final class DungeonSettleNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+     * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
      */
     @java.lang.Override
 
@@ -1071,10 +724,10 @@ public final class DungeonSettleNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int CREATE_PLAYER_UID_FIELD_NUMBER = 1;
+    public static final int CREATE_PLAYER_UID_FIELD_NUMBER = 12;
     private int createPlayerUid_;
     /**
-     * <code>uint32 create_player_uid = 1;</code>
+     * <code>uint32 create_player_uid = 12;</code>
      * @return The createPlayerUid.
      */
     @java.lang.Override
@@ -1082,32 +735,10 @@ public final class DungeonSettleNotifyOuterClass {
       return createPlayerUid_;
     }
 
-    public static final int DUNGEON_ID_FIELD_NUMBER = 7;
-    private int dungeonId_;
-    /**
-     * <code>uint32 dungeon_id = 7;</code>
-     * @return The dungeonId.
-     */
-    @java.lang.Override
-    public int getDungeonId() {
-      return dungeonId_;
-    }
-
-    public static final int CLOSE_TIME_FIELD_NUMBER = 6;
-    private int closeTime_;
-    /**
-     * <code>uint32 close_time = 6;</code>
-     * @return The closeTime.
-     */
-    @java.lang.Override
-    public int getCloseTime() {
-      return closeTime_;
-    }
-
-    public static final int RESULT_FIELD_NUMBER = 5;
+    public static final int RESULT_FIELD_NUMBER = 14;
     private int result_;
     /**
-     * <code>uint32 result = 5;</code>
+     * <code>uint32 result = 14;</code>
      * @return The result.
      */
     @java.lang.Override
@@ -1115,510 +746,68 @@ public final class DungeonSettleNotifyOuterClass {
       return result_;
     }
 
-    public static final int USE_TIME_FIELD_NUMBER = 15;
-    private int useTime_;
+    public static final int TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER = 682;
     /**
-     * <code>uint32 use_time = 15;</code>
-     * @return The useTime.
-     */
-    @java.lang.Override
-    public int getUseTime() {
-      return useTime_;
-    }
-
-    public static final int FAIL_COND_LIST_FIELD_NUMBER = 9;
-    private com.google.protobuf.Internal.IntList failCondList_;
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @return A list containing the failCondList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getFailCondListList() {
-      return failCondList_;
-    }
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @return The count of failCondList.
-     */
-    public int getFailCondListCount() {
-      return failCondList_.size();
-    }
-    /**
-     * <code>repeated uint32 fail_cond_list = 9;</code>
-     * @param index The index of the element to return.
-     * @return The failCondList at the given index.
-     */
-    public int getFailCondList(int index) {
-      return failCondList_.getInt(index);
-    }
-    private int failCondListMemoizedSerializedSize = -1;
-
-    public static final int TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER = 1162;
-    /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      * @return Whether the towerLevelEndNotify field is set.
      */
     @java.lang.Override
     public boolean hasTowerLevelEndNotify() {
-      return detailCase_ == 1162;
+      return detailCase_ == 682;
     }
     /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      * @return The towerLevelEndNotify.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() {
-      if (detailCase_ == 1162) {
+      if (detailCase_ == 682) {
          return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_;
       }
       return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
     }
     /**
-     * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+     * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() {
-      if (detailCase_ == 1162) {
+      if (detailCase_ == 682) {
          return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_;
       }
       return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
     }
 
-    public static final int TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER = 2036;
+    public static final int TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER = 1922;
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      * @return Whether the trialAvatarFirstPassDungeonNotify field is set.
      */
     @java.lang.Override
     public boolean hasTrialAvatarFirstPassDungeonNotify() {
-      return detailCase_ == 2036;
+      return detailCase_ == 1922;
     }
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      * @return The trialAvatarFirstPassDungeonNotify.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify getTrialAvatarFirstPassDungeonNotify() {
-      if (detailCase_ == 2036) {
+      if (detailCase_ == 1922) {
          return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_;
       }
       return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
     }
     /**
-     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+     * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder() {
-      if (detailCase_ == 2036) {
+      if (detailCase_ == 1922) {
          return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_;
       }
       return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
     }
 
-    public static final int CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER = 808;
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasChannellerSlabLoopDungeonResultInfo() {
-      return detailCase_ == 808;
-    }
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     * @return The channellerSlabLoopDungeonResultInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() {
-      if (detailCase_ == 808) {
-         return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 808) {
-         return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-    }
-
-    public static final int EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER = 596;
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     * @return Whether the effigyChallengeDungeonResultInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyChallengeDungeonResultInfo() {
-      return detailCase_ == 596;
-    }
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     * @return The effigyChallengeDungeonResultInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
-      if (detailCase_ == 596) {
-         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
-      if (detailCase_ == 596) {
-         return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-    }
-
-    public static final int ROGUELIKE_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 2010;
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     * @return Whether the roguelikeDungeonSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRoguelikeDungeonSettleInfo() {
-      return detailCase_ == 2010;
-    }
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     * @return The roguelikeDungeonSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo() {
-      if (detailCase_ == 2010) {
-         return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder() {
-      if (detailCase_ == 2010) {
-         return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-    }
-
-    public static final int CRYSTAL_LINK_SETTLE_INFO_FIELD_NUMBER = 1313;
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     * @return Whether the crystalLinkSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCrystalLinkSettleInfo() {
-      return detailCase_ == 1313;
-    }
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     * @return The crystalLinkSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo() {
-      if (detailCase_ == 1313) {
-         return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder() {
-      if (detailCase_ == 1313) {
-         return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-    }
-
-    public static final int SUMMER_TIME_V2_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 174;
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     * @return Whether the summerTimeV2DungeonSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSummerTimeV2DungeonSettleInfo() {
-      return detailCase_ == 174;
-    }
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     * @return The summerTimeV2DungeonSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo() {
-      if (detailCase_ == 174) {
-         return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder() {
-      if (detailCase_ == 174) {
-         return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-    }
-
-    public static final int INSTABLE_SPRAY_SETTLE_INFO_FIELD_NUMBER = 702;
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     * @return Whether the instableSpraySettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasInstableSpraySettleInfo() {
-      return detailCase_ == 702;
-    }
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     * @return The instableSpraySettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo() {
-      if (detailCase_ == 702) {
-         return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder() {
-      if (detailCase_ == 702) {
-         return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-    }
-
-    public static final int WIND_FIELD_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 714;
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     * @return Whether the windFieldDungeonSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWindFieldDungeonSettleInfo() {
-      return detailCase_ == 714;
-    }
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     * @return The windFieldDungeonSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo() {
-      if (detailCase_ == 714) {
-         return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder() {
-      if (detailCase_ == 714) {
-         return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-    }
-
-    public static final int EFFIGY_CHALLENGE_V2_SETTLE_INFO_FIELD_NUMBER = 1629;
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     * @return Whether the effigyChallengeV2SettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasEffigyChallengeV2SettleInfo() {
-      return detailCase_ == 1629;
-    }
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     * @return The effigyChallengeV2SettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo() {
-      if (detailCase_ == 1629) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder() {
-      if (detailCase_ == 1629) {
-         return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-    }
-
-    public static final int TEAM_CHAIN_SETTLE_INFO_FIELD_NUMBER = 755;
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     * @return Whether the teamChainSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTeamChainSettleInfo() {
-      return detailCase_ == 755;
-    }
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     * @return The teamChainSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo() {
-      if (detailCase_ == 755) {
-         return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder() {
-      if (detailCase_ == 755) {
-         return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-    }
-
-    public static final int PACMAN_SETTLE_INFO_FIELD_NUMBER = 1544;
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     * @return Whether the pacmanSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasPacmanSettleInfo() {
-      return detailCase_ == 1544;
-    }
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     * @return The pacmanSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo() {
-      if (detailCase_ == 1544) {
-         return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder() {
-      if (detailCase_ == 1544) {
-         return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-    }
-
-    public static final int FUNGUS_FIGHTER_V2_SETTLE_INFO_FIELD_NUMBER = 1886;
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     * @return Whether the fungusFighterV2SettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasFungusFighterV2SettleInfo() {
-      return detailCase_ == 1886;
-    }
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     * @return The fungusFighterV2SettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo() {
-      if (detailCase_ == 1886) {
-         return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder() {
-      if (detailCase_ == 1886) {
-         return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-    }
-
-    public static final int BLADE_DANCE_SETTLE_INFO_FIELD_NUMBER = 578;
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     * @return Whether the bladeDanceSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasBladeDanceSettleInfo() {
-      return detailCase_ == 578;
-    }
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     * @return The bladeDanceSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo() {
-      if (detailCase_ == 578) {
-         return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder() {
-      if (detailCase_ == 578) {
-         return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-    }
-
-    public static final int MULTI_CHARACTER_DUNGEON_SETTLE_INFO_FIELD_NUMBER = 1901;
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     * @return Whether the multiCharacterDungeonSettleInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMultiCharacterDungeonSettleInfo() {
-      return detailCase_ == 1901;
-    }
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     * @return The multiCharacterDungeonSettleInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo() {
-      if (detailCase_ == 1901) {
-         return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder() {
-      if (detailCase_ == 1901) {
-         return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_;
-      }
-      return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1634,90 +823,51 @@ public final class DungeonSettleNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (createPlayerUid_ != 0) {
-        output.writeUInt32(1, createPlayerUid_);
-      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetStrengthenPointDataMap(),
           StrengthenPointDataMapDefaultEntryHolder.defaultEntry,
-          2);
+          1);
       if (isSuccess_ != false) {
-        output.writeBool(3, isSuccess_);
-      }
-      if (result_ != 0) {
-        output.writeUInt32(5, result_);
-      }
-      if (closeTime_ != 0) {
-        output.writeUInt32(6, closeTime_);
-      }
-      if (dungeonId_ != 0) {
-        output.writeUInt32(7, dungeonId_);
+        output.writeBool(4, isSuccess_);
       }
       if (getFailCondListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(failCondListMemoizedSerializedSize);
       }
       for (int i = 0; i < failCondList_.size(); i++) {
         output.writeUInt32NoTag(failCondList_.getInt(i));
       }
       for (int i = 0; i < exhibitionInfoList_.size(); i++) {
-        output.writeMessage(10, exhibitionInfoList_.get(i));
+        output.writeMessage(6, exhibitionInfoList_.get(i));
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(8, dungeonId_);
+      }
+      if (useTime_ != 0) {
+        output.writeUInt32(9, useTime_);
+      }
+      if (closeTime_ != 0) {
+        output.writeUInt32(10, closeTime_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetSettleShow(),
           SettleShowDefaultEntryHolder.defaultEntry,
-          13);
-      if (useTime_ != 0) {
-        output.writeUInt32(15, useTime_);
+          11);
+      if (createPlayerUid_ != 0) {
+        output.writeUInt32(12, createPlayerUid_);
       }
-      if (detailCase_ == 174) {
-        output.writeMessage(174, (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_);
+      if (result_ != 0) {
+        output.writeUInt32(14, result_);
       }
-      if (detailCase_ == 578) {
-        output.writeMessage(578, (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_);
+      if (detailCase_ == 682) {
+        output.writeMessage(682, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_);
       }
-      if (detailCase_ == 596) {
-        output.writeMessage(596, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
-      }
-      if (detailCase_ == 702) {
-        output.writeMessage(702, (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 714) {
-        output.writeMessage(714, (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 755) {
-        output.writeMessage(755, (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_);
-      }
-      if (detailCase_ == 808) {
-        output.writeMessage(808, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
-      }
-      if (detailCase_ == 1162) {
-        output.writeMessage(1162, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_);
-      }
-      if (detailCase_ == 1313) {
-        output.writeMessage(1313, (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 1544) {
-        output.writeMessage(1544, (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_);
-      }
-      if (detailCase_ == 1629) {
-        output.writeMessage(1629, (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_);
-      }
-      if (detailCase_ == 1886) {
-        output.writeMessage(1886, (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_);
-      }
-      if (detailCase_ == 1901) {
-        output.writeMessage(1901, (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 2010) {
-        output.writeMessage(2010, (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 2036) {
-        output.writeMessage(2036, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_);
+      if (detailCase_ == 1922) {
+        output.writeMessage(1922, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_);
       }
       unknownFields.writeTo(output);
     }
@@ -1728,10 +878,6 @@ public final class DungeonSettleNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (createPlayerUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, createPlayerUid_);
-      }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> entry
            : internalGetStrengthenPointDataMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
@@ -1740,23 +886,11 @@ public final class DungeonSettleNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2, strengthenPointDataMap__);
+            .computeMessageSize(1, strengthenPointDataMap__);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isSuccess_);
-      }
-      if (result_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, result_);
-      }
-      if (closeTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, closeTime_);
-      }
-      if (dungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, dungeonId_);
+          .computeBoolSize(4, isSuccess_);
       }
       {
         int dataSize = 0;
@@ -1774,7 +908,19 @@ public final class DungeonSettleNotifyOuterClass {
       }
       for (int i = 0; i < exhibitionInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, exhibitionInfoList_.get(i));
+          .computeMessageSize(6, exhibitionInfoList_.get(i));
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, dungeonId_);
+      }
+      if (useTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, useTime_);
+      }
+      if (closeTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, closeTime_);
       }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList> entry
            : internalGetSettleShow().getMap().entrySet()) {
@@ -1784,71 +930,23 @@ public final class DungeonSettleNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, settleShow__);
+            .computeMessageSize(11, settleShow__);
       }
-      if (useTime_ != 0) {
+      if (createPlayerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, useTime_);
+          .computeUInt32Size(12, createPlayerUid_);
       }
-      if (detailCase_ == 174) {
+      if (result_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(174, (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_);
+          .computeUInt32Size(14, result_);
       }
-      if (detailCase_ == 578) {
+      if (detailCase_ == 682) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(578, (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_);
+          .computeMessageSize(682, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_);
       }
-      if (detailCase_ == 596) {
+      if (detailCase_ == 1922) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(596, (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_);
-      }
-      if (detailCase_ == 702) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(702, (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 714) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(714, (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 755) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(755, (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_);
-      }
-      if (detailCase_ == 808) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(808, (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_);
-      }
-      if (detailCase_ == 1162) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1162, (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_);
-      }
-      if (detailCase_ == 1313) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1313, (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 1544) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1544, (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_);
-      }
-      if (detailCase_ == 1629) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1629, (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_);
-      }
-      if (detailCase_ == 1886) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1886, (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_);
-      }
-      if (detailCase_ == 1901) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1901, (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 2010) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2010, (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_);
-      }
-      if (detailCase_ == 2036) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2036, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_);
+          .computeMessageSize(1922, (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1865,88 +963,36 @@ public final class DungeonSettleNotifyOuterClass {
       }
       emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify other = (emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify) obj;
 
-      if (getIsSuccess()
-          != other.getIsSuccess()) return false;
-      if (!getExhibitionInfoListList()
-          .equals(other.getExhibitionInfoListList())) return false;
       if (!internalGetStrengthenPointDataMap().equals(
           other.internalGetStrengthenPointDataMap())) return false;
+      if (getIsSuccess()
+          != other.getIsSuccess()) return false;
+      if (!getFailCondListList()
+          .equals(other.getFailCondListList())) return false;
+      if (!getExhibitionInfoListList()
+          .equals(other.getExhibitionInfoListList())) return false;
+      if (getDungeonId()
+          != other.getDungeonId()) return false;
+      if (getUseTime()
+          != other.getUseTime()) return false;
+      if (getCloseTime()
+          != other.getCloseTime()) return false;
       if (!internalGetSettleShow().equals(
           other.internalGetSettleShow())) return false;
       if (getCreatePlayerUid()
           != other.getCreatePlayerUid()) return false;
-      if (getDungeonId()
-          != other.getDungeonId()) return false;
-      if (getCloseTime()
-          != other.getCloseTime()) return false;
       if (getResult()
           != other.getResult()) return false;
-      if (getUseTime()
-          != other.getUseTime()) return false;
-      if (!getFailCondListList()
-          .equals(other.getFailCondListList())) return false;
       if (!getDetailCase().equals(other.getDetailCase())) return false;
       switch (detailCase_) {
-        case 1162:
+        case 682:
           if (!getTowerLevelEndNotify()
               .equals(other.getTowerLevelEndNotify())) return false;
           break;
-        case 2036:
+        case 1922:
           if (!getTrialAvatarFirstPassDungeonNotify()
               .equals(other.getTrialAvatarFirstPassDungeonNotify())) return false;
           break;
-        case 808:
-          if (!getChannellerSlabLoopDungeonResultInfo()
-              .equals(other.getChannellerSlabLoopDungeonResultInfo())) return false;
-          break;
-        case 596:
-          if (!getEffigyChallengeDungeonResultInfo()
-              .equals(other.getEffigyChallengeDungeonResultInfo())) return false;
-          break;
-        case 2010:
-          if (!getRoguelikeDungeonSettleInfo()
-              .equals(other.getRoguelikeDungeonSettleInfo())) return false;
-          break;
-        case 1313:
-          if (!getCrystalLinkSettleInfo()
-              .equals(other.getCrystalLinkSettleInfo())) return false;
-          break;
-        case 174:
-          if (!getSummerTimeV2DungeonSettleInfo()
-              .equals(other.getSummerTimeV2DungeonSettleInfo())) return false;
-          break;
-        case 702:
-          if (!getInstableSpraySettleInfo()
-              .equals(other.getInstableSpraySettleInfo())) return false;
-          break;
-        case 714:
-          if (!getWindFieldDungeonSettleInfo()
-              .equals(other.getWindFieldDungeonSettleInfo())) return false;
-          break;
-        case 1629:
-          if (!getEffigyChallengeV2SettleInfo()
-              .equals(other.getEffigyChallengeV2SettleInfo())) return false;
-          break;
-        case 755:
-          if (!getTeamChainSettleInfo()
-              .equals(other.getTeamChainSettleInfo())) return false;
-          break;
-        case 1544:
-          if (!getPacmanSettleInfo()
-              .equals(other.getPacmanSettleInfo())) return false;
-          break;
-        case 1886:
-          if (!getFungusFighterV2SettleInfo()
-              .equals(other.getFungusFighterV2SettleInfo())) return false;
-          break;
-        case 578:
-          if (!getBladeDanceSettleInfo()
-              .equals(other.getBladeDanceSettleInfo())) return false;
-          break;
-        case 1901:
-          if (!getMultiCharacterDungeonSettleInfo()
-              .equals(other.getMultiCharacterDungeonSettleInfo())) return false;
-          break;
         case 0:
         default:
       }
@@ -1961,96 +1007,44 @@ public final class DungeonSettleNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSuccess());
-      if (getExhibitionInfoListCount() > 0) {
-        hash = (37 * hash) + EXHIBITION_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getExhibitionInfoListList().hashCode();
-      }
       if (!internalGetStrengthenPointDataMap().getMap().isEmpty()) {
         hash = (37 * hash) + STRENGTHEN_POINT_DATA_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetStrengthenPointDataMap().hashCode();
       }
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSuccess());
+      if (getFailCondListCount() > 0) {
+        hash = (37 * hash) + FAIL_COND_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFailCondListList().hashCode();
+      }
+      if (getExhibitionInfoListCount() > 0) {
+        hash = (37 * hash) + EXHIBITION_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getExhibitionInfoListList().hashCode();
+      }
+      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonId();
+      hash = (37 * hash) + USE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getUseTime();
+      hash = (37 * hash) + CLOSE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getCloseTime();
       if (!internalGetSettleShow().getMap().isEmpty()) {
         hash = (37 * hash) + SETTLE_SHOW_FIELD_NUMBER;
         hash = (53 * hash) + internalGetSettleShow().hashCode();
       }
       hash = (37 * hash) + CREATE_PLAYER_UID_FIELD_NUMBER;
       hash = (53 * hash) + getCreatePlayerUid();
-      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonId();
-      hash = (37 * hash) + CLOSE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getCloseTime();
       hash = (37 * hash) + RESULT_FIELD_NUMBER;
       hash = (53 * hash) + getResult();
-      hash = (37 * hash) + USE_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getUseTime();
-      if (getFailCondListCount() > 0) {
-        hash = (37 * hash) + FAIL_COND_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFailCondListList().hashCode();
-      }
       switch (detailCase_) {
-        case 1162:
+        case 682:
           hash = (37 * hash) + TOWER_LEVEL_END_NOTIFY_FIELD_NUMBER;
           hash = (53 * hash) + getTowerLevelEndNotify().hashCode();
           break;
-        case 2036:
+        case 1922:
           hash = (37 * hash) + TRIAL_AVATAR_FIRST_PASS_DUNGEON_NOTIFY_FIELD_NUMBER;
           hash = (53 * hash) + getTrialAvatarFirstPassDungeonNotify().hashCode();
           break;
-        case 808:
-          hash = (37 * hash) + CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getChannellerSlabLoopDungeonResultInfo().hashCode();
-          break;
-        case 596:
-          hash = (37 * hash) + EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyChallengeDungeonResultInfo().hashCode();
-          break;
-        case 2010:
-          hash = (37 * hash) + ROGUELIKE_DUNGEON_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getRoguelikeDungeonSettleInfo().hashCode();
-          break;
-        case 1313:
-          hash = (37 * hash) + CRYSTAL_LINK_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getCrystalLinkSettleInfo().hashCode();
-          break;
-        case 174:
-          hash = (37 * hash) + SUMMER_TIME_V2_DUNGEON_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getSummerTimeV2DungeonSettleInfo().hashCode();
-          break;
-        case 702:
-          hash = (37 * hash) + INSTABLE_SPRAY_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getInstableSpraySettleInfo().hashCode();
-          break;
-        case 714:
-          hash = (37 * hash) + WIND_FIELD_DUNGEON_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getWindFieldDungeonSettleInfo().hashCode();
-          break;
-        case 1629:
-          hash = (37 * hash) + EFFIGY_CHALLENGE_V2_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getEffigyChallengeV2SettleInfo().hashCode();
-          break;
-        case 755:
-          hash = (37 * hash) + TEAM_CHAIN_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getTeamChainSettleInfo().hashCode();
-          break;
-        case 1544:
-          hash = (37 * hash) + PACMAN_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getPacmanSettleInfo().hashCode();
-          break;
-        case 1886:
-          hash = (37 * hash) + FUNGUS_FIGHTER_V2_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getFungusFighterV2SettleInfo().hashCode();
-          break;
-        case 578:
-          hash = (37 * hash) + BLADE_DANCE_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getBladeDanceSettleInfo().hashCode();
-          break;
-        case 1901:
-          hash = (37 * hash) + MULTI_CHARACTER_DUNGEON_SETTLE_INFO_FIELD_NUMBER;
-          hash = (53 * hash) + getMultiCharacterDungeonSettleInfo().hashCode();
-          break;
         case 0:
         default:
       }
@@ -2150,11 +1144,6 @@ public final class DungeonSettleNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22323
-     * Obf: OHGJJKADNFH
-     * </pre>
-     *
      * Protobuf type {@code DungeonSettleNotify}
      */
     public static final class Builder extends
@@ -2170,9 +1159,9 @@ public final class DungeonSettleNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 1:
             return internalGetStrengthenPointDataMap();
-          case 13:
+          case 11:
             return internalGetSettleShow();
           default:
             throw new RuntimeException(
@@ -2183,9 +1172,9 @@ public final class DungeonSettleNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 1:
             return internalGetMutableStrengthenPointDataMap();
-          case 13:
+          case 11:
             return internalGetMutableSettleShow();
           default:
             throw new RuntimeException(
@@ -2219,28 +1208,28 @@ public final class DungeonSettleNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableStrengthenPointDataMap().clear();
         isSuccess_ = false;
 
+        failCondList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         if (exhibitionInfoListBuilder_ == null) {
           exhibitionInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           exhibitionInfoListBuilder_.clear();
         }
-        internalGetMutableStrengthenPointDataMap().clear();
-        internalGetMutableSettleShow().clear();
-        createPlayerUid_ = 0;
-
         dungeonId_ = 0;
 
-        closeTime_ = 0;
-
-        result_ = 0;
-
         useTime_ = 0;
 
-        failCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
+        closeTime_ = 0;
+
+        internalGetMutableSettleShow().clear();
+        createPlayerUid_ = 0;
+
+        result_ = 0;
+
         detailCase_ = 0;
         detail_ = null;
         return this;
@@ -2270,135 +1259,44 @@ public final class DungeonSettleNotifyOuterClass {
       public emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify buildPartial() {
         emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify result = new emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify(this);
         int from_bitField0_ = bitField0_;
+        result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap();
+        result.strengthenPointDataMap_.makeImmutable();
         result.isSuccess_ = isSuccess_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          failCondList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.failCondList_ = failCondList_;
         if (exhibitionInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             exhibitionInfoList_ = java.util.Collections.unmodifiableList(exhibitionInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.exhibitionInfoList_ = exhibitionInfoList_;
         } else {
           result.exhibitionInfoList_ = exhibitionInfoListBuilder_.build();
         }
-        result.strengthenPointDataMap_ = internalGetStrengthenPointDataMap();
-        result.strengthenPointDataMap_.makeImmutable();
+        result.dungeonId_ = dungeonId_;
+        result.useTime_ = useTime_;
+        result.closeTime_ = closeTime_;
         result.settleShow_ = internalGetSettleShow();
         result.settleShow_.makeImmutable();
         result.createPlayerUid_ = createPlayerUid_;
-        result.dungeonId_ = dungeonId_;
-        result.closeTime_ = closeTime_;
         result.result_ = result_;
-        result.useTime_ = useTime_;
-        if (((bitField0_ & 0x00000008) != 0)) {
-          failCondList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        }
-        result.failCondList_ = failCondList_;
-        if (detailCase_ == 1162) {
+        if (detailCase_ == 682) {
           if (towerLevelEndNotifyBuilder_ == null) {
             result.detail_ = detail_;
           } else {
             result.detail_ = towerLevelEndNotifyBuilder_.build();
           }
         }
-        if (detailCase_ == 2036) {
+        if (detailCase_ == 1922) {
           if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
             result.detail_ = detail_;
           } else {
             result.detail_ = trialAvatarFirstPassDungeonNotifyBuilder_.build();
           }
         }
-        if (detailCase_ == 808) {
-          if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = channellerSlabLoopDungeonResultInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 596) {
-          if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = effigyChallengeDungeonResultInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 2010) {
-          if (roguelikeDungeonSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = roguelikeDungeonSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1313) {
-          if (crystalLinkSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = crystalLinkSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 174) {
-          if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = summerTimeV2DungeonSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 702) {
-          if (instableSpraySettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = instableSpraySettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 714) {
-          if (windFieldDungeonSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = windFieldDungeonSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1629) {
-          if (effigyChallengeV2SettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = effigyChallengeV2SettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 755) {
-          if (teamChainSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = teamChainSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1544) {
-          if (pacmanSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = pacmanSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1886) {
-          if (fungusFighterV2SettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = fungusFighterV2SettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 578) {
-          if (bladeDanceSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = bladeDanceSettleInfoBuilder_.build();
-          }
-        }
-        if (detailCase_ == 1901) {
-          if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-            result.detail_ = detail_;
-          } else {
-            result.detail_ = multiCharacterDungeonSettleInfoBuilder_.build();
-          }
-        }
         result.detailCase_ = detailCase_;
         onBuilt();
         return result;
@@ -2448,14 +1346,26 @@ public final class DungeonSettleNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify other) {
         if (other == emu.grasscutter.net.proto.DungeonSettleNotifyOuterClass.DungeonSettleNotify.getDefaultInstance()) return this;
+        internalGetMutableStrengthenPointDataMap().mergeFrom(
+            other.internalGetStrengthenPointDataMap());
         if (other.getIsSuccess() != false) {
           setIsSuccess(other.getIsSuccess());
         }
+        if (!other.failCondList_.isEmpty()) {
+          if (failCondList_.isEmpty()) {
+            failCondList_ = other.failCondList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureFailCondListIsMutable();
+            failCondList_.addAll(other.failCondList_);
+          }
+          onChanged();
+        }
         if (exhibitionInfoListBuilder_ == null) {
           if (!other.exhibitionInfoList_.isEmpty()) {
             if (exhibitionInfoList_.isEmpty()) {
               exhibitionInfoList_ = other.exhibitionInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
               ensureExhibitionInfoListIsMutable();
               exhibitionInfoList_.addAll(other.exhibitionInfoList_);
@@ -2468,7 +1378,7 @@ public final class DungeonSettleNotifyOuterClass {
               exhibitionInfoListBuilder_.dispose();
               exhibitionInfoListBuilder_ = null;
               exhibitionInfoList_ = other.exhibitionInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000004);
               exhibitionInfoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getExhibitionInfoListFieldBuilder() : null;
@@ -2477,35 +1387,23 @@ public final class DungeonSettleNotifyOuterClass {
             }
           }
         }
-        internalGetMutableStrengthenPointDataMap().mergeFrom(
-            other.internalGetStrengthenPointDataMap());
+        if (other.getDungeonId() != 0) {
+          setDungeonId(other.getDungeonId());
+        }
+        if (other.getUseTime() != 0) {
+          setUseTime(other.getUseTime());
+        }
+        if (other.getCloseTime() != 0) {
+          setCloseTime(other.getCloseTime());
+        }
         internalGetMutableSettleShow().mergeFrom(
             other.internalGetSettleShow());
         if (other.getCreatePlayerUid() != 0) {
           setCreatePlayerUid(other.getCreatePlayerUid());
         }
-        if (other.getDungeonId() != 0) {
-          setDungeonId(other.getDungeonId());
-        }
-        if (other.getCloseTime() != 0) {
-          setCloseTime(other.getCloseTime());
-        }
         if (other.getResult() != 0) {
           setResult(other.getResult());
         }
-        if (other.getUseTime() != 0) {
-          setUseTime(other.getUseTime());
-        }
-        if (!other.failCondList_.isEmpty()) {
-          if (failCondList_.isEmpty()) {
-            failCondList_ = other.failCondList_;
-            bitField0_ = (bitField0_ & ~0x00000008);
-          } else {
-            ensureFailCondListIsMutable();
-            failCondList_.addAll(other.failCondList_);
-          }
-          onChanged();
-        }
         switch (other.getDetailCase()) {
           case TOWER_LEVEL_END_NOTIFY: {
             mergeTowerLevelEndNotify(other.getTowerLevelEndNotify());
@@ -2515,58 +1413,6 @@ public final class DungeonSettleNotifyOuterClass {
             mergeTrialAvatarFirstPassDungeonNotify(other.getTrialAvatarFirstPassDungeonNotify());
             break;
           }
-          case CHANNELLER_SLAB_LOOP_DUNGEON_RESULT_INFO: {
-            mergeChannellerSlabLoopDungeonResultInfo(other.getChannellerSlabLoopDungeonResultInfo());
-            break;
-          }
-          case EFFIGY_CHALLENGE_DUNGEON_RESULT_INFO: {
-            mergeEffigyChallengeDungeonResultInfo(other.getEffigyChallengeDungeonResultInfo());
-            break;
-          }
-          case ROGUELIKE_DUNGEON_SETTLE_INFO: {
-            mergeRoguelikeDungeonSettleInfo(other.getRoguelikeDungeonSettleInfo());
-            break;
-          }
-          case CRYSTAL_LINK_SETTLE_INFO: {
-            mergeCrystalLinkSettleInfo(other.getCrystalLinkSettleInfo());
-            break;
-          }
-          case SUMMER_TIME_V2_DUNGEON_SETTLE_INFO: {
-            mergeSummerTimeV2DungeonSettleInfo(other.getSummerTimeV2DungeonSettleInfo());
-            break;
-          }
-          case INSTABLE_SPRAY_SETTLE_INFO: {
-            mergeInstableSpraySettleInfo(other.getInstableSpraySettleInfo());
-            break;
-          }
-          case WIND_FIELD_DUNGEON_SETTLE_INFO: {
-            mergeWindFieldDungeonSettleInfo(other.getWindFieldDungeonSettleInfo());
-            break;
-          }
-          case EFFIGY_CHALLENGE_V2_SETTLE_INFO: {
-            mergeEffigyChallengeV2SettleInfo(other.getEffigyChallengeV2SettleInfo());
-            break;
-          }
-          case TEAM_CHAIN_SETTLE_INFO: {
-            mergeTeamChainSettleInfo(other.getTeamChainSettleInfo());
-            break;
-          }
-          case PACMAN_SETTLE_INFO: {
-            mergePacmanSettleInfo(other.getPacmanSettleInfo());
-            break;
-          }
-          case FUNGUS_FIGHTER_V2_SETTLE_INFO: {
-            mergeFungusFighterV2SettleInfo(other.getFungusFighterV2SettleInfo());
-            break;
-          }
-          case BLADE_DANCE_SETTLE_INFO: {
-            mergeBladeDanceSettleInfo(other.getBladeDanceSettleInfo());
-            break;
-          }
-          case MULTI_CHARACTER_DUNGEON_SETTLE_INFO: {
-            mergeMultiCharacterDungeonSettleInfo(other.getMultiCharacterDungeonSettleInfo());
-            break;
-          }
           case DETAIL_NOT_SET: {
             break;
           }
@@ -2616,277 +1462,6 @@ public final class DungeonSettleNotifyOuterClass {
 
       private int bitField0_;
 
-      private boolean isSuccess_ ;
-      /**
-       * <code>bool is_success = 3;</code>
-       * @return The isSuccess.
-       */
-      @java.lang.Override
-      public boolean getIsSuccess() {
-        return isSuccess_;
-      }
-      /**
-       * <code>bool is_success = 3;</code>
-       * @param value The isSuccess to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSuccess(boolean value) {
-        
-        isSuccess_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_success = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSuccess() {
-        
-        isSuccess_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> exhibitionInfoList_ =
-        java.util.Collections.emptyList();
-      private void ensureExhibitionInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          exhibitionInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo>(exhibitionInfoList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> exhibitionInfoListBuilder_;
-
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> getExhibitionInfoListList() {
-        if (exhibitionInfoListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(exhibitionInfoList_);
-        } else {
-          return exhibitionInfoListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public int getExhibitionInfoListCount() {
-        if (exhibitionInfoListBuilder_ == null) {
-          return exhibitionInfoList_.size();
-        } else {
-          return exhibitionInfoListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index) {
-        if (exhibitionInfoListBuilder_ == null) {
-          return exhibitionInfoList_.get(index);
-        } else {
-          return exhibitionInfoListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder setExhibitionInfoList(
-          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
-        if (exhibitionInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.set(index, value);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder setExhibitionInfoList(
-          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
-        if (exhibitionInfoListBuilder_ == null) {
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder addExhibitionInfoList(emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
-        if (exhibitionInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.add(value);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder addExhibitionInfoList(
-          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
-        if (exhibitionInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.add(index, value);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder addExhibitionInfoList(
-          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
-        if (exhibitionInfoListBuilder_ == null) {
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder addExhibitionInfoList(
-          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
-        if (exhibitionInfoListBuilder_ == null) {
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder addAllExhibitionInfoList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> values) {
-        if (exhibitionInfoListBuilder_ == null) {
-          ensureExhibitionInfoListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, exhibitionInfoList_);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder clearExhibitionInfoList() {
-        if (exhibitionInfoListBuilder_ == null) {
-          exhibitionInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public Builder removeExhibitionInfoList(int index) {
-        if (exhibitionInfoListBuilder_ == null) {
-          ensureExhibitionInfoListIsMutable();
-          exhibitionInfoList_.remove(index);
-          onChanged();
-        } else {
-          exhibitionInfoListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder getExhibitionInfoListBuilder(
-          int index) {
-        return getExhibitionInfoListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
-          int index) {
-        if (exhibitionInfoListBuilder_ == null) {
-          return exhibitionInfoList_.get(index);  } else {
-          return exhibitionInfoListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
-           getExhibitionInfoListOrBuilderList() {
-        if (exhibitionInfoListBuilder_ != null) {
-          return exhibitionInfoListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(exhibitionInfoList_);
-        }
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder addExhibitionInfoListBuilder() {
-        return getExhibitionInfoListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder addExhibitionInfoListBuilder(
-          int index) {
-        return getExhibitionInfoListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 10;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder> 
-           getExhibitionInfoListBuilderList() {
-        return getExhibitionInfoListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
-          getExhibitionInfoListFieldBuilder() {
-        if (exhibitionInfoListBuilder_ == null) {
-          exhibitionInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder>(
-                  exhibitionInfoList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          exhibitionInfoList_ = null;
-        }
-        return exhibitionInfoListBuilder_;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData> strengthenPointDataMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData>
@@ -2914,7 +1489,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
 
       @java.lang.Override
@@ -2932,7 +1507,7 @@ public final class DungeonSettleNotifyOuterClass {
         return getStrengthenPointDataMapMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
       @java.lang.Override
 
@@ -2940,7 +1515,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetStrengthenPointDataMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
       @java.lang.Override
 
@@ -2953,7 +1528,7 @@ public final class DungeonSettleNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
       @java.lang.Override
 
@@ -2974,7 +1549,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
 
       public Builder removeStrengthenPointDataMap(
@@ -2993,7 +1568,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetMutableStrengthenPointDataMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
       public Builder putStrengthenPointDataMap(
           int key,
@@ -3005,7 +1580,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 2;</code>
+       * <code>map&lt;uint32, .StrengthenPointData&gt; strengthen_point_data_map = 1;</code>
        */
 
       public Builder putAllStrengthenPointDataMap(
@@ -3015,6 +1590,449 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
 
+      private boolean isSuccess_ ;
+      /**
+       * <code>bool is_success = 4;</code>
+       * @return The isSuccess.
+       */
+      @java.lang.Override
+      public boolean getIsSuccess() {
+        return isSuccess_;
+      }
+      /**
+       * <code>bool is_success = 4;</code>
+       * @param value The isSuccess to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSuccess(boolean value) {
+        
+        isSuccess_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_success = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSuccess() {
+        
+        isSuccess_ = false;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList failCondList_ = emptyIntList();
+      private void ensureFailCondListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          failCondList_ = mutableCopy(failCondList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @return A list containing the failCondList.
+       */
+      public java.util.List<java.lang.Integer>
+          getFailCondListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(failCondList_) : failCondList_;
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @return The count of failCondList.
+       */
+      public int getFailCondListCount() {
+        return failCondList_.size();
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @param index The index of the element to return.
+       * @return The failCondList at the given index.
+       */
+      public int getFailCondList(int index) {
+        return failCondList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @param index The index to set the value at.
+       * @param value The failCondList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFailCondList(
+          int index, int value) {
+        ensureFailCondListIsMutable();
+        failCondList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @param value The failCondList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFailCondList(int value) {
+        ensureFailCondListIsMutable();
+        failCondList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @param values The failCondList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFailCondList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFailCondListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, failCondList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 fail_cond_list = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFailCondList() {
+        failCondList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> exhibitionInfoList_ =
+        java.util.Collections.emptyList();
+      private void ensureExhibitionInfoListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          exhibitionInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo>(exhibitionInfoList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> exhibitionInfoListBuilder_;
+
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> getExhibitionInfoListList() {
+        if (exhibitionInfoListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(exhibitionInfoList_);
+        } else {
+          return exhibitionInfoListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public int getExhibitionInfoListCount() {
+        if (exhibitionInfoListBuilder_ == null) {
+          return exhibitionInfoList_.size();
+        } else {
+          return exhibitionInfoListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo getExhibitionInfoList(int index) {
+        if (exhibitionInfoListBuilder_ == null) {
+          return exhibitionInfoList_.get(index);
+        } else {
+          return exhibitionInfoListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder setExhibitionInfoList(
+          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
+        if (exhibitionInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.set(index, value);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder setExhibitionInfoList(
+          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
+        if (exhibitionInfoListBuilder_ == null) {
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder addExhibitionInfoList(emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
+        if (exhibitionInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.add(value);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder addExhibitionInfoList(
+          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo value) {
+        if (exhibitionInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.add(index, value);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder addExhibitionInfoList(
+          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
+        if (exhibitionInfoListBuilder_ == null) {
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder addExhibitionInfoList(
+          int index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder builderForValue) {
+        if (exhibitionInfoListBuilder_ == null) {
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder addAllExhibitionInfoList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo> values) {
+        if (exhibitionInfoListBuilder_ == null) {
+          ensureExhibitionInfoListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, exhibitionInfoList_);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder clearExhibitionInfoList() {
+        if (exhibitionInfoListBuilder_ == null) {
+          exhibitionInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public Builder removeExhibitionInfoList(int index) {
+        if (exhibitionInfoListBuilder_ == null) {
+          ensureExhibitionInfoListIsMutable();
+          exhibitionInfoList_.remove(index);
+          onChanged();
+        } else {
+          exhibitionInfoListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder getExhibitionInfoListBuilder(
+          int index) {
+        return getExhibitionInfoListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder getExhibitionInfoListOrBuilder(
+          int index) {
+        if (exhibitionInfoListBuilder_ == null) {
+          return exhibitionInfoList_.get(index);  } else {
+          return exhibitionInfoListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
+           getExhibitionInfoListOrBuilderList() {
+        if (exhibitionInfoListBuilder_ != null) {
+          return exhibitionInfoListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(exhibitionInfoList_);
+        }
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder addExhibitionInfoListBuilder() {
+        return getExhibitionInfoListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder addExhibitionInfoListBuilder(
+          int index) {
+        return getExhibitionInfoListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .DungeonSettleExhibitionInfo exhibition_info_list = 6;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder> 
+           getExhibitionInfoListBuilderList() {
+        return getExhibitionInfoListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder> 
+          getExhibitionInfoListFieldBuilder() {
+        if (exhibitionInfoListBuilder_ == null) {
+          exhibitionInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfo.Builder, emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.DungeonSettleExhibitionInfoOrBuilder>(
+                  exhibitionInfoList_,
+                  ((bitField0_ & 0x00000004) != 0),
+                  getParentForChildren(),
+                  isClean());
+          exhibitionInfoList_ = null;
+        }
+        return exhibitionInfoListBuilder_;
+      }
+
+      private int dungeonId_ ;
+      /**
+       * <code>uint32 dungeon_id = 8;</code>
+       * @return The dungeonId.
+       */
+      @java.lang.Override
+      public int getDungeonId() {
+        return dungeonId_;
+      }
+      /**
+       * <code>uint32 dungeon_id = 8;</code>
+       * @param value The dungeonId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonId(int value) {
+        
+        dungeonId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonId() {
+        
+        dungeonId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int useTime_ ;
+      /**
+       * <code>uint32 use_time = 9;</code>
+       * @return The useTime.
+       */
+      @java.lang.Override
+      public int getUseTime() {
+        return useTime_;
+      }
+      /**
+       * <code>uint32 use_time = 9;</code>
+       * @param value The useTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUseTime(int value) {
+        
+        useTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 use_time = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUseTime() {
+        
+        useTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int closeTime_ ;
+      /**
+       * <code>uint32 close_time = 10;</code>
+       * @return The closeTime.
+       */
+      @java.lang.Override
+      public int getCloseTime() {
+        return closeTime_;
+      }
+      /**
+       * <code>uint32 close_time = 10;</code>
+       * @param value The closeTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCloseTime(int value) {
+        
+        closeTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 close_time = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCloseTime() {
+        
+        closeTime_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList> settleShow_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.ParamListOuterClass.ParamList>
@@ -3042,7 +2060,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetSettleShow().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
 
       @java.lang.Override
@@ -3060,7 +2078,7 @@ public final class DungeonSettleNotifyOuterClass {
         return getSettleShowMap();
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
       @java.lang.Override
 
@@ -3068,7 +2086,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetSettleShow().getMap();
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
       @java.lang.Override
 
@@ -3081,7 +2099,7 @@ public final class DungeonSettleNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
       @java.lang.Override
 
@@ -3102,7 +2120,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
 
       public Builder removeSettleShow(
@@ -3121,7 +2139,7 @@ public final class DungeonSettleNotifyOuterClass {
         return internalGetMutableSettleShow().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
       public Builder putSettleShow(
           int key,
@@ -3133,7 +2151,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .ParamList&gt; settle_show = 13;</code>
+       * <code>map&lt;uint32, .ParamList&gt; settle_show = 11;</code>
        */
 
       public Builder putAllSettleShow(
@@ -3145,7 +2163,7 @@ public final class DungeonSettleNotifyOuterClass {
 
       private int createPlayerUid_ ;
       /**
-       * <code>uint32 create_player_uid = 1;</code>
+       * <code>uint32 create_player_uid = 12;</code>
        * @return The createPlayerUid.
        */
       @java.lang.Override
@@ -3153,7 +2171,7 @@ public final class DungeonSettleNotifyOuterClass {
         return createPlayerUid_;
       }
       /**
-       * <code>uint32 create_player_uid = 1;</code>
+       * <code>uint32 create_player_uid = 12;</code>
        * @param value The createPlayerUid to set.
        * @return This builder for chaining.
        */
@@ -3164,7 +2182,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 create_player_uid = 1;</code>
+       * <code>uint32 create_player_uid = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCreatePlayerUid() {
@@ -3174,71 +2192,9 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
 
-      private int dungeonId_ ;
-      /**
-       * <code>uint32 dungeon_id = 7;</code>
-       * @return The dungeonId.
-       */
-      @java.lang.Override
-      public int getDungeonId() {
-        return dungeonId_;
-      }
-      /**
-       * <code>uint32 dungeon_id = 7;</code>
-       * @param value The dungeonId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonId(int value) {
-        
-        dungeonId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonId() {
-        
-        dungeonId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int closeTime_ ;
-      /**
-       * <code>uint32 close_time = 6;</code>
-       * @return The closeTime.
-       */
-      @java.lang.Override
-      public int getCloseTime() {
-        return closeTime_;
-      }
-      /**
-       * <code>uint32 close_time = 6;</code>
-       * @param value The closeTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCloseTime(int value) {
-        
-        closeTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 close_time = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCloseTime() {
-        
-        closeTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int result_ ;
       /**
-       * <code>uint32 result = 5;</code>
+       * <code>uint32 result = 14;</code>
        * @return The result.
        */
       @java.lang.Override
@@ -3246,7 +2202,7 @@ public final class DungeonSettleNotifyOuterClass {
         return result_;
       }
       /**
-       * <code>uint32 result = 5;</code>
+       * <code>uint32 result = 14;</code>
        * @param value The result to set.
        * @return This builder for chaining.
        */
@@ -3257,7 +2213,7 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 result = 5;</code>
+       * <code>uint32 result = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearResult() {
@@ -3267,146 +2223,36 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
 
-      private int useTime_ ;
-      /**
-       * <code>uint32 use_time = 15;</code>
-       * @return The useTime.
-       */
-      @java.lang.Override
-      public int getUseTime() {
-        return useTime_;
-      }
-      /**
-       * <code>uint32 use_time = 15;</code>
-       * @param value The useTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUseTime(int value) {
-        
-        useTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 use_time = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUseTime() {
-        
-        useTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList failCondList_ = emptyIntList();
-      private void ensureFailCondListIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          failCondList_ = mutableCopy(failCondList_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @return A list containing the failCondList.
-       */
-      public java.util.List<java.lang.Integer>
-          getFailCondListList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(failCondList_) : failCondList_;
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @return The count of failCondList.
-       */
-      public int getFailCondListCount() {
-        return failCondList_.size();
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @param index The index of the element to return.
-       * @return The failCondList at the given index.
-       */
-      public int getFailCondList(int index) {
-        return failCondList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @param index The index to set the value at.
-       * @param value The failCondList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFailCondList(
-          int index, int value) {
-        ensureFailCondListIsMutable();
-        failCondList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @param value The failCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFailCondList(int value) {
-        ensureFailCondListIsMutable();
-        failCondList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @param values The failCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFailCondList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFailCondListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, failCondList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 fail_cond_list = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFailCondList() {
-        failCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> towerLevelEndNotifyBuilder_;
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        * @return Whether the towerLevelEndNotify field is set.
        */
       @java.lang.Override
       public boolean hasTowerLevelEndNotify() {
-        return detailCase_ == 1162;
+        return detailCase_ == 682;
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        * @return The towerLevelEndNotify.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify getTowerLevelEndNotify() {
         if (towerLevelEndNotifyBuilder_ == null) {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_;
           }
           return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
         } else {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             return towerLevelEndNotifyBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
         }
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       public Builder setTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) {
         if (towerLevelEndNotifyBuilder_ == null) {
@@ -3418,11 +2264,11 @@ public final class DungeonSettleNotifyOuterClass {
         } else {
           towerLevelEndNotifyBuilder_.setMessage(value);
         }
-        detailCase_ = 1162;
+        detailCase_ = 682;
         return this;
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       public Builder setTowerLevelEndNotify(
           emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder builderForValue) {
@@ -3432,15 +2278,15 @@ public final class DungeonSettleNotifyOuterClass {
         } else {
           towerLevelEndNotifyBuilder_.setMessage(builderForValue.build());
         }
-        detailCase_ = 1162;
+        detailCase_ = 682;
         return this;
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       public Builder mergeTowerLevelEndNotify(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify value) {
         if (towerLevelEndNotifyBuilder_ == null) {
-          if (detailCase_ == 1162 &&
+          if (detailCase_ == 682 &&
               detail_ != emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.newBuilder((emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_)
                 .mergeFrom(value).buildPartial();
@@ -3449,26 +2295,26 @@ public final class DungeonSettleNotifyOuterClass {
           }
           onChanged();
         } else {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             towerLevelEndNotifyBuilder_.mergeFrom(value);
           }
           towerLevelEndNotifyBuilder_.setMessage(value);
         }
-        detailCase_ = 1162;
+        detailCase_ = 682;
         return this;
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       public Builder clearTowerLevelEndNotify() {
         if (towerLevelEndNotifyBuilder_ == null) {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             detailCase_ = 0;
             detail_ = null;
             onChanged();
           }
         } else {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             detailCase_ = 0;
             detail_ = null;
           }
@@ -3477,33 +2323,33 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder getTowerLevelEndNotifyBuilder() {
         return getTowerLevelEndNotifyFieldBuilder().getBuilder();
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder getTowerLevelEndNotifyOrBuilder() {
-        if ((detailCase_ == 1162) && (towerLevelEndNotifyBuilder_ != null)) {
+        if ((detailCase_ == 682) && (towerLevelEndNotifyBuilder_ != null)) {
           return towerLevelEndNotifyBuilder_.getMessageOrBuilder();
         } else {
-          if (detailCase_ == 1162) {
+          if (detailCase_ == 682) {
             return (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) detail_;
           }
           return emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
         }
       }
       /**
-       * <code>.TowerLevelEndNotify tower_level_end_notify = 1162;</code>
+       * <code>.TowerLevelEndNotify tower_level_end_notify = 682;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.Builder, emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotifyOrBuilder> 
           getTowerLevelEndNotifyFieldBuilder() {
         if (towerLevelEndNotifyBuilder_ == null) {
-          if (!(detailCase_ == 1162)) {
+          if (!(detailCase_ == 682)) {
             detail_ = emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance();
           }
           towerLevelEndNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -3513,7 +2359,7 @@ public final class DungeonSettleNotifyOuterClass {
                   isClean());
           detail_ = null;
         }
-        detailCase_ = 1162;
+        detailCase_ = 682;
         onChanged();;
         return towerLevelEndNotifyBuilder_;
       }
@@ -3521,33 +2367,33 @@ public final class DungeonSettleNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify, emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder, emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder> trialAvatarFirstPassDungeonNotifyBuilder_;
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        * @return Whether the trialAvatarFirstPassDungeonNotify field is set.
        */
       @java.lang.Override
       public boolean hasTrialAvatarFirstPassDungeonNotify() {
-        return detailCase_ == 2036;
+        return detailCase_ == 1922;
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        * @return The trialAvatarFirstPassDungeonNotify.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify getTrialAvatarFirstPassDungeonNotify() {
         if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_;
           }
           return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
         } else {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             return trialAvatarFirstPassDungeonNotifyBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
         }
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       public Builder setTrialAvatarFirstPassDungeonNotify(emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify value) {
         if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
@@ -3559,11 +2405,11 @@ public final class DungeonSettleNotifyOuterClass {
         } else {
           trialAvatarFirstPassDungeonNotifyBuilder_.setMessage(value);
         }
-        detailCase_ = 2036;
+        detailCase_ = 1922;
         return this;
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       public Builder setTrialAvatarFirstPassDungeonNotify(
           emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder builderForValue) {
@@ -3573,15 +2419,15 @@ public final class DungeonSettleNotifyOuterClass {
         } else {
           trialAvatarFirstPassDungeonNotifyBuilder_.setMessage(builderForValue.build());
         }
-        detailCase_ = 2036;
+        detailCase_ = 1922;
         return this;
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       public Builder mergeTrialAvatarFirstPassDungeonNotify(emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify value) {
         if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
-          if (detailCase_ == 2036 &&
+          if (detailCase_ == 1922 &&
               detail_ != emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.newBuilder((emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_)
                 .mergeFrom(value).buildPartial();
@@ -3590,26 +2436,26 @@ public final class DungeonSettleNotifyOuterClass {
           }
           onChanged();
         } else {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             trialAvatarFirstPassDungeonNotifyBuilder_.mergeFrom(value);
           }
           trialAvatarFirstPassDungeonNotifyBuilder_.setMessage(value);
         }
-        detailCase_ = 2036;
+        detailCase_ = 1922;
         return this;
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       public Builder clearTrialAvatarFirstPassDungeonNotify() {
         if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             detailCase_ = 0;
             detail_ = null;
             onChanged();
           }
         } else {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             detailCase_ = 0;
             detail_ = null;
           }
@@ -3618,33 +2464,33 @@ public final class DungeonSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder getTrialAvatarFirstPassDungeonNotifyBuilder() {
         return getTrialAvatarFirstPassDungeonNotifyFieldBuilder().getBuilder();
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder getTrialAvatarFirstPassDungeonNotifyOrBuilder() {
-        if ((detailCase_ == 2036) && (trialAvatarFirstPassDungeonNotifyBuilder_ != null)) {
+        if ((detailCase_ == 1922) && (trialAvatarFirstPassDungeonNotifyBuilder_ != null)) {
           return trialAvatarFirstPassDungeonNotifyBuilder_.getMessageOrBuilder();
         } else {
-          if (detailCase_ == 2036) {
+          if (detailCase_ == 1922) {
             return (emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify) detail_;
           }
           return emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
         }
       }
       /**
-       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 2036;</code>
+       * <code>.TrialAvatarFirstPassDungeonNotify trial_avatar_first_pass_dungeon_notify = 1922;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify, emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder, emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotifyOrBuilder> 
           getTrialAvatarFirstPassDungeonNotifyFieldBuilder() {
         if (trialAvatarFirstPassDungeonNotifyBuilder_ == null) {
-          if (!(detailCase_ == 2036)) {
+          if (!(detailCase_ == 1922)) {
             detail_ = emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.getDefaultInstance();
           }
           trialAvatarFirstPassDungeonNotifyBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -3654,1843 +2500,10 @@ public final class DungeonSettleNotifyOuterClass {
                   isClean());
           detail_ = null;
         }
-        detailCase_ = 2036;
+        detailCase_ = 1922;
         onChanged();;
         return trialAvatarFirstPassDungeonNotifyBuilder_;
       }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> channellerSlabLoopDungeonResultInfoBuilder_;
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       * @return Whether the channellerSlabLoopDungeonResultInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasChannellerSlabLoopDungeonResultInfo() {
-        return detailCase_ == 808;
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       * @return The channellerSlabLoopDungeonResultInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo getChannellerSlabLoopDungeonResultInfo() {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 808) {
-            return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 808) {
-            return channellerSlabLoopDungeonResultInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      public Builder setChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 808;
-        return this;
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      public Builder setChannellerSlabLoopDungeonResultInfo(
-          emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder builderForValue) {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          channellerSlabLoopDungeonResultInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 808;
-        return this;
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      public Builder mergeChannellerSlabLoopDungeonResultInfo(emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo value) {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 808 &&
-              detail_ != emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 808) {
-            channellerSlabLoopDungeonResultInfoBuilder_.mergeFrom(value);
-          }
-          channellerSlabLoopDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 808;
-        return this;
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      public Builder clearChannellerSlabLoopDungeonResultInfo() {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 808) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 808) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          channellerSlabLoopDungeonResultInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder getChannellerSlabLoopDungeonResultInfoBuilder() {
-        return getChannellerSlabLoopDungeonResultInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder getChannellerSlabLoopDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 808) && (channellerSlabLoopDungeonResultInfoBuilder_ != null)) {
-          return channellerSlabLoopDungeonResultInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 808) {
-            return (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.ChannellerSlabLoopDungeonResultInfo channeller_slab_loop_dungeon_result_info = 808;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder> 
-          getChannellerSlabLoopDungeonResultInfoFieldBuilder() {
-        if (channellerSlabLoopDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 808)) {
-            detail_ = emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.getDefaultInstance();
-          }
-          channellerSlabLoopDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo.Builder, emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.ChannellerSlabLoopDungeonResultInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 808;
-        onChanged();;
-        return channellerSlabLoopDungeonResultInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> effigyChallengeDungeonResultInfoBuilder_;
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       * @return Whether the effigyChallengeDungeonResultInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyChallengeDungeonResultInfo() {
-        return detailCase_ == 596;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       * @return The effigyChallengeDungeonResultInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo getEffigyChallengeDungeonResultInfo() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 596) {
-            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 596) {
-            return effigyChallengeDungeonResultInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      public Builder setEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 596;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      public Builder setEffigyChallengeDungeonResultInfo(
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder builderForValue) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 596;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      public Builder mergeEffigyChallengeDungeonResultInfo(emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo value) {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 596 &&
-              detail_ != emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 596) {
-            effigyChallengeDungeonResultInfoBuilder_.mergeFrom(value);
-          }
-          effigyChallengeDungeonResultInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 596;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      public Builder clearEffigyChallengeDungeonResultInfo() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (detailCase_ == 596) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 596) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyChallengeDungeonResultInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder getEffigyChallengeDungeonResultInfoBuilder() {
-        return getEffigyChallengeDungeonResultInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder getEffigyChallengeDungeonResultInfoOrBuilder() {
-        if ((detailCase_ == 596) && (effigyChallengeDungeonResultInfoBuilder_ != null)) {
-          return effigyChallengeDungeonResultInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 596) {
-            return (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeDungeonResultInfo effigy_challenge_dungeon_result_info = 596;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder> 
-          getEffigyChallengeDungeonResultInfoFieldBuilder() {
-        if (effigyChallengeDungeonResultInfoBuilder_ == null) {
-          if (!(detailCase_ == 596)) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.getDefaultInstance();
-          }
-          effigyChallengeDungeonResultInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 596;
-        onChanged();;
-        return effigyChallengeDungeonResultInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder> roguelikeDungeonSettleInfoBuilder_;
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       * @return Whether the roguelikeDungeonSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasRoguelikeDungeonSettleInfo() {
-        return detailCase_ == 2010;
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       * @return The roguelikeDungeonSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo getRoguelikeDungeonSettleInfo() {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 2010) {
-            return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 2010) {
-            return roguelikeDungeonSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      public Builder setRoguelikeDungeonSettleInfo(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo value) {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          roguelikeDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2010;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      public Builder setRoguelikeDungeonSettleInfo(
-          emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder builderForValue) {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          roguelikeDungeonSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 2010;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      public Builder mergeRoguelikeDungeonSettleInfo(emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo value) {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 2010 &&
-              detail_ != emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 2010) {
-            roguelikeDungeonSettleInfoBuilder_.mergeFrom(value);
-          }
-          roguelikeDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 2010;
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      public Builder clearRoguelikeDungeonSettleInfo() {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 2010) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 2010) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          roguelikeDungeonSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder getRoguelikeDungeonSettleInfoBuilder() {
-        return getRoguelikeDungeonSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder getRoguelikeDungeonSettleInfoOrBuilder() {
-        if ((detailCase_ == 2010) && (roguelikeDungeonSettleInfoBuilder_ != null)) {
-          return roguelikeDungeonSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 2010) {
-            return (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.RoguelikeDungeonSettleInfo roguelike_dungeon_settle_info = 2010;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder> 
-          getRoguelikeDungeonSettleInfoFieldBuilder() {
-        if (roguelikeDungeonSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 2010)) {
-            detail_ = emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.getDefaultInstance();
-          }
-          roguelikeDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo.Builder, emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.RoguelikeDungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 2010;
-        onChanged();;
-        return roguelikeDungeonSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder> crystalLinkSettleInfoBuilder_;
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       * @return Whether the crystalLinkSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasCrystalLinkSettleInfo() {
-        return detailCase_ == 1313;
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       * @return The crystalLinkSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo getCrystalLinkSettleInfo() {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1313) {
-            return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1313) {
-            return crystalLinkSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      public Builder setCrystalLinkSettleInfo(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo value) {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          crystalLinkSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1313;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      public Builder setCrystalLinkSettleInfo(
-          emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder builderForValue) {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          crystalLinkSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1313;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      public Builder mergeCrystalLinkSettleInfo(emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo value) {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1313 &&
-              detail_ != emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1313) {
-            crystalLinkSettleInfoBuilder_.mergeFrom(value);
-          }
-          crystalLinkSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1313;
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      public Builder clearCrystalLinkSettleInfo() {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1313) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1313) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          crystalLinkSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder getCrystalLinkSettleInfoBuilder() {
-        return getCrystalLinkSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder getCrystalLinkSettleInfoOrBuilder() {
-        if ((detailCase_ == 1313) && (crystalLinkSettleInfoBuilder_ != null)) {
-          return crystalLinkSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1313) {
-            return (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.CrystalLinkDungeonSettleInfo crystal_link_settle_info = 1313;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder> 
-          getCrystalLinkSettleInfoFieldBuilder() {
-        if (crystalLinkSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 1313)) {
-            detail_ = emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.getDefaultInstance();
-          }
-          crystalLinkSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo.Builder, emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.CrystalLinkDungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1313;
-        onChanged();;
-        return crystalLinkSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder> summerTimeV2DungeonSettleInfoBuilder_;
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       * @return Whether the summerTimeV2DungeonSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasSummerTimeV2DungeonSettleInfo() {
-        return detailCase_ == 174;
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       * @return The summerTimeV2DungeonSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo getSummerTimeV2DungeonSettleInfo() {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 174) {
-            return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 174) {
-            return summerTimeV2DungeonSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      public Builder setSummerTimeV2DungeonSettleInfo(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo value) {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          summerTimeV2DungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 174;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      public Builder setSummerTimeV2DungeonSettleInfo(
-          emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder builderForValue) {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          summerTimeV2DungeonSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 174;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      public Builder mergeSummerTimeV2DungeonSettleInfo(emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo value) {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 174 &&
-              detail_ != emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 174) {
-            summerTimeV2DungeonSettleInfoBuilder_.mergeFrom(value);
-          }
-          summerTimeV2DungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 174;
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      public Builder clearSummerTimeV2DungeonSettleInfo() {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 174) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 174) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          summerTimeV2DungeonSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder getSummerTimeV2DungeonSettleInfoBuilder() {
-        return getSummerTimeV2DungeonSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder getSummerTimeV2DungeonSettleInfoOrBuilder() {
-        if ((detailCase_ == 174) && (summerTimeV2DungeonSettleInfoBuilder_ != null)) {
-          return summerTimeV2DungeonSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 174) {
-            return (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SummerTimeV2DungeonSettleInfo summer_time_v2_dungeon_settle_info = 174;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder> 
-          getSummerTimeV2DungeonSettleInfoFieldBuilder() {
-        if (summerTimeV2DungeonSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 174)) {
-            detail_ = emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.getDefaultInstance();
-          }
-          summerTimeV2DungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo.Builder, emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.SummerTimeV2DungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 174;
-        onChanged();;
-        return summerTimeV2DungeonSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder> instableSpraySettleInfoBuilder_;
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       * @return Whether the instableSpraySettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasInstableSpraySettleInfo() {
-        return detailCase_ == 702;
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       * @return The instableSpraySettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo getInstableSpraySettleInfo() {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          if (detailCase_ == 702) {
-            return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 702) {
-            return instableSpraySettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      public Builder setInstableSpraySettleInfo(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo value) {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          instableSpraySettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 702;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      public Builder setInstableSpraySettleInfo(
-          emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder builderForValue) {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          instableSpraySettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 702;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      public Builder mergeInstableSpraySettleInfo(emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo value) {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          if (detailCase_ == 702 &&
-              detail_ != emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 702) {
-            instableSpraySettleInfoBuilder_.mergeFrom(value);
-          }
-          instableSpraySettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 702;
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      public Builder clearInstableSpraySettleInfo() {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          if (detailCase_ == 702) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 702) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          instableSpraySettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder getInstableSpraySettleInfoBuilder() {
-        return getInstableSpraySettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder getInstableSpraySettleInfoOrBuilder() {
-        if ((detailCase_ == 702) && (instableSpraySettleInfoBuilder_ != null)) {
-          return instableSpraySettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 702) {
-            return (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.InstableSprayDungeonSettleInfo instable_spray_settle_info = 702;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder> 
-          getInstableSpraySettleInfoFieldBuilder() {
-        if (instableSpraySettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 702)) {
-            detail_ = emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.getDefaultInstance();
-          }
-          instableSpraySettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo.Builder, emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.InstableSprayDungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 702;
-        onChanged();;
-        return instableSpraySettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder> windFieldDungeonSettleInfoBuilder_;
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       * @return Whether the windFieldDungeonSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasWindFieldDungeonSettleInfo() {
-        return detailCase_ == 714;
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       * @return The windFieldDungeonSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo getWindFieldDungeonSettleInfo() {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 714) {
-            return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 714) {
-            return windFieldDungeonSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      public Builder setWindFieldDungeonSettleInfo(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo value) {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          windFieldDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 714;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      public Builder setWindFieldDungeonSettleInfo(
-          emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder builderForValue) {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          windFieldDungeonSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 714;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      public Builder mergeWindFieldDungeonSettleInfo(emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo value) {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 714 &&
-              detail_ != emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 714) {
-            windFieldDungeonSettleInfoBuilder_.mergeFrom(value);
-          }
-          windFieldDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 714;
-        return this;
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      public Builder clearWindFieldDungeonSettleInfo() {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 714) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 714) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          windFieldDungeonSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder getWindFieldDungeonSettleInfoBuilder() {
-        return getWindFieldDungeonSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder getWindFieldDungeonSettleInfoOrBuilder() {
-        if ((detailCase_ == 714) && (windFieldDungeonSettleInfoBuilder_ != null)) {
-          return windFieldDungeonSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 714) {
-            return (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.WindFieldDungeonSettleInfo wind_field_dungeon_settle_info = 714;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder> 
-          getWindFieldDungeonSettleInfoFieldBuilder() {
-        if (windFieldDungeonSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 714)) {
-            detail_ = emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.getDefaultInstance();
-          }
-          windFieldDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo.Builder, emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.WindFieldDungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 714;
-        onChanged();;
-        return windFieldDungeonSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder> effigyChallengeV2SettleInfoBuilder_;
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       * @return Whether the effigyChallengeV2SettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasEffigyChallengeV2SettleInfo() {
-        return detailCase_ == 1629;
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       * @return The effigyChallengeV2SettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo getEffigyChallengeV2SettleInfo() {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1629) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1629) {
-            return effigyChallengeV2SettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      public Builder setEffigyChallengeV2SettleInfo(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo value) {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          effigyChallengeV2SettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1629;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      public Builder setEffigyChallengeV2SettleInfo(
-          emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder builderForValue) {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          effigyChallengeV2SettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1629;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      public Builder mergeEffigyChallengeV2SettleInfo(emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo value) {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1629 &&
-              detail_ != emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.newBuilder((emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1629) {
-            effigyChallengeV2SettleInfoBuilder_.mergeFrom(value);
-          }
-          effigyChallengeV2SettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1629;
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      public Builder clearEffigyChallengeV2SettleInfo() {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1629) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1629) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          effigyChallengeV2SettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder getEffigyChallengeV2SettleInfoBuilder() {
-        return getEffigyChallengeV2SettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder getEffigyChallengeV2SettleInfoOrBuilder() {
-        if ((detailCase_ == 1629) && (effigyChallengeV2SettleInfoBuilder_ != null)) {
-          return effigyChallengeV2SettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1629) {
-            return (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.EffigyChallengeV2SettleInfo effigy_challenge_v2_settle_info = 1629;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder> 
-          getEffigyChallengeV2SettleInfoFieldBuilder() {
-        if (effigyChallengeV2SettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 1629)) {
-            detail_ = emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.getDefaultInstance();
-          }
-          effigyChallengeV2SettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.EffigyChallengeV2SettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1629;
-        onChanged();;
-        return effigyChallengeV2SettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder> teamChainSettleInfoBuilder_;
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       * @return Whether the teamChainSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasTeamChainSettleInfo() {
-        return detailCase_ == 755;
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       * @return The teamChainSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo getTeamChainSettleInfo() {
-        if (teamChainSettleInfoBuilder_ == null) {
-          if (detailCase_ == 755) {
-            return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 755) {
-            return teamChainSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      public Builder setTeamChainSettleInfo(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo value) {
-        if (teamChainSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          teamChainSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 755;
-        return this;
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      public Builder setTeamChainSettleInfo(
-          emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder builderForValue) {
-        if (teamChainSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          teamChainSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 755;
-        return this;
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      public Builder mergeTeamChainSettleInfo(emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo value) {
-        if (teamChainSettleInfoBuilder_ == null) {
-          if (detailCase_ == 755 &&
-              detail_ != emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.newBuilder((emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 755) {
-            teamChainSettleInfoBuilder_.mergeFrom(value);
-          }
-          teamChainSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 755;
-        return this;
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      public Builder clearTeamChainSettleInfo() {
-        if (teamChainSettleInfoBuilder_ == null) {
-          if (detailCase_ == 755) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 755) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          teamChainSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder getTeamChainSettleInfoBuilder() {
-        return getTeamChainSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder getTeamChainSettleInfoOrBuilder() {
-        if ((detailCase_ == 755) && (teamChainSettleInfoBuilder_ != null)) {
-          return teamChainSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 755) {
-            return (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.TeamChainSettleInfo team_chain_settle_info = 755;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder> 
-          getTeamChainSettleInfoFieldBuilder() {
-        if (teamChainSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 755)) {
-            detail_ = emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.getDefaultInstance();
-          }
-          teamChainSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo.Builder, emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.TeamChainSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 755;
-        onChanged();;
-        return teamChainSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder> pacmanSettleInfoBuilder_;
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       * @return Whether the pacmanSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasPacmanSettleInfo() {
-        return detailCase_ == 1544;
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       * @return The pacmanSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo getPacmanSettleInfo() {
-        if (pacmanSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1544) {
-            return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1544) {
-            return pacmanSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      public Builder setPacmanSettleInfo(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo value) {
-        if (pacmanSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          pacmanSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1544;
-        return this;
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      public Builder setPacmanSettleInfo(
-          emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder builderForValue) {
-        if (pacmanSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          pacmanSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1544;
-        return this;
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      public Builder mergePacmanSettleInfo(emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo value) {
-        if (pacmanSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1544 &&
-              detail_ != emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.newBuilder((emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1544) {
-            pacmanSettleInfoBuilder_.mergeFrom(value);
-          }
-          pacmanSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1544;
-        return this;
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      public Builder clearPacmanSettleInfo() {
-        if (pacmanSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1544) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1544) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          pacmanSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder getPacmanSettleInfoBuilder() {
-        return getPacmanSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder getPacmanSettleInfoOrBuilder() {
-        if ((detailCase_ == 1544) && (pacmanSettleInfoBuilder_ != null)) {
-          return pacmanSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1544) {
-            return (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.PacmanSettleInfo pacman_settle_info = 1544;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder> 
-          getPacmanSettleInfoFieldBuilder() {
-        if (pacmanSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 1544)) {
-            detail_ = emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.getDefaultInstance();
-          }
-          pacmanSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo.Builder, emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.PacmanSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1544;
-        onChanged();;
-        return pacmanSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder> fungusFighterV2SettleInfoBuilder_;
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       * @return Whether the fungusFighterV2SettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasFungusFighterV2SettleInfo() {
-        return detailCase_ == 1886;
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       * @return The fungusFighterV2SettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo getFungusFighterV2SettleInfo() {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1886) {
-            return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1886) {
-            return fungusFighterV2SettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      public Builder setFungusFighterV2SettleInfo(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo value) {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          fungusFighterV2SettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1886;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      public Builder setFungusFighterV2SettleInfo(
-          emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder builderForValue) {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          fungusFighterV2SettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1886;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      public Builder mergeFungusFighterV2SettleInfo(emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo value) {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1886 &&
-              detail_ != emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.newBuilder((emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1886) {
-            fungusFighterV2SettleInfoBuilder_.mergeFrom(value);
-          }
-          fungusFighterV2SettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1886;
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      public Builder clearFungusFighterV2SettleInfo() {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          if (detailCase_ == 1886) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1886) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          fungusFighterV2SettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder getFungusFighterV2SettleInfoBuilder() {
-        return getFungusFighterV2SettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder getFungusFighterV2SettleInfoOrBuilder() {
-        if ((detailCase_ == 1886) && (fungusFighterV2SettleInfoBuilder_ != null)) {
-          return fungusFighterV2SettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1886) {
-            return (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.FungusFighterV2SettleInfo fungus_fighter_v2_settle_info = 1886;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder> 
-          getFungusFighterV2SettleInfoFieldBuilder() {
-        if (fungusFighterV2SettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 1886)) {
-            detail_ = emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.getDefaultInstance();
-          }
-          fungusFighterV2SettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo.Builder, emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.FungusFighterV2SettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1886;
-        onChanged();;
-        return fungusFighterV2SettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder> bladeDanceSettleInfoBuilder_;
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       * @return Whether the bladeDanceSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasBladeDanceSettleInfo() {
-        return detailCase_ == 578;
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       * @return The bladeDanceSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo getBladeDanceSettleInfo() {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          if (detailCase_ == 578) {
-            return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 578) {
-            return bladeDanceSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      public Builder setBladeDanceSettleInfo(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo value) {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          bladeDanceSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 578;
-        return this;
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      public Builder setBladeDanceSettleInfo(
-          emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder builderForValue) {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          bladeDanceSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 578;
-        return this;
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      public Builder mergeBladeDanceSettleInfo(emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo value) {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          if (detailCase_ == 578 &&
-              detail_ != emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.newBuilder((emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 578) {
-            bladeDanceSettleInfoBuilder_.mergeFrom(value);
-          }
-          bladeDanceSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 578;
-        return this;
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      public Builder clearBladeDanceSettleInfo() {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          if (detailCase_ == 578) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 578) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          bladeDanceSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder getBladeDanceSettleInfoBuilder() {
-        return getBladeDanceSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder getBladeDanceSettleInfoOrBuilder() {
-        if ((detailCase_ == 578) && (bladeDanceSettleInfoBuilder_ != null)) {
-          return bladeDanceSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 578) {
-            return (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.BladeDanceSettleInfo blade_dance_settle_info = 578;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder> 
-          getBladeDanceSettleInfoFieldBuilder() {
-        if (bladeDanceSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 578)) {
-            detail_ = emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.getDefaultInstance();
-          }
-          bladeDanceSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo.Builder, emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.BladeDanceSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 578;
-        onChanged();;
-        return bladeDanceSettleInfoBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder> multiCharacterDungeonSettleInfoBuilder_;
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       * @return Whether the multiCharacterDungeonSettleInfo field is set.
-       */
-      @java.lang.Override
-      public boolean hasMultiCharacterDungeonSettleInfo() {
-        return detailCase_ == 1901;
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       * @return The multiCharacterDungeonSettleInfo.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo getMultiCharacterDungeonSettleInfo() {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1901) {
-            return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-        } else {
-          if (detailCase_ == 1901) {
-            return multiCharacterDungeonSettleInfoBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      public Builder setMultiCharacterDungeonSettleInfo(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo value) {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detail_ = value;
-          onChanged();
-        } else {
-          multiCharacterDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1901;
-        return this;
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      public Builder setMultiCharacterDungeonSettleInfo(
-          emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder builderForValue) {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          detail_ = builderForValue.build();
-          onChanged();
-        } else {
-          multiCharacterDungeonSettleInfoBuilder_.setMessage(builderForValue.build());
-        }
-        detailCase_ = 1901;
-        return this;
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      public Builder mergeMultiCharacterDungeonSettleInfo(emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo value) {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1901 &&
-              detail_ != emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance()) {
-            detail_ = emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.newBuilder((emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            detail_ = value;
-          }
-          onChanged();
-        } else {
-          if (detailCase_ == 1901) {
-            multiCharacterDungeonSettleInfoBuilder_.mergeFrom(value);
-          }
-          multiCharacterDungeonSettleInfoBuilder_.setMessage(value);
-        }
-        detailCase_ = 1901;
-        return this;
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      public Builder clearMultiCharacterDungeonSettleInfo() {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          if (detailCase_ == 1901) {
-            detailCase_ = 0;
-            detail_ = null;
-            onChanged();
-          }
-        } else {
-          if (detailCase_ == 1901) {
-            detailCase_ = 0;
-            detail_ = null;
-          }
-          multiCharacterDungeonSettleInfoBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder getMultiCharacterDungeonSettleInfoBuilder() {
-        return getMultiCharacterDungeonSettleInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder getMultiCharacterDungeonSettleInfoOrBuilder() {
-        if ((detailCase_ == 1901) && (multiCharacterDungeonSettleInfoBuilder_ != null)) {
-          return multiCharacterDungeonSettleInfoBuilder_.getMessageOrBuilder();
-        } else {
-          if (detailCase_ == 1901) {
-            return (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_;
-          }
-          return emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.MultiCharacterDungeonSettleInfo multi_character_dungeon_settle_info = 1901;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder> 
-          getMultiCharacterDungeonSettleInfoFieldBuilder() {
-        if (multiCharacterDungeonSettleInfoBuilder_ == null) {
-          if (!(detailCase_ == 1901)) {
-            detail_ = emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.getDefaultInstance();
-          }
-          multiCharacterDungeonSettleInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo.Builder, emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.MultiCharacterDungeonSettleInfo) detail_,
-                  getParentForChildren(),
-                  isClean());
-          detail_ = null;
-        }
-        detailCase_ = 1901;
-        onChanged();;
-        return multiCharacterDungeonSettleInfoBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -5568,92 +2581,45 @@ public final class DungeonSettleNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\031DungeonSettleNotify.proto\032!DungeonSett" +
-      "leExhibitionInfo.proto\032\031StrengthenPointD" +
-      "ata.proto\032\017ParamList.proto\032\031TowerLevelEn" +
+      "\n\031DungeonSettleNotify.proto\032\031StrengthenP" +
+      "ointData.proto\032!DungeonSettleExhibitionI" +
+      "nfo.proto\032\017ParamList.proto\032\031TowerLevelEn" +
       "dNotify.proto\032\'TrialAvatarFirstPassDunge" +
-      "onNotify.proto\032)ChannellerSlabLoopDungeo" +
-      "nResultInfo.proto\032&EffigyChallengeDungeo" +
-      "nResultInfo.proto\032 RoguelikeDungeonSettl" +
-      "eInfo.proto\032\"CrystalLinkDungeonSettleInf" +
-      "o.proto\032#SummerTimeV2DungeonSettleInfo.p" +
-      "roto\032$InstableSprayDungeonSettleInfo.pro" +
-      "to\032 WindFieldDungeonSettleInfo.proto\032!Ef" +
-      "figyChallengeV2SettleInfo.proto\032\031TeamCha" +
-      "inSettleInfo.proto\032\026PacmanSettleInfo.pro" +
-      "to\032\037FungusFighterV2SettleInfo.proto\032\032Bla" +
-      "deDanceSettleInfo.proto\032%MultiCharacterD" +
-      "ungeonSettleInfo.proto\"\301\014\n\023DungeonSettle" +
-      "Notify\022\022\n\nis_success\030\003 \001(\010\022:\n\024exhibition" +
-      "_info_list\030\n \003(\0132\034.DungeonSettleExhibiti" +
-      "onInfo\022S\n\031strengthen_point_data_map\030\002 \003(" +
-      "\01320.DungeonSettleNotify.StrengthenPointD" +
-      "ataMapEntry\0229\n\013settle_show\030\r \003(\0132$.Dunge" +
-      "onSettleNotify.SettleShowEntry\022\031\n\021create" +
-      "_player_uid\030\001 \001(\r\022\022\n\ndungeon_id\030\007 \001(\r\022\022\n" +
-      "\nclose_time\030\006 \001(\r\022\016\n\006result\030\005 \001(\r\022\020\n\010use" +
-      "_time\030\017 \001(\r\022\026\n\016fail_cond_list\030\t \003(\r\0227\n\026t" +
-      "ower_level_end_notify\030\212\t \001(\0132\024.TowerLeve" +
-      "lEndNotifyH\000\022U\n&trial_avatar_first_pass_" +
-      "dungeon_notify\030\364\017 \001(\0132\".TrialAvatarFirst" +
-      "PassDungeonNotifyH\000\022Y\n(channeller_slab_l" +
-      "oop_dungeon_result_info\030\250\006 \001(\0132$.Channel" +
-      "lerSlabLoopDungeonResultInfoH\000\022R\n$effigy" +
-      "_challenge_dungeon_result_info\030\324\004 \001(\0132!." +
-      "EffigyChallengeDungeonResultInfoH\000\022E\n\035ro" +
-      "guelike_dungeon_settle_info\030\332\017 \001(\0132\033.Rog" +
-      "uelikeDungeonSettleInfoH\000\022B\n\030crystal_lin" +
-      "k_settle_info\030\241\n \001(\0132\035.CrystalLinkDungeo" +
-      "nSettleInfoH\000\022M\n\"summer_time_v2_dungeon_" +
-      "settle_info\030\256\001 \001(\0132\036.SummerTimeV2Dungeon" +
-      "SettleInfoH\000\022F\n\032instable_spray_settle_in" +
-      "fo\030\276\005 \001(\0132\037.InstableSprayDungeonSettleIn" +
-      "foH\000\022F\n\036wind_field_dungeon_settle_info\030\312" +
-      "\005 \001(\0132\033.WindFieldDungeonSettleInfoH\000\022H\n\037" +
-      "effigy_challenge_v2_settle_info\030\335\014 \001(\0132\034" +
-      ".EffigyChallengeV2SettleInfoH\000\0227\n\026team_c" +
-      "hain_settle_info\030\363\005 \001(\0132\024.TeamChainSettl" +
-      "eInfoH\000\0220\n\022pacman_settle_info\030\210\014 \001(\0132\021.P" +
-      "acmanSettleInfoH\000\022D\n\035fungus_fighter_v2_s" +
-      "ettle_info\030\336\016 \001(\0132\032.FungusFighterV2Settl" +
-      "eInfoH\000\0229\n\027blade_dance_settle_info\030\302\004 \001(" +
-      "\0132\025.BladeDanceSettleInfoH\000\022P\n#multi_char" +
-      "acter_dungeon_settle_info\030\355\016 \001(\0132 .Multi" +
-      "CharacterDungeonSettleInfoH\000\032S\n\033Strength" +
-      "enPointDataMapEntry\022\013\n\003key\030\001 \001(\r\022#\n\005valu" +
-      "e\030\002 \001(\0132\024.StrengthenPointData:\0028\001\032=\n\017Set" +
-      "tleShowEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001(\013" +
-      "2\n.ParamList:\0028\001B\010\n\006detailB\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "onNotify.proto\"\240\005\n\023DungeonSettleNotify\022S" +
+      "\n\031strengthen_point_data_map\030\001 \003(\01320.Dung" +
+      "eonSettleNotify.StrengthenPointDataMapEn" +
+      "try\022\022\n\nis_success\030\004 \001(\010\022\026\n\016fail_cond_lis" +
+      "t\030\005 \003(\r\022:\n\024exhibition_info_list\030\006 \003(\0132\034." +
+      "DungeonSettleExhibitionInfo\022\022\n\ndungeon_i" +
+      "d\030\010 \001(\r\022\020\n\010use_time\030\t \001(\r\022\022\n\nclose_time\030" +
+      "\n \001(\r\0229\n\013settle_show\030\013 \003(\0132$.DungeonSett" +
+      "leNotify.SettleShowEntry\022\031\n\021create_playe" +
+      "r_uid\030\014 \001(\r\022\016\n\006result\030\016 \001(\r\0227\n\026tower_lev" +
+      "el_end_notify\030\252\005 \001(\0132\024.TowerLevelEndNoti" +
+      "fyH\000\022U\n&trial_avatar_first_pass_dungeon_" +
+      "notify\030\202\017 \001(\0132\".TrialAvatarFirstPassDung" +
+      "eonNotifyH\000\032S\n\033StrengthenPointDataMapEnt" +
+      "ry\022\013\n\003key\030\001 \001(\r\022#\n\005value\030\002 \001(\0132\024.Strengt" +
+      "henPointData:\0028\001\032=\n\017SettleShowEntry\022\013\n\003k" +
+      "ey\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.ParamList:\0028\001B" +
+      "\010\n\006detailB\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ParamListOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.getDescriptor(),
         });
     internal_static_DungeonSettleNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_DungeonSettleNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonSettleNotify_descriptor,
-        new java.lang.String[] { "IsSuccess", "ExhibitionInfoList", "StrengthenPointDataMap", "SettleShow", "CreatePlayerUid", "DungeonId", "CloseTime", "Result", "UseTime", "FailCondList", "TowerLevelEndNotify", "TrialAvatarFirstPassDungeonNotify", "ChannellerSlabLoopDungeonResultInfo", "EffigyChallengeDungeonResultInfo", "RoguelikeDungeonSettleInfo", "CrystalLinkSettleInfo", "SummerTimeV2DungeonSettleInfo", "InstableSpraySettleInfo", "WindFieldDungeonSettleInfo", "EffigyChallengeV2SettleInfo", "TeamChainSettleInfo", "PacmanSettleInfo", "FungusFighterV2SettleInfo", "BladeDanceSettleInfo", "MultiCharacterDungeonSettleInfo", "Detail", });
+        new java.lang.String[] { "StrengthenPointDataMap", "IsSuccess", "FailCondList", "ExhibitionInfoList", "DungeonId", "UseTime", "CloseTime", "SettleShow", "CreatePlayerUid", "Result", "TowerLevelEndNotify", "TrialAvatarFirstPassDungeonNotify", "Detail", });
     internal_static_DungeonSettleNotify_StrengthenPointDataMapEntry_descriptor =
       internal_static_DungeonSettleNotify_descriptor.getNestedTypes().get(0);
     internal_static_DungeonSettleNotify_StrengthenPointDataMapEntry_fieldAccessorTable = new
@@ -5666,24 +2632,11 @@ public final class DungeonSettleNotifyOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_DungeonSettleNotify_SettleShowEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
-    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.StrengthenPointDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.DungeonSettleExhibitionInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ParamListOuterClass.getDescriptor();
     emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.getDescriptor();
     emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ChannellerSlabLoopDungeonResultInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.RoguelikeDungeonSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.CrystalLinkDungeonSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SummerTimeV2DungeonSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.InstableSprayDungeonSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.WindFieldDungeonSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.EffigyChallengeV2SettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.TeamChainSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PacmanSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FungusFighterV2SettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BladeDanceSettleInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.MultiCharacterDungeonSettleInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EchoShellInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EchoShellInfoOuterClass.java
index 8d34baaa1..786e8b077 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EchoShellInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EchoShellInfoOuterClass.java
@@ -26,7 +26,7 @@ public final class EchoShellInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: KCHCJMNANCP
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code EchoShellInfo}
@@ -278,7 +278,7 @@ public final class EchoShellInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: KCHCJMNANCP
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code EchoShellInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EdgeTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EdgeTypeOuterClass.java
new file mode 100644
index 000000000..6c7aa80a7
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EdgeTypeOuterClass.java
@@ -0,0 +1,164 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EdgeType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EdgeTypeOuterClass {
+  private EdgeTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code EdgeType}
+   */
+  public enum EdgeType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>INNER = 0;</code>
+     */
+    INNER(0),
+    /**
+     * <code>TILE_BOUND = 1;</code>
+     */
+    TILE_BOUND(1),
+    /**
+     * <code>TILE_BOUND_UNCONNECT = 2;</code>
+     */
+    TILE_BOUND_UNCONNECT(2),
+    /**
+     * <code>TILE_BOUND_OVERIDE = 3;</code>
+     */
+    TILE_BOUND_OVERIDE(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>INNER = 0;</code>
+     */
+    public static final int INNER_VALUE = 0;
+    /**
+     * <code>TILE_BOUND = 1;</code>
+     */
+    public static final int TILE_BOUND_VALUE = 1;
+    /**
+     * <code>TILE_BOUND_UNCONNECT = 2;</code>
+     */
+    public static final int TILE_BOUND_UNCONNECT_VALUE = 2;
+    /**
+     * <code>TILE_BOUND_OVERIDE = 3;</code>
+     */
+    public static final int TILE_BOUND_OVERIDE_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static EdgeType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static EdgeType forNumber(int value) {
+      switch (value) {
+        case 0: return INNER;
+        case 1: return TILE_BOUND;
+        case 2: return TILE_BOUND_UNCONNECT;
+        case 3: return TILE_BOUND_OVERIDE;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<EdgeType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        EdgeType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<EdgeType>() {
+            public EdgeType findValueByNumber(int number) {
+              return EdgeType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EdgeTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final EdgeType[] VALUES = values();
+
+    public static EdgeType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private EdgeType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:EdgeType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\016EdgeType.proto*W\n\010EdgeType\022\t\n\005INNER\020\000\022" +
+      "\016\n\nTILE_BOUND\020\001\022\030\n\024TILE_BOUND_UNCONNECT\020" +
+      "\002\022\026\n\022TILE_BOUND_OVERIDE\020\003B\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeDungeonResultInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeDungeonResultInfoOuterClass.java
index 7aa19998f..ab74bf2db 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeDungeonResultInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeDungeonResultInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_in_time_limit = 8;</code>
+     * <code>bool is_in_time_limit = 2;</code>
      * @return The isInTimeLimit.
      */
     boolean getIsInTimeLimit();
 
     /**
-     * <code>uint32 challenge_id = 5;</code>
-     * @return The challengeId.
-     */
-    int getChallengeId();
-
-    /**
-     * <code>uint32 challenge_max_score = 11;</code>
+     * <code>uint32 challenge_max_score = 3;</code>
      * @return The challengeMaxScore.
      */
     int getChallengeMaxScore();
 
     /**
-     * <code>uint32 challenge_score = 15;</code>
+     * <code>bool is_success = 8;</code>
+     * @return The isSuccess.
+     */
+    boolean getIsSuccess();
+
+    /**
+     * <code>uint32 challenge_score = 13;</code>
      * @return The challengeScore.
      */
     int getChallengeScore();
 
     /**
-     * <code>bool is_success = 13;</code>
-     * @return The isSuccess.
+     * <code>uint32 challenge_id = 14;</code>
+     * @return The challengeId.
      */
-    boolean getIsSuccess();
+    int getChallengeId();
   }
   /**
-   * <pre>
-   * Obf: FMEPDDDIKHK
-   * </pre>
-   *
    * Protobuf type {@code EffigyChallengeDungeonResultInfo}
    */
   public static final class EffigyChallengeDungeonResultInfo extends
@@ -97,31 +93,31 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              challengeId_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 16: {
 
               isInTimeLimit_ = input.readBool();
               break;
             }
-            case 88: {
+            case 24: {
 
               challengeMaxScore_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 64: {
 
               isSuccess_ = input.readBool();
               break;
             }
-            case 120: {
+            case 104: {
 
               challengeScore_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              challengeId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +150,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
               emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.class, emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo.Builder.class);
     }
 
-    public static final int IS_IN_TIME_LIMIT_FIELD_NUMBER = 8;
+    public static final int IS_IN_TIME_LIMIT_FIELD_NUMBER = 2;
     private boolean isInTimeLimit_;
     /**
-     * <code>bool is_in_time_limit = 8;</code>
+     * <code>bool is_in_time_limit = 2;</code>
      * @return The isInTimeLimit.
      */
     @java.lang.Override
@@ -165,21 +161,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       return isInTimeLimit_;
     }
 
-    public static final int CHALLENGE_ID_FIELD_NUMBER = 5;
-    private int challengeId_;
-    /**
-     * <code>uint32 challenge_id = 5;</code>
-     * @return The challengeId.
-     */
-    @java.lang.Override
-    public int getChallengeId() {
-      return challengeId_;
-    }
-
-    public static final int CHALLENGE_MAX_SCORE_FIELD_NUMBER = 11;
+    public static final int CHALLENGE_MAX_SCORE_FIELD_NUMBER = 3;
     private int challengeMaxScore_;
     /**
-     * <code>uint32 challenge_max_score = 11;</code>
+     * <code>uint32 challenge_max_score = 3;</code>
      * @return The challengeMaxScore.
      */
     @java.lang.Override
@@ -187,10 +172,21 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       return challengeMaxScore_;
     }
 
-    public static final int CHALLENGE_SCORE_FIELD_NUMBER = 15;
+    public static final int IS_SUCCESS_FIELD_NUMBER = 8;
+    private boolean isSuccess_;
+    /**
+     * <code>bool is_success = 8;</code>
+     * @return The isSuccess.
+     */
+    @java.lang.Override
+    public boolean getIsSuccess() {
+      return isSuccess_;
+    }
+
+    public static final int CHALLENGE_SCORE_FIELD_NUMBER = 13;
     private int challengeScore_;
     /**
-     * <code>uint32 challenge_score = 15;</code>
+     * <code>uint32 challenge_score = 13;</code>
      * @return The challengeScore.
      */
     @java.lang.Override
@@ -198,15 +194,15 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       return challengeScore_;
     }
 
-    public static final int IS_SUCCESS_FIELD_NUMBER = 13;
-    private boolean isSuccess_;
+    public static final int CHALLENGE_ID_FIELD_NUMBER = 14;
+    private int challengeId_;
     /**
-     * <code>bool is_success = 13;</code>
-     * @return The isSuccess.
+     * <code>uint32 challenge_id = 14;</code>
+     * @return The challengeId.
      */
     @java.lang.Override
-    public boolean getIsSuccess() {
-      return isSuccess_;
+    public int getChallengeId() {
+      return challengeId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -223,20 +219,20 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (challengeId_ != 0) {
-        output.writeUInt32(5, challengeId_);
-      }
       if (isInTimeLimit_ != false) {
-        output.writeBool(8, isInTimeLimit_);
+        output.writeBool(2, isInTimeLimit_);
       }
       if (challengeMaxScore_ != 0) {
-        output.writeUInt32(11, challengeMaxScore_);
+        output.writeUInt32(3, challengeMaxScore_);
       }
       if (isSuccess_ != false) {
-        output.writeBool(13, isSuccess_);
+        output.writeBool(8, isSuccess_);
       }
       if (challengeScore_ != 0) {
-        output.writeUInt32(15, challengeScore_);
+        output.writeUInt32(13, challengeScore_);
+      }
+      if (challengeId_ != 0) {
+        output.writeUInt32(14, challengeId_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,25 +243,25 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (challengeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, challengeId_);
-      }
       if (isInTimeLimit_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isInTimeLimit_);
+          .computeBoolSize(2, isInTimeLimit_);
       }
       if (challengeMaxScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, challengeMaxScore_);
+          .computeUInt32Size(3, challengeMaxScore_);
       }
       if (isSuccess_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isSuccess_);
+          .computeBoolSize(8, isSuccess_);
       }
       if (challengeScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, challengeScore_);
+          .computeUInt32Size(13, challengeScore_);
+      }
+      if (challengeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, challengeId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -284,14 +280,14 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
 
       if (getIsInTimeLimit()
           != other.getIsInTimeLimit()) return false;
-      if (getChallengeId()
-          != other.getChallengeId()) return false;
       if (getChallengeMaxScore()
           != other.getChallengeMaxScore()) return false;
-      if (getChallengeScore()
-          != other.getChallengeScore()) return false;
       if (getIsSuccess()
           != other.getIsSuccess()) return false;
+      if (getChallengeScore()
+          != other.getChallengeScore()) return false;
+      if (getChallengeId()
+          != other.getChallengeId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -306,15 +302,15 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       hash = (37 * hash) + IS_IN_TIME_LIMIT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsInTimeLimit());
-      hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeId();
       hash = (37 * hash) + CHALLENGE_MAX_SCORE_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeMaxScore();
-      hash = (37 * hash) + CHALLENGE_SCORE_FIELD_NUMBER;
-      hash = (53 * hash) + getChallengeScore();
       hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsSuccess());
+      hash = (37 * hash) + CHALLENGE_SCORE_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeScore();
+      hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChallengeId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -411,10 +407,6 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FMEPDDDIKHK
-     * </pre>
-     *
      * Protobuf type {@code EffigyChallengeDungeonResultInfo}
      */
     public static final class Builder extends
@@ -454,13 +446,13 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         super.clear();
         isInTimeLimit_ = false;
 
-        challengeId_ = 0;
-
         challengeMaxScore_ = 0;
 
+        isSuccess_ = false;
+
         challengeScore_ = 0;
 
-        isSuccess_ = false;
+        challengeId_ = 0;
 
         return this;
       }
@@ -489,10 +481,10 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
       public emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo buildPartial() {
         emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo result = new emu.grasscutter.net.proto.EffigyChallengeDungeonResultInfoOuterClass.EffigyChallengeDungeonResultInfo(this);
         result.isInTimeLimit_ = isInTimeLimit_;
-        result.challengeId_ = challengeId_;
         result.challengeMaxScore_ = challengeMaxScore_;
-        result.challengeScore_ = challengeScore_;
         result.isSuccess_ = isSuccess_;
+        result.challengeScore_ = challengeScore_;
+        result.challengeId_ = challengeId_;
         onBuilt();
         return result;
       }
@@ -544,17 +536,17 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         if (other.getIsInTimeLimit() != false) {
           setIsInTimeLimit(other.getIsInTimeLimit());
         }
-        if (other.getChallengeId() != 0) {
-          setChallengeId(other.getChallengeId());
-        }
         if (other.getChallengeMaxScore() != 0) {
           setChallengeMaxScore(other.getChallengeMaxScore());
         }
+        if (other.getIsSuccess() != false) {
+          setIsSuccess(other.getIsSuccess());
+        }
         if (other.getChallengeScore() != 0) {
           setChallengeScore(other.getChallengeScore());
         }
-        if (other.getIsSuccess() != false) {
-          setIsSuccess(other.getIsSuccess());
+        if (other.getChallengeId() != 0) {
+          setChallengeId(other.getChallengeId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -587,7 +579,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
 
       private boolean isInTimeLimit_ ;
       /**
-       * <code>bool is_in_time_limit = 8;</code>
+       * <code>bool is_in_time_limit = 2;</code>
        * @return The isInTimeLimit.
        */
       @java.lang.Override
@@ -595,7 +587,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return isInTimeLimit_;
       }
       /**
-       * <code>bool is_in_time_limit = 8;</code>
+       * <code>bool is_in_time_limit = 2;</code>
        * @param value The isInTimeLimit to set.
        * @return This builder for chaining.
        */
@@ -606,7 +598,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_in_time_limit = 8;</code>
+       * <code>bool is_in_time_limit = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInTimeLimit() {
@@ -616,40 +608,9 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return this;
       }
 
-      private int challengeId_ ;
-      /**
-       * <code>uint32 challenge_id = 5;</code>
-       * @return The challengeId.
-       */
-      @java.lang.Override
-      public int getChallengeId() {
-        return challengeId_;
-      }
-      /**
-       * <code>uint32 challenge_id = 5;</code>
-       * @param value The challengeId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeId(int value) {
-        
-        challengeId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_id = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeId() {
-        
-        challengeId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int challengeMaxScore_ ;
       /**
-       * <code>uint32 challenge_max_score = 11;</code>
+       * <code>uint32 challenge_max_score = 3;</code>
        * @return The challengeMaxScore.
        */
       @java.lang.Override
@@ -657,7 +618,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return challengeMaxScore_;
       }
       /**
-       * <code>uint32 challenge_max_score = 11;</code>
+       * <code>uint32 challenge_max_score = 3;</code>
        * @param value The challengeMaxScore to set.
        * @return This builder for chaining.
        */
@@ -668,7 +629,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_max_score = 11;</code>
+       * <code>uint32 challenge_max_score = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeMaxScore() {
@@ -678,40 +639,9 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return this;
       }
 
-      private int challengeScore_ ;
-      /**
-       * <code>uint32 challenge_score = 15;</code>
-       * @return The challengeScore.
-       */
-      @java.lang.Override
-      public int getChallengeScore() {
-        return challengeScore_;
-      }
-      /**
-       * <code>uint32 challenge_score = 15;</code>
-       * @param value The challengeScore to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChallengeScore(int value) {
-        
-        challengeScore_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 challenge_score = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChallengeScore() {
-        
-        challengeScore_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isSuccess_ ;
       /**
-       * <code>bool is_success = 13;</code>
+       * <code>bool is_success = 8;</code>
        * @return The isSuccess.
        */
       @java.lang.Override
@@ -719,7 +649,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return isSuccess_;
       }
       /**
-       * <code>bool is_success = 13;</code>
+       * <code>bool is_success = 8;</code>
        * @param value The isSuccess to set.
        * @return This builder for chaining.
        */
@@ -730,7 +660,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_success = 13;</code>
+       * <code>bool is_success = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsSuccess() {
@@ -739,6 +669,68 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int challengeScore_ ;
+      /**
+       * <code>uint32 challenge_score = 13;</code>
+       * @return The challengeScore.
+       */
+      @java.lang.Override
+      public int getChallengeScore() {
+        return challengeScore_;
+      }
+      /**
+       * <code>uint32 challenge_score = 13;</code>
+       * @param value The challengeScore to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeScore(int value) {
+        
+        challengeScore_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_score = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeScore() {
+        
+        challengeScore_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int challengeId_ ;
+      /**
+       * <code>uint32 challenge_id = 14;</code>
+       * @return The challengeId.
+       */
+      @java.lang.Override
+      public int getChallengeId() {
+        return challengeId_;
+      }
+      /**
+       * <code>uint32 challenge_id = 14;</code>
+       * @param value The challengeId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChallengeId(int value) {
+        
+        challengeId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 challenge_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChallengeId() {
+        
+        challengeId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -808,9 +800,9 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n&EffigyChallengeDungeonResultInfo.proto" +
       "\"\234\001\n EffigyChallengeDungeonResultInfo\022\030\n" +
-      "\020is_in_time_limit\030\010 \001(\010\022\024\n\014challenge_id\030" +
-      "\005 \001(\r\022\033\n\023challenge_max_score\030\013 \001(\r\022\027\n\017ch" +
-      "allenge_score\030\017 \001(\r\022\022\n\nis_success\030\r \001(\010B" +
+      "\020is_in_time_limit\030\002 \001(\010\022\033\n\023challenge_max" +
+      "_score\030\003 \001(\r\022\022\n\nis_success\030\010 \001(\010\022\027\n\017chal" +
+      "lenge_score\030\r \001(\r\022\024\n\014challenge_id\030\016 \001(\rB" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -822,7 +814,7 @@ public final class EffigyChallengeDungeonResultInfoOuterClass {
     internal_static_EffigyChallengeDungeonResultInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EffigyChallengeDungeonResultInfo_descriptor,
-        new java.lang.String[] { "IsInTimeLimit", "ChallengeId", "ChallengeMaxScore", "ChallengeScore", "IsSuccess", });
+        new java.lang.String[] { "IsInTimeLimit", "ChallengeMaxScore", "IsSuccess", "ChallengeScore", "ChallengeId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4AvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4AvatarInfoOuterClass.java
new file mode 100644
index 000000000..d1eca4512
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4AvatarInfoOuterClass.java
@@ -0,0 +1,678 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EffigyChallengeV4AvatarInfo.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EffigyChallengeV4AvatarInfoOuterClass {
+  private EffigyChallengeV4AvatarInfoOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface EffigyChallengeV4AvatarInfoOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:EffigyChallengeV4AvatarInfo)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 costume_id = 8;</code>
+     * @return The costumeId.
+     */
+    int getCostumeId();
+
+    /**
+     * <code>uint64 guid = 9;</code>
+     * @return The guid.
+     */
+    long getGuid();
+
+    /**
+     * <code>uint32 avatar_id = 13;</code>
+     * @return The avatarId.
+     */
+    int getAvatarId();
+  }
+  /**
+   * Protobuf type {@code EffigyChallengeV4AvatarInfo}
+   */
+  public static final class EffigyChallengeV4AvatarInfo extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:EffigyChallengeV4AvatarInfo)
+      EffigyChallengeV4AvatarInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use EffigyChallengeV4AvatarInfo.newBuilder() to construct.
+    private EffigyChallengeV4AvatarInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private EffigyChallengeV4AvatarInfo() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new EffigyChallengeV4AvatarInfo();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private EffigyChallengeV4AvatarInfo(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 64: {
+
+              costumeId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              guid_ = input.readUInt64();
+              break;
+            }
+            case 104: {
+
+              avatarId_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.internal_static_EffigyChallengeV4AvatarInfo_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.internal_static_EffigyChallengeV4AvatarInfo_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder.class);
+    }
+
+    public static final int COSTUME_ID_FIELD_NUMBER = 8;
+    private int costumeId_;
+    /**
+     * <code>uint32 costume_id = 8;</code>
+     * @return The costumeId.
+     */
+    @java.lang.Override
+    public int getCostumeId() {
+      return costumeId_;
+    }
+
+    public static final int GUID_FIELD_NUMBER = 9;
+    private long guid_;
+    /**
+     * <code>uint64 guid = 9;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public long getGuid() {
+      return guid_;
+    }
+
+    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_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (costumeId_ != 0) {
+        output.writeUInt32(8, costumeId_);
+      }
+      if (guid_ != 0L) {
+        output.writeUInt64(9, guid_);
+      }
+      if (avatarId_ != 0) {
+        output.writeUInt32(13, avatarId_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (costumeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, costumeId_);
+      }
+      if (guid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(9, guid_);
+      }
+      if (avatarId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, avatarId_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo other = (emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo) obj;
+
+      if (getCostumeId()
+          != other.getCostumeId()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCostumeId();
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getGuid());
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code EffigyChallengeV4AvatarInfo}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:EffigyChallengeV4AvatarInfo)
+        emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.internal_static_EffigyChallengeV4AvatarInfo_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.internal_static_EffigyChallengeV4AvatarInfo_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        costumeId_ = 0;
+
+        guid_ = 0L;
+
+        avatarId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.internal_static_EffigyChallengeV4AvatarInfo_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo build() {
+        emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo buildPartial() {
+        emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo result = new emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo(this);
+        result.costumeId_ = costumeId_;
+        result.guid_ = guid_;
+        result.avatarId_ = avatarId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo) {
+          return mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo other) {
+        if (other == emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance()) return this;
+        if (other.getCostumeId() != 0) {
+          setCostumeId(other.getCostumeId());
+        }
+        if (other.getGuid() != 0L) {
+          setGuid(other.getGuid());
+        }
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
+        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.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int costumeId_ ;
+      /**
+       * <code>uint32 costume_id = 8;</code>
+       * @return The costumeId.
+       */
+      @java.lang.Override
+      public int getCostumeId() {
+        return costumeId_;
+      }
+      /**
+       * <code>uint32 costume_id = 8;</code>
+       * @param value The costumeId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCostumeId(int value) {
+        
+        costumeId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 costume_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCostumeId() {
+        
+        costumeId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 9;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 9;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
+        onChanged();
+        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;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:EffigyChallengeV4AvatarInfo)
+    }
+
+    // @@protoc_insertion_point(class_scope:EffigyChallengeV4AvatarInfo)
+    private static final emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo();
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<EffigyChallengeV4AvatarInfo>
+        PARSER = new com.google.protobuf.AbstractParser<EffigyChallengeV4AvatarInfo>() {
+      @java.lang.Override
+      public EffigyChallengeV4AvatarInfo parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new EffigyChallengeV4AvatarInfo(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<EffigyChallengeV4AvatarInfo> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<EffigyChallengeV4AvatarInfo> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_EffigyChallengeV4AvatarInfo_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_EffigyChallengeV4AvatarInfo_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n!EffigyChallengeV4AvatarInfo.proto\"R\n\033E" +
+      "ffigyChallengeV4AvatarInfo\022\022\n\ncostume_id" +
+      "\030\010 \001(\r\022\014\n\004guid\030\t \001(\004\022\021\n\tavatar_id\030\r \001(\rB" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_EffigyChallengeV4AvatarInfo_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_EffigyChallengeV4AvatarInfo_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_EffigyChallengeV4AvatarInfo_descriptor,
+        new java.lang.String[] { "CostumeId", "Guid", "AvatarId", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4LevelInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4LevelInfoOuterClass.java
new file mode 100644
index 000000000..f880089dd
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4LevelInfoOuterClass.java
@@ -0,0 +1,805 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EffigyChallengeV4LevelInfo.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EffigyChallengeV4LevelInfoOuterClass {
+  private EffigyChallengeV4LevelInfoOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface EffigyChallengeV4LevelInfoOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:EffigyChallengeV4LevelInfo)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 PJJAOILBFBN = 1;</code>
+     * @return The pJJAOILBFBN.
+     */
+    int getPJJAOILBFBN();
+
+    /**
+     * <code>uint32 DMNLDPPGOKG = 14;</code>
+     * @return The dMNLDPPGOKG.
+     */
+    int getDMNLDPPGOKG();
+
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @return A list containing the conditionIdList.
+     */
+    java.util.List<java.lang.Integer> getConditionIdListList();
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @return The count of conditionIdList.
+     */
+    int getConditionIdListCount();
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The conditionIdList at the given index.
+     */
+    int getConditionIdList(int index);
+  }
+  /**
+   * Protobuf type {@code EffigyChallengeV4LevelInfo}
+   */
+  public static final class EffigyChallengeV4LevelInfo extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:EffigyChallengeV4LevelInfo)
+      EffigyChallengeV4LevelInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use EffigyChallengeV4LevelInfo.newBuilder() to construct.
+    private EffigyChallengeV4LevelInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private EffigyChallengeV4LevelInfo() {
+      conditionIdList_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new EffigyChallengeV4LevelInfo();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private EffigyChallengeV4LevelInfo(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              pJJAOILBFBN_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              dMNLDPPGOKG_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                conditionIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              conditionIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 122: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                conditionIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                conditionIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          conditionIdList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.internal_static_EffigyChallengeV4LevelInfo_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.internal_static_EffigyChallengeV4LevelInfo_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder.class);
+    }
+
+    public static final int PJJAOILBFBN_FIELD_NUMBER = 1;
+    private int pJJAOILBFBN_;
+    /**
+     * <code>uint32 PJJAOILBFBN = 1;</code>
+     * @return The pJJAOILBFBN.
+     */
+    @java.lang.Override
+    public int getPJJAOILBFBN() {
+      return pJJAOILBFBN_;
+    }
+
+    public static final int DMNLDPPGOKG_FIELD_NUMBER = 14;
+    private int dMNLDPPGOKG_;
+    /**
+     * <code>uint32 DMNLDPPGOKG = 14;</code>
+     * @return The dMNLDPPGOKG.
+     */
+    @java.lang.Override
+    public int getDMNLDPPGOKG() {
+      return dMNLDPPGOKG_;
+    }
+
+    public static final int CONDITION_ID_LIST_FIELD_NUMBER = 15;
+    private com.google.protobuf.Internal.IntList conditionIdList_;
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @return A list containing the conditionIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getConditionIdListList() {
+      return conditionIdList_;
+    }
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @return The count of conditionIdList.
+     */
+    public int getConditionIdListCount() {
+      return conditionIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 condition_id_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The conditionIdList at the given index.
+     */
+    public int getConditionIdList(int index) {
+      return conditionIdList_.getInt(index);
+    }
+    private int conditionIdListMemoizedSerializedSize = -1;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (pJJAOILBFBN_ != 0) {
+        output.writeUInt32(1, pJJAOILBFBN_);
+      }
+      if (dMNLDPPGOKG_ != 0) {
+        output.writeUInt32(14, dMNLDPPGOKG_);
+      }
+      if (getConditionIdListList().size() > 0) {
+        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(conditionIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < conditionIdList_.size(); i++) {
+        output.writeUInt32NoTag(conditionIdList_.getInt(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (pJJAOILBFBN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, pJJAOILBFBN_);
+      }
+      if (dMNLDPPGOKG_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, dMNLDPPGOKG_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < conditionIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(conditionIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getConditionIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        conditionIdListMemoizedSerializedSize = dataSize;
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo other = (emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo) obj;
+
+      if (getPJJAOILBFBN()
+          != other.getPJJAOILBFBN()) return false;
+      if (getDMNLDPPGOKG()
+          != other.getDMNLDPPGOKG()) return false;
+      if (!getConditionIdListList()
+          .equals(other.getConditionIdListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER;
+      hash = (53 * hash) + getPJJAOILBFBN();
+      hash = (37 * hash) + DMNLDPPGOKG_FIELD_NUMBER;
+      hash = (53 * hash) + getDMNLDPPGOKG();
+      if (getConditionIdListCount() > 0) {
+        hash = (37 * hash) + CONDITION_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getConditionIdListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code EffigyChallengeV4LevelInfo}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:EffigyChallengeV4LevelInfo)
+        emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.internal_static_EffigyChallengeV4LevelInfo_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.internal_static_EffigyChallengeV4LevelInfo_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        pJJAOILBFBN_ = 0;
+
+        dMNLDPPGOKG_ = 0;
+
+        conditionIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.internal_static_EffigyChallengeV4LevelInfo_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo build() {
+        emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo buildPartial() {
+        emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo result = new emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo(this);
+        int from_bitField0_ = bitField0_;
+        result.pJJAOILBFBN_ = pJJAOILBFBN_;
+        result.dMNLDPPGOKG_ = dMNLDPPGOKG_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          conditionIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.conditionIdList_ = conditionIdList_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo) {
+          return mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo other) {
+        if (other == emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.getDefaultInstance()) return this;
+        if (other.getPJJAOILBFBN() != 0) {
+          setPJJAOILBFBN(other.getPJJAOILBFBN());
+        }
+        if (other.getDMNLDPPGOKG() != 0) {
+          setDMNLDPPGOKG(other.getDMNLDPPGOKG());
+        }
+        if (!other.conditionIdList_.isEmpty()) {
+          if (conditionIdList_.isEmpty()) {
+            conditionIdList_ = other.conditionIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureConditionIdListIsMutable();
+            conditionIdList_.addAll(other.conditionIdList_);
+          }
+          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.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int pJJAOILBFBN_ ;
+      /**
+       * <code>uint32 PJJAOILBFBN = 1;</code>
+       * @return The pJJAOILBFBN.
+       */
+      @java.lang.Override
+      public int getPJJAOILBFBN() {
+        return pJJAOILBFBN_;
+      }
+      /**
+       * <code>uint32 PJJAOILBFBN = 1;</code>
+       * @param value The pJJAOILBFBN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPJJAOILBFBN(int value) {
+        
+        pJJAOILBFBN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 PJJAOILBFBN = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPJJAOILBFBN() {
+        
+        pJJAOILBFBN_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int dMNLDPPGOKG_ ;
+      /**
+       * <code>uint32 DMNLDPPGOKG = 14;</code>
+       * @return The dMNLDPPGOKG.
+       */
+      @java.lang.Override
+      public int getDMNLDPPGOKG() {
+        return dMNLDPPGOKG_;
+      }
+      /**
+       * <code>uint32 DMNLDPPGOKG = 14;</code>
+       * @param value The dMNLDPPGOKG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDMNLDPPGOKG(int value) {
+        
+        dMNLDPPGOKG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DMNLDPPGOKG = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDMNLDPPGOKG() {
+        
+        dMNLDPPGOKG_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList conditionIdList_ = emptyIntList();
+      private void ensureConditionIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          conditionIdList_ = mutableCopy(conditionIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @return A list containing the conditionIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getConditionIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(conditionIdList_) : conditionIdList_;
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @return The count of conditionIdList.
+       */
+      public int getConditionIdListCount() {
+        return conditionIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @param index The index of the element to return.
+       * @return The conditionIdList at the given index.
+       */
+      public int getConditionIdList(int index) {
+        return conditionIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @param index The index to set the value at.
+       * @param value The conditionIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConditionIdList(
+          int index, int value) {
+        ensureConditionIdListIsMutable();
+        conditionIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @param value The conditionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addConditionIdList(int value) {
+        ensureConditionIdListIsMutable();
+        conditionIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @param values The conditionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllConditionIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureConditionIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, conditionIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 condition_id_list = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConditionIdList() {
+        conditionIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:EffigyChallengeV4LevelInfo)
+    }
+
+    // @@protoc_insertion_point(class_scope:EffigyChallengeV4LevelInfo)
+    private static final emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo();
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<EffigyChallengeV4LevelInfo>
+        PARSER = new com.google.protobuf.AbstractParser<EffigyChallengeV4LevelInfo>() {
+      @java.lang.Override
+      public EffigyChallengeV4LevelInfo parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new EffigyChallengeV4LevelInfo(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<EffigyChallengeV4LevelInfo> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<EffigyChallengeV4LevelInfo> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_EffigyChallengeV4LevelInfo_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_EffigyChallengeV4LevelInfo_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n EffigyChallengeV4LevelInfo.proto\"a\n\032Ef" +
+      "figyChallengeV4LevelInfo\022\023\n\013PJJAOILBFBN\030" +
+      "\001 \001(\r\022\023\n\013DMNLDPPGOKG\030\016 \001(\r\022\031\n\021condition_" +
+      "id_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.pro" +
+      "tob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_EffigyChallengeV4LevelInfo_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_EffigyChallengeV4LevelInfo_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_EffigyChallengeV4LevelInfo_descriptor,
+        new java.lang.String[] { "PJJAOILBFBN", "DMNLDPPGOKG", "ConditionIdList", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PlayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PlayerInfoOuterClass.java
new file mode 100644
index 000000000..7352437dc
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PlayerInfoOuterClass.java
@@ -0,0 +1,1400 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EffigyChallengeV4PlayerInfo.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EffigyChallengeV4PlayerInfoOuterClass {
+  private EffigyChallengeV4PlayerInfoOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface EffigyChallengeV4PlayerInfoOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:EffigyChallengeV4PlayerInfo)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> 
+        getFEECGJBPDFAList();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getFEECGJBPDFA(int index);
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    int getFEECGJBPDFACount();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+        getFEECGJBPDFAOrBuilderList();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getFEECGJBPDFAOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 uid = 5;</code>
+     * @return The uid.
+     */
+    int getUid();
+
+    /**
+     * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+     * @return The enum numeric value on the wire for prepareState.
+     */
+    int getPrepareStateValue();
+    /**
+     * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+     * @return The prepareState.
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState getPrepareState();
+
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> 
+        getBPFFLKLBGODList();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getBPFFLKLBGOD(int index);
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    int getBPFFLKLBGODCount();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+        getBPFFLKLBGODOrBuilderList();
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getBPFFLKLBGODOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code EffigyChallengeV4PlayerInfo}
+   */
+  public static final class EffigyChallengeV4PlayerInfo extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:EffigyChallengeV4PlayerInfo)
+      EffigyChallengeV4PlayerInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use EffigyChallengeV4PlayerInfo.newBuilder() to construct.
+    private EffigyChallengeV4PlayerInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private EffigyChallengeV4PlayerInfo() {
+      fEECGJBPDFA_ = java.util.Collections.emptyList();
+      prepareState_ = 0;
+      bPFFLKLBGOD_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new EffigyChallengeV4PlayerInfo();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private EffigyChallengeV4PlayerInfo(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                fEECGJBPDFA_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              fEECGJBPDFA_.add(
+                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 40: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+              int rawValue = input.readEnum();
+
+              prepareState_ = rawValue;
+              break;
+            }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                bPFFLKLBGOD_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              bPFFLKLBGOD_.add(
+                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          fEECGJBPDFA_ = java.util.Collections.unmodifiableList(fEECGJBPDFA_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          bPFFLKLBGOD_ = java.util.Collections.unmodifiableList(bPFFLKLBGOD_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.internal_static_EffigyChallengeV4PlayerInfo_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.internal_static_EffigyChallengeV4PlayerInfo_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder.class);
+    }
+
+    public static final int FEECGJBPDFA_FIELD_NUMBER = 3;
+    private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> fEECGJBPDFA_;
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> getFEECGJBPDFAList() {
+      return fEECGJBPDFA_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+        getFEECGJBPDFAOrBuilderList() {
+      return fEECGJBPDFA_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    @java.lang.Override
+    public int getFEECGJBPDFACount() {
+      return fEECGJBPDFA_.size();
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getFEECGJBPDFA(int index) {
+      return fEECGJBPDFA_.get(index);
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getFEECGJBPDFAOrBuilder(
+        int index) {
+      return fEECGJBPDFA_.get(index);
+    }
+
+    public static final int UID_FIELD_NUMBER = 5;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 5;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
+    public static final int PREPARE_STATE_FIELD_NUMBER = 9;
+    private int prepareState_;
+    /**
+     * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+     * @return The enum numeric value on the wire for prepareState.
+     */
+    @java.lang.Override public int getPrepareStateValue() {
+      return prepareState_;
+    }
+    /**
+     * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+     * @return The prepareState.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState getPrepareState() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState result = emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.valueOf(prepareState_);
+      return result == null ? emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.UNRECOGNIZED : result;
+    }
+
+    public static final int BPFFLKLBGOD_FIELD_NUMBER = 13;
+    private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> bPFFLKLBGOD_;
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> getBPFFLKLBGODList() {
+      return bPFFLKLBGOD_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+        getBPFFLKLBGODOrBuilderList() {
+      return bPFFLKLBGOD_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    @java.lang.Override
+    public int getBPFFLKLBGODCount() {
+      return bPFFLKLBGOD_.size();
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getBPFFLKLBGOD(int index) {
+      return bPFFLKLBGOD_.get(index);
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getBPFFLKLBGODOrBuilder(
+        int index) {
+      return bPFFLKLBGOD_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < fEECGJBPDFA_.size(); i++) {
+        output.writeMessage(3, fEECGJBPDFA_.get(i));
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(5, uid_);
+      }
+      if (prepareState_ != emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.IDLE.getNumber()) {
+        output.writeEnum(9, prepareState_);
+      }
+      for (int i = 0; i < bPFFLKLBGOD_.size(); i++) {
+        output.writeMessage(13, bPFFLKLBGOD_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < fEECGJBPDFA_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, fEECGJBPDFA_.get(i));
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, uid_);
+      }
+      if (prepareState_ != emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.IDLE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(9, prepareState_);
+      }
+      for (int i = 0; i < bPFFLKLBGOD_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, bPFFLKLBGOD_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo other = (emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo) obj;
+
+      if (!getFEECGJBPDFAList()
+          .equals(other.getFEECGJBPDFAList())) return false;
+      if (getUid()
+          != other.getUid()) return false;
+      if (prepareState_ != other.prepareState_) return false;
+      if (!getBPFFLKLBGODList()
+          .equals(other.getBPFFLKLBGODList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getFEECGJBPDFACount() > 0) {
+        hash = (37 * hash) + FEECGJBPDFA_FIELD_NUMBER;
+        hash = (53 * hash) + getFEECGJBPDFAList().hashCode();
+      }
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
+      hash = (37 * hash) + PREPARE_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + prepareState_;
+      if (getBPFFLKLBGODCount() > 0) {
+        hash = (37 * hash) + BPFFLKLBGOD_FIELD_NUMBER;
+        hash = (53 * hash) + getBPFFLKLBGODList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code EffigyChallengeV4PlayerInfo}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:EffigyChallengeV4PlayerInfo)
+        emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.internal_static_EffigyChallengeV4PlayerInfo_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.internal_static_EffigyChallengeV4PlayerInfo_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.class, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getFEECGJBPDFAFieldBuilder();
+          getBPFFLKLBGODFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (fEECGJBPDFABuilder_ == null) {
+          fEECGJBPDFA_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          fEECGJBPDFABuilder_.clear();
+        }
+        uid_ = 0;
+
+        prepareState_ = 0;
+
+        if (bPFFLKLBGODBuilder_ == null) {
+          bPFFLKLBGOD_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          bPFFLKLBGODBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.internal_static_EffigyChallengeV4PlayerInfo_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo build() {
+        emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo buildPartial() {
+        emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo result = new emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo(this);
+        int from_bitField0_ = bitField0_;
+        if (fEECGJBPDFABuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            fEECGJBPDFA_ = java.util.Collections.unmodifiableList(fEECGJBPDFA_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.fEECGJBPDFA_ = fEECGJBPDFA_;
+        } else {
+          result.fEECGJBPDFA_ = fEECGJBPDFABuilder_.build();
+        }
+        result.uid_ = uid_;
+        result.prepareState_ = prepareState_;
+        if (bPFFLKLBGODBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            bPFFLKLBGOD_ = java.util.Collections.unmodifiableList(bPFFLKLBGOD_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.bPFFLKLBGOD_ = bPFFLKLBGOD_;
+        } else {
+          result.bPFFLKLBGOD_ = bPFFLKLBGODBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo) {
+          return mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo other) {
+        if (other == emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.getDefaultInstance()) return this;
+        if (fEECGJBPDFABuilder_ == null) {
+          if (!other.fEECGJBPDFA_.isEmpty()) {
+            if (fEECGJBPDFA_.isEmpty()) {
+              fEECGJBPDFA_ = other.fEECGJBPDFA_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureFEECGJBPDFAIsMutable();
+              fEECGJBPDFA_.addAll(other.fEECGJBPDFA_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.fEECGJBPDFA_.isEmpty()) {
+            if (fEECGJBPDFABuilder_.isEmpty()) {
+              fEECGJBPDFABuilder_.dispose();
+              fEECGJBPDFABuilder_ = null;
+              fEECGJBPDFA_ = other.fEECGJBPDFA_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              fEECGJBPDFABuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getFEECGJBPDFAFieldBuilder() : null;
+            } else {
+              fEECGJBPDFABuilder_.addAllMessages(other.fEECGJBPDFA_);
+            }
+          }
+        }
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
+        if (other.prepareState_ != 0) {
+          setPrepareStateValue(other.getPrepareStateValue());
+        }
+        if (bPFFLKLBGODBuilder_ == null) {
+          if (!other.bPFFLKLBGOD_.isEmpty()) {
+            if (bPFFLKLBGOD_.isEmpty()) {
+              bPFFLKLBGOD_ = other.bPFFLKLBGOD_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureBPFFLKLBGODIsMutable();
+              bPFFLKLBGOD_.addAll(other.bPFFLKLBGOD_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.bPFFLKLBGOD_.isEmpty()) {
+            if (bPFFLKLBGODBuilder_.isEmpty()) {
+              bPFFLKLBGODBuilder_.dispose();
+              bPFFLKLBGODBuilder_ = null;
+              bPFFLKLBGOD_ = other.bPFFLKLBGOD_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              bPFFLKLBGODBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getBPFFLKLBGODFieldBuilder() : null;
+            } else {
+              bPFFLKLBGODBuilder_.addAllMessages(other.bPFFLKLBGOD_);
+            }
+          }
+        }
+        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.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> fEECGJBPDFA_ =
+        java.util.Collections.emptyList();
+      private void ensureFEECGJBPDFAIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          fEECGJBPDFA_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo>(fEECGJBPDFA_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> fEECGJBPDFABuilder_;
+
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> getFEECGJBPDFAList() {
+        if (fEECGJBPDFABuilder_ == null) {
+          return java.util.Collections.unmodifiableList(fEECGJBPDFA_);
+        } else {
+          return fEECGJBPDFABuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public int getFEECGJBPDFACount() {
+        if (fEECGJBPDFABuilder_ == null) {
+          return fEECGJBPDFA_.size();
+        } else {
+          return fEECGJBPDFABuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getFEECGJBPDFA(int index) {
+        if (fEECGJBPDFABuilder_ == null) {
+          return fEECGJBPDFA_.get(index);
+        } else {
+          return fEECGJBPDFABuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder setFEECGJBPDFA(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (fEECGJBPDFABuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.set(index, value);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder setFEECGJBPDFA(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (fEECGJBPDFABuilder_ == null) {
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder addFEECGJBPDFA(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (fEECGJBPDFABuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.add(value);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder addFEECGJBPDFA(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (fEECGJBPDFABuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.add(index, value);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder addFEECGJBPDFA(
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (fEECGJBPDFABuilder_ == null) {
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.add(builderForValue.build());
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder addFEECGJBPDFA(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (fEECGJBPDFABuilder_ == null) {
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder addAllFEECGJBPDFA(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> values) {
+        if (fEECGJBPDFABuilder_ == null) {
+          ensureFEECGJBPDFAIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fEECGJBPDFA_);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder clearFEECGJBPDFA() {
+        if (fEECGJBPDFABuilder_ == null) {
+          fEECGJBPDFA_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public Builder removeFEECGJBPDFA(int index) {
+        if (fEECGJBPDFABuilder_ == null) {
+          ensureFEECGJBPDFAIsMutable();
+          fEECGJBPDFA_.remove(index);
+          onChanged();
+        } else {
+          fEECGJBPDFABuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder getFEECGJBPDFABuilder(
+          int index) {
+        return getFEECGJBPDFAFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getFEECGJBPDFAOrBuilder(
+          int index) {
+        if (fEECGJBPDFABuilder_ == null) {
+          return fEECGJBPDFA_.get(index);  } else {
+          return fEECGJBPDFABuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+           getFEECGJBPDFAOrBuilderList() {
+        if (fEECGJBPDFABuilder_ != null) {
+          return fEECGJBPDFABuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(fEECGJBPDFA_);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder addFEECGJBPDFABuilder() {
+        return getFEECGJBPDFAFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder addFEECGJBPDFABuilder(
+          int index) {
+        return getFEECGJBPDFAFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo FEECGJBPDFA = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder> 
+           getFEECGJBPDFABuilderList() {
+        return getFEECGJBPDFAFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+          getFEECGJBPDFAFieldBuilder() {
+        if (fEECGJBPDFABuilder_ == null) {
+          fEECGJBPDFABuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder>(
+                  fEECGJBPDFA_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          fEECGJBPDFA_ = null;
+        }
+        return fEECGJBPDFABuilder_;
+      }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int prepareState_ = 0;
+      /**
+       * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+       * @return The enum numeric value on the wire for prepareState.
+       */
+      @java.lang.Override public int getPrepareStateValue() {
+        return prepareState_;
+      }
+      /**
+       * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+       * @param value The enum numeric value on the wire for prepareState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPrepareStateValue(int value) {
+        
+        prepareState_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+       * @return The prepareState.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState getPrepareState() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState result = emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.valueOf(prepareState_);
+        return result == null ? emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+       * @param value The prepareState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPrepareState(emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.EffigyChallengeV4PrepareState value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        prepareState_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4PrepareState prepare_state = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPrepareState() {
+        
+        prepareState_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> bPFFLKLBGOD_ =
+        java.util.Collections.emptyList();
+      private void ensureBPFFLKLBGODIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          bPFFLKLBGOD_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo>(bPFFLKLBGOD_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> bPFFLKLBGODBuilder_;
+
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> getBPFFLKLBGODList() {
+        if (bPFFLKLBGODBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(bPFFLKLBGOD_);
+        } else {
+          return bPFFLKLBGODBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public int getBPFFLKLBGODCount() {
+        if (bPFFLKLBGODBuilder_ == null) {
+          return bPFFLKLBGOD_.size();
+        } else {
+          return bPFFLKLBGODBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo getBPFFLKLBGOD(int index) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          return bPFFLKLBGOD_.get(index);
+        } else {
+          return bPFFLKLBGODBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder setBPFFLKLBGOD(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.set(index, value);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder setBPFFLKLBGOD(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder addBPFFLKLBGOD(emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.add(value);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder addBPFFLKLBGOD(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo value) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.add(index, value);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder addBPFFLKLBGOD(
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.add(builderForValue.build());
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder addBPFFLKLBGOD(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder builderForValue) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder addAllBPFFLKLBGOD(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo> values) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          ensureBPFFLKLBGODIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, bPFFLKLBGOD_);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder clearBPFFLKLBGOD() {
+        if (bPFFLKLBGODBuilder_ == null) {
+          bPFFLKLBGOD_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public Builder removeBPFFLKLBGOD(int index) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          ensureBPFFLKLBGODIsMutable();
+          bPFFLKLBGOD_.remove(index);
+          onChanged();
+        } else {
+          bPFFLKLBGODBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder getBPFFLKLBGODBuilder(
+          int index) {
+        return getBPFFLKLBGODFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder getBPFFLKLBGODOrBuilder(
+          int index) {
+        if (bPFFLKLBGODBuilder_ == null) {
+          return bPFFLKLBGOD_.get(index);  } else {
+          return bPFFLKLBGODBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+           getBPFFLKLBGODOrBuilderList() {
+        if (bPFFLKLBGODBuilder_ != null) {
+          return bPFFLKLBGODBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(bPFFLKLBGOD_);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder addBPFFLKLBGODBuilder() {
+        return getBPFFLKLBGODFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder addBPFFLKLBGODBuilder(
+          int index) {
+        return getBPFFLKLBGODFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4AvatarInfo BPFFLKLBGOD = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder> 
+           getBPFFLKLBGODBuilderList() {
+        return getBPFFLKLBGODFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder> 
+          getBPFFLKLBGODFieldBuilder() {
+        if (bPFFLKLBGODBuilder_ == null) {
+          bPFFLKLBGODBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.EffigyChallengeV4AvatarInfoOrBuilder>(
+                  bPFFLKLBGOD_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          bPFFLKLBGOD_ = null;
+        }
+        return bPFFLKLBGODBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:EffigyChallengeV4PlayerInfo)
+    }
+
+    // @@protoc_insertion_point(class_scope:EffigyChallengeV4PlayerInfo)
+    private static final emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo();
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<EffigyChallengeV4PlayerInfo>
+        PARSER = new com.google.protobuf.AbstractParser<EffigyChallengeV4PlayerInfo>() {
+      @java.lang.Override
+      public EffigyChallengeV4PlayerInfo parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new EffigyChallengeV4PlayerInfo(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<EffigyChallengeV4PlayerInfo> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<EffigyChallengeV4PlayerInfo> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_EffigyChallengeV4PlayerInfo_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_EffigyChallengeV4PlayerInfo_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n!EffigyChallengeV4PlayerInfo.proto\032!Eff" +
+      "igyChallengeV4AvatarInfo.proto\032#EffigyCh" +
+      "allengeV4PrepareState.proto\"\307\001\n\033EffigyCh" +
+      "allengeV4PlayerInfo\0221\n\013FEECGJBPDFA\030\003 \003(\013" +
+      "2\034.EffigyChallengeV4AvatarInfo\022\013\n\003uid\030\005 " +
+      "\001(\r\0225\n\rprepare_state\030\t \001(\0162\036.EffigyChall" +
+      "engeV4PrepareState\0221\n\013BPFFLKLBGOD\030\r \003(\0132" +
+      "\034.EffigyChallengeV4AvatarInfoB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.getDescriptor(),
+        });
+    internal_static_EffigyChallengeV4PlayerInfo_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_EffigyChallengeV4PlayerInfo_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_EffigyChallengeV4PlayerInfo_descriptor,
+        new java.lang.String[] { "FEECGJBPDFA", "Uid", "PrepareState", "BPFFLKLBGOD", });
+    emu.grasscutter.net.proto.EffigyChallengeV4AvatarInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareNotifyOuterClass.java
new file mode 100644
index 000000000..01af0df74
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareNotifyOuterClass.java
@@ -0,0 +1,1053 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EffigyChallengeV4PrepareNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EffigyChallengeV4PrepareNotifyOuterClass {
+  private EffigyChallengeV4PrepareNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface EffigyChallengeV4PrepareNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:EffigyChallengeV4PrepareNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     * @return Whether the levelInfo field is set.
+     */
+    boolean hasLevelInfo();
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     * @return The levelInfo.
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getLevelInfo();
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder getLevelInfoOrBuilder();
+
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> 
+        getPlayerInfoListList();
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getPlayerInfoList(int index);
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    int getPlayerInfoListCount();
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder> 
+        getPlayerInfoListOrBuilderList();
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code EffigyChallengeV4PrepareNotify}
+   */
+  public static final class EffigyChallengeV4PrepareNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:EffigyChallengeV4PrepareNotify)
+      EffigyChallengeV4PrepareNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use EffigyChallengeV4PrepareNotify.newBuilder() to construct.
+    private EffigyChallengeV4PrepareNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private EffigyChallengeV4PrepareNotify() {
+      playerInfoList_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new EffigyChallengeV4PrepareNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private EffigyChallengeV4PrepareNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 50: {
+              emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder subBuilder = null;
+              if (levelInfo_ != null) {
+                subBuilder = levelInfo_.toBuilder();
+              }
+              levelInfo_ = input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(levelInfo_);
+                levelInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              playerInfoList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.internal_static_EffigyChallengeV4PrepareNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.internal_static_EffigyChallengeV4PrepareNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.class, emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.Builder.class);
+    }
+
+    public static final int LEVEL_INFO_FIELD_NUMBER = 6;
+    private emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo levelInfo_;
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     * @return Whether the levelInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasLevelInfo() {
+      return levelInfo_ != null;
+    }
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     * @return The levelInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getLevelInfo() {
+      return levelInfo_ == null ? emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.getDefaultInstance() : levelInfo_;
+    }
+    /**
+     * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder getLevelInfoOrBuilder() {
+      return getLevelInfo();
+    }
+
+    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 7;
+    private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> playerInfoList_;
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> getPlayerInfoListList() {
+      return playerInfoList_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder> 
+        getPlayerInfoListOrBuilderList() {
+      return playerInfoList_;
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public int getPlayerInfoListCount() {
+      return playerInfoList_.size();
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getPlayerInfoList(int index) {
+      return playerInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+        int index) {
+      return playerInfoList_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (levelInfo_ != null) {
+        output.writeMessage(6, getLevelInfo());
+      }
+      for (int i = 0; i < playerInfoList_.size(); i++) {
+        output.writeMessage(7, playerInfoList_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (levelInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, getLevelInfo());
+      }
+      for (int i = 0; i < playerInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, playerInfoList_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify other = (emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify) obj;
+
+      if (hasLevelInfo() != other.hasLevelInfo()) return false;
+      if (hasLevelInfo()) {
+        if (!getLevelInfo()
+            .equals(other.getLevelInfo())) return false;
+      }
+      if (!getPlayerInfoListList()
+          .equals(other.getPlayerInfoListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasLevelInfo()) {
+        hash = (37 * hash) + LEVEL_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getLevelInfo().hashCode();
+      }
+      if (getPlayerInfoListCount() > 0) {
+        hash = (37 * hash) + PLAYER_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPlayerInfoListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code EffigyChallengeV4PrepareNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:EffigyChallengeV4PrepareNotify)
+        emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.internal_static_EffigyChallengeV4PrepareNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.internal_static_EffigyChallengeV4PrepareNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.class, emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getPlayerInfoListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (levelInfoBuilder_ == null) {
+          levelInfo_ = null;
+        } else {
+          levelInfo_ = null;
+          levelInfoBuilder_ = null;
+        }
+        if (playerInfoListBuilder_ == null) {
+          playerInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          playerInfoListBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.internal_static_EffigyChallengeV4PrepareNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify build() {
+        emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify buildPartial() {
+        emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify result = new emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify(this);
+        int from_bitField0_ = bitField0_;
+        if (levelInfoBuilder_ == null) {
+          result.levelInfo_ = levelInfo_;
+        } else {
+          result.levelInfo_ = levelInfoBuilder_.build();
+        }
+        if (playerInfoListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.playerInfoList_ = playerInfoList_;
+        } else {
+          result.playerInfoList_ = playerInfoListBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify other) {
+        if (other == emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify.getDefaultInstance()) return this;
+        if (other.hasLevelInfo()) {
+          mergeLevelInfo(other.getLevelInfo());
+        }
+        if (playerInfoListBuilder_ == null) {
+          if (!other.playerInfoList_.isEmpty()) {
+            if (playerInfoList_.isEmpty()) {
+              playerInfoList_ = other.playerInfoList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensurePlayerInfoListIsMutable();
+              playerInfoList_.addAll(other.playerInfoList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.playerInfoList_.isEmpty()) {
+            if (playerInfoListBuilder_.isEmpty()) {
+              playerInfoListBuilder_.dispose();
+              playerInfoListBuilder_ = null;
+              playerInfoList_ = other.playerInfoList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              playerInfoListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getPlayerInfoListFieldBuilder() : null;
+            } else {
+              playerInfoListBuilder_.addAllMessages(other.playerInfoList_);
+            }
+          }
+        }
+        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.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo levelInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder> levelInfoBuilder_;
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       * @return Whether the levelInfo field is set.
+       */
+      public boolean hasLevelInfo() {
+        return levelInfoBuilder_ != null || levelInfo_ != null;
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       * @return The levelInfo.
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo getLevelInfo() {
+        if (levelInfoBuilder_ == null) {
+          return levelInfo_ == null ? emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.getDefaultInstance() : levelInfo_;
+        } else {
+          return levelInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public Builder setLevelInfo(emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo value) {
+        if (levelInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          levelInfo_ = value;
+          onChanged();
+        } else {
+          levelInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public Builder setLevelInfo(
+          emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder builderForValue) {
+        if (levelInfoBuilder_ == null) {
+          levelInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          levelInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public Builder mergeLevelInfo(emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo value) {
+        if (levelInfoBuilder_ == null) {
+          if (levelInfo_ != null) {
+            levelInfo_ =
+              emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.newBuilder(levelInfo_).mergeFrom(value).buildPartial();
+          } else {
+            levelInfo_ = value;
+          }
+          onChanged();
+        } else {
+          levelInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public Builder clearLevelInfo() {
+        if (levelInfoBuilder_ == null) {
+          levelInfo_ = null;
+          onChanged();
+        } else {
+          levelInfo_ = null;
+          levelInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder getLevelInfoBuilder() {
+        
+        onChanged();
+        return getLevelInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder getLevelInfoOrBuilder() {
+        if (levelInfoBuilder_ != null) {
+          return levelInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return levelInfo_ == null ?
+              emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.getDefaultInstance() : levelInfo_;
+        }
+      }
+      /**
+       * <code>.EffigyChallengeV4LevelInfo level_info = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder> 
+          getLevelInfoFieldBuilder() {
+        if (levelInfoBuilder_ == null) {
+          levelInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.EffigyChallengeV4LevelInfoOrBuilder>(
+                  getLevelInfo(),
+                  getParentForChildren(),
+                  isClean());
+          levelInfo_ = null;
+        }
+        return levelInfoBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> playerInfoList_ =
+        java.util.Collections.emptyList();
+      private void ensurePlayerInfoListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo>(playerInfoList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder> playerInfoListBuilder_;
+
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> getPlayerInfoListList() {
+        if (playerInfoListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(playerInfoList_);
+        } else {
+          return playerInfoListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public int getPlayerInfoListCount() {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.size();
+        } else {
+          return playerInfoListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo getPlayerInfoList(int index) {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.get(index);
+        } else {
+          return playerInfoListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder setPlayerInfoList(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.set(index, value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder setPlayerInfoList(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder addPlayerInfoList(emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder addPlayerInfoList(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(index, value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder addPlayerInfoList(
+          emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder addPlayerInfoList(
+          int index, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder addAllPlayerInfoList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo> values) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, playerInfoList_);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder clearPlayerInfoList() {
+        if (playerInfoListBuilder_ == null) {
+          playerInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public Builder removePlayerInfoList(int index) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.remove(index);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder getPlayerInfoListBuilder(
+          int index) {
+        return getPlayerInfoListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+          int index) {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.get(index);  } else {
+          return playerInfoListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder> 
+           getPlayerInfoListOrBuilderList() {
+        if (playerInfoListBuilder_ != null) {
+          return playerInfoListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(playerInfoList_);
+        }
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder addPlayerInfoListBuilder() {
+        return getPlayerInfoListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder addPlayerInfoListBuilder(
+          int index) {
+        return getPlayerInfoListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .EffigyChallengeV4PlayerInfo player_info_list = 7;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder> 
+           getPlayerInfoListBuilderList() {
+        return getPlayerInfoListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder> 
+          getPlayerInfoListFieldBuilder() {
+        if (playerInfoListBuilder_ == null) {
+          playerInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfo.Builder, emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.EffigyChallengeV4PlayerInfoOrBuilder>(
+                  playerInfoList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          playerInfoList_ = null;
+        }
+        return playerInfoListBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:EffigyChallengeV4PrepareNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:EffigyChallengeV4PrepareNotify)
+    private static final emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify();
+    }
+
+    public static emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<EffigyChallengeV4PrepareNotify>
+        PARSER = new com.google.protobuf.AbstractParser<EffigyChallengeV4PrepareNotify>() {
+      @java.lang.Override
+      public EffigyChallengeV4PrepareNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new EffigyChallengeV4PrepareNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<EffigyChallengeV4PrepareNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<EffigyChallengeV4PrepareNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EffigyChallengeV4PrepareNotifyOuterClass.EffigyChallengeV4PrepareNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_EffigyChallengeV4PrepareNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_EffigyChallengeV4PrepareNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n$EffigyChallengeV4PrepareNotify.proto\032 " +
+      "EffigyChallengeV4LevelInfo.proto\032!Effigy" +
+      "ChallengeV4PlayerInfo.proto\"\211\001\n\036EffigyCh" +
+      "allengeV4PrepareNotify\022/\n\nlevel_info\030\006 \001" +
+      "(\0132\033.EffigyChallengeV4LevelInfo\0226\n\020playe" +
+      "r_info_list\030\007 \003(\0132\034.EffigyChallengeV4Pla" +
+      "yerInfoB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.getDescriptor(),
+        });
+    internal_static_EffigyChallengeV4PrepareNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_EffigyChallengeV4PrepareNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_EffigyChallengeV4PrepareNotify_descriptor,
+        new java.lang.String[] { "LevelInfo", "PlayerInfoList", });
+    emu.grasscutter.net.proto.EffigyChallengeV4LevelInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.EffigyChallengeV4PlayerInfoOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareStateOuterClass.java
new file mode 100644
index 000000000..0052982fd
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EffigyChallengeV4PrepareStateOuterClass.java
@@ -0,0 +1,155 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: EffigyChallengeV4PrepareState.proto
+
+package emu.grasscutter.net.proto;
+
+public final class EffigyChallengeV4PrepareStateOuterClass {
+  private EffigyChallengeV4PrepareStateOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code EffigyChallengeV4PrepareState}
+   */
+  public enum EffigyChallengeV4PrepareState
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>IDLE = 0;</code>
+     */
+    IDLE(0),
+    /**
+     * <code>CHANGING_AVATAR = 1;</code>
+     */
+    CHANGING_AVATAR(1),
+    /**
+     * <code>READY = 2;</code>
+     */
+    READY(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>IDLE = 0;</code>
+     */
+    public static final int IDLE_VALUE = 0;
+    /**
+     * <code>CHANGING_AVATAR = 1;</code>
+     */
+    public static final int CHANGING_AVATAR_VALUE = 1;
+    /**
+     * <code>READY = 2;</code>
+     */
+    public static final int READY_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static EffigyChallengeV4PrepareState valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static EffigyChallengeV4PrepareState forNumber(int value) {
+      switch (value) {
+        case 0: return IDLE;
+        case 1: return CHANGING_AVATAR;
+        case 2: return READY;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<EffigyChallengeV4PrepareState>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        EffigyChallengeV4PrepareState> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<EffigyChallengeV4PrepareState>() {
+            public EffigyChallengeV4PrepareState findValueByNumber(int number) {
+              return EffigyChallengeV4PrepareState.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.EffigyChallengeV4PrepareStateOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final EffigyChallengeV4PrepareState[] VALUES = values();
+
+    public static EffigyChallengeV4PrepareState valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private EffigyChallengeV4PrepareState(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:EffigyChallengeV4PrepareState)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n#EffigyChallengeV4PrepareState.proto*I\n" +
+      "\035EffigyChallengeV4PrepareState\022\010\n\004IDLE\020\000" +
+      "\022\023\n\017CHANGING_AVATAR\020\001\022\t\n\005READY\020\002B\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonRspOuterClass.java
index a1da17a67..54b87064a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonRspOuterClass.java
@@ -19,11 +19,32 @@ public final class EnterCustomDungeonRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     * @return Whether the customDungeon field is set.
+     */
+    boolean hasCustomDungeon();
+    /**
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     * @return The customDungeon.
+     */
+    emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon();
+    /**
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     */
+    emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder();
+
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     int getRoomCostMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     boolean containsRoomCostMap(
         int key);
@@ -34,62 +55,36 @@ public final class EnterCustomDungeonRspOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getRoomCostMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getRoomCostMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
 
     int getRoomCostMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
 
     int getRoomCostMapOrThrow(
         int key);
 
     /**
-     * <code>.EnterCustomDungeonType enter_type = 8;</code>
+     * <code>.EnterCustomDungeonType enter_type = 15;</code>
      * @return The enum numeric value on the wire for enterType.
      */
     int getEnterTypeValue();
     /**
-     * <code>.EnterCustomDungeonType enter_type = 8;</code>
+     * <code>.EnterCustomDungeonType enter_type = 15;</code>
      * @return The enterType.
      */
     emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType getEnterType();
-
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     * @return Whether the customDungeon field is set.
-     */
-    boolean hasCustomDungeon();
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     * @return The customDungeon.
-     */
-    emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon();
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     */
-    emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 22598
-   * Obf: HJBLNFGNAGN
-   * </pre>
-   *
    * Protobuf type {@code EnterCustomDungeonRsp}
    */
   public static final class EnterCustomDungeonRsp extends
@@ -136,7 +131,7 @@ public final class EnterCustomDungeonRspOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 34: {
               emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder subBuilder = null;
               if (customDungeon_ != null) {
                 subBuilder = customDungeon_.toBuilder();
@@ -149,18 +144,12 @@ public final class EnterCustomDungeonRspOuterClass {
 
               break;
             }
-            case 48: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 64: {
-              int rawValue = input.readEnum();
-
-              enterType_ = rawValue;
-              break;
-            }
-            case 122: {
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 roomCostMap_ = com.google.protobuf.MapField.newMapField(
                     RoomCostMapDefaultEntryHolder.defaultEntry);
@@ -173,6 +162,12 @@ public final class EnterCustomDungeonRspOuterClass {
                   roomCostMap__.getKey(), roomCostMap__.getValue());
               break;
             }
+            case 120: {
+              int rawValue = input.readEnum();
+
+              enterType_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -202,7 +197,7 @@ public final class EnterCustomDungeonRspOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 15:
+        case 14:
           return internalGetRoomCostMap();
         default:
           throw new RuntimeException(
@@ -217,7 +212,44 @@ public final class EnterCustomDungeonRspOuterClass {
               emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp.class, emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp.Builder.class);
     }
 
-    public static final int ROOM_COST_MAP_FIELD_NUMBER = 15;
+    public static final int CUSTOM_DUNGEON_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon customDungeon_;
+    /**
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     * @return Whether the customDungeon field is set.
+     */
+    @java.lang.Override
+    public boolean hasCustomDungeon() {
+      return customDungeon_ != null;
+    }
+    /**
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     * @return The customDungeon.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon() {
+      return customDungeon_ == null ? emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
+    }
+    /**
+     * <code>.CustomDungeon custom_dungeon = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder() {
+      return getCustomDungeon();
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 12;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int ROOM_COST_MAP_FIELD_NUMBER = 14;
     private static final class RoomCostMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -244,7 +276,7 @@ public final class EnterCustomDungeonRspOuterClass {
       return internalGetRoomCostMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
 
     @java.lang.Override
@@ -262,7 +294,7 @@ public final class EnterCustomDungeonRspOuterClass {
       return getRoomCostMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     @java.lang.Override
 
@@ -270,7 +302,7 @@ public final class EnterCustomDungeonRspOuterClass {
       return internalGetRoomCostMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     @java.lang.Override
 
@@ -283,7 +315,7 @@ public final class EnterCustomDungeonRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+     * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
      */
     @java.lang.Override
 
@@ -298,17 +330,17 @@ public final class EnterCustomDungeonRspOuterClass {
       return map.get(key);
     }
 
-    public static final int ENTER_TYPE_FIELD_NUMBER = 8;
+    public static final int ENTER_TYPE_FIELD_NUMBER = 15;
     private int enterType_;
     /**
-     * <code>.EnterCustomDungeonType enter_type = 8;</code>
+     * <code>.EnterCustomDungeonType enter_type = 15;</code>
      * @return The enum numeric value on the wire for enterType.
      */
     @java.lang.Override public int getEnterTypeValue() {
       return enterType_;
     }
     /**
-     * <code>.EnterCustomDungeonType enter_type = 8;</code>
+     * <code>.EnterCustomDungeonType enter_type = 15;</code>
      * @return The enterType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType getEnterType() {
@@ -317,43 +349,6 @@ public final class EnterCustomDungeonRspOuterClass {
       return result == null ? emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.UNRECOGNIZED : result;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int CUSTOM_DUNGEON_FIELD_NUMBER = 5;
-    private emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon customDungeon_;
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     * @return Whether the customDungeon field is set.
-     */
-    @java.lang.Override
-    public boolean hasCustomDungeon() {
-      return customDungeon_ != null;
-    }
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     * @return The customDungeon.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon() {
-      return customDungeon_ == null ? emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
-    }
-    /**
-     * <code>.CustomDungeon custom_dungeon = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder() {
-      return getCustomDungeon();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -369,20 +364,20 @@ public final class EnterCustomDungeonRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (customDungeon_ != null) {
-        output.writeMessage(5, getCustomDungeon());
+        output.writeMessage(4, getCustomDungeon());
       }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      if (enterType_ != emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.ENTER_CUSTOM_DUNGEON_NONE.getNumber()) {
-        output.writeEnum(8, enterType_);
+        output.writeInt32(12, retcode_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetRoomCostMap(),
           RoomCostMapDefaultEntryHolder.defaultEntry,
-          15);
+          14);
+      if (enterType_ != emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.ENTER_CUSTOM_DUNGEON_NONE.getNumber()) {
+        output.writeEnum(15, enterType_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -394,15 +389,11 @@ public final class EnterCustomDungeonRspOuterClass {
       size = 0;
       if (customDungeon_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getCustomDungeon());
+          .computeMessageSize(4, getCustomDungeon());
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      if (enterType_ != emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.ENTER_CUSTOM_DUNGEON_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, enterType_);
+          .computeInt32Size(12, retcode_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetRoomCostMap().getMap().entrySet()) {
@@ -412,7 +403,11 @@ public final class EnterCustomDungeonRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(15, roomCostMap__);
+            .computeMessageSize(14, roomCostMap__);
+      }
+      if (enterType_ != emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.ENTER_CUSTOM_DUNGEON_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(15, enterType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -429,16 +424,16 @@ public final class EnterCustomDungeonRspOuterClass {
       }
       emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp other = (emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp) obj;
 
-      if (!internalGetRoomCostMap().equals(
-          other.internalGetRoomCostMap())) return false;
-      if (enterType_ != other.enterType_) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (hasCustomDungeon() != other.hasCustomDungeon()) return false;
       if (hasCustomDungeon()) {
         if (!getCustomDungeon()
             .equals(other.getCustomDungeon())) return false;
       }
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!internalGetRoomCostMap().equals(
+          other.internalGetRoomCostMap())) return false;
+      if (enterType_ != other.enterType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -450,18 +445,18 @@ public final class EnterCustomDungeonRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasCustomDungeon()) {
+        hash = (37 * hash) + CUSTOM_DUNGEON_FIELD_NUMBER;
+        hash = (53 * hash) + getCustomDungeon().hashCode();
+      }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (!internalGetRoomCostMap().getMap().isEmpty()) {
         hash = (37 * hash) + ROOM_COST_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetRoomCostMap().hashCode();
       }
       hash = (37 * hash) + ENTER_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + enterType_;
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      if (hasCustomDungeon()) {
-        hash = (37 * hash) + CUSTOM_DUNGEON_FIELD_NUMBER;
-        hash = (53 * hash) + getCustomDungeon().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -558,11 +553,6 @@ public final class EnterCustomDungeonRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22598
-     * Obf: HJBLNFGNAGN
-     * </pre>
-     *
      * Protobuf type {@code EnterCustomDungeonRsp}
      */
     public static final class Builder extends
@@ -578,7 +568,7 @@ public final class EnterCustomDungeonRspOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 14:
             return internalGetRoomCostMap();
           default:
             throw new RuntimeException(
@@ -589,7 +579,7 @@ public final class EnterCustomDungeonRspOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 15:
+          case 14:
             return internalGetMutableRoomCostMap();
           default:
             throw new RuntimeException(
@@ -622,17 +612,17 @@ public final class EnterCustomDungeonRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        internalGetMutableRoomCostMap().clear();
-        enterType_ = 0;
-
-        retcode_ = 0;
-
         if (customDungeonBuilder_ == null) {
           customDungeon_ = null;
         } else {
           customDungeon_ = null;
           customDungeonBuilder_ = null;
         }
+        retcode_ = 0;
+
+        internalGetMutableRoomCostMap().clear();
+        enterType_ = 0;
+
         return this;
       }
 
@@ -660,15 +650,15 @@ public final class EnterCustomDungeonRspOuterClass {
       public emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp buildPartial() {
         emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp result = new emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp(this);
         int from_bitField0_ = bitField0_;
-        result.roomCostMap_ = internalGetRoomCostMap();
-        result.roomCostMap_.makeImmutable();
-        result.enterType_ = enterType_;
-        result.retcode_ = retcode_;
         if (customDungeonBuilder_ == null) {
           result.customDungeon_ = customDungeon_;
         } else {
           result.customDungeon_ = customDungeonBuilder_.build();
         }
+        result.retcode_ = retcode_;
+        result.roomCostMap_ = internalGetRoomCostMap();
+        result.roomCostMap_.makeImmutable();
+        result.enterType_ = enterType_;
         onBuilt();
         return result;
       }
@@ -717,16 +707,16 @@ public final class EnterCustomDungeonRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp other) {
         if (other == emu.grasscutter.net.proto.EnterCustomDungeonRspOuterClass.EnterCustomDungeonRsp.getDefaultInstance()) return this;
-        internalGetMutableRoomCostMap().mergeFrom(
-            other.internalGetRoomCostMap());
-        if (other.enterType_ != 0) {
-          setEnterTypeValue(other.getEnterTypeValue());
+        if (other.hasCustomDungeon()) {
+          mergeCustomDungeon(other.getCustomDungeon());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.hasCustomDungeon()) {
-          mergeCustomDungeon(other.getCustomDungeon());
+        internalGetMutableRoomCostMap().mergeFrom(
+            other.internalGetRoomCostMap());
+        if (other.enterType_ != 0) {
+          setEnterTypeValue(other.getEnterTypeValue());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -758,6 +748,156 @@ public final class EnterCustomDungeonRspOuterClass {
       }
       private int bitField0_;
 
+      private emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon customDungeon_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder> customDungeonBuilder_;
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       * @return Whether the customDungeon field is set.
+       */
+      public boolean hasCustomDungeon() {
+        return customDungeonBuilder_ != null || customDungeon_ != null;
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       * @return The customDungeon.
+       */
+      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon() {
+        if (customDungeonBuilder_ == null) {
+          return customDungeon_ == null ? emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
+        } else {
+          return customDungeonBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public Builder setCustomDungeon(emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon value) {
+        if (customDungeonBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          customDungeon_ = value;
+          onChanged();
+        } else {
+          customDungeonBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public Builder setCustomDungeon(
+          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder builderForValue) {
+        if (customDungeonBuilder_ == null) {
+          customDungeon_ = builderForValue.build();
+          onChanged();
+        } else {
+          customDungeonBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public Builder mergeCustomDungeon(emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon value) {
+        if (customDungeonBuilder_ == null) {
+          if (customDungeon_ != null) {
+            customDungeon_ =
+              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.newBuilder(customDungeon_).mergeFrom(value).buildPartial();
+          } else {
+            customDungeon_ = value;
+          }
+          onChanged();
+        } else {
+          customDungeonBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public Builder clearCustomDungeon() {
+        if (customDungeonBuilder_ == null) {
+          customDungeon_ = null;
+          onChanged();
+        } else {
+          customDungeon_ = null;
+          customDungeonBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder getCustomDungeonBuilder() {
+        
+        onChanged();
+        return getCustomDungeonFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder() {
+        if (customDungeonBuilder_ != null) {
+          return customDungeonBuilder_.getMessageOrBuilder();
+        } else {
+          return customDungeon_ == null ?
+              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
+        }
+      }
+      /**
+       * <code>.CustomDungeon custom_dungeon = 4;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder> 
+          getCustomDungeonFieldBuilder() {
+        if (customDungeonBuilder_ == null) {
+          customDungeonBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder>(
+                  getCustomDungeon(),
+                  getParentForChildren(),
+                  isClean());
+          customDungeon_ = null;
+        }
+        return customDungeonBuilder_;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 12;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 12;</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 = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> roomCostMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -785,7 +925,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return internalGetRoomCostMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
 
       @java.lang.Override
@@ -803,7 +943,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return getRoomCostMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
       @java.lang.Override
 
@@ -811,7 +951,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return internalGetRoomCostMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
       @java.lang.Override
 
@@ -824,7 +964,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
       @java.lang.Override
 
@@ -845,7 +985,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
 
       public Builder removeRoomCostMap(
@@ -864,7 +1004,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return internalGetMutableRoomCostMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
       public Builder putRoomCostMap(
           int key,
@@ -876,7 +1016,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; room_cost_map = 15;</code>
+       * <code>map&lt;uint32, uint32&gt; room_cost_map = 14;</code>
        */
 
       public Builder putAllRoomCostMap(
@@ -888,14 +1028,14 @@ public final class EnterCustomDungeonRspOuterClass {
 
       private int enterType_ = 0;
       /**
-       * <code>.EnterCustomDungeonType enter_type = 8;</code>
+       * <code>.EnterCustomDungeonType enter_type = 15;</code>
        * @return The enum numeric value on the wire for enterType.
        */
       @java.lang.Override public int getEnterTypeValue() {
         return enterType_;
       }
       /**
-       * <code>.EnterCustomDungeonType enter_type = 8;</code>
+       * <code>.EnterCustomDungeonType enter_type = 15;</code>
        * @param value The enum numeric value on the wire for enterType to set.
        * @return This builder for chaining.
        */
@@ -906,7 +1046,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>.EnterCustomDungeonType enter_type = 8;</code>
+       * <code>.EnterCustomDungeonType enter_type = 15;</code>
        * @return The enterType.
        */
       @java.lang.Override
@@ -916,7 +1056,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.EnterCustomDungeonType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.EnterCustomDungeonType enter_type = 8;</code>
+       * <code>.EnterCustomDungeonType enter_type = 15;</code>
        * @param value The enterType to set.
        * @return This builder for chaining.
        */
@@ -930,7 +1070,7 @@ public final class EnterCustomDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>.EnterCustomDungeonType enter_type = 8;</code>
+       * <code>.EnterCustomDungeonType enter_type = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterType() {
@@ -939,156 +1079,6 @@ public final class EnterCustomDungeonRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon customDungeon_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder> customDungeonBuilder_;
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       * @return Whether the customDungeon field is set.
-       */
-      public boolean hasCustomDungeon() {
-        return customDungeonBuilder_ != null || customDungeon_ != null;
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       * @return The customDungeon.
-       */
-      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon getCustomDungeon() {
-        if (customDungeonBuilder_ == null) {
-          return customDungeon_ == null ? emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
-        } else {
-          return customDungeonBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public Builder setCustomDungeon(emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon value) {
-        if (customDungeonBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          customDungeon_ = value;
-          onChanged();
-        } else {
-          customDungeonBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public Builder setCustomDungeon(
-          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder builderForValue) {
-        if (customDungeonBuilder_ == null) {
-          customDungeon_ = builderForValue.build();
-          onChanged();
-        } else {
-          customDungeonBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public Builder mergeCustomDungeon(emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon value) {
-        if (customDungeonBuilder_ == null) {
-          if (customDungeon_ != null) {
-            customDungeon_ =
-              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.newBuilder(customDungeon_).mergeFrom(value).buildPartial();
-          } else {
-            customDungeon_ = value;
-          }
-          onChanged();
-        } else {
-          customDungeonBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public Builder clearCustomDungeon() {
-        if (customDungeonBuilder_ == null) {
-          customDungeon_ = null;
-          onChanged();
-        } else {
-          customDungeon_ = null;
-          customDungeonBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder getCustomDungeonBuilder() {
-        
-        onChanged();
-        return getCustomDungeonFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      public emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder getCustomDungeonOrBuilder() {
-        if (customDungeonBuilder_ != null) {
-          return customDungeonBuilder_.getMessageOrBuilder();
-        } else {
-          return customDungeon_ == null ?
-              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.getDefaultInstance() : customDungeon_;
-        }
-      }
-      /**
-       * <code>.CustomDungeon custom_dungeon = 5;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder> 
-          getCustomDungeonFieldBuilder() {
-        if (customDungeonBuilder_ == null) {
-          customDungeonBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeon.Builder, emu.grasscutter.net.proto.CustomDungeonOuterClass.CustomDungeonOrBuilder>(
-                  getCustomDungeon(),
-                  getParentForChildren(),
-                  isClean());
-          customDungeon_ = null;
-        }
-        return customDungeonBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1161,13 +1151,13 @@ public final class EnterCustomDungeonRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033EnterCustomDungeonRsp.proto\032\034EnterCust" +
-      "omDungeonType.proto\032\023CustomDungeon.proto" +
-      "\"\361\001\n\025EnterCustomDungeonRsp\022>\n\rroom_cost_" +
-      "map\030\017 \003(\0132\'.EnterCustomDungeonRsp.RoomCo" +
-      "stMapEntry\022+\n\nenter_type\030\010 \001(\0162\027.EnterCu" +
-      "stomDungeonType\022\017\n\007retcode\030\006 \001(\005\022&\n\016cust" +
-      "om_dungeon\030\005 \001(\0132\016.CustomDungeon\0322\n\020Room" +
+      "\n\033EnterCustomDungeonRsp.proto\032\023CustomDun" +
+      "geon.proto\032\034EnterCustomDungeonType.proto" +
+      "\"\361\001\n\025EnterCustomDungeonRsp\022&\n\016custom_dun" +
+      "geon\030\004 \001(\0132\016.CustomDungeon\022\017\n\007retcode\030\014 " +
+      "\001(\005\022>\n\rroom_cost_map\030\016 \003(\0132\'.EnterCustom" +
+      "DungeonRsp.RoomCostMapEntry\022+\n\nenter_typ" +
+      "e\030\017 \001(\0162\027.EnterCustomDungeonType\0322\n\020Room" +
       "CostMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r" +
       ":\0028\001B\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
@@ -1175,23 +1165,23 @@ public final class EnterCustomDungeonRspOuterClass {
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.CustomDungeonOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.getDescriptor(),
         });
     internal_static_EnterCustomDungeonRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_EnterCustomDungeonRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterCustomDungeonRsp_descriptor,
-        new java.lang.String[] { "RoomCostMap", "EnterType", "Retcode", "CustomDungeon", });
+        new java.lang.String[] { "CustomDungeon", "Retcode", "RoomCostMap", "EnterType", });
     internal_static_EnterCustomDungeonRsp_RoomCostMapEntry_descriptor =
       internal_static_EnterCustomDungeonRsp_descriptor.getNestedTypes().get(0);
     internal_static_EnterCustomDungeonRsp_RoomCostMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterCustomDungeonRsp_RoomCostMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
-    emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.CustomDungeonOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.EnterCustomDungeonTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonTypeOuterClass.java
index 70a64fc62..18e258638 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterCustomDungeonTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class EnterCustomDungeonTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: PCCMGHKHKNL
-   * </pre>
-   *
    * Protobuf enum {@code EnterCustomDungeonType}
    */
   public enum EnterCustomDungeonType
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 34fa387d7..b4cfdea78 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneReqOuterClass.java
@@ -19,17 +19,12 @@ public final class EnterSceneDoneReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 9;</code>
+     * <code>uint32 enter_scene_token = 8;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 28690
-   * Obf: KLBOAPKHBEP
-   * </pre>
-   *
    * Protobuf type {@code EnterSceneDoneReq}
    */
   public static final class EnterSceneDoneReq extends
@@ -74,7 +69,7 @@ public final class EnterSceneDoneReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 64: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class EnterSceneDoneReqOuterClass {
               emu.grasscutter.net.proto.EnterSceneDoneReqOuterClass.EnterSceneDoneReq.class, emu.grasscutter.net.proto.EnterSceneDoneReqOuterClass.EnterSceneDoneReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 9;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 8;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 9;</code>
+     * <code>uint32 enter_scene_token = 8;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class EnterSceneDoneReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(9, enterSceneToken_);
+        output.writeUInt32(8, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class EnterSceneDoneReqOuterClass {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, enterSceneToken_);
+          .computeUInt32Size(8, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class EnterSceneDoneReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28690
-     * Obf: KLBOAPKHBEP
-     * </pre>
-     *
      * Protobuf type {@code EnterSceneDoneReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class EnterSceneDoneReqOuterClass {
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class EnterSceneDoneReqOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class EnterSceneDoneReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -527,7 +517,7 @@ public final class EnterSceneDoneReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterSceneDoneReq.proto\".\n\021EnterSceneD" +
-      "oneReq\022\031\n\021enter_scene_token\030\t \001(\rB\033\n\031emu" +
+      "oneReq\022\031\n\021enter_scene_token\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/EnterSceneDoneRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
index f5e814847..4204ec26a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneDoneRspOuterClass.java
@@ -19,23 +19,18 @@ public final class EnterSceneDoneRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 12;</code>
-     * @return The enterSceneToken.
-     */
-    int getEnterSceneToken();
-
-    /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
+     */
+    int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 24814
-   * Obf: AHBDCDEOHII
-   * </pre>
-   *
    * Protobuf type {@code EnterSceneDoneRsp}
    */
   public static final class EnterSceneDoneRsp extends
@@ -80,16 +75,16 @@ public final class EnterSceneDoneRspOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
-
-              enterSceneToken_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 88: {
+
+              enterSceneToken_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class EnterSceneDoneRspOuterClass {
               emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.class, emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.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 RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 10;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class EnterSceneDoneRspOuterClass {
       return retcode_;
     }
 
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 11;
+    private int enterSceneToken_;
+    /**
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class EnterSceneDoneRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (enterSceneToken_ != 0) {
-        output.writeUInt32(12, enterSceneToken_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(10, retcode_);
+      }
+      if (enterSceneToken_ != 0) {
+        output.writeUInt32(11, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class EnterSceneDoneRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (enterSceneToken_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, enterSceneToken_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(10, retcode_);
+      }
+      if (enterSceneToken_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class EnterSceneDoneRspOuterClass {
       }
       emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp other = (emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp) 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;
     }
@@ -211,10 +206,10 @@ public final class EnterSceneDoneRspOuterClass {
       }
       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;
@@ -311,11 +306,6 @@ public final class EnterSceneDoneRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24814
-     * Obf: AHBDCDEOHII
-     * </pre>
-     *
      * Protobuf type {@code EnterSceneDoneRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class EnterSceneDoneRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enterSceneToken_ = 0;
-
         retcode_ = 0;
 
+        enterSceneToken_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class EnterSceneDoneRspOuterClass {
       @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.enterSceneToken_ = enterSceneToken_;
         result.retcode_ = retcode_;
+        result.enterSceneToken_ = enterSceneToken_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class EnterSceneDoneRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp other) {
         if (other == emu.grasscutter.net.proto.EnterSceneDoneRspOuterClass.EnterSceneDoneRsp.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;
@@ -468,40 +458,9 @@ public final class EnterSceneDoneRspOuterClass {
         return this;
       }
 
-      private int enterSceneToken_ ;
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @return The enterSceneToken.
-       */
-      @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @param value The enterSceneToken to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnterSceneToken(int value) {
-        
-        enterSceneToken_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnterSceneToken() {
-        
-        enterSceneToken_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 10;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class EnterSceneDoneRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 10;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class EnterSceneDoneRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class EnterSceneDoneRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int enterSceneToken_ ;
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return The enterSceneToken.
+       */
+      @java.lang.Override
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @param value The enterSceneToken to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEnterSceneToken(int value) {
+        
+        enterSceneToken_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEnterSceneToken() {
+        
+        enterSceneToken_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class EnterSceneDoneRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterSceneDoneRsp.proto\"?\n\021EnterSceneD" +
-      "oneRsp\022\031\n\021enter_scene_token\030\014 \001(\r\022\017\n\007ret" +
-      "code\030\017 \001(\005B\033\n\031emu.grasscutter.net.protob" +
+      "oneRsp\022\017\n\007retcode\030\n \001(\005\022\031\n\021enter_scene_t" +
+      "oken\030\013 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class EnterSceneDoneRspOuterClass {
     internal_static_EnterSceneDoneRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterSceneDoneRsp_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/EnterScenePeerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
index c0357461e..f7dad7d21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterScenePeerNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class EnterScenePeerNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 7;</code>
+     * <code>uint32 enter_scene_token = 1;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
 
     /**
-     * <code>uint32 peer_id = 14;</code>
+     * <code>uint32 dest_scene_id = 7;</code>
+     * @return The destSceneId.
+     */
+    int getDestSceneId();
+
+    /**
+     * <code>uint32 peer_id = 8;</code>
      * @return The peerId.
      */
     int getPeerId();
 
     /**
-     * <code>uint32 host_peer_id = 8;</code>
+     * <code>uint32 host_peer_id = 11;</code>
      * @return The hostPeerId.
      */
     int getHostPeerId();
-
-    /**
-     * <code>uint32 dest_scene_id = 3;</code>
-     * @return The destSceneId.
-     */
-    int getDestSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 21053
-   * Obf: JBBPPLGGMPC
-   * </pre>
-   *
    * Protobuf type {@code EnterScenePeerNotify}
    */
   public static final class EnterScenePeerNotify extends
@@ -92,26 +87,26 @@ public final class EnterScenePeerNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              destSceneId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
+            case 8: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 56: {
 
-              hostPeerId_ = input.readUInt32();
+              destSceneId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 64: {
 
               peerId_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              hostPeerId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -144,10 +139,10 @@ public final class EnterScenePeerNotifyOuterClass {
               emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.class, emu.grasscutter.net.proto.EnterScenePeerNotifyOuterClass.EnterScenePeerNotify.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 1;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 7;</code>
+     * <code>uint32 enter_scene_token = 1;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -155,10 +150,21 @@ public final class EnterScenePeerNotifyOuterClass {
       return enterSceneToken_;
     }
 
-    public static final int PEER_ID_FIELD_NUMBER = 14;
+    public static final int DEST_SCENE_ID_FIELD_NUMBER = 7;
+    private int destSceneId_;
+    /**
+     * <code>uint32 dest_scene_id = 7;</code>
+     * @return The destSceneId.
+     */
+    @java.lang.Override
+    public int getDestSceneId() {
+      return destSceneId_;
+    }
+
+    public static final int PEER_ID_FIELD_NUMBER = 8;
     private int peerId_;
     /**
-     * <code>uint32 peer_id = 14;</code>
+     * <code>uint32 peer_id = 8;</code>
      * @return The peerId.
      */
     @java.lang.Override
@@ -166,10 +172,10 @@ public final class EnterScenePeerNotifyOuterClass {
       return peerId_;
     }
 
-    public static final int HOST_PEER_ID_FIELD_NUMBER = 8;
+    public static final int HOST_PEER_ID_FIELD_NUMBER = 11;
     private int hostPeerId_;
     /**
-     * <code>uint32 host_peer_id = 8;</code>
+     * <code>uint32 host_peer_id = 11;</code>
      * @return The hostPeerId.
      */
     @java.lang.Override
@@ -177,17 +183,6 @@ public final class EnterScenePeerNotifyOuterClass {
       return hostPeerId_;
     }
 
-    public static final int DEST_SCENE_ID_FIELD_NUMBER = 3;
-    private int destSceneId_;
-    /**
-     * <code>uint32 dest_scene_id = 3;</code>
-     * @return The destSceneId.
-     */
-    @java.lang.Override
-    public int getDestSceneId() {
-      return destSceneId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class EnterScenePeerNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (destSceneId_ != 0) {
-        output.writeUInt32(3, destSceneId_);
-      }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(7, enterSceneToken_);
+        output.writeUInt32(1, enterSceneToken_);
       }
-      if (hostPeerId_ != 0) {
-        output.writeUInt32(8, hostPeerId_);
+      if (destSceneId_ != 0) {
+        output.writeUInt32(7, destSceneId_);
       }
       if (peerId_ != 0) {
-        output.writeUInt32(14, peerId_);
+        output.writeUInt32(8, peerId_);
+      }
+      if (hostPeerId_ != 0) {
+        output.writeUInt32(11, hostPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class EnterScenePeerNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (destSceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, destSceneId_);
-      }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, enterSceneToken_);
+          .computeUInt32Size(1, enterSceneToken_);
       }
-      if (hostPeerId_ != 0) {
+      if (destSceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, hostPeerId_);
+          .computeUInt32Size(7, destSceneId_);
       }
       if (peerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, peerId_);
+          .computeUInt32Size(8, peerId_);
+      }
+      if (hostPeerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, hostPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +251,12 @@ public final class EnterScenePeerNotifyOuterClass {
 
       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 (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class EnterScenePeerNotifyOuterClass {
       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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class EnterScenePeerNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21053
-     * Obf: JBBPPLGGMPC
-     * </pre>
-     *
      * Protobuf type {@code EnterScenePeerNotify}
      */
     public static final class Builder extends
@@ -421,12 +411,12 @@ public final class EnterScenePeerNotifyOuterClass {
         super.clear();
         enterSceneToken_ = 0;
 
+        destSceneId_ = 0;
+
         peerId_ = 0;
 
         hostPeerId_ = 0;
 
-        destSceneId_ = 0;
-
         return this;
       }
 
@@ -454,9 +444,9 @@ public final class EnterScenePeerNotifyOuterClass {
       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_;
         onBuilt();
         return result;
       }
@@ -508,15 +498,15 @@ public final class EnterScenePeerNotifyOuterClass {
         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());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -548,7 +538,7 @@ public final class EnterScenePeerNotifyOuterClass {
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 7;</code>
+       * <code>uint32 enter_scene_token = 1;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -556,7 +546,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 7;</code>
+       * <code>uint32 enter_scene_token = 1;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -567,7 +557,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 7;</code>
+       * <code>uint32 enter_scene_token = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -577,9 +567,40 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
 
+      private int destSceneId_ ;
+      /**
+       * <code>uint32 dest_scene_id = 7;</code>
+       * @return The destSceneId.
+       */
+      @java.lang.Override
+      public int getDestSceneId() {
+        return destSceneId_;
+      }
+      /**
+       * <code>uint32 dest_scene_id = 7;</code>
+       * @param value The destSceneId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDestSceneId(int value) {
+        
+        destSceneId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dest_scene_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDestSceneId() {
+        
+        destSceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int peerId_ ;
       /**
-       * <code>uint32 peer_id = 14;</code>
+       * <code>uint32 peer_id = 8;</code>
        * @return The peerId.
        */
       @java.lang.Override
@@ -587,7 +608,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return peerId_;
       }
       /**
-       * <code>uint32 peer_id = 14;</code>
+       * <code>uint32 peer_id = 8;</code>
        * @param value The peerId to set.
        * @return This builder for chaining.
        */
@@ -598,7 +619,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 peer_id = 14;</code>
+       * <code>uint32 peer_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearPeerId() {
@@ -610,7 +631,7 @@ public final class EnterScenePeerNotifyOuterClass {
 
       private int hostPeerId_ ;
       /**
-       * <code>uint32 host_peer_id = 8;</code>
+       * <code>uint32 host_peer_id = 11;</code>
        * @return The hostPeerId.
        */
       @java.lang.Override
@@ -618,7 +639,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return hostPeerId_;
       }
       /**
-       * <code>uint32 host_peer_id = 8;</code>
+       * <code>uint32 host_peer_id = 11;</code>
        * @param value The hostPeerId to set.
        * @return This builder for chaining.
        */
@@ -629,7 +650,7 @@ public final class EnterScenePeerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 host_peer_id = 8;</code>
+       * <code>uint32 host_peer_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearHostPeerId() {
@@ -638,37 +659,6 @@ public final class EnterScenePeerNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int destSceneId_ ;
-      /**
-       * <code>uint32 dest_scene_id = 3;</code>
-       * @return The destSceneId.
-       */
-      @java.lang.Override
-      public int getDestSceneId() {
-        return destSceneId_;
-      }
-      /**
-       * <code>uint32 dest_scene_id = 3;</code>
-       * @param value The destSceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDestSceneId(int value) {
-        
-        destSceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dest_scene_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDestSceneId() {
-        
-        destSceneId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -737,9 +727,9 @@ public final class EnterScenePeerNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032EnterScenePeerNotify.proto\"o\n\024EnterSce" +
-      "nePeerNotify\022\031\n\021enter_scene_token\030\007 \001(\r\022" +
-      "\017\n\007peer_id\030\016 \001(\r\022\024\n\014host_peer_id\030\010 \001(\r\022\025" +
-      "\n\rdest_scene_id\030\003 \001(\rB\033\n\031emu.grasscutter" +
+      "nePeerNotify\022\031\n\021enter_scene_token\030\001 \001(\r\022" +
+      "\025\n\rdest_scene_id\030\007 \001(\r\022\017\n\007peer_id\030\010 \001(\r\022" +
+      "\024\n\014host_peer_id\030\013 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -751,7 +741,7 @@ public final class EnterScenePeerNotifyOuterClass {
     internal_static_EnterScenePeerNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterScenePeerNotify_descriptor,
-        new java.lang.String[] { "EnterSceneToken", "PeerId", "HostPeerId", "DestSceneId", });
+        new java.lang.String[] { "EnterSceneToken", "DestSceneId", "PeerId", "HostPeerId", });
   }
 
   // @@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 f8b9d7877..41bb25510 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyReqOuterClass.java
@@ -19,17 +19,12 @@ public final class EnterSceneReadyReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 15;</code>
+     * <code>uint32 enter_scene_token = 7;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 5011
-   * Obf: HDKGADMEFMP
-   * </pre>
-   *
    * Protobuf type {@code EnterSceneReadyReq}
    */
   public static final class EnterSceneReadyReq extends
@@ -74,7 +69,7 @@ public final class EnterSceneReadyReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 56: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class EnterSceneReadyReqOuterClass {
               emu.grasscutter.net.proto.EnterSceneReadyReqOuterClass.EnterSceneReadyReq.class, emu.grasscutter.net.proto.EnterSceneReadyReqOuterClass.EnterSceneReadyReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 15;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 15;</code>
+     * <code>uint32 enter_scene_token = 7;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class EnterSceneReadyReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(15, enterSceneToken_);
+        output.writeUInt32(7, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class EnterSceneReadyReqOuterClass {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, enterSceneToken_);
+          .computeUInt32Size(7, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class EnterSceneReadyReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5011
-     * Obf: HDKGADMEFMP
-     * </pre>
-     *
      * Protobuf type {@code EnterSceneReadyReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class EnterSceneReadyReqOuterClass {
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 15;</code>
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class EnterSceneReadyReqOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 15;</code>
+       * <code>uint32 enter_scene_token = 7;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class EnterSceneReadyReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 15;</code>
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -527,7 +517,7 @@ public final class EnterSceneReadyReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030EnterSceneReadyReq.proto\"/\n\022EnterScene" +
-      "ReadyReq\022\031\n\021enter_scene_token\030\017 \001(\rB\033\n\031e" +
+      "ReadyReq\022\031\n\021enter_scene_token\030\007 \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 f93d18941..6156e2eb9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterSceneReadyRspOuterClass.java
@@ -19,23 +19,18 @@ public final class EnterSceneReadyRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 12;</code>
-     * @return The enterSceneToken.
-     */
-    int getEnterSceneToken();
-
-    /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
+     */
+    int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 4744
-   * Obf: DCBGKOFOANI
-   * </pre>
-   *
    * Protobuf type {@code EnterSceneReadyRsp}
    */
   public static final class EnterSceneReadyRsp extends
@@ -80,12 +75,12 @@ public final class EnterSceneReadyRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class EnterSceneReadyRspOuterClass {
               emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.class, emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.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 RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 9;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class EnterSceneReadyRspOuterClass {
       return retcode_;
     }
 
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 11;
+    private int enterSceneToken_;
+    /**
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class EnterSceneReadyRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(9, retcode_);
       }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(12, enterSceneToken_);
+        output.writeUInt32(11, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class EnterSceneReadyRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(9, retcode_);
       }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, enterSceneToken_);
+          .computeUInt32Size(11, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class EnterSceneReadyRspOuterClass {
       }
       emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other = (emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp) 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;
     }
@@ -211,10 +206,10 @@ public final class EnterSceneReadyRspOuterClass {
       }
       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;
@@ -311,11 +306,6 @@ public final class EnterSceneReadyRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4744
-     * Obf: DCBGKOFOANI
-     * </pre>
-     *
      * Protobuf type {@code EnterSceneReadyRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class EnterSceneReadyRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        enterSceneToken_ = 0;
-
         retcode_ = 0;
 
+        enterSceneToken_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class EnterSceneReadyRspOuterClass {
       @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.enterSceneToken_ = enterSceneToken_;
         result.retcode_ = retcode_;
+        result.enterSceneToken_ = enterSceneToken_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class EnterSceneReadyRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp other) {
         if (other == emu.grasscutter.net.proto.EnterSceneReadyRspOuterClass.EnterSceneReadyRsp.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;
@@ -468,40 +458,9 @@ public final class EnterSceneReadyRspOuterClass {
         return this;
       }
 
-      private int enterSceneToken_ ;
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @return The enterSceneToken.
-       */
-      @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @param value The enterSceneToken to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnterSceneToken(int value) {
-        
-        enterSceneToken_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnterSceneToken() {
-        
-        enterSceneToken_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 9;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class EnterSceneReadyRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 9;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class EnterSceneReadyRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class EnterSceneReadyRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int enterSceneToken_ ;
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return The enterSceneToken.
+       */
+      @java.lang.Override
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @param value The enterSceneToken to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEnterSceneToken(int value) {
+        
+        enterSceneToken_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEnterSceneToken() {
+        
+        enterSceneToken_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class EnterSceneReadyRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030EnterSceneReadyRsp.proto\"@\n\022EnterScene" +
-      "ReadyRsp\022\031\n\021enter_scene_token\030\014 \001(\r\022\017\n\007r" +
-      "etcode\030\002 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "ReadyRsp\022\017\n\007retcode\030\t \001(\005\022\031\n\021enter_scene" +
+      "_token\030\013 \001(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class EnterSceneReadyRspOuterClass {
     internal_static_EnterSceneReadyRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterSceneReadyRsp_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/EnterTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterTypeOuterClass.java
index cce7a7e5f..3eb1611e4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class EnterTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: NMCABLGJJEK
-   * </pre>
-   *
    * Protobuf enum {@code EnterType}
    */
   public enum EnterType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaReqOuterClass.java
index 9d8c7ce0b..4fa138ddf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaReqOuterClass.java
@@ -25,17 +25,12 @@ public final class EnterWorldAreaReqOuterClass {
     int getAreaType();
 
     /**
-     * <code>uint32 area_id = 15;</code>
+     * <code>uint32 area_id = 2;</code>
      * @return The areaId.
      */
     int getAreaId();
   }
   /**
-   * <pre>
-   * CmdId: 29482
-   * Obf: OLIJIMJGACD
-   * </pre>
-   *
    * Protobuf type {@code EnterWorldAreaReq}
    */
   public static final class EnterWorldAreaReq extends
@@ -80,16 +75,16 @@ public final class EnterWorldAreaReqOuterClass {
             case 0:
               done = true;
               break;
+            case 16: {
+
+              areaId_ = input.readUInt32();
+              break;
+            }
             case 64: {
 
               areaType_ = input.readUInt32();
               break;
             }
-            case 120: {
-
-              areaId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class EnterWorldAreaReqOuterClass {
       return areaType_;
     }
 
-    public static final int AREA_ID_FIELD_NUMBER = 15;
+    public static final int AREA_ID_FIELD_NUMBER = 2;
     private int areaId_;
     /**
-     * <code>uint32 area_id = 15;</code>
+     * <code>uint32 area_id = 2;</code>
      * @return The areaId.
      */
     @java.lang.Override
@@ -158,12 +153,12 @@ public final class EnterWorldAreaReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (areaId_ != 0) {
+        output.writeUInt32(2, areaId_);
+      }
       if (areaType_ != 0) {
         output.writeUInt32(8, areaType_);
       }
-      if (areaId_ != 0) {
-        output.writeUInt32(15, areaId_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -173,14 +168,14 @@ public final class EnterWorldAreaReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (areaId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, areaId_);
+      }
       if (areaType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(8, areaType_);
       }
-      if (areaId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, areaId_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -311,11 +306,6 @@ public final class EnterWorldAreaReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29482
-     * Obf: OLIJIMJGACD
-     * </pre>
-     *
      * Protobuf type {@code EnterWorldAreaReq}
      */
     public static final class Builder extends
@@ -501,7 +491,7 @@ public final class EnterWorldAreaReqOuterClass {
 
       private int areaId_ ;
       /**
-       * <code>uint32 area_id = 15;</code>
+       * <code>uint32 area_id = 2;</code>
        * @return The areaId.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class EnterWorldAreaReqOuterClass {
         return areaId_;
       }
       /**
-       * <code>uint32 area_id = 15;</code>
+       * <code>uint32 area_id = 2;</code>
        * @param value The areaId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class EnterWorldAreaReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 area_id = 15;</code>
+       * <code>uint32 area_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaId() {
@@ -597,7 +587,7 @@ public final class EnterWorldAreaReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterWorldAreaReq.proto\"7\n\021EnterWorldA" +
-      "reaReq\022\021\n\tarea_type\030\010 \001(\r\022\017\n\007area_id\030\017 \001" +
+      "reaReq\022\021\n\tarea_type\030\010 \001(\r\022\017\n\007area_id\030\002 \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/EnterWorldAreaRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaRspOuterClass.java
index 337798a3f..7e5c980a7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EnterWorldAreaRspOuterClass.java
@@ -19,29 +19,24 @@ public final class EnterWorldAreaRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 area_type = 6;</code>
+     * <code>uint32 area_type = 7;</code>
      * @return The areaType.
      */
     int getAreaType();
 
     /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 area_id = 9;</code>
+     * <code>uint32 area_id = 11;</code>
      * @return The areaId.
      */
     int getAreaId();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 21362
-   * Obf: MIPCODPODKN
-   * </pre>
-   *
    * Protobuf type {@code EnterWorldAreaRsp}
    */
   public static final class EnterWorldAreaRsp extends
@@ -86,17 +81,17 @@ public final class EnterWorldAreaRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 56: {
 
               areaType_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 88: {
 
               areaId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
@@ -133,10 +128,10 @@ public final class EnterWorldAreaRspOuterClass {
               emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp.class, emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp.Builder.class);
     }
 
-    public static final int AREA_TYPE_FIELD_NUMBER = 6;
+    public static final int AREA_TYPE_FIELD_NUMBER = 7;
     private int areaType_;
     /**
-     * <code>uint32 area_type = 6;</code>
+     * <code>uint32 area_type = 7;</code>
      * @return The areaType.
      */
     @java.lang.Override
@@ -144,21 +139,10 @@ public final class EnterWorldAreaRspOuterClass {
       return areaType_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 13;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int AREA_ID_FIELD_NUMBER = 9;
+    public static final int AREA_ID_FIELD_NUMBER = 11;
     private int areaId_;
     /**
-     * <code>uint32 area_id = 9;</code>
+     * <code>uint32 area_id = 11;</code>
      * @return The areaId.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class EnterWorldAreaRspOuterClass {
       return areaId_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -181,13 +176,13 @@ public final class EnterWorldAreaRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (areaType_ != 0) {
-        output.writeUInt32(6, areaType_);
+        output.writeUInt32(7, areaType_);
       }
       if (areaId_ != 0) {
-        output.writeUInt32(9, areaId_);
+        output.writeUInt32(11, areaId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(13, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class EnterWorldAreaRspOuterClass {
       size = 0;
       if (areaType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, areaType_);
+          .computeUInt32Size(7, areaType_);
       }
       if (areaId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, areaId_);
+          .computeUInt32Size(11, areaId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +222,10 @@ public final class EnterWorldAreaRspOuterClass {
 
       if (getAreaType()
           != other.getAreaType()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getAreaId()
           != other.getAreaId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +239,10 @@ public final class EnterWorldAreaRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + AREA_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getAreaType();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + AREA_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAreaId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class EnterWorldAreaRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21362
-     * Obf: MIPCODPODKN
-     * </pre>
-     *
      * Protobuf type {@code EnterWorldAreaRsp}
      */
     public static final class Builder extends
@@ -388,10 +378,10 @@ public final class EnterWorldAreaRspOuterClass {
         super.clear();
         areaType_ = 0;
 
-        retcode_ = 0;
-
         areaId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -419,8 +409,8 @@ public final class EnterWorldAreaRspOuterClass {
       public emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp buildPartial() {
         emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp result = new emu.grasscutter.net.proto.EnterWorldAreaRspOuterClass.EnterWorldAreaRsp(this);
         result.areaType_ = areaType_;
-        result.retcode_ = retcode_;
         result.areaId_ = areaId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -472,12 +462,12 @@ public final class EnterWorldAreaRspOuterClass {
         if (other.getAreaType() != 0) {
           setAreaType(other.getAreaType());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getAreaId() != 0) {
           setAreaId(other.getAreaId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +499,7 @@ public final class EnterWorldAreaRspOuterClass {
 
       private int areaType_ ;
       /**
-       * <code>uint32 area_type = 6;</code>
+       * <code>uint32 area_type = 7;</code>
        * @return The areaType.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class EnterWorldAreaRspOuterClass {
         return areaType_;
       }
       /**
-       * <code>uint32 area_type = 6;</code>
+       * <code>uint32 area_type = 7;</code>
        * @param value The areaType to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class EnterWorldAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 area_type = 6;</code>
+       * <code>uint32 area_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaType() {
@@ -538,40 +528,9 @@ public final class EnterWorldAreaRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int areaId_ ;
       /**
-       * <code>uint32 area_id = 9;</code>
+       * <code>uint32 area_id = 11;</code>
        * @return The areaId.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class EnterWorldAreaRspOuterClass {
         return areaId_;
       }
       /**
-       * <code>uint32 area_id = 9;</code>
+       * <code>uint32 area_id = 11;</code>
        * @param value The areaId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class EnterWorldAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 area_id = 9;</code>
+       * <code>uint32 area_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaId() {
@@ -599,6 +558,37 @@ public final class EnterWorldAreaRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -667,8 +657,8 @@ public final class EnterWorldAreaRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027EnterWorldAreaRsp.proto\"H\n\021EnterWorldA" +
-      "reaRsp\022\021\n\tarea_type\030\006 \001(\r\022\017\n\007retcode\030\r \001" +
-      "(\005\022\017\n\007area_id\030\t \001(\rB\033\n\031emu.grasscutter.n" +
+      "reaRsp\022\021\n\tarea_type\030\007 \001(\r\022\017\n\007area_id\030\013 \001" +
+      "(\r\022\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class EnterWorldAreaRspOuterClass {
     internal_static_EnterWorldAreaRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EnterWorldAreaRsp_descriptor,
-        new java.lang.String[] { "AreaType", "Retcode", "AreaId", });
+        new java.lang.String[] { "AreaType", "AreaId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityChangeNotifyOuterClass.java
index 07b7a7d0d..f157d877f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityChangeNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class EntityAuthorityChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange> 
         getAuthorityChangeListList();
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange getAuthorityChangeList(int index);
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     int getAuthorityChangeListCount();
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder> 
         getAuthorityChangeListOrBuilderList();
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder getAuthorityChangeListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 3913
-   * Obf: PCGGEAGLBGD
-   * </pre>
-   *
    * Protobuf type {@code EntityAuthorityChangeNotify}
    */
   public static final class EntityAuthorityChangeNotify extends
@@ -94,7 +89,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 106: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 authorityChangeList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class EntityAuthorityChangeNotifyOuterClass {
               emu.grasscutter.net.proto.EntityAuthorityChangeNotifyOuterClass.EntityAuthorityChangeNotify.class, emu.grasscutter.net.proto.EntityAuthorityChangeNotifyOuterClass.EntityAuthorityChangeNotify.Builder.class);
     }
 
-    public static final int AUTHORITY_CHANGE_LIST_FIELD_NUMBER = 13;
+    public static final int AUTHORITY_CHANGE_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange> authorityChangeList_;
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange> getAuthorityChangeListList() {
       return authorityChangeList_;
     }
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder> 
@@ -156,21 +151,21 @@ public final class EntityAuthorityChangeNotifyOuterClass {
       return authorityChangeList_;
     }
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     @java.lang.Override
     public int getAuthorityChangeListCount() {
       return authorityChangeList_.size();
     }
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange getAuthorityChangeList(int index) {
       return authorityChangeList_.get(index);
     }
     /**
-     * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+     * <code>repeated .AuthorityChange authority_change_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder getAuthorityChangeListOrBuilder(
@@ -193,7 +188,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < authorityChangeList_.size(); i++) {
-        output.writeMessage(13, authorityChangeList_.get(i));
+        output.writeMessage(15, authorityChangeList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
       size = 0;
       for (int i = 0; i < authorityChangeList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, authorityChangeList_.get(i));
+          .computeMessageSize(15, authorityChangeList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class EntityAuthorityChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3913
-     * Obf: PCGGEAGLBGD
-     * </pre>
-     *
      * Protobuf type {@code EntityAuthorityChangeNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
           emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder> authorityChangeListBuilder_;
 
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange> getAuthorityChangeListList() {
         if (authorityChangeListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public int getAuthorityChangeListCount() {
         if (authorityChangeListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange getAuthorityChangeList(int index) {
         if (authorityChangeListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder setAuthorityChangeList(
           int index, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange value) {
@@ -585,7 +575,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder setAuthorityChangeList(
           int index, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder addAuthorityChangeList(emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange value) {
         if (authorityChangeListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder addAuthorityChangeList(
           int index, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange value) {
@@ -632,7 +622,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder addAuthorityChangeList(
           emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder addAuthorityChangeList(
           int index, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder addAllAuthorityChangeList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange> values) {
@@ -675,7 +665,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder clearAuthorityChangeList() {
         if (authorityChangeListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public Builder removeAuthorityChangeList(int index) {
         if (authorityChangeListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder getAuthorityChangeListBuilder(
           int index) {
         return getAuthorityChangeListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder getAuthorityChangeListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChangeOrBuilder> 
            getAuthorityChangeListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class EntityAuthorityChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder addAuthorityChangeListBuilder() {
         return getAuthorityChangeListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.getDefaultInstance());
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder addAuthorityChangeListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.getDefaultInstance());
       }
       /**
-       * <code>repeated .AuthorityChange authority_change_list = 13;</code>
+       * <code>repeated .AuthorityChange authority_change_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AuthorityChangeOuterClass.AuthorityChange.Builder> 
            getAuthorityChangeListBuilderList() {
@@ -833,7 +823,7 @@ public final class EntityAuthorityChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!EntityAuthorityChangeNotify.proto\032\025Aut" +
       "horityChange.proto\"N\n\033EntityAuthorityCha" +
-      "ngeNotify\022/\n\025authority_change_list\030\r \003(\013" +
+      "ngeNotify\022/\n\025authority_change_list\030\017 \003(\013" +
       "2\020.AuthorityChangeB\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityInfoOuterClass.java
index 75b0f53cd..0c5762b14 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityAuthorityInfoOuterClass.java
@@ -118,10 +118,6 @@ public final class EntityAuthorityInfoOuterClass {
     emu.grasscutter.net.proto.EntityClientExtraInfoOuterClass.EntityClientExtraInfoOrBuilder getClientExtraInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: DHLPFKPHPNF
-   * </pre>
-   *
    * Protobuf type {@code EntityAuthorityInfo}
    */
   public static final class EntityAuthorityInfo extends
@@ -685,10 +681,6 @@ public final class EntityAuthorityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DHLPFKPHPNF
-     * </pre>
-     *
      * Protobuf type {@code EntityAuthorityInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityClientDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityClientDataOuterClass.java
index 919da5588..6ecb8a972 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityClientDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityClientDataOuterClass.java
@@ -37,10 +37,6 @@ public final class EntityClientDataOuterClass {
     int getWindChangeTargetLevel();
   }
   /**
-   * <pre>
-   * Obf: GCALEOBNFFH
-   * </pre>
-   *
    * Protobuf type {@code EntityClientData}
    */
   public static final class EntityClientData extends
@@ -345,10 +341,6 @@ public final class EntityClientDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GCALEOBNFFH
-     * </pre>
-     *
      * Protobuf type {@code EntityClientData}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityClientExtraInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityClientExtraInfoOuterClass.java
index 34175aa63..03a31a8a5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityClientExtraInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityClientExtraInfoOuterClass.java
@@ -35,7 +35,7 @@ public final class EntityClientExtraInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: LCJDLMMKJCK
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code EntityClientExtraInfo}
@@ -315,7 +315,7 @@ public final class EntityClientExtraInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: LCJDLMMKJCK
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code EntityClientExtraInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityEnvironmentInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityEnvironmentInfoOuterClass.java
index d5b040310..c3d9b5e41 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityEnvironmentInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityEnvironmentInfoOuterClass.java
@@ -31,10 +31,6 @@ public final class EntityEnvironmentInfoOuterClass {
     int getClimateAreaId();
   }
   /**
-   * <pre>
-   * Obf: FDGMLNKHDKB
-   * </pre>
-   *
    * Protobuf type {@code EntityEnvironmentInfo}
    */
   public static final class EntityEnvironmentInfo extends
@@ -310,10 +306,6 @@ public final class EntityEnvironmentInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FDGMLNKHDKB
-     * </pre>
-     *
      * Protobuf type {@code EntityEnvironmentInfo}
      */
     public static final class Builder extends
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 102990b18..c2de662db 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropChangeReasonNotifyOuterClass.java
@@ -19,88 +19,15 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChangeHpReason changeHpReason = 12;</code>
-     * @return The enum numeric value on the wire for changeHpReason.
-     */
-    int getChangeHpReasonValue();
-    /**
-     * <code>.ChangeHpReason changeHpReason = 12;</code>
-     * @return The changeHpReason.
-     */
-    emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason getChangeHpReason();
-
-    /**
-     * <code>uint32 entity_id = 6;</code>
+     * <pre>
+     *PBDPJNCFEOF detail_info = 1;
+     * </pre>
+     *
+     * <code>uint32 entity_id = 2;</code>
      * @return The entityId.
      */
     int getEntityId();
 
-    /**
-     * <code>uint32 prop_type = 1;</code>
-     * @return The propType.
-     */
-    int getPropType();
-
-    /**
-     * <code>float prop_delta = 10;</code>
-     * @return The propDelta.
-     */
-    float getPropDelta();
-
-    /**
-     * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-     * @return The enum numeric value on the wire for changeEnergyReason.
-     */
-    int getChangeEnergyReasonValue();
-    /**
-     * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-     * @return The changeEnergyReason.
-     */
-    emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason();
-
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     * @return Whether the detailInfo field is set.
-     */
-    boolean hasDetailInfo();
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     * @return The detailInfo.
-     */
-    emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH getDetailInfo();
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     */
-    emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder getDetailInfoOrBuilder();
-
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @return A list containing the paramList.
-     */
-    java.util.List<java.lang.Integer> getParamListList();
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @return The count of paramList.
-     */
-    int getParamListCount();
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    int getParamList(int index);
-
-    /**
-     * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-     * @return The enum numeric value on the wire for aEFJJGCHIJH.
-     */
-    int getAEFJJGCHIJHValue();
-    /**
-     * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-     * @return The aEFJJGCHIJH.
-     */
-    emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP getAEFJJGCHIJH();
-
     /**
      * <code>.PropChangeReason reason = 3;</code>
      * @return The enum numeric value on the wire for reason.
@@ -113,17 +40,74 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
     emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
 
     /**
-     * <code>float JJEEABMPEKL = 13;</code>
-     * @return The jJEEABMPEKL.
+     * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+     * @return The enum numeric value on the wire for changeHpDebts.
      */
-    float getJJEEABMPEKL();
+    int getChangeHpDebtsValue();
+    /**
+     * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+     * @return The changeHpDebts.
+     */
+    emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts getChangeHpDebts();
+
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @return A list containing the paramList.
+     */
+    java.util.List<java.lang.Integer> getParamListList();
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @return The count of paramList.
+     */
+    int getParamListCount();
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    int getParamList(int index);
+
+    /**
+     * <code>float prop_delta = 10;</code>
+     * @return The propDelta.
+     */
+    float getPropDelta();
+
+    /**
+     * <code>uint32 prop_type = 11;</code>
+     * @return The propType.
+     */
+    int getPropType();
+
+    /**
+     * <code>float NNFONEOHGHE = 12;</code>
+     * @return The nNFONEOHGHE.
+     */
+    float getNNFONEOHGHE();
+
+    /**
+     * <code>.ChangeHpReason change_hp_reason = 13;</code>
+     * @return The enum numeric value on the wire for changeHpReason.
+     */
+    int getChangeHpReasonValue();
+    /**
+     * <code>.ChangeHpReason change_hp_reason = 13;</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: 2489
-   * Obf: KHFJILELHPL
-   * </pre>
-   *
    * Protobuf type {@code EntityFightPropChangeReasonNotify}
    */
   public static final class EntityFightPropChangeReasonNotify extends
@@ -136,11 +120,11 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       super(builder);
     }
     private EntityFightPropChangeReasonNotify() {
+      reason_ = 0;
+      changeHpDebts_ = 0;
+      paramList_ = emptyIntList();
       changeHpReason_ = 0;
       changeEnergyReason_ = 0;
-      paramList_ = emptyIntList();
-      aEFJJGCHIJH_ = 0;
-      reason_ = 0;
     }
 
     @java.lang.Override
@@ -174,9 +158,9 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
 
-              propType_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
             case 24: {
@@ -185,18 +169,13 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
               reason_ = rawValue;
               break;
             }
-            case 48: {
+            case 56: {
+              int rawValue = input.readEnum();
 
-              entityId_ = input.readUInt32();
+              changeHpDebts_ = rawValue;
               break;
             }
             case 64: {
-              int rawValue = input.readEnum();
-
-              changeEnergyReason_ = rawValue;
-              break;
-            }
-            case 72: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 paramList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -204,7 +183,7 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
               paramList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -222,34 +201,26 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
               propDelta_ = input.readFloat();
               break;
             }
-            case 90: {
-              emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder subBuilder = null;
-              if (detailInfo_ != null) {
-                subBuilder = detailInfo_.toBuilder();
-              }
-              detailInfo_ = input.readMessage(emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(detailInfo_);
-                detailInfo_ = subBuilder.buildPartial();
-              }
+            case 88: {
 
+              propType_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 101: {
+
+              nNFONEOHGHE_ = input.readFloat();
+              break;
+            }
+            case 104: {
               int rawValue = input.readEnum();
 
               changeHpReason_ = rawValue;
               break;
             }
-            case 109: {
-
-              jJEEABMPEKL_ = input.readFloat();
-              break;
-            }
-            case 112: {
+            case 120: {
               int rawValue = input.readEnum();
 
-              aEFJJGCHIJH_ = rawValue;
+              changeEnergyReason_ = rawValue;
               break;
             }
             default: {
@@ -287,29 +258,14 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
               emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.class, emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int CHANGEHPREASON_FIELD_NUMBER = 12;
-    private int changeHpReason_;
-    /**
-     * <code>.ChangeHpReason changeHpReason = 12;</code>
-     * @return The enum numeric value on the wire for changeHpReason.
-     */
-    @java.lang.Override public int getChangeHpReasonValue() {
-      return changeHpReason_;
-    }
-    /**
-     * <code>.ChangeHpReason changeHpReason = 12;</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;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
+    public static final int ENTITY_ID_FIELD_NUMBER = 2;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 6;</code>
+     * <pre>
+     *PBDPJNCFEOF detail_info = 1;
+     * </pre>
+     *
+     * <code>uint32 entity_id = 2;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -317,120 +273,6 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 1;
-    private int propType_;
-    /**
-     * <code>uint32 prop_type = 1;</code>
-     * @return The propType.
-     */
-    @java.lang.Override
-    public int getPropType() {
-      return propType_;
-    }
-
-    public static final int PROP_DELTA_FIELD_NUMBER = 10;
-    private float propDelta_;
-    /**
-     * <code>float prop_delta = 10;</code>
-     * @return The propDelta.
-     */
-    @java.lang.Override
-    public float getPropDelta() {
-      return propDelta_;
-    }
-
-    public static final int CHANGEENERGYREASON_FIELD_NUMBER = 8;
-    private int changeEnergyReason_;
-    /**
-     * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-     * @return The enum numeric value on the wire for changeEnergyReason.
-     */
-    @java.lang.Override public int getChangeEnergyReasonValue() {
-      return changeEnergyReason_;
-    }
-    /**
-     * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-     * @return The changeEnergyReason.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason result = emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.valueOf(changeEnergyReason_);
-      return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
-    }
-
-    public static final int DETAIL_INFO_FIELD_NUMBER = 11;
-    private emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH detailInfo_;
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     * @return Whether the detailInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasDetailInfo() {
-      return detailInfo_ != null;
-    }
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     * @return The detailInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH getDetailInfo() {
-      return detailInfo_ == null ? emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.getDefaultInstance() : detailInfo_;
-    }
-    /**
-     * <code>.FAFPLBDIGDH detail_info = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder getDetailInfoOrBuilder() {
-      return getDetailInfo();
-    }
-
-    public static final int PARAM_LIST_FIELD_NUMBER = 9;
-    private com.google.protobuf.Internal.IntList paramList_;
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @return A list containing the paramList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getParamListList() {
-      return paramList_;
-    }
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @return The count of paramList.
-     */
-    public int getParamListCount() {
-      return paramList_.size();
-    }
-    /**
-     * <code>repeated uint32 param_list = 9;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    public int getParamList(int index) {
-      return paramList_.getInt(index);
-    }
-    private int paramListMemoizedSerializedSize = -1;
-
-    public static final int AEFJJGCHIJH_FIELD_NUMBER = 14;
-    private int aEFJJGCHIJH_;
-    /**
-     * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-     * @return The enum numeric value on the wire for aEFJJGCHIJH.
-     */
-    @java.lang.Override public int getAEFJJGCHIJHValue() {
-      return aEFJJGCHIJH_;
-    }
-    /**
-     * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-     * @return The aEFJJGCHIJH.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP getAEFJJGCHIJH() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP result = emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.valueOf(aEFJJGCHIJH_);
-      return result == null ? emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.UNRECOGNIZED : result;
-    }
-
     public static final int REASON_FIELD_NUMBER = 3;
     private int reason_;
     /**
@@ -450,15 +292,122 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
     }
 
-    public static final int JJEEABMPEKL_FIELD_NUMBER = 13;
-    private float jJEEABMPEKL_;
+    public static final int CHANGE_HP_DEBTS_FIELD_NUMBER = 7;
+    private int changeHpDebts_;
     /**
-     * <code>float JJEEABMPEKL = 13;</code>
-     * @return The jJEEABMPEKL.
+     * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+     * @return The enum numeric value on the wire for changeHpDebts.
+     */
+    @java.lang.Override public int getChangeHpDebtsValue() {
+      return changeHpDebts_;
+    }
+    /**
+     * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+     * @return The changeHpDebts.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts getChangeHpDebts() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts result = emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.valueOf(changeHpDebts_);
+      return result == null ? emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.UNRECOGNIZED : result;
+    }
+
+    public static final int PARAM_LIST_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList paramList_;
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @return A list containing the paramList.
      */
     @java.lang.Override
-    public float getJJEEABMPEKL() {
-      return jJEEABMPEKL_;
+    public java.util.List<java.lang.Integer>
+        getParamListList() {
+      return paramList_;
+    }
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @return The count of paramList.
+     */
+    public int getParamListCount() {
+      return paramList_.size();
+    }
+    /**
+     * <code>repeated uint32 param_list = 8;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    public int getParamList(int index) {
+      return paramList_.getInt(index);
+    }
+    private int paramListMemoizedSerializedSize = -1;
+
+    public static final int PROP_DELTA_FIELD_NUMBER = 10;
+    private float propDelta_;
+    /**
+     * <code>float prop_delta = 10;</code>
+     * @return The propDelta.
+     */
+    @java.lang.Override
+    public float getPropDelta() {
+      return propDelta_;
+    }
+
+    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 NNFONEOHGHE_FIELD_NUMBER = 12;
+    private float nNFONEOHGHE_;
+    /**
+     * <code>float NNFONEOHGHE = 12;</code>
+     * @return The nNFONEOHGHE.
+     */
+    @java.lang.Override
+    public float getNNFONEOHGHE() {
+      return nNFONEOHGHE_;
+    }
+
+    public static final int CHANGE_HP_REASON_FIELD_NUMBER = 13;
+    private int changeHpReason_;
+    /**
+     * <code>.ChangeHpReason change_hp_reason = 13;</code>
+     * @return The enum numeric value on the wire for changeHpReason.
+     */
+    @java.lang.Override public int getChangeHpReasonValue() {
+      return changeHpReason_;
+    }
+    /**
+     * <code>.ChangeHpReason change_hp_reason = 13;</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;
+    }
+
+    public static final int CHANGE_ENERGY_REASON_FIELD_NUMBER = 15;
+    private int changeEnergyReason_;
+    /**
+     * <code>.ChangeEnergyReason change_energy_reason = 15;</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>
+     * @return The changeEnergyReason.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason result = emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.valueOf(changeEnergyReason_);
+      return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -476,20 +425,17 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (propType_ != 0) {
-        output.writeUInt32(1, propType_);
+      if (entityId_ != 0) {
+        output.writeUInt32(2, entityId_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         output.writeEnum(3, reason_);
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
-      }
-      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
-        output.writeEnum(8, changeEnergyReason_);
+      if (changeHpDebts_ != emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.CHANGE_HP_DEBTS_NONE.getNumber()) {
+        output.writeEnum(7, changeHpDebts_);
       }
       if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(paramListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramList_.size(); i++) {
@@ -498,17 +444,17 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       if (propDelta_ != 0F) {
         output.writeFloat(10, propDelta_);
       }
-      if (detailInfo_ != null) {
-        output.writeMessage(11, getDetailInfo());
+      if (propType_ != 0) {
+        output.writeUInt32(11, propType_);
+      }
+      if (nNFONEOHGHE_ != 0F) {
+        output.writeFloat(12, nNFONEOHGHE_);
       }
       if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
-        output.writeEnum(12, changeHpReason_);
+        output.writeEnum(13, changeHpReason_);
       }
-      if (jJEEABMPEKL_ != 0F) {
-        output.writeFloat(13, jJEEABMPEKL_);
-      }
-      if (aEFJJGCHIJH_ != emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.OFDEHFOCIFP_ChangeHpDebtsNone.getNumber()) {
-        output.writeEnum(14, aEFJJGCHIJH_);
+      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
+        output.writeEnum(15, changeEnergyReason_);
       }
       unknownFields.writeTo(output);
     }
@@ -519,21 +465,17 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (propType_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, propType_);
+          .computeUInt32Size(2, entityId_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(3, reason_);
       }
-      if (entityId_ != 0) {
+      if (changeHpDebts_ != emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.CHANGE_HP_DEBTS_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
-      }
-      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, changeEnergyReason_);
+          .computeEnumSize(7, changeHpDebts_);
       }
       {
         int dataSize = 0;
@@ -553,21 +495,21 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeFloatSize(10, propDelta_);
       }
-      if (detailInfo_ != null) {
+      if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getDetailInfo());
+          .computeUInt32Size(11, propType_);
+      }
+      if (nNFONEOHGHE_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(12, nNFONEOHGHE_);
       }
       if (changeHpReason_ != emu.grasscutter.net.proto.ChangeHpReasonOuterClass.ChangeHpReason.CHANGE_HP_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, changeHpReason_);
+          .computeEnumSize(13, changeHpReason_);
       }
-      if (jJEEABMPEKL_ != 0F) {
+      if (changeEnergyReason_ != emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.CHANGE_ENERGY_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(13, jJEEABMPEKL_);
-      }
-      if (aEFJJGCHIJH_ != emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.OFDEHFOCIFP_ChangeHpDebtsNone.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, aEFJJGCHIJH_);
+          .computeEnumSize(15, changeEnergyReason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -584,27 +526,22 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify other = (emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify) obj;
 
-      if (changeHpReason_ != other.changeHpReason_) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (getPropType()
-          != other.getPropType()) return false;
+      if (reason_ != other.reason_) return false;
+      if (changeHpDebts_ != other.changeHpDebts_) return false;
+      if (!getParamListList()
+          .equals(other.getParamListList())) return false;
       if (java.lang.Float.floatToIntBits(getPropDelta())
           != java.lang.Float.floatToIntBits(
               other.getPropDelta())) return false;
-      if (changeEnergyReason_ != other.changeEnergyReason_) return false;
-      if (hasDetailInfo() != other.hasDetailInfo()) return false;
-      if (hasDetailInfo()) {
-        if (!getDetailInfo()
-            .equals(other.getDetailInfo())) return false;
-      }
-      if (!getParamListList()
-          .equals(other.getParamListList())) return false;
-      if (aEFJJGCHIJH_ != other.aEFJJGCHIJH_) return false;
-      if (reason_ != other.reason_) return false;
-      if (java.lang.Float.floatToIntBits(getJJEEABMPEKL())
+      if (getPropType()
+          != other.getPropType()) return false;
+      if (java.lang.Float.floatToIntBits(getNNFONEOHGHE())
           != java.lang.Float.floatToIntBits(
-              other.getJJEEABMPEKL())) return false;
+              other.getNNFONEOHGHE())) return false;
+      if (changeHpReason_ != other.changeHpReason_) return false;
+      if (changeEnergyReason_ != other.changeEnergyReason_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -616,32 +553,28 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CHANGEHPREASON_FIELD_NUMBER;
-      hash = (53 * hash) + changeHpReason_;
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPropType();
-      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getPropDelta());
-      hash = (37 * hash) + CHANGEENERGYREASON_FIELD_NUMBER;
-      hash = (53 * hash) + changeEnergyReason_;
-      if (hasDetailInfo()) {
-        hash = (37 * hash) + DETAIL_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getDetailInfo().hashCode();
-      }
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + reason_;
+      hash = (37 * hash) + CHANGE_HP_DEBTS_FIELD_NUMBER;
+      hash = (53 * hash) + changeHpDebts_;
       if (getParamListCount() > 0) {
         hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamListList().hashCode();
       }
-      hash = (37 * hash) + AEFJJGCHIJH_FIELD_NUMBER;
-      hash = (53 * hash) + aEFJJGCHIJH_;
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
-      hash = (37 * hash) + JJEEABMPEKL_FIELD_NUMBER;
+      hash = (37 * hash) + PROP_DELTA_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getJJEEABMPEKL());
+          getPropDelta());
+      hash = (37 * hash) + PROP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPropType();
+      hash = (37 * hash) + NNFONEOHGHE_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getNNFONEOHGHE());
+      hash = (37 * hash) + CHANGE_HP_REASON_FIELD_NUMBER;
+      hash = (53 * hash) + changeHpReason_;
+      hash = (37 * hash) + CHANGE_ENERGY_REASON_FIELD_NUMBER;
+      hash = (53 * hash) + changeEnergyReason_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -738,11 +671,6 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2489
-     * Obf: KHFJILELHPL
-     * </pre>
-     *
      * Protobuf type {@code EntityFightPropChangeReasonNotify}
      */
     public static final class Builder extends
@@ -780,29 +708,23 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        changeHpReason_ = 0;
-
         entityId_ = 0;
 
-        propType_ = 0;
-
-        propDelta_ = 0F;
-
-        changeEnergyReason_ = 0;
-
-        if (detailInfoBuilder_ == null) {
-          detailInfo_ = null;
-        } else {
-          detailInfo_ = null;
-          detailInfoBuilder_ = null;
-        }
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        aEFJJGCHIJH_ = 0;
-
         reason_ = 0;
 
-        jJEEABMPEKL_ = 0F;
+        changeHpDebts_ = 0;
+
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        propDelta_ = 0F;
+
+        propType_ = 0;
+
+        nNFONEOHGHE_ = 0F;
+
+        changeHpReason_ = 0;
+
+        changeEnergyReason_ = 0;
 
         return this;
       }
@@ -831,24 +753,19 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       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.changeHpReason_ = changeHpReason_;
         result.entityId_ = entityId_;
-        result.propType_ = propType_;
-        result.propDelta_ = propDelta_;
-        result.changeEnergyReason_ = changeEnergyReason_;
-        if (detailInfoBuilder_ == null) {
-          result.detailInfo_ = detailInfo_;
-        } else {
-          result.detailInfo_ = detailInfoBuilder_.build();
-        }
+        result.reason_ = reason_;
+        result.changeHpDebts_ = changeHpDebts_;
         if (((bitField0_ & 0x00000001) != 0)) {
           paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.paramList_ = paramList_;
-        result.aEFJJGCHIJH_ = aEFJJGCHIJH_;
-        result.reason_ = reason_;
-        result.jJEEABMPEKL_ = jJEEABMPEKL_;
+        result.propDelta_ = propDelta_;
+        result.propType_ = propType_;
+        result.nNFONEOHGHE_ = nNFONEOHGHE_;
+        result.changeHpReason_ = changeHpReason_;
+        result.changeEnergyReason_ = changeEnergyReason_;
         onBuilt();
         return result;
       }
@@ -897,23 +814,14 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.EntityFightPropChangeReasonNotifyOuterClass.EntityFightPropChangeReasonNotify.getDefaultInstance()) return this;
-        if (other.changeHpReason_ != 0) {
-          setChangeHpReasonValue(other.getChangeHpReasonValue());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (other.getPropType() != 0) {
-          setPropType(other.getPropType());
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
         }
-        if (other.getPropDelta() != 0F) {
-          setPropDelta(other.getPropDelta());
-        }
-        if (other.changeEnergyReason_ != 0) {
-          setChangeEnergyReasonValue(other.getChangeEnergyReasonValue());
-        }
-        if (other.hasDetailInfo()) {
-          mergeDetailInfo(other.getDetailInfo());
+        if (other.changeHpDebts_ != 0) {
+          setChangeHpDebtsValue(other.getChangeHpDebtsValue());
         }
         if (!other.paramList_.isEmpty()) {
           if (paramList_.isEmpty()) {
@@ -925,14 +833,20 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.aEFJJGCHIJH_ != 0) {
-          setAEFJJGCHIJHValue(other.getAEFJJGCHIJHValue());
+        if (other.getPropDelta() != 0F) {
+          setPropDelta(other.getPropDelta());
         }
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
+        if (other.getPropType() != 0) {
+          setPropType(other.getPropType());
         }
-        if (other.getJJEEABMPEKL() != 0F) {
-          setJJEEABMPEKL(other.getJJEEABMPEKL());
+        if (other.getNNFONEOHGHE() != 0F) {
+          setNNFONEOHGHE(other.getNNFONEOHGHE());
+        }
+        if (other.changeHpReason_ != 0) {
+          setChangeHpReasonValue(other.getChangeHpReasonValue());
+        }
+        if (other.changeEnergyReason_ != 0) {
+          setChangeEnergyReasonValue(other.getChangeEnergyReasonValue());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -964,63 +878,13 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int changeHpReason_ = 0;
-      /**
-       * <code>.ChangeHpReason changeHpReason = 12;</code>
-       * @return The enum numeric value on the wire for changeHpReason.
-       */
-      @java.lang.Override public int getChangeHpReasonValue() {
-        return changeHpReason_;
-      }
-      /**
-       * <code>.ChangeHpReason changeHpReason = 12;</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;
-      }
-      /**
-       * <code>.ChangeHpReason changeHpReason = 12;</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;
-      }
-      /**
-       * <code>.ChangeHpReason changeHpReason = 12;</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;
-      }
-      /**
-       * <code>.ChangeHpReason changeHpReason = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChangeHpReason() {
-        
-        changeHpReason_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       *PBDPJNCFEOF detail_info = 1;
+       * </pre>
+       *
+       * <code>uint32 entity_id = 2;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -1028,7 +892,11 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       *PBDPJNCFEOF detail_info = 1;
+       * </pre>
+       *
+       * <code>uint32 entity_id = 2;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -1039,7 +907,11 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <pre>
+       *PBDPJNCFEOF detail_info = 1;
+       * </pre>
+       *
+       * <code>uint32 entity_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -1049,374 +921,6 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
         return this;
       }
 
-      private int propType_ ;
-      /**
-       * <code>uint32 prop_type = 1;</code>
-       * @return The propType.
-       */
-      @java.lang.Override
-      public int getPropType() {
-        return propType_;
-      }
-      /**
-       * <code>uint32 prop_type = 1;</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 = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPropType() {
-        
-        propType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private float propDelta_ ;
-      /**
-       * <code>float prop_delta = 10;</code>
-       * @return The propDelta.
-       */
-      @java.lang.Override
-      public float getPropDelta() {
-        return propDelta_;
-      }
-      /**
-       * <code>float prop_delta = 10;</code>
-       * @param value The propDelta to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPropDelta(float value) {
-        
-        propDelta_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float prop_delta = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPropDelta() {
-        
-        propDelta_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private int changeEnergyReason_ = 0;
-      /**
-       * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-       * @return The enum numeric value on the wire for changeEnergyReason.
-       */
-      @java.lang.Override public int getChangeEnergyReasonValue() {
-        return changeEnergyReason_;
-      }
-      /**
-       * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-       * @param value The enum numeric value on the wire for changeEnergyReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChangeEnergyReasonValue(int value) {
-        
-        changeEnergyReason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-       * @return The changeEnergyReason.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason result = emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.valueOf(changeEnergyReason_);
-        return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-       * @param value The changeEnergyReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChangeEnergyReason(emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        changeEnergyReason_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ChangeEnergyReason changeEnergyReason = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChangeEnergyReason() {
-        
-        changeEnergyReason_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH detailInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder> detailInfoBuilder_;
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       * @return Whether the detailInfo field is set.
-       */
-      public boolean hasDetailInfo() {
-        return detailInfoBuilder_ != null || detailInfo_ != null;
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       * @return The detailInfo.
-       */
-      public emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH getDetailInfo() {
-        if (detailInfoBuilder_ == null) {
-          return detailInfo_ == null ? emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.getDefaultInstance() : detailInfo_;
-        } else {
-          return detailInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public Builder setDetailInfo(emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH value) {
-        if (detailInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          detailInfo_ = value;
-          onChanged();
-        } else {
-          detailInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public Builder setDetailInfo(
-          emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder builderForValue) {
-        if (detailInfoBuilder_ == null) {
-          detailInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          detailInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public Builder mergeDetailInfo(emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH value) {
-        if (detailInfoBuilder_ == null) {
-          if (detailInfo_ != null) {
-            detailInfo_ =
-              emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.newBuilder(detailInfo_).mergeFrom(value).buildPartial();
-          } else {
-            detailInfo_ = value;
-          }
-          onChanged();
-        } else {
-          detailInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public Builder clearDetailInfo() {
-        if (detailInfoBuilder_ == null) {
-          detailInfo_ = null;
-          onChanged();
-        } else {
-          detailInfo_ = null;
-          detailInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder getDetailInfoBuilder() {
-        
-        onChanged();
-        return getDetailInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      public emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder getDetailInfoOrBuilder() {
-        if (detailInfoBuilder_ != null) {
-          return detailInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return detailInfo_ == null ?
-              emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.getDefaultInstance() : detailInfo_;
-        }
-      }
-      /**
-       * <code>.FAFPLBDIGDH detail_info = 11;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder> 
-          getDetailInfoFieldBuilder() {
-        if (detailInfoBuilder_ == null) {
-          detailInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDH.Builder, emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.FAFPLBDIGDHOrBuilder>(
-                  getDetailInfo(),
-                  getParentForChildren(),
-                  isClean());
-          detailInfo_ = null;
-        }
-        return detailInfoBuilder_;
-      }
-
-      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
-      private void ensureParamListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          paramList_ = mutableCopy(paramList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @return A list containing the paramList.
-       */
-      public java.util.List<java.lang.Integer>
-          getParamListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @return The count of paramList.
-       */
-      public int getParamListCount() {
-        return paramList_.size();
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @param index The index of the element to return.
-       * @return The paramList at the given index.
-       */
-      public int getParamList(int index) {
-        return paramList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @param index The index to set the value at.
-       * @param value The paramList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParamList(
-          int index, int value) {
-        ensureParamListIsMutable();
-        paramList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @param value The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addParamList(int value) {
-        ensureParamListIsMutable();
-        paramList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @param values The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllParamList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureParamListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, paramList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParamList() {
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private int aEFJJGCHIJH_ = 0;
-      /**
-       * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-       * @return The enum numeric value on the wire for aEFJJGCHIJH.
-       */
-      @java.lang.Override public int getAEFJJGCHIJHValue() {
-        return aEFJJGCHIJH_;
-      }
-      /**
-       * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-       * @param value The enum numeric value on the wire for aEFJJGCHIJH to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAEFJJGCHIJHValue(int value) {
-        
-        aEFJJGCHIJH_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-       * @return The aEFJJGCHIJH.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP getAEFJJGCHIJH() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP result = emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.valueOf(aEFJJGCHIJH_);
-        return result == null ? emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-       * @param value The aEFJJGCHIJH to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAEFJJGCHIJH(emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.OFDEHFOCIFP value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        aEFJJGCHIJH_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.OFDEHFOCIFP AEFJJGCHIJH = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAEFJJGCHIJH() {
-        
-        aEFJJGCHIJH_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int reason_ = 0;
       /**
        * <code>.PropChangeReason reason = 3;</code>
@@ -1471,33 +975,336 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
         return this;
       }
 
-      private float jJEEABMPEKL_ ;
+      private int changeHpDebts_ = 0;
       /**
-       * <code>float JJEEABMPEKL = 13;</code>
-       * @return The jJEEABMPEKL.
+       * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+       * @return The enum numeric value on the wire for changeHpDebts.
        */
-      @java.lang.Override
-      public float getJJEEABMPEKL() {
-        return jJEEABMPEKL_;
+      @java.lang.Override public int getChangeHpDebtsValue() {
+        return changeHpDebts_;
       }
       /**
-       * <code>float JJEEABMPEKL = 13;</code>
-       * @param value The jJEEABMPEKL to set.
+       * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+       * @param value The enum numeric value on the wire for changeHpDebts to set.
        * @return This builder for chaining.
        */
-      public Builder setJJEEABMPEKL(float value) {
+      public Builder setChangeHpDebtsValue(int value) {
         
-        jJEEABMPEKL_ = value;
+        changeHpDebts_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float JJEEABMPEKL = 13;</code>
+       * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+       * @return The changeHpDebts.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts getChangeHpDebts() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts result = emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.valueOf(changeHpDebts_);
+        return result == null ? emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+       * @param value The changeHpDebts to set.
        * @return This builder for chaining.
        */
-      public Builder clearJJEEABMPEKL() {
+      public Builder setChangeHpDebts(emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.ChangeHpDebts value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         
-        jJEEABMPEKL_ = 0F;
+        changeHpDebts_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ChangeHpDebts change_hp_debts = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChangeHpDebts() {
+        
+        changeHpDebts_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
+      private void ensureParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          paramList_ = mutableCopy(paramList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @return A list containing the paramList.
+       */
+      public java.util.List<java.lang.Integer>
+          getParamListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @return The count of paramList.
+       */
+      public int getParamListCount() {
+        return paramList_.size();
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @param index The index of the element to return.
+       * @return The paramList at the given index.
+       */
+      public int getParamList(int index) {
+        return paramList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The paramList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamList(
+          int index, int value) {
+        ensureParamListIsMutable();
+        paramList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @param value The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addParamList(int value) {
+        ensureParamListIsMutable();
+        paramList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @param values The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllParamList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureParamListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, paramList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamList() {
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private float propDelta_ ;
+      /**
+       * <code>float prop_delta = 10;</code>
+       * @return The propDelta.
+       */
+      @java.lang.Override
+      public float getPropDelta() {
+        return propDelta_;
+      }
+      /**
+       * <code>float prop_delta = 10;</code>
+       * @param value The propDelta to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPropDelta(float value) {
+        
+        propDelta_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float prop_delta = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPropDelta() {
+        
+        propDelta_ = 0F;
+        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 nNFONEOHGHE_ ;
+      /**
+       * <code>float NNFONEOHGHE = 12;</code>
+       * @return The nNFONEOHGHE.
+       */
+      @java.lang.Override
+      public float getNNFONEOHGHE() {
+        return nNFONEOHGHE_;
+      }
+      /**
+       * <code>float NNFONEOHGHE = 12;</code>
+       * @param value The nNFONEOHGHE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNNFONEOHGHE(float value) {
+        
+        nNFONEOHGHE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float NNFONEOHGHE = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNNFONEOHGHE() {
+        
+        nNFONEOHGHE_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int changeHpReason_ = 0;
+      /**
+       * <code>.ChangeHpReason change_hp_reason = 13;</code>
+       * @return The enum numeric value on the wire for changeHpReason.
+       */
+      @java.lang.Override public int getChangeHpReasonValue() {
+        return changeHpReason_;
+      }
+      /**
+       * <code>.ChangeHpReason change_hp_reason = 13;</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;
+      }
+      /**
+       * <code>.ChangeHpReason change_hp_reason = 13;</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;
+      }
+      /**
+       * <code>.ChangeHpReason change_hp_reason = 13;</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;
+      }
+      /**
+       * <code>.ChangeHpReason change_hp_reason = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChangeHpReason() {
+        
+        changeHpReason_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int changeEnergyReason_ = 0;
+      /**
+       * <code>.ChangeEnergyReason change_energy_reason = 15;</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>
+       * @param value The enum numeric value on the wire for changeEnergyReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChangeEnergyReasonValue(int value) {
+        
+        changeEnergyReason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * @return The changeEnergyReason.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason getChangeEnergyReason() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason result = emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.valueOf(changeEnergyReason_);
+        return result == null ? emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * @param value The changeEnergyReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChangeEnergyReason(emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.ChangeEnergyReason value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        changeEnergyReason_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ChangeEnergyReason change_energy_reason = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChangeEnergyReason() {
+        
+        changeEnergyReason_ = 0;
         onChanged();
         return this;
       }
@@ -1569,39 +1376,36 @@ public final class EntityFightPropChangeReasonNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\'EntityFightPropChangeReasonNotify.prot" +
-      "o\032\024ChangeHpReason.proto\032\030ChangeEnergyRea" +
-      "son.proto\032\021FAFPLBDIGDH.proto\032\021OFDEHFOCIF" +
-      "P.proto\032\026PropChangeReason.proto\"\311\002\n!Enti" +
-      "tyFightPropChangeReasonNotify\022\'\n\016changeH" +
-      "pReason\030\014 \001(\0162\017.ChangeHpReason\022\021\n\tentity" +
-      "_id\030\006 \001(\r\022\021\n\tprop_type\030\001 \001(\r\022\022\n\nprop_del" +
-      "ta\030\n \001(\002\022/\n\022changeEnergyReason\030\010 \001(\0162\023.C" +
-      "hangeEnergyReason\022!\n\013detail_info\030\013 \001(\0132\014" +
-      ".FAFPLBDIGDH\022\022\n\nparam_list\030\t \003(\r\022!\n\013AEFJ" +
-      "JGCHIJH\030\016 \001(\0162\014.OFDEHFOCIFP\022!\n\006reason\030\003 " +
-      "\001(\0162\021.PropChangeReason\022\023\n\013JJEEABMPEKL\030\r " +
-      "\001(\002B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "o\032\026PropChangeReason.proto\032\023ChangeHpDebts" +
+      ".proto\032\024ChangeHpReason.proto\032\030ChangeEner" +
+      "gyReason.proto\"\260\002\n!EntityFightPropChange" +
+      "ReasonNotify\022\021\n\tentity_id\030\002 \001(\r\022!\n\006reaso" +
+      "n\030\003 \001(\0162\021.PropChangeReason\022\'\n\017change_hp_" +
+      "debts\030\007 \001(\0162\016.ChangeHpDebts\022\022\n\nparam_lis" +
+      "t\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.ChangeHpReason\0221\n\024change" +
+      "_energy_reason\030\017 \001(\0162\023.ChangeEnergyReaso" +
+      "nB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ChangeHpReasonOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor(),
         });
     internal_static_EntityFightPropChangeReasonNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_EntityFightPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityFightPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "ChangeHpReason", "EntityId", "PropType", "PropDelta", "ChangeEnergyReason", "DetailInfo", "ParamList", "AEFJJGCHIJH", "Reason", "JJEEABMPEKL", });
+        new java.lang.String[] { "EntityId", "Reason", "ChangeHpDebts", "ParamList", "PropDelta", "PropType", "NNFONEOHGHE", "ChangeHpReason", "ChangeEnergyReason", });
+    emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ChangeHpDebtsOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChangeHpReasonOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChangeEnergyReasonOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FAFPLBDIGDHOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.OFDEHFOCIFPOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PropChangeReasonOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropNotifyOuterClass.java
index 3312f4a2b..588c36d52 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class EntityFightPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     int getFightPropMapCount();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     boolean containsFightPropMap(
         int key);
@@ -34,36 +34,31 @@ public final class EntityFightPropNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Float>
     getFightPropMapMap();
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
 
     float getFightPropMapOrDefault(
         int key,
         float defaultValue);
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
 
     float getFightPropMapOrThrow(
         int key);
 
     /**
-     * <code>uint32 entity_id = 13;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 9760
-   * Obf: PFCFCHANLHA
-   * </pre>
-   *
    * Protobuf type {@code EntityFightPropNotify}
    */
   public static final class EntityFightPropNotify extends
@@ -109,7 +104,7 @@ public final class EntityFightPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
                     FightPropMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +117,7 @@ public final class EntityFightPropNotifyOuterClass {
                   fightPropMap__.getKey(), fightPropMap__.getValue());
               break;
             }
-            case 104: {
+            case 56: {
 
               entityId_ = input.readUInt32();
               break;
@@ -156,7 +151,7 @@ public final class EntityFightPropNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 7:
+        case 3:
           return internalGetFightPropMap();
         default:
           throw new RuntimeException(
@@ -171,7 +166,7 @@ public final class EntityFightPropNotifyOuterClass {
               emu.grasscutter.net.proto.EntityFightPropNotifyOuterClass.EntityFightPropNotify.class, emu.grasscutter.net.proto.EntityFightPropNotifyOuterClass.EntityFightPropNotify.Builder.class);
     }
 
-    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 7;
+    public static final int FIGHT_PROP_MAP_FIELD_NUMBER = 3;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Float> defaultEntry =
@@ -198,7 +193,7 @@ public final class EntityFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
 
     @java.lang.Override
@@ -216,7 +211,7 @@ public final class EntityFightPropNotifyOuterClass {
       return getFightPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -224,7 +219,7 @@ public final class EntityFightPropNotifyOuterClass {
       return internalGetFightPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -237,7 +232,7 @@ public final class EntityFightPropNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+     * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -252,10 +247,10 @@ public final class EntityFightPropNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 13;
+    public static final int ENTITY_ID_FIELD_NUMBER = 7;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 13;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -282,9 +277,9 @@ public final class EntityFightPropNotifyOuterClass {
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
-          7);
+          3);
       if (entityId_ != 0) {
-        output.writeUInt32(13, entityId_);
+        output.writeUInt32(7, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +298,11 @@ public final class EntityFightPropNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(7, fightPropMap__);
+            .computeMessageSize(3, fightPropMap__);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, entityId_);
+          .computeUInt32Size(7, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -441,11 +436,6 @@ public final class EntityFightPropNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9760
-     * Obf: PFCFCHANLHA
-     * </pre>
-     *
      * Protobuf type {@code EntityFightPropNotify}
      */
     public static final class Builder extends
@@ -461,7 +451,7 @@ public final class EntityFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 3:
             return internalGetFightPropMap();
           default:
             throw new RuntimeException(
@@ -472,7 +462,7 @@ public final class EntityFightPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 3:
             return internalGetMutableFightPropMap();
           default:
             throw new RuntimeException(
@@ -648,7 +638,7 @@ public final class EntityFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
 
       @java.lang.Override
@@ -666,7 +656,7 @@ public final class EntityFightPropNotifyOuterClass {
         return getFightPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -674,7 +664,7 @@ public final class EntityFightPropNotifyOuterClass {
         return internalGetFightPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -687,7 +677,7 @@ public final class EntityFightPropNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -708,7 +698,7 @@ public final class EntityFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
 
       public Builder removeFightPropMap(
@@ -727,7 +717,7 @@ public final class EntityFightPropNotifyOuterClass {
         return internalGetMutableFightPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
       public Builder putFightPropMap(
           int key,
@@ -739,7 +729,7 @@ public final class EntityFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, float&gt; fight_prop_map = 7;</code>
+       * <code>map&lt;uint32, float&gt; fight_prop_map = 3;</code>
        */
 
       public Builder putAllFightPropMap(
@@ -751,7 +741,7 @@ public final class EntityFightPropNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 13;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -759,7 +749,7 @@ public final class EntityFightPropNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 13;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -770,7 +760,7 @@ public final class EntityFightPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 13;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -852,9 +842,9 @@ public final class EntityFightPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033EntityFightPropNotify.proto\"\241\001\n\025Entity" +
-      "FightPropNotify\022@\n\016fight_prop_map\030\007 \003(\0132" +
+      "FightPropNotify\022@\n\016fight_prop_map\030\003 \003(\0132" +
       "(.EntityFightPropNotify.FightPropMapEntr" +
-      "y\022\021\n\tentity_id\030\r \001(\r\0323\n\021FightPropMapEntr" +
+      "y\022\021\n\tentity_id\030\007 \001(\r\0323\n\021FightPropMapEntr" +
       "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\002:\0028\001B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
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 e780ad905..4407b3bb6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityFightPropUpdateNotifyOuterClass.java
@@ -18,12 +18,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:EntityFightPropUpdateNotify)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
     /**
      * <code>map&lt;uint32, float&gt; fight_prop_map = 13;</code>
      */
@@ -57,13 +51,14 @@ public final class EntityFightPropUpdateNotifyOuterClass {
 
     float getFightPropMapOrThrow(
         int key);
+
+    /**
+     * <code>uint32 entity_id = 14;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 24036
-   * Obf: POHPJAAPGHD
-   * </pre>
-   *
    * Protobuf type {@code EntityFightPropUpdateNotify}
    */
   public static final class EntityFightPropUpdateNotify extends
@@ -109,11 +104,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 fightPropMap_ = com.google.protobuf.MapField.newMapField(
@@ -127,6 +117,11 @@ public final class EntityFightPropUpdateNotifyOuterClass {
                   fightPropMap__.getKey(), fightPropMap__.getValue());
               break;
             }
+            case 112: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -171,17 +166,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify.class, emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify.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 FIGHT_PROP_MAP_FIELD_NUMBER = 13;
     private static final class FightPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
@@ -263,6 +247,17 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       return map.get(key);
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 14;
+    private int entityId_;
+    /**
+     * <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() {
@@ -277,15 +272,15 @@ public final class EntityFightPropUpdateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(4, entityId_);
-      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetFightPropMap(),
           FightPropMapDefaultEntryHolder.defaultEntry,
           13);
+      if (entityId_ != 0) {
+        output.writeUInt32(14, entityId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -295,10 +290,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, entityId_);
-      }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Float> entry
            : internalGetFightPropMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Float>
@@ -309,6 +300,10 @@ public final class EntityFightPropUpdateNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
             .computeMessageSize(13, fightPropMap__);
       }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, entityId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -324,10 +319,10 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify other = (emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!internalGetFightPropMap().equals(
           other.internalGetFightPropMap())) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -339,12 +334,12 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (!internalGetFightPropMap().getMap().isEmpty()) {
         hash = (37 * hash) + FIGHT_PROP_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetFightPropMap().hashCode();
       }
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -441,11 +436,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24036
-     * Obf: POHPJAAPGHD
-     * </pre>
-     *
      * Protobuf type {@code EntityFightPropUpdateNotify}
      */
     public static final class Builder extends
@@ -505,9 +495,9 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        internalGetMutableFightPropMap().clear();
         entityId_ = 0;
 
-        internalGetMutableFightPropMap().clear();
         return this;
       }
 
@@ -535,9 +525,9 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       public emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify result = new emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify(this);
         int from_bitField0_ = bitField0_;
-        result.entityId_ = entityId_;
         result.fightPropMap_ = internalGetFightPropMap();
         result.fightPropMap_.makeImmutable();
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -586,11 +576,11 @@ public final class EntityFightPropUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.EntityFightPropUpdateNotifyOuterClass.EntityFightPropUpdateNotify.getDefaultInstance()) return this;
+        internalGetMutableFightPropMap().mergeFrom(
+            other.internalGetFightPropMap());
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        internalGetMutableFightPropMap().mergeFrom(
-            other.internalGetFightPropMap());
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -621,37 +611,6 @@ public final class EntityFightPropUpdateNotifyOuterClass {
       }
       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 com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Float> fightPropMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Float>
@@ -779,6 +738,37 @@ public final class EntityFightPropUpdateNotifyOuterClass {
             .putAll(values);
         return this;
       }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 14;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <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) {
@@ -852,9 +842,9 @@ public final class EntityFightPropUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!EntityFightPropUpdateNotify.proto\"\255\001\n\033" +
-      "EntityFightPropUpdateNotify\022\021\n\tentity_id" +
-      "\030\004 \001(\r\022F\n\016fight_prop_map\030\r \003(\0132..EntityF" +
-      "ightPropUpdateNotify.FightPropMapEntry\0323" +
+      "EntityFightPropUpdateNotify\022F\n\016fight_pro" +
+      "p_map\030\r \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" +
       "b\006proto3"
@@ -868,7 +858,7 @@ public final class EntityFightPropUpdateNotifyOuterClass {
     internal_static_EntityFightPropUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityFightPropUpdateNotify_descriptor,
-        new java.lang.String[] { "EntityId", "FightPropMap", });
+        new java.lang.String[] { "FightPropMap", "EntityId", });
     internal_static_EntityFightPropUpdateNotify_FightPropMapEntry_descriptor =
       internal_static_EntityFightPropUpdateNotify_descriptor.getNestedTypes().get(0);
     internal_static_EntityFightPropUpdateNotify_FightPropMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityMoveFailInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityMoveFailInfoOuterClass.java
index a75c8f503..3958824fd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityMoveFailInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityMoveFailInfoOuterClass.java
@@ -19,49 +19,45 @@ public final class EntityMoveFailInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      * @return Whether the failMotion field is set.
      */
     boolean hasFailMotion();
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      * @return The failMotion.
      */
     emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo getFailMotion();
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      */
     emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getFailMotionOrBuilder();
 
     /**
-     * <code>uint32 scene_time = 8;</code>
+     * <code>uint32 scene_time = 5;</code>
      * @return The sceneTime.
      */
     int getSceneTime();
 
     /**
-     * <code>uint32 reliable_seq = 3;</code>
-     * @return The reliableSeq.
-     */
-    int getReliableSeq();
-
-    /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 entity_id = 6;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>uint32 reliable_seq = 10;</code>
+     * @return The reliableSeq.
+     */
+    int getReliableSeq();
   }
   /**
-   * <pre>
-   * Obf: ODNIIBAOJHO
-   * </pre>
-   *
    * Protobuf type {@code EntityMoveFailInfo}
    */
   public static final class EntityMoveFailInfo extends
@@ -106,27 +102,7 @@ public final class EntityMoveFailInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              reliableSeq_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 48: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              sceneTime_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 10: {
               emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder subBuilder = null;
               if (failMotion_ != null) {
                 subBuilder = failMotion_.toBuilder();
@@ -139,6 +115,26 @@ public final class EntityMoveFailInfoOuterClass {
 
               break;
             }
+            case 40: {
+
+              sceneTime_ = input.readUInt32();
+              break;
+            }
+            case 48: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 56: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              reliableSeq_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -171,10 +167,10 @@ public final class EntityMoveFailInfoOuterClass {
               emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.class, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder.class);
     }
 
-    public static final int FAIL_MOTION_FIELD_NUMBER = 9;
+    public static final int FAIL_MOTION_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo failMotion_;
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      * @return Whether the failMotion field is set.
      */
     @java.lang.Override
@@ -182,7 +178,7 @@ public final class EntityMoveFailInfoOuterClass {
       return failMotion_ != null;
     }
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      * @return The failMotion.
      */
     @java.lang.Override
@@ -190,17 +186,17 @@ public final class EntityMoveFailInfoOuterClass {
       return failMotion_ == null ? emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.getDefaultInstance() : failMotion_;
     }
     /**
-     * <code>.MotionInfo fail_motion = 9;</code>
+     * <code>.MotionInfo fail_motion = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getFailMotionOrBuilder() {
       return getFailMotion();
     }
 
-    public static final int SCENE_TIME_FIELD_NUMBER = 8;
+    public static final int SCENE_TIME_FIELD_NUMBER = 5;
     private int sceneTime_;
     /**
-     * <code>uint32 scene_time = 8;</code>
+     * <code>uint32 scene_time = 5;</code>
      * @return The sceneTime.
      */
     @java.lang.Override
@@ -208,21 +204,10 @@ public final class EntityMoveFailInfoOuterClass {
       return sceneTime_;
     }
 
-    public static final int RELIABLE_SEQ_FIELD_NUMBER = 3;
-    private int reliableSeq_;
-    /**
-     * <code>uint32 reliable_seq = 3;</code>
-     * @return The reliableSeq.
-     */
-    @java.lang.Override
-    public int getReliableSeq() {
-      return reliableSeq_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -230,10 +215,10 @@ public final class EntityMoveFailInfoOuterClass {
       return retcode_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
+    public static final int ENTITY_ID_FIELD_NUMBER = 7;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 6;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -241,6 +226,17 @@ public final class EntityMoveFailInfoOuterClass {
       return entityId_;
     }
 
+    public static final int RELIABLE_SEQ_FIELD_NUMBER = 10;
+    private int reliableSeq_;
+    /**
+     * <code>uint32 reliable_seq = 10;</code>
+     * @return The reliableSeq.
+     */
+    @java.lang.Override
+    public int getReliableSeq() {
+      return reliableSeq_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -255,20 +251,20 @@ public final class EntityMoveFailInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reliableSeq_ != 0) {
-        output.writeUInt32(3, reliableSeq_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
+      if (failMotion_ != null) {
+        output.writeMessage(1, getFailMotion());
       }
       if (sceneTime_ != 0) {
-        output.writeUInt32(8, sceneTime_);
+        output.writeUInt32(5, sceneTime_);
       }
-      if (failMotion_ != null) {
-        output.writeMessage(9, getFailMotion());
+      if (retcode_ != 0) {
+        output.writeInt32(6, retcode_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(7, entityId_);
+      }
+      if (reliableSeq_ != 0) {
+        output.writeUInt32(10, reliableSeq_);
       }
       unknownFields.writeTo(output);
     }
@@ -279,25 +275,25 @@ public final class EntityMoveFailInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (reliableSeq_ != 0) {
+      if (failMotion_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, reliableSeq_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
+          .computeMessageSize(1, getFailMotion());
       }
       if (sceneTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, sceneTime_);
+          .computeUInt32Size(5, sceneTime_);
       }
-      if (failMotion_ != null) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getFailMotion());
+          .computeInt32Size(6, retcode_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, entityId_);
+      }
+      if (reliableSeq_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, reliableSeq_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -321,12 +317,12 @@ public final class EntityMoveFailInfoOuterClass {
       }
       if (getSceneTime()
           != other.getSceneTime()) return false;
-      if (getReliableSeq()
-          != other.getReliableSeq()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (getReliableSeq()
+          != other.getReliableSeq()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -344,12 +340,12 @@ public final class EntityMoveFailInfoOuterClass {
       }
       hash = (37 * hash) + SCENE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getSceneTime();
-      hash = (37 * hash) + RELIABLE_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getReliableSeq();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + RELIABLE_SEQ_FIELD_NUMBER;
+      hash = (53 * hash) + getReliableSeq();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -446,10 +442,6 @@ public final class EntityMoveFailInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ODNIIBAOJHO
-     * </pre>
-     *
      * Protobuf type {@code EntityMoveFailInfo}
      */
     public static final class Builder extends
@@ -495,12 +487,12 @@ public final class EntityMoveFailInfoOuterClass {
         }
         sceneTime_ = 0;
 
-        reliableSeq_ = 0;
-
         retcode_ = 0;
 
         entityId_ = 0;
 
+        reliableSeq_ = 0;
+
         return this;
       }
 
@@ -533,9 +525,9 @@ public final class EntityMoveFailInfoOuterClass {
           result.failMotion_ = failMotionBuilder_.build();
         }
         result.sceneTime_ = sceneTime_;
-        result.reliableSeq_ = reliableSeq_;
         result.retcode_ = retcode_;
         result.entityId_ = entityId_;
+        result.reliableSeq_ = reliableSeq_;
         onBuilt();
         return result;
       }
@@ -590,15 +582,15 @@ public final class EntityMoveFailInfoOuterClass {
         if (other.getSceneTime() != 0) {
           setSceneTime(other.getSceneTime());
         }
-        if (other.getReliableSeq() != 0) {
-          setReliableSeq(other.getReliableSeq());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.getReliableSeq() != 0) {
+          setReliableSeq(other.getReliableSeq());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -632,14 +624,14 @@ public final class EntityMoveFailInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo, emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder, emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder> failMotionBuilder_;
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        * @return Whether the failMotion field is set.
        */
       public boolean hasFailMotion() {
         return failMotionBuilder_ != null || failMotion_ != null;
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        * @return The failMotion.
        */
       public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo getFailMotion() {
@@ -650,7 +642,7 @@ public final class EntityMoveFailInfoOuterClass {
         }
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public Builder setFailMotion(emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo value) {
         if (failMotionBuilder_ == null) {
@@ -666,7 +658,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public Builder setFailMotion(
           emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder builderForValue) {
@@ -680,7 +672,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public Builder mergeFailMotion(emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo value) {
         if (failMotionBuilder_ == null) {
@@ -698,7 +690,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public Builder clearFailMotion() {
         if (failMotionBuilder_ == null) {
@@ -712,7 +704,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder getFailMotionBuilder() {
         
@@ -720,7 +712,7 @@ public final class EntityMoveFailInfoOuterClass {
         return getFailMotionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       public emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder getFailMotionOrBuilder() {
         if (failMotionBuilder_ != null) {
@@ -731,7 +723,7 @@ public final class EntityMoveFailInfoOuterClass {
         }
       }
       /**
-       * <code>.MotionInfo fail_motion = 9;</code>
+       * <code>.MotionInfo fail_motion = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo, emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfo.Builder, emu.grasscutter.net.proto.MotionInfoOuterClass.MotionInfoOrBuilder> 
@@ -749,7 +741,7 @@ public final class EntityMoveFailInfoOuterClass {
 
       private int sceneTime_ ;
       /**
-       * <code>uint32 scene_time = 8;</code>
+       * <code>uint32 scene_time = 5;</code>
        * @return The sceneTime.
        */
       @java.lang.Override
@@ -757,7 +749,7 @@ public final class EntityMoveFailInfoOuterClass {
         return sceneTime_;
       }
       /**
-       * <code>uint32 scene_time = 8;</code>
+       * <code>uint32 scene_time = 5;</code>
        * @param value The sceneTime to set.
        * @return This builder for chaining.
        */
@@ -768,7 +760,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_time = 8;</code>
+       * <code>uint32 scene_time = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneTime() {
@@ -778,40 +770,9 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
 
-      private int reliableSeq_ ;
-      /**
-       * <code>uint32 reliable_seq = 3;</code>
-       * @return The reliableSeq.
-       */
-      @java.lang.Override
-      public int getReliableSeq() {
-        return reliableSeq_;
-      }
-      /**
-       * <code>uint32 reliable_seq = 3;</code>
-       * @param value The reliableSeq to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReliableSeq(int value) {
-        
-        reliableSeq_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reliable_seq = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReliableSeq() {
-        
-        reliableSeq_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -819,7 +780,7 @@ public final class EntityMoveFailInfoOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -830,7 +791,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -842,7 +803,7 @@ public final class EntityMoveFailInfoOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -850,7 +811,7 @@ public final class EntityMoveFailInfoOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -861,7 +822,7 @@ public final class EntityMoveFailInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 6;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -870,6 +831,37 @@ public final class EntityMoveFailInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int reliableSeq_ ;
+      /**
+       * <code>uint32 reliable_seq = 10;</code>
+       * @return The reliableSeq.
+       */
+      @java.lang.Override
+      public int getReliableSeq() {
+        return reliableSeq_;
+      }
+      /**
+       * <code>uint32 reliable_seq = 10;</code>
+       * @param value The reliableSeq to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReliableSeq(int value) {
+        
+        reliableSeq_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reliable_seq = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReliableSeq() {
+        
+        reliableSeq_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -939,9 +931,9 @@ public final class EntityMoveFailInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030EntityMoveFailInfo.proto\032\020MotionInfo.p" +
       "roto\"\204\001\n\022EntityMoveFailInfo\022 \n\013fail_moti" +
-      "on\030\t \001(\0132\013.MotionInfo\022\022\n\nscene_time\030\010 \001(" +
-      "\r\022\024\n\014reliable_seq\030\003 \001(\r\022\017\n\007retcode\030\005 \001(\005" +
-      "\022\021\n\tentity_id\030\006 \001(\rB\033\n\031emu.grasscutter.n" +
+      "on\030\001 \001(\0132\013.MotionInfo\022\022\n\nscene_time\030\005 \001(" +
+      "\r\022\017\n\007retcode\030\006 \001(\005\022\021\n\tentity_id\030\007 \001(\r\022\024\n" +
+      "\014reliable_seq\030\n \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -954,7 +946,7 @@ public final class EntityMoveFailInfoOuterClass {
     internal_static_EntityMoveFailInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityMoveFailInfo_descriptor,
-        new java.lang.String[] { "FailMotion", "SceneTime", "ReliableSeq", "Retcode", "EntityId", });
+        new java.lang.String[] { "FailMotion", "SceneTime", "Retcode", "EntityId", "ReliableSeq", });
     emu.grasscutter.net.proto.MotionInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityPropNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityPropNotifyOuterClass.java
index 1e3031e3d..bd3c58b8c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityPropNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityPropNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class EntityPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     boolean containsPropMap(
         int key);
@@ -34,36 +34,31 @@ public final class EntityPropNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <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 = 2;</code>
+     * <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 = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
         int key);
 
     /**
-     * <code>uint32 entity_id = 5;</code>
+     * <code>uint32 entity_id = 13;</code>
      * @return The entityId.
      */
     int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 3503
-   * Obf: IDBEABMPEFN
-   * </pre>
-   *
    * Protobuf type {@code EntityPropNotify}
    */
   public static final class EntityPropNotify extends
@@ -109,7 +104,7 @@ public final class EntityPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -122,7 +117,7 @@ public final class EntityPropNotifyOuterClass {
                   propMap__.getKey(), propMap__.getValue());
               break;
             }
-            case 40: {
+            case 104: {
 
               entityId_ = input.readUInt32();
               break;
@@ -156,7 +151,7 @@ public final class EntityPropNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 2:
+        case 12:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -171,7 +166,7 @@ public final class EntityPropNotifyOuterClass {
               emu.grasscutter.net.proto.EntityPropNotifyOuterClass.EntityPropNotify.class, emu.grasscutter.net.proto.EntityPropNotifyOuterClass.EntityPropNotify.Builder.class);
     }
 
-    public static final int PROP_MAP_FIELD_NUMBER = 2;
+    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 =
@@ -198,7 +193,7 @@ public final class EntityPropNotifyOuterClass {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     @java.lang.Override
@@ -216,7 +211,7 @@ public final class EntityPropNotifyOuterClass {
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -224,7 +219,7 @@ public final class EntityPropNotifyOuterClass {
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -237,7 +232,7 @@ public final class EntityPropNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -252,10 +247,10 @@ public final class EntityPropNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 5;
+    public static final int ENTITY_ID_FIELD_NUMBER = 13;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 5;</code>
+     * <code>uint32 entity_id = 13;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -282,9 +277,9 @@ public final class EntityPropNotifyOuterClass {
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          2);
+          12);
       if (entityId_ != 0) {
-        output.writeUInt32(5, entityId_);
+        output.writeUInt32(13, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,11 +298,11 @@ public final class EntityPropNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2, propMap__);
+            .computeMessageSize(12, propMap__);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, entityId_);
+          .computeUInt32Size(13, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -441,11 +436,6 @@ public final class EntityPropNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3503
-     * Obf: IDBEABMPEFN
-     * </pre>
-     *
      * Protobuf type {@code EntityPropNotify}
      */
     public static final class Builder extends
@@ -461,7 +451,7 @@ public final class EntityPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 12:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -472,7 +462,7 @@ public final class EntityPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 2:
+          case 12:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -648,7 +638,7 @@ public final class EntityPropNotifyOuterClass {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       @java.lang.Override
@@ -666,7 +656,7 @@ public final class EntityPropNotifyOuterClass {
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -674,7 +664,7 @@ public final class EntityPropNotifyOuterClass {
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -687,7 +677,7 @@ public final class EntityPropNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -708,7 +698,7 @@ public final class EntityPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder removePropMap(
@@ -727,7 +717,7 @@ public final class EntityPropNotifyOuterClass {
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       public Builder putPropMap(
           int key,
@@ -739,7 +729,7 @@ public final class EntityPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 2;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder putAllPropMap(
@@ -751,7 +741,7 @@ public final class EntityPropNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <code>uint32 entity_id = 13;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -759,7 +749,7 @@ public final class EntityPropNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <code>uint32 entity_id = 13;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -770,7 +760,7 @@ public final class EntityPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <code>uint32 entity_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -852,9 +842,9 @@ public final class EntityPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026EntityPropNotify.proto\032\017PropValue.prot" +
-      "o\"\223\001\n\020EntityPropNotify\0220\n\010prop_map\030\002 \003(\013" +
+      "o\"\223\001\n\020EntityPropNotify\0220\n\010prop_map\030\014 \003(\013" +
       "2\036.EntityPropNotify.PropMapEntry\022\021\n\tenti" +
-      "ty_id\030\005 \001(\r\032:\n\014PropMapEntry\022\013\n\003key\030\001 \001(\r" +
+      "ty_id\030\r \001(\r\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.g" +
       "rasscutter.net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityRendererChangedInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityRendererChangedInfoOuterClass.java
index aafcb2b9f..2396c1094 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityRendererChangedInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityRendererChangedInfoOuterClass.java
@@ -65,10 +65,6 @@ public final class EntityRendererChangedInfoOuterClass {
     boolean getIsCached();
   }
   /**
-   * <pre>
-   * Obf: OGLDMEEKHOB
-   * </pre>
-   *
    * Protobuf type {@code EntityRendererChangedInfo}
    */
   public static final class EntityRendererChangedInfo extends
@@ -474,10 +470,6 @@ public final class EntityRendererChangedInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OGLDMEEKHOB
-     * </pre>
-     *
      * Protobuf type {@code EntityRendererChangedInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EntityTagChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EntityTagChangeNotifyOuterClass.java
index cda5ea9d9..6d0c7a294 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EntityTagChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EntityTagChangeNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class EntityTagChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_add = 1;</code>
+     * <code>bool is_add = 7;</code>
      * @return The isAdd.
      */
     boolean getIsAdd();
 
     /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>string tag = 6;</code>
+     * <code>string tag = 10;</code>
      * @return The tag.
      */
     java.lang.String getTag();
     /**
-     * <code>string tag = 6;</code>
+     * <code>string tag = 10;</code>
      * @return The bytes for tag.
      */
     com.google.protobuf.ByteString
         getTagBytes();
+
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 6805
-   * Obf: FPHPMKCMJIM
-   * </pre>
-   *
    * Protobuf type {@code EntityTagChangeNotify}
    */
   public static final class EntityTagChangeNotify extends
@@ -93,18 +88,18 @@ public final class EntityTagChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 56: {
 
               isAdd_ = input.readBool();
               break;
             }
-            case 50: {
+            case 82: {
               java.lang.String s = input.readStringRequireUtf8();
 
               tag_ = s;
               break;
             }
-            case 64: {
+            case 88: {
 
               entityId_ = input.readUInt32();
               break;
@@ -141,10 +136,10 @@ public final class EntityTagChangeNotifyOuterClass {
               emu.grasscutter.net.proto.EntityTagChangeNotifyOuterClass.EntityTagChangeNotify.class, emu.grasscutter.net.proto.EntityTagChangeNotifyOuterClass.EntityTagChangeNotify.Builder.class);
     }
 
-    public static final int IS_ADD_FIELD_NUMBER = 1;
+    public static final int IS_ADD_FIELD_NUMBER = 7;
     private boolean isAdd_;
     /**
-     * <code>bool is_add = 1;</code>
+     * <code>bool is_add = 7;</code>
      * @return The isAdd.
      */
     @java.lang.Override
@@ -152,21 +147,10 @@ public final class EntityTagChangeNotifyOuterClass {
       return isAdd_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 8;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 8;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int TAG_FIELD_NUMBER = 6;
+    public static final int TAG_FIELD_NUMBER = 10;
     private volatile java.lang.Object tag_;
     /**
-     * <code>string tag = 6;</code>
+     * <code>string tag = 10;</code>
      * @return The tag.
      */
     @java.lang.Override
@@ -183,7 +167,7 @@ public final class EntityTagChangeNotifyOuterClass {
       }
     }
     /**
-     * <code>string tag = 6;</code>
+     * <code>string tag = 10;</code>
      * @return The bytes for tag.
      */
     @java.lang.Override
@@ -201,6 +185,17 @@ public final class EntityTagChangeNotifyOuterClass {
       }
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 11;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 11;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -216,13 +211,13 @@ public final class EntityTagChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isAdd_ != false) {
-        output.writeBool(1, isAdd_);
+        output.writeBool(7, isAdd_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, tag_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, tag_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(8, entityId_);
+        output.writeUInt32(11, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -235,14 +230,14 @@ public final class EntityTagChangeNotifyOuterClass {
       size = 0;
       if (isAdd_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isAdd_);
+          .computeBoolSize(7, isAdd_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(tag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, tag_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, tag_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, entityId_);
+          .computeUInt32Size(11, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -261,10 +256,10 @@ public final class EntityTagChangeNotifyOuterClass {
 
       if (getIsAdd()
           != other.getIsAdd()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!getTag()
           .equals(other.getTag())) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -279,10 +274,10 @@ public final class EntityTagChangeNotifyOuterClass {
       hash = (37 * hash) + IS_ADD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsAdd());
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + TAG_FIELD_NUMBER;
       hash = (53 * hash) + getTag().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,11 +374,6 @@ public final class EntityTagChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6805
-     * Obf: FPHPMKCMJIM
-     * </pre>
-     *
      * Protobuf type {@code EntityTagChangeNotify}
      */
     public static final class Builder extends
@@ -423,10 +413,10 @@ public final class EntityTagChangeNotifyOuterClass {
         super.clear();
         isAdd_ = false;
 
-        entityId_ = 0;
-
         tag_ = "";
 
+        entityId_ = 0;
+
         return this;
       }
 
@@ -454,8 +444,8 @@ public final class EntityTagChangeNotifyOuterClass {
       public emu.grasscutter.net.proto.EntityTagChangeNotifyOuterClass.EntityTagChangeNotify buildPartial() {
         emu.grasscutter.net.proto.EntityTagChangeNotifyOuterClass.EntityTagChangeNotify result = new emu.grasscutter.net.proto.EntityTagChangeNotifyOuterClass.EntityTagChangeNotify(this);
         result.isAdd_ = isAdd_;
-        result.entityId_ = entityId_;
         result.tag_ = tag_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -507,13 +497,13 @@ public final class EntityTagChangeNotifyOuterClass {
         if (other.getIsAdd() != false) {
           setIsAdd(other.getIsAdd());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (!other.getTag().isEmpty()) {
           tag_ = other.tag_;
           onChanged();
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,7 +535,7 @@ public final class EntityTagChangeNotifyOuterClass {
 
       private boolean isAdd_ ;
       /**
-       * <code>bool is_add = 1;</code>
+       * <code>bool is_add = 7;</code>
        * @return The isAdd.
        */
       @java.lang.Override
@@ -553,7 +543,7 @@ public final class EntityTagChangeNotifyOuterClass {
         return isAdd_;
       }
       /**
-       * <code>bool is_add = 1;</code>
+       * <code>bool is_add = 7;</code>
        * @param value The isAdd to set.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class EntityTagChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_add = 1;</code>
+       * <code>bool is_add = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAdd() {
@@ -574,40 +564,9 @@ public final class EntityTagChangeNotifyOuterClass {
         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 java.lang.Object tag_ = "";
       /**
-       * <code>string tag = 6;</code>
+       * <code>string tag = 10;</code>
        * @return The tag.
        */
       public java.lang.String getTag() {
@@ -623,7 +582,7 @@ public final class EntityTagChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>string tag = 6;</code>
+       * <code>string tag = 10;</code>
        * @return The bytes for tag.
        */
       public com.google.protobuf.ByteString
@@ -640,7 +599,7 @@ public final class EntityTagChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>string tag = 6;</code>
+       * <code>string tag = 10;</code>
        * @param value The tag to set.
        * @return This builder for chaining.
        */
@@ -655,7 +614,7 @@ public final class EntityTagChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string tag = 6;</code>
+       * <code>string tag = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearTag() {
@@ -665,7 +624,7 @@ public final class EntityTagChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string tag = 6;</code>
+       * <code>string tag = 10;</code>
        * @param value The bytes for tag to set.
        * @return This builder for chaining.
        */
@@ -680,6 +639,37 @@ public final class EntityTagChangeNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 11;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 11;</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 = 11;</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) {
@@ -748,8 +738,8 @@ public final class EntityTagChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033EntityTagChangeNotify.proto\"G\n\025EntityT" +
-      "agChangeNotify\022\016\n\006is_add\030\001 \001(\010\022\021\n\tentity" +
-      "_id\030\010 \001(\r\022\013\n\003tag\030\006 \001(\tB\033\n\031emu.grasscutte" +
+      "agChangeNotify\022\016\n\006is_add\030\007 \001(\010\022\013\n\003tag\030\n " +
+      "\001(\t\022\021\n\tentity_id\030\013 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -761,7 +751,7 @@ public final class EntityTagChangeNotifyOuterClass {
     internal_static_EntityTagChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EntityTagChangeNotify_descriptor,
-        new java.lang.String[] { "IsAdd", "EntityId", "Tag", });
+        new java.lang.String[] { "IsAdd", "Tag", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EquipOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EquipOuterClass.java
index da1878383..90b621138 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EquipOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EquipOuterClass.java
@@ -18,6 +18,12 @@ public final class EquipOuterClass {
       // @@protoc_insertion_point(interface_extends:Equip)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>bool is_locked = 3;</code>
+     * @return The isLocked.
+     */
+    boolean getIsLocked();
+
     /**
      * <code>.Reliquary reliquary = 1;</code>
      * @return Whether the reliquary field is set.
@@ -48,19 +54,9 @@ public final class EquipOuterClass {
      */
     emu.grasscutter.net.proto.WeaponOuterClass.WeaponOrBuilder getWeaponOrBuilder();
 
-    /**
-     * <code>bool is_locked = 3;</code>
-     * @return The isLocked.
-     */
-    boolean getIsLocked();
-
     public emu.grasscutter.net.proto.EquipOuterClass.Equip.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * Obf: EFEDALDPHMA
-   * </pre>
-   *
    * Protobuf type {@code Equip}
    */
   public static final class Equip extends
@@ -211,6 +207,17 @@ public final class EquipOuterClass {
           detailCase_);
     }
 
+    public static final int IS_LOCKED_FIELD_NUMBER = 3;
+    private boolean isLocked_;
+    /**
+     * <code>bool is_locked = 3;</code>
+     * @return The isLocked.
+     */
+    @java.lang.Override
+    public boolean getIsLocked() {
+      return isLocked_;
+    }
+
     public static final int RELIQUARY_FIELD_NUMBER = 1;
     /**
      * <code>.Reliquary reliquary = 1;</code>
@@ -273,17 +280,6 @@ public final class EquipOuterClass {
       return emu.grasscutter.net.proto.WeaponOuterClass.Weapon.getDefaultInstance();
     }
 
-    public static final int IS_LOCKED_FIELD_NUMBER = 3;
-    private boolean isLocked_;
-    /**
-     * <code>bool is_locked = 3;</code>
-     * @return The isLocked.
-     */
-    @java.lang.Override
-    public boolean getIsLocked() {
-      return isLocked_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -480,10 +476,6 @@ public final class EquipOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EFEDALDPHMA
-     * </pre>
-     *
      * Protobuf type {@code Equip}
      */
     public static final class Builder extends
@@ -551,6 +543,7 @@ public final class EquipOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EquipOuterClass.Equip buildPartial() {
         emu.grasscutter.net.proto.EquipOuterClass.Equip result = new emu.grasscutter.net.proto.EquipOuterClass.Equip(this);
+        result.isLocked_ = isLocked_;
         if (detailCase_ == 1) {
           if (reliquaryBuilder_ == null) {
             result.detail_ = detail_;
@@ -565,7 +558,6 @@ public final class EquipOuterClass {
             result.detail_ = weaponBuilder_.build();
           }
         }
-        result.isLocked_ = isLocked_;
         result.detailCase_ = detailCase_;
         onBuilt();
         return result;
@@ -675,6 +667,37 @@ public final class EquipOuterClass {
       }
 
 
+      private boolean isLocked_ ;
+      /**
+       * <code>bool is_locked = 3;</code>
+       * @return The isLocked.
+       */
+      @java.lang.Override
+      public boolean getIsLocked() {
+        return isLocked_;
+      }
+      /**
+       * <code>bool is_locked = 3;</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 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsLocked() {
+        
+        isLocked_ = false;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ReliquaryOuterClass.Reliquary, emu.grasscutter.net.proto.ReliquaryOuterClass.Reliquary.Builder, emu.grasscutter.net.proto.ReliquaryOuterClass.ReliquaryOrBuilder> reliquaryBuilder_;
       /**
@@ -956,37 +979,6 @@ public final class EquipOuterClass {
         onChanged();;
         return weaponBuilder_;
       }
-
-      private boolean isLocked_ ;
-      /**
-       * <code>bool is_locked = 3;</code>
-       * @return The isLocked.
-       */
-      @java.lang.Override
-      public boolean getIsLocked() {
-        return isLocked_;
-      }
-      /**
-       * <code>bool is_locked = 3;</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 = 3;</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) {
@@ -1055,9 +1047,9 @@ public final class EquipOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\013Equip.proto\032\017Reliquary.proto\032\014Weapon.p" +
-      "roto\"`\n\005Equip\022\037\n\treliquary\030\001 \001(\0132\n.Reliq" +
-      "uaryH\000\022\031\n\006weapon\030\002 \001(\0132\007.WeaponH\000\022\021\n\tis_" +
-      "locked\030\003 \001(\010B\010\n\006detailB\033\n\031emu.grasscutte" +
+      "roto\"`\n\005Equip\022\021\n\tis_locked\030\003 \001(\010\022\037\n\treli" +
+      "quary\030\001 \001(\0132\n.ReliquaryH\000\022\031\n\006weapon\030\002 \001(" +
+      "\0132\007.WeaponH\000B\010\n\006DetailB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1071,7 +1063,7 @@ public final class EquipOuterClass {
     internal_static_Equip_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Equip_descriptor,
-        new java.lang.String[] { "Reliquary", "Weapon", "IsLocked", "Detail", });
+        new java.lang.String[] { "IsLocked", "Reliquary", "Weapon", "Detail", });
     emu.grasscutter.net.proto.ReliquaryOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WeaponOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EquipParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EquipParamOuterClass.java
index 3e26074d4..054a232f5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EquipParamOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EquipParamOuterClass.java
@@ -43,10 +43,6 @@ public final class EquipParamOuterClass {
     int getPromoteLevel();
   }
   /**
-   * <pre>
-   * Obf: HPFNFEJGODI
-   * </pre>
-   *
    * Protobuf type {@code EquipParam}
    */
   public static final class EquipParam extends
@@ -376,10 +372,6 @@ public final class EquipParamOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HPFNFEJGODI
-     * </pre>
-     *
      * Protobuf type {@code EquipParam}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncSkillCdNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncSkillCdNotifyOuterClass.java
index d5f994858..97956e893 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncSkillCdNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAiSyncSkillCdNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     int getAiCdMapCount();
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     boolean containsAiCdMap(
         int key);
@@ -34,30 +34,25 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo>
     getAiCdMap();
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo>
     getAiCdMapMap();
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
 
     emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo getAiCdMapOrDefault(
         int key,
         emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo defaultValue);
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
 
     emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo getAiCdMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 6471
-   * Obf: DCKIHJONHIO
-   * </pre>
-   *
    * Protobuf type {@code EvtAiSyncSkillCdNotify}
    */
   public static final class EvtAiSyncSkillCdNotify extends
@@ -103,7 +98,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 82: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 aiCdMap_ = com.google.protobuf.MapField.newMapField(
                     AiCdMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 10:
+        case 11:
           return internalGetAiCdMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
               emu.grasscutter.net.proto.EvtAiSyncSkillCdNotifyOuterClass.EvtAiSyncSkillCdNotify.class, emu.grasscutter.net.proto.EvtAiSyncSkillCdNotifyOuterClass.EvtAiSyncSkillCdNotify.Builder.class);
     }
 
-    public static final int AI_CD_MAP_FIELD_NUMBER = 10;
+    public static final int AI_CD_MAP_FIELD_NUMBER = 11;
     private static final class AiCdMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.AiSkillCdInfoOuterClass.AiSkillCdInfo> defaultEntry =
@@ -187,7 +182,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       return internalGetAiCdMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       return getAiCdMapMap();
     }
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       return internalGetAiCdMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+     * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
           output,
           internalGetAiCdMap(),
           AiCdMapDefaultEntryHolder.defaultEntry,
-          10);
+          11);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(10, aiCdMap__);
+            .computeMessageSize(11, aiCdMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6471
-     * Obf: DCKIHJONHIO
-     * </pre>
-     *
      * Protobuf type {@code EvtAiSyncSkillCdNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 11:
             return internalGetAiCdMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 11:
             return internalGetMutableAiCdMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return internalGetAiCdMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return getAiCdMapMap();
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return internalGetAiCdMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
 
       public Builder removeAiCdMap(
@@ -688,7 +678,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return internalGetMutableAiCdMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
       public Builder putAiCdMap(
           int key,
@@ -700,7 +690,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 10;</code>
+       * <code>map&lt;uint32, .AiSkillCdInfo&gt; ai_cd_map = 11;</code>
        */
 
       public Builder putAllAiCdMap(
@@ -783,7 +773,7 @@ public final class EvtAiSyncSkillCdNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034EvtAiSyncSkillCdNotify.proto\032\023AiSkillC" +
       "dInfo.proto\"\221\001\n\026EvtAiSyncSkillCdNotify\0227" +
-      "\n\tai_cd_map\030\n \003(\0132$.EvtAiSyncSkillCdNoti" +
+      "\n\tai_cd_map\030\013 \003(\0132$.EvtAiSyncSkillCdNoti" +
       "fy.AiCdMapEntry\032>\n\014AiCdMapEntry\022\013\n\003key\030\001" +
       " \001(\r\022\035\n\005value\030\002 \001(\0132\016.AiSkillCdInfo:\0028\001B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java
index 26325f19e..5405d07d3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairReqOuterClass.java
@@ -34,23 +34,18 @@ public final class EvtAvatarLockChairReqOuterClass {
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
 
     /**
-     * <code>uint64 chair_id = 9;</code>
+     * <code>uint64 chair_id = 3;</code>
      * @return The chairId.
      */
     long getChairId();
 
     /**
-     * <code>int32 direction = 3;</code>
+     * <code>int32 direction = 14;</code>
      * @return The direction.
      */
     int getDirection();
   }
   /**
-   * <pre>
-   * CmdId: 23086
-   * Obf: LBJMDFGMGBD
-   * </pre>
-   *
    * Protobuf type {@code EvtAvatarLockChairReq}
    */
   public static final class EvtAvatarLockChairReq extends
@@ -97,11 +92,6 @@ public final class EvtAvatarLockChairReqOuterClass {
               break;
             case 24: {
 
-              direction_ = input.readInt32();
-              break;
-            }
-            case 72: {
-
               chairId_ = input.readUInt64();
               break;
             }
@@ -118,6 +108,11 @@ public final class EvtAvatarLockChairReqOuterClass {
 
               break;
             }
+            case 112: {
+
+              direction_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -176,10 +171,10 @@ public final class EvtAvatarLockChairReqOuterClass {
       return getPosition();
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 9;
+    public static final int CHAIR_ID_FIELD_NUMBER = 3;
     private long chairId_;
     /**
-     * <code>uint64 chair_id = 9;</code>
+     * <code>uint64 chair_id = 3;</code>
      * @return The chairId.
      */
     @java.lang.Override
@@ -187,10 +182,10 @@ public final class EvtAvatarLockChairReqOuterClass {
       return chairId_;
     }
 
-    public static final int DIRECTION_FIELD_NUMBER = 3;
+    public static final int DIRECTION_FIELD_NUMBER = 14;
     private int direction_;
     /**
-     * <code>int32 direction = 3;</code>
+     * <code>int32 direction = 14;</code>
      * @return The direction.
      */
     @java.lang.Override
@@ -212,15 +207,15 @@ public final class EvtAvatarLockChairReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (direction_ != 0) {
-        output.writeInt32(3, direction_);
-      }
       if (chairId_ != 0L) {
-        output.writeUInt64(9, chairId_);
+        output.writeUInt64(3, chairId_);
       }
       if (position_ != null) {
         output.writeMessage(13, getPosition());
       }
+      if (direction_ != 0) {
+        output.writeInt32(14, direction_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -230,18 +225,18 @@ public final class EvtAvatarLockChairReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (direction_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, direction_);
-      }
       if (chairId_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, chairId_);
+          .computeUInt64Size(3, chairId_);
       }
       if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(13, getPosition());
       }
+      if (direction_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, direction_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -382,11 +377,6 @@ public final class EvtAvatarLockChairReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23086
-     * Obf: LBJMDFGMGBD
-     * </pre>
-     *
      * Protobuf type {@code EvtAvatarLockChairReq}
      */
     public static final class Builder extends
@@ -674,7 +664,7 @@ public final class EvtAvatarLockChairReqOuterClass {
 
       private long chairId_ ;
       /**
-       * <code>uint64 chair_id = 9;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @return The chairId.
        */
       @java.lang.Override
@@ -682,7 +672,7 @@ public final class EvtAvatarLockChairReqOuterClass {
         return chairId_;
       }
       /**
-       * <code>uint64 chair_id = 9;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @param value The chairId to set.
        * @return This builder for chaining.
        */
@@ -693,7 +683,7 @@ public final class EvtAvatarLockChairReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 chair_id = 9;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearChairId() {
@@ -705,7 +695,7 @@ public final class EvtAvatarLockChairReqOuterClass {
 
       private int direction_ ;
       /**
-       * <code>int32 direction = 3;</code>
+       * <code>int32 direction = 14;</code>
        * @return The direction.
        */
       @java.lang.Override
@@ -713,7 +703,7 @@ public final class EvtAvatarLockChairReqOuterClass {
         return direction_;
       }
       /**
-       * <code>int32 direction = 3;</code>
+       * <code>int32 direction = 14;</code>
        * @param value The direction to set.
        * @return This builder for chaining.
        */
@@ -724,7 +714,7 @@ public final class EvtAvatarLockChairReqOuterClass {
         return this;
       }
       /**
-       * <code>int32 direction = 3;</code>
+       * <code>int32 direction = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearDirection() {
@@ -802,8 +792,8 @@ public final class EvtAvatarLockChairReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033EvtAvatarLockChairReq.proto\032\014Vector.pr" +
       "oto\"W\n\025EvtAvatarLockChairReq\022\031\n\010position" +
-      "\030\r \001(\0132\007.Vector\022\020\n\010chair_id\030\t \001(\004\022\021\n\tdir" +
-      "ection\030\003 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "\030\r \001(\0132\007.Vector\022\020\n\010chair_id\030\003 \001(\004\022\021\n\tdir" +
+      "ection\030\016 \001(\005B\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/EvtAvatarLockChairRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
index e70db1747..86010be71 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarLockChairRspOuterClass.java
@@ -19,50 +19,45 @@ public final class EvtAvatarLockChairRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 chair_id = 4;</code>
-     * @return The chairId.
-     */
-    long getChairId();
-
-    /**
-     * <code>.Vector position = 3;</code>
-     * @return Whether the position field is set.
-     */
-    boolean hasPosition();
-    /**
-     * <code>.Vector position = 3;</code>
-     * @return The position.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
-    /**
-     * <code>.Vector position = 3;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
-
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>int32 direction = 2;</code>
+     * <code>int32 direction = 4;</code>
      * @return The direction.
      */
     int getDirection();
+
+    /**
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint64 chair_id = 8;</code>
+     * @return The chairId.
+     */
+    long getChairId();
+
+    /**
+     * <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>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 26356
-   * Obf: ABACJEJFCJJ
-   * </pre>
-   *
    * Protobuf type {@code EvtAvatarLockChairRsp}
    */
   public static final class EvtAvatarLockChairRsp extends
@@ -107,12 +102,27 @@ public final class EvtAvatarLockChairRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 32: {
 
               direction_ = input.readInt32();
               break;
             }
-            case 26: {
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 64: {
+
+              chairId_ = input.readUInt64();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -125,21 +135,6 @@ public final class EvtAvatarLockChairRspOuterClass {
 
               break;
             }
-            case 32: {
-
-              chairId_ = input.readUInt64();
-              break;
-            }
-            case 56: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -172,58 +167,10 @@ public final class EvtAvatarLockChairRspOuterClass {
               emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.class, emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.Builder.class);
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 4;
-    private long chairId_;
-    /**
-     * <code>uint64 chair_id = 4;</code>
-     * @return The chairId.
-     */
-    @java.lang.Override
-    public long getChairId() {
-      return chairId_;
-    }
-
-    public static final int POSITION_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
-    /**
-     * <code>.Vector position = 3;</code>
-     * @return Whether the position field is set.
-     */
-    @java.lang.Override
-    public boolean hasPosition() {
-      return position_ != null;
-    }
-    /**
-     * <code>.Vector position = 3;</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_;
-    }
-    /**
-     * <code>.Vector position = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
-      return getPosition();
-    }
-
-    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 ENTITY_ID_FIELD_NUMBER = 7;
+    public static final int ENTITY_ID_FIELD_NUMBER = 1;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>uint32 entity_id = 1;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -231,10 +178,10 @@ public final class EvtAvatarLockChairRspOuterClass {
       return entityId_;
     }
 
-    public static final int DIRECTION_FIELD_NUMBER = 2;
+    public static final int DIRECTION_FIELD_NUMBER = 4;
     private int direction_;
     /**
-     * <code>int32 direction = 2;</code>
+     * <code>int32 direction = 4;</code>
      * @return The direction.
      */
     @java.lang.Override
@@ -242,6 +189,54 @@ public final class EvtAvatarLockChairRspOuterClass {
       return direction_;
     }
 
+    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 CHAIR_ID_FIELD_NUMBER = 8;
+    private long chairId_;
+    /**
+     * <code>uint64 chair_id = 8;</code>
+     * @return The chairId.
+     */
+    @java.lang.Override
+    public long getChairId() {
+      return chairId_;
+    }
+
+    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_;
+    }
+    /**
+     * <code>.Vector position = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
+      return getPosition();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -256,20 +251,20 @@ public final class EvtAvatarLockChairRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (direction_ != 0) {
-        output.writeInt32(2, direction_);
-      }
-      if (position_ != null) {
-        output.writeMessage(3, getPosition());
-      }
-      if (chairId_ != 0L) {
-        output.writeUInt64(4, chairId_);
-      }
       if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
+        output.writeUInt32(1, entityId_);
+      }
+      if (direction_ != 0) {
+        output.writeInt32(4, direction_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      if (chairId_ != 0L) {
+        output.writeUInt64(8, chairId_);
+      }
+      if (position_ != null) {
+        output.writeMessage(12, getPosition());
       }
       unknownFields.writeTo(output);
     }
@@ -280,25 +275,25 @@ public final class EvtAvatarLockChairRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (direction_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, direction_);
-      }
-      if (position_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getPosition());
-      }
-      if (chairId_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, chairId_);
-      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
+          .computeUInt32Size(1, entityId_);
+      }
+      if (direction_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, direction_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(5, retcode_);
+      }
+      if (chairId_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(8, chairId_);
+      }
+      if (position_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getPosition());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,6 +310,12 @@ public final class EvtAvatarLockChairRspOuterClass {
       }
       emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp other = (emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (getDirection()
+          != other.getDirection()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getChairId()
           != other.getChairId()) return false;
       if (hasPosition() != other.hasPosition()) return false;
@@ -322,12 +323,6 @@ public final class EvtAvatarLockChairRspOuterClass {
         if (!getPosition()
             .equals(other.getPosition())) return false;
       }
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (getDirection()
-          != other.getDirection()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -339,6 +334,12 @@ public final class EvtAvatarLockChairRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + DIRECTION_FIELD_NUMBER;
+      hash = (53 * hash) + getDirection();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CHAIR_ID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getChairId());
@@ -346,12 +347,6 @@ public final class EvtAvatarLockChairRspOuterClass {
         hash = (37 * hash) + POSITION_FIELD_NUMBER;
         hash = (53 * hash) + getPosition().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      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;
@@ -448,11 +443,6 @@ public final class EvtAvatarLockChairRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26356
-     * Obf: ABACJEJFCJJ
-     * </pre>
-     *
      * Protobuf type {@code EvtAvatarLockChairRsp}
      */
     public static final class Builder extends
@@ -490,6 +480,12 @@ public final class EvtAvatarLockChairRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
+        direction_ = 0;
+
+        retcode_ = 0;
+
         chairId_ = 0L;
 
         if (positionBuilder_ == null) {
@@ -498,12 +494,6 @@ public final class EvtAvatarLockChairRspOuterClass {
           position_ = null;
           positionBuilder_ = null;
         }
-        retcode_ = 0;
-
-        entityId_ = 0;
-
-        direction_ = 0;
-
         return this;
       }
 
@@ -530,15 +520,15 @@ public final class EvtAvatarLockChairRspOuterClass {
       @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.retcode_ = retcode_;
-        result.entityId_ = entityId_;
-        result.direction_ = direction_;
         onBuilt();
         return result;
       }
@@ -587,21 +577,21 @@ public final class EvtAvatarLockChairRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp other) {
         if (other == emu.grasscutter.net.proto.EvtAvatarLockChairRspOuterClass.EvtAvatarLockChairRsp.getDefaultInstance()) return this;
-        if (other.getChairId() != 0L) {
-          setChairId(other.getChairId());
-        }
-        if (other.hasPosition()) {
-          mergePosition(other.getPosition());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.getDirection() != 0) {
           setDirection(other.getDirection());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getChairId() != 0L) {
+          setChairId(other.getChairId());
+        }
+        if (other.hasPosition()) {
+          mergePosition(other.getPosition());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -631,9 +621,102 @@ public final class EvtAvatarLockChairRspOuterClass {
         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 = 4;</code>
+       * <code>uint64 chair_id = 8;</code>
        * @return The chairId.
        */
       @java.lang.Override
@@ -641,7 +724,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return chairId_;
       }
       /**
-       * <code>uint64 chair_id = 4;</code>
+       * <code>uint64 chair_id = 8;</code>
        * @param value The chairId to set.
        * @return This builder for chaining.
        */
@@ -652,7 +735,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 chair_id = 4;</code>
+       * <code>uint64 chair_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearChairId() {
@@ -666,14 +749,14 @@ public final class EvtAvatarLockChairRspOuterClass {
       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 = 3;</code>
+       * <code>.Vector position = 12;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -684,7 +767,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -700,7 +783,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -714,7 +797,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -732,7 +815,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -746,7 +829,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -754,7 +837,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -765,7 +848,7 @@ public final class EvtAvatarLockChairRspOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 3;</code>
+       * <code>.Vector position = 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> 
@@ -780,99 +863,6 @@ public final class EvtAvatarLockChairRspOuterClass {
         }
         return positionBuilder_;
       }
-
-      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 int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 7;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int direction_ ;
-      /**
-       * <code>int32 direction = 2;</code>
-       * @return The direction.
-       */
-      @java.lang.Override
-      public int getDirection() {
-        return direction_;
-      }
-      /**
-       * <code>int32 direction = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDirection() {
-        
-        direction_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -941,10 +931,10 @@ public final class EvtAvatarLockChairRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033EvtAvatarLockChairRsp.proto\032\014Vector.pr" +
-      "oto\"{\n\025EvtAvatarLockChairRsp\022\020\n\010chair_id" +
-      "\030\004 \001(\004\022\031\n\010position\030\003 \001(\0132\007.Vector\022\017\n\007ret" +
-      "code\030\t \001(\005\022\021\n\tentity_id\030\007 \001(\r\022\021\n\tdirecti" +
-      "on\030\002 \001(\005B\033\n\031emu.grasscutter.net.protob\006p" +
+      "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" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -957,7 +947,7 @@ public final class EvtAvatarLockChairRspOuterClass {
     internal_static_EvtAvatarLockChairRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtAvatarLockChairRsp_descriptor,
-        new java.lang.String[] { "ChairId", "Position", "Retcode", "EntityId", "Direction", });
+        new java.lang.String[] { "EntityId", "Direction", "Retcode", "ChairId", "Position", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java
index 94e5d7c38..ad2530d13 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarSitDownNotifyOuterClass.java
@@ -19,42 +19,41 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 chair_id = 6;</code>
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint64 chair_id = 3;</code>
      * @return The chairId.
      */
     long getChairId();
 
     /**
-     * <code>int32 direction = 8;</code>
+     * <code>int32 direction = 10;</code>
      * @return The direction.
      */
     int getDirection();
 
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      * @return Whether the position field is set.
      */
     boolean hasPosition();
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      * @return The position.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 4;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 23010
-   * Obf: EGKACDGMPPG
+   * CmdId: 22638
    * </pre>
    *
    * Protobuf type {@code EvtAvatarSitDownNotify}
@@ -101,22 +100,22 @@ public final class EvtAvatarSitDownNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
               entityId_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 24: {
 
               chairId_ = input.readUInt64();
               break;
             }
-            case 64: {
+            case 80: {
 
               direction_ = input.readInt32();
               break;
             }
-            case 74: {
+            case 90: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -161,10 +160,21 @@ public final class EvtAvatarSitDownNotifyOuterClass {
               emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify.class, emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify.Builder.class);
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 6;
+    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 CHAIR_ID_FIELD_NUMBER = 3;
     private long chairId_;
     /**
-     * <code>uint64 chair_id = 6;</code>
+     * <code>uint64 chair_id = 3;</code>
      * @return The chairId.
      */
     @java.lang.Override
@@ -172,10 +182,10 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       return chairId_;
     }
 
-    public static final int DIRECTION_FIELD_NUMBER = 8;
+    public static final int DIRECTION_FIELD_NUMBER = 10;
     private int direction_;
     /**
-     * <code>int32 direction = 8;</code>
+     * <code>int32 direction = 10;</code>
      * @return The direction.
      */
     @java.lang.Override
@@ -183,10 +193,10 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       return direction_;
     }
 
-    public static final int POSITION_FIELD_NUMBER = 9;
+    public static final int POSITION_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      * @return Whether the position field is set.
      */
     @java.lang.Override
@@ -194,7 +204,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       return position_ != null;
     }
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      * @return The position.
      */
     @java.lang.Override
@@ -202,24 +212,13 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
     }
     /**
-     * <code>.Vector position = 9;</code>
+     * <code>.Vector position = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
       return getPosition();
     }
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -235,16 +234,16 @@ public final class EvtAvatarSitDownNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityId_ != 0) {
-        output.writeUInt32(4, entityId_);
+        output.writeUInt32(1, entityId_);
       }
       if (chairId_ != 0L) {
-        output.writeUInt64(6, chairId_);
+        output.writeUInt64(3, chairId_);
       }
       if (direction_ != 0) {
-        output.writeInt32(8, direction_);
+        output.writeInt32(10, direction_);
       }
       if (position_ != null) {
-        output.writeMessage(9, getPosition());
+        output.writeMessage(11, getPosition());
       }
       unknownFields.writeTo(output);
     }
@@ -257,19 +256,19 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       size = 0;
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, entityId_);
+          .computeUInt32Size(1, entityId_);
       }
       if (chairId_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, chairId_);
+          .computeUInt64Size(3, chairId_);
       }
       if (direction_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, direction_);
+          .computeInt32Size(10, direction_);
       }
       if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getPosition());
+          .computeMessageSize(11, getPosition());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -286,6 +285,8 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify other = (emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (getChairId()
           != other.getChairId()) return false;
       if (getDirection()
@@ -295,8 +296,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         if (!getPosition()
             .equals(other.getPosition())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -308,6 +307,8 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      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());
@@ -317,8 +318,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         hash = (37 * hash) + POSITION_FIELD_NUMBER;
         hash = (53 * hash) + getPosition().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,8 +415,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 23010
-     * Obf: EGKACDGMPPG
+     * CmdId: 22638
      * </pre>
      *
      * Protobuf type {@code EvtAvatarSitDownNotify}
@@ -457,6 +455,8 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         chairId_ = 0L;
 
         direction_ = 0;
@@ -467,8 +467,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
           position_ = null;
           positionBuilder_ = null;
         }
-        entityId_ = 0;
-
         return this;
       }
 
@@ -495,6 +493,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify buildPartial() {
         emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify result = new emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify(this);
+        result.entityId_ = entityId_;
         result.chairId_ = chairId_;
         result.direction_ = direction_;
         if (positionBuilder_ == null) {
@@ -502,7 +501,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         } else {
           result.position_ = positionBuilder_.build();
         }
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -551,6 +549,9 @@ public final class EvtAvatarSitDownNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify other) {
         if (other == emu.grasscutter.net.proto.EvtAvatarSitDownNotifyOuterClass.EvtAvatarSitDownNotify.getDefaultInstance()) return this;
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         if (other.getChairId() != 0L) {
           setChairId(other.getChairId());
         }
@@ -560,9 +561,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         if (other.hasPosition()) {
           mergePosition(other.getPosition());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -592,9 +590,40 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         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 long chairId_ ;
       /**
-       * <code>uint64 chair_id = 6;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @return The chairId.
        */
       @java.lang.Override
@@ -602,7 +631,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return chairId_;
       }
       /**
-       * <code>uint64 chair_id = 6;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @param value The chairId to set.
        * @return This builder for chaining.
        */
@@ -613,7 +642,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 chair_id = 6;</code>
+       * <code>uint64 chair_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearChairId() {
@@ -625,7 +654,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
 
       private int direction_ ;
       /**
-       * <code>int32 direction = 8;</code>
+       * <code>int32 direction = 10;</code>
        * @return The direction.
        */
       @java.lang.Override
@@ -633,7 +662,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return direction_;
       }
       /**
-       * <code>int32 direction = 8;</code>
+       * <code>int32 direction = 10;</code>
        * @param value The direction to set.
        * @return This builder for chaining.
        */
@@ -644,7 +673,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>int32 direction = 8;</code>
+       * <code>int32 direction = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDirection() {
@@ -658,14 +687,14 @@ public final class EvtAvatarSitDownNotifyOuterClass {
       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 = 9;</code>
+       * <code>.Vector position = 11;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -676,7 +705,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -692,7 +721,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -706,7 +735,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -724,7 +753,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -738,7 +767,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -746,7 +775,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -757,7 +786,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 9;</code>
+       * <code>.Vector position = 11;</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> 
@@ -772,37 +801,6 @@ public final class EvtAvatarSitDownNotifyOuterClass {
         }
         return positionBuilder_;
       }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -871,9 +869,9 @@ public final class EvtAvatarSitDownNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034EvtAvatarSitDownNotify.proto\032\014Vector.p" +
-      "roto\"k\n\026EvtAvatarSitDownNotify\022\020\n\010chair_" +
-      "id\030\006 \001(\004\022\021\n\tdirection\030\010 \001(\005\022\031\n\010position\030" +
-      "\t \001(\0132\007.Vector\022\021\n\tentity_id\030\004 \001(\rB\033\n\031emu" +
+      "roto\"k\n\026EvtAvatarSitDownNotify\022\021\n\tentity" +
+      "_id\030\001 \001(\r\022\020\n\010chair_id\030\003 \001(\004\022\021\n\tdirection" +
+      "\030\n \001(\005\022\031\n\010position\030\013 \001(\0132\007.VectorB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -886,7 +884,7 @@ public final class EvtAvatarSitDownNotifyOuterClass {
     internal_static_EvtAvatarSitDownNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtAvatarSitDownNotify_descriptor,
-        new java.lang.String[] { "ChairId", "Direction", "Position", "EntityId", });
+        new java.lang.String[] { "EntityId", "ChairId", "Direction", "Position", });
     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 b52e4a6d9..1991d424c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtAvatarStandUpNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 direction = 14;</code>
-     * @return The direction.
-     */
-    int getDirection();
-
-    /**
-     * <code>uint64 chair_id = 8;</code>
+     * <code>uint64 chair_id = 3;</code>
      * @return The chairId.
      */
     long getChairId();
 
     /**
-     * <code>int32 performId = 12;</code>
+     * <code>int32 perform_id = 7;</code>
      * @return The performId.
      */
     int getPerformId();
 
     /**
-     * <code>uint32 entity_id = 6;</code>
+     * <code>uint32 entity_id = 13;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>int32 direction = 14;</code>
+     * @return The direction.
+     */
+    int getDirection();
   }
   /**
-   * <pre>
-   * CmdId: 8332
-   * Obf: JOAGCKEBIGN
-   * </pre>
-   *
    * Protobuf type {@code EvtAvatarStandUpNotify}
    */
   public static final class EvtAvatarStandUpNotify extends
@@ -92,21 +87,21 @@ public final class EvtAvatarStandUpNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 24: {
 
               chairId_ = input.readUInt64();
               break;
             }
-            case 96: {
+            case 56: {
 
               performId_ = input.readInt32();
               break;
             }
+            case 104: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
             case 112: {
 
               direction_ = input.readInt32();
@@ -144,6 +139,39 @@ public final class EvtAvatarStandUpNotifyOuterClass {
               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_;
+    /**
+     * <code>uint64 chair_id = 3;</code>
+     * @return The chairId.
+     */
+    @java.lang.Override
+    public long getChairId() {
+      return chairId_;
+    }
+
+    public static final int PERFORM_ID_FIELD_NUMBER = 7;
+    private int performId_;
+    /**
+     * <code>int32 perform_id = 7;</code>
+     * @return The performId.
+     */
+    @java.lang.Override
+    public int getPerformId() {
+      return performId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 13;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 13;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     public static final int DIRECTION_FIELD_NUMBER = 14;
     private int direction_;
     /**
@@ -155,39 +183,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       return direction_;
     }
 
-    public static final int CHAIR_ID_FIELD_NUMBER = 8;
-    private long chairId_;
-    /**
-     * <code>uint64 chair_id = 8;</code>
-     * @return The chairId.
-     */
-    @java.lang.Override
-    public long getChairId() {
-      return chairId_;
-    }
-
-    public static final int PERFORMID_FIELD_NUMBER = 12;
-    private int performId_;
-    /**
-     * <code>int32 performId = 12;</code>
-     * @return The performId.
-     */
-    @java.lang.Override
-    public int getPerformId() {
-      return performId_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 6;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 6;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,14 +197,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityId_ != 0) {
-        output.writeUInt32(6, entityId_);
-      }
       if (chairId_ != 0L) {
-        output.writeUInt64(8, chairId_);
+        output.writeUInt64(3, chairId_);
       }
       if (performId_ != 0) {
-        output.writeInt32(12, performId_);
+        output.writeInt32(7, performId_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(13, entityId_);
       }
       if (direction_ != 0) {
         output.writeInt32(14, direction_);
@@ -223,17 +218,17 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, entityId_);
-      }
       if (chairId_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, chairId_);
+          .computeUInt64Size(3, chairId_);
       }
       if (performId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, performId_);
+          .computeInt32Size(7, performId_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, entityId_);
       }
       if (direction_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -254,14 +249,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other = (emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify) obj;
 
-      if (getDirection()
-          != other.getDirection()) return false;
       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 (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +268,15 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      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) + PERFORMID_FIELD_NUMBER;
+      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,11 +373,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8332
-     * Obf: JOAGCKEBIGN
-     * </pre>
-     *
      * Protobuf type {@code EvtAvatarStandUpNotify}
      */
     public static final class Builder extends
@@ -420,14 +410,14 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        direction_ = 0;
-
         chairId_ = 0L;
 
         performId_ = 0;
 
         entityId_ = 0;
 
+        direction_ = 0;
+
         return this;
       }
 
@@ -454,10 +444,10 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       @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.direction_ = direction_;
         result.chairId_ = chairId_;
         result.performId_ = performId_;
         result.entityId_ = entityId_;
+        result.direction_ = direction_;
         onBuilt();
         return result;
       }
@@ -506,9 +496,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify other) {
         if (other == emu.grasscutter.net.proto.EvtAvatarStandUpNotifyOuterClass.EvtAvatarStandUpNotify.getDefaultInstance()) return this;
-        if (other.getDirection() != 0) {
-          setDirection(other.getDirection());
-        }
         if (other.getChairId() != 0L) {
           setChairId(other.getChairId());
         }
@@ -518,6 +505,9 @@ public final class EvtAvatarStandUpNotifyOuterClass {
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.getDirection() != 0) {
+          setDirection(other.getDirection());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,6 +537,99 @@ public final class EvtAvatarStandUpNotifyOuterClass {
         return this;
       }
 
+      private long chairId_ ;
+      /**
+       * <code>uint64 chair_id = 3;</code>
+       * @return The chairId.
+       */
+      @java.lang.Override
+      public long getChairId() {
+        return chairId_;
+      }
+      /**
+       * <code>uint64 chair_id = 3;</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 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChairId() {
+        
+        chairId_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int performId_ ;
+      /**
+       * <code>int32 perform_id = 7;</code>
+       * @return The performId.
+       */
+      @java.lang.Override
+      public int getPerformId() {
+        return performId_;
+      }
+      /**
+       * <code>int32 perform_id = 7;</code>
+       * @param value The performId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPerformId(int value) {
+        
+        performId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 perform_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPerformId() {
+        
+        performId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 13;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 13;</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 = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int direction_ ;
       /**
        * <code>int32 direction = 14;</code>
@@ -577,99 +660,6 @@ public final class EvtAvatarStandUpNotifyOuterClass {
         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 int performId_ ;
-      /**
-       * <code>int32 performId = 12;</code>
-       * @return The performId.
-       */
-      @java.lang.Override
-      public int getPerformId() {
-        return performId_;
-      }
-      /**
-       * <code>int32 performId = 12;</code>
-       * @param value The performId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPerformId(int value) {
-        
-        performId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 performId = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPerformId() {
-        
-        performId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 6;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 6;</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 = 6;</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) {
@@ -737,11 +727,11 @@ public final class EvtAvatarStandUpNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034EvtAvatarStandUpNotify.proto\"c\n\026EvtAva" +
-      "tarStandUpNotify\022\021\n\tdirection\030\016 \001(\005\022\020\n\010c" +
-      "hair_id\030\010 \001(\004\022\021\n\tperformId\030\014 \001(\005\022\021\n\tenti" +
-      "ty_id\030\006 \001(\rB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "\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" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -752,7 +742,7 @@ public final class EvtAvatarStandUpNotifyOuterClass {
     internal_static_EvtAvatarStandUpNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtAvatarStandUpNotify_descriptor,
-        new java.lang.String[] { "Direction", "ChairId", "PerformId", "EntityId", });
+        new java.lang.String[] { "ChairId", "PerformId", "EntityId", "Direction", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHealedNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHealedNotifyOuterClass.java
index 6ec42989d..5cd4081fe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHealedNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHealedNotifyOuterClass.java
@@ -19,35 +19,56 @@ public final class EvtBeingHealedNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 source_id = 5;</code>
+     * <pre>
+     * 8
+     * </pre>
+     *
+     * <code>float heal_amount = 4;</code>
+     * @return The healAmount.
+     */
+    float getHealAmount();
+
+    /**
+     * <code>bool NNDDEADLGGD = 7;</code>
+     * @return The nNDDEADLGGD.
+     */
+    boolean getNNDDEADLGGD();
+
+    /**
+     * <pre>
+     * 4
+     * </pre>
+     *
+     * <code>float real_heal_amount = 8;</code>
+     * @return The realHealAmount.
+     */
+    float getRealHealAmount();
+
+    /**
+     * <code>uint32 source_id = 9;</code>
      * @return The sourceId.
      */
     int getSourceId();
 
     /**
-     * <code>float NNKHJEJKNDO = 8;</code>
-     * @return The nNKHJEJKNDO.
+     * <code>string AHCFMJJLEJN = 11;</code>
+     * @return The aHCFMJJLEJN.
      */
-    float getNNKHJEJKNDO();
+    java.lang.String getAHCFMJJLEJN();
+    /**
+     * <code>string AHCFMJJLEJN = 11;</code>
+     * @return The bytes for aHCFMJJLEJN.
+     */
+    com.google.protobuf.ByteString
+        getAHCFMJJLEJNBytes();
 
     /**
-     * <code>float OHLCBKLHLGL = 3;</code>
-     * @return The oHLCBKLHLGL.
-     */
-    float getOHLCBKLHLGL();
-
-    /**
-     * <code>uint32 target_id = 7;</code>
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     int getTargetId();
   }
   /**
-   * <pre>
-   * CmdId: 4595
-   * Obf: MJNMJNGNOJO
-   * </pre>
-   *
    * Protobuf type {@code EvtBeingHealedNotify}
    */
   public static final class EvtBeingHealedNotify extends
@@ -60,6 +81,7 @@ public final class EvtBeingHealedNotifyOuterClass {
       super(builder);
     }
     private EvtBeingHealedNotify() {
+      aHCFMJJLEJN_ = "";
     }
 
     @java.lang.Override
@@ -92,24 +114,35 @@ public final class EvtBeingHealedNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 29: {
+            case 37: {
 
-              oHLCBKLHLGL_ = input.readFloat();
-              break;
-            }
-            case 40: {
-
-              sourceId_ = input.readUInt32();
+              healAmount_ = input.readFloat();
               break;
             }
             case 56: {
 
-              targetId_ = input.readUInt32();
+              nNDDEADLGGD_ = input.readBool();
               break;
             }
             case 69: {
 
-              nNKHJEJKNDO_ = input.readFloat();
+              realHealAmount_ = input.readFloat();
+              break;
+            }
+            case 72: {
+
+              sourceId_ = input.readUInt32();
+              break;
+            }
+            case 90: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              aHCFMJJLEJN_ = s;
+              break;
+            }
+            case 104: {
+
+              targetId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,10 +177,51 @@ public final class EvtBeingHealedNotifyOuterClass {
               emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify.class, emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify.Builder.class);
     }
 
-    public static final int SOURCE_ID_FIELD_NUMBER = 5;
+    public static final int HEAL_AMOUNT_FIELD_NUMBER = 4;
+    private float healAmount_;
+    /**
+     * <pre>
+     * 8
+     * </pre>
+     *
+     * <code>float heal_amount = 4;</code>
+     * @return The healAmount.
+     */
+    @java.lang.Override
+    public float getHealAmount() {
+      return healAmount_;
+    }
+
+    public static final int NNDDEADLGGD_FIELD_NUMBER = 7;
+    private boolean nNDDEADLGGD_;
+    /**
+     * <code>bool NNDDEADLGGD = 7;</code>
+     * @return The nNDDEADLGGD.
+     */
+    @java.lang.Override
+    public boolean getNNDDEADLGGD() {
+      return nNDDEADLGGD_;
+    }
+
+    public static final int REAL_HEAL_AMOUNT_FIELD_NUMBER = 8;
+    private float realHealAmount_;
+    /**
+     * <pre>
+     * 4
+     * </pre>
+     *
+     * <code>float real_heal_amount = 8;</code>
+     * @return The realHealAmount.
+     */
+    @java.lang.Override
+    public float getRealHealAmount() {
+      return realHealAmount_;
+    }
+
+    public static final int SOURCE_ID_FIELD_NUMBER = 9;
     private int sourceId_;
     /**
-     * <code>uint32 source_id = 5;</code>
+     * <code>uint32 source_id = 9;</code>
      * @return The sourceId.
      */
     @java.lang.Override
@@ -155,32 +229,48 @@ public final class EvtBeingHealedNotifyOuterClass {
       return sourceId_;
     }
 
-    public static final int NNKHJEJKNDO_FIELD_NUMBER = 8;
-    private float nNKHJEJKNDO_;
+    public static final int AHCFMJJLEJN_FIELD_NUMBER = 11;
+    private volatile java.lang.Object aHCFMJJLEJN_;
     /**
-     * <code>float NNKHJEJKNDO = 8;</code>
-     * @return The nNKHJEJKNDO.
+     * <code>string AHCFMJJLEJN = 11;</code>
+     * @return The aHCFMJJLEJN.
      */
     @java.lang.Override
-    public float getNNKHJEJKNDO() {
-      return nNKHJEJKNDO_;
+    public java.lang.String getAHCFMJJLEJN() {
+      java.lang.Object ref = aHCFMJJLEJN_;
+      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();
+        aHCFMJJLEJN_ = s;
+        return s;
+      }
     }
-
-    public static final int OHLCBKLHLGL_FIELD_NUMBER = 3;
-    private float oHLCBKLHLGL_;
     /**
-     * <code>float OHLCBKLHLGL = 3;</code>
-     * @return The oHLCBKLHLGL.
+     * <code>string AHCFMJJLEJN = 11;</code>
+     * @return The bytes for aHCFMJJLEJN.
      */
     @java.lang.Override
-    public float getOHLCBKLHLGL() {
-      return oHLCBKLHLGL_;
+    public com.google.protobuf.ByteString
+        getAHCFMJJLEJNBytes() {
+      java.lang.Object ref = aHCFMJJLEJN_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        aHCFMJJLEJN_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int TARGET_ID_FIELD_NUMBER = 7;
+    public static final int TARGET_ID_FIELD_NUMBER = 13;
     private int targetId_;
     /**
-     * <code>uint32 target_id = 7;</code>
+     * <code>uint32 target_id = 13;</code>
      * @return The targetId.
      */
     @java.lang.Override
@@ -202,17 +292,23 @@ public final class EvtBeingHealedNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (oHLCBKLHLGL_ != 0F) {
-        output.writeFloat(3, oHLCBKLHLGL_);
+      if (healAmount_ != 0F) {
+        output.writeFloat(4, healAmount_);
+      }
+      if (nNDDEADLGGD_ != false) {
+        output.writeBool(7, nNDDEADLGGD_);
+      }
+      if (realHealAmount_ != 0F) {
+        output.writeFloat(8, realHealAmount_);
       }
       if (sourceId_ != 0) {
-        output.writeUInt32(5, sourceId_);
+        output.writeUInt32(9, sourceId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(aHCFMJJLEJN_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, aHCFMJJLEJN_);
       }
       if (targetId_ != 0) {
-        output.writeUInt32(7, targetId_);
-      }
-      if (nNKHJEJKNDO_ != 0F) {
-        output.writeFloat(8, nNKHJEJKNDO_);
+        output.writeUInt32(13, targetId_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +319,28 @@ public final class EvtBeingHealedNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (oHLCBKLHLGL_ != 0F) {
+      if (healAmount_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(3, oHLCBKLHLGL_);
+          .computeFloatSize(4, healAmount_);
+      }
+      if (nNDDEADLGGD_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(7, nNDDEADLGGD_);
+      }
+      if (realHealAmount_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(8, realHealAmount_);
       }
       if (sourceId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sourceId_);
+          .computeUInt32Size(9, sourceId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(aHCFMJJLEJN_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, aHCFMJJLEJN_);
       }
       if (targetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, targetId_);
-      }
-      if (nNKHJEJKNDO_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(8, nNKHJEJKNDO_);
+          .computeUInt32Size(13, targetId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +357,18 @@ public final class EvtBeingHealedNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify other = (emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify) obj;
 
+      if (java.lang.Float.floatToIntBits(getHealAmount())
+          != java.lang.Float.floatToIntBits(
+              other.getHealAmount())) return false;
+      if (getNNDDEADLGGD()
+          != other.getNNDDEADLGGD()) return false;
+      if (java.lang.Float.floatToIntBits(getRealHealAmount())
+          != java.lang.Float.floatToIntBits(
+              other.getRealHealAmount())) return false;
       if (getSourceId()
           != other.getSourceId()) return false;
-      if (java.lang.Float.floatToIntBits(getNNKHJEJKNDO())
-          != java.lang.Float.floatToIntBits(
-              other.getNNKHJEJKNDO())) return false;
-      if (java.lang.Float.floatToIntBits(getOHLCBKLHLGL())
-          != java.lang.Float.floatToIntBits(
-              other.getOHLCBKLHLGL())) return false;
+      if (!getAHCFMJJLEJN()
+          .equals(other.getAHCFMJJLEJN())) return false;
       if (getTargetId()
           != other.getTargetId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -275,14 +382,19 @@ public final class EvtBeingHealedNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + HEAL_AMOUNT_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getHealAmount());
+      hash = (37 * hash) + NNDDEADLGGD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getNNDDEADLGGD());
+      hash = (37 * hash) + REAL_HEAL_AMOUNT_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getRealHealAmount());
       hash = (37 * hash) + SOURCE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSourceId();
-      hash = (37 * hash) + NNKHJEJKNDO_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNNKHJEJKNDO());
-      hash = (37 * hash) + OHLCBKLHLGL_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getOHLCBKLHLGL());
+      hash = (37 * hash) + AHCFMJJLEJN_FIELD_NUMBER;
+      hash = (53 * hash) + getAHCFMJJLEJN().hashCode();
       hash = (37 * hash) + TARGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -381,11 +493,6 @@ public final class EvtBeingHealedNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4595
-     * Obf: MJNMJNGNOJO
-     * </pre>
-     *
      * Protobuf type {@code EvtBeingHealedNotify}
      */
     public static final class Builder extends
@@ -423,11 +530,15 @@ public final class EvtBeingHealedNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        healAmount_ = 0F;
+
+        nNDDEADLGGD_ = false;
+
+        realHealAmount_ = 0F;
+
         sourceId_ = 0;
 
-        nNKHJEJKNDO_ = 0F;
-
-        oHLCBKLHLGL_ = 0F;
+        aHCFMJJLEJN_ = "";
 
         targetId_ = 0;
 
@@ -457,9 +568,11 @@ public final class EvtBeingHealedNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify buildPartial() {
         emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify result = new emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify(this);
+        result.healAmount_ = healAmount_;
+        result.nNDDEADLGGD_ = nNDDEADLGGD_;
+        result.realHealAmount_ = realHealAmount_;
         result.sourceId_ = sourceId_;
-        result.nNKHJEJKNDO_ = nNKHJEJKNDO_;
-        result.oHLCBKLHLGL_ = oHLCBKLHLGL_;
+        result.aHCFMJJLEJN_ = aHCFMJJLEJN_;
         result.targetId_ = targetId_;
         onBuilt();
         return result;
@@ -509,14 +622,21 @@ public final class EvtBeingHealedNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify other) {
         if (other == emu.grasscutter.net.proto.EvtBeingHealedNotifyOuterClass.EvtBeingHealedNotify.getDefaultInstance()) return this;
+        if (other.getHealAmount() != 0F) {
+          setHealAmount(other.getHealAmount());
+        }
+        if (other.getNNDDEADLGGD() != false) {
+          setNNDDEADLGGD(other.getNNDDEADLGGD());
+        }
+        if (other.getRealHealAmount() != 0F) {
+          setRealHealAmount(other.getRealHealAmount());
+        }
         if (other.getSourceId() != 0) {
           setSourceId(other.getSourceId());
         }
-        if (other.getNNKHJEJKNDO() != 0F) {
-          setNNKHJEJKNDO(other.getNNKHJEJKNDO());
-        }
-        if (other.getOHLCBKLHLGL() != 0F) {
-          setOHLCBKLHLGL(other.getOHLCBKLHLGL());
+        if (!other.getAHCFMJJLEJN().isEmpty()) {
+          aHCFMJJLEJN_ = other.aHCFMJJLEJN_;
+          onChanged();
         }
         if (other.getTargetId() != 0) {
           setTargetId(other.getTargetId());
@@ -550,9 +670,126 @@ public final class EvtBeingHealedNotifyOuterClass {
         return this;
       }
 
+      private float healAmount_ ;
+      /**
+       * <pre>
+       * 8
+       * </pre>
+       *
+       * <code>float heal_amount = 4;</code>
+       * @return The healAmount.
+       */
+      @java.lang.Override
+      public float getHealAmount() {
+        return healAmount_;
+      }
+      /**
+       * <pre>
+       * 8
+       * </pre>
+       *
+       * <code>float heal_amount = 4;</code>
+       * @param value The healAmount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHealAmount(float value) {
+        
+        healAmount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 8
+       * </pre>
+       *
+       * <code>float heal_amount = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHealAmount() {
+        
+        healAmount_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private boolean nNDDEADLGGD_ ;
+      /**
+       * <code>bool NNDDEADLGGD = 7;</code>
+       * @return The nNDDEADLGGD.
+       */
+      @java.lang.Override
+      public boolean getNNDDEADLGGD() {
+        return nNDDEADLGGD_;
+      }
+      /**
+       * <code>bool NNDDEADLGGD = 7;</code>
+       * @param value The nNDDEADLGGD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNNDDEADLGGD(boolean value) {
+        
+        nNDDEADLGGD_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool NNDDEADLGGD = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNNDDEADLGGD() {
+        
+        nNDDEADLGGD_ = false;
+        onChanged();
+        return this;
+      }
+
+      private float realHealAmount_ ;
+      /**
+       * <pre>
+       * 4
+       * </pre>
+       *
+       * <code>float real_heal_amount = 8;</code>
+       * @return The realHealAmount.
+       */
+      @java.lang.Override
+      public float getRealHealAmount() {
+        return realHealAmount_;
+      }
+      /**
+       * <pre>
+       * 4
+       * </pre>
+       *
+       * <code>float real_heal_amount = 8;</code>
+       * @param value The realHealAmount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRealHealAmount(float value) {
+        
+        realHealAmount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 4
+       * </pre>
+       *
+       * <code>float real_heal_amount = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRealHealAmount() {
+        
+        realHealAmount_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private int sourceId_ ;
       /**
-       * <code>uint32 source_id = 5;</code>
+       * <code>uint32 source_id = 9;</code>
        * @return The sourceId.
        */
       @java.lang.Override
@@ -560,7 +797,7 @@ public final class EvtBeingHealedNotifyOuterClass {
         return sourceId_;
       }
       /**
-       * <code>uint32 source_id = 5;</code>
+       * <code>uint32 source_id = 9;</code>
        * @param value The sourceId to set.
        * @return This builder for chaining.
        */
@@ -571,7 +808,7 @@ public final class EvtBeingHealedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 source_id = 5;</code>
+       * <code>uint32 source_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearSourceId() {
@@ -581,71 +818,85 @@ public final class EvtBeingHealedNotifyOuterClass {
         return this;
       }
 
-      private float nNKHJEJKNDO_ ;
+      private java.lang.Object aHCFMJJLEJN_ = "";
       /**
-       * <code>float NNKHJEJKNDO = 8;</code>
-       * @return The nNKHJEJKNDO.
+       * <code>string AHCFMJJLEJN = 11;</code>
+       * @return The aHCFMJJLEJN.
        */
-      @java.lang.Override
-      public float getNNKHJEJKNDO() {
-        return nNKHJEJKNDO_;
+      public java.lang.String getAHCFMJJLEJN() {
+        java.lang.Object ref = aHCFMJJLEJN_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          aHCFMJJLEJN_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>float NNKHJEJKNDO = 8;</code>
-       * @param value The nNKHJEJKNDO to set.
+       * <code>string AHCFMJJLEJN = 11;</code>
+       * @return The bytes for aHCFMJJLEJN.
+       */
+      public com.google.protobuf.ByteString
+          getAHCFMJJLEJNBytes() {
+        java.lang.Object ref = aHCFMJJLEJN_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          aHCFMJJLEJN_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string AHCFMJJLEJN = 11;</code>
+       * @param value The aHCFMJJLEJN to set.
        * @return This builder for chaining.
        */
-      public Builder setNNKHJEJKNDO(float value) {
-        
-        nNKHJEJKNDO_ = value;
+      public Builder setAHCFMJJLEJN(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        aHCFMJJLEJN_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float NNKHJEJKNDO = 8;</code>
+       * <code>string AHCFMJJLEJN = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNNKHJEJKNDO() {
+      public Builder clearAHCFMJJLEJN() {
         
-        nNKHJEJKNDO_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private float oHLCBKLHLGL_ ;
-      /**
-       * <code>float OHLCBKLHLGL = 3;</code>
-       * @return The oHLCBKLHLGL.
-       */
-      @java.lang.Override
-      public float getOHLCBKLHLGL() {
-        return oHLCBKLHLGL_;
-      }
-      /**
-       * <code>float OHLCBKLHLGL = 3;</code>
-       * @param value The oHLCBKLHLGL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOHLCBKLHLGL(float value) {
-        
-        oHLCBKLHLGL_ = value;
+        aHCFMJJLEJN_ = getDefaultInstance().getAHCFMJJLEJN();
         onChanged();
         return this;
       }
       /**
-       * <code>float OHLCBKLHLGL = 3;</code>
+       * <code>string AHCFMJJLEJN = 11;</code>
+       * @param value The bytes for aHCFMJJLEJN to set.
        * @return This builder for chaining.
        */
-      public Builder clearOHLCBKLHLGL() {
+      public Builder setAHCFMJJLEJNBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
         
-        oHLCBKLHLGL_ = 0F;
+        aHCFMJJLEJN_ = value;
         onChanged();
         return this;
       }
 
       private int targetId_ ;
       /**
-       * <code>uint32 target_id = 7;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return The targetId.
        */
       @java.lang.Override
@@ -653,7 +904,7 @@ public final class EvtBeingHealedNotifyOuterClass {
         return targetId_;
       }
       /**
-       * <code>uint32 target_id = 7;</code>
+       * <code>uint32 target_id = 13;</code>
        * @param value The targetId to set.
        * @return This builder for chaining.
        */
@@ -664,7 +915,7 @@ public final class EvtBeingHealedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_id = 7;</code>
+       * <code>uint32 target_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetId() {
@@ -740,11 +991,12 @@ public final class EvtBeingHealedNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032EvtBeingHealedNotify.proto\"f\n\024EvtBeing" +
-      "HealedNotify\022\021\n\tsource_id\030\005 \001(\r\022\023\n\013NNKHJ" +
-      "EJKNDO\030\010 \001(\002\022\023\n\013OHLCBKLHLGL\030\003 \001(\002\022\021\n\ttar" +
-      "get_id\030\007 \001(\rB\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\n\032EvtBeingHealedNotify.proto\"\225\001\n\024EvtBein" +
+      "gHealedNotify\022\023\n\013heal_amount\030\004 \001(\002\022\023\n\013NN" +
+      "DDEADLGGD\030\007 \001(\010\022\030\n\020real_heal_amount\030\010 \001(" +
+      "\002\022\021\n\tsource_id\030\t \001(\r\022\023\n\013AHCFMJJLEJN\030\013 \001(" +
+      "\t\022\021\n\ttarget_id\030\r \001(\rB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -755,7 +1007,7 @@ public final class EvtBeingHealedNotifyOuterClass {
     internal_static_EvtBeingHealedNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtBeingHealedNotify_descriptor,
-        new java.lang.String[] { "SourceId", "NNKHJEJKNDO", "OHLCBKLHLGL", "TargetId", });
+        new java.lang.String[] { "HealAmount", "NNDDEADLGGD", "RealHealAmount", "SourceId", "AHCFMJJLEJN", "TargetId", });
   }
 
   // @@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 83776e955..68d043f84 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitInfoOuterClass.java
@@ -19,37 +19,33 @@ public final class EvtBeingHitInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 peer_id = 4;</code>
-     * @return The peerId.
-     */
-    int getPeerId();
-
-    /**
-     * <code>uint32 frame_num = 15;</code>
+     * <code>uint32 frame_num = 4;</code>
      * @return The frameNum.
      */
     int getFrameNum();
 
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>uint32 peer_id = 9;</code>
+     * @return The peerId.
+     */
+    int getPeerId();
+
+    /**
+     * <code>.AttackResult attack_result = 12;</code>
      * @return Whether the attackResult field is set.
      */
     boolean hasAttackResult();
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>.AttackResult attack_result = 12;</code>
      * @return The attackResult.
      */
     emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult();
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>.AttackResult attack_result = 12;</code>
      */
     emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: LGMKEKBEELG
-   * </pre>
-   *
    * Protobuf type {@code EvtBeingHitInfo}
    */
   public static final class EvtBeingHitInfo extends
@@ -96,10 +92,15 @@ public final class EvtBeingHitInfoOuterClass {
               break;
             case 32: {
 
+              frameNum_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
               peerId_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 98: {
               emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder subBuilder = null;
               if (attackResult_ != null) {
                 subBuilder = attackResult_.toBuilder();
@@ -112,11 +113,6 @@ public final class EvtBeingHitInfoOuterClass {
 
               break;
             }
-            case 120: {
-
-              frameNum_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,21 +145,10 @@ public final class EvtBeingHitInfoOuterClass {
               emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.class, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder.class);
     }
 
-    public static final int PEER_ID_FIELD_NUMBER = 4;
-    private int peerId_;
-    /**
-     * <code>uint32 peer_id = 4;</code>
-     * @return The peerId.
-     */
-    @java.lang.Override
-    public int getPeerId() {
-      return peerId_;
-    }
-
-    public static final int FRAME_NUM_FIELD_NUMBER = 15;
+    public static final int FRAME_NUM_FIELD_NUMBER = 4;
     private int frameNum_;
     /**
-     * <code>uint32 frame_num = 15;</code>
+     * <code>uint32 frame_num = 4;</code>
      * @return The frameNum.
      */
     @java.lang.Override
@@ -171,10 +156,21 @@ public final class EvtBeingHitInfoOuterClass {
       return frameNum_;
     }
 
-    public static final int ATTACK_RESULT_FIELD_NUMBER = 10;
+    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;
     private emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult attackResult_;
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>.AttackResult attack_result = 12;</code>
      * @return Whether the attackResult field is set.
      */
     @java.lang.Override
@@ -182,7 +178,7 @@ public final class EvtBeingHitInfoOuterClass {
       return attackResult_ != null;
     }
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>.AttackResult attack_result = 12;</code>
      * @return The attackResult.
      */
     @java.lang.Override
@@ -190,7 +186,7 @@ public final class EvtBeingHitInfoOuterClass {
       return attackResult_ == null ? emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.getDefaultInstance() : attackResult_;
     }
     /**
-     * <code>.AttackResult attack_result = 10;</code>
+     * <code>.AttackResult attack_result = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
@@ -211,14 +207,14 @@ public final class EvtBeingHitInfoOuterClass {
     @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(4, peerId_);
+        output.writeUInt32(9, peerId_);
       }
       if (attackResult_ != null) {
-        output.writeMessage(10, getAttackResult());
-      }
-      if (frameNum_ != 0) {
-        output.writeUInt32(15, frameNum_);
+        output.writeMessage(12, getAttackResult());
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +225,17 @@ public final class EvtBeingHitInfoOuterClass {
       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(4, peerId_);
+          .computeUInt32Size(9, peerId_);
       }
       if (attackResult_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getAttackResult());
-      }
-      if (frameNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, frameNum_);
+          .computeMessageSize(12, getAttackResult());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,10 +252,10 @@ public final class EvtBeingHitInfoOuterClass {
       }
       emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other = (emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo) obj;
 
-      if (getPeerId()
-          != other.getPeerId()) return false;
       if (getFrameNum()
           != other.getFrameNum()) return false;
+      if (getPeerId()
+          != other.getPeerId()) return false;
       if (hasAttackResult() != other.hasAttackResult()) return false;
       if (hasAttackResult()) {
         if (!getAttackResult()
@@ -276,10 +272,10 @@ public final class EvtBeingHitInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPeerId();
       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();
@@ -380,10 +376,6 @@ public final class EvtBeingHitInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LGMKEKBEELG
-     * </pre>
-     *
      * Protobuf type {@code EvtBeingHitInfo}
      */
     public static final class Builder extends
@@ -421,10 +413,10 @@ public final class EvtBeingHitInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        peerId_ = 0;
-
         frameNum_ = 0;
 
+        peerId_ = 0;
+
         if (attackResultBuilder_ == null) {
           attackResult_ = null;
         } else {
@@ -457,8 +449,8 @@ public final class EvtBeingHitInfoOuterClass {
       @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.peerId_ = peerId_;
         result.frameNum_ = frameNum_;
+        result.peerId_ = peerId_;
         if (attackResultBuilder_ == null) {
           result.attackResult_ = attackResult_;
         } else {
@@ -512,12 +504,12 @@ public final class EvtBeingHitInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo other) {
         if (other == emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance()) return this;
-        if (other.getPeerId() != 0) {
-          setPeerId(other.getPeerId());
-        }
         if (other.getFrameNum() != 0) {
           setFrameNum(other.getFrameNum());
         }
+        if (other.getPeerId() != 0) {
+          setPeerId(other.getPeerId());
+        }
         if (other.hasAttackResult()) {
           mergeAttackResult(other.getAttackResult());
         }
@@ -550,40 +542,9 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
 
-      private int peerId_ ;
-      /**
-       * <code>uint32 peer_id = 4;</code>
-       * @return The peerId.
-       */
-      @java.lang.Override
-      public int getPeerId() {
-        return peerId_;
-      }
-      /**
-       * <code>uint32 peer_id = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPeerId() {
-        
-        peerId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int frameNum_ ;
       /**
-       * <code>uint32 frame_num = 15;</code>
+       * <code>uint32 frame_num = 4;</code>
        * @return The frameNum.
        */
       @java.lang.Override
@@ -591,7 +552,7 @@ public final class EvtBeingHitInfoOuterClass {
         return frameNum_;
       }
       /**
-       * <code>uint32 frame_num = 15;</code>
+       * <code>uint32 frame_num = 4;</code>
        * @param value The frameNum to set.
        * @return This builder for chaining.
        */
@@ -602,7 +563,7 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 frame_num = 15;</code>
+       * <code>uint32 frame_num = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearFrameNum() {
@@ -612,18 +573,49 @@ public final class EvtBeingHitInfoOuterClass {
         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 = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        * @return Whether the attackResult field is set.
        */
       public boolean hasAttackResult() {
         return attackResultBuilder_ != null || attackResult_ != null;
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        * @return The attackResult.
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult getAttackResult() {
@@ -634,7 +626,7 @@ public final class EvtBeingHitInfoOuterClass {
         }
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public Builder setAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
         if (attackResultBuilder_ == null) {
@@ -650,7 +642,7 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public Builder setAttackResult(
           emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder builderForValue) {
@@ -664,7 +656,7 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public Builder mergeAttackResult(emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult value) {
         if (attackResultBuilder_ == null) {
@@ -682,7 +674,7 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public Builder clearAttackResult() {
         if (attackResultBuilder_ == null) {
@@ -696,7 +688,7 @@ public final class EvtBeingHitInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResult.Builder getAttackResultBuilder() {
         
@@ -704,7 +696,7 @@ public final class EvtBeingHitInfoOuterClass {
         return getAttackResultFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</code>
        */
       public emu.grasscutter.net.proto.AttackResultOuterClass.AttackResultOrBuilder getAttackResultOrBuilder() {
         if (attackResultBuilder_ != null) {
@@ -715,7 +707,7 @@ public final class EvtBeingHitInfoOuterClass {
         }
       }
       /**
-       * <code>.AttackResult attack_result = 10;</code>
+       * <code>.AttackResult attack_result = 12;</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> 
@@ -798,8 +790,8 @@ public final class EvtBeingHitInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025EvtBeingHitInfo.proto\032\022AttackResult.pr" +
-      "oto\"[\n\017EvtBeingHitInfo\022\017\n\007peer_id\030\004 \001(\r\022" +
-      "\021\n\tframe_num\030\017 \001(\r\022$\n\rattack_result\030\n \001(" +
+      "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." +
       "protob\006proto3"
     };
@@ -813,7 +805,7 @@ public final class EvtBeingHitInfoOuterClass {
     internal_static_EvtBeingHitInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtBeingHitInfo_descriptor,
-        new java.lang.String[] { "PeerId", "FrameNum", "AttackResult", });
+        new java.lang.String[] { "FrameNum", "PeerId", "AttackResult", });
     emu.grasscutter.net.proto.AttackResultOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitNotifyOuterClass.java
index 90effe923..5200c9813 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitNotifyOuterClass.java
@@ -19,37 +19,32 @@ public final class EvtBeingHitNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ForwardType forward_type = 9;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    int getForwardTypeValue();
-    /**
-     * <code>.ForwardType forward_type = 9;</code>
-     * @return The forwardType.
-     */
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
-
-    /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      * @return Whether the beingHitInfo field is set.
      */
     boolean hasBeingHitInfo();
     /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      * @return The beingHitInfo.
      */
     emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getBeingHitInfo();
     /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      */
     emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getBeingHitInfoOrBuilder();
+
+    /**
+     * <code>.ForwardType forward_type = 11;</code>
+     * @return The enum numeric value on the wire for forwardType.
+     */
+    int getForwardTypeValue();
+    /**
+     * <code>.ForwardType forward_type = 11;</code>
+     * @return The forwardType.
+     */
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
   }
   /**
-   * <pre>
-   * CmdId: 8650
-   * Obf: OPODPPOAPKP
-   * </pre>
-   *
    * Protobuf type {@code EvtBeingHitNotify}
    */
   public static final class EvtBeingHitNotify extends
@@ -95,7 +90,7 @@ public final class EvtBeingHitNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 82: {
               emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder subBuilder = null;
               if (beingHitInfo_ != null) {
                 subBuilder = beingHitInfo_.toBuilder();
@@ -108,7 +103,7 @@ public final class EvtBeingHitNotifyOuterClass {
 
               break;
             }
-            case 72: {
+            case 88: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
@@ -146,29 +141,10 @@ public final class EvtBeingHitNotifyOuterClass {
               emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify.class, emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify.Builder.class);
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 9;
-    private int forwardType_;
-    /**
-     * <code>.ForwardType forward_type = 9;</code>
-     * @return The enum numeric value on the wire for forwardType.
-     */
-    @java.lang.Override public int getForwardTypeValue() {
-      return forwardType_;
-    }
-    /**
-     * <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 BEING_HIT_INFO_FIELD_NUMBER = 4;
+    public static final int BEING_HIT_INFO_FIELD_NUMBER = 10;
     private emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo beingHitInfo_;
     /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      * @return Whether the beingHitInfo field is set.
      */
     @java.lang.Override
@@ -176,7 +152,7 @@ public final class EvtBeingHitNotifyOuterClass {
       return beingHitInfo_ != null;
     }
     /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      * @return The beingHitInfo.
      */
     @java.lang.Override
@@ -184,13 +160,32 @@ public final class EvtBeingHitNotifyOuterClass {
       return beingHitInfo_ == null ? emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance() : beingHitInfo_;
     }
     /**
-     * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+     * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getBeingHitInfoOrBuilder() {
       return getBeingHitInfo();
     }
 
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 11;
+    private int forwardType_;
+    /**
+     * <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 = 11;</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;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -206,10 +201,10 @@ public final class EvtBeingHitNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (beingHitInfo_ != null) {
-        output.writeMessage(4, getBeingHitInfo());
+        output.writeMessage(10, getBeingHitInfo());
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(9, forwardType_);
+        output.writeEnum(11, forwardType_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,11 +217,11 @@ public final class EvtBeingHitNotifyOuterClass {
       size = 0;
       if (beingHitInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getBeingHitInfo());
+          .computeMessageSize(10, getBeingHitInfo());
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, forwardType_);
+          .computeEnumSize(11, forwardType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -243,12 +238,12 @@ public final class EvtBeingHitNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify other = (emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify) obj;
 
-      if (forwardType_ != other.forwardType_) return false;
       if (hasBeingHitInfo() != other.hasBeingHitInfo()) return false;
       if (hasBeingHitInfo()) {
         if (!getBeingHitInfo()
             .equals(other.getBeingHitInfo())) return false;
       }
+      if (forwardType_ != other.forwardType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -260,12 +255,12 @@ public final class EvtBeingHitNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
       if (hasBeingHitInfo()) {
         hash = (37 * hash) + BEING_HIT_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getBeingHitInfo().hashCode();
       }
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -362,11 +357,6 @@ public final class EvtBeingHitNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8650
-     * Obf: OPODPPOAPKP
-     * </pre>
-     *
      * Protobuf type {@code EvtBeingHitNotify}
      */
     public static final class Builder extends
@@ -404,14 +394,14 @@ public final class EvtBeingHitNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        forwardType_ = 0;
-
         if (beingHitInfoBuilder_ == null) {
           beingHitInfo_ = null;
         } else {
           beingHitInfo_ = null;
           beingHitInfoBuilder_ = null;
         }
+        forwardType_ = 0;
+
         return this;
       }
 
@@ -438,12 +428,12 @@ public final class EvtBeingHitNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify buildPartial() {
         emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify result = new emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify(this);
-        result.forwardType_ = forwardType_;
         if (beingHitInfoBuilder_ == null) {
           result.beingHitInfo_ = beingHitInfo_;
         } else {
           result.beingHitInfo_ = beingHitInfoBuilder_.build();
         }
+        result.forwardType_ = forwardType_;
         onBuilt();
         return result;
       }
@@ -492,12 +482,12 @@ public final class EvtBeingHitNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify other) {
         if (other == emu.grasscutter.net.proto.EvtBeingHitNotifyOuterClass.EvtBeingHitNotify.getDefaultInstance()) return this;
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
-        }
         if (other.hasBeingHitInfo()) {
           mergeBeingHitInfo(other.getBeingHitInfo());
         }
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -527,72 +517,18 @@ public final class EvtBeingHitNotifyOuterClass {
         return this;
       }
 
-      private int forwardType_ = 0;
-      /**
-       * <code>.ForwardType forward_type = 9;</code>
-       * @return The enum numeric value on the wire for forwardType.
-       */
-      @java.lang.Override public int getForwardTypeValue() {
-        return forwardType_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>.ForwardType forward_type = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardType() {
-        
-        forwardType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo beingHitInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> beingHitInfoBuilder_;
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        * @return Whether the beingHitInfo field is set.
        */
       public boolean hasBeingHitInfo() {
         return beingHitInfoBuilder_ != null || beingHitInfo_ != null;
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        * @return The beingHitInfo.
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getBeingHitInfo() {
@@ -603,7 +539,7 @@ public final class EvtBeingHitNotifyOuterClass {
         }
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public Builder setBeingHitInfo(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo value) {
         if (beingHitInfoBuilder_ == null) {
@@ -619,7 +555,7 @@ public final class EvtBeingHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public Builder setBeingHitInfo(
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder builderForValue) {
@@ -633,7 +569,7 @@ public final class EvtBeingHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public Builder mergeBeingHitInfo(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo value) {
         if (beingHitInfoBuilder_ == null) {
@@ -651,7 +587,7 @@ public final class EvtBeingHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public Builder clearBeingHitInfo() {
         if (beingHitInfoBuilder_ == null) {
@@ -665,7 +601,7 @@ public final class EvtBeingHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder getBeingHitInfoBuilder() {
         
@@ -673,7 +609,7 @@ public final class EvtBeingHitNotifyOuterClass {
         return getBeingHitInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getBeingHitInfoOrBuilder() {
         if (beingHitInfoBuilder_ != null) {
@@ -684,7 +620,7 @@ public final class EvtBeingHitNotifyOuterClass {
         }
       }
       /**
-       * <code>.EvtBeingHitInfo being_hit_info = 4;</code>
+       * <code>.EvtBeingHitInfo being_hit_info = 10;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> 
@@ -699,6 +635,60 @@ public final class EvtBeingHitNotifyOuterClass {
         }
         return beingHitInfoBuilder_;
       }
+
+      private int forwardType_ = 0;
+      /**
+       * <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 = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardType() {
+        
+        forwardType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -766,27 +756,27 @@ public final class EvtBeingHitNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027EvtBeingHitNotify.proto\032\021ForwardType.p" +
-      "roto\032\025EvtBeingHitInfo.proto\"a\n\021EvtBeingH" +
-      "itNotify\022\"\n\014forward_type\030\t \001(\0162\014.Forward" +
-      "Type\022(\n\016being_hit_info\030\004 \001(\0132\020.EvtBeingH" +
-      "itInfoB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "\n\027EvtBeingHitNotify.proto\032\025EvtBeingHitIn" +
+      "fo.proto\032\021ForwardType.proto\"a\n\021EvtBeingH" +
+      "itNotify\022(\n\016being_hit_info\030\n \001(\0132\020.EvtBe" +
+      "ingHitInfo\022\"\n\014forward_type\030\013 \001(\0162\014.Forwa" +
+      "rdTypeB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
         });
     internal_static_EvtBeingHitNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_EvtBeingHitNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtBeingHitNotify_descriptor,
-        new java.lang.String[] { "ForwardType", "BeingHitInfo", });
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "BeingHitInfo", "ForwardType", });
     emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitsCombineNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitsCombineNotifyOuterClass.java
index ea2691d7e..c3451d951 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitsCombineNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBeingHitsCombineNotifyOuterClass.java
@@ -19,46 +19,41 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo> 
         getEvtBeingHitInfoListList();
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getEvtBeingHitInfoList(int index);
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     int getEvtBeingHitInfoListCount();
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> 
         getEvtBeingHitInfoListOrBuilderList();
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getEvtBeingHitInfoListOrBuilder(
         int index);
 
     /**
-     * <code>.ForwardType forward_type = 8;</code>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 8;</code>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
   }
   /**
-   * <pre>
-   * CmdId: 22445
-   * Obf: KKMJKPPFMGI
-   * </pre>
-   *
    * Protobuf type {@code EvtBeingHitsCombineNotify}
    */
   public static final class EvtBeingHitsCombineNotify extends
@@ -106,7 +101,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 evtBeingHitInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -115,7 +110,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.parser(), extensionRegistry));
               break;
             }
-            case 64: {
+            case 80: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
@@ -156,17 +151,17 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
               emu.grasscutter.net.proto.EvtBeingHitsCombineNotifyOuterClass.EvtBeingHitsCombineNotify.class, emu.grasscutter.net.proto.EvtBeingHitsCombineNotifyOuterClass.EvtBeingHitsCombineNotify.Builder.class);
     }
 
-    public static final int EVT_BEING_HIT_INFO_LIST_FIELD_NUMBER = 4;
+    public static final int EVT_BEING_HIT_INFO_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo> evtBeingHitInfoList_;
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo> getEvtBeingHitInfoListList() {
       return evtBeingHitInfoList_;
     }
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> 
@@ -174,21 +169,21 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       return evtBeingHitInfoList_;
     }
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     @java.lang.Override
     public int getEvtBeingHitInfoListCount() {
       return evtBeingHitInfoList_.size();
     }
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getEvtBeingHitInfoList(int index) {
       return evtBeingHitInfoList_.get(index);
     }
     /**
-     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+     * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getEvtBeingHitInfoListOrBuilder(
@@ -196,17 +191,17 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       return evtBeingHitInfoList_.get(index);
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 8;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 10;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 8;</code>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     @java.lang.Override public int getForwardTypeValue() {
       return forwardType_;
     }
     /**
-     * <code>.ForwardType forward_type = 8;</code>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -230,10 +225,10 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < evtBeingHitInfoList_.size(); i++) {
-        output.writeMessage(4, evtBeingHitInfoList_.get(i));
+        output.writeMessage(1, evtBeingHitInfoList_.get(i));
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(8, forwardType_);
+        output.writeEnum(10, forwardType_);
       }
       unknownFields.writeTo(output);
     }
@@ -246,11 +241,11 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       size = 0;
       for (int i = 0; i < evtBeingHitInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, evtBeingHitInfoList_.get(i));
+          .computeMessageSize(1, evtBeingHitInfoList_.get(i));
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, forwardType_);
+          .computeEnumSize(10, forwardType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -383,11 +378,6 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22445
-     * Obf: KKMJKPPFMGI
-     * </pre>
-     *
      * Protobuf type {@code EvtBeingHitsCombineNotify}
      */
     public static final class Builder extends
@@ -591,7 +581,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> evtBeingHitInfoListBuilder_;
 
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo> getEvtBeingHitInfoListList() {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -601,7 +591,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public int getEvtBeingHitInfoListCount() {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -611,7 +601,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo getEvtBeingHitInfoList(int index) {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -621,7 +611,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder setEvtBeingHitInfoList(
           int index, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo value) {
@@ -638,7 +628,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder setEvtBeingHitInfoList(
           int index, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder builderForValue) {
@@ -652,7 +642,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder addEvtBeingHitInfoList(emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo value) {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -668,7 +658,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder addEvtBeingHitInfoList(
           int index, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo value) {
@@ -685,7 +675,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder addEvtBeingHitInfoList(
           emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder builderForValue) {
@@ -699,7 +689,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder addEvtBeingHitInfoList(
           int index, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder builderForValue) {
@@ -713,7 +703,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder addAllEvtBeingHitInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo> values) {
@@ -728,7 +718,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder clearEvtBeingHitInfoList() {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -741,7 +731,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public Builder removeEvtBeingHitInfoList(int index) {
         if (evtBeingHitInfoListBuilder_ == null) {
@@ -754,14 +744,14 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder getEvtBeingHitInfoListBuilder(
           int index) {
         return getEvtBeingHitInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder getEvtBeingHitInfoListOrBuilder(
           int index) {
@@ -771,7 +761,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfoOrBuilder> 
            getEvtBeingHitInfoListOrBuilderList() {
@@ -782,14 +772,14 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder addEvtBeingHitInfoListBuilder() {
         return getEvtBeingHitInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder addEvtBeingHitInfoListBuilder(
           int index) {
@@ -797,7 +787,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
             index, emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 4;</code>
+       * <code>repeated .EvtBeingHitInfo evt_being_hit_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EvtBeingHitInfoOuterClass.EvtBeingHitInfo.Builder> 
            getEvtBeingHitInfoListBuilderList() {
@@ -820,14 +810,14 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
 
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 8;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @return The enum numeric value on the wire for forwardType.
        */
       @java.lang.Override public int getForwardTypeValue() {
         return forwardType_;
       }
       /**
-       * <code>.ForwardType forward_type = 8;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -838,7 +828,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 8;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -848,7 +838,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 8;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -862,7 +852,7 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 8;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -941,8 +931,8 @@ public final class EvtBeingHitsCombineNotifyOuterClass {
       "\n\037EvtBeingHitsCombineNotify.proto\032\025EvtBe" +
       "ingHitInfo.proto\032\021ForwardType.proto\"r\n\031E" +
       "vtBeingHitsCombineNotify\0221\n\027evt_being_hi" +
-      "t_info_list\030\004 \003(\0132\020.EvtBeingHitInfo\022\"\n\014f" +
-      "orward_type\030\010 \001(\0162\014.ForwardTypeB\033\n\031emu.g" +
+      "t_info_list\030\001 \003(\0132\020.EvtBeingHitInfo\022\"\n\014f" +
+      "orward_type\030\n \001(\0162\014.ForwardTypeB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtBulletHitNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtBulletHitNotifyOuterClass.java
index 746797a4a..f12d2c545 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtBulletHitNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtBulletHitNotifyOuterClass.java
@@ -19,93 +19,88 @@ public final class EvtBulletHitNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ForwardType forward_type = 3;</code>
-     * @return The enum numeric value on the wire for forwardType.
+     * <code>uint32 single_bullet_id = 4;</code>
+     * @return The singleBulletId.
      */
-    int getForwardTypeValue();
-    /**
-     * <code>.ForwardType forward_type = 3;</code>
-     * @return The forwardType.
-     */
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+    int getSingleBulletId();
 
     /**
-     * <code>.HitColliderType hit_collider_type = 5;</code>
-     * @return The enum numeric value on the wire for hitColliderType.
+     * <code>uint32 forward_peer = 5;</code>
+     * @return The forwardPeer.
      */
-    int getHitColliderTypeValue();
-    /**
-     * <code>.HitColliderType hit_collider_type = 5;</code>
-     * @return The hitColliderType.
-     */
-    emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType getHitColliderType();
+    int getForwardPeer();
 
     /**
-     * <code>uint32 KDBDDHAOOME = 6;</code>
-     * @return The kDBDDHAOOME.
-     */
-    int getKDBDDHAOOME();
-
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     * @return Whether the hitPoint field is set.
-     */
-    boolean hasHitPoint();
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     * @return The hitPoint.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint();
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder();
-
-    /**
-     * <code>uint32 HNMABCLIAMB = 7;</code>
-     * @return The hNMABCLIAMB.
-     */
-    int getHNMABCLIAMB();
-
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     * @return Whether the hitNormal field is set.
-     */
-    boolean hasHitNormal();
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     * @return The hitNormal.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getHitNormal();
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitNormalOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>int32 hit_box_index = 12;</code>
+     * <code>int32 hit_box_index = 7;</code>
      * @return The hitBoxIndex.
      */
     int getHitBoxIndex();
 
     /**
-     * <code>uint32 forward_peer = 8;</code>
-     * @return The forwardPeer.
+     * <code>.HitColliderType hit_collider_type = 9;</code>
+     * @return The enum numeric value on the wire for hitColliderType.
      */
-    int getForwardPeer();
+    int getHitColliderTypeValue();
+    /**
+     * <code>.HitColliderType hit_collider_type = 9;</code>
+     * @return The hitColliderType.
+     */
+    emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType getHitColliderType();
+
+    /**
+     * <code>uint32 entity_id = 10;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>.ForwardType forward_type = 11;</code>
+     * @return The enum numeric value on the wire for forwardType.
+     */
+    int getForwardTypeValue();
+    /**
+     * <code>.ForwardType forward_type = 11;</code>
+     * @return The forwardType.
+     */
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+
+    /**
+     * <code>.Vector hit_point = 13;</code>
+     * @return Whether the hitPoint field is set.
+     */
+    boolean hasHitPoint();
+    /**
+     * <code>.Vector hit_point = 13;</code>
+     * @return The hitPoint.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint();
+    /**
+     * <code>.Vector hit_point = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder();
+
+    /**
+     * <code>uint32 hit_entity_id = 14;</code>
+     * @return The hitEntityId.
+     */
+    int getHitEntityId();
+
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     * @return Whether the hitPointhitNormal field is set.
+     */
+    boolean hasHitPointhitNormal();
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     * @return The hitPointhitNormal.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPointhitNormal();
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointhitNormalOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 23746
-   * Obf: LAFKEDKPKIM
-   * </pre>
-   *
    * Protobuf type {@code EvtBulletHitNotify}
    */
   public static final class EvtBulletHitNotify extends
@@ -118,8 +113,8 @@ public final class EvtBulletHitNotifyOuterClass {
       super(builder);
     }
     private EvtBulletHitNotify() {
-      forwardType_ = 0;
       hitColliderType_ = 0;
+      forwardType_ = 0;
     }
 
     @java.lang.Override
@@ -152,7 +147,39 @@ public final class EvtBulletHitNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 32: {
+
+              singleBulletId_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              forwardPeer_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              hitBoxIndex_ = input.readInt32();
+              break;
+            }
+            case 72: {
+              int rawValue = input.readEnum();
+
+              hitColliderType_ = rawValue;
+              break;
+            }
+            case 80: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+              int rawValue = input.readEnum();
+
+              forwardType_ = rawValue;
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (hitPoint_ != null) {
                 subBuilder = hitPoint_.toBuilder();
@@ -165,56 +192,24 @@ public final class EvtBulletHitNotifyOuterClass {
 
               break;
             }
-            case 24: {
-              int rawValue = input.readEnum();
+            case 112: {
 
-              forwardType_ = rawValue;
+              hitEntityId_ = input.readUInt32();
               break;
             }
-            case 34: {
+            case 122: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (hitNormal_ != null) {
-                subBuilder = hitNormal_.toBuilder();
+              if (hitPointhitNormal_ != null) {
+                subBuilder = hitPointhitNormal_.toBuilder();
               }
-              hitNormal_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              hitPointhitNormal_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(hitNormal_);
-                hitNormal_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(hitPointhitNormal_);
+                hitPointhitNormal_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 40: {
-              int rawValue = input.readEnum();
-
-              hitColliderType_ = rawValue;
-              break;
-            }
-            case 48: {
-
-              kDBDDHAOOME_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              hNMABCLIAMB_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              forwardPeer_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
-
-              hitBoxIndex_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -247,36 +242,50 @@ public final class EvtBulletHitNotifyOuterClass {
               emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify.class, emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify.Builder.class);
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 3;
-    private int forwardType_;
+    public static final int SINGLE_BULLET_ID_FIELD_NUMBER = 4;
+    private int singleBulletId_;
     /**
-     * <code>.ForwardType forward_type = 3;</code>
-     * @return The enum numeric value on the wire for forwardType.
+     * <code>uint32 single_bullet_id = 4;</code>
+     * @return The singleBulletId.
      */
-    @java.lang.Override public int getForwardTypeValue() {
-      return forwardType_;
-    }
-    /**
-     * <code>.ForwardType forward_type = 3;</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;
+    @java.lang.Override
+    public int getSingleBulletId() {
+      return singleBulletId_;
     }
 
-    public static final int HIT_COLLIDER_TYPE_FIELD_NUMBER = 5;
+    public static final int FORWARD_PEER_FIELD_NUMBER = 5;
+    private int forwardPeer_;
+    /**
+     * <code>uint32 forward_peer = 5;</code>
+     * @return The forwardPeer.
+     */
+    @java.lang.Override
+    public int getForwardPeer() {
+      return forwardPeer_;
+    }
+
+    public static final int HIT_BOX_INDEX_FIELD_NUMBER = 7;
+    private int hitBoxIndex_;
+    /**
+     * <code>int32 hit_box_index = 7;</code>
+     * @return The hitBoxIndex.
+     */
+    @java.lang.Override
+    public int getHitBoxIndex() {
+      return hitBoxIndex_;
+    }
+
+    public static final int HIT_COLLIDER_TYPE_FIELD_NUMBER = 9;
     private int hitColliderType_;
     /**
-     * <code>.HitColliderType hit_collider_type = 5;</code>
+     * <code>.HitColliderType hit_collider_type = 9;</code>
      * @return The enum numeric value on the wire for hitColliderType.
      */
     @java.lang.Override public int getHitColliderTypeValue() {
       return hitColliderType_;
     }
     /**
-     * <code>.HitColliderType hit_collider_type = 5;</code>
+     * <code>.HitColliderType hit_collider_type = 9;</code>
      * @return The hitColliderType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType getHitColliderType() {
@@ -285,84 +294,10 @@ public final class EvtBulletHitNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.UNRECOGNIZED : result;
     }
 
-    public static final int KDBDDHAOOME_FIELD_NUMBER = 6;
-    private int kDBDDHAOOME_;
-    /**
-     * <code>uint32 KDBDDHAOOME = 6;</code>
-     * @return The kDBDDHAOOME.
-     */
-    @java.lang.Override
-    public int getKDBDDHAOOME() {
-      return kDBDDHAOOME_;
-    }
-
-    public static final int HIT_POINT_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector hitPoint_;
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     * @return Whether the hitPoint field is set.
-     */
-    @java.lang.Override
-    public boolean hasHitPoint() {
-      return hitPoint_ != null;
-    }
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     * @return The hitPoint.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint() {
-      return hitPoint_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPoint_;
-    }
-    /**
-     * <code>.Vector hit_point = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder() {
-      return getHitPoint();
-    }
-
-    public static final int HNMABCLIAMB_FIELD_NUMBER = 7;
-    private int hNMABCLIAMB_;
-    /**
-     * <code>uint32 HNMABCLIAMB = 7;</code>
-     * @return The hNMABCLIAMB.
-     */
-    @java.lang.Override
-    public int getHNMABCLIAMB() {
-      return hNMABCLIAMB_;
-    }
-
-    public static final int HIT_NORMAL_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector hitNormal_;
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     * @return Whether the hitNormal field is set.
-     */
-    @java.lang.Override
-    public boolean hasHitNormal() {
-      return hitNormal_ != null;
-    }
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     * @return The hitNormal.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitNormal() {
-      return hitNormal_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitNormal_;
-    }
-    /**
-     * <code>.Vector hit_normal = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitNormalOrBuilder() {
-      return getHitNormal();
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 9;</code>
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -370,26 +305,86 @@ public final class EvtBulletHitNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int HIT_BOX_INDEX_FIELD_NUMBER = 12;
-    private int hitBoxIndex_;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 11;
+    private int forwardType_;
     /**
-     * <code>int32 hit_box_index = 12;</code>
-     * @return The hitBoxIndex.
+     * <code>.ForwardType forward_type = 11;</code>
+     * @return The enum numeric value on the wire for forwardType.
      */
-    @java.lang.Override
-    public int getHitBoxIndex() {
-      return hitBoxIndex_;
+    @java.lang.Override public int getForwardTypeValue() {
+      return forwardType_;
+    }
+    /**
+     * <code>.ForwardType forward_type = 11;</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 = 8;
-    private int forwardPeer_;
+    public static final int HIT_POINT_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector hitPoint_;
     /**
-     * <code>uint32 forward_peer = 8;</code>
-     * @return The forwardPeer.
+     * <code>.Vector hit_point = 13;</code>
+     * @return Whether the hitPoint field is set.
      */
     @java.lang.Override
-    public int getForwardPeer() {
-      return forwardPeer_;
+    public boolean hasHitPoint() {
+      return hitPoint_ != null;
+    }
+    /**
+     * <code>.Vector hit_point = 13;</code>
+     * @return The hitPoint.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint() {
+      return hitPoint_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPoint_;
+    }
+    /**
+     * <code>.Vector hit_point = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder() {
+      return getHitPoint();
+    }
+
+    public static final int HIT_ENTITY_ID_FIELD_NUMBER = 14;
+    private int hitEntityId_;
+    /**
+     * <code>uint32 hit_entity_id = 14;</code>
+     * @return The hitEntityId.
+     */
+    @java.lang.Override
+    public int getHitEntityId() {
+      return hitEntityId_;
+    }
+
+    public static final int HIT_POINTHIT_NORMAL_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector hitPointhitNormal_;
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     * @return Whether the hitPointhitNormal field is set.
+     */
+    @java.lang.Override
+    public boolean hasHitPointhitNormal() {
+      return hitPointhitNormal_ != null;
+    }
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     * @return The hitPointhitNormal.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPointhitNormal() {
+      return hitPointhitNormal_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPointhitNormal_;
+    }
+    /**
+     * <code>.Vector hit_pointhit_normal = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointhitNormalOrBuilder() {
+      return getHitPointhitNormal();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -406,32 +401,32 @@ public final class EvtBulletHitNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (hitPoint_ != null) {
-        output.writeMessage(1, getHitPoint());
-      }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(3, forwardType_);
-      }
-      if (hitNormal_ != null) {
-        output.writeMessage(4, getHitNormal());
-      }
-      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
-        output.writeEnum(5, hitColliderType_);
-      }
-      if (kDBDDHAOOME_ != 0) {
-        output.writeUInt32(6, kDBDDHAOOME_);
-      }
-      if (hNMABCLIAMB_ != 0) {
-        output.writeUInt32(7, hNMABCLIAMB_);
+      if (singleBulletId_ != 0) {
+        output.writeUInt32(4, singleBulletId_);
       }
       if (forwardPeer_ != 0) {
-        output.writeUInt32(8, forwardPeer_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(9, entityId_);
+        output.writeUInt32(5, forwardPeer_);
       }
       if (hitBoxIndex_ != 0) {
-        output.writeInt32(12, hitBoxIndex_);
+        output.writeInt32(7, hitBoxIndex_);
+      }
+      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
+        output.writeEnum(9, hitColliderType_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(10, entityId_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        output.writeEnum(11, forwardType_);
+      }
+      if (hitPoint_ != null) {
+        output.writeMessage(13, getHitPoint());
+      }
+      if (hitEntityId_ != 0) {
+        output.writeUInt32(14, hitEntityId_);
+      }
+      if (hitPointhitNormal_ != null) {
+        output.writeMessage(15, getHitPointhitNormal());
       }
       unknownFields.writeTo(output);
     }
@@ -442,41 +437,41 @@ public final class EvtBulletHitNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (hitPoint_ != null) {
+      if (singleBulletId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getHitPoint());
-      }
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, forwardType_);
-      }
-      if (hitNormal_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getHitNormal());
-      }
-      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, hitColliderType_);
-      }
-      if (kDBDDHAOOME_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, kDBDDHAOOME_);
-      }
-      if (hNMABCLIAMB_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, hNMABCLIAMB_);
+          .computeUInt32Size(4, singleBulletId_);
       }
       if (forwardPeer_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, forwardPeer_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, entityId_);
+          .computeUInt32Size(5, forwardPeer_);
       }
       if (hitBoxIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, hitBoxIndex_);
+          .computeInt32Size(7, hitBoxIndex_);
+      }
+      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(9, hitColliderType_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, entityId_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(11, forwardType_);
+      }
+      if (hitPoint_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, getHitPoint());
+      }
+      if (hitEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, hitEntityId_);
+      }
+      if (hitPointhitNormal_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getHitPointhitNormal());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -493,28 +488,28 @@ public final class EvtBulletHitNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify other = (emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify) obj;
 
-      if (forwardType_ != other.forwardType_) return false;
+      if (getSingleBulletId()
+          != other.getSingleBulletId()) return false;
+      if (getForwardPeer()
+          != other.getForwardPeer()) return false;
+      if (getHitBoxIndex()
+          != other.getHitBoxIndex()) return false;
       if (hitColliderType_ != other.hitColliderType_) return false;
-      if (getKDBDDHAOOME()
-          != other.getKDBDDHAOOME()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (forwardType_ != other.forwardType_) return false;
       if (hasHitPoint() != other.hasHitPoint()) return false;
       if (hasHitPoint()) {
         if (!getHitPoint()
             .equals(other.getHitPoint())) return false;
       }
-      if (getHNMABCLIAMB()
-          != other.getHNMABCLIAMB()) return false;
-      if (hasHitNormal() != other.hasHitNormal()) return false;
-      if (hasHitNormal()) {
-        if (!getHitNormal()
-            .equals(other.getHitNormal())) return false;
+      if (getHitEntityId()
+          != other.getHitEntityId()) return false;
+      if (hasHitPointhitNormal() != other.hasHitPointhitNormal()) return false;
+      if (hasHitPointhitNormal()) {
+        if (!getHitPointhitNormal()
+            .equals(other.getHitPointhitNormal())) return false;
       }
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (getHitBoxIndex()
-          != other.getHitBoxIndex()) return false;
-      if (getForwardPeer()
-          != other.getForwardPeer()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -526,28 +521,28 @@ public final class EvtBulletHitNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + SINGLE_BULLET_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSingleBulletId();
+      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
+      hash = (53 * hash) + getForwardPeer();
+      hash = (37 * hash) + HIT_BOX_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getHitBoxIndex();
       hash = (37 * hash) + HIT_COLLIDER_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + hitColliderType_;
-      hash = (37 * hash) + KDBDDHAOOME_FIELD_NUMBER;
-      hash = (53 * hash) + getKDBDDHAOOME();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
       if (hasHitPoint()) {
         hash = (37 * hash) + HIT_POINT_FIELD_NUMBER;
         hash = (53 * hash) + getHitPoint().hashCode();
       }
-      hash = (37 * hash) + HNMABCLIAMB_FIELD_NUMBER;
-      hash = (53 * hash) + getHNMABCLIAMB();
-      if (hasHitNormal()) {
-        hash = (37 * hash) + HIT_NORMAL_FIELD_NUMBER;
-        hash = (53 * hash) + getHitNormal().hashCode();
+      hash = (37 * hash) + HIT_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getHitEntityId();
+      if (hasHitPointhitNormal()) {
+        hash = (37 * hash) + HIT_POINTHIT_NORMAL_FIELD_NUMBER;
+        hash = (53 * hash) + getHitPointhitNormal().hashCode();
       }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + HIT_BOX_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getHitBoxIndex();
-      hash = (37 * hash) + FORWARD_PEER_FIELD_NUMBER;
-      hash = (53 * hash) + getForwardPeer();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -644,11 +639,6 @@ public final class EvtBulletHitNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23746
-     * Obf: LAFKEDKPKIM
-     * </pre>
-     *
      * Protobuf type {@code EvtBulletHitNotify}
      */
     public static final class Builder extends
@@ -686,11 +676,17 @@ public final class EvtBulletHitNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        forwardType_ = 0;
+        singleBulletId_ = 0;
+
+        forwardPeer_ = 0;
+
+        hitBoxIndex_ = 0;
 
         hitColliderType_ = 0;
 
-        kDBDDHAOOME_ = 0;
+        entityId_ = 0;
+
+        forwardType_ = 0;
 
         if (hitPointBuilder_ == null) {
           hitPoint_ = null;
@@ -698,20 +694,14 @@ public final class EvtBulletHitNotifyOuterClass {
           hitPoint_ = null;
           hitPointBuilder_ = null;
         }
-        hNMABCLIAMB_ = 0;
+        hitEntityId_ = 0;
 
-        if (hitNormalBuilder_ == null) {
-          hitNormal_ = null;
+        if (hitPointhitNormalBuilder_ == null) {
+          hitPointhitNormal_ = null;
         } else {
-          hitNormal_ = null;
-          hitNormalBuilder_ = null;
+          hitPointhitNormal_ = null;
+          hitPointhitNormalBuilder_ = null;
         }
-        entityId_ = 0;
-
-        hitBoxIndex_ = 0;
-
-        forwardPeer_ = 0;
-
         return this;
       }
 
@@ -738,23 +728,23 @@ public final class EvtBulletHitNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify buildPartial() {
         emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify result = new emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify(this);
-        result.forwardType_ = forwardType_;
+        result.singleBulletId_ = singleBulletId_;
+        result.forwardPeer_ = forwardPeer_;
+        result.hitBoxIndex_ = hitBoxIndex_;
         result.hitColliderType_ = hitColliderType_;
-        result.kDBDDHAOOME_ = kDBDDHAOOME_;
+        result.entityId_ = entityId_;
+        result.forwardType_ = forwardType_;
         if (hitPointBuilder_ == null) {
           result.hitPoint_ = hitPoint_;
         } else {
           result.hitPoint_ = hitPointBuilder_.build();
         }
-        result.hNMABCLIAMB_ = hNMABCLIAMB_;
-        if (hitNormalBuilder_ == null) {
-          result.hitNormal_ = hitNormal_;
+        result.hitEntityId_ = hitEntityId_;
+        if (hitPointhitNormalBuilder_ == null) {
+          result.hitPointhitNormal_ = hitPointhitNormal_;
         } else {
-          result.hitNormal_ = hitNormalBuilder_.build();
+          result.hitPointhitNormal_ = hitPointhitNormalBuilder_.build();
         }
-        result.entityId_ = entityId_;
-        result.hitBoxIndex_ = hitBoxIndex_;
-        result.forwardPeer_ = forwardPeer_;
         onBuilt();
         return result;
       }
@@ -803,32 +793,32 @@ public final class EvtBulletHitNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify other) {
         if (other == emu.grasscutter.net.proto.EvtBulletHitNotifyOuterClass.EvtBulletHitNotify.getDefaultInstance()) return this;
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
+        if (other.getSingleBulletId() != 0) {
+          setSingleBulletId(other.getSingleBulletId());
         }
-        if (other.hitColliderType_ != 0) {
-          setHitColliderTypeValue(other.getHitColliderTypeValue());
-        }
-        if (other.getKDBDDHAOOME() != 0) {
-          setKDBDDHAOOME(other.getKDBDDHAOOME());
-        }
-        if (other.hasHitPoint()) {
-          mergeHitPoint(other.getHitPoint());
-        }
-        if (other.getHNMABCLIAMB() != 0) {
-          setHNMABCLIAMB(other.getHNMABCLIAMB());
-        }
-        if (other.hasHitNormal()) {
-          mergeHitNormal(other.getHitNormal());
-        }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        if (other.getForwardPeer() != 0) {
+          setForwardPeer(other.getForwardPeer());
         }
         if (other.getHitBoxIndex() != 0) {
           setHitBoxIndex(other.getHitBoxIndex());
         }
-        if (other.getForwardPeer() != 0) {
-          setForwardPeer(other.getForwardPeer());
+        if (other.hitColliderType_ != 0) {
+          setHitColliderTypeValue(other.getHitColliderTypeValue());
+        }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
+        if (other.hasHitPoint()) {
+          mergeHitPoint(other.getHitPoint());
+        }
+        if (other.getHitEntityId() != 0) {
+          setHitEntityId(other.getHitEntityId());
+        }
+        if (other.hasHitPointhitNormal()) {
+          mergeHitPointhitNormal(other.getHitPointhitNormal());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -859,70 +849,109 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
 
-      private int forwardType_ = 0;
+      private int singleBulletId_ ;
       /**
-       * <code>.ForwardType forward_type = 3;</code>
-       * @return The enum numeric value on the wire for forwardType.
-       */
-      @java.lang.Override public int getForwardTypeValue() {
-        return forwardType_;
-      }
-      /**
-       * <code>.ForwardType forward_type = 3;</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;
-      }
-      /**
-       * <code>.ForwardType forward_type = 3;</code>
-       * @return The forwardType.
+       * <code>uint32 single_bullet_id = 4;</code>
+       * @return The singleBulletId.
        */
       @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 int getSingleBulletId() {
+        return singleBulletId_;
       }
       /**
-       * <code>.ForwardType forward_type = 3;</code>
-       * @param value The forwardType to set.
+       * <code>uint32 single_bullet_id = 4;</code>
+       * @param value The singleBulletId to set.
        * @return This builder for chaining.
        */
-      public Builder setForwardType(emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setSingleBulletId(int value) {
         
-        forwardType_ = value.getNumber();
+        singleBulletId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 3;</code>
+       * <code>uint32 single_bullet_id = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearForwardType() {
+      public Builder clearSingleBulletId() {
         
-        forwardType_ = 0;
+        singleBulletId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int forwardPeer_ ;
+      /**
+       * <code>uint32 forward_peer = 5;</code>
+       * @return The forwardPeer.
+       */
+      @java.lang.Override
+      public int getForwardPeer() {
+        return forwardPeer_;
+      }
+      /**
+       * <code>uint32 forward_peer = 5;</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 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardPeer() {
+        
+        forwardPeer_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int hitBoxIndex_ ;
+      /**
+       * <code>int32 hit_box_index = 7;</code>
+       * @return The hitBoxIndex.
+       */
+      @java.lang.Override
+      public int getHitBoxIndex() {
+        return hitBoxIndex_;
+      }
+      /**
+       * <code>int32 hit_box_index = 7;</code>
+       * @param value The hitBoxIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHitBoxIndex(int value) {
+        
+        hitBoxIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 hit_box_index = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHitBoxIndex() {
+        
+        hitBoxIndex_ = 0;
         onChanged();
         return this;
       }
 
       private int hitColliderType_ = 0;
       /**
-       * <code>.HitColliderType hit_collider_type = 5;</code>
+       * <code>.HitColliderType hit_collider_type = 9;</code>
        * @return The enum numeric value on the wire for hitColliderType.
        */
       @java.lang.Override public int getHitColliderTypeValue() {
         return hitColliderType_;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 5;</code>
+       * <code>.HitColliderType hit_collider_type = 9;</code>
        * @param value The enum numeric value on the wire for hitColliderType to set.
        * @return This builder for chaining.
        */
@@ -933,7 +962,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 5;</code>
+       * <code>.HitColliderType hit_collider_type = 9;</code>
        * @return The hitColliderType.
        */
       @java.lang.Override
@@ -943,7 +972,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 5;</code>
+       * <code>.HitColliderType hit_collider_type = 9;</code>
        * @param value The hitColliderType to set.
        * @return This builder for chaining.
        */
@@ -957,7 +986,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 5;</code>
+       * <code>.HitColliderType hit_collider_type = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearHitColliderType() {
@@ -967,33 +996,87 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
 
-      private int kDBDDHAOOME_ ;
+      private int entityId_ ;
       /**
-       * <code>uint32 KDBDDHAOOME = 6;</code>
-       * @return The kDBDDHAOOME.
+       * <code>uint32 entity_id = 10;</code>
+       * @return The entityId.
        */
       @java.lang.Override
-      public int getKDBDDHAOOME() {
-        return kDBDDHAOOME_;
+      public int getEntityId() {
+        return entityId_;
       }
       /**
-       * <code>uint32 KDBDDHAOOME = 6;</code>
-       * @param value The kDBDDHAOOME to set.
+       * <code>uint32 entity_id = 10;</code>
+       * @param value The entityId to set.
        * @return This builder for chaining.
        */
-      public Builder setKDBDDHAOOME(int value) {
+      public Builder setEntityId(int value) {
         
-        kDBDDHAOOME_ = value;
+        entityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KDBDDHAOOME = 6;</code>
+       * <code>uint32 entity_id = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKDBDDHAOOME() {
+      public Builder clearEntityId() {
         
-        kDBDDHAOOME_ = 0;
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int forwardType_ = 0;
+      /**
+       * <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 = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardType() {
+        
+        forwardType_ = 0;
         onChanged();
         return this;
       }
@@ -1002,14 +1085,14 @@ public final class EvtBulletHitNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> hitPointBuilder_;
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        * @return Whether the hitPoint field is set.
        */
       public boolean hasHitPoint() {
         return hitPointBuilder_ != null || hitPoint_ != null;
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        * @return The hitPoint.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint() {
@@ -1020,7 +1103,7 @@ public final class EvtBulletHitNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public Builder setHitPoint(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (hitPointBuilder_ == null) {
@@ -1036,7 +1119,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public Builder setHitPoint(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1050,7 +1133,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public Builder mergeHitPoint(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (hitPointBuilder_ == null) {
@@ -1068,7 +1151,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public Builder clearHitPoint() {
         if (hitPointBuilder_ == null) {
@@ -1082,7 +1165,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHitPointBuilder() {
         
@@ -1090,7 +1173,7 @@ public final class EvtBulletHitNotifyOuterClass {
         return getHitPointFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder() {
         if (hitPointBuilder_ != null) {
@@ -1101,7 +1184,7 @@ public final class EvtBulletHitNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector hit_point = 1;</code>
+       * <code>.Vector hit_point = 13;</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> 
@@ -1117,247 +1200,154 @@ public final class EvtBulletHitNotifyOuterClass {
         return hitPointBuilder_;
       }
 
-      private int hNMABCLIAMB_ ;
+      private int hitEntityId_ ;
       /**
-       * <code>uint32 HNMABCLIAMB = 7;</code>
-       * @return The hNMABCLIAMB.
+       * <code>uint32 hit_entity_id = 14;</code>
+       * @return The hitEntityId.
        */
       @java.lang.Override
-      public int getHNMABCLIAMB() {
-        return hNMABCLIAMB_;
+      public int getHitEntityId() {
+        return hitEntityId_;
       }
       /**
-       * <code>uint32 HNMABCLIAMB = 7;</code>
-       * @param value The hNMABCLIAMB to set.
+       * <code>uint32 hit_entity_id = 14;</code>
+       * @param value The hitEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder setHNMABCLIAMB(int value) {
+      public Builder setHitEntityId(int value) {
         
-        hNMABCLIAMB_ = value;
+        hitEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 HNMABCLIAMB = 7;</code>
+       * <code>uint32 hit_entity_id = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHNMABCLIAMB() {
+      public Builder clearHitEntityId() {
         
-        hNMABCLIAMB_ = 0;
+        hitEntityId_ = 0;
         onChanged();
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector hitNormal_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector hitPointhitNormal_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> hitNormalBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> hitPointhitNormalBuilder_;
       /**
-       * <code>.Vector hit_normal = 4;</code>
-       * @return Whether the hitNormal field is set.
+       * <code>.Vector hit_pointhit_normal = 15;</code>
+       * @return Whether the hitPointhitNormal field is set.
        */
-      public boolean hasHitNormal() {
-        return hitNormalBuilder_ != null || hitNormal_ != null;
+      public boolean hasHitPointhitNormal() {
+        return hitPointhitNormalBuilder_ != null || hitPointhitNormal_ != null;
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
-       * @return The hitNormal.
+       * <code>.Vector hit_pointhit_normal = 15;</code>
+       * @return The hitPointhitNormal.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitNormal() {
-        if (hitNormalBuilder_ == null) {
-          return hitNormal_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitNormal_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPointhitNormal() {
+        if (hitPointhitNormalBuilder_ == null) {
+          return hitPointhitNormal_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPointhitNormal_;
         } else {
-          return hitNormalBuilder_.getMessage();
+          return hitPointhitNormalBuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public Builder setHitNormal(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hitNormalBuilder_ == null) {
+      public Builder setHitPointhitNormal(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (hitPointhitNormalBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          hitNormal_ = value;
+          hitPointhitNormal_ = value;
           onChanged();
         } else {
-          hitNormalBuilder_.setMessage(value);
+          hitPointhitNormalBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public Builder setHitNormal(
+      public Builder setHitPointhitNormal(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (hitNormalBuilder_ == null) {
-          hitNormal_ = builderForValue.build();
+        if (hitPointhitNormalBuilder_ == null) {
+          hitPointhitNormal_ = builderForValue.build();
           onChanged();
         } else {
-          hitNormalBuilder_.setMessage(builderForValue.build());
+          hitPointhitNormalBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public Builder mergeHitNormal(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hitNormalBuilder_ == null) {
-          if (hitNormal_ != null) {
-            hitNormal_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(hitNormal_).mergeFrom(value).buildPartial();
+      public Builder mergeHitPointhitNormal(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (hitPointhitNormalBuilder_ == null) {
+          if (hitPointhitNormal_ != null) {
+            hitPointhitNormal_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(hitPointhitNormal_).mergeFrom(value).buildPartial();
           } else {
-            hitNormal_ = value;
+            hitPointhitNormal_ = value;
           }
           onChanged();
         } else {
-          hitNormalBuilder_.mergeFrom(value);
+          hitPointhitNormalBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public Builder clearHitNormal() {
-        if (hitNormalBuilder_ == null) {
-          hitNormal_ = null;
+      public Builder clearHitPointhitNormal() {
+        if (hitPointhitNormalBuilder_ == null) {
+          hitPointhitNormal_ = null;
           onChanged();
         } else {
-          hitNormal_ = null;
-          hitNormalBuilder_ = null;
+          hitPointhitNormal_ = null;
+          hitPointhitNormalBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHitNormalBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHitPointhitNormalBuilder() {
         
         onChanged();
-        return getHitNormalFieldBuilder().getBuilder();
+        return getHitPointhitNormalFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 15;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitNormalOrBuilder() {
-        if (hitNormalBuilder_ != null) {
-          return hitNormalBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointhitNormalOrBuilder() {
+        if (hitPointhitNormalBuilder_ != null) {
+          return hitPointhitNormalBuilder_.getMessageOrBuilder();
         } else {
-          return hitNormal_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitNormal_;
+          return hitPointhitNormal_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPointhitNormal_;
         }
       }
       /**
-       * <code>.Vector hit_normal = 4;</code>
+       * <code>.Vector hit_pointhit_normal = 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> 
-          getHitNormalFieldBuilder() {
-        if (hitNormalBuilder_ == null) {
-          hitNormalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getHitPointhitNormalFieldBuilder() {
+        if (hitPointhitNormalBuilder_ == null) {
+          hitPointhitNormalBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getHitNormal(),
+                  getHitPointhitNormal(),
                   getParentForChildren(),
                   isClean());
-          hitNormal_ = null;
+          hitPointhitNormal_ = null;
         }
-        return hitNormalBuilder_;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 9;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 9;</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 = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int hitBoxIndex_ ;
-      /**
-       * <code>int32 hit_box_index = 12;</code>
-       * @return The hitBoxIndex.
-       */
-      @java.lang.Override
-      public int getHitBoxIndex() {
-        return hitBoxIndex_;
-      }
-      /**
-       * <code>int32 hit_box_index = 12;</code>
-       * @param value The hitBoxIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHitBoxIndex(int value) {
-        
-        hitBoxIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 hit_box_index = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHitBoxIndex() {
-        
-        hitBoxIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int forwardPeer_ ;
-      /**
-       * <code>uint32 forward_peer = 8;</code>
-       * @return The forwardPeer.
-       */
-      @java.lang.Override
-      public int getForwardPeer() {
-        return forwardPeer_;
-      }
-      /**
-       * <code>uint32 forward_peer = 8;</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 = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardPeer() {
-        
-        forwardPeer_ = 0;
-        onChanged();
-        return this;
+        return hitPointhitNormalBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1426,22 +1416,23 @@ public final class EvtBulletHitNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030EvtBulletHitNotify.proto\032\021ForwardType." +
-      "proto\032\025HitColliderType.proto\032\014Vector.pro" +
-      "to\"\210\002\n\022EvtBulletHitNotify\022\"\n\014forward_typ" +
-      "e\030\003 \001(\0162\014.ForwardType\022+\n\021hit_collider_ty" +
-      "pe\030\005 \001(\0162\020.HitColliderType\022\023\n\013KDBDDHAOOM" +
-      "E\030\006 \001(\r\022\032\n\thit_point\030\001 \001(\0132\007.Vector\022\023\n\013H" +
-      "NMABCLIAMB\030\007 \001(\r\022\033\n\nhit_normal\030\004 \001(\0132\007.V" +
-      "ector\022\021\n\tentity_id\030\t \001(\r\022\025\n\rhit_box_inde" +
-      "x\030\014 \001(\005\022\024\n\014forward_peer\030\010 \001(\rB\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\n\030EvtBulletHitNotify.proto\032\025HitColliderT" +
+      "ype.proto\032\021ForwardType.proto\032\014Vector.pro" +
+      "to\"\230\002\n\022EvtBulletHitNotify\022\030\n\020single_bull" +
+      "et_id\030\004 \001(\r\022\024\n\014forward_peer\030\005 \001(\r\022\025\n\rhit" +
+      "_box_index\030\007 \001(\005\022+\n\021hit_collider_type\030\t " +
+      "\001(\0162\020.HitColliderType\022\021\n\tentity_id\030\n \001(\r" +
+      "\022\"\n\014forward_type\030\013 \001(\0162\014.ForwardType\022\032\n\t" +
+      "hit_point\030\r \001(\0132\007.Vector\022\025\n\rhit_entity_i" +
+      "d\030\016 \001(\r\022$\n\023hit_pointhit_normal\030\017 \001(\0132\007.V" +
+      "ectorB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HitColliderTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
         });
     internal_static_EvtBulletHitNotify_descriptor =
@@ -1449,9 +1440,9 @@ public final class EvtBulletHitNotifyOuterClass {
     internal_static_EvtBulletHitNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtBulletHitNotify_descriptor,
-        new java.lang.String[] { "ForwardType", "HitColliderType", "KDBDDHAOOME", "HitPoint", "HNMABCLIAMB", "HitNormal", "EntityId", "HitBoxIndex", "ForwardPeer", });
-    emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "SingleBulletId", "ForwardPeer", "HitBoxIndex", "HitColliderType", "EntityId", "ForwardType", "HitPoint", "HitEntityId", "HitPointhitNormal", });
     emu.grasscutter.net.proto.HitColliderTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtCostStaminaNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtCostStaminaNotifyOuterClass.java
index cc4978660..9be0c9c42 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtCostStaminaNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtCostStaminaNotifyOuterClass.java
@@ -19,21 +19,20 @@ public final class EvtCostStaminaNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float cost_stamina = 11;</code>
+     * <code>float cost_stamina = 1;</code>
      * @return The costStamina.
      */
     float getCostStamina();
 
     /**
-     * <code>uint32 skill_id = 4;</code>
+     * <code>uint32 skill_id = 7;</code>
      * @return The skillId.
      */
     int getSkillId();
   }
   /**
    * <pre>
-   * CmdId: 810
-   * Obf: FPOPCBIOAAA
+   * CmdId: 1514
    * </pre>
    *
    * Protobuf type {@code EvtCostStaminaNotify}
@@ -80,16 +79,16 @@ public final class EvtCostStaminaNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 93: {
+            case 13: {
 
               costStamina_ = input.readFloat();
               break;
             }
+            case 56: {
+
+              skillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +121,10 @@ public final class EvtCostStaminaNotifyOuterClass {
               emu.grasscutter.net.proto.EvtCostStaminaNotifyOuterClass.EvtCostStaminaNotify.class, emu.grasscutter.net.proto.EvtCostStaminaNotifyOuterClass.EvtCostStaminaNotify.Builder.class);
     }
 
-    public static final int COST_STAMINA_FIELD_NUMBER = 11;
+    public static final int COST_STAMINA_FIELD_NUMBER = 1;
     private float costStamina_;
     /**
-     * <code>float cost_stamina = 11;</code>
+     * <code>float cost_stamina = 1;</code>
      * @return The costStamina.
      */
     @java.lang.Override
@@ -133,10 +132,10 @@ public final class EvtCostStaminaNotifyOuterClass {
       return costStamina_;
     }
 
-    public static final int SKILL_ID_FIELD_NUMBER = 4;
+    public static final int SKILL_ID_FIELD_NUMBER = 7;
     private int skillId_;
     /**
-     * <code>uint32 skill_id = 4;</code>
+     * <code>uint32 skill_id = 7;</code>
      * @return The skillId.
      */
     @java.lang.Override
@@ -158,11 +157,11 @@ public final class EvtCostStaminaNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (skillId_ != 0) {
-        output.writeUInt32(4, skillId_);
-      }
       if (costStamina_ != 0F) {
-        output.writeFloat(11, costStamina_);
+        output.writeFloat(1, costStamina_);
+      }
+      if (skillId_ != 0) {
+        output.writeUInt32(7, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +172,13 @@ public final class EvtCostStaminaNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (skillId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, skillId_);
-      }
       if (costStamina_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(11, costStamina_);
+          .computeFloatSize(1, costStamina_);
+      }
+      if (skillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -314,8 +313,7 @@ public final class EvtCostStaminaNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 810
-     * Obf: FPOPCBIOAAA
+     * CmdId: 1514
      * </pre>
      *
      * Protobuf type {@code EvtCostStaminaNotify}
@@ -472,7 +470,7 @@ public final class EvtCostStaminaNotifyOuterClass {
 
       private float costStamina_ ;
       /**
-       * <code>float cost_stamina = 11;</code>
+       * <code>float cost_stamina = 1;</code>
        * @return The costStamina.
        */
       @java.lang.Override
@@ -480,7 +478,7 @@ public final class EvtCostStaminaNotifyOuterClass {
         return costStamina_;
       }
       /**
-       * <code>float cost_stamina = 11;</code>
+       * <code>float cost_stamina = 1;</code>
        * @param value The costStamina to set.
        * @return This builder for chaining.
        */
@@ -491,7 +489,7 @@ public final class EvtCostStaminaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>float cost_stamina = 11;</code>
+       * <code>float cost_stamina = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostStamina() {
@@ -503,7 +501,7 @@ public final class EvtCostStaminaNotifyOuterClass {
 
       private int skillId_ ;
       /**
-       * <code>uint32 skill_id = 4;</code>
+       * <code>uint32 skill_id = 7;</code>
        * @return The skillId.
        */
       @java.lang.Override
@@ -511,7 +509,7 @@ public final class EvtCostStaminaNotifyOuterClass {
         return skillId_;
       }
       /**
-       * <code>uint32 skill_id = 4;</code>
+       * <code>uint32 skill_id = 7;</code>
        * @param value The skillId to set.
        * @return This builder for chaining.
        */
@@ -522,7 +520,7 @@ public final class EvtCostStaminaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 skill_id = 4;</code>
+       * <code>uint32 skill_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSkillId() {
@@ -599,8 +597,8 @@ public final class EvtCostStaminaNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032EvtCostStaminaNotify.proto\">\n\024EvtCostS" +
-      "taminaNotify\022\024\n\014cost_stamina\030\013 \001(\002\022\020\n\010sk" +
-      "ill_id\030\004 \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "taminaNotify\022\024\n\014cost_stamina\030\001 \001(\002\022\020\n\010sk" +
+      "ill_id\030\007 \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/EvtCreateGadgetNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
index 304bedeae..bf4d9b155 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtCreateGadgetNotifyOuterClass.java
@@ -19,57 +19,83 @@ public final class EvtCreateGadgetNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 guid = 11;</code>
-     * @return The guid.
-     */
-    long getGuid();
-
-    /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @return A list containing the targetLockPointIndexList.
      */
     java.util.List<java.lang.Integer> getTargetLockPointIndexListList();
     /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @return The count of targetLockPointIndexList.
      */
     int getTargetLockPointIndexListCount();
     /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @param index The index of the element to return.
      * @return The targetLockPointIndexList at the given index.
      */
     int getTargetLockPointIndexList(int index);
 
     /**
-     * <code>uint32 room_id = 3;</code>
-     * @return The roomId.
+     * <code>.Vector init_pos = 13;</code>
+     * @return Whether the initPos field is set.
      */
-    int getRoomId();
+    boolean hasInitPos();
+    /**
+     * <code>.Vector init_pos = 13;</code>
+     * @return The initPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos();
+    /**
+     * <code>.Vector init_pos = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder();
 
     /**
-     * <code>bool is_peer_id_from_player = 1886;</code>
-     * @return The isPeerIdFromPlayer.
+     * <code>.Vector init_euler_angles = 4;</code>
+     * @return Whether the initEulerAngles field is set.
      */
-    boolean getIsPeerIdFromPlayer();
+    boolean hasInitEulerAngles();
+    /**
+     * <code>.Vector init_euler_angles = 4;</code>
+     * @return The initEulerAngles.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles();
+    /**
+     * <code>.Vector init_euler_angles = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder();
 
     /**
-     * <code>bool HEPFGKFLCCD = 13;</code>
-     * @return The hEPFGKFLCCD.
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @return A list containing the targetEntityIdList.
      */
-    boolean getHEPFGKFLCCD();
+    java.util.List<java.lang.Integer> getTargetEntityIdListList();
+    /**
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @return The count of targetEntityIdList.
+     */
+    int getTargetEntityIdListCount();
+    /**
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @param index The index of the element to return.
+     * @return The targetEntityIdList at the given index.
+     */
+    int getTargetEntityIdList(int index);
 
     /**
-     * <code>uint32 owner_entity_id = 14;</code>
-     * @return The ownerEntityId.
+     * <code>.AbilityString ability_name = 426;</code>
+     * @return Whether the abilityName field is set.
      */
-    int getOwnerEntityId();
-
+    boolean hasAbilityName();
     /**
-     * <code>bool is_async_load = 438;</code>
-     * @return The isAsyncLoad.
+     * <code>.AbilityString ability_name = 426;</code>
+     * @return The abilityName.
      */
-    boolean getIsAsyncLoad();
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getAbilityName();
+    /**
+     * <code>.AbilityString ability_name = 426;</code>
+     */
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getAbilityNameOrBuilder();
 
     /**
      * <code>uint32 target_lock_point_index = 8;</code>
@@ -78,111 +104,121 @@ public final class EvtCreateGadgetNotifyOuterClass {
     int getTargetLockPointIndex();
 
     /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     * @return Whether the initEulerAngles field is set.
-     */
-    boolean hasInitEulerAngles();
-    /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     * @return The initEulerAngles.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles();
-    /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder();
-
-    /**
-     * <code>uint32 prop_owner_entity_id = 1;</code>
-     * @return The propOwnerEntityId.
-     */
-    int getPropOwnerEntityId();
-
-    /**
-     * <code>uint32 camp_type = 5;</code>
-     * @return The campType.
-     */
-    int getCampType();
-
-    /**
-     * <code>.ForwardType forward_type = 7;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 7;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
 
     /**
-     * <code>.Vector InitPos = 9;</code>
-     * @return Whether the initPos field is set.
+     * <code>bool is_peer_id_from_player = 637;</code>
+     * @return The isPeerIdFromPlayer.
      */
-    boolean hasInitPos();
-    /**
-     * <code>.Vector InitPos = 9;</code>
-     * @return The initPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos();
-    /**
-     * <code>.Vector InitPos = 9;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder();
+    boolean getIsPeerIdFromPlayer();
 
     /**
-     * <code>uint32 target_entity_id = 2;</code>
-     * @return The targetEntityId.
+     * <code>bool is_async_load = 354;</code>
+     * @return The isAsyncLoad.
      */
-    int getTargetEntityId();
+    boolean getIsAsyncLoad();
 
     /**
-     * <code>uint32 config_id = 15;</code>
-     * @return The configId.
+     * <pre>
+     * 10
+     * </pre>
+     *
+     * <code>bool sight_group_with_owner = 9;</code>
+     * @return The sightGroupWithOwner.
      */
-    int getConfigId();
+    boolean getSightGroupWithOwner();
 
     /**
-     * <code>uint32 camp_id = 12;</code>
-     * @return The campId.
+     * <pre>
+     * 9
+     * </pre>
+     *
+     * <code>bool is_true_life_time_by_owner = 10;</code>
+     * @return The isTrueLifeTimeByOwner.
      */
-    int getCampId();
+    boolean getIsTrueLifeTimeByOwner();
 
     /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @return A list containing the targetEntityIdList.
-     */
-    java.util.List<java.lang.Integer> getTargetEntityIdListList();
-    /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @return The count of targetEntityIdList.
-     */
-    int getTargetEntityIdListCount();
-    /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @param index The index of the element to return.
-     * @return The targetEntityIdList at the given index.
-     */
-    int getTargetEntityIdList(int index);
-
-    /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 5;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>bool CNIILEKPCMD = 6;</code>
-     * @return The cNIILEKPCMD.
+     * <code>uint32 room_id = 2;</code>
+     * @return The roomId.
      */
-    boolean getCNIILEKPCMD();
+    int getRoomId();
+
+    /**
+     * <code>uint32 init_pose_id = 328;</code>
+     * @return The initPoseId.
+     */
+    int getInitPoseId();
+
+    /**
+     * <code>uint32 prop_owner_entity_id = 3;</code>
+     * @return The propOwnerEntityId.
+     */
+    int getPropOwnerEntityId();
+
+    /**
+     * <code>int32 local_id = 19;</code>
+     * @return The localId.
+     */
+    int getLocalId();
+
+    /**
+     * <code>uint32 target_entity_id = 12;</code>
+     * @return The targetEntityId.
+     */
+    int getTargetEntityId();
+
+    /**
+     * <code>uint32 camp_type = 7;</code>
+     * @return The campType.
+     */
+    int getCampType();
+
+    /**
+     * <code>uint32 camp_id = 1;</code>
+     * @return The campId.
+     */
+    int getCampId();
+
+    /**
+     * <code>uint32 born_slot_index = 1898;</code>
+     * @return The bornSlotIndex.
+     */
+    int getBornSlotIndex();
+
+    /**
+     * <code>uint32 owner_entity_id = 15;</code>
+     * @return The ownerEntityId.
+     */
+    int getOwnerEntityId();
+
+    /**
+     * <code>uint32 config_id = 14;</code>
+     * @return The configId.
+     */
+    int getConfigId();
+
+    /**
+     * <code>uint64 guid = 11;</code>
+     * @return The guid.
+     */
+    long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 22195
-   * Obf: LGEDOOIENKG
-   * </pre>
-   *
    * Protobuf type {@code EvtCreateGadgetNotify}
    */
   public static final class EvtCreateGadgetNotify extends
@@ -196,8 +232,8 @@ public final class EvtCreateGadgetNotifyOuterClass {
     }
     private EvtCreateGadgetNotify() {
       targetLockPointIndexList_ = emptyIntList();
-      forwardType_ = 0;
       targetEntityIdList_ = emptyIntList();
+      forwardType_ = 0;
     }
 
     @java.lang.Override
@@ -233,17 +269,17 @@ public final class EvtCreateGadgetNotifyOuterClass {
               break;
             case 8: {
 
-              propOwnerEntityId_ = input.readUInt32();
+              campId_ = input.readUInt32();
               break;
             }
             case 16: {
 
-              targetEntityId_ = input.readUInt32();
+              roomId_ = input.readUInt32();
               break;
             }
             case 24: {
 
-              roomId_ = input.readUInt32();
+              propOwnerEntityId_ = input.readUInt32();
               break;
             }
             case 34: {
@@ -261,26 +297,46 @@ public final class EvtCreateGadgetNotifyOuterClass {
             }
             case 40: {
 
-              campType_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
             case 48: {
-
-              cNIILEKPCMD_ = input.readBool();
-              break;
-            }
-            case 56: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
               break;
             }
+            case 56: {
+
+              campType_ = input.readUInt32();
+              break;
+            }
             case 64: {
 
               targetLockPointIndex_ = input.readUInt32();
               break;
             }
-            case 74: {
+            case 72: {
+
+              sightGroupWithOwner_ = input.readBool();
+              break;
+            }
+            case 80: {
+
+              isTrueLifeTimeByOwner_ = input.readBool();
+              break;
+            }
+            case 88: {
+
+              guid_ = input.readUInt64();
+              break;
+            }
+            case 96: {
+
+              targetEntityId_ = input.readUInt32();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (initPos_ != null) {
                 subBuilder = initPos_.toBuilder();
@@ -293,63 +349,22 @@ public final class EvtCreateGadgetNotifyOuterClass {
 
               break;
             }
-            case 80: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              guid_ = input.readUInt64();
-              break;
-            }
-            case 96: {
-
-              campId_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              hEPFGKFLCCD_ = input.readBool();
-              break;
-            }
             case 112: {
 
-              ownerEntityId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
               configId_ = input.readUInt32();
               break;
             }
-            case 1728: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                targetEntityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              targetEntityIdList_.addInt(input.readUInt32());
-              break;
-            }
-            case 1730: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                targetEntityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                targetEntityIdList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 3504: {
+            case 120: {
 
-              isAsyncLoad_ = input.readBool();
+              ownerEntityId_ = input.readUInt32();
               break;
             }
-            case 4128: {
+            case 152: {
+
+              localId_ = input.readInt32();
+              break;
+            }
+            case 2088: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 targetLockPointIndexList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -357,7 +372,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
               targetLockPointIndexList_.addInt(input.readUInt32());
               break;
             }
-            case 4130: {
+            case 2090: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -370,11 +385,60 @@ public final class EvtCreateGadgetNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 15088: {
+            case 2624: {
+
+              initPoseId_ = input.readUInt32();
+              break;
+            }
+            case 2832: {
+
+              isAsyncLoad_ = input.readBool();
+              break;
+            }
+            case 3410: {
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null;
+              if (abilityName_ != null) {
+                subBuilder = abilityName_.toBuilder();
+              }
+              abilityName_ = input.readMessage(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(abilityName_);
+                abilityName_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 5096: {
 
               isPeerIdFromPlayer_ = input.readBool();
               break;
             }
+            case 6472: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                targetEntityIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              targetEntityIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 6474: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                targetEntityIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                targetEntityIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 15184: {
+
+              bornSlotIndex_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -390,12 +454,12 @@ public final class EvtCreateGadgetNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          targetEntityIdList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           targetLockPointIndexList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          targetEntityIdList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -413,21 +477,10 @@ public final class EvtCreateGadgetNotifyOuterClass {
               emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify.class, emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 11;
-    private long guid_;
-    /**
-     * <code>uint64 guid = 11;</code>
-     * @return The guid.
-     */
-    @java.lang.Override
-    public long getGuid() {
-      return guid_;
-    }
-
-    public static final int TARGET_LOCK_POINT_INDEX_LIST_FIELD_NUMBER = 516;
+    public static final int TARGET_LOCK_POINT_INDEX_LIST_FIELD_NUMBER = 261;
     private com.google.protobuf.Internal.IntList targetLockPointIndexList_;
     /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @return A list containing the targetLockPointIndexList.
      */
     @java.lang.Override
@@ -436,14 +489,14 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return targetLockPointIndexList_;
     }
     /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @return The count of targetLockPointIndexList.
      */
     public int getTargetLockPointIndexListCount() {
       return targetLockPointIndexList_.size();
     }
     /**
-     * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+     * <code>repeated uint32 target_lock_point_index_list = 261;</code>
      * @param index The index of the element to return.
      * @return The targetLockPointIndexList at the given index.
      */
@@ -452,59 +505,110 @@ public final class EvtCreateGadgetNotifyOuterClass {
     }
     private int targetLockPointIndexListMemoizedSerializedSize = -1;
 
-    public static final int ROOM_ID_FIELD_NUMBER = 3;
-    private int roomId_;
+    public static final int INIT_POS_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector initPos_;
     /**
-     * <code>uint32 room_id = 3;</code>
-     * @return The roomId.
+     * <code>.Vector init_pos = 13;</code>
+     * @return Whether the initPos field is set.
      */
     @java.lang.Override
-    public int getRoomId() {
-      return roomId_;
+    public boolean hasInitPos() {
+      return initPos_ != null;
+    }
+    /**
+     * <code>.Vector init_pos = 13;</code>
+     * @return The initPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos() {
+      return initPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
+    }
+    /**
+     * <code>.Vector init_pos = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder() {
+      return getInitPos();
     }
 
-    public static final int IS_PEER_ID_FROM_PLAYER_FIELD_NUMBER = 1886;
-    private boolean isPeerIdFromPlayer_;
+    public static final int INIT_EULER_ANGLES_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector initEulerAngles_;
     /**
-     * <code>bool is_peer_id_from_player = 1886;</code>
-     * @return The isPeerIdFromPlayer.
+     * <code>.Vector init_euler_angles = 4;</code>
+     * @return Whether the initEulerAngles field is set.
      */
     @java.lang.Override
-    public boolean getIsPeerIdFromPlayer() {
-      return isPeerIdFromPlayer_;
+    public boolean hasInitEulerAngles() {
+      return initEulerAngles_ != null;
+    }
+    /**
+     * <code>.Vector init_euler_angles = 4;</code>
+     * @return The initEulerAngles.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles() {
+      return initEulerAngles_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
+    }
+    /**
+     * <code>.Vector init_euler_angles = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder() {
+      return getInitEulerAngles();
     }
 
-    public static final int HEPFGKFLCCD_FIELD_NUMBER = 13;
-    private boolean hEPFGKFLCCD_;
+    public static final int TARGET_ENTITY_ID_LIST_FIELD_NUMBER = 809;
+    private com.google.protobuf.Internal.IntList targetEntityIdList_;
     /**
-     * <code>bool HEPFGKFLCCD = 13;</code>
-     * @return The hEPFGKFLCCD.
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @return A list containing the targetEntityIdList.
      */
     @java.lang.Override
-    public boolean getHEPFGKFLCCD() {
-      return hEPFGKFLCCD_;
+    public java.util.List<java.lang.Integer>
+        getTargetEntityIdListList() {
+      return targetEntityIdList_;
     }
-
-    public static final int OWNER_ENTITY_ID_FIELD_NUMBER = 14;
-    private int ownerEntityId_;
     /**
-     * <code>uint32 owner_entity_id = 14;</code>
-     * @return The ownerEntityId.
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @return The count of targetEntityIdList.
      */
-    @java.lang.Override
-    public int getOwnerEntityId() {
-      return ownerEntityId_;
+    public int getTargetEntityIdListCount() {
+      return targetEntityIdList_.size();
     }
-
-    public static final int IS_ASYNC_LOAD_FIELD_NUMBER = 438;
-    private boolean isAsyncLoad_;
     /**
-     * <code>bool is_async_load = 438;</code>
-     * @return The isAsyncLoad.
+     * <code>repeated uint32 target_entity_id_list = 809;</code>
+     * @param index The index of the element to return.
+     * @return The targetEntityIdList at the given index.
+     */
+    public int getTargetEntityIdList(int index) {
+      return targetEntityIdList_.getInt(index);
+    }
+    private int targetEntityIdListMemoizedSerializedSize = -1;
+
+    public static final int ABILITY_NAME_FIELD_NUMBER = 426;
+    private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString abilityName_;
+    /**
+     * <code>.AbilityString ability_name = 426;</code>
+     * @return Whether the abilityName field is set.
      */
     @java.lang.Override
-    public boolean getIsAsyncLoad() {
-      return isAsyncLoad_;
+    public boolean hasAbilityName() {
+      return abilityName_ != null;
+    }
+    /**
+     * <code>.AbilityString ability_name = 426;</code>
+     * @return The abilityName.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getAbilityName() {
+      return abilityName_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : abilityName_;
+    }
+    /**
+     * <code>.AbilityString ability_name = 426;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getAbilityNameOrBuilder() {
+      return getAbilityName();
     }
 
     public static final int TARGET_LOCK_POINT_INDEX_FIELD_NUMBER = 8;
@@ -518,65 +622,17 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return targetLockPointIndex_;
     }
 
-    public static final int INITEULERANGLES_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector initEulerAngles_;
-    /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     * @return Whether the initEulerAngles field is set.
-     */
-    @java.lang.Override
-    public boolean hasInitEulerAngles() {
-      return initEulerAngles_ != null;
-    }
-    /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     * @return The initEulerAngles.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles() {
-      return initEulerAngles_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
-    }
-    /**
-     * <code>.Vector InitEulerAngles = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder() {
-      return getInitEulerAngles();
-    }
-
-    public static final int PROP_OWNER_ENTITY_ID_FIELD_NUMBER = 1;
-    private int propOwnerEntityId_;
-    /**
-     * <code>uint32 prop_owner_entity_id = 1;</code>
-     * @return The propOwnerEntityId.
-     */
-    @java.lang.Override
-    public int getPropOwnerEntityId() {
-      return propOwnerEntityId_;
-    }
-
-    public static final int CAMP_TYPE_FIELD_NUMBER = 5;
-    private int campType_;
-    /**
-     * <code>uint32 camp_type = 5;</code>
-     * @return The campType.
-     */
-    @java.lang.Override
-    public int getCampType() {
-      return campType_;
-    }
-
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 7;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 6;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 7;</code>
+     * <code>.ForwardType forward_type = 6;</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>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -585,97 +641,62 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
-    public static final int INITPOS_FIELD_NUMBER = 9;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector initPos_;
+    public static final int IS_PEER_ID_FROM_PLAYER_FIELD_NUMBER = 637;
+    private boolean isPeerIdFromPlayer_;
     /**
-     * <code>.Vector InitPos = 9;</code>
-     * @return Whether the initPos field is set.
+     * <code>bool is_peer_id_from_player = 637;</code>
+     * @return The isPeerIdFromPlayer.
      */
     @java.lang.Override
-    public boolean hasInitPos() {
-      return initPos_ != null;
-    }
-    /**
-     * <code>.Vector InitPos = 9;</code>
-     * @return The initPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos() {
-      return initPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
-    }
-    /**
-     * <code>.Vector InitPos = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder() {
-      return getInitPos();
+    public boolean getIsPeerIdFromPlayer() {
+      return isPeerIdFromPlayer_;
     }
 
-    public static final int TARGET_ENTITY_ID_FIELD_NUMBER = 2;
-    private int targetEntityId_;
+    public static final int IS_ASYNC_LOAD_FIELD_NUMBER = 354;
+    private boolean isAsyncLoad_;
     /**
-     * <code>uint32 target_entity_id = 2;</code>
-     * @return The targetEntityId.
+     * <code>bool is_async_load = 354;</code>
+     * @return The isAsyncLoad.
      */
     @java.lang.Override
-    public int getTargetEntityId() {
-      return targetEntityId_;
+    public boolean getIsAsyncLoad() {
+      return isAsyncLoad_;
     }
 
-    public static final int CONFIG_ID_FIELD_NUMBER = 15;
-    private int configId_;
+    public static final int SIGHT_GROUP_WITH_OWNER_FIELD_NUMBER = 9;
+    private boolean sightGroupWithOwner_;
     /**
-     * <code>uint32 config_id = 15;</code>
-     * @return The configId.
+     * <pre>
+     * 10
+     * </pre>
+     *
+     * <code>bool sight_group_with_owner = 9;</code>
+     * @return The sightGroupWithOwner.
      */
     @java.lang.Override
-    public int getConfigId() {
-      return configId_;
+    public boolean getSightGroupWithOwner() {
+      return sightGroupWithOwner_;
     }
 
-    public static final int CAMP_ID_FIELD_NUMBER = 12;
-    private int campId_;
+    public static final int IS_TRUE_LIFE_TIME_BY_OWNER_FIELD_NUMBER = 10;
+    private boolean isTrueLifeTimeByOwner_;
     /**
-     * <code>uint32 camp_id = 12;</code>
-     * @return The campId.
+     * <pre>
+     * 9
+     * </pre>
+     *
+     * <code>bool is_true_life_time_by_owner = 10;</code>
+     * @return The isTrueLifeTimeByOwner.
      */
     @java.lang.Override
-    public int getCampId() {
-      return campId_;
+    public boolean getIsTrueLifeTimeByOwner() {
+      return isTrueLifeTimeByOwner_;
     }
 
-    public static final int TARGET_ENTITY_ID_LIST_FIELD_NUMBER = 216;
-    private com.google.protobuf.Internal.IntList targetEntityIdList_;
-    /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @return A list containing the targetEntityIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getTargetEntityIdListList() {
-      return targetEntityIdList_;
-    }
-    /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @return The count of targetEntityIdList.
-     */
-    public int getTargetEntityIdListCount() {
-      return targetEntityIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 target_entity_id_list = 216;</code>
-     * @param index The index of the element to return.
-     * @return The targetEntityIdList at the given index.
-     */
-    public int getTargetEntityIdList(int index) {
-      return targetEntityIdList_.getInt(index);
-    }
-    private int targetEntityIdListMemoizedSerializedSize = -1;
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int ENTITY_ID_FIELD_NUMBER = 5;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 5;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -683,15 +704,125 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int CNIILEKPCMD_FIELD_NUMBER = 6;
-    private boolean cNIILEKPCMD_;
+    public static final int ROOM_ID_FIELD_NUMBER = 2;
+    private int roomId_;
     /**
-     * <code>bool CNIILEKPCMD = 6;</code>
-     * @return The cNIILEKPCMD.
+     * <code>uint32 room_id = 2;</code>
+     * @return The roomId.
      */
     @java.lang.Override
-    public boolean getCNIILEKPCMD() {
-      return cNIILEKPCMD_;
+    public int getRoomId() {
+      return roomId_;
+    }
+
+    public static final int INIT_POSE_ID_FIELD_NUMBER = 328;
+    private int initPoseId_;
+    /**
+     * <code>uint32 init_pose_id = 328;</code>
+     * @return The initPoseId.
+     */
+    @java.lang.Override
+    public int getInitPoseId() {
+      return initPoseId_;
+    }
+
+    public static final int PROP_OWNER_ENTITY_ID_FIELD_NUMBER = 3;
+    private int propOwnerEntityId_;
+    /**
+     * <code>uint32 prop_owner_entity_id = 3;</code>
+     * @return The propOwnerEntityId.
+     */
+    @java.lang.Override
+    public int getPropOwnerEntityId() {
+      return propOwnerEntityId_;
+    }
+
+    public static final int LOCAL_ID_FIELD_NUMBER = 19;
+    private int localId_;
+    /**
+     * <code>int32 local_id = 19;</code>
+     * @return The localId.
+     */
+    @java.lang.Override
+    public int getLocalId() {
+      return localId_;
+    }
+
+    public static final int TARGET_ENTITY_ID_FIELD_NUMBER = 12;
+    private int targetEntityId_;
+    /**
+     * <code>uint32 target_entity_id = 12;</code>
+     * @return The targetEntityId.
+     */
+    @java.lang.Override
+    public int getTargetEntityId() {
+      return targetEntityId_;
+    }
+
+    public static final int CAMP_TYPE_FIELD_NUMBER = 7;
+    private int campType_;
+    /**
+     * <code>uint32 camp_type = 7;</code>
+     * @return The campType.
+     */
+    @java.lang.Override
+    public int getCampType() {
+      return campType_;
+    }
+
+    public static final int CAMP_ID_FIELD_NUMBER = 1;
+    private int campId_;
+    /**
+     * <code>uint32 camp_id = 1;</code>
+     * @return The campId.
+     */
+    @java.lang.Override
+    public int getCampId() {
+      return campId_;
+    }
+
+    public static final int BORN_SLOT_INDEX_FIELD_NUMBER = 1898;
+    private int bornSlotIndex_;
+    /**
+     * <code>uint32 born_slot_index = 1898;</code>
+     * @return The bornSlotIndex.
+     */
+    @java.lang.Override
+    public int getBornSlotIndex() {
+      return bornSlotIndex_;
+    }
+
+    public static final int OWNER_ENTITY_ID_FIELD_NUMBER = 15;
+    private int ownerEntityId_;
+    /**
+     * <code>uint32 owner_entity_id = 15;</code>
+     * @return The ownerEntityId.
+     */
+    @java.lang.Override
+    public int getOwnerEntityId() {
+      return ownerEntityId_;
+    }
+
+    public static final int CONFIG_ID_FIELD_NUMBER = 14;
+    private int configId_;
+    /**
+     * <code>uint32 config_id = 14;</code>
+     * @return The configId.
+     */
+    @java.lang.Override
+    public int getConfigId() {
+      return configId_;
+    }
+
+    public static final int GUID_FIELD_NUMBER = 11;
+    private long guid_;
+    /**
+     * <code>uint64 guid = 11;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public long getGuid() {
+      return guid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -709,70 +840,82 @@ public final class EvtCreateGadgetNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (propOwnerEntityId_ != 0) {
-        output.writeUInt32(1, propOwnerEntityId_);
-      }
-      if (targetEntityId_ != 0) {
-        output.writeUInt32(2, targetEntityId_);
+      if (campId_ != 0) {
+        output.writeUInt32(1, campId_);
       }
       if (roomId_ != 0) {
-        output.writeUInt32(3, roomId_);
+        output.writeUInt32(2, roomId_);
+      }
+      if (propOwnerEntityId_ != 0) {
+        output.writeUInt32(3, propOwnerEntityId_);
       }
       if (initEulerAngles_ != null) {
         output.writeMessage(4, getInitEulerAngles());
       }
-      if (campType_ != 0) {
-        output.writeUInt32(5, campType_);
-      }
-      if (cNIILEKPCMD_ != false) {
-        output.writeBool(6, cNIILEKPCMD_);
+      if (entityId_ != 0) {
+        output.writeUInt32(5, entityId_);
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(7, forwardType_);
+        output.writeEnum(6, forwardType_);
+      }
+      if (campType_ != 0) {
+        output.writeUInt32(7, campType_);
       }
       if (targetLockPointIndex_ != 0) {
         output.writeUInt32(8, targetLockPointIndex_);
       }
-      if (initPos_ != null) {
-        output.writeMessage(9, getInitPos());
+      if (sightGroupWithOwner_ != false) {
+        output.writeBool(9, sightGroupWithOwner_);
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+      if (isTrueLifeTimeByOwner_ != false) {
+        output.writeBool(10, isTrueLifeTimeByOwner_);
       }
       if (guid_ != 0L) {
         output.writeUInt64(11, guid_);
       }
-      if (campId_ != 0) {
-        output.writeUInt32(12, campId_);
+      if (targetEntityId_ != 0) {
+        output.writeUInt32(12, targetEntityId_);
       }
-      if (hEPFGKFLCCD_ != false) {
-        output.writeBool(13, hEPFGKFLCCD_);
-      }
-      if (ownerEntityId_ != 0) {
-        output.writeUInt32(14, ownerEntityId_);
+      if (initPos_ != null) {
+        output.writeMessage(13, getInitPos());
       }
       if (configId_ != 0) {
-        output.writeUInt32(15, configId_);
+        output.writeUInt32(14, configId_);
       }
-      if (getTargetEntityIdListList().size() > 0) {
-        output.writeUInt32NoTag(1730);
-        output.writeUInt32NoTag(targetEntityIdListMemoizedSerializedSize);
+      if (ownerEntityId_ != 0) {
+        output.writeUInt32(15, ownerEntityId_);
       }
-      for (int i = 0; i < targetEntityIdList_.size(); i++) {
-        output.writeUInt32NoTag(targetEntityIdList_.getInt(i));
-      }
-      if (isAsyncLoad_ != false) {
-        output.writeBool(438, isAsyncLoad_);
+      if (localId_ != 0) {
+        output.writeInt32(19, localId_);
       }
       if (getTargetLockPointIndexListList().size() > 0) {
-        output.writeUInt32NoTag(4130);
+        output.writeUInt32NoTag(2090);
         output.writeUInt32NoTag(targetLockPointIndexListMemoizedSerializedSize);
       }
       for (int i = 0; i < targetLockPointIndexList_.size(); i++) {
         output.writeUInt32NoTag(targetLockPointIndexList_.getInt(i));
       }
+      if (initPoseId_ != 0) {
+        output.writeUInt32(328, initPoseId_);
+      }
+      if (isAsyncLoad_ != false) {
+        output.writeBool(354, isAsyncLoad_);
+      }
+      if (abilityName_ != null) {
+        output.writeMessage(426, getAbilityName());
+      }
       if (isPeerIdFromPlayer_ != false) {
-        output.writeBool(1886, isPeerIdFromPlayer_);
+        output.writeBool(637, isPeerIdFromPlayer_);
+      }
+      if (getTargetEntityIdListList().size() > 0) {
+        output.writeUInt32NoTag(6474);
+        output.writeUInt32NoTag(targetEntityIdListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < targetEntityIdList_.size(); i++) {
+        output.writeUInt32NoTag(targetEntityIdList_.getInt(i));
+      }
+      if (bornSlotIndex_ != 0) {
+        output.writeUInt32(1898, bornSlotIndex_);
       }
       unknownFields.writeTo(output);
     }
@@ -783,83 +926,69 @@ public final class EvtCreateGadgetNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (propOwnerEntityId_ != 0) {
+      if (campId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, propOwnerEntityId_);
-      }
-      if (targetEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, targetEntityId_);
+          .computeUInt32Size(1, campId_);
       }
       if (roomId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, roomId_);
+          .computeUInt32Size(2, roomId_);
+      }
+      if (propOwnerEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, propOwnerEntityId_);
       }
       if (initEulerAngles_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getInitEulerAngles());
       }
-      if (campType_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, campType_);
-      }
-      if (cNIILEKPCMD_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, cNIILEKPCMD_);
+          .computeUInt32Size(5, entityId_);
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, forwardType_);
+          .computeEnumSize(6, forwardType_);
+      }
+      if (campType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, campType_);
       }
       if (targetLockPointIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(8, targetLockPointIndex_);
       }
-      if (initPos_ != null) {
+      if (sightGroupWithOwner_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getInitPos());
+          .computeBoolSize(9, sightGroupWithOwner_);
       }
-      if (entityId_ != 0) {
+      if (isTrueLifeTimeByOwner_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeBoolSize(10, isTrueLifeTimeByOwner_);
       }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(11, guid_);
       }
-      if (campId_ != 0) {
+      if (targetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, campId_);
+          .computeUInt32Size(12, targetEntityId_);
       }
-      if (hEPFGKFLCCD_ != false) {
+      if (initPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, hEPFGKFLCCD_);
-      }
-      if (ownerEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, ownerEntityId_);
+          .computeMessageSize(13, getInitPos());
       }
       if (configId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, configId_);
+          .computeUInt32Size(14, configId_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < targetEntityIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(targetEntityIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getTargetEntityIdListList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        targetEntityIdListMemoizedSerializedSize = dataSize;
-      }
-      if (isAsyncLoad_ != false) {
+      if (ownerEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(438, isAsyncLoad_);
+          .computeUInt32Size(15, ownerEntityId_);
+      }
+      if (localId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(19, localId_);
       }
       {
         int dataSize = 0;
@@ -875,9 +1004,39 @@ public final class EvtCreateGadgetNotifyOuterClass {
         }
         targetLockPointIndexListMemoizedSerializedSize = dataSize;
       }
+      if (initPoseId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(328, initPoseId_);
+      }
+      if (isAsyncLoad_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(354, isAsyncLoad_);
+      }
+      if (abilityName_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(426, getAbilityName());
+      }
       if (isPeerIdFromPlayer_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1886, isPeerIdFromPlayer_);
+          .computeBoolSize(637, isPeerIdFromPlayer_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < targetEntityIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(targetEntityIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getTargetEntityIdListList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        targetEntityIdListMemoizedSerializedSize = dataSize;
+      }
+      if (bornSlotIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1898, bornSlotIndex_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -894,49 +1053,60 @@ public final class EvtCreateGadgetNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify other = (emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify) obj;
 
-      if (getGuid()
-          != other.getGuid()) return false;
       if (!getTargetLockPointIndexListList()
           .equals(other.getTargetLockPointIndexListList())) return false;
-      if (getRoomId()
-          != other.getRoomId()) return false;
-      if (getIsPeerIdFromPlayer()
-          != other.getIsPeerIdFromPlayer()) return false;
-      if (getHEPFGKFLCCD()
-          != other.getHEPFGKFLCCD()) return false;
-      if (getOwnerEntityId()
-          != other.getOwnerEntityId()) return false;
-      if (getIsAsyncLoad()
-          != other.getIsAsyncLoad()) return false;
-      if (getTargetLockPointIndex()
-          != other.getTargetLockPointIndex()) return false;
-      if (hasInitEulerAngles() != other.hasInitEulerAngles()) return false;
-      if (hasInitEulerAngles()) {
-        if (!getInitEulerAngles()
-            .equals(other.getInitEulerAngles())) return false;
-      }
-      if (getPropOwnerEntityId()
-          != other.getPropOwnerEntityId()) return false;
-      if (getCampType()
-          != other.getCampType()) return false;
-      if (forwardType_ != other.forwardType_) return false;
       if (hasInitPos() != other.hasInitPos()) return false;
       if (hasInitPos()) {
         if (!getInitPos()
             .equals(other.getInitPos())) return false;
       }
-      if (getTargetEntityId()
-          != other.getTargetEntityId()) return false;
-      if (getConfigId()
-          != other.getConfigId()) return false;
-      if (getCampId()
-          != other.getCampId()) return false;
+      if (hasInitEulerAngles() != other.hasInitEulerAngles()) return false;
+      if (hasInitEulerAngles()) {
+        if (!getInitEulerAngles()
+            .equals(other.getInitEulerAngles())) return false;
+      }
       if (!getTargetEntityIdListList()
           .equals(other.getTargetEntityIdListList())) return false;
+      if (hasAbilityName() != other.hasAbilityName()) return false;
+      if (hasAbilityName()) {
+        if (!getAbilityName()
+            .equals(other.getAbilityName())) return false;
+      }
+      if (getTargetLockPointIndex()
+          != other.getTargetLockPointIndex()) return false;
+      if (forwardType_ != other.forwardType_) return false;
+      if (getIsPeerIdFromPlayer()
+          != other.getIsPeerIdFromPlayer()) return false;
+      if (getIsAsyncLoad()
+          != other.getIsAsyncLoad()) return false;
+      if (getSightGroupWithOwner()
+          != other.getSightGroupWithOwner()) return false;
+      if (getIsTrueLifeTimeByOwner()
+          != other.getIsTrueLifeTimeByOwner()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
-      if (getCNIILEKPCMD()
-          != other.getCNIILEKPCMD()) return false;
+      if (getRoomId()
+          != other.getRoomId()) return false;
+      if (getInitPoseId()
+          != other.getInitPoseId()) return false;
+      if (getPropOwnerEntityId()
+          != other.getPropOwnerEntityId()) return false;
+      if (getLocalId()
+          != other.getLocalId()) return false;
+      if (getTargetEntityId()
+          != other.getTargetEntityId()) return false;
+      if (getCampType()
+          != other.getCampType()) return false;
+      if (getCampId()
+          != other.getCampId()) return false;
+      if (getBornSlotIndex()
+          != other.getBornSlotIndex()) return false;
+      if (getOwnerEntityId()
+          != other.getOwnerEntityId()) return false;
+      if (getConfigId()
+          != other.getConfigId()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -948,57 +1118,67 @@ public final class EvtCreateGadgetNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getGuid());
       if (getTargetLockPointIndexListCount() > 0) {
         hash = (37 * hash) + TARGET_LOCK_POINT_INDEX_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTargetLockPointIndexListList().hashCode();
       }
-      hash = (37 * hash) + ROOM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRoomId();
-      hash = (37 * hash) + IS_PEER_ID_FROM_PLAYER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsPeerIdFromPlayer());
-      hash = (37 * hash) + HEPFGKFLCCD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getHEPFGKFLCCD());
-      hash = (37 * hash) + OWNER_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerEntityId();
-      hash = (37 * hash) + IS_ASYNC_LOAD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsAsyncLoad());
-      hash = (37 * hash) + TARGET_LOCK_POINT_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetLockPointIndex();
-      if (hasInitEulerAngles()) {
-        hash = (37 * hash) + INITEULERANGLES_FIELD_NUMBER;
-        hash = (53 * hash) + getInitEulerAngles().hashCode();
-      }
-      hash = (37 * hash) + PROP_OWNER_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPropOwnerEntityId();
-      hash = (37 * hash) + CAMP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getCampType();
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
       if (hasInitPos()) {
-        hash = (37 * hash) + INITPOS_FIELD_NUMBER;
+        hash = (37 * hash) + INIT_POS_FIELD_NUMBER;
         hash = (53 * hash) + getInitPos().hashCode();
       }
-      hash = (37 * hash) + TARGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetEntityId();
-      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getConfigId();
-      hash = (37 * hash) + CAMP_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCampId();
+      if (hasInitEulerAngles()) {
+        hash = (37 * hash) + INIT_EULER_ANGLES_FIELD_NUMBER;
+        hash = (53 * hash) + getInitEulerAngles().hashCode();
+      }
       if (getTargetEntityIdListCount() > 0) {
         hash = (37 * hash) + TARGET_ENTITY_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getTargetEntityIdListList().hashCode();
       }
+      if (hasAbilityName()) {
+        hash = (37 * hash) + ABILITY_NAME_FIELD_NUMBER;
+        hash = (53 * hash) + getAbilityName().hashCode();
+      }
+      hash = (37 * hash) + TARGET_LOCK_POINT_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetLockPointIndex();
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + IS_PEER_ID_FROM_PLAYER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsPeerIdFromPlayer());
+      hash = (37 * hash) + IS_ASYNC_LOAD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsAsyncLoad());
+      hash = (37 * hash) + SIGHT_GROUP_WITH_OWNER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getSightGroupWithOwner());
+      hash = (37 * hash) + IS_TRUE_LIFE_TIME_BY_OWNER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTrueLifeTimeByOwner());
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + CNIILEKPCMD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getCNIILEKPCMD());
+      hash = (37 * hash) + ROOM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRoomId();
+      hash = (37 * hash) + INIT_POSE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInitPoseId();
+      hash = (37 * hash) + PROP_OWNER_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPropOwnerEntityId();
+      hash = (37 * hash) + LOCAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getLocalId();
+      hash = (37 * hash) + TARGET_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetEntityId();
+      hash = (37 * hash) + CAMP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getCampType();
+      hash = (37 * hash) + CAMP_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCampId();
+      hash = (37 * hash) + BORN_SLOT_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getBornSlotIndex();
+      hash = (37 * hash) + OWNER_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerEntityId();
+      hash = (37 * hash) + CONFIG_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigId();
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1095,11 +1275,6 @@ public final class EvtCreateGadgetNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22195
-     * Obf: LGEDOOIENKG
-     * </pre>
-     *
      * Protobuf type {@code EvtCreateGadgetNotify}
      */
     public static final class Builder extends
@@ -1137,51 +1312,63 @@ public final class EvtCreateGadgetNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        guid_ = 0L;
-
         targetLockPointIndexList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        roomId_ = 0;
-
-        isPeerIdFromPlayer_ = false;
-
-        hEPFGKFLCCD_ = false;
-
-        ownerEntityId_ = 0;
-
-        isAsyncLoad_ = false;
-
-        targetLockPointIndex_ = 0;
-
-        if (initEulerAnglesBuilder_ == null) {
-          initEulerAngles_ = null;
-        } else {
-          initEulerAngles_ = null;
-          initEulerAnglesBuilder_ = null;
-        }
-        propOwnerEntityId_ = 0;
-
-        campType_ = 0;
-
-        forwardType_ = 0;
-
         if (initPosBuilder_ == null) {
           initPos_ = null;
         } else {
           initPos_ = null;
           initPosBuilder_ = null;
         }
+        if (initEulerAnglesBuilder_ == null) {
+          initEulerAngles_ = null;
+        } else {
+          initEulerAngles_ = null;
+          initEulerAnglesBuilder_ = null;
+        }
+        targetEntityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (abilityNameBuilder_ == null) {
+          abilityName_ = null;
+        } else {
+          abilityName_ = null;
+          abilityNameBuilder_ = null;
+        }
+        targetLockPointIndex_ = 0;
+
+        forwardType_ = 0;
+
+        isPeerIdFromPlayer_ = false;
+
+        isAsyncLoad_ = false;
+
+        sightGroupWithOwner_ = false;
+
+        isTrueLifeTimeByOwner_ = false;
+
+        entityId_ = 0;
+
+        roomId_ = 0;
+
+        initPoseId_ = 0;
+
+        propOwnerEntityId_ = 0;
+
+        localId_ = 0;
+
         targetEntityId_ = 0;
 
-        configId_ = 0;
+        campType_ = 0;
 
         campId_ = 0;
 
-        targetEntityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        entityId_ = 0;
+        bornSlotIndex_ = 0;
 
-        cNIILEKPCMD_ = false;
+        ownerEntityId_ = 0;
+
+        configId_ = 0;
+
+        guid_ = 0L;
 
         return this;
       }
@@ -1210,41 +1397,49 @@ public final class EvtCreateGadgetNotifyOuterClass {
       public emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify buildPartial() {
         emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify result = new emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify(this);
         int from_bitField0_ = bitField0_;
-        result.guid_ = guid_;
         if (((bitField0_ & 0x00000001) != 0)) {
           targetLockPointIndexList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.targetLockPointIndexList_ = targetLockPointIndexList_;
-        result.roomId_ = roomId_;
-        result.isPeerIdFromPlayer_ = isPeerIdFromPlayer_;
-        result.hEPFGKFLCCD_ = hEPFGKFLCCD_;
-        result.ownerEntityId_ = ownerEntityId_;
-        result.isAsyncLoad_ = isAsyncLoad_;
-        result.targetLockPointIndex_ = targetLockPointIndex_;
-        if (initEulerAnglesBuilder_ == null) {
-          result.initEulerAngles_ = initEulerAngles_;
-        } else {
-          result.initEulerAngles_ = initEulerAnglesBuilder_.build();
-        }
-        result.propOwnerEntityId_ = propOwnerEntityId_;
-        result.campType_ = campType_;
-        result.forwardType_ = forwardType_;
         if (initPosBuilder_ == null) {
           result.initPos_ = initPos_;
         } else {
           result.initPos_ = initPosBuilder_.build();
         }
-        result.targetEntityId_ = targetEntityId_;
-        result.configId_ = configId_;
-        result.campId_ = campId_;
+        if (initEulerAnglesBuilder_ == null) {
+          result.initEulerAngles_ = initEulerAngles_;
+        } else {
+          result.initEulerAngles_ = initEulerAnglesBuilder_.build();
+        }
         if (((bitField0_ & 0x00000002) != 0)) {
           targetEntityIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.targetEntityIdList_ = targetEntityIdList_;
+        if (abilityNameBuilder_ == null) {
+          result.abilityName_ = abilityName_;
+        } else {
+          result.abilityName_ = abilityNameBuilder_.build();
+        }
+        result.targetLockPointIndex_ = targetLockPointIndex_;
+        result.forwardType_ = forwardType_;
+        result.isPeerIdFromPlayer_ = isPeerIdFromPlayer_;
+        result.isAsyncLoad_ = isAsyncLoad_;
+        result.sightGroupWithOwner_ = sightGroupWithOwner_;
+        result.isTrueLifeTimeByOwner_ = isTrueLifeTimeByOwner_;
         result.entityId_ = entityId_;
-        result.cNIILEKPCMD_ = cNIILEKPCMD_;
+        result.roomId_ = roomId_;
+        result.initPoseId_ = initPoseId_;
+        result.propOwnerEntityId_ = propOwnerEntityId_;
+        result.localId_ = localId_;
+        result.targetEntityId_ = targetEntityId_;
+        result.campType_ = campType_;
+        result.campId_ = campId_;
+        result.bornSlotIndex_ = bornSlotIndex_;
+        result.ownerEntityId_ = ownerEntityId_;
+        result.configId_ = configId_;
+        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -1293,9 +1488,6 @@ public final class EvtCreateGadgetNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify other) {
         if (other == emu.grasscutter.net.proto.EvtCreateGadgetNotifyOuterClass.EvtCreateGadgetNotify.getDefaultInstance()) return this;
-        if (other.getGuid() != 0L) {
-          setGuid(other.getGuid());
-        }
         if (!other.targetLockPointIndexList_.isEmpty()) {
           if (targetLockPointIndexList_.isEmpty()) {
             targetLockPointIndexList_ = other.targetLockPointIndexList_;
@@ -1306,47 +1498,11 @@ public final class EvtCreateGadgetNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.getRoomId() != 0) {
-          setRoomId(other.getRoomId());
-        }
-        if (other.getIsPeerIdFromPlayer() != false) {
-          setIsPeerIdFromPlayer(other.getIsPeerIdFromPlayer());
-        }
-        if (other.getHEPFGKFLCCD() != false) {
-          setHEPFGKFLCCD(other.getHEPFGKFLCCD());
-        }
-        if (other.getOwnerEntityId() != 0) {
-          setOwnerEntityId(other.getOwnerEntityId());
-        }
-        if (other.getIsAsyncLoad() != false) {
-          setIsAsyncLoad(other.getIsAsyncLoad());
-        }
-        if (other.getTargetLockPointIndex() != 0) {
-          setTargetLockPointIndex(other.getTargetLockPointIndex());
-        }
-        if (other.hasInitEulerAngles()) {
-          mergeInitEulerAngles(other.getInitEulerAngles());
-        }
-        if (other.getPropOwnerEntityId() != 0) {
-          setPropOwnerEntityId(other.getPropOwnerEntityId());
-        }
-        if (other.getCampType() != 0) {
-          setCampType(other.getCampType());
-        }
-        if (other.forwardType_ != 0) {
-          setForwardTypeValue(other.getForwardTypeValue());
-        }
         if (other.hasInitPos()) {
           mergeInitPos(other.getInitPos());
         }
-        if (other.getTargetEntityId() != 0) {
-          setTargetEntityId(other.getTargetEntityId());
-        }
-        if (other.getConfigId() != 0) {
-          setConfigId(other.getConfigId());
-        }
-        if (other.getCampId() != 0) {
-          setCampId(other.getCampId());
+        if (other.hasInitEulerAngles()) {
+          mergeInitEulerAngles(other.getInitEulerAngles());
         }
         if (!other.targetEntityIdList_.isEmpty()) {
           if (targetEntityIdList_.isEmpty()) {
@@ -1358,11 +1514,62 @@ public final class EvtCreateGadgetNotifyOuterClass {
           }
           onChanged();
         }
+        if (other.hasAbilityName()) {
+          mergeAbilityName(other.getAbilityName());
+        }
+        if (other.getTargetLockPointIndex() != 0) {
+          setTargetLockPointIndex(other.getTargetLockPointIndex());
+        }
+        if (other.forwardType_ != 0) {
+          setForwardTypeValue(other.getForwardTypeValue());
+        }
+        if (other.getIsPeerIdFromPlayer() != false) {
+          setIsPeerIdFromPlayer(other.getIsPeerIdFromPlayer());
+        }
+        if (other.getIsAsyncLoad() != false) {
+          setIsAsyncLoad(other.getIsAsyncLoad());
+        }
+        if (other.getSightGroupWithOwner() != false) {
+          setSightGroupWithOwner(other.getSightGroupWithOwner());
+        }
+        if (other.getIsTrueLifeTimeByOwner() != false) {
+          setIsTrueLifeTimeByOwner(other.getIsTrueLifeTimeByOwner());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (other.getCNIILEKPCMD() != false) {
-          setCNIILEKPCMD(other.getCNIILEKPCMD());
+        if (other.getRoomId() != 0) {
+          setRoomId(other.getRoomId());
+        }
+        if (other.getInitPoseId() != 0) {
+          setInitPoseId(other.getInitPoseId());
+        }
+        if (other.getPropOwnerEntityId() != 0) {
+          setPropOwnerEntityId(other.getPropOwnerEntityId());
+        }
+        if (other.getLocalId() != 0) {
+          setLocalId(other.getLocalId());
+        }
+        if (other.getTargetEntityId() != 0) {
+          setTargetEntityId(other.getTargetEntityId());
+        }
+        if (other.getCampType() != 0) {
+          setCampType(other.getCampType());
+        }
+        if (other.getCampId() != 0) {
+          setCampId(other.getCampId());
+        }
+        if (other.getBornSlotIndex() != 0) {
+          setBornSlotIndex(other.getBornSlotIndex());
+        }
+        if (other.getOwnerEntityId() != 0) {
+          setOwnerEntityId(other.getOwnerEntityId());
+        }
+        if (other.getConfigId() != 0) {
+          setConfigId(other.getConfigId());
+        }
+        if (other.getGuid() != 0L) {
+          setGuid(other.getGuid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1394,37 +1601,6 @@ public final class EvtCreateGadgetNotifyOuterClass {
       }
       private int bitField0_;
 
-      private long guid_ ;
-      /**
-       * <code>uint64 guid = 11;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public long getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint64 guid = 11;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(long value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 guid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList targetLockPointIndexList_ = emptyIntList();
       private void ensureTargetLockPointIndexListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -1433,7 +1609,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @return A list containing the targetLockPointIndexList.
        */
       public java.util.List<java.lang.Integer>
@@ -1442,14 +1618,14 @@ public final class EvtCreateGadgetNotifyOuterClass {
                  java.util.Collections.unmodifiableList(targetLockPointIndexList_) : targetLockPointIndexList_;
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @return The count of targetLockPointIndexList.
        */
       public int getTargetLockPointIndexListCount() {
         return targetLockPointIndexList_.size();
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @param index The index of the element to return.
        * @return The targetLockPointIndexList at the given index.
        */
@@ -1457,7 +1633,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return targetLockPointIndexList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @param index The index to set the value at.
        * @param value The targetLockPointIndexList to set.
        * @return This builder for chaining.
@@ -1470,7 +1646,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @param value The targetLockPointIndexList to add.
        * @return This builder for chaining.
        */
@@ -1481,7 +1657,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @param values The targetLockPointIndexList to add.
        * @return This builder for chaining.
        */
@@ -1494,7 +1670,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 target_lock_point_index_list = 516;</code>
+       * <code>repeated uint32 target_lock_point_index_list = 261;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetLockPointIndexList() {
@@ -1504,160 +1680,441 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
 
-      private int roomId_ ;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector initPos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> initPosBuilder_;
       /**
-       * <code>uint32 room_id = 3;</code>
-       * @return The roomId.
+       * <code>.Vector init_pos = 13;</code>
+       * @return Whether the initPos field is set.
        */
-      @java.lang.Override
-      public int getRoomId() {
-        return roomId_;
+      public boolean hasInitPos() {
+        return initPosBuilder_ != null || initPos_ != null;
       }
       /**
-       * <code>uint32 room_id = 3;</code>
-       * @param value The roomId to set.
+       * <code>.Vector init_pos = 13;</code>
+       * @return The initPos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos() {
+        if (initPosBuilder_ == null) {
+          return initPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
+        } else {
+          return initPosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public Builder setInitPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (initPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          initPos_ = value;
+          onChanged();
+        } else {
+          initPosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public Builder setInitPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (initPosBuilder_ == null) {
+          initPos_ = builderForValue.build();
+          onChanged();
+        } else {
+          initPosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public Builder mergeInitPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (initPosBuilder_ == null) {
+          if (initPos_ != null) {
+            initPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(initPos_).mergeFrom(value).buildPartial();
+          } else {
+            initPos_ = value;
+          }
+          onChanged();
+        } else {
+          initPosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public Builder clearInitPos() {
+        if (initPosBuilder_ == null) {
+          initPos_ = null;
+          onChanged();
+        } else {
+          initPos_ = null;
+          initPosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getInitPosBuilder() {
+        
+        onChanged();
+        return getInitPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector init_pos = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder() {
+        if (initPosBuilder_ != null) {
+          return initPosBuilder_.getMessageOrBuilder();
+        } else {
+          return initPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
+        }
+      }
+      /**
+       * <code>.Vector init_pos = 13;</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> 
+          getInitPosFieldBuilder() {
+        if (initPosBuilder_ == null) {
+          initPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getInitPos(),
+                  getParentForChildren(),
+                  isClean());
+          initPos_ = null;
+        }
+        return initPosBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector initEulerAngles_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> initEulerAnglesBuilder_;
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       * @return Whether the initEulerAngles field is set.
+       */
+      public boolean hasInitEulerAngles() {
+        return initEulerAnglesBuilder_ != null || initEulerAngles_ != null;
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       * @return The initEulerAngles.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles() {
+        if (initEulerAnglesBuilder_ == null) {
+          return initEulerAngles_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
+        } else {
+          return initEulerAnglesBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public Builder setInitEulerAngles(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (initEulerAnglesBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          initEulerAngles_ = value;
+          onChanged();
+        } else {
+          initEulerAnglesBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public Builder setInitEulerAngles(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (initEulerAnglesBuilder_ == null) {
+          initEulerAngles_ = builderForValue.build();
+          onChanged();
+        } else {
+          initEulerAnglesBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public Builder mergeInitEulerAngles(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (initEulerAnglesBuilder_ == null) {
+          if (initEulerAngles_ != null) {
+            initEulerAngles_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(initEulerAngles_).mergeFrom(value).buildPartial();
+          } else {
+            initEulerAngles_ = value;
+          }
+          onChanged();
+        } else {
+          initEulerAnglesBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public Builder clearInitEulerAngles() {
+        if (initEulerAnglesBuilder_ == null) {
+          initEulerAngles_ = null;
+          onChanged();
+        } else {
+          initEulerAngles_ = null;
+          initEulerAnglesBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getInitEulerAnglesBuilder() {
+        
+        onChanged();
+        return getInitEulerAnglesFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector init_euler_angles = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder() {
+        if (initEulerAnglesBuilder_ != null) {
+          return initEulerAnglesBuilder_.getMessageOrBuilder();
+        } else {
+          return initEulerAngles_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
+        }
+      }
+      /**
+       * <code>.Vector init_euler_angles = 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> 
+          getInitEulerAnglesFieldBuilder() {
+        if (initEulerAnglesBuilder_ == null) {
+          initEulerAnglesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getInitEulerAngles(),
+                  getParentForChildren(),
+                  isClean());
+          initEulerAngles_ = null;
+        }
+        return initEulerAnglesBuilder_;
+      }
+
+      private com.google.protobuf.Internal.IntList targetEntityIdList_ = emptyIntList();
+      private void ensureTargetEntityIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          targetEntityIdList_ = mutableCopy(targetEntityIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @return A list containing the targetEntityIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getTargetEntityIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(targetEntityIdList_) : targetEntityIdList_;
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @return The count of targetEntityIdList.
+       */
+      public int getTargetEntityIdListCount() {
+        return targetEntityIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @param index The index of the element to return.
+       * @return The targetEntityIdList at the given index.
+       */
+      public int getTargetEntityIdList(int index) {
+        return targetEntityIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @param index The index to set the value at.
+       * @param value The targetEntityIdList to set.
        * @return This builder for chaining.
        */
-      public Builder setRoomId(int value) {
-        
-        roomId_ = value;
+      public Builder setTargetEntityIdList(
+          int index, int value) {
+        ensureTargetEntityIdListIsMutable();
+        targetEntityIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 room_id = 3;</code>
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @param value The targetEntityIdList to add.
        * @return This builder for chaining.
        */
-      public Builder clearRoomId() {
-        
-        roomId_ = 0;
+      public Builder addTargetEntityIdList(int value) {
+        ensureTargetEntityIdListIsMutable();
+        targetEntityIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @param values The targetEntityIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTargetEntityIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureTargetEntityIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, targetEntityIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 target_entity_id_list = 809;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetEntityIdList() {
+        targetEntityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
 
-      private boolean isPeerIdFromPlayer_ ;
+      private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString abilityName_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> abilityNameBuilder_;
       /**
-       * <code>bool is_peer_id_from_player = 1886;</code>
-       * @return The isPeerIdFromPlayer.
+       * <code>.AbilityString ability_name = 426;</code>
+       * @return Whether the abilityName field is set.
        */
-      @java.lang.Override
-      public boolean getIsPeerIdFromPlayer() {
-        return isPeerIdFromPlayer_;
+      public boolean hasAbilityName() {
+        return abilityNameBuilder_ != null || abilityName_ != null;
       }
       /**
-       * <code>bool is_peer_id_from_player = 1886;</code>
-       * @param value The isPeerIdFromPlayer to set.
-       * @return This builder for chaining.
+       * <code>.AbilityString ability_name = 426;</code>
+       * @return The abilityName.
        */
-      public Builder setIsPeerIdFromPlayer(boolean value) {
-        
-        isPeerIdFromPlayer_ = value;
-        onChanged();
-        return this;
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getAbilityName() {
+        if (abilityNameBuilder_ == null) {
+          return abilityName_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : abilityName_;
+        } else {
+          return abilityNameBuilder_.getMessage();
+        }
       }
       /**
-       * <code>bool is_peer_id_from_player = 1886;</code>
-       * @return This builder for chaining.
+       * <code>.AbilityString ability_name = 426;</code>
        */
-      public Builder clearIsPeerIdFromPlayer() {
-        
-        isPeerIdFromPlayer_ = false;
-        onChanged();
-        return this;
-      }
+      public Builder setAbilityName(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (abilityNameBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          abilityName_ = value;
+          onChanged();
+        } else {
+          abilityNameBuilder_.setMessage(value);
+        }
 
-      private boolean hEPFGKFLCCD_ ;
-      /**
-       * <code>bool HEPFGKFLCCD = 13;</code>
-       * @return The hEPFGKFLCCD.
-       */
-      @java.lang.Override
-      public boolean getHEPFGKFLCCD() {
-        return hEPFGKFLCCD_;
-      }
-      /**
-       * <code>bool HEPFGKFLCCD = 13;</code>
-       * @param value The hEPFGKFLCCD to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHEPFGKFLCCD(boolean value) {
-        
-        hEPFGKFLCCD_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>bool HEPFGKFLCCD = 13;</code>
-       * @return This builder for chaining.
+       * <code>.AbilityString ability_name = 426;</code>
        */
-      public Builder clearHEPFGKFLCCD() {
-        
-        hEPFGKFLCCD_ = false;
-        onChanged();
-        return this;
-      }
+      public Builder setAbilityName(
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) {
+        if (abilityNameBuilder_ == null) {
+          abilityName_ = builderForValue.build();
+          onChanged();
+        } else {
+          abilityNameBuilder_.setMessage(builderForValue.build());
+        }
 
-      private int ownerEntityId_ ;
-      /**
-       * <code>uint32 owner_entity_id = 14;</code>
-       * @return The ownerEntityId.
-       */
-      @java.lang.Override
-      public int getOwnerEntityId() {
-        return ownerEntityId_;
-      }
-      /**
-       * <code>uint32 owner_entity_id = 14;</code>
-       * @param value The ownerEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOwnerEntityId(int value) {
-        
-        ownerEntityId_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>uint32 owner_entity_id = 14;</code>
-       * @return This builder for chaining.
+       * <code>.AbilityString ability_name = 426;</code>
        */
-      public Builder clearOwnerEntityId() {
-        
-        ownerEntityId_ = 0;
-        onChanged();
-        return this;
-      }
+      public Builder mergeAbilityName(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (abilityNameBuilder_ == null) {
+          if (abilityName_ != null) {
+            abilityName_ =
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.newBuilder(abilityName_).mergeFrom(value).buildPartial();
+          } else {
+            abilityName_ = value;
+          }
+          onChanged();
+        } else {
+          abilityNameBuilder_.mergeFrom(value);
+        }
 
-      private boolean isAsyncLoad_ ;
-      /**
-       * <code>bool is_async_load = 438;</code>
-       * @return The isAsyncLoad.
-       */
-      @java.lang.Override
-      public boolean getIsAsyncLoad() {
-        return isAsyncLoad_;
-      }
-      /**
-       * <code>bool is_async_load = 438;</code>
-       * @param value The isAsyncLoad to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsAsyncLoad(boolean value) {
-        
-        isAsyncLoad_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>bool is_async_load = 438;</code>
-       * @return This builder for chaining.
+       * <code>.AbilityString ability_name = 426;</code>
        */
-      public Builder clearIsAsyncLoad() {
-        
-        isAsyncLoad_ = false;
-        onChanged();
+      public Builder clearAbilityName() {
+        if (abilityNameBuilder_ == null) {
+          abilityName_ = null;
+          onChanged();
+        } else {
+          abilityName_ = null;
+          abilityNameBuilder_ = null;
+        }
+
         return this;
       }
+      /**
+       * <code>.AbilityString ability_name = 426;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getAbilityNameBuilder() {
+        
+        onChanged();
+        return getAbilityNameFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilityString ability_name = 426;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getAbilityNameOrBuilder() {
+        if (abilityNameBuilder_ != null) {
+          return abilityNameBuilder_.getMessageOrBuilder();
+        } else {
+          return abilityName_ == null ?
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : abilityName_;
+        }
+      }
+      /**
+       * <code>.AbilityString ability_name = 426;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> 
+          getAbilityNameFieldBuilder() {
+        if (abilityNameBuilder_ == null) {
+          abilityNameBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder>(
+                  getAbilityName(),
+                  getParentForChildren(),
+                  isClean());
+          abilityName_ = null;
+        }
+        return abilityNameBuilder_;
+      }
 
       private int targetLockPointIndex_ ;
       /**
@@ -1690,197 +2147,16 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector initEulerAngles_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> initEulerAnglesBuilder_;
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       * @return Whether the initEulerAngles field is set.
-       */
-      public boolean hasInitEulerAngles() {
-        return initEulerAnglesBuilder_ != null || initEulerAngles_ != null;
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       * @return The initEulerAngles.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitEulerAngles() {
-        if (initEulerAnglesBuilder_ == null) {
-          return initEulerAngles_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
-        } else {
-          return initEulerAnglesBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public Builder setInitEulerAngles(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (initEulerAnglesBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          initEulerAngles_ = value;
-          onChanged();
-        } else {
-          initEulerAnglesBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public Builder setInitEulerAngles(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (initEulerAnglesBuilder_ == null) {
-          initEulerAngles_ = builderForValue.build();
-          onChanged();
-        } else {
-          initEulerAnglesBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public Builder mergeInitEulerAngles(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (initEulerAnglesBuilder_ == null) {
-          if (initEulerAngles_ != null) {
-            initEulerAngles_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(initEulerAngles_).mergeFrom(value).buildPartial();
-          } else {
-            initEulerAngles_ = value;
-          }
-          onChanged();
-        } else {
-          initEulerAnglesBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public Builder clearInitEulerAngles() {
-        if (initEulerAnglesBuilder_ == null) {
-          initEulerAngles_ = null;
-          onChanged();
-        } else {
-          initEulerAngles_ = null;
-          initEulerAnglesBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getInitEulerAnglesBuilder() {
-        
-        onChanged();
-        return getInitEulerAnglesFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 4;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitEulerAnglesOrBuilder() {
-        if (initEulerAnglesBuilder_ != null) {
-          return initEulerAnglesBuilder_.getMessageOrBuilder();
-        } else {
-          return initEulerAngles_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initEulerAngles_;
-        }
-      }
-      /**
-       * <code>.Vector InitEulerAngles = 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> 
-          getInitEulerAnglesFieldBuilder() {
-        if (initEulerAnglesBuilder_ == null) {
-          initEulerAnglesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getInitEulerAngles(),
-                  getParentForChildren(),
-                  isClean());
-          initEulerAngles_ = null;
-        }
-        return initEulerAnglesBuilder_;
-      }
-
-      private int propOwnerEntityId_ ;
-      /**
-       * <code>uint32 prop_owner_entity_id = 1;</code>
-       * @return The propOwnerEntityId.
-       */
-      @java.lang.Override
-      public int getPropOwnerEntityId() {
-        return propOwnerEntityId_;
-      }
-      /**
-       * <code>uint32 prop_owner_entity_id = 1;</code>
-       * @param value The propOwnerEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPropOwnerEntityId(int value) {
-        
-        propOwnerEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 prop_owner_entity_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPropOwnerEntityId() {
-        
-        propOwnerEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int campType_ ;
-      /**
-       * <code>uint32 camp_type = 5;</code>
-       * @return The campType.
-       */
-      @java.lang.Override
-      public int getCampType() {
-        return campType_;
-      }
-      /**
-       * <code>uint32 camp_type = 5;</code>
-       * @param value The campType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCampType(int value) {
-        
-        campType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 camp_type = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCampType() {
-        
-        campType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 7;</code>
+       * <code>.ForwardType forward_type = 6;</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>
+       * <code>.ForwardType forward_type = 6;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -1891,7 +2167,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 7;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -1901,7 +2177,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 7;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -1915,7 +2191,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 7;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -1925,300 +2201,157 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector initPos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> initPosBuilder_;
+      private boolean isPeerIdFromPlayer_ ;
       /**
-       * <code>.Vector InitPos = 9;</code>
-       * @return Whether the initPos field is set.
-       */
-      public boolean hasInitPos() {
-        return initPosBuilder_ != null || initPos_ != null;
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       * @return The initPos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getInitPos() {
-        if (initPosBuilder_ == null) {
-          return initPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
-        } else {
-          return initPosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public Builder setInitPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (initPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          initPos_ = value;
-          onChanged();
-        } else {
-          initPosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public Builder setInitPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (initPosBuilder_ == null) {
-          initPos_ = builderForValue.build();
-          onChanged();
-        } else {
-          initPosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public Builder mergeInitPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (initPosBuilder_ == null) {
-          if (initPos_ != null) {
-            initPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(initPos_).mergeFrom(value).buildPartial();
-          } else {
-            initPos_ = value;
-          }
-          onChanged();
-        } else {
-          initPosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public Builder clearInitPos() {
-        if (initPosBuilder_ == null) {
-          initPos_ = null;
-          onChanged();
-        } else {
-          initPos_ = null;
-          initPosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getInitPosBuilder() {
-        
-        onChanged();
-        return getInitPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector InitPos = 9;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getInitPosOrBuilder() {
-        if (initPosBuilder_ != null) {
-          return initPosBuilder_.getMessageOrBuilder();
-        } else {
-          return initPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : initPos_;
-        }
-      }
-      /**
-       * <code>.Vector InitPos = 9;</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> 
-          getInitPosFieldBuilder() {
-        if (initPosBuilder_ == null) {
-          initPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getInitPos(),
-                  getParentForChildren(),
-                  isClean());
-          initPos_ = null;
-        }
-        return initPosBuilder_;
-      }
-
-      private int targetEntityId_ ;
-      /**
-       * <code>uint32 target_entity_id = 2;</code>
-       * @return The targetEntityId.
+       * <code>bool is_peer_id_from_player = 637;</code>
+       * @return The isPeerIdFromPlayer.
        */
       @java.lang.Override
-      public int getTargetEntityId() {
-        return targetEntityId_;
+      public boolean getIsPeerIdFromPlayer() {
+        return isPeerIdFromPlayer_;
       }
       /**
-       * <code>uint32 target_entity_id = 2;</code>
-       * @param value The targetEntityId to set.
+       * <code>bool is_peer_id_from_player = 637;</code>
+       * @param value The isPeerIdFromPlayer to set.
        * @return This builder for chaining.
        */
-      public Builder setTargetEntityId(int value) {
+      public Builder setIsPeerIdFromPlayer(boolean value) {
         
-        targetEntityId_ = value;
+        isPeerIdFromPlayer_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 target_entity_id = 2;</code>
+       * <code>bool is_peer_id_from_player = 637;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTargetEntityId() {
+      public Builder clearIsPeerIdFromPlayer() {
         
-        targetEntityId_ = 0;
+        isPeerIdFromPlayer_ = false;
         onChanged();
         return this;
       }
 
-      private int configId_ ;
+      private boolean isAsyncLoad_ ;
       /**
-       * <code>uint32 config_id = 15;</code>
-       * @return The configId.
+       * <code>bool is_async_load = 354;</code>
+       * @return The isAsyncLoad.
        */
       @java.lang.Override
-      public int getConfigId() {
-        return configId_;
+      public boolean getIsAsyncLoad() {
+        return isAsyncLoad_;
       }
       /**
-       * <code>uint32 config_id = 15;</code>
-       * @param value The configId to set.
+       * <code>bool is_async_load = 354;</code>
+       * @param value The isAsyncLoad to set.
        * @return This builder for chaining.
        */
-      public Builder setConfigId(int value) {
+      public Builder setIsAsyncLoad(boolean value) {
         
-        configId_ = value;
+        isAsyncLoad_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 config_id = 15;</code>
+       * <code>bool is_async_load = 354;</code>
        * @return This builder for chaining.
        */
-      public Builder clearConfigId() {
+      public Builder clearIsAsyncLoad() {
         
-        configId_ = 0;
+        isAsyncLoad_ = false;
         onChanged();
         return this;
       }
 
-      private int campId_ ;
+      private boolean sightGroupWithOwner_ ;
       /**
-       * <code>uint32 camp_id = 12;</code>
-       * @return The campId.
+       * <pre>
+       * 10
+       * </pre>
+       *
+       * <code>bool sight_group_with_owner = 9;</code>
+       * @return The sightGroupWithOwner.
        */
       @java.lang.Override
-      public int getCampId() {
-        return campId_;
+      public boolean getSightGroupWithOwner() {
+        return sightGroupWithOwner_;
       }
       /**
-       * <code>uint32 camp_id = 12;</code>
-       * @param value The campId to set.
+       * <pre>
+       * 10
+       * </pre>
+       *
+       * <code>bool sight_group_with_owner = 9;</code>
+       * @param value The sightGroupWithOwner to set.
        * @return This builder for chaining.
        */
-      public Builder setCampId(int value) {
+      public Builder setSightGroupWithOwner(boolean value) {
         
-        campId_ = value;
+        sightGroupWithOwner_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 camp_id = 12;</code>
+       * <pre>
+       * 10
+       * </pre>
+       *
+       * <code>bool sight_group_with_owner = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCampId() {
+      public Builder clearSightGroupWithOwner() {
         
-        campId_ = 0;
+        sightGroupWithOwner_ = false;
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList targetEntityIdList_ = emptyIntList();
-      private void ensureTargetEntityIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          targetEntityIdList_ = mutableCopy(targetEntityIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
+      private boolean isTrueLifeTimeByOwner_ ;
       /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @return A list containing the targetEntityIdList.
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>bool is_true_life_time_by_owner = 10;</code>
+       * @return The isTrueLifeTimeByOwner.
        */
-      public java.util.List<java.lang.Integer>
-          getTargetEntityIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(targetEntityIdList_) : targetEntityIdList_;
+      @java.lang.Override
+      public boolean getIsTrueLifeTimeByOwner() {
+        return isTrueLifeTimeByOwner_;
       }
       /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @return The count of targetEntityIdList.
-       */
-      public int getTargetEntityIdListCount() {
-        return targetEntityIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @param index The index of the element to return.
-       * @return The targetEntityIdList at the given index.
-       */
-      public int getTargetEntityIdList(int index) {
-        return targetEntityIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @param index The index to set the value at.
-       * @param value The targetEntityIdList to set.
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>bool is_true_life_time_by_owner = 10;</code>
+       * @param value The isTrueLifeTimeByOwner to set.
        * @return This builder for chaining.
        */
-      public Builder setTargetEntityIdList(
-          int index, int value) {
-        ensureTargetEntityIdListIsMutable();
-        targetEntityIdList_.setInt(index, value);
+      public Builder setIsTrueLifeTimeByOwner(boolean value) {
+        
+        isTrueLifeTimeByOwner_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @param value The targetEntityIdList to add.
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>bool is_true_life_time_by_owner = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder addTargetEntityIdList(int value) {
-        ensureTargetEntityIdListIsMutable();
-        targetEntityIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @param values The targetEntityIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllTargetEntityIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureTargetEntityIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, targetEntityIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 target_entity_id_list = 216;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetEntityIdList() {
-        targetEntityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearIsTrueLifeTimeByOwner() {
+        
+        isTrueLifeTimeByOwner_ = false;
         onChanged();
         return this;
       }
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -2226,7 +2359,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -2237,7 +2370,7 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -2247,33 +2380,343 @@ public final class EvtCreateGadgetNotifyOuterClass {
         return this;
       }
 
-      private boolean cNIILEKPCMD_ ;
+      private int roomId_ ;
       /**
-       * <code>bool CNIILEKPCMD = 6;</code>
-       * @return The cNIILEKPCMD.
+       * <code>uint32 room_id = 2;</code>
+       * @return The roomId.
        */
       @java.lang.Override
-      public boolean getCNIILEKPCMD() {
-        return cNIILEKPCMD_;
+      public int getRoomId() {
+        return roomId_;
       }
       /**
-       * <code>bool CNIILEKPCMD = 6;</code>
-       * @param value The cNIILEKPCMD to set.
+       * <code>uint32 room_id = 2;</code>
+       * @param value The roomId to set.
        * @return This builder for chaining.
        */
-      public Builder setCNIILEKPCMD(boolean value) {
+      public Builder setRoomId(int value) {
         
-        cNIILEKPCMD_ = value;
+        roomId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool CNIILEKPCMD = 6;</code>
+       * <code>uint32 room_id = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCNIILEKPCMD() {
+      public Builder clearRoomId() {
         
-        cNIILEKPCMD_ = false;
+        roomId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int initPoseId_ ;
+      /**
+       * <code>uint32 init_pose_id = 328;</code>
+       * @return The initPoseId.
+       */
+      @java.lang.Override
+      public int getInitPoseId() {
+        return initPoseId_;
+      }
+      /**
+       * <code>uint32 init_pose_id = 328;</code>
+       * @param value The initPoseId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setInitPoseId(int value) {
+        
+        initPoseId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 init_pose_id = 328;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearInitPoseId() {
+        
+        initPoseId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int propOwnerEntityId_ ;
+      /**
+       * <code>uint32 prop_owner_entity_id = 3;</code>
+       * @return The propOwnerEntityId.
+       */
+      @java.lang.Override
+      public int getPropOwnerEntityId() {
+        return propOwnerEntityId_;
+      }
+      /**
+       * <code>uint32 prop_owner_entity_id = 3;</code>
+       * @param value The propOwnerEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPropOwnerEntityId(int value) {
+        
+        propOwnerEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 prop_owner_entity_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPropOwnerEntityId() {
+        
+        propOwnerEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int localId_ ;
+      /**
+       * <code>int32 local_id = 19;</code>
+       * @return The localId.
+       */
+      @java.lang.Override
+      public int getLocalId() {
+        return localId_;
+      }
+      /**
+       * <code>int32 local_id = 19;</code>
+       * @param value The localId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLocalId(int value) {
+        
+        localId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 local_id = 19;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLocalId() {
+        
+        localId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int targetEntityId_ ;
+      /**
+       * <code>uint32 target_entity_id = 12;</code>
+       * @return The targetEntityId.
+       */
+      @java.lang.Override
+      public int getTargetEntityId() {
+        return targetEntityId_;
+      }
+      /**
+       * <code>uint32 target_entity_id = 12;</code>
+       * @param value The targetEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetEntityId(int value) {
+        
+        targetEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_entity_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetEntityId() {
+        
+        targetEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int campType_ ;
+      /**
+       * <code>uint32 camp_type = 7;</code>
+       * @return The campType.
+       */
+      @java.lang.Override
+      public int getCampType() {
+        return campType_;
+      }
+      /**
+       * <code>uint32 camp_type = 7;</code>
+       * @param value The campType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCampType(int value) {
+        
+        campType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 camp_type = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCampType() {
+        
+        campType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int campId_ ;
+      /**
+       * <code>uint32 camp_id = 1;</code>
+       * @return The campId.
+       */
+      @java.lang.Override
+      public int getCampId() {
+        return campId_;
+      }
+      /**
+       * <code>uint32 camp_id = 1;</code>
+       * @param value The campId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCampId(int value) {
+        
+        campId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 camp_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCampId() {
+        
+        campId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int bornSlotIndex_ ;
+      /**
+       * <code>uint32 born_slot_index = 1898;</code>
+       * @return The bornSlotIndex.
+       */
+      @java.lang.Override
+      public int getBornSlotIndex() {
+        return bornSlotIndex_;
+      }
+      /**
+       * <code>uint32 born_slot_index = 1898;</code>
+       * @param value The bornSlotIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBornSlotIndex(int value) {
+        
+        bornSlotIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 born_slot_index = 1898;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBornSlotIndex() {
+        
+        bornSlotIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int ownerEntityId_ ;
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @return The ownerEntityId.
+       */
+      @java.lang.Override
+      public int getOwnerEntityId() {
+        return ownerEntityId_;
+      }
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @param value The ownerEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnerEntityId(int value) {
+        
+        ownerEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOwnerEntityId() {
+        
+        ownerEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int configId_ ;
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @return The configId.
+       */
+      @java.lang.Override
+      public int getConfigId() {
+        return configId_;
+      }
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @param value The configId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigId(int value) {
+        
+        configId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigId() {
+        
+        configId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 11;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 11;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
         onChanged();
         return this;
       }
@@ -2345,26 +2788,31 @@ public final class EvtCreateGadgetNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033EvtCreateGadgetNotify.proto\032\014Vector.pr" +
-      "oto\032\021ForwardType.proto\"\374\003\n\025EvtCreateGadg" +
-      "etNotify\022\014\n\004guid\030\013 \001(\004\022%\n\034target_lock_po" +
-      "int_index_list\030\204\004 \003(\r\022\017\n\007room_id\030\003 \001(\r\022\037" +
-      "\n\026is_peer_id_from_player\030\336\016 \001(\010\022\023\n\013HEPFG" +
-      "KFLCCD\030\r \001(\010\022\027\n\017owner_entity_id\030\016 \001(\r\022\026\n" +
-      "\ris_async_load\030\266\003 \001(\010\022\037\n\027target_lock_poi" +
-      "nt_index\030\010 \001(\r\022 \n\017InitEulerAngles\030\004 \001(\0132" +
-      "\007.Vector\022\034\n\024prop_owner_entity_id\030\001 \001(\r\022\021" +
-      "\n\tcamp_type\030\005 \001(\r\022\"\n\014forward_type\030\007 \001(\0162" +
-      "\014.ForwardType\022\030\n\007InitPos\030\t \001(\0132\007.Vector\022" +
-      "\030\n\020target_entity_id\030\002 \001(\r\022\021\n\tconfig_id\030\017" +
-      " \001(\r\022\017\n\007camp_id\030\014 \001(\r\022\036\n\025target_entity_i" +
-      "d_list\030\330\001 \003(\r\022\021\n\tentity_id\030\n \001(\r\022\023\n\013CNII" +
-      "LEKPCMD\030\006 \001(\010B\033\n\031emu.grasscutter.net.pro" +
-      "tob\006proto3"
+      "oto\032\023AbilityString.proto\032\021ForwardType.pr" +
+      "oto\"\203\005\n\025EvtCreateGadgetNotify\022%\n\034target_" +
+      "lock_point_index_list\030\205\002 \003(\r\022\031\n\010init_pos" +
+      "\030\r \001(\0132\007.Vector\022\"\n\021init_euler_angles\030\004 \001" +
+      "(\0132\007.Vector\022\036\n\025target_entity_id_list\030\251\006 " +
+      "\003(\r\022%\n\014ability_name\030\252\003 \001(\0132\016.AbilityStri" +
+      "ng\022\037\n\027target_lock_point_index\030\010 \001(\r\022\"\n\014f" +
+      "orward_type\030\006 \001(\0162\014.ForwardType\022\037\n\026is_pe" +
+      "er_id_from_player\030\375\004 \001(\010\022\026\n\ris_async_loa" +
+      "d\030\342\002 \001(\010\022\036\n\026sight_group_with_owner\030\t \001(\010" +
+      "\022\"\n\032is_true_life_time_by_owner\030\n \001(\010\022\021\n\t" +
+      "entity_id\030\005 \001(\r\022\017\n\007room_id\030\002 \001(\r\022\025\n\014init" +
+      "_pose_id\030\310\002 \001(\r\022\034\n\024prop_owner_entity_id\030" +
+      "\003 \001(\r\022\020\n\010local_id\030\023 \001(\005\022\030\n\020target_entity" +
+      "_id\030\014 \001(\r\022\021\n\tcamp_type\030\007 \001(\r\022\017\n\007camp_id\030" +
+      "\001 \001(\r\022\030\n\017born_slot_index\030\352\016 \001(\r\022\027\n\017owner" +
+      "_entity_id\030\017 \001(\r\022\021\n\tconfig_id\030\016 \001(\r\022\014\n\004g" +
+      "uid\030\013 \001(\004B\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
         });
     internal_static_EvtCreateGadgetNotify_descriptor =
@@ -2372,8 +2820,9 @@ public final class EvtCreateGadgetNotifyOuterClass {
     internal_static_EvtCreateGadgetNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtCreateGadgetNotify_descriptor,
-        new java.lang.String[] { "Guid", "TargetLockPointIndexList", "RoomId", "IsPeerIdFromPlayer", "HEPFGKFLCCD", "OwnerEntityId", "IsAsyncLoad", "TargetLockPointIndex", "InitEulerAngles", "PropOwnerEntityId", "CampType", "ForwardType", "InitPos", "TargetEntityId", "ConfigId", "CampId", "TargetEntityIdList", "EntityId", "CNIILEKPCMD", });
+        new java.lang.String[] { "TargetLockPointIndexList", "InitPos", "InitEulerAngles", "TargetEntityIdList", "AbilityName", "TargetLockPointIndex", "ForwardType", "IsPeerIdFromPlayer", "IsAsyncLoad", "SightGroupWithOwner", "IsTrueLifeTimeByOwner", "EntityId", "RoomId", "InitPoseId", "PropOwnerEntityId", "LocalId", "TargetEntityId", "CampType", "CampId", "BornSlotIndex", "OwnerEntityId", "ConfigId", "Guid", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.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 50a0c9521..ad6984572 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtDoSkillSuccNotifyOuterClass.java
@@ -19,49 +19,44 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 caster_id = 14;</code>
-     * @return The casterId.
+     * <code>.Vector forward = 4;</code>
+     * @return Whether the forward field is set.
      */
-    int getCasterId();
+    boolean hasForward();
+    /**
+     * <code>.Vector forward = 4;</code>
+     * @return The forward.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getForward();
+    /**
+     * <code>.Vector forward = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder();
 
     /**
-     * <code>uint32 skill_id = 7;</code>
+     * <code>uint32 skill_id = 11;</code>
      * @return The skillId.
      */
     int getSkillId();
 
     /**
-     * <code>.Vector forward = 5;</code>
-     * @return Whether the forward field is set.
-     */
-    boolean hasForward();
-    /**
-     * <code>.Vector forward = 5;</code>
-     * @return The forward.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getForward();
-    /**
-     * <code>.Vector forward = 5;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder();
-
-    /**
-     * <code>.ForwardType forward_type = 12;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 12;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+
+    /**
+     * <code>uint32 caster_id = 9;</code>
+     * @return The casterId.
+     */
+    int getCasterId();
   }
   /**
-   * <pre>
-   * CmdId: 8216
-   * Obf: LPCJNKAIIEL
-   * </pre>
-   *
    * Protobuf type {@code EvtDoSkillSuccNotify}
    */
   public static final class EvtDoSkillSuccNotify extends
@@ -107,7 +102,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 34: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (forward_ != null) {
                 subBuilder = forward_.toBuilder();
@@ -120,22 +115,22 @@ public final class EvtDoSkillSuccNotifyOuterClass {
 
               break;
             }
-            case 56: {
-
-              skillId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 48: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
               break;
             }
-            case 112: {
+            case 72: {
 
               casterId_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              skillId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -168,32 +163,10 @@ public final class EvtDoSkillSuccNotifyOuterClass {
               emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify.class, emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify.Builder.class);
     }
 
-    public static final int CASTER_ID_FIELD_NUMBER = 14;
-    private int casterId_;
-    /**
-     * <code>uint32 caster_id = 14;</code>
-     * @return The casterId.
-     */
-    @java.lang.Override
-    public int getCasterId() {
-      return casterId_;
-    }
-
-    public static final int SKILL_ID_FIELD_NUMBER = 7;
-    private int skillId_;
-    /**
-     * <code>uint32 skill_id = 7;</code>
-     * @return The skillId.
-     */
-    @java.lang.Override
-    public int getSkillId() {
-      return skillId_;
-    }
-
-    public static final int FORWARD_FIELD_NUMBER = 5;
+    public static final int FORWARD_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector forward_;
     /**
-     * <code>.Vector forward = 5;</code>
+     * <code>.Vector forward = 4;</code>
      * @return Whether the forward field is set.
      */
     @java.lang.Override
@@ -201,7 +174,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       return forward_ != null;
     }
     /**
-     * <code>.Vector forward = 5;</code>
+     * <code>.Vector forward = 4;</code>
      * @return The forward.
      */
     @java.lang.Override
@@ -209,24 +182,35 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       return forward_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : forward_;
     }
     /**
-     * <code>.Vector forward = 5;</code>
+     * <code>.Vector forward = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder() {
       return getForward();
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 12;
+    public static final int SKILL_ID_FIELD_NUMBER = 11;
+    private int skillId_;
+    /**
+     * <code>uint32 skill_id = 11;</code>
+     * @return The skillId.
+     */
+    @java.lang.Override
+    public int getSkillId() {
+      return skillId_;
+    }
+
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 6;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 12;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     @java.lang.Override public int getForwardTypeValue() {
       return forwardType_;
     }
     /**
-     * <code>.ForwardType forward_type = 12;</code>
+     * <code>.ForwardType forward_type = 6;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -235,6 +219,17 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       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() {
@@ -250,16 +245,16 @@ public final class EvtDoSkillSuccNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (forward_ != null) {
-        output.writeMessage(5, getForward());
-      }
-      if (skillId_ != 0) {
-        output.writeUInt32(7, skillId_);
+        output.writeMessage(4, getForward());
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(12, forwardType_);
+        output.writeEnum(6, forwardType_);
       }
       if (casterId_ != 0) {
-        output.writeUInt32(14, casterId_);
+        output.writeUInt32(9, casterId_);
+      }
+      if (skillId_ != 0) {
+        output.writeUInt32(11, skillId_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,19 +267,19 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       size = 0;
       if (forward_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getForward());
-      }
-      if (skillId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, skillId_);
+          .computeMessageSize(4, getForward());
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, forwardType_);
+          .computeEnumSize(6, forwardType_);
       }
       if (casterId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, casterId_);
+          .computeUInt32Size(9, casterId_);
+      }
+      if (skillId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, skillId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -301,16 +296,16 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify other = (emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify) obj;
 
-      if (getCasterId()
-          != other.getCasterId()) return false;
-      if (getSkillId()
-          != other.getSkillId()) return false;
       if (hasForward() != other.hasForward()) return false;
       if (hasForward()) {
         if (!getForward()
             .equals(other.getForward())) return false;
       }
+      if (getSkillId()
+          != other.getSkillId()) return false;
       if (forwardType_ != other.forwardType_) return false;
+      if (getCasterId()
+          != other.getCasterId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,16 +317,16 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CASTER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCasterId();
-      hash = (37 * hash) + SKILL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillId();
       if (hasForward()) {
         hash = (37 * hash) + FORWARD_FIELD_NUMBER;
         hash = (53 * hash) + getForward().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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -428,11 +423,6 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8216
-     * Obf: LPCJNKAIIEL
-     * </pre>
-     *
      * Protobuf type {@code EvtDoSkillSuccNotify}
      */
     public static final class Builder extends
@@ -470,18 +460,18 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        casterId_ = 0;
-
-        skillId_ = 0;
-
         if (forwardBuilder_ == null) {
           forward_ = null;
         } else {
           forward_ = null;
           forwardBuilder_ = null;
         }
+        skillId_ = 0;
+
         forwardType_ = 0;
 
+        casterId_ = 0;
+
         return this;
       }
 
@@ -508,14 +498,14 @@ public final class EvtDoSkillSuccNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify buildPartial() {
         emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify result = new emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify(this);
-        result.casterId_ = casterId_;
-        result.skillId_ = skillId_;
         if (forwardBuilder_ == null) {
           result.forward_ = forward_;
         } else {
           result.forward_ = forwardBuilder_.build();
         }
+        result.skillId_ = skillId_;
         result.forwardType_ = forwardType_;
+        result.casterId_ = casterId_;
         onBuilt();
         return result;
       }
@@ -564,18 +554,18 @@ public final class EvtDoSkillSuccNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify other) {
         if (other == emu.grasscutter.net.proto.EvtDoSkillSuccNotifyOuterClass.EvtDoSkillSuccNotify.getDefaultInstance()) return this;
-        if (other.getCasterId() != 0) {
-          setCasterId(other.getCasterId());
+        if (other.hasForward()) {
+          mergeForward(other.getForward());
         }
         if (other.getSkillId() != 0) {
           setSkillId(other.getSkillId());
         }
-        if (other.hasForward()) {
-          mergeForward(other.getForward());
-        }
         if (other.forwardType_ != 0) {
           setForwardTypeValue(other.getForwardTypeValue());
         }
+        if (other.getCasterId() != 0) {
+          setCasterId(other.getCasterId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -605,80 +595,18 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
 
-      private int casterId_ ;
-      /**
-       * <code>uint32 caster_id = 14;</code>
-       * @return The casterId.
-       */
-      @java.lang.Override
-      public int getCasterId() {
-        return casterId_;
-      }
-      /**
-       * <code>uint32 caster_id = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCasterId() {
-        
-        casterId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int skillId_ ;
-      /**
-       * <code>uint32 skill_id = 7;</code>
-       * @return The skillId.
-       */
-      @java.lang.Override
-      public int getSkillId() {
-        return skillId_;
-      }
-      /**
-       * <code>uint32 skill_id = 7;</code>
-       * @param value The skillId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillId(int value) {
-        
-        skillId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillId() {
-        
-        skillId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector forward_;
       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 = 5;</code>
+       * <code>.Vector forward = 4;</code>
        * @return Whether the forward field is set.
        */
       public boolean hasForward() {
         return forwardBuilder_ != null || forward_ != null;
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        * @return The forward.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getForward() {
@@ -689,7 +617,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public Builder setForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (forwardBuilder_ == null) {
@@ -705,7 +633,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public Builder setForward(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -719,7 +647,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public Builder mergeForward(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (forwardBuilder_ == null) {
@@ -737,7 +665,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public Builder clearForward() {
         if (forwardBuilder_ == null) {
@@ -751,7 +679,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getForwardBuilder() {
         
@@ -759,7 +687,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return getForwardFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getForwardOrBuilder() {
         if (forwardBuilder_ != null) {
@@ -770,7 +698,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector forward = 5;</code>
+       * <code>.Vector forward = 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> 
@@ -786,16 +714,47 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return forwardBuilder_;
       }
 
+      private int skillId_ ;
+      /**
+       * <code>uint32 skill_id = 11;</code>
+       * @return The skillId.
+       */
+      @java.lang.Override
+      public int getSkillId() {
+        return skillId_;
+      }
+      /**
+       * <code>uint32 skill_id = 11;</code>
+       * @param value The skillId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillId(int value) {
+        
+        skillId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillId() {
+        
+        skillId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 12;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @return The enum numeric value on the wire for forwardType.
        */
       @java.lang.Override public int getForwardTypeValue() {
         return forwardType_;
       }
       /**
-       * <code>.ForwardType forward_type = 12;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -806,7 +765,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 12;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -816,7 +775,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 12;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -830,7 +789,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 12;</code>
+       * <code>.ForwardType forward_type = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -839,6 +798,37 @@ public final class EvtDoSkillSuccNotifyOuterClass {
         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) {
@@ -908,9 +898,9 @@ public final class EvtDoSkillSuccNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032EvtDoSkillSuccNotify.proto\032\014Vector.pro" +
       "to\032\021ForwardType.proto\"y\n\024EvtDoSkillSuccN" +
-      "otify\022\021\n\tcaster_id\030\016 \001(\r\022\020\n\010skill_id\030\007 \001" +
-      "(\r\022\030\n\007forward\030\005 \001(\0132\007.Vector\022\"\n\014forward_" +
-      "type\030\014 \001(\0162\014.ForwardTypeB\033\n\031emu.grasscut" +
+      "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" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -924,7 +914,7 @@ public final class EvtDoSkillSuccNotifyOuterClass {
     internal_static_EvtDoSkillSuccNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtDoSkillSuccNotify_descriptor,
-        new java.lang.String[] { "CasterId", "SkillId", "Forward", "ForwardType", });
+        new java.lang.String[] { "Forward", "SkillId", "ForwardType", "CasterId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java
index 2b82624aa..d637437d5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityRenderersChangedNotifyOuterClass.java
@@ -19,47 +19,46 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 12;</code>
+     * <code>uint32 entity_id = 2;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     * @return Whether the rendererChangedInfo field is set.
-     */
-    boolean hasRendererChangedInfo();
-    /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     * @return The rendererChangedInfo.
-     */
-    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo getRendererChangedInfo();
-    /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     */
-    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder();
-
-    /**
-     * <code>.ForwardType forward_type = 10;</code>
+     * <code>.ForwardType forward_type = 7;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 10;</code>
+     * <code>.ForwardType forward_type = 7;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
 
     /**
-     * <code>bool is_server_cache = 6;</code>
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     * @return Whether the rendererChangedInfo field is set.
+     */
+    boolean hasRendererChangedInfo();
+    /**
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     * @return The rendererChangedInfo.
+     */
+    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo getRendererChangedInfo();
+    /**
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     */
+    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder();
+
+    /**
+     * <code>bool is_server_cache = 11;</code>
      * @return The isServerCache.
      */
     boolean getIsServerCache();
   }
   /**
    * <pre>
-   * CmdId: 5525
-   * Obf: IOCCLGCILKA
+   * CmdId: 7358
    * </pre>
    *
    * Protobuf type {@code EvtEntityRenderersChangedNotify}
@@ -107,7 +106,18 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 16: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+              int rawValue = input.readEnum();
+
+              forwardType_ = rawValue;
+              break;
+            }
+            case 82: {
               emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.Builder subBuilder = null;
               if (rendererChangedInfo_ != null) {
                 subBuilder = rendererChangedInfo_.toBuilder();
@@ -120,22 +130,11 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
 
               break;
             }
-            case 48: {
+            case 88: {
 
               isServerCache_ = input.readBool();
               break;
             }
-            case 80: {
-              int rawValue = input.readEnum();
-
-              forwardType_ = rawValue;
-              break;
-            }
-            case 96: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -168,10 +167,10 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
               emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify.class, emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 12;
+    public static final int ENTITY_ID_FIELD_NUMBER = 2;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 12;</code>
+     * <code>uint32 entity_id = 2;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -179,43 +178,17 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int RENDERER_CHANGED_INFO_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo rendererChangedInfo_;
-    /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     * @return Whether the rendererChangedInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasRendererChangedInfo() {
-      return rendererChangedInfo_ != null;
-    }
-    /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     * @return The rendererChangedInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo getRendererChangedInfo() {
-      return rendererChangedInfo_ == null ? emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.getDefaultInstance() : rendererChangedInfo_;
-    }
-    /**
-     * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder() {
-      return getRendererChangedInfo();
-    }
-
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 10;
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 7;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 10;</code>
+     * <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 = 10;</code>
+     * <code>.ForwardType forward_type = 7;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -224,10 +197,36 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
-    public static final int IS_SERVER_CACHE_FIELD_NUMBER = 6;
+    public static final int RENDERER_CHANGED_INFO_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo rendererChangedInfo_;
+    /**
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     * @return Whether the rendererChangedInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasRendererChangedInfo() {
+      return rendererChangedInfo_ != null;
+    }
+    /**
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     * @return The rendererChangedInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo getRendererChangedInfo() {
+      return rendererChangedInfo_ == null ? emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.getDefaultInstance() : rendererChangedInfo_;
+    }
+    /**
+     * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder() {
+      return getRendererChangedInfo();
+    }
+
+    public static final int IS_SERVER_CACHE_FIELD_NUMBER = 11;
     private boolean isServerCache_;
     /**
-     * <code>bool is_server_cache = 6;</code>
+     * <code>bool is_server_cache = 11;</code>
      * @return The isServerCache.
      */
     @java.lang.Override
@@ -249,17 +248,17 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (rendererChangedInfo_ != null) {
-        output.writeMessage(4, getRendererChangedInfo());
-      }
-      if (isServerCache_ != false) {
-        output.writeBool(6, isServerCache_);
+      if (entityId_ != 0) {
+        output.writeUInt32(2, entityId_);
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(10, forwardType_);
+        output.writeEnum(7, forwardType_);
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(12, entityId_);
+      if (rendererChangedInfo_ != null) {
+        output.writeMessage(10, getRendererChangedInfo());
+      }
+      if (isServerCache_ != false) {
+        output.writeBool(11, isServerCache_);
       }
       unknownFields.writeTo(output);
     }
@@ -270,21 +269,21 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (rendererChangedInfo_ != null) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getRendererChangedInfo());
-      }
-      if (isServerCache_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isServerCache_);
+          .computeUInt32Size(2, entityId_);
       }
       if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, forwardType_);
+          .computeEnumSize(7, forwardType_);
       }
-      if (entityId_ != 0) {
+      if (rendererChangedInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, entityId_);
+          .computeMessageSize(10, getRendererChangedInfo());
+      }
+      if (isServerCache_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isServerCache_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -303,12 +302,12 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
 
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (forwardType_ != other.forwardType_) return false;
       if (hasRendererChangedInfo() != other.hasRendererChangedInfo()) return false;
       if (hasRendererChangedInfo()) {
         if (!getRendererChangedInfo()
             .equals(other.getRendererChangedInfo())) return false;
       }
-      if (forwardType_ != other.forwardType_) return false;
       if (getIsServerCache()
           != other.getIsServerCache()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -324,12 +323,12 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + forwardType_;
       if (hasRendererChangedInfo()) {
         hash = (37 * hash) + RENDERER_CHANGED_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getRendererChangedInfo().hashCode();
       }
-      hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + forwardType_;
       hash = (37 * hash) + IS_SERVER_CACHE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsServerCache());
@@ -430,8 +429,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 5525
-     * Obf: IOCCLGCILKA
+     * CmdId: 7358
      * </pre>
      *
      * Protobuf type {@code EvtEntityRenderersChangedNotify}
@@ -473,14 +471,14 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         super.clear();
         entityId_ = 0;
 
+        forwardType_ = 0;
+
         if (rendererChangedInfoBuilder_ == null) {
           rendererChangedInfo_ = null;
         } else {
           rendererChangedInfo_ = null;
           rendererChangedInfoBuilder_ = null;
         }
-        forwardType_ = 0;
-
         isServerCache_ = false;
 
         return this;
@@ -510,12 +508,12 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
       public emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify buildPartial() {
         emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify result = new emu.grasscutter.net.proto.EvtEntityRenderersChangedNotifyOuterClass.EvtEntityRenderersChangedNotify(this);
         result.entityId_ = entityId_;
+        result.forwardType_ = forwardType_;
         if (rendererChangedInfoBuilder_ == null) {
           result.rendererChangedInfo_ = rendererChangedInfo_;
         } else {
           result.rendererChangedInfo_ = rendererChangedInfoBuilder_.build();
         }
-        result.forwardType_ = forwardType_;
         result.isServerCache_ = isServerCache_;
         onBuilt();
         return result;
@@ -568,12 +566,12 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
-        if (other.hasRendererChangedInfo()) {
-          mergeRendererChangedInfo(other.getRendererChangedInfo());
-        }
         if (other.forwardType_ != 0) {
           setForwardTypeValue(other.getForwardTypeValue());
         }
+        if (other.hasRendererChangedInfo()) {
+          mergeRendererChangedInfo(other.getRendererChangedInfo());
+        }
         if (other.getIsServerCache() != false) {
           setIsServerCache(other.getIsServerCache());
         }
@@ -608,7 +606,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 12;</code>
+       * <code>uint32 entity_id = 2;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -616,7 +614,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 12;</code>
+       * <code>uint32 entity_id = 2;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -627,7 +625,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 12;</code>
+       * <code>uint32 entity_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -637,18 +635,72 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         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;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 7;</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;
+      }
+      /**
+       * <code>.ForwardType forward_type = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearForwardType() {
+        
+        forwardType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo rendererChangedInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo, emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.Builder, emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder> rendererChangedInfoBuilder_;
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        * @return Whether the rendererChangedInfo field is set.
        */
       public boolean hasRendererChangedInfo() {
         return rendererChangedInfoBuilder_ != null || rendererChangedInfo_ != null;
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        * @return The rendererChangedInfo.
        */
       public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo getRendererChangedInfo() {
@@ -659,7 +711,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         }
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public Builder setRendererChangedInfo(emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo value) {
         if (rendererChangedInfoBuilder_ == null) {
@@ -675,7 +727,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public Builder setRendererChangedInfo(
           emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.Builder builderForValue) {
@@ -689,7 +741,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public Builder mergeRendererChangedInfo(emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo value) {
         if (rendererChangedInfoBuilder_ == null) {
@@ -707,7 +759,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public Builder clearRendererChangedInfo() {
         if (rendererChangedInfoBuilder_ == null) {
@@ -721,7 +773,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.Builder getRendererChangedInfoBuilder() {
         
@@ -729,7 +781,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return getRendererChangedInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       public emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder() {
         if (rendererChangedInfoBuilder_ != null) {
@@ -740,7 +792,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         }
       }
       /**
-       * <code>.EntityRendererChangedInfo renderer_changed_info = 4;</code>
+       * <code>.EntityRendererChangedInfo renderer_changed_info = 10;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo, emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfo.Builder, emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder> 
@@ -756,63 +808,9 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return rendererChangedInfoBuilder_;
       }
 
-      private int forwardType_ = 0;
-      /**
-       * <code>.ForwardType forward_type = 10;</code>
-       * @return The enum numeric value on the wire for forwardType.
-       */
-      @java.lang.Override public int getForwardTypeValue() {
-        return forwardType_;
-      }
-      /**
-       * <code>.ForwardType forward_type = 10;</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;
-      }
-      /**
-       * <code>.ForwardType forward_type = 10;</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;
-      }
-      /**
-       * <code>.ForwardType forward_type = 10;</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;
-      }
-      /**
-       * <code>.ForwardType forward_type = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearForwardType() {
-        
-        forwardType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isServerCache_ ;
       /**
-       * <code>bool is_server_cache = 6;</code>
+       * <code>bool is_server_cache = 11;</code>
        * @return The isServerCache.
        */
       @java.lang.Override
@@ -820,7 +818,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return isServerCache_;
       }
       /**
-       * <code>bool is_server_cache = 6;</code>
+       * <code>bool is_server_cache = 11;</code>
        * @param value The isServerCache to set.
        * @return This builder for chaining.
        */
@@ -831,7 +829,7 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_server_cache = 6;</code>
+       * <code>bool is_server_cache = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsServerCache() {
@@ -908,28 +906,28 @@ public final class EvtEntityRenderersChangedNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%EvtEntityRenderersChangedNotify.proto\032" +
-      "\037EntityRendererChangedInfo.proto\032\021Forwar" +
-      "dType.proto\"\254\001\n\037EvtEntityRenderersChange" +
-      "dNotify\022\021\n\tentity_id\030\014 \001(\r\0229\n\025renderer_c" +
-      "hanged_info\030\004 \001(\0132\032.EntityRendererChange" +
-      "dInfo\022\"\n\014forward_type\030\n \001(\0162\014.ForwardTyp" +
-      "e\022\027\n\017is_server_cache\030\006 \001(\010B\033\n\031emu.grassc" +
+      "\021ForwardType.proto\032\037EntityRendererChange" +
+      "dInfo.proto\"\254\001\n\037EvtEntityRenderersChange" +
+      "dNotify\022\021\n\tentity_id\030\002 \001(\r\022\"\n\014forward_ty" +
+      "pe\030\007 \001(\0162\014.ForwardType\0229\n\025renderer_chang" +
+      "ed_info\030\n \001(\0132\032.EntityRendererChangedInf" +
+      "o\022\027\n\017is_server_cache\030\013 \001(\010B\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.getDescriptor(),
         });
     internal_static_EvtEntityRenderersChangedNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_EvtEntityRenderersChangedNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtEntityRenderersChangedNotify_descriptor,
-        new java.lang.String[] { "EntityId", "RendererChangedInfo", "ForwardType", "IsServerCache", });
-    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "EntityId", "ForwardType", "RendererChangedInfo", "IsServerCache", });
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityStartDieEndNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityStartDieEndNotifyOuterClass.java
index 83d8fc5ff..236858d35 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityStartDieEndNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/EvtEntityStartDieEndNotifyOuterClass.java
@@ -19,38 +19,37 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 die_state_flag = 13;</code>
-     * @return The dieStateFlag.
-     */
-    int getDieStateFlag();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>bool immediately = 12;</code>
+     * <code>bool immediately = 4;</code>
      * @return The immediately.
      */
     boolean getImmediately();
 
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <code>uint32 die_state_flag = 7;</code>
+     * @return The dieStateFlag.
+     */
+    int getDieStateFlag();
+
+    /**
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The enum numeric value on the wire for forwardType.
      */
     int getForwardTypeValue();
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The forwardType.
      */
     emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType();
+
+    /**
+     * <code>uint32 entity_id = 12;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 27889
-   * Obf: BIBKKFDFKEH
+   * CmdId: 5095
    * </pre>
    *
    * Protobuf type {@code EvtEntityStartDieEndNotify}
@@ -98,25 +97,25 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 32: {
+
+              immediately_ = input.readBool();
+              break;
+            }
+            case 56: {
+
+              dieStateFlag_ = input.readUInt32();
+              break;
+            }
+            case 80: {
               int rawValue = input.readEnum();
 
               forwardType_ = rawValue;
               break;
             }
-            case 72: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             case 96: {
 
-              immediately_ = input.readBool();
-              break;
-            }
-            case 104: {
-
-              dieStateFlag_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
             default: {
@@ -151,32 +150,10 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
               emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify.class, emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify.Builder.class);
     }
 
-    public static final int DIE_STATE_FLAG_FIELD_NUMBER = 13;
-    private int dieStateFlag_;
-    /**
-     * <code>uint32 die_state_flag = 13;</code>
-     * @return The dieStateFlag.
-     */
-    @java.lang.Override
-    public int getDieStateFlag() {
-      return dieStateFlag_;
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int IMMEDIATELY_FIELD_NUMBER = 12;
+    public static final int IMMEDIATELY_FIELD_NUMBER = 4;
     private boolean immediately_;
     /**
-     * <code>bool immediately = 12;</code>
+     * <code>bool immediately = 4;</code>
      * @return The immediately.
      */
     @java.lang.Override
@@ -184,17 +161,28 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       return immediately_;
     }
 
-    public static final int FORWARD_TYPE_FIELD_NUMBER = 6;
+    public static final int DIE_STATE_FLAG_FIELD_NUMBER = 7;
+    private int dieStateFlag_;
+    /**
+     * <code>uint32 die_state_flag = 7;</code>
+     * @return The dieStateFlag.
+     */
+    @java.lang.Override
+    public int getDieStateFlag() {
+      return dieStateFlag_;
+    }
+
+    public static final int FORWARD_TYPE_FIELD_NUMBER = 10;
     private int forwardType_;
     /**
-     * <code>.ForwardType forward_type = 6;</code>
+     * <code>.ForwardType forward_type = 10;</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>
+     * <code>.ForwardType forward_type = 10;</code>
      * @return The forwardType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType getForwardType() {
@@ -203,6 +191,17 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 12;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 12;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -217,17 +216,17 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        output.writeEnum(6, forwardType_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(9, entityId_);
-      }
       if (immediately_ != false) {
-        output.writeBool(12, immediately_);
+        output.writeBool(4, immediately_);
       }
       if (dieStateFlag_ != 0) {
-        output.writeUInt32(13, dieStateFlag_);
+        output.writeUInt32(7, dieStateFlag_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        output.writeEnum(10, forwardType_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(12, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -238,21 +237,21 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, forwardType_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, entityId_);
-      }
       if (immediately_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, immediately_);
+          .computeBoolSize(4, immediately_);
       }
       if (dieStateFlag_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, dieStateFlag_);
+          .computeUInt32Size(7, dieStateFlag_);
+      }
+      if (forwardType_ != emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.FORWARD_TYPE_LOCAL.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, forwardType_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -269,13 +268,13 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       }
       emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify other = (emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify) obj;
 
-      if (getDieStateFlag()
-          != other.getDieStateFlag()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (getImmediately()
           != other.getImmediately()) return false;
+      if (getDieStateFlag()
+          != other.getDieStateFlag()) return false;
       if (forwardType_ != other.forwardType_) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -287,15 +286,15 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + DIE_STATE_FLAG_FIELD_NUMBER;
-      hash = (53 * hash) + getDieStateFlag();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + IMMEDIATELY_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getImmediately());
+      hash = (37 * hash) + DIE_STATE_FLAG_FIELD_NUMBER;
+      hash = (53 * hash) + getDieStateFlag();
       hash = (37 * hash) + FORWARD_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + forwardType_;
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -393,8 +392,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 27889
-     * Obf: BIBKKFDFKEH
+     * CmdId: 5095
      * </pre>
      *
      * Protobuf type {@code EvtEntityStartDieEndNotify}
@@ -434,14 +432,14 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        dieStateFlag_ = 0;
-
-        entityId_ = 0;
-
         immediately_ = false;
 
+        dieStateFlag_ = 0;
+
         forwardType_ = 0;
 
+        entityId_ = 0;
+
         return this;
       }
 
@@ -468,10 +466,10 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify buildPartial() {
         emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify result = new emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify(this);
-        result.dieStateFlag_ = dieStateFlag_;
-        result.entityId_ = entityId_;
         result.immediately_ = immediately_;
+        result.dieStateFlag_ = dieStateFlag_;
         result.forwardType_ = forwardType_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -520,18 +518,18 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify other) {
         if (other == emu.grasscutter.net.proto.EvtEntityStartDieEndNotifyOuterClass.EvtEntityStartDieEndNotify.getDefaultInstance()) return this;
-        if (other.getDieStateFlag() != 0) {
-          setDieStateFlag(other.getDieStateFlag());
-        }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.getImmediately() != false) {
           setImmediately(other.getImmediately());
         }
+        if (other.getDieStateFlag() != 0) {
+          setDieStateFlag(other.getDieStateFlag());
+        }
         if (other.forwardType_ != 0) {
           setForwardTypeValue(other.getForwardTypeValue());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -561,71 +559,9 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return this;
       }
 
-      private int dieStateFlag_ ;
-      /**
-       * <code>uint32 die_state_flag = 13;</code>
-       * @return The dieStateFlag.
-       */
-      @java.lang.Override
-      public int getDieStateFlag() {
-        return dieStateFlag_;
-      }
-      /**
-       * <code>uint32 die_state_flag = 13;</code>
-       * @param value The dieStateFlag to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDieStateFlag(int value) {
-        
-        dieStateFlag_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 die_state_flag = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDieStateFlag() {
-        
-        dieStateFlag_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 9;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 9;</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 = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean immediately_ ;
       /**
-       * <code>bool immediately = 12;</code>
+       * <code>bool immediately = 4;</code>
        * @return The immediately.
        */
       @java.lang.Override
@@ -633,7 +569,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return immediately_;
       }
       /**
-       * <code>bool immediately = 12;</code>
+       * <code>bool immediately = 4;</code>
        * @param value The immediately to set.
        * @return This builder for chaining.
        */
@@ -644,7 +580,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool immediately = 12;</code>
+       * <code>bool immediately = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearImmediately() {
@@ -654,16 +590,47 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return this;
       }
 
+      private int dieStateFlag_ ;
+      /**
+       * <code>uint32 die_state_flag = 7;</code>
+       * @return The dieStateFlag.
+       */
+      @java.lang.Override
+      public int getDieStateFlag() {
+        return dieStateFlag_;
+      }
+      /**
+       * <code>uint32 die_state_flag = 7;</code>
+       * @param value The dieStateFlag to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDieStateFlag(int value) {
+        
+        dieStateFlag_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 die_state_flag = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDieStateFlag() {
+        
+        dieStateFlag_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int forwardType_ = 0;
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <code>.ForwardType forward_type = 10;</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>
+       * <code>.ForwardType forward_type = 10;</code>
        * @param value The enum numeric value on the wire for forwardType to set.
        * @return This builder for chaining.
        */
@@ -674,7 +641,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @return The forwardType.
        */
       @java.lang.Override
@@ -684,7 +651,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ForwardTypeOuterClass.ForwardType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @param value The forwardType to set.
        * @return This builder for chaining.
        */
@@ -698,7 +665,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ForwardType forward_type = 6;</code>
+       * <code>.ForwardType forward_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearForwardType() {
@@ -707,6 +674,37 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 12;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 12;</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 = 12;</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) {
@@ -776,9 +774,9 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n EvtEntityStartDieEndNotify.proto\032\021Forw" +
       "ardType.proto\"\200\001\n\032EvtEntityStartDieEndNo" +
-      "tify\022\026\n\016die_state_flag\030\r \001(\r\022\021\n\tentity_i" +
-      "d\030\t \001(\r\022\023\n\013immediately\030\014 \001(\010\022\"\n\014forward_" +
-      "type\030\006 \001(\0162\014.ForwardTypeB\033\n\031emu.grasscut" +
+      "tify\022\023\n\013immediately\030\004 \001(\010\022\026\n\016die_state_f" +
+      "lag\030\007 \001(\r\022\"\n\014forward_type\030\n \001(\0162\014.Forwar" +
+      "dType\022\021\n\tentity_id\030\014 \001(\rB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -791,7 +789,7 @@ public final class EvtEntityStartDieEndNotifyOuterClass {
     internal_static_EvtEntityStartDieEndNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_EvtEntityStartDieEndNotify_descriptor,
-        new java.lang.String[] { "DieStateFlag", "EntityId", "Immediately", "ForwardType", });
+        new java.lang.String[] { "Immediately", "DieStateFlag", "ForwardType", "EntityId", });
     emu.grasscutter.net.proto.ForwardTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ExhibitionDisplayInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ExhibitionDisplayInfoOuterClass.java
index 6f471bc51..915293591 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ExhibitionDisplayInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ExhibitionDisplayInfoOuterClass.java
@@ -38,7 +38,7 @@ public final class ExhibitionDisplayInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: MCIHMDBLAPP
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ExhibitionDisplayInfo}
@@ -344,7 +344,7 @@ public final class ExhibitionDisplayInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: MCIHMDBLAPP
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ExhibitionDisplayInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FeatureBlockInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FeatureBlockInfoOuterClass.java
index f12e17d25..1753e7725 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FeatureBlockInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FeatureBlockInfoOuterClass.java
@@ -31,10 +31,6 @@ public final class FeatureBlockInfoOuterClass {
     int getEndTime();
   }
   /**
-   * <pre>
-   * Obf: NGEGAFNJIFO
-   * </pre>
-   *
    * Protobuf type {@code FeatureBlockInfo}
    */
   public static final class FeatureBlockInfo extends
@@ -310,10 +306,6 @@ public final class FeatureBlockInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NGEGAFNJIFO
-     * </pre>
-     *
      * Protobuf type {@code FeatureBlockInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FetterDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FetterDataOuterClass.java
index 9a0721e44..10092ec81 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FetterDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FetterDataOuterClass.java
@@ -48,10 +48,6 @@ public final class FetterDataOuterClass {
     int getCondIndexList(int index);
   }
   /**
-   * <pre>
-   * Obf: JFCHMJKBMBL
-   * </pre>
-   *
    * Protobuf type {@code FetterData}
    */
   public static final class FetterData extends
@@ -409,10 +405,6 @@ public final class FetterDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JFCHMJKBMBL
-     * </pre>
-     *
      * Protobuf type {@code FetterData}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FightPropPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FightPropPairOuterClass.java
index 3ef617cde..055981a3d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FightPropPairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FightPropPairOuterClass.java
@@ -31,10 +31,6 @@ public final class FightPropPairOuterClass {
     float getPropValue();
   }
   /**
-   * <pre>
-   * Obf: DKENFABIHAJ
-   * </pre>
-   *
    * Protobuf type {@code FightPropPair}
    */
   public static final class FightPropPair extends
@@ -312,10 +308,6 @@ public final class FightPropPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DKENFABIHAJ
-     * </pre>
-     *
      * Protobuf type {@code FightPropPair}
      */
     public static final class Builder extends
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 9e11fbef9..b43b6cf83 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class FinishedParentQuestNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> 
         getParentQuestListList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index);
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     int getParentQuestListCount();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
         getParentQuestListOrBuilderList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 27820
-   * Obf: EPOAAKIMMFB
-   * </pre>
-   *
    * Protobuf type {@code FinishedParentQuestNotify}
    */
   public static final class FinishedParentQuestNotify extends
@@ -94,7 +89,7 @@ public final class FinishedParentQuestNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class FinishedParentQuestNotifyOuterClass {
               emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify.class, emu.grasscutter.net.proto.FinishedParentQuestNotifyOuterClass.FinishedParentQuestNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 6;
+    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> parentQuestList_;
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
@@ -156,21 +151,21 @@ public final class FinishedParentQuestNotifyOuterClass {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     @java.lang.Override
     public int getParentQuestListCount() {
       return parentQuestList_.size();
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
       return parentQuestList_.get(index);
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
@@ -193,7 +188,7 @@ public final class FinishedParentQuestNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < parentQuestList_.size(); i++) {
-        output.writeMessage(6, parentQuestList_.get(i));
+        output.writeMessage(14, parentQuestList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class FinishedParentQuestNotifyOuterClass {
       size = 0;
       for (int i = 0; i < parentQuestList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, parentQuestList_.get(i));
+          .computeMessageSize(14, parentQuestList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class FinishedParentQuestNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27820
-     * Obf: EPOAAKIMMFB
-     * </pre>
-     *
      * Protobuf type {@code FinishedParentQuestNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class FinishedParentQuestNotifyOuterClass {
           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 = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
         if (parentQuestListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public int getParentQuestListCount() {
         if (parentQuestListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -585,7 +575,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
         if (parentQuestListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -632,7 +622,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder addParentQuestList(
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder addAllParentQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> values) {
@@ -675,7 +665,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder clearParentQuestList() {
         if (parentQuestListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public Builder removeParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class FinishedParentQuestNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder getParentQuestListBuilder(
           int index) {
         return getParentQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class FinishedParentQuestNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
            getParentQuestListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class FinishedParentQuestNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</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 = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class FinishedParentQuestNotifyOuterClass {
             index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 6;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder> 
            getParentQuestListBuilderList() {
@@ -833,7 +823,7 @@ public final class FinishedParentQuestNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037FinishedParentQuestNotify.proto\032\021Paren" +
       "tQuest.proto\"D\n\031FinishedParentQuestNotif" +
-      "y\022\'\n\021parent_quest_list\030\006 \003(\0132\014.ParentQue" +
+      "y\022\'\n\021parent_quest_list\030\016 \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 ca9f7c104..6a93faa96 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FinishedParentQuestUpdateNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> 
         getParentQuestListList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index);
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     int getParentQuestListCount();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
         getParentQuestListOrBuilderList();
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 455
-   * Obf: JCGNAICEEND
-   * </pre>
-   *
    * Protobuf type {@code FinishedParentQuestUpdateNotify}
    */
   public static final class FinishedParentQuestUpdateNotify extends
@@ -94,7 +89,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentQuestList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify.class, emu.grasscutter.net.proto.FinishedParentQuestUpdateNotifyOuterClass.FinishedParentQuestUpdateNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 3;
+    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> parentQuestList_;
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
@@ -156,21 +151,21 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
       return parentQuestList_;
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     @java.lang.Override
     public int getParentQuestListCount() {
       return parentQuestList_.size();
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
       return parentQuestList_.get(index);
     }
     /**
-     * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+     * <code>repeated .ParentQuest parent_quest_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
@@ -193,7 +188,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < parentQuestList_.size(); i++) {
-        output.writeMessage(3, parentQuestList_.get(i));
+        output.writeMessage(11, parentQuestList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
       size = 0;
       for (int i = 0; i < parentQuestList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, parentQuestList_.get(i));
+          .computeMessageSize(11, parentQuestList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 455
-     * Obf: JCGNAICEEND
-     * </pre>
-     *
      * Protobuf type {@code FinishedParentQuestUpdateNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
           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 = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> getParentQuestListList() {
         if (parentQuestListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public int getParentQuestListCount() {
         if (parentQuestListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest getParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -585,7 +575,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder setParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder addParentQuestList(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
         if (parentQuestListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest value) {
@@ -632,7 +622,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder addParentQuestList(
           emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder addParentQuestList(
           int index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder addAllParentQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest> values) {
@@ -675,7 +665,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder clearParentQuestList() {
         if (parentQuestListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public Builder removeParentQuestList(int index) {
         if (parentQuestListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder getParentQuestListBuilder(
           int index) {
         return getParentQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder getParentQuestListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuestOrBuilder> 
            getParentQuestListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</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 = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder addParentQuestListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
             index, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ParentQuest parent_quest_list = 3;</code>
+       * <code>repeated .ParentQuest parent_quest_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder> 
            getParentQuestListBuilderList() {
@@ -833,7 +823,7 @@ public final class FinishedParentQuestUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n%FinishedParentQuestUpdateNotify.proto\032" +
       "\021ParentQuest.proto\"J\n\037FinishedParentQues" +
-      "tUpdateNotify\022\'\n\021parent_quest_list\030\003 \003(\013" +
+      "tUpdateNotify\022\'\n\021parent_quest_list\030\013 \003(\013" +
       "2\014.ParentQuestB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FishBattleEndRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FishBattleEndRspOuterClass.java
index 8c8f6122e..a34dc3b3d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FishBattleEndRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FishBattleEndRspOuterClass.java
@@ -19,11 +19,70 @@ public final class FishBattleEndRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getOICHDIANAEEList();
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOICHDIANAEE(int index);
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    int getOICHDIANAEECount();
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getOICHDIANAEEOrBuilderList();
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOICHDIANAEEOrBuilder(
+        int index);
+
+    /**
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
 
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getRewardItemListList();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index);
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    int getRewardItemListCount();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getRewardItemListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+     * @return The enum numeric value on the wire for noRewardReason.
+     */
+    int getNoRewardReasonValue();
+    /**
+     * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+     * @return The noRewardReason.
+     */
+    emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason getNoRewardReason();
+
     /**
      * <code>.FishBattleResult battle_result = 7;</code>
      * @return The enum numeric value on the wire for battleResult.
@@ -36,100 +95,36 @@ public final class FishBattleEndRspOuterClass {
     emu.grasscutter.net.proto.FishBattleResultOuterClass.FishBattleResult getBattleResult();
 
     /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getRewardItemListList();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index);
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    int getRewardItemListCount();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getRewardItemListOrBuilderList();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
-        int index);
-
-    /**
-     * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-     * @return The enum numeric value on the wire for noRewardReason.
-     */
-    int getNoRewardReasonValue();
-    /**
-     * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-     * @return The noRewardReason.
-     */
-    emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason getNoRewardReason();
-
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getFILLNPDLDGIList();
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFILLNPDLDGI(int index);
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    int getFILLNPDLDGICount();
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getFILLNPDLDGIOrBuilderList();
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFILLNPDLDGIOrBuilder(
-        int index);
-
-    /**
-     * <code>bool is_got_reward = 13;</code>
+     * <code>bool is_got_reward = 11;</code>
      * @return The isGotReward.
      */
     boolean getIsGotReward();
 
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getAGADCCFPDEIList();
+        getLEPOMLNOAPKList();
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAGADCCFPDEI(int index);
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getLEPOMLNOAPK(int index);
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
-    int getAGADCCFPDEICount();
+    int getLEPOMLNOAPKCount();
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getAGADCCFPDEIOrBuilderList();
+        getLEPOMLNOAPKOrBuilderList();
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAGADCCFPDEIOrBuilder(
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getLEPOMLNOAPKOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 2479
-   * Obf: IDIIDOMLDIA
-   * </pre>
-   *
    * Protobuf type {@code FishBattleEndRsp}
    */
   public static final class FishBattleEndRsp extends
@@ -142,11 +137,11 @@ public final class FishBattleEndRspOuterClass {
       super(builder);
     }
     private FishBattleEndRsp() {
-      battleResult_ = 0;
+      oICHDIANAEE_ = java.util.Collections.emptyList();
       rewardItemList_ = java.util.Collections.emptyList();
       noRewardReason_ = 0;
-      fILLNPDLDGI_ = java.util.Collections.emptyList();
-      aGADCCFPDEI_ = java.util.Collections.emptyList();
+      battleResult_ = 0;
+      lEPOMLNOAPK_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -180,55 +175,55 @@ public final class FishBattleEndRspOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                aGADCCFPDEI_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000004;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                oICHDIANAEE_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000001;
               }
-              aGADCCFPDEI_.add(
+              oICHDIANAEE_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
+            case 16: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              rewardItemList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
+            case 48: {
+              int rawValue = input.readEnum();
+
+              noRewardReason_ = rawValue;
+              break;
+            }
             case 56: {
               int rawValue = input.readEnum();
 
               battleResult_ = rawValue;
               break;
             }
-            case 66: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                fILLNPDLDGI_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              fILLNPDLDGI_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-              break;
-            }
-            case 72: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              rewardItemList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-              break;
-            }
-            case 96: {
-              int rawValue = input.readEnum();
-
-              noRewardReason_ = rawValue;
-              break;
-            }
-            case 104: {
+            case 88: {
 
               isGotReward_ = input.readBool();
               break;
             }
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                lEPOMLNOAPK_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              lEPOMLNOAPK_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -244,15 +239,15 @@ public final class FishBattleEndRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          aGADCCFPDEI_ = java.util.Collections.unmodifiableList(aGADCCFPDEI_);
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          oICHDIANAEE_ = java.util.Collections.unmodifiableList(oICHDIANAEE_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          fILLNPDLDGI_ = java.util.Collections.unmodifiableList(fILLNPDLDGI_);
-        }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           rewardItemList_ = java.util.Collections.unmodifiableList(rewardItemList_);
         }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          lEPOMLNOAPK_ = java.util.Collections.unmodifiableList(lEPOMLNOAPK_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -270,140 +265,50 @@ public final class FishBattleEndRspOuterClass {
               emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.class, emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.Builder.class);
     }
 
+    public static final int OICHDIANAEE_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> oICHDIANAEE_;
     /**
-     * <pre>
-     * Obf: KNCHAIIMIDM
-     * </pre>
-     *
-     * Protobuf enum {@code FishBattleEndRsp.FishNoRewardReason}
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
      */
-    public enum FishNoRewardReason
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>FISH_NO_REWARD_NONE = 0;</code>
-       */
-      FISH_NO_REWARD_NONE(0),
-      /**
-       * <code>FISH_NO_REWARD_ACTIVITY_LIMIT = 1;</code>
-       */
-      FISH_NO_REWARD_ACTIVITY_LIMIT(1),
-      /**
-       * <code>FISH_NO_REWARD_BAG_LIMIT = 2;</code>
-       */
-      FISH_NO_REWARD_BAG_LIMIT(2),
-      /**
-       * <code>FISH_NO_REWARD_POOL_LIMIT = 3;</code>
-       */
-      FISH_NO_REWARD_POOL_LIMIT(3),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>FISH_NO_REWARD_NONE = 0;</code>
-       */
-      public static final int FISH_NO_REWARD_NONE_VALUE = 0;
-      /**
-       * <code>FISH_NO_REWARD_ACTIVITY_LIMIT = 1;</code>
-       */
-      public static final int FISH_NO_REWARD_ACTIVITY_LIMIT_VALUE = 1;
-      /**
-       * <code>FISH_NO_REWARD_BAG_LIMIT = 2;</code>
-       */
-      public static final int FISH_NO_REWARD_BAG_LIMIT_VALUE = 2;
-      /**
-       * <code>FISH_NO_REWARD_POOL_LIMIT = 3;</code>
-       */
-      public static final int FISH_NO_REWARD_POOL_LIMIT_VALUE = 3;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static FishNoRewardReason valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static FishNoRewardReason forNumber(int value) {
-        switch (value) {
-          case 0: return FISH_NO_REWARD_NONE;
-          case 1: return FISH_NO_REWARD_ACTIVITY_LIMIT;
-          case 2: return FISH_NO_REWARD_BAG_LIMIT;
-          case 3: return FISH_NO_REWARD_POOL_LIMIT;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<FishNoRewardReason>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          FishNoRewardReason> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<FishNoRewardReason>() {
-              public FishNoRewardReason findValueByNumber(int number) {
-                return FishNoRewardReason.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final FishNoRewardReason[] VALUES = values();
-
-      public static FishNoRewardReason valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private FishNoRewardReason(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:FishBattleEndRsp.FishNoRewardReason)
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getOICHDIANAEEList() {
+      return oICHDIANAEE_;
+    }
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getOICHDIANAEEOrBuilderList() {
+      return oICHDIANAEE_;
+    }
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    @java.lang.Override
+    public int getOICHDIANAEECount() {
+      return oICHDIANAEE_.size();
+    }
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOICHDIANAEE(int index) {
+      return oICHDIANAEE_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOICHDIANAEEOrBuilder(
+        int index) {
+      return oICHDIANAEE_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 2;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -411,6 +316,65 @@ public final class FishBattleEndRspOuterClass {
       return retcode_;
     }
 
+    public static final int REWARD_ITEM_LIST_FIELD_NUMBER = 3;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_;
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
+      return rewardItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getRewardItemListOrBuilderList() {
+      return rewardItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    @java.lang.Override
+    public int getRewardItemListCount() {
+      return rewardItemList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
+      return rewardItemList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
+        int index) {
+      return rewardItemList_.get(index);
+    }
+
+    public static final int NO_REWARD_REASON_FIELD_NUMBER = 6;
+    private int noRewardReason_;
+    /**
+     * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+     * @return The enum numeric value on the wire for noRewardReason.
+     */
+    @java.lang.Override public int getNoRewardReasonValue() {
+      return noRewardReason_;
+    }
+    /**
+     * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+     * @return The noRewardReason.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason getNoRewardReason() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason result = emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.valueOf(noRewardReason_);
+      return result == null ? emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.UNRECOGNIZED : result;
+    }
+
     public static final int BATTLE_RESULT_FIELD_NUMBER = 7;
     private int battleResult_;
     /**
@@ -430,109 +394,10 @@ public final class FishBattleEndRspOuterClass {
       return result == null ? emu.grasscutter.net.proto.FishBattleResultOuterClass.FishBattleResult.UNRECOGNIZED : result;
     }
 
-    public static final int REWARD_ITEM_LIST_FIELD_NUMBER = 11;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_;
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
-      return rewardItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getRewardItemListOrBuilderList() {
-      return rewardItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    @java.lang.Override
-    public int getRewardItemListCount() {
-      return rewardItemList_.size();
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
-      return rewardItemList_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
-        int index) {
-      return rewardItemList_.get(index);
-    }
-
-    public static final int NO_REWARD_REASON_FIELD_NUMBER = 12;
-    private int noRewardReason_;
-    /**
-     * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-     * @return The enum numeric value on the wire for noRewardReason.
-     */
-    @java.lang.Override public int getNoRewardReasonValue() {
-      return noRewardReason_;
-    }
-    /**
-     * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-     * @return The noRewardReason.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason getNoRewardReason() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason result = emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.valueOf(noRewardReason_);
-      return result == null ? emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.UNRECOGNIZED : result;
-    }
-
-    public static final int FILLNPDLDGI_FIELD_NUMBER = 8;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> fILLNPDLDGI_;
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getFILLNPDLDGIList() {
-      return fILLNPDLDGI_;
-    }
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getFILLNPDLDGIOrBuilderList() {
-      return fILLNPDLDGI_;
-    }
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    @java.lang.Override
-    public int getFILLNPDLDGICount() {
-      return fILLNPDLDGI_.size();
-    }
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFILLNPDLDGI(int index) {
-      return fILLNPDLDGI_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFILLNPDLDGIOrBuilder(
-        int index) {
-      return fILLNPDLDGI_.get(index);
-    }
-
-    public static final int IS_GOT_REWARD_FIELD_NUMBER = 13;
+    public static final int IS_GOT_REWARD_FIELD_NUMBER = 11;
     private boolean isGotReward_;
     /**
-     * <code>bool is_got_reward = 13;</code>
+     * <code>bool is_got_reward = 11;</code>
      * @return The isGotReward.
      */
     @java.lang.Override
@@ -540,44 +405,44 @@ public final class FishBattleEndRspOuterClass {
       return isGotReward_;
     }
 
-    public static final int AGADCCFPDEI_FIELD_NUMBER = 6;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> aGADCCFPDEI_;
+    public static final int LEPOMLNOAPK_FIELD_NUMBER = 12;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> lEPOMLNOAPK_;
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getAGADCCFPDEIList() {
-      return aGADCCFPDEI_;
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getLEPOMLNOAPKList() {
+      return lEPOMLNOAPK_;
     }
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getAGADCCFPDEIOrBuilderList() {
-      return aGADCCFPDEI_;
+        getLEPOMLNOAPKOrBuilderList() {
+      return lEPOMLNOAPK_;
     }
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     @java.lang.Override
-    public int getAGADCCFPDEICount() {
-      return aGADCCFPDEI_.size();
+    public int getLEPOMLNOAPKCount() {
+      return lEPOMLNOAPK_.size();
     }
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAGADCCFPDEI(int index) {
-      return aGADCCFPDEI_.get(index);
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getLEPOMLNOAPK(int index) {
+      return lEPOMLNOAPK_.get(index);
     }
     /**
-     * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+     * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAGADCCFPDEIOrBuilder(
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getLEPOMLNOAPKOrBuilder(
         int index) {
-      return aGADCCFPDEI_.get(index);
+      return lEPOMLNOAPK_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -594,26 +459,26 @@ public final class FishBattleEndRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < aGADCCFPDEI_.size(); i++) {
-        output.writeMessage(6, aGADCCFPDEI_.get(i));
+      for (int i = 0; i < oICHDIANAEE_.size(); i++) {
+        output.writeMessage(1, oICHDIANAEE_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(2, retcode_);
+      }
+      for (int i = 0; i < rewardItemList_.size(); i++) {
+        output.writeMessage(3, rewardItemList_.get(i));
+      }
+      if (noRewardReason_ != emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.FISH_NO_REWARD_NONE.getNumber()) {
+        output.writeEnum(6, noRewardReason_);
       }
       if (battleResult_ != emu.grasscutter.net.proto.FishBattleResultOuterClass.FishBattleResult.FISH_BATTLE_RESULT_NONE.getNumber()) {
         output.writeEnum(7, battleResult_);
       }
-      for (int i = 0; i < fILLNPDLDGI_.size(); i++) {
-        output.writeMessage(8, fILLNPDLDGI_.get(i));
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
-      for (int i = 0; i < rewardItemList_.size(); i++) {
-        output.writeMessage(11, rewardItemList_.get(i));
-      }
-      if (noRewardReason_ != emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.FISH_NO_REWARD_NONE.getNumber()) {
-        output.writeEnum(12, noRewardReason_);
-      }
       if (isGotReward_ != false) {
-        output.writeBool(13, isGotReward_);
+        output.writeBool(11, isGotReward_);
+      }
+      for (int i = 0; i < lEPOMLNOAPK_.size(); i++) {
+        output.writeMessage(12, lEPOMLNOAPK_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -624,33 +489,33 @@ public final class FishBattleEndRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < aGADCCFPDEI_.size(); i++) {
+      for (int i = 0; i < oICHDIANAEE_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, aGADCCFPDEI_.get(i));
+          .computeMessageSize(1, oICHDIANAEE_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, retcode_);
+      }
+      for (int i = 0; i < rewardItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(3, rewardItemList_.get(i));
+      }
+      if (noRewardReason_ != emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.FISH_NO_REWARD_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(6, noRewardReason_);
       }
       if (battleResult_ != emu.grasscutter.net.proto.FishBattleResultOuterClass.FishBattleResult.FISH_BATTLE_RESULT_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(7, battleResult_);
       }
-      for (int i = 0; i < fILLNPDLDGI_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, fILLNPDLDGI_.get(i));
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
-      }
-      for (int i = 0; i < rewardItemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, rewardItemList_.get(i));
-      }
-      if (noRewardReason_ != emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.FISH_NO_REWARD_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, noRewardReason_);
-      }
       if (isGotReward_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isGotReward_);
+          .computeBoolSize(11, isGotReward_);
+      }
+      for (int i = 0; i < lEPOMLNOAPK_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, lEPOMLNOAPK_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -667,18 +532,18 @@ public final class FishBattleEndRspOuterClass {
       }
       emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp other = (emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp) obj;
 
+      if (!getOICHDIANAEEList()
+          .equals(other.getOICHDIANAEEList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (battleResult_ != other.battleResult_) return false;
       if (!getRewardItemListList()
           .equals(other.getRewardItemListList())) return false;
       if (noRewardReason_ != other.noRewardReason_) return false;
-      if (!getFILLNPDLDGIList()
-          .equals(other.getFILLNPDLDGIList())) return false;
+      if (battleResult_ != other.battleResult_) return false;
       if (getIsGotReward()
           != other.getIsGotReward()) return false;
-      if (!getAGADCCFPDEIList()
-          .equals(other.getAGADCCFPDEIList())) return false;
+      if (!getLEPOMLNOAPKList()
+          .equals(other.getLEPOMLNOAPKList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -690,26 +555,26 @@ public final class FishBattleEndRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getOICHDIANAEECount() > 0) {
+        hash = (37 * hash) + OICHDIANAEE_FIELD_NUMBER;
+        hash = (53 * hash) + getOICHDIANAEEList().hashCode();
+      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + BATTLE_RESULT_FIELD_NUMBER;
-      hash = (53 * hash) + battleResult_;
       if (getRewardItemListCount() > 0) {
         hash = (37 * hash) + REWARD_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getRewardItemListList().hashCode();
       }
       hash = (37 * hash) + NO_REWARD_REASON_FIELD_NUMBER;
       hash = (53 * hash) + noRewardReason_;
-      if (getFILLNPDLDGICount() > 0) {
-        hash = (37 * hash) + FILLNPDLDGI_FIELD_NUMBER;
-        hash = (53 * hash) + getFILLNPDLDGIList().hashCode();
-      }
+      hash = (37 * hash) + BATTLE_RESULT_FIELD_NUMBER;
+      hash = (53 * hash) + battleResult_;
       hash = (37 * hash) + IS_GOT_REWARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsGotReward());
-      if (getAGADCCFPDEICount() > 0) {
-        hash = (37 * hash) + AGADCCFPDEI_FIELD_NUMBER;
-        hash = (53 * hash) + getAGADCCFPDEIList().hashCode();
+      if (getLEPOMLNOAPKCount() > 0) {
+        hash = (37 * hash) + LEPOMLNOAPK_FIELD_NUMBER;
+        hash = (53 * hash) + getLEPOMLNOAPKList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -807,11 +672,6 @@ public final class FishBattleEndRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2479
-     * Obf: IDIIDOMLDIA
-     * </pre>
-     *
      * Protobuf type {@code FishBattleEndRsp}
      */
     public static final class Builder extends
@@ -844,39 +704,39 @@ public final class FishBattleEndRspOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getOICHDIANAEEFieldBuilder();
           getRewardItemListFieldBuilder();
-          getFILLNPDLDGIFieldBuilder();
-          getAGADCCFPDEIFieldBuilder();
+          getLEPOMLNOAPKFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (oICHDIANAEEBuilder_ == null) {
+          oICHDIANAEE_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          oICHDIANAEEBuilder_.clear();
+        }
         retcode_ = 0;
 
-        battleResult_ = 0;
-
         if (rewardItemListBuilder_ == null) {
           rewardItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           rewardItemListBuilder_.clear();
         }
         noRewardReason_ = 0;
 
-        if (fILLNPDLDGIBuilder_ == null) {
-          fILLNPDLDGI_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          fILLNPDLDGIBuilder_.clear();
-        }
+        battleResult_ = 0;
+
         isGotReward_ = false;
 
-        if (aGADCCFPDEIBuilder_ == null) {
-          aGADCCFPDEI_ = java.util.Collections.emptyList();
+        if (lEPOMLNOAPKBuilder_ == null) {
+          lEPOMLNOAPK_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
         } else {
-          aGADCCFPDEIBuilder_.clear();
+          lEPOMLNOAPKBuilder_.clear();
         }
         return this;
       }
@@ -905,36 +765,36 @@ public final class FishBattleEndRspOuterClass {
       public emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp buildPartial() {
         emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp result = new emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
-        result.battleResult_ = battleResult_;
-        if (rewardItemListBuilder_ == null) {
+        if (oICHDIANAEEBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            rewardItemList_ = java.util.Collections.unmodifiableList(rewardItemList_);
+            oICHDIANAEE_ = java.util.Collections.unmodifiableList(oICHDIANAEE_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
+          result.oICHDIANAEE_ = oICHDIANAEE_;
+        } else {
+          result.oICHDIANAEE_ = oICHDIANAEEBuilder_.build();
+        }
+        result.retcode_ = retcode_;
+        if (rewardItemListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            rewardItemList_ = java.util.Collections.unmodifiableList(rewardItemList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
           result.rewardItemList_ = rewardItemList_;
         } else {
           result.rewardItemList_ = rewardItemListBuilder_.build();
         }
         result.noRewardReason_ = noRewardReason_;
-        if (fILLNPDLDGIBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
-            fILLNPDLDGI_ = java.util.Collections.unmodifiableList(fILLNPDLDGI_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.fILLNPDLDGI_ = fILLNPDLDGI_;
-        } else {
-          result.fILLNPDLDGI_ = fILLNPDLDGIBuilder_.build();
-        }
+        result.battleResult_ = battleResult_;
         result.isGotReward_ = isGotReward_;
-        if (aGADCCFPDEIBuilder_ == null) {
+        if (lEPOMLNOAPKBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
-            aGADCCFPDEI_ = java.util.Collections.unmodifiableList(aGADCCFPDEI_);
+            lEPOMLNOAPK_ = java.util.Collections.unmodifiableList(lEPOMLNOAPK_);
             bitField0_ = (bitField0_ & ~0x00000004);
           }
-          result.aGADCCFPDEI_ = aGADCCFPDEI_;
+          result.lEPOMLNOAPK_ = lEPOMLNOAPK_;
         } else {
-          result.aGADCCFPDEI_ = aGADCCFPDEIBuilder_.build();
+          result.lEPOMLNOAPK_ = lEPOMLNOAPKBuilder_.build();
         }
         onBuilt();
         return result;
@@ -984,17 +844,40 @@ public final class FishBattleEndRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp other) {
         if (other == emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.getDefaultInstance()) return this;
+        if (oICHDIANAEEBuilder_ == null) {
+          if (!other.oICHDIANAEE_.isEmpty()) {
+            if (oICHDIANAEE_.isEmpty()) {
+              oICHDIANAEE_ = other.oICHDIANAEE_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureOICHDIANAEEIsMutable();
+              oICHDIANAEE_.addAll(other.oICHDIANAEE_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.oICHDIANAEE_.isEmpty()) {
+            if (oICHDIANAEEBuilder_.isEmpty()) {
+              oICHDIANAEEBuilder_.dispose();
+              oICHDIANAEEBuilder_ = null;
+              oICHDIANAEE_ = other.oICHDIANAEE_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              oICHDIANAEEBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getOICHDIANAEEFieldBuilder() : null;
+            } else {
+              oICHDIANAEEBuilder_.addAllMessages(other.oICHDIANAEE_);
+            }
+          }
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.battleResult_ != 0) {
-          setBattleResultValue(other.getBattleResultValue());
-        }
         if (rewardItemListBuilder_ == null) {
           if (!other.rewardItemList_.isEmpty()) {
             if (rewardItemList_.isEmpty()) {
               rewardItemList_ = other.rewardItemList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureRewardItemListIsMutable();
               rewardItemList_.addAll(other.rewardItemList_);
@@ -1007,7 +890,7 @@ public final class FishBattleEndRspOuterClass {
               rewardItemListBuilder_.dispose();
               rewardItemListBuilder_ = null;
               rewardItemList_ = other.rewardItemList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               rewardItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRewardItemListFieldBuilder() : null;
@@ -1019,58 +902,35 @@ public final class FishBattleEndRspOuterClass {
         if (other.noRewardReason_ != 0) {
           setNoRewardReasonValue(other.getNoRewardReasonValue());
         }
-        if (fILLNPDLDGIBuilder_ == null) {
-          if (!other.fILLNPDLDGI_.isEmpty()) {
-            if (fILLNPDLDGI_.isEmpty()) {
-              fILLNPDLDGI_ = other.fILLNPDLDGI_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureFILLNPDLDGIIsMutable();
-              fILLNPDLDGI_.addAll(other.fILLNPDLDGI_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.fILLNPDLDGI_.isEmpty()) {
-            if (fILLNPDLDGIBuilder_.isEmpty()) {
-              fILLNPDLDGIBuilder_.dispose();
-              fILLNPDLDGIBuilder_ = null;
-              fILLNPDLDGI_ = other.fILLNPDLDGI_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              fILLNPDLDGIBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getFILLNPDLDGIFieldBuilder() : null;
-            } else {
-              fILLNPDLDGIBuilder_.addAllMessages(other.fILLNPDLDGI_);
-            }
-          }
+        if (other.battleResult_ != 0) {
+          setBattleResultValue(other.getBattleResultValue());
         }
         if (other.getIsGotReward() != false) {
           setIsGotReward(other.getIsGotReward());
         }
-        if (aGADCCFPDEIBuilder_ == null) {
-          if (!other.aGADCCFPDEI_.isEmpty()) {
-            if (aGADCCFPDEI_.isEmpty()) {
-              aGADCCFPDEI_ = other.aGADCCFPDEI_;
+        if (lEPOMLNOAPKBuilder_ == null) {
+          if (!other.lEPOMLNOAPK_.isEmpty()) {
+            if (lEPOMLNOAPK_.isEmpty()) {
+              lEPOMLNOAPK_ = other.lEPOMLNOAPK_;
               bitField0_ = (bitField0_ & ~0x00000004);
             } else {
-              ensureAGADCCFPDEIIsMutable();
-              aGADCCFPDEI_.addAll(other.aGADCCFPDEI_);
+              ensureLEPOMLNOAPKIsMutable();
+              lEPOMLNOAPK_.addAll(other.lEPOMLNOAPK_);
             }
             onChanged();
           }
         } else {
-          if (!other.aGADCCFPDEI_.isEmpty()) {
-            if (aGADCCFPDEIBuilder_.isEmpty()) {
-              aGADCCFPDEIBuilder_.dispose();
-              aGADCCFPDEIBuilder_ = null;
-              aGADCCFPDEI_ = other.aGADCCFPDEI_;
+          if (!other.lEPOMLNOAPK_.isEmpty()) {
+            if (lEPOMLNOAPKBuilder_.isEmpty()) {
+              lEPOMLNOAPKBuilder_.dispose();
+              lEPOMLNOAPKBuilder_ = null;
+              lEPOMLNOAPK_ = other.lEPOMLNOAPK_;
               bitField0_ = (bitField0_ & ~0x00000004);
-              aGADCCFPDEIBuilder_ = 
+              lEPOMLNOAPKBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getAGADCCFPDEIFieldBuilder() : null;
+                   getLEPOMLNOAPKFieldBuilder() : null;
             } else {
-              aGADCCFPDEIBuilder_.addAllMessages(other.aGADCCFPDEI_);
+              lEPOMLNOAPKBuilder_.addAllMessages(other.lEPOMLNOAPK_);
             }
           }
         }
@@ -1104,9 +964,249 @@ public final class FishBattleEndRspOuterClass {
       }
       private int bitField0_;
 
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> oICHDIANAEE_ =
+        java.util.Collections.emptyList();
+      private void ensureOICHDIANAEEIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          oICHDIANAEE_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(oICHDIANAEE_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> oICHDIANAEEBuilder_;
+
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getOICHDIANAEEList() {
+        if (oICHDIANAEEBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(oICHDIANAEE_);
+        } else {
+          return oICHDIANAEEBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public int getOICHDIANAEECount() {
+        if (oICHDIANAEEBuilder_ == null) {
+          return oICHDIANAEE_.size();
+        } else {
+          return oICHDIANAEEBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getOICHDIANAEE(int index) {
+        if (oICHDIANAEEBuilder_ == null) {
+          return oICHDIANAEE_.get(index);
+        } else {
+          return oICHDIANAEEBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder setOICHDIANAEE(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (oICHDIANAEEBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.set(index, value);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder setOICHDIANAEE(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (oICHDIANAEEBuilder_ == null) {
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder addOICHDIANAEE(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (oICHDIANAEEBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.add(value);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder addOICHDIANAEE(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (oICHDIANAEEBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.add(index, value);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder addOICHDIANAEE(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (oICHDIANAEEBuilder_ == null) {
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.add(builderForValue.build());
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder addOICHDIANAEE(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (oICHDIANAEEBuilder_ == null) {
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder addAllOICHDIANAEE(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (oICHDIANAEEBuilder_ == null) {
+          ensureOICHDIANAEEIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, oICHDIANAEE_);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder clearOICHDIANAEE() {
+        if (oICHDIANAEEBuilder_ == null) {
+          oICHDIANAEE_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public Builder removeOICHDIANAEE(int index) {
+        if (oICHDIANAEEBuilder_ == null) {
+          ensureOICHDIANAEEIsMutable();
+          oICHDIANAEE_.remove(index);
+          onChanged();
+        } else {
+          oICHDIANAEEBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getOICHDIANAEEBuilder(
+          int index) {
+        return getOICHDIANAEEFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getOICHDIANAEEOrBuilder(
+          int index) {
+        if (oICHDIANAEEBuilder_ == null) {
+          return oICHDIANAEE_.get(index);  } else {
+          return oICHDIANAEEBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getOICHDIANAEEOrBuilderList() {
+        if (oICHDIANAEEBuilder_ != null) {
+          return oICHDIANAEEBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(oICHDIANAEE_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addOICHDIANAEEBuilder() {
+        return getOICHDIANAEEFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addOICHDIANAEEBuilder(
+          int index) {
+        return getOICHDIANAEEFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam OICHDIANAEE = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getOICHDIANAEEBuilderList() {
+        return getOICHDIANAEEFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getOICHDIANAEEFieldBuilder() {
+        if (oICHDIANAEEBuilder_ == null) {
+          oICHDIANAEEBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  oICHDIANAEE_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          oICHDIANAEE_ = null;
+        }
+        return oICHDIANAEEBuilder_;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -1114,7 +1214,7 @@ public final class FishBattleEndRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -1125,7 +1225,7 @@ public final class FishBattleEndRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -1135,6 +1235,300 @@ public final class FishBattleEndRspOuterClass {
         return this;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_ =
+        java.util.Collections.emptyList();
+      private void ensureRewardItemListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(rewardItemList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> rewardItemListBuilder_;
+
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
+        if (rewardItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(rewardItemList_);
+        } else {
+          return rewardItemListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public int getRewardItemListCount() {
+        if (rewardItemListBuilder_ == null) {
+          return rewardItemList_.size();
+        } else {
+          return rewardItemListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
+        if (rewardItemListBuilder_ == null) {
+          return rewardItemList_.get(index);
+        } else {
+          return rewardItemListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder setRewardItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (rewardItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardItemListIsMutable();
+          rewardItemList_.set(index, value);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder setRewardItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (rewardItemListBuilder_ == null) {
+          ensureRewardItemListIsMutable();
+          rewardItemList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardItemListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder addRewardItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (rewardItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardItemListIsMutable();
+          rewardItemList_.add(value);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder addRewardItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (rewardItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureRewardItemListIsMutable();
+          rewardItemList_.add(index, value);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder addRewardItemList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (rewardItemListBuilder_ == null) {
+          ensureRewardItemListIsMutable();
+          rewardItemList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          rewardItemListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder addRewardItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (rewardItemListBuilder_ == null) {
+          ensureRewardItemListIsMutable();
+          rewardItemList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          rewardItemListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder addAllRewardItemList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (rewardItemListBuilder_ == null) {
+          ensureRewardItemListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, rewardItemList_);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder clearRewardItemList() {
+        if (rewardItemListBuilder_ == null) {
+          rewardItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public Builder removeRewardItemList(int index) {
+        if (rewardItemListBuilder_ == null) {
+          ensureRewardItemListIsMutable();
+          rewardItemList_.remove(index);
+          onChanged();
+        } else {
+          rewardItemListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getRewardItemListBuilder(
+          int index) {
+        return getRewardItemListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
+          int index) {
+        if (rewardItemListBuilder_ == null) {
+          return rewardItemList_.get(index);  } else {
+          return rewardItemListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getRewardItemListOrBuilderList() {
+        if (rewardItemListBuilder_ != null) {
+          return rewardItemListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(rewardItemList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder() {
+        return getRewardItemListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder(
+          int index) {
+        return getRewardItemListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam reward_item_list = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getRewardItemListBuilderList() {
+        return getRewardItemListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getRewardItemListFieldBuilder() {
+        if (rewardItemListBuilder_ == null) {
+          rewardItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  rewardItemList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          rewardItemList_ = null;
+        }
+        return rewardItemListBuilder_;
+      }
+
+      private int noRewardReason_ = 0;
+      /**
+       * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+       * @return The enum numeric value on the wire for noRewardReason.
+       */
+      @java.lang.Override public int getNoRewardReasonValue() {
+        return noRewardReason_;
+      }
+      /**
+       * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+       * @param value The enum numeric value on the wire for noRewardReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNoRewardReasonValue(int value) {
+        
+        noRewardReason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+       * @return The noRewardReason.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason getNoRewardReason() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason result = emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.valueOf(noRewardReason_);
+        return result == null ? emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+       * @param value The noRewardReason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNoRewardReason(emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.FishNoRewardReason value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        noRewardReason_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.FishNoRewardReason no_reward_reason = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNoRewardReason() {
+        
+        noRewardReason_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int battleResult_ = 0;
       /**
        * <code>.FishBattleResult battle_result = 7;</code>
@@ -1189,543 +1583,9 @@ public final class FishBattleEndRspOuterClass {
         return this;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_ =
-        java.util.Collections.emptyList();
-      private void ensureRewardItemListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(rewardItemList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> rewardItemListBuilder_;
-
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
-        if (rewardItemListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(rewardItemList_);
-        } else {
-          return rewardItemListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public int getRewardItemListCount() {
-        if (rewardItemListBuilder_ == null) {
-          return rewardItemList_.size();
-        } else {
-          return rewardItemListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
-        if (rewardItemListBuilder_ == null) {
-          return rewardItemList_.get(index);
-        } else {
-          return rewardItemListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder setRewardItemList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (rewardItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardItemListIsMutable();
-          rewardItemList_.set(index, value);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder setRewardItemList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (rewardItemListBuilder_ == null) {
-          ensureRewardItemListIsMutable();
-          rewardItemList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          rewardItemListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder addRewardItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (rewardItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardItemListIsMutable();
-          rewardItemList_.add(value);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder addRewardItemList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (rewardItemListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureRewardItemListIsMutable();
-          rewardItemList_.add(index, value);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder addRewardItemList(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (rewardItemListBuilder_ == null) {
-          ensureRewardItemListIsMutable();
-          rewardItemList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          rewardItemListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder addRewardItemList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (rewardItemListBuilder_ == null) {
-          ensureRewardItemListIsMutable();
-          rewardItemList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          rewardItemListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder addAllRewardItemList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-        if (rewardItemListBuilder_ == null) {
-          ensureRewardItemListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, rewardItemList_);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder clearRewardItemList() {
-        if (rewardItemListBuilder_ == null) {
-          rewardItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public Builder removeRewardItemList(int index) {
-        if (rewardItemListBuilder_ == null) {
-          ensureRewardItemListIsMutable();
-          rewardItemList_.remove(index);
-          onChanged();
-        } else {
-          rewardItemListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getRewardItemListBuilder(
-          int index) {
-        return getRewardItemListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
-          int index) {
-        if (rewardItemListBuilder_ == null) {
-          return rewardItemList_.get(index);  } else {
-          return rewardItemListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-           getRewardItemListOrBuilderList() {
-        if (rewardItemListBuilder_ != null) {
-          return rewardItemListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(rewardItemList_);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder() {
-        return getRewardItemListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder(
-          int index) {
-        return getRewardItemListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam reward_item_list = 11;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-           getRewardItemListBuilderList() {
-        return getRewardItemListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getRewardItemListFieldBuilder() {
-        if (rewardItemListBuilder_ == null) {
-          rewardItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  rewardItemList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          rewardItemList_ = null;
-        }
-        return rewardItemListBuilder_;
-      }
-
-      private int noRewardReason_ = 0;
-      /**
-       * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-       * @return The enum numeric value on the wire for noRewardReason.
-       */
-      @java.lang.Override public int getNoRewardReasonValue() {
-        return noRewardReason_;
-      }
-      /**
-       * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-       * @param value The enum numeric value on the wire for noRewardReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNoRewardReasonValue(int value) {
-        
-        noRewardReason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-       * @return The noRewardReason.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason getNoRewardReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason result = emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.valueOf(noRewardReason_);
-        return result == null ? emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-       * @param value The noRewardReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNoRewardReason(emu.grasscutter.net.proto.FishBattleEndRspOuterClass.FishBattleEndRsp.FishNoRewardReason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        noRewardReason_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.FishBattleEndRsp.FishNoRewardReason no_reward_reason = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNoRewardReason() {
-        
-        noRewardReason_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> fILLNPDLDGI_ =
-        java.util.Collections.emptyList();
-      private void ensureFILLNPDLDGIIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          fILLNPDLDGI_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(fILLNPDLDGI_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> fILLNPDLDGIBuilder_;
-
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getFILLNPDLDGIList() {
-        if (fILLNPDLDGIBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(fILLNPDLDGI_);
-        } else {
-          return fILLNPDLDGIBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public int getFILLNPDLDGICount() {
-        if (fILLNPDLDGIBuilder_ == null) {
-          return fILLNPDLDGI_.size();
-        } else {
-          return fILLNPDLDGIBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getFILLNPDLDGI(int index) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          return fILLNPDLDGI_.get(index);
-        } else {
-          return fILLNPDLDGIBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder setFILLNPDLDGI(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.set(index, value);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder setFILLNPDLDGI(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder addFILLNPDLDGI(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.add(value);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder addFILLNPDLDGI(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.add(index, value);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder addFILLNPDLDGI(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.add(builderForValue.build());
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder addFILLNPDLDGI(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder addAllFILLNPDLDGI(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          ensureFILLNPDLDGIIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, fILLNPDLDGI_);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder clearFILLNPDLDGI() {
-        if (fILLNPDLDGIBuilder_ == null) {
-          fILLNPDLDGI_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public Builder removeFILLNPDLDGI(int index) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          ensureFILLNPDLDGIIsMutable();
-          fILLNPDLDGI_.remove(index);
-          onChanged();
-        } else {
-          fILLNPDLDGIBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getFILLNPDLDGIBuilder(
-          int index) {
-        return getFILLNPDLDGIFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getFILLNPDLDGIOrBuilder(
-          int index) {
-        if (fILLNPDLDGIBuilder_ == null) {
-          return fILLNPDLDGI_.get(index);  } else {
-          return fILLNPDLDGIBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-           getFILLNPDLDGIOrBuilderList() {
-        if (fILLNPDLDGIBuilder_ != null) {
-          return fILLNPDLDGIBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(fILLNPDLDGI_);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addFILLNPDLDGIBuilder() {
-        return getFILLNPDLDGIFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addFILLNPDLDGIBuilder(
-          int index) {
-        return getFILLNPDLDGIFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam FILLNPDLDGI = 8;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-           getFILLNPDLDGIBuilderList() {
-        return getFILLNPDLDGIFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getFILLNPDLDGIFieldBuilder() {
-        if (fILLNPDLDGIBuilder_ == null) {
-          fILLNPDLDGIBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  fILLNPDLDGI_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          fILLNPDLDGI_ = null;
-        }
-        return fILLNPDLDGIBuilder_;
-      }
-
       private boolean isGotReward_ ;
       /**
-       * <code>bool is_got_reward = 13;</code>
+       * <code>bool is_got_reward = 11;</code>
        * @return The isGotReward.
        */
       @java.lang.Override
@@ -1733,7 +1593,7 @@ public final class FishBattleEndRspOuterClass {
         return isGotReward_;
       }
       /**
-       * <code>bool is_got_reward = 13;</code>
+       * <code>bool is_got_reward = 11;</code>
        * @param value The isGotReward to set.
        * @return This builder for chaining.
        */
@@ -1744,7 +1604,7 @@ public final class FishBattleEndRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_got_reward = 13;</code>
+       * <code>bool is_got_reward = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsGotReward() {
@@ -1754,244 +1614,244 @@ public final class FishBattleEndRspOuterClass {
         return this;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> aGADCCFPDEI_ =
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> lEPOMLNOAPK_ =
         java.util.Collections.emptyList();
-      private void ensureAGADCCFPDEIIsMutable() {
+      private void ensureLEPOMLNOAPKIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          aGADCCFPDEI_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(aGADCCFPDEI_);
+          lEPOMLNOAPK_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(lEPOMLNOAPK_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> aGADCCFPDEIBuilder_;
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> lEPOMLNOAPKBuilder_;
 
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getAGADCCFPDEIList() {
-        if (aGADCCFPDEIBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(aGADCCFPDEI_);
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getLEPOMLNOAPKList() {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(lEPOMLNOAPK_);
         } else {
-          return aGADCCFPDEIBuilder_.getMessageList();
+          return lEPOMLNOAPKBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public int getAGADCCFPDEICount() {
-        if (aGADCCFPDEIBuilder_ == null) {
-          return aGADCCFPDEI_.size();
+      public int getLEPOMLNOAPKCount() {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          return lEPOMLNOAPK_.size();
         } else {
-          return aGADCCFPDEIBuilder_.getCount();
+          return lEPOMLNOAPKBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getAGADCCFPDEI(int index) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          return aGADCCFPDEI_.get(index);
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getLEPOMLNOAPK(int index) {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          return lEPOMLNOAPK_.get(index);
         } else {
-          return aGADCCFPDEIBuilder_.getMessage(index);
+          return lEPOMLNOAPKBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder setAGADCCFPDEI(
+      public Builder setLEPOMLNOAPK(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aGADCCFPDEIBuilder_ == null) {
+        if (lEPOMLNOAPKBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.set(index, value);
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.set(index, value);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.setMessage(index, value);
+          lEPOMLNOAPKBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder setAGADCCFPDEI(
+      public Builder setLEPOMLNOAPK(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.set(index, builderForValue.build());
+        if (lEPOMLNOAPKBuilder_ == null) {
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.set(index, builderForValue.build());
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.setMessage(index, builderForValue.build());
+          lEPOMLNOAPKBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder addAGADCCFPDEI(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aGADCCFPDEIBuilder_ == null) {
+      public Builder addLEPOMLNOAPK(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (lEPOMLNOAPKBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.add(value);
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.add(value);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.addMessage(value);
+          lEPOMLNOAPKBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder addAGADCCFPDEI(
+      public Builder addLEPOMLNOAPK(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (aGADCCFPDEIBuilder_ == null) {
+        if (lEPOMLNOAPKBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.add(index, value);
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.add(index, value);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.addMessage(index, value);
+          lEPOMLNOAPKBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder addAGADCCFPDEI(
+      public Builder addLEPOMLNOAPK(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.add(builderForValue.build());
+        if (lEPOMLNOAPKBuilder_ == null) {
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.add(builderForValue.build());
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.addMessage(builderForValue.build());
+          lEPOMLNOAPKBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder addAGADCCFPDEI(
+      public Builder addLEPOMLNOAPK(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.add(index, builderForValue.build());
+        if (lEPOMLNOAPKBuilder_ == null) {
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.add(index, builderForValue.build());
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.addMessage(index, builderForValue.build());
+          lEPOMLNOAPKBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder addAllAGADCCFPDEI(
+      public Builder addAllLEPOMLNOAPK(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          ensureAGADCCFPDEIIsMutable();
+        if (lEPOMLNOAPKBuilder_ == null) {
+          ensureLEPOMLNOAPKIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, aGADCCFPDEI_);
+              values, lEPOMLNOAPK_);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.addAllMessages(values);
+          lEPOMLNOAPKBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder clearAGADCCFPDEI() {
-        if (aGADCCFPDEIBuilder_ == null) {
-          aGADCCFPDEI_ = java.util.Collections.emptyList();
+      public Builder clearLEPOMLNOAPK() {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          lEPOMLNOAPK_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.clear();
+          lEPOMLNOAPKBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public Builder removeAGADCCFPDEI(int index) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          ensureAGADCCFPDEIIsMutable();
-          aGADCCFPDEI_.remove(index);
+      public Builder removeLEPOMLNOAPK(int index) {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          ensureLEPOMLNOAPKIsMutable();
+          lEPOMLNOAPK_.remove(index);
           onChanged();
         } else {
-          aGADCCFPDEIBuilder_.remove(index);
+          lEPOMLNOAPKBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getAGADCCFPDEIBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getLEPOMLNOAPKBuilder(
           int index) {
-        return getAGADCCFPDEIFieldBuilder().getBuilder(index);
+        return getLEPOMLNOAPKFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getAGADCCFPDEIOrBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getLEPOMLNOAPKOrBuilder(
           int index) {
-        if (aGADCCFPDEIBuilder_ == null) {
-          return aGADCCFPDEI_.get(index);  } else {
-          return aGADCCFPDEIBuilder_.getMessageOrBuilder(index);
+        if (lEPOMLNOAPKBuilder_ == null) {
+          return lEPOMLNOAPK_.get(index);  } else {
+          return lEPOMLNOAPKBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-           getAGADCCFPDEIOrBuilderList() {
-        if (aGADCCFPDEIBuilder_ != null) {
-          return aGADCCFPDEIBuilder_.getMessageOrBuilderList();
+           getLEPOMLNOAPKOrBuilderList() {
+        if (lEPOMLNOAPKBuilder_ != null) {
+          return lEPOMLNOAPKBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(aGADCCFPDEI_);
+          return java.util.Collections.unmodifiableList(lEPOMLNOAPK_);
         }
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAGADCCFPDEIBuilder() {
-        return getAGADCCFPDEIFieldBuilder().addBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addLEPOMLNOAPKBuilder() {
+        return getLEPOMLNOAPKFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addAGADCCFPDEIBuilder(
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addLEPOMLNOAPKBuilder(
           int index) {
-        return getAGADCCFPDEIFieldBuilder().addBuilder(
+        return getLEPOMLNOAPKFieldBuilder().addBuilder(
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam AGADCCFPDEI = 6;</code>
+       * <code>repeated .ItemParam LEPOMLNOAPK = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-           getAGADCCFPDEIBuilderList() {
-        return getAGADCCFPDEIFieldBuilder().getBuilderList();
+           getLEPOMLNOAPKBuilderList() {
+        return getLEPOMLNOAPKFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getAGADCCFPDEIFieldBuilder() {
-        if (aGADCCFPDEIBuilder_ == null) {
-          aGADCCFPDEIBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+          getLEPOMLNOAPKFieldBuilder() {
+        if (lEPOMLNOAPKBuilder_ == null) {
+          lEPOMLNOAPKBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  aGADCCFPDEI_,
+                  lEPOMLNOAPK_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
-          aGADCCFPDEI_ = null;
+          lEPOMLNOAPK_ = null;
         }
-        return aGADCCFPDEIBuilder_;
+        return lEPOMLNOAPKBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -2060,34 +1920,33 @@ public final class FishBattleEndRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026FishBattleEndRsp.proto\032\026FishBattleResu" +
-      "lt.proto\032\017ItemParam.proto\"\234\003\n\020FishBattle" +
-      "EndRsp\022\017\n\007retcode\030\t \001(\005\022(\n\rbattle_result" +
-      "\030\007 \001(\0162\021.FishBattleResult\022$\n\020reward_item" +
-      "_list\030\013 \003(\0132\n.ItemParam\022>\n\020no_reward_rea" +
-      "son\030\014 \001(\0162$.FishBattleEndRsp.FishNoRewar" +
-      "dReason\022\037\n\013FILLNPDLDGI\030\010 \003(\0132\n.ItemParam" +
-      "\022\025\n\ris_got_reward\030\r \001(\010\022\037\n\013AGADCCFPDEI\030\006" +
-      " \003(\0132\n.ItemParam\"\215\001\n\022FishNoRewardReason\022" +
-      "\027\n\023FISH_NO_REWARD_NONE\020\000\022!\n\035FISH_NO_REWA" +
-      "RD_ACTIVITY_LIMIT\020\001\022\034\n\030FISH_NO_REWARD_BA" +
-      "G_LIMIT\020\002\022\035\n\031FISH_NO_REWARD_POOL_LIMIT\020\003" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\026FishBattleEndRsp.proto\032\017ItemParam.prot" +
+      "o\032\030FishNoRewardReason.proto\032\026FishBattleR" +
+      "esult.proto\"\373\001\n\020FishBattleEndRsp\022\037\n\013OICH" +
+      "DIANAEE\030\001 \003(\0132\n.ItemParam\022\017\n\007retcode\030\002 \001" +
+      "(\005\022$\n\020reward_item_list\030\003 \003(\0132\n.ItemParam" +
+      "\022-\n\020no_reward_reason\030\006 \001(\0162\023.FishNoRewar" +
+      "dReason\022(\n\rbattle_result\030\007 \001(\0162\021.FishBat" +
+      "tleResult\022\025\n\ris_got_reward\030\013 \001(\010\022\037\n\013LEPO" +
+      "MLNOAPK\030\014 \003(\0132\n.ItemParamB\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.FishBattleResultOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.FishBattleResultOuterClass.getDescriptor(),
         });
     internal_static_FishBattleEndRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_FishBattleEndRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_FishBattleEndRsp_descriptor,
-        new java.lang.String[] { "Retcode", "BattleResult", "RewardItemList", "NoRewardReason", "FILLNPDLDGI", "IsGotReward", "AGADCCFPDEI", });
-    emu.grasscutter.net.proto.FishBattleResultOuterClass.getDescriptor();
+        new java.lang.String[] { "OICHDIANAEE", "Retcode", "RewardItemList", "NoRewardReason", "BattleResult", "IsGotReward", "LEPOMLNOAPK", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.FishBattleResultOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FishBattleResultOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FishBattleResultOuterClass.java
index 1ce5f66e4..474f990dc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FishBattleResultOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FishBattleResultOuterClass.java
@@ -15,10 +15,6 @@ public final class FishBattleResultOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LCKAOMFDGLP
-   * </pre>
-   *
    * Protobuf enum {@code FishBattleResult}
    */
   public enum FishBattleResult
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FishNoRewardReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FishNoRewardReasonOuterClass.java
new file mode 100644
index 000000000..340d83c16
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FishNoRewardReasonOuterClass.java
@@ -0,0 +1,166 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: FishNoRewardReason.proto
+
+package emu.grasscutter.net.proto;
+
+public final class FishNoRewardReasonOuterClass {
+  private FishNoRewardReasonOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code FishNoRewardReason}
+   */
+  public enum FishNoRewardReason
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>FISH_NO_REWARD_NONE = 0;</code>
+     */
+    FISH_NO_REWARD_NONE(0),
+    /**
+     * <code>FISH_NO_REWARD_ACTIVITY_LIMIT = 1;</code>
+     */
+    FISH_NO_REWARD_ACTIVITY_LIMIT(1),
+    /**
+     * <code>FISH_NO_REWARD_BAG_LIMIT = 2;</code>
+     */
+    FISH_NO_REWARD_BAG_LIMIT(2),
+    /**
+     * <code>FISH_NO_REWARD_POOL_LIMIT = 3;</code>
+     */
+    FISH_NO_REWARD_POOL_LIMIT(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>FISH_NO_REWARD_NONE = 0;</code>
+     */
+    public static final int FISH_NO_REWARD_NONE_VALUE = 0;
+    /**
+     * <code>FISH_NO_REWARD_ACTIVITY_LIMIT = 1;</code>
+     */
+    public static final int FISH_NO_REWARD_ACTIVITY_LIMIT_VALUE = 1;
+    /**
+     * <code>FISH_NO_REWARD_BAG_LIMIT = 2;</code>
+     */
+    public static final int FISH_NO_REWARD_BAG_LIMIT_VALUE = 2;
+    /**
+     * <code>FISH_NO_REWARD_POOL_LIMIT = 3;</code>
+     */
+    public static final int FISH_NO_REWARD_POOL_LIMIT_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static FishNoRewardReason valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static FishNoRewardReason forNumber(int value) {
+      switch (value) {
+        case 0: return FISH_NO_REWARD_NONE;
+        case 1: return FISH_NO_REWARD_ACTIVITY_LIMIT;
+        case 2: return FISH_NO_REWARD_BAG_LIMIT;
+        case 3: return FISH_NO_REWARD_POOL_LIMIT;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<FishNoRewardReason>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        FishNoRewardReason> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<FishNoRewardReason>() {
+            public FishNoRewardReason findValueByNumber(int number) {
+              return FishNoRewardReason.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.FishNoRewardReasonOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final FishNoRewardReason[] VALUES = values();
+
+    public static FishNoRewardReason valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private FishNoRewardReason(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:FishNoRewardReason)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\030FishNoRewardReason.proto*\215\001\n\022FishNoRew" +
+      "ardReason\022\027\n\023FISH_NO_REWARD_NONE\020\000\022!\n\035FI" +
+      "SH_NO_REWARD_ACTIVITY_LIMIT\020\001\022\034\n\030FISH_NO" +
+      "_REWARD_BAG_LIMIT\020\002\022\035\n\031FISH_NO_REWARD_PO" +
+      "OL_LIMIT\020\003B\033\n\031emu.grasscutter.net.protob" +
+      "\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FishPoolInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FishPoolInfoOuterClass.java
index af9d822c0..a55aba0db 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FishPoolInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FishPoolInfoOuterClass.java
@@ -49,7 +49,7 @@ public final class FishPoolInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: NPDMIJKKJPA
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code FishPoolInfo}
@@ -410,7 +410,7 @@ public final class FishPoolInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: NPDMIJKKJPA
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code FishPoolInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FishtankFishInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FishtankFishInfoOuterClass.java
index f6c7dbbde..07c367e22 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FishtankFishInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FishtankFishInfoOuterClass.java
@@ -37,10 +37,6 @@ public final class FishtankFishInfoOuterClass {
     float getInitialRotationY();
   }
   /**
-   * <pre>
-   * Obf: JEMIPJIOKME
-   * </pre>
-   *
    * Protobuf type {@code FishtankFishInfo}
    */
   public static final class FishtankFishInfo extends
@@ -349,10 +345,6 @@ public final class FishtankFishInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JEMIPJIOKME
-     * </pre>
-     *
      * Protobuf type {@code FishtankFishInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForceUpdateInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForceUpdateInfoOuterClass.java
index e9885a577..732a93aab 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ForceUpdateInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ForceUpdateInfoOuterClass.java
@@ -31,10 +31,6 @@ public final class ForceUpdateInfoOuterClass {
         getForceUpdateUrlBytes();
   }
   /**
-   * <pre>
-   * Obf: EBNFKOBKCHA
-   * </pre>
-   *
    * Protobuf type {@code ForceUpdateInfo}
    */
   public static final class ForceUpdateInfo extends
@@ -311,10 +307,6 @@ public final class ForceUpdateInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EBNFKOBKCHA
-     * </pre>
-     *
      * Protobuf type {@code ForceUpdateInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ForwardTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ForwardTypeOuterClass.java
index 42f9b347b..5b7fbb419 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ForwardTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ForwardTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class ForwardTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: CLILGMMMGCK
-   * </pre>
-   *
    * Protobuf enum {@code ForwardType}
    */
   public enum ForwardType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FoundationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FoundationInfoOuterClass.java
index 926232b24..35980fe4d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FoundationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FoundationInfoOuterClass.java
@@ -60,7 +60,8 @@ public final class FoundationInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: HJBPIEDJHAP
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code FoundationInfo}
@@ -457,7 +458,8 @@ public final class FoundationInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: HJBPIEDJHAP
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code FoundationInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FoundationStatusOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FoundationStatusOuterClass.java
index cbe78386e..bafd8d808 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FoundationStatusOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FoundationStatusOuterClass.java
@@ -16,7 +16,7 @@ public final class FoundationStatusOuterClass {
   }
   /**
    * <pre>
-   * Obf: HGKOLBGFAEC
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code FoundationStatus}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
index 0e1e0e2f3..8bb9731c3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FriendBriefOuterClass.java
@@ -229,10 +229,6 @@ public final class FriendBriefOuterClass {
     boolean getIsDuelObservable();
   }
   /**
-   * <pre>
-   * Obf: JIFKJKFNBFF
-   * </pre>
-   *
    * Protobuf type {@code FriendBrief}
    */
   public static final class FriendBrief extends
@@ -1315,10 +1311,6 @@ public final class FriendBriefOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JIFKJKFNBFF
-     * </pre>
-     *
      * Protobuf type {@code FriendBrief}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FriendEnterHomeOptionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FriendEnterHomeOptionOuterClass.java
index aa49d317a..23a8a802f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FriendEnterHomeOptionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FriendEnterHomeOptionOuterClass.java
@@ -15,10 +15,6 @@ public final class FriendEnterHomeOptionOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LDBJAIDJNMO
-   * </pre>
-   *
    * Protobuf enum {@code FriendEnterHomeOption}
    */
   public enum FriendEnterHomeOption
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FriendOnlineStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FriendOnlineStateOuterClass.java
index dac20a9c1..af3381c2e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FriendOnlineStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FriendOnlineStateOuterClass.java
@@ -15,10 +15,6 @@ public final class FriendOnlineStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: NALGAFDLMDG
-   * </pre>
-   *
    * Protobuf enum {@code FriendOnlineState}
    */
   public enum FriendOnlineState
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureCurModuleArrangeCountNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureCurModuleArrangeCountNotifyOuterClass.java
index 0e930a3e2..24c035af8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureCurModuleArrangeCountNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureCurModuleArrangeCountNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
         getFurnitureArrangeCountListList();
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getFurnitureArrangeCountList(int index);
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     int getFurnitureArrangeCountListCount();
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
         getFurnitureArrangeCountListOrBuilderList();
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getFurnitureArrangeCountListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 2948
-   * Obf: FGLMMAMBPBP
-   * </pre>
-   *
    * Protobuf type {@code FurnitureCurModuleArrangeCountNotify}
    */
   public static final class FurnitureCurModuleArrangeCountNotify extends
@@ -94,7 +89,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 furnitureArrangeCountList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
               emu.grasscutter.net.proto.FurnitureCurModuleArrangeCountNotifyOuterClass.FurnitureCurModuleArrangeCountNotify.class, emu.grasscutter.net.proto.FurnitureCurModuleArrangeCountNotifyOuterClass.FurnitureCurModuleArrangeCountNotify.Builder.class);
     }
 
-    public static final int FURNITURE_ARRANGE_COUNT_LIST_FIELD_NUMBER = 1;
+    public static final int FURNITURE_ARRANGE_COUNT_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> furnitureArrangeCountList_;
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getFurnitureArrangeCountListList() {
       return furnitureArrangeCountList_;
     }
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
@@ -156,21 +151,21 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
       return furnitureArrangeCountList_;
     }
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     @java.lang.Override
     public int getFurnitureArrangeCountListCount() {
       return furnitureArrangeCountList_.size();
     }
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getFurnitureArrangeCountList(int index) {
       return furnitureArrangeCountList_.get(index);
     }
     /**
-     * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+     * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getFurnitureArrangeCountListOrBuilder(
@@ -193,7 +188,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < furnitureArrangeCountList_.size(); i++) {
-        output.writeMessage(1, furnitureArrangeCountList_.get(i));
+        output.writeMessage(15, furnitureArrangeCountList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
       size = 0;
       for (int i = 0; i < furnitureArrangeCountList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, furnitureArrangeCountList_.get(i));
+          .computeMessageSize(15, furnitureArrangeCountList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2948
-     * Obf: FGLMMAMBPBP
-     * </pre>
-     *
      * Protobuf type {@code FurnitureCurModuleArrangeCountNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
           emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> furnitureArrangeCountListBuilder_;
 
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getFurnitureArrangeCountListList() {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public int getFurnitureArrangeCountListCount() {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getFurnitureArrangeCountList(int index) {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder setFurnitureArrangeCountList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -585,7 +575,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder setFurnitureArrangeCountList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder addFurnitureArrangeCountList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder addFurnitureArrangeCountList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -632,7 +622,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder addFurnitureArrangeCountList(
           emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder addFurnitureArrangeCountList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder addAllFurnitureArrangeCountList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> values) {
@@ -675,7 +665,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder clearFurnitureArrangeCountList() {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public Builder removeFurnitureArrangeCountList(int index) {
         if (furnitureArrangeCountListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getFurnitureArrangeCountListBuilder(
           int index) {
         return getFurnitureArrangeCountListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getFurnitureArrangeCountListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
            getFurnitureArrangeCountListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addFurnitureArrangeCountListBuilder() {
         return getFurnitureArrangeCountListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addFurnitureArrangeCountListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
             index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
       }
       /**
-       * <code>repeated .Uint32Pair furniture_arrange_count_list = 1;</code>
+       * <code>repeated .Uint32Pair furniture_arrange_count_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder> 
            getFurnitureArrangeCountListBuilderList() {
@@ -834,7 +824,7 @@ public final class FurnitureCurModuleArrangeCountNotifyOuterClass {
       "\n*FurnitureCurModuleArrangeCountNotify.p" +
       "roto\032\020Uint32Pair.proto\"Y\n$FurnitureCurMo" +
       "duleArrangeCountNotify\0221\n\034furniture_arra" +
-      "nge_count_list\030\001 \003(\0132\013.Uint32PairB\033\n\031emu" +
+      "nge_count_list\030\017 \003(\0132\013.Uint32PairB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeReqOuterClass.java
index a656871de..7cc45d290 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureMakeReqOuterClass.java
@@ -19,11 +19,6 @@ public final class FurnitureMakeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 23349
-   * Obf: OBBOIIBGLPH
-   * </pre>
-   *
    * Protobuf type {@code FurnitureMakeReq}
    */
   public static final class FurnitureMakeReq extends
@@ -245,11 +240,6 @@ public final class FurnitureMakeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23349
-     * Obf: OBBOIIBGLPH
-     * </pre>
-     *
      * Protobuf type {@code FurnitureMakeReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureOuterClass.java
index 0d66ace0f..3463d6a95 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/FurnitureOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/FurnitureOuterClass.java
@@ -25,10 +25,6 @@ public final class FurnitureOuterClass {
     int getCount();
   }
   /**
-   * <pre>
-   * Obf: GDHFFBFCAPJ
-   * </pre>
-   *
    * Protobuf type {@code Furniture}
    */
   public static final class Furniture extends
@@ -277,10 +273,6 @@ public final class FurnitureOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GDHFFBFCAPJ
-     * </pre>
-     *
      * Protobuf type {@code Furniture}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GMShowNavMeshRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GMShowNavMeshRspOuterClass.java
index 995d288cb..1a10df349 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GMShowNavMeshRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GMShowNavMeshRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GMShowNavMeshRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile> 
         getTilesList();
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile getTiles(int index);
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     int getTilesCount();
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder> 
         getTilesOrBuilderList();
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder getTilesOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 2341
-   * Obf: HFCANNOCOEG
-   * </pre>
-   *
    * Protobuf type {@code GMShowNavMeshRsp}
    */
   public static final class GMShowNavMeshRsp extends
@@ -100,12 +95,12 @@ public final class GMShowNavMeshRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 50: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tiles_ = new java.util.ArrayList<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,10 +144,10 @@ public final class GMShowNavMeshRspOuterClass {
               emu.grasscutter.net.proto.GMShowNavMeshRspOuterClass.GMShowNavMeshRsp.class, emu.grasscutter.net.proto.GMShowNavMeshRspOuterClass.GMShowNavMeshRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -160,17 +155,17 @@ public final class GMShowNavMeshRspOuterClass {
       return retcode_;
     }
 
-    public static final int TILES_FIELD_NUMBER = 6;
+    public static final int TILES_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile> tiles_;
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile> getTilesList() {
       return tiles_;
     }
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder> 
@@ -178,21 +173,21 @@ public final class GMShowNavMeshRspOuterClass {
       return tiles_;
     }
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     @java.lang.Override
     public int getTilesCount() {
       return tiles_.size();
     }
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile getTiles(int index) {
       return tiles_.get(index);
     }
     /**
-     * <code>repeated .PBNavMeshTile tiles = 6;</code>
+     * <code>repeated .PBNavMeshTile tiles = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder getTilesOrBuilder(
@@ -215,10 +210,10 @@ public final class GMShowNavMeshRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
+        output.writeInt32(5, retcode_);
       }
       for (int i = 0; i < tiles_.size(); i++) {
-        output.writeMessage(6, tiles_.get(i));
+        output.writeMessage(12, tiles_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class GMShowNavMeshRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       for (int i = 0; i < tiles_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, tiles_.get(i));
+          .computeMessageSize(12, tiles_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -369,11 +364,6 @@ public final class GMShowNavMeshRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2341
-     * Obf: HFCANNOCOEG
-     * </pre>
-     *
      * Protobuf type {@code GMShowNavMeshRsp}
      */
     public static final class Builder extends
@@ -566,7 +556,7 @@ public final class GMShowNavMeshRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -574,7 +564,7 @@ public final class GMShowNavMeshRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -585,7 +575,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -608,7 +598,7 @@ public final class GMShowNavMeshRspOuterClass {
           emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder> tilesBuilder_;
 
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile> getTilesList() {
         if (tilesBuilder_ == null) {
@@ -618,7 +608,7 @@ public final class GMShowNavMeshRspOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public int getTilesCount() {
         if (tilesBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class GMShowNavMeshRspOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile getTiles(int index) {
         if (tilesBuilder_ == null) {
@@ -638,7 +628,7 @@ public final class GMShowNavMeshRspOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder setTiles(
           int index, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile value) {
@@ -655,7 +645,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder setTiles(
           int index, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder builderForValue) {
@@ -669,7 +659,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder addTiles(emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile value) {
         if (tilesBuilder_ == null) {
@@ -685,7 +675,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder addTiles(
           int index, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile value) {
@@ -702,7 +692,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder addTiles(
           emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder builderForValue) {
@@ -716,7 +706,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder addTiles(
           int index, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder builderForValue) {
@@ -730,7 +720,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder addAllTiles(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile> values) {
@@ -745,7 +735,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder clearTiles() {
         if (tilesBuilder_ == null) {
@@ -758,7 +748,7 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public Builder removeTiles(int index) {
         if (tilesBuilder_ == null) {
@@ -771,14 +761,14 @@ public final class GMShowNavMeshRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder getTilesBuilder(
           int index) {
         return getTilesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder getTilesOrBuilder(
           int index) {
@@ -788,7 +778,7 @@ public final class GMShowNavMeshRspOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTileOrBuilder> 
            getTilesOrBuilderList() {
@@ -799,14 +789,14 @@ public final class GMShowNavMeshRspOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder addTilesBuilder() {
         return getTilesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.getDefaultInstance());
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder addTilesBuilder(
           int index) {
@@ -814,7 +804,7 @@ public final class GMShowNavMeshRspOuterClass {
             index, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.getDefaultInstance());
       }
       /**
-       * <code>repeated .PBNavMeshTile tiles = 6;</code>
+       * <code>repeated .PBNavMeshTile tiles = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder> 
            getTilesBuilderList() {
@@ -902,8 +892,8 @@ public final class GMShowNavMeshRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026GMShowNavMeshRsp.proto\032\023PBNavMeshTile." +
-      "proto\"B\n\020GMShowNavMeshRsp\022\017\n\007retcode\030\001 \001" +
-      "(\005\022\035\n\005tiles\030\006 \003(\0132\016.PBNavMeshTileB\033\n\031emu" +
+      "proto\"B\n\020GMShowNavMeshRsp\022\017\n\007retcode\030\005 \001" +
+      "(\005\022\035\n\005tiles\030\014 \003(\0132\016.PBNavMeshTileB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
index b846eb390..c6772e078 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaInfoOuterClass.java
@@ -19,248 +19,267 @@ public final class GachaInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costItemId = 13;</code>
-     * @return The costItemId.
-     */
-    int getCostItemId();
-
-    /**
-     * <code>string gachaPrefabPath = 10;</code>
-     * @return The gachaPrefabPath.
-     */
-    java.lang.String getGachaPrefabPath();
-    /**
-     * <code>string gachaPrefabPath = 10;</code>
-     * @return The bytes for gachaPrefabPath.
-     */
-    com.google.protobuf.ByteString
-        getGachaPrefabPathBytes();
-
-    /**
-     * <code>uint32 gachaType = 1;</code>
-     * @return The gachaType.
-     */
-    int getGachaType();
-
-    /**
-     * <code>uint32 wishMaxProgress = 960;</code>
-     * @return The wishMaxProgress.
-     */
-    int getWishMaxProgress();
-
-    /**
-     * <code>uint32 curScheduleDailyGachaTimes = 1456;</code>
-     * @return The curScheduleDailyGachaTimes.
-     */
-    int getCurScheduleDailyGachaTimes();
-
-    /**
-     * <code>uint32 leftGachaTimes = 15;</code>
-     * @return The leftGachaTimes.
-     */
-    int getLeftGachaTimes();
-
-    /**
-     * <code>bool is_new_wish = 1537;</code>
-     * @return The isNewWish.
-     */
-    boolean getIsNewWish();
-
-    /**
-     * <code>uint32 tenCostItemNum = 8;</code>
-     * @return The tenCostItemNum.
-     */
-    int getTenCostItemNum();
-
-    /**
-     * <code>uint32 wishProgress = 1511;</code>
-     * @return The wishProgress.
-     */
-    int getWishProgress();
-
-    /**
-     * <code>uint32 schedule_id = 5;</code>
-     * @return The scheduleId.
-     */
-    int getScheduleId();
-
-    /**
-     * <code>uint32 tenCostItemId = 6;</code>
-     * @return The tenCostItemId.
-     */
-    int getTenCostItemId();
-
-    /**
-     * <code>uint32 gachaSortId = 11;</code>
-     * @return The gachaSortId.
-     */
-    int getGachaSortId();
-
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @return A list containing the displayUp4ItemList.
-     */
-    java.util.List<java.lang.Integer> getDisplayUp4ItemListList();
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @return The count of displayUp4ItemList.
-     */
-    int getDisplayUp4ItemListCount();
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @param index The index of the element to return.
-     * @return The displayUp4ItemList at the given index.
-     */
-    int getDisplayUp4ItemList(int index);
-
-    /**
-     * <code>string gachaRecordUrlOversea = 1181;</code>
-     * @return The gachaRecordUrlOversea.
-     */
-    java.lang.String getGachaRecordUrlOversea();
-    /**
-     * <code>string gachaRecordUrlOversea = 1181;</code>
-     * @return The bytes for gachaRecordUrlOversea.
-     */
-    com.google.protobuf.ByteString
-        getGachaRecordUrlOverseaBytes();
-
-    /**
-     * <code>string gachaProbUrlOversea = 1221;</code>
-     * @return The gachaProbUrlOversea.
-     */
-    java.lang.String getGachaProbUrlOversea();
-    /**
-     * <code>string gachaProbUrlOversea = 1221;</code>
-     * @return The bytes for gachaProbUrlOversea.
-     */
-    com.google.protobuf.ByteString
-        getGachaProbUrlOverseaBytes();
-
-    /**
-     * <code>uint32 begin_time = 3;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-
-    /**
-     * <code>uint32 wishItemId = 870;</code>
-     * @return The wishItemId.
-     */
-    int getWishItemId();
-
-    /**
-     * <code>uint32 end_time = 7;</code>
+     * <code>uint32 end_time = 1;</code>
      * @return The endTime.
      */
     int getEndTime();
 
     /**
-     * <code>string gachaPreviewPrefabPath = 12;</code>
+     * <code>uint32 wish_progress = 2;</code>
+     * @return The wishProgress.
+     */
+    int getWishProgress();
+
+    /**
+     * <code>uint32 ten_cost_item_num = 3;</code>
+     * @return The tenCostItemNum.
+     */
+    int getTenCostItemNum();
+
+    /**
+     * <code>string gacha_preview_prefab_path = 4;</code>
      * @return The gachaPreviewPrefabPath.
      */
     java.lang.String getGachaPreviewPrefabPath();
     /**
-     * <code>string gachaPreviewPrefabPath = 12;</code>
+     * <code>string gacha_preview_prefab_path = 4;</code>
      * @return The bytes for gachaPreviewPrefabPath.
      */
     com.google.protobuf.ByteString
         getGachaPreviewPrefabPathBytes();
 
     /**
-     * <code>string titleTextmap = 847;</code>
-     * @return The titleTextmap.
+     * <code>uint32 begin_time = 5;</code>
+     * @return The beginTime.
      */
-    java.lang.String getTitleTextmap();
-    /**
-     * <code>string titleTextmap = 847;</code>
-     * @return The bytes for titleTextmap.
-     */
-    com.google.protobuf.ByteString
-        getTitleTextmapBytes();
+    int getBeginTime();
 
     /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @return A list containing the displayUp5ItemList.
-     */
-    java.util.List<java.lang.Integer> getDisplayUp5ItemListList();
-    /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @return The count of displayUp5ItemList.
-     */
-    int getDisplayUp5ItemListCount();
-    /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @param index The index of the element to return.
-     * @return The displayUp5ItemList at the given index.
-     */
-    int getDisplayUp5ItemList(int index);
-
-    /**
-     * <code>uint32 gachaTimesLimit = 14;</code>
-     * @return The gachaTimesLimit.
-     */
-    int getGachaTimesLimit();
-
-    /**
-     * <code>string gachaRecordUrl = 9;</code>
+     * <code>string gacha_record_url = 6;</code>
      * @return The gachaRecordUrl.
      */
     java.lang.String getGachaRecordUrl();
     /**
-     * <code>string gachaRecordUrl = 9;</code>
+     * <code>string gacha_record_url = 6;</code>
      * @return The bytes for gachaRecordUrl.
      */
     com.google.protobuf.ByteString
         getGachaRecordUrlBytes();
 
     /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> 
-        getGachaUpInfoListList();
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo getGachaUpInfoList(int index);
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    int getGachaUpInfoListCount();
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> 
-        getGachaUpInfoListOrBuilderList();
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 costItemNum = 2;</code>
+     * <code>uint32 cost_item_num = 7;</code>
      * @return The costItemNum.
      */
     int getCostItemNum();
 
     /**
-     * <code>string gachaProbUrl = 4;</code>
+     * <code>uint32 schedule_id = 8;</code>
+     * @return The scheduleId.
+     */
+    int getScheduleId();
+
+    /**
+     * <code>string gacha_prob_url = 9;</code>
      * @return The gachaProbUrl.
      */
     java.lang.String getGachaProbUrl();
     /**
-     * <code>string gachaProbUrl = 4;</code>
+     * <code>string gacha_prob_url = 9;</code>
      * @return The bytes for gachaProbUrl.
      */
     com.google.protobuf.ByteString
         getGachaProbUrlBytes();
+
+    /**
+     * <code>uint32 gacha_type = 10;</code>
+     * @return The gachaType.
+     */
+    int getGachaType();
+
+    /**
+     * <code>string gacha_prefab_path = 11;</code>
+     * @return The gachaPrefabPath.
+     */
+    java.lang.String getGachaPrefabPath();
+    /**
+     * <code>string gacha_prefab_path = 11;</code>
+     * @return The bytes for gachaPrefabPath.
+     */
+    com.google.protobuf.ByteString
+        getGachaPrefabPathBytes();
+
+    /**
+     * <code>uint32 cost_item_id = 12;</code>
+     * @return The costItemId.
+     */
+    int getCostItemId();
+
+    /**
+     * <code>uint32 wish_max_progress = 13;</code>
+     * @return The wishMaxProgress.
+     */
+    int getWishMaxProgress();
+
+    /**
+     * <code>uint32 left_gacha_times = 14;</code>
+     * @return The leftGachaTimes.
+     */
+    int getLeftGachaTimes();
+
+    /**
+     * <code>uint32 gacha_times_limit = 15;</code>
+     * @return The gachaTimesLimit.
+     */
+    int getGachaTimesLimit();
+
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @return A list containing the displayUp5ItemList.
+     */
+    java.util.List<java.lang.Integer> getDisplayUp5ItemListList();
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @return The count of displayUp5ItemList.
+     */
+    int getDisplayUp5ItemListCount();
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @param index The index of the element to return.
+     * @return The displayUp5ItemList at the given index.
+     */
+    int getDisplayUp5ItemList(int index);
+
+    /**
+     * <code>uint32 ten_cost_item_id = 243;</code>
+     * @return The tenCostItemId.
+     */
+    int getTenCostItemId();
+
+    /**
+     * <code>bool is_new_wish = 251;</code>
+     * @return The isNewWish.
+     */
+    boolean getIsNewWish();
+
+    /**
+     * <code>uint32 wish_item_id = 599;</code>
+     * @return The wishItemId.
+     */
+    int getWishItemId();
+
+    /**
+     * <code>string title_textmap = 782;</code>
+     * @return The titleTextmap.
+     */
+    java.lang.String getTitleTextmap();
+    /**
+     * <code>string title_textmap = 782;</code>
+     * @return The bytes for titleTextmap.
+     */
+    com.google.protobuf.ByteString
+        getTitleTextmapBytes();
+
+    /**
+     * <code>string gacha_prob_url_oversea = 798;</code>
+     * @return The gachaProbUrlOversea.
+     */
+    java.lang.String getGachaProbUrlOversea();
+    /**
+     * <code>string gacha_prob_url_oversea = 798;</code>
+     * @return The bytes for gachaProbUrlOversea.
+     */
+    com.google.protobuf.ByteString
+        getGachaProbUrlOverseaBytes();
+
+    /**
+     * <code>uint32 cur_schedule_daily_gacha_times = 1087;</code>
+     * @return The curScheduleDailyGachaTimes.
+     */
+    int getCurScheduleDailyGachaTimes();
+
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @return A list containing the displayChronicle5ItemList.
+     */
+    java.util.List<java.lang.Integer> getDisplayChronicle5ItemListList();
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @return The count of displayChronicle5ItemList.
+     */
+    int getDisplayChronicle5ItemListCount();
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @param index The index of the element to return.
+     * @return The displayChronicle5ItemList at the given index.
+     */
+    int getDisplayChronicle5ItemList(int index);
+
+    /**
+     * <code>bool LAGAHPEKLHM = 1509;</code>
+     * @return The lAGAHPEKLHM.
+     */
+    boolean getLAGAHPEKLHM();
+
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> 
+        getGachaUpInfoListList();
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo getGachaUpInfoList(int index);
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    int getGachaUpInfoListCount();
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> 
+        getGachaUpInfoListOrBuilderList();
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @return A list containing the displayUp4ItemList.
+     */
+    java.util.List<java.lang.Integer> getDisplayUp4ItemListList();
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @return The count of displayUp4ItemList.
+     */
+    int getDisplayUp4ItemListCount();
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @param index The index of the element to return.
+     * @return The displayUp4ItemList at the given index.
+     */
+    int getDisplayUp4ItemList(int index);
+
+    /**
+     * <code>uint32 gacha_sort_id = 1938;</code>
+     * @return The gachaSortId.
+     */
+    int getGachaSortId();
+
+    /**
+     * <code>string gacha_record_url_oversea = 1984;</code>
+     * @return The gachaRecordUrlOversea.
+     */
+    java.lang.String getGachaRecordUrlOversea();
+    /**
+     * <code>string gacha_record_url_oversea = 1984;</code>
+     * @return The bytes for gachaRecordUrlOversea.
+     */
+    com.google.protobuf.ByteString
+        getGachaRecordUrlOverseaBytes();
   }
   /**
-   * <pre>
-   * Obf: LBJPFCBOKFM
-   * </pre>
-   *
    * Protobuf type {@code GachaInfo}
    */
   public static final class GachaInfo extends
@@ -273,16 +292,17 @@ public final class GachaInfoOuterClass {
       super(builder);
     }
     private GachaInfo() {
+      gachaPreviewPrefabPath_ = "";
+      gachaRecordUrl_ = "";
+      gachaProbUrl_ = "";
       gachaPrefabPath_ = "";
+      displayUp5ItemList_ = emptyIntList();
+      titleTextmap_ = "";
+      gachaProbUrlOversea_ = "";
+      displayChronicle5ItemList_ = emptyIntList();
+      gachaUpInfoList_ = java.util.Collections.emptyList();
       displayUp4ItemList_ = emptyIntList();
       gachaRecordUrlOversea_ = "";
-      gachaProbUrlOversea_ = "";
-      gachaPreviewPrefabPath_ = "";
-      titleTextmap_ = "";
-      displayUp5ItemList_ = emptyIntList();
-      gachaRecordUrl_ = "";
-      gachaUpInfoList_ = java.util.Collections.emptyList();
-      gachaProbUrl_ = "";
     }
 
     @java.lang.Override
@@ -318,143 +338,163 @@ public final class GachaInfoOuterClass {
               break;
             case 8: {
 
-              gachaType_ = input.readUInt32();
+              endTime_ = input.readUInt32();
               break;
             }
             case 16: {
 
-              costItemNum_ = input.readUInt32();
+              wishProgress_ = input.readUInt32();
               break;
             }
             case 24: {
 
-              beginTime_ = input.readUInt32();
+              tenCostItemNum_ = input.readUInt32();
               break;
             }
             case 34: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              gachaProbUrl_ = s;
+              gachaPreviewPrefabPath_ = s;
               break;
             }
             case 40: {
 
-              scheduleId_ = input.readUInt32();
+              beginTime_ = input.readUInt32();
               break;
             }
-            case 48: {
-
-              tenCostItemId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              tenCostItemNum_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 50: {
               java.lang.String s = input.readStringRequireUtf8();
 
               gachaRecordUrl_ = s;
               break;
             }
-            case 82: {
+            case 56: {
+
+              costItemNum_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              scheduleId_ = input.readUInt32();
+              break;
+            }
+            case 74: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              gachaProbUrl_ = s;
+              break;
+            }
+            case 80: {
+
+              gachaType_ = input.readUInt32();
+              break;
+            }
+            case 90: {
               java.lang.String s = input.readStringRequireUtf8();
 
               gachaPrefabPath_ = s;
               break;
             }
-            case 88: {
-
-              gachaSortId_ = input.readUInt32();
-              break;
-            }
-            case 98: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              gachaPreviewPrefabPath_ = s;
-              break;
-            }
-            case 104: {
+            case 96: {
 
               costItemId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 104: {
 
-              gachaTimesLimit_ = input.readUInt32();
+              wishMaxProgress_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 112: {
 
               leftGachaTimes_ = input.readUInt32();
               break;
             }
-            case 6778: {
+            case 120: {
+
+              gachaTimesLimit_ = input.readUInt32();
+              break;
+            }
+            case 792: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                displayUp5ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              displayUp5ItemList_.addInt(input.readUInt32());
+              break;
+            }
+            case 794: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                displayUp5ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                displayUp5ItemList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 1944: {
+
+              tenCostItemId_ = input.readUInt32();
+              break;
+            }
+            case 2008: {
+
+              isNewWish_ = input.readBool();
+              break;
+            }
+            case 4792: {
+
+              wishItemId_ = input.readUInt32();
+              break;
+            }
+            case 6258: {
               java.lang.String s = input.readStringRequireUtf8();
 
               titleTextmap_ = s;
               break;
             }
-            case 6960: {
-
-              wishItemId_ = input.readUInt32();
-              break;
-            }
-            case 7680: {
-
-              wishMaxProgress_ = input.readUInt32();
-              break;
-            }
-            case 9450: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              gachaRecordUrlOversea_ = s;
-              break;
-            }
-            case 9770: {
+            case 6386: {
               java.lang.String s = input.readStringRequireUtf8();
 
               gachaProbUrlOversea_ = s;
               break;
             }
-            case 10280: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                displayUp4ItemList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              displayUp4ItemList_.addInt(input.readUInt32());
-              break;
-            }
-            case 10282: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                displayUp4ItemList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                displayUp4ItemList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 11648: {
+            case 8696: {
 
               curScheduleDailyGachaTimes_ = input.readUInt32();
               break;
             }
-            case 12088: {
-
-              wishProgress_ = input.readUInt32();
+            case 11584: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                displayChronicle5ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              displayChronicle5ItemList_.addInt(input.readUInt32());
               break;
             }
-            case 12114: {
+            case 11586: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                displayChronicle5ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                displayChronicle5ItemList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 12072: {
+
+              lAGAHPEKLHM_ = input.readBool();
+              break;
+            }
+            case 13690: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 gachaUpInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo>();
                 mutable_bitField0_ |= 0x00000004;
@@ -463,32 +503,38 @@ public final class GachaInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.parser(), extensionRegistry));
               break;
             }
-            case 12296: {
-
-              isNewWish_ = input.readBool();
-              break;
-            }
-            case 14648: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                displayUp5ItemList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 15056: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                displayUp4ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
-              displayUp5ItemList_.addInt(input.readUInt32());
+              displayUp4ItemList_.addInt(input.readUInt32());
               break;
             }
-            case 14650: {
+            case 15058: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                displayUp5ItemList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                displayUp4ItemList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
-                displayUp5ItemList_.addInt(input.readUInt32());
+                displayUp4ItemList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
+            case 15504: {
+
+              gachaSortId_ = input.readUInt32();
+              break;
+            }
+            case 15874: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              gachaRecordUrlOversea_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -505,13 +551,16 @@ public final class GachaInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          displayUp4ItemList_.makeImmutable(); // C
+          displayUp5ItemList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          displayChronicle5ItemList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
           gachaUpInfoList_ = java.util.Collections.unmodifiableList(gachaUpInfoList_);
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          displayUp5ItemList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          displayUp4ItemList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -530,295 +579,10 @@ public final class GachaInfoOuterClass {
               emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.class, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder.class);
     }
 
-    public static final int COSTITEMID_FIELD_NUMBER = 13;
-    private int costItemId_;
-    /**
-     * <code>uint32 costItemId = 13;</code>
-     * @return The costItemId.
-     */
-    @java.lang.Override
-    public int getCostItemId() {
-      return costItemId_;
-    }
-
-    public static final int GACHAPREFABPATH_FIELD_NUMBER = 10;
-    private volatile java.lang.Object gachaPrefabPath_;
-    /**
-     * <code>string gachaPrefabPath = 10;</code>
-     * @return The gachaPrefabPath.
-     */
-    @java.lang.Override
-    public java.lang.String getGachaPrefabPath() {
-      java.lang.Object ref = gachaPrefabPath_;
-      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();
-        gachaPrefabPath_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string gachaPrefabPath = 10;</code>
-     * @return The bytes for gachaPrefabPath.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getGachaPrefabPathBytes() {
-      java.lang.Object ref = gachaPrefabPath_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        gachaPrefabPath_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int GACHATYPE_FIELD_NUMBER = 1;
-    private int gachaType_;
-    /**
-     * <code>uint32 gachaType = 1;</code>
-     * @return The gachaType.
-     */
-    @java.lang.Override
-    public int getGachaType() {
-      return gachaType_;
-    }
-
-    public static final int WISHMAXPROGRESS_FIELD_NUMBER = 960;
-    private int wishMaxProgress_;
-    /**
-     * <code>uint32 wishMaxProgress = 960;</code>
-     * @return The wishMaxProgress.
-     */
-    @java.lang.Override
-    public int getWishMaxProgress() {
-      return wishMaxProgress_;
-    }
-
-    public static final int CURSCHEDULEDAILYGACHATIMES_FIELD_NUMBER = 1456;
-    private int curScheduleDailyGachaTimes_;
-    /**
-     * <code>uint32 curScheduleDailyGachaTimes = 1456;</code>
-     * @return The curScheduleDailyGachaTimes.
-     */
-    @java.lang.Override
-    public int getCurScheduleDailyGachaTimes() {
-      return curScheduleDailyGachaTimes_;
-    }
-
-    public static final int LEFTGACHATIMES_FIELD_NUMBER = 15;
-    private int leftGachaTimes_;
-    /**
-     * <code>uint32 leftGachaTimes = 15;</code>
-     * @return The leftGachaTimes.
-     */
-    @java.lang.Override
-    public int getLeftGachaTimes() {
-      return leftGachaTimes_;
-    }
-
-    public static final int IS_NEW_WISH_FIELD_NUMBER = 1537;
-    private boolean isNewWish_;
-    /**
-     * <code>bool is_new_wish = 1537;</code>
-     * @return The isNewWish.
-     */
-    @java.lang.Override
-    public boolean getIsNewWish() {
-      return isNewWish_;
-    }
-
-    public static final int TENCOSTITEMNUM_FIELD_NUMBER = 8;
-    private int tenCostItemNum_;
-    /**
-     * <code>uint32 tenCostItemNum = 8;</code>
-     * @return The tenCostItemNum.
-     */
-    @java.lang.Override
-    public int getTenCostItemNum() {
-      return tenCostItemNum_;
-    }
-
-    public static final int WISHPROGRESS_FIELD_NUMBER = 1511;
-    private int wishProgress_;
-    /**
-     * <code>uint32 wishProgress = 1511;</code>
-     * @return The wishProgress.
-     */
-    @java.lang.Override
-    public int getWishProgress() {
-      return wishProgress_;
-    }
-
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 5;
-    private int scheduleId_;
-    /**
-     * <code>uint32 schedule_id = 5;</code>
-     * @return The scheduleId.
-     */
-    @java.lang.Override
-    public int getScheduleId() {
-      return scheduleId_;
-    }
-
-    public static final int TENCOSTITEMID_FIELD_NUMBER = 6;
-    private int tenCostItemId_;
-    /**
-     * <code>uint32 tenCostItemId = 6;</code>
-     * @return The tenCostItemId.
-     */
-    @java.lang.Override
-    public int getTenCostItemId() {
-      return tenCostItemId_;
-    }
-
-    public static final int GACHASORTID_FIELD_NUMBER = 11;
-    private int gachaSortId_;
-    /**
-     * <code>uint32 gachaSortId = 11;</code>
-     * @return The gachaSortId.
-     */
-    @java.lang.Override
-    public int getGachaSortId() {
-      return gachaSortId_;
-    }
-
-    public static final int DISPLAYUP4ITEMLIST_FIELD_NUMBER = 1285;
-    private com.google.protobuf.Internal.IntList displayUp4ItemList_;
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @return A list containing the displayUp4ItemList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getDisplayUp4ItemListList() {
-      return displayUp4ItemList_;
-    }
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @return The count of displayUp4ItemList.
-     */
-    public int getDisplayUp4ItemListCount() {
-      return displayUp4ItemList_.size();
-    }
-    /**
-     * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-     * @param index The index of the element to return.
-     * @return The displayUp4ItemList at the given index.
-     */
-    public int getDisplayUp4ItemList(int index) {
-      return displayUp4ItemList_.getInt(index);
-    }
-    private int displayUp4ItemListMemoizedSerializedSize = -1;
-
-    public static final int GACHARECORDURLOVERSEA_FIELD_NUMBER = 1181;
-    private volatile java.lang.Object gachaRecordUrlOversea_;
-    /**
-     * <code>string gachaRecordUrlOversea = 1181;</code>
-     * @return The gachaRecordUrlOversea.
-     */
-    @java.lang.Override
-    public java.lang.String getGachaRecordUrlOversea() {
-      java.lang.Object ref = gachaRecordUrlOversea_;
-      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();
-        gachaRecordUrlOversea_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string gachaRecordUrlOversea = 1181;</code>
-     * @return The bytes for gachaRecordUrlOversea.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getGachaRecordUrlOverseaBytes() {
-      java.lang.Object ref = gachaRecordUrlOversea_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        gachaRecordUrlOversea_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int GACHAPROBURLOVERSEA_FIELD_NUMBER = 1221;
-    private volatile java.lang.Object gachaProbUrlOversea_;
-    /**
-     * <code>string gachaProbUrlOversea = 1221;</code>
-     * @return The gachaProbUrlOversea.
-     */
-    @java.lang.Override
-    public java.lang.String getGachaProbUrlOversea() {
-      java.lang.Object ref = gachaProbUrlOversea_;
-      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();
-        gachaProbUrlOversea_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string gachaProbUrlOversea = 1221;</code>
-     * @return The bytes for gachaProbUrlOversea.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getGachaProbUrlOverseaBytes() {
-      java.lang.Object ref = gachaProbUrlOversea_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        gachaProbUrlOversea_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 3;
-    private int beginTime_;
-    /**
-     * <code>uint32 begin_time = 3;</code>
-     * @return The beginTime.
-     */
-    @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
-    }
-
-    public static final int WISHITEMID_FIELD_NUMBER = 870;
-    private int wishItemId_;
-    /**
-     * <code>uint32 wishItemId = 870;</code>
-     * @return The wishItemId.
-     */
-    @java.lang.Override
-    public int getWishItemId() {
-      return wishItemId_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 7;
+    public static final int END_TIME_FIELD_NUMBER = 1;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 7;</code>
+     * <code>uint32 end_time = 1;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -826,10 +590,32 @@ public final class GachaInfoOuterClass {
       return endTime_;
     }
 
-    public static final int GACHAPREVIEWPREFABPATH_FIELD_NUMBER = 12;
+    public static final int WISH_PROGRESS_FIELD_NUMBER = 2;
+    private int wishProgress_;
+    /**
+     * <code>uint32 wish_progress = 2;</code>
+     * @return The wishProgress.
+     */
+    @java.lang.Override
+    public int getWishProgress() {
+      return wishProgress_;
+    }
+
+    public static final int TEN_COST_ITEM_NUM_FIELD_NUMBER = 3;
+    private int tenCostItemNum_;
+    /**
+     * <code>uint32 ten_cost_item_num = 3;</code>
+     * @return The tenCostItemNum.
+     */
+    @java.lang.Override
+    public int getTenCostItemNum() {
+      return tenCostItemNum_;
+    }
+
+    public static final int GACHA_PREVIEW_PREFAB_PATH_FIELD_NUMBER = 4;
     private volatile java.lang.Object gachaPreviewPrefabPath_;
     /**
-     * <code>string gachaPreviewPrefabPath = 12;</code>
+     * <code>string gacha_preview_prefab_path = 4;</code>
      * @return The gachaPreviewPrefabPath.
      */
     @java.lang.Override
@@ -846,7 +632,7 @@ public final class GachaInfoOuterClass {
       }
     }
     /**
-     * <code>string gachaPreviewPrefabPath = 12;</code>
+     * <code>string gacha_preview_prefab_path = 4;</code>
      * @return The bytes for gachaPreviewPrefabPath.
      */
     @java.lang.Override
@@ -864,87 +650,21 @@ public final class GachaInfoOuterClass {
       }
     }
 
-    public static final int TITLETEXTMAP_FIELD_NUMBER = 847;
-    private volatile java.lang.Object titleTextmap_;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 5;
+    private int beginTime_;
     /**
-     * <code>string titleTextmap = 847;</code>
-     * @return The titleTextmap.
+     * <code>uint32 begin_time = 5;</code>
+     * @return The beginTime.
      */
     @java.lang.Override
-    public java.lang.String getTitleTextmap() {
-      java.lang.Object ref = titleTextmap_;
-      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();
-        titleTextmap_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string titleTextmap = 847;</code>
-     * @return The bytes for titleTextmap.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getTitleTextmapBytes() {
-      java.lang.Object ref = titleTextmap_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        titleTextmap_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getBeginTime() {
+      return beginTime_;
     }
 
-    public static final int DISPLAYUP5ITEMLIST_FIELD_NUMBER = 1831;
-    private com.google.protobuf.Internal.IntList displayUp5ItemList_;
-    /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @return A list containing the displayUp5ItemList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getDisplayUp5ItemListList() {
-      return displayUp5ItemList_;
-    }
-    /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @return The count of displayUp5ItemList.
-     */
-    public int getDisplayUp5ItemListCount() {
-      return displayUp5ItemList_.size();
-    }
-    /**
-     * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-     * @param index The index of the element to return.
-     * @return The displayUp5ItemList at the given index.
-     */
-    public int getDisplayUp5ItemList(int index) {
-      return displayUp5ItemList_.getInt(index);
-    }
-    private int displayUp5ItemListMemoizedSerializedSize = -1;
-
-    public static final int GACHATIMESLIMIT_FIELD_NUMBER = 14;
-    private int gachaTimesLimit_;
-    /**
-     * <code>uint32 gachaTimesLimit = 14;</code>
-     * @return The gachaTimesLimit.
-     */
-    @java.lang.Override
-    public int getGachaTimesLimit() {
-      return gachaTimesLimit_;
-    }
-
-    public static final int GACHARECORDURL_FIELD_NUMBER = 9;
+    public static final int GACHA_RECORD_URL_FIELD_NUMBER = 6;
     private volatile java.lang.Object gachaRecordUrl_;
     /**
-     * <code>string gachaRecordUrl = 9;</code>
+     * <code>string gacha_record_url = 6;</code>
      * @return The gachaRecordUrl.
      */
     @java.lang.Override
@@ -961,7 +681,7 @@ public final class GachaInfoOuterClass {
       }
     }
     /**
-     * <code>string gachaRecordUrl = 9;</code>
+     * <code>string gacha_record_url = 6;</code>
      * @return The bytes for gachaRecordUrl.
      */
     @java.lang.Override
@@ -979,50 +699,10 @@ public final class GachaInfoOuterClass {
       }
     }
 
-    public static final int GACHA_UP_INFO_LIST_FIELD_NUMBER = 1514;
-    private java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> gachaUpInfoList_;
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> getGachaUpInfoListList() {
-      return gachaUpInfoList_;
-    }
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> 
-        getGachaUpInfoListOrBuilderList() {
-      return gachaUpInfoList_;
-    }
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    @java.lang.Override
-    public int getGachaUpInfoListCount() {
-      return gachaUpInfoList_.size();
-    }
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo getGachaUpInfoList(int index) {
-      return gachaUpInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpInfoListOrBuilder(
-        int index) {
-      return gachaUpInfoList_.get(index);
-    }
-
-    public static final int COSTITEMNUM_FIELD_NUMBER = 2;
+    public static final int COST_ITEM_NUM_FIELD_NUMBER = 7;
     private int costItemNum_;
     /**
-     * <code>uint32 costItemNum = 2;</code>
+     * <code>uint32 cost_item_num = 7;</code>
      * @return The costItemNum.
      */
     @java.lang.Override
@@ -1030,10 +710,21 @@ public final class GachaInfoOuterClass {
       return costItemNum_;
     }
 
-    public static final int GACHAPROBURL_FIELD_NUMBER = 4;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 8;
+    private int scheduleId_;
+    /**
+     * <code>uint32 schedule_id = 8;</code>
+     * @return The scheduleId.
+     */
+    @java.lang.Override
+    public int getScheduleId() {
+      return scheduleId_;
+    }
+
+    public static final int GACHA_PROB_URL_FIELD_NUMBER = 9;
     private volatile java.lang.Object gachaProbUrl_;
     /**
-     * <code>string gachaProbUrl = 4;</code>
+     * <code>string gacha_prob_url = 9;</code>
      * @return The gachaProbUrl.
      */
     @java.lang.Override
@@ -1050,7 +741,7 @@ public final class GachaInfoOuterClass {
       }
     }
     /**
-     * <code>string gachaProbUrl = 4;</code>
+     * <code>string gacha_prob_url = 9;</code>
      * @return The bytes for gachaProbUrl.
      */
     @java.lang.Override
@@ -1068,6 +759,403 @@ public final class GachaInfoOuterClass {
       }
     }
 
+    public static final int GACHA_TYPE_FIELD_NUMBER = 10;
+    private int gachaType_;
+    /**
+     * <code>uint32 gacha_type = 10;</code>
+     * @return The gachaType.
+     */
+    @java.lang.Override
+    public int getGachaType() {
+      return gachaType_;
+    }
+
+    public static final int GACHA_PREFAB_PATH_FIELD_NUMBER = 11;
+    private volatile java.lang.Object gachaPrefabPath_;
+    /**
+     * <code>string gacha_prefab_path = 11;</code>
+     * @return The gachaPrefabPath.
+     */
+    @java.lang.Override
+    public java.lang.String getGachaPrefabPath() {
+      java.lang.Object ref = gachaPrefabPath_;
+      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();
+        gachaPrefabPath_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string gacha_prefab_path = 11;</code>
+     * @return The bytes for gachaPrefabPath.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGachaPrefabPathBytes() {
+      java.lang.Object ref = gachaPrefabPath_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gachaPrefabPath_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int COST_ITEM_ID_FIELD_NUMBER = 12;
+    private int costItemId_;
+    /**
+     * <code>uint32 cost_item_id = 12;</code>
+     * @return The costItemId.
+     */
+    @java.lang.Override
+    public int getCostItemId() {
+      return costItemId_;
+    }
+
+    public static final int WISH_MAX_PROGRESS_FIELD_NUMBER = 13;
+    private int wishMaxProgress_;
+    /**
+     * <code>uint32 wish_max_progress = 13;</code>
+     * @return The wishMaxProgress.
+     */
+    @java.lang.Override
+    public int getWishMaxProgress() {
+      return wishMaxProgress_;
+    }
+
+    public static final int LEFT_GACHA_TIMES_FIELD_NUMBER = 14;
+    private int leftGachaTimes_;
+    /**
+     * <code>uint32 left_gacha_times = 14;</code>
+     * @return The leftGachaTimes.
+     */
+    @java.lang.Override
+    public int getLeftGachaTimes() {
+      return leftGachaTimes_;
+    }
+
+    public static final int GACHA_TIMES_LIMIT_FIELD_NUMBER = 15;
+    private int gachaTimesLimit_;
+    /**
+     * <code>uint32 gacha_times_limit = 15;</code>
+     * @return The gachaTimesLimit.
+     */
+    @java.lang.Override
+    public int getGachaTimesLimit() {
+      return gachaTimesLimit_;
+    }
+
+    public static final int DISPLAY_UP5_ITEM_LIST_FIELD_NUMBER = 99;
+    private com.google.protobuf.Internal.IntList displayUp5ItemList_;
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @return A list containing the displayUp5ItemList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getDisplayUp5ItemListList() {
+      return displayUp5ItemList_;
+    }
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @return The count of displayUp5ItemList.
+     */
+    public int getDisplayUp5ItemListCount() {
+      return displayUp5ItemList_.size();
+    }
+    /**
+     * <code>repeated uint32 display_up5_item_list = 99;</code>
+     * @param index The index of the element to return.
+     * @return The displayUp5ItemList at the given index.
+     */
+    public int getDisplayUp5ItemList(int index) {
+      return displayUp5ItemList_.getInt(index);
+    }
+    private int displayUp5ItemListMemoizedSerializedSize = -1;
+
+    public static final int TEN_COST_ITEM_ID_FIELD_NUMBER = 243;
+    private int tenCostItemId_;
+    /**
+     * <code>uint32 ten_cost_item_id = 243;</code>
+     * @return The tenCostItemId.
+     */
+    @java.lang.Override
+    public int getTenCostItemId() {
+      return tenCostItemId_;
+    }
+
+    public static final int IS_NEW_WISH_FIELD_NUMBER = 251;
+    private boolean isNewWish_;
+    /**
+     * <code>bool is_new_wish = 251;</code>
+     * @return The isNewWish.
+     */
+    @java.lang.Override
+    public boolean getIsNewWish() {
+      return isNewWish_;
+    }
+
+    public static final int WISH_ITEM_ID_FIELD_NUMBER = 599;
+    private int wishItemId_;
+    /**
+     * <code>uint32 wish_item_id = 599;</code>
+     * @return The wishItemId.
+     */
+    @java.lang.Override
+    public int getWishItemId() {
+      return wishItemId_;
+    }
+
+    public static final int TITLE_TEXTMAP_FIELD_NUMBER = 782;
+    private volatile java.lang.Object titleTextmap_;
+    /**
+     * <code>string title_textmap = 782;</code>
+     * @return The titleTextmap.
+     */
+    @java.lang.Override
+    public java.lang.String getTitleTextmap() {
+      java.lang.Object ref = titleTextmap_;
+      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();
+        titleTextmap_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string title_textmap = 782;</code>
+     * @return The bytes for titleTextmap.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getTitleTextmapBytes() {
+      java.lang.Object ref = titleTextmap_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        titleTextmap_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int GACHA_PROB_URL_OVERSEA_FIELD_NUMBER = 798;
+    private volatile java.lang.Object gachaProbUrlOversea_;
+    /**
+     * <code>string gacha_prob_url_oversea = 798;</code>
+     * @return The gachaProbUrlOversea.
+     */
+    @java.lang.Override
+    public java.lang.String getGachaProbUrlOversea() {
+      java.lang.Object ref = gachaProbUrlOversea_;
+      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();
+        gachaProbUrlOversea_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string gacha_prob_url_oversea = 798;</code>
+     * @return The bytes for gachaProbUrlOversea.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGachaProbUrlOverseaBytes() {
+      java.lang.Object ref = gachaProbUrlOversea_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gachaProbUrlOversea_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int CUR_SCHEDULE_DAILY_GACHA_TIMES_FIELD_NUMBER = 1087;
+    private int curScheduleDailyGachaTimes_;
+    /**
+     * <code>uint32 cur_schedule_daily_gacha_times = 1087;</code>
+     * @return The curScheduleDailyGachaTimes.
+     */
+    @java.lang.Override
+    public int getCurScheduleDailyGachaTimes() {
+      return curScheduleDailyGachaTimes_;
+    }
+
+    public static final int DISPLAY_CHRONICLE5_ITEM_LIST_FIELD_NUMBER = 1448;
+    private com.google.protobuf.Internal.IntList displayChronicle5ItemList_;
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @return A list containing the displayChronicle5ItemList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getDisplayChronicle5ItemListList() {
+      return displayChronicle5ItemList_;
+    }
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @return The count of displayChronicle5ItemList.
+     */
+    public int getDisplayChronicle5ItemListCount() {
+      return displayChronicle5ItemList_.size();
+    }
+    /**
+     * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+     * @param index The index of the element to return.
+     * @return The displayChronicle5ItemList at the given index.
+     */
+    public int getDisplayChronicle5ItemList(int index) {
+      return displayChronicle5ItemList_.getInt(index);
+    }
+    private int displayChronicle5ItemListMemoizedSerializedSize = -1;
+
+    public static final int LAGAHPEKLHM_FIELD_NUMBER = 1509;
+    private boolean lAGAHPEKLHM_;
+    /**
+     * <code>bool LAGAHPEKLHM = 1509;</code>
+     * @return The lAGAHPEKLHM.
+     */
+    @java.lang.Override
+    public boolean getLAGAHPEKLHM() {
+      return lAGAHPEKLHM_;
+    }
+
+    public static final int GACHA_UP_INFO_LIST_FIELD_NUMBER = 1711;
+    private java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> gachaUpInfoList_;
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> getGachaUpInfoListList() {
+      return gachaUpInfoList_;
+    }
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> 
+        getGachaUpInfoListOrBuilderList() {
+      return gachaUpInfoList_;
+    }
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    @java.lang.Override
+    public int getGachaUpInfoListCount() {
+      return gachaUpInfoList_.size();
+    }
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo getGachaUpInfoList(int index) {
+      return gachaUpInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpInfoListOrBuilder(
+        int index) {
+      return gachaUpInfoList_.get(index);
+    }
+
+    public static final int DISPLAY_UP4_ITEM_LIST_FIELD_NUMBER = 1882;
+    private com.google.protobuf.Internal.IntList displayUp4ItemList_;
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @return A list containing the displayUp4ItemList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getDisplayUp4ItemListList() {
+      return displayUp4ItemList_;
+    }
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @return The count of displayUp4ItemList.
+     */
+    public int getDisplayUp4ItemListCount() {
+      return displayUp4ItemList_.size();
+    }
+    /**
+     * <code>repeated uint32 display_up4_item_list = 1882;</code>
+     * @param index The index of the element to return.
+     * @return The displayUp4ItemList at the given index.
+     */
+    public int getDisplayUp4ItemList(int index) {
+      return displayUp4ItemList_.getInt(index);
+    }
+    private int displayUp4ItemListMemoizedSerializedSize = -1;
+
+    public static final int GACHA_SORT_ID_FIELD_NUMBER = 1938;
+    private int gachaSortId_;
+    /**
+     * <code>uint32 gacha_sort_id = 1938;</code>
+     * @return The gachaSortId.
+     */
+    @java.lang.Override
+    public int getGachaSortId() {
+      return gachaSortId_;
+    }
+
+    public static final int GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER = 1984;
+    private volatile java.lang.Object gachaRecordUrlOversea_;
+    /**
+     * <code>string gacha_record_url_oversea = 1984;</code>
+     * @return The gachaRecordUrlOversea.
+     */
+    @java.lang.Override
+    public java.lang.String getGachaRecordUrlOversea() {
+      java.lang.Object ref = gachaRecordUrlOversea_;
+      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();
+        gachaRecordUrlOversea_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string gacha_record_url_oversea = 1984;</code>
+     * @return The bytes for gachaRecordUrlOversea.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGachaRecordUrlOverseaBytes() {
+      java.lang.Object ref = gachaRecordUrlOversea_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gachaRecordUrlOversea_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1083,91 +1171,101 @@ public final class GachaInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (gachaType_ != 0) {
-        output.writeUInt32(1, gachaType_);
-      }
-      if (costItemNum_ != 0) {
-        output.writeUInt32(2, costItemNum_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(3, beginTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, gachaProbUrl_);
-      }
-      if (scheduleId_ != 0) {
-        output.writeUInt32(5, scheduleId_);
-      }
-      if (tenCostItemId_ != 0) {
-        output.writeUInt32(6, tenCostItemId_);
-      }
       if (endTime_ != 0) {
-        output.writeUInt32(7, endTime_);
+        output.writeUInt32(1, endTime_);
+      }
+      if (wishProgress_ != 0) {
+        output.writeUInt32(2, wishProgress_);
       }
       if (tenCostItemNum_ != 0) {
-        output.writeUInt32(8, tenCostItemNum_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, gachaRecordUrl_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPrefabPath_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, gachaPrefabPath_);
-      }
-      if (gachaSortId_ != 0) {
-        output.writeUInt32(11, gachaSortId_);
+        output.writeUInt32(3, tenCostItemNum_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPreviewPrefabPath_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, gachaPreviewPrefabPath_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, gachaPreviewPrefabPath_);
+      }
+      if (beginTime_ != 0) {
+        output.writeUInt32(5, beginTime_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, gachaRecordUrl_);
+      }
+      if (costItemNum_ != 0) {
+        output.writeUInt32(7, costItemNum_);
+      }
+      if (scheduleId_ != 0) {
+        output.writeUInt32(8, scheduleId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, gachaProbUrl_);
+      }
+      if (gachaType_ != 0) {
+        output.writeUInt32(10, gachaType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPrefabPath_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, gachaPrefabPath_);
       }
       if (costItemId_ != 0) {
-        output.writeUInt32(13, costItemId_);
-      }
-      if (gachaTimesLimit_ != 0) {
-        output.writeUInt32(14, gachaTimesLimit_);
-      }
-      if (leftGachaTimes_ != 0) {
-        output.writeUInt32(15, leftGachaTimes_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 847, titleTextmap_);
-      }
-      if (wishItemId_ != 0) {
-        output.writeUInt32(870, wishItemId_);
+        output.writeUInt32(12, costItemId_);
       }
       if (wishMaxProgress_ != 0) {
-        output.writeUInt32(960, wishMaxProgress_);
+        output.writeUInt32(13, wishMaxProgress_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1181, gachaRecordUrlOversea_);
+      if (leftGachaTimes_ != 0) {
+        output.writeUInt32(14, leftGachaTimes_);
+      }
+      if (gachaTimesLimit_ != 0) {
+        output.writeUInt32(15, gachaTimesLimit_);
+      }
+      if (getDisplayUp5ItemListList().size() > 0) {
+        output.writeUInt32NoTag(794);
+        output.writeUInt32NoTag(displayUp5ItemListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < displayUp5ItemList_.size(); i++) {
+        output.writeUInt32NoTag(displayUp5ItemList_.getInt(i));
+      }
+      if (tenCostItemId_ != 0) {
+        output.writeUInt32(243, tenCostItemId_);
+      }
+      if (isNewWish_ != false) {
+        output.writeBool(251, isNewWish_);
+      }
+      if (wishItemId_ != 0) {
+        output.writeUInt32(599, wishItemId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 782, titleTextmap_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1221, gachaProbUrlOversea_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 798, gachaProbUrlOversea_);
+      }
+      if (curScheduleDailyGachaTimes_ != 0) {
+        output.writeUInt32(1087, curScheduleDailyGachaTimes_);
+      }
+      if (getDisplayChronicle5ItemListList().size() > 0) {
+        output.writeUInt32NoTag(11586);
+        output.writeUInt32NoTag(displayChronicle5ItemListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < displayChronicle5ItemList_.size(); i++) {
+        output.writeUInt32NoTag(displayChronicle5ItemList_.getInt(i));
+      }
+      if (lAGAHPEKLHM_ != false) {
+        output.writeBool(1509, lAGAHPEKLHM_);
+      }
+      for (int i = 0; i < gachaUpInfoList_.size(); i++) {
+        output.writeMessage(1711, gachaUpInfoList_.get(i));
       }
       if (getDisplayUp4ItemListList().size() > 0) {
-        output.writeUInt32NoTag(10282);
+        output.writeUInt32NoTag(15058);
         output.writeUInt32NoTag(displayUp4ItemListMemoizedSerializedSize);
       }
       for (int i = 0; i < displayUp4ItemList_.size(); i++) {
         output.writeUInt32NoTag(displayUp4ItemList_.getInt(i));
       }
-      if (curScheduleDailyGachaTimes_ != 0) {
-        output.writeUInt32(1456, curScheduleDailyGachaTimes_);
+      if (gachaSortId_ != 0) {
+        output.writeUInt32(1938, gachaSortId_);
       }
-      if (wishProgress_ != 0) {
-        output.writeUInt32(1511, wishProgress_);
-      }
-      for (int i = 0; i < gachaUpInfoList_.size(); i++) {
-        output.writeMessage(1514, gachaUpInfoList_.get(i));
-      }
-      if (isNewWish_ != false) {
-        output.writeBool(1537, isNewWish_);
-      }
-      if (getDisplayUp5ItemListList().size() > 0) {
-        output.writeUInt32NoTag(14650);
-        output.writeUInt32NoTag(displayUp5ItemListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < displayUp5ItemList_.size(); i++) {
-        output.writeUInt32NoTag(displayUp5ItemList_.getInt(i));
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1984, gachaRecordUrlOversea_);
       }
       unknownFields.writeTo(output);
     }
@@ -1178,78 +1276,119 @@ public final class GachaInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (gachaType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, gachaType_);
-      }
-      if (costItemNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, costItemNum_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, beginTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, gachaProbUrl_);
-      }
-      if (scheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, scheduleId_);
-      }
-      if (tenCostItemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, tenCostItemId_);
-      }
       if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, endTime_);
+          .computeUInt32Size(1, endTime_);
+      }
+      if (wishProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, wishProgress_);
       }
       if (tenCostItemNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, tenCostItemNum_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, gachaRecordUrl_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPrefabPath_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, gachaPrefabPath_);
-      }
-      if (gachaSortId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, gachaSortId_);
+          .computeUInt32Size(3, tenCostItemNum_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPreviewPrefabPath_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, gachaPreviewPrefabPath_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, gachaPreviewPrefabPath_);
+      }
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, beginTime_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrl_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, gachaRecordUrl_);
+      }
+      if (costItemNum_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, costItemNum_);
+      }
+      if (scheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, scheduleId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrl_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, gachaProbUrl_);
+      }
+      if (gachaType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, gachaType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaPrefabPath_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, gachaPrefabPath_);
       }
       if (costItemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, costItemId_);
-      }
-      if (gachaTimesLimit_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, gachaTimesLimit_);
-      }
-      if (leftGachaTimes_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, leftGachaTimes_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(847, titleTextmap_);
-      }
-      if (wishItemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(870, wishItemId_);
+          .computeUInt32Size(12, costItemId_);
       }
       if (wishMaxProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(960, wishMaxProgress_);
+          .computeUInt32Size(13, wishMaxProgress_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1181, gachaRecordUrlOversea_);
+      if (leftGachaTimes_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, leftGachaTimes_);
+      }
+      if (gachaTimesLimit_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, gachaTimesLimit_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < displayUp5ItemList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(displayUp5ItemList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getDisplayUp5ItemListList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        displayUp5ItemListMemoizedSerializedSize = dataSize;
+      }
+      if (tenCostItemId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(243, tenCostItemId_);
+      }
+      if (isNewWish_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(251, isNewWish_);
+      }
+      if (wishItemId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(599, wishItemId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(titleTextmap_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(782, titleTextmap_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaProbUrlOversea_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1221, gachaProbUrlOversea_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(798, gachaProbUrlOversea_);
+      }
+      if (curScheduleDailyGachaTimes_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1087, curScheduleDailyGachaTimes_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < displayChronicle5ItemList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(displayChronicle5ItemList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getDisplayChronicle5ItemListList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        displayChronicle5ItemListMemoizedSerializedSize = dataSize;
+      }
+      if (lAGAHPEKLHM_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1509, lAGAHPEKLHM_);
+      }
+      for (int i = 0; i < gachaUpInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1711, gachaUpInfoList_.get(i));
       }
       {
         int dataSize = 0;
@@ -1265,35 +1404,12 @@ public final class GachaInfoOuterClass {
         }
         displayUp4ItemListMemoizedSerializedSize = dataSize;
       }
-      if (curScheduleDailyGachaTimes_ != 0) {
+      if (gachaSortId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1456, curScheduleDailyGachaTimes_);
+          .computeUInt32Size(1938, gachaSortId_);
       }
-      if (wishProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1511, wishProgress_);
-      }
-      for (int i = 0; i < gachaUpInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1514, gachaUpInfoList_.get(i));
-      }
-      if (isNewWish_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1537, isNewWish_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < displayUp5ItemList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(displayUp5ItemList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getDisplayUp5ItemListList().isEmpty()) {
-          size += 2;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        displayUp5ItemListMemoizedSerializedSize = dataSize;
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gachaRecordUrlOversea_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1984, gachaRecordUrlOversea_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1310,58 +1426,62 @@ public final class GachaInfoOuterClass {
       }
       emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo other = (emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo) obj;
 
-      if (getCostItemId()
-          != other.getCostItemId()) return false;
-      if (!getGachaPrefabPath()
-          .equals(other.getGachaPrefabPath())) return false;
-      if (getGachaType()
-          != other.getGachaType()) return false;
-      if (getWishMaxProgress()
-          != other.getWishMaxProgress()) return false;
-      if (getCurScheduleDailyGachaTimes()
-          != other.getCurScheduleDailyGachaTimes()) return false;
-      if (getLeftGachaTimes()
-          != other.getLeftGachaTimes()) return false;
-      if (getIsNewWish()
-          != other.getIsNewWish()) return false;
-      if (getTenCostItemNum()
-          != other.getTenCostItemNum()) return false;
-      if (getWishProgress()
-          != other.getWishProgress()) return false;
-      if (getScheduleId()
-          != other.getScheduleId()) return false;
-      if (getTenCostItemId()
-          != other.getTenCostItemId()) return false;
-      if (getGachaSortId()
-          != other.getGachaSortId()) return false;
-      if (!getDisplayUp4ItemListList()
-          .equals(other.getDisplayUp4ItemListList())) return false;
-      if (!getGachaRecordUrlOversea()
-          .equals(other.getGachaRecordUrlOversea())) return false;
-      if (!getGachaProbUrlOversea()
-          .equals(other.getGachaProbUrlOversea())) return false;
-      if (getBeginTime()
-          != other.getBeginTime()) return false;
-      if (getWishItemId()
-          != other.getWishItemId()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
+      if (getWishProgress()
+          != other.getWishProgress()) return false;
+      if (getTenCostItemNum()
+          != other.getTenCostItemNum()) return false;
       if (!getGachaPreviewPrefabPath()
           .equals(other.getGachaPreviewPrefabPath())) return false;
-      if (!getTitleTextmap()
-          .equals(other.getTitleTextmap())) return false;
-      if (!getDisplayUp5ItemListList()
-          .equals(other.getDisplayUp5ItemListList())) return false;
-      if (getGachaTimesLimit()
-          != other.getGachaTimesLimit()) return false;
+      if (getBeginTime()
+          != other.getBeginTime()) return false;
       if (!getGachaRecordUrl()
           .equals(other.getGachaRecordUrl())) return false;
-      if (!getGachaUpInfoListList()
-          .equals(other.getGachaUpInfoListList())) return false;
       if (getCostItemNum()
           != other.getCostItemNum()) return false;
+      if (getScheduleId()
+          != other.getScheduleId()) return false;
       if (!getGachaProbUrl()
           .equals(other.getGachaProbUrl())) return false;
+      if (getGachaType()
+          != other.getGachaType()) return false;
+      if (!getGachaPrefabPath()
+          .equals(other.getGachaPrefabPath())) return false;
+      if (getCostItemId()
+          != other.getCostItemId()) return false;
+      if (getWishMaxProgress()
+          != other.getWishMaxProgress()) return false;
+      if (getLeftGachaTimes()
+          != other.getLeftGachaTimes()) return false;
+      if (getGachaTimesLimit()
+          != other.getGachaTimesLimit()) return false;
+      if (!getDisplayUp5ItemListList()
+          .equals(other.getDisplayUp5ItemListList())) return false;
+      if (getTenCostItemId()
+          != other.getTenCostItemId()) return false;
+      if (getIsNewWish()
+          != other.getIsNewWish()) return false;
+      if (getWishItemId()
+          != other.getWishItemId()) return false;
+      if (!getTitleTextmap()
+          .equals(other.getTitleTextmap())) return false;
+      if (!getGachaProbUrlOversea()
+          .equals(other.getGachaProbUrlOversea())) return false;
+      if (getCurScheduleDailyGachaTimes()
+          != other.getCurScheduleDailyGachaTimes()) return false;
+      if (!getDisplayChronicle5ItemListList()
+          .equals(other.getDisplayChronicle5ItemListList())) return false;
+      if (getLAGAHPEKLHM()
+          != other.getLAGAHPEKLHM()) return false;
+      if (!getGachaUpInfoListList()
+          .equals(other.getGachaUpInfoListList())) return false;
+      if (!getDisplayUp4ItemListList()
+          .equals(other.getDisplayUp4ItemListList())) return false;
+      if (getGachaSortId()
+          != other.getGachaSortId()) return false;
+      if (!getGachaRecordUrlOversea()
+          .equals(other.getGachaRecordUrlOversea())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1373,65 +1493,72 @@ public final class GachaInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + COSTITEMID_FIELD_NUMBER;
-      hash = (53 * hash) + getCostItemId();
-      hash = (37 * hash) + GACHAPREFABPATH_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaPrefabPath().hashCode();
-      hash = (37 * hash) + GACHATYPE_FIELD_NUMBER;
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + WISH_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getWishProgress();
+      hash = (37 * hash) + TEN_COST_ITEM_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getTenCostItemNum();
+      hash = (37 * hash) + GACHA_PREVIEW_PREFAB_PATH_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaPreviewPrefabPath().hashCode();
+      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBeginTime();
+      hash = (37 * hash) + GACHA_RECORD_URL_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaRecordUrl().hashCode();
+      hash = (37 * hash) + COST_ITEM_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getCostItemNum();
+      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getScheduleId();
+      hash = (37 * hash) + GACHA_PROB_URL_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaProbUrl().hashCode();
+      hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getGachaType();
-      hash = (37 * hash) + WISHMAXPROGRESS_FIELD_NUMBER;
+      hash = (37 * hash) + GACHA_PREFAB_PATH_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaPrefabPath().hashCode();
+      hash = (37 * hash) + COST_ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCostItemId();
+      hash = (37 * hash) + WISH_MAX_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getWishMaxProgress();
-      hash = (37 * hash) + CURSCHEDULEDAILYGACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getCurScheduleDailyGachaTimes();
-      hash = (37 * hash) + LEFTGACHATIMES_FIELD_NUMBER;
+      hash = (37 * hash) + LEFT_GACHA_TIMES_FIELD_NUMBER;
       hash = (53 * hash) + getLeftGachaTimes();
+      hash = (37 * hash) + GACHA_TIMES_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaTimesLimit();
+      if (getDisplayUp5ItemListCount() > 0) {
+        hash = (37 * hash) + DISPLAY_UP5_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisplayUp5ItemListList().hashCode();
+      }
+      hash = (37 * hash) + TEN_COST_ITEM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTenCostItemId();
       hash = (37 * hash) + IS_NEW_WISH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsNewWish());
-      hash = (37 * hash) + TENCOSTITEMNUM_FIELD_NUMBER;
-      hash = (53 * hash) + getTenCostItemNum();
-      hash = (37 * hash) + WISHPROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getWishProgress();
-      hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + TENCOSTITEMID_FIELD_NUMBER;
-      hash = (53 * hash) + getTenCostItemId();
-      hash = (37 * hash) + GACHASORTID_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaSortId();
-      if (getDisplayUp4ItemListCount() > 0) {
-        hash = (37 * hash) + DISPLAYUP4ITEMLIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDisplayUp4ItemListList().hashCode();
-      }
-      hash = (37 * hash) + GACHARECORDURLOVERSEA_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaRecordUrlOversea().hashCode();
-      hash = (37 * hash) + GACHAPROBURLOVERSEA_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaProbUrlOversea().hashCode();
-      hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + WISHITEMID_FIELD_NUMBER;
+      hash = (37 * hash) + WISH_ITEM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getWishItemId();
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
-      hash = (37 * hash) + GACHAPREVIEWPREFABPATH_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaPreviewPrefabPath().hashCode();
-      hash = (37 * hash) + TITLETEXTMAP_FIELD_NUMBER;
+      hash = (37 * hash) + TITLE_TEXTMAP_FIELD_NUMBER;
       hash = (53 * hash) + getTitleTextmap().hashCode();
-      if (getDisplayUp5ItemListCount() > 0) {
-        hash = (37 * hash) + DISPLAYUP5ITEMLIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDisplayUp5ItemListList().hashCode();
+      hash = (37 * hash) + GACHA_PROB_URL_OVERSEA_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaProbUrlOversea().hashCode();
+      hash = (37 * hash) + CUR_SCHEDULE_DAILY_GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getCurScheduleDailyGachaTimes();
+      if (getDisplayChronicle5ItemListCount() > 0) {
+        hash = (37 * hash) + DISPLAY_CHRONICLE5_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisplayChronicle5ItemListList().hashCode();
       }
-      hash = (37 * hash) + GACHATIMESLIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaTimesLimit();
-      hash = (37 * hash) + GACHARECORDURL_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaRecordUrl().hashCode();
+      hash = (37 * hash) + LAGAHPEKLHM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getLAGAHPEKLHM());
       if (getGachaUpInfoListCount() > 0) {
         hash = (37 * hash) + GACHA_UP_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGachaUpInfoListList().hashCode();
       }
-      hash = (37 * hash) + COSTITEMNUM_FIELD_NUMBER;
-      hash = (53 * hash) + getCostItemNum();
-      hash = (37 * hash) + GACHAPROBURL_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaProbUrl().hashCode();
+      if (getDisplayUp4ItemListCount() > 0) {
+        hash = (37 * hash) + DISPLAY_UP4_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDisplayUp4ItemListList().hashCode();
+      }
+      hash = (37 * hash) + GACHA_SORT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaSortId();
+      hash = (37 * hash) + GACHA_RECORD_URL_OVERSEA_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaRecordUrlOversea().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1528,10 +1655,6 @@ public final class GachaInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LBJPFCBOKFM
-     * </pre>
-     *
      * Protobuf type {@code GachaInfo}
      */
     public static final class Builder extends
@@ -1570,61 +1693,65 @@ public final class GachaInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        costItemId_ = 0;
-
-        gachaPrefabPath_ = "";
-
-        gachaType_ = 0;
-
-        wishMaxProgress_ = 0;
-
-        curScheduleDailyGachaTimes_ = 0;
-
-        leftGachaTimes_ = 0;
-
-        isNewWish_ = false;
-
-        tenCostItemNum_ = 0;
+        endTime_ = 0;
 
         wishProgress_ = 0;
 
-        scheduleId_ = 0;
-
-        tenCostItemId_ = 0;
-
-        gachaSortId_ = 0;
-
-        displayUp4ItemList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        gachaRecordUrlOversea_ = "";
-
-        gachaProbUrlOversea_ = "";
-
-        beginTime_ = 0;
-
-        wishItemId_ = 0;
-
-        endTime_ = 0;
+        tenCostItemNum_ = 0;
 
         gachaPreviewPrefabPath_ = "";
 
-        titleTextmap_ = "";
-
-        displayUp5ItemList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        gachaTimesLimit_ = 0;
+        beginTime_ = 0;
 
         gachaRecordUrl_ = "";
 
+        costItemNum_ = 0;
+
+        scheduleId_ = 0;
+
+        gachaProbUrl_ = "";
+
+        gachaType_ = 0;
+
+        gachaPrefabPath_ = "";
+
+        costItemId_ = 0;
+
+        wishMaxProgress_ = 0;
+
+        leftGachaTimes_ = 0;
+
+        gachaTimesLimit_ = 0;
+
+        displayUp5ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        tenCostItemId_ = 0;
+
+        isNewWish_ = false;
+
+        wishItemId_ = 0;
+
+        titleTextmap_ = "";
+
+        gachaProbUrlOversea_ = "";
+
+        curScheduleDailyGachaTimes_ = 0;
+
+        displayChronicle5ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        lAGAHPEKLHM_ = false;
+
         if (gachaUpInfoListBuilder_ == null) {
           gachaUpInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           gachaUpInfoListBuilder_.clear();
         }
-        costItemNum_ = 0;
+        displayUp4ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        gachaSortId_ = 0;
 
-        gachaProbUrl_ = "";
+        gachaRecordUrlOversea_ = "";
 
         return this;
       }
@@ -1653,37 +1780,38 @@ public final class GachaInfoOuterClass {
       public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo buildPartial() {
         emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo result = new emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo(this);
         int from_bitField0_ = bitField0_;
-        result.costItemId_ = costItemId_;
-        result.gachaPrefabPath_ = gachaPrefabPath_;
-        result.gachaType_ = gachaType_;
-        result.wishMaxProgress_ = wishMaxProgress_;
-        result.curScheduleDailyGachaTimes_ = curScheduleDailyGachaTimes_;
-        result.leftGachaTimes_ = leftGachaTimes_;
-        result.isNewWish_ = isNewWish_;
-        result.tenCostItemNum_ = tenCostItemNum_;
+        result.endTime_ = endTime_;
         result.wishProgress_ = wishProgress_;
+        result.tenCostItemNum_ = tenCostItemNum_;
+        result.gachaPreviewPrefabPath_ = gachaPreviewPrefabPath_;
+        result.beginTime_ = beginTime_;
+        result.gachaRecordUrl_ = gachaRecordUrl_;
+        result.costItemNum_ = costItemNum_;
         result.scheduleId_ = scheduleId_;
-        result.tenCostItemId_ = tenCostItemId_;
-        result.gachaSortId_ = gachaSortId_;
+        result.gachaProbUrl_ = gachaProbUrl_;
+        result.gachaType_ = gachaType_;
+        result.gachaPrefabPath_ = gachaPrefabPath_;
+        result.costItemId_ = costItemId_;
+        result.wishMaxProgress_ = wishMaxProgress_;
+        result.leftGachaTimes_ = leftGachaTimes_;
+        result.gachaTimesLimit_ = gachaTimesLimit_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          displayUp4ItemList_.makeImmutable();
+          displayUp5ItemList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.displayUp4ItemList_ = displayUp4ItemList_;
-        result.gachaRecordUrlOversea_ = gachaRecordUrlOversea_;
-        result.gachaProbUrlOversea_ = gachaProbUrlOversea_;
-        result.beginTime_ = beginTime_;
+        result.displayUp5ItemList_ = displayUp5ItemList_;
+        result.tenCostItemId_ = tenCostItemId_;
+        result.isNewWish_ = isNewWish_;
         result.wishItemId_ = wishItemId_;
-        result.endTime_ = endTime_;
-        result.gachaPreviewPrefabPath_ = gachaPreviewPrefabPath_;
         result.titleTextmap_ = titleTextmap_;
+        result.gachaProbUrlOversea_ = gachaProbUrlOversea_;
+        result.curScheduleDailyGachaTimes_ = curScheduleDailyGachaTimes_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          displayUp5ItemList_.makeImmutable();
+          displayChronicle5ItemList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.displayUp5ItemList_ = displayUp5ItemList_;
-        result.gachaTimesLimit_ = gachaTimesLimit_;
-        result.gachaRecordUrl_ = gachaRecordUrl_;
+        result.displayChronicle5ItemList_ = displayChronicle5ItemList_;
+        result.lAGAHPEKLHM_ = lAGAHPEKLHM_;
         if (gachaUpInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             gachaUpInfoList_ = java.util.Collections.unmodifiableList(gachaUpInfoList_);
@@ -1693,8 +1821,13 @@ public final class GachaInfoOuterClass {
         } else {
           result.gachaUpInfoList_ = gachaUpInfoListBuilder_.build();
         }
-        result.costItemNum_ = costItemNum_;
-        result.gachaProbUrl_ = gachaProbUrl_;
+        if (((bitField0_ & 0x00000008) != 0)) {
+          displayUp4ItemList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000008);
+        }
+        result.displayUp4ItemList_ = displayUp4ItemList_;
+        result.gachaSortId_ = gachaSortId_;
+        result.gachaRecordUrlOversea_ = gachaRecordUrlOversea_;
         onBuilt();
         return result;
       }
@@ -1743,95 +1876,98 @@ public final class GachaInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo other) {
         if (other == emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.getDefaultInstance()) return this;
-        if (other.getCostItemId() != 0) {
-          setCostItemId(other.getCostItemId());
-        }
-        if (!other.getGachaPrefabPath().isEmpty()) {
-          gachaPrefabPath_ = other.gachaPrefabPath_;
-          onChanged();
-        }
-        if (other.getGachaType() != 0) {
-          setGachaType(other.getGachaType());
-        }
-        if (other.getWishMaxProgress() != 0) {
-          setWishMaxProgress(other.getWishMaxProgress());
-        }
-        if (other.getCurScheduleDailyGachaTimes() != 0) {
-          setCurScheduleDailyGachaTimes(other.getCurScheduleDailyGachaTimes());
-        }
-        if (other.getLeftGachaTimes() != 0) {
-          setLeftGachaTimes(other.getLeftGachaTimes());
-        }
-        if (other.getIsNewWish() != false) {
-          setIsNewWish(other.getIsNewWish());
-        }
-        if (other.getTenCostItemNum() != 0) {
-          setTenCostItemNum(other.getTenCostItemNum());
+        if (other.getEndTime() != 0) {
+          setEndTime(other.getEndTime());
         }
         if (other.getWishProgress() != 0) {
           setWishProgress(other.getWishProgress());
         }
-        if (other.getScheduleId() != 0) {
-          setScheduleId(other.getScheduleId());
-        }
-        if (other.getTenCostItemId() != 0) {
-          setTenCostItemId(other.getTenCostItemId());
-        }
-        if (other.getGachaSortId() != 0) {
-          setGachaSortId(other.getGachaSortId());
-        }
-        if (!other.displayUp4ItemList_.isEmpty()) {
-          if (displayUp4ItemList_.isEmpty()) {
-            displayUp4ItemList_ = other.displayUp4ItemList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureDisplayUp4ItemListIsMutable();
-            displayUp4ItemList_.addAll(other.displayUp4ItemList_);
-          }
-          onChanged();
-        }
-        if (!other.getGachaRecordUrlOversea().isEmpty()) {
-          gachaRecordUrlOversea_ = other.gachaRecordUrlOversea_;
-          onChanged();
-        }
-        if (!other.getGachaProbUrlOversea().isEmpty()) {
-          gachaProbUrlOversea_ = other.gachaProbUrlOversea_;
-          onChanged();
-        }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
-        }
-        if (other.getWishItemId() != 0) {
-          setWishItemId(other.getWishItemId());
-        }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
+        if (other.getTenCostItemNum() != 0) {
+          setTenCostItemNum(other.getTenCostItemNum());
         }
         if (!other.getGachaPreviewPrefabPath().isEmpty()) {
           gachaPreviewPrefabPath_ = other.gachaPreviewPrefabPath_;
           onChanged();
         }
-        if (!other.getTitleTextmap().isEmpty()) {
-          titleTextmap_ = other.titleTextmap_;
+        if (other.getBeginTime() != 0) {
+          setBeginTime(other.getBeginTime());
+        }
+        if (!other.getGachaRecordUrl().isEmpty()) {
+          gachaRecordUrl_ = other.gachaRecordUrl_;
           onChanged();
         }
+        if (other.getCostItemNum() != 0) {
+          setCostItemNum(other.getCostItemNum());
+        }
+        if (other.getScheduleId() != 0) {
+          setScheduleId(other.getScheduleId());
+        }
+        if (!other.getGachaProbUrl().isEmpty()) {
+          gachaProbUrl_ = other.gachaProbUrl_;
+          onChanged();
+        }
+        if (other.getGachaType() != 0) {
+          setGachaType(other.getGachaType());
+        }
+        if (!other.getGachaPrefabPath().isEmpty()) {
+          gachaPrefabPath_ = other.gachaPrefabPath_;
+          onChanged();
+        }
+        if (other.getCostItemId() != 0) {
+          setCostItemId(other.getCostItemId());
+        }
+        if (other.getWishMaxProgress() != 0) {
+          setWishMaxProgress(other.getWishMaxProgress());
+        }
+        if (other.getLeftGachaTimes() != 0) {
+          setLeftGachaTimes(other.getLeftGachaTimes());
+        }
+        if (other.getGachaTimesLimit() != 0) {
+          setGachaTimesLimit(other.getGachaTimesLimit());
+        }
         if (!other.displayUp5ItemList_.isEmpty()) {
           if (displayUp5ItemList_.isEmpty()) {
             displayUp5ItemList_ = other.displayUp5ItemList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureDisplayUp5ItemListIsMutable();
             displayUp5ItemList_.addAll(other.displayUp5ItemList_);
           }
           onChanged();
         }
-        if (other.getGachaTimesLimit() != 0) {
-          setGachaTimesLimit(other.getGachaTimesLimit());
+        if (other.getTenCostItemId() != 0) {
+          setTenCostItemId(other.getTenCostItemId());
         }
-        if (!other.getGachaRecordUrl().isEmpty()) {
-          gachaRecordUrl_ = other.gachaRecordUrl_;
+        if (other.getIsNewWish() != false) {
+          setIsNewWish(other.getIsNewWish());
+        }
+        if (other.getWishItemId() != 0) {
+          setWishItemId(other.getWishItemId());
+        }
+        if (!other.getTitleTextmap().isEmpty()) {
+          titleTextmap_ = other.titleTextmap_;
           onChanged();
         }
+        if (!other.getGachaProbUrlOversea().isEmpty()) {
+          gachaProbUrlOversea_ = other.gachaProbUrlOversea_;
+          onChanged();
+        }
+        if (other.getCurScheduleDailyGachaTimes() != 0) {
+          setCurScheduleDailyGachaTimes(other.getCurScheduleDailyGachaTimes());
+        }
+        if (!other.displayChronicle5ItemList_.isEmpty()) {
+          if (displayChronicle5ItemList_.isEmpty()) {
+            displayChronicle5ItemList_ = other.displayChronicle5ItemList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureDisplayChronicle5ItemListIsMutable();
+            displayChronicle5ItemList_.addAll(other.displayChronicle5ItemList_);
+          }
+          onChanged();
+        }
+        if (other.getLAGAHPEKLHM() != false) {
+          setLAGAHPEKLHM(other.getLAGAHPEKLHM());
+        }
         if (gachaUpInfoListBuilder_ == null) {
           if (!other.gachaUpInfoList_.isEmpty()) {
             if (gachaUpInfoList_.isEmpty()) {
@@ -1858,11 +1994,21 @@ public final class GachaInfoOuterClass {
             }
           }
         }
-        if (other.getCostItemNum() != 0) {
-          setCostItemNum(other.getCostItemNum());
+        if (!other.displayUp4ItemList_.isEmpty()) {
+          if (displayUp4ItemList_.isEmpty()) {
+            displayUp4ItemList_ = other.displayUp4ItemList_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+          } else {
+            ensureDisplayUp4ItemListIsMutable();
+            displayUp4ItemList_.addAll(other.displayUp4ItemList_);
+          }
+          onChanged();
         }
-        if (!other.getGachaProbUrl().isEmpty()) {
-          gachaProbUrl_ = other.gachaProbUrl_;
+        if (other.getGachaSortId() != 0) {
+          setGachaSortId(other.getGachaSortId());
+        }
+        if (!other.getGachaRecordUrlOversea().isEmpty()) {
+          gachaRecordUrlOversea_ = other.gachaRecordUrlOversea_;
           onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
@@ -1895,719 +2041,9 @@ public final class GachaInfoOuterClass {
       }
       private int bitField0_;
 
-      private int costItemId_ ;
-      /**
-       * <code>uint32 costItemId = 13;</code>
-       * @return The costItemId.
-       */
-      @java.lang.Override
-      public int getCostItemId() {
-        return costItemId_;
-      }
-      /**
-       * <code>uint32 costItemId = 13;</code>
-       * @param value The costItemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCostItemId(int value) {
-        
-        costItemId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 costItemId = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCostItemId() {
-        
-        costItemId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object gachaPrefabPath_ = "";
-      /**
-       * <code>string gachaPrefabPath = 10;</code>
-       * @return The gachaPrefabPath.
-       */
-      public java.lang.String getGachaPrefabPath() {
-        java.lang.Object ref = gachaPrefabPath_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          gachaPrefabPath_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string gachaPrefabPath = 10;</code>
-       * @return The bytes for gachaPrefabPath.
-       */
-      public com.google.protobuf.ByteString
-          getGachaPrefabPathBytes() {
-        java.lang.Object ref = gachaPrefabPath_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          gachaPrefabPath_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string gachaPrefabPath = 10;</code>
-       * @param value The gachaPrefabPath to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaPrefabPath(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        gachaPrefabPath_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaPrefabPath = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaPrefabPath() {
-        
-        gachaPrefabPath_ = getDefaultInstance().getGachaPrefabPath();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaPrefabPath = 10;</code>
-       * @param value The bytes for gachaPrefabPath to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaPrefabPathBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        gachaPrefabPath_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int gachaType_ ;
-      /**
-       * <code>uint32 gachaType = 1;</code>
-       * @return The gachaType.
-       */
-      @java.lang.Override
-      public int getGachaType() {
-        return gachaType_;
-      }
-      /**
-       * <code>uint32 gachaType = 1;</code>
-       * @param value The gachaType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaType(int value) {
-        
-        gachaType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaType = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaType() {
-        
-        gachaType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int wishMaxProgress_ ;
-      /**
-       * <code>uint32 wishMaxProgress = 960;</code>
-       * @return The wishMaxProgress.
-       */
-      @java.lang.Override
-      public int getWishMaxProgress() {
-        return wishMaxProgress_;
-      }
-      /**
-       * <code>uint32 wishMaxProgress = 960;</code>
-       * @param value The wishMaxProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWishMaxProgress(int value) {
-        
-        wishMaxProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wishMaxProgress = 960;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWishMaxProgress() {
-        
-        wishMaxProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curScheduleDailyGachaTimes_ ;
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 1456;</code>
-       * @return The curScheduleDailyGachaTimes.
-       */
-      @java.lang.Override
-      public int getCurScheduleDailyGachaTimes() {
-        return curScheduleDailyGachaTimes_;
-      }
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 1456;</code>
-       * @param value The curScheduleDailyGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurScheduleDailyGachaTimes(int value) {
-        
-        curScheduleDailyGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 curScheduleDailyGachaTimes = 1456;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurScheduleDailyGachaTimes() {
-        
-        curScheduleDailyGachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int leftGachaTimes_ ;
-      /**
-       * <code>uint32 leftGachaTimes = 15;</code>
-       * @return The leftGachaTimes.
-       */
-      @java.lang.Override
-      public int getLeftGachaTimes() {
-        return leftGachaTimes_;
-      }
-      /**
-       * <code>uint32 leftGachaTimes = 15;</code>
-       * @param value The leftGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLeftGachaTimes(int value) {
-        
-        leftGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 leftGachaTimes = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLeftGachaTimes() {
-        
-        leftGachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isNewWish_ ;
-      /**
-       * <code>bool is_new_wish = 1537;</code>
-       * @return The isNewWish.
-       */
-      @java.lang.Override
-      public boolean getIsNewWish() {
-        return isNewWish_;
-      }
-      /**
-       * <code>bool is_new_wish = 1537;</code>
-       * @param value The isNewWish to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsNewWish(boolean value) {
-        
-        isNewWish_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_new_wish = 1537;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsNewWish() {
-        
-        isNewWish_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int tenCostItemNum_ ;
-      /**
-       * <code>uint32 tenCostItemNum = 8;</code>
-       * @return The tenCostItemNum.
-       */
-      @java.lang.Override
-      public int getTenCostItemNum() {
-        return tenCostItemNum_;
-      }
-      /**
-       * <code>uint32 tenCostItemNum = 8;</code>
-       * @param value The tenCostItemNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTenCostItemNum(int value) {
-        
-        tenCostItemNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 tenCostItemNum = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTenCostItemNum() {
-        
-        tenCostItemNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int wishProgress_ ;
-      /**
-       * <code>uint32 wishProgress = 1511;</code>
-       * @return The wishProgress.
-       */
-      @java.lang.Override
-      public int getWishProgress() {
-        return wishProgress_;
-      }
-      /**
-       * <code>uint32 wishProgress = 1511;</code>
-       * @param value The wishProgress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWishProgress(int value) {
-        
-        wishProgress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wishProgress = 1511;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWishProgress() {
-        
-        wishProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int scheduleId_ ;
-      /**
-       * <code>uint32 schedule_id = 5;</code>
-       * @return The scheduleId.
-       */
-      @java.lang.Override
-      public int getScheduleId() {
-        return scheduleId_;
-      }
-      /**
-       * <code>uint32 schedule_id = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScheduleId() {
-        
-        scheduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int tenCostItemId_ ;
-      /**
-       * <code>uint32 tenCostItemId = 6;</code>
-       * @return The tenCostItemId.
-       */
-      @java.lang.Override
-      public int getTenCostItemId() {
-        return tenCostItemId_;
-      }
-      /**
-       * <code>uint32 tenCostItemId = 6;</code>
-       * @param value The tenCostItemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTenCostItemId(int value) {
-        
-        tenCostItemId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 tenCostItemId = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTenCostItemId() {
-        
-        tenCostItemId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int gachaSortId_ ;
-      /**
-       * <code>uint32 gachaSortId = 11;</code>
-       * @return The gachaSortId.
-       */
-      @java.lang.Override
-      public int getGachaSortId() {
-        return gachaSortId_;
-      }
-      /**
-       * <code>uint32 gachaSortId = 11;</code>
-       * @param value The gachaSortId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaSortId(int value) {
-        
-        gachaSortId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaSortId = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaSortId() {
-        
-        gachaSortId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList displayUp4ItemList_ = emptyIntList();
-      private void ensureDisplayUp4ItemListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          displayUp4ItemList_ = mutableCopy(displayUp4ItemList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @return A list containing the displayUp4ItemList.
-       */
-      public java.util.List<java.lang.Integer>
-          getDisplayUp4ItemListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(displayUp4ItemList_) : displayUp4ItemList_;
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @return The count of displayUp4ItemList.
-       */
-      public int getDisplayUp4ItemListCount() {
-        return displayUp4ItemList_.size();
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @param index The index of the element to return.
-       * @return The displayUp4ItemList at the given index.
-       */
-      public int getDisplayUp4ItemList(int index) {
-        return displayUp4ItemList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @param index The index to set the value at.
-       * @param value The displayUp4ItemList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDisplayUp4ItemList(
-          int index, int value) {
-        ensureDisplayUp4ItemListIsMutable();
-        displayUp4ItemList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @param value The displayUp4ItemList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addDisplayUp4ItemList(int value) {
-        ensureDisplayUp4ItemListIsMutable();
-        displayUp4ItemList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @param values The displayUp4ItemList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllDisplayUp4ItemList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureDisplayUp4ItemListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, displayUp4ItemList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp4ItemList = 1285;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDisplayUp4ItemList() {
-        displayUp4ItemList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object gachaRecordUrlOversea_ = "";
-      /**
-       * <code>string gachaRecordUrlOversea = 1181;</code>
-       * @return The gachaRecordUrlOversea.
-       */
-      public java.lang.String getGachaRecordUrlOversea() {
-        java.lang.Object ref = gachaRecordUrlOversea_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          gachaRecordUrlOversea_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string gachaRecordUrlOversea = 1181;</code>
-       * @return The bytes for gachaRecordUrlOversea.
-       */
-      public com.google.protobuf.ByteString
-          getGachaRecordUrlOverseaBytes() {
-        java.lang.Object ref = gachaRecordUrlOversea_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          gachaRecordUrlOversea_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string gachaRecordUrlOversea = 1181;</code>
-       * @param value The gachaRecordUrlOversea to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaRecordUrlOversea(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        gachaRecordUrlOversea_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaRecordUrlOversea = 1181;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaRecordUrlOversea() {
-        
-        gachaRecordUrlOversea_ = getDefaultInstance().getGachaRecordUrlOversea();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaRecordUrlOversea = 1181;</code>
-       * @param value The bytes for gachaRecordUrlOversea to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaRecordUrlOverseaBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        gachaRecordUrlOversea_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object gachaProbUrlOversea_ = "";
-      /**
-       * <code>string gachaProbUrlOversea = 1221;</code>
-       * @return The gachaProbUrlOversea.
-       */
-      public java.lang.String getGachaProbUrlOversea() {
-        java.lang.Object ref = gachaProbUrlOversea_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          gachaProbUrlOversea_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string gachaProbUrlOversea = 1221;</code>
-       * @return The bytes for gachaProbUrlOversea.
-       */
-      public com.google.protobuf.ByteString
-          getGachaProbUrlOverseaBytes() {
-        java.lang.Object ref = gachaProbUrlOversea_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          gachaProbUrlOversea_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string gachaProbUrlOversea = 1221;</code>
-       * @param value The gachaProbUrlOversea to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaProbUrlOversea(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        gachaProbUrlOversea_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaProbUrlOversea = 1221;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaProbUrlOversea() {
-        
-        gachaProbUrlOversea_ = getDefaultInstance().getGachaProbUrlOversea();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string gachaProbUrlOversea = 1221;</code>
-       * @param value The bytes for gachaProbUrlOversea to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaProbUrlOverseaBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        gachaProbUrlOversea_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 3;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 3;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int wishItemId_ ;
-      /**
-       * <code>uint32 wishItemId = 870;</code>
-       * @return The wishItemId.
-       */
-      @java.lang.Override
-      public int getWishItemId() {
-        return wishItemId_;
-      }
-      /**
-       * <code>uint32 wishItemId = 870;</code>
-       * @param value The wishItemId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWishItemId(int value) {
-        
-        wishItemId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 wishItemId = 870;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWishItemId() {
-        
-        wishItemId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 7;</code>
+       * <code>uint32 end_time = 1;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -2615,7 +2051,7 @@ public final class GachaInfoOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 7;</code>
+       * <code>uint32 end_time = 1;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -2626,7 +2062,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 7;</code>
+       * <code>uint32 end_time = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -2636,9 +2072,71 @@ public final class GachaInfoOuterClass {
         return this;
       }
 
+      private int wishProgress_ ;
+      /**
+       * <code>uint32 wish_progress = 2;</code>
+       * @return The wishProgress.
+       */
+      @java.lang.Override
+      public int getWishProgress() {
+        return wishProgress_;
+      }
+      /**
+       * <code>uint32 wish_progress = 2;</code>
+       * @param value The wishProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWishProgress(int value) {
+        
+        wishProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wish_progress = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWishProgress() {
+        
+        wishProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int tenCostItemNum_ ;
+      /**
+       * <code>uint32 ten_cost_item_num = 3;</code>
+       * @return The tenCostItemNum.
+       */
+      @java.lang.Override
+      public int getTenCostItemNum() {
+        return tenCostItemNum_;
+      }
+      /**
+       * <code>uint32 ten_cost_item_num = 3;</code>
+       * @param value The tenCostItemNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTenCostItemNum(int value) {
+        
+        tenCostItemNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 ten_cost_item_num = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTenCostItemNum() {
+        
+        tenCostItemNum_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object gachaPreviewPrefabPath_ = "";
       /**
-       * <code>string gachaPreviewPrefabPath = 12;</code>
+       * <code>string gacha_preview_prefab_path = 4;</code>
        * @return The gachaPreviewPrefabPath.
        */
       public java.lang.String getGachaPreviewPrefabPath() {
@@ -2654,7 +2152,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>string gachaPreviewPrefabPath = 12;</code>
+       * <code>string gacha_preview_prefab_path = 4;</code>
        * @return The bytes for gachaPreviewPrefabPath.
        */
       public com.google.protobuf.ByteString
@@ -2671,7 +2169,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>string gachaPreviewPrefabPath = 12;</code>
+       * <code>string gacha_preview_prefab_path = 4;</code>
        * @param value The gachaPreviewPrefabPath to set.
        * @return This builder for chaining.
        */
@@ -2686,7 +2184,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>string gachaPreviewPrefabPath = 12;</code>
+       * <code>string gacha_preview_prefab_path = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaPreviewPrefabPath() {
@@ -2696,7 +2194,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>string gachaPreviewPrefabPath = 12;</code>
+       * <code>string gacha_preview_prefab_path = 4;</code>
        * @param value The bytes for gachaPreviewPrefabPath to set.
        * @return This builder for chaining.
        */
@@ -2712,195 +2210,40 @@ public final class GachaInfoOuterClass {
         return this;
       }
 
-      private java.lang.Object titleTextmap_ = "";
+      private int beginTime_ ;
       /**
-       * <code>string titleTextmap = 847;</code>
-       * @return The titleTextmap.
-       */
-      public java.lang.String getTitleTextmap() {
-        java.lang.Object ref = titleTextmap_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          titleTextmap_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string titleTextmap = 847;</code>
-       * @return The bytes for titleTextmap.
-       */
-      public com.google.protobuf.ByteString
-          getTitleTextmapBytes() {
-        java.lang.Object ref = titleTextmap_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          titleTextmap_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string titleTextmap = 847;</code>
-       * @param value The titleTextmap to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTitleTextmap(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        titleTextmap_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string titleTextmap = 847;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTitleTextmap() {
-        
-        titleTextmap_ = getDefaultInstance().getTitleTextmap();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string titleTextmap = 847;</code>
-       * @param value The bytes for titleTextmap to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTitleTextmapBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        titleTextmap_ = value;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList displayUp5ItemList_ = emptyIntList();
-      private void ensureDisplayUp5ItemListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          displayUp5ItemList_ = mutableCopy(displayUp5ItemList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @return A list containing the displayUp5ItemList.
-       */
-      public java.util.List<java.lang.Integer>
-          getDisplayUp5ItemListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(displayUp5ItemList_) : displayUp5ItemList_;
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @return The count of displayUp5ItemList.
-       */
-      public int getDisplayUp5ItemListCount() {
-        return displayUp5ItemList_.size();
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @param index The index of the element to return.
-       * @return The displayUp5ItemList at the given index.
-       */
-      public int getDisplayUp5ItemList(int index) {
-        return displayUp5ItemList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @param index The index to set the value at.
-       * @param value The displayUp5ItemList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDisplayUp5ItemList(
-          int index, int value) {
-        ensureDisplayUp5ItemListIsMutable();
-        displayUp5ItemList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @param value The displayUp5ItemList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addDisplayUp5ItemList(int value) {
-        ensureDisplayUp5ItemListIsMutable();
-        displayUp5ItemList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @param values The displayUp5ItemList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllDisplayUp5ItemList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureDisplayUp5ItemListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, displayUp5ItemList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 displayUp5ItemList = 1831;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDisplayUp5ItemList() {
-        displayUp5ItemList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private int gachaTimesLimit_ ;
-      /**
-       * <code>uint32 gachaTimesLimit = 14;</code>
-       * @return The gachaTimesLimit.
+       * <code>uint32 begin_time = 5;</code>
+       * @return The beginTime.
        */
       @java.lang.Override
-      public int getGachaTimesLimit() {
-        return gachaTimesLimit_;
+      public int getBeginTime() {
+        return beginTime_;
       }
       /**
-       * <code>uint32 gachaTimesLimit = 14;</code>
-       * @param value The gachaTimesLimit to set.
+       * <code>uint32 begin_time = 5;</code>
+       * @param value The beginTime to set.
        * @return This builder for chaining.
        */
-      public Builder setGachaTimesLimit(int value) {
+      public Builder setBeginTime(int value) {
         
-        gachaTimesLimit_ = value;
+        beginTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 gachaTimesLimit = 14;</code>
+       * <code>uint32 begin_time = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGachaTimesLimit() {
+      public Builder clearBeginTime() {
         
-        gachaTimesLimit_ = 0;
+        beginTime_ = 0;
         onChanged();
         return this;
       }
 
       private java.lang.Object gachaRecordUrl_ = "";
       /**
-       * <code>string gachaRecordUrl = 9;</code>
+       * <code>string gacha_record_url = 6;</code>
        * @return The gachaRecordUrl.
        */
       public java.lang.String getGachaRecordUrl() {
@@ -2916,7 +2259,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>string gachaRecordUrl = 9;</code>
+       * <code>string gacha_record_url = 6;</code>
        * @return The bytes for gachaRecordUrl.
        */
       public com.google.protobuf.ByteString
@@ -2933,7 +2276,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>string gachaRecordUrl = 9;</code>
+       * <code>string gacha_record_url = 6;</code>
        * @param value The gachaRecordUrl to set.
        * @return This builder for chaining.
        */
@@ -2948,7 +2291,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>string gachaRecordUrl = 9;</code>
+       * <code>string gacha_record_url = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaRecordUrl() {
@@ -2958,7 +2301,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>string gachaRecordUrl = 9;</code>
+       * <code>string gacha_record_url = 6;</code>
        * @param value The bytes for gachaRecordUrl to set.
        * @return This builder for chaining.
        */
@@ -2974,6 +2317,840 @@ public final class GachaInfoOuterClass {
         return this;
       }
 
+      private int costItemNum_ ;
+      /**
+       * <code>uint32 cost_item_num = 7;</code>
+       * @return The costItemNum.
+       */
+      @java.lang.Override
+      public int getCostItemNum() {
+        return costItemNum_;
+      }
+      /**
+       * <code>uint32 cost_item_num = 7;</code>
+       * @param value The costItemNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCostItemNum(int value) {
+        
+        costItemNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cost_item_num = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCostItemNum() {
+        
+        costItemNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int scheduleId_ ;
+      /**
+       * <code>uint32 schedule_id = 8;</code>
+       * @return The scheduleId.
+       */
+      @java.lang.Override
+      public int getScheduleId() {
+        return scheduleId_;
+      }
+      /**
+       * <code>uint32 schedule_id = 8;</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 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearScheduleId() {
+        
+        scheduleId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gachaProbUrl_ = "";
+      /**
+       * <code>string gacha_prob_url = 9;</code>
+       * @return The gachaProbUrl.
+       */
+      public java.lang.String getGachaProbUrl() {
+        java.lang.Object ref = gachaProbUrl_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gachaProbUrl_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prob_url = 9;</code>
+       * @return The bytes for gachaProbUrl.
+       */
+      public com.google.protobuf.ByteString
+          getGachaProbUrlBytes() {
+        java.lang.Object ref = gachaProbUrl_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gachaProbUrl_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prob_url = 9;</code>
+       * @param value The gachaProbUrl to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaProbUrl(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gachaProbUrl_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prob_url = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaProbUrl() {
+        
+        gachaProbUrl_ = getDefaultInstance().getGachaProbUrl();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prob_url = 9;</code>
+       * @param value The bytes for gachaProbUrl to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaProbUrlBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gachaProbUrl_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int gachaType_ ;
+      /**
+       * <code>uint32 gacha_type = 10;</code>
+       * @return The gachaType.
+       */
+      @java.lang.Override
+      public int getGachaType() {
+        return gachaType_;
+      }
+      /**
+       * <code>uint32 gacha_type = 10;</code>
+       * @param value The gachaType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaType(int value) {
+        
+        gachaType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_type = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaType() {
+        
+        gachaType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gachaPrefabPath_ = "";
+      /**
+       * <code>string gacha_prefab_path = 11;</code>
+       * @return The gachaPrefabPath.
+       */
+      public java.lang.String getGachaPrefabPath() {
+        java.lang.Object ref = gachaPrefabPath_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gachaPrefabPath_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prefab_path = 11;</code>
+       * @return The bytes for gachaPrefabPath.
+       */
+      public com.google.protobuf.ByteString
+          getGachaPrefabPathBytes() {
+        java.lang.Object ref = gachaPrefabPath_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gachaPrefabPath_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prefab_path = 11;</code>
+       * @param value The gachaPrefabPath to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaPrefabPath(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gachaPrefabPath_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prefab_path = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaPrefabPath() {
+        
+        gachaPrefabPath_ = getDefaultInstance().getGachaPrefabPath();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prefab_path = 11;</code>
+       * @param value The bytes for gachaPrefabPath to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaPrefabPathBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gachaPrefabPath_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int costItemId_ ;
+      /**
+       * <code>uint32 cost_item_id = 12;</code>
+       * @return The costItemId.
+       */
+      @java.lang.Override
+      public int getCostItemId() {
+        return costItemId_;
+      }
+      /**
+       * <code>uint32 cost_item_id = 12;</code>
+       * @param value The costItemId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCostItemId(int value) {
+        
+        costItemId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cost_item_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCostItemId() {
+        
+        costItemId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int wishMaxProgress_ ;
+      /**
+       * <code>uint32 wish_max_progress = 13;</code>
+       * @return The wishMaxProgress.
+       */
+      @java.lang.Override
+      public int getWishMaxProgress() {
+        return wishMaxProgress_;
+      }
+      /**
+       * <code>uint32 wish_max_progress = 13;</code>
+       * @param value The wishMaxProgress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWishMaxProgress(int value) {
+        
+        wishMaxProgress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wish_max_progress = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWishMaxProgress() {
+        
+        wishMaxProgress_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int leftGachaTimes_ ;
+      /**
+       * <code>uint32 left_gacha_times = 14;</code>
+       * @return The leftGachaTimes.
+       */
+      @java.lang.Override
+      public int getLeftGachaTimes() {
+        return leftGachaTimes_;
+      }
+      /**
+       * <code>uint32 left_gacha_times = 14;</code>
+       * @param value The leftGachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLeftGachaTimes(int value) {
+        
+        leftGachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 left_gacha_times = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLeftGachaTimes() {
+        
+        leftGachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gachaTimesLimit_ ;
+      /**
+       * <code>uint32 gacha_times_limit = 15;</code>
+       * @return The gachaTimesLimit.
+       */
+      @java.lang.Override
+      public int getGachaTimesLimit() {
+        return gachaTimesLimit_;
+      }
+      /**
+       * <code>uint32 gacha_times_limit = 15;</code>
+       * @param value The gachaTimesLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaTimesLimit(int value) {
+        
+        gachaTimesLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_times_limit = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaTimesLimit() {
+        
+        gachaTimesLimit_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList displayUp5ItemList_ = emptyIntList();
+      private void ensureDisplayUp5ItemListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          displayUp5ItemList_ = mutableCopy(displayUp5ItemList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @return A list containing the displayUp5ItemList.
+       */
+      public java.util.List<java.lang.Integer>
+          getDisplayUp5ItemListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(displayUp5ItemList_) : displayUp5ItemList_;
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @return The count of displayUp5ItemList.
+       */
+      public int getDisplayUp5ItemListCount() {
+        return displayUp5ItemList_.size();
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @param index The index of the element to return.
+       * @return The displayUp5ItemList at the given index.
+       */
+      public int getDisplayUp5ItemList(int index) {
+        return displayUp5ItemList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @param index The index to set the value at.
+       * @param value The displayUp5ItemList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDisplayUp5ItemList(
+          int index, int value) {
+        ensureDisplayUp5ItemListIsMutable();
+        displayUp5ItemList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @param value The displayUp5ItemList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addDisplayUp5ItemList(int value) {
+        ensureDisplayUp5ItemListIsMutable();
+        displayUp5ItemList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @param values The displayUp5ItemList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllDisplayUp5ItemList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureDisplayUp5ItemListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, displayUp5ItemList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_up5_item_list = 99;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDisplayUp5ItemList() {
+        displayUp5ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int tenCostItemId_ ;
+      /**
+       * <code>uint32 ten_cost_item_id = 243;</code>
+       * @return The tenCostItemId.
+       */
+      @java.lang.Override
+      public int getTenCostItemId() {
+        return tenCostItemId_;
+      }
+      /**
+       * <code>uint32 ten_cost_item_id = 243;</code>
+       * @param value The tenCostItemId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTenCostItemId(int value) {
+        
+        tenCostItemId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 ten_cost_item_id = 243;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTenCostItemId() {
+        
+        tenCostItemId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isNewWish_ ;
+      /**
+       * <code>bool is_new_wish = 251;</code>
+       * @return The isNewWish.
+       */
+      @java.lang.Override
+      public boolean getIsNewWish() {
+        return isNewWish_;
+      }
+      /**
+       * <code>bool is_new_wish = 251;</code>
+       * @param value The isNewWish to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsNewWish(boolean value) {
+        
+        isNewWish_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_new_wish = 251;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewWish() {
+        
+        isNewWish_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int wishItemId_ ;
+      /**
+       * <code>uint32 wish_item_id = 599;</code>
+       * @return The wishItemId.
+       */
+      @java.lang.Override
+      public int getWishItemId() {
+        return wishItemId_;
+      }
+      /**
+       * <code>uint32 wish_item_id = 599;</code>
+       * @param value The wishItemId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWishItemId(int value) {
+        
+        wishItemId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 wish_item_id = 599;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWishItemId() {
+        
+        wishItemId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object titleTextmap_ = "";
+      /**
+       * <code>string title_textmap = 782;</code>
+       * @return The titleTextmap.
+       */
+      public java.lang.String getTitleTextmap() {
+        java.lang.Object ref = titleTextmap_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          titleTextmap_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string title_textmap = 782;</code>
+       * @return The bytes for titleTextmap.
+       */
+      public com.google.protobuf.ByteString
+          getTitleTextmapBytes() {
+        java.lang.Object ref = titleTextmap_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          titleTextmap_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string title_textmap = 782;</code>
+       * @param value The titleTextmap to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTitleTextmap(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        titleTextmap_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string title_textmap = 782;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTitleTextmap() {
+        
+        titleTextmap_ = getDefaultInstance().getTitleTextmap();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string title_textmap = 782;</code>
+       * @param value The bytes for titleTextmap to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTitleTextmapBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        titleTextmap_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gachaProbUrlOversea_ = "";
+      /**
+       * <code>string gacha_prob_url_oversea = 798;</code>
+       * @return The gachaProbUrlOversea.
+       */
+      public java.lang.String getGachaProbUrlOversea() {
+        java.lang.Object ref = gachaProbUrlOversea_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gachaProbUrlOversea_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prob_url_oversea = 798;</code>
+       * @return The bytes for gachaProbUrlOversea.
+       */
+      public com.google.protobuf.ByteString
+          getGachaProbUrlOverseaBytes() {
+        java.lang.Object ref = gachaProbUrlOversea_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gachaProbUrlOversea_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string gacha_prob_url_oversea = 798;</code>
+       * @param value The gachaProbUrlOversea to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaProbUrlOversea(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gachaProbUrlOversea_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prob_url_oversea = 798;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaProbUrlOversea() {
+        
+        gachaProbUrlOversea_ = getDefaultInstance().getGachaProbUrlOversea();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gacha_prob_url_oversea = 798;</code>
+       * @param value The bytes for gachaProbUrlOversea to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaProbUrlOverseaBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gachaProbUrlOversea_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int curScheduleDailyGachaTimes_ ;
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 1087;</code>
+       * @return The curScheduleDailyGachaTimes.
+       */
+      @java.lang.Override
+      public int getCurScheduleDailyGachaTimes() {
+        return curScheduleDailyGachaTimes_;
+      }
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 1087;</code>
+       * @param value The curScheduleDailyGachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurScheduleDailyGachaTimes(int value) {
+        
+        curScheduleDailyGachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_schedule_daily_gacha_times = 1087;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurScheduleDailyGachaTimes() {
+        
+        curScheduleDailyGachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList displayChronicle5ItemList_ = emptyIntList();
+      private void ensureDisplayChronicle5ItemListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          displayChronicle5ItemList_ = mutableCopy(displayChronicle5ItemList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @return A list containing the displayChronicle5ItemList.
+       */
+      public java.util.List<java.lang.Integer>
+          getDisplayChronicle5ItemListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(displayChronicle5ItemList_) : displayChronicle5ItemList_;
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @return The count of displayChronicle5ItemList.
+       */
+      public int getDisplayChronicle5ItemListCount() {
+        return displayChronicle5ItemList_.size();
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @param index The index of the element to return.
+       * @return The displayChronicle5ItemList at the given index.
+       */
+      public int getDisplayChronicle5ItemList(int index) {
+        return displayChronicle5ItemList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @param index The index to set the value at.
+       * @param value The displayChronicle5ItemList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDisplayChronicle5ItemList(
+          int index, int value) {
+        ensureDisplayChronicle5ItemListIsMutable();
+        displayChronicle5ItemList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @param value The displayChronicle5ItemList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addDisplayChronicle5ItemList(int value) {
+        ensureDisplayChronicle5ItemListIsMutable();
+        displayChronicle5ItemList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @param values The displayChronicle5ItemList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllDisplayChronicle5ItemList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureDisplayChronicle5ItemListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, displayChronicle5ItemList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_chronicle5_item_list = 1448;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDisplayChronicle5ItemList() {
+        displayChronicle5ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private boolean lAGAHPEKLHM_ ;
+      /**
+       * <code>bool LAGAHPEKLHM = 1509;</code>
+       * @return The lAGAHPEKLHM.
+       */
+      @java.lang.Override
+      public boolean getLAGAHPEKLHM() {
+        return lAGAHPEKLHM_;
+      }
+      /**
+       * <code>bool LAGAHPEKLHM = 1509;</code>
+       * @param value The lAGAHPEKLHM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLAGAHPEKLHM(boolean value) {
+        
+        lAGAHPEKLHM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool LAGAHPEKLHM = 1509;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLAGAHPEKLHM() {
+        
+        lAGAHPEKLHM_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> gachaUpInfoList_ =
         java.util.Collections.emptyList();
       private void ensureGachaUpInfoListIsMutable() {
@@ -2987,7 +3164,7 @@ public final class GachaInfoOuterClass {
           emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> gachaUpInfoListBuilder_;
 
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> getGachaUpInfoListList() {
         if (gachaUpInfoListBuilder_ == null) {
@@ -2997,7 +3174,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public int getGachaUpInfoListCount() {
         if (gachaUpInfoListBuilder_ == null) {
@@ -3007,7 +3184,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo getGachaUpInfoList(int index) {
         if (gachaUpInfoListBuilder_ == null) {
@@ -3017,7 +3194,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder setGachaUpInfoList(
           int index, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo value) {
@@ -3034,7 +3211,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder setGachaUpInfoList(
           int index, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder builderForValue) {
@@ -3048,7 +3225,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder addGachaUpInfoList(emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo value) {
         if (gachaUpInfoListBuilder_ == null) {
@@ -3064,7 +3241,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder addGachaUpInfoList(
           int index, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo value) {
@@ -3081,7 +3258,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder addGachaUpInfoList(
           emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder builderForValue) {
@@ -3095,7 +3272,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder addGachaUpInfoList(
           int index, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder builderForValue) {
@@ -3109,7 +3286,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder addAllGachaUpInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo> values) {
@@ -3124,7 +3301,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder clearGachaUpInfoList() {
         if (gachaUpInfoListBuilder_ == null) {
@@ -3137,7 +3314,7 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public Builder removeGachaUpInfoList(int index) {
         if (gachaUpInfoListBuilder_ == null) {
@@ -3150,14 +3327,14 @@ public final class GachaInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder getGachaUpInfoListBuilder(
           int index) {
         return getGachaUpInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder getGachaUpInfoListOrBuilder(
           int index) {
@@ -3167,7 +3344,7 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfoOrBuilder> 
            getGachaUpInfoListOrBuilderList() {
@@ -3178,14 +3355,14 @@ public final class GachaInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder addGachaUpInfoListBuilder() {
         return getGachaUpInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder addGachaUpInfoListBuilder(
           int index) {
@@ -3193,7 +3370,7 @@ public final class GachaInfoOuterClass {
             index, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .GachaUpInfo gacha_up_info_list = 1514;</code>
+       * <code>repeated .GachaUpInfo gacha_up_info_list = 1711;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder> 
            getGachaUpInfoListBuilderList() {
@@ -3214,109 +3391,188 @@ public final class GachaInfoOuterClass {
         return gachaUpInfoListBuilder_;
       }
 
-      private int costItemNum_ ;
-      /**
-       * <code>uint32 costItemNum = 2;</code>
-       * @return The costItemNum.
-       */
-      @java.lang.Override
-      public int getCostItemNum() {
-        return costItemNum_;
+      private com.google.protobuf.Internal.IntList displayUp4ItemList_ = emptyIntList();
+      private void ensureDisplayUp4ItemListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          displayUp4ItemList_ = mutableCopy(displayUp4ItemList_);
+          bitField0_ |= 0x00000008;
+         }
       }
       /**
-       * <code>uint32 costItemNum = 2;</code>
-       * @param value The costItemNum to set.
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @return A list containing the displayUp4ItemList.
+       */
+      public java.util.List<java.lang.Integer>
+          getDisplayUp4ItemListList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(displayUp4ItemList_) : displayUp4ItemList_;
+      }
+      /**
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @return The count of displayUp4ItemList.
+       */
+      public int getDisplayUp4ItemListCount() {
+        return displayUp4ItemList_.size();
+      }
+      /**
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @param index The index of the element to return.
+       * @return The displayUp4ItemList at the given index.
+       */
+      public int getDisplayUp4ItemList(int index) {
+        return displayUp4ItemList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @param index The index to set the value at.
+       * @param value The displayUp4ItemList to set.
        * @return This builder for chaining.
        */
-      public Builder setCostItemNum(int value) {
-        
-        costItemNum_ = value;
+      public Builder setDisplayUp4ItemList(
+          int index, int value) {
+        ensureDisplayUp4ItemListIsMutable();
+        displayUp4ItemList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 costItemNum = 2;</code>
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @param value The displayUp4ItemList to add.
        * @return This builder for chaining.
        */
-      public Builder clearCostItemNum() {
-        
-        costItemNum_ = 0;
+      public Builder addDisplayUp4ItemList(int value) {
+        ensureDisplayUp4ItemListIsMutable();
+        displayUp4ItemList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @param values The displayUp4ItemList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllDisplayUp4ItemList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureDisplayUp4ItemListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, displayUp4ItemList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 display_up4_item_list = 1882;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDisplayUp4ItemList() {
+        displayUp4ItemList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
       }
 
-      private java.lang.Object gachaProbUrl_ = "";
+      private int gachaSortId_ ;
       /**
-       * <code>string gachaProbUrl = 4;</code>
-       * @return The gachaProbUrl.
+       * <code>uint32 gacha_sort_id = 1938;</code>
+       * @return The gachaSortId.
        */
-      public java.lang.String getGachaProbUrl() {
-        java.lang.Object ref = gachaProbUrl_;
+      @java.lang.Override
+      public int getGachaSortId() {
+        return gachaSortId_;
+      }
+      /**
+       * <code>uint32 gacha_sort_id = 1938;</code>
+       * @param value The gachaSortId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaSortId(int value) {
+        
+        gachaSortId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_sort_id = 1938;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaSortId() {
+        
+        gachaSortId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gachaRecordUrlOversea_ = "";
+      /**
+       * <code>string gacha_record_url_oversea = 1984;</code>
+       * @return The gachaRecordUrlOversea.
+       */
+      public java.lang.String getGachaRecordUrlOversea() {
+        java.lang.Object ref = gachaRecordUrlOversea_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          gachaProbUrl_ = s;
+          gachaRecordUrlOversea_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string gachaProbUrl = 4;</code>
-       * @return The bytes for gachaProbUrl.
+       * <code>string gacha_record_url_oversea = 1984;</code>
+       * @return The bytes for gachaRecordUrlOversea.
        */
       public com.google.protobuf.ByteString
-          getGachaProbUrlBytes() {
-        java.lang.Object ref = gachaProbUrl_;
+          getGachaRecordUrlOverseaBytes() {
+        java.lang.Object ref = gachaRecordUrlOversea_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          gachaProbUrl_ = b;
+          gachaRecordUrlOversea_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string gachaProbUrl = 4;</code>
-       * @param value The gachaProbUrl to set.
+       * <code>string gacha_record_url_oversea = 1984;</code>
+       * @param value The gachaRecordUrlOversea to set.
        * @return This builder for chaining.
        */
-      public Builder setGachaProbUrl(
+      public Builder setGachaRecordUrlOversea(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        gachaProbUrl_ = value;
+        gachaRecordUrlOversea_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string gachaProbUrl = 4;</code>
+       * <code>string gacha_record_url_oversea = 1984;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGachaProbUrl() {
+      public Builder clearGachaRecordUrlOversea() {
         
-        gachaProbUrl_ = getDefaultInstance().getGachaProbUrl();
+        gachaRecordUrlOversea_ = getDefaultInstance().getGachaRecordUrlOversea();
         onChanged();
         return this;
       }
       /**
-       * <code>string gachaProbUrl = 4;</code>
-       * @param value The bytes for gachaProbUrl to set.
+       * <code>string gacha_record_url_oversea = 1984;</code>
+       * @param value The bytes for gachaRecordUrlOversea to set.
        * @return This builder for chaining.
        */
-      public Builder setGachaProbUrlBytes(
+      public Builder setGachaRecordUrlOverseaBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        gachaProbUrl_ = value;
+        gachaRecordUrlOversea_ = value;
         onChanged();
         return this;
       }
@@ -3387,25 +3643,28 @@ public final class GachaInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\231\005\n" +
-      "\tGachaInfo\022\022\n\ncostItemId\030\r \001(\r\022\027\n\017gachaP" +
-      "refabPath\030\n \001(\t\022\021\n\tgachaType\030\001 \001(\r\022\030\n\017wi" +
-      "shMaxProgress\030\300\007 \001(\r\022#\n\032curScheduleDaily" +
-      "GachaTimes\030\260\013 \001(\r\022\026\n\016leftGachaTimes\030\017 \001(" +
-      "\r\022\024\n\013is_new_wish\030\201\014 \001(\010\022\026\n\016tenCostItemNu" +
-      "m\030\010 \001(\r\022\025\n\014wishProgress\030\347\013 \001(\r\022\023\n\013schedu" +
-      "le_id\030\005 \001(\r\022\025\n\rtenCostItemId\030\006 \001(\r\022\023\n\013ga" +
-      "chaSortId\030\013 \001(\r\022\033\n\022displayUp4ItemList\030\205\n" +
-      " \003(\r\022\036\n\025gachaRecordUrlOversea\030\235\t \001(\t\022\034\n\023" +
-      "gachaProbUrlOversea\030\305\t \001(\t\022\022\n\nbegin_time" +
-      "\030\003 \001(\r\022\023\n\nwishItemId\030\346\006 \001(\r\022\020\n\010end_time\030" +
-      "\007 \001(\r\022\036\n\026gachaPreviewPrefabPath\030\014 \001(\t\022\025\n" +
-      "\014titleTextmap\030\317\006 \001(\t\022\033\n\022displayUp5ItemLi" +
-      "st\030\247\016 \003(\r\022\027\n\017gachaTimesLimit\030\016 \001(\r\022\026\n\016ga" +
-      "chaRecordUrl\030\t \001(\t\022)\n\022gacha_up_info_list" +
-      "\030\352\013 \003(\0132\014.GachaUpInfo\022\023\n\013costItemNum\030\002 \001" +
-      "(\r\022\024\n\014gachaProbUrl\030\004 \001(\tB\033\n\031emu.grasscut" +
-      "ter.net.protob\006proto3"
+      "\n\017GachaInfo.proto\032\021GachaUpInfo.proto\"\205\006\n" +
+      "\tGachaInfo\022\020\n\010end_time\030\001 \001(\r\022\025\n\rwish_pro" +
+      "gress\030\002 \001(\r\022\031\n\021ten_cost_item_num\030\003 \001(\r\022!" +
+      "\n\031gacha_preview_prefab_path\030\004 \001(\t\022\022\n\nbeg" +
+      "in_time\030\005 \001(\r\022\030\n\020gacha_record_url\030\006 \001(\t\022" +
+      "\025\n\rcost_item_num\030\007 \001(\r\022\023\n\013schedule_id\030\010 " +
+      "\001(\r\022\026\n\016gacha_prob_url\030\t \001(\t\022\022\n\ngacha_typ" +
+      "e\030\n \001(\r\022\031\n\021gacha_prefab_path\030\013 \001(\t\022\024\n\014co" +
+      "st_item_id\030\014 \001(\r\022\031\n\021wish_max_progress\030\r " +
+      "\001(\r\022\030\n\020left_gacha_times\030\016 \001(\r\022\031\n\021gacha_t" +
+      "imes_limit\030\017 \001(\r\022\035\n\025display_up5_item_lis" +
+      "t\030c \003(\r\022\031\n\020ten_cost_item_id\030\363\001 \001(\r\022\024\n\013is" +
+      "_new_wish\030\373\001 \001(\010\022\025\n\014wish_item_id\030\327\004 \001(\r\022" +
+      "\026\n\rtitle_textmap\030\216\006 \001(\t\022\037\n\026gacha_prob_ur" +
+      "l_oversea\030\236\006 \001(\t\022\'\n\036cur_schedule_daily_g" +
+      "acha_times\030\277\010 \001(\r\022%\n\034display_chronicle5_" +
+      "item_list\030\250\013 \003(\r\022\024\n\013LAGAHPEKLHM\030\345\013 \001(\010\022)" +
+      "\n\022gacha_up_info_list\030\257\r \003(\0132\014.GachaUpInf" +
+      "o\022\036\n\025display_up4_item_list\030\332\016 \003(\r\022\026\n\rgac" +
+      "ha_sort_id\030\222\017 \001(\r\022!\n\030gacha_record_url_ov" +
+      "ersea\030\300\017 \001(\tB\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3417,7 +3676,7 @@ public final class GachaInfoOuterClass {
     internal_static_GachaInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GachaInfo_descriptor,
-        new java.lang.String[] { "CostItemId", "GachaPrefabPath", "GachaType", "WishMaxProgress", "CurScheduleDailyGachaTimes", "LeftGachaTimes", "IsNewWish", "TenCostItemNum", "WishProgress", "ScheduleId", "TenCostItemId", "GachaSortId", "DisplayUp4ItemList", "GachaRecordUrlOversea", "GachaProbUrlOversea", "BeginTime", "WishItemId", "EndTime", "GachaPreviewPrefabPath", "TitleTextmap", "DisplayUp5ItemList", "GachaTimesLimit", "GachaRecordUrl", "GachaUpInfoList", "CostItemNum", "GachaProbUrl", });
+        new java.lang.String[] { "EndTime", "WishProgress", "TenCostItemNum", "GachaPreviewPrefabPath", "BeginTime", "GachaRecordUrl", "CostItemNum", "ScheduleId", "GachaProbUrl", "GachaType", "GachaPrefabPath", "CostItemId", "WishMaxProgress", "LeftGachaTimes", "GachaTimesLimit", "DisplayUp5ItemList", "TenCostItemId", "IsNewWish", "WishItemId", "TitleTextmap", "GachaProbUrlOversea", "CurScheduleDailyGachaTimes", "DisplayChronicle5ItemList", "LAGAHPEKLHM", "GachaUpInfoList", "DisplayUp4ItemList", "GachaSortId", "GachaRecordUrlOversea", });
     emu.grasscutter.net.proto.GachaUpInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaItemOuterClass.java
index 1142a87df..e3da5d07d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaItemOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaItemOuterClass.java
@@ -19,85 +19,81 @@ public final class GachaItemOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getTokenItemListList();
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTokenItemList(int index);
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    int getTokenItemListCount();
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getTokenItemListOrBuilderList();
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTokenItemListOrBuilder(
-        int index);
-
-    /**
-     * <code>bool is_gacha_item_new = 6;</code>
-     * @return The isGachaItemNew.
-     */
-    boolean getIsGachaItemNew();
-
-    /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      * @return Whether the gachaItem field is set.
      */
     boolean hasGachaItem();
     /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      * @return The gachaItem.
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGachaItem();
     /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGachaItemOrBuilder();
 
     /**
-     * <code>bool is_flash_card = 2;</code>
+     * <code>bool is_flash_card = 4;</code>
      * @return The isFlashCard.
      */
     boolean getIsFlashCard();
 
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>bool is_gacha_item_new = 8;</code>
+     * @return The isGachaItemNew.
+     */
+    boolean getIsGachaItemNew();
+
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getTokenItemListList();
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTokenItemList(int index);
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    int getTokenItemListCount();
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getTokenItemListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTokenItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> 
         getTransferItemsList();
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem getTransferItems(int index);
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     int getTransferItemsCount();
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder> 
         getTransferItemsOrBuilderList();
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder getTransferItemsOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * Obf: NJOOCPHJKKG
-   * </pre>
-   *
    * Protobuf type {@code GachaItem}
    */
   public static final class GachaItem extends
@@ -146,20 +142,6 @@ public final class GachaItemOuterClass {
               done = true;
               break;
             case 10: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                transferItems_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              transferItems_.add(
-                  input.readMessage(emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.parser(), extensionRegistry));
-              break;
-            }
-            case 16: {
-
-              isFlashCard_ = input.readBool();
-              break;
-            }
-            case 34: {
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder subBuilder = null;
               if (gachaItem_ != null) {
                 subBuilder = gachaItem_.toBuilder();
@@ -172,12 +154,17 @@ public final class GachaItemOuterClass {
 
               break;
             }
-            case 48: {
+            case 32: {
+
+              isFlashCard_ = input.readBool();
+              break;
+            }
+            case 64: {
 
               isGachaItemNew_ = input.readBool();
               break;
             }
-            case 74: {
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tokenItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -186,6 +173,15 @@ public final class GachaItemOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
+            case 122: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                transferItems_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              transferItems_.add(
+                  input.readMessage(emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -201,12 +197,12 @@ public final class GachaItemOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          transferItems_ = java.util.Collections.unmodifiableList(transferItems_);
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           tokenItemList_ = java.util.Collections.unmodifiableList(tokenItemList_);
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          transferItems_ = java.util.Collections.unmodifiableList(transferItems_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -224,61 +220,10 @@ public final class GachaItemOuterClass {
               emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.class, emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.Builder.class);
     }
 
-    public static final int TOKEN_ITEM_LIST_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> tokenItemList_;
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getTokenItemListList() {
-      return tokenItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getTokenItemListOrBuilderList() {
-      return tokenItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    @java.lang.Override
-    public int getTokenItemListCount() {
-      return tokenItemList_.size();
-    }
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTokenItemList(int index) {
-      return tokenItemList_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam token_item_list = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTokenItemListOrBuilder(
-        int index) {
-      return tokenItemList_.get(index);
-    }
-
-    public static final int IS_GACHA_ITEM_NEW_FIELD_NUMBER = 6;
-    private boolean isGachaItemNew_;
-    /**
-     * <code>bool is_gacha_item_new = 6;</code>
-     * @return The isGachaItemNew.
-     */
-    @java.lang.Override
-    public boolean getIsGachaItemNew() {
-      return isGachaItemNew_;
-    }
-
-    public static final int GACHA_ITEM_FIELD_NUMBER = 4;
+    public static final int GACHA_ITEM_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam gachaItem_;
     /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      * @return Whether the gachaItem field is set.
      */
     @java.lang.Override
@@ -286,7 +231,7 @@ public final class GachaItemOuterClass {
       return gachaItem_ != null;
     }
     /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      * @return The gachaItem.
      */
     @java.lang.Override
@@ -294,17 +239,17 @@ public final class GachaItemOuterClass {
       return gachaItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : gachaItem_;
     }
     /**
-     * <code>.ItemParam gacha_item = 4;</code>
+     * <code>.ItemParam gacha_item = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGachaItemOrBuilder() {
       return getGachaItem();
     }
 
-    public static final int IS_FLASH_CARD_FIELD_NUMBER = 2;
+    public static final int IS_FLASH_CARD_FIELD_NUMBER = 4;
     private boolean isFlashCard_;
     /**
-     * <code>bool is_flash_card = 2;</code>
+     * <code>bool is_flash_card = 4;</code>
      * @return The isFlashCard.
      */
     @java.lang.Override
@@ -312,17 +257,68 @@ public final class GachaItemOuterClass {
       return isFlashCard_;
     }
 
-    public static final int TRANSFER_ITEMS_FIELD_NUMBER = 1;
+    public static final int IS_GACHA_ITEM_NEW_FIELD_NUMBER = 8;
+    private boolean isGachaItemNew_;
+    /**
+     * <code>bool is_gacha_item_new = 8;</code>
+     * @return The isGachaItemNew.
+     */
+    @java.lang.Override
+    public boolean getIsGachaItemNew() {
+      return isGachaItemNew_;
+    }
+
+    public static final int TOKEN_ITEM_LIST_FIELD_NUMBER = 14;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> tokenItemList_;
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getTokenItemListList() {
+      return tokenItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getTokenItemListOrBuilderList() {
+      return tokenItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    @java.lang.Override
+    public int getTokenItemListCount() {
+      return tokenItemList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTokenItemList(int index) {
+      return tokenItemList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam token_item_list = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTokenItemListOrBuilder(
+        int index) {
+      return tokenItemList_.get(index);
+    }
+
+    public static final int TRANSFER_ITEMS_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> transferItems_;
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> getTransferItemsList() {
       return transferItems_;
     }
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder> 
@@ -330,21 +326,21 @@ public final class GachaItemOuterClass {
       return transferItems_;
     }
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     @java.lang.Override
     public int getTransferItemsCount() {
       return transferItems_.size();
     }
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem getTransferItems(int index) {
       return transferItems_.get(index);
     }
     /**
-     * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+     * <code>repeated .GachaTransferItem transfer_items = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder getTransferItemsOrBuilder(
@@ -366,20 +362,20 @@ public final class GachaItemOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < transferItems_.size(); i++) {
-        output.writeMessage(1, transferItems_.get(i));
+      if (gachaItem_ != null) {
+        output.writeMessage(1, getGachaItem());
       }
       if (isFlashCard_ != false) {
-        output.writeBool(2, isFlashCard_);
-      }
-      if (gachaItem_ != null) {
-        output.writeMessage(4, getGachaItem());
+        output.writeBool(4, isFlashCard_);
       }
       if (isGachaItemNew_ != false) {
-        output.writeBool(6, isGachaItemNew_);
+        output.writeBool(8, isGachaItemNew_);
       }
       for (int i = 0; i < tokenItemList_.size(); i++) {
-        output.writeMessage(9, tokenItemList_.get(i));
+        output.writeMessage(14, tokenItemList_.get(i));
+      }
+      for (int i = 0; i < transferItems_.size(); i++) {
+        output.writeMessage(15, transferItems_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -390,25 +386,25 @@ public final class GachaItemOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < transferItems_.size(); i++) {
+      if (gachaItem_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, transferItems_.get(i));
+          .computeMessageSize(1, getGachaItem());
       }
       if (isFlashCard_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isFlashCard_);
-      }
-      if (gachaItem_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getGachaItem());
+          .computeBoolSize(4, isFlashCard_);
       }
       if (isGachaItemNew_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isGachaItemNew_);
+          .computeBoolSize(8, isGachaItemNew_);
       }
       for (int i = 0; i < tokenItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, tokenItemList_.get(i));
+          .computeMessageSize(14, tokenItemList_.get(i));
+      }
+      for (int i = 0; i < transferItems_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, transferItems_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -425,10 +421,6 @@ public final class GachaItemOuterClass {
       }
       emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem other = (emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem) obj;
 
-      if (!getTokenItemListList()
-          .equals(other.getTokenItemListList())) return false;
-      if (getIsGachaItemNew()
-          != other.getIsGachaItemNew()) return false;
       if (hasGachaItem() != other.hasGachaItem()) return false;
       if (hasGachaItem()) {
         if (!getGachaItem()
@@ -436,6 +428,10 @@ public final class GachaItemOuterClass {
       }
       if (getIsFlashCard()
           != other.getIsFlashCard()) return false;
+      if (getIsGachaItemNew()
+          != other.getIsGachaItemNew()) return false;
+      if (!getTokenItemListList()
+          .equals(other.getTokenItemListList())) return false;
       if (!getTransferItemsList()
           .equals(other.getTransferItemsList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -449,13 +445,6 @@ public final class GachaItemOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getTokenItemListCount() > 0) {
-        hash = (37 * hash) + TOKEN_ITEM_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getTokenItemListList().hashCode();
-      }
-      hash = (37 * hash) + IS_GACHA_ITEM_NEW_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsGachaItemNew());
       if (hasGachaItem()) {
         hash = (37 * hash) + GACHA_ITEM_FIELD_NUMBER;
         hash = (53 * hash) + getGachaItem().hashCode();
@@ -463,6 +452,13 @@ public final class GachaItemOuterClass {
       hash = (37 * hash) + IS_FLASH_CARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsFlashCard());
+      hash = (37 * hash) + IS_GACHA_ITEM_NEW_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsGachaItemNew());
+      if (getTokenItemListCount() > 0) {
+        hash = (37 * hash) + TOKEN_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTokenItemListList().hashCode();
+      }
       if (getTransferItemsCount() > 0) {
         hash = (37 * hash) + TRANSFER_ITEMS_FIELD_NUMBER;
         hash = (53 * hash) + getTransferItemsList().hashCode();
@@ -563,10 +559,6 @@ public final class GachaItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NJOOCPHJKKG
-     * </pre>
-     *
      * Protobuf type {@code GachaItem}
      */
     public static final class Builder extends
@@ -606,14 +598,6 @@ public final class GachaItemOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (tokenItemListBuilder_ == null) {
-          tokenItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          tokenItemListBuilder_.clear();
-        }
-        isGachaItemNew_ = false;
-
         if (gachaItemBuilder_ == null) {
           gachaItem_ = null;
         } else {
@@ -622,6 +606,14 @@ public final class GachaItemOuterClass {
         }
         isFlashCard_ = false;
 
+        isGachaItemNew_ = false;
+
+        if (tokenItemListBuilder_ == null) {
+          tokenItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          tokenItemListBuilder_.clear();
+        }
         if (transferItemsBuilder_ == null) {
           transferItems_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
@@ -655,6 +647,13 @@ public final class GachaItemOuterClass {
       public emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem buildPartial() {
         emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem result = new emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem(this);
         int from_bitField0_ = bitField0_;
+        if (gachaItemBuilder_ == null) {
+          result.gachaItem_ = gachaItem_;
+        } else {
+          result.gachaItem_ = gachaItemBuilder_.build();
+        }
+        result.isFlashCard_ = isFlashCard_;
+        result.isGachaItemNew_ = isGachaItemNew_;
         if (tokenItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             tokenItemList_ = java.util.Collections.unmodifiableList(tokenItemList_);
@@ -664,13 +663,6 @@ public final class GachaItemOuterClass {
         } else {
           result.tokenItemList_ = tokenItemListBuilder_.build();
         }
-        result.isGachaItemNew_ = isGachaItemNew_;
-        if (gachaItemBuilder_ == null) {
-          result.gachaItem_ = gachaItem_;
-        } else {
-          result.gachaItem_ = gachaItemBuilder_.build();
-        }
-        result.isFlashCard_ = isFlashCard_;
         if (transferItemsBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             transferItems_ = java.util.Collections.unmodifiableList(transferItems_);
@@ -728,6 +720,15 @@ public final class GachaItemOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem other) {
         if (other == emu.grasscutter.net.proto.GachaItemOuterClass.GachaItem.getDefaultInstance()) return this;
+        if (other.hasGachaItem()) {
+          mergeGachaItem(other.getGachaItem());
+        }
+        if (other.getIsFlashCard() != false) {
+          setIsFlashCard(other.getIsFlashCard());
+        }
+        if (other.getIsGachaItemNew() != false) {
+          setIsGachaItemNew(other.getIsGachaItemNew());
+        }
         if (tokenItemListBuilder_ == null) {
           if (!other.tokenItemList_.isEmpty()) {
             if (tokenItemList_.isEmpty()) {
@@ -754,15 +755,6 @@ public final class GachaItemOuterClass {
             }
           }
         }
-        if (other.getIsGachaItemNew() != false) {
-          setIsGachaItemNew(other.getIsGachaItemNew());
-        }
-        if (other.hasGachaItem()) {
-          mergeGachaItem(other.getGachaItem());
-        }
-        if (other.getIsFlashCard() != false) {
-          setIsFlashCard(other.getIsFlashCard());
-        }
         if (transferItemsBuilder_ == null) {
           if (!other.transferItems_.isEmpty()) {
             if (transferItems_.isEmpty()) {
@@ -819,6 +811,187 @@ public final class GachaItemOuterClass {
       }
       private int bitField0_;
 
+      private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam gachaItem_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> gachaItemBuilder_;
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       * @return Whether the gachaItem field is set.
+       */
+      public boolean hasGachaItem() {
+        return gachaItemBuilder_ != null || gachaItem_ != null;
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       * @return The gachaItem.
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGachaItem() {
+        if (gachaItemBuilder_ == null) {
+          return gachaItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : gachaItem_;
+        } else {
+          return gachaItemBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public Builder setGachaItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (gachaItemBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          gachaItem_ = value;
+          onChanged();
+        } else {
+          gachaItemBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public Builder setGachaItem(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (gachaItemBuilder_ == null) {
+          gachaItem_ = builderForValue.build();
+          onChanged();
+        } else {
+          gachaItemBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public Builder mergeGachaItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (gachaItemBuilder_ == null) {
+          if (gachaItem_ != null) {
+            gachaItem_ =
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(gachaItem_).mergeFrom(value).buildPartial();
+          } else {
+            gachaItem_ = value;
+          }
+          onChanged();
+        } else {
+          gachaItemBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public Builder clearGachaItem() {
+        if (gachaItemBuilder_ == null) {
+          gachaItem_ = null;
+          onChanged();
+        } else {
+          gachaItem_ = null;
+          gachaItemBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGachaItemBuilder() {
+        
+        onChanged();
+        return getGachaItemFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGachaItemOrBuilder() {
+        if (gachaItemBuilder_ != null) {
+          return gachaItemBuilder_.getMessageOrBuilder();
+        } else {
+          return gachaItem_ == null ?
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : gachaItem_;
+        }
+      }
+      /**
+       * <code>.ItemParam gacha_item = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getGachaItemFieldBuilder() {
+        if (gachaItemBuilder_ == null) {
+          gachaItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  getGachaItem(),
+                  getParentForChildren(),
+                  isClean());
+          gachaItem_ = null;
+        }
+        return gachaItemBuilder_;
+      }
+
+      private boolean isFlashCard_ ;
+      /**
+       * <code>bool is_flash_card = 4;</code>
+       * @return The isFlashCard.
+       */
+      @java.lang.Override
+      public boolean getIsFlashCard() {
+        return isFlashCard_;
+      }
+      /**
+       * <code>bool is_flash_card = 4;</code>
+       * @param value The isFlashCard to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsFlashCard(boolean value) {
+        
+        isFlashCard_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_flash_card = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFlashCard() {
+        
+        isFlashCard_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isGachaItemNew_ ;
+      /**
+       * <code>bool is_gacha_item_new = 8;</code>
+       * @return The isGachaItemNew.
+       */
+      @java.lang.Override
+      public boolean getIsGachaItemNew() {
+        return isGachaItemNew_;
+      }
+      /**
+       * <code>bool is_gacha_item_new = 8;</code>
+       * @param value The isGachaItemNew to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsGachaItemNew(boolean value) {
+        
+        isGachaItemNew_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_gacha_item_new = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsGachaItemNew() {
+        
+        isGachaItemNew_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> tokenItemList_ =
         java.util.Collections.emptyList();
       private void ensureTokenItemListIsMutable() {
@@ -832,7 +1005,7 @@ public final class GachaItemOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> tokenItemListBuilder_;
 
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getTokenItemListList() {
         if (tokenItemListBuilder_ == null) {
@@ -842,7 +1015,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public int getTokenItemListCount() {
         if (tokenItemListBuilder_ == null) {
@@ -852,7 +1025,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getTokenItemList(int index) {
         if (tokenItemListBuilder_ == null) {
@@ -862,7 +1035,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder setTokenItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -879,7 +1052,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder setTokenItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -893,7 +1066,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder addTokenItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (tokenItemListBuilder_ == null) {
@@ -909,7 +1082,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder addTokenItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -926,7 +1099,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder addTokenItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -940,7 +1113,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder addTokenItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -954,7 +1127,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder addAllTokenItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -969,7 +1142,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder clearTokenItemList() {
         if (tokenItemListBuilder_ == null) {
@@ -982,7 +1155,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public Builder removeTokenItemList(int index) {
         if (tokenItemListBuilder_ == null) {
@@ -995,14 +1168,14 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getTokenItemListBuilder(
           int index) {
         return getTokenItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getTokenItemListOrBuilder(
           int index) {
@@ -1012,7 +1185,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getTokenItemListOrBuilderList() {
@@ -1023,14 +1196,14 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTokenItemListBuilder() {
         return getTokenItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addTokenItemListBuilder(
           int index) {
@@ -1038,7 +1211,7 @@ public final class GachaItemOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam token_item_list = 9;</code>
+       * <code>repeated .ItemParam token_item_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getTokenItemListBuilderList() {
@@ -1059,187 +1232,6 @@ public final class GachaItemOuterClass {
         return tokenItemListBuilder_;
       }
 
-      private boolean isGachaItemNew_ ;
-      /**
-       * <code>bool is_gacha_item_new = 6;</code>
-       * @return The isGachaItemNew.
-       */
-      @java.lang.Override
-      public boolean getIsGachaItemNew() {
-        return isGachaItemNew_;
-      }
-      /**
-       * <code>bool is_gacha_item_new = 6;</code>
-       * @param value The isGachaItemNew to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsGachaItemNew(boolean value) {
-        
-        isGachaItemNew_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_gacha_item_new = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsGachaItemNew() {
-        
-        isGachaItemNew_ = false;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam gachaItem_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> gachaItemBuilder_;
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       * @return Whether the gachaItem field is set.
-       */
-      public boolean hasGachaItem() {
-        return gachaItemBuilder_ != null || gachaItem_ != null;
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       * @return The gachaItem.
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGachaItem() {
-        if (gachaItemBuilder_ == null) {
-          return gachaItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : gachaItem_;
-        } else {
-          return gachaItemBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public Builder setGachaItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (gachaItemBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          gachaItem_ = value;
-          onChanged();
-        } else {
-          gachaItemBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public Builder setGachaItem(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (gachaItemBuilder_ == null) {
-          gachaItem_ = builderForValue.build();
-          onChanged();
-        } else {
-          gachaItemBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public Builder mergeGachaItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (gachaItemBuilder_ == null) {
-          if (gachaItem_ != null) {
-            gachaItem_ =
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(gachaItem_).mergeFrom(value).buildPartial();
-          } else {
-            gachaItem_ = value;
-          }
-          onChanged();
-        } else {
-          gachaItemBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public Builder clearGachaItem() {
-        if (gachaItemBuilder_ == null) {
-          gachaItem_ = null;
-          onChanged();
-        } else {
-          gachaItem_ = null;
-          gachaItemBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGachaItemBuilder() {
-        
-        onChanged();
-        return getGachaItemFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGachaItemOrBuilder() {
-        if (gachaItemBuilder_ != null) {
-          return gachaItemBuilder_.getMessageOrBuilder();
-        } else {
-          return gachaItem_ == null ?
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : gachaItem_;
-        }
-      }
-      /**
-       * <code>.ItemParam gacha_item = 4;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getGachaItemFieldBuilder() {
-        if (gachaItemBuilder_ == null) {
-          gachaItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  getGachaItem(),
-                  getParentForChildren(),
-                  isClean());
-          gachaItem_ = null;
-        }
-        return gachaItemBuilder_;
-      }
-
-      private boolean isFlashCard_ ;
-      /**
-       * <code>bool is_flash_card = 2;</code>
-       * @return The isFlashCard.
-       */
-      @java.lang.Override
-      public boolean getIsFlashCard() {
-        return isFlashCard_;
-      }
-      /**
-       * <code>bool is_flash_card = 2;</code>
-       * @param value The isFlashCard to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsFlashCard(boolean value) {
-        
-        isFlashCard_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_flash_card = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFlashCard() {
-        
-        isFlashCard_ = false;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> transferItems_ =
         java.util.Collections.emptyList();
       private void ensureTransferItemsIsMutable() {
@@ -1253,7 +1245,7 @@ public final class GachaItemOuterClass {
           emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder> transferItemsBuilder_;
 
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> getTransferItemsList() {
         if (transferItemsBuilder_ == null) {
@@ -1263,7 +1255,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public int getTransferItemsCount() {
         if (transferItemsBuilder_ == null) {
@@ -1273,7 +1265,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem getTransferItems(int index) {
         if (transferItemsBuilder_ == null) {
@@ -1283,7 +1275,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder setTransferItems(
           int index, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem value) {
@@ -1300,7 +1292,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder setTransferItems(
           int index, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder builderForValue) {
@@ -1314,7 +1306,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder addTransferItems(emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem value) {
         if (transferItemsBuilder_ == null) {
@@ -1330,7 +1322,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder addTransferItems(
           int index, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem value) {
@@ -1347,7 +1339,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder addTransferItems(
           emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder builderForValue) {
@@ -1361,7 +1353,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder addTransferItems(
           int index, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder builderForValue) {
@@ -1375,7 +1367,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder addAllTransferItems(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem> values) {
@@ -1390,7 +1382,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder clearTransferItems() {
         if (transferItemsBuilder_ == null) {
@@ -1403,7 +1395,7 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public Builder removeTransferItems(int index) {
         if (transferItemsBuilder_ == null) {
@@ -1416,14 +1408,14 @@ public final class GachaItemOuterClass {
         return this;
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder getTransferItemsBuilder(
           int index) {
         return getTransferItemsFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder getTransferItemsOrBuilder(
           int index) {
@@ -1433,7 +1425,7 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItemOrBuilder> 
            getTransferItemsOrBuilderList() {
@@ -1444,14 +1436,14 @@ public final class GachaItemOuterClass {
         }
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder addTransferItemsBuilder() {
         return getTransferItemsFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder addTransferItemsBuilder(
           int index) {
@@ -1459,7 +1451,7 @@ public final class GachaItemOuterClass {
             index, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.getDefaultInstance());
       }
       /**
-       * <code>repeated .GachaTransferItem transfer_items = 1;</code>
+       * <code>repeated .GachaTransferItem transfer_items = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder> 
            getTransferItemsBuilderList() {
@@ -1547,11 +1539,11 @@ public final class GachaItemOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\017GachaItem.proto\032\017ItemParam.proto\032\027Gach" +
-      "aTransferItem.proto\"\256\001\n\tGachaItem\022#\n\017tok" +
-      "en_item_list\030\t \003(\0132\n.ItemParam\022\031\n\021is_gac" +
-      "ha_item_new\030\006 \001(\010\022\036\n\ngacha_item\030\004 \001(\0132\n." +
-      "ItemParam\022\025\n\ris_flash_card\030\002 \001(\010\022*\n\016tran" +
-      "sfer_items\030\001 \003(\0132\022.GachaTransferItemB\033\n\031" +
+      "aTransferItem.proto\"\256\001\n\tGachaItem\022\036\n\ngac" +
+      "ha_item\030\001 \001(\0132\n.ItemParam\022\025\n\ris_flash_ca" +
+      "rd\030\004 \001(\010\022\031\n\021is_gacha_item_new\030\010 \001(\010\022#\n\017t" +
+      "oken_item_list\030\016 \003(\0132\n.ItemParam\022*\n\016tran" +
+      "sfer_items\030\017 \003(\0132\022.GachaTransferItemB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1565,7 +1557,7 @@ public final class GachaItemOuterClass {
     internal_static_GachaItem_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GachaItem_descriptor,
-        new java.lang.String[] { "TokenItemList", "IsGachaItemNew", "GachaItem", "IsFlashCard", "TransferItems", });
+        new java.lang.String[] { "GachaItem", "IsFlashCard", "IsGachaItemNew", "TokenItemList", "TransferItems", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
     emu.grasscutter.net.proto.GachaTransferItemOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaTransferItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaTransferItemOuterClass.java
index 052817837..e12f8cfa3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaTransferItemOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaTransferItemOuterClass.java
@@ -19,31 +19,27 @@ public final class GachaTransferItemOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      * @return Whether the item field is set.
      */
     boolean hasItem();
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      * @return The item.
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItem();
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemOrBuilder();
 
     /**
-     * <code>bool is_transfer_item_new = 6;</code>
+     * <code>bool is_transfer_item_new = 15;</code>
      * @return The isTransferItemNew.
      */
     boolean getIsTransferItemNew();
   }
   /**
-   * <pre>
-   * Obf: KGHFCKLJBLC
-   * </pre>
-   *
    * Protobuf type {@code GachaTransferItem}
    */
   public static final class GachaTransferItem extends
@@ -88,12 +84,7 @@ public final class GachaTransferItemOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              isTransferItemNew_ = input.readBool();
-              break;
-            }
-            case 74: {
+            case 42: {
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder subBuilder = null;
               if (item_ != null) {
                 subBuilder = item_.toBuilder();
@@ -106,6 +97,11 @@ public final class GachaTransferItemOuterClass {
 
               break;
             }
+            case 120: {
+
+              isTransferItemNew_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -138,10 +134,10 @@ public final class GachaTransferItemOuterClass {
               emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.class, emu.grasscutter.net.proto.GachaTransferItemOuterClass.GachaTransferItem.Builder.class);
     }
 
-    public static final int ITEM_FIELD_NUMBER = 9;
+    public static final int ITEM_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam item_;
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      * @return Whether the item field is set.
      */
     @java.lang.Override
@@ -149,7 +145,7 @@ public final class GachaTransferItemOuterClass {
       return item_ != null;
     }
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      * @return The item.
      */
     @java.lang.Override
@@ -157,17 +153,17 @@ public final class GachaTransferItemOuterClass {
       return item_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : item_;
     }
     /**
-     * <code>.ItemParam item = 9;</code>
+     * <code>.ItemParam item = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemOrBuilder() {
       return getItem();
     }
 
-    public static final int IS_TRANSFER_ITEM_NEW_FIELD_NUMBER = 6;
+    public static final int IS_TRANSFER_ITEM_NEW_FIELD_NUMBER = 15;
     private boolean isTransferItemNew_;
     /**
-     * <code>bool is_transfer_item_new = 6;</code>
+     * <code>bool is_transfer_item_new = 15;</code>
      * @return The isTransferItemNew.
      */
     @java.lang.Override
@@ -189,11 +185,11 @@ public final class GachaTransferItemOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isTransferItemNew_ != false) {
-        output.writeBool(6, isTransferItemNew_);
-      }
       if (item_ != null) {
-        output.writeMessage(9, getItem());
+        output.writeMessage(5, getItem());
+      }
+      if (isTransferItemNew_ != false) {
+        output.writeBool(15, isTransferItemNew_);
       }
       unknownFields.writeTo(output);
     }
@@ -204,13 +200,13 @@ public final class GachaTransferItemOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isTransferItemNew_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isTransferItemNew_);
-      }
       if (item_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getItem());
+          .computeMessageSize(5, getItem());
+      }
+      if (isTransferItemNew_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(15, isTransferItemNew_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,10 +344,6 @@ public final class GachaTransferItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KGHFCKLJBLC
-     * </pre>
-     *
      * Protobuf type {@code GachaTransferItem}
      */
     public static final class Builder extends
@@ -516,14 +508,14 @@ public final class GachaTransferItemOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemBuilder_;
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        * @return Whether the item field is set.
        */
       public boolean hasItem() {
         return itemBuilder_ != null || item_ != null;
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        * @return The item.
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItem() {
@@ -534,7 +526,7 @@ public final class GachaTransferItemOuterClass {
         }
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public Builder setItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemBuilder_ == null) {
@@ -550,7 +542,7 @@ public final class GachaTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public Builder setItem(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -564,7 +556,7 @@ public final class GachaTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public Builder mergeItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemBuilder_ == null) {
@@ -582,7 +574,7 @@ public final class GachaTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public Builder clearItem() {
         if (itemBuilder_ == null) {
@@ -596,7 +588,7 @@ public final class GachaTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemBuilder() {
         
@@ -604,7 +596,7 @@ public final class GachaTransferItemOuterClass {
         return getItemFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemOrBuilder() {
         if (itemBuilder_ != null) {
@@ -615,7 +607,7 @@ public final class GachaTransferItemOuterClass {
         }
       }
       /**
-       * <code>.ItemParam item = 9;</code>
+       * <code>.ItemParam item = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -633,7 +625,7 @@ public final class GachaTransferItemOuterClass {
 
       private boolean isTransferItemNew_ ;
       /**
-       * <code>bool is_transfer_item_new = 6;</code>
+       * <code>bool is_transfer_item_new = 15;</code>
        * @return The isTransferItemNew.
        */
       @java.lang.Override
@@ -641,7 +633,7 @@ public final class GachaTransferItemOuterClass {
         return isTransferItemNew_;
       }
       /**
-       * <code>bool is_transfer_item_new = 6;</code>
+       * <code>bool is_transfer_item_new = 15;</code>
        * @param value The isTransferItemNew to set.
        * @return This builder for chaining.
        */
@@ -652,7 +644,7 @@ public final class GachaTransferItemOuterClass {
         return this;
       }
       /**
-       * <code>bool is_transfer_item_new = 6;</code>
+       * <code>bool is_transfer_item_new = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsTransferItemNew() {
@@ -729,8 +721,8 @@ public final class GachaTransferItemOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027GachaTransferItem.proto\032\017ItemParam.pro" +
-      "to\"K\n\021GachaTransferItem\022\030\n\004item\030\t \001(\0132\n." +
-      "ItemParam\022\034\n\024is_transfer_item_new\030\006 \001(\010B" +
+      "to\"K\n\021GachaTransferItem\022\030\n\004item\030\005 \001(\0132\n." +
+      "ItemParam\022\034\n\024is_transfer_item_new\030\017 \001(\010B" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GachaUpInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaUpInfoOuterClass.java
index 86885f171..410c13753 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaUpInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaUpInfoOuterClass.java
@@ -19,33 +19,29 @@ public final class GachaUpInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @return A list containing the itemIdList.
      */
     java.util.List<java.lang.Integer> getItemIdListList();
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @return The count of itemIdList.
      */
     int getItemIdListCount();
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @param index The index of the element to return.
      * @return The itemIdList at the given index.
      */
     int getItemIdList(int index);
 
     /**
-     * <code>uint32 item_parent_type = 6;</code>
+     * <code>uint32 item_parent_type = 11;</code>
      * @return The itemParentType.
      */
     int getItemParentType();
   }
   /**
-   * <pre>
-   * Obf: GLKEEDIHOFH
-   * </pre>
-   *
    * Protobuf type {@code GachaUpInfo}
    */
   public static final class GachaUpInfo extends
@@ -92,7 +88,7 @@ public final class GachaUpInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 64: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -100,7 +96,7 @@ public final class GachaUpInfoOuterClass {
               itemIdList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -113,7 +109,7 @@ public final class GachaUpInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 48: {
+            case 88: {
 
               itemParentType_ = input.readUInt32();
               break;
@@ -153,10 +149,10 @@ public final class GachaUpInfoOuterClass {
               emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.class, emu.grasscutter.net.proto.GachaUpInfoOuterClass.GachaUpInfo.Builder.class);
     }
 
-    public static final int ITEM_ID_LIST_FIELD_NUMBER = 4;
+    public static final int ITEM_ID_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList itemIdList_;
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @return A list containing the itemIdList.
      */
     @java.lang.Override
@@ -165,14 +161,14 @@ public final class GachaUpInfoOuterClass {
       return itemIdList_;
     }
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @return The count of itemIdList.
      */
     public int getItemIdListCount() {
       return itemIdList_.size();
     }
     /**
-     * <code>repeated uint32 item_id_list = 4;</code>
+     * <code>repeated uint32 item_id_list = 8;</code>
      * @param index The index of the element to return.
      * @return The itemIdList at the given index.
      */
@@ -181,10 +177,10 @@ public final class GachaUpInfoOuterClass {
     }
     private int itemIdListMemoizedSerializedSize = -1;
 
-    public static final int ITEM_PARENT_TYPE_FIELD_NUMBER = 6;
+    public static final int ITEM_PARENT_TYPE_FIELD_NUMBER = 11;
     private int itemParentType_;
     /**
-     * <code>uint32 item_parent_type = 6;</code>
+     * <code>uint32 item_parent_type = 11;</code>
      * @return The itemParentType.
      */
     @java.lang.Override
@@ -208,14 +204,14 @@ public final class GachaUpInfoOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getItemIdListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(itemIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < itemIdList_.size(); i++) {
         output.writeUInt32NoTag(itemIdList_.getInt(i));
       }
       if (itemParentType_ != 0) {
-        output.writeUInt32(6, itemParentType_);
+        output.writeUInt32(11, itemParentType_);
       }
       unknownFields.writeTo(output);
     }
@@ -242,7 +238,7 @@ public final class GachaUpInfoOuterClass {
       }
       if (itemParentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, itemParentType_);
+          .computeUInt32Size(11, itemParentType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -376,10 +372,6 @@ public final class GachaUpInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GLKEEDIHOFH
-     * </pre>
-     *
      * Protobuf type {@code GachaUpInfo}
      */
     public static final class Builder extends
@@ -553,7 +545,7 @@ public final class GachaUpInfoOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @return A list containing the itemIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -562,14 +554,14 @@ public final class GachaUpInfoOuterClass {
                  java.util.Collections.unmodifiableList(itemIdList_) : itemIdList_;
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @return The count of itemIdList.
        */
       public int getItemIdListCount() {
         return itemIdList_.size();
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @param index The index of the element to return.
        * @return The itemIdList at the given index.
        */
@@ -577,7 +569,7 @@ public final class GachaUpInfoOuterClass {
         return itemIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @param index The index to set the value at.
        * @param value The itemIdList to set.
        * @return This builder for chaining.
@@ -590,7 +582,7 @@ public final class GachaUpInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @param value The itemIdList to add.
        * @return This builder for chaining.
        */
@@ -601,7 +593,7 @@ public final class GachaUpInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @param values The itemIdList to add.
        * @return This builder for chaining.
        */
@@ -614,7 +606,7 @@ public final class GachaUpInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 item_id_list = 4;</code>
+       * <code>repeated uint32 item_id_list = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemIdList() {
@@ -626,7 +618,7 @@ public final class GachaUpInfoOuterClass {
 
       private int itemParentType_ ;
       /**
-       * <code>uint32 item_parent_type = 6;</code>
+       * <code>uint32 item_parent_type = 11;</code>
        * @return The itemParentType.
        */
       @java.lang.Override
@@ -634,7 +626,7 @@ public final class GachaUpInfoOuterClass {
         return itemParentType_;
       }
       /**
-       * <code>uint32 item_parent_type = 6;</code>
+       * <code>uint32 item_parent_type = 11;</code>
        * @param value The itemParentType to set.
        * @return This builder for chaining.
        */
@@ -645,7 +637,7 @@ public final class GachaUpInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_parent_type = 6;</code>
+       * <code>uint32 item_parent_type = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemParentType() {
@@ -722,7 +714,7 @@ public final class GachaUpInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021GachaUpInfo.proto\"=\n\013GachaUpInfo\022\024\n\014it" +
-      "em_id_list\030\004 \003(\r\022\030\n\020item_parent_type\030\006 \001" +
+      "em_id_list\030\010 \003(\r\022\030\n\020item_parent_type\030\013 \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/GachaWishReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java
index 475189071..61c26d976 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GachaWishReqOuterClass.java
@@ -19,27 +19,26 @@ public final class GachaWishReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gachaType = 12;</code>
-     * @return The gachaType.
-     */
-    int getGachaType();
-
-    /**
-     * <code>uint32 item_id = 7;</code>
+     * <code>uint32 item_id = 2;</code>
      * @return The itemId.
      */
     int getItemId();
 
     /**
-     * <code>uint32 gachaScheduleId = 10;</code>
+     * <code>uint32 gacha_type = 4;</code>
+     * @return The gachaType.
+     */
+    int getGachaType();
+
+    /**
+     * <code>uint32 gacha_schedule_id = 13;</code>
      * @return The gachaScheduleId.
      */
     int getGachaScheduleId();
   }
   /**
    * <pre>
-   * CmdId: 23244
-   * Obf: HPILINGFDBP
+   * CmdId: 25407
    * </pre>
    *
    * Protobuf type {@code GachaWishReq}
@@ -86,21 +85,21 @@ public final class GachaWishReqOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 16: {
 
               itemId_ = input.readUInt32();
               break;
             }
-            case 80: {
-
-              gachaScheduleId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 32: {
 
               gachaType_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              gachaScheduleId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +132,10 @@ public final class GachaWishReqOuterClass {
               emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq.class, emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq.Builder.class);
     }
 
-    public static final int GACHATYPE_FIELD_NUMBER = 12;
-    private int gachaType_;
-    /**
-     * <code>uint32 gachaType = 12;</code>
-     * @return The gachaType.
-     */
-    @java.lang.Override
-    public int getGachaType() {
-      return gachaType_;
-    }
-
-    public static final int ITEM_ID_FIELD_NUMBER = 7;
+    public static final int ITEM_ID_FIELD_NUMBER = 2;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 7;</code>
+     * <code>uint32 item_id = 2;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -155,10 +143,21 @@ public final class GachaWishReqOuterClass {
       return itemId_;
     }
 
-    public static final int GACHASCHEDULEID_FIELD_NUMBER = 10;
+    public static final int GACHA_TYPE_FIELD_NUMBER = 4;
+    private int gachaType_;
+    /**
+     * <code>uint32 gacha_type = 4;</code>
+     * @return The gachaType.
+     */
+    @java.lang.Override
+    public int getGachaType() {
+      return gachaType_;
+    }
+
+    public static final int GACHA_SCHEDULE_ID_FIELD_NUMBER = 13;
     private int gachaScheduleId_;
     /**
-     * <code>uint32 gachaScheduleId = 10;</code>
+     * <code>uint32 gacha_schedule_id = 13;</code>
      * @return The gachaScheduleId.
      */
     @java.lang.Override
@@ -181,13 +180,13 @@ public final class GachaWishReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (itemId_ != 0) {
-        output.writeUInt32(7, itemId_);
-      }
-      if (gachaScheduleId_ != 0) {
-        output.writeUInt32(10, gachaScheduleId_);
+        output.writeUInt32(2, itemId_);
       }
       if (gachaType_ != 0) {
-        output.writeUInt32(12, gachaType_);
+        output.writeUInt32(4, gachaType_);
+      }
+      if (gachaScheduleId_ != 0) {
+        output.writeUInt32(13, gachaScheduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +199,15 @@ public final class GachaWishReqOuterClass {
       size = 0;
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, itemId_);
-      }
-      if (gachaScheduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, gachaScheduleId_);
+          .computeUInt32Size(2, itemId_);
       }
       if (gachaType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gachaType_);
+          .computeUInt32Size(4, gachaType_);
+      }
+      if (gachaScheduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, gachaScheduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +224,10 @@ public final class GachaWishReqOuterClass {
       }
       emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq other = (emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq) obj;
 
-      if (getGachaType()
-          != other.getGachaType()) return false;
       if (getItemId()
           != other.getItemId()) return false;
+      if (getGachaType()
+          != other.getGachaType()) return false;
       if (getGachaScheduleId()
           != other.getGachaScheduleId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,11 +241,11 @@ public final class GachaWishReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GACHATYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaType();
       hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getItemId();
-      hash = (37 * hash) + GACHASCHEDULEID_FIELD_NUMBER;
+      hash = (37 * hash) + GACHA_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaType();
+      hash = (37 * hash) + GACHA_SCHEDULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGachaScheduleId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -345,8 +344,7 @@ public final class GachaWishReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 23244
-     * Obf: HPILINGFDBP
+     * CmdId: 25407
      * </pre>
      *
      * Protobuf type {@code GachaWishReq}
@@ -386,10 +384,10 @@ public final class GachaWishReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gachaType_ = 0;
-
         itemId_ = 0;
 
+        gachaType_ = 0;
+
         gachaScheduleId_ = 0;
 
         return this;
@@ -418,8 +416,8 @@ public final class GachaWishReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq buildPartial() {
         emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq result = new emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq(this);
-        result.gachaType_ = gachaType_;
         result.itemId_ = itemId_;
+        result.gachaType_ = gachaType_;
         result.gachaScheduleId_ = gachaScheduleId_;
         onBuilt();
         return result;
@@ -469,12 +467,12 @@ public final class GachaWishReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq other) {
         if (other == emu.grasscutter.net.proto.GachaWishReqOuterClass.GachaWishReq.getDefaultInstance()) return this;
-        if (other.getGachaType() != 0) {
-          setGachaType(other.getGachaType());
-        }
         if (other.getItemId() != 0) {
           setItemId(other.getItemId());
         }
+        if (other.getGachaType() != 0) {
+          setGachaType(other.getGachaType());
+        }
         if (other.getGachaScheduleId() != 0) {
           setGachaScheduleId(other.getGachaScheduleId());
         }
@@ -507,40 +505,9 @@ public final class GachaWishReqOuterClass {
         return this;
       }
 
-      private int gachaType_ ;
-      /**
-       * <code>uint32 gachaType = 12;</code>
-       * @return The gachaType.
-       */
-      @java.lang.Override
-      public int getGachaType() {
-        return gachaType_;
-      }
-      /**
-       * <code>uint32 gachaType = 12;</code>
-       * @param value The gachaType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGachaType(int value) {
-        
-        gachaType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gachaType = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGachaType() {
-        
-        gachaType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 7;</code>
+       * <code>uint32 item_id = 2;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -548,7 +515,7 @@ public final class GachaWishReqOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 7;</code>
+       * <code>uint32 item_id = 2;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -559,7 +526,7 @@ public final class GachaWishReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 7;</code>
+       * <code>uint32 item_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -569,9 +536,40 @@ public final class GachaWishReqOuterClass {
         return this;
       }
 
+      private int gachaType_ ;
+      /**
+       * <code>uint32 gacha_type = 4;</code>
+       * @return The gachaType.
+       */
+      @java.lang.Override
+      public int getGachaType() {
+        return gachaType_;
+      }
+      /**
+       * <code>uint32 gacha_type = 4;</code>
+       * @param value The gachaType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGachaType(int value) {
+        
+        gachaType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gacha_type = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGachaType() {
+        
+        gachaType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int gachaScheduleId_ ;
       /**
-       * <code>uint32 gachaScheduleId = 10;</code>
+       * <code>uint32 gacha_schedule_id = 13;</code>
        * @return The gachaScheduleId.
        */
       @java.lang.Override
@@ -579,7 +577,7 @@ public final class GachaWishReqOuterClass {
         return gachaScheduleId_;
       }
       /**
-       * <code>uint32 gachaScheduleId = 10;</code>
+       * <code>uint32 gacha_schedule_id = 13;</code>
        * @param value The gachaScheduleId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +588,7 @@ public final class GachaWishReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gachaScheduleId = 10;</code>
+       * <code>uint32 gacha_schedule_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaScheduleId() {
@@ -666,10 +664,10 @@ public final class GachaWishReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022GachaWishReq.proto\"K\n\014GachaWishReq\022\021\n\t" +
-      "gachaType\030\014 \001(\r\022\017\n\007item_id\030\007 \001(\r\022\027\n\017gach" +
-      "aScheduleId\030\n \001(\rB\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "\n\022GachaWishReq.proto\"N\n\014GachaWishReq\022\017\n\007" +
+      "item_id\030\002 \001(\r\022\022\n\ngacha_type\030\004 \001(\r\022\031\n\021gac" +
+      "ha_schedule_id\030\r \001(\rB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -680,7 +678,7 @@ public final class GachaWishReqOuterClass {
     internal_static_GachaWishReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GachaWishReq_descriptor,
-        new java.lang.String[] { "GachaType", "ItemId", "GachaScheduleId", });
+        new java.lang.String[] { "ItemId", "GachaType", "GachaScheduleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetBornTypeOuterClass.java
index b17036363..37968ae7a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetBornTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetBornTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class GadgetBornTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: GPODMAALLGC
-   * </pre>
-   *
    * Protobuf enum {@code GadgetBornType}
    */
   public enum GadgetBornType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetCrucibleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetCrucibleInfoOuterClass.java
index be83266c7..7e5f97933 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetCrucibleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetCrucibleInfoOuterClass.java
@@ -32,7 +32,7 @@ public final class GadgetCrucibleInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: LMEGMGDKNJL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code GadgetCrucibleInfo}
@@ -311,7 +311,7 @@ public final class GadgetCrucibleInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: LMEGMGDKNJL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code GadgetCrucibleInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetGeneralRewardInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetGeneralRewardInfoOuterClass.java
index 21d752a54..28bdf0487 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetGeneralRewardInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetGeneralRewardInfoOuterClass.java
@@ -81,7 +81,7 @@ public final class GadgetGeneralRewardInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: AHGOAHBMENB
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code GadgetGeneralRewardInfo}
@@ -577,7 +577,7 @@ public final class GadgetGeneralRewardInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: AHGOAHBMENB
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code GadgetGeneralRewardInfo}
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 f26cd9f2a..5a73897c4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractReqOuterClass.java
@@ -19,57 +19,58 @@ public final class GadgetInteractReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gadget_entity_id = 11;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
-
-    /**
-     * <code>uint32 ui_interact_id = 7;</code>
+     * <code>uint32 ui_interact_id = 5;</code>
      * @return The uiInteractId.
      */
     int getUiInteractId();
 
     /**
-     * <code>.ResinCostType resin_cost_type = 5;</code>
-     * @return The enum numeric value on the wire for resinCostType.
-     */
-    int getResinCostTypeValue();
-    /**
-     * <code>.ResinCostType resin_cost_type = 5;</code>
-     * @return The resinCostType.
-     */
-    emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType();
-
-    /**
-     * <code>bool is_use_condense_resin = 8;</code>
-     * @return The isUseCondenseResin.
-     */
-    boolean getIsUseCondenseResin();
-
-    /**
-     * <code>.InterOpType op_type = 13;</code>
+     * <code>.InterOpType op_type = 4;</code>
      * @return The enum numeric value on the wire for opType.
      */
     int getOpTypeValue();
     /**
-     * <code>.InterOpType op_type = 13;</code>
+     * <code>.InterOpType op_type = 4;</code>
      * @return The opType.
      */
     emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
 
     /**
-     * <code>uint32 gadget_id = 6;</code>
+     * <code>bool is_use_condense_resin = 15;</code>
+     * @return The isUseCondenseResin.
+     */
+    boolean getIsUseCondenseResin();
+
+    /**
+     * <code>uint32 gadget_id = 3;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
+
+    /**
+     * <code>.ResinCostType resin_cost_type = 11;</code>
+     * @return The enum numeric value on the wire for resinCostType.
+     */
+    int getResinCostTypeValue();
+    /**
+     * <code>.ResinCostType resin_cost_type = 11;</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: 9254
-   * Obf: ALDNKENDMAD
-   * </pre>
-   *
    * Protobuf type {@code GadgetInteractReq}
    */
   public static final class GadgetInteractReq extends
@@ -82,8 +83,8 @@ public final class GadgetInteractReqOuterClass {
       super(builder);
     }
     private GadgetInteractReq() {
-      resinCostType_ = 0;
       opType_ = 0;
+      resinCostType_ = 0;
     }
 
     @java.lang.Override
@@ -116,36 +117,41 @@ public final class GadgetInteractReqOuterClass {
             case 0:
               done = true;
               break;
+            case 24: {
+
+              gadgetId_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+              int rawValue = input.readEnum();
+
+              opType_ = rawValue;
+              break;
+            }
             case 40: {
+
+              uiInteractId_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              cHDDOFMLBLM_ = input.readUInt32();
+              break;
+            }
+            case 88: {
               int rawValue = input.readEnum();
 
               resinCostType_ = rawValue;
               break;
             }
-            case 48: {
-
-              gadgetId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              uiInteractId_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              isUseCondenseResin_ = input.readBool();
-              break;
-            }
-            case 88: {
+            case 96: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 104: {
-              int rawValue = input.readEnum();
+            case 120: {
 
-              opType_ = rawValue;
+              isUseCondenseResin_ = input.readBool();
               break;
             }
             default: {
@@ -180,21 +186,10 @@ public final class GadgetInteractReqOuterClass {
               emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.class, emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.Builder.class);
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 11;
-    private int gadgetEntityId_;
-    /**
-     * <code>uint32 gadget_entity_id = 11;</code>
-     * @return The gadgetEntityId.
-     */
-    @java.lang.Override
-    public int getGadgetEntityId() {
-      return gadgetEntityId_;
-    }
-
-    public static final int UI_INTERACT_ID_FIELD_NUMBER = 7;
+    public static final int UI_INTERACT_ID_FIELD_NUMBER = 5;
     private int uiInteractId_;
     /**
-     * <code>uint32 ui_interact_id = 7;</code>
+     * <code>uint32 ui_interact_id = 5;</code>
      * @return The uiInteractId.
      */
     @java.lang.Override
@@ -202,47 +197,17 @@ public final class GadgetInteractReqOuterClass {
       return uiInteractId_;
     }
 
-    public static final int RESIN_COST_TYPE_FIELD_NUMBER = 5;
-    private int resinCostType_;
-    /**
-     * <code>.ResinCostType resin_cost_type = 5;</code>
-     * @return The enum numeric value on the wire for resinCostType.
-     */
-    @java.lang.Override public int getResinCostTypeValue() {
-      return resinCostType_;
-    }
-    /**
-     * <code>.ResinCostType resin_cost_type = 5;</code>
-     * @return The resinCostType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType result = emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.valueOf(resinCostType_);
-      return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
-    }
-
-    public static final int IS_USE_CONDENSE_RESIN_FIELD_NUMBER = 8;
-    private boolean isUseCondenseResin_;
-    /**
-     * <code>bool is_use_condense_resin = 8;</code>
-     * @return The isUseCondenseResin.
-     */
-    @java.lang.Override
-    public boolean getIsUseCondenseResin() {
-      return isUseCondenseResin_;
-    }
-
-    public static final int OP_TYPE_FIELD_NUMBER = 13;
+    public static final int OP_TYPE_FIELD_NUMBER = 4;
     private int opType_;
     /**
-     * <code>.InterOpType op_type = 13;</code>
+     * <code>.InterOpType op_type = 4;</code>
      * @return The enum numeric value on the wire for opType.
      */
     @java.lang.Override public int getOpTypeValue() {
       return opType_;
     }
     /**
-     * <code>.InterOpType op_type = 13;</code>
+     * <code>.InterOpType op_type = 4;</code>
      * @return The opType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
@@ -251,10 +216,21 @@ public final class GadgetInteractReqOuterClass {
       return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
     }
 
-    public static final int GADGET_ID_FIELD_NUMBER = 6;
+    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;
     private int gadgetId_;
     /**
-     * <code>uint32 gadget_id = 6;</code>
+     * <code>uint32 gadget_id = 3;</code>
      * @return The gadgetId.
      */
     @java.lang.Override
@@ -262,6 +238,47 @@ public final class GadgetInteractReqOuterClass {
       return gadgetId_;
     }
 
+    public static final int RESIN_COST_TYPE_FIELD_NUMBER = 11;
+    private int resinCostType_;
+    /**
+     * <code>.ResinCostType resin_cost_type = 11;</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>
+     * @return The resinCostType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType result = emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.valueOf(resinCostType_);
+      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() {
@@ -276,23 +293,26 @@ public final class GadgetInteractReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
-        output.writeEnum(5, resinCostType_);
-      }
       if (gadgetId_ != 0) {
-        output.writeUInt32(6, gadgetId_);
-      }
-      if (uiInteractId_ != 0) {
-        output.writeUInt32(7, uiInteractId_);
-      }
-      if (isUseCondenseResin_ != false) {
-        output.writeBool(8, isUseCondenseResin_);
-      }
-      if (gadgetEntityId_ != 0) {
-        output.writeUInt32(11, gadgetEntityId_);
+        output.writeUInt32(3, gadgetId_);
       }
       if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
-        output.writeEnum(13, opType_);
+        output.writeEnum(4, opType_);
+      }
+      if (uiInteractId_ != 0) {
+        output.writeUInt32(5, uiInteractId_);
+      }
+      if (cHDDOFMLBLM_ != 0) {
+        output.writeUInt32(9, cHDDOFMLBLM_);
+      }
+      if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
+        output.writeEnum(11, resinCostType_);
+      }
+      if (gadgetEntityId_ != 0) {
+        output.writeUInt32(12, gadgetEntityId_);
+      }
+      if (isUseCondenseResin_ != false) {
+        output.writeBool(15, isUseCondenseResin_);
       }
       unknownFields.writeTo(output);
     }
@@ -303,29 +323,33 @@ public final class GadgetInteractReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (resinCostType_ != emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.RESIN_COST_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, resinCostType_);
-      }
       if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, gadgetId_);
-      }
-      if (uiInteractId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, uiInteractId_);
-      }
-      if (isUseCondenseResin_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isUseCondenseResin_);
-      }
-      if (gadgetEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, gadgetEntityId_);
+          .computeUInt32Size(3, gadgetId_);
       }
       if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(13, opType_);
+          .computeEnumSize(4, opType_);
+      }
+      if (uiInteractId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, uiInteractId_);
+      }
+      if (cHDDOFMLBLM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, cHDDOFMLBLM_);
+      }
+      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_);
+      }
+      if (isUseCondenseResin_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(15, isUseCondenseResin_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -342,16 +366,18 @@ public final class GadgetInteractReqOuterClass {
       }
       emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq other = (emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq) obj;
 
-      if (getGadgetEntityId()
-          != other.getGadgetEntityId()) return false;
       if (getUiInteractId()
           != other.getUiInteractId()) return false;
-      if (resinCostType_ != other.resinCostType_) return false;
+      if (opType_ != other.opType_) return false;
       if (getIsUseCondenseResin()
           != other.getIsUseCondenseResin()) return false;
-      if (opType_ != other.opType_) 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;
     }
@@ -363,19 +389,21 @@ public final class GadgetInteractReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetEntityId();
       hash = (37 * hash) + UI_INTERACT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getUiInteractId();
-      hash = (37 * hash) + RESIN_COST_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + resinCostType_;
+      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) + OP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + opType_;
       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;
@@ -472,11 +500,6 @@ public final class GadgetInteractReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9254
-     * Obf: ALDNKENDMAD
-     * </pre>
-     *
      * Protobuf type {@code GadgetInteractReq}
      */
     public static final class Builder extends
@@ -514,18 +537,20 @@ public final class GadgetInteractReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gadgetEntityId_ = 0;
-
         uiInteractId_ = 0;
 
-        resinCostType_ = 0;
-
-        isUseCondenseResin_ = false;
-
         opType_ = 0;
 
+        isUseCondenseResin_ = false;
+
         gadgetId_ = 0;
 
+        resinCostType_ = 0;
+
+        cHDDOFMLBLM_ = 0;
+
+        gadgetEntityId_ = 0;
+
         return this;
       }
 
@@ -552,12 +577,13 @@ public final class GadgetInteractReqOuterClass {
       @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.gadgetEntityId_ = gadgetEntityId_;
         result.uiInteractId_ = uiInteractId_;
-        result.resinCostType_ = resinCostType_;
-        result.isUseCondenseResin_ = isUseCondenseResin_;
         result.opType_ = opType_;
+        result.isUseCondenseResin_ = isUseCondenseResin_;
         result.gadgetId_ = gadgetId_;
+        result.resinCostType_ = resinCostType_;
+        result.cHDDOFMLBLM_ = cHDDOFMLBLM_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         onBuilt();
         return result;
       }
@@ -606,24 +632,27 @@ public final class GadgetInteractReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq other) {
         if (other == emu.grasscutter.net.proto.GadgetInteractReqOuterClass.GadgetInteractReq.getDefaultInstance()) return this;
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         if (other.getUiInteractId() != 0) {
           setUiInteractId(other.getUiInteractId());
         }
-        if (other.resinCostType_ != 0) {
-          setResinCostTypeValue(other.getResinCostTypeValue());
-        }
-        if (other.getIsUseCondenseResin() != false) {
-          setIsUseCondenseResin(other.getIsUseCondenseResin());
-        }
         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;
@@ -653,40 +682,9 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
 
-      private int gadgetEntityId_ ;
-      /**
-       * <code>uint32 gadget_entity_id = 11;</code>
-       * @return The gadgetEntityId.
-       */
-      @java.lang.Override
-      public int getGadgetEntityId() {
-        return gadgetEntityId_;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 11;</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 = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetEntityId() {
-        
-        gadgetEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int uiInteractId_ ;
       /**
-       * <code>uint32 ui_interact_id = 7;</code>
+       * <code>uint32 ui_interact_id = 5;</code>
        * @return The uiInteractId.
        */
       @java.lang.Override
@@ -694,7 +692,7 @@ public final class GadgetInteractReqOuterClass {
         return uiInteractId_;
       }
       /**
-       * <code>uint32 ui_interact_id = 7;</code>
+       * <code>uint32 ui_interact_id = 5;</code>
        * @param value The uiInteractId to set.
        * @return This builder for chaining.
        */
@@ -705,7 +703,7 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 ui_interact_id = 7;</code>
+       * <code>uint32 ui_interact_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearUiInteractId() {
@@ -715,101 +713,16 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
 
-      private int resinCostType_ = 0;
-      /**
-       * <code>.ResinCostType resin_cost_type = 5;</code>
-       * @return The enum numeric value on the wire for resinCostType.
-       */
-      @java.lang.Override public int getResinCostTypeValue() {
-        return resinCostType_;
-      }
-      /**
-       * <code>.ResinCostType resin_cost_type = 5;</code>
-       * @param value The enum numeric value on the wire for resinCostType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setResinCostTypeValue(int value) {
-        
-        resinCostType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ResinCostType resin_cost_type = 5;</code>
-       * @return The resinCostType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType result = emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.valueOf(resinCostType_);
-        return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.ResinCostType resin_cost_type = 5;</code>
-       * @param value The resinCostType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setResinCostType(emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        resinCostType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ResinCostType resin_cost_type = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearResinCostType() {
-        
-        resinCostType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isUseCondenseResin_ ;
-      /**
-       * <code>bool is_use_condense_resin = 8;</code>
-       * @return The isUseCondenseResin.
-       */
-      @java.lang.Override
-      public boolean getIsUseCondenseResin() {
-        return isUseCondenseResin_;
-      }
-      /**
-       * <code>bool is_use_condense_resin = 8;</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 = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUseCondenseResin() {
-        
-        isUseCondenseResin_ = false;
-        onChanged();
-        return this;
-      }
-
       private int opType_ = 0;
       /**
-       * <code>.InterOpType op_type = 13;</code>
+       * <code>.InterOpType op_type = 4;</code>
        * @return The enum numeric value on the wire for opType.
        */
       @java.lang.Override public int getOpTypeValue() {
         return opType_;
       }
       /**
-       * <code>.InterOpType op_type = 13;</code>
+       * <code>.InterOpType op_type = 4;</code>
        * @param value The enum numeric value on the wire for opType to set.
        * @return This builder for chaining.
        */
@@ -820,7 +733,7 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 13;</code>
+       * <code>.InterOpType op_type = 4;</code>
        * @return The opType.
        */
       @java.lang.Override
@@ -830,7 +743,7 @@ public final class GadgetInteractReqOuterClass {
         return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InterOpType op_type = 13;</code>
+       * <code>.InterOpType op_type = 4;</code>
        * @param value The opType to set.
        * @return This builder for chaining.
        */
@@ -844,7 +757,7 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 13;</code>
+       * <code>.InterOpType op_type = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearOpType() {
@@ -854,9 +767,40 @@ public final class GadgetInteractReqOuterClass {
         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 = 6;</code>
+       * <code>uint32 gadget_id = 3;</code>
        * @return The gadgetId.
        */
       @java.lang.Override
@@ -864,7 +808,7 @@ public final class GadgetInteractReqOuterClass {
         return gadgetId_;
       }
       /**
-       * <code>uint32 gadget_id = 6;</code>
+       * <code>uint32 gadget_id = 3;</code>
        * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
@@ -875,7 +819,7 @@ public final class GadgetInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_id = 6;</code>
+       * <code>uint32 gadget_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetId() {
@@ -884,6 +828,122 @@ public final class GadgetInteractReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int resinCostType_ = 0;
+      /**
+       * <code>.ResinCostType resin_cost_type = 11;</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>
+       * @param value The enum numeric value on the wire for resinCostType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setResinCostTypeValue(int value) {
+        
+        resinCostType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * @return The resinCostType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType getResinCostType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType result = emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.valueOf(resinCostType_);
+        return result == null ? emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * @param value The resinCostType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setResinCostType(emu.grasscutter.net.proto.ResinCostTypeOuterClass.ResinCostType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        resinCostType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ResinCostType resin_cost_type = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearResinCostType() {
+        
+        resinCostType_ = 0;
+        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) {
@@ -951,29 +1011,29 @@ public final class GadgetInteractReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027GadgetInteractReq.proto\032\023ResinCostType" +
-      ".proto\032\021InterOpType.proto\"\277\001\n\021GadgetInte" +
-      "ractReq\022\030\n\020gadget_entity_id\030\013 \001(\r\022\026\n\016ui_" +
-      "interact_id\030\007 \001(\r\022\'\n\017resin_cost_type\030\005 \001" +
-      "(\0162\016.ResinCostType\022\035\n\025is_use_condense_re" +
-      "sin\030\010 \001(\010\022\035\n\007op_type\030\r \001(\0162\014.InterOpType" +
-      "\022\021\n\tgadget_id\030\006 \001(\rB\033\n\031emu.grasscutter.n" +
-      "et.protob\006proto3"
+      "\n\027GadgetInteractReq.proto\032\021InterOpType.p" +
+      "roto\032\023ResinCostType.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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor(),
         });
     internal_static_GadgetInteractReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_GadgetInteractReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GadgetInteractReq_descriptor,
-        new java.lang.String[] { "GadgetEntityId", "UiInteractId", "ResinCostType", "IsUseCondenseResin", "OpType", "GadgetId", });
-    emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "UiInteractId", "OpType", "IsUseCondenseResin", "GadgetId", "ResinCostType", "CHDDOFMLBLM", "GadgetEntityId", });
     emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ResinCostTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 c0f7d0720..1ace51f33 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetInteractRspOuterClass.java
@@ -19,51 +19,52 @@ public final class GadgetInteractRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gadget_entity_id = 12;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
-
-    /**
-     * <code>.InterOpType op_type = 5;</code>
+     * <code>.InterOpType op_type = 1;</code>
      * @return The enum numeric value on the wire for opType.
      */
     int getOpTypeValue();
     /**
-     * <code>.InterOpType op_type = 5;</code>
+     * <code>.InterOpType op_type = 1;</code>
      * @return The opType.
      */
     emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType();
 
     /**
-     * <code>.InteractType interact_type = 11;</code>
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint32 gadget_entity_id = 6;</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 = 11;</code>
+     * <code>.InteractType interact_type = 8;</code>
      * @return The interactType.
      */
     emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType();
 
     /**
-     * <code>uint32 gadget_id = 8;</code>
+     * <code>uint32 gadget_id = 9;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint32 CHDDOFMLBLM = 11;</code>
+     * @return The cHDDOFMLBLM.
      */
-    int getRetcode();
+    int getCHDDOFMLBLM();
   }
   /**
-   * <pre>
-   * CmdId: 29895
-   * Obf: OLJHDABEEPG
-   * </pre>
-   *
    * Protobuf type {@code GadgetInteractRsp}
    */
   public static final class GadgetInteractRsp extends
@@ -110,31 +111,36 @@ public final class GadgetInteractRspOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 8: {
               int rawValue = input.readEnum();
 
               opType_ = rawValue;
               break;
             }
-            case 64: {
-
-              gadgetId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 88: {
+            case 48: {
+
+              gadgetEntityId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
               int rawValue = input.readEnum();
 
               interactType_ = rawValue;
               break;
             }
-            case 96: {
+            case 72: {
 
-              gadgetEntityId_ = input.readUInt32();
+              gadgetId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              cHDDOFMLBLM_ = input.readUInt32();
               break;
             }
             default: {
@@ -169,28 +175,17 @@ public final class GadgetInteractRspOuterClass {
               emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.class, emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.Builder.class);
     }
 
-    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_;
-    }
-
-    public static final int OP_TYPE_FIELD_NUMBER = 5;
+    public static final int OP_TYPE_FIELD_NUMBER = 1;
     private int opType_;
     /**
-     * <code>.InterOpType op_type = 5;</code>
+     * <code>.InterOpType op_type = 1;</code>
      * @return The enum numeric value on the wire for opType.
      */
     @java.lang.Override public int getOpTypeValue() {
       return opType_;
     }
     /**
-     * <code>.InterOpType op_type = 5;</code>
+     * <code>.InterOpType op_type = 1;</code>
      * @return The opType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType getOpType() {
@@ -199,17 +194,39 @@ public final class GadgetInteractRspOuterClass {
       return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 11;
+    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 GADGET_ENTITY_ID_FIELD_NUMBER = 6;
+    private int gadgetEntityId_;
+    /**
+     * <code>uint32 gadget_entity_id = 6;</code>
+     * @return The gadgetEntityId.
+     */
+    @java.lang.Override
+    public int getGadgetEntityId() {
+      return gadgetEntityId_;
+    }
+
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 8;
     private int interactType_;
     /**
-     * <code>.InteractType interact_type = 11;</code>
+     * <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 = 11;</code>
+     * <code>.InteractType interact_type = 8;</code>
      * @return The interactType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType getInteractType() {
@@ -218,10 +235,10 @@ public final class GadgetInteractRspOuterClass {
       return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
     }
 
-    public static final int GADGET_ID_FIELD_NUMBER = 8;
+    public static final int GADGET_ID_FIELD_NUMBER = 9;
     private int gadgetId_;
     /**
-     * <code>uint32 gadget_id = 8;</code>
+     * <code>uint32 gadget_id = 9;</code>
      * @return The gadgetId.
      */
     @java.lang.Override
@@ -229,15 +246,15 @@ public final class GadgetInteractRspOuterClass {
       return gadgetId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
-    private int retcode_;
+    public static final int CHDDOFMLBLM_FIELD_NUMBER = 11;
+    private int cHDDOFMLBLM_;
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
+     * <code>uint32 CHDDOFMLBLM = 11;</code>
+     * @return The cHDDOFMLBLM.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getCHDDOFMLBLM() {
+      return cHDDOFMLBLM_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -255,19 +272,22 @@ public final class GadgetInteractRspOuterClass {
     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(5, opType_);
-      }
-      if (gadgetId_ != 0) {
-        output.writeUInt32(8, gadgetId_);
+        output.writeEnum(1, opType_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(11, interactType_);
+        output.writeInt32(5, retcode_);
       }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(12, gadgetEntityId_);
+        output.writeUInt32(6, 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 (cHDDOFMLBLM_ != 0) {
+        output.writeUInt32(11, cHDDOFMLBLM_);
       }
       unknownFields.writeTo(output);
     }
@@ -280,23 +300,27 @@ public final class GadgetInteractRspOuterClass {
       size = 0;
       if (opType_ != emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.INTER_OP_TYPE_FINISH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, opType_);
-      }
-      if (gadgetId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, gadgetId_);
+          .computeEnumSize(1, opType_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, interactType_);
+          .computeInt32Size(5, retcode_);
       }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gadgetEntityId_);
+          .computeUInt32Size(6, gadgetEntityId_);
+      }
+      if (interactType_ != emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.INTERACT_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(8, interactType_);
+      }
+      if (gadgetId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, gadgetId_);
+      }
+      if (cHDDOFMLBLM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, cHDDOFMLBLM_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,14 +337,16 @@ public final class GadgetInteractRspOuterClass {
       }
       emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp other = (emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp) obj;
 
+      if (opType_ != other.opType_) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getGadgetEntityId()
           != other.getGadgetEntityId()) return false;
-      if (opType_ != other.opType_) return false;
       if (interactType_ != other.interactType_) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
+      if (getCHDDOFMLBLM()
+          != other.getCHDDOFMLBLM()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -332,16 +358,18 @@ public final class GadgetInteractRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      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) + 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) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CHDDOFMLBLM_FIELD_NUMBER;
+      hash = (53 * hash) + getCHDDOFMLBLM();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -438,11 +466,6 @@ public final class GadgetInteractRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29895
-     * Obf: OLJHDABEEPG
-     * </pre>
-     *
      * Protobuf type {@code GadgetInteractRsp}
      */
     public static final class Builder extends
@@ -480,15 +503,17 @@ public final class GadgetInteractRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gadgetEntityId_ = 0;
-
         opType_ = 0;
 
+        retcode_ = 0;
+
+        gadgetEntityId_ = 0;
+
         interactType_ = 0;
 
         gadgetId_ = 0;
 
-        retcode_ = 0;
+        cHDDOFMLBLM_ = 0;
 
         return this;
       }
@@ -516,11 +541,12 @@ public final class GadgetInteractRspOuterClass {
       @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.gadgetEntityId_ = gadgetEntityId_;
         result.opType_ = opType_;
+        result.retcode_ = retcode_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         result.interactType_ = interactType_;
         result.gadgetId_ = gadgetId_;
-        result.retcode_ = retcode_;
+        result.cHDDOFMLBLM_ = cHDDOFMLBLM_;
         onBuilt();
         return result;
       }
@@ -569,20 +595,23 @@ public final class GadgetInteractRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp other) {
         if (other == emu.grasscutter.net.proto.GadgetInteractRspOuterClass.GadgetInteractRsp.getDefaultInstance()) return this;
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         if (other.opType_ != 0) {
           setOpTypeValue(other.getOpTypeValue());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getGadgetEntityId() != 0) {
+          setGadgetEntityId(other.getGadgetEntityId());
+        }
         if (other.interactType_ != 0) {
           setInteractTypeValue(other.getInteractTypeValue());
         }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getCHDDOFMLBLM() != 0) {
+          setCHDDOFMLBLM(other.getCHDDOFMLBLM());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -613,47 +642,16 @@ public final class GadgetInteractRspOuterClass {
         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;
-      }
-
       private int opType_ = 0;
       /**
-       * <code>.InterOpType op_type = 5;</code>
+       * <code>.InterOpType op_type = 1;</code>
        * @return The enum numeric value on the wire for opType.
        */
       @java.lang.Override public int getOpTypeValue() {
         return opType_;
       }
       /**
-       * <code>.InterOpType op_type = 5;</code>
+       * <code>.InterOpType op_type = 1;</code>
        * @param value The enum numeric value on the wire for opType to set.
        * @return This builder for chaining.
        */
@@ -664,7 +662,7 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 5;</code>
+       * <code>.InterOpType op_type = 1;</code>
        * @return The opType.
        */
       @java.lang.Override
@@ -674,7 +672,7 @@ public final class GadgetInteractRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.InterOpTypeOuterClass.InterOpType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InterOpType op_type = 5;</code>
+       * <code>.InterOpType op_type = 1;</code>
        * @param value The opType to set.
        * @return This builder for chaining.
        */
@@ -688,7 +686,7 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.InterOpType op_type = 5;</code>
+       * <code>.InterOpType op_type = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearOpType() {
@@ -698,16 +696,78 @@ public final class GadgetInteractRspOuterClass {
         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 gadgetEntityId_ ;
+      /**
+       * <code>uint32 gadget_entity_id = 6;</code>
+       * @return The gadgetEntityId.
+       */
+      @java.lang.Override
+      public int getGadgetEntityId() {
+        return gadgetEntityId_;
+      }
+      /**
+       * <code>uint32 gadget_entity_id = 6;</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 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetEntityId() {
+        
+        gadgetEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int interactType_ = 0;
       /**
-       * <code>.InteractType interact_type = 11;</code>
+       * <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 = 11;</code>
+       * <code>.InteractType interact_type = 8;</code>
        * @param value The enum numeric value on the wire for interactType to set.
        * @return This builder for chaining.
        */
@@ -718,7 +778,7 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.InteractType interact_type = 11;</code>
+       * <code>.InteractType interact_type = 8;</code>
        * @return The interactType.
        */
       @java.lang.Override
@@ -728,7 +788,7 @@ public final class GadgetInteractRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.InteractTypeOuterClass.InteractType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InteractType interact_type = 11;</code>
+       * <code>.InteractType interact_type = 8;</code>
        * @param value The interactType to set.
        * @return This builder for chaining.
        */
@@ -742,7 +802,7 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.InteractType interact_type = 11;</code>
+       * <code>.InteractType interact_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearInteractType() {
@@ -754,7 +814,7 @@ public final class GadgetInteractRspOuterClass {
 
       private int gadgetId_ ;
       /**
-       * <code>uint32 gadget_id = 8;</code>
+       * <code>uint32 gadget_id = 9;</code>
        * @return The gadgetId.
        */
       @java.lang.Override
@@ -762,7 +822,7 @@ public final class GadgetInteractRspOuterClass {
         return gadgetId_;
       }
       /**
-       * <code>uint32 gadget_id = 8;</code>
+       * <code>uint32 gadget_id = 9;</code>
        * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
@@ -773,7 +833,7 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_id = 8;</code>
+       * <code>uint32 gadget_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetId() {
@@ -783,33 +843,33 @@ public final class GadgetInteractRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
+      private int cHDDOFMLBLM_ ;
       /**
-       * <code>int32 retcode = 10;</code>
-       * @return The retcode.
+       * <code>uint32 CHDDOFMLBLM = 11;</code>
+       * @return The cHDDOFMLBLM.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getCHDDOFMLBLM() {
+        return cHDDOFMLBLM_;
       }
       /**
-       * <code>int32 retcode = 10;</code>
-       * @param value The retcode to set.
+       * <code>uint32 CHDDOFMLBLM = 11;</code>
+       * @param value The cHDDOFMLBLM to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setCHDDOFMLBLM(int value) {
         
-        retcode_ = value;
+        cHDDOFMLBLM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>uint32 CHDDOFMLBLM = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearCHDDOFMLBLM() {
         
-        retcode_ = 0;
+        cHDDOFMLBLM_ = 0;
         onChanged();
         return this;
       }
@@ -881,12 +941,12 @@ public final class GadgetInteractRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027GadgetInteractRsp.proto\032\021InterOpType.p" +
-      "roto\032\022InteractType.proto\"\226\001\n\021GadgetInter" +
-      "actRsp\022\030\n\020gadget_entity_id\030\014 \001(\r\022\035\n\007op_t" +
-      "ype\030\005 \001(\0162\014.InterOpType\022$\n\rinteract_type" +
-      "\030\013 \001(\0162\r.InteractType\022\021\n\tgadget_id\030\010 \001(\r" +
-      "\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -899,7 +959,7 @@ public final class GadgetInteractRspOuterClass {
     internal_static_GadgetInteractRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GadgetInteractRsp_descriptor,
-        new java.lang.String[] { "GadgetEntityId", "OpType", "InteractType", "GadgetId", "Retcode", });
+        new java.lang.String[] { "OpType", "Retcode", "GadgetEntityId", "InteractType", "GadgetId", "CHDDOFMLBLM", });
     emu.grasscutter.net.proto.InterOpTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.InteractTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetPlayInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetPlayInfoOuterClass.java
index c87de3b6e..b54e5d276 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetPlayInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetPlayInfoOuterClass.java
@@ -82,7 +82,7 @@ public final class GadgetPlayInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: LJJODNPIMAI
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code GadgetPlayInfo}
@@ -580,7 +580,7 @@ public final class GadgetPlayInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: LJJODNPIMAI
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code GadgetPlayInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GadgetStateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GadgetStateNotifyOuterClass.java
index f4402cbdb..bbd9f2767 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GadgetStateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GadgetStateNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class GadgetStateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_enable_interact = 12;</code>
+     * <code>bool is_enable_interact = 1;</code>
      * @return The isEnableInteract.
      */
     boolean getIsEnableInteract();
 
     /**
-     * <code>uint32 gadget_entity_id = 3;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
-
-    /**
-     * <code>uint32 gadget_state = 1;</code>
+     * <code>uint32 gadget_state = 13;</code>
      * @return The gadgetState.
      */
     int getGadgetState();
+
+    /**
+     * <code>uint32 gadget_entity_id = 14;</code>
+     * @return The gadgetEntityId.
+     */
+    int getGadgetEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 2075
-   * Obf: DAHKNOFELFH
-   * </pre>
-   *
    * Protobuf type {@code GadgetStateNotify}
    */
   public static final class GadgetStateNotify extends
@@ -88,19 +83,19 @@ public final class GadgetStateNotifyOuterClass {
               break;
             case 8: {
 
+              isEnableInteract_ = input.readBool();
+              break;
+            }
+            case 104: {
+
               gadgetState_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 112: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 96: {
-
-              isEnableInteract_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class GadgetStateNotifyOuterClass {
               emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify.class, emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify.Builder.class);
     }
 
-    public static final int IS_ENABLE_INTERACT_FIELD_NUMBER = 12;
+    public static final int IS_ENABLE_INTERACT_FIELD_NUMBER = 1;
     private boolean isEnableInteract_;
     /**
-     * <code>bool is_enable_interact = 12;</code>
+     * <code>bool is_enable_interact = 1;</code>
      * @return The isEnableInteract.
      */
     @java.lang.Override
@@ -144,21 +139,10 @@ public final class GadgetStateNotifyOuterClass {
       return isEnableInteract_;
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 3;
-    private int gadgetEntityId_;
-    /**
-     * <code>uint32 gadget_entity_id = 3;</code>
-     * @return The gadgetEntityId.
-     */
-    @java.lang.Override
-    public int getGadgetEntityId() {
-      return gadgetEntityId_;
-    }
-
-    public static final int GADGET_STATE_FIELD_NUMBER = 1;
+    public static final int GADGET_STATE_FIELD_NUMBER = 13;
     private int gadgetState_;
     /**
-     * <code>uint32 gadget_state = 1;</code>
+     * <code>uint32 gadget_state = 13;</code>
      * @return The gadgetState.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class GadgetStateNotifyOuterClass {
       return gadgetState_;
     }
 
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 14;
+    private int gadgetEntityId_;
+    /**
+     * <code>uint32 gadget_entity_id = 14;</code>
+     * @return The gadgetEntityId.
+     */
+    @java.lang.Override
+    public int getGadgetEntityId() {
+      return gadgetEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class GadgetStateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (isEnableInteract_ != false) {
+        output.writeBool(1, isEnableInteract_);
+      }
       if (gadgetState_ != 0) {
-        output.writeUInt32(1, gadgetState_);
+        output.writeUInt32(13, gadgetState_);
       }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(3, gadgetEntityId_);
-      }
-      if (isEnableInteract_ != false) {
-        output.writeBool(12, isEnableInteract_);
+        output.writeUInt32(14, gadgetEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class GadgetStateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isEnableInteract_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1, isEnableInteract_);
+      }
       if (gadgetState_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, gadgetState_);
+          .computeUInt32Size(13, gadgetState_);
       }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, gadgetEntityId_);
-      }
-      if (isEnableInteract_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isEnableInteract_);
+          .computeUInt32Size(14, gadgetEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +222,10 @@ public final class GadgetStateNotifyOuterClass {
 
       if (getIsEnableInteract()
           != other.getIsEnableInteract()) return false;
-      if (getGadgetEntityId()
-          != other.getGadgetEntityId()) return false;
       if (getGadgetState()
           != other.getGadgetState()) return false;
+      if (getGadgetEntityId()
+          != other.getGadgetEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,10 +240,10 @@ public final class GadgetStateNotifyOuterClass {
       hash = (37 * hash) + IS_ENABLE_INTERACT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEnableInteract());
-      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetEntityId();
       hash = (37 * hash) + GADGET_STATE_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetState();
+      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class GadgetStateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2075
-     * Obf: DAHKNOFELFH
-     * </pre>
-     *
      * Protobuf type {@code GadgetStateNotify}
      */
     public static final class Builder extends
@@ -389,10 +379,10 @@ public final class GadgetStateNotifyOuterClass {
         super.clear();
         isEnableInteract_ = false;
 
-        gadgetEntityId_ = 0;
-
         gadgetState_ = 0;
 
+        gadgetEntityId_ = 0;
+
         return this;
       }
 
@@ -420,8 +410,8 @@ public final class GadgetStateNotifyOuterClass {
       public emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify buildPartial() {
         emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify result = new emu.grasscutter.net.proto.GadgetStateNotifyOuterClass.GadgetStateNotify(this);
         result.isEnableInteract_ = isEnableInteract_;
-        result.gadgetEntityId_ = gadgetEntityId_;
         result.gadgetState_ = gadgetState_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         onBuilt();
         return result;
       }
@@ -473,12 +463,12 @@ public final class GadgetStateNotifyOuterClass {
         if (other.getIsEnableInteract() != false) {
           setIsEnableInteract(other.getIsEnableInteract());
         }
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         if (other.getGadgetState() != 0) {
           setGadgetState(other.getGadgetState());
         }
+        if (other.getGadgetEntityId() != 0) {
+          setGadgetEntityId(other.getGadgetEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -510,7 +500,7 @@ public final class GadgetStateNotifyOuterClass {
 
       private boolean isEnableInteract_ ;
       /**
-       * <code>bool is_enable_interact = 12;</code>
+       * <code>bool is_enable_interact = 1;</code>
        * @return The isEnableInteract.
        */
       @java.lang.Override
@@ -518,7 +508,7 @@ public final class GadgetStateNotifyOuterClass {
         return isEnableInteract_;
       }
       /**
-       * <code>bool is_enable_interact = 12;</code>
+       * <code>bool is_enable_interact = 1;</code>
        * @param value The isEnableInteract to set.
        * @return This builder for chaining.
        */
@@ -529,7 +519,7 @@ public final class GadgetStateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enable_interact = 12;</code>
+       * <code>bool is_enable_interact = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnableInteract() {
@@ -539,40 +529,9 @@ public final class GadgetStateNotifyOuterClass {
         return this;
       }
 
-      private int gadgetEntityId_ ;
-      /**
-       * <code>uint32 gadget_entity_id = 3;</code>
-       * @return The gadgetEntityId.
-       */
-      @java.lang.Override
-      public int getGadgetEntityId() {
-        return gadgetEntityId_;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetEntityId() {
-        
-        gadgetEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int gadgetState_ ;
       /**
-       * <code>uint32 gadget_state = 1;</code>
+       * <code>uint32 gadget_state = 13;</code>
        * @return The gadgetState.
        */
       @java.lang.Override
@@ -580,7 +539,7 @@ public final class GadgetStateNotifyOuterClass {
         return gadgetState_;
       }
       /**
-       * <code>uint32 gadget_state = 1;</code>
+       * <code>uint32 gadget_state = 13;</code>
        * @param value The gadgetState to set.
        * @return This builder for chaining.
        */
@@ -591,7 +550,7 @@ public final class GadgetStateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_state = 1;</code>
+       * <code>uint32 gadget_state = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetState() {
@@ -600,6 +559,37 @@ public final class GadgetStateNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int gadgetEntityId_ ;
+      /**
+       * <code>uint32 gadget_entity_id = 14;</code>
+       * @return The gadgetEntityId.
+       */
+      @java.lang.Override
+      public int getGadgetEntityId() {
+        return gadgetEntityId_;
+      }
+      /**
+       * <code>uint32 gadget_entity_id = 14;</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 = 14;</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) {
@@ -668,8 +658,8 @@ public final class GadgetStateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027GadgetStateNotify.proto\"_\n\021GadgetState" +
-      "Notify\022\032\n\022is_enable_interact\030\014 \001(\010\022\030\n\020ga" +
-      "dget_entity_id\030\003 \001(\r\022\024\n\014gadget_state\030\001 \001" +
+      "Notify\022\032\n\022is_enable_interact\030\001 \001(\010\022\024\n\014ga" +
+      "dget_state\030\r \001(\r\022\030\n\020gadget_entity_id\030\016 \001" +
       "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class GadgetStateNotifyOuterClass {
     internal_static_GadgetStateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GadgetStateNotify_descriptor,
-        new java.lang.String[] { "IsEnableInteract", "GadgetEntityId", "GadgetState", });
+        new java.lang.String[] { "IsEnableInteract", "GadgetState", "GadgetEntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GalleryStartSourceOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GalleryStartSourceOuterClass.java
index 8ae6fb96a..c7cd0407c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GalleryStartSourceOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GalleryStartSourceOuterClass.java
@@ -15,10 +15,6 @@ public final class GalleryStartSourceOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: KENCCPDLDJG
-   * </pre>
-   *
    * Protobuf enum {@code GalleryStartSource}
    */
   public enum GalleryStartSource
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GalleryWillStartCountdownNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GalleryWillStartCountdownNotifyOuterClass.java
index 6728506b8..7a7f34ac0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GalleryWillStartCountdownNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GalleryWillStartCountdownNotifyOuterClass.java
@@ -19,40 +19,35 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.GalleryStartSource start_source = 11;</code>
-     * @return The enum numeric value on the wire for startSource.
-     */
-    int getStartSourceValue();
-    /**
-     * <code>.GalleryStartSource start_source = 11;</code>
-     * @return The startSource.
-     */
-    emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource getStartSource();
-
-    /**
-     * <code>bool is_end = 9;</code>
+     * <code>bool is_end = 2;</code>
      * @return The isEnd.
      */
     boolean getIsEnd();
 
     /**
-     * <code>uint32 end_time = 4;</code>
-     * @return The endTime.
+     * <code>.GalleryStartSource start_source = 7;</code>
+     * @return The enum numeric value on the wire for startSource.
      */
-    int getEndTime();
+    int getStartSourceValue();
+    /**
+     * <code>.GalleryStartSource start_source = 7;</code>
+     * @return The startSource.
+     */
+    emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource getStartSource();
 
     /**
-     * <code>uint32 gallery_id = 6;</code>
+     * <code>uint32 gallery_id = 10;</code>
      * @return The galleryId.
      */
     int getGalleryId();
+
+    /**
+     * <code>uint32 end_time = 14;</code>
+     * @return The endTime.
+     */
+    int getEndTime();
   }
   /**
-   * <pre>
-   * CmdId: 26134
-   * Obf: KCENJJNMBDM
-   * </pre>
-   *
    * Protobuf type {@code GalleryWillStartCountdownNotify}
    */
   public static final class GalleryWillStartCountdownNotify extends
@@ -98,27 +93,27 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              galleryId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 16: {
 
               isEnd_ = input.readBool();
               break;
             }
-            case 88: {
+            case 56: {
               int rawValue = input.readEnum();
 
               startSource_ = rawValue;
               break;
             }
+            case 80: {
+
+              galleryId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              endTime_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -151,17 +146,28 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
               emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify.class, emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify.Builder.class);
     }
 
-    public static final int START_SOURCE_FIELD_NUMBER = 11;
+    public static final int IS_END_FIELD_NUMBER = 2;
+    private boolean isEnd_;
+    /**
+     * <code>bool is_end = 2;</code>
+     * @return The isEnd.
+     */
+    @java.lang.Override
+    public boolean getIsEnd() {
+      return isEnd_;
+    }
+
+    public static final int START_SOURCE_FIELD_NUMBER = 7;
     private int startSource_;
     /**
-     * <code>.GalleryStartSource start_source = 11;</code>
+     * <code>.GalleryStartSource start_source = 7;</code>
      * @return The enum numeric value on the wire for startSource.
      */
     @java.lang.Override public int getStartSourceValue() {
       return startSource_;
     }
     /**
-     * <code>.GalleryStartSource start_source = 11;</code>
+     * <code>.GalleryStartSource start_source = 7;</code>
      * @return The startSource.
      */
     @java.lang.Override public emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource getStartSource() {
@@ -170,32 +176,10 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource.UNRECOGNIZED : result;
     }
 
-    public static final int IS_END_FIELD_NUMBER = 9;
-    private boolean isEnd_;
-    /**
-     * <code>bool is_end = 9;</code>
-     * @return The isEnd.
-     */
-    @java.lang.Override
-    public boolean getIsEnd() {
-      return isEnd_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 4;
-    private int endTime_;
-    /**
-     * <code>uint32 end_time = 4;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int GALLERY_ID_FIELD_NUMBER = 6;
+    public static final int GALLERY_ID_FIELD_NUMBER = 10;
     private int galleryId_;
     /**
-     * <code>uint32 gallery_id = 6;</code>
+     * <code>uint32 gallery_id = 10;</code>
      * @return The galleryId.
      */
     @java.lang.Override
@@ -203,6 +187,17 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       return galleryId_;
     }
 
+    public static final int END_TIME_FIELD_NUMBER = 14;
+    private int endTime_;
+    /**
+     * <code>uint32 end_time = 14;</code>
+     * @return The endTime.
+     */
+    @java.lang.Override
+    public int getEndTime() {
+      return endTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -217,17 +212,17 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (endTime_ != 0) {
-        output.writeUInt32(4, endTime_);
-      }
-      if (galleryId_ != 0) {
-        output.writeUInt32(6, galleryId_);
-      }
       if (isEnd_ != false) {
-        output.writeBool(9, isEnd_);
+        output.writeBool(2, isEnd_);
       }
       if (startSource_ != emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource.GALLERY_START_BY_NONE.getNumber()) {
-        output.writeEnum(11, startSource_);
+        output.writeEnum(7, startSource_);
+      }
+      if (galleryId_ != 0) {
+        output.writeUInt32(10, galleryId_);
+      }
+      if (endTime_ != 0) {
+        output.writeUInt32(14, endTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -238,21 +233,21 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, endTime_);
-      }
-      if (galleryId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, galleryId_);
-      }
       if (isEnd_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isEnd_);
+          .computeBoolSize(2, isEnd_);
       }
       if (startSource_ != emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource.GALLERY_START_BY_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, startSource_);
+          .computeEnumSize(7, startSource_);
+      }
+      if (galleryId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, galleryId_);
+      }
+      if (endTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, endTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -269,13 +264,13 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       }
       emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify other = (emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify) obj;
 
-      if (startSource_ != other.startSource_) return false;
       if (getIsEnd()
           != other.getIsEnd()) return false;
-      if (getEndTime()
-          != other.getEndTime()) return false;
+      if (startSource_ != other.startSource_) return false;
       if (getGalleryId()
           != other.getGalleryId()) return false;
+      if (getEndTime()
+          != other.getEndTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -287,15 +282,15 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + START_SOURCE_FIELD_NUMBER;
-      hash = (53 * hash) + startSource_;
       hash = (37 * hash) + IS_END_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEnd());
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
+      hash = (37 * hash) + START_SOURCE_FIELD_NUMBER;
+      hash = (53 * hash) + startSource_;
       hash = (37 * hash) + GALLERY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGalleryId();
+      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getEndTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -392,11 +387,6 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26134
-     * Obf: KCENJJNMBDM
-     * </pre>
-     *
      * Protobuf type {@code GalleryWillStartCountdownNotify}
      */
     public static final class Builder extends
@@ -434,14 +424,14 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        startSource_ = 0;
-
         isEnd_ = false;
 
-        endTime_ = 0;
+        startSource_ = 0;
 
         galleryId_ = 0;
 
+        endTime_ = 0;
+
         return this;
       }
 
@@ -468,10 +458,10 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify buildPartial() {
         emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify result = new emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify(this);
-        result.startSource_ = startSource_;
         result.isEnd_ = isEnd_;
-        result.endTime_ = endTime_;
+        result.startSource_ = startSource_;
         result.galleryId_ = galleryId_;
+        result.endTime_ = endTime_;
         onBuilt();
         return result;
       }
@@ -520,18 +510,18 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify other) {
         if (other == emu.grasscutter.net.proto.GalleryWillStartCountdownNotifyOuterClass.GalleryWillStartCountdownNotify.getDefaultInstance()) return this;
-        if (other.startSource_ != 0) {
-          setStartSourceValue(other.getStartSourceValue());
-        }
         if (other.getIsEnd() != false) {
           setIsEnd(other.getIsEnd());
         }
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
+        if (other.startSource_ != 0) {
+          setStartSourceValue(other.getStartSourceValue());
         }
         if (other.getGalleryId() != 0) {
           setGalleryId(other.getGalleryId());
         }
+        if (other.getEndTime() != 0) {
+          setEndTime(other.getEndTime());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -561,16 +551,47 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return this;
       }
 
+      private boolean isEnd_ ;
+      /**
+       * <code>bool is_end = 2;</code>
+       * @return The isEnd.
+       */
+      @java.lang.Override
+      public boolean getIsEnd() {
+        return isEnd_;
+      }
+      /**
+       * <code>bool is_end = 2;</code>
+       * @param value The isEnd to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsEnd(boolean value) {
+        
+        isEnd_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_end = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsEnd() {
+        
+        isEnd_ = false;
+        onChanged();
+        return this;
+      }
+
       private int startSource_ = 0;
       /**
-       * <code>.GalleryStartSource start_source = 11;</code>
+       * <code>.GalleryStartSource start_source = 7;</code>
        * @return The enum numeric value on the wire for startSource.
        */
       @java.lang.Override public int getStartSourceValue() {
         return startSource_;
       }
       /**
-       * <code>.GalleryStartSource start_source = 11;</code>
+       * <code>.GalleryStartSource start_source = 7;</code>
        * @param value The enum numeric value on the wire for startSource to set.
        * @return This builder for chaining.
        */
@@ -581,7 +602,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.GalleryStartSource start_source = 11;</code>
+       * <code>.GalleryStartSource start_source = 7;</code>
        * @return The startSource.
        */
       @java.lang.Override
@@ -591,7 +612,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.GalleryStartSourceOuterClass.GalleryStartSource.UNRECOGNIZED : result;
       }
       /**
-       * <code>.GalleryStartSource start_source = 11;</code>
+       * <code>.GalleryStartSource start_source = 7;</code>
        * @param value The startSource to set.
        * @return This builder for chaining.
        */
@@ -605,7 +626,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.GalleryStartSource start_source = 11;</code>
+       * <code>.GalleryStartSource start_source = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearStartSource() {
@@ -615,71 +636,9 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return this;
       }
 
-      private boolean isEnd_ ;
-      /**
-       * <code>bool is_end = 9;</code>
-       * @return The isEnd.
-       */
-      @java.lang.Override
-      public boolean getIsEnd() {
-        return isEnd_;
-      }
-      /**
-       * <code>bool is_end = 9;</code>
-       * @param value The isEnd to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsEnd(boolean value) {
-        
-        isEnd_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_end = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsEnd() {
-        
-        isEnd_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int endTime_ ;
-      /**
-       * <code>uint32 end_time = 4;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>uint32 end_time = 4;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 end_time = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int galleryId_ ;
       /**
-       * <code>uint32 gallery_id = 6;</code>
+       * <code>uint32 gallery_id = 10;</code>
        * @return The galleryId.
        */
       @java.lang.Override
@@ -687,7 +646,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return galleryId_;
       }
       /**
-       * <code>uint32 gallery_id = 6;</code>
+       * <code>uint32 gallery_id = 10;</code>
        * @param value The galleryId to set.
        * @return This builder for chaining.
        */
@@ -698,7 +657,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gallery_id = 6;</code>
+       * <code>uint32 gallery_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearGalleryId() {
@@ -707,6 +666,37 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int endTime_ ;
+      /**
+       * <code>uint32 end_time = 14;</code>
+       * @return The endTime.
+       */
+      @java.lang.Override
+      public int getEndTime() {
+        return endTime_;
+      }
+      /**
+       * <code>uint32 end_time = 14;</code>
+       * @param value The endTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEndTime(int value) {
+        
+        endTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 end_time = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEndTime() {
+        
+        endTime_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -776,9 +766,9 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n%GalleryWillStartCountdownNotify.proto\032" +
       "\030GalleryStartSource.proto\"\202\001\n\037GalleryWil" +
-      "lStartCountdownNotify\022)\n\014start_source\030\013 " +
-      "\001(\0162\023.GalleryStartSource\022\016\n\006is_end\030\t \001(\010" +
-      "\022\020\n\010end_time\030\004 \001(\r\022\022\n\ngallery_id\030\006 \001(\rB\033" +
+      "lStartCountdownNotify\022\016\n\006is_end\030\002 \001(\010\022)\n" +
+      "\014start_source\030\007 \001(\0162\023.GalleryStartSource" +
+      "\022\022\n\ngallery_id\030\n \001(\r\022\020\n\010end_time\030\016 \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -791,7 +781,7 @@ public final class GalleryWillStartCountdownNotifyOuterClass {
     internal_static_GalleryWillStartCountdownNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GalleryWillStartCountdownNotify_descriptor,
-        new java.lang.String[] { "StartSource", "IsEnd", "EndTime", "GalleryId", });
+        new java.lang.String[] { "IsEnd", "StartSource", "GalleryId", "EndTime", });
     emu.grasscutter.net.proto.GalleryStartSourceOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GatherGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GatherGadgetInfoOuterClass.java
index 7bc74f58f..c14d7635a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GatherGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GatherGadgetInfoOuterClass.java
@@ -32,7 +32,7 @@ public final class GatherGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: IHPBLNPFECK
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code GatherGadgetInfo}
@@ -312,7 +312,7 @@ public final class GatherGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: IHPBLNPFECK
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code GatherGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoReqOuterClass.java
index 70c7c0514..2076cb929 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoReqOuterClass.java
@@ -19,28 +19,23 @@ public final class GetActivityInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @return A list containing the activityIdList.
      */
     java.util.List<java.lang.Integer> getActivityIdListList();
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @return The count of activityIdList.
      */
     int getActivityIdListCount();
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The activityIdList at the given index.
      */
     int getActivityIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 25586
-   * Obf: OOBNLCBIPJK
-   * </pre>
-   *
    * Protobuf type {@code GetActivityInfoReq}
    */
   public static final class GetActivityInfoReq extends
@@ -87,7 +82,7 @@ public final class GetActivityInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 56: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class GetActivityInfoReqOuterClass {
               activityIdList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 58: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class GetActivityInfoReqOuterClass {
               emu.grasscutter.net.proto.GetActivityInfoReqOuterClass.GetActivityInfoReq.class, emu.grasscutter.net.proto.GetActivityInfoReqOuterClass.GetActivityInfoReq.Builder.class);
     }
 
-    public static final int ACTIVITY_ID_LIST_FIELD_NUMBER = 9;
+    public static final int ACTIVITY_ID_LIST_FIELD_NUMBER = 7;
     private com.google.protobuf.Internal.IntList activityIdList_;
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @return A list containing the activityIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class GetActivityInfoReqOuterClass {
       return activityIdList_;
     }
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @return The count of activityIdList.
      */
     public int getActivityIdListCount() {
       return activityIdList_.size();
     }
     /**
-     * <code>repeated uint32 activity_id_list = 9;</code>
+     * <code>repeated uint32 activity_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The activityIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class GetActivityInfoReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getActivityIdListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(58);
         output.writeUInt32NoTag(activityIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < activityIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class GetActivityInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25586
-     * Obf: OOBNLCBIPJK
-     * </pre>
-     *
      * Protobuf type {@code GetActivityInfoReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class GetActivityInfoReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @return A list containing the activityIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class GetActivityInfoReqOuterClass {
                  java.util.Collections.unmodifiableList(activityIdList_) : activityIdList_;
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @return The count of activityIdList.
        */
       public int getActivityIdListCount() {
         return activityIdList_.size();
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @param index The index of the element to return.
        * @return The activityIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class GetActivityInfoReqOuterClass {
         return activityIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @param index The index to set the value at.
        * @param value The activityIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class GetActivityInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @param value The activityIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class GetActivityInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @param values The activityIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class GetActivityInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 activity_id_list = 9;</code>
+       * <code>repeated uint32 activity_id_list = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearActivityIdList() {
@@ -654,7 +644,7 @@ public final class GetActivityInfoReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030GetActivityInfoReq.proto\".\n\022GetActivit" +
-      "yInfoReq\022\030\n\020activity_id_list\030\t \003(\rB\033\n\031em" +
+      "yInfoReq\022\030\n\020activity_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/GetActivityInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
index 9aeb42b99..512e88d54 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityInfoRspOuterClass.java
@@ -43,58 +43,53 @@ public final class GetActivityInfoRspOuterClass {
         int index);
 
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
+        getDisableTransferPointInteractionListList();
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
+     */
+    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index);
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
+     */
+    int getDisableTransferPointInteractionListCount();
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
+        getDisableTransferPointInteractionListOrBuilderList();
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
+     */
+    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @return A list containing the activatedSaleIdList.
      */
     java.util.List<java.lang.Integer> getActivatedSaleIdListList();
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @return The count of activatedSaleIdList.
      */
     int getActivatedSaleIdListCount();
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The activatedSaleIdList at the given index.
      */
     int getActivatedSaleIdList(int index);
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
-
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> 
-        getDisableTransferPointInteractionListList();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index);
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
-     */
-    int getDisableTransferPointInteractionListCount();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
-        getDisableTransferPointInteractionListOrBuilderList();
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
-        int index);
   }
   /**
-   * <pre>
-   * CmdId: 7972
-   * Obf: KFLFLAMEHIJ
-   * </pre>
-   *
    * Protobuf type {@code GetActivityInfoRsp}
    */
   public static final class GetActivityInfoRsp extends
@@ -108,8 +103,8 @@ public final class GetActivityInfoRspOuterClass {
     }
     private GetActivityInfoRsp() {
       activityInfoList_ = java.util.Collections.emptyList();
-      activatedSaleIdList_ = emptyIntList();
       disableTransferPointInteractionList_ = java.util.Collections.emptyList();
+      activatedSaleIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -152,25 +147,29 @@ public final class GetActivityInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ActivityInfoOuterClass.ActivityInfo.parser(), extensionRegistry));
               break;
             }
-            case 32: {
-
-              retcode_ = input.readInt32();
+            case 42: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              disableTransferPointInteractionList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.parser(), extensionRegistry));
               break;
             }
-            case 72: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 activatedSaleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               activatedSaleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 58: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 activatedSaleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 activatedSaleIdList_.addInt(input.readUInt32());
@@ -178,13 +177,9 @@ public final class GetActivityInfoRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              disableTransferPointInteractionList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.parser(), extensionRegistry));
+            case 112: {
+
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -206,10 +201,10 @@ public final class GetActivityInfoRspOuterClass {
           activityInfoList_ = java.util.Collections.unmodifiableList(activityInfoList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          activatedSaleIdList_.makeImmutable(); // C
+          disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
+          activatedSaleIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -268,10 +263,50 @@ public final class GetActivityInfoRspOuterClass {
       return activityInfoList_.get(index);
     }
 
-    public static final int ACTIVATED_SALE_ID_LIST_FIELD_NUMBER = 9;
+    public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 5;
+    private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_;
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</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 = 5;</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 = 5;</code>
+     */
+    @java.lang.Override
+    public int getDisableTransferPointInteractionListCount() {
+      return disableTransferPointInteractionList_.size();
+    }
+    /**
+     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</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 = 5;</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 = 7;
     private com.google.protobuf.Internal.IntList activatedSaleIdList_;
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @return A list containing the activatedSaleIdList.
      */
     @java.lang.Override
@@ -280,14 +315,14 @@ public final class GetActivityInfoRspOuterClass {
       return activatedSaleIdList_;
     }
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @return The count of activatedSaleIdList.
      */
     public int getActivatedSaleIdListCount() {
       return activatedSaleIdList_.size();
     }
     /**
-     * <code>repeated uint32 activated_sale_id_list = 9;</code>
+     * <code>repeated uint32 activated_sale_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The activatedSaleIdList at the given index.
      */
@@ -296,10 +331,10 @@ public final class GetActivityInfoRspOuterClass {
     }
     private int activatedSaleIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -307,46 +342,6 @@ public final class GetActivityInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_;
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</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 = 12;</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 = 12;</code>
-     */
-    @java.lang.Override
-    public int getDisableTransferPointInteractionListCount() {
-      return disableTransferPointInteractionList_.size();
-    }
-    /**
-     * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</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 = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
-        int index) {
-      return disableTransferPointInteractionList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -365,18 +360,18 @@ public final class GetActivityInfoRspOuterClass {
       for (int i = 0; i < activityInfoList_.size(); i++) {
         output.writeMessage(2, activityInfoList_.get(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+      for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
+        output.writeMessage(5, disableTransferPointInteractionList_.get(i));
       }
       if (getActivatedSaleIdListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(58);
         output.writeUInt32NoTag(activatedSaleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < activatedSaleIdList_.size(); i++) {
         output.writeUInt32NoTag(activatedSaleIdList_.getInt(i));
       }
-      for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
-        output.writeMessage(12, disableTransferPointInteractionList_.get(i));
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -391,9 +386,9 @@ public final class GetActivityInfoRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(2, activityInfoList_.get(i));
       }
-      if (retcode_ != 0) {
+      for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeMessageSize(5, disableTransferPointInteractionList_.get(i));
       }
       {
         int dataSize = 0;
@@ -409,9 +404,9 @@ public final class GetActivityInfoRspOuterClass {
         }
         activatedSaleIdListMemoizedSerializedSize = dataSize;
       }
-      for (int i = 0; i < disableTransferPointInteractionList_.size(); i++) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, disableTransferPointInteractionList_.get(i));
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -430,12 +425,12 @@ public final class GetActivityInfoRspOuterClass {
 
       if (!getActivityInfoListList()
           .equals(other.getActivityInfoListList())) return false;
+      if (!getDisableTransferPointInteractionListList()
+          .equals(other.getDisableTransferPointInteractionListList())) return false;
       if (!getActivatedSaleIdListList()
           .equals(other.getActivatedSaleIdListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (!getDisableTransferPointInteractionListList()
-          .equals(other.getDisableTransferPointInteractionListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -451,16 +446,16 @@ public final class GetActivityInfoRspOuterClass {
         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();
+      }
       if (getActivatedSaleIdListCount() > 0) {
         hash = (37 * hash) + ACTIVATED_SALE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivatedSaleIdListList().hashCode();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      if (getDisableTransferPointInteractionListCount() > 0) {
-        hash = (37 * hash) + DISABLE_TRANSFER_POINT_INTERACTION_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDisableTransferPointInteractionListList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -557,11 +552,6 @@ public final class GetActivityInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7972
-     * Obf: KFLFLAMEHIJ
-     * </pre>
-     *
      * Protobuf type {@code GetActivityInfoRsp}
      */
     public static final class Builder extends
@@ -607,16 +597,16 @@ public final class GetActivityInfoRspOuterClass {
         } else {
           activityInfoListBuilder_.clear();
         }
-        activatedSaleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        retcode_ = 0;
-
         if (disableTransferPointInteractionListBuilder_ == null) {
           disableTransferPointInteractionList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           disableTransferPointInteractionListBuilder_.clear();
         }
+        activatedSaleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -653,21 +643,21 @@ public final class GetActivityInfoRspOuterClass {
         } else {
           result.activityInfoList_ = activityInfoListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          activatedSaleIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.activatedSaleIdList_ = activatedSaleIdList_;
-        result.retcode_ = retcode_;
         if (disableTransferPointInteractionListBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             disableTransferPointInteractionList_ = java.util.Collections.unmodifiableList(disableTransferPointInteractionList_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.disableTransferPointInteractionList_ = disableTransferPointInteractionList_;
         } else {
           result.disableTransferPointInteractionList_ = disableTransferPointInteractionListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000004) != 0)) {
+          activatedSaleIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.activatedSaleIdList_ = activatedSaleIdList_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -742,24 +732,11 @@ public final class GetActivityInfoRspOuterClass {
             }
           }
         }
-        if (!other.activatedSaleIdList_.isEmpty()) {
-          if (activatedSaleIdList_.isEmpty()) {
-            activatedSaleIdList_ = other.activatedSaleIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureActivatedSaleIdListIsMutable();
-            activatedSaleIdList_.addAll(other.activatedSaleIdList_);
-          }
-          onChanged();
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (disableTransferPointInteractionListBuilder_ == null) {
           if (!other.disableTransferPointInteractionList_.isEmpty()) {
             if (disableTransferPointInteractionList_.isEmpty()) {
               disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureDisableTransferPointInteractionListIsMutable();
               disableTransferPointInteractionList_.addAll(other.disableTransferPointInteractionList_);
@@ -772,7 +749,7 @@ public final class GetActivityInfoRspOuterClass {
               disableTransferPointInteractionListBuilder_.dispose();
               disableTransferPointInteractionListBuilder_ = null;
               disableTransferPointInteractionList_ = other.disableTransferPointInteractionList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
               disableTransferPointInteractionListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getDisableTransferPointInteractionListFieldBuilder() : null;
@@ -781,6 +758,19 @@ public final class GetActivityInfoRspOuterClass {
             }
           }
         }
+        if (!other.activatedSaleIdList_.isEmpty()) {
+          if (activatedSaleIdList_.isEmpty()) {
+            activatedSaleIdList_ = other.activatedSaleIdList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureActivatedSaleIdListIsMutable();
+            activatedSaleIdList_.addAll(other.activatedSaleIdList_);
+          }
+          onChanged();
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1051,122 +1041,12 @@ public final class GetActivityInfoRspOuterClass {
         return activityInfoListBuilder_;
       }
 
-      private com.google.protobuf.Internal.IntList activatedSaleIdList_ = emptyIntList();
-      private void ensureActivatedSaleIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          activatedSaleIdList_ = mutableCopy(activatedSaleIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @return A list containing the activatedSaleIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getActivatedSaleIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(activatedSaleIdList_) : activatedSaleIdList_;
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @return The count of activatedSaleIdList.
-       */
-      public int getActivatedSaleIdListCount() {
-        return activatedSaleIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @param index The index of the element to return.
-       * @return The activatedSaleIdList at the given index.
-       */
-      public int getActivatedSaleIdList(int index) {
-        return activatedSaleIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @param index The index to set the value at.
-       * @param value The activatedSaleIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setActivatedSaleIdList(
-          int index, int value) {
-        ensureActivatedSaleIdListIsMutable();
-        activatedSaleIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @param value The activatedSaleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addActivatedSaleIdList(int value) {
-        ensureActivatedSaleIdListIsMutable();
-        activatedSaleIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @param values The activatedSaleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllActivatedSaleIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureActivatedSaleIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, activatedSaleIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 activated_sale_id_list = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearActivatedSaleIdList() {
-        activatedSaleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> disableTransferPointInteractionList_ =
         java.util.Collections.emptyList();
       private void ensureDisableTransferPointInteractionListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           disableTransferPointInteractionList_ = new java.util.ArrayList<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair>(disableTransferPointInteractionList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -1174,7 +1054,7 @@ public final class GetActivityInfoRspOuterClass {
           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 = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> getDisableTransferPointInteractionListList() {
         if (disableTransferPointInteractionListBuilder_ == null) {
@@ -1184,7 +1064,7 @@ public final class GetActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public int getDisableTransferPointInteractionListCount() {
         if (disableTransferPointInteractionListBuilder_ == null) {
@@ -1194,7 +1074,7 @@ public final class GetActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair getDisableTransferPointInteractionList(int index) {
         if (disableTransferPointInteractionListBuilder_ == null) {
@@ -1204,7 +1084,7 @@ public final class GetActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder setDisableTransferPointInteractionList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -1221,7 +1101,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder setDisableTransferPointInteractionList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -1235,7 +1115,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder addDisableTransferPointInteractionList(emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
         if (disableTransferPointInteractionListBuilder_ == null) {
@@ -1251,7 +1131,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder addDisableTransferPointInteractionList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair value) {
@@ -1268,7 +1148,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder addDisableTransferPointInteractionList(
           emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -1282,7 +1162,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder addDisableTransferPointInteractionList(
           int index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder builderForValue) {
@@ -1296,7 +1176,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder addAllDisableTransferPointInteractionList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair> values) {
@@ -1311,12 +1191,12 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder clearDisableTransferPointInteractionList() {
         if (disableTransferPointInteractionListBuilder_ == null) {
           disableTransferPointInteractionList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           disableTransferPointInteractionListBuilder_.clear();
@@ -1324,7 +1204,7 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public Builder removeDisableTransferPointInteractionList(int index) {
         if (disableTransferPointInteractionListBuilder_ == null) {
@@ -1337,14 +1217,14 @@ public final class GetActivityInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder getDisableTransferPointInteractionListBuilder(
           int index) {
         return getDisableTransferPointInteractionListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder getDisableTransferPointInteractionListOrBuilder(
           int index) {
@@ -1354,7 +1234,7 @@ public final class GetActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32PairOrBuilder> 
            getDisableTransferPointInteractionListOrBuilderList() {
@@ -1365,14 +1245,14 @@ public final class GetActivityInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</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 = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder addDisableTransferPointInteractionListBuilder(
           int index) {
@@ -1380,7 +1260,7 @@ public final class GetActivityInfoRspOuterClass {
             index, emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.getDefaultInstance());
       }
       /**
-       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 12;</code>
+       * <code>repeated .Uint32Pair disable_transfer_point_interaction_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.Uint32PairOuterClass.Uint32Pair.Builder> 
            getDisableTransferPointInteractionListBuilderList() {
@@ -1393,13 +1273,123 @@ public final class GetActivityInfoRspOuterClass {
           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),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           disableTransferPointInteractionList_ = null;
         }
         return disableTransferPointInteractionListBuilder_;
       }
+
+      private com.google.protobuf.Internal.IntList activatedSaleIdList_ = emptyIntList();
+      private void ensureActivatedSaleIdListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          activatedSaleIdList_ = mutableCopy(activatedSaleIdList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @return A list containing the activatedSaleIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getActivatedSaleIdListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(activatedSaleIdList_) : activatedSaleIdList_;
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @return The count of activatedSaleIdList.
+       */
+      public int getActivatedSaleIdListCount() {
+        return activatedSaleIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @param index The index of the element to return.
+       * @return The activatedSaleIdList at the given index.
+       */
+      public int getActivatedSaleIdList(int index) {
+        return activatedSaleIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @param index The index to set the value at.
+       * @param value The activatedSaleIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setActivatedSaleIdList(
+          int index, int value) {
+        ensureActivatedSaleIdListIsMutable();
+        activatedSaleIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @param value The activatedSaleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addActivatedSaleIdList(int value) {
+        ensureActivatedSaleIdListIsMutable();
+        activatedSaleIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @param values The activatedSaleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllActivatedSaleIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureActivatedSaleIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, activatedSaleIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 activated_sale_id_list = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearActivatedSaleIdList() {
+        activatedSaleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1470,10 +1460,10 @@ public final class GetActivityInfoRspOuterClass {
       "\n\030GetActivityInfoRsp.proto\032\022ActivityInfo" +
       ".proto\032\020Uint32Pair.proto\"\256\001\n\022GetActivity" +
       "InfoRsp\022)\n\022activity_info_list\030\002 \003(\0132\r.Ac" +
-      "tivityInfo\022\036\n\026activated_sale_id_list\030\t \003" +
-      "(\r\022\017\n\007retcode\030\004 \001(\005\022<\n\'disable_transfer_" +
-      "point_interaction_list\030\014 \003(\0132\013.Uint32Pai" +
-      "rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "tivityInfo\022<\n\'disable_transfer_point_int" +
+      "eraction_list\030\005 \003(\0132\013.Uint32Pair\022\036\n\026acti" +
+      "vated_sale_id_list\030\007 \003(\r\022\017\n\007retcode\030\016 \001(" +
+      "\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1486,7 +1476,7 @@ public final class GetActivityInfoRspOuterClass {
     internal_static_GetActivityInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetActivityInfoRsp_descriptor,
-        new java.lang.String[] { "ActivityInfoList", "ActivatedSaleIdList", "Retcode", "DisableTransferPointInteractionList", });
+        new java.lang.String[] { "ActivityInfoList", "DisableTransferPointInteractionList", "ActivatedSaleIdList", "Retcode", });
     emu.grasscutter.net.proto.ActivityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.Uint32PairOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityScheduleRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityScheduleRspOuterClass.java
index ec1400653..b61dfb945 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetActivityScheduleRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetActivityScheduleRspOuterClass.java
@@ -19,47 +19,42 @@ public final class GetActivityScheduleRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 remain_fly_sea_lamp_num = 15;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    int getRemainFlySeaLampNum();
-
-    /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> 
         getActivityScheduleListList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index);
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     int getActivityScheduleListCount();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
         getActivityScheduleListOrBuilderList();
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 13;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    int getRemainFlySeaLampNum();
   }
   /**
-   * <pre>
-   * CmdId: 7421
-   * Obf: AKAPOEANCFC
-   * </pre>
-   *
    * Protobuf type {@code GetActivityScheduleRsp}
    */
   public static final class GetActivityScheduleRsp extends
@@ -106,12 +101,12 @@ public final class GetActivityScheduleRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 16: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 106: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 activityScheduleList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -120,7 +115,7 @@ public final class GetActivityScheduleRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.parser(), extensionRegistry));
               break;
             }
-            case 120: {
+            case 104: {
 
               remainFlySeaLampNum_ = input.readUInt32();
               break;
@@ -160,10 +155,10 @@ public final class GetActivityScheduleRspOuterClass {
               emu.grasscutter.net.proto.GetActivityScheduleRspOuterClass.GetActivityScheduleRsp.class, emu.grasscutter.net.proto.GetActivityScheduleRspOuterClass.GetActivityScheduleRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 2;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -171,28 +166,17 @@ public final class GetActivityScheduleRspOuterClass {
       return retcode_;
     }
 
-    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 15;
-    private int remainFlySeaLampNum_;
-    /**
-     * <code>uint32 remain_fly_sea_lamp_num = 15;</code>
-     * @return The remainFlySeaLampNum.
-     */
-    @java.lang.Override
-    public int getRemainFlySeaLampNum() {
-      return remainFlySeaLampNum_;
-    }
-
-    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 13;
+    public static final int ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_;
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
@@ -200,21 +184,21 @@ public final class GetActivityScheduleRspOuterClass {
       return activityScheduleList_;
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     @java.lang.Override
     public int getActivityScheduleListCount() {
       return activityScheduleList_.size();
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
       return activityScheduleList_.get(index);
     }
     /**
-     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+     * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
@@ -222,6 +206,17 @@ public final class GetActivityScheduleRspOuterClass {
       return activityScheduleList_.get(index);
     }
 
+    public static final int REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER = 13;
+    private int remainFlySeaLampNum_;
+    /**
+     * <code>uint32 remain_fly_sea_lamp_num = 13;</code>
+     * @return The remainFlySeaLampNum.
+     */
+    @java.lang.Override
+    public int getRemainFlySeaLampNum() {
+      return remainFlySeaLampNum_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -237,13 +232,13 @@ public final class GetActivityScheduleRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(2, retcode_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
-        output.writeMessage(13, activityScheduleList_.get(i));
+        output.writeMessage(4, activityScheduleList_.get(i));
       }
       if (remainFlySeaLampNum_ != 0) {
-        output.writeUInt32(15, remainFlySeaLampNum_);
+        output.writeUInt32(13, remainFlySeaLampNum_);
       }
       unknownFields.writeTo(output);
     }
@@ -256,15 +251,15 @@ public final class GetActivityScheduleRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(2, retcode_);
       }
       for (int i = 0; i < activityScheduleList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, activityScheduleList_.get(i));
+          .computeMessageSize(4, activityScheduleList_.get(i));
       }
       if (remainFlySeaLampNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, remainFlySeaLampNum_);
+          .computeUInt32Size(13, remainFlySeaLampNum_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,10 +278,10 @@ public final class GetActivityScheduleRspOuterClass {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getRemainFlySeaLampNum()
-          != other.getRemainFlySeaLampNum()) return false;
       if (!getActivityScheduleListList()
           .equals(other.getActivityScheduleListList())) return false;
+      if (getRemainFlySeaLampNum()
+          != other.getRemainFlySeaLampNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -300,12 +295,12 @@ public final class GetActivityScheduleRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getRemainFlySeaLampNum();
       if (getActivityScheduleListCount() > 0) {
         hash = (37 * hash) + ACTIVITY_SCHEDULE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getActivityScheduleListList().hashCode();
       }
+      hash = (37 * hash) + REMAIN_FLY_SEA_LAMP_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getRemainFlySeaLampNum();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,11 +397,6 @@ public final class GetActivityScheduleRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7421
-     * Obf: AKAPOEANCFC
-     * </pre>
-     *
      * Protobuf type {@code GetActivityScheduleRsp}
      */
     public static final class Builder extends
@@ -447,14 +437,14 @@ public final class GetActivityScheduleRspOuterClass {
         super.clear();
         retcode_ = 0;
 
-        remainFlySeaLampNum_ = 0;
-
         if (activityScheduleListBuilder_ == null) {
           activityScheduleList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           activityScheduleListBuilder_.clear();
         }
+        remainFlySeaLampNum_ = 0;
+
         return this;
       }
 
@@ -483,7 +473,6 @@ public final class GetActivityScheduleRspOuterClass {
         emu.grasscutter.net.proto.GetActivityScheduleRspOuterClass.GetActivityScheduleRsp result = new emu.grasscutter.net.proto.GetActivityScheduleRspOuterClass.GetActivityScheduleRsp(this);
         int from_bitField0_ = bitField0_;
         result.retcode_ = retcode_;
-        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         if (activityScheduleListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             activityScheduleList_ = java.util.Collections.unmodifiableList(activityScheduleList_);
@@ -493,6 +482,7 @@ public final class GetActivityScheduleRspOuterClass {
         } else {
           result.activityScheduleList_ = activityScheduleListBuilder_.build();
         }
+        result.remainFlySeaLampNum_ = remainFlySeaLampNum_;
         onBuilt();
         return result;
       }
@@ -544,9 +534,6 @@ public final class GetActivityScheduleRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getRemainFlySeaLampNum() != 0) {
-          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
-        }
         if (activityScheduleListBuilder_ == null) {
           if (!other.activityScheduleList_.isEmpty()) {
             if (activityScheduleList_.isEmpty()) {
@@ -573,6 +560,9 @@ public final class GetActivityScheduleRspOuterClass {
             }
           }
         }
+        if (other.getRemainFlySeaLampNum() != 0) {
+          setRemainFlySeaLampNum(other.getRemainFlySeaLampNum());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -605,7 +595,7 @@ public final class GetActivityScheduleRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -613,7 +603,7 @@ public final class GetActivityScheduleRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -624,7 +614,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -634,37 +624,6 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
 
-      private int remainFlySeaLampNum_ ;
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 15;</code>
-       * @return The remainFlySeaLampNum.
-       */
-      @java.lang.Override
-      public int getRemainFlySeaLampNum() {
-        return remainFlySeaLampNum_;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 15;</code>
-       * @param value The remainFlySeaLampNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRemainFlySeaLampNum(int value) {
-        
-        remainFlySeaLampNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 remain_fly_sea_lamp_num = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRemainFlySeaLampNum() {
-        
-        remainFlySeaLampNum_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> activityScheduleList_ =
         java.util.Collections.emptyList();
       private void ensureActivityScheduleListIsMutable() {
@@ -678,7 +637,7 @@ public final class GetActivityScheduleRspOuterClass {
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> activityScheduleListBuilder_;
 
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> getActivityScheduleListList() {
         if (activityScheduleListBuilder_ == null) {
@@ -688,7 +647,7 @@ public final class GetActivityScheduleRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public int getActivityScheduleListCount() {
         if (activityScheduleListBuilder_ == null) {
@@ -698,7 +657,7 @@ public final class GetActivityScheduleRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo getActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -708,7 +667,7 @@ public final class GetActivityScheduleRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -725,7 +684,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder setActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -739,7 +698,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder addActivityScheduleList(emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
         if (activityScheduleListBuilder_ == null) {
@@ -755,7 +714,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo value) {
@@ -772,7 +731,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder addActivityScheduleList(
           emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -786,7 +745,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder addActivityScheduleList(
           int index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder builderForValue) {
@@ -800,7 +759,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder addAllActivityScheduleList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo> values) {
@@ -815,7 +774,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder clearActivityScheduleList() {
         if (activityScheduleListBuilder_ == null) {
@@ -828,7 +787,7 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public Builder removeActivityScheduleList(int index) {
         if (activityScheduleListBuilder_ == null) {
@@ -841,14 +800,14 @@ public final class GetActivityScheduleRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder getActivityScheduleListBuilder(
           int index) {
         return getActivityScheduleListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder getActivityScheduleListOrBuilder(
           int index) {
@@ -858,7 +817,7 @@ public final class GetActivityScheduleRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfoOrBuilder> 
            getActivityScheduleListOrBuilderList() {
@@ -869,14 +828,14 @@ public final class GetActivityScheduleRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder() {
         return getActivityScheduleListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder addActivityScheduleListBuilder(
           int index) {
@@ -884,7 +843,7 @@ public final class GetActivityScheduleRspOuterClass {
             index, emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 13;</code>
+       * <code>repeated .ActivityScheduleInfo activity_schedule_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.ActivityScheduleInfo.Builder> 
            getActivityScheduleListBuilderList() {
@@ -904,6 +863,37 @@ public final class GetActivityScheduleRspOuterClass {
         }
         return activityScheduleListBuilder_;
       }
+
+      private int remainFlySeaLampNum_ ;
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 13;</code>
+       * @return The remainFlySeaLampNum.
+       */
+      @java.lang.Override
+      public int getRemainFlySeaLampNum() {
+        return remainFlySeaLampNum_;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 13;</code>
+       * @param value The remainFlySeaLampNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRemainFlySeaLampNum(int value) {
+        
+        remainFlySeaLampNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 remain_fly_sea_lamp_num = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRemainFlySeaLampNum() {
+        
+        remainFlySeaLampNum_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -973,9 +963,9 @@ public final class GetActivityScheduleRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034GetActivityScheduleRsp.proto\032\032Activity" +
       "ScheduleInfo.proto\"\201\001\n\026GetActivitySchedu" +
-      "leRsp\022\017\n\007retcode\030\004 \001(\005\022\037\n\027remain_fly_sea" +
-      "_lamp_num\030\017 \001(\r\0225\n\026activity_schedule_lis" +
-      "t\030\r \003(\0132\025.ActivityScheduleInfoB\033\n\031emu.gr" +
+      "leRsp\022\017\n\007retcode\030\002 \001(\005\0225\n\026activity_sched" +
+      "ule_list\030\004 \003(\0132\025.ActivityScheduleInfo\022\037\n" +
+      "\027remain_fly_sea_lamp_num\030\r \001(\rB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -988,7 +978,7 @@ public final class GetActivityScheduleRspOuterClass {
     internal_static_GetActivityScheduleRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetActivityScheduleRsp_descriptor,
-        new java.lang.String[] { "Retcode", "RemainFlySeaLampNum", "ActivityScheduleList", });
+        new java.lang.String[] { "Retcode", "ActivityScheduleList", "RemainFlySeaLampNum", });
     emu.grasscutter.net.proto.ActivityScheduleInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailNotifyOuterClass.java
index eaf31b900..7c7261084 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class GetAllMailNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_collected = 2;</code>
+     * <code>bool is_collected = 8;</code>
      * @return The isCollected.
      */
     boolean getIsCollected();
   }
   /**
-   * <pre>
-   * CmdId: 24116
-   * Obf: ACIPPADMKFF
-   * </pre>
-   *
    * Protobuf type {@code GetAllMailNotify}
    */
   public static final class GetAllMailNotify extends
@@ -74,7 +69,7 @@ public final class GetAllMailNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 64: {
 
               isCollected_ = input.readBool();
               break;
@@ -111,10 +106,10 @@ public final class GetAllMailNotifyOuterClass {
               emu.grasscutter.net.proto.GetAllMailNotifyOuterClass.GetAllMailNotify.class, emu.grasscutter.net.proto.GetAllMailNotifyOuterClass.GetAllMailNotify.Builder.class);
     }
 
-    public static final int IS_COLLECTED_FIELD_NUMBER = 2;
+    public static final int IS_COLLECTED_FIELD_NUMBER = 8;
     private boolean isCollected_;
     /**
-     * <code>bool is_collected = 2;</code>
+     * <code>bool is_collected = 8;</code>
      * @return The isCollected.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetAllMailNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isCollected_ != false) {
-        output.writeBool(2, isCollected_);
+        output.writeBool(8, isCollected_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetAllMailNotifyOuterClass {
       size = 0;
       if (isCollected_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isCollected_);
+          .computeBoolSize(8, isCollected_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class GetAllMailNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24116
-     * Obf: ACIPPADMKFF
-     * </pre>
-     *
      * Protobuf type {@code GetAllMailNotify}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class GetAllMailNotifyOuterClass {
 
       private boolean isCollected_ ;
       /**
-       * <code>bool is_collected = 2;</code>
+       * <code>bool is_collected = 8;</code>
        * @return The isCollected.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class GetAllMailNotifyOuterClass {
         return isCollected_;
       }
       /**
-       * <code>bool is_collected = 2;</code>
+       * <code>bool is_collected = 8;</code>
        * @param value The isCollected to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class GetAllMailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_collected = 2;</code>
+       * <code>bool is_collected = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsCollected() {
@@ -528,7 +518,7 @@ public final class GetAllMailNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026GetAllMailNotify.proto\"(\n\020GetAllMailNo" +
-      "tify\022\024\n\014is_collected\030\002 \001(\010B\033\n\031emu.grassc" +
+      "tify\022\024\n\014is_collected\030\010 \001(\010B\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/GetAllMailResultNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailResultNotifyOuterClass.java
index 169938137..3c15c005e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailResultNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailResultNotifyOuterClass.java
@@ -19,71 +19,74 @@ public final class GetAllMailResultNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_collected = 5;</code>
-     * @return The isCollected.
-     */
-    boolean getIsCollected();
-
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> 
-        getMailListList();
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index);
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    int getMailListCount();
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
-        getMailListOrBuilderList();
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 packet_num = 13;</code>
+     * <pre>
+     *sus 6
+     * </pre>
+     *
+     * <code>uint32 packet_num = 4;</code>
      * @return The packetNum.
      */
     int getPacketNum();
 
     /**
-     * <code>string transaction = 10;</code>
+     * <pre>
+     *sus 4
+     * </pre>
+     *
+     * <code>uint32 packet_be_sent_num = 6;</code>
+     * @return The packetBeSentNum.
+     */
+    int getPacketBeSentNum();
+
+    /**
+     * <code>string transaction = 8;</code>
      * @return The transaction.
      */
     java.lang.String getTransaction();
     /**
-     * <code>string transaction = 10;</code>
+     * <code>string transaction = 8;</code>
      * @return The bytes for transaction.
      */
     com.google.protobuf.ByteString
         getTransactionBytes();
 
     /**
-     * <code>uint32 packet_be_sent_num = 14;</code>
-     * @return The packetBeSentNum.
+     * <code>bool is_collected = 10;</code>
+     * @return The isCollected.
      */
-    int getPacketBeSentNum();
+    boolean getIsCollected();
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> 
+        getMailListList();
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index);
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    int getMailListCount();
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
+        getMailListOrBuilderList();
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * CmdId: 5536
-   * Obf: DCHBLDEKBCN
-   * </pre>
-   *
    * Protobuf type {@code GetAllMailResultNotify}
    */
   public static final class GetAllMailResultNotify extends
@@ -96,8 +99,8 @@ public final class GetAllMailResultNotifyOuterClass {
       super(builder);
     }
     private GetAllMailResultNotify() {
-      mailList_ = java.util.Collections.emptyList();
       transaction_ = "";
+      mailList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -131,18 +134,33 @@ public final class GetAllMailResultNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 32: {
 
-              isCollected_ = input.readBool();
+              packetNum_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 48: {
+
+              packetBeSentNum_ = input.readUInt32();
+              break;
+            }
+            case 66: {
               java.lang.String s = input.readStringRequireUtf8();
 
               transaction_ = s;
               break;
             }
-            case 90: {
+            case 80: {
+
+              isCollected_ = input.readBool();
+              break;
+            }
+            case 88: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MailDataOuterClass.MailData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -151,21 +169,6 @@ public final class GetAllMailResultNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.MailDataOuterClass.MailData.parser(), extensionRegistry));
               break;
             }
-            case 104: {
-
-              packetNum_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              packetBeSentNum_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -201,61 +204,14 @@ public final class GetAllMailResultNotifyOuterClass {
               emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify.class, emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify.Builder.class);
     }
 
-    public static final int IS_COLLECTED_FIELD_NUMBER = 5;
-    private boolean isCollected_;
-    /**
-     * <code>bool is_collected = 5;</code>
-     * @return The isCollected.
-     */
-    @java.lang.Override
-    public boolean getIsCollected() {
-      return isCollected_;
-    }
-
-    public static final int MAIL_LIST_FIELD_NUMBER = 11;
-    private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_;
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
-      return mailList_;
-    }
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
-        getMailListOrBuilderList() {
-      return mailList_;
-    }
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    @java.lang.Override
-    public int getMailListCount() {
-      return mailList_.size();
-    }
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
-      return mailList_.get(index);
-    }
-    /**
-     * <code>repeated .MailData mail_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
-        int index) {
-      return mailList_.get(index);
-    }
-
-    public static final int PACKET_NUM_FIELD_NUMBER = 13;
+    public static final int PACKET_NUM_FIELD_NUMBER = 4;
     private int packetNum_;
     /**
-     * <code>uint32 packet_num = 13;</code>
+     * <pre>
+     *sus 6
+     * </pre>
+     *
+     * <code>uint32 packet_num = 4;</code>
      * @return The packetNum.
      */
     @java.lang.Override
@@ -263,10 +219,25 @@ public final class GetAllMailResultNotifyOuterClass {
       return packetNum_;
     }
 
-    public static final int TRANSACTION_FIELD_NUMBER = 10;
+    public static final int PACKET_BE_SENT_NUM_FIELD_NUMBER = 6;
+    private int packetBeSentNum_;
+    /**
+     * <pre>
+     *sus 4
+     * </pre>
+     *
+     * <code>uint32 packet_be_sent_num = 6;</code>
+     * @return The packetBeSentNum.
+     */
+    @java.lang.Override
+    public int getPacketBeSentNum() {
+      return packetBeSentNum_;
+    }
+
+    public static final int TRANSACTION_FIELD_NUMBER = 8;
     private volatile java.lang.Object transaction_;
     /**
-     * <code>string transaction = 10;</code>
+     * <code>string transaction = 8;</code>
      * @return The transaction.
      */
     @java.lang.Override
@@ -283,7 +254,7 @@ public final class GetAllMailResultNotifyOuterClass {
       }
     }
     /**
-     * <code>string transaction = 10;</code>
+     * <code>string transaction = 8;</code>
      * @return The bytes for transaction.
      */
     @java.lang.Override
@@ -301,21 +272,21 @@ public final class GetAllMailResultNotifyOuterClass {
       }
     }
 
-    public static final int PACKET_BE_SENT_NUM_FIELD_NUMBER = 14;
-    private int packetBeSentNum_;
+    public static final int IS_COLLECTED_FIELD_NUMBER = 10;
+    private boolean isCollected_;
     /**
-     * <code>uint32 packet_be_sent_num = 14;</code>
-     * @return The packetBeSentNum.
+     * <code>bool is_collected = 10;</code>
+     * @return The isCollected.
      */
     @java.lang.Override
-    public int getPacketBeSentNum() {
-      return packetBeSentNum_;
+    public boolean getIsCollected() {
+      return isCollected_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -323,6 +294,46 @@ public final class GetAllMailResultNotifyOuterClass {
       return retcode_;
     }
 
+    public static final int MAIL_LIST_FIELD_NUMBER = 13;
+    private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_;
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
+      return mailList_;
+    }
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
+        getMailListOrBuilderList() {
+      return mailList_;
+    }
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    @java.lang.Override
+    public int getMailListCount() {
+      return mailList_.size();
+    }
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
+      return mailList_.get(index);
+    }
+    /**
+     * <code>repeated .MailData mail_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
+        int index) {
+      return mailList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -337,23 +348,23 @@ public final class GetAllMailResultNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isCollected_ != false) {
-        output.writeBool(5, isCollected_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transaction_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, transaction_);
-      }
-      for (int i = 0; i < mailList_.size(); i++) {
-        output.writeMessage(11, mailList_.get(i));
-      }
       if (packetNum_ != 0) {
-        output.writeUInt32(13, packetNum_);
+        output.writeUInt32(4, packetNum_);
       }
       if (packetBeSentNum_ != 0) {
-        output.writeUInt32(14, packetBeSentNum_);
+        output.writeUInt32(6, packetBeSentNum_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transaction_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, transaction_);
+      }
+      if (isCollected_ != false) {
+        output.writeBool(10, isCollected_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(11, retcode_);
+      }
+      for (int i = 0; i < mailList_.size(); i++) {
+        output.writeMessage(13, mailList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -364,28 +375,28 @@ public final class GetAllMailResultNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isCollected_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isCollected_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transaction_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, transaction_);
-      }
-      for (int i = 0; i < mailList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, mailList_.get(i));
-      }
       if (packetNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, packetNum_);
+          .computeUInt32Size(4, packetNum_);
       }
       if (packetBeSentNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, packetBeSentNum_);
+          .computeUInt32Size(6, packetBeSentNum_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(transaction_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, transaction_);
+      }
+      if (isCollected_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isCollected_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(11, retcode_);
+      }
+      for (int i = 0; i < mailList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, mailList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -402,18 +413,18 @@ public final class GetAllMailResultNotifyOuterClass {
       }
       emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify other = (emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify) obj;
 
-      if (getIsCollected()
-          != other.getIsCollected()) return false;
-      if (!getMailListList()
-          .equals(other.getMailListList())) return false;
       if (getPacketNum()
           != other.getPacketNum()) return false;
-      if (!getTransaction()
-          .equals(other.getTransaction())) return false;
       if (getPacketBeSentNum()
           != other.getPacketBeSentNum()) return false;
+      if (!getTransaction()
+          .equals(other.getTransaction())) return false;
+      if (getIsCollected()
+          != other.getIsCollected()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getMailListList()
+          .equals(other.getMailListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -425,21 +436,21 @@ public final class GetAllMailResultNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PACKET_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getPacketNum();
+      hash = (37 * hash) + PACKET_BE_SENT_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getPacketBeSentNum();
+      hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
+      hash = (53 * hash) + getTransaction().hashCode();
       hash = (37 * hash) + IS_COLLECTED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsCollected());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getMailListCount() > 0) {
         hash = (37 * hash) + MAIL_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMailListList().hashCode();
       }
-      hash = (37 * hash) + PACKET_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getPacketNum();
-      hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
-      hash = (53 * hash) + getTransaction().hashCode();
-      hash = (37 * hash) + PACKET_BE_SENT_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getPacketBeSentNum();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -536,11 +547,6 @@ public final class GetAllMailResultNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5536
-     * Obf: DCHBLDEKBCN
-     * </pre>
-     *
      * Protobuf type {@code GetAllMailResultNotify}
      */
     public static final class Builder extends
@@ -579,22 +585,22 @@ public final class GetAllMailResultNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        packetNum_ = 0;
+
+        packetBeSentNum_ = 0;
+
+        transaction_ = "";
+
         isCollected_ = false;
 
+        retcode_ = 0;
+
         if (mailListBuilder_ == null) {
           mailList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           mailListBuilder_.clear();
         }
-        packetNum_ = 0;
-
-        transaction_ = "";
-
-        packetBeSentNum_ = 0;
-
-        retcode_ = 0;
-
         return this;
       }
 
@@ -622,7 +628,11 @@ public final class GetAllMailResultNotifyOuterClass {
       public emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify buildPartial() {
         emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify result = new emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify(this);
         int from_bitField0_ = bitField0_;
+        result.packetNum_ = packetNum_;
+        result.packetBeSentNum_ = packetBeSentNum_;
+        result.transaction_ = transaction_;
         result.isCollected_ = isCollected_;
+        result.retcode_ = retcode_;
         if (mailListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             mailList_ = java.util.Collections.unmodifiableList(mailList_);
@@ -632,10 +642,6 @@ public final class GetAllMailResultNotifyOuterClass {
         } else {
           result.mailList_ = mailListBuilder_.build();
         }
-        result.packetNum_ = packetNum_;
-        result.transaction_ = transaction_;
-        result.packetBeSentNum_ = packetBeSentNum_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -684,9 +690,22 @@ public final class GetAllMailResultNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify other) {
         if (other == emu.grasscutter.net.proto.GetAllMailResultNotifyOuterClass.GetAllMailResultNotify.getDefaultInstance()) return this;
+        if (other.getPacketNum() != 0) {
+          setPacketNum(other.getPacketNum());
+        }
+        if (other.getPacketBeSentNum() != 0) {
+          setPacketBeSentNum(other.getPacketBeSentNum());
+        }
+        if (!other.getTransaction().isEmpty()) {
+          transaction_ = other.transaction_;
+          onChanged();
+        }
         if (other.getIsCollected() != false) {
           setIsCollected(other.getIsCollected());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (mailListBuilder_ == null) {
           if (!other.mailList_.isEmpty()) {
             if (mailList_.isEmpty()) {
@@ -713,19 +732,6 @@ public final class GetAllMailResultNotifyOuterClass {
             }
           }
         }
-        if (other.getPacketNum() != 0) {
-          setPacketNum(other.getPacketNum());
-        }
-        if (!other.getTransaction().isEmpty()) {
-          transaction_ = other.transaction_;
-          onChanged();
-        }
-        if (other.getPacketBeSentNum() != 0) {
-          setPacketBeSentNum(other.getPacketBeSentNum());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -756,9 +762,171 @@ public final class GetAllMailResultNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int packetNum_ ;
+      /**
+       * <pre>
+       *sus 6
+       * </pre>
+       *
+       * <code>uint32 packet_num = 4;</code>
+       * @return The packetNum.
+       */
+      @java.lang.Override
+      public int getPacketNum() {
+        return packetNum_;
+      }
+      /**
+       * <pre>
+       *sus 6
+       * </pre>
+       *
+       * <code>uint32 packet_num = 4;</code>
+       * @param value The packetNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPacketNum(int value) {
+        
+        packetNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *sus 6
+       * </pre>
+       *
+       * <code>uint32 packet_num = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPacketNum() {
+        
+        packetNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int packetBeSentNum_ ;
+      /**
+       * <pre>
+       *sus 4
+       * </pre>
+       *
+       * <code>uint32 packet_be_sent_num = 6;</code>
+       * @return The packetBeSentNum.
+       */
+      @java.lang.Override
+      public int getPacketBeSentNum() {
+        return packetBeSentNum_;
+      }
+      /**
+       * <pre>
+       *sus 4
+       * </pre>
+       *
+       * <code>uint32 packet_be_sent_num = 6;</code>
+       * @param value The packetBeSentNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPacketBeSentNum(int value) {
+        
+        packetBeSentNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *sus 4
+       * </pre>
+       *
+       * <code>uint32 packet_be_sent_num = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPacketBeSentNum() {
+        
+        packetBeSentNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object transaction_ = "";
+      /**
+       * <code>string transaction = 8;</code>
+       * @return The transaction.
+       */
+      public java.lang.String getTransaction() {
+        java.lang.Object ref = transaction_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          transaction_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string transaction = 8;</code>
+       * @return The bytes for transaction.
+       */
+      public com.google.protobuf.ByteString
+          getTransactionBytes() {
+        java.lang.Object ref = transaction_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          transaction_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string transaction = 8;</code>
+       * @param value The transaction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTransaction(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        transaction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string transaction = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTransaction() {
+        
+        transaction_ = getDefaultInstance().getTransaction();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string transaction = 8;</code>
+       * @param value The bytes for transaction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTransactionBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        transaction_ = value;
+        onChanged();
+        return this;
+      }
+
       private boolean isCollected_ ;
       /**
-       * <code>bool is_collected = 5;</code>
+       * <code>bool is_collected = 10;</code>
        * @return The isCollected.
        */
       @java.lang.Override
@@ -766,7 +934,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return isCollected_;
       }
       /**
-       * <code>bool is_collected = 5;</code>
+       * <code>bool is_collected = 10;</code>
        * @param value The isCollected to set.
        * @return This builder for chaining.
        */
@@ -777,7 +945,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_collected = 5;</code>
+       * <code>bool is_collected = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsCollected() {
@@ -787,6 +955,37 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_ =
         java.util.Collections.emptyList();
       private void ensureMailListIsMutable() {
@@ -800,7 +999,7 @@ public final class GetAllMailResultNotifyOuterClass {
           emu.grasscutter.net.proto.MailDataOuterClass.MailData, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder, emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> mailListBuilder_;
 
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
         if (mailListBuilder_ == null) {
@@ -810,7 +1009,7 @@ public final class GetAllMailResultNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public int getMailListCount() {
         if (mailListBuilder_ == null) {
@@ -820,7 +1019,7 @@ public final class GetAllMailResultNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -830,7 +1029,7 @@ public final class GetAllMailResultNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -847,7 +1046,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -861,7 +1060,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder addMailList(emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
         if (mailListBuilder_ == null) {
@@ -877,7 +1076,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -894,7 +1093,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder addMailList(
           emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -908,7 +1107,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -922,7 +1121,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder addAllMailList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailData> values) {
@@ -937,7 +1136,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder clearMailList() {
         if (mailListBuilder_ == null) {
@@ -950,7 +1149,7 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public Builder removeMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -963,14 +1162,14 @@ public final class GetAllMailResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder getMailListBuilder(
           int index) {
         return getMailListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
           int index) {
@@ -980,7 +1179,7 @@ public final class GetAllMailResultNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
            getMailListOrBuilderList() {
@@ -991,14 +1190,14 @@ public final class GetAllMailResultNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder() {
         return getMailListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder(
           int index) {
@@ -1006,7 +1205,7 @@ public final class GetAllMailResultNotifyOuterClass {
             index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 11;</code>
+       * <code>repeated .MailData mail_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder> 
            getMailListBuilderList() {
@@ -1026,175 +1225,6 @@ public final class GetAllMailResultNotifyOuterClass {
         }
         return mailListBuilder_;
       }
-
-      private int packetNum_ ;
-      /**
-       * <code>uint32 packet_num = 13;</code>
-       * @return The packetNum.
-       */
-      @java.lang.Override
-      public int getPacketNum() {
-        return packetNum_;
-      }
-      /**
-       * <code>uint32 packet_num = 13;</code>
-       * @param value The packetNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPacketNum(int value) {
-        
-        packetNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 packet_num = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPacketNum() {
-        
-        packetNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object transaction_ = "";
-      /**
-       * <code>string transaction = 10;</code>
-       * @return The transaction.
-       */
-      public java.lang.String getTransaction() {
-        java.lang.Object ref = transaction_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          transaction_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string transaction = 10;</code>
-       * @return The bytes for transaction.
-       */
-      public com.google.protobuf.ByteString
-          getTransactionBytes() {
-        java.lang.Object ref = transaction_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          transaction_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string transaction = 10;</code>
-       * @param value The transaction to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTransaction(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        transaction_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string transaction = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTransaction() {
-        
-        transaction_ = getDefaultInstance().getTransaction();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string transaction = 10;</code>
-       * @param value The bytes for transaction to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTransactionBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        transaction_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int packetBeSentNum_ ;
-      /**
-       * <code>uint32 packet_be_sent_num = 14;</code>
-       * @return The packetBeSentNum.
-       */
-      @java.lang.Override
-      public int getPacketBeSentNum() {
-        return packetBeSentNum_;
-      }
-      /**
-       * <code>uint32 packet_be_sent_num = 14;</code>
-       * @param value The packetBeSentNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPacketBeSentNum(int value) {
-        
-        packetBeSentNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 packet_be_sent_num = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPacketBeSentNum() {
-        
-        packetBeSentNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -1263,11 +1293,11 @@ public final class GetAllMailResultNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034GetAllMailResultNotify.proto\032\016MailData" +
-      ".proto\"\242\001\n\026GetAllMailResultNotify\022\024\n\014is_" +
-      "collected\030\005 \001(\010\022\034\n\tmail_list\030\013 \003(\0132\t.Mai" +
-      "lData\022\022\n\npacket_num\030\r \001(\r\022\023\n\013transaction" +
-      "\030\n \001(\t\022\032\n\022packet_be_sent_num\030\016 \001(\r\022\017\n\007re" +
-      "tcode\030\017 \001(\005B\033\n\031emu.grasscutter.net.proto" +
+      ".proto\"\242\001\n\026GetAllMailResultNotify\022\022\n\npac" +
+      "ket_num\030\004 \001(\r\022\032\n\022packet_be_sent_num\030\006 \001(" +
+      "\r\022\023\n\013transaction\030\010 \001(\t\022\024\n\014is_collected\030\n" +
+      " \001(\010\022\017\n\007retcode\030\013 \001(\005\022\034\n\tmail_list\030\r \003(\013" +
+      "2\t.MailDataB\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1280,7 +1310,7 @@ public final class GetAllMailResultNotifyOuterClass {
     internal_static_GetAllMailResultNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetAllMailResultNotify_descriptor,
-        new java.lang.String[] { "IsCollected", "MailList", "PacketNum", "Transaction", "PacketBeSentNum", "Retcode", });
+        new java.lang.String[] { "PacketNum", "PacketBeSentNum", "Transaction", "IsCollected", "Retcode", "MailList", });
     emu.grasscutter.net.proto.MailDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailRspOuterClass.java
index fa5e8c007..adbf24a1d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllMailRspOuterClass.java
@@ -19,53 +19,48 @@ public final class GetAllMailRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>bool is_collected = 12;</code>
+     * <code>bool is_collected = 4;</code>
      * @return The isCollected.
      */
     boolean getIsCollected();
 
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>bool is_truncated = 9;</code>
+     * @return The isTruncated.
+     */
+    boolean getIsTruncated();
+
+    /**
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> 
         getMailListList();
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index);
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     int getMailListCount();
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
         getMailListOrBuilderList();
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
         int index);
-
-    /**
-     * <code>bool is_truncated = 11;</code>
-     * @return The isTruncated.
-     */
-    boolean getIsTruncated();
   }
   /**
-   * <pre>
-   * CmdId: 9526
-   * Obf: FMMMCILNFIA
-   * </pre>
-   *
    * Protobuf type {@code GetAllMailRsp}
    */
   public static final class GetAllMailRsp extends
@@ -112,7 +107,22 @@ public final class GetAllMailRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 32: {
+
+              isCollected_ = input.readBool();
+              break;
+            }
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 72: {
+
+              isTruncated_ = input.readBool();
+              break;
+            }
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MailDataOuterClass.MailData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -121,21 +131,6 @@ public final class GetAllMailRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.MailDataOuterClass.MailData.parser(), extensionRegistry));
               break;
             }
-            case 48: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 88: {
-
-              isTruncated_ = input.readBool();
-              break;
-            }
-            case 96: {
-
-              isCollected_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -171,21 +166,10 @@ public final class GetAllMailRspOuterClass {
               emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp.class, emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int IS_COLLECTED_FIELD_NUMBER = 12;
+    public static final int IS_COLLECTED_FIELD_NUMBER = 4;
     private boolean isCollected_;
     /**
-     * <code>bool is_collected = 12;</code>
+     * <code>bool is_collected = 4;</code>
      * @return The isCollected.
      */
     @java.lang.Override
@@ -193,17 +177,39 @@ public final class GetAllMailRspOuterClass {
       return isCollected_;
     }
 
-    public static final int MAIL_LIST_FIELD_NUMBER = 1;
+    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 IS_TRUNCATED_FIELD_NUMBER = 9;
+    private boolean isTruncated_;
+    /**
+     * <code>bool is_truncated = 9;</code>
+     * @return The isTruncated.
+     */
+    @java.lang.Override
+    public boolean getIsTruncated() {
+      return isTruncated_;
+    }
+
+    public static final int MAIL_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_;
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
       return mailList_;
     }
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
@@ -211,21 +217,21 @@ public final class GetAllMailRspOuterClass {
       return mailList_;
     }
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     @java.lang.Override
     public int getMailListCount() {
       return mailList_.size();
     }
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
       return mailList_.get(index);
     }
     /**
-     * <code>repeated .MailData mail_list = 1;</code>
+     * <code>repeated .MailData mail_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
@@ -233,17 +239,6 @@ public final class GetAllMailRspOuterClass {
       return mailList_.get(index);
     }
 
-    public static final int IS_TRUNCATED_FIELD_NUMBER = 11;
-    private boolean isTruncated_;
-    /**
-     * <code>bool is_truncated = 11;</code>
-     * @return The isTruncated.
-     */
-    @java.lang.Override
-    public boolean getIsTruncated() {
-      return isTruncated_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -258,17 +253,17 @@ public final class GetAllMailRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < mailList_.size(); i++) {
-        output.writeMessage(1, mailList_.get(i));
+      if (isCollected_ != false) {
+        output.writeBool(4, isCollected_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(5, retcode_);
       }
       if (isTruncated_ != false) {
-        output.writeBool(11, isTruncated_);
+        output.writeBool(9, isTruncated_);
       }
-      if (isCollected_ != false) {
-        output.writeBool(12, isCollected_);
+      for (int i = 0; i < mailList_.size(); i++) {
+        output.writeMessage(11, mailList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -279,21 +274,21 @@ public final class GetAllMailRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < mailList_.size(); i++) {
+      if (isCollected_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, mailList_.get(i));
+          .computeBoolSize(4, isCollected_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       if (isTruncated_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isTruncated_);
+          .computeBoolSize(9, isTruncated_);
       }
-      if (isCollected_ != false) {
+      for (int i = 0; i < mailList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isCollected_);
+          .computeMessageSize(11, mailList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -310,14 +305,14 @@ public final class GetAllMailRspOuterClass {
       }
       emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp other = (emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getIsCollected()
           != other.getIsCollected()) return false;
-      if (!getMailListList()
-          .equals(other.getMailListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getIsTruncated()
           != other.getIsTruncated()) return false;
+      if (!getMailListList()
+          .equals(other.getMailListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -329,18 +324,18 @@ public final class GetAllMailRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + IS_COLLECTED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsCollected());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + IS_TRUNCATED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTruncated());
       if (getMailListCount() > 0) {
         hash = (37 * hash) + MAIL_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMailListList().hashCode();
       }
-      hash = (37 * hash) + IS_TRUNCATED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsTruncated());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -437,11 +432,6 @@ public final class GetAllMailRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9526
-     * Obf: FMMMCILNFIA
-     * </pre>
-     *
      * Protobuf type {@code GetAllMailRsp}
      */
     public static final class Builder extends
@@ -480,9 +470,11 @@ public final class GetAllMailRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isCollected_ = false;
+
         retcode_ = 0;
 
-        isCollected_ = false;
+        isTruncated_ = false;
 
         if (mailListBuilder_ == null) {
           mailList_ = java.util.Collections.emptyList();
@@ -490,8 +482,6 @@ public final class GetAllMailRspOuterClass {
         } else {
           mailListBuilder_.clear();
         }
-        isTruncated_ = false;
-
         return this;
       }
 
@@ -519,8 +509,9 @@ public final class GetAllMailRspOuterClass {
       public emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp buildPartial() {
         emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp result = new emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         result.isCollected_ = isCollected_;
+        result.retcode_ = retcode_;
+        result.isTruncated_ = isTruncated_;
         if (mailListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             mailList_ = java.util.Collections.unmodifiableList(mailList_);
@@ -530,7 +521,6 @@ public final class GetAllMailRspOuterClass {
         } else {
           result.mailList_ = mailListBuilder_.build();
         }
-        result.isTruncated_ = isTruncated_;
         onBuilt();
         return result;
       }
@@ -579,11 +569,14 @@ public final class GetAllMailRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp other) {
         if (other == emu.grasscutter.net.proto.GetAllMailRspOuterClass.GetAllMailRsp.getDefaultInstance()) return this;
+        if (other.getIsCollected() != false) {
+          setIsCollected(other.getIsCollected());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getIsCollected() != false) {
-          setIsCollected(other.getIsCollected());
+        if (other.getIsTruncated() != false) {
+          setIsTruncated(other.getIsTruncated());
         }
         if (mailListBuilder_ == null) {
           if (!other.mailList_.isEmpty()) {
@@ -611,9 +604,6 @@ public final class GetAllMailRspOuterClass {
             }
           }
         }
-        if (other.getIsTruncated() != false) {
-          setIsTruncated(other.getIsTruncated());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -644,40 +634,9 @@ public final class GetAllMailRspOuterClass {
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isCollected_ ;
       /**
-       * <code>bool is_collected = 12;</code>
+       * <code>bool is_collected = 4;</code>
        * @return The isCollected.
        */
       @java.lang.Override
@@ -685,7 +644,7 @@ public final class GetAllMailRspOuterClass {
         return isCollected_;
       }
       /**
-       * <code>bool is_collected = 12;</code>
+       * <code>bool is_collected = 4;</code>
        * @param value The isCollected to set.
        * @return This builder for chaining.
        */
@@ -696,7 +655,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_collected = 12;</code>
+       * <code>bool is_collected = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsCollected() {
@@ -706,6 +665,68 @@ public final class GetAllMailRspOuterClass {
         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 boolean isTruncated_ ;
+      /**
+       * <code>bool is_truncated = 9;</code>
+       * @return The isTruncated.
+       */
+      @java.lang.Override
+      public boolean getIsTruncated() {
+        return isTruncated_;
+      }
+      /**
+       * <code>bool is_truncated = 9;</code>
+       * @param value The isTruncated to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTruncated(boolean value) {
+        
+        isTruncated_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_truncated = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTruncated() {
+        
+        isTruncated_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_ =
         java.util.Collections.emptyList();
       private void ensureMailListIsMutable() {
@@ -719,7 +740,7 @@ public final class GetAllMailRspOuterClass {
           emu.grasscutter.net.proto.MailDataOuterClass.MailData, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder, emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> mailListBuilder_;
 
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
         if (mailListBuilder_ == null) {
@@ -729,7 +750,7 @@ public final class GetAllMailRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public int getMailListCount() {
         if (mailListBuilder_ == null) {
@@ -739,7 +760,7 @@ public final class GetAllMailRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -749,7 +770,7 @@ public final class GetAllMailRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -766,7 +787,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -780,7 +801,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder addMailList(emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
         if (mailListBuilder_ == null) {
@@ -796,7 +817,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -813,7 +834,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder addMailList(
           emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -827,7 +848,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -841,7 +862,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder addAllMailList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailData> values) {
@@ -856,7 +877,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder clearMailList() {
         if (mailListBuilder_ == null) {
@@ -869,7 +890,7 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public Builder removeMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -882,14 +903,14 @@ public final class GetAllMailRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder getMailListBuilder(
           int index) {
         return getMailListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
           int index) {
@@ -899,7 +920,7 @@ public final class GetAllMailRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
            getMailListOrBuilderList() {
@@ -910,14 +931,14 @@ public final class GetAllMailRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder() {
         return getMailListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder(
           int index) {
@@ -925,7 +946,7 @@ public final class GetAllMailRspOuterClass {
             index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 1;</code>
+       * <code>repeated .MailData mail_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder> 
            getMailListBuilderList() {
@@ -945,37 +966,6 @@ public final class GetAllMailRspOuterClass {
         }
         return mailListBuilder_;
       }
-
-      private boolean isTruncated_ ;
-      /**
-       * <code>bool is_truncated = 11;</code>
-       * @return The isTruncated.
-       */
-      @java.lang.Override
-      public boolean getIsTruncated() {
-        return isTruncated_;
-      }
-      /**
-       * <code>bool is_truncated = 11;</code>
-       * @param value The isTruncated to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTruncated(boolean value) {
-        
-        isTruncated_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_truncated = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTruncated() {
-        
-        isTruncated_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1044,9 +1034,9 @@ public final class GetAllMailRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023GetAllMailRsp.proto\032\016MailData.proto\"j\n" +
-      "\rGetAllMailRsp\022\017\n\007retcode\030\006 \001(\005\022\024\n\014is_co" +
-      "llected\030\014 \001(\010\022\034\n\tmail_list\030\001 \003(\0132\t.MailD" +
-      "ata\022\024\n\014is_truncated\030\013 \001(\010B\033\n\031emu.grasscu" +
+      "\rGetAllMailRsp\022\024\n\014is_collected\030\004 \001(\010\022\017\n\007" +
+      "retcode\030\005 \001(\005\022\024\n\014is_truncated\030\t \001(\010\022\034\n\tm" +
+      "ail_list\030\013 \003(\0132\t.MailDataB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1059,7 +1049,7 @@ public final class GetAllMailRspOuterClass {
     internal_static_GetAllMailRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetAllMailRsp_descriptor,
-        new java.lang.String[] { "Retcode", "IsCollected", "MailList", "IsTruncated", });
+        new java.lang.String[] { "IsCollected", "Retcode", "IsTruncated", "MailList", });
     emu.grasscutter.net.proto.MailDataOuterClass.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 116a5ef4c..6b4410baf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetAllUnlockNameCardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 3551
-   * Obf: NKCLOOCOADG
-   * </pre>
-   *
    * Protobuf type {@code GetAllUnlockNameCardReq}
    */
   public static final class GetAllUnlockNameCardReq extends
@@ -245,11 +240,6 @@ public final class GetAllUnlockNameCardReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3551
-     * Obf: NKCLOOCOADG
-     * </pre>
-     *
      * Protobuf type {@code GetAllUnlockNameCardReq}
      */
     public static final class Builder extends
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 c4a65ebd2..8ee0ead34 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAllUnlockNameCardRspOuterClass.java
@@ -19,34 +19,29 @@ public final class GetAllUnlockNameCardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @return A list containing the nameCardList.
      */
     java.util.List<java.lang.Integer> getNameCardListList();
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @return The count of nameCardList.
      */
     int getNameCardListCount();
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @param index The index of the element to return.
      * @return The nameCardList at the given index.
      */
     int getNameCardList(int index);
-
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28550
-   * Obf: MIOFHIOGCNF
-   * </pre>
-   *
    * Protobuf type {@code GetAllUnlockNameCardRsp}
    */
   public static final class GetAllUnlockNameCardRsp extends
@@ -93,7 +88,12 @@ public final class GetAllUnlockNameCardRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 80: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 nameCardList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +101,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
               nameCardList_.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) {
@@ -114,11 +114,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +149,21 @@ public final class GetAllUnlockNameCardRspOuterClass {
               emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp.class, emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp.Builder.class);
     }
 
-    public static final int NAME_CARD_LIST_FIELD_NUMBER = 8;
+    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;
     private com.google.protobuf.Internal.IntList nameCardList_;
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @return A list containing the nameCardList.
      */
     @java.lang.Override
@@ -166,14 +172,14 @@ public final class GetAllUnlockNameCardRspOuterClass {
       return nameCardList_;
     }
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @return The count of nameCardList.
      */
     public int getNameCardListCount() {
       return nameCardList_.size();
     }
     /**
-     * <code>repeated uint32 name_card_list = 8;</code>
+     * <code>repeated uint32 name_card_list = 11;</code>
      * @param index The index of the element to return.
      * @return The nameCardList at the given index.
      */
@@ -182,17 +188,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
     }
     private int nameCardListMemoizedSerializedSize = -1;
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -208,16 +203,16 @@ public final class GetAllUnlockNameCardRspOuterClass {
     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(66);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(nameCardListMemoizedSerializedSize);
       }
       for (int i = 0; i < nameCardList_.size(); i++) {
         output.writeUInt32NoTag(nameCardList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -227,6 +222,10 @@ public final class GetAllUnlockNameCardRspOuterClass {
       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++) {
@@ -241,10 +240,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
         }
         nameCardListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -260,10 +255,10 @@ public final class GetAllUnlockNameCardRspOuterClass {
       }
       emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp other = (emu.grasscutter.net.proto.GetAllUnlockNameCardRspOuterClass.GetAllUnlockNameCardRsp) obj;
 
-      if (!getNameCardListList()
-          .equals(other.getNameCardListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getNameCardListList()
+          .equals(other.getNameCardListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class GetAllUnlockNameCardRspOuterClass {
       }
       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,11 +372,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28550
-     * Obf: MIOFHIOGCNF
-     * </pre>
-     *
      * Protobuf type {@code GetAllUnlockNameCardRsp}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class GetAllUnlockNameCardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nameCardList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
+        nameCardList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class GetAllUnlockNameCardRspOuterClass {
       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;
       }
@@ -504,6 +494,9 @@ public final class GetAllUnlockNameCardRspOuterClass {
 
       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_;
@@ -514,9 +507,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
           }
           onChanged();
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,6 +537,37 @@ public final class GetAllUnlockNameCardRspOuterClass {
       }
       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)) {
@@ -555,7 +576,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @return A list containing the nameCardList.
        */
       public java.util.List<java.lang.Integer>
@@ -564,14 +585,14 @@ public final class GetAllUnlockNameCardRspOuterClass {
                  java.util.Collections.unmodifiableList(nameCardList_) : nameCardList_;
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @return The count of nameCardList.
        */
       public int getNameCardListCount() {
         return nameCardList_.size();
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @param index The index of the element to return.
        * @return The nameCardList at the given index.
        */
@@ -579,7 +600,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
         return nameCardList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The nameCardList to set.
        * @return This builder for chaining.
@@ -592,7 +613,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @param value The nameCardList to add.
        * @return This builder for chaining.
        */
@@ -603,7 +624,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @param values The nameCardList to add.
        * @return This builder for chaining.
        */
@@ -616,7 +637,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 name_card_list = 8;</code>
+       * <code>repeated uint32 name_card_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearNameCardList() {
@@ -625,37 +646,6 @@ public final class GetAllUnlockNameCardRspOuterClass {
         onChanged();
         return this;
       }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -724,8 +714,8 @@ public final class GetAllUnlockNameCardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\035GetAllUnlockNameCardRsp.proto\"B\n\027GetAl" +
-      "lUnlockNameCardRsp\022\026\n\016name_card_list\030\010 \003" +
-      "(\r\022\017\n\007retcode\030\t \001(\005B\033\n\031emu.grasscutter.n" +
+      "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" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +727,7 @@ public final class GetAllUnlockNameCardRspOuterClass {
     internal_static_GetAllUnlockNameCardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetAllUnlockNameCardRsp_descriptor,
-        new java.lang.String[] { "NameCardList", "Retcode", });
+        new java.lang.String[] { "Retcode", "NameCardList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointReqOuterClass.java
index 2eb3ec59c..dd187deff 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointReqOuterClass.java
@@ -19,28 +19,23 @@ public final class GetAreaExplorePointReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @return A list containing the areaIdList.
      */
     java.util.List<java.lang.Integer> getAreaIdListList();
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @return The count of areaIdList.
      */
     int getAreaIdListCount();
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
     int getAreaIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 20438
-   * Obf: FJFIDGPOJPP
-   * </pre>
-   *
    * Protobuf type {@code GetAreaExplorePointReq}
    */
   public static final class GetAreaExplorePointReq extends
@@ -87,7 +82,7 @@ public final class GetAreaExplorePointReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 areaIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class GetAreaExplorePointReqOuterClass {
               areaIdList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class GetAreaExplorePointReqOuterClass {
               emu.grasscutter.net.proto.GetAreaExplorePointReqOuterClass.GetAreaExplorePointReq.class, emu.grasscutter.net.proto.GetAreaExplorePointReqOuterClass.GetAreaExplorePointReq.Builder.class);
     }
 
-    public static final int AREA_ID_LIST_FIELD_NUMBER = 15;
+    public static final int AREA_ID_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList areaIdList_;
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @return A list containing the areaIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class GetAreaExplorePointReqOuterClass {
       return areaIdList_;
     }
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @return The count of areaIdList.
      */
     public int getAreaIdListCount() {
       return areaIdList_.size();
     }
     /**
-     * <code>repeated uint32 area_id_list = 15;</code>
+     * <code>repeated uint32 area_id_list = 11;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class GetAreaExplorePointReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getAreaIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(areaIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < areaIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class GetAreaExplorePointReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20438
-     * Obf: FJFIDGPOJPP
-     * </pre>
-     *
      * Protobuf type {@code GetAreaExplorePointReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class GetAreaExplorePointReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @return A list containing the areaIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class GetAreaExplorePointReqOuterClass {
                  java.util.Collections.unmodifiableList(areaIdList_) : areaIdList_;
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @return The count of areaIdList.
        */
       public int getAreaIdListCount() {
         return areaIdList_.size();
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @param index The index of the element to return.
        * @return The areaIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class GetAreaExplorePointReqOuterClass {
         return areaIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The areaIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class GetAreaExplorePointReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @param value The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class GetAreaExplorePointReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @param values The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class GetAreaExplorePointReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 15;</code>
+       * <code>repeated uint32 area_id_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaIdList() {
@@ -654,7 +644,7 @@ public final class GetAreaExplorePointReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034GetAreaExplorePointReq.proto\".\n\026GetAre" +
-      "aExplorePointReq\022\024\n\014area_id_list\030\017 \003(\rB\033" +
+      "aExplorePointReq\022\024\n\014area_id_list\030\013 \003(\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/GetAreaExplorePointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointRspOuterClass.java
index 41c49ac0d..6a3a8e410 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetAreaExplorePointRspOuterClass.java
@@ -19,51 +19,46 @@ public final class GetAreaExplorePointRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @return A list containing the explorePointList.
      */
     java.util.List<java.lang.Integer> getExplorePointListList();
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @return The count of explorePointList.
      */
     int getExplorePointListCount();
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @param index The index of the element to return.
      * @return The explorePointList at the given index.
      */
     int getExplorePointList(int index);
 
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @return A list containing the areaIdList.
      */
     java.util.List<java.lang.Integer> getAreaIdListList();
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @return The count of areaIdList.
      */
     int getAreaIdListCount();
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
     int getAreaIdList(int index);
 
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 27637
-   * Obf: OLAMIDKPCCE
-   * </pre>
-   *
    * Protobuf type {@code GetAreaExplorePointRsp}
    */
   public static final class GetAreaExplorePointRsp extends
@@ -112,6 +107,27 @@ public final class GetAreaExplorePointRspOuterClass {
               done = true;
               break;
             case 8: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                explorePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              explorePointList_.addInt(input.readUInt32());
+              break;
+            }
+            case 10: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                explorePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                explorePointList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 56: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 areaIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -119,7 +135,7 @@ public final class GetAreaExplorePointRspOuterClass {
               areaIdList_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 58: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -132,32 +148,11 @@ public final class GetAreaExplorePointRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                explorePointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              explorePointList_.addInt(input.readUInt32());
-              break;
-            }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                explorePointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                explorePointList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -173,12 +168,12 @@ public final class GetAreaExplorePointRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          areaIdList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           explorePointList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          areaIdList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -196,10 +191,10 @@ public final class GetAreaExplorePointRspOuterClass {
               emu.grasscutter.net.proto.GetAreaExplorePointRspOuterClass.GetAreaExplorePointRsp.class, emu.grasscutter.net.proto.GetAreaExplorePointRspOuterClass.GetAreaExplorePointRsp.Builder.class);
     }
 
-    public static final int EXPLORE_POINT_LIST_FIELD_NUMBER = 10;
+    public static final int EXPLORE_POINT_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList explorePointList_;
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @return A list containing the explorePointList.
      */
     @java.lang.Override
@@ -208,14 +203,14 @@ public final class GetAreaExplorePointRspOuterClass {
       return explorePointList_;
     }
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @return The count of explorePointList.
      */
     public int getExplorePointListCount() {
       return explorePointList_.size();
     }
     /**
-     * <code>repeated uint32 explore_point_list = 10;</code>
+     * <code>repeated uint32 explore_point_list = 1;</code>
      * @param index The index of the element to return.
      * @return The explorePointList at the given index.
      */
@@ -224,10 +219,10 @@ public final class GetAreaExplorePointRspOuterClass {
     }
     private int explorePointListMemoizedSerializedSize = -1;
 
-    public static final int AREA_ID_LIST_FIELD_NUMBER = 1;
+    public static final int AREA_ID_LIST_FIELD_NUMBER = 7;
     private com.google.protobuf.Internal.IntList areaIdList_;
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @return A list containing the areaIdList.
      */
     @java.lang.Override
@@ -236,14 +231,14 @@ public final class GetAreaExplorePointRspOuterClass {
       return areaIdList_;
     }
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @return The count of areaIdList.
      */
     public int getAreaIdListCount() {
       return areaIdList_.size();
     }
     /**
-     * <code>repeated uint32 area_id_list = 1;</code>
+     * <code>repeated uint32 area_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
@@ -252,10 +247,10 @@ public final class GetAreaExplorePointRspOuterClass {
     }
     private int areaIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -278,22 +273,22 @@ public final class GetAreaExplorePointRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getAreaIdListList().size() > 0) {
+      if (getExplorePointListList().size() > 0) {
         output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(explorePointListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < explorePointList_.size(); i++) {
+        output.writeUInt32NoTag(explorePointList_.getInt(i));
+      }
+      if (getAreaIdListList().size() > 0) {
+        output.writeUInt32NoTag(58);
         output.writeUInt32NoTag(areaIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < areaIdList_.size(); i++) {
         output.writeUInt32NoTag(areaIdList_.getInt(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
-      if (getExplorePointListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(explorePointListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < explorePointList_.size(); i++) {
-        output.writeUInt32NoTag(explorePointList_.getInt(i));
+        output.writeInt32(11, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -304,6 +299,20 @@ public final class GetAreaExplorePointRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < explorePointList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(explorePointList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getExplorePointListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        explorePointListMemoizedSerializedSize = dataSize;
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < areaIdList_.size(); i++) {
@@ -320,21 +329,7 @@ public final class GetAreaExplorePointRspOuterClass {
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < explorePointList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(explorePointList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getExplorePointListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        explorePointListMemoizedSerializedSize = dataSize;
+          .computeInt32Size(11, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -474,11 +469,6 @@ public final class GetAreaExplorePointRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27637
-     * Obf: OLAMIDKPCCE
-     * </pre>
-     *
      * Protobuf type {@code GetAreaExplorePointRsp}
      */
     public static final class Builder extends
@@ -669,7 +659,7 @@ public final class GetAreaExplorePointRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @return A list containing the explorePointList.
        */
       public java.util.List<java.lang.Integer>
@@ -678,14 +668,14 @@ public final class GetAreaExplorePointRspOuterClass {
                  java.util.Collections.unmodifiableList(explorePointList_) : explorePointList_;
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @return The count of explorePointList.
        */
       public int getExplorePointListCount() {
         return explorePointList_.size();
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @param index The index of the element to return.
        * @return The explorePointList at the given index.
        */
@@ -693,7 +683,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return explorePointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The explorePointList to set.
        * @return This builder for chaining.
@@ -706,7 +696,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @param value The explorePointList to add.
        * @return This builder for chaining.
        */
@@ -717,7 +707,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @param values The explorePointList to add.
        * @return This builder for chaining.
        */
@@ -730,7 +720,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 explore_point_list = 10;</code>
+       * <code>repeated uint32 explore_point_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearExplorePointList() {
@@ -748,7 +738,7 @@ public final class GetAreaExplorePointRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @return A list containing the areaIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -757,14 +747,14 @@ public final class GetAreaExplorePointRspOuterClass {
                  java.util.Collections.unmodifiableList(areaIdList_) : areaIdList_;
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @return The count of areaIdList.
        */
       public int getAreaIdListCount() {
         return areaIdList_.size();
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @param index The index of the element to return.
        * @return The areaIdList at the given index.
        */
@@ -772,7 +762,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return areaIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @param index The index to set the value at.
        * @param value The areaIdList to set.
        * @return This builder for chaining.
@@ -785,7 +775,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @param value The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -796,7 +786,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @param values The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -809,7 +799,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 1;</code>
+       * <code>repeated uint32 area_id_list = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaIdList() {
@@ -821,7 +811,7 @@ public final class GetAreaExplorePointRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -829,7 +819,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -840,7 +830,7 @@ public final class GetAreaExplorePointRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -917,8 +907,8 @@ public final class GetAreaExplorePointRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034GetAreaExplorePointRsp.proto\"[\n\026GetAre" +
-      "aExplorePointRsp\022\032\n\022explore_point_list\030\n" +
-      " \003(\r\022\024\n\014area_id_list\030\001 \003(\r\022\017\n\007retcode\030\t " +
+      "aExplorePointRsp\022\032\n\022explore_point_list\030\001" +
+      " \003(\r\022\024\n\014area_id_list\030\007 \003(\r\022\017\n\007retcode\030\013 " +
       "\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/GetCityHuntingOfferRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetCityHuntingOfferRspOuterClass.java
index ec3133eda..b85192897 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetCityHuntingOfferRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetCityHuntingOfferRspOuterClass.java
@@ -19,10 +19,10 @@ public final class GetCityHuntingOfferRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
+     * <code>uint32 city_id = 8;</code>
+     * @return The cityId.
      */
-    int getRetcode();
+    int getCityId();
 
     /**
      * <code>repeated .HuntingOfferData hunting_offer_list = 9;</code>
@@ -49,44 +49,39 @@ public final class GetCityHuntingOfferRspOuterClass {
         int index);
 
     /**
-     * <code>uint32 next_refresh_time = 3;</code>
+     * <code>uint32 next_refresh_time = 10;</code>
      * @return The nextRefreshTime.
      */
     int getNextRefreshTime();
 
     /**
-     * <code>uint32 city_id = 6;</code>
-     * @return The cityId.
+     * <code>int32 retcode = 11;</code>
+     * @return The retcode.
      */
-    int getCityId();
+    int getRetcode();
 
     /**
-     * <code>uint32 cur_week_finished_count = 4;</code>
-     * @return The curWeekFinishedCount.
-     */
-    int getCurWeekFinishedCount();
-
-    /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      * @return Whether the ongoingHuntingPair field is set.
      */
     boolean hasOngoingHuntingPair();
     /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      * @return The ongoingHuntingPair.
      */
     emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getOngoingHuntingPair();
     /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      */
     emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getOngoingHuntingPairOrBuilder();
+
+    /**
+     * <code>uint32 cur_week_finished_count = 15;</code>
+     * @return The curWeekFinishedCount.
+     */
+    int getCurWeekFinishedCount();
   }
   /**
-   * <pre>
-   * CmdId: 6015
-   * Obf: PHNMECOCEEN
-   * </pre>
-   *
    * Protobuf type {@code GetCityHuntingOfferRsp}
    */
   public static final class GetCityHuntingOfferRsp extends
@@ -133,17 +128,7 @@ public final class GetCityHuntingOfferRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              nextRefreshTime_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              curWeekFinishedCount_ = input.readUInt32();
-              break;
-            }
-            case 48: {
+            case 64: {
 
               cityId_ = input.readUInt32();
               break;
@@ -157,12 +142,17 @@ public final class GetCityHuntingOfferRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData.parser(), extensionRegistry));
               break;
             }
-            case 96: {
+            case 80: {
+
+              nextRefreshTime_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 122: {
+            case 106: {
               emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder subBuilder = null;
               if (ongoingHuntingPair_ != null) {
                 subBuilder = ongoingHuntingPair_.toBuilder();
@@ -175,6 +165,11 @@ public final class GetCityHuntingOfferRspOuterClass {
 
               break;
             }
+            case 120: {
+
+              curWeekFinishedCount_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -210,15 +205,15 @@ public final class GetCityHuntingOfferRspOuterClass {
               emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp.class, emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
-    private int retcode_;
+    public static final int CITY_ID_FIELD_NUMBER = 8;
+    private int cityId_;
     /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
+     * <code>uint32 city_id = 8;</code>
+     * @return The cityId.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getCityId() {
+      return cityId_;
     }
 
     public static final int HUNTING_OFFER_LIST_FIELD_NUMBER = 9;
@@ -261,10 +256,10 @@ public final class GetCityHuntingOfferRspOuterClass {
       return huntingOfferList_.get(index);
     }
 
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 3;
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 10;
     private int nextRefreshTime_;
     /**
-     * <code>uint32 next_refresh_time = 3;</code>
+     * <code>uint32 next_refresh_time = 10;</code>
      * @return The nextRefreshTime.
      */
     @java.lang.Override
@@ -272,32 +267,21 @@ public final class GetCityHuntingOfferRspOuterClass {
       return nextRefreshTime_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 6;
-    private int cityId_;
+    public static final int RETCODE_FIELD_NUMBER = 11;
+    private int retcode_;
     /**
-     * <code>uint32 city_id = 6;</code>
-     * @return The cityId.
+     * <code>int32 retcode = 11;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getCityId() {
-      return cityId_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int CUR_WEEK_FINISHED_COUNT_FIELD_NUMBER = 4;
-    private int curWeekFinishedCount_;
-    /**
-     * <code>uint32 cur_week_finished_count = 4;</code>
-     * @return The curWeekFinishedCount.
-     */
-    @java.lang.Override
-    public int getCurWeekFinishedCount() {
-      return curWeekFinishedCount_;
-    }
-
-    public static final int ONGOING_HUNTING_PAIR_FIELD_NUMBER = 15;
+    public static final int ONGOING_HUNTING_PAIR_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair ongoingHuntingPair_;
     /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      * @return Whether the ongoingHuntingPair field is set.
      */
     @java.lang.Override
@@ -305,7 +289,7 @@ public final class GetCityHuntingOfferRspOuterClass {
       return ongoingHuntingPair_ != null;
     }
     /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      * @return The ongoingHuntingPair.
      */
     @java.lang.Override
@@ -313,13 +297,24 @@ public final class GetCityHuntingOfferRspOuterClass {
       return ongoingHuntingPair_ == null ? emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.getDefaultInstance() : ongoingHuntingPair_;
     }
     /**
-     * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+     * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getOngoingHuntingPairOrBuilder() {
       return getOngoingHuntingPair();
     }
 
+    public static final int CUR_WEEK_FINISHED_COUNT_FIELD_NUMBER = 15;
+    private int curWeekFinishedCount_;
+    /**
+     * <code>uint32 cur_week_finished_count = 15;</code>
+     * @return The curWeekFinishedCount.
+     */
+    @java.lang.Override
+    public int getCurWeekFinishedCount() {
+      return curWeekFinishedCount_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -334,23 +329,23 @@ public final class GetCityHuntingOfferRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (nextRefreshTime_ != 0) {
-        output.writeUInt32(3, nextRefreshTime_);
-      }
-      if (curWeekFinishedCount_ != 0) {
-        output.writeUInt32(4, curWeekFinishedCount_);
-      }
       if (cityId_ != 0) {
-        output.writeUInt32(6, cityId_);
+        output.writeUInt32(8, cityId_);
       }
       for (int i = 0; i < huntingOfferList_.size(); i++) {
         output.writeMessage(9, huntingOfferList_.get(i));
       }
+      if (nextRefreshTime_ != 0) {
+        output.writeUInt32(10, nextRefreshTime_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(11, retcode_);
       }
       if (ongoingHuntingPair_ != null) {
-        output.writeMessage(15, getOngoingHuntingPair());
+        output.writeMessage(13, getOngoingHuntingPair());
+      }
+      if (curWeekFinishedCount_ != 0) {
+        output.writeUInt32(15, curWeekFinishedCount_);
       }
       unknownFields.writeTo(output);
     }
@@ -361,29 +356,29 @@ public final class GetCityHuntingOfferRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (nextRefreshTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, nextRefreshTime_);
-      }
-      if (curWeekFinishedCount_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, curWeekFinishedCount_);
-      }
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, cityId_);
+          .computeUInt32Size(8, cityId_);
       }
       for (int i = 0; i < huntingOfferList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, huntingOfferList_.get(i));
       }
+      if (nextRefreshTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, nextRefreshTime_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       if (ongoingHuntingPair_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getOngoingHuntingPair());
+          .computeMessageSize(13, getOngoingHuntingPair());
+      }
+      if (curWeekFinishedCount_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, curWeekFinishedCount_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -400,21 +395,21 @@ public final class GetCityHuntingOfferRspOuterClass {
       }
       emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp other = (emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
+      if (getCityId()
+          != other.getCityId()) return false;
       if (!getHuntingOfferListList()
           .equals(other.getHuntingOfferListList())) return false;
       if (getNextRefreshTime()
           != other.getNextRefreshTime()) return false;
-      if (getCityId()
-          != other.getCityId()) return false;
-      if (getCurWeekFinishedCount()
-          != other.getCurWeekFinishedCount()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (hasOngoingHuntingPair() != other.hasOngoingHuntingPair()) return false;
       if (hasOngoingHuntingPair()) {
         if (!getOngoingHuntingPair()
             .equals(other.getOngoingHuntingPair())) return false;
       }
+      if (getCurWeekFinishedCount()
+          != other.getCurWeekFinishedCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -426,22 +421,22 @@ public final class GetCityHuntingOfferRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCityId();
       if (getHuntingOfferListCount() > 0) {
         hash = (37 * hash) + HUNTING_OFFER_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getHuntingOfferListList().hashCode();
       }
       hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getNextRefreshTime();
-      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCityId();
-      hash = (37 * hash) + CUR_WEEK_FINISHED_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getCurWeekFinishedCount();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (hasOngoingHuntingPair()) {
         hash = (37 * hash) + ONGOING_HUNTING_PAIR_FIELD_NUMBER;
         hash = (53 * hash) + getOngoingHuntingPair().hashCode();
       }
+      hash = (37 * hash) + CUR_WEEK_FINISHED_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getCurWeekFinishedCount();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -538,11 +533,6 @@ public final class GetCityHuntingOfferRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6015
-     * Obf: PHNMECOCEEN
-     * </pre>
-     *
      * Protobuf type {@code GetCityHuntingOfferRsp}
      */
     public static final class Builder extends
@@ -581,7 +571,7 @@ public final class GetCityHuntingOfferRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        cityId_ = 0;
 
         if (huntingOfferListBuilder_ == null) {
           huntingOfferList_ = java.util.Collections.emptyList();
@@ -591,9 +581,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         }
         nextRefreshTime_ = 0;
 
-        cityId_ = 0;
-
-        curWeekFinishedCount_ = 0;
+        retcode_ = 0;
 
         if (ongoingHuntingPairBuilder_ == null) {
           ongoingHuntingPair_ = null;
@@ -601,6 +589,8 @@ public final class GetCityHuntingOfferRspOuterClass {
           ongoingHuntingPair_ = null;
           ongoingHuntingPairBuilder_ = null;
         }
+        curWeekFinishedCount_ = 0;
+
         return this;
       }
 
@@ -628,7 +618,7 @@ public final class GetCityHuntingOfferRspOuterClass {
       public emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp buildPartial() {
         emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp result = new emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
+        result.cityId_ = cityId_;
         if (huntingOfferListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             huntingOfferList_ = java.util.Collections.unmodifiableList(huntingOfferList_);
@@ -639,13 +629,13 @@ public final class GetCityHuntingOfferRspOuterClass {
           result.huntingOfferList_ = huntingOfferListBuilder_.build();
         }
         result.nextRefreshTime_ = nextRefreshTime_;
-        result.cityId_ = cityId_;
-        result.curWeekFinishedCount_ = curWeekFinishedCount_;
+        result.retcode_ = retcode_;
         if (ongoingHuntingPairBuilder_ == null) {
           result.ongoingHuntingPair_ = ongoingHuntingPair_;
         } else {
           result.ongoingHuntingPair_ = ongoingHuntingPairBuilder_.build();
         }
+        result.curWeekFinishedCount_ = curWeekFinishedCount_;
         onBuilt();
         return result;
       }
@@ -694,8 +684,8 @@ public final class GetCityHuntingOfferRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp other) {
         if (other == emu.grasscutter.net.proto.GetCityHuntingOfferRspOuterClass.GetCityHuntingOfferRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getCityId() != 0) {
+          setCityId(other.getCityId());
         }
         if (huntingOfferListBuilder_ == null) {
           if (!other.huntingOfferList_.isEmpty()) {
@@ -726,15 +716,15 @@ public final class GetCityHuntingOfferRspOuterClass {
         if (other.getNextRefreshTime() != 0) {
           setNextRefreshTime(other.getNextRefreshTime());
         }
-        if (other.getCityId() != 0) {
-          setCityId(other.getCityId());
-        }
-        if (other.getCurWeekFinishedCount() != 0) {
-          setCurWeekFinishedCount(other.getCurWeekFinishedCount());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         if (other.hasOngoingHuntingPair()) {
           mergeOngoingHuntingPair(other.getOngoingHuntingPair());
         }
+        if (other.getCurWeekFinishedCount() != 0) {
+          setCurWeekFinishedCount(other.getCurWeekFinishedCount());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -765,33 +755,33 @@ public final class GetCityHuntingOfferRspOuterClass {
       }
       private int bitField0_;
 
-      private int retcode_ ;
+      private int cityId_ ;
       /**
-       * <code>int32 retcode = 12;</code>
-       * @return The retcode.
+       * <code>uint32 city_id = 8;</code>
+       * @return The cityId.
        */
       @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      public int getCityId() {
+        return cityId_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
-       * @param value The retcode to set.
+       * <code>uint32 city_id = 8;</code>
+       * @param value The cityId to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
+      public Builder setCityId(int value) {
         
-        retcode_ = value;
+        cityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>uint32 city_id = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
+      public Builder clearCityId() {
         
-        retcode_ = 0;
+        cityId_ = 0;
         onChanged();
         return this;
       }
@@ -1038,7 +1028,7 @@ public final class GetCityHuntingOfferRspOuterClass {
 
       private int nextRefreshTime_ ;
       /**
-       * <code>uint32 next_refresh_time = 3;</code>
+       * <code>uint32 next_refresh_time = 10;</code>
        * @return The nextRefreshTime.
        */
       @java.lang.Override
@@ -1046,7 +1036,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return nextRefreshTime_;
       }
       /**
-       * <code>uint32 next_refresh_time = 3;</code>
+       * <code>uint32 next_refresh_time = 10;</code>
        * @param value The nextRefreshTime to set.
        * @return This builder for chaining.
        */
@@ -1057,7 +1047,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 next_refresh_time = 3;</code>
+       * <code>uint32 next_refresh_time = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearNextRefreshTime() {
@@ -1067,64 +1057,33 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
 
-      private int cityId_ ;
+      private int retcode_ ;
       /**
-       * <code>uint32 city_id = 6;</code>
-       * @return The cityId.
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public int getCityId() {
-        return cityId_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>uint32 city_id = 6;</code>
-       * @param value The cityId to set.
+       * <code>int32 retcode = 11;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setCityId(int value) {
+      public Builder setRetcode(int value) {
         
-        cityId_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 city_id = 6;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCityId() {
+      public Builder clearRetcode() {
         
-        cityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curWeekFinishedCount_ ;
-      /**
-       * <code>uint32 cur_week_finished_count = 4;</code>
-       * @return The curWeekFinishedCount.
-       */
-      @java.lang.Override
-      public int getCurWeekFinishedCount() {
-        return curWeekFinishedCount_;
-      }
-      /**
-       * <code>uint32 cur_week_finished_count = 4;</code>
-       * @param value The curWeekFinishedCount to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurWeekFinishedCount(int value) {
-        
-        curWeekFinishedCount_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_week_finished_count = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurWeekFinishedCount() {
-        
-        curWeekFinishedCount_ = 0;
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -1133,14 +1092,14 @@ public final class GetCityHuntingOfferRspOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder> ongoingHuntingPairBuilder_;
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        * @return Whether the ongoingHuntingPair field is set.
        */
       public boolean hasOngoingHuntingPair() {
         return ongoingHuntingPairBuilder_ != null || ongoingHuntingPair_ != null;
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        * @return The ongoingHuntingPair.
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getOngoingHuntingPair() {
@@ -1151,7 +1110,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         }
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public Builder setOngoingHuntingPair(emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair value) {
         if (ongoingHuntingPairBuilder_ == null) {
@@ -1167,7 +1126,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public Builder setOngoingHuntingPair(
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder builderForValue) {
@@ -1181,7 +1140,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public Builder mergeOngoingHuntingPair(emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair value) {
         if (ongoingHuntingPairBuilder_ == null) {
@@ -1199,7 +1158,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public Builder clearOngoingHuntingPair() {
         if (ongoingHuntingPairBuilder_ == null) {
@@ -1213,7 +1172,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder getOngoingHuntingPairBuilder() {
         
@@ -1221,7 +1180,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         return getOngoingHuntingPairFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getOngoingHuntingPairOrBuilder() {
         if (ongoingHuntingPairBuilder_ != null) {
@@ -1232,7 +1191,7 @@ public final class GetCityHuntingOfferRspOuterClass {
         }
       }
       /**
-       * <code>.HuntingPair ongoing_hunting_pair = 15;</code>
+       * <code>.HuntingPair ongoing_hunting_pair = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder> 
@@ -1247,6 +1206,37 @@ public final class GetCityHuntingOfferRspOuterClass {
         }
         return ongoingHuntingPairBuilder_;
       }
+
+      private int curWeekFinishedCount_ ;
+      /**
+       * <code>uint32 cur_week_finished_count = 15;</code>
+       * @return The curWeekFinishedCount.
+       */
+      @java.lang.Override
+      public int getCurWeekFinishedCount() {
+        return curWeekFinishedCount_;
+      }
+      /**
+       * <code>uint32 cur_week_finished_count = 15;</code>
+       * @param value The curWeekFinishedCount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurWeekFinishedCount(int value) {
+        
+        curWeekFinishedCount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_week_finished_count = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurWeekFinishedCount() {
+        
+        curWeekFinishedCount_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1316,12 +1306,12 @@ public final class GetCityHuntingOfferRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034GetCityHuntingOfferRsp.proto\032\026HuntingO" +
       "fferData.proto\032\021HuntingPair.proto\"\321\001\n\026Ge" +
-      "tCityHuntingOfferRsp\022\017\n\007retcode\030\014 \001(\005\022-\n" +
+      "tCityHuntingOfferRsp\022\017\n\007city_id\030\010 \001(\r\022-\n" +
       "\022hunting_offer_list\030\t \003(\0132\021.HuntingOffer" +
-      "Data\022\031\n\021next_refresh_time\030\003 \001(\r\022\017\n\007city_" +
-      "id\030\006 \001(\r\022\037\n\027cur_week_finished_count\030\004 \001(" +
-      "\r\022*\n\024ongoing_hunting_pair\030\017 \001(\0132\014.Huntin" +
-      "gPairB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "Data\022\031\n\021next_refresh_time\030\n \001(\r\022\017\n\007retco" +
+      "de\030\013 \001(\005\022*\n\024ongoing_hunting_pair\030\r \001(\0132\014" +
+      ".HuntingPair\022\037\n\027cur_week_finished_count\030" +
+      "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1335,7 +1325,7 @@ public final class GetCityHuntingOfferRspOuterClass {
     internal_static_GetCityHuntingOfferRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetCityHuntingOfferRsp_descriptor,
-        new java.lang.String[] { "Retcode", "HuntingOfferList", "NextRefreshTime", "CityId", "CurWeekFinishedCount", "OngoingHuntingPair", });
+        new java.lang.String[] { "CityId", "HuntingOfferList", "NextRefreshTime", "Retcode", "OngoingHuntingPair", "CurWeekFinishedCount", });
     emu.grasscutter.net.proto.HuntingOfferDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HuntingPairOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoReqOuterClass.java
index 03b3b5229..42b876a52 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoReqOuterClass.java
@@ -19,17 +19,12 @@ public final class GetCityReputationInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 city_id = 15;</code>
+     * <code>uint32 city_id = 11;</code>
      * @return The cityId.
      */
     int getCityId();
   }
   /**
-   * <pre>
-   * CmdId: 8549
-   * Obf: NGMPLHMNEFE
-   * </pre>
-   *
    * Protobuf type {@code GetCityReputationInfoReq}
    */
   public static final class GetCityReputationInfoReq extends
@@ -74,7 +69,7 @@ public final class GetCityReputationInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 88: {
 
               cityId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class GetCityReputationInfoReqOuterClass {
               emu.grasscutter.net.proto.GetCityReputationInfoReqOuterClass.GetCityReputationInfoReq.class, emu.grasscutter.net.proto.GetCityReputationInfoReqOuterClass.GetCityReputationInfoReq.Builder.class);
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 15;
+    public static final int CITY_ID_FIELD_NUMBER = 11;
     private int cityId_;
     /**
-     * <code>uint32 city_id = 15;</code>
+     * <code>uint32 city_id = 11;</code>
      * @return The cityId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetCityReputationInfoReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (cityId_ != 0) {
-        output.writeUInt32(15, cityId_);
+        output.writeUInt32(11, cityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetCityReputationInfoReqOuterClass {
       size = 0;
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, cityId_);
+          .computeUInt32Size(11, cityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class GetCityReputationInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8549
-     * Obf: NGMPLHMNEFE
-     * </pre>
-     *
      * Protobuf type {@code GetCityReputationInfoReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class GetCityReputationInfoReqOuterClass {
 
       private int cityId_ ;
       /**
-       * <code>uint32 city_id = 15;</code>
+       * <code>uint32 city_id = 11;</code>
        * @return The cityId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class GetCityReputationInfoReqOuterClass {
         return cityId_;
       }
       /**
-       * <code>uint32 city_id = 15;</code>
+       * <code>uint32 city_id = 11;</code>
        * @param value The cityId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class GetCityReputationInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 city_id = 15;</code>
+       * <code>uint32 city_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearCityId() {
@@ -527,7 +517,7 @@ public final class GetCityReputationInfoReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036GetCityReputationInfoReq.proto\"+\n\030GetC" +
-      "ityReputationInfoReq\022\017\n\007city_id\030\017 \001(\rB\033\n" +
+      "ityReputationInfoReq\022\017\n\007city_id\030\013 \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/GetCityReputationInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoRspOuterClass.java
index b8902bb11..b5845728f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetCityReputationInfoRspOuterClass.java
@@ -18,6 +18,23 @@ public final class GetCityReputationInfoRspOuterClass {
       // @@protoc_insertion_point(interface_extends:GetCityReputationInfoRsp)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @return A list containing the lIDPFAAPFMM.
+     */
+    java.util.List<java.lang.Integer> getLIDPFAAPFMMList();
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @return The count of lIDPFAAPFMM.
+     */
+    int getLIDPFAAPFMMCount();
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @param index The index of the element to return.
+     * @return The lIDPFAAPFMM at the given index.
+     */
+    int getLIDPFAAPFMM(int index);
+
     /**
      * <code>int32 retcode = 5;</code>
      * @return The retcode.
@@ -25,32 +42,16 @@ public final class GetCityReputationInfoRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>uint32 city_id = 10;</code>
+     * <pre>
+     *repeated LCBGDOHINDD GAGAHOFMJLM = 9;
+     * </pre>
+     *
+     * <code>uint32 city_id = 8;</code>
      * @return The cityId.
      */
     int getCityId();
-
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     * @return Whether the cityReputationInfo field is set.
-     */
-    boolean hasCityReputationInfo();
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     * @return The cityReputationInfo.
-     */
-    emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo getCityReputationInfo();
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     */
-    emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder getCityReputationInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 128
-   * Obf: GJNNLGKELGN
-   * </pre>
-   *
    * Protobuf type {@code GetCityReputationInfoRsp}
    */
   public static final class GetCityReputationInfoRsp extends
@@ -63,6 +64,7 @@ public final class GetCityReputationInfoRspOuterClass {
       super(builder);
     }
     private GetCityReputationInfoRsp() {
+      lIDPFAAPFMM_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -85,6 +87,7 @@ public final class GetCityReputationInfoRspOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -95,17 +98,25 @@ public final class GetCityReputationInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder subBuilder = null;
-              if (cityReputationInfo_ != null) {
-                subBuilder = cityReputationInfo_.toBuilder();
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                lIDPFAAPFMM_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              cityReputationInfo_ = input.readMessage(emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(cityReputationInfo_);
-                cityReputationInfo_ = subBuilder.buildPartial();
+              lIDPFAAPFMM_.addInt(input.readUInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                lIDPFAAPFMM_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-
+              while (input.getBytesUntilLimit() > 0) {
+                lIDPFAAPFMM_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             case 40: {
@@ -113,7 +124,7 @@ public final class GetCityReputationInfoRspOuterClass {
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 64: {
 
               cityId_ = input.readUInt32();
               break;
@@ -133,6 +144,9 @@ public final class GetCityReputationInfoRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          lIDPFAAPFMM_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -150,6 +164,34 @@ public final class GetCityReputationInfoRspOuterClass {
               emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp.class, emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp.Builder.class);
     }
 
+    public static final int LIDPFAAPFMM_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList lIDPFAAPFMM_;
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @return A list containing the lIDPFAAPFMM.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLIDPFAAPFMMList() {
+      return lIDPFAAPFMM_;
+    }
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @return The count of lIDPFAAPFMM.
+     */
+    public int getLIDPFAAPFMMCount() {
+      return lIDPFAAPFMM_.size();
+    }
+    /**
+     * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+     * @param index The index of the element to return.
+     * @return The lIDPFAAPFMM at the given index.
+     */
+    public int getLIDPFAAPFMM(int index) {
+      return lIDPFAAPFMM_.getInt(index);
+    }
+    private int lIDPFAAPFMMMemoizedSerializedSize = -1;
+
     public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
@@ -161,10 +203,14 @@ public final class GetCityReputationInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 10;
+    public static final int CITY_ID_FIELD_NUMBER = 8;
     private int cityId_;
     /**
-     * <code>uint32 city_id = 10;</code>
+     * <pre>
+     *repeated LCBGDOHINDD GAGAHOFMJLM = 9;
+     * </pre>
+     *
+     * <code>uint32 city_id = 8;</code>
      * @return The cityId.
      */
     @java.lang.Override
@@ -172,32 +218,6 @@ public final class GetCityReputationInfoRspOuterClass {
       return cityId_;
     }
 
-    public static final int CITY_REPUTATION_INFO_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo cityReputationInfo_;
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     * @return Whether the cityReputationInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasCityReputationInfo() {
-      return cityReputationInfo_ != null;
-    }
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     * @return The cityReputationInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo getCityReputationInfo() {
-      return cityReputationInfo_ == null ? emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.getDefaultInstance() : cityReputationInfo_;
-    }
-    /**
-     * <code>.CityReputationInfo city_reputation_info = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder getCityReputationInfoOrBuilder() {
-      return getCityReputationInfo();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -212,14 +232,19 @@ public final class GetCityReputationInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (cityReputationInfo_ != null) {
-        output.writeMessage(1, getCityReputationInfo());
+      getSerializedSize();
+      if (getLIDPFAAPFMMList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(lIDPFAAPFMMMemoizedSerializedSize);
+      }
+      for (int i = 0; i < lIDPFAAPFMM_.size(); i++) {
+        output.writeUInt32NoTag(lIDPFAAPFMM_.getInt(i));
       }
       if (retcode_ != 0) {
         output.writeInt32(5, retcode_);
       }
       if (cityId_ != 0) {
-        output.writeUInt32(10, cityId_);
+        output.writeUInt32(8, cityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -230,9 +255,19 @@ public final class GetCityReputationInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (cityReputationInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getCityReputationInfo());
+      {
+        int dataSize = 0;
+        for (int i = 0; i < lIDPFAAPFMM_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(lIDPFAAPFMM_.getInt(i));
+        }
+        size += dataSize;
+        if (!getLIDPFAAPFMMList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        lIDPFAAPFMMMemoizedSerializedSize = dataSize;
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -240,7 +275,7 @@ public final class GetCityReputationInfoRspOuterClass {
       }
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, cityId_);
+          .computeUInt32Size(8, cityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +292,12 @@ public final class GetCityReputationInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp other = (emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp) obj;
 
+      if (!getLIDPFAAPFMMList()
+          .equals(other.getLIDPFAAPFMMList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getCityId()
           != other.getCityId()) return false;
-      if (hasCityReputationInfo() != other.hasCityReputationInfo()) return false;
-      if (hasCityReputationInfo()) {
-        if (!getCityReputationInfo()
-            .equals(other.getCityReputationInfo())) return false;
-      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,14 +309,14 @@ public final class GetCityReputationInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getLIDPFAAPFMMCount() > 0) {
+        hash = (37 * hash) + LIDPFAAPFMM_FIELD_NUMBER;
+        hash = (53 * hash) + getLIDPFAAPFMMList().hashCode();
+      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCityId();
-      if (hasCityReputationInfo()) {
-        hash = (37 * hash) + CITY_REPUTATION_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getCityReputationInfo().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -381,11 +413,6 @@ public final class GetCityReputationInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 128
-     * Obf: GJNNLGKELGN
-     * </pre>
-     *
      * Protobuf type {@code GetCityReputationInfoRsp}
      */
     public static final class Builder extends
@@ -423,16 +450,12 @@ public final class GetCityReputationInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        lIDPFAAPFMM_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
         cityId_ = 0;
 
-        if (cityReputationInfoBuilder_ == null) {
-          cityReputationInfo_ = null;
-        } else {
-          cityReputationInfo_ = null;
-          cityReputationInfoBuilder_ = null;
-        }
         return this;
       }
 
@@ -459,13 +482,14 @@ public final class GetCityReputationInfoRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp buildPartial() {
         emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp result = new emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp(this);
+        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          lIDPFAAPFMM_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.lIDPFAAPFMM_ = lIDPFAAPFMM_;
         result.retcode_ = retcode_;
         result.cityId_ = cityId_;
-        if (cityReputationInfoBuilder_ == null) {
-          result.cityReputationInfo_ = cityReputationInfo_;
-        } else {
-          result.cityReputationInfo_ = cityReputationInfoBuilder_.build();
-        }
         onBuilt();
         return result;
       }
@@ -514,15 +538,22 @@ public final class GetCityReputationInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp other) {
         if (other == emu.grasscutter.net.proto.GetCityReputationInfoRspOuterClass.GetCityReputationInfoRsp.getDefaultInstance()) return this;
+        if (!other.lIDPFAAPFMM_.isEmpty()) {
+          if (lIDPFAAPFMM_.isEmpty()) {
+            lIDPFAAPFMM_ = other.lIDPFAAPFMM_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureLIDPFAAPFMMIsMutable();
+            lIDPFAAPFMM_.addAll(other.lIDPFAAPFMM_);
+          }
+          onChanged();
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getCityId() != 0) {
           setCityId(other.getCityId());
         }
-        if (other.hasCityReputationInfo()) {
-          mergeCityReputationInfo(other.getCityReputationInfo());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -551,6 +582,86 @@ public final class GetCityReputationInfoRspOuterClass {
         }
         return this;
       }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList lIDPFAAPFMM_ = emptyIntList();
+      private void ensureLIDPFAAPFMMIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          lIDPFAAPFMM_ = mutableCopy(lIDPFAAPFMM_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @return A list containing the lIDPFAAPFMM.
+       */
+      public java.util.List<java.lang.Integer>
+          getLIDPFAAPFMMList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(lIDPFAAPFMM_) : lIDPFAAPFMM_;
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @return The count of lIDPFAAPFMM.
+       */
+      public int getLIDPFAAPFMMCount() {
+        return lIDPFAAPFMM_.size();
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @param index The index of the element to return.
+       * @return The lIDPFAAPFMM at the given index.
+       */
+      public int getLIDPFAAPFMM(int index) {
+        return lIDPFAAPFMM_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The lIDPFAAPFMM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLIDPFAAPFMM(
+          int index, int value) {
+        ensureLIDPFAAPFMMIsMutable();
+        lIDPFAAPFMM_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @param value The lIDPFAAPFMM to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLIDPFAAPFMM(int value) {
+        ensureLIDPFAAPFMMIsMutable();
+        lIDPFAAPFMM_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @param values The lIDPFAAPFMM to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLIDPFAAPFMM(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLIDPFAAPFMMIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, lIDPFAAPFMM_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LIDPFAAPFMM = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLIDPFAAPFMM() {
+        lIDPFAAPFMM_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
 
       private int retcode_ ;
       /**
@@ -585,7 +696,11 @@ public final class GetCityReputationInfoRspOuterClass {
 
       private int cityId_ ;
       /**
-       * <code>uint32 city_id = 10;</code>
+       * <pre>
+       *repeated LCBGDOHINDD GAGAHOFMJLM = 9;
+       * </pre>
+       *
+       * <code>uint32 city_id = 8;</code>
        * @return The cityId.
        */
       @java.lang.Override
@@ -593,7 +708,11 @@ public final class GetCityReputationInfoRspOuterClass {
         return cityId_;
       }
       /**
-       * <code>uint32 city_id = 10;</code>
+       * <pre>
+       *repeated LCBGDOHINDD GAGAHOFMJLM = 9;
+       * </pre>
+       *
+       * <code>uint32 city_id = 8;</code>
        * @param value The cityId to set.
        * @return This builder for chaining.
        */
@@ -604,7 +723,11 @@ public final class GetCityReputationInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 city_id = 10;</code>
+       * <pre>
+       *repeated LCBGDOHINDD GAGAHOFMJLM = 9;
+       * </pre>
+       *
+       * <code>uint32 city_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearCityId() {
@@ -613,125 +736,6 @@ public final class GetCityReputationInfoRspOuterClass {
         onChanged();
         return this;
       }
-
-      private emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo cityReputationInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder> cityReputationInfoBuilder_;
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       * @return Whether the cityReputationInfo field is set.
-       */
-      public boolean hasCityReputationInfo() {
-        return cityReputationInfoBuilder_ != null || cityReputationInfo_ != null;
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       * @return The cityReputationInfo.
-       */
-      public emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo getCityReputationInfo() {
-        if (cityReputationInfoBuilder_ == null) {
-          return cityReputationInfo_ == null ? emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.getDefaultInstance() : cityReputationInfo_;
-        } else {
-          return cityReputationInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public Builder setCityReputationInfo(emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo value) {
-        if (cityReputationInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          cityReputationInfo_ = value;
-          onChanged();
-        } else {
-          cityReputationInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public Builder setCityReputationInfo(
-          emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder builderForValue) {
-        if (cityReputationInfoBuilder_ == null) {
-          cityReputationInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          cityReputationInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public Builder mergeCityReputationInfo(emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo value) {
-        if (cityReputationInfoBuilder_ == null) {
-          if (cityReputationInfo_ != null) {
-            cityReputationInfo_ =
-              emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.newBuilder(cityReputationInfo_).mergeFrom(value).buildPartial();
-          } else {
-            cityReputationInfo_ = value;
-          }
-          onChanged();
-        } else {
-          cityReputationInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public Builder clearCityReputationInfo() {
-        if (cityReputationInfoBuilder_ == null) {
-          cityReputationInfo_ = null;
-          onChanged();
-        } else {
-          cityReputationInfo_ = null;
-          cityReputationInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder getCityReputationInfoBuilder() {
-        
-        onChanged();
-        return getCityReputationInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      public emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder getCityReputationInfoOrBuilder() {
-        if (cityReputationInfoBuilder_ != null) {
-          return cityReputationInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return cityReputationInfo_ == null ?
-              emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.getDefaultInstance() : cityReputationInfo_;
-        }
-      }
-      /**
-       * <code>.CityReputationInfo city_reputation_info = 1;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder> 
-          getCityReputationInfoFieldBuilder() {
-        if (cityReputationInfoBuilder_ == null) {
-          cityReputationInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfo.Builder, emu.grasscutter.net.proto.CityReputationInfoOuterClass.CityReputationInfoOrBuilder>(
-                  getCityReputationInfo(),
-                  getParentForChildren(),
-                  isClean());
-          cityReputationInfo_ = null;
-        }
-        return cityReputationInfoBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -799,25 +803,21 @@ public final class GetCityReputationInfoRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\036GetCityReputationInfoRsp.proto\032\030CityRe" +
-      "putationInfo.proto\"o\n\030GetCityReputationI" +
-      "nfoRsp\022\017\n\007retcode\030\005 \001(\005\022\017\n\007city_id\030\n \001(\r" +
-      "\0221\n\024city_reputation_info\030\001 \001(\0132\023.CityRep" +
-      "utationInfoB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "\n\036GetCityReputationInfoRsp.proto\"Q\n\030GetC" +
+      "ityReputationInfoRsp\022\023\n\013LIDPFAAPFMM\030\004 \003(" +
+      "\r\022\017\n\007retcode\030\005 \001(\005\022\017\n\007city_id\030\010 \001(\rB\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.CityReputationInfoOuterClass.getDescriptor(),
         });
     internal_static_GetCityReputationInfoRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_GetCityReputationInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetCityReputationInfoRsp_descriptor,
-        new java.lang.String[] { "Retcode", "CityId", "CityReputationInfo", });
-    emu.grasscutter.net.proto.CityReputationInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "LIDPFAAPFMM", "Retcode", "CityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoRspOuterClass.java
index ea70d5905..c435a1aa9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetDailyDungeonEntryInfoRspOuterClass.java
@@ -19,39 +19,38 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo> 
         getDailyDungeonInfoListList();
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo getDailyDungeonInfoList(int index);
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     int getDailyDungeonInfoListCount();
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder> 
         getDailyDungeonInfoListOrBuilderList();
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder getDailyDungeonInfoListOrBuilder(
         int index);
   }
   /**
    * <pre>
-   * CmdId: 674
-   * Obf: OENGIKKHMHC
+   * CmdId: 6779
    * </pre>
    *
    * Protobuf type {@code GetDailyDungeonEntryInfoRsp}
@@ -100,7 +99,12 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 48: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 dailyDungeonInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +113,6 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +148,10 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
               emu.grasscutter.net.proto.GetDailyDungeonEntryInfoRspOuterClass.GetDailyDungeonEntryInfoRsp.class, emu.grasscutter.net.proto.GetDailyDungeonEntryInfoRspOuterClass.GetDailyDungeonEntryInfoRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -160,17 +159,17 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int DAILY_DUNGEON_INFO_LIST_FIELD_NUMBER = 7;
+    public static final int DAILY_DUNGEON_INFO_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo> dailyDungeonInfoList_;
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo> getDailyDungeonInfoListList() {
       return dailyDungeonInfoList_;
     }
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder> 
@@ -178,21 +177,21 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
       return dailyDungeonInfoList_;
     }
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     @java.lang.Override
     public int getDailyDungeonInfoListCount() {
       return dailyDungeonInfoList_.size();
     }
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo getDailyDungeonInfoList(int index) {
       return dailyDungeonInfoList_.get(index);
     }
     /**
-     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+     * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder getDailyDungeonInfoListOrBuilder(
@@ -214,11 +213,11 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < dailyDungeonInfoList_.size(); i++) {
-        output.writeMessage(7, dailyDungeonInfoList_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(6, retcode_);
+      }
+      for (int i = 0; i < dailyDungeonInfoList_.size(); i++) {
+        output.writeMessage(11, dailyDungeonInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +228,13 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < dailyDungeonInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, dailyDungeonInfoList_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(6, retcode_);
+      }
+      for (int i = 0; i < dailyDungeonInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, dailyDungeonInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -370,8 +369,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 674
-     * Obf: OENGIKKHMHC
+     * CmdId: 6779
      * </pre>
      *
      * Protobuf type {@code GetDailyDungeonEntryInfoRsp}
@@ -566,7 +564,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -574,7 +572,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -585,7 +583,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -608,7 +606,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
           emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder> dailyDungeonInfoListBuilder_;
 
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo> getDailyDungeonInfoListList() {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -618,7 +616,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public int getDailyDungeonInfoListCount() {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -628,7 +626,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo getDailyDungeonInfoList(int index) {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -638,7 +636,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder setDailyDungeonInfoList(
           int index, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo value) {
@@ -655,7 +653,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder setDailyDungeonInfoList(
           int index, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder builderForValue) {
@@ -669,7 +667,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder addDailyDungeonInfoList(emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo value) {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -685,7 +683,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder addDailyDungeonInfoList(
           int index, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo value) {
@@ -702,7 +700,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder addDailyDungeonInfoList(
           emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder builderForValue) {
@@ -716,7 +714,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder addDailyDungeonInfoList(
           int index, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder builderForValue) {
@@ -730,7 +728,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder addAllDailyDungeonInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo> values) {
@@ -745,7 +743,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder clearDailyDungeonInfoList() {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -758,7 +756,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public Builder removeDailyDungeonInfoList(int index) {
         if (dailyDungeonInfoListBuilder_ == null) {
@@ -771,14 +769,14 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder getDailyDungeonInfoListBuilder(
           int index) {
         return getDailyDungeonInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder getDailyDungeonInfoListOrBuilder(
           int index) {
@@ -788,7 +786,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfoOrBuilder> 
            getDailyDungeonInfoListOrBuilderList() {
@@ -799,14 +797,14 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder addDailyDungeonInfoListBuilder() {
         return getDailyDungeonInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder addDailyDungeonInfoListBuilder(
           int index) {
@@ -814,7 +812,7 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
             index, emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 7;</code>
+       * <code>repeated .DailyDungeonEntryInfo daily_dungeon_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.DailyDungeonEntryInfoOuterClass.DailyDungeonEntryInfo.Builder> 
            getDailyDungeonInfoListBuilderList() {
@@ -903,8 +901,8 @@ public final class GetDailyDungeonEntryInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n!GetDailyDungeonEntryInfoRsp.proto\032\033Dai" +
       "lyDungeonEntryInfo.proto\"g\n\033GetDailyDung" +
-      "eonEntryInfoRsp\022\017\n\007retcode\030\016 \001(\005\0227\n\027dail" +
-      "y_dungeon_info_list\030\007 \003(\0132\026.DailyDungeon" +
+      "eonEntryInfoRsp\022\017\n\007retcode\030\006 \001(\005\0227\n\027dail" +
+      "y_dungeon_info_list\030\013 \003(\0132\026.DailyDungeon" +
       "EntryInfoB\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoReqOuterClass.java
index 0b6916fad..e9b591439 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoReqOuterClass.java
@@ -19,17 +19,12 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 uid = 1;</code>
+     * <code>uint32 uid = 13;</code>
      * @return The uid.
      */
     int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 3887
-   * Obf: HPFMOEEPOGI
-   * </pre>
-   *
    * Protobuf type {@code GetFriendShowAvatarInfoReq}
    */
   public static final class GetFriendShowAvatarInfoReq extends
@@ -74,7 +69,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 104: {
 
               uid_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
               emu.grasscutter.net.proto.GetFriendShowAvatarInfoReqOuterClass.GetFriendShowAvatarInfoReq.class, emu.grasscutter.net.proto.GetFriendShowAvatarInfoReqOuterClass.GetFriendShowAvatarInfoReq.Builder.class);
     }
 
-    public static final int UID_FIELD_NUMBER = 1;
+    public static final int UID_FIELD_NUMBER = 13;
     private int uid_;
     /**
-     * <code>uint32 uid = 1;</code>
+     * <code>uint32 uid = 13;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (uid_ != 0) {
-        output.writeUInt32(1, uid_);
+        output.writeUInt32(13, uid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
       size = 0;
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, uid_);
+          .computeUInt32Size(13, uid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3887
-     * Obf: HPFMOEEPOGI
-     * </pre>
-     *
      * Protobuf type {@code GetFriendShowAvatarInfoReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 13;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 13;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -527,7 +517,7 @@ public final class GetFriendShowAvatarInfoReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n GetFriendShowAvatarInfoReq.proto\")\n\032Ge" +
-      "tFriendShowAvatarInfoReq\022\013\n\003uid\030\001 \001(\rB\033\n" +
+      "tFriendShowAvatarInfoReq\022\013\n\003uid\030\r \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/GetFriendShowAvatarInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoRspOuterClass.java
index 409e31f7d..6f125e81b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowAvatarInfoRspOuterClass.java
@@ -19,47 +19,42 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 uid = 8;</code>
-     * @return The uid.
-     */
-    int getUid();
-
-    /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> 
         getShowAvatarInfoListList();
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo getShowAvatarInfoList(int index);
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     int getShowAvatarInfoListCount();
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder> 
         getShowAvatarInfoListOrBuilderList();
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder getShowAvatarInfoListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 uid = 11;</code>
+     * @return The uid.
+     */
+    int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 26299
-   * Obf: GKKBKHLCING
-   * </pre>
-   *
    * Protobuf type {@code GetFriendShowAvatarInfoRsp}
    */
   public static final class GetFriendShowAvatarInfoRsp extends
@@ -106,17 +101,12 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 8: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 64: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
-            case 114: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showAvatarInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -125,6 +115,11 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.parser(), extensionRegistry));
               break;
             }
+            case 88: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,21 +155,10 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
               emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.class, emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.Builder.class);
     }
 
-    public static final int UID_FIELD_NUMBER = 8;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 8;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -182,17 +166,17 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int SHOW_AVATAR_INFO_LIST_FIELD_NUMBER = 14;
+    public static final int SHOW_AVATAR_INFO_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> showAvatarInfoList_;
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> getShowAvatarInfoListList() {
       return showAvatarInfoList_;
     }
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder> 
@@ -200,21 +184,21 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       return showAvatarInfoList_;
     }
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     @java.lang.Override
     public int getShowAvatarInfoListCount() {
       return showAvatarInfoList_.size();
     }
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo getShowAvatarInfoList(int index) {
       return showAvatarInfoList_.get(index);
     }
     /**
-     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+     * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder getShowAvatarInfoListOrBuilder(
@@ -222,6 +206,17 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       return showAvatarInfoList_.get(index);
     }
 
+    public static final int UID_FIELD_NUMBER = 11;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 11;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -237,13 +232,13 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      if (uid_ != 0) {
-        output.writeUInt32(8, uid_);
+        output.writeInt32(1, retcode_);
       }
       for (int i = 0; i < showAvatarInfoList_.size(); i++) {
-        output.writeMessage(14, showAvatarInfoList_.get(i));
+        output.writeMessage(9, showAvatarInfoList_.get(i));
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(11, uid_);
       }
       unknownFields.writeTo(output);
     }
@@ -256,15 +251,15 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, uid_);
+          .computeInt32Size(1, retcode_);
       }
       for (int i = 0; i < showAvatarInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, showAvatarInfoList_.get(i));
+          .computeMessageSize(9, showAvatarInfoList_.get(i));
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, uid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -281,12 +276,12 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp other = (emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp) obj;
 
-      if (getUid()
-          != other.getUid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!getShowAvatarInfoListList()
           .equals(other.getShowAvatarInfoListList())) return false;
+      if (getUid()
+          != other.getUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -298,14 +293,14 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       if (getShowAvatarInfoListCount() > 0) {
         hash = (37 * hash) + SHOW_AVATAR_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getShowAvatarInfoListList().hashCode();
       }
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,11 +397,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26299
-     * Obf: GKKBKHLCING
-     * </pre>
-     *
      * Protobuf type {@code GetFriendShowAvatarInfoRsp}
      */
     public static final class Builder extends
@@ -445,8 +435,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        uid_ = 0;
-
         retcode_ = 0;
 
         if (showAvatarInfoListBuilder_ == null) {
@@ -455,6 +443,8 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         } else {
           showAvatarInfoListBuilder_.clear();
         }
+        uid_ = 0;
+
         return this;
       }
 
@@ -482,7 +472,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       public emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp buildPartial() {
         emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp result = new emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp(this);
         int from_bitField0_ = bitField0_;
-        result.uid_ = uid_;
         result.retcode_ = retcode_;
         if (showAvatarInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -493,6 +482,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         } else {
           result.showAvatarInfoList_ = showAvatarInfoListBuilder_.build();
         }
+        result.uid_ = uid_;
         onBuilt();
         return result;
       }
@@ -541,9 +531,6 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp other) {
         if (other == emu.grasscutter.net.proto.GetFriendShowAvatarInfoRspOuterClass.GetFriendShowAvatarInfoRsp.getDefaultInstance()) return this;
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -573,6 +560,9 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
             }
           }
         }
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -603,40 +593,9 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
       }
       private int bitField0_;
 
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 8;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 8;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -644,7 +603,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -655,7 +614,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -678,7 +637,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
           emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder> showAvatarInfoListBuilder_;
 
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> getShowAvatarInfoListList() {
         if (showAvatarInfoListBuilder_ == null) {
@@ -688,7 +647,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public int getShowAvatarInfoListCount() {
         if (showAvatarInfoListBuilder_ == null) {
@@ -698,7 +657,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo getShowAvatarInfoList(int index) {
         if (showAvatarInfoListBuilder_ == null) {
@@ -708,7 +667,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder setShowAvatarInfoList(
           int index, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo value) {
@@ -725,7 +684,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder setShowAvatarInfoList(
           int index, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder builderForValue) {
@@ -739,7 +698,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder addShowAvatarInfoList(emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo value) {
         if (showAvatarInfoListBuilder_ == null) {
@@ -755,7 +714,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder addShowAvatarInfoList(
           int index, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo value) {
@@ -772,7 +731,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder addShowAvatarInfoList(
           emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder builderForValue) {
@@ -786,7 +745,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder addShowAvatarInfoList(
           int index, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder builderForValue) {
@@ -800,7 +759,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder addAllShowAvatarInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo> values) {
@@ -815,7 +774,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder clearShowAvatarInfoList() {
         if (showAvatarInfoListBuilder_ == null) {
@@ -828,7 +787,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public Builder removeShowAvatarInfoList(int index) {
         if (showAvatarInfoListBuilder_ == null) {
@@ -841,14 +800,14 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder getShowAvatarInfoListBuilder(
           int index) {
         return getShowAvatarInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder getShowAvatarInfoListOrBuilder(
           int index) {
@@ -858,7 +817,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfoOrBuilder> 
            getShowAvatarInfoListOrBuilderList() {
@@ -869,14 +828,14 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder addShowAvatarInfoListBuilder() {
         return getShowAvatarInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder addShowAvatarInfoListBuilder(
           int index) {
@@ -884,7 +843,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
             index, emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 14;</code>
+       * <code>repeated .ShowAvatarInfo show_avatar_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.ShowAvatarInfo.Builder> 
            getShowAvatarInfoListBuilderList() {
@@ -904,6 +863,37 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
         }
         return showAvatarInfoListBuilder_;
       }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 11;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 11;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -973,9 +963,9 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n GetFriendShowAvatarInfoRsp.proto\032\024Show" +
       "AvatarInfo.proto\"j\n\032GetFriendShowAvatarI" +
-      "nfoRsp\022\013\n\003uid\030\010 \001(\r\022\017\n\007retcode\030\006 \001(\005\022.\n\025" +
-      "show_avatar_info_list\030\016 \003(\0132\017.ShowAvatar" +
-      "InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "nfoRsp\022\017\n\007retcode\030\001 \001(\005\022.\n\025show_avatar_i" +
+      "nfo_list\030\t \003(\0132\017.ShowAvatarInfo\022\013\n\003uid\030\013" +
+      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -988,7 +978,7 @@ public final class GetFriendShowAvatarInfoRspOuterClass {
     internal_static_GetFriendShowAvatarInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetFriendShowAvatarInfoRsp_descriptor,
-        new java.lang.String[] { "Uid", "Retcode", "ShowAvatarInfoList", });
+        new java.lang.String[] { "Retcode", "ShowAvatarInfoList", "Uid", });
     emu.grasscutter.net.proto.ShowAvatarInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowNameCardInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowNameCardInfoRspOuterClass.java
index 2b7744c5c..e43606d48 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowNameCardInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetFriendShowNameCardInfoRspOuterClass.java
@@ -19,40 +19,35 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 uid = 12;</code>
+     * <code>uint32 uid = 6;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @return A list containing the showNameCardIdList.
      */
     java.util.List<java.lang.Integer> getShowNameCardIdListList();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @return The count of showNameCardIdList.
      */
     int getShowNameCardIdListCount();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
     int getShowNameCardIdList(int index);
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 20479
-   * Obf: LLJDGCBCJMB
-   * </pre>
-   *
    * Protobuf type {@code GetFriendShowNameCardInfoRsp}
    */
   public static final class GetFriendShowNameCardInfoRsp extends
@@ -99,7 +94,12 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 48: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
+            case 56: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showNameCardIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -107,7 +107,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
               showNameCardIdList_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 58: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,16 +120,11 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 16: {
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 96: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +160,10 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
               emu.grasscutter.net.proto.GetFriendShowNameCardInfoRspOuterClass.GetFriendShowNameCardInfoRsp.class, emu.grasscutter.net.proto.GetFriendShowNameCardInfoRspOuterClass.GetFriendShowNameCardInfoRsp.Builder.class);
     }
 
-    public static final int UID_FIELD_NUMBER = 12;
+    public static final int UID_FIELD_NUMBER = 6;
     private int uid_;
     /**
-     * <code>uint32 uid = 12;</code>
+     * <code>uint32 uid = 6;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -176,10 +171,10 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       return uid_;
     }
 
-    public static final int SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 1;
+    public static final int SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 7;
     private com.google.protobuf.Internal.IntList showNameCardIdList_;
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @return A list containing the showNameCardIdList.
      */
     @java.lang.Override
@@ -188,14 +183,14 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       return showNameCardIdList_;
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @return The count of showNameCardIdList.
      */
     public int getShowNameCardIdListCount() {
       return showNameCardIdList_.size();
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 1;</code>
+     * <code>repeated uint32 show_name_card_id_list = 7;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
@@ -204,10 +199,10 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
     }
     private int showNameCardIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 10;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -230,18 +225,18 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (uid_ != 0) {
+        output.writeUInt32(6, uid_);
+      }
       if (getShowNameCardIdListList().size() > 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(58);
         output.writeUInt32NoTag(showNameCardIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < showNameCardIdList_.size(); i++) {
         output.writeUInt32NoTag(showNameCardIdList_.getInt(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
-      if (uid_ != 0) {
-        output.writeUInt32(12, uid_);
+        output.writeInt32(10, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -252,6 +247,10 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, uid_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < showNameCardIdList_.size(); i++) {
@@ -268,11 +267,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, uid_);
+          .computeInt32Size(10, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -410,11 +405,6 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20479
-     * Obf: LLJDGCBCJMB
-     * </pre>
-     *
      * Protobuf type {@code GetFriendShowNameCardInfoRsp}
      */
     public static final class Builder extends
@@ -588,7 +578,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 12;</code>
+       * <code>uint32 uid = 6;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -596,7 +586,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 12;</code>
+       * <code>uint32 uid = 6;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -607,7 +597,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 12;</code>
+       * <code>uint32 uid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -625,7 +615,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @return A list containing the showNameCardIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -634,14 +624,14 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
                  java.util.Collections.unmodifiableList(showNameCardIdList_) : showNameCardIdList_;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @return The count of showNameCardIdList.
        */
       public int getShowNameCardIdListCount() {
         return showNameCardIdList_.size();
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @param index The index of the element to return.
        * @return The showNameCardIdList at the given index.
        */
@@ -649,7 +639,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return showNameCardIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @param index The index to set the value at.
        * @param value The showNameCardIdList to set.
        * @return This builder for chaining.
@@ -662,7 +652,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @param value The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -673,7 +663,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @param values The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -686,7 +676,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 1;</code>
+       * <code>repeated uint32 show_name_card_id_list = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearShowNameCardIdList() {
@@ -698,7 +688,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -706,7 +696,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -717,7 +707,7 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -794,9 +784,9 @@ public final class GetFriendShowNameCardInfoRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\"GetFriendShowNameCardInfoRsp.proto\"\\\n\034" +
-      "GetFriendShowNameCardInfoRsp\022\013\n\003uid\030\014 \001(" +
-      "\r\022\036\n\026show_name_card_id_list\030\001 \003(\r\022\017\n\007ret" +
-      "code\030\002 \001(\005B\033\n\031emu.grasscutter.net.protob" +
+      "GetFriendShowNameCardInfoRsp\022\013\n\003uid\030\006 \001(" +
+      "\r\022\036\n\026show_name_card_id_list\030\007 \003(\r\022\017\n\007ret" +
+      "code\030\n \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/GetFurnitureCurModuleArrangeCountReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetFurnitureCurModuleArrangeCountReqOuterClass.java
index 00d798333..b571de92b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetFurnitureCurModuleArrangeCountReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetFurnitureCurModuleArrangeCountReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetFurnitureCurModuleArrangeCountReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 27516
-   * Obf: KPANNNCEOKM
-   * </pre>
-   *
    * Protobuf type {@code GetFurnitureCurModuleArrangeCountReq}
    */
   public static final class GetFurnitureCurModuleArrangeCountReq extends
@@ -245,11 +240,6 @@ public final class GetFurnitureCurModuleArrangeCountReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27516
-     * Obf: KPANNNCEOKM
-     * </pre>
-     *
      * Protobuf type {@code GetFurnitureCurModuleArrangeCountReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoReqOuterClass.java
index 761be1bb6..e139988d2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetGachaInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 181
-   * Obf: ICLGLDGHDGP
-   * </pre>
-   *
    * Protobuf type {@code GetGachaInfoReq}
    */
   public static final class GetGachaInfoReq extends
@@ -245,11 +240,6 @@ public final class GetGachaInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 181
-     * Obf: ICLGLDGHDGP
-     * </pre>
-     *
      * Protobuf type {@code GetGachaInfoReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoRspOuterClass.java
index 31af53627..d8073d03e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetGachaInfoRspOuterClass.java
@@ -19,47 +19,11 @@ public final class GetGachaInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> 
-        getGachaInfoListList();
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index);
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    int getGachaInfoListCount();
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
-        getGachaInfoListOrBuilderList();
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 gachaRandom = 12;</code>
+     * <code>uint32 gacha_random = 1;</code>
      * @return The gachaRandom.
      */
     int getGachaRandom();
 
-    /**
-     * <code>uint32 dailyGachaTimes = 9;</code>
-     * @return The dailyGachaTimes.
-     */
-    int getDailyGachaTimes();
-
-    /**
-     * <code>bool is_under_general_restrict = 7;</code>
-     * @return The isUnderGeneralRestrict.
-     */
-    boolean getIsUnderGeneralRestrict();
-
     /**
      * <code>int32 retcode = 2;</code>
      * @return The retcode.
@@ -67,17 +31,48 @@ public final class GetGachaInfoRspOuterClass {
     int getRetcode();
 
     /**
-     * <code>bool is_under_minors_restrict = 5;</code>
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> 
+        getGachaInfoListList();
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index);
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    int getGachaInfoListCount();
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
+        getGachaInfoListOrBuilderList();
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>bool is_under_minors_restrict = 10;</code>
      * @return The isUnderMinorsRestrict.
      */
     boolean getIsUnderMinorsRestrict();
+
+    /**
+     * <code>bool is_under_general_restrict = 12;</code>
+     * @return The isUnderGeneralRestrict.
+     */
+    boolean getIsUnderGeneralRestrict();
+
+    /**
+     * <code>uint32 daily_gacha_times = 15;</code>
+     * @return The dailyGachaTimes.
+     */
+    int getDailyGachaTimes();
   }
   /**
-   * <pre>
-   * CmdId: 23881
-   * Obf: IAAKKGACPDM
-   * </pre>
-   *
    * Protobuf type {@code GetGachaInfoRsp}
    */
   public static final class GetGachaInfoRsp extends
@@ -124,12 +119,17 @@ public final class GetGachaInfoRspOuterClass {
             case 0:
               done = true;
               break;
+            case 8: {
+
+              gachaRandom_ = input.readUInt32();
+              break;
+            }
             case 16: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 26: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 gachaInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,26 +138,21 @@ public final class GetGachaInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.parser(), extensionRegistry));
               break;
             }
-            case 40: {
+            case 80: {
 
               isUnderMinorsRestrict_ = input.readBool();
               break;
             }
-            case 56: {
+            case 96: {
 
               isUnderGeneralRestrict_ = input.readBool();
               break;
             }
-            case 72: {
+            case 120: {
 
               dailyGachaTimes_ = input.readUInt32();
               break;
             }
-            case 96: {
-
-              gachaRandom_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -193,50 +188,10 @@ public final class GetGachaInfoRspOuterClass {
               emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp.class, emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp.Builder.class);
     }
 
-    public static final int GACHA_INFO_LIST_FIELD_NUMBER = 3;
-    private java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> gachaInfoList_;
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> getGachaInfoListList() {
-      return gachaInfoList_;
-    }
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
-        getGachaInfoListOrBuilderList() {
-      return gachaInfoList_;
-    }
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    @java.lang.Override
-    public int getGachaInfoListCount() {
-      return gachaInfoList_.size();
-    }
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index) {
-      return gachaInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
-        int index) {
-      return gachaInfoList_.get(index);
-    }
-
-    public static final int GACHARANDOM_FIELD_NUMBER = 12;
+    public static final int GACHA_RANDOM_FIELD_NUMBER = 1;
     private int gachaRandom_;
     /**
-     * <code>uint32 gachaRandom = 12;</code>
+     * <code>uint32 gacha_random = 1;</code>
      * @return The gachaRandom.
      */
     @java.lang.Override
@@ -244,28 +199,6 @@ public final class GetGachaInfoRspOuterClass {
       return gachaRandom_;
     }
 
-    public static final int DAILYGACHATIMES_FIELD_NUMBER = 9;
-    private int dailyGachaTimes_;
-    /**
-     * <code>uint32 dailyGachaTimes = 9;</code>
-     * @return The dailyGachaTimes.
-     */
-    @java.lang.Override
-    public int getDailyGachaTimes() {
-      return dailyGachaTimes_;
-    }
-
-    public static final int IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER = 7;
-    private boolean isUnderGeneralRestrict_;
-    /**
-     * <code>bool is_under_general_restrict = 7;</code>
-     * @return The isUnderGeneralRestrict.
-     */
-    @java.lang.Override
-    public boolean getIsUnderGeneralRestrict() {
-      return isUnderGeneralRestrict_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 2;
     private int retcode_;
     /**
@@ -277,10 +210,50 @@ public final class GetGachaInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER = 5;
+    public static final int GACHA_INFO_LIST_FIELD_NUMBER = 4;
+    private java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> gachaInfoList_;
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> getGachaInfoListList() {
+      return gachaInfoList_;
+    }
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
+        getGachaInfoListOrBuilderList() {
+      return gachaInfoList_;
+    }
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    @java.lang.Override
+    public int getGachaInfoListCount() {
+      return gachaInfoList_.size();
+    }
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index) {
+      return gachaInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
+        int index) {
+      return gachaInfoList_.get(index);
+    }
+
+    public static final int IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER = 10;
     private boolean isUnderMinorsRestrict_;
     /**
-     * <code>bool is_under_minors_restrict = 5;</code>
+     * <code>bool is_under_minors_restrict = 10;</code>
      * @return The isUnderMinorsRestrict.
      */
     @java.lang.Override
@@ -288,6 +261,28 @@ public final class GetGachaInfoRspOuterClass {
       return isUnderMinorsRestrict_;
     }
 
+    public static final int IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER = 12;
+    private boolean isUnderGeneralRestrict_;
+    /**
+     * <code>bool is_under_general_restrict = 12;</code>
+     * @return The isUnderGeneralRestrict.
+     */
+    @java.lang.Override
+    public boolean getIsUnderGeneralRestrict() {
+      return isUnderGeneralRestrict_;
+    }
+
+    public static final int DAILY_GACHA_TIMES_FIELD_NUMBER = 15;
+    private int dailyGachaTimes_;
+    /**
+     * <code>uint32 daily_gacha_times = 15;</code>
+     * @return The dailyGachaTimes.
+     */
+    @java.lang.Override
+    public int getDailyGachaTimes() {
+      return dailyGachaTimes_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -302,23 +297,23 @@ public final class GetGachaInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (gachaRandom_ != 0) {
+        output.writeUInt32(1, gachaRandom_);
+      }
       if (retcode_ != 0) {
         output.writeInt32(2, retcode_);
       }
       for (int i = 0; i < gachaInfoList_.size(); i++) {
-        output.writeMessage(3, gachaInfoList_.get(i));
+        output.writeMessage(4, gachaInfoList_.get(i));
       }
       if (isUnderMinorsRestrict_ != false) {
-        output.writeBool(5, isUnderMinorsRestrict_);
+        output.writeBool(10, isUnderMinorsRestrict_);
       }
       if (isUnderGeneralRestrict_ != false) {
-        output.writeBool(7, isUnderGeneralRestrict_);
+        output.writeBool(12, isUnderGeneralRestrict_);
       }
       if (dailyGachaTimes_ != 0) {
-        output.writeUInt32(9, dailyGachaTimes_);
-      }
-      if (gachaRandom_ != 0) {
-        output.writeUInt32(12, gachaRandom_);
+        output.writeUInt32(15, dailyGachaTimes_);
       }
       unknownFields.writeTo(output);
     }
@@ -329,29 +324,29 @@ public final class GetGachaInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (gachaRandom_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, gachaRandom_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, retcode_);
       }
       for (int i = 0; i < gachaInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, gachaInfoList_.get(i));
+          .computeMessageSize(4, gachaInfoList_.get(i));
       }
       if (isUnderMinorsRestrict_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isUnderMinorsRestrict_);
+          .computeBoolSize(10, isUnderMinorsRestrict_);
       }
       if (isUnderGeneralRestrict_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isUnderGeneralRestrict_);
+          .computeBoolSize(12, isUnderGeneralRestrict_);
       }
       if (dailyGachaTimes_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, dailyGachaTimes_);
-      }
-      if (gachaRandom_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gachaRandom_);
+          .computeUInt32Size(15, dailyGachaTimes_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -368,18 +363,18 @@ public final class GetGachaInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp other = (emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp) obj;
 
-      if (!getGachaInfoListList()
-          .equals(other.getGachaInfoListList())) return false;
       if (getGachaRandom()
           != other.getGachaRandom()) return false;
-      if (getDailyGachaTimes()
-          != other.getDailyGachaTimes()) return false;
-      if (getIsUnderGeneralRestrict()
-          != other.getIsUnderGeneralRestrict()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getGachaInfoListList()
+          .equals(other.getGachaInfoListList())) return false;
       if (getIsUnderMinorsRestrict()
           != other.getIsUnderMinorsRestrict()) return false;
+      if (getIsUnderGeneralRestrict()
+          != other.getIsUnderGeneralRestrict()) return false;
+      if (getDailyGachaTimes()
+          != other.getDailyGachaTimes()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -391,22 +386,22 @@ public final class GetGachaInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + GACHA_RANDOM_FIELD_NUMBER;
+      hash = (53 * hash) + getGachaRandom();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getGachaInfoListCount() > 0) {
         hash = (37 * hash) + GACHA_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGachaInfoListList().hashCode();
       }
-      hash = (37 * hash) + GACHARANDOM_FIELD_NUMBER;
-      hash = (53 * hash) + getGachaRandom();
-      hash = (37 * hash) + DAILYGACHATIMES_FIELD_NUMBER;
-      hash = (53 * hash) + getDailyGachaTimes();
-      hash = (37 * hash) + IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsUnderGeneralRestrict());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + IS_UNDER_MINORS_RESTRICT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsUnderMinorsRestrict());
+      hash = (37 * hash) + IS_UNDER_GENERAL_RESTRICT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsUnderGeneralRestrict());
+      hash = (37 * hash) + DAILY_GACHA_TIMES_FIELD_NUMBER;
+      hash = (53 * hash) + getDailyGachaTimes();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -503,11 +498,6 @@ public final class GetGachaInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23881
-     * Obf: IAAKKGACPDM
-     * </pre>
-     *
      * Protobuf type {@code GetGachaInfoRsp}
      */
     public static final class Builder extends
@@ -546,21 +536,21 @@ public final class GetGachaInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        gachaRandom_ = 0;
+
+        retcode_ = 0;
+
         if (gachaInfoListBuilder_ == null) {
           gachaInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           gachaInfoListBuilder_.clear();
         }
-        gachaRandom_ = 0;
-
-        dailyGachaTimes_ = 0;
+        isUnderMinorsRestrict_ = false;
 
         isUnderGeneralRestrict_ = false;
 
-        retcode_ = 0;
-
-        isUnderMinorsRestrict_ = false;
+        dailyGachaTimes_ = 0;
 
         return this;
       }
@@ -589,6 +579,8 @@ public final class GetGachaInfoRspOuterClass {
       public emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp buildPartial() {
         emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp result = new emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp(this);
         int from_bitField0_ = bitField0_;
+        result.gachaRandom_ = gachaRandom_;
+        result.retcode_ = retcode_;
         if (gachaInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             gachaInfoList_ = java.util.Collections.unmodifiableList(gachaInfoList_);
@@ -598,11 +590,9 @@ public final class GetGachaInfoRspOuterClass {
         } else {
           result.gachaInfoList_ = gachaInfoListBuilder_.build();
         }
-        result.gachaRandom_ = gachaRandom_;
-        result.dailyGachaTimes_ = dailyGachaTimes_;
-        result.isUnderGeneralRestrict_ = isUnderGeneralRestrict_;
-        result.retcode_ = retcode_;
         result.isUnderMinorsRestrict_ = isUnderMinorsRestrict_;
+        result.isUnderGeneralRestrict_ = isUnderGeneralRestrict_;
+        result.dailyGachaTimes_ = dailyGachaTimes_;
         onBuilt();
         return result;
       }
@@ -651,6 +641,12 @@ public final class GetGachaInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp other) {
         if (other == emu.grasscutter.net.proto.GetGachaInfoRspOuterClass.GetGachaInfoRsp.getDefaultInstance()) return this;
+        if (other.getGachaRandom() != 0) {
+          setGachaRandom(other.getGachaRandom());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (gachaInfoListBuilder_ == null) {
           if (!other.gachaInfoList_.isEmpty()) {
             if (gachaInfoList_.isEmpty()) {
@@ -677,20 +673,14 @@ public final class GetGachaInfoRspOuterClass {
             }
           }
         }
-        if (other.getGachaRandom() != 0) {
-          setGachaRandom(other.getGachaRandom());
-        }
-        if (other.getDailyGachaTimes() != 0) {
-          setDailyGachaTimes(other.getDailyGachaTimes());
+        if (other.getIsUnderMinorsRestrict() != false) {
+          setIsUnderMinorsRestrict(other.getIsUnderMinorsRestrict());
         }
         if (other.getIsUnderGeneralRestrict() != false) {
           setIsUnderGeneralRestrict(other.getIsUnderGeneralRestrict());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.getIsUnderMinorsRestrict() != false) {
-          setIsUnderMinorsRestrict(other.getIsUnderMinorsRestrict());
+        if (other.getDailyGachaTimes() != 0) {
+          setDailyGachaTimes(other.getDailyGachaTimes());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -722,249 +712,9 @@ public final class GetGachaInfoRspOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> gachaInfoList_ =
-        java.util.Collections.emptyList();
-      private void ensureGachaInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          gachaInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo>(gachaInfoList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> gachaInfoListBuilder_;
-
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> getGachaInfoListList() {
-        if (gachaInfoListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(gachaInfoList_);
-        } else {
-          return gachaInfoListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public int getGachaInfoListCount() {
-        if (gachaInfoListBuilder_ == null) {
-          return gachaInfoList_.size();
-        } else {
-          return gachaInfoListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index) {
-        if (gachaInfoListBuilder_ == null) {
-          return gachaInfoList_.get(index);
-        } else {
-          return gachaInfoListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder setGachaInfoList(
-          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
-        if (gachaInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.set(index, value);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder setGachaInfoList(
-          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
-        if (gachaInfoListBuilder_ == null) {
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder addGachaInfoList(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
-        if (gachaInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.add(value);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder addGachaInfoList(
-          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
-        if (gachaInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.add(index, value);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder addGachaInfoList(
-          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
-        if (gachaInfoListBuilder_ == null) {
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder addGachaInfoList(
-          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
-        if (gachaInfoListBuilder_ == null) {
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder addAllGachaInfoList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> values) {
-        if (gachaInfoListBuilder_ == null) {
-          ensureGachaInfoListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, gachaInfoList_);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder clearGachaInfoList() {
-        if (gachaInfoListBuilder_ == null) {
-          gachaInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public Builder removeGachaInfoList(int index) {
-        if (gachaInfoListBuilder_ == null) {
-          ensureGachaInfoListIsMutable();
-          gachaInfoList_.remove(index);
-          onChanged();
-        } else {
-          gachaInfoListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder getGachaInfoListBuilder(
-          int index) {
-        return getGachaInfoListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
-          int index) {
-        if (gachaInfoListBuilder_ == null) {
-          return gachaInfoList_.get(index);  } else {
-          return gachaInfoListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
-           getGachaInfoListOrBuilderList() {
-        if (gachaInfoListBuilder_ != null) {
-          return gachaInfoListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(gachaInfoList_);
-        }
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder addGachaInfoListBuilder() {
-        return getGachaInfoListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder addGachaInfoListBuilder(
-          int index) {
-        return getGachaInfoListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .GachaInfo gacha_info_list = 3;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder> 
-           getGachaInfoListBuilderList() {
-        return getGachaInfoListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
-          getGachaInfoListFieldBuilder() {
-        if (gachaInfoListBuilder_ == null) {
-          gachaInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder>(
-                  gachaInfoList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          gachaInfoList_ = null;
-        }
-        return gachaInfoListBuilder_;
-      }
-
       private int gachaRandom_ ;
       /**
-       * <code>uint32 gachaRandom = 12;</code>
+       * <code>uint32 gacha_random = 1;</code>
        * @return The gachaRandom.
        */
       @java.lang.Override
@@ -972,7 +722,7 @@ public final class GetGachaInfoRspOuterClass {
         return gachaRandom_;
       }
       /**
-       * <code>uint32 gachaRandom = 12;</code>
+       * <code>uint32 gacha_random = 1;</code>
        * @param value The gachaRandom to set.
        * @return This builder for chaining.
        */
@@ -983,7 +733,7 @@ public final class GetGachaInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gachaRandom = 12;</code>
+       * <code>uint32 gacha_random = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearGachaRandom() {
@@ -993,68 +743,6 @@ public final class GetGachaInfoRspOuterClass {
         return this;
       }
 
-      private int dailyGachaTimes_ ;
-      /**
-       * <code>uint32 dailyGachaTimes = 9;</code>
-       * @return The dailyGachaTimes.
-       */
-      @java.lang.Override
-      public int getDailyGachaTimes() {
-        return dailyGachaTimes_;
-      }
-      /**
-       * <code>uint32 dailyGachaTimes = 9;</code>
-       * @param value The dailyGachaTimes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDailyGachaTimes(int value) {
-        
-        dailyGachaTimes_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dailyGachaTimes = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDailyGachaTimes() {
-        
-        dailyGachaTimes_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isUnderGeneralRestrict_ ;
-      /**
-       * <code>bool is_under_general_restrict = 7;</code>
-       * @return The isUnderGeneralRestrict.
-       */
-      @java.lang.Override
-      public boolean getIsUnderGeneralRestrict() {
-        return isUnderGeneralRestrict_;
-      }
-      /**
-       * <code>bool is_under_general_restrict = 7;</code>
-       * @param value The isUnderGeneralRestrict to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsUnderGeneralRestrict(boolean value) {
-        
-        isUnderGeneralRestrict_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_under_general_restrict = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUnderGeneralRestrict() {
-        
-        isUnderGeneralRestrict_ = false;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 2;</code>
@@ -1086,9 +774,249 @@ public final class GetGachaInfoRspOuterClass {
         return this;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> gachaInfoList_ =
+        java.util.Collections.emptyList();
+      private void ensureGachaInfoListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          gachaInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo>(gachaInfoList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> gachaInfoListBuilder_;
+
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> getGachaInfoListList() {
+        if (gachaInfoListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(gachaInfoList_);
+        } else {
+          return gachaInfoListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public int getGachaInfoListCount() {
+        if (gachaInfoListBuilder_ == null) {
+          return gachaInfoList_.size();
+        } else {
+          return gachaInfoListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo getGachaInfoList(int index) {
+        if (gachaInfoListBuilder_ == null) {
+          return gachaInfoList_.get(index);
+        } else {
+          return gachaInfoListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder setGachaInfoList(
+          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
+        if (gachaInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.set(index, value);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder setGachaInfoList(
+          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
+        if (gachaInfoListBuilder_ == null) {
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder addGachaInfoList(emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
+        if (gachaInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.add(value);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder addGachaInfoList(
+          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo value) {
+        if (gachaInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.add(index, value);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder addGachaInfoList(
+          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
+        if (gachaInfoListBuilder_ == null) {
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder addGachaInfoList(
+          int index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder builderForValue) {
+        if (gachaInfoListBuilder_ == null) {
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder addAllGachaInfoList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo> values) {
+        if (gachaInfoListBuilder_ == null) {
+          ensureGachaInfoListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, gachaInfoList_);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder clearGachaInfoList() {
+        if (gachaInfoListBuilder_ == null) {
+          gachaInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public Builder removeGachaInfoList(int index) {
+        if (gachaInfoListBuilder_ == null) {
+          ensureGachaInfoListIsMutable();
+          gachaInfoList_.remove(index);
+          onChanged();
+        } else {
+          gachaInfoListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder getGachaInfoListBuilder(
+          int index) {
+        return getGachaInfoListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder getGachaInfoListOrBuilder(
+          int index) {
+        if (gachaInfoListBuilder_ == null) {
+          return gachaInfoList_.get(index);  } else {
+          return gachaInfoListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
+           getGachaInfoListOrBuilderList() {
+        if (gachaInfoListBuilder_ != null) {
+          return gachaInfoListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(gachaInfoList_);
+        }
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder addGachaInfoListBuilder() {
+        return getGachaInfoListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder addGachaInfoListBuilder(
+          int index) {
+        return getGachaInfoListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .GachaInfo gacha_info_list = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder> 
+           getGachaInfoListBuilderList() {
+        return getGachaInfoListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder> 
+          getGachaInfoListFieldBuilder() {
+        if (gachaInfoListBuilder_ == null) {
+          gachaInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfo.Builder, emu.grasscutter.net.proto.GachaInfoOuterClass.GachaInfoOrBuilder>(
+                  gachaInfoList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          gachaInfoList_ = null;
+        }
+        return gachaInfoListBuilder_;
+      }
+
       private boolean isUnderMinorsRestrict_ ;
       /**
-       * <code>bool is_under_minors_restrict = 5;</code>
+       * <code>bool is_under_minors_restrict = 10;</code>
        * @return The isUnderMinorsRestrict.
        */
       @java.lang.Override
@@ -1096,7 +1024,7 @@ public final class GetGachaInfoRspOuterClass {
         return isUnderMinorsRestrict_;
       }
       /**
-       * <code>bool is_under_minors_restrict = 5;</code>
+       * <code>bool is_under_minors_restrict = 10;</code>
        * @param value The isUnderMinorsRestrict to set.
        * @return This builder for chaining.
        */
@@ -1107,7 +1035,7 @@ public final class GetGachaInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_under_minors_restrict = 5;</code>
+       * <code>bool is_under_minors_restrict = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsUnderMinorsRestrict() {
@@ -1116,6 +1044,68 @@ public final class GetGachaInfoRspOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isUnderGeneralRestrict_ ;
+      /**
+       * <code>bool is_under_general_restrict = 12;</code>
+       * @return The isUnderGeneralRestrict.
+       */
+      @java.lang.Override
+      public boolean getIsUnderGeneralRestrict() {
+        return isUnderGeneralRestrict_;
+      }
+      /**
+       * <code>bool is_under_general_restrict = 12;</code>
+       * @param value The isUnderGeneralRestrict to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsUnderGeneralRestrict(boolean value) {
+        
+        isUnderGeneralRestrict_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_under_general_restrict = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsUnderGeneralRestrict() {
+        
+        isUnderGeneralRestrict_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dailyGachaTimes_ ;
+      /**
+       * <code>uint32 daily_gacha_times = 15;</code>
+       * @return The dailyGachaTimes.
+       */
+      @java.lang.Override
+      public int getDailyGachaTimes() {
+        return dailyGachaTimes_;
+      }
+      /**
+       * <code>uint32 daily_gacha_times = 15;</code>
+       * @param value The dailyGachaTimes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDailyGachaTimes(int value) {
+        
+        dailyGachaTimes_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 daily_gacha_times = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDailyGachaTimes() {
+        
+        dailyGachaTimes_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1184,12 +1174,12 @@ public final class GetGachaInfoRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025GetGachaInfoRsp.proto\032\017GachaInfo.proto" +
-      "\"\272\001\n\017GetGachaInfoRsp\022#\n\017gacha_info_list\030" +
-      "\003 \003(\0132\n.GachaInfo\022\023\n\013gachaRandom\030\014 \001(\r\022\027" +
-      "\n\017dailyGachaTimes\030\t \001(\r\022!\n\031is_under_gene" +
-      "ral_restrict\030\007 \001(\010\022\017\n\007retcode\030\002 \001(\005\022 \n\030i" +
-      "s_under_minors_restrict\030\005 \001(\010B\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\"\275\001\n\017GetGachaInfoRsp\022\024\n\014gacha_random\030\001 \001" +
+      "(\r\022\017\n\007retcode\030\002 \001(\005\022#\n\017gacha_info_list\030\004" +
+      " \003(\0132\n.GachaInfo\022 \n\030is_under_minors_rest" +
+      "rict\030\n \001(\010\022!\n\031is_under_general_restrict\030" +
+      "\014 \001(\010\022\031\n\021daily_gacha_times\030\017 \001(\rB\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1201,7 +1191,7 @@ public final class GetGachaInfoRspOuterClass {
     internal_static_GetGachaInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetGachaInfoRsp_descriptor,
-        new java.lang.String[] { "GachaInfoList", "GachaRandom", "DailyGachaTimes", "IsUnderGeneralRestrict", "Retcode", "IsUnderMinorsRestrict", });
+        new java.lang.String[] { "GachaRandom", "Retcode", "GachaInfoList", "IsUnderMinorsRestrict", "IsUnderGeneralRestrict", "DailyGachaTimes", });
     emu.grasscutter.net.proto.GachaInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetHomeExchangeWoodInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetHomeExchangeWoodInfoReqOuterClass.java
index a4ab3848f..52f3bee44 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetHomeExchangeWoodInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetHomeExchangeWoodInfoReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetHomeExchangeWoodInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 20885
-   * Obf: BFCMDBHEBGK
-   * </pre>
-   *
    * Protobuf type {@code GetHomeExchangeWoodInfoReq}
    */
   public static final class GetHomeExchangeWoodInfoReq extends
@@ -245,11 +240,6 @@ public final class GetHomeExchangeWoodInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20885
-     * Obf: BFCMDBHEBGK
-     * </pre>
-     *
      * Protobuf type {@code GetHomeExchangeWoodInfoReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetInvestigationMonsterRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetInvestigationMonsterRspOuterClass.java
index 2a29d1f62..fdaf9569a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetInvestigationMonsterRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetInvestigationMonsterRspOuterClass.java
@@ -19,47 +19,42 @@ public final class GetInvestigationMonsterRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> 
         getMonsterListList();
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index);
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     int getMonsterListCount();
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> 
         getMonsterListOrBuilderList();
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
         int index);
 
     /**
-     * <code>bool is_for_mark = 1;</code>
-     * @return The isForMark.
+     * <code>bool kis_for_mark = 13;</code>
+     * @return The kisForMark.
      */
-    boolean getIsForMark();
+    boolean getKisForMark();
 
     /**
-     * <code>int32 retcode = 11;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 23497
-   * Obf: PBLBHKIGDKG
-   * </pre>
-   *
    * Protobuf type {@code GetInvestigationMonsterRsp}
    */
   public static final class GetInvestigationMonsterRsp extends
@@ -106,12 +101,7 @@ public final class GetInvestigationMonsterRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              isForMark_ = input.readBool();
-              break;
-            }
-            case 74: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 monsterList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster>();
                 mutable_bitField0_ |= 0x00000001;
@@ -120,7 +110,12 @@ public final class GetInvestigationMonsterRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.parser(), extensionRegistry));
               break;
             }
-            case 88: {
+            case 104: {
+
+              kisForMark_ = input.readBool();
+              break;
+            }
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
@@ -160,17 +155,17 @@ public final class GetInvestigationMonsterRspOuterClass {
               emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp.class, emu.grasscutter.net.proto.GetInvestigationMonsterRspOuterClass.GetInvestigationMonsterRsp.Builder.class);
     }
 
-    public static final int MONSTER_LIST_FIELD_NUMBER = 9;
+    public static final int MONSTER_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> monsterList_;
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> getMonsterListList() {
       return monsterList_;
     }
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> 
@@ -178,21 +173,21 @@ public final class GetInvestigationMonsterRspOuterClass {
       return monsterList_;
     }
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     @java.lang.Override
     public int getMonsterListCount() {
       return monsterList_.size();
     }
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index) {
       return monsterList_.get(index);
     }
     /**
-     * <code>repeated .InvestigationMonster monster_list = 9;</code>
+     * <code>repeated .InvestigationMonster monster_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
@@ -200,21 +195,21 @@ public final class GetInvestigationMonsterRspOuterClass {
       return monsterList_.get(index);
     }
 
-    public static final int IS_FOR_MARK_FIELD_NUMBER = 1;
-    private boolean isForMark_;
+    public static final int KIS_FOR_MARK_FIELD_NUMBER = 13;
+    private boolean kisForMark_;
     /**
-     * <code>bool is_for_mark = 1;</code>
-     * @return The isForMark.
+     * <code>bool kis_for_mark = 13;</code>
+     * @return The kisForMark.
      */
     @java.lang.Override
-    public boolean getIsForMark() {
-      return isForMark_;
+    public boolean getKisForMark() {
+      return kisForMark_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
-     * <code>int32 retcode = 11;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -236,14 +231,14 @@ public final class GetInvestigationMonsterRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isForMark_ != false) {
-        output.writeBool(1, isForMark_);
-      }
       for (int i = 0; i < monsterList_.size(); i++) {
-        output.writeMessage(9, monsterList_.get(i));
+        output.writeMessage(4, monsterList_.get(i));
+      }
+      if (kisForMark_ != false) {
+        output.writeBool(13, kisForMark_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class GetInvestigationMonsterRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isForMark_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isForMark_);
-      }
       for (int i = 0; i < monsterList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, monsterList_.get(i));
+          .computeMessageSize(4, monsterList_.get(i));
+      }
+      if (kisForMark_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, kisForMark_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,8 +278,8 @@ public final class GetInvestigationMonsterRspOuterClass {
 
       if (!getMonsterListList()
           .equals(other.getMonsterListList())) return false;
-      if (getIsForMark()
-          != other.getIsForMark()) return false;
+      if (getKisForMark()
+          != other.getKisForMark()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -302,9 +297,9 @@ public final class GetInvestigationMonsterRspOuterClass {
         hash = (37 * hash) + MONSTER_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMonsterListList().hashCode();
       }
-      hash = (37 * hash) + IS_FOR_MARK_FIELD_NUMBER;
+      hash = (37 * hash) + KIS_FOR_MARK_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsForMark());
+          getKisForMark());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -403,11 +398,6 @@ public final class GetInvestigationMonsterRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23497
-     * Obf: PBLBHKIGDKG
-     * </pre>
-     *
      * Protobuf type {@code GetInvestigationMonsterRsp}
      */
     public static final class Builder extends
@@ -452,7 +442,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         } else {
           monsterListBuilder_.clear();
         }
-        isForMark_ = false;
+        kisForMark_ = false;
 
         retcode_ = 0;
 
@@ -492,7 +482,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         } else {
           result.monsterList_ = monsterListBuilder_.build();
         }
-        result.isForMark_ = isForMark_;
+        result.kisForMark_ = kisForMark_;
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -568,8 +558,8 @@ public final class GetInvestigationMonsterRspOuterClass {
             }
           }
         }
-        if (other.getIsForMark() != false) {
-          setIsForMark(other.getIsForMark());
+        if (other.getKisForMark() != false) {
+          setKisForMark(other.getKisForMark());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
@@ -617,7 +607,7 @@ public final class GetInvestigationMonsterRspOuterClass {
           emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> monsterListBuilder_;
 
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> getMonsterListList() {
         if (monsterListBuilder_ == null) {
@@ -627,7 +617,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public int getMonsterListCount() {
         if (monsterListBuilder_ == null) {
@@ -637,7 +627,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster getMonsterList(int index) {
         if (monsterListBuilder_ == null) {
@@ -647,7 +637,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder setMonsterList(
           int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
@@ -664,7 +654,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder setMonsterList(
           int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -678,7 +668,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder addMonsterList(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
         if (monsterListBuilder_ == null) {
@@ -694,7 +684,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder addMonsterList(
           int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster value) {
@@ -711,7 +701,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder addMonsterList(
           emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -725,7 +715,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder addMonsterList(
           int index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder builderForValue) {
@@ -739,7 +729,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder addAllMonsterList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster> values) {
@@ -754,7 +744,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder clearMonsterList() {
         if (monsterListBuilder_ == null) {
@@ -767,7 +757,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public Builder removeMonsterList(int index) {
         if (monsterListBuilder_ == null) {
@@ -780,14 +770,14 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder getMonsterListBuilder(
           int index) {
         return getMonsterListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder getMonsterListOrBuilder(
           int index) {
@@ -797,7 +787,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonsterOrBuilder> 
            getMonsterListOrBuilderList() {
@@ -808,14 +798,14 @@ public final class GetInvestigationMonsterRspOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder addMonsterListBuilder() {
         return getMonsterListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder addMonsterListBuilder(
           int index) {
@@ -823,7 +813,7 @@ public final class GetInvestigationMonsterRspOuterClass {
             index, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationMonster monster_list = 9;</code>
+       * <code>repeated .InvestigationMonster monster_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder> 
            getMonsterListBuilderList() {
@@ -844,40 +834,40 @@ public final class GetInvestigationMonsterRspOuterClass {
         return monsterListBuilder_;
       }
 
-      private boolean isForMark_ ;
+      private boolean kisForMark_ ;
       /**
-       * <code>bool is_for_mark = 1;</code>
-       * @return The isForMark.
+       * <code>bool kis_for_mark = 13;</code>
+       * @return The kisForMark.
        */
       @java.lang.Override
-      public boolean getIsForMark() {
-        return isForMark_;
+      public boolean getKisForMark() {
+        return kisForMark_;
       }
       /**
-       * <code>bool is_for_mark = 1;</code>
-       * @param value The isForMark to set.
+       * <code>bool kis_for_mark = 13;</code>
+       * @param value The kisForMark to set.
        * @return This builder for chaining.
        */
-      public Builder setIsForMark(boolean value) {
+      public Builder setKisForMark(boolean value) {
         
-        isForMark_ = value;
+        kisForMark_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_for_mark = 1;</code>
+       * <code>bool kis_for_mark = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsForMark() {
+      public Builder clearKisForMark() {
         
-        isForMark_ = false;
+        kisForMark_ = false;
         onChanged();
         return this;
       }
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 15;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -885,7 +875,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 15;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -896,7 +886,7 @@ public final class GetInvestigationMonsterRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -973,11 +963,11 @@ public final class GetInvestigationMonsterRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n GetInvestigationMonsterRsp.proto\032\032Inve" +
-      "stigationMonster.proto\"o\n\032GetInvestigati" +
-      "onMonsterRsp\022+\n\014monster_list\030\t \003(\0132\025.Inv" +
-      "estigationMonster\022\023\n\013is_for_mark\030\001 \001(\010\022\017" +
-      "\n\007retcode\030\013 \001(\005B\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "stigationMonster.proto\"p\n\032GetInvestigati" +
+      "onMonsterRsp\022+\n\014monster_list\030\004 \003(\0132\025.Inv" +
+      "estigationMonster\022\024\n\014kis_for_mark\030\r \001(\010\022" +
+      "\017\n\007retcode\030\017 \001(\005B\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -989,7 +979,7 @@ public final class GetInvestigationMonsterRspOuterClass {
     internal_static_GetInvestigationMonsterRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetInvestigationMonsterRsp_descriptor,
-        new java.lang.String[] { "MonsterList", "IsForMark", "Retcode", });
+        new java.lang.String[] { "MonsterList", "KisForMark", "Retcode", });
     emu.grasscutter.net.proto.InvestigationMonsterOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemReqOuterClass.java
index 9533a132c..49f4fa60c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemReqOuterClass.java
@@ -19,28 +19,23 @@ public final class GetMailItemReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 5317
-   * Obf: GLKNPOJNACB
-   * </pre>
-   *
    * Protobuf type {@code GetMailItemReq}
    */
   public static final class GetMailItemReq extends
@@ -87,7 +82,7 @@ public final class GetMailItemReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class GetMailItemReqOuterClass {
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class GetMailItemReqOuterClass {
               emu.grasscutter.net.proto.GetMailItemReqOuterClass.GetMailItemReq.class, emu.grasscutter.net.proto.GetMailItemReqOuterClass.GetMailItemReq.Builder.class);
     }
 
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 14;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class GetMailItemReqOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 14;</code>
+     * <code>repeated uint32 mail_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class GetMailItemReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class GetMailItemReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5317
-     * Obf: GLKNPOJNACB
-     * </pre>
-     *
      * Protobuf type {@code GetMailItemReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class GetMailItemReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @return A list containing the mailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class GetMailItemReqOuterClass {
                  java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @return The count of mailIdList.
        */
       public int getMailIdListCount() {
         return mailIdList_.size();
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @param index The index of the element to return.
        * @return The mailIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class GetMailItemReqOuterClass {
         return mailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The mailIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class GetMailItemReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @param value The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class GetMailItemReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @param values The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class GetMailItemReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 14;</code>
+       * <code>repeated uint32 mail_id_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailIdList() {
@@ -654,7 +644,7 @@ public final class GetMailItemReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024GetMailItemReq.proto\"&\n\016GetMailItemReq" +
-      "\022\024\n\014mail_id_list\030\016 \003(\rB\033\n\031emu.grasscutte" +
+      "\022\024\n\014mail_id_list\030\001 \003(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemRspOuterClass.java
index dac89c3f9..a32617e64 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMailItemRspOuterClass.java
@@ -19,58 +19,53 @@ public final class GetMailItemRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> 
-        getItemListList();
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam getItemList(int index);
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    int getItemListCount();
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> 
-        getItemListOrBuilderList();
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder getItemListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
 
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> 
+        getItemListList();
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam getItemList(int index);
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    int getItemListCount();
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> 
+        getItemListOrBuilderList();
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder getItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 27050
-   * Obf: MCJPPPBEHPE
-   * </pre>
-   *
    * Protobuf type {@code GetMailItemRsp}
    */
   public static final class GetMailItemRsp extends
@@ -83,8 +78,8 @@ public final class GetMailItemRspOuterClass {
       super(builder);
     }
     private GetMailItemRsp() {
-      itemList_ = java.util.Collections.emptyList();
       mailIdList_ = emptyIntList();
+      itemList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -118,34 +113,20 @@ public final class GetMailItemRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 66: {
+            case 32: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              itemList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.parser(), extensionRegistry));
-              break;
-            }
-            case 104: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 mailIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 34: {
               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) {
                 mailIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 mailIdList_.addInt(input.readUInt32());
@@ -153,6 +134,20 @@ public final class GetMailItemRspOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              itemList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.parser(), extensionRegistry));
+              break;
+            }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -169,10 +164,10 @@ public final class GetMailItemRspOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          itemList_ = java.util.Collections.unmodifiableList(itemList_);
+          mailIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          mailIdList_.makeImmutable(); // C
+          itemList_ = java.util.Collections.unmodifiableList(itemList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -191,50 +186,10 @@ public final class GetMailItemRspOuterClass {
               emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp.class, emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp.Builder.class);
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 8;
-    private java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> itemList_;
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> getItemListList() {
-      return itemList_;
-    }
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> 
-        getItemListOrBuilderList() {
-      return itemList_;
-    }
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    @java.lang.Override
-    public int getItemListCount() {
-      return itemList_.size();
-    }
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam getItemList(int index) {
-      return itemList_.get(index);
-    }
-    /**
-     * <code>repeated .EquipParam item_list = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder getItemListOrBuilder(
-        int index) {
-      return itemList_.get(index);
-    }
-
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 13;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 4;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -243,14 +198,14 @@ public final class GetMailItemRspOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 13;</code>
+     * <code>repeated uint32 mail_id_list = 4;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -259,10 +214,50 @@ public final class GetMailItemRspOuterClass {
     }
     private int mailIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 1;
+    public static final int ITEM_LIST_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> itemList_;
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> getItemListList() {
+      return itemList_;
+    }
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> 
+        getItemListOrBuilderList() {
+      return itemList_;
+    }
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    @java.lang.Override
+    public int getItemListCount() {
+      return itemList_.size();
+    }
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam getItemList(int index) {
+      return itemList_.get(index);
+    }
+    /**
+     * <code>repeated .EquipParam item_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder getItemListOrBuilder(
+        int index) {
+      return itemList_.get(index);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -285,19 +280,19 @@ public final class GetMailItemRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
-      }
-      for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(8, itemList_.get(i));
-      }
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(34);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
         output.writeUInt32NoTag(mailIdList_.getInt(i));
       }
+      for (int i = 0; i < itemList_.size(); i++) {
+        output.writeMessage(9, itemList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -307,14 +302,6 @@ public final class GetMailItemRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
-      }
-      for (int i = 0; i < itemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, itemList_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < mailIdList_.size(); i++) {
@@ -329,6 +316,14 @@ public final class GetMailItemRspOuterClass {
         }
         mailIdListMemoizedSerializedSize = dataSize;
       }
+      for (int i = 0; i < itemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, itemList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -344,10 +339,10 @@ public final class GetMailItemRspOuterClass {
       }
       emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp other = (emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp) obj;
 
-      if (!getItemListList()
-          .equals(other.getItemListList())) return false;
       if (!getMailIdListList()
           .equals(other.getMailIdListList())) return false;
+      if (!getItemListList()
+          .equals(other.getItemListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -361,14 +356,14 @@ public final class GetMailItemRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getItemListCount() > 0) {
-        hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getItemListList().hashCode();
-      }
       if (getMailIdListCount() > 0) {
         hash = (37 * hash) + MAIL_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMailIdListList().hashCode();
       }
+      if (getItemListCount() > 0) {
+        hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getItemListList().hashCode();
+      }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -467,11 +462,6 @@ public final class GetMailItemRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27050
-     * Obf: MCJPPPBEHPE
-     * </pre>
-     *
      * Protobuf type {@code GetMailItemRsp}
      */
     public static final class Builder extends
@@ -510,14 +500,14 @@ public final class GetMailItemRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        mailIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         if (itemListBuilder_ == null) {
           itemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           itemListBuilder_.clear();
         }
-        mailIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         retcode_ = 0;
 
         return this;
@@ -547,20 +537,20 @@ public final class GetMailItemRspOuterClass {
       public emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp buildPartial() {
         emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp result = new emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp(this);
         int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          mailIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.mailIdList_ = mailIdList_;
         if (itemListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             itemList_ = java.util.Collections.unmodifiableList(itemList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.itemList_ = itemList_;
         } else {
           result.itemList_ = itemListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          mailIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.mailIdList_ = mailIdList_;
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -610,11 +600,21 @@ public final class GetMailItemRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp other) {
         if (other == emu.grasscutter.net.proto.GetMailItemRspOuterClass.GetMailItemRsp.getDefaultInstance()) return this;
+        if (!other.mailIdList_.isEmpty()) {
+          if (mailIdList_.isEmpty()) {
+            mailIdList_ = other.mailIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureMailIdListIsMutable();
+            mailIdList_.addAll(other.mailIdList_);
+          }
+          onChanged();
+        }
         if (itemListBuilder_ == null) {
           if (!other.itemList_.isEmpty()) {
             if (itemList_.isEmpty()) {
               itemList_ = other.itemList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureItemListIsMutable();
               itemList_.addAll(other.itemList_);
@@ -627,7 +627,7 @@ public final class GetMailItemRspOuterClass {
               itemListBuilder_.dispose();
               itemListBuilder_ = null;
               itemList_ = other.itemList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               itemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getItemListFieldBuilder() : null;
@@ -636,16 +636,6 @@ public final class GetMailItemRspOuterClass {
             }
           }
         }
-        if (!other.mailIdList_.isEmpty()) {
-          if (mailIdList_.isEmpty()) {
-            mailIdList_ = other.mailIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureMailIdListIsMutable();
-            mailIdList_.addAll(other.mailIdList_);
-          }
-          onChanged();
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -679,12 +669,91 @@ public final class GetMailItemRspOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList mailIdList_ = emptyIntList();
+      private void ensureMailIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          mailIdList_ = mutableCopy(mailIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @return A list containing the mailIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getMailIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @return The count of mailIdList.
+       */
+      public int getMailIdListCount() {
+        return mailIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @param index The index of the element to return.
+       * @return The mailIdList at the given index.
+       */
+      public int getMailIdList(int index) {
+        return mailIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The mailIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMailIdList(
+          int index, int value) {
+        ensureMailIdListIsMutable();
+        mailIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @param value The mailIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addMailIdList(int value) {
+        ensureMailIdListIsMutable();
+        mailIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @param values The mailIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllMailIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMailIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, mailIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mail_id_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMailIdList() {
+        mailIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> itemList_ =
         java.util.Collections.emptyList();
       private void ensureItemListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam>(itemList_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -692,7 +761,7 @@ public final class GetMailItemRspOuterClass {
           emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -702,7 +771,7 @@ public final class GetMailItemRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -712,7 +781,7 @@ public final class GetMailItemRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -722,7 +791,7 @@ public final class GetMailItemRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam value) {
@@ -739,7 +808,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder builderForValue) {
@@ -753,7 +822,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam value) {
         if (itemListBuilder_ == null) {
@@ -769,7 +838,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam value) {
@@ -786,7 +855,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder builderForValue) {
@@ -800,7 +869,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder builderForValue) {
@@ -814,7 +883,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam> values) {
@@ -829,12 +898,12 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
           itemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           itemListBuilder_.clear();
@@ -842,7 +911,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -855,14 +924,14 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder getItemListOrBuilder(
           int index) {
@@ -872,7 +941,7 @@ public final class GetMailItemRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder> 
            getItemListOrBuilderList() {
@@ -883,14 +952,14 @@ public final class GetMailItemRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder addItemListBuilder(
           int index) {
@@ -898,7 +967,7 @@ public final class GetMailItemRspOuterClass {
             index, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .EquipParam item_list = 8;</code>
+       * <code>repeated .EquipParam item_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder> 
            getItemListBuilderList() {
@@ -911,7 +980,7 @@ public final class GetMailItemRspOuterClass {
           itemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParam.Builder, emu.grasscutter.net.proto.EquipParamOuterClass.EquipParamOrBuilder>(
                   itemList_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           itemList_ = null;
@@ -919,88 +988,9 @@ public final class GetMailItemRspOuterClass {
         return itemListBuilder_;
       }
 
-      private com.google.protobuf.Internal.IntList mailIdList_ = emptyIntList();
-      private void ensureMailIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          mailIdList_ = mutableCopy(mailIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @return A list containing the mailIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getMailIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @return The count of mailIdList.
-       */
-      public int getMailIdListCount() {
-        return mailIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @param index The index of the element to return.
-       * @return The mailIdList at the given index.
-       */
-      public int getMailIdList(int index) {
-        return mailIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @param index The index to set the value at.
-       * @param value The mailIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMailIdList(
-          int index, int value) {
-        ensureMailIdListIsMutable();
-        mailIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @param value The mailIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addMailIdList(int value) {
-        ensureMailIdListIsMutable();
-        mailIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @param values The mailIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllMailIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureMailIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, mailIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mail_id_list = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMailIdList() {
-        mailIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -1008,7 +998,7 @@ public final class GetMailItemRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -1019,7 +1009,7 @@ public final class GetMailItemRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -1096,9 +1086,9 @@ public final class GetMailItemRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024GetMailItemRsp.proto\032\020EquipParam.proto" +
-      "\"W\n\016GetMailItemRsp\022\036\n\titem_list\030\010 \003(\0132\013." +
-      "EquipParam\022\024\n\014mail_id_list\030\r \003(\r\022\017\n\007retc" +
-      "ode\030\001 \001(\005B\033\n\031emu.grasscutter.net.protob\006" +
+      "\"W\n\016GetMailItemRsp\022\024\n\014mail_id_list\030\004 \003(\r" +
+      "\022\036\n\titem_list\030\t \003(\0132\013.EquipParam\022\017\n\007retc" +
+      "ode\030\016 \001(\005B\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1111,7 +1101,7 @@ public final class GetMailItemRspOuterClass {
     internal_static_GetMailItemRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetMailItemRsp_descriptor,
-        new java.lang.String[] { "ItemList", "MailIdList", "Retcode", });
+        new java.lang.String[] { "MailIdList", "ItemList", "Retcode", });
     emu.grasscutter.net.proto.EquipParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaReqOuterClass.java
index d3630a397..675407ed0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetMapAreaReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 8758
-   * Obf: IIOCEMHKDEF
-   * </pre>
-   *
    * Protobuf type {@code GetMapAreaReq}
    */
   public static final class GetMapAreaReq extends
@@ -245,11 +240,6 @@ public final class GetMapAreaReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8758
-     * Obf: IIOCEMHKDEF
-     * </pre>
-     *
      * Protobuf type {@code GetMapAreaReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaRspOuterClass.java
index d0f111842..fdba9d37f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMapAreaRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GetMapAreaRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> 
         getMapAreaInfoListList();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index);
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     int getMapAreaInfoListCount();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
         getMapAreaInfoListOrBuilderList();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 9654
-   * Obf: ILDNIMHNDKG
-   * </pre>
-   *
    * Protobuf type {@code GetMapAreaRsp}
    */
   public static final class GetMapAreaRsp extends
@@ -100,12 +95,12 @@ public final class GetMapAreaRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 112: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 82: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mapAreaInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,17 +144,28 @@ public final class GetMapAreaRspOuterClass {
               emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp.class, emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp.Builder.class);
     }
 
-    public static final int MAP_AREA_INFO_LIST_FIELD_NUMBER = 10;
+    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 MAP_AREA_INFO_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> mapAreaInfoList_;
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> getMapAreaInfoListList() {
       return mapAreaInfoList_;
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class GetMapAreaRspOuterClass {
       return mapAreaInfoList_;
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     @java.lang.Override
     public int getMapAreaInfoListCount() {
       return mapAreaInfoList_.size();
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index) {
       return mapAreaInfoList_.get(index);
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
@@ -189,17 +195,6 @@ public final class GetMapAreaRspOuterClass {
       return mapAreaInfoList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
-    private int retcode_;
-    /**
-     * <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() {
@@ -215,10 +210,10 @@ public final class GetMapAreaRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
+        output.writeInt32(14, retcode_);
       }
       for (int i = 0; i < mapAreaInfoList_.size(); i++) {
-        output.writeMessage(10, mapAreaInfoList_.get(i));
+        output.writeMessage(15, mapAreaInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class GetMapAreaRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
+          .computeInt32Size(14, retcode_);
       }
       for (int i = 0; i < mapAreaInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, mapAreaInfoList_.get(i));
+          .computeMessageSize(15, mapAreaInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class GetMapAreaRspOuterClass {
       }
       emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp other = (emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp) obj;
 
-      if (!getMapAreaInfoListList()
-          .equals(other.getMapAreaInfoListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getMapAreaInfoListList()
+          .equals(other.getMapAreaInfoListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class GetMapAreaRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getMapAreaInfoListCount() > 0) {
         hash = (37 * hash) + MAP_AREA_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMapAreaInfoListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class GetMapAreaRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9654
-     * Obf: ILDNIMHNDKG
-     * </pre>
-     *
      * Protobuf type {@code GetMapAreaRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class GetMapAreaRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (mapAreaInfoListBuilder_ == null) {
           mapAreaInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           mapAreaInfoListBuilder_.clear();
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class GetMapAreaRspOuterClass {
       public emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp buildPartial() {
         emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp result = new emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (mapAreaInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             mapAreaInfoList_ = java.util.Collections.unmodifiableList(mapAreaInfoList_);
@@ -456,7 +447,6 @@ public final class GetMapAreaRspOuterClass {
         } else {
           result.mapAreaInfoList_ = mapAreaInfoListBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class GetMapAreaRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp other) {
         if (other == emu.grasscutter.net.proto.GetMapAreaRspOuterClass.GetMapAreaRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (mapAreaInfoListBuilder_ == null) {
           if (!other.mapAreaInfoList_.isEmpty()) {
             if (mapAreaInfoList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class GetMapAreaRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class GetMapAreaRspOuterClass {
       }
       private int bitField0_;
 
+      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.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> mapAreaInfoList_ =
         java.util.Collections.emptyList();
       private void ensureMapAreaInfoListIsMutable() {
@@ -577,7 +598,7 @@ public final class GetMapAreaRspOuterClass {
           emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> mapAreaInfoListBuilder_;
 
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> getMapAreaInfoListList() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class GetMapAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public int getMapAreaInfoListCount() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class GetMapAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class GetMapAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder setMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
@@ -624,7 +645,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder setMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder addMapAreaInfoList(emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder addMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
@@ -671,7 +692,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder addMapAreaInfoList(
           emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder addMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder addAllMapAreaInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> values) {
@@ -714,7 +735,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder clearMapAreaInfoList() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public Builder removeMapAreaInfoList(int index) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class GetMapAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder getMapAreaInfoListBuilder(
           int index) {
         return getMapAreaInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class GetMapAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
            getMapAreaInfoListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class GetMapAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder addMapAreaInfoListBuilder() {
         return getMapAreaInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder addMapAreaInfoListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class GetMapAreaRspOuterClass {
             index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 10;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder> 
            getMapAreaInfoListBuilderList() {
@@ -803,37 +824,6 @@ public final class GetMapAreaRspOuterClass {
         }
         return mapAreaInfoListBuilder_;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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) {
@@ -902,8 +892,8 @@ public final class GetMapAreaRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023GetMapAreaRsp.proto\032\021MapAreaInfo.proto" +
-      "\"J\n\rGetMapAreaRsp\022(\n\022map_area_info_list\030" +
-      "\n \003(\0132\014.MapAreaInfo\022\017\n\007retcode\030\007 \001(\005B\033\n\031" +
+      "\"J\n\rGetMapAreaRsp\022\017\n\007retcode\030\016 \001(\005\022(\n\022ma" +
+      "p_area_info_list\030\017 \003(\0132\014.MapAreaInfoB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -916,7 +906,7 @@ public final class GetMapAreaRspOuterClass {
     internal_static_GetMapAreaRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetMapAreaRsp_descriptor,
-        new java.lang.String[] { "MapAreaInfoList", "Retcode", });
+        new java.lang.String[] { "Retcode", "MapAreaInfoList", });
     emu.grasscutter.net.proto.MapAreaInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsReqOuterClass.java
index e434a9234..221834bf3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetMapMarkTipsReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 4445
-   * Obf: EFPLHMCHFDJ
-   * </pre>
-   *
    * Protobuf type {@code GetMapMarkTipsReq}
    */
   public static final class GetMapMarkTipsReq extends
@@ -245,11 +240,6 @@ public final class GetMapMarkTipsReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4445
-     * Obf: EFPLHMCHFDJ
-     * </pre>
-     *
      * Protobuf type {@code GetMapMarkTipsReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsRspOuterClass.java
index 3475dbb2a..ca09690a1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetMapMarkTipsRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GetMapMarkTipsRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo> 
         getMarkTipsListList();
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo getMarkTipsList(int index);
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     int getMarkTipsListCount();
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder> 
         getMarkTipsListOrBuilderList();
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder getMarkTipsListOrBuilder(
         int index);
 
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 26346
-   * Obf: KAMAAHEKBHL
-   * </pre>
-   *
    * Protobuf type {@code GetMapMarkTipsRsp}
    */
   public static final class GetMapMarkTipsRsp extends
@@ -100,12 +95,7 @@ public final class GetMapMarkTipsRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 106: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 markTipsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -114,6 +104,11 @@ public final class GetMapMarkTipsRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.parser(), extensionRegistry));
               break;
             }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +144,17 @@ public final class GetMapMarkTipsRspOuterClass {
               emu.grasscutter.net.proto.GetMapMarkTipsRspOuterClass.GetMapMarkTipsRsp.class, emu.grasscutter.net.proto.GetMapMarkTipsRspOuterClass.GetMapMarkTipsRsp.Builder.class);
     }
 
-    public static final int MARK_TIPS_LIST_FIELD_NUMBER = 13;
+    public static final int MARK_TIPS_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo> markTipsList_;
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo> getMarkTipsListList() {
       return markTipsList_;
     }
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder> 
@@ -167,21 +162,21 @@ public final class GetMapMarkTipsRspOuterClass {
       return markTipsList_;
     }
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     @java.lang.Override
     public int getMarkTipsListCount() {
       return markTipsList_.size();
     }
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo getMarkTipsList(int index) {
       return markTipsList_.get(index);
     }
     /**
-     * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+     * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder getMarkTipsListOrBuilder(
@@ -189,10 +184,10 @@ public final class GetMapMarkTipsRspOuterClass {
       return markTipsList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -214,11 +209,11 @@ public final class GetMapMarkTipsRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
-      }
       for (int i = 0; i < markTipsList_.size(); i++) {
-        output.writeMessage(13, markTipsList_.get(i));
+        output.writeMessage(8, markTipsList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class GetMapMarkTipsRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
-      }
       for (int i = 0; i < markTipsList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, markTipsList_.get(i));
+          .computeMessageSize(8, markTipsList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -369,11 +364,6 @@ public final class GetMapMarkTipsRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26346
-     * Obf: KAMAAHEKBHL
-     * </pre>
-     *
      * Protobuf type {@code GetMapMarkTipsRsp}
      */
     public static final class Builder extends
@@ -577,7 +567,7 @@ public final class GetMapMarkTipsRspOuterClass {
           emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder> markTipsListBuilder_;
 
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo> getMarkTipsListList() {
         if (markTipsListBuilder_ == null) {
@@ -587,7 +577,7 @@ public final class GetMapMarkTipsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public int getMarkTipsListCount() {
         if (markTipsListBuilder_ == null) {
@@ -597,7 +587,7 @@ public final class GetMapMarkTipsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo getMarkTipsList(int index) {
         if (markTipsListBuilder_ == null) {
@@ -607,7 +597,7 @@ public final class GetMapMarkTipsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder setMarkTipsList(
           int index, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo value) {
@@ -624,7 +614,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder setMarkTipsList(
           int index, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder builderForValue) {
@@ -638,7 +628,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder addMarkTipsList(emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo value) {
         if (markTipsListBuilder_ == null) {
@@ -654,7 +644,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder addMarkTipsList(
           int index, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo value) {
@@ -671,7 +661,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder addMarkTipsList(
           emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder builderForValue) {
@@ -685,7 +675,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder addMarkTipsList(
           int index, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder builderForValue) {
@@ -699,7 +689,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder addAllMarkTipsList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo> values) {
@@ -714,7 +704,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder clearMarkTipsList() {
         if (markTipsListBuilder_ == null) {
@@ -727,7 +717,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public Builder removeMarkTipsList(int index) {
         if (markTipsListBuilder_ == null) {
@@ -740,14 +730,14 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder getMarkTipsListBuilder(
           int index) {
         return getMarkTipsListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder getMarkTipsListOrBuilder(
           int index) {
@@ -757,7 +747,7 @@ public final class GetMapMarkTipsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfoOrBuilder> 
            getMarkTipsListOrBuilderList() {
@@ -768,14 +758,14 @@ public final class GetMapMarkTipsRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder addMarkTipsListBuilder() {
         return getMarkTipsListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder addMarkTipsListBuilder(
           int index) {
@@ -783,7 +773,7 @@ public final class GetMapMarkTipsRspOuterClass {
             index, emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkTipsInfo mark_tips_list = 13;</code>
+       * <code>repeated .MapMarkTipsInfo mark_tips_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkTipsInfoOuterClass.MapMarkTipsInfo.Builder> 
            getMarkTipsListBuilderList() {
@@ -806,7 +796,7 @@ public final class GetMapMarkTipsRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 14;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -814,7 +804,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 14;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -825,7 +815,7 @@ public final class GetMapMarkTipsRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -903,8 +893,8 @@ public final class GetMapMarkTipsRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\027GetMapMarkTipsRsp.proto\032\025MapMarkTipsIn" +
       "fo.proto\"N\n\021GetMapMarkTipsRsp\022(\n\016mark_ti" +
-      "ps_list\030\r \003(\0132\020.MapMarkTipsInfo\022\017\n\007retco" +
-      "de\030\010 \001(\005B\033\n\031emu.grasscutter.net.protob\006p" +
+      "ps_list\030\010 \003(\0132\020.MapMarkTipsInfo\022\017\n\007retco" +
+      "de\030\016 \001(\005B\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/GetOnlinePlayerInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
index af1007c4e..552ee5644 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerInfoRspOuterClass.java
@@ -19,44 +19,39 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 2;</code>
+     * <code>uint32 target_uid = 5;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      * @return Whether the targetPlayerInfo field is set.
      */
     boolean hasTargetPlayerInfo();
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      * @return The targetPlayerInfo.
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getTargetPlayerInfo();
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder();
 
     /**
-     * <code>uint32 param = 5;</code>
-     * @return The param.
-     */
-    int getParam();
-
-    /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 param = 15;</code>
+     * @return The param.
+     */
+    int getParam();
   }
   /**
-   * <pre>
-   * CmdId: 8759
-   * Obf: LDNOEIHGGKN
-   * </pre>
-   *
    * Protobuf type {@code GetOnlinePlayerInfoRsp}
    */
   public static final class GetOnlinePlayerInfoRsp extends
@@ -101,22 +96,12 @@ public final class GetOnlinePlayerInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 40: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 40: {
-
-              param_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 114: {
+            case 58: {
               emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
               if (targetPlayerInfo_ != null) {
                 subBuilder = targetPlayerInfo_.toBuilder();
@@ -129,6 +114,16 @@ public final class GetOnlinePlayerInfoRspOuterClass {
 
               break;
             }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 120: {
+
+              param_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -161,10 +156,10 @@ public final class GetOnlinePlayerInfoRspOuterClass {
               emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlayerInfoRsp.class, emu.grasscutter.net.proto.GetOnlinePlayerInfoRspOuterClass.GetOnlinePlayerInfoRsp.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 2;
+    public static final int TARGET_UID_FIELD_NUMBER = 5;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 2;</code>
+     * <code>uint32 target_uid = 5;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -172,10 +167,10 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       return targetUid_;
     }
 
-    public static final int TARGET_PLAYER_INFO_FIELD_NUMBER = 14;
+    public static final int TARGET_PLAYER_INFO_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo targetPlayerInfo_;
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      * @return Whether the targetPlayerInfo field is set.
      */
     @java.lang.Override
@@ -183,7 +178,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       return targetPlayerInfo_ != null;
     }
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      * @return The targetPlayerInfo.
      */
     @java.lang.Override
@@ -191,28 +186,17 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       return targetPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : targetPlayerInfo_;
     }
     /**
-     * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo target_player_info = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder() {
       return getTargetPlayerInfo();
     }
 
-    public static final int PARAM_FIELD_NUMBER = 5;
-    private int param_;
-    /**
-     * <code>uint32 param = 5;</code>
-     * @return The param.
-     */
-    @java.lang.Override
-    public int getParam() {
-      return param_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -220,6 +204,17 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       return retcode_;
     }
 
+    public static final int PARAM_FIELD_NUMBER = 15;
+    private int param_;
+    /**
+     * <code>uint32 param = 15;</code>
+     * @return The param.
+     */
+    @java.lang.Override
+    public int getParam() {
+      return param_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -235,16 +230,16 @@ public final class GetOnlinePlayerInfoRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(2, targetUid_);
-      }
-      if (param_ != 0) {
-        output.writeUInt32(5, param_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeUInt32(5, targetUid_);
       }
       if (targetPlayerInfo_ != null) {
-        output.writeMessage(14, getTargetPlayerInfo());
+        output.writeMessage(7, getTargetPlayerInfo());
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
+      }
+      if (param_ != 0) {
+        output.writeUInt32(15, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -257,19 +252,19 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, targetUid_);
-      }
-      if (param_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, param_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeUInt32Size(5, targetUid_);
       }
       if (targetPlayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getTargetPlayerInfo());
+          .computeMessageSize(7, getTargetPlayerInfo());
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
+      }
+      if (param_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -293,10 +288,10 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         if (!getTargetPlayerInfo()
             .equals(other.getTargetPlayerInfo())) return false;
       }
-      if (getParam()
-          != other.getParam()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getParam()
+          != other.getParam()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -314,10 +309,10 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         hash = (37 * hash) + TARGET_PLAYER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getTargetPlayerInfo().hashCode();
       }
-      hash = (37 * hash) + PARAM_FIELD_NUMBER;
-      hash = (53 * hash) + getParam();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + PARAM_FIELD_NUMBER;
+      hash = (53 * hash) + getParam();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -414,11 +409,6 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8759
-     * Obf: LDNOEIHGGKN
-     * </pre>
-     *
      * Protobuf type {@code GetOnlinePlayerInfoRsp}
      */
     public static final class Builder extends
@@ -464,10 +454,10 @@ public final class GetOnlinePlayerInfoRspOuterClass {
           targetPlayerInfo_ = null;
           targetPlayerInfoBuilder_ = null;
         }
-        param_ = 0;
-
         retcode_ = 0;
 
+        param_ = 0;
+
         return this;
       }
 
@@ -500,8 +490,8 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         } else {
           result.targetPlayerInfo_ = targetPlayerInfoBuilder_.build();
         }
-        result.param_ = param_;
         result.retcode_ = retcode_;
+        result.param_ = param_;
         onBuilt();
         return result;
       }
@@ -556,12 +546,12 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         if (other.hasTargetPlayerInfo()) {
           mergeTargetPlayerInfo(other.getTargetPlayerInfo());
         }
-        if (other.getParam() != 0) {
-          setParam(other.getParam());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getParam() != 0) {
+          setParam(other.getParam());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -593,7 +583,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 2;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -601,7 +591,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 2;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -612,7 +602,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 2;</code>
+       * <code>uint32 target_uid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -626,14 +616,14 @@ public final class GetOnlinePlayerInfoRspOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> targetPlayerInfoBuilder_;
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        * @return Whether the targetPlayerInfo field is set.
        */
       public boolean hasTargetPlayerInfo() {
         return targetPlayerInfoBuilder_ != null || targetPlayerInfo_ != null;
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        * @return The targetPlayerInfo.
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getTargetPlayerInfo() {
@@ -644,7 +634,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public Builder setTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (targetPlayerInfoBuilder_ == null) {
@@ -660,7 +650,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public Builder setTargetPlayerInfo(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -674,7 +664,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public Builder mergeTargetPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (targetPlayerInfoBuilder_ == null) {
@@ -692,7 +682,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public Builder clearTargetPlayerInfo() {
         if (targetPlayerInfoBuilder_ == null) {
@@ -706,7 +696,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getTargetPlayerInfoBuilder() {
         
@@ -714,7 +704,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return getTargetPlayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getTargetPlayerInfoOrBuilder() {
         if (targetPlayerInfoBuilder_ != null) {
@@ -725,7 +715,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo target_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo target_player_info = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -741,40 +731,9 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return targetPlayerInfoBuilder_;
       }
 
-      private int param_ ;
-      /**
-       * <code>uint32 param = 5;</code>
-       * @return The param.
-       */
-      @java.lang.Override
-      public int getParam() {
-        return param_;
-      }
-      /**
-       * <code>uint32 param = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParam() {
-        
-        param_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -782,7 +741,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -793,7 +752,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -802,6 +761,37 @@ public final class GetOnlinePlayerInfoRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int param_ ;
+      /**
+       * <code>uint32 param = 15;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <code>uint32 param = 15;</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 = 15;</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) {
@@ -871,9 +861,9 @@ public final class GetOnlinePlayerInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034GetOnlinePlayerInfoRsp.proto\032\026OnlinePl" +
       "ayerInfo.proto\"{\n\026GetOnlinePlayerInfoRsp" +
-      "\022\022\n\ntarget_uid\030\002 \001(\r\022-\n\022target_player_in" +
-      "fo\030\016 \001(\0132\021.OnlinePlayerInfo\022\r\n\005param\030\005 \001" +
-      "(\r\022\017\n\007retcode\030\006 \001(\005B\033\n\031emu.grasscutter.n" +
+      "\022\022\n\ntarget_uid\030\005 \001(\r\022-\n\022target_player_in" +
+      "fo\030\007 \001(\0132\021.OnlinePlayerInfo\022\017\n\007retcode\030\010" +
+      " \001(\005\022\r\n\005param\030\017 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -886,7 +876,7 @@ public final class GetOnlinePlayerInfoRspOuterClass {
     internal_static_GetOnlinePlayerInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetOnlinePlayerInfoRsp_descriptor,
-        new java.lang.String[] { "TargetUid", "TargetPlayerInfo", "Param", "Retcode", });
+        new java.lang.String[] { "TargetUid", "TargetPlayerInfo", "Retcode", "Param", });
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListReqOuterClass.java
index 7b853d598..598c31e55 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetOnlinePlayerListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 27587
-   * Obf: IGNGJNHHJBM
-   * </pre>
-   *
    * Protobuf type {@code GetOnlinePlayerListReq}
    */
   public static final class GetOnlinePlayerListReq extends
@@ -245,11 +240,6 @@ public final class GetOnlinePlayerListReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27587
-     * Obf: IGNGJNHHJBM
-     * </pre>
-     *
      * Protobuf type {@code GetOnlinePlayerListReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListRspOuterClass.java
index a0dc30633..6d8ff390a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetOnlinePlayerListRspOuterClass.java
@@ -19,47 +19,42 @@ public final class GetOnlinePlayerListRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 param = 10;</code>
+     * <code>uint32 param = 4;</code>
      * @return The param.
      */
     int getParam();
 
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> 
         getPlayerInfoListList();
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index);
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     int getPlayerInfoListCount();
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
         getPlayerInfoListOrBuilderList();
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
         int index);
 
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 1234
-   * Obf: AANMJBACMJM
-   * </pre>
-   *
    * Protobuf type {@code GetOnlinePlayerListRsp}
    */
   public static final class GetOnlinePlayerListRsp extends
@@ -106,17 +101,12 @@ public final class GetOnlinePlayerListRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 80: {
+            case 32: {
 
               param_ = input.readUInt32();
               break;
             }
-            case 106: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -125,6 +115,11 @@ public final class GetOnlinePlayerListRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.parser(), extensionRegistry));
               break;
             }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,10 +155,10 @@ public final class GetOnlinePlayerListRspOuterClass {
               emu.grasscutter.net.proto.GetOnlinePlayerListRspOuterClass.GetOnlinePlayerListRsp.class, emu.grasscutter.net.proto.GetOnlinePlayerListRspOuterClass.GetOnlinePlayerListRsp.Builder.class);
     }
 
-    public static final int PARAM_FIELD_NUMBER = 10;
+    public static final int PARAM_FIELD_NUMBER = 4;
     private int param_;
     /**
-     * <code>uint32 param = 10;</code>
+     * <code>uint32 param = 4;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -171,17 +166,17 @@ public final class GetOnlinePlayerListRspOuterClass {
       return param_;
     }
 
-    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 13;
+    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> playerInfoList_;
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
       return playerInfoList_;
     }
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -189,21 +184,21 @@ public final class GetOnlinePlayerListRspOuterClass {
       return playerInfoList_;
     }
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     @java.lang.Override
     public int getPlayerInfoListCount() {
       return playerInfoList_.size();
     }
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
       return playerInfoList_.get(index);
     }
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+     * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
@@ -211,10 +206,10 @@ public final class GetOnlinePlayerListRspOuterClass {
       return playerInfoList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
+    public static final int RETCODE_FIELD_NUMBER = 14;
     private int retcode_;
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 14;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -236,14 +231,14 @@ public final class GetOnlinePlayerListRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
-      }
       if (param_ != 0) {
-        output.writeUInt32(10, param_);
+        output.writeUInt32(4, param_);
       }
       for (int i = 0; i < playerInfoList_.size(); i++) {
-        output.writeMessage(13, playerInfoList_.get(i));
+        output.writeMessage(11, playerInfoList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class GetOnlinePlayerListRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
-      }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, param_);
+          .computeUInt32Size(4, param_);
       }
       for (int i = 0; i < playerInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, playerInfoList_.get(i));
+          .computeMessageSize(11, playerInfoList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -402,11 +397,6 @@ public final class GetOnlinePlayerListRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1234
-     * Obf: AANMJBACMJM
-     * </pre>
-     *
      * Protobuf type {@code GetOnlinePlayerListRsp}
      */
     public static final class Builder extends
@@ -605,7 +595,7 @@ public final class GetOnlinePlayerListRspOuterClass {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 4;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -613,7 +603,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 4;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -624,7 +614,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -647,7 +637,7 @@ public final class GetOnlinePlayerListRspOuterClass {
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> playerInfoListBuilder_;
 
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
         if (playerInfoListBuilder_ == null) {
@@ -657,7 +647,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public int getPlayerInfoListCount() {
         if (playerInfoListBuilder_ == null) {
@@ -667,7 +657,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
         if (playerInfoListBuilder_ == null) {
@@ -677,7 +667,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder setPlayerInfoList(
           int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
@@ -694,7 +684,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder setPlayerInfoList(
           int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -708,7 +698,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder addPlayerInfoList(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (playerInfoListBuilder_ == null) {
@@ -724,7 +714,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder addPlayerInfoList(
           int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
@@ -741,7 +731,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder addPlayerInfoList(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -755,7 +745,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder addPlayerInfoList(
           int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -769,7 +759,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder addAllPlayerInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> values) {
@@ -784,7 +774,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder clearPlayerInfoList() {
         if (playerInfoListBuilder_ == null) {
@@ -797,7 +787,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public Builder removePlayerInfoList(int index) {
         if (playerInfoListBuilder_ == null) {
@@ -810,14 +800,14 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getPlayerInfoListBuilder(
           int index) {
         return getPlayerInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
           int index) {
@@ -827,7 +817,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
            getPlayerInfoListOrBuilderList() {
@@ -838,14 +828,14 @@ public final class GetOnlinePlayerListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder() {
         return getPlayerInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder(
           int index) {
@@ -853,7 +843,7 @@ public final class GetOnlinePlayerListRspOuterClass {
             index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 13;</code>
+       * <code>repeated .OnlinePlayerInfo player_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder> 
            getPlayerInfoListBuilderList() {
@@ -876,7 +866,7 @@ public final class GetOnlinePlayerListRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 14;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -884,7 +874,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 14;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -895,7 +885,7 @@ public final class GetOnlinePlayerListRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -973,8 +963,8 @@ public final class GetOnlinePlayerListRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034GetOnlinePlayerListRsp.proto\032\026OnlinePl" +
       "ayerInfo.proto\"e\n\026GetOnlinePlayerListRsp" +
-      "\022\r\n\005param\030\n \001(\r\022+\n\020player_info_list\030\r \003(" +
-      "\0132\021.OnlinePlayerInfo\022\017\n\007retcode\030\007 \001(\005B\033\n" +
+      "\022\r\n\005param\030\004 \001(\r\022+\n\020player_info_list\030\013 \003(" +
+      "\0132\021.OnlinePlayerInfo\022\017\n\007retcode\030\016 \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/GetParentQuestVideoKeyReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyReqOuterClass.java
index 560f32814..610121808 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyReqOuterClass.java
@@ -19,17 +19,12 @@ public final class GetParentQuestVideoKeyReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 14;</code>
+     * <code>uint32 parent_quest_id = 13;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
   }
   /**
-   * <pre>
-   * CmdId: 28598
-   * Obf: IDDDDFEJCNE
-   * </pre>
-   *
    * Protobuf type {@code GetParentQuestVideoKeyReq}
    */
   public static final class GetParentQuestVideoKeyReq extends
@@ -74,7 +69,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 104: {
 
               parentQuestId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class GetParentQuestVideoKeyReqOuterClass {
               emu.grasscutter.net.proto.GetParentQuestVideoKeyReqOuterClass.GetParentQuestVideoKeyReq.class, emu.grasscutter.net.proto.GetParentQuestVideoKeyReqOuterClass.GetParentQuestVideoKeyReq.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 14;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 13;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 14;</code>
+     * <code>uint32 parent_quest_id = 13;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (parentQuestId_ != 0) {
-        output.writeUInt32(14, parentQuestId_);
+        output.writeUInt32(13, parentQuestId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
       size = 0;
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, parentQuestId_);
+          .computeUInt32Size(13, parentQuestId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class GetParentQuestVideoKeyReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28598
-     * Obf: IDDDDFEJCNE
-     * </pre>
-     *
      * Protobuf type {@code GetParentQuestVideoKeyReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 14;</code>
+       * <code>uint32 parent_quest_id = 13;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 14;</code>
+       * <code>uint32 parent_quest_id = 13;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 14;</code>
+       * <code>uint32 parent_quest_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -528,7 +518,7 @@ public final class GetParentQuestVideoKeyReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037GetParentQuestVideoKeyReq.proto\"4\n\031Get" +
       "ParentQuestVideoKeyReq\022\027\n\017parent_quest_i" +
-      "d\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "d\030\r \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/GetParentQuestVideoKeyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
index 9d8cff1a4..20252e1ce 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetParentQuestVideoKeyRspOuterClass.java
@@ -19,29 +19,24 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 parent_quest_id = 2;</code>
+     * <code>uint32 parent_quest_id = 10;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>uint64 video_key = 7;</code>
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint64 video_key = 15;</code>
      * @return The videoKey.
      */
     long getVideoKey();
   }
   /**
-   * <pre>
-   * CmdId: 5868
-   * Obf: HKBLCEEFAFM
-   * </pre>
-   *
    * Protobuf type {@code GetParentQuestVideoKeyRsp}
    */
   public static final class GetParentQuestVideoKeyRsp extends
@@ -86,21 +81,21 @@ public final class GetParentQuestVideoKeyRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 80: {
 
               parentQuestId_ = input.readUInt32();
               break;
             }
-            case 56: {
-
-              videoKey_ = input.readUInt64();
-              break;
-            }
-            case 64: {
+            case 112: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 120: {
+
+              videoKey_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class GetParentQuestVideoKeyRspOuterClass {
               emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp.class, emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 2;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 10;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 2;</code>
+     * <code>uint32 parent_quest_id = 10;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -155,10 +139,21 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       return parentQuestId_;
     }
 
-    public static final int VIDEO_KEY_FIELD_NUMBER = 7;
+    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 VIDEO_KEY_FIELD_NUMBER = 15;
     private long videoKey_;
     /**
-     * <code>uint64 video_key = 7;</code>
+     * <code>uint64 video_key = 15;</code>
      * @return The videoKey.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class GetParentQuestVideoKeyRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (parentQuestId_ != 0) {
-        output.writeUInt32(2, parentQuestId_);
-      }
-      if (videoKey_ != 0L) {
-        output.writeUInt64(7, videoKey_);
+        output.writeUInt32(10, parentQuestId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+        output.writeInt32(14, retcode_);
+      }
+      if (videoKey_ != 0L) {
+        output.writeUInt64(15, videoKey_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       size = 0;
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, parentQuestId_);
-      }
-      if (videoKey_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, videoKey_);
+          .computeUInt32Size(10, parentQuestId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeInt32Size(14, retcode_);
+      }
+      if (videoKey_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(15, videoKey_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       }
       emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp other = (emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getParentQuestId()
           != other.getParentQuestId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getVideoKey()
           != other.getVideoKey()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +237,10 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       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) + VIDEO_KEY_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getVideoKey());
@@ -345,11 +340,6 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5868
-     * Obf: HKBLCEEFAFM
-     * </pre>
-     *
      * Protobuf type {@code GetParentQuestVideoKeyRsp}
      */
     public static final class Builder extends
@@ -387,10 +377,10 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         parentQuestId_ = 0;
 
+        retcode_ = 0;
+
         videoKey_ = 0L;
 
         return this;
@@ -419,8 +409,8 @@ public final class GetParentQuestVideoKeyRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp buildPartial() {
         emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp result = new emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp(this);
-        result.retcode_ = retcode_;
         result.parentQuestId_ = parentQuestId_;
+        result.retcode_ = retcode_;
         result.videoKey_ = videoKey_;
         onBuilt();
         return result;
@@ -470,12 +460,12 @@ public final class GetParentQuestVideoKeyRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp other) {
         if (other == emu.grasscutter.net.proto.GetParentQuestVideoKeyRspOuterClass.GetParentQuestVideoKeyRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getParentQuestId() != 0) {
           setParentQuestId(other.getParentQuestId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getVideoKey() != 0L) {
           setVideoKey(other.getVideoKey());
         }
@@ -508,40 +498,9 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 2;</code>
+       * <code>uint32 parent_quest_id = 10;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -549,7 +508,7 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 2;</code>
+       * <code>uint32 parent_quest_id = 10;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -560,7 +519,7 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 2;</code>
+       * <code>uint32 parent_quest_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -570,9 +529,40 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         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 long videoKey_ ;
       /**
-       * <code>uint64 video_key = 7;</code>
+       * <code>uint64 video_key = 15;</code>
        * @return The videoKey.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         return videoKey_;
       }
       /**
-       * <code>uint64 video_key = 7;</code>
+       * <code>uint64 video_key = 15;</code>
        * @param value The videoKey to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class GetParentQuestVideoKeyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 video_key = 7;</code>
+       * <code>uint64 video_key = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearVideoKey() {
@@ -668,8 +658,8 @@ public final class GetParentQuestVideoKeyRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037GetParentQuestVideoKeyRsp.proto\"X\n\031Get" +
-      "ParentQuestVideoKeyRsp\022\017\n\007retcode\030\010 \001(\005\022" +
-      "\027\n\017parent_quest_id\030\002 \001(\r\022\021\n\tvideo_key\030\007 " +
+      "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 " +
       "\001(\004B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +671,7 @@ public final class GetParentQuestVideoKeyRspOuterClass {
     internal_static_GetParentQuestVideoKeyRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetParentQuestVideoKeyRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ParentQuestId", "VideoKey", });
+        new java.lang.String[] { "ParentQuestId", "Retcode", "VideoKey", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListReqOuterClass.java
index e453f372a..bf5d07fd2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetPlayerAskFriendListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 3520
-   * Obf: FHNBEAINLJA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerAskFriendListReq}
    */
   public static final class GetPlayerAskFriendListReq extends
@@ -245,11 +240,6 @@ public final class GetPlayerAskFriendListReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3520
-     * Obf: FHNBEAINLJA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerAskFriendListReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListRspOuterClass.java
index 3bb6306b6..58087aa42 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerAskFriendListRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GetPlayerAskFriendListRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> 
         getAskFriendListList();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index);
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     int getAskFriendListCount();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
         getAskFriendListOrBuilderList();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 20085
-   * Obf: JGLDEDHOMNL
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerAskFriendListRsp}
    */
   public static final class GetPlayerAskFriendListRsp extends
@@ -100,7 +95,12 @@ public final class GetPlayerAskFriendListRspOuterClass {
             case 0:
               done = true;
               break;
-            case 98: {
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 askFriendList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.parser(), extensionRegistry));
               break;
             }
-            case 104: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +144,28 @@ public final class GetPlayerAskFriendListRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp.class, emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp.Builder.class);
     }
 
-    public static final int ASK_FRIEND_LIST_FIELD_NUMBER = 12;
+    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 ASK_FRIEND_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> askFriendList_;
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getAskFriendListList() {
       return askFriendList_;
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -167,21 +173,21 @@ public final class GetPlayerAskFriendListRspOuterClass {
       return askFriendList_;
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     @java.lang.Override
     public int getAskFriendListCount() {
       return askFriendList_.size();
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index) {
       return askFriendList_.get(index);
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
@@ -189,17 +195,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
       return askFriendList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 13;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class GetPlayerAskFriendListRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < askFriendList_.size(); i++) {
-        output.writeMessage(12, askFriendList_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(13, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      for (int i = 0; i < askFriendList_.size(); i++) {
+        output.writeMessage(10, askFriendList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class GetPlayerAskFriendListRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < askFriendList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, askFriendList_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, retcode_);
+          .computeInt32Size(5, retcode_);
+      }
+      for (int i = 0; i < askFriendList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, askFriendList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class GetPlayerAskFriendListRspOuterClass {
       }
       emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp other = (emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp) obj;
 
-      if (!getAskFriendListList()
-          .equals(other.getAskFriendListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getAskFriendListList()
+          .equals(other.getAskFriendListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class GetPlayerAskFriendListRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getAskFriendListCount() > 0) {
         hash = (37 * hash) + ASK_FRIEND_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAskFriendListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20085
-     * Obf: JGLDEDHOMNL
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerAskFriendListRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class GetPlayerAskFriendListRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (askFriendListBuilder_ == null) {
           askFriendList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           askFriendListBuilder_.clear();
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
       public emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp buildPartial() {
         emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp result = new emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (askFriendListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             askFriendList_ = java.util.Collections.unmodifiableList(askFriendList_);
@@ -456,7 +447,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
         } else {
           result.askFriendList_ = askFriendListBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class GetPlayerAskFriendListRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp other) {
         if (other == emu.grasscutter.net.proto.GetPlayerAskFriendListRspOuterClass.GetPlayerAskFriendListRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (askFriendListBuilder_ == null) {
           if (!other.askFriendList_.isEmpty()) {
             if (askFriendList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class GetPlayerAskFriendListRspOuterClass {
       }
       private int bitField0_;
 
+      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 java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> askFriendList_ =
         java.util.Collections.emptyList();
       private void ensureAskFriendListIsMutable() {
@@ -577,7 +598,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> askFriendListBuilder_;
 
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getAskFriendListList() {
         if (askFriendListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public int getAskFriendListCount() {
         if (askFriendListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index) {
         if (askFriendListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder setAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -624,7 +645,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder setAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder addAskFriendList(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (askFriendListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder addAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -671,7 +692,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder addAskFriendList(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder addAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder addAllAskFriendList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> values) {
@@ -714,7 +735,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder clearAskFriendList() {
         if (askFriendListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public Builder removeAskFriendList(int index) {
         if (askFriendListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class GetPlayerAskFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getAskFriendListBuilder(
           int index) {
         return getAskFriendListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
            getAskFriendListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addAskFriendListBuilder() {
         return getAskFriendListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addAskFriendListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
             index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 12;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder> 
            getAskFriendListBuilderList() {
@@ -803,37 +824,6 @@ public final class GetPlayerAskFriendListRspOuterClass {
         }
         return askFriendListBuilder_;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 13;</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 = 13;</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) {
@@ -903,8 +893,8 @@ public final class GetPlayerAskFriendListRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037GetPlayerAskFriendListRsp.proto\032\021Frien" +
       "dBrief.proto\"S\n\031GetPlayerAskFriendListRs" +
-      "p\022%\n\017ask_friend_list\030\014 \003(\0132\014.FriendBrief" +
-      "\022\017\n\007retcode\030\r \001(\005B\033\n\031emu.grasscutter.net" +
+      "p\022\017\n\007retcode\030\005 \001(\005\022%\n\017ask_friend_list\030\n " +
+      "\003(\0132\014.FriendBriefB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -917,7 +907,7 @@ public final class GetPlayerAskFriendListRspOuterClass {
     internal_static_GetPlayerAskFriendListRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerAskFriendListRsp_descriptor,
-        new java.lang.String[] { "AskFriendList", "Retcode", });
+        new java.lang.String[] { "Retcode", "AskFriendList", });
     emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistReqOuterClass.java
index ce59db21f..ad4bcf0a0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetPlayerBlacklistReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 25338
-   * Obf: BGDKEKKBHDA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerBlacklistReq}
    */
   public static final class GetPlayerBlacklistReq extends
@@ -245,11 +240,6 @@ public final class GetPlayerBlacklistReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25338
-     * Obf: BGDKEKKBHDA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerBlacklistReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistRspOuterClass.java
index af470016f..a16469788 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerBlacklistRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GetPlayerBlacklistRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> 
         getBlacklistList();
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getBlacklist(int index);
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     int getBlacklistCount();
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
         getBlacklistOrBuilderList();
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getBlacklistOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 20310
-   * Obf: NFLFLEHNLAJ
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerBlacklistRsp}
    */
   public static final class GetPlayerBlacklistRsp extends
@@ -100,7 +95,12 @@ public final class GetPlayerBlacklistRspOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 blacklist_ = new java.util.ArrayList<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class GetPlayerBlacklistRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.parser(), extensionRegistry));
               break;
             }
-            case 80: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +144,28 @@ public final class GetPlayerBlacklistRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp.class, emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp.Builder.class);
     }
 
-    public static final int BLACKLIST_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int BLACKLIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> blacklist_;
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getBlacklistList() {
       return blacklist_;
     }
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -167,21 +173,21 @@ public final class GetPlayerBlacklistRspOuterClass {
       return blacklist_;
     }
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     @java.lang.Override
     public int getBlacklistCount() {
       return blacklist_.size();
     }
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getBlacklist(int index) {
       return blacklist_.get(index);
     }
     /**
-     * <code>repeated .FriendBrief blacklist = 4;</code>
+     * <code>repeated .FriendBrief blacklist = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getBlacklistOrBuilder(
@@ -189,17 +195,6 @@ public final class GetPlayerBlacklistRspOuterClass {
       return blacklist_.get(index);
     }
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class GetPlayerBlacklistRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < blacklist_.size(); i++) {
-        output.writeMessage(4, blacklist_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
+        output.writeInt32(7, retcode_);
+      }
+      for (int i = 0; i < blacklist_.size(); i++) {
+        output.writeMessage(15, blacklist_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class GetPlayerBlacklistRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < blacklist_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, blacklist_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
+          .computeInt32Size(7, retcode_);
+      }
+      for (int i = 0; i < blacklist_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, blacklist_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class GetPlayerBlacklistRspOuterClass {
       }
       emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp other = (emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp) obj;
 
-      if (!getBlacklistList()
-          .equals(other.getBlacklistList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getBlacklistList()
+          .equals(other.getBlacklistList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class GetPlayerBlacklistRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getBlacklistCount() > 0) {
         hash = (37 * hash) + BLACKLIST_FIELD_NUMBER;
         hash = (53 * hash) + getBlacklistList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class GetPlayerBlacklistRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20310
-     * Obf: NFLFLEHNLAJ
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerBlacklistRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class GetPlayerBlacklistRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (blacklistBuilder_ == null) {
           blacklist_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           blacklistBuilder_.clear();
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class GetPlayerBlacklistRspOuterClass {
       public emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp buildPartial() {
         emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp result = new emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (blacklistBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             blacklist_ = java.util.Collections.unmodifiableList(blacklist_);
@@ -456,7 +447,6 @@ public final class GetPlayerBlacklistRspOuterClass {
         } else {
           result.blacklist_ = blacklistBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class GetPlayerBlacklistRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp other) {
         if (other == emu.grasscutter.net.proto.GetPlayerBlacklistRspOuterClass.GetPlayerBlacklistRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (blacklistBuilder_ == null) {
           if (!other.blacklist_.isEmpty()) {
             if (blacklist_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class GetPlayerBlacklistRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class GetPlayerBlacklistRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> blacklist_ =
         java.util.Collections.emptyList();
       private void ensureBlacklistIsMutable() {
@@ -577,7 +598,7 @@ public final class GetPlayerBlacklistRspOuterClass {
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> blacklistBuilder_;
 
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getBlacklistList() {
         if (blacklistBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public int getBlacklistCount() {
         if (blacklistBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getBlacklist(int index) {
         if (blacklistBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder setBlacklist(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -624,7 +645,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder setBlacklist(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder addBlacklist(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (blacklistBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder addBlacklist(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -671,7 +692,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder addBlacklist(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder addBlacklist(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder addAllBlacklist(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> values) {
@@ -714,7 +735,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder clearBlacklist() {
         if (blacklistBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public Builder removeBlacklist(int index) {
         if (blacklistBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class GetPlayerBlacklistRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getBlacklistBuilder(
           int index) {
         return getBlacklistFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getBlacklistOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
            getBlacklistOrBuilderList() {
@@ -768,14 +789,14 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addBlacklistBuilder() {
         return getBlacklistFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addBlacklistBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class GetPlayerBlacklistRspOuterClass {
             index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief blacklist = 4;</code>
+       * <code>repeated .FriendBrief blacklist = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder> 
            getBlacklistBuilderList() {
@@ -803,37 +824,6 @@ public final class GetPlayerBlacklistRspOuterClass {
         }
         return blacklistBuilder_;
       }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -902,9 +892,9 @@ public final class GetPlayerBlacklistRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033GetPlayerBlacklistRsp.proto\032\021FriendBri" +
-      "ef.proto\"I\n\025GetPlayerBlacklistRsp\022\037\n\tbla" +
-      "cklist\030\004 \003(\0132\014.FriendBrief\022\017\n\007retcode\030\n " +
-      "\001(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "ef.proto\"I\n\025GetPlayerBlacklistRsp\022\017\n\007ret" +
+      "code\030\007 \001(\005\022\037\n\tblacklist\030\017 \003(\0132\014.FriendBr" +
+      "iefB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -916,7 +906,7 @@ public final class GetPlayerBlacklistRspOuterClass {
     internal_static_GetPlayerBlacklistRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerBlacklistRsp_descriptor,
-        new java.lang.String[] { "Blacklist", "Retcode", });
+        new java.lang.String[] { "Retcode", "Blacklist", });
     emu.grasscutter.net.proto.FriendBriefOuterClass.getDescriptor();
   }
 
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 e5008034e..74da4c756 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetPlayerFriendListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 2240
-   * Obf: OEHLGALOKNA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerFriendListReq}
    */
   public static final class GetPlayerFriendListReq extends
@@ -245,11 +240,6 @@ public final class GetPlayerFriendListReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2240
-     * Obf: OEHLGALOKNA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerFriendListReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListRspOuterClass.java
index f411592e7..7086d24e4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerFriendListRspOuterClass.java
@@ -19,65 +19,60 @@ public final class GetPlayerFriendListRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> 
         getFriendListList();
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getFriendList(int index);
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     int getFriendListCount();
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
         getFriendListOrBuilderList();
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getFriendListOrBuilder(
         int index);
 
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> 
         getAskFriendListList();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index);
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     int getAskFriendListCount();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
         getAskFriendListOrBuilderList();
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 20997
-   * Obf: GBPKOGFAIJA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerFriendListRsp}
    */
   public static final class GetPlayerFriendListRsp extends
@@ -125,21 +120,12 @@ public final class GetPlayerFriendListRspOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                askFriendList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              askFriendList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.parser(), extensionRegistry));
-              break;
-            }
-            case 48: {
+            case 8: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 122: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 friendList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief>();
                 mutable_bitField0_ |= 0x00000001;
@@ -148,6 +134,15 @@ public final class GetPlayerFriendListRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.parser(), extensionRegistry));
               break;
             }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                askFriendList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              askFriendList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -163,12 +158,12 @@ public final class GetPlayerFriendListRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          askFriendList_ = java.util.Collections.unmodifiableList(askFriendList_);
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           friendList_ = java.util.Collections.unmodifiableList(friendList_);
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          askFriendList_ = java.util.Collections.unmodifiableList(askFriendList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -186,10 +181,10 @@ public final class GetPlayerFriendListRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerFriendListRspOuterClass.GetPlayerFriendListRsp.class, emu.grasscutter.net.proto.GetPlayerFriendListRspOuterClass.GetPlayerFriendListRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -197,17 +192,17 @@ public final class GetPlayerFriendListRspOuterClass {
       return retcode_;
     }
 
-    public static final int FRIEND_LIST_FIELD_NUMBER = 15;
+    public static final int FRIEND_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> friendList_;
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getFriendListList() {
       return friendList_;
     }
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -215,21 +210,21 @@ public final class GetPlayerFriendListRspOuterClass {
       return friendList_;
     }
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     @java.lang.Override
     public int getFriendListCount() {
       return friendList_.size();
     }
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getFriendList(int index) {
       return friendList_.get(index);
     }
     /**
-     * <code>repeated .FriendBrief friend_list = 15;</code>
+     * <code>repeated .FriendBrief friend_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getFriendListOrBuilder(
@@ -237,17 +232,17 @@ public final class GetPlayerFriendListRspOuterClass {
       return friendList_.get(index);
     }
 
-    public static final int ASK_FRIEND_LIST_FIELD_NUMBER = 2;
+    public static final int ASK_FRIEND_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> askFriendList_;
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getAskFriendListList() {
       return askFriendList_;
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
@@ -255,21 +250,21 @@ public final class GetPlayerFriendListRspOuterClass {
       return askFriendList_;
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     @java.lang.Override
     public int getAskFriendListCount() {
       return askFriendList_.size();
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index) {
       return askFriendList_.get(index);
     }
     /**
-     * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+     * <code>repeated .FriendBrief ask_friend_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
@@ -291,14 +286,14 @@ public final class GetPlayerFriendListRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < askFriendList_.size(); i++) {
-        output.writeMessage(2, askFriendList_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(1, retcode_);
       }
       for (int i = 0; i < friendList_.size(); i++) {
-        output.writeMessage(15, friendList_.get(i));
+        output.writeMessage(4, friendList_.get(i));
+      }
+      for (int i = 0; i < askFriendList_.size(); i++) {
+        output.writeMessage(7, askFriendList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -309,17 +304,17 @@ public final class GetPlayerFriendListRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < askFriendList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, askFriendList_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(1, retcode_);
       }
       for (int i = 0; i < friendList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, friendList_.get(i));
+          .computeMessageSize(4, friendList_.get(i));
+      }
+      for (int i = 0; i < askFriendList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, askFriendList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -459,11 +454,6 @@ public final class GetPlayerFriendListRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20997
-     * Obf: GBPKOGFAIJA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerFriendListRsp}
      */
     public static final class Builder extends
@@ -698,7 +688,7 @@ public final class GetPlayerFriendListRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -706,7 +696,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -717,7 +707,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -740,7 +730,7 @@ public final class GetPlayerFriendListRspOuterClass {
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> friendListBuilder_;
 
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getFriendListList() {
         if (friendListBuilder_ == null) {
@@ -750,7 +740,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public int getFriendListCount() {
         if (friendListBuilder_ == null) {
@@ -760,7 +750,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getFriendList(int index) {
         if (friendListBuilder_ == null) {
@@ -770,7 +760,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder setFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -787,7 +777,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder setFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -801,7 +791,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder addFriendList(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (friendListBuilder_ == null) {
@@ -817,7 +807,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder addFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -834,7 +824,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder addFriendList(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -848,7 +838,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder addFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -862,7 +852,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder addAllFriendList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> values) {
@@ -877,7 +867,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder clearFriendList() {
         if (friendListBuilder_ == null) {
@@ -890,7 +880,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public Builder removeFriendList(int index) {
         if (friendListBuilder_ == null) {
@@ -903,14 +893,14 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getFriendListBuilder(
           int index) {
         return getFriendListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getFriendListOrBuilder(
           int index) {
@@ -920,7 +910,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
            getFriendListOrBuilderList() {
@@ -931,14 +921,14 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addFriendListBuilder() {
         return getFriendListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addFriendListBuilder(
           int index) {
@@ -946,7 +936,7 @@ public final class GetPlayerFriendListRspOuterClass {
             index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief friend_list = 15;</code>
+       * <code>repeated .FriendBrief friend_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder> 
            getFriendListBuilderList() {
@@ -980,7 +970,7 @@ public final class GetPlayerFriendListRspOuterClass {
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> askFriendListBuilder_;
 
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> getAskFriendListList() {
         if (askFriendListBuilder_ == null) {
@@ -990,7 +980,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public int getAskFriendListCount() {
         if (askFriendListBuilder_ == null) {
@@ -1000,7 +990,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief getAskFriendList(int index) {
         if (askFriendListBuilder_ == null) {
@@ -1010,7 +1000,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder setAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -1027,7 +1017,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder setAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -1041,7 +1031,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder addAskFriendList(emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
         if (askFriendListBuilder_ == null) {
@@ -1057,7 +1047,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder addAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief value) {
@@ -1074,7 +1064,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder addAskFriendList(
           emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -1088,7 +1078,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder addAskFriendList(
           int index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder builderForValue) {
@@ -1102,7 +1092,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder addAllAskFriendList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief> values) {
@@ -1117,7 +1107,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder clearAskFriendList() {
         if (askFriendListBuilder_ == null) {
@@ -1130,7 +1120,7 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public Builder removeAskFriendList(int index) {
         if (askFriendListBuilder_ == null) {
@@ -1143,14 +1133,14 @@ public final class GetPlayerFriendListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder getAskFriendListBuilder(
           int index) {
         return getAskFriendListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder getAskFriendListOrBuilder(
           int index) {
@@ -1160,7 +1150,7 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBriefOrBuilder> 
            getAskFriendListOrBuilderList() {
@@ -1171,14 +1161,14 @@ public final class GetPlayerFriendListRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addAskFriendListBuilder() {
         return getAskFriendListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder addAskFriendListBuilder(
           int index) {
@@ -1186,7 +1176,7 @@ public final class GetPlayerFriendListRspOuterClass {
             index, emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.getDefaultInstance());
       }
       /**
-       * <code>repeated .FriendBrief ask_friend_list = 2;</code>
+       * <code>repeated .FriendBrief ask_friend_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief.Builder> 
            getAskFriendListBuilderList() {
@@ -1275,8 +1265,8 @@ public final class GetPlayerFriendListRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034GetPlayerFriendListRsp.proto\032\021FriendBr" +
       "ief.proto\"s\n\026GetPlayerFriendListRsp\022\017\n\007r" +
-      "etcode\030\006 \001(\005\022!\n\013friend_list\030\017 \003(\0132\014.Frie" +
-      "ndBrief\022%\n\017ask_friend_list\030\002 \003(\0132\014.Frien" +
+      "etcode\030\001 \001(\005\022!\n\013friend_list\030\004 \003(\0132\014.Frie" +
+      "ndBrief\022%\n\017ask_friend_list\030\007 \003(\0132\014.Frien" +
       "dBriefB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerHomeCompInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerHomeCompInfoReqOuterClass.java
index 6a8d7bee8..ed6f311ca 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerHomeCompInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerHomeCompInfoReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetPlayerHomeCompInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 3709
-   * Obf: DCHBFDKENHG
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerHomeCompInfoReq}
    */
   public static final class GetPlayerHomeCompInfoReq extends
@@ -245,11 +240,6 @@ public final class GetPlayerHomeCompInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3709
-     * Obf: DCHBFDKENHG
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerHomeCompInfoReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerMpModeAvailabilityRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerMpModeAvailabilityRspOuterClass.java
index 1a1ad18ae..9c7fbb80c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerMpModeAvailabilityRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerMpModeAvailabilityRspOuterClass.java
@@ -19,40 +19,35 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 mp_ret = 7;</code>
+     * <code>int32 mp_ret = 1;</code>
      * @return The mpRet.
      */
     int getMpRet();
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @return A list containing the paramList.
      */
     java.util.List<java.lang.Integer> getParamListList();
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @return The count of paramList.
      */
     int getParamListCount();
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @param index The index of the element to return.
      * @return The paramList at the given index.
      */
     int getParamList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 28762
-   * Obf: HMBNKLOHKPA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerMpModeAvailabilityRsp}
    */
   public static final class GetPlayerMpModeAvailabilityRsp extends
@@ -99,17 +94,17 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 56: {
+            case 8: {
 
               mpRet_ = input.readInt32();
               break;
             }
-            case 72: {
+            case 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 64: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 paramList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -117,7 +112,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
               paramList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -165,10 +160,10 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerMpModeAvailabilityRspOuterClass.GetPlayerMpModeAvailabilityRsp.class, emu.grasscutter.net.proto.GetPlayerMpModeAvailabilityRspOuterClass.GetPlayerMpModeAvailabilityRsp.Builder.class);
     }
 
-    public static final int MP_RET_FIELD_NUMBER = 7;
+    public static final int MP_RET_FIELD_NUMBER = 1;
     private int mpRet_;
     /**
-     * <code>int32 mp_ret = 7;</code>
+     * <code>int32 mp_ret = 1;</code>
      * @return The mpRet.
      */
     @java.lang.Override
@@ -176,10 +171,10 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       return mpRet_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 7;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -187,10 +182,10 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       return retcode_;
     }
 
-    public static final int PARAM_LIST_FIELD_NUMBER = 9;
+    public static final int PARAM_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList paramList_;
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @return A list containing the paramList.
      */
     @java.lang.Override
@@ -199,14 +194,14 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       return paramList_;
     }
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @return The count of paramList.
      */
     public int getParamListCount() {
       return paramList_.size();
     }
     /**
-     * <code>repeated uint32 param_list = 9;</code>
+     * <code>repeated uint32 param_list = 8;</code>
      * @param index The index of the element to return.
      * @return The paramList at the given index.
      */
@@ -230,14 +225,14 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
-      }
       if (mpRet_ != 0) {
-        output.writeInt32(7, mpRet_);
+        output.writeInt32(1, mpRet_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(7, retcode_);
       }
       if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(paramListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramList_.size(); i++) {
@@ -252,13 +247,13 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
-      }
       if (mpRet_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, mpRet_);
+          .computeInt32Size(1, mpRet_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(7, retcode_);
       }
       {
         int dataSize = 0;
@@ -410,11 +405,6 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28762
-     * Obf: HMBNKLOHKPA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerMpModeAvailabilityRsp}
      */
     public static final class Builder extends
@@ -588,7 +578,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
 
       private int mpRet_ ;
       /**
-       * <code>int32 mp_ret = 7;</code>
+       * <code>int32 mp_ret = 1;</code>
        * @return The mpRet.
        */
       @java.lang.Override
@@ -596,7 +586,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return mpRet_;
       }
       /**
-       * <code>int32 mp_ret = 7;</code>
+       * <code>int32 mp_ret = 1;</code>
        * @param value The mpRet to set.
        * @return This builder for chaining.
        */
@@ -607,7 +597,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 mp_ret = 7;</code>
+       * <code>int32 mp_ret = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearMpRet() {
@@ -619,7 +609,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 7;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 7;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -638,7 +628,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -656,7 +646,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @return A list containing the paramList.
        */
       public java.util.List<java.lang.Integer>
@@ -665,14 +655,14 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
                  java.util.Collections.unmodifiableList(paramList_) : paramList_;
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @return The count of paramList.
        */
       public int getParamListCount() {
         return paramList_.size();
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @param index The index of the element to return.
        * @return The paramList at the given index.
        */
@@ -680,7 +670,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return paramList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @param index The index to set the value at.
        * @param value The paramList to set.
        * @return This builder for chaining.
@@ -693,7 +683,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @param value The paramList to add.
        * @return This builder for chaining.
        */
@@ -704,7 +694,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @param values The paramList to add.
        * @return This builder for chaining.
        */
@@ -717,7 +707,7 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_list = 9;</code>
+       * <code>repeated uint32 param_list = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearParamList() {
@@ -795,8 +785,8 @@ public final class GetPlayerMpModeAvailabilityRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n$GetPlayerMpModeAvailabilityRsp.proto\"U" +
       "\n\036GetPlayerMpModeAvailabilityRsp\022\016\n\006mp_r" +
-      "et\030\007 \001(\005\022\017\n\007retcode\030\004 \001(\005\022\022\n\nparam_list\030" +
-      "\t \003(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "et\030\001 \001(\005\022\017\n\007retcode\030\007 \001(\005\022\022\n\nparam_list\030" +
+      "\010 \003(\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/GetPlayerSocialDetailReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
index 62fcd56e4..4a896fc49 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailReqOuterClass.java
@@ -25,11 +25,6 @@ public final class GetPlayerSocialDetailReqOuterClass {
     int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 928
-   * Obf: NELPPMEFINN
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerSocialDetailReq}
    */
   public static final class GetPlayerSocialDetailReq extends
@@ -278,11 +273,6 @@ public final class GetPlayerSocialDetailReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 928
-     * Obf: NELPPMEFINN
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerSocialDetailReq}
      */
     public static final class Builder extends
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 dcfe5841c..481c5199f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerSocialDetailRspOuterClass.java
@@ -19,32 +19,27 @@ public final class GetPlayerSocialDetailRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      * @return Whether the detailData field is set.
      */
     boolean hasDetailData();
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      * @return The detailData.
      */
     emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailData();
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      */
     emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 7452
-   * Obf: EOJCAMGIPGL
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerSocialDetailRsp}
    */
   public static final class GetPlayerSocialDetailRsp extends
@@ -89,7 +84,12 @@ public final class GetPlayerSocialDetailRspOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder subBuilder = null;
               if (detailData_ != null) {
                 subBuilder = detailData_.toBuilder();
@@ -102,11 +102,6 @@ public final class GetPlayerSocialDetailRspOuterClass {
 
               break;
             }
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +134,10 @@ public final class GetPlayerSocialDetailRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp.class, emu.grasscutter.net.proto.GetPlayerSocialDetailRspOuterClass.GetPlayerSocialDetailRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class GetPlayerSocialDetailRspOuterClass {
       return retcode_;
     }
 
-    public static final int DETAIL_DATA_FIELD_NUMBER = 5;
+    public static final int DETAIL_DATA_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail detailData_;
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      * @return Whether the detailData field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
       return detailData_ != null;
     }
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      * @return The detailData.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
       return detailData_ == null ? emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.getDefaultInstance() : detailData_;
     }
     /**
-     * <code>.SocialDetail detail_data = 5;</code>
+     * <code>.SocialDetail detail_data = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder() {
@@ -190,11 +185,11 @@ public final class GetPlayerSocialDetailRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (detailData_ != null) {
-        output.writeMessage(5, getDetailData());
-      }
       if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      if (detailData_ != null) {
+        output.writeMessage(12, getDetailData());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class GetPlayerSocialDetailRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (detailData_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getDetailData());
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
+          .computeInt32Size(5, retcode_);
+      }
+      if (detailData_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getDetailData());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class GetPlayerSocialDetailRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7452
-     * Obf: EOJCAMGIPGL
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerSocialDetailRsp}
      */
     public static final class Builder extends
@@ -515,7 +505,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -523,7 +513,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -534,7 +524,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -548,14 +538,14 @@ public final class GetPlayerSocialDetailRspOuterClass {
       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 = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        * @return Whether the detailData field is set.
        */
       public boolean hasDetailData() {
         return detailDataBuilder_ != null || detailData_ != null;
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        * @return The detailData.
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail getDetailData() {
@@ -566,7 +556,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         }
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public Builder setDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail value) {
         if (detailDataBuilder_ == null) {
@@ -582,7 +572,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public Builder setDetailData(
           emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder builderForValue) {
@@ -596,7 +586,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public Builder mergeDetailData(emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail value) {
         if (detailDataBuilder_ == null) {
@@ -614,7 +604,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public Builder clearDetailData() {
         if (detailDataBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return this;
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetail.Builder getDetailDataBuilder() {
         
@@ -636,7 +626,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         return getDetailDataFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</code>
        */
       public emu.grasscutter.net.proto.SocialDetailOuterClass.SocialDetailOrBuilder getDetailDataOrBuilder() {
         if (detailDataBuilder_ != null) {
@@ -647,7 +637,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
         }
       }
       /**
-       * <code>.SocialDetail detail_data = 5;</code>
+       * <code>.SocialDetail detail_data = 12;</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> 
@@ -731,7 +721,7 @@ public final class GetPlayerSocialDetailRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036GetPlayerSocialDetailRsp.proto\032\022Social" +
       "Detail.proto\"O\n\030GetPlayerSocialDetailRsp" +
-      "\022\017\n\007retcode\030\007 \001(\005\022\"\n\013detail_data\030\005 \001(\0132\r" +
+      "\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"
     };
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 ce32510bb..2c6e83a90 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenReqOuterClass.java
@@ -19,18 +19,60 @@ public final class GetPlayerTokenReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 account_type = 11;</code>
-     * @return The accountType.
+     * <code>string HCJGLLHFCMA = 1304;</code>
+     * @return The hCJGLLHFCMA.
      */
-    int getAccountType();
+    java.lang.String getHCJGLLHFCMA();
+    /**
+     * <code>string HCJGLLHFCMA = 1304;</code>
+     * @return The bytes for hCJGLLHFCMA.
+     */
+    com.google.protobuf.ByteString
+        getHCJGLLHFCMABytes();
 
     /**
-     * <code>string account_token = 12;</code>
+     * <code>string online_id = 13;</code>
+     * @return The onlineId.
+     */
+    java.lang.String getOnlineId();
+    /**
+     * <code>string online_id = 13;</code>
+     * @return The bytes for onlineId.
+     */
+    com.google.protobuf.ByteString
+        getOnlineIdBytes();
+
+    /**
+     * <code>string BPFIMEKJANE = 9;</code>
+     * @return The bPFIMEKJANE.
+     */
+    java.lang.String getBPFIMEKJANE();
+    /**
+     * <code>string BPFIMEKJANE = 9;</code>
+     * @return The bytes for bPFIMEKJANE.
+     */
+    com.google.protobuf.ByteString
+        getBPFIMEKJANEBytes();
+
+    /**
+     * <code>string country_code = 1;</code>
+     * @return The countryCode.
+     */
+    java.lang.String getCountryCode();
+    /**
+     * <code>string country_code = 1;</code>
+     * @return The bytes for countryCode.
+     */
+    com.google.protobuf.ByteString
+        getCountryCodeBytes();
+
+    /**
+     * <code>string account_token = 4;</code>
      * @return The accountToken.
      */
     java.lang.String getAccountToken();
     /**
-     * <code>string account_token = 12;</code>
+     * <code>string account_token = 4;</code>
      * @return The bytes for accountToken.
      */
     com.google.protobuf.ByteString
@@ -49,173 +91,162 @@ public final class GetPlayerTokenReqOuterClass {
         getPsnIdBytes();
 
     /**
-     * <code>string online_id = 1;</code>
-     * @return The onlineId.
+     * <code>string JLCDDOJGKKG = 1528;</code>
+     * @return The jLCDDOJGKKG.
      */
-    java.lang.String getOnlineId();
+    java.lang.String getJLCDDOJGKKG();
     /**
-     * <code>string online_id = 1;</code>
-     * @return The bytes for onlineId.
+     * <code>string JLCDDOJGKKG = 1528;</code>
+     * @return The bytes for jLCDDOJGKKG.
      */
     com.google.protobuf.ByteString
-        getOnlineIdBytes();
+        getJLCDDOJGKKGBytes();
 
     /**
-     * <code>string account_uid = 4;</code>
+     * <code>string account_uid = 3;</code>
      * @return The accountUid.
      */
     java.lang.String getAccountUid();
     /**
-     * <code>string account_uid = 4;</code>
+     * <code>string account_uid = 3;</code>
      * @return The bytes for accountUid.
      */
     com.google.protobuf.ByteString
         getAccountUidBytes();
 
     /**
-     * <code>string LODOCFKABDG = 3;</code>
-     * @return The lODOCFKABDG.
+     * <code>string client_rand_key = 94;</code>
+     * @return The clientRandKey.
      */
-    java.lang.String getLODOCFKABDG();
+    java.lang.String getClientRandKey();
     /**
-     * <code>string LODOCFKABDG = 3;</code>
-     * @return The bytes for lODOCFKABDG.
+     * <code>string client_rand_key = 94;</code>
+     * @return The bytes for clientRandKey.
      */
     com.google.protobuf.ByteString
-        getLODOCFKABDGBytes();
+        getClientRandKeyBytes();
 
     /**
-     * <code>uint32 platform_type = 8;</code>
-     * @return The platformType.
+     * <code>string BDGFMEIEHOD = 5;</code>
+     * @return The bDGFMEIEHOD.
      */
-    int getPlatformType();
+    java.lang.String getBDGFMEIEHOD();
+    /**
+     * <code>string BDGFMEIEHOD = 5;</code>
+     * @return The bytes for bDGFMEIEHOD.
+     */
+    com.google.protobuf.ByteString
+        getBDGFMEIEHODBytes();
 
     /**
-     * <code>string client_ip_str = 9;</code>
+     * <code>string client_ip_str = 7;</code>
      * @return The clientIpStr.
      */
     java.lang.String getClientIpStr();
     /**
-     * <code>string client_ip_str = 9;</code>
+     * <code>string client_ip_str = 7;</code>
      * @return The bytes for clientIpStr.
      */
     com.google.protobuf.ByteString
         getClientIpStrBytes();
 
     /**
-     * <code>uint32 sub_channel_id = 7;</code>
-     * @return The subChannelId.
-     */
-    int getSubChannelId();
-
-    /**
-     * <code>uint32 cloudClientIp = 177;</code>
-     * @return The cloudClientIp.
-     */
-    int getCloudClientIp();
-
-    /**
-     * <code>string GIKAFFPKLOE = 14;</code>
-     * @return The gIKAFFPKLOE.
-     */
-    java.lang.String getGIKAFFPKLOE();
-    /**
-     * <code>string GIKAFFPKLOE = 14;</code>
-     * @return The bytes for gIKAFFPKLOE.
-     */
-    com.google.protobuf.ByteString
-        getGIKAFFPKLOEBytes();
-
-    /**
-     * <code>string birthday = 828;</code>
+     * <code>string birthday = 594;</code>
      * @return The birthday.
      */
     java.lang.String getBirthday();
     /**
-     * <code>string birthday = 828;</code>
+     * <code>string birthday = 594;</code>
      * @return The bytes for birthday.
      */
     com.google.protobuf.ByteString
         getBirthdayBytes();
 
     /**
-     * <code>uint32 uid = 13;</code>
+     * <code>string ADFHNBPGAGM = 1804;</code>
+     * @return The aDFHNBPGAGM.
+     */
+    java.lang.String getADFHNBPGAGM();
+    /**
+     * <code>string ADFHNBPGAGM = 1804;</code>
+     * @return The bytes for aDFHNBPGAGM.
+     */
+    com.google.protobuf.ByteString
+        getADFHNBPGAGMBytes();
+
+    /**
+     * <code>uint32 platform_type = 2;</code>
+     * @return The platformType.
+     */
+    int getPlatformType();
+
+    /**
+     * <code>uint32 IKKKLHICPMF = 12;</code>
+     * @return The iKKKLHICPMF.
+     */
+    int getIKKKLHICPMF();
+
+    /**
+     * <code>uint32 account_type = 8;</code>
+     * @return The accountType.
+     */
+    int getAccountType();
+
+    /**
+     * <code>uint32 OCINFHOJCEA = 15;</code>
+     * @return The oCINFHOJCEA.
+     */
+    int getOCINFHOJCEA();
+
+    /**
+     * <code>uint32 CIJPMGMCJBA = 1776;</code>
+     * @return The cIJPMGMCJBA.
+     */
+    int getCIJPMGMCJBA();
+
+    /**
+     * <code>uint32 uid = 6;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>uint32 OGNFFAEKDBO = 695;</code>
-     * @return The oGNFFAEKDBO.
+     * <code>uint32 MPGMOFLCEOF = 1730;</code>
+     * @return The mPGMOFLCEOF.
      */
-    int getOGNFFAEKDBO();
+    int getMPGMOFLCEOF();
 
     /**
-     * <code>uint32 key_id = 407;</code>
-     * @return The keyId.
-     */
-    int getKeyId();
-
-    /**
-     * <code>string country_code = 15;</code>
-     * @return The countryCode.
-     */
-    java.lang.String getCountryCode();
-    /**
-     * <code>string country_code = 15;</code>
-     * @return The bytes for countryCode.
-     */
-    com.google.protobuf.ByteString
-        getCountryCodeBytes();
-
-    /**
-     * <code>uint32 channel_id = 6;</code>
-     * @return The channelId.
-     */
-    int getChannelId();
-
-    /**
-     * <code>uint32 FCPDNLHOBNK = 2;</code>
-     * @return The fCPDNLHOBNK.
-     */
-    int getFCPDNLHOBNK();
-
-    /**
-     * <code>bool is_guest = 5;</code>
+     * <code>bool is_guest = 14;</code>
      * @return The isGuest.
      */
     boolean getIsGuest();
 
     /**
-     * <code>string FAOAMMHOOHL = 1457;</code>
-     * @return The fAOAMMHOOHL.
+     * <code>uint32 KODKEFGJHAP = 168;</code>
+     * @return The kODKEFGJHAP.
      */
-    java.lang.String getFAOAMMHOOHL();
-    /**
-     * <code>string FAOAMMHOOHL = 1457;</code>
-     * @return The bytes for fAOAMMHOOHL.
-     */
-    com.google.protobuf.ByteString
-        getFAOAMMHOOHLBytes();
+    int getKODKEFGJHAP();
 
     /**
-     * <code>string client_rand_key = 355;</code>
-     * @return The clientRandKey.
+     * <code>uint32 key_id = 1485;</code>
+     * @return The keyId.
      */
-    java.lang.String getClientRandKey();
+    int getKeyId();
+
     /**
-     * <code>string client_rand_key = 355;</code>
-     * @return The bytes for clientRandKey.
+     * <code>uint32 KEKHAKAPMIN = 11;</code>
+     * @return The kEKHAKAPMIN.
      */
-    com.google.protobuf.ByteString
-        getClientRandKeyBytes();
+    int getKEKHAKAPMIN();
+
+    /**
+     * <code>uint32 JDHCKKAGBNL = 1686;</code>
+     * @return The jDHCKKAGBNL.
+     */
+    int getJDHCKKAGBNL();
   }
   /**
-   * <pre>
-   * CmdId: 21228
-   * Obf: AGJHCDNJDOG
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerTokenReq}
    */
   public static final class GetPlayerTokenReq extends
@@ -228,17 +259,19 @@ public final class GetPlayerTokenReqOuterClass {
       super(builder);
     }
     private GetPlayerTokenReq() {
+      hCJGLLHFCMA_ = "";
+      onlineId_ = "";
+      bPFIMEKJANE_ = "";
+      countryCode_ = "";
       accountToken_ = "";
       psnId_ = "";
-      onlineId_ = "";
+      jLCDDOJGKKG_ = "";
       accountUid_ = "";
-      lODOCFKABDG_ = "";
-      clientIpStr_ = "";
-      gIKAFFPKLOE_ = "";
-      birthday_ = "";
-      countryCode_ = "";
-      fAOAMMHOOHL_ = "";
       clientRandKey_ = "";
+      bDGFMEIEHOD_ = "";
+      clientIpStr_ = "";
+      birthday_ = "";
+      aDFHNBPGAGM_ = "";
     }
 
     @java.lang.Override
@@ -274,50 +307,52 @@ public final class GetPlayerTokenReqOuterClass {
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              onlineId_ = s;
+              countryCode_ = s;
               break;
             }
             case 16: {
 
-              fCPDNLHOBNK_ = input.readUInt32();
+              platformType_ = input.readUInt32();
               break;
             }
             case 26: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              lODOCFKABDG_ = s;
+              accountUid_ = s;
               break;
             }
             case 34: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              accountUid_ = s;
+              accountToken_ = s;
               break;
             }
-            case 40: {
+            case 42: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              isGuest_ = input.readBool();
+              bDGFMEIEHOD_ = s;
               break;
             }
             case 48: {
 
-              channelId_ = input.readUInt32();
+              uid_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 58: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              subChannelId_ = input.readUInt32();
+              clientIpStr_ = s;
               break;
             }
             case 64: {
 
-              platformType_ = input.readUInt32();
+              accountType_ = input.readUInt32();
               break;
             }
             case 74: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              clientIpStr_ = s;
+              bPFIMEKJANE_ = s;
               break;
             }
             case 82: {
@@ -328,63 +363,83 @@ public final class GetPlayerTokenReqOuterClass {
             }
             case 88: {
 
-              accountType_ = input.readUInt32();
+              kEKHAKAPMIN_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 96: {
+
+              iKKKLHICPMF_ = input.readUInt32();
+              break;
+            }
+            case 106: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              accountToken_ = s;
+              onlineId_ = s;
               break;
             }
-            case 104: {
+            case 112: {
 
-              uid_ = input.readUInt32();
+              isGuest_ = input.readBool();
               break;
             }
-            case 114: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 120: {
 
-              gIKAFFPKLOE_ = s;
+              oCINFHOJCEA_ = input.readUInt32();
               break;
             }
-            case 122: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              countryCode_ = s;
-              break;
-            }
-            case 1416: {
-
-              cloudClientIp_ = input.readUInt32();
-              break;
-            }
-            case 2842: {
+            case 754: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientRandKey_ = s;
               break;
             }
-            case 3256: {
+            case 1344: {
 
-              keyId_ = input.readUInt32();
+              kODKEFGJHAP_ = input.readUInt32();
               break;
             }
-            case 5560: {
-
-              oGNFFAEKDBO_ = input.readUInt32();
-              break;
-            }
-            case 6626: {
+            case 4754: {
               java.lang.String s = input.readStringRequireUtf8();
 
               birthday_ = s;
               break;
             }
-            case 11658: {
+            case 10434: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              fAOAMMHOOHL_ = s;
+              hCJGLLHFCMA_ = s;
+              break;
+            }
+            case 11880: {
+
+              keyId_ = input.readUInt32();
+              break;
+            }
+            case 12226: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              jLCDDOJGKKG_ = s;
+              break;
+            }
+            case 13488: {
+
+              jDHCKKAGBNL_ = input.readUInt32();
+              break;
+            }
+            case 13840: {
+
+              mPGMOFLCEOF_ = input.readUInt32();
+              break;
+            }
+            case 14208: {
+
+              cIJPMGMCJBA_ = input.readUInt32();
+              break;
+            }
+            case 14434: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              aDFHNBPGAGM_ = s;
               break;
             }
             default: {
@@ -419,21 +474,162 @@ public final class GetPlayerTokenReqOuterClass {
               emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq.class, emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq.Builder.class);
     }
 
-    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 11;
-    private int accountType_;
+    public static final int HCJGLLHFCMA_FIELD_NUMBER = 1304;
+    private volatile java.lang.Object hCJGLLHFCMA_;
     /**
-     * <code>uint32 account_type = 11;</code>
-     * @return The accountType.
+     * <code>string HCJGLLHFCMA = 1304;</code>
+     * @return The hCJGLLHFCMA.
      */
     @java.lang.Override
-    public int getAccountType() {
-      return accountType_;
+    public java.lang.String getHCJGLLHFCMA() {
+      java.lang.Object ref = hCJGLLHFCMA_;
+      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();
+        hCJGLLHFCMA_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string HCJGLLHFCMA = 1304;</code>
+     * @return The bytes for hCJGLLHFCMA.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getHCJGLLHFCMABytes() {
+      java.lang.Object ref = hCJGLLHFCMA_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        hCJGLLHFCMA_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int ACCOUNT_TOKEN_FIELD_NUMBER = 12;
+    public static final int ONLINE_ID_FIELD_NUMBER = 13;
+    private volatile java.lang.Object onlineId_;
+    /**
+     * <code>string online_id = 13;</code>
+     * @return The onlineId.
+     */
+    @java.lang.Override
+    public java.lang.String getOnlineId() {
+      java.lang.Object ref = onlineId_;
+      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();
+        onlineId_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string online_id = 13;</code>
+     * @return The bytes for onlineId.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOnlineIdBytes() {
+      java.lang.Object ref = onlineId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        onlineId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int BPFIMEKJANE_FIELD_NUMBER = 9;
+    private volatile java.lang.Object bPFIMEKJANE_;
+    /**
+     * <code>string BPFIMEKJANE = 9;</code>
+     * @return The bPFIMEKJANE.
+     */
+    @java.lang.Override
+    public java.lang.String getBPFIMEKJANE() {
+      java.lang.Object ref = bPFIMEKJANE_;
+      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();
+        bPFIMEKJANE_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string BPFIMEKJANE = 9;</code>
+     * @return The bytes for bPFIMEKJANE.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getBPFIMEKJANEBytes() {
+      java.lang.Object ref = bPFIMEKJANE_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        bPFIMEKJANE_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1;
+    private volatile java.lang.Object countryCode_;
+    /**
+     * <code>string country_code = 1;</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();
+        countryCode_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string country_code = 1;</code>
+     * @return The bytes for countryCode.
+     */
+    @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 static final int ACCOUNT_TOKEN_FIELD_NUMBER = 4;
     private volatile java.lang.Object accountToken_;
     /**
-     * <code>string account_token = 12;</code>
+     * <code>string account_token = 4;</code>
      * @return The accountToken.
      */
     @java.lang.Override
@@ -450,7 +646,7 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
     /**
-     * <code>string account_token = 12;</code>
+     * <code>string account_token = 4;</code>
      * @return The bytes for accountToken.
      */
     @java.lang.Override
@@ -506,48 +702,48 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
 
-    public static final int ONLINE_ID_FIELD_NUMBER = 1;
-    private volatile java.lang.Object onlineId_;
+    public static final int JLCDDOJGKKG_FIELD_NUMBER = 1528;
+    private volatile java.lang.Object jLCDDOJGKKG_;
     /**
-     * <code>string online_id = 1;</code>
-     * @return The onlineId.
+     * <code>string JLCDDOJGKKG = 1528;</code>
+     * @return The jLCDDOJGKKG.
      */
     @java.lang.Override
-    public java.lang.String getOnlineId() {
-      java.lang.Object ref = onlineId_;
+    public java.lang.String getJLCDDOJGKKG() {
+      java.lang.Object ref = jLCDDOJGKKG_;
       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();
-        onlineId_ = s;
+        jLCDDOJGKKG_ = s;
         return s;
       }
     }
     /**
-     * <code>string online_id = 1;</code>
-     * @return The bytes for onlineId.
+     * <code>string JLCDDOJGKKG = 1528;</code>
+     * @return The bytes for jLCDDOJGKKG.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getOnlineIdBytes() {
-      java.lang.Object ref = onlineId_;
+        getJLCDDOJGKKGBytes() {
+      java.lang.Object ref = jLCDDOJGKKG_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        onlineId_ = b;
+        jLCDDOJGKKG_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 4;
+    public static final int ACCOUNT_UID_FIELD_NUMBER = 3;
     private volatile java.lang.Object accountUid_;
     /**
-     * <code>string account_uid = 4;</code>
+     * <code>string account_uid = 3;</code>
      * @return The accountUid.
      */
     @java.lang.Override
@@ -564,7 +760,7 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
     /**
-     * <code>string account_uid = 4;</code>
+     * <code>string account_uid = 3;</code>
      * @return The bytes for accountUid.
      */
     @java.lang.Override
@@ -582,337 +778,10 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
 
-    public static final int LODOCFKABDG_FIELD_NUMBER = 3;
-    private volatile java.lang.Object lODOCFKABDG_;
-    /**
-     * <code>string LODOCFKABDG = 3;</code>
-     * @return The lODOCFKABDG.
-     */
-    @java.lang.Override
-    public java.lang.String getLODOCFKABDG() {
-      java.lang.Object ref = lODOCFKABDG_;
-      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();
-        lODOCFKABDG_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string LODOCFKABDG = 3;</code>
-     * @return The bytes for lODOCFKABDG.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getLODOCFKABDGBytes() {
-      java.lang.Object ref = lODOCFKABDG_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        lODOCFKABDG_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int PLATFORM_TYPE_FIELD_NUMBER = 8;
-    private int platformType_;
-    /**
-     * <code>uint32 platform_type = 8;</code>
-     * @return The platformType.
-     */
-    @java.lang.Override
-    public int getPlatformType() {
-      return platformType_;
-    }
-
-    public static final int CLIENT_IP_STR_FIELD_NUMBER = 9;
-    private volatile java.lang.Object clientIpStr_;
-    /**
-     * <code>string client_ip_str = 9;</code>
-     * @return The clientIpStr.
-     */
-    @java.lang.Override
-    public java.lang.String getClientIpStr() {
-      java.lang.Object ref = clientIpStr_;
-      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();
-        clientIpStr_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_ip_str = 9;</code>
-     * @return The bytes for clientIpStr.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientIpStrBytes() {
-      java.lang.Object ref = clientIpStr_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientIpStr_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int SUB_CHANNEL_ID_FIELD_NUMBER = 7;
-    private int subChannelId_;
-    /**
-     * <code>uint32 sub_channel_id = 7;</code>
-     * @return The subChannelId.
-     */
-    @java.lang.Override
-    public int getSubChannelId() {
-      return subChannelId_;
-    }
-
-    public static final int CLOUDCLIENTIP_FIELD_NUMBER = 177;
-    private int cloudClientIp_;
-    /**
-     * <code>uint32 cloudClientIp = 177;</code>
-     * @return The cloudClientIp.
-     */
-    @java.lang.Override
-    public int getCloudClientIp() {
-      return cloudClientIp_;
-    }
-
-    public static final int GIKAFFPKLOE_FIELD_NUMBER = 14;
-    private volatile java.lang.Object gIKAFFPKLOE_;
-    /**
-     * <code>string GIKAFFPKLOE = 14;</code>
-     * @return The gIKAFFPKLOE.
-     */
-    @java.lang.Override
-    public java.lang.String getGIKAFFPKLOE() {
-      java.lang.Object ref = gIKAFFPKLOE_;
-      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();
-        gIKAFFPKLOE_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string GIKAFFPKLOE = 14;</code>
-     * @return The bytes for gIKAFFPKLOE.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getGIKAFFPKLOEBytes() {
-      java.lang.Object ref = gIKAFFPKLOE_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        gIKAFFPKLOE_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int BIRTHDAY_FIELD_NUMBER = 828;
-    private volatile java.lang.Object birthday_;
-    /**
-     * <code>string birthday = 828;</code>
-     * @return The birthday.
-     */
-    @java.lang.Override
-    public java.lang.String getBirthday() {
-      java.lang.Object ref = birthday_;
-      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();
-        birthday_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string birthday = 828;</code>
-     * @return The bytes for birthday.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getBirthdayBytes() {
-      java.lang.Object ref = birthday_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        birthday_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int UID_FIELD_NUMBER = 13;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 13;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
-    public static final int OGNFFAEKDBO_FIELD_NUMBER = 695;
-    private int oGNFFAEKDBO_;
-    /**
-     * <code>uint32 OGNFFAEKDBO = 695;</code>
-     * @return The oGNFFAEKDBO.
-     */
-    @java.lang.Override
-    public int getOGNFFAEKDBO() {
-      return oGNFFAEKDBO_;
-    }
-
-    public static final int KEY_ID_FIELD_NUMBER = 407;
-    private int keyId_;
-    /**
-     * <code>uint32 key_id = 407;</code>
-     * @return The keyId.
-     */
-    @java.lang.Override
-    public int getKeyId() {
-      return keyId_;
-    }
-
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 15;
-    private volatile java.lang.Object countryCode_;
-    /**
-     * <code>string country_code = 15;</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();
-        countryCode_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string country_code = 15;</code>
-     * @return The bytes for countryCode.
-     */
-    @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 static final int CHANNEL_ID_FIELD_NUMBER = 6;
-    private int channelId_;
-    /**
-     * <code>uint32 channel_id = 6;</code>
-     * @return The channelId.
-     */
-    @java.lang.Override
-    public int getChannelId() {
-      return channelId_;
-    }
-
-    public static final int FCPDNLHOBNK_FIELD_NUMBER = 2;
-    private int fCPDNLHOBNK_;
-    /**
-     * <code>uint32 FCPDNLHOBNK = 2;</code>
-     * @return The fCPDNLHOBNK.
-     */
-    @java.lang.Override
-    public int getFCPDNLHOBNK() {
-      return fCPDNLHOBNK_;
-    }
-
-    public static final int IS_GUEST_FIELD_NUMBER = 5;
-    private boolean isGuest_;
-    /**
-     * <code>bool is_guest = 5;</code>
-     * @return The isGuest.
-     */
-    @java.lang.Override
-    public boolean getIsGuest() {
-      return isGuest_;
-    }
-
-    public static final int FAOAMMHOOHL_FIELD_NUMBER = 1457;
-    private volatile java.lang.Object fAOAMMHOOHL_;
-    /**
-     * <code>string FAOAMMHOOHL = 1457;</code>
-     * @return The fAOAMMHOOHL.
-     */
-    @java.lang.Override
-    public java.lang.String getFAOAMMHOOHL() {
-      java.lang.Object ref = fAOAMMHOOHL_;
-      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();
-        fAOAMMHOOHL_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string FAOAMMHOOHL = 1457;</code>
-     * @return The bytes for fAOAMMHOOHL.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getFAOAMMHOOHLBytes() {
-      java.lang.Object ref = fAOAMMHOOHL_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        fAOAMMHOOHL_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int CLIENT_RAND_KEY_FIELD_NUMBER = 355;
+    public static final int CLIENT_RAND_KEY_FIELD_NUMBER = 94;
     private volatile java.lang.Object clientRandKey_;
     /**
-     * <code>string client_rand_key = 355;</code>
+     * <code>string client_rand_key = 94;</code>
      * @return The clientRandKey.
      */
     @java.lang.Override
@@ -929,7 +798,7 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
     /**
-     * <code>string client_rand_key = 355;</code>
+     * <code>string client_rand_key = 94;</code>
      * @return The bytes for clientRandKey.
      */
     @java.lang.Override
@@ -947,6 +816,290 @@ public final class GetPlayerTokenReqOuterClass {
       }
     }
 
+    public static final int BDGFMEIEHOD_FIELD_NUMBER = 5;
+    private volatile java.lang.Object bDGFMEIEHOD_;
+    /**
+     * <code>string BDGFMEIEHOD = 5;</code>
+     * @return The bDGFMEIEHOD.
+     */
+    @java.lang.Override
+    public java.lang.String getBDGFMEIEHOD() {
+      java.lang.Object ref = bDGFMEIEHOD_;
+      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();
+        bDGFMEIEHOD_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string BDGFMEIEHOD = 5;</code>
+     * @return The bytes for bDGFMEIEHOD.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getBDGFMEIEHODBytes() {
+      java.lang.Object ref = bDGFMEIEHOD_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        bDGFMEIEHOD_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int CLIENT_IP_STR_FIELD_NUMBER = 7;
+    private volatile java.lang.Object clientIpStr_;
+    /**
+     * <code>string client_ip_str = 7;</code>
+     * @return The clientIpStr.
+     */
+    @java.lang.Override
+    public java.lang.String getClientIpStr() {
+      java.lang.Object ref = clientIpStr_;
+      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();
+        clientIpStr_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string client_ip_str = 7;</code>
+     * @return The bytes for clientIpStr.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getClientIpStrBytes() {
+      java.lang.Object ref = clientIpStr_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        clientIpStr_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int BIRTHDAY_FIELD_NUMBER = 594;
+    private volatile java.lang.Object birthday_;
+    /**
+     * <code>string birthday = 594;</code>
+     * @return The birthday.
+     */
+    @java.lang.Override
+    public java.lang.String getBirthday() {
+      java.lang.Object ref = birthday_;
+      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();
+        birthday_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string birthday = 594;</code>
+     * @return The bytes for birthday.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getBirthdayBytes() {
+      java.lang.Object ref = birthday_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        birthday_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ADFHNBPGAGM_FIELD_NUMBER = 1804;
+    private volatile java.lang.Object aDFHNBPGAGM_;
+    /**
+     * <code>string ADFHNBPGAGM = 1804;</code>
+     * @return The aDFHNBPGAGM.
+     */
+    @java.lang.Override
+    public java.lang.String getADFHNBPGAGM() {
+      java.lang.Object ref = aDFHNBPGAGM_;
+      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();
+        aDFHNBPGAGM_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string ADFHNBPGAGM = 1804;</code>
+     * @return The bytes for aDFHNBPGAGM.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getADFHNBPGAGMBytes() {
+      java.lang.Object ref = aDFHNBPGAGM_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        aDFHNBPGAGM_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    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 IKKKLHICPMF_FIELD_NUMBER = 12;
+    private int iKKKLHICPMF_;
+    /**
+     * <code>uint32 IKKKLHICPMF = 12;</code>
+     * @return The iKKKLHICPMF.
+     */
+    @java.lang.Override
+    public int getIKKKLHICPMF() {
+      return iKKKLHICPMF_;
+    }
+
+    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 8;
+    private int accountType_;
+    /**
+     * <code>uint32 account_type = 8;</code>
+     * @return The accountType.
+     */
+    @java.lang.Override
+    public int getAccountType() {
+      return accountType_;
+    }
+
+    public static final int OCINFHOJCEA_FIELD_NUMBER = 15;
+    private int oCINFHOJCEA_;
+    /**
+     * <code>uint32 OCINFHOJCEA = 15;</code>
+     * @return The oCINFHOJCEA.
+     */
+    @java.lang.Override
+    public int getOCINFHOJCEA() {
+      return oCINFHOJCEA_;
+    }
+
+    public static final int CIJPMGMCJBA_FIELD_NUMBER = 1776;
+    private int cIJPMGMCJBA_;
+    /**
+     * <code>uint32 CIJPMGMCJBA = 1776;</code>
+     * @return The cIJPMGMCJBA.
+     */
+    @java.lang.Override
+    public int getCIJPMGMCJBA() {
+      return cIJPMGMCJBA_;
+    }
+
+    public static final int UID_FIELD_NUMBER = 6;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 6;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
+    public static final int MPGMOFLCEOF_FIELD_NUMBER = 1730;
+    private int mPGMOFLCEOF_;
+    /**
+     * <code>uint32 MPGMOFLCEOF = 1730;</code>
+     * @return The mPGMOFLCEOF.
+     */
+    @java.lang.Override
+    public int getMPGMOFLCEOF() {
+      return mPGMOFLCEOF_;
+    }
+
+    public static final int IS_GUEST_FIELD_NUMBER = 14;
+    private boolean isGuest_;
+    /**
+     * <code>bool is_guest = 14;</code>
+     * @return The isGuest.
+     */
+    @java.lang.Override
+    public boolean getIsGuest() {
+      return isGuest_;
+    }
+
+    public static final int KODKEFGJHAP_FIELD_NUMBER = 168;
+    private int kODKEFGJHAP_;
+    /**
+     * <code>uint32 KODKEFGJHAP = 168;</code>
+     * @return The kODKEFGJHAP.
+     */
+    @java.lang.Override
+    public int getKODKEFGJHAP() {
+      return kODKEFGJHAP_;
+    }
+
+    public static final int KEY_ID_FIELD_NUMBER = 1485;
+    private int keyId_;
+    /**
+     * <code>uint32 key_id = 1485;</code>
+     * @return The keyId.
+     */
+    @java.lang.Override
+    public int getKeyId() {
+      return keyId_;
+    }
+
+    public static final int KEKHAKAPMIN_FIELD_NUMBER = 11;
+    private int kEKHAKAPMIN_;
+    /**
+     * <code>uint32 KEKHAKAPMIN = 11;</code>
+     * @return The kEKHAKAPMIN.
+     */
+    @java.lang.Override
+    public int getKEKHAKAPMIN() {
+      return kEKHAKAPMIN_;
+    }
+
+    public static final int JDHCKKAGBNL_FIELD_NUMBER = 1686;
+    private int jDHCKKAGBNL_;
+    /**
+     * <code>uint32 JDHCKKAGBNL = 1686;</code>
+     * @return The jDHCKKAGBNL.
+     */
+    @java.lang.Override
+    public int getJDHCKKAGBNL() {
+      return jDHCKKAGBNL_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -961,68 +1114,80 @@ public final class GetPlayerTokenReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, onlineId_);
-      }
-      if (fCPDNLHOBNK_ != 0) {
-        output.writeUInt32(2, fCPDNLHOBNK_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lODOCFKABDG_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, lODOCFKABDG_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, accountUid_);
-      }
-      if (isGuest_ != false) {
-        output.writeBool(5, isGuest_);
-      }
-      if (channelId_ != 0) {
-        output.writeUInt32(6, channelId_);
-      }
-      if (subChannelId_ != 0) {
-        output.writeUInt32(7, subChannelId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1, countryCode_);
       }
       if (platformType_ != 0) {
-        output.writeUInt32(8, platformType_);
+        output.writeUInt32(2, platformType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, accountUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, accountToken_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bDGFMEIEHOD_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, bDGFMEIEHOD_);
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(6, uid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, clientIpStr_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, clientIpStr_);
+      }
+      if (accountType_ != 0) {
+        output.writeUInt32(8, accountType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bPFIMEKJANE_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, bPFIMEKJANE_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 10, psnId_);
       }
-      if (accountType_ != 0) {
-        output.writeUInt32(11, accountType_);
+      if (kEKHAKAPMIN_ != 0) {
+        output.writeUInt32(11, kEKHAKAPMIN_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, accountToken_);
+      if (iKKKLHICPMF_ != 0) {
+        output.writeUInt32(12, iKKKLHICPMF_);
       }
-      if (uid_ != 0) {
-        output.writeUInt32(13, uid_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, onlineId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gIKAFFPKLOE_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, gIKAFFPKLOE_);
+      if (isGuest_ != false) {
+        output.writeBool(14, isGuest_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, countryCode_);
-      }
-      if (cloudClientIp_ != 0) {
-        output.writeUInt32(177, cloudClientIp_);
+      if (oCINFHOJCEA_ != 0) {
+        output.writeUInt32(15, oCINFHOJCEA_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 355, clientRandKey_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 94, clientRandKey_);
       }
-      if (keyId_ != 0) {
-        output.writeUInt32(407, keyId_);
-      }
-      if (oGNFFAEKDBO_ != 0) {
-        output.writeUInt32(695, oGNFFAEKDBO_);
+      if (kODKEFGJHAP_ != 0) {
+        output.writeUInt32(168, kODKEFGJHAP_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 828, birthday_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 594, birthday_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fAOAMMHOOHL_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1457, fAOAMMHOOHL_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hCJGLLHFCMA_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1304, hCJGLLHFCMA_);
+      }
+      if (keyId_ != 0) {
+        output.writeUInt32(1485, keyId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jLCDDOJGKKG_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1528, jLCDDOJGKKG_);
+      }
+      if (jDHCKKAGBNL_ != 0) {
+        output.writeUInt32(1686, jDHCKKAGBNL_);
+      }
+      if (mPGMOFLCEOF_ != 0) {
+        output.writeUInt32(1730, mPGMOFLCEOF_);
+      }
+      if (cIJPMGMCJBA_ != 0) {
+        output.writeUInt32(1776, cIJPMGMCJBA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(aDFHNBPGAGM_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1804, aDFHNBPGAGM_);
       }
       unknownFields.writeTo(output);
     }
@@ -1033,78 +1198,92 @@ public final class GetPlayerTokenReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, onlineId_);
-      }
-      if (fCPDNLHOBNK_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, fCPDNLHOBNK_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lODOCFKABDG_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, lODOCFKABDG_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, accountUid_);
-      }
-      if (isGuest_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isGuest_);
-      }
-      if (channelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, channelId_);
-      }
-      if (subChannelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, subChannelId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, countryCode_);
       }
       if (platformType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, platformType_);
+          .computeUInt32Size(2, platformType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, accountUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, accountToken_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bDGFMEIEHOD_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, bDGFMEIEHOD_);
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, uid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, clientIpStr_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, clientIpStr_);
+      }
+      if (accountType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, accountType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(bPFIMEKJANE_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, bPFIMEKJANE_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, psnId_);
       }
-      if (accountType_ != 0) {
+      if (kEKHAKAPMIN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, accountType_);
+          .computeUInt32Size(11, kEKHAKAPMIN_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountToken_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, accountToken_);
-      }
-      if (uid_ != 0) {
+      if (iKKKLHICPMF_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, uid_);
+          .computeUInt32Size(12, iKKKLHICPMF_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gIKAFFPKLOE_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, gIKAFFPKLOE_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, onlineId_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, countryCode_);
-      }
-      if (cloudClientIp_ != 0) {
+      if (isGuest_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(177, cloudClientIp_);
+          .computeBoolSize(14, isGuest_);
+      }
+      if (oCINFHOJCEA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, oCINFHOJCEA_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientRandKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(355, clientRandKey_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(94, clientRandKey_);
+      }
+      if (kODKEFGJHAP_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(168, kODKEFGJHAP_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(594, birthday_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hCJGLLHFCMA_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1304, hCJGLLHFCMA_);
       }
       if (keyId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(407, keyId_);
+          .computeUInt32Size(1485, keyId_);
       }
-      if (oGNFFAEKDBO_ != 0) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jLCDDOJGKKG_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1528, jLCDDOJGKKG_);
+      }
+      if (jDHCKKAGBNL_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(695, oGNFFAEKDBO_);
+          .computeUInt32Size(1686, jDHCKKAGBNL_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(828, birthday_);
+      if (mPGMOFLCEOF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1730, mPGMOFLCEOF_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fAOAMMHOOHL_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1457, fAOAMMHOOHL_);
+      if (cIJPMGMCJBA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1776, cIJPMGMCJBA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(aDFHNBPGAGM_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1804, aDFHNBPGAGM_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1121,48 +1300,56 @@ public final class GetPlayerTokenReqOuterClass {
       }
       emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq other = (emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq) obj;
 
-      if (getAccountType()
-          != other.getAccountType()) return false;
+      if (!getHCJGLLHFCMA()
+          .equals(other.getHCJGLLHFCMA())) return false;
+      if (!getOnlineId()
+          .equals(other.getOnlineId())) return false;
+      if (!getBPFIMEKJANE()
+          .equals(other.getBPFIMEKJANE())) return false;
+      if (!getCountryCode()
+          .equals(other.getCountryCode())) return false;
       if (!getAccountToken()
           .equals(other.getAccountToken())) return false;
       if (!getPsnId()
           .equals(other.getPsnId())) return false;
-      if (!getOnlineId()
-          .equals(other.getOnlineId())) return false;
+      if (!getJLCDDOJGKKG()
+          .equals(other.getJLCDDOJGKKG())) return false;
       if (!getAccountUid()
           .equals(other.getAccountUid())) return false;
-      if (!getLODOCFKABDG()
-          .equals(other.getLODOCFKABDG())) return false;
-      if (getPlatformType()
-          != other.getPlatformType()) return false;
-      if (!getClientIpStr()
-          .equals(other.getClientIpStr())) return false;
-      if (getSubChannelId()
-          != other.getSubChannelId()) return false;
-      if (getCloudClientIp()
-          != other.getCloudClientIp()) return false;
-      if (!getGIKAFFPKLOE()
-          .equals(other.getGIKAFFPKLOE())) return false;
-      if (!getBirthday()
-          .equals(other.getBirthday())) return false;
-      if (getUid()
-          != other.getUid()) return false;
-      if (getOGNFFAEKDBO()
-          != other.getOGNFFAEKDBO()) return false;
-      if (getKeyId()
-          != other.getKeyId()) return false;
-      if (!getCountryCode()
-          .equals(other.getCountryCode())) return false;
-      if (getChannelId()
-          != other.getChannelId()) return false;
-      if (getFCPDNLHOBNK()
-          != other.getFCPDNLHOBNK()) return false;
-      if (getIsGuest()
-          != other.getIsGuest()) return false;
-      if (!getFAOAMMHOOHL()
-          .equals(other.getFAOAMMHOOHL())) return false;
       if (!getClientRandKey()
           .equals(other.getClientRandKey())) return false;
+      if (!getBDGFMEIEHOD()
+          .equals(other.getBDGFMEIEHOD())) return false;
+      if (!getClientIpStr()
+          .equals(other.getClientIpStr())) return false;
+      if (!getBirthday()
+          .equals(other.getBirthday())) return false;
+      if (!getADFHNBPGAGM()
+          .equals(other.getADFHNBPGAGM())) return false;
+      if (getPlatformType()
+          != other.getPlatformType()) return false;
+      if (getIKKKLHICPMF()
+          != other.getIKKKLHICPMF()) return false;
+      if (getAccountType()
+          != other.getAccountType()) return false;
+      if (getOCINFHOJCEA()
+          != other.getOCINFHOJCEA()) return false;
+      if (getCIJPMGMCJBA()
+          != other.getCIJPMGMCJBA()) return false;
+      if (getUid()
+          != other.getUid()) return false;
+      if (getMPGMOFLCEOF()
+          != other.getMPGMOFLCEOF()) return false;
+      if (getIsGuest()
+          != other.getIsGuest()) return false;
+      if (getKODKEFGJHAP()
+          != other.getKODKEFGJHAP()) return false;
+      if (getKeyId()
+          != other.getKeyId()) return false;
+      if (getKEKHAKAPMIN()
+          != other.getKEKHAKAPMIN()) return false;
+      if (getJDHCKKAGBNL()
+          != other.getJDHCKKAGBNL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1174,49 +1361,57 @@ public final class GetPlayerTokenReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountType();
+      hash = (37 * hash) + HCJGLLHFCMA_FIELD_NUMBER;
+      hash = (53 * hash) + getHCJGLLHFCMA().hashCode();
+      hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOnlineId().hashCode();
+      hash = (37 * hash) + BPFIMEKJANE_FIELD_NUMBER;
+      hash = (53 * hash) + getBPFIMEKJANE().hashCode();
+      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getCountryCode().hashCode();
       hash = (37 * hash) + ACCOUNT_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getAccountToken().hashCode();
       hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPsnId().hashCode();
-      hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOnlineId().hashCode();
+      hash = (37 * hash) + JLCDDOJGKKG_FIELD_NUMBER;
+      hash = (53 * hash) + getJLCDDOJGKKG().hashCode();
       hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
       hash = (53 * hash) + getAccountUid().hashCode();
-      hash = (37 * hash) + LODOCFKABDG_FIELD_NUMBER;
-      hash = (53 * hash) + getLODOCFKABDG().hashCode();
-      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + CLIENT_RAND_KEY_FIELD_NUMBER;
+      hash = (53 * hash) + getClientRandKey().hashCode();
+      hash = (37 * hash) + BDGFMEIEHOD_FIELD_NUMBER;
+      hash = (53 * hash) + getBDGFMEIEHOD().hashCode();
       hash = (37 * hash) + CLIENT_IP_STR_FIELD_NUMBER;
       hash = (53 * hash) + getClientIpStr().hashCode();
-      hash = (37 * hash) + SUB_CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSubChannelId();
-      hash = (37 * hash) + CLOUDCLIENTIP_FIELD_NUMBER;
-      hash = (53 * hash) + getCloudClientIp();
-      hash = (37 * hash) + GIKAFFPKLOE_FIELD_NUMBER;
-      hash = (53 * hash) + getGIKAFFPKLOE().hashCode();
       hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
       hash = (53 * hash) + getBirthday().hashCode();
+      hash = (37 * hash) + ADFHNBPGAGM_FIELD_NUMBER;
+      hash = (53 * hash) + getADFHNBPGAGM().hashCode();
+      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + IKKKLHICPMF_FIELD_NUMBER;
+      hash = (53 * hash) + getIKKKLHICPMF();
+      hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getAccountType();
+      hash = (37 * hash) + OCINFHOJCEA_FIELD_NUMBER;
+      hash = (53 * hash) + getOCINFHOJCEA();
+      hash = (37 * hash) + CIJPMGMCJBA_FIELD_NUMBER;
+      hash = (53 * hash) + getCIJPMGMCJBA();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
-      hash = (37 * hash) + OGNFFAEKDBO_FIELD_NUMBER;
-      hash = (53 * hash) + getOGNFFAEKDBO();
-      hash = (37 * hash) + KEY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getKeyId();
-      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getCountryCode().hashCode();
-      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChannelId();
-      hash = (37 * hash) + FCPDNLHOBNK_FIELD_NUMBER;
-      hash = (53 * hash) + getFCPDNLHOBNK();
+      hash = (37 * hash) + MPGMOFLCEOF_FIELD_NUMBER;
+      hash = (53 * hash) + getMPGMOFLCEOF();
       hash = (37 * hash) + IS_GUEST_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsGuest());
-      hash = (37 * hash) + FAOAMMHOOHL_FIELD_NUMBER;
-      hash = (53 * hash) + getFAOAMMHOOHL().hashCode();
-      hash = (37 * hash) + CLIENT_RAND_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getClientRandKey().hashCode();
+      hash = (37 * hash) + KODKEFGJHAP_FIELD_NUMBER;
+      hash = (53 * hash) + getKODKEFGJHAP();
+      hash = (37 * hash) + KEY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getKeyId();
+      hash = (37 * hash) + KEKHAKAPMIN_FIELD_NUMBER;
+      hash = (53 * hash) + getKEKHAKAPMIN();
+      hash = (37 * hash) + JDHCKKAGBNL_FIELD_NUMBER;
+      hash = (53 * hash) + getJDHCKKAGBNL();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1313,11 +1508,6 @@ public final class GetPlayerTokenReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21228
-     * Obf: AGJHCDNJDOG
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerTokenReq}
      */
     public static final class Builder extends
@@ -1355,47 +1545,55 @@ public final class GetPlayerTokenReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        accountType_ = 0;
+        hCJGLLHFCMA_ = "";
+
+        onlineId_ = "";
+
+        bPFIMEKJANE_ = "";
+
+        countryCode_ = "";
 
         accountToken_ = "";
 
         psnId_ = "";
 
-        onlineId_ = "";
+        jLCDDOJGKKG_ = "";
 
         accountUid_ = "";
 
-        lODOCFKABDG_ = "";
+        clientRandKey_ = "";
 
-        platformType_ = 0;
+        bDGFMEIEHOD_ = "";
 
         clientIpStr_ = "";
 
-        subChannelId_ = 0;
-
-        cloudClientIp_ = 0;
-
-        gIKAFFPKLOE_ = "";
-
         birthday_ = "";
 
+        aDFHNBPGAGM_ = "";
+
+        platformType_ = 0;
+
+        iKKKLHICPMF_ = 0;
+
+        accountType_ = 0;
+
+        oCINFHOJCEA_ = 0;
+
+        cIJPMGMCJBA_ = 0;
+
         uid_ = 0;
 
-        oGNFFAEKDBO_ = 0;
-
-        keyId_ = 0;
-
-        countryCode_ = "";
-
-        channelId_ = 0;
-
-        fCPDNLHOBNK_ = 0;
+        mPGMOFLCEOF_ = 0;
 
         isGuest_ = false;
 
-        fAOAMMHOOHL_ = "";
+        kODKEFGJHAP_ = 0;
 
-        clientRandKey_ = "";
+        keyId_ = 0;
+
+        kEKHAKAPMIN_ = 0;
+
+        jDHCKKAGBNL_ = 0;
 
         return this;
       }
@@ -1423,27 +1621,31 @@ public final class GetPlayerTokenReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq buildPartial() {
         emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq result = new emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq(this);
-        result.accountType_ = accountType_;
+        result.hCJGLLHFCMA_ = hCJGLLHFCMA_;
+        result.onlineId_ = onlineId_;
+        result.bPFIMEKJANE_ = bPFIMEKJANE_;
+        result.countryCode_ = countryCode_;
         result.accountToken_ = accountToken_;
         result.psnId_ = psnId_;
-        result.onlineId_ = onlineId_;
+        result.jLCDDOJGKKG_ = jLCDDOJGKKG_;
         result.accountUid_ = accountUid_;
-        result.lODOCFKABDG_ = lODOCFKABDG_;
-        result.platformType_ = platformType_;
-        result.clientIpStr_ = clientIpStr_;
-        result.subChannelId_ = subChannelId_;
-        result.cloudClientIp_ = cloudClientIp_;
-        result.gIKAFFPKLOE_ = gIKAFFPKLOE_;
-        result.birthday_ = birthday_;
-        result.uid_ = uid_;
-        result.oGNFFAEKDBO_ = oGNFFAEKDBO_;
-        result.keyId_ = keyId_;
-        result.countryCode_ = countryCode_;
-        result.channelId_ = channelId_;
-        result.fCPDNLHOBNK_ = fCPDNLHOBNK_;
-        result.isGuest_ = isGuest_;
-        result.fAOAMMHOOHL_ = fAOAMMHOOHL_;
         result.clientRandKey_ = clientRandKey_;
+        result.bDGFMEIEHOD_ = bDGFMEIEHOD_;
+        result.clientIpStr_ = clientIpStr_;
+        result.birthday_ = birthday_;
+        result.aDFHNBPGAGM_ = aDFHNBPGAGM_;
+        result.platformType_ = platformType_;
+        result.iKKKLHICPMF_ = iKKKLHICPMF_;
+        result.accountType_ = accountType_;
+        result.oCINFHOJCEA_ = oCINFHOJCEA_;
+        result.cIJPMGMCJBA_ = cIJPMGMCJBA_;
+        result.uid_ = uid_;
+        result.mPGMOFLCEOF_ = mPGMOFLCEOF_;
+        result.isGuest_ = isGuest_;
+        result.kODKEFGJHAP_ = kODKEFGJHAP_;
+        result.keyId_ = keyId_;
+        result.kEKHAKAPMIN_ = kEKHAKAPMIN_;
+        result.jDHCKKAGBNL_ = jDHCKKAGBNL_;
         onBuilt();
         return result;
       }
@@ -1492,8 +1694,21 @@ public final class GetPlayerTokenReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq other) {
         if (other == emu.grasscutter.net.proto.GetPlayerTokenReqOuterClass.GetPlayerTokenReq.getDefaultInstance()) return this;
-        if (other.getAccountType() != 0) {
-          setAccountType(other.getAccountType());
+        if (!other.getHCJGLLHFCMA().isEmpty()) {
+          hCJGLLHFCMA_ = other.hCJGLLHFCMA_;
+          onChanged();
+        }
+        if (!other.getOnlineId().isEmpty()) {
+          onlineId_ = other.onlineId_;
+          onChanged();
+        }
+        if (!other.getBPFIMEKJANE().isEmpty()) {
+          bPFIMEKJANE_ = other.bPFIMEKJANE_;
+          onChanged();
+        }
+        if (!other.getCountryCode().isEmpty()) {
+          countryCode_ = other.countryCode_;
+          onChanged();
         }
         if (!other.getAccountToken().isEmpty()) {
           accountToken_ = other.accountToken_;
@@ -1503,68 +1718,69 @@ public final class GetPlayerTokenReqOuterClass {
           psnId_ = other.psnId_;
           onChanged();
         }
-        if (!other.getOnlineId().isEmpty()) {
-          onlineId_ = other.onlineId_;
+        if (!other.getJLCDDOJGKKG().isEmpty()) {
+          jLCDDOJGKKG_ = other.jLCDDOJGKKG_;
           onChanged();
         }
         if (!other.getAccountUid().isEmpty()) {
           accountUid_ = other.accountUid_;
           onChanged();
         }
-        if (!other.getLODOCFKABDG().isEmpty()) {
-          lODOCFKABDG_ = other.lODOCFKABDG_;
+        if (!other.getClientRandKey().isEmpty()) {
+          clientRandKey_ = other.clientRandKey_;
           onChanged();
         }
-        if (other.getPlatformType() != 0) {
-          setPlatformType(other.getPlatformType());
+        if (!other.getBDGFMEIEHOD().isEmpty()) {
+          bDGFMEIEHOD_ = other.bDGFMEIEHOD_;
+          onChanged();
         }
         if (!other.getClientIpStr().isEmpty()) {
           clientIpStr_ = other.clientIpStr_;
           onChanged();
         }
-        if (other.getSubChannelId() != 0) {
-          setSubChannelId(other.getSubChannelId());
-        }
-        if (other.getCloudClientIp() != 0) {
-          setCloudClientIp(other.getCloudClientIp());
-        }
-        if (!other.getGIKAFFPKLOE().isEmpty()) {
-          gIKAFFPKLOE_ = other.gIKAFFPKLOE_;
-          onChanged();
-        }
         if (!other.getBirthday().isEmpty()) {
           birthday_ = other.birthday_;
           onChanged();
         }
+        if (!other.getADFHNBPGAGM().isEmpty()) {
+          aDFHNBPGAGM_ = other.aDFHNBPGAGM_;
+          onChanged();
+        }
+        if (other.getPlatformType() != 0) {
+          setPlatformType(other.getPlatformType());
+        }
+        if (other.getIKKKLHICPMF() != 0) {
+          setIKKKLHICPMF(other.getIKKKLHICPMF());
+        }
+        if (other.getAccountType() != 0) {
+          setAccountType(other.getAccountType());
+        }
+        if (other.getOCINFHOJCEA() != 0) {
+          setOCINFHOJCEA(other.getOCINFHOJCEA());
+        }
+        if (other.getCIJPMGMCJBA() != 0) {
+          setCIJPMGMCJBA(other.getCIJPMGMCJBA());
+        }
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
-        if (other.getOGNFFAEKDBO() != 0) {
-          setOGNFFAEKDBO(other.getOGNFFAEKDBO());
-        }
-        if (other.getKeyId() != 0) {
-          setKeyId(other.getKeyId());
-        }
-        if (!other.getCountryCode().isEmpty()) {
-          countryCode_ = other.countryCode_;
-          onChanged();
-        }
-        if (other.getChannelId() != 0) {
-          setChannelId(other.getChannelId());
-        }
-        if (other.getFCPDNLHOBNK() != 0) {
-          setFCPDNLHOBNK(other.getFCPDNLHOBNK());
+        if (other.getMPGMOFLCEOF() != 0) {
+          setMPGMOFLCEOF(other.getMPGMOFLCEOF());
         }
         if (other.getIsGuest() != false) {
           setIsGuest(other.getIsGuest());
         }
-        if (!other.getFAOAMMHOOHL().isEmpty()) {
-          fAOAMMHOOHL_ = other.fAOAMMHOOHL_;
-          onChanged();
+        if (other.getKODKEFGJHAP() != 0) {
+          setKODKEFGJHAP(other.getKODKEFGJHAP());
         }
-        if (!other.getClientRandKey().isEmpty()) {
-          clientRandKey_ = other.clientRandKey_;
-          onChanged();
+        if (other.getKeyId() != 0) {
+          setKeyId(other.getKeyId());
+        }
+        if (other.getKEKHAKAPMIN() != 0) {
+          setKEKHAKAPMIN(other.getKEKHAKAPMIN());
+        }
+        if (other.getJDHCKKAGBNL() != 0) {
+          setJDHCKKAGBNL(other.getJDHCKKAGBNL());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1595,40 +1811,313 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
 
-      private int accountType_ ;
+      private java.lang.Object hCJGLLHFCMA_ = "";
       /**
-       * <code>uint32 account_type = 11;</code>
-       * @return The accountType.
+       * <code>string HCJGLLHFCMA = 1304;</code>
+       * @return The hCJGLLHFCMA.
        */
-      @java.lang.Override
-      public int getAccountType() {
-        return accountType_;
+      public java.lang.String getHCJGLLHFCMA() {
+        java.lang.Object ref = hCJGLLHFCMA_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          hCJGLLHFCMA_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 account_type = 11;</code>
-       * @param value The accountType to set.
+       * <code>string HCJGLLHFCMA = 1304;</code>
+       * @return The bytes for hCJGLLHFCMA.
+       */
+      public com.google.protobuf.ByteString
+          getHCJGLLHFCMABytes() {
+        java.lang.Object ref = hCJGLLHFCMA_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          hCJGLLHFCMA_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string HCJGLLHFCMA = 1304;</code>
+       * @param value The hCJGLLHFCMA to set.
        * @return This builder for chaining.
        */
-      public Builder setAccountType(int value) {
-        
-        accountType_ = value;
+      public Builder setHCJGLLHFCMA(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        hCJGLLHFCMA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 account_type = 11;</code>
+       * <code>string HCJGLLHFCMA = 1304;</code>
        * @return This builder for chaining.
        */
-      public Builder clearAccountType() {
+      public Builder clearHCJGLLHFCMA() {
         
-        accountType_ = 0;
+        hCJGLLHFCMA_ = getDefaultInstance().getHCJGLLHFCMA();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string HCJGLLHFCMA = 1304;</code>
+       * @param value The bytes for hCJGLLHFCMA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHCJGLLHFCMABytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        hCJGLLHFCMA_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object onlineId_ = "";
+      /**
+       * <code>string online_id = 13;</code>
+       * @return The onlineId.
+       */
+      public java.lang.String getOnlineId() {
+        java.lang.Object ref = onlineId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          onlineId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string online_id = 13;</code>
+       * @return The bytes for onlineId.
+       */
+      public com.google.protobuf.ByteString
+          getOnlineIdBytes() {
+        java.lang.Object ref = onlineId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          onlineId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string online_id = 13;</code>
+       * @param value The onlineId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOnlineId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        onlineId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string online_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOnlineId() {
+        
+        onlineId_ = getDefaultInstance().getOnlineId();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string online_id = 13;</code>
+       * @param value The bytes for onlineId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOnlineIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        onlineId_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object bPFIMEKJANE_ = "";
+      /**
+       * <code>string BPFIMEKJANE = 9;</code>
+       * @return The bPFIMEKJANE.
+       */
+      public java.lang.String getBPFIMEKJANE() {
+        java.lang.Object ref = bPFIMEKJANE_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          bPFIMEKJANE_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string BPFIMEKJANE = 9;</code>
+       * @return The bytes for bPFIMEKJANE.
+       */
+      public com.google.protobuf.ByteString
+          getBPFIMEKJANEBytes() {
+        java.lang.Object ref = bPFIMEKJANE_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          bPFIMEKJANE_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string BPFIMEKJANE = 9;</code>
+       * @param value The bPFIMEKJANE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBPFIMEKJANE(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        bPFIMEKJANE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string BPFIMEKJANE = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBPFIMEKJANE() {
+        
+        bPFIMEKJANE_ = getDefaultInstance().getBPFIMEKJANE();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string BPFIMEKJANE = 9;</code>
+       * @param value The bytes for bPFIMEKJANE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBPFIMEKJANEBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        bPFIMEKJANE_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object countryCode_ = "";
+      /**
+       * <code>string country_code = 1;</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();
+          countryCode_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string country_code = 1;</code>
+       * @return The bytes for countryCode.
+       */
+      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>string country_code = 1;</code>
+       * @param value The countryCode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountryCode(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        countryCode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string country_code = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCountryCode() {
+        
+        countryCode_ = getDefaultInstance().getCountryCode();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string country_code = 1;</code>
+       * @param value The bytes for countryCode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountryCodeBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        countryCode_ = value;
         onChanged();
         return this;
       }
 
       private java.lang.Object accountToken_ = "";
       /**
-       * <code>string account_token = 12;</code>
+       * <code>string account_token = 4;</code>
        * @return The accountToken.
        */
       public java.lang.String getAccountToken() {
@@ -1644,7 +2133,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string account_token = 12;</code>
+       * <code>string account_token = 4;</code>
        * @return The bytes for accountToken.
        */
       public com.google.protobuf.ByteString
@@ -1661,7 +2150,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string account_token = 12;</code>
+       * <code>string account_token = 4;</code>
        * @param value The accountToken to set.
        * @return This builder for chaining.
        */
@@ -1676,7 +2165,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string account_token = 12;</code>
+       * <code>string account_token = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountToken() {
@@ -1686,7 +2175,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string account_token = 12;</code>
+       * <code>string account_token = 4;</code>
        * @param value The bytes for accountToken to set.
        * @return This builder for chaining.
        */
@@ -1778,85 +2267,85 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
 
-      private java.lang.Object onlineId_ = "";
+      private java.lang.Object jLCDDOJGKKG_ = "";
       /**
-       * <code>string online_id = 1;</code>
-       * @return The onlineId.
+       * <code>string JLCDDOJGKKG = 1528;</code>
+       * @return The jLCDDOJGKKG.
        */
-      public java.lang.String getOnlineId() {
-        java.lang.Object ref = onlineId_;
+      public java.lang.String getJLCDDOJGKKG() {
+        java.lang.Object ref = jLCDDOJGKKG_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          onlineId_ = s;
+          jLCDDOJGKKG_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string online_id = 1;</code>
-       * @return The bytes for onlineId.
+       * <code>string JLCDDOJGKKG = 1528;</code>
+       * @return The bytes for jLCDDOJGKKG.
        */
       public com.google.protobuf.ByteString
-          getOnlineIdBytes() {
-        java.lang.Object ref = onlineId_;
+          getJLCDDOJGKKGBytes() {
+        java.lang.Object ref = jLCDDOJGKKG_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          onlineId_ = b;
+          jLCDDOJGKKG_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string online_id = 1;</code>
-       * @param value The onlineId to set.
+       * <code>string JLCDDOJGKKG = 1528;</code>
+       * @param value The jLCDDOJGKKG to set.
        * @return This builder for chaining.
        */
-      public Builder setOnlineId(
+      public Builder setJLCDDOJGKKG(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        onlineId_ = value;
+        jLCDDOJGKKG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string online_id = 1;</code>
+       * <code>string JLCDDOJGKKG = 1528;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOnlineId() {
+      public Builder clearJLCDDOJGKKG() {
         
-        onlineId_ = getDefaultInstance().getOnlineId();
+        jLCDDOJGKKG_ = getDefaultInstance().getJLCDDOJGKKG();
         onChanged();
         return this;
       }
       /**
-       * <code>string online_id = 1;</code>
-       * @param value The bytes for onlineId to set.
+       * <code>string JLCDDOJGKKG = 1528;</code>
+       * @param value The bytes for jLCDDOJGKKG to set.
        * @return This builder for chaining.
        */
-      public Builder setOnlineIdBytes(
+      public Builder setJLCDDOJGKKGBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        onlineId_ = value;
+        jLCDDOJGKKG_ = value;
         onChanged();
         return this;
       }
 
       private java.lang.Object accountUid_ = "";
       /**
-       * <code>string account_uid = 4;</code>
+       * <code>string account_uid = 3;</code>
        * @return The accountUid.
        */
       public java.lang.String getAccountUid() {
@@ -1872,7 +2361,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string account_uid = 4;</code>
+       * <code>string account_uid = 3;</code>
        * @return The bytes for accountUid.
        */
       public com.google.protobuf.ByteString
@@ -1889,7 +2378,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string account_uid = 4;</code>
+       * <code>string account_uid = 3;</code>
        * @param value The accountUid to set.
        * @return This builder for chaining.
        */
@@ -1904,7 +2393,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string account_uid = 4;</code>
+       * <code>string account_uid = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountUid() {
@@ -1914,7 +2403,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string account_uid = 4;</code>
+       * <code>string account_uid = 3;</code>
        * @param value The bytes for accountUid to set.
        * @return This builder for chaining.
        */
@@ -1930,744 +2419,9 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
 
-      private java.lang.Object lODOCFKABDG_ = "";
-      /**
-       * <code>string LODOCFKABDG = 3;</code>
-       * @return The lODOCFKABDG.
-       */
-      public java.lang.String getLODOCFKABDG() {
-        java.lang.Object ref = lODOCFKABDG_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          lODOCFKABDG_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string LODOCFKABDG = 3;</code>
-       * @return The bytes for lODOCFKABDG.
-       */
-      public com.google.protobuf.ByteString
-          getLODOCFKABDGBytes() {
-        java.lang.Object ref = lODOCFKABDG_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          lODOCFKABDG_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string LODOCFKABDG = 3;</code>
-       * @param value The lODOCFKABDG to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLODOCFKABDG(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        lODOCFKABDG_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string LODOCFKABDG = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLODOCFKABDG() {
-        
-        lODOCFKABDG_ = getDefaultInstance().getLODOCFKABDG();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string LODOCFKABDG = 3;</code>
-       * @param value The bytes for lODOCFKABDG to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLODOCFKABDGBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        lODOCFKABDG_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int platformType_ ;
-      /**
-       * <code>uint32 platform_type = 8;</code>
-       * @return The platformType.
-       */
-      @java.lang.Override
-      public int getPlatformType() {
-        return platformType_;
-      }
-      /**
-       * <code>uint32 platform_type = 8;</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 = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlatformType() {
-        
-        platformType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientIpStr_ = "";
-      /**
-       * <code>string client_ip_str = 9;</code>
-       * @return The clientIpStr.
-       */
-      public java.lang.String getClientIpStr() {
-        java.lang.Object ref = clientIpStr_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientIpStr_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_ip_str = 9;</code>
-       * @return The bytes for clientIpStr.
-       */
-      public com.google.protobuf.ByteString
-          getClientIpStrBytes() {
-        java.lang.Object ref = clientIpStr_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientIpStr_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_ip_str = 9;</code>
-       * @param value The clientIpStr to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientIpStr(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientIpStr_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_ip_str = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientIpStr() {
-        
-        clientIpStr_ = getDefaultInstance().getClientIpStr();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_ip_str = 9;</code>
-       * @param value The bytes for clientIpStr to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientIpStrBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientIpStr_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int subChannelId_ ;
-      /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @return The subChannelId.
-       */
-      @java.lang.Override
-      public int getSubChannelId() {
-        return subChannelId_;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @param value The subChannelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSubChannelId(int value) {
-        
-        subChannelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSubChannelId() {
-        
-        subChannelId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int cloudClientIp_ ;
-      /**
-       * <code>uint32 cloudClientIp = 177;</code>
-       * @return The cloudClientIp.
-       */
-      @java.lang.Override
-      public int getCloudClientIp() {
-        return cloudClientIp_;
-      }
-      /**
-       * <code>uint32 cloudClientIp = 177;</code>
-       * @param value The cloudClientIp to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCloudClientIp(int value) {
-        
-        cloudClientIp_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cloudClientIp = 177;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCloudClientIp() {
-        
-        cloudClientIp_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object gIKAFFPKLOE_ = "";
-      /**
-       * <code>string GIKAFFPKLOE = 14;</code>
-       * @return The gIKAFFPKLOE.
-       */
-      public java.lang.String getGIKAFFPKLOE() {
-        java.lang.Object ref = gIKAFFPKLOE_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          gIKAFFPKLOE_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string GIKAFFPKLOE = 14;</code>
-       * @return The bytes for gIKAFFPKLOE.
-       */
-      public com.google.protobuf.ByteString
-          getGIKAFFPKLOEBytes() {
-        java.lang.Object ref = gIKAFFPKLOE_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          gIKAFFPKLOE_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string GIKAFFPKLOE = 14;</code>
-       * @param value The gIKAFFPKLOE to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGIKAFFPKLOE(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        gIKAFFPKLOE_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string GIKAFFPKLOE = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGIKAFFPKLOE() {
-        
-        gIKAFFPKLOE_ = getDefaultInstance().getGIKAFFPKLOE();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string GIKAFFPKLOE = 14;</code>
-       * @param value The bytes for gIKAFFPKLOE to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGIKAFFPKLOEBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        gIKAFFPKLOE_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object birthday_ = "";
-      /**
-       * <code>string birthday = 828;</code>
-       * @return The birthday.
-       */
-      public java.lang.String getBirthday() {
-        java.lang.Object ref = birthday_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          birthday_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 828;</code>
-       * @return The bytes for birthday.
-       */
-      public com.google.protobuf.ByteString
-          getBirthdayBytes() {
-        java.lang.Object ref = birthday_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          birthday_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 828;</code>
-       * @param value The birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthday(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 828;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBirthday() {
-        
-        birthday_ = getDefaultInstance().getBirthday();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 828;</code>
-       * @param value The bytes for birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthdayBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 13;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 13;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int oGNFFAEKDBO_ ;
-      /**
-       * <code>uint32 OGNFFAEKDBO = 695;</code>
-       * @return The oGNFFAEKDBO.
-       */
-      @java.lang.Override
-      public int getOGNFFAEKDBO() {
-        return oGNFFAEKDBO_;
-      }
-      /**
-       * <code>uint32 OGNFFAEKDBO = 695;</code>
-       * @param value The oGNFFAEKDBO to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOGNFFAEKDBO(int value) {
-        
-        oGNFFAEKDBO_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 OGNFFAEKDBO = 695;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOGNFFAEKDBO() {
-        
-        oGNFFAEKDBO_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int keyId_ ;
-      /**
-       * <code>uint32 key_id = 407;</code>
-       * @return The keyId.
-       */
-      @java.lang.Override
-      public int getKeyId() {
-        return keyId_;
-      }
-      /**
-       * <code>uint32 key_id = 407;</code>
-       * @param value The keyId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKeyId(int value) {
-        
-        keyId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 key_id = 407;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKeyId() {
-        
-        keyId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object countryCode_ = "";
-      /**
-       * <code>string country_code = 15;</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();
-          countryCode_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string country_code = 15;</code>
-       * @return The bytes for countryCode.
-       */
-      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>string country_code = 15;</code>
-       * @param value The countryCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountryCode(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        countryCode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string country_code = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCountryCode() {
-        
-        countryCode_ = getDefaultInstance().getCountryCode();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string country_code = 15;</code>
-       * @param value The bytes for countryCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountryCodeBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        countryCode_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int channelId_ ;
-      /**
-       * <code>uint32 channel_id = 6;</code>
-       * @return The channelId.
-       */
-      @java.lang.Override
-      public int getChannelId() {
-        return channelId_;
-      }
-      /**
-       * <code>uint32 channel_id = 6;</code>
-       * @param value The channelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChannelId(int value) {
-        
-        channelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 channel_id = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChannelId() {
-        
-        channelId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int fCPDNLHOBNK_ ;
-      /**
-       * <code>uint32 FCPDNLHOBNK = 2;</code>
-       * @return The fCPDNLHOBNK.
-       */
-      @java.lang.Override
-      public int getFCPDNLHOBNK() {
-        return fCPDNLHOBNK_;
-      }
-      /**
-       * <code>uint32 FCPDNLHOBNK = 2;</code>
-       * @param value The fCPDNLHOBNK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFCPDNLHOBNK(int value) {
-        
-        fCPDNLHOBNK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 FCPDNLHOBNK = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFCPDNLHOBNK() {
-        
-        fCPDNLHOBNK_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isGuest_ ;
-      /**
-       * <code>bool is_guest = 5;</code>
-       * @return The isGuest.
-       */
-      @java.lang.Override
-      public boolean getIsGuest() {
-        return isGuest_;
-      }
-      /**
-       * <code>bool is_guest = 5;</code>
-       * @param value The isGuest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsGuest(boolean value) {
-        
-        isGuest_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_guest = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsGuest() {
-        
-        isGuest_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object fAOAMMHOOHL_ = "";
-      /**
-       * <code>string FAOAMMHOOHL = 1457;</code>
-       * @return The fAOAMMHOOHL.
-       */
-      public java.lang.String getFAOAMMHOOHL() {
-        java.lang.Object ref = fAOAMMHOOHL_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          fAOAMMHOOHL_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string FAOAMMHOOHL = 1457;</code>
-       * @return The bytes for fAOAMMHOOHL.
-       */
-      public com.google.protobuf.ByteString
-          getFAOAMMHOOHLBytes() {
-        java.lang.Object ref = fAOAMMHOOHL_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          fAOAMMHOOHL_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string FAOAMMHOOHL = 1457;</code>
-       * @param value The fAOAMMHOOHL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFAOAMMHOOHL(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        fAOAMMHOOHL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string FAOAMMHOOHL = 1457;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFAOAMMHOOHL() {
-        
-        fAOAMMHOOHL_ = getDefaultInstance().getFAOAMMHOOHL();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string FAOAMMHOOHL = 1457;</code>
-       * @param value The bytes for fAOAMMHOOHL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFAOAMMHOOHLBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        fAOAMMHOOHL_ = value;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object clientRandKey_ = "";
       /**
-       * <code>string client_rand_key = 355;</code>
+       * <code>string client_rand_key = 94;</code>
        * @return The clientRandKey.
        */
       public java.lang.String getClientRandKey() {
@@ -2683,7 +2437,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string client_rand_key = 355;</code>
+       * <code>string client_rand_key = 94;</code>
        * @return The bytes for clientRandKey.
        */
       public com.google.protobuf.ByteString
@@ -2700,7 +2454,7 @@ public final class GetPlayerTokenReqOuterClass {
         }
       }
       /**
-       * <code>string client_rand_key = 355;</code>
+       * <code>string client_rand_key = 94;</code>
        * @param value The clientRandKey to set.
        * @return This builder for chaining.
        */
@@ -2715,7 +2469,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string client_rand_key = 355;</code>
+       * <code>string client_rand_key = 94;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientRandKey() {
@@ -2725,7 +2479,7 @@ public final class GetPlayerTokenReqOuterClass {
         return this;
       }
       /**
-       * <code>string client_rand_key = 355;</code>
+       * <code>string client_rand_key = 94;</code>
        * @param value The bytes for clientRandKey to set.
        * @return This builder for chaining.
        */
@@ -2740,6 +2494,682 @@ public final class GetPlayerTokenReqOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object bDGFMEIEHOD_ = "";
+      /**
+       * <code>string BDGFMEIEHOD = 5;</code>
+       * @return The bDGFMEIEHOD.
+       */
+      public java.lang.String getBDGFMEIEHOD() {
+        java.lang.Object ref = bDGFMEIEHOD_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          bDGFMEIEHOD_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string BDGFMEIEHOD = 5;</code>
+       * @return The bytes for bDGFMEIEHOD.
+       */
+      public com.google.protobuf.ByteString
+          getBDGFMEIEHODBytes() {
+        java.lang.Object ref = bDGFMEIEHOD_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          bDGFMEIEHOD_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string BDGFMEIEHOD = 5;</code>
+       * @param value The bDGFMEIEHOD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBDGFMEIEHOD(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        bDGFMEIEHOD_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string BDGFMEIEHOD = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBDGFMEIEHOD() {
+        
+        bDGFMEIEHOD_ = getDefaultInstance().getBDGFMEIEHOD();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string BDGFMEIEHOD = 5;</code>
+       * @param value The bytes for bDGFMEIEHOD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBDGFMEIEHODBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        bDGFMEIEHOD_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object clientIpStr_ = "";
+      /**
+       * <code>string client_ip_str = 7;</code>
+       * @return The clientIpStr.
+       */
+      public java.lang.String getClientIpStr() {
+        java.lang.Object ref = clientIpStr_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          clientIpStr_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string client_ip_str = 7;</code>
+       * @return The bytes for clientIpStr.
+       */
+      public com.google.protobuf.ByteString
+          getClientIpStrBytes() {
+        java.lang.Object ref = clientIpStr_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          clientIpStr_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string client_ip_str = 7;</code>
+       * @param value The clientIpStr to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientIpStr(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientIpStr_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_ip_str = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientIpStr() {
+        
+        clientIpStr_ = getDefaultInstance().getClientIpStr();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_ip_str = 7;</code>
+       * @param value The bytes for clientIpStr to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientIpStrBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        clientIpStr_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object birthday_ = "";
+      /**
+       * <code>string birthday = 594;</code>
+       * @return The birthday.
+       */
+      public java.lang.String getBirthday() {
+        java.lang.Object ref = birthday_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          birthday_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 594;</code>
+       * @return The bytes for birthday.
+       */
+      public com.google.protobuf.ByteString
+          getBirthdayBytes() {
+        java.lang.Object ref = birthday_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          birthday_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 594;</code>
+       * @param value The birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthday(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 594;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBirthday() {
+        
+        birthday_ = getDefaultInstance().getBirthday();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 594;</code>
+       * @param value The bytes for birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthdayBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object aDFHNBPGAGM_ = "";
+      /**
+       * <code>string ADFHNBPGAGM = 1804;</code>
+       * @return The aDFHNBPGAGM.
+       */
+      public java.lang.String getADFHNBPGAGM() {
+        java.lang.Object ref = aDFHNBPGAGM_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          aDFHNBPGAGM_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string ADFHNBPGAGM = 1804;</code>
+       * @return The bytes for aDFHNBPGAGM.
+       */
+      public com.google.protobuf.ByteString
+          getADFHNBPGAGMBytes() {
+        java.lang.Object ref = aDFHNBPGAGM_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          aDFHNBPGAGM_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string ADFHNBPGAGM = 1804;</code>
+       * @param value The aDFHNBPGAGM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setADFHNBPGAGM(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        aDFHNBPGAGM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string ADFHNBPGAGM = 1804;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearADFHNBPGAGM() {
+        
+        aDFHNBPGAGM_ = getDefaultInstance().getADFHNBPGAGM();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string ADFHNBPGAGM = 1804;</code>
+       * @param value The bytes for aDFHNBPGAGM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setADFHNBPGAGMBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        aDFHNBPGAGM_ = value;
+        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 iKKKLHICPMF_ ;
+      /**
+       * <code>uint32 IKKKLHICPMF = 12;</code>
+       * @return The iKKKLHICPMF.
+       */
+      @java.lang.Override
+      public int getIKKKLHICPMF() {
+        return iKKKLHICPMF_;
+      }
+      /**
+       * <code>uint32 IKKKLHICPMF = 12;</code>
+       * @param value The iKKKLHICPMF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIKKKLHICPMF(int value) {
+        
+        iKKKLHICPMF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IKKKLHICPMF = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIKKKLHICPMF() {
+        
+        iKKKLHICPMF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int accountType_ ;
+      /**
+       * <code>uint32 account_type = 8;</code>
+       * @return The accountType.
+       */
+      @java.lang.Override
+      public int getAccountType() {
+        return accountType_;
+      }
+      /**
+       * <code>uint32 account_type = 8;</code>
+       * @param value The accountType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountType(int value) {
+        
+        accountType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 account_type = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAccountType() {
+        
+        accountType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oCINFHOJCEA_ ;
+      /**
+       * <code>uint32 OCINFHOJCEA = 15;</code>
+       * @return The oCINFHOJCEA.
+       */
+      @java.lang.Override
+      public int getOCINFHOJCEA() {
+        return oCINFHOJCEA_;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 15;</code>
+       * @param value The oCINFHOJCEA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOCINFHOJCEA(int value) {
+        
+        oCINFHOJCEA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOCINFHOJCEA() {
+        
+        oCINFHOJCEA_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cIJPMGMCJBA_ ;
+      /**
+       * <code>uint32 CIJPMGMCJBA = 1776;</code>
+       * @return The cIJPMGMCJBA.
+       */
+      @java.lang.Override
+      public int getCIJPMGMCJBA() {
+        return cIJPMGMCJBA_;
+      }
+      /**
+       * <code>uint32 CIJPMGMCJBA = 1776;</code>
+       * @param value The cIJPMGMCJBA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCIJPMGMCJBA(int value) {
+        
+        cIJPMGMCJBA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 CIJPMGMCJBA = 1776;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCIJPMGMCJBA() {
+        
+        cIJPMGMCJBA_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 6;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 6;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mPGMOFLCEOF_ ;
+      /**
+       * <code>uint32 MPGMOFLCEOF = 1730;</code>
+       * @return The mPGMOFLCEOF.
+       */
+      @java.lang.Override
+      public int getMPGMOFLCEOF() {
+        return mPGMOFLCEOF_;
+      }
+      /**
+       * <code>uint32 MPGMOFLCEOF = 1730;</code>
+       * @param value The mPGMOFLCEOF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMPGMOFLCEOF(int value) {
+        
+        mPGMOFLCEOF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MPGMOFLCEOF = 1730;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMPGMOFLCEOF() {
+        
+        mPGMOFLCEOF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isGuest_ ;
+      /**
+       * <code>bool is_guest = 14;</code>
+       * @return The isGuest.
+       */
+      @java.lang.Override
+      public boolean getIsGuest() {
+        return isGuest_;
+      }
+      /**
+       * <code>bool is_guest = 14;</code>
+       * @param value The isGuest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsGuest(boolean value) {
+        
+        isGuest_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_guest = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsGuest() {
+        
+        isGuest_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int kODKEFGJHAP_ ;
+      /**
+       * <code>uint32 KODKEFGJHAP = 168;</code>
+       * @return The kODKEFGJHAP.
+       */
+      @java.lang.Override
+      public int getKODKEFGJHAP() {
+        return kODKEFGJHAP_;
+      }
+      /**
+       * <code>uint32 KODKEFGJHAP = 168;</code>
+       * @param value The kODKEFGJHAP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKODKEFGJHAP(int value) {
+        
+        kODKEFGJHAP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KODKEFGJHAP = 168;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKODKEFGJHAP() {
+        
+        kODKEFGJHAP_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int keyId_ ;
+      /**
+       * <code>uint32 key_id = 1485;</code>
+       * @return The keyId.
+       */
+      @java.lang.Override
+      public int getKeyId() {
+        return keyId_;
+      }
+      /**
+       * <code>uint32 key_id = 1485;</code>
+       * @param value The keyId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKeyId(int value) {
+        
+        keyId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 key_id = 1485;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKeyId() {
+        
+        keyId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kEKHAKAPMIN_ ;
+      /**
+       * <code>uint32 KEKHAKAPMIN = 11;</code>
+       * @return The kEKHAKAPMIN.
+       */
+      @java.lang.Override
+      public int getKEKHAKAPMIN() {
+        return kEKHAKAPMIN_;
+      }
+      /**
+       * <code>uint32 KEKHAKAPMIN = 11;</code>
+       * @param value The kEKHAKAPMIN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKEKHAKAPMIN(int value) {
+        
+        kEKHAKAPMIN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KEKHAKAPMIN = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKEKHAKAPMIN() {
+        
+        kEKHAKAPMIN_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int jDHCKKAGBNL_ ;
+      /**
+       * <code>uint32 JDHCKKAGBNL = 1686;</code>
+       * @return The jDHCKKAGBNL.
+       */
+      @java.lang.Override
+      public int getJDHCKKAGBNL() {
+        return jDHCKKAGBNL_;
+      }
+      /**
+       * <code>uint32 JDHCKKAGBNL = 1686;</code>
+       * @param value The jDHCKKAGBNL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJDHCKKAGBNL(int value) {
+        
+        jDHCKKAGBNL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 JDHCKKAGBNL = 1686;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJDHCKKAGBNL() {
+        
+        jDHCKKAGBNL_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2807,20 +3237,22 @@ public final class GetPlayerTokenReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027GetPlayerTokenReq.proto\"\310\003\n\021GetPlayerT" +
-      "okenReq\022\024\n\014account_type\030\013 \001(\r\022\025\n\raccount" +
-      "_token\030\014 \001(\t\022\016\n\006psn_id\030\n \001(\t\022\021\n\tonline_i" +
-      "d\030\001 \001(\t\022\023\n\013account_uid\030\004 \001(\t\022\023\n\013LODOCFKA" +
-      "BDG\030\003 \001(\t\022\025\n\rplatform_type\030\010 \001(\r\022\025\n\rclie" +
-      "nt_ip_str\030\t \001(\t\022\026\n\016sub_channel_id\030\007 \001(\r\022" +
-      "\026\n\rcloudClientIp\030\261\001 \001(\r\022\023\n\013GIKAFFPKLOE\030\016" +
-      " \001(\t\022\021\n\010birthday\030\274\006 \001(\t\022\013\n\003uid\030\r \001(\r\022\024\n\013" +
-      "OGNFFAEKDBO\030\267\005 \001(\r\022\017\n\006key_id\030\227\003 \001(\r\022\024\n\014c" +
-      "ountry_code\030\017 \001(\t\022\022\n\nchannel_id\030\006 \001(\r\022\023\n" +
-      "\013FCPDNLHOBNK\030\002 \001(\r\022\020\n\010is_guest\030\005 \001(\010\022\024\n\013" +
-      "FAOAMMHOOHL\030\261\013 \001(\t\022\030\n\017client_rand_key\030\343\002" +
-      " \001(\tB\033\n\031emu.grasscutter.net.protob\006proto" +
-      "3"
+      "\n\027GetPlayerTokenReq.proto\"\233\004\n\021GetPlayerT" +
+      "okenReq\022\024\n\013HCJGLLHFCMA\030\230\n \001(\t\022\021\n\tonline_" +
+      "id\030\r \001(\t\022\023\n\013BPFIMEKJANE\030\t \001(\t\022\024\n\014country" +
+      "_code\030\001 \001(\t\022\025\n\raccount_token\030\004 \001(\t\022\016\n\006ps" +
+      "n_id\030\n \001(\t\022\024\n\013JLCDDOJGKKG\030\370\013 \001(\t\022\023\n\013acco" +
+      "unt_uid\030\003 \001(\t\022\027\n\017client_rand_key\030^ \001(\t\022\023" +
+      "\n\013BDGFMEIEHOD\030\005 \001(\t\022\025\n\rclient_ip_str\030\007 \001" +
+      "(\t\022\021\n\010birthday\030\322\004 \001(\t\022\024\n\013ADFHNBPGAGM\030\214\016 " +
+      "\001(\t\022\025\n\rplatform_type\030\002 \001(\r\022\023\n\013IKKKLHICPM" +
+      "F\030\014 \001(\r\022\024\n\014account_type\030\010 \001(\r\022\023\n\013OCINFHO" +
+      "JCEA\030\017 \001(\r\022\024\n\013CIJPMGMCJBA\030\360\r \001(\r\022\013\n\003uid\030" +
+      "\006 \001(\r\022\024\n\013MPGMOFLCEOF\030\302\r \001(\r\022\020\n\010is_guest\030" +
+      "\016 \001(\010\022\024\n\013KODKEFGJHAP\030\250\001 \001(\r\022\017\n\006key_id\030\315\013" +
+      " \001(\r\022\023\n\013KEKHAKAPMIN\030\013 \001(\r\022\024\n\013JDHCKKAGBNL" +
+      "\030\226\r \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2831,7 +3263,7 @@ public final class GetPlayerTokenReqOuterClass {
     internal_static_GetPlayerTokenReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerTokenReq_descriptor,
-        new java.lang.String[] { "AccountType", "AccountToken", "PsnId", "OnlineId", "AccountUid", "LODOCFKABDG", "PlatformType", "ClientIpStr", "SubChannelId", "CloudClientIp", "GIKAFFPKLOE", "Birthday", "Uid", "OGNFFAEKDBO", "KeyId", "CountryCode", "ChannelId", "FCPDNLHOBNK", "IsGuest", "FAOAMMHOOHL", "ClientRandKey", });
+        new java.lang.String[] { "HCJGLLHFCMA", "OnlineId", "BPFIMEKJANE", "CountryCode", "AccountToken", "PsnId", "JLCDDOJGKKG", "AccountUid", "ClientRandKey", "BDGFMEIEHOD", "ClientIpStr", "Birthday", "ADFHNBPGAGM", "PlatformType", "IKKKLHICPMF", "AccountType", "OCINFHOJCEA", "CIJPMGMCJBA", "Uid", "MPGMOFLCEOF", "IsGuest", "KODKEFGJHAP", "KeyId", "KEKHAKAPMIN", "JDHCKKAGBNL", });
   }
 
   // @@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 35a1e720a..b1f559a37 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetPlayerTokenRspOuterClass.java
@@ -19,289 +19,346 @@ public final class GetPlayerTokenRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool PELBMOHDKHJ = 1292;</code>
-     * @return The pELBMOHDKHJ.
+     * <code>int32 retcode = 1;</code>
+     * @return The retcode.
      */
-    boolean getPELBMOHDKHJ();
+    int getRetcode();
 
     /**
-     * <code>bool ILGBPPMFHIF = 1962;</code>
-     * @return The iLGBPPMFHIF.
-     */
-    boolean getILGBPPMFHIF();
-
-    /**
-     * <code>uint64 secret_key_seed = 13;</code>
+     * <code>uint64 secret_key_seed = 2;</code>
      * @return The secretKeySeed.
      */
     long getSecretKeySeed();
 
     /**
-     * <code>string client_version_random_key = 678;</code>
-     * @return The clientVersionRandomKey.
+     * <code>bool is_guest = 3;</code>
+     * @return The isGuest.
      */
-    java.lang.String getClientVersionRandomKey();
-    /**
-     * <code>string client_version_random_key = 678;</code>
-     * @return The bytes for clientVersionRandomKey.
-     */
-    com.google.protobuf.ByteString
-        getClientVersionRandomKeyBytes();
+    boolean getIsGuest();
 
     /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     * @return Whether the stopServer field is set.
+     * <code>bytes security_cmd_buffer = 4;</code>
+     * @return The securityCmdBuffer.
      */
-    boolean hasStopServer();
-    /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     * @return The stopServer.
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer();
-    /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder();
+    com.google.protobuf.ByteString getSecurityCmdBuffer();
 
     /**
-     * <code>uint32 channel_id = 259;</code>
-     * @return The channelId.
+     * <code>bool is_proficient_player = 5;</code>
+     * @return The isProficientPlayer.
      */
-    int getChannelId();
+    boolean getIsProficientPlayer();
 
     /**
-     * <code>uint32 platform_type = 5;</code>
-     * @return The platformType.
-     */
-    int getPlatformType();
-
-    /**
-     * <code>uint32 reg_platform = 1241;</code>
-     * @return The regPlatform.
-     */
-    int getRegPlatform();
-
-    /**
-     * <code>string account_uid = 3;</code>
+     * <code>string account_uid = 6;</code>
      * @return The accountUid.
      */
     java.lang.String getAccountUid();
     /**
-     * <code>string account_uid = 3;</code>
+     * <code>string account_uid = 6;</code>
      * @return The bytes for accountUid.
      */
     com.google.protobuf.ByteString
         getAccountUidBytes();
 
     /**
-     * <code>uint32 uid = 7;</code>
+     * <code>uint32 black_uid_end_time = 7;</code>
+     * @return The blackUidEndTime.
+     */
+    int getBlackUidEndTime();
+
+    /**
+     * <code>uint32 uid = 8;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>uint32 tag = 1572;</code>
-     * @return The tag.
-     */
-    int getTag();
-
-    /**
-     * <code>string birthday = 1437;</code>
-     * @return The birthday.
-     */
-    java.lang.String getBirthday();
-    /**
-     * <code>string birthday = 1437;</code>
-     * @return The bytes for birthday.
-     */
-    com.google.protobuf.ByteString
-        getBirthdayBytes();
-
-    /**
-     * <code>uint32 key_id = 1676;</code>
-     * @return The keyId.
-     */
-    int getKeyId();
-
-    /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>bool is_guest = 2;</code>
-     * @return The isGuest.
-     */
-    boolean getIsGuest();
-
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @return A list containing the finishCollectionIdList.
-     */
-    java.util.List<java.lang.Integer> getFinishCollectionIdListList();
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @return The count of finishCollectionIdList.
-     */
-    int getFinishCollectionIdListCount();
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @param index The index of the element to return.
-     * @return The finishCollectionIdList at the given index.
-     */
-    int getFinishCollectionIdList(int index);
-
-    /**
-     * <code>string server_rand_key = 517;</code>
-     * @return The serverRandKey.
-     */
-    java.lang.String getServerRandKey();
-    /**
-     * <code>string server_rand_key = 517;</code>
-     * @return The bytes for serverRandKey.
-     */
-    com.google.protobuf.ByteString
-        getServerRandKeyBytes();
-
-    /**
-     * <code>bytes security_cmd_buffer = 15;</code>
-     * @return The securityCmdBuffer.
-     */
-    com.google.protobuf.ByteString getSecurityCmdBuffer();
-
-    /**
-     * <code>string msg = 12;</code>
-     * @return The msg.
-     */
-    java.lang.String getMsg();
-    /**
-     * <code>string msg = 12;</code>
-     * @return The bytes for msg.
-     */
-    com.google.protobuf.ByteString
-        getMsgBytes();
-
-    /**
-     * <code>bool is_proficient_player = 8;</code>
-     * @return The isProficientPlayer.
-     */
-    boolean getIsProficientPlayer();
-
-    /**
-     * <code>string token = 11;</code>
-     * @return The token.
-     */
-    java.lang.String getToken();
-    /**
-     * <code>string token = 11;</code>
-     * @return The bytes for token.
-     */
-    com.google.protobuf.ByteString
-        getTokenBytes();
-
-    /**
-     * <code>string sign = 394;</code>
-     * @return The sign.
-     */
-    java.lang.String getSign();
-    /**
-     * <code>string sign = 394;</code>
-     * @return The bytes for sign.
-     */
-    com.google.protobuf.ByteString
-        getSignBytes();
-
-    /**
-     * <code>uint32 account_type = 1585;</code>
-     * @return The accountType.
-     */
-    int getAccountType();
-
-    /**
-     * <code>bytes extra_bin_data = 1;</code>
+     * <code>bytes extra_bin_data = 9;</code>
      * @return The extraBinData.
      */
     com.google.protobuf.ByteString getExtraBinData();
 
     /**
-     * <code>string psn_id = 1790;</code>
-     * @return The psnId.
+     * <code>uint32 gm_uid = 10;</code>
+     * @return The gmUid.
      */
-    java.lang.String getPsnId();
-    /**
-     * <code>string psn_id = 1790;</code>
-     * @return The bytes for psnId.
-     */
-    com.google.protobuf.ByteString
-        getPsnIdBytes();
+    int getGmUid();
 
     /**
-     * <code>uint32 sub_channel_id = 14;</code>
-     * @return The subChannelId.
-     */
-    int getSubChannelId();
-
-    /**
-     * <code>string secret_key = 9;</code>
+     * <code>string secret_key = 11;</code>
      * @return The secretKey.
      */
     java.lang.String getSecretKey();
     /**
-     * <code>string secret_key = 9;</code>
+     * <code>string secret_key = 11;</code>
      * @return The bytes for secretKey.
      */
     com.google.protobuf.ByteString
         getSecretKeyBytes();
 
     /**
-     * <code>string client_ip_str = 1921;</code>
-     * @return The clientIpStr.
+     * <code>uint32 account_type = 12;</code>
+     * @return The accountType.
      */
-    java.lang.String getClientIpStr();
+    int getAccountType();
+
     /**
-     * <code>string client_ip_str = 1921;</code>
-     * @return The bytes for clientIpStr.
+     * <code>uint32 platform_type = 13;</code>
+     * @return The platformType.
+     */
+    int getPlatformType();
+
+    /**
+     * <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
-        getClientIpStrBytes();
+        getMsgBytes();
 
     /**
-     * <code>uint32 blackUidEndTime = 10;</code>
-     * @return The blackUidEndTime.
+     * <code>string token = 15;</code>
+     * @return The token.
      */
-    int getBlackUidEndTime();
-
+    java.lang.String getToken();
     /**
-     * <code>uint32 KCFIGJAPNIB = 6;</code>
-     * @return The kCFIGJAPNIB.
+     * <code>string token = 15;</code>
+     * @return The bytes for token.
      */
-    int getKCFIGJAPNIB();
+    com.google.protobuf.ByteString
+        getTokenBytes();
 
     /**
-     * <code>string country_code = 1412;</code>
+     * <code>string server_rand_key = 68;</code>
+     * @return The serverRandKey.
+     */
+    java.lang.String getServerRandKey();
+    /**
+     * <code>string server_rand_key = 68;</code>
+     * @return The bytes for serverRandKey.
+     */
+    com.google.protobuf.ByteString
+        getServerRandKeyBytes();
+
+    /**
+     * <code>bool AKODFAIGJCE = 206;</code>
+     * @return The aKODFAIGJCE.
+     */
+    boolean getAKODFAIGJCE();
+
+    /**
+     * <code>uint32 MPGMOFLCEOF = 267;</code>
+     * @return The mPGMOFLCEOF.
+     */
+    int getMPGMOFLCEOF();
+
+    /**
+     * <code>uint32 OCINFHOJCEA = 290;</code>
+     * @return The oCINFHOJCEA.
+     */
+    int getOCINFHOJCEA();
+
+    /**
+     * <code>uint32 key_id = 398;</code>
+     * @return The keyId.
+     */
+    int getKeyId();
+
+    /**
+     * <code>bool GCDGEKAONGD = 440;</code>
+     * @return The gCDGEKAONGD.
+     */
+    boolean getGCDGEKAONGD();
+
+    /**
+     * <pre>
+     *sus KNCFLPGOMNI
+     * </pre>
+     *
+     * <code>string client_version_random_key = 496;</code>
+     * @return The clientVersionRandomKey.
+     */
+    java.lang.String getClientVersionRandomKey();
+    /**
+     * <pre>
+     *sus KNCFLPGOMNI
+     * </pre>
+     *
+     * <code>string client_version_random_key = 496;</code>
+     * @return The bytes for clientVersionRandomKey.
+     */
+    com.google.protobuf.ByteString
+        getClientVersionRandomKeyBytes();
+
+    /**
+     * <code>string OLODGDMMPNF = 528;</code>
+     * @return The oLODGDMMPNF.
+     */
+    java.lang.String getOLODGDMMPNF();
+    /**
+     * <code>string OLODGDMMPNF = 528;</code>
+     * @return The bytes for oLODGDMMPNF.
+     */
+    com.google.protobuf.ByteString
+        getOLODGDMMPNFBytes();
+
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     * @return Whether the stopServer field is set.
+     */
+    boolean hasStopServer();
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     * @return The stopServer.
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer();
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder();
+
+    /**
+     * <code>bool HNBGEKMPFIB = 575;</code>
+     * @return The hNBGEKMPFIB.
+     */
+    boolean getHNBGEKMPFIB();
+
+    /**
+     * <code>uint32 JDHCKKAGBNL = 576;</code>
+     * @return The jDHCKKAGBNL.
+     */
+    int getJDHCKKAGBNL();
+
+    /**
+     * <code>uint32 KEKHAKAPMIN = 630;</code>
+     * @return The kEKHAKAPMIN.
+     */
+    int getKEKHAKAPMIN();
+
+    /**
+     * <code>uint32 CIJPMGMCJBA = 847;</code>
+     * @return The cIJPMGMCJBA.
+     */
+    int getCIJPMGMCJBA();
+
+    /**
+     * <code>uint32 tag = 853;</code>
+     * @return The tag.
+     */
+    int getTag();
+
+    /**
+     * <code>uint32 PLNNJPFPPAM = 1118;</code>
+     * @return The pLNNJPFPPAM.
+     */
+    int getPLNNJPFPPAM();
+
+    /**
+     * <code>string country_code = 1269;</code>
      * @return The countryCode.
      */
     java.lang.String getCountryCode();
     /**
-     * <code>string country_code = 1412;</code>
+     * <code>string country_code = 1269;</code>
      * @return The bytes for countryCode.
      */
     com.google.protobuf.ByteString
         getCountryCodeBytes();
 
     /**
-     * <code>uint32 cloudClientIp = 508;</code>
-     * @return The cloudClientIp.
+     * <code>string game_biz = 1670;</code>
+     * @return The gameBiz.
      */
-    int getCloudClientIp();
+    java.lang.String getGameBiz();
+    /**
+     * <code>string game_biz = 1670;</code>
+     * @return The bytes for gameBiz.
+     */
+    com.google.protobuf.ByteString
+        getGameBizBytes();
+
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @return A list containing the finishCollectionIdList.
+     */
+    java.util.List<java.lang.Integer> getFinishCollectionIdListList();
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @return The count of finishCollectionIdList.
+     */
+    int getFinishCollectionIdListCount();
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @param index The index of the element to return.
+     * @return The finishCollectionIdList at the given index.
+     */
+    int getFinishCollectionIdList(int index);
+
+    /**
+     * <code>string birthday = 1735;</code>
+     * @return The birthday.
+     */
+    java.lang.String getBirthday();
+    /**
+     * <code>string birthday = 1735;</code>
+     * @return The bytes for birthday.
+     */
+    com.google.protobuf.ByteString
+        getBirthdayBytes();
+
+    /**
+     * <code>string client_ip_str = 1871;</code>
+     * @return The clientIpStr.
+     */
+    java.lang.String getClientIpStr();
+    /**
+     * <code>string client_ip_str = 1871;</code>
+     * @return The bytes for clientIpStr.
+     */
+    com.google.protobuf.ByteString
+        getClientIpStrBytes();
+
+    /**
+     * <code>string sign = 1885;</code>
+     * @return The sign.
+     */
+    java.lang.String getSign();
+    /**
+     * <code>string sign = 1885;</code>
+     * @return The bytes for sign.
+     */
+    com.google.protobuf.ByteString
+        getSignBytes();
+
+    /**
+     * <code>string psn_id = 1954;</code>
+     * @return The psnId.
+     */
+    java.lang.String getPsnId();
+    /**
+     * <code>string psn_id = 1954;</code>
+     * @return The bytes for psnId.
+     */
+    com.google.protobuf.ByteString
+        getPsnIdBytes();
+
+    /**
+     * <code>string JLCDDOJGKKG = 2042;</code>
+     * @return The jLCDDOJGKKG.
+     */
+    java.lang.String getJLCDDOJGKKG();
+    /**
+     * <code>string JLCDDOJGKKG = 2042;</code>
+     * @return The bytes for jLCDDOJGKKG.
+     */
+    com.google.protobuf.ByteString
+        getJLCDDOJGKKGBytes();
   }
   /**
-   * <pre>
-   * CmdId: 2407
-   * Obf: BKFNIGMLAOA
-   * </pre>
-   *
    * Protobuf type {@code GetPlayerTokenRsp}
    */
   public static final class GetPlayerTokenRsp extends
@@ -314,20 +371,23 @@ public final class GetPlayerTokenRspOuterClass {
       super(builder);
     }
     private GetPlayerTokenRsp() {
-      clientVersionRandomKey_ = "";
-      accountUid_ = "";
-      birthday_ = "";
-      finishCollectionIdList_ = emptyIntList();
-      serverRandKey_ = "";
       securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
+      accountUid_ = "";
+      extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+      secretKey_ = "";
       msg_ = "";
       token_ = "";
-      sign_ = "";
-      extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-      psnId_ = "";
-      secretKey_ = "";
-      clientIpStr_ = "";
+      serverRandKey_ = "";
+      clientVersionRandomKey_ = "";
+      oLODGDMMPNF_ = "";
       countryCode_ = "";
+      gameBiz_ = "";
+      finishCollectionIdList_ = emptyIntList();
+      birthday_ = "";
+      clientIpStr_ = "";
+      sign_ = "";
+      psnId_ = "";
+      jLCDDOJGKKG_ = "";
     }
 
     @java.lang.Override
@@ -361,135 +421,129 @@ public final class GetPlayerTokenRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 8: {
 
-              extraBinData_ = input.readBytes();
+              retcode_ = input.readInt32();
               break;
             }
             case 16: {
 
+              secretKeySeed_ = input.readUInt64();
+              break;
+            }
+            case 24: {
+
               isGuest_ = input.readBool();
               break;
             }
-            case 26: {
+            case 34: {
+
+              securityCmdBuffer_ = input.readBytes();
+              break;
+            }
+            case 40: {
+
+              isProficientPlayer_ = input.readBool();
+              break;
+            }
+            case 50: {
               java.lang.String s = input.readStringRequireUtf8();
 
               accountUid_ = s;
               break;
             }
-            case 32: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 40: {
-
-              platformType_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              kCFIGJAPNIB_ = input.readUInt32();
-              break;
-            }
             case 56: {
 
-              uid_ = input.readUInt32();
+              blackUidEndTime_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              isProficientPlayer_ = input.readBool();
+              uid_ = input.readUInt32();
               break;
             }
             case 74: {
-              java.lang.String s = input.readStringRequireUtf8();
 
-              secretKey_ = s;
+              extraBinData_ = input.readBytes();
               break;
             }
             case 80: {
 
-              blackUidEndTime_ = input.readUInt32();
+              gmUid_ = input.readUInt32();
               break;
             }
             case 90: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              token_ = s;
+              secretKey_ = s;
               break;
             }
-            case 98: {
+            case 96: {
+
+              accountType_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              platformType_ = input.readUInt32();
+              break;
+            }
+            case 114: {
               java.lang.String s = input.readStringRequireUtf8();
 
               msg_ = s;
               break;
             }
-            case 104: {
-
-              secretKeySeed_ = input.readUInt64();
-              break;
-            }
-            case 112: {
-
-              subChannelId_ = input.readUInt32();
-              break;
-            }
             case 122: {
-
-              securityCmdBuffer_ = input.readBytes();
-              break;
-            }
-            case 2072: {
-
-              channelId_ = input.readUInt32();
-              break;
-            }
-            case 3154: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              sign_ = s;
+              token_ = s;
               break;
             }
-            case 3608: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                finishCollectionIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              finishCollectionIdList_.addInt(input.readUInt32());
-              break;
-            }
-            case 3610: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                finishCollectionIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                finishCollectionIdList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 4064: {
-
-              cloudClientIp_ = input.readUInt32();
-              break;
-            }
-            case 4138: {
+            case 546: {
               java.lang.String s = input.readStringRequireUtf8();
 
               serverRandKey_ = s;
               break;
             }
-            case 5426: {
+            case 1648: {
+
+              aKODFAIGJCE_ = input.readBool();
+              break;
+            }
+            case 2136: {
+
+              mPGMOFLCEOF_ = input.readUInt32();
+              break;
+            }
+            case 2320: {
+
+              oCINFHOJCEA_ = input.readUInt32();
+              break;
+            }
+            case 3184: {
+
+              keyId_ = input.readUInt32();
+              break;
+            }
+            case 3520: {
+
+              gCDGEKAONGD_ = input.readBool();
+              break;
+            }
+            case 3970: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientVersionRandomKey_ = s;
               break;
             }
-            case 7002: {
+            case 4226: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              oLODGDMMPNF_ = s;
+              break;
+            }
+            case 4506: {
               emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder subBuilder = null;
               if (stopServer_ != null) {
                 subBuilder = stopServer_.toBuilder();
@@ -502,58 +556,97 @@ public final class GetPlayerTokenRspOuterClass {
 
               break;
             }
-            case 9928: {
+            case 4600: {
 
-              regPlatform_ = input.readUInt32();
+              hNBGEKMPFIB_ = input.readBool();
               break;
             }
-            case 10336: {
+            case 4608: {
 
-              pELBMOHDKHJ_ = input.readBool();
+              jDHCKKAGBNL_ = input.readUInt32();
               break;
             }
-            case 11298: {
+            case 5040: {
+
+              kEKHAKAPMIN_ = input.readUInt32();
+              break;
+            }
+            case 6776: {
+
+              cIJPMGMCJBA_ = input.readUInt32();
+              break;
+            }
+            case 6824: {
+
+              tag_ = input.readUInt32();
+              break;
+            }
+            case 8944: {
+
+              pLNNJPFPPAM_ = input.readUInt32();
+              break;
+            }
+            case 10154: {
               java.lang.String s = input.readStringRequireUtf8();
 
               countryCode_ = s;
               break;
             }
-            case 11498: {
+            case 13362: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              gameBiz_ = s;
+              break;
+            }
+            case 13472: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                finishCollectionIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              finishCollectionIdList_.addInt(input.readUInt32());
+              break;
+            }
+            case 13474: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                finishCollectionIdList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                finishCollectionIdList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 13882: {
               java.lang.String s = input.readStringRequireUtf8();
 
               birthday_ = s;
               break;
             }
-            case 12576: {
-
-              tag_ = input.readUInt32();
-              break;
-            }
-            case 12680: {
-
-              accountType_ = input.readUInt32();
-              break;
-            }
-            case 13408: {
-
-              keyId_ = input.readUInt32();
-              break;
-            }
-            case 14322: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              psnId_ = s;
-              break;
-            }
-            case 15370: {
+            case 14970: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientIpStr_ = s;
               break;
             }
-            case 15696: {
+            case 15082: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              iLGBPPMFHIF_ = input.readBool();
+              sign_ = s;
+              break;
+            }
+            case 15634: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              psnId_ = s;
+              break;
+            }
+            case 16338: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              jLCDDOJGKKG_ = s;
               break;
             }
             default: {
@@ -591,32 +684,21 @@ public final class GetPlayerTokenRspOuterClass {
               emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp.class, emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp.Builder.class);
     }
 
-    public static final int PELBMOHDKHJ_FIELD_NUMBER = 1292;
-    private boolean pELBMOHDKHJ_;
+    public static final int RETCODE_FIELD_NUMBER = 1;
+    private int retcode_;
     /**
-     * <code>bool PELBMOHDKHJ = 1292;</code>
-     * @return The pELBMOHDKHJ.
+     * <code>int32 retcode = 1;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public boolean getPELBMOHDKHJ() {
-      return pELBMOHDKHJ_;
+    public int getRetcode() {
+      return retcode_;
     }
 
-    public static final int ILGBPPMFHIF_FIELD_NUMBER = 1962;
-    private boolean iLGBPPMFHIF_;
-    /**
-     * <code>bool ILGBPPMFHIF = 1962;</code>
-     * @return The iLGBPPMFHIF.
-     */
-    @java.lang.Override
-    public boolean getILGBPPMFHIF() {
-      return iLGBPPMFHIF_;
-    }
-
-    public static final int SECRET_KEY_SEED_FIELD_NUMBER = 13;
+    public static final int SECRET_KEY_SEED_FIELD_NUMBER = 2;
     private long secretKeySeed_;
     /**
-     * <code>uint64 secret_key_seed = 13;</code>
+     * <code>uint64 secret_key_seed = 2;</code>
      * @return The secretKeySeed.
      */
     @java.lang.Override
@@ -624,107 +706,43 @@ public final class GetPlayerTokenRspOuterClass {
       return secretKeySeed_;
     }
 
-    public static final int CLIENT_VERSION_RANDOM_KEY_FIELD_NUMBER = 678;
-    private volatile java.lang.Object clientVersionRandomKey_;
+    public static final int IS_GUEST_FIELD_NUMBER = 3;
+    private boolean isGuest_;
     /**
-     * <code>string client_version_random_key = 678;</code>
-     * @return The clientVersionRandomKey.
+     * <code>bool is_guest = 3;</code>
+     * @return The isGuest.
      */
     @java.lang.Override
-    public java.lang.String getClientVersionRandomKey() {
-      java.lang.Object ref = clientVersionRandomKey_;
-      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();
-        clientVersionRandomKey_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_version_random_key = 678;</code>
-     * @return The bytes for clientVersionRandomKey.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientVersionRandomKeyBytes() {
-      java.lang.Object ref = clientVersionRandomKey_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientVersionRandomKey_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public boolean getIsGuest() {
+      return isGuest_;
     }
 
-    public static final int STOP_SERVER_FIELD_NUMBER = 875;
-    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo stopServer_;
+    public static final int SECURITY_CMD_BUFFER_FIELD_NUMBER = 4;
+    private com.google.protobuf.ByteString securityCmdBuffer_;
     /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     * @return Whether the stopServer field is set.
+     * <code>bytes security_cmd_buffer = 4;</code>
+     * @return The securityCmdBuffer.
      */
     @java.lang.Override
-    public boolean hasStopServer() {
-      return stopServer_ != null;
-    }
-    /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     * @return The stopServer.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer() {
-      return stopServer_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : stopServer_;
-    }
-    /**
-     * <code>.StopServerInfo stop_server = 875;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder() {
-      return getStopServer();
+    public com.google.protobuf.ByteString getSecurityCmdBuffer() {
+      return securityCmdBuffer_;
     }
 
-    public static final int CHANNEL_ID_FIELD_NUMBER = 259;
-    private int channelId_;
+    public static final int IS_PROFICIENT_PLAYER_FIELD_NUMBER = 5;
+    private boolean isProficientPlayer_;
     /**
-     * <code>uint32 channel_id = 259;</code>
-     * @return The channelId.
+     * <code>bool is_proficient_player = 5;</code>
+     * @return The isProficientPlayer.
      */
     @java.lang.Override
-    public int getChannelId() {
-      return channelId_;
+    public boolean getIsProficientPlayer() {
+      return isProficientPlayer_;
     }
 
-    public static final int PLATFORM_TYPE_FIELD_NUMBER = 5;
-    private int platformType_;
-    /**
-     * <code>uint32 platform_type = 5;</code>
-     * @return The platformType.
-     */
-    @java.lang.Override
-    public int getPlatformType() {
-      return platformType_;
-    }
-
-    public static final int REG_PLATFORM_FIELD_NUMBER = 1241;
-    private int regPlatform_;
-    /**
-     * <code>uint32 reg_platform = 1241;</code>
-     * @return The regPlatform.
-     */
-    @java.lang.Override
-    public int getRegPlatform() {
-      return regPlatform_;
-    }
-
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 3;
+    public static final int ACCOUNT_UID_FIELD_NUMBER = 6;
     private volatile java.lang.Object accountUid_;
     /**
-     * <code>string account_uid = 3;</code>
+     * <code>string account_uid = 6;</code>
      * @return The accountUid.
      */
     @java.lang.Override
@@ -741,7 +759,7 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
     /**
-     * <code>string account_uid = 3;</code>
+     * <code>string account_uid = 6;</code>
      * @return The bytes for accountUid.
      */
     @java.lang.Override
@@ -759,10 +777,21 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
 
-    public static final int UID_FIELD_NUMBER = 7;
+    public static final int BLACK_UID_END_TIME_FIELD_NUMBER = 7;
+    private int blackUidEndTime_;
+    /**
+     * <code>uint32 black_uid_end_time = 7;</code>
+     * @return The blackUidEndTime.
+     */
+    @java.lang.Override
+    public int getBlackUidEndTime() {
+      return blackUidEndTime_;
+    }
+
+    public static final int UID_FIELD_NUMBER = 8;
     private int uid_;
     /**
-     * <code>uint32 uid = 7;</code>
+     * <code>uint32 uid = 8;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -770,305 +799,10 @@ public final class GetPlayerTokenRspOuterClass {
       return uid_;
     }
 
-    public static final int TAG_FIELD_NUMBER = 1572;
-    private int tag_;
-    /**
-     * <code>uint32 tag = 1572;</code>
-     * @return The tag.
-     */
-    @java.lang.Override
-    public int getTag() {
-      return tag_;
-    }
-
-    public static final int BIRTHDAY_FIELD_NUMBER = 1437;
-    private volatile java.lang.Object birthday_;
-    /**
-     * <code>string birthday = 1437;</code>
-     * @return The birthday.
-     */
-    @java.lang.Override
-    public java.lang.String getBirthday() {
-      java.lang.Object ref = birthday_;
-      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();
-        birthday_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string birthday = 1437;</code>
-     * @return The bytes for birthday.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getBirthdayBytes() {
-      java.lang.Object ref = birthday_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        birthday_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int KEY_ID_FIELD_NUMBER = 1676;
-    private int keyId_;
-    /**
-     * <code>uint32 key_id = 1676;</code>
-     * @return The keyId.
-     */
-    @java.lang.Override
-    public int getKeyId() {
-      return keyId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int IS_GUEST_FIELD_NUMBER = 2;
-    private boolean isGuest_;
-    /**
-     * <code>bool is_guest = 2;</code>
-     * @return The isGuest.
-     */
-    @java.lang.Override
-    public boolean getIsGuest() {
-      return isGuest_;
-    }
-
-    public static final int FINISH_COLLECTION_ID_LIST_FIELD_NUMBER = 451;
-    private com.google.protobuf.Internal.IntList finishCollectionIdList_;
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @return A list containing the finishCollectionIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getFinishCollectionIdListList() {
-      return finishCollectionIdList_;
-    }
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @return The count of finishCollectionIdList.
-     */
-    public int getFinishCollectionIdListCount() {
-      return finishCollectionIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 finish_collection_id_list = 451;</code>
-     * @param index The index of the element to return.
-     * @return The finishCollectionIdList at the given index.
-     */
-    public int getFinishCollectionIdList(int index) {
-      return finishCollectionIdList_.getInt(index);
-    }
-    private int finishCollectionIdListMemoizedSerializedSize = -1;
-
-    public static final int SERVER_RAND_KEY_FIELD_NUMBER = 517;
-    private volatile java.lang.Object serverRandKey_;
-    /**
-     * <code>string server_rand_key = 517;</code>
-     * @return The serverRandKey.
-     */
-    @java.lang.Override
-    public java.lang.String getServerRandKey() {
-      java.lang.Object ref = serverRandKey_;
-      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();
-        serverRandKey_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string server_rand_key = 517;</code>
-     * @return The bytes for serverRandKey.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getServerRandKeyBytes() {
-      java.lang.Object ref = serverRandKey_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        serverRandKey_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int SECURITY_CMD_BUFFER_FIELD_NUMBER = 15;
-    private com.google.protobuf.ByteString securityCmdBuffer_;
-    /**
-     * <code>bytes security_cmd_buffer = 15;</code>
-     * @return The securityCmdBuffer.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getSecurityCmdBuffer() {
-      return securityCmdBuffer_;
-    }
-
-    public static final int MSG_FIELD_NUMBER = 12;
-    private volatile java.lang.Object msg_;
-    /**
-     * <code>string msg = 12;</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 = 12;</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 IS_PROFICIENT_PLAYER_FIELD_NUMBER = 8;
-    private boolean isProficientPlayer_;
-    /**
-     * <code>bool is_proficient_player = 8;</code>
-     * @return The isProficientPlayer.
-     */
-    @java.lang.Override
-    public boolean getIsProficientPlayer() {
-      return isProficientPlayer_;
-    }
-
-    public static final int TOKEN_FIELD_NUMBER = 11;
-    private volatile java.lang.Object token_;
-    /**
-     * <code>string token = 11;</code>
-     * @return The token.
-     */
-    @java.lang.Override
-    public java.lang.String getToken() {
-      java.lang.Object ref = token_;
-      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();
-        token_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string token = 11;</code>
-     * @return The bytes for token.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getTokenBytes() {
-      java.lang.Object ref = token_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        token_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int SIGN_FIELD_NUMBER = 394;
-    private volatile java.lang.Object sign_;
-    /**
-     * <code>string sign = 394;</code>
-     * @return The sign.
-     */
-    @java.lang.Override
-    public java.lang.String getSign() {
-      java.lang.Object ref = sign_;
-      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();
-        sign_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string sign = 394;</code>
-     * @return The bytes for sign.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getSignBytes() {
-      java.lang.Object ref = sign_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        sign_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 1585;
-    private int accountType_;
-    /**
-     * <code>uint32 account_type = 1585;</code>
-     * @return The accountType.
-     */
-    @java.lang.Override
-    public int getAccountType() {
-      return accountType_;
-    }
-
-    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 1;
+    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 9;
     private com.google.protobuf.ByteString extraBinData_;
     /**
-     * <code>bytes extra_bin_data = 1;</code>
+     * <code>bytes extra_bin_data = 9;</code>
      * @return The extraBinData.
      */
     @java.lang.Override
@@ -1076,59 +810,21 @@ public final class GetPlayerTokenRspOuterClass {
       return extraBinData_;
     }
 
-    public static final int PSN_ID_FIELD_NUMBER = 1790;
-    private volatile java.lang.Object psnId_;
+    public static final int GM_UID_FIELD_NUMBER = 10;
+    private int gmUid_;
     /**
-     * <code>string psn_id = 1790;</code>
-     * @return The psnId.
+     * <code>uint32 gm_uid = 10;</code>
+     * @return The gmUid.
      */
     @java.lang.Override
-    public java.lang.String getPsnId() {
-      java.lang.Object ref = psnId_;
-      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();
-        psnId_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string psn_id = 1790;</code>
-     * @return The bytes for psnId.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getPsnIdBytes() {
-      java.lang.Object ref = psnId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        psnId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getGmUid() {
+      return gmUid_;
     }
 
-    public static final int SUB_CHANNEL_ID_FIELD_NUMBER = 14;
-    private int subChannelId_;
-    /**
-     * <code>uint32 sub_channel_id = 14;</code>
-     * @return The subChannelId.
-     */
-    @java.lang.Override
-    public int getSubChannelId() {
-      return subChannelId_;
-    }
-
-    public static final int SECRET_KEY_FIELD_NUMBER = 9;
+    public static final int SECRET_KEY_FIELD_NUMBER = 11;
     private volatile java.lang.Object secretKey_;
     /**
-     * <code>string secret_key = 9;</code>
+     * <code>string secret_key = 11;</code>
      * @return The secretKey.
      */
     @java.lang.Override
@@ -1145,7 +841,7 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
     /**
-     * <code>string secret_key = 9;</code>
+     * <code>string secret_key = 11;</code>
      * @return The bytes for secretKey.
      */
     @java.lang.Override
@@ -1163,70 +859,377 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
 
-    public static final int CLIENT_IP_STR_FIELD_NUMBER = 1921;
-    private volatile java.lang.Object clientIpStr_;
+    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 12;
+    private int accountType_;
     /**
-     * <code>string client_ip_str = 1921;</code>
-     * @return The clientIpStr.
+     * <code>uint32 account_type = 12;</code>
+     * @return The accountType.
      */
     @java.lang.Override
-    public java.lang.String getClientIpStr() {
-      java.lang.Object ref = clientIpStr_;
+    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 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();
-        clientIpStr_ = s;
+        msg_ = s;
         return s;
       }
     }
     /**
-     * <code>string client_ip_str = 1921;</code>
-     * @return The bytes for clientIpStr.
+     * <code>string msg = 14;</code>
+     * @return The bytes for msg.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getClientIpStrBytes() {
-      java.lang.Object ref = clientIpStr_;
+        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);
-        clientIpStr_ = b;
+        msg_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int BLACKUIDENDTIME_FIELD_NUMBER = 10;
-    private int blackUidEndTime_;
+    public static final int TOKEN_FIELD_NUMBER = 15;
+    private volatile java.lang.Object token_;
     /**
-     * <code>uint32 blackUidEndTime = 10;</code>
-     * @return The blackUidEndTime.
+     * <code>string token = 15;</code>
+     * @return The token.
      */
     @java.lang.Override
-    public int getBlackUidEndTime() {
-      return blackUidEndTime_;
+    public java.lang.String getToken() {
+      java.lang.Object ref = token_;
+      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();
+        token_ = s;
+        return s;
+      }
     }
-
-    public static final int KCFIGJAPNIB_FIELD_NUMBER = 6;
-    private int kCFIGJAPNIB_;
     /**
-     * <code>uint32 KCFIGJAPNIB = 6;</code>
-     * @return The kCFIGJAPNIB.
+     * <code>string token = 15;</code>
+     * @return The bytes for token.
      */
     @java.lang.Override
-    public int getKCFIGJAPNIB() {
-      return kCFIGJAPNIB_;
+    public com.google.protobuf.ByteString
+        getTokenBytes() {
+      java.lang.Object ref = token_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        token_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 1412;
+    public static final int SERVER_RAND_KEY_FIELD_NUMBER = 68;
+    private volatile java.lang.Object serverRandKey_;
+    /**
+     * <code>string server_rand_key = 68;</code>
+     * @return The serverRandKey.
+     */
+    @java.lang.Override
+    public java.lang.String getServerRandKey() {
+      java.lang.Object ref = serverRandKey_;
+      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();
+        serverRandKey_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string server_rand_key = 68;</code>
+     * @return The bytes for serverRandKey.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getServerRandKeyBytes() {
+      java.lang.Object ref = serverRandKey_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        serverRandKey_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int AKODFAIGJCE_FIELD_NUMBER = 206;
+    private boolean aKODFAIGJCE_;
+    /**
+     * <code>bool AKODFAIGJCE = 206;</code>
+     * @return The aKODFAIGJCE.
+     */
+    @java.lang.Override
+    public boolean getAKODFAIGJCE() {
+      return aKODFAIGJCE_;
+    }
+
+    public static final int MPGMOFLCEOF_FIELD_NUMBER = 267;
+    private int mPGMOFLCEOF_;
+    /**
+     * <code>uint32 MPGMOFLCEOF = 267;</code>
+     * @return The mPGMOFLCEOF.
+     */
+    @java.lang.Override
+    public int getMPGMOFLCEOF() {
+      return mPGMOFLCEOF_;
+    }
+
+    public static final int OCINFHOJCEA_FIELD_NUMBER = 290;
+    private int oCINFHOJCEA_;
+    /**
+     * <code>uint32 OCINFHOJCEA = 290;</code>
+     * @return The oCINFHOJCEA.
+     */
+    @java.lang.Override
+    public int getOCINFHOJCEA() {
+      return oCINFHOJCEA_;
+    }
+
+    public static final int KEY_ID_FIELD_NUMBER = 398;
+    private int keyId_;
+    /**
+     * <code>uint32 key_id = 398;</code>
+     * @return The keyId.
+     */
+    @java.lang.Override
+    public int getKeyId() {
+      return keyId_;
+    }
+
+    public static final int GCDGEKAONGD_FIELD_NUMBER = 440;
+    private boolean gCDGEKAONGD_;
+    /**
+     * <code>bool GCDGEKAONGD = 440;</code>
+     * @return The gCDGEKAONGD.
+     */
+    @java.lang.Override
+    public boolean getGCDGEKAONGD() {
+      return gCDGEKAONGD_;
+    }
+
+    public static final int CLIENT_VERSION_RANDOM_KEY_FIELD_NUMBER = 496;
+    private volatile java.lang.Object clientVersionRandomKey_;
+    /**
+     * <pre>
+     *sus KNCFLPGOMNI
+     * </pre>
+     *
+     * <code>string client_version_random_key = 496;</code>
+     * @return The clientVersionRandomKey.
+     */
+    @java.lang.Override
+    public java.lang.String getClientVersionRandomKey() {
+      java.lang.Object ref = clientVersionRandomKey_;
+      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();
+        clientVersionRandomKey_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     *sus KNCFLPGOMNI
+     * </pre>
+     *
+     * <code>string client_version_random_key = 496;</code>
+     * @return The bytes for clientVersionRandomKey.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getClientVersionRandomKeyBytes() {
+      java.lang.Object ref = clientVersionRandomKey_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        clientVersionRandomKey_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int OLODGDMMPNF_FIELD_NUMBER = 528;
+    private volatile java.lang.Object oLODGDMMPNF_;
+    /**
+     * <code>string OLODGDMMPNF = 528;</code>
+     * @return The oLODGDMMPNF.
+     */
+    @java.lang.Override
+    public java.lang.String getOLODGDMMPNF() {
+      java.lang.Object ref = oLODGDMMPNF_;
+      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();
+        oLODGDMMPNF_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string OLODGDMMPNF = 528;</code>
+     * @return The bytes for oLODGDMMPNF.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getOLODGDMMPNFBytes() {
+      java.lang.Object ref = oLODGDMMPNF_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        oLODGDMMPNF_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int STOP_SERVER_FIELD_NUMBER = 563;
+    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo stopServer_;
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     * @return Whether the stopServer field is set.
+     */
+    @java.lang.Override
+    public boolean hasStopServer() {
+      return stopServer_ != null;
+    }
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     * @return The stopServer.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer() {
+      return stopServer_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : stopServer_;
+    }
+    /**
+     * <code>.StopServerInfo stop_server = 563;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder() {
+      return getStopServer();
+    }
+
+    public static final int HNBGEKMPFIB_FIELD_NUMBER = 575;
+    private boolean hNBGEKMPFIB_;
+    /**
+     * <code>bool HNBGEKMPFIB = 575;</code>
+     * @return The hNBGEKMPFIB.
+     */
+    @java.lang.Override
+    public boolean getHNBGEKMPFIB() {
+      return hNBGEKMPFIB_;
+    }
+
+    public static final int JDHCKKAGBNL_FIELD_NUMBER = 576;
+    private int jDHCKKAGBNL_;
+    /**
+     * <code>uint32 JDHCKKAGBNL = 576;</code>
+     * @return The jDHCKKAGBNL.
+     */
+    @java.lang.Override
+    public int getJDHCKKAGBNL() {
+      return jDHCKKAGBNL_;
+    }
+
+    public static final int KEKHAKAPMIN_FIELD_NUMBER = 630;
+    private int kEKHAKAPMIN_;
+    /**
+     * <code>uint32 KEKHAKAPMIN = 630;</code>
+     * @return The kEKHAKAPMIN.
+     */
+    @java.lang.Override
+    public int getKEKHAKAPMIN() {
+      return kEKHAKAPMIN_;
+    }
+
+    public static final int CIJPMGMCJBA_FIELD_NUMBER = 847;
+    private int cIJPMGMCJBA_;
+    /**
+     * <code>uint32 CIJPMGMCJBA = 847;</code>
+     * @return The cIJPMGMCJBA.
+     */
+    @java.lang.Override
+    public int getCIJPMGMCJBA() {
+      return cIJPMGMCJBA_;
+    }
+
+    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 PLNNJPFPPAM_FIELD_NUMBER = 1118;
+    private int pLNNJPFPPAM_;
+    /**
+     * <code>uint32 PLNNJPFPPAM = 1118;</code>
+     * @return The pLNNJPFPPAM.
+     */
+    @java.lang.Override
+    public int getPLNNJPFPPAM() {
+      return pLNNJPFPPAM_;
+    }
+
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1269;
     private volatile java.lang.Object countryCode_;
     /**
-     * <code>string country_code = 1412;</code>
+     * <code>string country_code = 1269;</code>
      * @return The countryCode.
      */
     @java.lang.Override
@@ -1243,7 +1246,7 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
     /**
-     * <code>string country_code = 1412;</code>
+     * <code>string country_code = 1269;</code>
      * @return The bytes for countryCode.
      */
     @java.lang.Override
@@ -1261,15 +1264,260 @@ public final class GetPlayerTokenRspOuterClass {
       }
     }
 
-    public static final int CLOUDCLIENTIP_FIELD_NUMBER = 508;
-    private int cloudClientIp_;
+    public static final int GAME_BIZ_FIELD_NUMBER = 1670;
+    private volatile java.lang.Object gameBiz_;
     /**
-     * <code>uint32 cloudClientIp = 508;</code>
-     * @return The cloudClientIp.
+     * <code>string game_biz = 1670;</code>
+     * @return The gameBiz.
      */
     @java.lang.Override
-    public int getCloudClientIp() {
-      return cloudClientIp_;
+    public java.lang.String getGameBiz() {
+      java.lang.Object ref = gameBiz_;
+      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();
+        gameBiz_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string game_biz = 1670;</code>
+     * @return The bytes for gameBiz.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGameBizBytes() {
+      java.lang.Object ref = gameBiz_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gameBiz_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int FINISH_COLLECTION_ID_LIST_FIELD_NUMBER = 1684;
+    private com.google.protobuf.Internal.IntList finishCollectionIdList_;
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @return A list containing the finishCollectionIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getFinishCollectionIdListList() {
+      return finishCollectionIdList_;
+    }
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @return The count of finishCollectionIdList.
+     */
+    public int getFinishCollectionIdListCount() {
+      return finishCollectionIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+     * @param index The index of the element to return.
+     * @return The finishCollectionIdList at the given index.
+     */
+    public int getFinishCollectionIdList(int index) {
+      return finishCollectionIdList_.getInt(index);
+    }
+    private int finishCollectionIdListMemoizedSerializedSize = -1;
+
+    public static final int BIRTHDAY_FIELD_NUMBER = 1735;
+    private volatile java.lang.Object birthday_;
+    /**
+     * <code>string birthday = 1735;</code>
+     * @return The birthday.
+     */
+    @java.lang.Override
+    public java.lang.String getBirthday() {
+      java.lang.Object ref = birthday_;
+      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();
+        birthday_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string birthday = 1735;</code>
+     * @return The bytes for birthday.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getBirthdayBytes() {
+      java.lang.Object ref = birthday_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        birthday_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int CLIENT_IP_STR_FIELD_NUMBER = 1871;
+    private volatile java.lang.Object clientIpStr_;
+    /**
+     * <code>string client_ip_str = 1871;</code>
+     * @return The clientIpStr.
+     */
+    @java.lang.Override
+    public java.lang.String getClientIpStr() {
+      java.lang.Object ref = clientIpStr_;
+      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();
+        clientIpStr_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string client_ip_str = 1871;</code>
+     * @return The bytes for clientIpStr.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getClientIpStrBytes() {
+      java.lang.Object ref = clientIpStr_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        clientIpStr_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int SIGN_FIELD_NUMBER = 1885;
+    private volatile java.lang.Object sign_;
+    /**
+     * <code>string sign = 1885;</code>
+     * @return The sign.
+     */
+    @java.lang.Override
+    public java.lang.String getSign() {
+      java.lang.Object ref = sign_;
+      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();
+        sign_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string sign = 1885;</code>
+     * @return The bytes for sign.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getSignBytes() {
+      java.lang.Object ref = sign_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        sign_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int PSN_ID_FIELD_NUMBER = 1954;
+    private volatile java.lang.Object psnId_;
+    /**
+     * <code>string psn_id = 1954;</code>
+     * @return The psnId.
+     */
+    @java.lang.Override
+    public java.lang.String getPsnId() {
+      java.lang.Object ref = psnId_;
+      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();
+        psnId_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string psn_id = 1954;</code>
+     * @return The bytes for psnId.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getPsnIdBytes() {
+      java.lang.Object ref = psnId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        psnId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int JLCDDOJGKKG_FIELD_NUMBER = 2042;
+    private volatile java.lang.Object jLCDDOJGKKG_;
+    /**
+     * <code>string JLCDDOJGKKG = 2042;</code>
+     * @return The jLCDDOJGKKG.
+     */
+    @java.lang.Override
+    public java.lang.String getJLCDDOJGKKG() {
+      java.lang.Object ref = jLCDDOJGKKG_;
+      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();
+        jLCDDOJGKKG_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string JLCDDOJGKKG = 2042;</code>
+     * @return The bytes for jLCDDOJGKKG.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getJLCDDOJGKKGBytes() {
+      java.lang.Object ref = jLCDDOJGKKG_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        jLCDDOJGKKG_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1287,105 +1535,123 @@ public final class GetPlayerTokenRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (!extraBinData_.isEmpty()) {
-        output.writeBytes(1, extraBinData_);
-      }
-      if (isGuest_ != false) {
-        output.writeBool(2, isGuest_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, accountUid_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
-      }
-      if (platformType_ != 0) {
-        output.writeUInt32(5, platformType_);
-      }
-      if (kCFIGJAPNIB_ != 0) {
-        output.writeUInt32(6, kCFIGJAPNIB_);
-      }
-      if (uid_ != 0) {
-        output.writeUInt32(7, uid_);
-      }
-      if (isProficientPlayer_ != false) {
-        output.writeBool(8, isProficientPlayer_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, secretKey_);
-      }
-      if (blackUidEndTime_ != 0) {
-        output.writeUInt32(10, blackUidEndTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, token_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, msg_);
+        output.writeInt32(1, retcode_);
       }
       if (secretKeySeed_ != 0L) {
-        output.writeUInt64(13, secretKeySeed_);
+        output.writeUInt64(2, secretKeySeed_);
       }
-      if (subChannelId_ != 0) {
-        output.writeUInt32(14, subChannelId_);
+      if (isGuest_ != false) {
+        output.writeBool(3, isGuest_);
       }
       if (!securityCmdBuffer_.isEmpty()) {
-        output.writeBytes(15, securityCmdBuffer_);
+        output.writeBytes(4, securityCmdBuffer_);
       }
-      if (channelId_ != 0) {
-        output.writeUInt32(259, channelId_);
+      if (isProficientPlayer_ != false) {
+        output.writeBool(5, isProficientPlayer_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 394, sign_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, accountUid_);
+      }
+      if (blackUidEndTime_ != 0) {
+        output.writeUInt32(7, blackUidEndTime_);
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(8, uid_);
+      }
+      if (!extraBinData_.isEmpty()) {
+        output.writeBytes(9, extraBinData_);
+      }
+      if (gmUid_ != 0) {
+        output.writeUInt32(10, gmUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, secretKey_);
+      }
+      if (accountType_ != 0) {
+        output.writeUInt32(12, accountType_);
+      }
+      if (platformType_ != 0) {
+        output.writeUInt32(13, platformType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, msg_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 15, token_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 68, serverRandKey_);
+      }
+      if (aKODFAIGJCE_ != false) {
+        output.writeBool(206, aKODFAIGJCE_);
+      }
+      if (mPGMOFLCEOF_ != 0) {
+        output.writeUInt32(267, mPGMOFLCEOF_);
+      }
+      if (oCINFHOJCEA_ != 0) {
+        output.writeUInt32(290, oCINFHOJCEA_);
+      }
+      if (keyId_ != 0) {
+        output.writeUInt32(398, keyId_);
+      }
+      if (gCDGEKAONGD_ != false) {
+        output.writeBool(440, gCDGEKAONGD_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 496, clientVersionRandomKey_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oLODGDMMPNF_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 528, oLODGDMMPNF_);
+      }
+      if (stopServer_ != null) {
+        output.writeMessage(563, getStopServer());
+      }
+      if (hNBGEKMPFIB_ != false) {
+        output.writeBool(575, hNBGEKMPFIB_);
+      }
+      if (jDHCKKAGBNL_ != 0) {
+        output.writeUInt32(576, jDHCKKAGBNL_);
+      }
+      if (kEKHAKAPMIN_ != 0) {
+        output.writeUInt32(630, kEKHAKAPMIN_);
+      }
+      if (cIJPMGMCJBA_ != 0) {
+        output.writeUInt32(847, cIJPMGMCJBA_);
+      }
+      if (tag_ != 0) {
+        output.writeUInt32(853, tag_);
+      }
+      if (pLNNJPFPPAM_ != 0) {
+        output.writeUInt32(1118, pLNNJPFPPAM_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1269, countryCode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1670, gameBiz_);
       }
       if (getFinishCollectionIdListList().size() > 0) {
-        output.writeUInt32NoTag(3610);
+        output.writeUInt32NoTag(13474);
         output.writeUInt32NoTag(finishCollectionIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishCollectionIdList_.size(); i++) {
         output.writeUInt32NoTag(finishCollectionIdList_.getInt(i));
       }
-      if (cloudClientIp_ != 0) {
-        output.writeUInt32(508, cloudClientIp_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 517, serverRandKey_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 678, clientVersionRandomKey_);
-      }
-      if (stopServer_ != null) {
-        output.writeMessage(875, getStopServer());
-      }
-      if (regPlatform_ != 0) {
-        output.writeUInt32(1241, regPlatform_);
-      }
-      if (pELBMOHDKHJ_ != false) {
-        output.writeBool(1292, pELBMOHDKHJ_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1412, countryCode_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1437, birthday_);
-      }
-      if (tag_ != 0) {
-        output.writeUInt32(1572, tag_);
-      }
-      if (accountType_ != 0) {
-        output.writeUInt32(1585, accountType_);
-      }
-      if (keyId_ != 0) {
-        output.writeUInt32(1676, keyId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1790, psnId_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1735, birthday_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1921, clientIpStr_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1871, clientIpStr_);
       }
-      if (iLGBPPMFHIF_ != false) {
-        output.writeBool(1962, iLGBPPMFHIF_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1885, sign_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1954, psnId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jLCDDOJGKKG_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2042, jLCDDOJGKKG_);
       }
       unknownFields.writeTo(output);
     }
@@ -1396,68 +1662,124 @@ public final class GetPlayerTokenRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!extraBinData_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1, extraBinData_);
-      }
-      if (isGuest_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isGuest_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, accountUid_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
-      }
-      if (platformType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, platformType_);
-      }
-      if (kCFIGJAPNIB_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, kCFIGJAPNIB_);
-      }
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, uid_);
-      }
-      if (isProficientPlayer_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isProficientPlayer_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, secretKey_);
-      }
-      if (blackUidEndTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, blackUidEndTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, token_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, msg_);
+          .computeInt32Size(1, retcode_);
       }
       if (secretKeySeed_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, secretKeySeed_);
+          .computeUInt64Size(2, secretKeySeed_);
       }
-      if (subChannelId_ != 0) {
+      if (isGuest_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, subChannelId_);
+          .computeBoolSize(3, isGuest_);
       }
       if (!securityCmdBuffer_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(15, securityCmdBuffer_);
+          .computeBytesSize(4, securityCmdBuffer_);
       }
-      if (channelId_ != 0) {
+      if (isProficientPlayer_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(259, channelId_);
+          .computeBoolSize(5, isProficientPlayer_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(394, sign_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, accountUid_);
+      }
+      if (blackUidEndTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, blackUidEndTime_);
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, uid_);
+      }
+      if (!extraBinData_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(9, extraBinData_);
+      }
+      if (gmUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, gmUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(secretKey_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, secretKey_);
+      }
+      if (accountType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, accountType_);
+      }
+      if (platformType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, platformType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, msg_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, token_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(68, serverRandKey_);
+      }
+      if (aKODFAIGJCE_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(206, aKODFAIGJCE_);
+      }
+      if (mPGMOFLCEOF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(267, mPGMOFLCEOF_);
+      }
+      if (oCINFHOJCEA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(290, oCINFHOJCEA_);
+      }
+      if (keyId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(398, keyId_);
+      }
+      if (gCDGEKAONGD_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(440, gCDGEKAONGD_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(496, clientVersionRandomKey_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(oLODGDMMPNF_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(528, oLODGDMMPNF_);
+      }
+      if (stopServer_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(563, getStopServer());
+      }
+      if (hNBGEKMPFIB_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(575, hNBGEKMPFIB_);
+      }
+      if (jDHCKKAGBNL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(576, jDHCKKAGBNL_);
+      }
+      if (kEKHAKAPMIN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(630, kEKHAKAPMIN_);
+      }
+      if (cIJPMGMCJBA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(847, cIJPMGMCJBA_);
+      }
+      if (tag_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(853, tag_);
+      }
+      if (pLNNJPFPPAM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1118, pLNNJPFPPAM_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1269, countryCode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1670, gameBiz_);
       }
       {
         int dataSize = 0;
@@ -1473,55 +1795,20 @@ public final class GetPlayerTokenRspOuterClass {
         }
         finishCollectionIdListMemoizedSerializedSize = dataSize;
       }
-      if (cloudClientIp_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(508, cloudClientIp_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serverRandKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(517, serverRandKey_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionRandomKey_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(678, clientVersionRandomKey_);
-      }
-      if (stopServer_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(875, getStopServer());
-      }
-      if (regPlatform_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1241, regPlatform_);
-      }
-      if (pELBMOHDKHJ_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1292, pELBMOHDKHJ_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1412, countryCode_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1437, birthday_);
-      }
-      if (tag_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1572, tag_);
-      }
-      if (accountType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1585, accountType_);
-      }
-      if (keyId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1676, keyId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1790, psnId_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1735, birthday_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientIpStr_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1921, clientIpStr_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1871, clientIpStr_);
       }
-      if (iLGBPPMFHIF_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1962, iLGBPPMFHIF_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sign_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1885, sign_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1954, psnId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jLCDDOJGKKG_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2042, jLCDDOJGKKG_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1538,73 +1825,85 @@ public final class GetPlayerTokenRspOuterClass {
       }
       emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp other = (emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp) obj;
 
-      if (getPELBMOHDKHJ()
-          != other.getPELBMOHDKHJ()) return false;
-      if (getILGBPPMFHIF()
-          != other.getILGBPPMFHIF()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getSecretKeySeed()
           != other.getSecretKeySeed()) return false;
+      if (getIsGuest()
+          != other.getIsGuest()) return false;
+      if (!getSecurityCmdBuffer()
+          .equals(other.getSecurityCmdBuffer())) return false;
+      if (getIsProficientPlayer()
+          != other.getIsProficientPlayer()) return false;
+      if (!getAccountUid()
+          .equals(other.getAccountUid())) return false;
+      if (getBlackUidEndTime()
+          != other.getBlackUidEndTime()) return false;
+      if (getUid()
+          != other.getUid()) return false;
+      if (!getExtraBinData()
+          .equals(other.getExtraBinData())) return false;
+      if (getGmUid()
+          != other.getGmUid()) return false;
+      if (!getSecretKey()
+          .equals(other.getSecretKey())) return false;
+      if (getAccountType()
+          != other.getAccountType()) return false;
+      if (getPlatformType()
+          != other.getPlatformType()) return false;
+      if (!getMsg()
+          .equals(other.getMsg())) return false;
+      if (!getToken()
+          .equals(other.getToken())) return false;
+      if (!getServerRandKey()
+          .equals(other.getServerRandKey())) return false;
+      if (getAKODFAIGJCE()
+          != other.getAKODFAIGJCE()) return false;
+      if (getMPGMOFLCEOF()
+          != other.getMPGMOFLCEOF()) return false;
+      if (getOCINFHOJCEA()
+          != other.getOCINFHOJCEA()) return false;
+      if (getKeyId()
+          != other.getKeyId()) return false;
+      if (getGCDGEKAONGD()
+          != other.getGCDGEKAONGD()) return false;
       if (!getClientVersionRandomKey()
           .equals(other.getClientVersionRandomKey())) return false;
+      if (!getOLODGDMMPNF()
+          .equals(other.getOLODGDMMPNF())) return false;
       if (hasStopServer() != other.hasStopServer()) return false;
       if (hasStopServer()) {
         if (!getStopServer()
             .equals(other.getStopServer())) return false;
       }
-      if (getChannelId()
-          != other.getChannelId()) return false;
-      if (getPlatformType()
-          != other.getPlatformType()) return false;
-      if (getRegPlatform()
-          != other.getRegPlatform()) return false;
-      if (!getAccountUid()
-          .equals(other.getAccountUid())) return false;
-      if (getUid()
-          != other.getUid()) return false;
+      if (getHNBGEKMPFIB()
+          != other.getHNBGEKMPFIB()) return false;
+      if (getJDHCKKAGBNL()
+          != other.getJDHCKKAGBNL()) return false;
+      if (getKEKHAKAPMIN()
+          != other.getKEKHAKAPMIN()) return false;
+      if (getCIJPMGMCJBA()
+          != other.getCIJPMGMCJBA()) return false;
       if (getTag()
           != other.getTag()) return false;
-      if (!getBirthday()
-          .equals(other.getBirthday())) return false;
-      if (getKeyId()
-          != other.getKeyId()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getIsGuest()
-          != other.getIsGuest()) return false;
-      if (!getFinishCollectionIdListList()
-          .equals(other.getFinishCollectionIdListList())) return false;
-      if (!getServerRandKey()
-          .equals(other.getServerRandKey())) return false;
-      if (!getSecurityCmdBuffer()
-          .equals(other.getSecurityCmdBuffer())) return false;
-      if (!getMsg()
-          .equals(other.getMsg())) return false;
-      if (getIsProficientPlayer()
-          != other.getIsProficientPlayer()) return false;
-      if (!getToken()
-          .equals(other.getToken())) return false;
-      if (!getSign()
-          .equals(other.getSign())) return false;
-      if (getAccountType()
-          != other.getAccountType()) return false;
-      if (!getExtraBinData()
-          .equals(other.getExtraBinData())) return false;
-      if (!getPsnId()
-          .equals(other.getPsnId())) return false;
-      if (getSubChannelId()
-          != other.getSubChannelId()) return false;
-      if (!getSecretKey()
-          .equals(other.getSecretKey())) return false;
-      if (!getClientIpStr()
-          .equals(other.getClientIpStr())) return false;
-      if (getBlackUidEndTime()
-          != other.getBlackUidEndTime()) return false;
-      if (getKCFIGJAPNIB()
-          != other.getKCFIGJAPNIB()) return false;
+      if (getPLNNJPFPPAM()
+          != other.getPLNNJPFPPAM()) return false;
       if (!getCountryCode()
           .equals(other.getCountryCode())) return false;
-      if (getCloudClientIp()
-          != other.getCloudClientIp()) return false;
+      if (!getGameBiz()
+          .equals(other.getGameBiz())) return false;
+      if (!getFinishCollectionIdListList()
+          .equals(other.getFinishCollectionIdListList())) return false;
+      if (!getBirthday()
+          .equals(other.getBirthday())) return false;
+      if (!getClientIpStr()
+          .equals(other.getClientIpStr())) return false;
+      if (!getSign()
+          .equals(other.getSign())) return false;
+      if (!getPsnId()
+          .equals(other.getPsnId())) return false;
+      if (!getJLCDDOJGKKG()
+          .equals(other.getJLCDDOJGKKG())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1616,79 +1915,92 @@ public final class GetPlayerTokenRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PELBMOHDKHJ_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getPELBMOHDKHJ());
-      hash = (37 * hash) + ILGBPPMFHIF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getILGBPPMFHIF());
+      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());
+      hash = (37 * hash) + SECURITY_CMD_BUFFER_FIELD_NUMBER;
+      hash = (53 * hash) + getSecurityCmdBuffer().hashCode();
+      hash = (37 * hash) + IS_PROFICIENT_PLAYER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsProficientPlayer());
+      hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getAccountUid().hashCode();
+      hash = (37 * hash) + BLACK_UID_END_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getBlackUidEndTime();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
+      hash = (37 * hash) + EXTRA_BIN_DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getExtraBinData().hashCode();
+      hash = (37 * hash) + GM_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getGmUid();
+      hash = (37 * hash) + SECRET_KEY_FIELD_NUMBER;
+      hash = (53 * hash) + getSecretKey().hashCode();
+      hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getAccountType();
+      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + MSG_FIELD_NUMBER;
+      hash = (53 * hash) + getMsg().hashCode();
+      hash = (37 * hash) + TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getToken().hashCode();
+      hash = (37 * hash) + SERVER_RAND_KEY_FIELD_NUMBER;
+      hash = (53 * hash) + getServerRandKey().hashCode();
+      hash = (37 * hash) + AKODFAIGJCE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getAKODFAIGJCE());
+      hash = (37 * hash) + MPGMOFLCEOF_FIELD_NUMBER;
+      hash = (53 * hash) + getMPGMOFLCEOF();
+      hash = (37 * hash) + OCINFHOJCEA_FIELD_NUMBER;
+      hash = (53 * hash) + getOCINFHOJCEA();
+      hash = (37 * hash) + KEY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getKeyId();
+      hash = (37 * hash) + GCDGEKAONGD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getGCDGEKAONGD());
       hash = (37 * hash) + CLIENT_VERSION_RANDOM_KEY_FIELD_NUMBER;
       hash = (53 * hash) + getClientVersionRandomKey().hashCode();
+      hash = (37 * hash) + OLODGDMMPNF_FIELD_NUMBER;
+      hash = (53 * hash) + getOLODGDMMPNF().hashCode();
       if (hasStopServer()) {
         hash = (37 * hash) + STOP_SERVER_FIELD_NUMBER;
         hash = (53 * hash) + getStopServer().hashCode();
       }
-      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChannelId();
-      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatformType();
-      hash = (37 * hash) + REG_PLATFORM_FIELD_NUMBER;
-      hash = (53 * hash) + getRegPlatform();
-      hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountUid().hashCode();
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
+      hash = (37 * hash) + HNBGEKMPFIB_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHNBGEKMPFIB());
+      hash = (37 * hash) + JDHCKKAGBNL_FIELD_NUMBER;
+      hash = (53 * hash) + getJDHCKKAGBNL();
+      hash = (37 * hash) + KEKHAKAPMIN_FIELD_NUMBER;
+      hash = (53 * hash) + getKEKHAKAPMIN();
+      hash = (37 * hash) + CIJPMGMCJBA_FIELD_NUMBER;
+      hash = (53 * hash) + getCIJPMGMCJBA();
       hash = (37 * hash) + TAG_FIELD_NUMBER;
       hash = (53 * hash) + getTag();
-      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
-      hash = (53 * hash) + getBirthday().hashCode();
-      hash = (37 * hash) + KEY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getKeyId();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + IS_GUEST_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsGuest());
+      hash = (37 * hash) + PLNNJPFPPAM_FIELD_NUMBER;
+      hash = (53 * hash) + getPLNNJPFPPAM();
+      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getCountryCode().hashCode();
+      hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER;
+      hash = (53 * hash) + getGameBiz().hashCode();
       if (getFinishCollectionIdListCount() > 0) {
         hash = (37 * hash) + FINISH_COLLECTION_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFinishCollectionIdListList().hashCode();
       }
-      hash = (37 * hash) + SERVER_RAND_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getServerRandKey().hashCode();
-      hash = (37 * hash) + SECURITY_CMD_BUFFER_FIELD_NUMBER;
-      hash = (53 * hash) + getSecurityCmdBuffer().hashCode();
-      hash = (37 * hash) + MSG_FIELD_NUMBER;
-      hash = (53 * hash) + getMsg().hashCode();
-      hash = (37 * hash) + IS_PROFICIENT_PLAYER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsProficientPlayer());
-      hash = (37 * hash) + TOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getToken().hashCode();
-      hash = (37 * hash) + SIGN_FIELD_NUMBER;
-      hash = (53 * hash) + getSign().hashCode();
-      hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountType();
-      hash = (37 * hash) + EXTRA_BIN_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getExtraBinData().hashCode();
-      hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPsnId().hashCode();
-      hash = (37 * hash) + SUB_CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSubChannelId();
-      hash = (37 * hash) + SECRET_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + getSecretKey().hashCode();
+      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
+      hash = (53 * hash) + getBirthday().hashCode();
       hash = (37 * hash) + CLIENT_IP_STR_FIELD_NUMBER;
       hash = (53 * hash) + getClientIpStr().hashCode();
-      hash = (37 * hash) + BLACKUIDENDTIME_FIELD_NUMBER;
-      hash = (53 * hash) + getBlackUidEndTime();
-      hash = (37 * hash) + KCFIGJAPNIB_FIELD_NUMBER;
-      hash = (53 * hash) + getKCFIGJAPNIB();
-      hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getCountryCode().hashCode();
-      hash = (37 * hash) + CLOUDCLIENTIP_FIELD_NUMBER;
-      hash = (53 * hash) + getCloudClientIp();
+      hash = (37 * hash) + SIGN_FIELD_NUMBER;
+      hash = (53 * hash) + getSign().hashCode();
+      hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPsnId().hashCode();
+      hash = (37 * hash) + JLCDDOJGKKG_FIELD_NUMBER;
+      hash = (53 * hash) + getJLCDDOJGKKG().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1785,11 +2097,6 @@ public final class GetPlayerTokenRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2407
-     * Obf: BKFNIGMLAOA
-     * </pre>
-     *
      * Protobuf type {@code GetPlayerTokenRsp}
      */
     public static final class Builder extends
@@ -1827,73 +2134,85 @@ public final class GetPlayerTokenRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pELBMOHDKHJ_ = false;
-
-        iLGBPPMFHIF_ = false;
+        retcode_ = 0;
 
         secretKeySeed_ = 0L;
 
+        isGuest_ = false;
+
+        securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
+
+        isProficientPlayer_ = false;
+
+        accountUid_ = "";
+
+        blackUidEndTime_ = 0;
+
+        uid_ = 0;
+
+        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+
+        gmUid_ = 0;
+
+        secretKey_ = "";
+
+        accountType_ = 0;
+
+        platformType_ = 0;
+
+        msg_ = "";
+
+        token_ = "";
+
+        serverRandKey_ = "";
+
+        aKODFAIGJCE_ = false;
+
+        mPGMOFLCEOF_ = 0;
+
+        oCINFHOJCEA_ = 0;
+
+        keyId_ = 0;
+
+        gCDGEKAONGD_ = false;
+
         clientVersionRandomKey_ = "";
 
+        oLODGDMMPNF_ = "";
+
         if (stopServerBuilder_ == null) {
           stopServer_ = null;
         } else {
           stopServer_ = null;
           stopServerBuilder_ = null;
         }
-        channelId_ = 0;
+        hNBGEKMPFIB_ = false;
 
-        platformType_ = 0;
+        jDHCKKAGBNL_ = 0;
 
-        regPlatform_ = 0;
+        kEKHAKAPMIN_ = 0;
 
-        accountUid_ = "";
-
-        uid_ = 0;
+        cIJPMGMCJBA_ = 0;
 
         tag_ = 0;
 
-        birthday_ = "";
-
-        keyId_ = 0;
-
-        retcode_ = 0;
-
-        isGuest_ = false;
-
-        finishCollectionIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        serverRandKey_ = "";
-
-        securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
-
-        msg_ = "";
-
-        isProficientPlayer_ = false;
-
-        token_ = "";
-
-        sign_ = "";
-
-        accountType_ = 0;
-
-        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-
-        psnId_ = "";
-
-        subChannelId_ = 0;
-
-        secretKey_ = "";
-
-        clientIpStr_ = "";
-
-        blackUidEndTime_ = 0;
-
-        kCFIGJAPNIB_ = 0;
+        pLNNJPFPPAM_ = 0;
 
         countryCode_ = "";
 
-        cloudClientIp_ = 0;
+        gameBiz_ = "";
+
+        finishCollectionIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        birthday_ = "";
+
+        clientIpStr_ = "";
+
+        sign_ = "";
+
+        psnId_ = "";
+
+        jLCDDOJGKKG_ = "";
 
         return this;
       }
@@ -1922,46 +2241,52 @@ public final class GetPlayerTokenRspOuterClass {
       public emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp buildPartial() {
         emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp result = new emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp(this);
         int from_bitField0_ = bitField0_;
-        result.pELBMOHDKHJ_ = pELBMOHDKHJ_;
-        result.iLGBPPMFHIF_ = iLGBPPMFHIF_;
+        result.retcode_ = retcode_;
         result.secretKeySeed_ = secretKeySeed_;
+        result.isGuest_ = isGuest_;
+        result.securityCmdBuffer_ = securityCmdBuffer_;
+        result.isProficientPlayer_ = isProficientPlayer_;
+        result.accountUid_ = accountUid_;
+        result.blackUidEndTime_ = blackUidEndTime_;
+        result.uid_ = uid_;
+        result.extraBinData_ = extraBinData_;
+        result.gmUid_ = gmUid_;
+        result.secretKey_ = secretKey_;
+        result.accountType_ = accountType_;
+        result.platformType_ = platformType_;
+        result.msg_ = msg_;
+        result.token_ = token_;
+        result.serverRandKey_ = serverRandKey_;
+        result.aKODFAIGJCE_ = aKODFAIGJCE_;
+        result.mPGMOFLCEOF_ = mPGMOFLCEOF_;
+        result.oCINFHOJCEA_ = oCINFHOJCEA_;
+        result.keyId_ = keyId_;
+        result.gCDGEKAONGD_ = gCDGEKAONGD_;
         result.clientVersionRandomKey_ = clientVersionRandomKey_;
+        result.oLODGDMMPNF_ = oLODGDMMPNF_;
         if (stopServerBuilder_ == null) {
           result.stopServer_ = stopServer_;
         } else {
           result.stopServer_ = stopServerBuilder_.build();
         }
-        result.channelId_ = channelId_;
-        result.platformType_ = platformType_;
-        result.regPlatform_ = regPlatform_;
-        result.accountUid_ = accountUid_;
-        result.uid_ = uid_;
+        result.hNBGEKMPFIB_ = hNBGEKMPFIB_;
+        result.jDHCKKAGBNL_ = jDHCKKAGBNL_;
+        result.kEKHAKAPMIN_ = kEKHAKAPMIN_;
+        result.cIJPMGMCJBA_ = cIJPMGMCJBA_;
         result.tag_ = tag_;
-        result.birthday_ = birthday_;
-        result.keyId_ = keyId_;
-        result.retcode_ = retcode_;
-        result.isGuest_ = isGuest_;
+        result.pLNNJPFPPAM_ = pLNNJPFPPAM_;
+        result.countryCode_ = countryCode_;
+        result.gameBiz_ = gameBiz_;
         if (((bitField0_ & 0x00000001) != 0)) {
           finishCollectionIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.finishCollectionIdList_ = finishCollectionIdList_;
-        result.serverRandKey_ = serverRandKey_;
-        result.securityCmdBuffer_ = securityCmdBuffer_;
-        result.msg_ = msg_;
-        result.isProficientPlayer_ = isProficientPlayer_;
-        result.token_ = token_;
-        result.sign_ = sign_;
-        result.accountType_ = accountType_;
-        result.extraBinData_ = extraBinData_;
-        result.psnId_ = psnId_;
-        result.subChannelId_ = subChannelId_;
-        result.secretKey_ = secretKey_;
+        result.birthday_ = birthday_;
         result.clientIpStr_ = clientIpStr_;
-        result.blackUidEndTime_ = blackUidEndTime_;
-        result.kCFIGJAPNIB_ = kCFIGJAPNIB_;
-        result.countryCode_ = countryCode_;
-        result.cloudClientIp_ = cloudClientIp_;
+        result.sign_ = sign_;
+        result.psnId_ = psnId_;
+        result.jLCDDOJGKKG_ = jLCDDOJGKKG_;
         onBuilt();
         return result;
       }
@@ -2010,53 +2335,110 @@ public final class GetPlayerTokenRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp other) {
         if (other == emu.grasscutter.net.proto.GetPlayerTokenRspOuterClass.GetPlayerTokenRsp.getDefaultInstance()) return this;
-        if (other.getPELBMOHDKHJ() != false) {
-          setPELBMOHDKHJ(other.getPELBMOHDKHJ());
-        }
-        if (other.getILGBPPMFHIF() != false) {
-          setILGBPPMFHIF(other.getILGBPPMFHIF());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         if (other.getSecretKeySeed() != 0L) {
           setSecretKeySeed(other.getSecretKeySeed());
         }
-        if (!other.getClientVersionRandomKey().isEmpty()) {
-          clientVersionRandomKey_ = other.clientVersionRandomKey_;
-          onChanged();
+        if (other.getIsGuest() != false) {
+          setIsGuest(other.getIsGuest());
         }
-        if (other.hasStopServer()) {
-          mergeStopServer(other.getStopServer());
+        if (other.getSecurityCmdBuffer() != com.google.protobuf.ByteString.EMPTY) {
+          setSecurityCmdBuffer(other.getSecurityCmdBuffer());
         }
-        if (other.getChannelId() != 0) {
-          setChannelId(other.getChannelId());
-        }
-        if (other.getPlatformType() != 0) {
-          setPlatformType(other.getPlatformType());
-        }
-        if (other.getRegPlatform() != 0) {
-          setRegPlatform(other.getRegPlatform());
+        if (other.getIsProficientPlayer() != false) {
+          setIsProficientPlayer(other.getIsProficientPlayer());
         }
         if (!other.getAccountUid().isEmpty()) {
           accountUid_ = other.accountUid_;
           onChanged();
         }
+        if (other.getBlackUidEndTime() != 0) {
+          setBlackUidEndTime(other.getBlackUidEndTime());
+        }
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
-        if (other.getTag() != 0) {
-          setTag(other.getTag());
+        if (other.getExtraBinData() != com.google.protobuf.ByteString.EMPTY) {
+          setExtraBinData(other.getExtraBinData());
         }
-        if (!other.getBirthday().isEmpty()) {
-          birthday_ = other.birthday_;
+        if (other.getGmUid() != 0) {
+          setGmUid(other.getGmUid());
+        }
+        if (!other.getSecretKey().isEmpty()) {
+          secretKey_ = other.secretKey_;
           onChanged();
         }
+        if (other.getAccountType() != 0) {
+          setAccountType(other.getAccountType());
+        }
+        if (other.getPlatformType() != 0) {
+          setPlatformType(other.getPlatformType());
+        }
+        if (!other.getMsg().isEmpty()) {
+          msg_ = other.msg_;
+          onChanged();
+        }
+        if (!other.getToken().isEmpty()) {
+          token_ = other.token_;
+          onChanged();
+        }
+        if (!other.getServerRandKey().isEmpty()) {
+          serverRandKey_ = other.serverRandKey_;
+          onChanged();
+        }
+        if (other.getAKODFAIGJCE() != false) {
+          setAKODFAIGJCE(other.getAKODFAIGJCE());
+        }
+        if (other.getMPGMOFLCEOF() != 0) {
+          setMPGMOFLCEOF(other.getMPGMOFLCEOF());
+        }
+        if (other.getOCINFHOJCEA() != 0) {
+          setOCINFHOJCEA(other.getOCINFHOJCEA());
+        }
         if (other.getKeyId() != 0) {
           setKeyId(other.getKeyId());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getGCDGEKAONGD() != false) {
+          setGCDGEKAONGD(other.getGCDGEKAONGD());
         }
-        if (other.getIsGuest() != false) {
-          setIsGuest(other.getIsGuest());
+        if (!other.getClientVersionRandomKey().isEmpty()) {
+          clientVersionRandomKey_ = other.clientVersionRandomKey_;
+          onChanged();
+        }
+        if (!other.getOLODGDMMPNF().isEmpty()) {
+          oLODGDMMPNF_ = other.oLODGDMMPNF_;
+          onChanged();
+        }
+        if (other.hasStopServer()) {
+          mergeStopServer(other.getStopServer());
+        }
+        if (other.getHNBGEKMPFIB() != false) {
+          setHNBGEKMPFIB(other.getHNBGEKMPFIB());
+        }
+        if (other.getJDHCKKAGBNL() != 0) {
+          setJDHCKKAGBNL(other.getJDHCKKAGBNL());
+        }
+        if (other.getKEKHAKAPMIN() != 0) {
+          setKEKHAKAPMIN(other.getKEKHAKAPMIN());
+        }
+        if (other.getCIJPMGMCJBA() != 0) {
+          setCIJPMGMCJBA(other.getCIJPMGMCJBA());
+        }
+        if (other.getTag() != 0) {
+          setTag(other.getTag());
+        }
+        if (other.getPLNNJPFPPAM() != 0) {
+          setPLNNJPFPPAM(other.getPLNNJPFPPAM());
+        }
+        if (!other.getCountryCode().isEmpty()) {
+          countryCode_ = other.countryCode_;
+          onChanged();
+        }
+        if (!other.getGameBiz().isEmpty()) {
+          gameBiz_ = other.gameBiz_;
+          onChanged();
         }
         if (!other.finishCollectionIdList_.isEmpty()) {
           if (finishCollectionIdList_.isEmpty()) {
@@ -2068,61 +2450,25 @@ public final class GetPlayerTokenRspOuterClass {
           }
           onChanged();
         }
-        if (!other.getServerRandKey().isEmpty()) {
-          serverRandKey_ = other.serverRandKey_;
-          onChanged();
-        }
-        if (other.getSecurityCmdBuffer() != com.google.protobuf.ByteString.EMPTY) {
-          setSecurityCmdBuffer(other.getSecurityCmdBuffer());
-        }
-        if (!other.getMsg().isEmpty()) {
-          msg_ = other.msg_;
-          onChanged();
-        }
-        if (other.getIsProficientPlayer() != false) {
-          setIsProficientPlayer(other.getIsProficientPlayer());
-        }
-        if (!other.getToken().isEmpty()) {
-          token_ = other.token_;
-          onChanged();
-        }
-        if (!other.getSign().isEmpty()) {
-          sign_ = other.sign_;
-          onChanged();
-        }
-        if (other.getAccountType() != 0) {
-          setAccountType(other.getAccountType());
-        }
-        if (other.getExtraBinData() != com.google.protobuf.ByteString.EMPTY) {
-          setExtraBinData(other.getExtraBinData());
-        }
-        if (!other.getPsnId().isEmpty()) {
-          psnId_ = other.psnId_;
-          onChanged();
-        }
-        if (other.getSubChannelId() != 0) {
-          setSubChannelId(other.getSubChannelId());
-        }
-        if (!other.getSecretKey().isEmpty()) {
-          secretKey_ = other.secretKey_;
+        if (!other.getBirthday().isEmpty()) {
+          birthday_ = other.birthday_;
           onChanged();
         }
         if (!other.getClientIpStr().isEmpty()) {
           clientIpStr_ = other.clientIpStr_;
           onChanged();
         }
-        if (other.getBlackUidEndTime() != 0) {
-          setBlackUidEndTime(other.getBlackUidEndTime());
-        }
-        if (other.getKCFIGJAPNIB() != 0) {
-          setKCFIGJAPNIB(other.getKCFIGJAPNIB());
-        }
-        if (!other.getCountryCode().isEmpty()) {
-          countryCode_ = other.countryCode_;
+        if (!other.getSign().isEmpty()) {
+          sign_ = other.sign_;
           onChanged();
         }
-        if (other.getCloudClientIp() != 0) {
-          setCloudClientIp(other.getCloudClientIp());
+        if (!other.getPsnId().isEmpty()) {
+          psnId_ = other.psnId_;
+          onChanged();
+        }
+        if (!other.getJLCDDOJGKKG().isEmpty()) {
+          jLCDDOJGKKG_ = other.jLCDDOJGKKG_;
+          onChanged();
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -2154,71 +2500,40 @@ public final class GetPlayerTokenRspOuterClass {
       }
       private int bitField0_;
 
-      private boolean pELBMOHDKHJ_ ;
+      private int retcode_ ;
       /**
-       * <code>bool PELBMOHDKHJ = 1292;</code>
-       * @return The pELBMOHDKHJ.
+       * <code>int32 retcode = 1;</code>
+       * @return The retcode.
        */
       @java.lang.Override
-      public boolean getPELBMOHDKHJ() {
-        return pELBMOHDKHJ_;
+      public int getRetcode() {
+        return retcode_;
       }
       /**
-       * <code>bool PELBMOHDKHJ = 1292;</code>
-       * @param value The pELBMOHDKHJ to set.
+       * <code>int32 retcode = 1;</code>
+       * @param value The retcode to set.
        * @return This builder for chaining.
        */
-      public Builder setPELBMOHDKHJ(boolean value) {
+      public Builder setRetcode(int value) {
         
-        pELBMOHDKHJ_ = value;
+        retcode_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool PELBMOHDKHJ = 1292;</code>
+       * <code>int32 retcode = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPELBMOHDKHJ() {
+      public Builder clearRetcode() {
         
-        pELBMOHDKHJ_ = false;
-        onChanged();
-        return this;
-      }
-
-      private boolean iLGBPPMFHIF_ ;
-      /**
-       * <code>bool ILGBPPMFHIF = 1962;</code>
-       * @return The iLGBPPMFHIF.
-       */
-      @java.lang.Override
-      public boolean getILGBPPMFHIF() {
-        return iLGBPPMFHIF_;
-      }
-      /**
-       * <code>bool ILGBPPMFHIF = 1962;</code>
-       * @param value The iLGBPPMFHIF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setILGBPPMFHIF(boolean value) {
-        
-        iLGBPPMFHIF_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool ILGBPPMFHIF = 1962;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearILGBPPMFHIF() {
-        
-        iLGBPPMFHIF_ = false;
+        retcode_ = 0;
         onChanged();
         return this;
       }
 
       private long secretKeySeed_ ;
       /**
-       * <code>uint64 secret_key_seed = 13;</code>
+       * <code>uint64 secret_key_seed = 2;</code>
        * @return The secretKeySeed.
        */
       @java.lang.Override
@@ -2226,7 +2541,7 @@ public final class GetPlayerTokenRspOuterClass {
         return secretKeySeed_;
       }
       /**
-       * <code>uint64 secret_key_seed = 13;</code>
+       * <code>uint64 secret_key_seed = 2;</code>
        * @param value The secretKeySeed to set.
        * @return This builder for chaining.
        */
@@ -2237,7 +2552,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 secret_key_seed = 13;</code>
+       * <code>uint64 secret_key_seed = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearSecretKeySeed() {
@@ -2247,9 +2562,833 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
 
+      private boolean isGuest_ ;
+      /**
+       * <code>bool is_guest = 3;</code>
+       * @return The isGuest.
+       */
+      @java.lang.Override
+      public boolean getIsGuest() {
+        return isGuest_;
+      }
+      /**
+       * <code>bool is_guest = 3;</code>
+       * @param value The isGuest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsGuest(boolean value) {
+        
+        isGuest_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_guest = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsGuest() {
+        
+        isGuest_ = false;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes security_cmd_buffer = 4;</code>
+       * @return The securityCmdBuffer.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getSecurityCmdBuffer() {
+        return securityCmdBuffer_;
+      }
+      /**
+       * <code>bytes security_cmd_buffer = 4;</code>
+       * @param value The securityCmdBuffer to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSecurityCmdBuffer(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        securityCmdBuffer_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes security_cmd_buffer = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSecurityCmdBuffer() {
+        
+        securityCmdBuffer_ = getDefaultInstance().getSecurityCmdBuffer();
+        onChanged();
+        return this;
+      }
+
+      private boolean isProficientPlayer_ ;
+      /**
+       * <code>bool is_proficient_player = 5;</code>
+       * @return The isProficientPlayer.
+       */
+      @java.lang.Override
+      public boolean getIsProficientPlayer() {
+        return isProficientPlayer_;
+      }
+      /**
+       * <code>bool is_proficient_player = 5;</code>
+       * @param value The isProficientPlayer to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsProficientPlayer(boolean value) {
+        
+        isProficientPlayer_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_proficient_player = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsProficientPlayer() {
+        
+        isProficientPlayer_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object accountUid_ = "";
+      /**
+       * <code>string account_uid = 6;</code>
+       * @return The accountUid.
+       */
+      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();
+          accountUid_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string account_uid = 6;</code>
+       * @return The bytes for accountUid.
+       */
+      public com.google.protobuf.ByteString
+          getAccountUidBytes() {
+        java.lang.Object ref = accountUid_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          accountUid_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string account_uid = 6;</code>
+       * @param value The accountUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountUid(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        accountUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string account_uid = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAccountUid() {
+        
+        accountUid_ = getDefaultInstance().getAccountUid();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string account_uid = 6;</code>
+       * @param value The bytes for accountUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountUidBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        accountUid_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int blackUidEndTime_ ;
+      /**
+       * <code>uint32 black_uid_end_time = 7;</code>
+       * @return The blackUidEndTime.
+       */
+      @java.lang.Override
+      public int getBlackUidEndTime() {
+        return blackUidEndTime_;
+      }
+      /**
+       * <code>uint32 black_uid_end_time = 7;</code>
+       * @param value The blackUidEndTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBlackUidEndTime(int value) {
+        
+        blackUidEndTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 black_uid_end_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBlackUidEndTime() {
+        
+        blackUidEndTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 8;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 8;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes extra_bin_data = 9;</code>
+       * @return The extraBinData.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getExtraBinData() {
+        return extraBinData_;
+      }
+      /**
+       * <code>bytes extra_bin_data = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearExtraBinData() {
+        
+        extraBinData_ = getDefaultInstance().getExtraBinData();
+        onChanged();
+        return this;
+      }
+
+      private int gmUid_ ;
+      /**
+       * <code>uint32 gm_uid = 10;</code>
+       * @return The gmUid.
+       */
+      @java.lang.Override
+      public int getGmUid() {
+        return gmUid_;
+      }
+      /**
+       * <code>uint32 gm_uid = 10;</code>
+       * @param value The gmUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGmUid(int value) {
+        
+        gmUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gm_uid = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGmUid() {
+        
+        gmUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object secretKey_ = "";
+      /**
+       * <code>string secret_key = 11;</code>
+       * @return The secretKey.
+       */
+      public java.lang.String getSecretKey() {
+        java.lang.Object ref = secretKey_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          secretKey_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string secret_key = 11;</code>
+       * @return The bytes for secretKey.
+       */
+      public com.google.protobuf.ByteString
+          getSecretKeyBytes() {
+        java.lang.Object ref = secretKey_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          secretKey_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string secret_key = 11;</code>
+       * @param value The secretKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSecretKey(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        secretKey_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string secret_key = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSecretKey() {
+        
+        secretKey_ = getDefaultInstance().getSecretKey();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string secret_key = 11;</code>
+       * @param value The bytes for secretKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSecretKeyBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        secretKey_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int accountType_ ;
+      /**
+       * <code>uint32 account_type = 12;</code>
+       * @return The accountType.
+       */
+      @java.lang.Override
+      public int getAccountType() {
+        return accountType_;
+      }
+      /**
+       * <code>uint32 account_type = 12;</code>
+       * @param value The accountType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountType(int value) {
+        
+        accountType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 account_type = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAccountType() {
+        
+        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;
+      }
+
+      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 token_ = "";
+      /**
+       * <code>string token = 15;</code>
+       * @return The token.
+       */
+      public java.lang.String getToken() {
+        java.lang.Object ref = token_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          token_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string token = 15;</code>
+       * @return The bytes for token.
+       */
+      public com.google.protobuf.ByteString
+          getTokenBytes() {
+        java.lang.Object ref = token_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          token_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string token = 15;</code>
+       * @param value The token to set.
+       * @return This builder for chaining.
+       */
+      public Builder setToken(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        token_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string token = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearToken() {
+        
+        token_ = getDefaultInstance().getToken();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string token = 15;</code>
+       * @param value The bytes for token to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTokenBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        token_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object serverRandKey_ = "";
+      /**
+       * <code>string server_rand_key = 68;</code>
+       * @return The serverRandKey.
+       */
+      public java.lang.String getServerRandKey() {
+        java.lang.Object ref = serverRandKey_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          serverRandKey_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string server_rand_key = 68;</code>
+       * @return The bytes for serverRandKey.
+       */
+      public com.google.protobuf.ByteString
+          getServerRandKeyBytes() {
+        java.lang.Object ref = serverRandKey_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          serverRandKey_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string server_rand_key = 68;</code>
+       * @param value The serverRandKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setServerRandKey(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        serverRandKey_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string server_rand_key = 68;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearServerRandKey() {
+        
+        serverRandKey_ = getDefaultInstance().getServerRandKey();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string server_rand_key = 68;</code>
+       * @param value The bytes for serverRandKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setServerRandKeyBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        serverRandKey_ = value;
+        onChanged();
+        return this;
+      }
+
+      private boolean aKODFAIGJCE_ ;
+      /**
+       * <code>bool AKODFAIGJCE = 206;</code>
+       * @return The aKODFAIGJCE.
+       */
+      @java.lang.Override
+      public boolean getAKODFAIGJCE() {
+        return aKODFAIGJCE_;
+      }
+      /**
+       * <code>bool AKODFAIGJCE = 206;</code>
+       * @param value The aKODFAIGJCE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAKODFAIGJCE(boolean value) {
+        
+        aKODFAIGJCE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool AKODFAIGJCE = 206;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAKODFAIGJCE() {
+        
+        aKODFAIGJCE_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int mPGMOFLCEOF_ ;
+      /**
+       * <code>uint32 MPGMOFLCEOF = 267;</code>
+       * @return The mPGMOFLCEOF.
+       */
+      @java.lang.Override
+      public int getMPGMOFLCEOF() {
+        return mPGMOFLCEOF_;
+      }
+      /**
+       * <code>uint32 MPGMOFLCEOF = 267;</code>
+       * @param value The mPGMOFLCEOF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMPGMOFLCEOF(int value) {
+        
+        mPGMOFLCEOF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MPGMOFLCEOF = 267;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMPGMOFLCEOF() {
+        
+        mPGMOFLCEOF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oCINFHOJCEA_ ;
+      /**
+       * <code>uint32 OCINFHOJCEA = 290;</code>
+       * @return The oCINFHOJCEA.
+       */
+      @java.lang.Override
+      public int getOCINFHOJCEA() {
+        return oCINFHOJCEA_;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 290;</code>
+       * @param value The oCINFHOJCEA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOCINFHOJCEA(int value) {
+        
+        oCINFHOJCEA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 290;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOCINFHOJCEA() {
+        
+        oCINFHOJCEA_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int keyId_ ;
+      /**
+       * <code>uint32 key_id = 398;</code>
+       * @return The keyId.
+       */
+      @java.lang.Override
+      public int getKeyId() {
+        return keyId_;
+      }
+      /**
+       * <code>uint32 key_id = 398;</code>
+       * @param value The keyId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKeyId(int value) {
+        
+        keyId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 key_id = 398;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKeyId() {
+        
+        keyId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean gCDGEKAONGD_ ;
+      /**
+       * <code>bool GCDGEKAONGD = 440;</code>
+       * @return The gCDGEKAONGD.
+       */
+      @java.lang.Override
+      public boolean getGCDGEKAONGD() {
+        return gCDGEKAONGD_;
+      }
+      /**
+       * <code>bool GCDGEKAONGD = 440;</code>
+       * @param value The gCDGEKAONGD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGCDGEKAONGD(boolean value) {
+        
+        gCDGEKAONGD_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool GCDGEKAONGD = 440;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGCDGEKAONGD() {
+        
+        gCDGEKAONGD_ = false;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object clientVersionRandomKey_ = "";
       /**
-       * <code>string client_version_random_key = 678;</code>
+       * <pre>
+       *sus KNCFLPGOMNI
+       * </pre>
+       *
+       * <code>string client_version_random_key = 496;</code>
        * @return The clientVersionRandomKey.
        */
       public java.lang.String getClientVersionRandomKey() {
@@ -2265,7 +3404,11 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>string client_version_random_key = 678;</code>
+       * <pre>
+       *sus KNCFLPGOMNI
+       * </pre>
+       *
+       * <code>string client_version_random_key = 496;</code>
        * @return The bytes for clientVersionRandomKey.
        */
       public com.google.protobuf.ByteString
@@ -2282,7 +3425,11 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>string client_version_random_key = 678;</code>
+       * <pre>
+       *sus KNCFLPGOMNI
+       * </pre>
+       *
+       * <code>string client_version_random_key = 496;</code>
        * @param value The clientVersionRandomKey to set.
        * @return This builder for chaining.
        */
@@ -2297,7 +3444,11 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>string client_version_random_key = 678;</code>
+       * <pre>
+       *sus KNCFLPGOMNI
+       * </pre>
+       *
+       * <code>string client_version_random_key = 496;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientVersionRandomKey() {
@@ -2307,7 +3458,11 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>string client_version_random_key = 678;</code>
+       * <pre>
+       *sus KNCFLPGOMNI
+       * </pre>
+       *
+       * <code>string client_version_random_key = 496;</code>
        * @param value The bytes for clientVersionRandomKey to set.
        * @return This builder for chaining.
        */
@@ -2323,18 +3478,94 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
 
+      private java.lang.Object oLODGDMMPNF_ = "";
+      /**
+       * <code>string OLODGDMMPNF = 528;</code>
+       * @return The oLODGDMMPNF.
+       */
+      public java.lang.String getOLODGDMMPNF() {
+        java.lang.Object ref = oLODGDMMPNF_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          oLODGDMMPNF_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string OLODGDMMPNF = 528;</code>
+       * @return The bytes for oLODGDMMPNF.
+       */
+      public com.google.protobuf.ByteString
+          getOLODGDMMPNFBytes() {
+        java.lang.Object ref = oLODGDMMPNF_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          oLODGDMMPNF_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string OLODGDMMPNF = 528;</code>
+       * @param value The oLODGDMMPNF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOLODGDMMPNF(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        oLODGDMMPNF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string OLODGDMMPNF = 528;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOLODGDMMPNF() {
+        
+        oLODGDMMPNF_ = getDefaultInstance().getOLODGDMMPNF();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string OLODGDMMPNF = 528;</code>
+       * @param value The bytes for oLODGDMMPNF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOLODGDMMPNFBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        oLODGDMMPNF_ = value;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo stopServer_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> stopServerBuilder_;
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        * @return Whether the stopServer field is set.
        */
       public boolean hasStopServer() {
         return stopServerBuilder_ != null || stopServer_ != null;
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        * @return The stopServer.
        */
       public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer() {
@@ -2345,7 +3576,7 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public Builder setStopServer(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
         if (stopServerBuilder_ == null) {
@@ -2361,7 +3592,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public Builder setStopServer(
           emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder builderForValue) {
@@ -2375,7 +3606,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public Builder mergeStopServer(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
         if (stopServerBuilder_ == null) {
@@ -2393,7 +3624,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public Builder clearStopServer() {
         if (stopServerBuilder_ == null) {
@@ -2407,7 +3638,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder getStopServerBuilder() {
         
@@ -2415,7 +3646,7 @@ public final class GetPlayerTokenRspOuterClass {
         return getStopServerFieldBuilder().getBuilder();
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</code>
        */
       public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder() {
         if (stopServerBuilder_ != null) {
@@ -2426,7 +3657,7 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>.StopServerInfo stop_server = 875;</code>
+       * <code>.StopServerInfo stop_server = 563;</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> 
@@ -2442,209 +3673,133 @@ public final class GetPlayerTokenRspOuterClass {
         return stopServerBuilder_;
       }
 
-      private int channelId_ ;
+      private boolean hNBGEKMPFIB_ ;
       /**
-       * <code>uint32 channel_id = 259;</code>
-       * @return The channelId.
+       * <code>bool HNBGEKMPFIB = 575;</code>
+       * @return The hNBGEKMPFIB.
        */
       @java.lang.Override
-      public int getChannelId() {
-        return channelId_;
+      public boolean getHNBGEKMPFIB() {
+        return hNBGEKMPFIB_;
       }
       /**
-       * <code>uint32 channel_id = 259;</code>
-       * @param value The channelId to set.
+       * <code>bool HNBGEKMPFIB = 575;</code>
+       * @param value The hNBGEKMPFIB to set.
        * @return This builder for chaining.
        */
-      public Builder setChannelId(int value) {
+      public Builder setHNBGEKMPFIB(boolean value) {
         
-        channelId_ = value;
+        hNBGEKMPFIB_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 channel_id = 259;</code>
+       * <code>bool HNBGEKMPFIB = 575;</code>
        * @return This builder for chaining.
        */
-      public Builder clearChannelId() {
+      public Builder clearHNBGEKMPFIB() {
         
-        channelId_ = 0;
+        hNBGEKMPFIB_ = false;
         onChanged();
         return this;
       }
 
-      private int platformType_ ;
+      private int jDHCKKAGBNL_ ;
       /**
-       * <code>uint32 platform_type = 5;</code>
-       * @return The platformType.
+       * <code>uint32 JDHCKKAGBNL = 576;</code>
+       * @return The jDHCKKAGBNL.
        */
       @java.lang.Override
-      public int getPlatformType() {
-        return platformType_;
+      public int getJDHCKKAGBNL() {
+        return jDHCKKAGBNL_;
       }
       /**
-       * <code>uint32 platform_type = 5;</code>
-       * @param value The platformType to set.
+       * <code>uint32 JDHCKKAGBNL = 576;</code>
+       * @param value The jDHCKKAGBNL to set.
        * @return This builder for chaining.
        */
-      public Builder setPlatformType(int value) {
+      public Builder setJDHCKKAGBNL(int value) {
         
-        platformType_ = value;
+        jDHCKKAGBNL_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 platform_type = 5;</code>
+       * <code>uint32 JDHCKKAGBNL = 576;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPlatformType() {
+      public Builder clearJDHCKKAGBNL() {
         
-        platformType_ = 0;
+        jDHCKKAGBNL_ = 0;
         onChanged();
         return this;
       }
 
-      private int regPlatform_ ;
+      private int kEKHAKAPMIN_ ;
       /**
-       * <code>uint32 reg_platform = 1241;</code>
-       * @return The regPlatform.
+       * <code>uint32 KEKHAKAPMIN = 630;</code>
+       * @return The kEKHAKAPMIN.
        */
       @java.lang.Override
-      public int getRegPlatform() {
-        return regPlatform_;
+      public int getKEKHAKAPMIN() {
+        return kEKHAKAPMIN_;
       }
       /**
-       * <code>uint32 reg_platform = 1241;</code>
-       * @param value The regPlatform to set.
+       * <code>uint32 KEKHAKAPMIN = 630;</code>
+       * @param value The kEKHAKAPMIN to set.
        * @return This builder for chaining.
        */
-      public Builder setRegPlatform(int value) {
+      public Builder setKEKHAKAPMIN(int value) {
         
-        regPlatform_ = value;
+        kEKHAKAPMIN_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 reg_platform = 1241;</code>
+       * <code>uint32 KEKHAKAPMIN = 630;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRegPlatform() {
+      public Builder clearKEKHAKAPMIN() {
         
-        regPlatform_ = 0;
+        kEKHAKAPMIN_ = 0;
         onChanged();
         return this;
       }
 
-      private java.lang.Object accountUid_ = "";
+      private int cIJPMGMCJBA_ ;
       /**
-       * <code>string account_uid = 3;</code>
-       * @return The accountUid.
-       */
-      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();
-          accountUid_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string account_uid = 3;</code>
-       * @return The bytes for accountUid.
-       */
-      public com.google.protobuf.ByteString
-          getAccountUidBytes() {
-        java.lang.Object ref = accountUid_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          accountUid_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string account_uid = 3;</code>
-       * @param value The accountUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAccountUid(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        accountUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string account_uid = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAccountUid() {
-        
-        accountUid_ = getDefaultInstance().getAccountUid();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string account_uid = 3;</code>
-       * @param value The bytes for accountUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAccountUidBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        accountUid_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 7;</code>
-       * @return The uid.
+       * <code>uint32 CIJPMGMCJBA = 847;</code>
+       * @return The cIJPMGMCJBA.
        */
       @java.lang.Override
-      public int getUid() {
-        return uid_;
+      public int getCIJPMGMCJBA() {
+        return cIJPMGMCJBA_;
       }
       /**
-       * <code>uint32 uid = 7;</code>
-       * @param value The uid to set.
+       * <code>uint32 CIJPMGMCJBA = 847;</code>
+       * @param value The cIJPMGMCJBA to set.
        * @return This builder for chaining.
        */
-      public Builder setUid(int value) {
+      public Builder setCIJPMGMCJBA(int value) {
         
-        uid_ = value;
+        cIJPMGMCJBA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 uid = 7;</code>
+       * <code>uint32 CIJPMGMCJBA = 847;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUid() {
+      public Builder clearCIJPMGMCJBA() {
         
-        uid_ = 0;
+        cIJPMGMCJBA_ = 0;
         onChanged();
         return this;
       }
 
       private int tag_ ;
       /**
-       * <code>uint32 tag = 1572;</code>
+       * <code>uint32 tag = 853;</code>
        * @return The tag.
        */
       @java.lang.Override
@@ -2652,7 +3807,7 @@ public final class GetPlayerTokenRspOuterClass {
         return tag_;
       }
       /**
-       * <code>uint32 tag = 1572;</code>
+       * <code>uint32 tag = 853;</code>
        * @param value The tag to set.
        * @return This builder for chaining.
        */
@@ -2663,7 +3818,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 tag = 1572;</code>
+       * <code>uint32 tag = 853;</code>
        * @return This builder for chaining.
        */
       public Builder clearTag() {
@@ -2673,1012 +3828,40 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
 
-      private java.lang.Object birthday_ = "";
+      private int pLNNJPFPPAM_ ;
       /**
-       * <code>string birthday = 1437;</code>
-       * @return The birthday.
-       */
-      public java.lang.String getBirthday() {
-        java.lang.Object ref = birthday_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          birthday_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 1437;</code>
-       * @return The bytes for birthday.
-       */
-      public com.google.protobuf.ByteString
-          getBirthdayBytes() {
-        java.lang.Object ref = birthday_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          birthday_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 1437;</code>
-       * @param value The birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthday(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 1437;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBirthday() {
-        
-        birthday_ = getDefaultInstance().getBirthday();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 1437;</code>
-       * @param value The bytes for birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthdayBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int keyId_ ;
-      /**
-       * <code>uint32 key_id = 1676;</code>
-       * @return The keyId.
+       * <code>uint32 PLNNJPFPPAM = 1118;</code>
+       * @return The pLNNJPFPPAM.
        */
       @java.lang.Override
-      public int getKeyId() {
-        return keyId_;
+      public int getPLNNJPFPPAM() {
+        return pLNNJPFPPAM_;
       }
       /**
-       * <code>uint32 key_id = 1676;</code>
-       * @param value The keyId to set.
+       * <code>uint32 PLNNJPFPPAM = 1118;</code>
+       * @param value The pLNNJPFPPAM to set.
        * @return This builder for chaining.
        */
-      public Builder setKeyId(int value) {
+      public Builder setPLNNJPFPPAM(int value) {
         
-        keyId_ = value;
+        pLNNJPFPPAM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 key_id = 1676;</code>
+       * <code>uint32 PLNNJPFPPAM = 1118;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKeyId() {
+      public Builder clearPLNNJPFPPAM() {
         
-        keyId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isGuest_ ;
-      /**
-       * <code>bool is_guest = 2;</code>
-       * @return The isGuest.
-       */
-      @java.lang.Override
-      public boolean getIsGuest() {
-        return isGuest_;
-      }
-      /**
-       * <code>bool is_guest = 2;</code>
-       * @param value The isGuest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsGuest(boolean value) {
-        
-        isGuest_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_guest = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsGuest() {
-        
-        isGuest_ = false;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList finishCollectionIdList_ = emptyIntList();
-      private void ensureFinishCollectionIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          finishCollectionIdList_ = mutableCopy(finishCollectionIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @return A list containing the finishCollectionIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getFinishCollectionIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(finishCollectionIdList_) : finishCollectionIdList_;
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @return The count of finishCollectionIdList.
-       */
-      public int getFinishCollectionIdListCount() {
-        return finishCollectionIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @param index The index of the element to return.
-       * @return The finishCollectionIdList at the given index.
-       */
-      public int getFinishCollectionIdList(int index) {
-        return finishCollectionIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @param index The index to set the value at.
-       * @param value The finishCollectionIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishCollectionIdList(
-          int index, int value) {
-        ensureFinishCollectionIdListIsMutable();
-        finishCollectionIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @param value The finishCollectionIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFinishCollectionIdList(int value) {
-        ensureFinishCollectionIdListIsMutable();
-        finishCollectionIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @param values The finishCollectionIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFinishCollectionIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFinishCollectionIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, finishCollectionIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_collection_id_list = 451;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinishCollectionIdList() {
-        finishCollectionIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object serverRandKey_ = "";
-      /**
-       * <code>string server_rand_key = 517;</code>
-       * @return The serverRandKey.
-       */
-      public java.lang.String getServerRandKey() {
-        java.lang.Object ref = serverRandKey_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          serverRandKey_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string server_rand_key = 517;</code>
-       * @return The bytes for serverRandKey.
-       */
-      public com.google.protobuf.ByteString
-          getServerRandKeyBytes() {
-        java.lang.Object ref = serverRandKey_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          serverRandKey_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string server_rand_key = 517;</code>
-       * @param value The serverRandKey to set.
-       * @return This builder for chaining.
-       */
-      public Builder setServerRandKey(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        serverRandKey_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string server_rand_key = 517;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearServerRandKey() {
-        
-        serverRandKey_ = getDefaultInstance().getServerRandKey();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string server_rand_key = 517;</code>
-       * @param value The bytes for serverRandKey to set.
-       * @return This builder for chaining.
-       */
-      public Builder setServerRandKeyBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        serverRandKey_ = value;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString securityCmdBuffer_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes security_cmd_buffer = 15;</code>
-       * @return The securityCmdBuffer.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getSecurityCmdBuffer() {
-        return securityCmdBuffer_;
-      }
-      /**
-       * <code>bytes security_cmd_buffer = 15;</code>
-       * @param value The securityCmdBuffer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSecurityCmdBuffer(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        securityCmdBuffer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes security_cmd_buffer = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSecurityCmdBuffer() {
-        
-        securityCmdBuffer_ = getDefaultInstance().getSecurityCmdBuffer();
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object msg_ = "";
-      /**
-       * <code>string msg = 12;</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 = 12;</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 = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMsg() {
-        
-        msg_ = getDefaultInstance().getMsg();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 12;</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 boolean isProficientPlayer_ ;
-      /**
-       * <code>bool is_proficient_player = 8;</code>
-       * @return The isProficientPlayer.
-       */
-      @java.lang.Override
-      public boolean getIsProficientPlayer() {
-        return isProficientPlayer_;
-      }
-      /**
-       * <code>bool is_proficient_player = 8;</code>
-       * @param value The isProficientPlayer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsProficientPlayer(boolean value) {
-        
-        isProficientPlayer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_proficient_player = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsProficientPlayer() {
-        
-        isProficientPlayer_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object token_ = "";
-      /**
-       * <code>string token = 11;</code>
-       * @return The token.
-       */
-      public java.lang.String getToken() {
-        java.lang.Object ref = token_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          token_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string token = 11;</code>
-       * @return The bytes for token.
-       */
-      public com.google.protobuf.ByteString
-          getTokenBytes() {
-        java.lang.Object ref = token_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          token_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string token = 11;</code>
-       * @param value The token to set.
-       * @return This builder for chaining.
-       */
-      public Builder setToken(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        token_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string token = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearToken() {
-        
-        token_ = getDefaultInstance().getToken();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string token = 11;</code>
-       * @param value The bytes for token to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTokenBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        token_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object sign_ = "";
-      /**
-       * <code>string sign = 394;</code>
-       * @return The sign.
-       */
-      public java.lang.String getSign() {
-        java.lang.Object ref = sign_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          sign_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string sign = 394;</code>
-       * @return The bytes for sign.
-       */
-      public com.google.protobuf.ByteString
-          getSignBytes() {
-        java.lang.Object ref = sign_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          sign_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string sign = 394;</code>
-       * @param value The sign to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSign(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        sign_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string sign = 394;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSign() {
-        
-        sign_ = getDefaultInstance().getSign();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string sign = 394;</code>
-       * @param value The bytes for sign to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSignBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        sign_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int accountType_ ;
-      /**
-       * <code>uint32 account_type = 1585;</code>
-       * @return The accountType.
-       */
-      @java.lang.Override
-      public int getAccountType() {
-        return accountType_;
-      }
-      /**
-       * <code>uint32 account_type = 1585;</code>
-       * @param value The accountType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAccountType(int value) {
-        
-        accountType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 account_type = 1585;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAccountType() {
-        
-        accountType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes extra_bin_data = 1;</code>
-       * @return The extraBinData.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getExtraBinData() {
-        return extraBinData_;
-      }
-      /**
-       * <code>bytes extra_bin_data = 1;</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 = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearExtraBinData() {
-        
-        extraBinData_ = getDefaultInstance().getExtraBinData();
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object psnId_ = "";
-      /**
-       * <code>string psn_id = 1790;</code>
-       * @return The psnId.
-       */
-      public java.lang.String getPsnId() {
-        java.lang.Object ref = psnId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          psnId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string psn_id = 1790;</code>
-       * @return The bytes for psnId.
-       */
-      public com.google.protobuf.ByteString
-          getPsnIdBytes() {
-        java.lang.Object ref = psnId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          psnId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string psn_id = 1790;</code>
-       * @param value The psnId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPsnId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        psnId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string psn_id = 1790;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPsnId() {
-        
-        psnId_ = getDefaultInstance().getPsnId();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string psn_id = 1790;</code>
-       * @param value The bytes for psnId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPsnIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        psnId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int subChannelId_ ;
-      /**
-       * <code>uint32 sub_channel_id = 14;</code>
-       * @return The subChannelId.
-       */
-      @java.lang.Override
-      public int getSubChannelId() {
-        return subChannelId_;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 14;</code>
-       * @param value The subChannelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSubChannelId(int value) {
-        
-        subChannelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSubChannelId() {
-        
-        subChannelId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object secretKey_ = "";
-      /**
-       * <code>string secret_key = 9;</code>
-       * @return The secretKey.
-       */
-      public java.lang.String getSecretKey() {
-        java.lang.Object ref = secretKey_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          secretKey_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string secret_key = 9;</code>
-       * @return The bytes for secretKey.
-       */
-      public com.google.protobuf.ByteString
-          getSecretKeyBytes() {
-        java.lang.Object ref = secretKey_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          secretKey_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string secret_key = 9;</code>
-       * @param value The secretKey to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSecretKey(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        secretKey_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string secret_key = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSecretKey() {
-        
-        secretKey_ = getDefaultInstance().getSecretKey();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string secret_key = 9;</code>
-       * @param value The bytes for secretKey to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSecretKeyBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        secretKey_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientIpStr_ = "";
-      /**
-       * <code>string client_ip_str = 1921;</code>
-       * @return The clientIpStr.
-       */
-      public java.lang.String getClientIpStr() {
-        java.lang.Object ref = clientIpStr_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientIpStr_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_ip_str = 1921;</code>
-       * @return The bytes for clientIpStr.
-       */
-      public com.google.protobuf.ByteString
-          getClientIpStrBytes() {
-        java.lang.Object ref = clientIpStr_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientIpStr_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_ip_str = 1921;</code>
-       * @param value The clientIpStr to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientIpStr(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientIpStr_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_ip_str = 1921;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientIpStr() {
-        
-        clientIpStr_ = getDefaultInstance().getClientIpStr();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_ip_str = 1921;</code>
-       * @param value The bytes for clientIpStr to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientIpStrBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientIpStr_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int blackUidEndTime_ ;
-      /**
-       * <code>uint32 blackUidEndTime = 10;</code>
-       * @return The blackUidEndTime.
-       */
-      @java.lang.Override
-      public int getBlackUidEndTime() {
-        return blackUidEndTime_;
-      }
-      /**
-       * <code>uint32 blackUidEndTime = 10;</code>
-       * @param value The blackUidEndTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBlackUidEndTime(int value) {
-        
-        blackUidEndTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 blackUidEndTime = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBlackUidEndTime() {
-        
-        blackUidEndTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int kCFIGJAPNIB_ ;
-      /**
-       * <code>uint32 KCFIGJAPNIB = 6;</code>
-       * @return The kCFIGJAPNIB.
-       */
-      @java.lang.Override
-      public int getKCFIGJAPNIB() {
-        return kCFIGJAPNIB_;
-      }
-      /**
-       * <code>uint32 KCFIGJAPNIB = 6;</code>
-       * @param value The kCFIGJAPNIB to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKCFIGJAPNIB(int value) {
-        
-        kCFIGJAPNIB_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KCFIGJAPNIB = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKCFIGJAPNIB() {
-        
-        kCFIGJAPNIB_ = 0;
+        pLNNJPFPPAM_ = 0;
         onChanged();
         return this;
       }
 
       private java.lang.Object countryCode_ = "";
       /**
-       * <code>string country_code = 1412;</code>
+       * <code>string country_code = 1269;</code>
        * @return The countryCode.
        */
       public java.lang.String getCountryCode() {
@@ -3694,7 +3877,7 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>string country_code = 1412;</code>
+       * <code>string country_code = 1269;</code>
        * @return The bytes for countryCode.
        */
       public com.google.protobuf.ByteString
@@ -3711,7 +3894,7 @@ public final class GetPlayerTokenRspOuterClass {
         }
       }
       /**
-       * <code>string country_code = 1412;</code>
+       * <code>string country_code = 1269;</code>
        * @param value The countryCode to set.
        * @return This builder for chaining.
        */
@@ -3726,7 +3909,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>string country_code = 1412;</code>
+       * <code>string country_code = 1269;</code>
        * @return This builder for chaining.
        */
       public Builder clearCountryCode() {
@@ -3736,7 +3919,7 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
       /**
-       * <code>string country_code = 1412;</code>
+       * <code>string country_code = 1269;</code>
        * @param value The bytes for countryCode to set.
        * @return This builder for chaining.
        */
@@ -3752,33 +3935,537 @@ public final class GetPlayerTokenRspOuterClass {
         return this;
       }
 
-      private int cloudClientIp_ ;
+      private java.lang.Object gameBiz_ = "";
       /**
-       * <code>uint32 cloudClientIp = 508;</code>
-       * @return The cloudClientIp.
+       * <code>string game_biz = 1670;</code>
+       * @return The gameBiz.
        */
-      @java.lang.Override
-      public int getCloudClientIp() {
-        return cloudClientIp_;
+      public java.lang.String getGameBiz() {
+        java.lang.Object ref = gameBiz_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gameBiz_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 cloudClientIp = 508;</code>
-       * @param value The cloudClientIp to set.
+       * <code>string game_biz = 1670;</code>
+       * @return The bytes for gameBiz.
+       */
+      public com.google.protobuf.ByteString
+          getGameBizBytes() {
+        java.lang.Object ref = gameBiz_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gameBiz_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string game_biz = 1670;</code>
+       * @param value The gameBiz to set.
        * @return This builder for chaining.
        */
-      public Builder setCloudClientIp(int value) {
-        
-        cloudClientIp_ = value;
+      public Builder setGameBiz(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gameBiz_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cloudClientIp = 508;</code>
+       * <code>string game_biz = 1670;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCloudClientIp() {
+      public Builder clearGameBiz() {
         
-        cloudClientIp_ = 0;
+        gameBiz_ = getDefaultInstance().getGameBiz();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string game_biz = 1670;</code>
+       * @param value The bytes for gameBiz to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGameBizBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gameBiz_ = value;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList finishCollectionIdList_ = emptyIntList();
+      private void ensureFinishCollectionIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          finishCollectionIdList_ = mutableCopy(finishCollectionIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @return A list containing the finishCollectionIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getFinishCollectionIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(finishCollectionIdList_) : finishCollectionIdList_;
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @return The count of finishCollectionIdList.
+       */
+      public int getFinishCollectionIdListCount() {
+        return finishCollectionIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @param index The index of the element to return.
+       * @return The finishCollectionIdList at the given index.
+       */
+      public int getFinishCollectionIdList(int index) {
+        return finishCollectionIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @param index The index to set the value at.
+       * @param value The finishCollectionIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishCollectionIdList(
+          int index, int value) {
+        ensureFinishCollectionIdListIsMutable();
+        finishCollectionIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @param value The finishCollectionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFinishCollectionIdList(int value) {
+        ensureFinishCollectionIdListIsMutable();
+        finishCollectionIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @param values The finishCollectionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFinishCollectionIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFinishCollectionIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, finishCollectionIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_collection_id_list = 1684;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinishCollectionIdList() {
+        finishCollectionIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object birthday_ = "";
+      /**
+       * <code>string birthday = 1735;</code>
+       * @return The birthday.
+       */
+      public java.lang.String getBirthday() {
+        java.lang.Object ref = birthday_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          birthday_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 1735;</code>
+       * @return The bytes for birthday.
+       */
+      public com.google.protobuf.ByteString
+          getBirthdayBytes() {
+        java.lang.Object ref = birthday_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          birthday_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 1735;</code>
+       * @param value The birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthday(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 1735;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBirthday() {
+        
+        birthday_ = getDefaultInstance().getBirthday();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 1735;</code>
+       * @param value The bytes for birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthdayBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object clientIpStr_ = "";
+      /**
+       * <code>string client_ip_str = 1871;</code>
+       * @return The clientIpStr.
+       */
+      public java.lang.String getClientIpStr() {
+        java.lang.Object ref = clientIpStr_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          clientIpStr_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string client_ip_str = 1871;</code>
+       * @return The bytes for clientIpStr.
+       */
+      public com.google.protobuf.ByteString
+          getClientIpStrBytes() {
+        java.lang.Object ref = clientIpStr_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          clientIpStr_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string client_ip_str = 1871;</code>
+       * @param value The clientIpStr to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientIpStr(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientIpStr_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_ip_str = 1871;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientIpStr() {
+        
+        clientIpStr_ = getDefaultInstance().getClientIpStr();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_ip_str = 1871;</code>
+       * @param value The bytes for clientIpStr to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientIpStrBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        clientIpStr_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object sign_ = "";
+      /**
+       * <code>string sign = 1885;</code>
+       * @return The sign.
+       */
+      public java.lang.String getSign() {
+        java.lang.Object ref = sign_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          sign_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string sign = 1885;</code>
+       * @return The bytes for sign.
+       */
+      public com.google.protobuf.ByteString
+          getSignBytes() {
+        java.lang.Object ref = sign_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          sign_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string sign = 1885;</code>
+       * @param value The sign to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSign(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        sign_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string sign = 1885;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSign() {
+        
+        sign_ = getDefaultInstance().getSign();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string sign = 1885;</code>
+       * @param value The bytes for sign to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSignBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        sign_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object psnId_ = "";
+      /**
+       * <code>string psn_id = 1954;</code>
+       * @return The psnId.
+       */
+      public java.lang.String getPsnId() {
+        java.lang.Object ref = psnId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          psnId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string psn_id = 1954;</code>
+       * @return The bytes for psnId.
+       */
+      public com.google.protobuf.ByteString
+          getPsnIdBytes() {
+        java.lang.Object ref = psnId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          psnId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string psn_id = 1954;</code>
+       * @param value The psnId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPsnId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        psnId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string psn_id = 1954;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPsnId() {
+        
+        psnId_ = getDefaultInstance().getPsnId();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string psn_id = 1954;</code>
+       * @param value The bytes for psnId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPsnIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        psnId_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object jLCDDOJGKKG_ = "";
+      /**
+       * <code>string JLCDDOJGKKG = 2042;</code>
+       * @return The jLCDDOJGKKG.
+       */
+      public java.lang.String getJLCDDOJGKKG() {
+        java.lang.Object ref = jLCDDOJGKKG_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          jLCDDOJGKKG_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string JLCDDOJGKKG = 2042;</code>
+       * @return The bytes for jLCDDOJGKKG.
+       */
+      public com.google.protobuf.ByteString
+          getJLCDDOJGKKGBytes() {
+        java.lang.Object ref = jLCDDOJGKKG_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          jLCDDOJGKKG_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string JLCDDOJGKKG = 2042;</code>
+       * @param value The jLCDDOJGKKG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJLCDDOJGKKG(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        jLCDDOJGKKG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JLCDDOJGKKG = 2042;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJLCDDOJGKKG() {
+        
+        jLCDDOJGKKG_ = getDefaultInstance().getJLCDDOJGKKG();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JLCDDOJGKKG = 2042;</code>
+       * @param value The bytes for jLCDDOJGKKG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJLCDDOJGKKGBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        jLCDDOJGKKG_ = value;
         onChanged();
         return this;
       }
@@ -3850,26 +4537,29 @@ public final class GetPlayerTokenRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027GetPlayerTokenRsp.proto\032\024StopServerInf" +
-      "o.proto\"\342\005\n\021GetPlayerTokenRsp\022\024\n\013PELBMOH" +
-      "DKHJ\030\214\n \001(\010\022\024\n\013ILGBPPMFHIF\030\252\017 \001(\010\022\027\n\017sec" +
-      "ret_key_seed\030\r \001(\004\022\"\n\031client_version_ran" +
-      "dom_key\030\246\005 \001(\t\022%\n\013stop_server\030\353\006 \001(\0132\017.S" +
-      "topServerInfo\022\023\n\nchannel_id\030\203\002 \001(\r\022\025\n\rpl" +
-      "atform_type\030\005 \001(\r\022\025\n\014reg_platform\030\331\t \001(\r" +
-      "\022\023\n\013account_uid\030\003 \001(\t\022\013\n\003uid\030\007 \001(\r\022\014\n\003ta" +
-      "g\030\244\014 \001(\r\022\021\n\010birthday\030\235\013 \001(\t\022\017\n\006key_id\030\214\r" +
-      " \001(\r\022\017\n\007retcode\030\004 \001(\005\022\020\n\010is_guest\030\002 \001(\010\022" +
-      "\"\n\031finish_collection_id_list\030\303\003 \003(\r\022\030\n\017s" +
-      "erver_rand_key\030\205\004 \001(\t\022\033\n\023security_cmd_bu" +
-      "ffer\030\017 \001(\014\022\013\n\003msg\030\014 \001(\t\022\034\n\024is_proficient" +
-      "_player\030\010 \001(\010\022\r\n\005token\030\013 \001(\t\022\r\n\004sign\030\212\003 " +
-      "\001(\t\022\025\n\014account_type\030\261\014 \001(\r\022\026\n\016extra_bin_" +
-      "data\030\001 \001(\014\022\017\n\006psn_id\030\376\r \001(\t\022\026\n\016sub_chann" +
-      "el_id\030\016 \001(\r\022\022\n\nsecret_key\030\t \001(\t\022\026\n\rclien" +
-      "t_ip_str\030\201\017 \001(\t\022\027\n\017blackUidEndTime\030\n \001(\r" +
-      "\022\023\n\013KCFIGJAPNIB\030\006 \001(\r\022\025\n\014country_code\030\204\013" +
-      " \001(\t\022\026\n\rcloudClientIp\030\374\003 \001(\rB\033\n\031emu.gras" +
-      "scutter.net.protob\006proto3"
+      "o.proto\"\333\006\n\021GetPlayerTokenRsp\022\017\n\007retcode" +
+      "\030\001 \001(\005\022\027\n\017secret_key_seed\030\002 \001(\004\022\020\n\010is_gu" +
+      "est\030\003 \001(\010\022\033\n\023security_cmd_buffer\030\004 \001(\014\022\034" +
+      "\n\024is_proficient_player\030\005 \001(\010\022\023\n\013account_" +
+      "uid\030\006 \001(\t\022\032\n\022black_uid_end_time\030\007 \001(\r\022\013\n" +
+      "\003uid\030\010 \001(\r\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\024\n\014accoun" +
+      "t_type\030\014 \001(\r\022\025\n\rplatform_type\030\r \001(\r\022\013\n\003m" +
+      "sg\030\016 \001(\t\022\r\n\005token\030\017 \001(\t\022\027\n\017server_rand_k" +
+      "ey\030D \001(\t\022\024\n\013AKODFAIGJCE\030\316\001 \001(\010\022\024\n\013MPGMOF" +
+      "LCEOF\030\213\002 \001(\r\022\024\n\013OCINFHOJCEA\030\242\002 \001(\r\022\017\n\006ke" +
+      "y_id\030\216\003 \001(\r\022\024\n\013GCDGEKAONGD\030\270\003 \001(\010\022\"\n\031cli" +
+      "ent_version_random_key\030\360\003 \001(\t\022\024\n\013OLODGDM" +
+      "MPNF\030\220\004 \001(\t\022%\n\013stop_server\030\263\004 \001(\0132\017.Stop" +
+      "ServerInfo\022\024\n\013HNBGEKMPFIB\030\277\004 \001(\010\022\024\n\013JDHC" +
+      "KKAGBNL\030\300\004 \001(\r\022\024\n\013KEKHAKAPMIN\030\366\004 \001(\r\022\024\n\013" +
+      "CIJPMGMCJBA\030\317\006 \001(\r\022\014\n\003tag\030\325\006 \001(\r\022\024\n\013PLNN" +
+      "JPFPPAM\030\336\010 \001(\r\022\025\n\014country_code\030\365\t \001(\t\022\021\n" +
+      "\010game_biz\030\206\r \001(\t\022\"\n\031finish_collection_id" +
+      "_list\030\224\r \003(\r\022\021\n\010birthday\030\307\r \001(\t\022\026\n\rclien" +
+      "t_ip_str\030\317\016 \001(\t\022\r\n\004sign\030\335\016 \001(\t\022\017\n\006psn_id" +
+      "\030\242\017 \001(\t\022\024\n\013JLCDDOJGKKG\030\372\017 \001(\tB\033\n\031emu.gra" +
+      "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3881,7 +4571,7 @@ public final class GetPlayerTokenRspOuterClass {
     internal_static_GetPlayerTokenRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetPlayerTokenRsp_descriptor,
-        new java.lang.String[] { "PELBMOHDKHJ", "ILGBPPMFHIF", "SecretKeySeed", "ClientVersionRandomKey", "StopServer", "ChannelId", "PlatformType", "RegPlatform", "AccountUid", "Uid", "Tag", "Birthday", "KeyId", "Retcode", "IsGuest", "FinishCollectionIdList", "ServerRandKey", "SecurityCmdBuffer", "Msg", "IsProficientPlayer", "Token", "Sign", "AccountType", "ExtraBinData", "PsnId", "SubChannelId", "SecretKey", "ClientIpStr", "BlackUidEndTime", "KCFIGJAPNIB", "CountryCode", "CloudClientIp", });
+        new java.lang.String[] { "Retcode", "SecretKeySeed", "IsGuest", "SecurityCmdBuffer", "IsProficientPlayer", "AccountUid", "BlackUidEndTime", "Uid", "ExtraBinData", "GmUid", "SecretKey", "AccountType", "PlatformType", "Msg", "Token", "ServerRandKey", "AKODFAIGJCE", "MPGMOFLCEOF", "OCINFHOJCEA", "KeyId", "GCDGEKAONGD", "ClientVersionRandomKey", "OLODGDMMPNF", "StopServer", "HNBGEKMPFIB", "JDHCKKAGBNL", "KEKHAKAPMIN", "CIJPMGMCJBA", "Tag", "PLNNJPFPPAM", "CountryCode", "GameBiz", "FinishCollectionIdList", "Birthday", "ClientIpStr", "Sign", "PsnId", "JLCDDOJGKKG", });
     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
new file mode 100644
index 000000000..84cb88a04
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataReqOuterClass.java
@@ -0,0 +1,466 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: GetProfilePictureDataReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class GetProfilePictureDataReqOuterClass {
+  private GetProfilePictureDataReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface GetProfilePictureDataReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:GetProfilePictureDataReq)
+      com.google.protobuf.MessageOrBuilder {
+  }
+  /**
+   * Protobuf type {@code GetProfilePictureDataReq}
+   */
+  public static final class GetProfilePictureDataReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:GetProfilePictureDataReq)
+      GetProfilePictureDataReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetProfilePictureDataReq.newBuilder() to construct.
+    private GetProfilePictureDataReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private GetProfilePictureDataReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new GetProfilePictureDataReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetProfilePictureDataReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.internal_static_GetProfilePictureDataReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.internal_static_GetProfilePictureDataReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.class, emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.Builder.class);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq other = (emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq) obj;
+
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code GetProfilePictureDataReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:GetProfilePictureDataReq)
+        emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.internal_static_GetProfilePictureDataReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.internal_static_GetProfilePictureDataReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.class, emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.internal_static_GetProfilePictureDataReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq build() {
+        emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq buildPartial() {
+        emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq result = new emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq(this);
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq) {
+          return mergeFrom((emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq other) {
+        if (other == emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq.getDefaultInstance()) return this;
+        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.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:GetProfilePictureDataReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:GetProfilePictureDataReq)
+    private static final emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq();
+    }
+
+    public static emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<GetProfilePictureDataReq>
+        PARSER = new com.google.protobuf.AbstractParser<GetProfilePictureDataReq>() {
+      @java.lang.Override
+      public GetProfilePictureDataReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new GetProfilePictureDataReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<GetProfilePictureDataReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<GetProfilePictureDataReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GetProfilePictureDataReqOuterClass.GetProfilePictureDataReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_GetProfilePictureDataReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_GetProfilePictureDataReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\036GetProfilePictureDataReq.proto\"\032\n\030GetP" +
+      "rofilePictureDataReqB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_GetProfilePictureDataReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_GetProfilePictureDataReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_GetProfilePictureDataReq_descriptor,
+        new java.lang.String[] { });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java
new file mode 100644
index 000000000..f68a37188
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetProfilePictureDataRspOuterClass.java
@@ -0,0 +1,734 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: GetProfilePictureDataRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class GetProfilePictureDataRspOuterClass {
+  private GetProfilePictureDataRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface GetProfilePictureDataRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:GetProfilePictureDataRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * @return A list containing the specialProfilePictureList.
+     */
+    java.util.List<java.lang.Integer> getSpecialProfilePictureListList();
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * @return The count of specialProfilePictureList.
+     */
+    int getSpecialProfilePictureListCount();
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</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>
+     * @return The retcode.
+     */
+    int getRetcode();
+  }
+  /**
+   * Protobuf type {@code GetProfilePictureDataRsp}
+   */
+  public static final class GetProfilePictureDataRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:GetProfilePictureDataRsp)
+      GetProfilePictureDataRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetProfilePictureDataRsp.newBuilder() to construct.
+    private GetProfilePictureDataRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private GetProfilePictureDataRsp() {
+      specialProfilePictureList_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new GetProfilePictureDataRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetProfilePictureDataRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                specialProfilePictureList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              specialProfilePictureList_.addInt(input.readUInt32());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                specialProfilePictureList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                specialProfilePictureList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 88: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.internal_static_GetProfilePictureDataRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.internal_static_GetProfilePictureDataRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              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;
+    private com.google.protobuf.Internal.IntList specialProfilePictureList_;
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * @return A list containing the specialProfilePictureList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getSpecialProfilePictureListList() {
+      return specialProfilePictureList_;
+    }
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * @return The count of specialProfilePictureList.
+     */
+    public int getSpecialProfilePictureListCount() {
+      return specialProfilePictureList_.size();
+    }
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The specialProfilePictureList at the given index.
+     */
+    public int getSpecialProfilePictureList(int index) {
+      return specialProfilePictureList_.getInt(index);
+    }
+    private int specialProfilePictureListMemoizedSerializedSize = -1;
+
+    public static final int RETCODE_FIELD_NUMBER = 11;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 11;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (getSpecialProfilePictureListList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        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);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < specialProfilePictureList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(specialProfilePictureList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getSpecialProfilePictureListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        specialProfilePictureListMemoizedSerializedSize = dataSize;
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(11, retcode_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp other = (emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp) obj;
+
+      if (!getSpecialProfilePictureListList()
+          .equals(other.getSpecialProfilePictureListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getSpecialProfilePictureListCount() > 0) {
+        hash = (37 * hash) + SPECIAL_PROFILE_PICTURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getSpecialProfilePictureListList().hashCode();
+      }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code GetProfilePictureDataRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:GetProfilePictureDataRsp)
+        emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.internal_static_GetProfilePictureDataRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.internal_static_GetProfilePictureDataRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.class, emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        specialProfilePictureList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.internal_static_GetProfilePictureDataRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp build() {
+        emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp buildPartial() {
+        emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp result = new emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp(this);
+        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.specialProfilePictureList_ = specialProfilePictureList_;
+        result.retcode_ = retcode_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp other) {
+        if (other == emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp.getDefaultInstance()) return this;
+        if (!other.specialProfilePictureList_.isEmpty()) {
+          if (specialProfilePictureList_.isEmpty()) {
+            specialProfilePictureList_ = other.specialProfilePictureList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureSpecialProfilePictureListIsMutable();
+            specialProfilePictureList_.addAll(other.specialProfilePictureList_);
+          }
+          onChanged();
+        }
+        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.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList specialProfilePictureList_ = emptyIntList();
+      private void ensureSpecialProfilePictureListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_ = mutableCopy(specialProfilePictureList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @return A list containing the specialProfilePictureList.
+       */
+      public java.util.List<java.lang.Integer>
+          getSpecialProfilePictureListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(specialProfilePictureList_) : specialProfilePictureList_;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @return The count of specialProfilePictureList.
+       */
+      public int getSpecialProfilePictureListCount() {
+        return specialProfilePictureList_.size();
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The specialProfilePictureList at the given index.
+       */
+      public int getSpecialProfilePictureList(int index) {
+        return specialProfilePictureList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The specialProfilePictureList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSpecialProfilePictureList(
+          int index, int value) {
+        ensureSpecialProfilePictureListIsMutable();
+        specialProfilePictureList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @param value The specialProfilePictureList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addSpecialProfilePictureList(int value) {
+        ensureSpecialProfilePictureListIsMutable();
+        specialProfilePictureList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @param values The specialProfilePictureList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllSpecialProfilePictureList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureSpecialProfilePictureListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, specialProfilePictureList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSpecialProfilePictureList() {
+        specialProfilePictureList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 11;</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 = 11;</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) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:GetProfilePictureDataRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:GetProfilePictureDataRsp)
+    private static final emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp();
+    }
+
+    public static emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<GetProfilePictureDataRsp>
+        PARSER = new com.google.protobuf.AbstractParser<GetProfilePictureDataRsp>() {
+      @java.lang.Override
+      public GetProfilePictureDataRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new GetProfilePictureDataRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<GetProfilePictureDataRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<GetProfilePictureDataRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GetProfilePictureDataRspOuterClass.GetProfilePictureDataRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_GetProfilePictureDataRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_GetProfilePictureDataRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    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" +
+      "mu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_GetProfilePictureDataRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_GetProfilePictureDataRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_GetProfilePictureDataRsp_descriptor,
+        new java.lang.String[] { "SpecialProfilePictureList", "Retcode", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceReqOuterClass.java
index 21dc58983..fafd5f203 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceReqOuterClass.java
@@ -19,17 +19,12 @@ public final class GetQuestLackingResourceReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 quest_id = 5;</code>
+     * <code>uint32 quest_id = 8;</code>
      * @return The questId.
      */
     int getQuestId();
   }
   /**
-   * <pre>
-   * CmdId: 24145
-   * Obf: NNLDEBNHEEF
-   * </pre>
-   *
    * Protobuf type {@code GetQuestLackingResourceReq}
    */
   public static final class GetQuestLackingResourceReq extends
@@ -74,7 +69,7 @@ public final class GetQuestLackingResourceReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 64: {
 
               questId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class GetQuestLackingResourceReqOuterClass {
               emu.grasscutter.net.proto.GetQuestLackingResourceReqOuterClass.GetQuestLackingResourceReq.class, emu.grasscutter.net.proto.GetQuestLackingResourceReqOuterClass.GetQuestLackingResourceReq.Builder.class);
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 5;
+    public static final int QUEST_ID_FIELD_NUMBER = 8;
     private int questId_;
     /**
-     * <code>uint32 quest_id = 5;</code>
+     * <code>uint32 quest_id = 8;</code>
      * @return The questId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetQuestLackingResourceReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (questId_ != 0) {
-        output.writeUInt32(5, questId_);
+        output.writeUInt32(8, questId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetQuestLackingResourceReqOuterClass {
       size = 0;
       if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, questId_);
+          .computeUInt32Size(8, questId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class GetQuestLackingResourceReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24145
-     * Obf: NNLDEBNHEEF
-     * </pre>
-     *
      * Protobuf type {@code GetQuestLackingResourceReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class GetQuestLackingResourceReqOuterClass {
 
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 5;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class GetQuestLackingResourceReqOuterClass {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 5;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class GetQuestLackingResourceReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 5;</code>
+       * <code>uint32 quest_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -527,7 +517,7 @@ public final class GetQuestLackingResourceReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n GetQuestLackingResourceReq.proto\".\n\032Ge" +
-      "tQuestLackingResourceReq\022\020\n\010quest_id\030\005 \001" +
+      "tQuestLackingResourceReq\022\020\n\010quest_id\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/GetQuestLackingResourceRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java
index 9e8d48261..90639a56c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetQuestLackingResourceRspOuterClass.java
@@ -19,125 +19,33 @@ public final class GetQuestLackingResourceRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @return A list containing the lackedNpcList.
-     */
-    java.util.List<java.lang.Integer> getLackedNpcListList();
-    /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @return The count of lackedNpcList.
-     */
-    int getLackedNpcListCount();
-    /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @param index The index of the element to return.
-     * @return The lackedNpcList at the given index.
-     */
-    int getLackedNpcList(int index);
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    int getLackedPlaceMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    boolean containsLackedPlaceMap(
-        int key);
-    /**
-     * Use {@link #getLackedPlaceMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedPlaceMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedPlaceMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-
-    int getLackedPlaceMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-
-    int getLackedPlaceMapOrThrow(
-        int key);
-
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @return A list containing the lackedPlaceList.
-     */
-    java.util.List<java.lang.Integer> getLackedPlaceListList();
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @return The count of lackedPlaceList.
-     */
-    int getLackedPlaceListCount();
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The lackedPlaceList at the given index.
-     */
-    int getLackedPlaceList(int index);
-
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    int getLackedNpcMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    boolean containsLackedNpcMap(
-        int key);
-    /**
-     * Use {@link #getLackedNpcMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedNpcMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedNpcMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-
-    int getLackedNpcMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-
-    int getLackedNpcMapOrThrow(
-        int key);
-
-    /**
-     * <code>uint32 quest_id = 7;</code>
+     * <code>uint32 quest_id = 4;</code>
      * @return The questId.
      */
     int getQuestId();
+
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     * @return Whether the lackingResourcesInfo field is set.
+     */
+    boolean hasLackingResourcesInfo();
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     * @return The lackingResourcesInfo.
+     */
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo();
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     */
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder();
+
+    /**
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28297
-   * Obf: FDCIDFLNJKP
-   * </pre>
-   *
    * Protobuf type {@code GetQuestLackingResourceRsp}
    */
   public static final class GetQuestLackingResourceRsp extends
@@ -150,8 +58,6 @@ public final class GetQuestLackingResourceRspOuterClass {
       super(builder);
     }
     private GetQuestLackingResourceRsp() {
-      lackedNpcList_ = emptyIntList();
-      lackedPlaceList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -174,7 +80,6 @@ public final class GetQuestLackingResourceRspOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -185,82 +90,27 @@ public final class GetQuestLackingResourceRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                lackedNpcMap_ = com.google.protobuf.MapField.newMapField(
-                    LackedNpcMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000008;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              lackedNpcMap__ = input.readMessage(
-                  LackedNpcMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              lackedNpcMap_.getMutableMap().put(
-                  lackedNpcMap__.getKey(), lackedNpcMap__.getValue());
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                lackedPlaceMap_ = com.google.protobuf.MapField.newMapField(
-                    LackedPlaceMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              lackedPlaceMap__ = input.readMessage(
-                  LackedPlaceMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              lackedPlaceMap_.getMutableMap().put(
-                  lackedPlaceMap__.getKey(), lackedPlaceMap__.getValue());
-              break;
-            }
-            case 56: {
+            case 32: {
 
               questId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 66: {
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder subBuilder = null;
+              if (lackingResourcesInfo_ != null) {
+                subBuilder = lackingResourcesInfo_.toBuilder();
+              }
+              lackingResourcesInfo_ = input.readMessage(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(lackingResourcesInfo_);
+                lackingResourcesInfo_ = subBuilder.buildPartial();
+              }
 
-              retcode_ = input.readInt32();
               break;
             }
             case 80: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                lackedPlaceList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              lackedPlaceList_.addInt(input.readUInt32());
-              break;
-            }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
-                lackedPlaceList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                lackedPlaceList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                lackedNpcList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              lackedNpcList_.addInt(input.readUInt32());
-              break;
-            }
-            case 122: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                lackedNpcList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                lackedNpcList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
+
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -278,12 +128,6 @@ public final class GetQuestLackingResourceRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          lackedPlaceList_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_.makeImmutable(); // C
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -293,20 +137,6 @@ public final class GetQuestLackingResourceRspOuterClass {
       return emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.internal_static_GetQuestLackingResourceRsp_descriptor;
     }
 
-    @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
-      switch (number) {
-        case 4:
-          return internalGetLackedPlaceMap();
-        case 1:
-          return internalGetLackedNpcMap();
-        default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
-      }
-    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -315,239 +145,10 @@ public final class GetQuestLackingResourceRspOuterClass {
               emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.class, emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.Builder.class);
     }
 
-    public static final int LACKED_NPC_LIST_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList lackedNpcList_;
-    /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @return A list containing the lackedNpcList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getLackedNpcListList() {
-      return lackedNpcList_;
-    }
-    /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @return The count of lackedNpcList.
-     */
-    public int getLackedNpcListCount() {
-      return lackedNpcList_.size();
-    }
-    /**
-     * <code>repeated uint32 lacked_npc_list = 15;</code>
-     * @param index The index of the element to return.
-     * @return The lackedNpcList at the given index.
-     */
-    public int getLackedNpcList(int index) {
-      return lackedNpcList_.getInt(index);
-    }
-    private int lackedNpcListMemoizedSerializedSize = -1;
-
-    public static final int LACKED_PLACE_MAP_FIELD_NUMBER = 4;
-    private static final class LackedPlaceMapDefaultEntryHolder {
-      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.GetQuestLackingResourceRspOuterClass.internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_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> lackedPlaceMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetLackedPlaceMap() {
-      if (lackedPlaceMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            LackedPlaceMapDefaultEntryHolder.defaultEntry);
-      }
-      return lackedPlaceMap_;
-    }
-
-    public int getLackedPlaceMapCount() {
-      return internalGetLackedPlaceMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsLackedPlaceMap(
-        int key) {
-      
-      return internalGetLackedPlaceMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getLackedPlaceMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMap() {
-      return getLackedPlaceMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMapMap() {
-      return internalGetLackedPlaceMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedPlaceMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedPlaceMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedPlaceMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedPlaceMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int LACKED_PLACE_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList lackedPlaceList_;
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @return A list containing the lackedPlaceList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getLackedPlaceListList() {
-      return lackedPlaceList_;
-    }
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @return The count of lackedPlaceList.
-     */
-    public int getLackedPlaceListCount() {
-      return lackedPlaceList_.size();
-    }
-    /**
-     * <code>repeated uint32 lacked_place_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The lackedPlaceList at the given index.
-     */
-    public int getLackedPlaceList(int index) {
-      return lackedPlaceList_.getInt(index);
-    }
-    private int lackedPlaceListMemoizedSerializedSize = -1;
-
-    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 LACKED_NPC_MAP_FIELD_NUMBER = 1;
-    private static final class LackedNpcMapDefaultEntryHolder {
-      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.GetQuestLackingResourceRspOuterClass.internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_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> lackedNpcMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetLackedNpcMap() {
-      if (lackedNpcMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            LackedNpcMapDefaultEntryHolder.defaultEntry);
-      }
-      return lackedNpcMap_;
-    }
-
-    public int getLackedNpcMapCount() {
-      return internalGetLackedNpcMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsLackedNpcMap(
-        int key) {
-      
-      return internalGetLackedNpcMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getLackedNpcMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMap() {
-      return getLackedNpcMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMapMap() {
-      return internalGetLackedNpcMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedNpcMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedNpcMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedNpcMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedNpcMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int QUEST_ID_FIELD_NUMBER = 7;
+    public static final int QUEST_ID_FIELD_NUMBER = 4;
     private int questId_;
     /**
-     * <code>uint32 quest_id = 7;</code>
+     * <code>uint32 quest_id = 4;</code>
      * @return The questId.
      */
     @java.lang.Override
@@ -555,6 +156,43 @@ public final class GetQuestLackingResourceRspOuterClass {
       return questId_;
     }
 
+    public static final int LACKING_RESOURCES_INFO_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_;
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     * @return Whether the lackingResourcesInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasLackingResourcesInfo() {
+      return lackingResourcesInfo_ != null;
+    }
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     * @return The lackingResourcesInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() {
+      return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
+    }
+    /**
+     * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() {
+      return getLackingResourcesInfo();
+    }
+
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -569,38 +207,14 @@ public final class GetQuestLackingResourceRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      getSerializedSize();
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetLackedNpcMap(),
-          LackedNpcMapDefaultEntryHolder.defaultEntry,
-          1);
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetLackedPlaceMap(),
-          LackedPlaceMapDefaultEntryHolder.defaultEntry,
-          4);
       if (questId_ != 0) {
-        output.writeUInt32(7, questId_);
+        output.writeUInt32(4, questId_);
+      }
+      if (lackingResourcesInfo_ != null) {
+        output.writeMessage(8, getLackingResourcesInfo());
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
-      if (getLackedPlaceListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(lackedPlaceListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < lackedPlaceList_.size(); i++) {
-        output.writeUInt32NoTag(lackedPlaceList_.getInt(i));
-      }
-      if (getLackedNpcListList().size() > 0) {
-        output.writeUInt32NoTag(122);
-        output.writeUInt32NoTag(lackedNpcListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < lackedNpcList_.size(); i++) {
-        output.writeUInt32NoTag(lackedNpcList_.getInt(i));
+        output.writeInt32(10, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -611,61 +225,17 @@ public final class GetQuestLackingResourceRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetLackedNpcMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        lackedNpcMap__ = LackedNpcMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, lackedNpcMap__);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetLackedPlaceMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        lackedPlaceMap__ = LackedPlaceMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, lackedPlaceMap__);
-      }
       if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, questId_);
+          .computeUInt32Size(4, questId_);
+      }
+      if (lackingResourcesInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getLackingResourcesInfo());
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < lackedPlaceList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lackedPlaceList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getLackedPlaceListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        lackedPlaceListMemoizedSerializedSize = dataSize;
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < lackedNpcList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lackedNpcList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getLackedNpcListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        lackedNpcListMemoizedSerializedSize = dataSize;
+          .computeInt32Size(10, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -682,18 +252,15 @@ public final class GetQuestLackingResourceRspOuterClass {
       }
       emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp other = (emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp) obj;
 
-      if (!getLackedNpcListList()
-          .equals(other.getLackedNpcListList())) return false;
-      if (!internalGetLackedPlaceMap().equals(
-          other.internalGetLackedPlaceMap())) return false;
-      if (!getLackedPlaceListList()
-          .equals(other.getLackedPlaceListList())) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (!internalGetLackedNpcMap().equals(
-          other.internalGetLackedNpcMap())) return false;
       if (getQuestId()
           != other.getQuestId()) return false;
+      if (hasLackingResourcesInfo() != other.hasLackingResourcesInfo()) return false;
+      if (hasLackingResourcesInfo()) {
+        if (!getLackingResourcesInfo()
+            .equals(other.getLackingResourcesInfo())) return false;
+      }
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -705,26 +272,14 @@ public final class GetQuestLackingResourceRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getLackedNpcListCount() > 0) {
-        hash = (37 * hash) + LACKED_NPC_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLackedNpcListList().hashCode();
-      }
-      if (!internalGetLackedPlaceMap().getMap().isEmpty()) {
-        hash = (37 * hash) + LACKED_PLACE_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetLackedPlaceMap().hashCode();
-      }
-      if (getLackedPlaceListCount() > 0) {
-        hash = (37 * hash) + LACKED_PLACE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLackedPlaceListList().hashCode();
+      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestId();
+      if (hasLackingResourcesInfo()) {
+        hash = (37 * hash) + LACKING_RESOURCES_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getLackingResourcesInfo().hashCode();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      if (!internalGetLackedNpcMap().getMap().isEmpty()) {
-        hash = (37 * hash) + LACKED_NPC_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetLackedNpcMap().hashCode();
-      }
-      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -821,11 +376,6 @@ public final class GetQuestLackingResourceRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28297
-     * Obf: FDCIDFLNJKP
-     * </pre>
-     *
      * Protobuf type {@code GetQuestLackingResourceRsp}
      */
     public static final class Builder extends
@@ -837,32 +387,6 @@ public final class GetQuestLackingResourceRspOuterClass {
         return emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.internal_static_GetQuestLackingResourceRsp_descriptor;
       }
 
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMapField(
-          int number) {
-        switch (number) {
-          case 4:
-            return internalGetLackedPlaceMap();
-          case 1:
-            return internalGetLackedNpcMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMutableMapField(
-          int number) {
-        switch (number) {
-          case 4:
-            return internalGetMutableLackedPlaceMap();
-          case 1:
-            return internalGetMutableLackedNpcMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
@@ -889,16 +413,16 @@ public final class GetQuestLackingResourceRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        lackedNpcList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        internalGetMutableLackedPlaceMap().clear();
-        lackedPlaceList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        retcode_ = 0;
-
-        internalGetMutableLackedNpcMap().clear();
         questId_ = 0;
 
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = null;
+        } else {
+          lackingResourcesInfo_ = null;
+          lackingResourcesInfoBuilder_ = null;
+        }
+        retcode_ = 0;
+
         return this;
       }
 
@@ -925,23 +449,13 @@ public final class GetQuestLackingResourceRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp buildPartial() {
         emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp result = new emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp(this);
-        int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.lackedNpcList_ = lackedNpcList_;
-        result.lackedPlaceMap_ = internalGetLackedPlaceMap();
-        result.lackedPlaceMap_.makeImmutable();
-        if (((bitField0_ & 0x00000004) != 0)) {
-          lackedPlaceList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.lackedPlaceList_ = lackedPlaceList_;
-        result.retcode_ = retcode_;
-        result.lackedNpcMap_ = internalGetLackedNpcMap();
-        result.lackedNpcMap_.makeImmutable();
         result.questId_ = questId_;
+        if (lackingResourcesInfoBuilder_ == null) {
+          result.lackingResourcesInfo_ = lackingResourcesInfo_;
+        } else {
+          result.lackingResourcesInfo_ = lackingResourcesInfoBuilder_.build();
+        }
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -990,36 +504,15 @@ public final class GetQuestLackingResourceRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp other) {
         if (other == emu.grasscutter.net.proto.GetQuestLackingResourceRspOuterClass.GetQuestLackingResourceRsp.getDefaultInstance()) return this;
-        if (!other.lackedNpcList_.isEmpty()) {
-          if (lackedNpcList_.isEmpty()) {
-            lackedNpcList_ = other.lackedNpcList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureLackedNpcListIsMutable();
-            lackedNpcList_.addAll(other.lackedNpcList_);
-          }
-          onChanged();
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
         }
-        internalGetMutableLackedPlaceMap().mergeFrom(
-            other.internalGetLackedPlaceMap());
-        if (!other.lackedPlaceList_.isEmpty()) {
-          if (lackedPlaceList_.isEmpty()) {
-            lackedPlaceList_ = other.lackedPlaceList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureLackedPlaceListIsMutable();
-            lackedPlaceList_.addAll(other.lackedPlaceList_);
-          }
-          onChanged();
+        if (other.hasLackingResourcesInfo()) {
+          mergeLackingResourcesInfo(other.getLackingResourcesInfo());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        internalGetMutableLackedNpcMap().mergeFrom(
-            other.internalGetLackedNpcMap());
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1048,456 +541,10 @@ public final class GetQuestLackingResourceRspOuterClass {
         }
         return this;
       }
-      private int bitField0_;
-
-      private com.google.protobuf.Internal.IntList lackedNpcList_ = emptyIntList();
-      private void ensureLackedNpcListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_ = mutableCopy(lackedNpcList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @return A list containing the lackedNpcList.
-       */
-      public java.util.List<java.lang.Integer>
-          getLackedNpcListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(lackedNpcList_) : lackedNpcList_;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @return The count of lackedNpcList.
-       */
-      public int getLackedNpcListCount() {
-        return lackedNpcList_.size();
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @param index The index of the element to return.
-       * @return The lackedNpcList at the given index.
-       */
-      public int getLackedNpcList(int index) {
-        return lackedNpcList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @param index The index to set the value at.
-       * @param value The lackedNpcList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLackedNpcList(
-          int index, int value) {
-        ensureLackedNpcListIsMutable();
-        lackedNpcList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @param value The lackedNpcList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addLackedNpcList(int value) {
-        ensureLackedNpcListIsMutable();
-        lackedNpcList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @param values The lackedNpcList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLackedNpcList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLackedNpcListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lackedNpcList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLackedNpcList() {
-        lackedNpcList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> lackedPlaceMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetLackedPlaceMap() {
-        if (lackedPlaceMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              LackedPlaceMapDefaultEntryHolder.defaultEntry);
-        }
-        return lackedPlaceMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableLackedPlaceMap() {
-        onChanged();;
-        if (lackedPlaceMap_ == null) {
-          lackedPlaceMap_ = com.google.protobuf.MapField.newMapField(
-              LackedPlaceMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!lackedPlaceMap_.isMutable()) {
-          lackedPlaceMap_ = lackedPlaceMap_.copy();
-        }
-        return lackedPlaceMap_;
-      }
-
-      public int getLackedPlaceMapCount() {
-        return internalGetLackedPlaceMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsLackedPlaceMap(
-          int key) {
-        
-        return internalGetLackedPlaceMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getLackedPlaceMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMap() {
-        return getLackedPlaceMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMapMap() {
-        return internalGetLackedPlaceMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedPlaceMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedPlaceMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedPlaceMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedPlaceMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearLackedPlaceMap() {
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-
-      public Builder removeLackedPlaceMap(
-          int key) {
-        
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableLackedPlaceMap() {
-        return internalGetMutableLackedPlaceMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-      public Builder putLackedPlaceMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 4;</code>
-       */
-
-      public Builder putAllLackedPlaceMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList lackedPlaceList_ = emptyIntList();
-      private void ensureLackedPlaceListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          lackedPlaceList_ = mutableCopy(lackedPlaceList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @return A list containing the lackedPlaceList.
-       */
-      public java.util.List<java.lang.Integer>
-          getLackedPlaceListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(lackedPlaceList_) : lackedPlaceList_;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @return The count of lackedPlaceList.
-       */
-      public int getLackedPlaceListCount() {
-        return lackedPlaceList_.size();
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @param index The index of the element to return.
-       * @return The lackedPlaceList at the given index.
-       */
-      public int getLackedPlaceList(int index) {
-        return lackedPlaceList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The lackedPlaceList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLackedPlaceList(
-          int index, int value) {
-        ensureLackedPlaceListIsMutable();
-        lackedPlaceList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @param value The lackedPlaceList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addLackedPlaceList(int value) {
-        ensureLackedPlaceListIsMutable();
-        lackedPlaceList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @param values The lackedPlaceList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLackedPlaceList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLackedPlaceListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lackedPlaceList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLackedPlaceList() {
-        lackedPlaceList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      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 com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> lackedNpcMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetLackedNpcMap() {
-        if (lackedNpcMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              LackedNpcMapDefaultEntryHolder.defaultEntry);
-        }
-        return lackedNpcMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableLackedNpcMap() {
-        onChanged();;
-        if (lackedNpcMap_ == null) {
-          lackedNpcMap_ = com.google.protobuf.MapField.newMapField(
-              LackedNpcMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!lackedNpcMap_.isMutable()) {
-          lackedNpcMap_ = lackedNpcMap_.copy();
-        }
-        return lackedNpcMap_;
-      }
-
-      public int getLackedNpcMapCount() {
-        return internalGetLackedNpcMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsLackedNpcMap(
-          int key) {
-        
-        return internalGetLackedNpcMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getLackedNpcMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMap() {
-        return getLackedNpcMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMapMap() {
-        return internalGetLackedNpcMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedNpcMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedNpcMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedNpcMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedNpcMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearLackedNpcMap() {
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-
-      public Builder removeLackedNpcMap(
-          int key) {
-        
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableLackedNpcMap() {
-        return internalGetMutableLackedNpcMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-      public Builder putLackedNpcMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 1;</code>
-       */
-
-      public Builder putAllLackedNpcMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
 
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 7;</code>
+       * <code>uint32 quest_id = 4;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -1505,7 +552,7 @@ public final class GetQuestLackingResourceRspOuterClass {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 7;</code>
+       * <code>uint32 quest_id = 4;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -1516,7 +563,7 @@ public final class GetQuestLackingResourceRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 7;</code>
+       * <code>uint32 quest_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -1525,6 +572,156 @@ public final class GetQuestLackingResourceRspOuterClass {
         onChanged();
         return this;
       }
+
+      private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> lackingResourcesInfoBuilder_;
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       * @return Whether the lackingResourcesInfo field is set.
+       */
+      public boolean hasLackingResourcesInfo() {
+        return lackingResourcesInfoBuilder_ != null || lackingResourcesInfo_ != null;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       * @return The lackingResourcesInfo.
+       */
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
+        } else {
+          return lackingResourcesInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public Builder setLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          lackingResourcesInfo_ = value;
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public Builder setLackingResourcesInfo(
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder builderForValue) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public Builder mergeLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          if (lackingResourcesInfo_ != null) {
+            lackingResourcesInfo_ =
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.newBuilder(lackingResourcesInfo_).mergeFrom(value).buildPartial();
+          } else {
+            lackingResourcesInfo_ = value;
+          }
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public Builder clearLackingResourcesInfo() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = null;
+          onChanged();
+        } else {
+          lackingResourcesInfo_ = null;
+          lackingResourcesInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder getLackingResourcesInfoBuilder() {
+        
+        onChanged();
+        return getLackingResourcesInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() {
+        if (lackingResourcesInfoBuilder_ != null) {
+          return lackingResourcesInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return lackingResourcesInfo_ == null ?
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
+        }
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 8;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> 
+          getLackingResourcesInfoFieldBuilder() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder>(
+                  getLackingResourcesInfo(),
+                  getParentForChildren(),
+                  isClean());
+          lackingResourcesInfo_ = null;
+        }
+        return lackingResourcesInfoBuilder_;
+      }
+
+      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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1583,16 +780,6 @@ public final class GetQuestLackingResourceRspOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_GetQuestLackingResourceRsp_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -1602,41 +789,25 @@ public final class GetQuestLackingResourceRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n GetQuestLackingResourceRsp.proto\"\361\002\n\032G" +
-      "etQuestLackingResourceRsp\022\027\n\017lacked_npc_" +
-      "list\030\017 \003(\r\022I\n\020lacked_place_map\030\004 \003(\0132/.G" +
-      "etQuestLackingResourceRsp.LackedPlaceMap" +
-      "Entry\022\031\n\021lacked_place_list\030\n \003(\r\022\017\n\007retc" +
-      "ode\030\t \001(\005\022E\n\016lacked_npc_map\030\001 \003(\0132-.GetQ" +
-      "uestLackingResourceRsp.LackedNpcMapEntry" +
-      "\022\020\n\010quest_id\030\007 \001(\r\0325\n\023LackedPlaceMapEntr" +
-      "y\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0323\n\021Lac" +
-      "kedNpcMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" +
-      "(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006pro" +
-      "to3"
+      "\n GetQuestLackingResourceRsp.proto\032\031Lack" +
+      "ingResourceInfo.proto\"u\n\032GetQuestLacking" +
+      "ResourceRsp\022\020\n\010quest_id\030\004 \001(\r\0224\n\026lacking" +
+      "_resources_info\030\010 \001(\0132\024.LackingResourceI" +
+      "nfo\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.getDescriptor(),
         });
     internal_static_GetQuestLackingResourceRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_GetQuestLackingResourceRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetQuestLackingResourceRsp_descriptor,
-        new java.lang.String[] { "LackedNpcList", "LackedPlaceMap", "LackedPlaceList", "Retcode", "LackedNpcMap", "QuestId", });
-    internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_descriptor =
-      internal_static_GetQuestLackingResourceRsp_descriptor.getNestedTypes().get(0);
-    internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_GetQuestLackingResourceRsp_LackedPlaceMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
-    internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_descriptor =
-      internal_static_GetQuestLackingResourceRsp_descriptor.getNestedTypes().get(1);
-    internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_GetQuestLackingResourceRsp_LackedNpcMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "QuestId", "LackingResourcesInfo", "Retcode", });
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetRegionSearchReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetRegionSearchReqOuterClass.java
index 460822f7d..1c9dff0df 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetRegionSearchReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetRegionSearchReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetRegionSearchReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 2030
-   * Obf: BHEPKPEBEGB
-   * </pre>
-   *
    * Protobuf type {@code GetRegionSearchReq}
    */
   public static final class GetRegionSearchReq extends
@@ -245,11 +240,6 @@ public final class GetRegionSearchReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2030
-     * Obf: BHEPKPEBEGB
-     * </pre>
-     *
      * Protobuf type {@code GetRegionSearchReq}
      */
     public static final class Builder extends
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 aabb6f248..fb29bed2b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaReqOuterClass.java
@@ -25,17 +25,12 @@ public final class GetSceneAreaReqOuterClass {
     int getSceneId();
 
     /**
-     * <code>uint32 belong_uid = 9;</code>
+     * <code>uint32 belong_uid = 11;</code>
      * @return The belongUid.
      */
     int getBelongUid();
   }
   /**
-   * <pre>
-   * CmdId: 25175
-   * Obf: LABAJDKACOG
-   * </pre>
-   *
    * Protobuf type {@code GetSceneAreaReq}
    */
   public static final class GetSceneAreaReq extends
@@ -80,7 +75,7 @@ public final class GetSceneAreaReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 88: {
 
               belongUid_ = input.readUInt32();
               break;
@@ -133,10 +128,10 @@ public final class GetSceneAreaReqOuterClass {
       return sceneId_;
     }
 
-    public static final int BELONG_UID_FIELD_NUMBER = 9;
+    public static final int BELONG_UID_FIELD_NUMBER = 11;
     private int belongUid_;
     /**
-     * <code>uint32 belong_uid = 9;</code>
+     * <code>uint32 belong_uid = 11;</code>
      * @return The belongUid.
      */
     @java.lang.Override
@@ -159,7 +154,7 @@ public final class GetSceneAreaReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (belongUid_ != 0) {
-        output.writeUInt32(9, belongUid_);
+        output.writeUInt32(11, belongUid_);
       }
       if (sceneId_ != 0) {
         output.writeUInt32(13, sceneId_);
@@ -175,7 +170,7 @@ public final class GetSceneAreaReqOuterClass {
       size = 0;
       if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, belongUid_);
+          .computeUInt32Size(11, belongUid_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -311,11 +306,6 @@ public final class GetSceneAreaReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25175
-     * Obf: LABAJDKACOG
-     * </pre>
-     *
      * Protobuf type {@code GetSceneAreaReq}
      */
     public static final class Builder extends
@@ -501,7 +491,7 @@ public final class GetSceneAreaReqOuterClass {
 
       private int belongUid_ ;
       /**
-       * <code>uint32 belong_uid = 9;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @return The belongUid.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class GetSceneAreaReqOuterClass {
         return belongUid_;
       }
       /**
-       * <code>uint32 belong_uid = 9;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @param value The belongUid to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class GetSceneAreaReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 belong_uid = 9;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearBelongUid() {
@@ -597,7 +587,7 @@ public final class GetSceneAreaReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025GetSceneAreaReq.proto\"7\n\017GetSceneAreaR" +
-      "eq\022\020\n\010scene_id\030\r \001(\r\022\022\n\nbelong_uid\030\t \001(\r" +
+      "eq\022\020\n\010scene_id\030\r \001(\r\022\022\n\nbelong_uid\030\013 \001(\r" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 f57bb94cf..cf51f523c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetSceneAreaRspOuterClass.java
@@ -19,64 +19,59 @@ public final class GetSceneAreaRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> 
-        getCityInfoListList();
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index);
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    int getCityInfoListCount();
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
-        getCityInfoListOrBuilderList();
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>int32 retcode = 3;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 scene_id = 7;</code>
+     * <code>uint32 scene_id = 1;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> 
+        getCityInfoListList();
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index);
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    int getCityInfoListCount();
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
+        getCityInfoListOrBuilderList();
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @return A list containing the areaIdList.
      */
     java.util.List<java.lang.Integer> getAreaIdListList();
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @return The count of areaIdList.
      */
     int getAreaIdListCount();
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
     int getAreaIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 27029
-   * Obf: GOPJBKDDELB
-   * </pre>
-   *
    * Protobuf type {@code GetSceneAreaRsp}
    */
   public static final class GetSceneAreaRsp extends
@@ -124,7 +119,26 @@ public final class GetSceneAreaRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 50: {
+              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 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 areaIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -132,7 +146,7 @@ public final class GetSceneAreaRspOuterClass {
               areaIdList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -145,25 +159,6 @@ public final class GetSceneAreaRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 24: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 56: {
-
-              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;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -179,12 +174,12 @@ public final class GetSceneAreaRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          areaIdList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           cityInfoList_ = java.util.Collections.unmodifiableList(cityInfoList_);
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          areaIdList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -202,61 +197,10 @@ public final class GetSceneAreaRspOuterClass {
               emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp.class, emu.grasscutter.net.proto.GetSceneAreaRspOuterClass.GetSceneAreaRsp.Builder.class);
     }
 
-    public static final int CITY_INFO_LIST_FIELD_NUMBER = 11;
-    private java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> cityInfoList_;
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> getCityInfoListList() {
-      return cityInfoList_;
-    }
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
-        getCityInfoListOrBuilderList() {
-      return cityInfoList_;
-    }
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    @java.lang.Override
-    public int getCityInfoListCount() {
-      return cityInfoList_.size();
-    }
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index) {
-      return cityInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .CityInfo city_info_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
-        int index) {
-      return cityInfoList_.get(index);
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 3;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 3;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 7;
+    public static final int SCENE_ID_FIELD_NUMBER = 1;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <code>uint32 scene_id = 1;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -264,10 +208,61 @@ public final class GetSceneAreaRspOuterClass {
       return sceneId_;
     }
 
-    public static final int AREA_ID_LIST_FIELD_NUMBER = 2;
+    public static final int CITY_INFO_LIST_FIELD_NUMBER = 6;
+    private java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> cityInfoList_;
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> getCityInfoListList() {
+      return cityInfoList_;
+    }
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
+        getCityInfoListOrBuilderList() {
+      return cityInfoList_;
+    }
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public int getCityInfoListCount() {
+      return cityInfoList_.size();
+    }
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index) {
+      return cityInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .CityInfo city_info_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
+        int index) {
+      return cityInfoList_.get(index);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int AREA_ID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList areaIdList_;
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @return A list containing the areaIdList.
      */
     @java.lang.Override
@@ -276,14 +271,14 @@ public final class GetSceneAreaRspOuterClass {
       return areaIdList_;
     }
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @return The count of areaIdList.
      */
     public int getAreaIdListCount() {
       return areaIdList_.size();
     }
     /**
-     * <code>repeated uint32 area_id_list = 2;</code>
+     * <code>repeated uint32 area_id_list = 10;</code>
      * @param index The index of the element to return.
      * @return The areaIdList at the given index.
      */
@@ -307,22 +302,22 @@ public final class GetSceneAreaRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (sceneId_ != 0) {
+        output.writeUInt32(1, sceneId_);
+      }
+      for (int i = 0; i < cityInfoList_.size(); i++) {
+        output.writeMessage(6, cityInfoList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(7, retcode_);
+      }
       if (getAreaIdListList().size() > 0) {
-        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(areaIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < areaIdList_.size(); i++) {
         output.writeUInt32NoTag(areaIdList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
-      }
-      for (int i = 0; i < cityInfoList_.size(); i++) {
-        output.writeMessage(11, cityInfoList_.get(i));
-      }
       unknownFields.writeTo(output);
     }
 
@@ -332,6 +327,18 @@ public final class GetSceneAreaRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, sceneId_);
+      }
+      for (int i = 0; i < cityInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, cityInfoList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(7, retcode_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < areaIdList_.size(); i++) {
@@ -346,18 +353,6 @@ public final class GetSceneAreaRspOuterClass {
         }
         areaIdListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
-      }
-      for (int i = 0; i < cityInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, cityInfoList_.get(i));
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -373,12 +368,12 @@ public final class GetSceneAreaRspOuterClass {
       }
       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 (getRetcode()
           != other.getRetcode()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (!getAreaIdListList()
           .equals(other.getAreaIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -392,14 +387,14 @@ public final class GetSceneAreaRspOuterClass {
       }
       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();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       if (getAreaIdListCount() > 0) {
         hash = (37 * hash) + AREA_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAreaIdListList().hashCode();
@@ -500,11 +495,6 @@ public final class GetSceneAreaRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27029
-     * Obf: GOPJBKDDELB
-     * </pre>
-     *
      * Protobuf type {@code GetSceneAreaRsp}
      */
     public static final class Builder extends
@@ -543,6 +533,8 @@ public final class GetSceneAreaRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        sceneId_ = 0;
+
         if (cityInfoListBuilder_ == null) {
           cityInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -551,8 +543,6 @@ public final class GetSceneAreaRspOuterClass {
         }
         retcode_ = 0;
 
-        sceneId_ = 0;
-
         areaIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
@@ -582,6 +572,7 @@ public final class GetSceneAreaRspOuterClass {
       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_);
@@ -592,7 +583,6 @@ public final class GetSceneAreaRspOuterClass {
           result.cityInfoList_ = cityInfoListBuilder_.build();
         }
         result.retcode_ = retcode_;
-        result.sceneId_ = sceneId_;
         if (((bitField0_ & 0x00000002) != 0)) {
           areaIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
@@ -646,6 +636,9 @@ public final class GetSceneAreaRspOuterClass {
 
       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()) {
@@ -675,9 +668,6 @@ public final class GetSceneAreaRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         if (!other.areaIdList_.isEmpty()) {
           if (areaIdList_.isEmpty()) {
             areaIdList_ = other.areaIdList_;
@@ -718,6 +708,37 @@ public final class GetSceneAreaRspOuterClass {
       }
       private int bitField0_;
 
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 1;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 1;</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 = 1;</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() {
@@ -731,7 +752,7 @@ public final class GetSceneAreaRspOuterClass {
           emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> cityInfoListBuilder_;
 
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> getCityInfoListList() {
         if (cityInfoListBuilder_ == null) {
@@ -741,7 +762,7 @@ public final class GetSceneAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public int getCityInfoListCount() {
         if (cityInfoListBuilder_ == null) {
@@ -751,7 +772,7 @@ public final class GetSceneAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo getCityInfoList(int index) {
         if (cityInfoListBuilder_ == null) {
@@ -761,7 +782,7 @@ public final class GetSceneAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder setCityInfoList(
           int index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) {
@@ -778,7 +799,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder setCityInfoList(
           int index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder builderForValue) {
@@ -792,7 +813,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder addCityInfoList(emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) {
         if (cityInfoListBuilder_ == null) {
@@ -808,7 +829,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder addCityInfoList(
           int index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo value) {
@@ -825,7 +846,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder addCityInfoList(
           emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder builderForValue) {
@@ -839,7 +860,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder addCityInfoList(
           int index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder builderForValue) {
@@ -853,7 +874,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder addAllCityInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo> values) {
@@ -868,7 +889,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder clearCityInfoList() {
         if (cityInfoListBuilder_ == null) {
@@ -881,7 +902,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public Builder removeCityInfoList(int index) {
         if (cityInfoListBuilder_ == null) {
@@ -894,14 +915,14 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder getCityInfoListBuilder(
           int index) {
         return getCityInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder getCityInfoListOrBuilder(
           int index) {
@@ -911,7 +932,7 @@ public final class GetSceneAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.CityInfoOuterClass.CityInfoOrBuilder> 
            getCityInfoListOrBuilderList() {
@@ -922,14 +943,14 @@ public final class GetSceneAreaRspOuterClass {
         }
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfoListBuilder() {
         return getCityInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder addCityInfoListBuilder(
           int index) {
@@ -937,7 +958,7 @@ public final class GetSceneAreaRspOuterClass {
             index, emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .CityInfo city_info_list = 11;</code>
+       * <code>repeated .CityInfo city_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.CityInfoOuterClass.CityInfo.Builder> 
            getCityInfoListBuilderList() {
@@ -960,7 +981,7 @@ public final class GetSceneAreaRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 7;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -968,7 +989,7 @@ public final class GetSceneAreaRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 7;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -979,7 +1000,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -989,37 +1010,6 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
 
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 7;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList areaIdList_ = emptyIntList();
       private void ensureAreaIdListIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
@@ -1028,7 +1018,7 @@ public final class GetSceneAreaRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @return A list containing the areaIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -1037,14 +1027,14 @@ public final class GetSceneAreaRspOuterClass {
                  java.util.Collections.unmodifiableList(areaIdList_) : areaIdList_;
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @return The count of areaIdList.
        */
       public int getAreaIdListCount() {
         return areaIdList_.size();
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @param index The index of the element to return.
        * @return The areaIdList at the given index.
        */
@@ -1052,7 +1042,7 @@ public final class GetSceneAreaRspOuterClass {
         return areaIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The areaIdList to set.
        * @return This builder for chaining.
@@ -1065,7 +1055,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @param value The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -1076,7 +1066,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @param values The areaIdList to add.
        * @return This builder for chaining.
        */
@@ -1089,7 +1079,7 @@ public final class GetSceneAreaRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_id_list = 2;</code>
+       * <code>repeated uint32 area_id_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaIdList() {
@@ -1166,9 +1156,9 @@ public final class GetSceneAreaRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025GetSceneAreaRsp.proto\032\016CityInfo.proto\"" +
-      "m\n\017GetSceneAreaRsp\022!\n\016city_info_list\030\013 \003" +
-      "(\0132\t.CityInfo\022\017\n\007retcode\030\003 \001(\005\022\020\n\010scene_" +
-      "id\030\007 \001(\r\022\024\n\014area_id_list\030\002 \003(\rB\033\n\031emu.gr" +
+      "m\n\017GetSceneAreaRsp\022\020\n\010scene_id\030\001 \001(\r\022!\n\016" +
+      "city_info_list\030\006 \003(\0132\t.CityInfo\022\017\n\007retco" +
+      "de\030\007 \001(\005\022\024\n\014area_id_list\030\n \003(\rB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1181,7 +1171,7 @@ public final class GetSceneAreaRspOuterClass {
     internal_static_GetSceneAreaRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetSceneAreaRsp_descriptor,
-        new java.lang.String[] { "CityInfoList", "Retcode", "SceneId", "AreaIdList", });
+        new java.lang.String[] { "SceneId", "CityInfoList", "Retcode", "AreaIdList", });
     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 8d61992d2..6e4cf7444 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointReqOuterClass.java
@@ -19,29 +19,24 @@ public final class GetScenePointReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 belong_uid = 12;</code>
+     * <code>bool is_new_player = 12;</code>
+     * @return The isNewPlayer.
+     */
+    boolean getIsNewPlayer();
+
+    /**
+     * <code>uint32 belong_uid = 11;</code>
      * @return The belongUid.
      */
     int getBelongUid();
 
     /**
-     * <code>bool FBFJPEPMAOF = 5;</code>
-     * @return The fBFJPEPMAOF.
-     */
-    boolean getFBFJPEPMAOF();
-
-    /**
-     * <code>uint32 scene_id = 3;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     int getSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 23197
-   * Obf: PBIPDICGDKH
-   * </pre>
-   *
    * Protobuf type {@code GetScenePointReq}
    */
   public static final class GetScenePointReq extends
@@ -86,19 +81,19 @@ public final class GetScenePointReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 64: {
 
               sceneId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 88: {
 
-              fBFJPEPMAOF_ = input.readBool();
+              belongUid_ = input.readUInt32();
               break;
             }
             case 96: {
 
-              belongUid_ = input.readUInt32();
+              isNewPlayer_ = input.readBool();
               break;
             }
             default: {
@@ -133,10 +128,21 @@ public final class GetScenePointReqOuterClass {
               emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq.class, emu.grasscutter.net.proto.GetScenePointReqOuterClass.GetScenePointReq.Builder.class);
     }
 
-    public static final int BELONG_UID_FIELD_NUMBER = 12;
+    public static final int IS_NEW_PLAYER_FIELD_NUMBER = 12;
+    private boolean isNewPlayer_;
+    /**
+     * <code>bool is_new_player = 12;</code>
+     * @return The isNewPlayer.
+     */
+    @java.lang.Override
+    public boolean getIsNewPlayer() {
+      return isNewPlayer_;
+    }
+
+    public static final int BELONG_UID_FIELD_NUMBER = 11;
     private int belongUid_;
     /**
-     * <code>uint32 belong_uid = 12;</code>
+     * <code>uint32 belong_uid = 11;</code>
      * @return The belongUid.
      */
     @java.lang.Override
@@ -144,21 +150,10 @@ public final class GetScenePointReqOuterClass {
       return belongUid_;
     }
 
-    public static final int FBFJPEPMAOF_FIELD_NUMBER = 5;
-    private boolean fBFJPEPMAOF_;
-    /**
-     * <code>bool FBFJPEPMAOF = 5;</code>
-     * @return The fBFJPEPMAOF.
-     */
-    @java.lang.Override
-    public boolean getFBFJPEPMAOF() {
-      return fBFJPEPMAOF_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 3;
+    public static final int SCENE_ID_FIELD_NUMBER = 8;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 3;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class GetScenePointReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(3, sceneId_);
-      }
-      if (fBFJPEPMAOF_ != false) {
-        output.writeBool(5, fBFJPEPMAOF_);
+        output.writeUInt32(8, sceneId_);
       }
       if (belongUid_ != 0) {
-        output.writeUInt32(12, belongUid_);
+        output.writeUInt32(11, belongUid_);
+      }
+      if (isNewPlayer_ != false) {
+        output.writeBool(12, isNewPlayer_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class GetScenePointReqOuterClass {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, sceneId_);
-      }
-      if (fBFJPEPMAOF_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, fBFJPEPMAOF_);
+          .computeUInt32Size(8, sceneId_);
       }
       if (belongUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, belongUid_);
+          .computeUInt32Size(11, belongUid_);
+      }
+      if (isNewPlayer_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isNewPlayer_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class GetScenePointReqOuterClass {
       }
       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 (getFBFJPEPMAOF()
-          != other.getFBFJPEPMAOF()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,11 +237,11 @@ public final class GetScenePointReqOuterClass {
       }
       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) + FBFJPEPMAOF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getFBFJPEPMAOF());
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,11 +340,6 @@ public final class GetScenePointReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23197
-     * Obf: PBIPDICGDKH
-     * </pre>
-     *
      * Protobuf type {@code GetScenePointReq}
      */
     public static final class Builder extends
@@ -387,9 +377,9 @@ public final class GetScenePointReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        belongUid_ = 0;
+        isNewPlayer_ = false;
 
-        fBFJPEPMAOF_ = false;
+        belongUid_ = 0;
 
         sceneId_ = 0;
 
@@ -419,8 +409,8 @@ public final class GetScenePointReqOuterClass {
       @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.fBFJPEPMAOF_ = fBFJPEPMAOF_;
         result.sceneId_ = sceneId_;
         onBuilt();
         return result;
@@ -470,12 +460,12 @@ public final class GetScenePointReqOuterClass {
 
       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.getFBFJPEPMAOF() != false) {
-          setFBFJPEPMAOF(other.getFBFJPEPMAOF());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
@@ -508,9 +498,40 @@ public final class GetScenePointReqOuterClass {
         return this;
       }
 
+      private boolean isNewPlayer_ ;
+      /**
+       * <code>bool is_new_player = 12;</code>
+       * @return The isNewPlayer.
+       */
+      @java.lang.Override
+      public boolean getIsNewPlayer() {
+        return isNewPlayer_;
+      }
+      /**
+       * <code>bool is_new_player = 12;</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 = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewPlayer() {
+        
+        isNewPlayer_ = false;
+        onChanged();
+        return this;
+      }
+
       private int belongUid_ ;
       /**
-       * <code>uint32 belong_uid = 12;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @return The belongUid.
        */
       @java.lang.Override
@@ -518,7 +539,7 @@ public final class GetScenePointReqOuterClass {
         return belongUid_;
       }
       /**
-       * <code>uint32 belong_uid = 12;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @param value The belongUid to set.
        * @return This builder for chaining.
        */
@@ -529,7 +550,7 @@ public final class GetScenePointReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 belong_uid = 12;</code>
+       * <code>uint32 belong_uid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearBelongUid() {
@@ -539,40 +560,9 @@ public final class GetScenePointReqOuterClass {
         return this;
       }
 
-      private boolean fBFJPEPMAOF_ ;
-      /**
-       * <code>bool FBFJPEPMAOF = 5;</code>
-       * @return The fBFJPEPMAOF.
-       */
-      @java.lang.Override
-      public boolean getFBFJPEPMAOF() {
-        return fBFJPEPMAOF_;
-      }
-      /**
-       * <code>bool FBFJPEPMAOF = 5;</code>
-       * @param value The fBFJPEPMAOF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFBFJPEPMAOF(boolean value) {
-        
-        fBFJPEPMAOF_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool FBFJPEPMAOF = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFBFJPEPMAOF() {
-        
-        fBFJPEPMAOF_ = false;
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class GetScenePointReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class GetScenePointReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 3;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -667,10 +657,10 @@ public final class GetScenePointReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointReq.proto\"M\n\020GetScenePoin" +
-      "tReq\022\022\n\nbelong_uid\030\014 \001(\r\022\023\n\013FBFJPEPMAOF\030" +
-      "\005 \001(\010\022\020\n\010scene_id\030\003 \001(\rB\033\n\031emu.grasscutt" +
-      "er.net.protob\006proto3"
+      "\n\026GetScenePointReq.proto\"O\n\020GetScenePoin" +
+      "tReq\022\025\n\ris_new_player\030\014 \001(\010\022\022\n\nbelong_ui" +
+      "d\030\013 \001(\r\022\020\n\010scene_id\030\010 \001(\rB\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -681,7 +671,7 @@ public final class GetScenePointReqOuterClass {
     internal_static_GetScenePointReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointReq_descriptor,
-        new java.lang.String[] { "BelongUid", "FBFJPEPMAOF", "SceneId", });
+        new java.lang.String[] { "IsNewPlayer", "BelongUid", "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 3eac65540..09100f879 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetScenePointRspOuterClass.java
@@ -36,171 +36,166 @@ public final class GetScenePointRspOuterClass {
     int getUnlockedPointList(int index);
 
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @return A list containing the fELMBEACBLB.
+     */
+    java.util.List<java.lang.Integer> getFELMBEACBLBList();
+    /**
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @return The count of fELMBEACBLB.
+     */
+    int getFELMBEACBLBCount();
+    /**
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @param index The index of the element to return.
+     * @return The fELMBEACBLB at the given index.
+     */
+    int getFELMBEACBLB(int index);
+
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</code>
+     * @return A list containing the lockedPointList.
+     */
+    java.util.List<java.lang.Integer> getLockedPointListList();
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</code>
+     * @return The count of lockedPointList.
+     */
+    int getLockedPointListCount();
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The lockedPointList at the given index.
+     */
+    int getLockedPointList(int index);
+
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @return A list containing the pointList.
+     */
+    java.util.List<java.lang.Integer> getPointListList();
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @return The count of pointList.
+     */
+    int getPointListCount();
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The pointList at the given index.
+     */
+    int getPointList(int index);
+
+    /**
+     * <code>uint32 belong_uid = 6;</code>
+     * @return The belongUid.
+     */
+    int getBelongUid();
+
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint32 scene_id = 9;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @return A list containing the unhidePointList.
      */
     java.util.List<java.lang.Integer> getUnhidePointListList();
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @return The count of unhidePointList.
      */
     int getUnhidePointListCount();
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @param index The index of the element to return.
      * @return The unhidePointList at the given index.
      */
     int getUnhidePointList(int index);
 
     /**
-     * <code>bool FBFJPEPMAOF = 9;</code>
-     * @return The fBFJPEPMAOF.
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @return A list containing the bEOCPMCPHJH.
      */
-    boolean getFBFJPEPMAOF();
+    java.util.List<java.lang.Integer> getBEOCPMCPHJHList();
+    /**
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @return The count of bEOCPMCPHJH.
+     */
+    int getBEOCPMCPHJHCount();
+    /**
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @param index The index of the element to return.
+     * @return The bEOCPMCPHJH at the given index.
+     */
+    int getBEOCPMCPHJH(int index);
 
     /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @return A list containing the dOGJLOBEEPC.
      */
-    int getRetcode();
+    java.util.List<java.lang.Integer> getDOGJLOBEEPCList();
+    /**
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @return The count of dOGJLOBEEPC.
+     */
+    int getDOGJLOBEEPCCount();
+    /**
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @param index The index of the element to return.
+     * @return The dOGJLOBEEPC at the given index.
+     */
+    int getDOGJLOBEEPC(int index);
 
     /**
-     * <code>repeated uint32 unlock_area_list = 12;</code>
+     * <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 = 12;</code>
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return The count of unlockAreaList.
      */
     int getUnlockAreaListCount();
     /**
-     * <code>repeated uint32 unlock_area_list = 12;</code>
+     * <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 PPDDIADEDIC = 8;</code>
-     * @return A list containing the pPDDIADEDIC.
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+     * @return A list containing the oGLOLEOEAGD.
      */
-    java.util.List<java.lang.Integer> getPPDDIADEDICList();
+    java.util.List<java.lang.Integer> getOGLOLEOEAGDList();
     /**
-     * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-     * @return The count of pPDDIADEDIC.
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+     * @return The count of oGLOLEOEAGD.
      */
-    int getPPDDIADEDICCount();
+    int getOGLOLEOEAGDCount();
     /**
-     * <code>repeated uint32 PPDDIADEDIC = 8;</code>
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
      * @param index The index of the element to return.
-     * @return The pPDDIADEDIC at the given index.
+     * @return The oGLOLEOEAGD at the given index.
      */
-    int getPPDDIADEDIC(int index);
+    int getOGLOLEOEAGD(int index);
 
     /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @return A list containing the oGKCOCBLNLF.
+     * <code>bool is_new_player = 15;</code>
+     * @return The isNewPlayer.
      */
-    java.util.List<java.lang.Integer> getOGKCOCBLNLFList();
-    /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @return The count of oGKCOCBLNLF.
-     */
-    int getOGKCOCBLNLFCount();
-    /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @param index The index of the element to return.
-     * @return The oGKCOCBLNLF at the given index.
-     */
-    int getOGKCOCBLNLF(int index);
-
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @return A list containing the eBIFELCKPEA.
-     */
-    java.util.List<java.lang.Integer> getEBIFELCKPEAList();
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @return The count of eBIFELCKPEA.
-     */
-    int getEBIFELCKPEACount();
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @param index The index of the element to return.
-     * @return The eBIFELCKPEA at the given index.
-     */
-    int getEBIFELCKPEA(int index);
-
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @return A list containing the jJOHJDFINFN.
-     */
-    java.util.List<java.lang.Integer> getJJOHJDFINFNList();
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @return The count of jJOHJDFINFN.
-     */
-    int getJJOHJDFINFNCount();
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @param index The index of the element to return.
-     * @return The jJOHJDFINFN at the given index.
-     */
-    int getJJOHJDFINFN(int index);
-
-    /**
-     * <code>uint32 belong_uid = 14;</code>
-     * @return The belongUid.
-     */
-    int getBelongUid();
-
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @return A list containing the jCLHNODLPOH.
-     */
-    java.util.List<java.lang.Integer> getJCLHNODLPOHList();
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @return The count of jCLHNODLPOH.
-     */
-    int getJCLHNODLPOHCount();
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @param index The index of the element to return.
-     * @return The jCLHNODLPOH at the given index.
-     */
-    int getJCLHNODLPOH(int index);
-
-    /**
-     * <code>uint32 scene_id = 2;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @return A list containing the kOPAHGHMECF.
-     */
-    java.util.List<java.lang.Integer> getKOPAHGHMECFList();
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @return The count of kOPAHGHMECF.
-     */
-    int getKOPAHGHMECFCount();
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @param index The index of the element to return.
-     * @return The kOPAHGHMECF at the given index.
-     */
-    int getKOPAHGHMECF(int index);
+    boolean getIsNewPlayer();
   }
   /**
-   * <pre>
-   * CmdId: 7133
-   * Obf: PMONCPENJMK
-   * </pre>
-   *
    * Protobuf type {@code GetScenePointRsp}
    */
   public static final class GetScenePointRsp extends
@@ -214,14 +209,14 @@ public final class GetScenePointRspOuterClass {
     }
     private GetScenePointRsp() {
       unlockedPointList_ = emptyIntList();
+      fELMBEACBLB_ = emptyIntList();
+      lockedPointList_ = emptyIntList();
+      pointList_ = emptyIntList();
       unhidePointList_ = emptyIntList();
+      bEOCPMCPHJH_ = emptyIntList();
+      dOGJLOBEEPC_ = emptyIntList();
       unlockAreaList_ = emptyIntList();
-      pPDDIADEDIC_ = emptyIntList();
-      oGKCOCBLNLF_ = emptyIntList();
-      eBIFELCKPEA_ = emptyIntList();
-      jJOHJDFINFN_ = emptyIntList();
-      jCLHNODLPOH_ = emptyIntList();
-      kOPAHGHMECF_ = emptyIntList();
+      oGLOLEOEAGD_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -277,66 +272,97 @@ public final class GetScenePointRspOuterClass {
               break;
             }
             case 16: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
-                kOPAHGHMECF_ = newIntList();
-                mutable_bitField0_ |= 0x00000100;
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                fELMBEACBLB_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
               }
-              kOPAHGHMECF_.addInt(input.readUInt32());
+              fELMBEACBLB_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 18: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_ = newIntList();
-                mutable_bitField0_ |= 0x00000100;
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                fELMBEACBLB_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_.addInt(input.readUInt32());
+                fELMBEACBLB_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 32: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                jJOHJDFINFN_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                lockedPointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
-              jJOHJDFINFN_.addInt(input.readUInt32());
+              lockedPointList_.addInt(input.readUInt32());
               break;
             }
             case 34: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
-                jJOHJDFINFN_ = newIntList();
-                mutable_bitField0_ |= 0x00000040;
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                lockedPointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jJOHJDFINFN_.addInt(input.readUInt32());
+                lockedPointList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 40: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                pointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              pointList_.addInt(input.readUInt32());
+              break;
+            }
+            case 42: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                pointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                pointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
             case 48: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+
+              belongUid_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 72: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
                 unhidePointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000010;
               }
               unhidePointList_.addInt(input.readUInt32());
               break;
             }
-            case 50: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
                 unhidePointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000010;
               }
               while (input.getBytesUntilLimit() > 0) {
                 unhidePointList_.addInt(input.readUInt32());
@@ -344,93 +370,62 @@ public final class GetScenePointRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 56: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                eBIFELCKPEA_ = newIntList();
+                bEOCPMCPHJH_ = newIntList();
                 mutable_bitField0_ |= 0x00000020;
               }
-              eBIFELCKPEA_.addInt(input.readUInt32());
+              bEOCPMCPHJH_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000020) != 0) && input.getBytesUntilLimit() > 0) {
-                eBIFELCKPEA_ = newIntList();
+                bEOCPMCPHJH_ = newIntList();
                 mutable_bitField0_ |= 0x00000020;
               }
               while (input.getBytesUntilLimit() > 0) {
-                eBIFELCKPEA_.addInt(input.readUInt32());
+                bEOCPMCPHJH_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 64: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                pPDDIADEDIC_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              pPDDIADEDIC_.addInt(input.readUInt32());
-              break;
-            }
-            case 66: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                pPDDIADEDIC_ = newIntList();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                pPDDIADEDIC_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 72: {
-
-              fBFJPEPMAOF_ = input.readBool();
-              break;
-            }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                oGKCOCBLNLF_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              oGKCOCBLNLF_.addInt(input.readUInt32());
-              break;
-            }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                oGKCOCBLNLF_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                oGKCOCBLNLF_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 88: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             case 96: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                unlockAreaList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                dOGJLOBEEPC_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
               }
-              unlockAreaList_.addInt(input.readUInt32());
+              dOGJLOBEEPC_.addInt(input.readUInt32());
               break;
             }
             case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                dOGJLOBEEPC_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                dOGJLOBEEPC_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 104: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
                 unlockAreaList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000080;
+              }
+              unlockAreaList_.addInt(input.readUInt32());
+              break;
+            }
+            case 106: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
+                unlockAreaList_ = newIntList();
+                mutable_bitField0_ |= 0x00000080;
               }
               while (input.getBytesUntilLimit() > 0) {
                 unlockAreaList_.addInt(input.readUInt32());
@@ -438,30 +433,30 @@ public final class GetScenePointRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 104: {
-              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                jCLHNODLPOH_ = newIntList();
-                mutable_bitField0_ |= 0x00000080;
+            case 112: {
+              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
+                oGLOLEOEAGD_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
               }
-              jCLHNODLPOH_.addInt(input.readUInt32());
+              oGLOLEOEAGD_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_ = newIntList();
-                mutable_bitField0_ |= 0x00000080;
+              if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
+                oGLOLEOEAGD_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_.addInt(input.readUInt32());
+                oGLOLEOEAGD_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 112: {
+            case 120: {
 
-              belongUid_ = input.readUInt32();
+              isNewPlayer_ = input.readBool();
               break;
             }
             default: {
@@ -482,29 +477,29 @@ public final class GetScenePointRspOuterClass {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           unlockedPointList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          jJOHJDFINFN_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          fELMBEACBLB_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          lockedPointList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          pointList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000010) != 0)) {
           unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
-          eBIFELCKPEA_.makeImmutable(); // C
+          bEOCPMCPHJH_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          pPDDIADEDIC_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          oGKCOCBLNLF_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          unlockAreaList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          dOGJLOBEEPC_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_.makeImmutable(); // C
+          unlockAreaList_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000100) != 0)) {
+          oGLOLEOEAGD_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -551,10 +546,127 @@ public final class GetScenePointRspOuterClass {
     }
     private int unlockedPointListMemoizedSerializedSize = -1;
 
-    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 6;
+    public static final int FELMBEACBLB_FIELD_NUMBER = 2;
+    private com.google.protobuf.Internal.IntList fELMBEACBLB_;
+    /**
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @return A list containing the fELMBEACBLB.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getFELMBEACBLBList() {
+      return fELMBEACBLB_;
+    }
+    /**
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @return The count of fELMBEACBLB.
+     */
+    public int getFELMBEACBLBCount() {
+      return fELMBEACBLB_.size();
+    }
+    /**
+     * <code>repeated uint32 FELMBEACBLB = 2;</code>
+     * @param index The index of the element to return.
+     * @return The fELMBEACBLB at the given index.
+     */
+    public int getFELMBEACBLB(int index) {
+      return fELMBEACBLB_.getInt(index);
+    }
+    private int fELMBEACBLBMemoizedSerializedSize = -1;
+
+    public static final int LOCKED_POINT_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList lockedPointList_;
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</code>
+     * @return A list containing the lockedPointList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLockedPointListList() {
+      return lockedPointList_;
+    }
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</code>
+     * @return The count of lockedPointList.
+     */
+    public int getLockedPointListCount() {
+      return lockedPointList_.size();
+    }
+    /**
+     * <code>repeated uint32 locked_point_list = 4;</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 POINT_LIST_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList pointList_;
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @return A list containing the pointList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPointListList() {
+      return pointList_;
+    }
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @return The count of pointList.
+     */
+    public int getPointListCount() {
+      return pointList_.size();
+    }
+    /**
+     * <code>repeated uint32 point_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The pointList at the given index.
+     */
+    public int getPointList(int index) {
+      return pointList_.getInt(index);
+    }
+    private int pointListMemoizedSerializedSize = -1;
+
+    public static final int BELONG_UID_FIELD_NUMBER = 6;
+    private int belongUid_;
+    /**
+     * <code>uint32 belong_uid = 6;</code>
+     * @return The belongUid.
+     */
+    @java.lang.Override
+    public int getBelongUid() {
+      return belongUid_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 9;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 9;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList unhidePointList_;
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @return A list containing the unhidePointList.
      */
     @java.lang.Override
@@ -563,14 +675,14 @@ public final class GetScenePointRspOuterClass {
       return unhidePointList_;
     }
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @return The count of unhidePointList.
      */
     public int getUnhidePointListCount() {
       return unhidePointList_.size();
     }
     /**
-     * <code>repeated uint32 unhide_point_list = 6;</code>
+     * <code>repeated uint32 unhide_point_list = 10;</code>
      * @param index The index of the element to return.
      * @return The unhidePointList at the given index.
      */
@@ -579,32 +691,66 @@ public final class GetScenePointRspOuterClass {
     }
     private int unhidePointListMemoizedSerializedSize = -1;
 
-    public static final int FBFJPEPMAOF_FIELD_NUMBER = 9;
-    private boolean fBFJPEPMAOF_;
+    public static final int BEOCPMCPHJH_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList bEOCPMCPHJH_;
     /**
-     * <code>bool FBFJPEPMAOF = 9;</code>
-     * @return The fBFJPEPMAOF.
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @return A list containing the bEOCPMCPHJH.
      */
     @java.lang.Override
-    public boolean getFBFJPEPMAOF() {
-      return fBFJPEPMAOF_;
+    public java.util.List<java.lang.Integer>
+        getBEOCPMCPHJHList() {
+      return bEOCPMCPHJH_;
     }
-
-    public static final int RETCODE_FIELD_NUMBER = 11;
-    private int retcode_;
     /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @return The count of bEOCPMCPHJH.
+     */
+    public int getBEOCPMCPHJHCount() {
+      return bEOCPMCPHJH_.size();
+    }
+    /**
+     * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+     * @param index The index of the element to return.
+     * @return The bEOCPMCPHJH at the given index.
+     */
+    public int getBEOCPMCPHJH(int index) {
+      return bEOCPMCPHJH_.getInt(index);
+    }
+    private int bEOCPMCPHJHMemoizedSerializedSize = -1;
+
+    public static final int DOGJLOBEEPC_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList dOGJLOBEEPC_;
+    /**
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @return A list containing the dOGJLOBEEPC.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public java.util.List<java.lang.Integer>
+        getDOGJLOBEEPCList() {
+      return dOGJLOBEEPC_;
     }
+    /**
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @return The count of dOGJLOBEEPC.
+     */
+    public int getDOGJLOBEEPCCount() {
+      return dOGJLOBEEPC_.size();
+    }
+    /**
+     * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+     * @param index The index of the element to return.
+     * @return The dOGJLOBEEPC at the given index.
+     */
+    public int getDOGJLOBEEPC(int index) {
+      return dOGJLOBEEPC_.getInt(index);
+    }
+    private int dOGJLOBEEPCMemoizedSerializedSize = -1;
 
-    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 12;
+    public static final int UNLOCK_AREA_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList unlockAreaList_;
     /**
-     * <code>repeated uint32 unlock_area_list = 12;</code>
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @return A list containing the unlockAreaList.
      */
     @java.lang.Override
@@ -613,14 +759,14 @@ public final class GetScenePointRspOuterClass {
       return unlockAreaList_;
     }
     /**
-     * <code>repeated uint32 unlock_area_list = 12;</code>
+     * <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 = 12;</code>
+     * <code>repeated uint32 unlock_area_list = 13;</code>
      * @param index The index of the element to return.
      * @return The unlockAreaList at the given index.
      */
@@ -629,195 +775,44 @@ public final class GetScenePointRspOuterClass {
     }
     private int unlockAreaListMemoizedSerializedSize = -1;
 
-    public static final int PPDDIADEDIC_FIELD_NUMBER = 8;
-    private com.google.protobuf.Internal.IntList pPDDIADEDIC_;
+    public static final int OGLOLEOEAGD_FIELD_NUMBER = 14;
+    private com.google.protobuf.Internal.IntList oGLOLEOEAGD_;
     /**
-     * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-     * @return A list containing the pPDDIADEDIC.
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+     * @return A list containing the oGLOLEOEAGD.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getPPDDIADEDICList() {
-      return pPDDIADEDIC_;
+        getOGLOLEOEAGDList() {
+      return oGLOLEOEAGD_;
     }
     /**
-     * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-     * @return The count of pPDDIADEDIC.
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+     * @return The count of oGLOLEOEAGD.
      */
-    public int getPPDDIADEDICCount() {
-      return pPDDIADEDIC_.size();
+    public int getOGLOLEOEAGDCount() {
+      return oGLOLEOEAGD_.size();
     }
     /**
-     * <code>repeated uint32 PPDDIADEDIC = 8;</code>
+     * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
      * @param index The index of the element to return.
-     * @return The pPDDIADEDIC at the given index.
+     * @return The oGLOLEOEAGD at the given index.
      */
-    public int getPPDDIADEDIC(int index) {
-      return pPDDIADEDIC_.getInt(index);
+    public int getOGLOLEOEAGD(int index) {
+      return oGLOLEOEAGD_.getInt(index);
     }
-    private int pPDDIADEDICMemoizedSerializedSize = -1;
+    private int oGLOLEOEAGDMemoizedSerializedSize = -1;
 
-    public static final int OGKCOCBLNLF_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList oGKCOCBLNLF_;
+    public static final int IS_NEW_PLAYER_FIELD_NUMBER = 15;
+    private boolean isNewPlayer_;
     /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @return A list containing the oGKCOCBLNLF.
+     * <code>bool is_new_player = 15;</code>
+     * @return The isNewPlayer.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getOGKCOCBLNLFList() {
-      return oGKCOCBLNLF_;
+    public boolean getIsNewPlayer() {
+      return isNewPlayer_;
     }
-    /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @return The count of oGKCOCBLNLF.
-     */
-    public int getOGKCOCBLNLFCount() {
-      return oGKCOCBLNLF_.size();
-    }
-    /**
-     * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-     * @param index The index of the element to return.
-     * @return The oGKCOCBLNLF at the given index.
-     */
-    public int getOGKCOCBLNLF(int index) {
-      return oGKCOCBLNLF_.getInt(index);
-    }
-    private int oGKCOCBLNLFMemoizedSerializedSize = -1;
-
-    public static final int EBIFELCKPEA_FIELD_NUMBER = 7;
-    private com.google.protobuf.Internal.IntList eBIFELCKPEA_;
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @return A list containing the eBIFELCKPEA.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getEBIFELCKPEAList() {
-      return eBIFELCKPEA_;
-    }
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @return The count of eBIFELCKPEA.
-     */
-    public int getEBIFELCKPEACount() {
-      return eBIFELCKPEA_.size();
-    }
-    /**
-     * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-     * @param index The index of the element to return.
-     * @return The eBIFELCKPEA at the given index.
-     */
-    public int getEBIFELCKPEA(int index) {
-      return eBIFELCKPEA_.getInt(index);
-    }
-    private int eBIFELCKPEAMemoizedSerializedSize = -1;
-
-    public static final int JJOHJDFINFN_FIELD_NUMBER = 4;
-    private com.google.protobuf.Internal.IntList jJOHJDFINFN_;
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @return A list containing the jJOHJDFINFN.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getJJOHJDFINFNList() {
-      return jJOHJDFINFN_;
-    }
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @return The count of jJOHJDFINFN.
-     */
-    public int getJJOHJDFINFNCount() {
-      return jJOHJDFINFN_.size();
-    }
-    /**
-     * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-     * @param index The index of the element to return.
-     * @return The jJOHJDFINFN at the given index.
-     */
-    public int getJJOHJDFINFN(int index) {
-      return jJOHJDFINFN_.getInt(index);
-    }
-    private int jJOHJDFINFNMemoizedSerializedSize = -1;
-
-    public static final int BELONG_UID_FIELD_NUMBER = 14;
-    private int belongUid_;
-    /**
-     * <code>uint32 belong_uid = 14;</code>
-     * @return The belongUid.
-     */
-    @java.lang.Override
-    public int getBelongUid() {
-      return belongUid_;
-    }
-
-    public static final int JCLHNODLPOH_FIELD_NUMBER = 13;
-    private com.google.protobuf.Internal.IntList jCLHNODLPOH_;
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @return A list containing the jCLHNODLPOH.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getJCLHNODLPOHList() {
-      return jCLHNODLPOH_;
-    }
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @return The count of jCLHNODLPOH.
-     */
-    public int getJCLHNODLPOHCount() {
-      return jCLHNODLPOH_.size();
-    }
-    /**
-     * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-     * @param index The index of the element to return.
-     * @return The jCLHNODLPOH at the given index.
-     */
-    public int getJCLHNODLPOH(int index) {
-      return jCLHNODLPOH_.getInt(index);
-    }
-    private int jCLHNODLPOHMemoizedSerializedSize = -1;
-
-    public static final int SCENE_ID_FIELD_NUMBER = 2;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 2;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
-    public static final int KOPAHGHMECF_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList kOPAHGHMECF_;
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @return A list containing the kOPAHGHMECF.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getKOPAHGHMECFList() {
-      return kOPAHGHMECF_;
-    }
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @return The count of kOPAHGHMECF.
-     */
-    public int getKOPAHGHMECFCount() {
-      return kOPAHGHMECF_.size();
-    }
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-     * @param index The index of the element to return.
-     * @return The kOPAHGHMECF at the given index.
-     */
-    public int getKOPAHGHMECF(int index) {
-      return kOPAHGHMECF_.getInt(index);
-    }
-    private int kOPAHGHMECFMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -841,73 +836,73 @@ public final class GetScenePointRspOuterClass {
       for (int i = 0; i < unlockedPointList_.size(); i++) {
         output.writeUInt32NoTag(unlockedPointList_.getInt(i));
       }
-      if (sceneId_ != 0) {
-        output.writeUInt32(2, sceneId_);
+      if (getFELMBEACBLBList().size() > 0) {
+        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(fELMBEACBLBMemoizedSerializedSize);
       }
-      if (getKOPAHGHMECFList().size() > 0) {
-        output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(kOPAHGHMECFMemoizedSerializedSize);
+      for (int i = 0; i < fELMBEACBLB_.size(); i++) {
+        output.writeUInt32NoTag(fELMBEACBLB_.getInt(i));
       }
-      for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
-        output.writeUInt32NoTag(kOPAHGHMECF_.getInt(i));
-      }
-      if (getJJOHJDFINFNList().size() > 0) {
+      if (getLockedPointListList().size() > 0) {
         output.writeUInt32NoTag(34);
-        output.writeUInt32NoTag(jJOHJDFINFNMemoizedSerializedSize);
+        output.writeUInt32NoTag(lockedPointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < jJOHJDFINFN_.size(); i++) {
-        output.writeUInt32NoTag(jJOHJDFINFN_.getInt(i));
+      for (int i = 0; i < lockedPointList_.size(); i++) {
+        output.writeUInt32NoTag(lockedPointList_.getInt(i));
+      }
+      if (getPointListList().size() > 0) {
+        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(pointListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < pointList_.size(); i++) {
+        output.writeUInt32NoTag(pointList_.getInt(i));
+      }
+      if (belongUid_ != 0) {
+        output.writeUInt32(6, belongUid_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(9, sceneId_);
       }
       if (getUnhidePointListList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
       }
       for (int i = 0; i < unhidePointList_.size(); i++) {
         output.writeUInt32NoTag(unhidePointList_.getInt(i));
       }
-      if (getEBIFELCKPEAList().size() > 0) {
-        output.writeUInt32NoTag(58);
-        output.writeUInt32NoTag(eBIFELCKPEAMemoizedSerializedSize);
+      if (getBEOCPMCPHJHList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(bEOCPMCPHJHMemoizedSerializedSize);
       }
-      for (int i = 0; i < eBIFELCKPEA_.size(); i++) {
-        output.writeUInt32NoTag(eBIFELCKPEA_.getInt(i));
+      for (int i = 0; i < bEOCPMCPHJH_.size(); i++) {
+        output.writeUInt32NoTag(bEOCPMCPHJH_.getInt(i));
       }
-      if (getPPDDIADEDICList().size() > 0) {
-        output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(pPDDIADEDICMemoizedSerializedSize);
+      if (getDOGJLOBEEPCList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(dOGJLOBEEPCMemoizedSerializedSize);
       }
-      for (int i = 0; i < pPDDIADEDIC_.size(); i++) {
-        output.writeUInt32NoTag(pPDDIADEDIC_.getInt(i));
-      }
-      if (fBFJPEPMAOF_ != false) {
-        output.writeBool(9, fBFJPEPMAOF_);
-      }
-      if (getOGKCOCBLNLFList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(oGKCOCBLNLFMemoizedSerializedSize);
-      }
-      for (int i = 0; i < oGKCOCBLNLF_.size(); i++) {
-        output.writeUInt32NoTag(oGKCOCBLNLF_.getInt(i));
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+      for (int i = 0; i < dOGJLOBEEPC_.size(); i++) {
+        output.writeUInt32NoTag(dOGJLOBEEPC_.getInt(i));
       }
       if (getUnlockAreaListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(unlockAreaListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockAreaList_.size(); i++) {
         output.writeUInt32NoTag(unlockAreaList_.getInt(i));
       }
-      if (getJCLHNODLPOHList().size() > 0) {
-        output.writeUInt32NoTag(106);
-        output.writeUInt32NoTag(jCLHNODLPOHMemoizedSerializedSize);
+      if (getOGLOLEOEAGDList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(oGLOLEOEAGDMemoizedSerializedSize);
       }
-      for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
-        output.writeUInt32NoTag(jCLHNODLPOH_.getInt(i));
+      for (int i = 0; i < oGLOLEOEAGD_.size(); i++) {
+        output.writeUInt32NoTag(oGLOLEOEAGD_.getInt(i));
       }
-      if (belongUid_ != 0) {
-        output.writeUInt32(14, belongUid_);
+      if (isNewPlayer_ != false) {
+        output.writeBool(15, isNewPlayer_);
       }
       unknownFields.writeTo(output);
     }
@@ -932,37 +927,59 @@ public final class GetScenePointRspOuterClass {
         }
         unlockedPointListMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < fELMBEACBLB_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(fELMBEACBLB_.getInt(i));
+        }
+        size += dataSize;
+        if (!getFELMBEACBLBList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        fELMBEACBLBMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < lockedPointList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(lockedPointList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getLockedPointListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        lockedPointListMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < pointList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(pointList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPointListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        pointListMemoizedSerializedSize = dataSize;
+      }
+      if (belongUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, belongUid_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
+      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, sceneId_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(kOPAHGHMECF_.getInt(i));
-        }
-        size += dataSize;
-        if (!getKOPAHGHMECFList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        kOPAHGHMECFMemoizedSerializedSize = dataSize;
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < jJOHJDFINFN_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jJOHJDFINFN_.getInt(i));
-        }
-        size += dataSize;
-        if (!getJJOHJDFINFNList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        jJOHJDFINFNMemoizedSerializedSize = dataSize;
+          .computeUInt32Size(9, sceneId_);
       }
       {
         int dataSize = 0;
@@ -980,53 +997,31 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < eBIFELCKPEA_.size(); i++) {
+        for (int i = 0; i < bEOCPMCPHJH_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(eBIFELCKPEA_.getInt(i));
+            .computeUInt32SizeNoTag(bEOCPMCPHJH_.getInt(i));
         }
         size += dataSize;
-        if (!getEBIFELCKPEAList().isEmpty()) {
+        if (!getBEOCPMCPHJHList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        eBIFELCKPEAMemoizedSerializedSize = dataSize;
+        bEOCPMCPHJHMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < pPDDIADEDIC_.size(); i++) {
+        for (int i = 0; i < dOGJLOBEEPC_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(pPDDIADEDIC_.getInt(i));
+            .computeUInt32SizeNoTag(dOGJLOBEEPC_.getInt(i));
         }
         size += dataSize;
-        if (!getPPDDIADEDICList().isEmpty()) {
+        if (!getDOGJLOBEEPCList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        pPDDIADEDICMemoizedSerializedSize = dataSize;
-      }
-      if (fBFJPEPMAOF_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, fBFJPEPMAOF_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < oGKCOCBLNLF_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(oGKCOCBLNLF_.getInt(i));
-        }
-        size += dataSize;
-        if (!getOGKCOCBLNLFList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        oGKCOCBLNLFMemoizedSerializedSize = dataSize;
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+        dOGJLOBEEPCMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -1044,21 +1039,21 @@ public final class GetScenePointRspOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
+        for (int i = 0; i < oGLOLEOEAGD_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jCLHNODLPOH_.getInt(i));
+            .computeUInt32SizeNoTag(oGLOLEOEAGD_.getInt(i));
         }
         size += dataSize;
-        if (!getJCLHNODLPOHList().isEmpty()) {
+        if (!getOGLOLEOEAGDList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        jCLHNODLPOHMemoizedSerializedSize = dataSize;
+        oGLOLEOEAGDMemoizedSerializedSize = dataSize;
       }
-      if (belongUid_ != 0) {
+      if (isNewPlayer_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, belongUid_);
+          .computeBoolSize(15, isNewPlayer_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1077,30 +1072,30 @@ public final class GetScenePointRspOuterClass {
 
       if (!getUnlockedPointListList()
           .equals(other.getUnlockedPointListList())) return false;
-      if (!getUnhidePointListList()
-          .equals(other.getUnhidePointListList())) return false;
-      if (getFBFJPEPMAOF()
-          != other.getFBFJPEPMAOF()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (!getUnlockAreaListList()
-          .equals(other.getUnlockAreaListList())) return false;
-      if (!getPPDDIADEDICList()
-          .equals(other.getPPDDIADEDICList())) return false;
-      if (!getOGKCOCBLNLFList()
-          .equals(other.getOGKCOCBLNLFList())) return false;
-      if (!getEBIFELCKPEAList()
-          .equals(other.getEBIFELCKPEAList())) return false;
-      if (!getJJOHJDFINFNList()
-          .equals(other.getJJOHJDFINFNList())) return false;
+      if (!getFELMBEACBLBList()
+          .equals(other.getFELMBEACBLBList())) return false;
+      if (!getLockedPointListList()
+          .equals(other.getLockedPointListList())) return false;
+      if (!getPointListList()
+          .equals(other.getPointListList())) return false;
       if (getBelongUid()
           != other.getBelongUid()) return false;
-      if (!getJCLHNODLPOHList()
-          .equals(other.getJCLHNODLPOHList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (!getKOPAHGHMECFList()
-          .equals(other.getKOPAHGHMECFList())) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
+      if (!getBEOCPMCPHJHList()
+          .equals(other.getBEOCPMCPHJHList())) return false;
+      if (!getDOGJLOBEEPCList()
+          .equals(other.getDOGJLOBEEPCList())) return false;
+      if (!getUnlockAreaListList()
+          .equals(other.getUnlockAreaListList())) return false;
+      if (!getOGLOLEOEAGDList()
+          .equals(other.getOGLOLEOEAGDList())) return false;
+      if (getIsNewPlayer()
+          != other.getIsNewPlayer()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1116,47 +1111,47 @@ public final class GetScenePointRspOuterClass {
         hash = (37 * hash) + UNLOCKED_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedPointListList().hashCode();
       }
+      if (getFELMBEACBLBCount() > 0) {
+        hash = (37 * hash) + FELMBEACBLB_FIELD_NUMBER;
+        hash = (53 * hash) + getFELMBEACBLBList().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();
+      }
+      hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getBelongUid();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       if (getUnhidePointListCount() > 0) {
         hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnhidePointListList().hashCode();
       }
-      hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getFBFJPEPMAOF());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
+      if (getBEOCPMCPHJHCount() > 0) {
+        hash = (37 * hash) + BEOCPMCPHJH_FIELD_NUMBER;
+        hash = (53 * hash) + getBEOCPMCPHJHList().hashCode();
+      }
+      if (getDOGJLOBEEPCCount() > 0) {
+        hash = (37 * hash) + DOGJLOBEEPC_FIELD_NUMBER;
+        hash = (53 * hash) + getDOGJLOBEEPCList().hashCode();
+      }
       if (getUnlockAreaListCount() > 0) {
         hash = (37 * hash) + UNLOCK_AREA_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockAreaListList().hashCode();
       }
-      if (getPPDDIADEDICCount() > 0) {
-        hash = (37 * hash) + PPDDIADEDIC_FIELD_NUMBER;
-        hash = (53 * hash) + getPPDDIADEDICList().hashCode();
-      }
-      if (getOGKCOCBLNLFCount() > 0) {
-        hash = (37 * hash) + OGKCOCBLNLF_FIELD_NUMBER;
-        hash = (53 * hash) + getOGKCOCBLNLFList().hashCode();
-      }
-      if (getEBIFELCKPEACount() > 0) {
-        hash = (37 * hash) + EBIFELCKPEA_FIELD_NUMBER;
-        hash = (53 * hash) + getEBIFELCKPEAList().hashCode();
-      }
-      if (getJJOHJDFINFNCount() > 0) {
-        hash = (37 * hash) + JJOHJDFINFN_FIELD_NUMBER;
-        hash = (53 * hash) + getJJOHJDFINFNList().hashCode();
-      }
-      hash = (37 * hash) + BELONG_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getBelongUid();
-      if (getJCLHNODLPOHCount() > 0) {
-        hash = (37 * hash) + JCLHNODLPOH_FIELD_NUMBER;
-        hash = (53 * hash) + getJCLHNODLPOHList().hashCode();
-      }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      if (getKOPAHGHMECFCount() > 0) {
-        hash = (37 * hash) + KOPAHGHMECF_FIELD_NUMBER;
-        hash = (53 * hash) + getKOPAHGHMECFList().hashCode();
+      if (getOGLOLEOEAGDCount() > 0) {
+        hash = (37 * hash) + OGLOLEOEAGD_FIELD_NUMBER;
+        hash = (53 * hash) + getOGLOLEOEAGDList().hashCode();
       }
+      hash = (37 * hash) + IS_NEW_PLAYER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsNewPlayer());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1253,11 +1248,6 @@ public final class GetScenePointRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7133
-     * Obf: PMONCPENJMK
-     * </pre>
-     *
      * Protobuf type {@code GetScenePointRsp}
      */
     public static final class Builder extends
@@ -1297,30 +1287,30 @@ public final class GetScenePointRspOuterClass {
         super.clear();
         unlockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        unhidePointList_ = emptyIntList();
+        fELMBEACBLB_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        fBFJPEPMAOF_ = false;
+        lockedPointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        pointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        belongUid_ = 0;
 
         retcode_ = 0;
 
-        unlockAreaList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        pPDDIADEDIC_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        oGKCOCBLNLF_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        eBIFELCKPEA_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        jJOHJDFINFN_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-        belongUid_ = 0;
-
-        jCLHNODLPOH_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000080);
         sceneId_ = 0;
 
-        kOPAHGHMECF_ = emptyIntList();
+        unhidePointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000010);
+        bEOCPMCPHJH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000020);
+        dOGJLOBEEPC_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        unlockAreaList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000080);
+        oGLOLEOEAGD_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
+        isNewPlayer_ = false;
+
         return this;
       }
 
@@ -1354,49 +1344,49 @@ public final class GetScenePointRspOuterClass {
         }
         result.unlockedPointList_ = unlockedPointList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          unhidePointList_.makeImmutable();
+          fELMBEACBLB_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.unhidePointList_ = unhidePointList_;
-        result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
-        result.retcode_ = retcode_;
+        result.fELMBEACBLB_ = fELMBEACBLB_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          unlockAreaList_.makeImmutable();
+          lockedPointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.unlockAreaList_ = unlockAreaList_;
+        result.lockedPointList_ = lockedPointList_;
         if (((bitField0_ & 0x00000008) != 0)) {
-          pPDDIADEDIC_.makeImmutable();
+          pointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.pPDDIADEDIC_ = pPDDIADEDIC_;
+        result.pointList_ = pointList_;
+        result.belongUid_ = belongUid_;
+        result.retcode_ = retcode_;
+        result.sceneId_ = sceneId_;
         if (((bitField0_ & 0x00000010) != 0)) {
-          oGKCOCBLNLF_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000010);
         }
-        result.oGKCOCBLNLF_ = oGKCOCBLNLF_;
+        result.unhidePointList_ = unhidePointList_;
         if (((bitField0_ & 0x00000020) != 0)) {
-          eBIFELCKPEA_.makeImmutable();
+          bEOCPMCPHJH_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000020);
         }
-        result.eBIFELCKPEA_ = eBIFELCKPEA_;
+        result.bEOCPMCPHJH_ = bEOCPMCPHJH_;
         if (((bitField0_ & 0x00000040) != 0)) {
-          jJOHJDFINFN_.makeImmutable();
+          dOGJLOBEEPC_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000040);
         }
-        result.jJOHJDFINFN_ = jJOHJDFINFN_;
-        result.belongUid_ = belongUid_;
+        result.dOGJLOBEEPC_ = dOGJLOBEEPC_;
         if (((bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_.makeImmutable();
+          unlockAreaList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000080);
         }
-        result.jCLHNODLPOH_ = jCLHNODLPOH_;
-        result.sceneId_ = sceneId_;
+        result.unlockAreaList_ = unlockAreaList_;
         if (((bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_.makeImmutable();
+          oGLOLEOEAGD_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000100);
         }
-        result.kOPAHGHMECF_ = kOPAHGHMECF_;
+        result.oGLOLEOEAGD_ = oGLOLEOEAGD_;
+        result.isNewPlayer_ = isNewPlayer_;
         onBuilt();
         return result;
       }
@@ -1455,98 +1445,98 @@ public final class GetScenePointRspOuterClass {
           }
           onChanged();
         }
-        if (!other.unhidePointList_.isEmpty()) {
-          if (unhidePointList_.isEmpty()) {
-            unhidePointList_ = other.unhidePointList_;
+        if (!other.fELMBEACBLB_.isEmpty()) {
+          if (fELMBEACBLB_.isEmpty()) {
+            fELMBEACBLB_ = other.fELMBEACBLB_;
             bitField0_ = (bitField0_ & ~0x00000002);
           } else {
-            ensureUnhidePointListIsMutable();
-            unhidePointList_.addAll(other.unhidePointList_);
+            ensureFELMBEACBLBIsMutable();
+            fELMBEACBLB_.addAll(other.fELMBEACBLB_);
           }
           onChanged();
         }
-        if (other.getFBFJPEPMAOF() != false) {
-          setFBFJPEPMAOF(other.getFBFJPEPMAOF());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (!other.unlockAreaList_.isEmpty()) {
-          if (unlockAreaList_.isEmpty()) {
-            unlockAreaList_ = other.unlockAreaList_;
+        if (!other.lockedPointList_.isEmpty()) {
+          if (lockedPointList_.isEmpty()) {
+            lockedPointList_ = other.lockedPointList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureUnlockAreaListIsMutable();
-            unlockAreaList_.addAll(other.unlockAreaList_);
+            ensureLockedPointListIsMutable();
+            lockedPointList_.addAll(other.lockedPointList_);
           }
           onChanged();
         }
-        if (!other.pPDDIADEDIC_.isEmpty()) {
-          if (pPDDIADEDIC_.isEmpty()) {
-            pPDDIADEDIC_ = other.pPDDIADEDIC_;
+        if (!other.pointList_.isEmpty()) {
+          if (pointList_.isEmpty()) {
+            pointList_ = other.pointList_;
             bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensurePPDDIADEDICIsMutable();
-            pPDDIADEDIC_.addAll(other.pPDDIADEDIC_);
-          }
-          onChanged();
-        }
-        if (!other.oGKCOCBLNLF_.isEmpty()) {
-          if (oGKCOCBLNLF_.isEmpty()) {
-            oGKCOCBLNLF_ = other.oGKCOCBLNLF_;
-            bitField0_ = (bitField0_ & ~0x00000010);
-          } else {
-            ensureOGKCOCBLNLFIsMutable();
-            oGKCOCBLNLF_.addAll(other.oGKCOCBLNLF_);
-          }
-          onChanged();
-        }
-        if (!other.eBIFELCKPEA_.isEmpty()) {
-          if (eBIFELCKPEA_.isEmpty()) {
-            eBIFELCKPEA_ = other.eBIFELCKPEA_;
-            bitField0_ = (bitField0_ & ~0x00000020);
-          } else {
-            ensureEBIFELCKPEAIsMutable();
-            eBIFELCKPEA_.addAll(other.eBIFELCKPEA_);
-          }
-          onChanged();
-        }
-        if (!other.jJOHJDFINFN_.isEmpty()) {
-          if (jJOHJDFINFN_.isEmpty()) {
-            jJOHJDFINFN_ = other.jJOHJDFINFN_;
-            bitField0_ = (bitField0_ & ~0x00000040);
-          } else {
-            ensureJJOHJDFINFNIsMutable();
-            jJOHJDFINFN_.addAll(other.jJOHJDFINFN_);
+            ensurePointListIsMutable();
+            pointList_.addAll(other.pointList_);
           }
           onChanged();
         }
         if (other.getBelongUid() != 0) {
           setBelongUid(other.getBelongUid());
         }
-        if (!other.jCLHNODLPOH_.isEmpty()) {
-          if (jCLHNODLPOH_.isEmpty()) {
-            jCLHNODLPOH_ = other.jCLHNODLPOH_;
-            bitField0_ = (bitField0_ & ~0x00000080);
-          } else {
-            ensureJCLHNODLPOHIsMutable();
-            jCLHNODLPOH_.addAll(other.jCLHNODLPOH_);
-          }
-          onChanged();
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (!other.kOPAHGHMECF_.isEmpty()) {
-          if (kOPAHGHMECF_.isEmpty()) {
-            kOPAHGHMECF_ = other.kOPAHGHMECF_;
-            bitField0_ = (bitField0_ & ~0x00000100);
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
+            bitField0_ = (bitField0_ & ~0x00000010);
           } else {
-            ensureKOPAHGHMECFIsMutable();
-            kOPAHGHMECF_.addAll(other.kOPAHGHMECF_);
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
           }
           onChanged();
         }
+        if (!other.bEOCPMCPHJH_.isEmpty()) {
+          if (bEOCPMCPHJH_.isEmpty()) {
+            bEOCPMCPHJH_ = other.bEOCPMCPHJH_;
+            bitField0_ = (bitField0_ & ~0x00000020);
+          } else {
+            ensureBEOCPMCPHJHIsMutable();
+            bEOCPMCPHJH_.addAll(other.bEOCPMCPHJH_);
+          }
+          onChanged();
+        }
+        if (!other.dOGJLOBEEPC_.isEmpty()) {
+          if (dOGJLOBEEPC_.isEmpty()) {
+            dOGJLOBEEPC_ = other.dOGJLOBEEPC_;
+            bitField0_ = (bitField0_ & ~0x00000040);
+          } else {
+            ensureDOGJLOBEEPCIsMutable();
+            dOGJLOBEEPC_.addAll(other.dOGJLOBEEPC_);
+          }
+          onChanged();
+        }
+        if (!other.unlockAreaList_.isEmpty()) {
+          if (unlockAreaList_.isEmpty()) {
+            unlockAreaList_ = other.unlockAreaList_;
+            bitField0_ = (bitField0_ & ~0x00000080);
+          } else {
+            ensureUnlockAreaListIsMutable();
+            unlockAreaList_.addAll(other.unlockAreaList_);
+          }
+          onChanged();
+        }
+        if (!other.oGLOLEOEAGD_.isEmpty()) {
+          if (oGLOLEOEAGD_.isEmpty()) {
+            oGLOLEOEAGD_ = other.oGLOLEOEAGD_;
+            bitField0_ = (bitField0_ & ~0x00000100);
+          } else {
+            ensureOGLOLEOEAGDIsMutable();
+            oGLOLEOEAGD_.addAll(other.oGLOLEOEAGD_);
+          }
+          onChanged();
+        }
+        if (other.getIsNewPlayer() != false) {
+          setIsNewPlayer(other.getIsNewPlayer());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1656,31 +1646,361 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
-      private void ensureUnhidePointListIsMutable() {
+      private com.google.protobuf.Internal.IntList fELMBEACBLB_ = emptyIntList();
+      private void ensureFELMBEACBLBIsMutable() {
         if (!((bitField0_ & 0x00000002) != 0)) {
-          unhidePointList_ = mutableCopy(unhidePointList_);
+          fELMBEACBLB_ = mutableCopy(fELMBEACBLB_);
           bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @return A list containing the fELMBEACBLB.
+       */
+      public java.util.List<java.lang.Integer>
+          getFELMBEACBLBList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(fELMBEACBLB_) : fELMBEACBLB_;
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @return The count of fELMBEACBLB.
+       */
+      public int getFELMBEACBLBCount() {
+        return fELMBEACBLB_.size();
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @param index The index of the element to return.
+       * @return The fELMBEACBLB at the given index.
+       */
+      public int getFELMBEACBLB(int index) {
+        return fELMBEACBLB_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @param index The index to set the value at.
+       * @param value The fELMBEACBLB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFELMBEACBLB(
+          int index, int value) {
+        ensureFELMBEACBLBIsMutable();
+        fELMBEACBLB_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @param value The fELMBEACBLB to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFELMBEACBLB(int value) {
+        ensureFELMBEACBLBIsMutable();
+        fELMBEACBLB_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @param values The fELMBEACBLB to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFELMBEACBLB(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFELMBEACBLBIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, fELMBEACBLB_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 FELMBEACBLB = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFELMBEACBLB() {
+        fELMBEACBLB_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList lockedPointList_ = emptyIntList();
+      private void ensureLockedPointListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          lockedPointList_ = mutableCopy(lockedPointList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @return A list containing the lockedPointList.
+       */
+      public java.util.List<java.lang.Integer>
+          getLockedPointListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(lockedPointList_) : lockedPointList_;
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @return The count of lockedPointList.
+       */
+      public int getLockedPointListCount() {
+        return lockedPointList_.size();
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</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);
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The lockedPointList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLockedPointList(
+          int index, int value) {
+        ensureLockedPointListIsMutable();
+        lockedPointList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @param value The lockedPointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLockedPointList(int value) {
+        ensureLockedPointListIsMutable();
+        lockedPointList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @param values The lockedPointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLockedPointList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLockedPointListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, lockedPointList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 locked_point_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLockedPointList() {
+        lockedPointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList pointList_ = emptyIntList();
+      private void ensurePointListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          pointList_ = mutableCopy(pointList_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @return A list containing the pointList.
+       */
+      public java.util.List<java.lang.Integer>
+          getPointListList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(pointList_) : pointList_;
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @return The count of pointList.
+       */
+      public int getPointListCount() {
+        return pointList_.size();
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @param index The index of the element to return.
+       * @return The pointList at the given index.
+       */
+      public int getPointList(int index) {
+        return pointList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @param index The index to set the value at.
+       * @param value The pointList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointList(
+          int index, int value) {
+        ensurePointListIsMutable();
+        pointList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @param value The pointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPointList(int value) {
+        ensurePointListIsMutable();
+        pointList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @param values The pointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPointList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePointListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, pointList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 point_list = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointList() {
+        pointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        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;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 9;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
+        if (!((bitField0_ & 0x00000010) != 0)) {
+          unhidePointList_ = mutableCopy(unhidePointList_);
+          bitField0_ |= 0x00000010;
+         }
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @return A list containing the unhidePointList.
        */
       public java.util.List<java.lang.Integer>
           getUnhidePointListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000010) != 0) ?
                  java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @return The count of unhidePointList.
        */
       public int getUnhidePointListCount() {
         return unhidePointList_.size();
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @param index The index of the element to return.
        * @return The unhidePointList at the given index.
        */
@@ -1688,7 +2008,7 @@ public final class GetScenePointRspOuterClass {
         return unhidePointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The unhidePointList to set.
        * @return This builder for chaining.
@@ -1701,7 +2021,7 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @param value The unhidePointList to add.
        * @return This builder for chaining.
        */
@@ -1712,7 +2032,7 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @param values The unhidePointList to add.
        * @return This builder for chaining.
        */
@@ -1725,103 +2045,199 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unhide_point_list = 6;</code>
+       * <code>repeated uint32 unhide_point_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnhidePointList() {
         unhidePointList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000010);
         onChanged();
         return this;
       }
 
-      private boolean fBFJPEPMAOF_ ;
-      /**
-       * <code>bool FBFJPEPMAOF = 9;</code>
-       * @return The fBFJPEPMAOF.
-       */
-      @java.lang.Override
-      public boolean getFBFJPEPMAOF() {
-        return fBFJPEPMAOF_;
+      private com.google.protobuf.Internal.IntList bEOCPMCPHJH_ = emptyIntList();
+      private void ensureBEOCPMCPHJHIsMutable() {
+        if (!((bitField0_ & 0x00000020) != 0)) {
+          bEOCPMCPHJH_ = mutableCopy(bEOCPMCPHJH_);
+          bitField0_ |= 0x00000020;
+         }
       }
       /**
-       * <code>bool FBFJPEPMAOF = 9;</code>
-       * @param value The fBFJPEPMAOF to set.
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @return A list containing the bEOCPMCPHJH.
+       */
+      public java.util.List<java.lang.Integer>
+          getBEOCPMCPHJHList() {
+        return ((bitField0_ & 0x00000020) != 0) ?
+                 java.util.Collections.unmodifiableList(bEOCPMCPHJH_) : bEOCPMCPHJH_;
+      }
+      /**
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @return The count of bEOCPMCPHJH.
+       */
+      public int getBEOCPMCPHJHCount() {
+        return bEOCPMCPHJH_.size();
+      }
+      /**
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @param index The index of the element to return.
+       * @return The bEOCPMCPHJH at the given index.
+       */
+      public int getBEOCPMCPHJH(int index) {
+        return bEOCPMCPHJH_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The bEOCPMCPHJH to set.
        * @return This builder for chaining.
        */
-      public Builder setFBFJPEPMAOF(boolean value) {
-        
-        fBFJPEPMAOF_ = value;
+      public Builder setBEOCPMCPHJH(
+          int index, int value) {
+        ensureBEOCPMCPHJHIsMutable();
+        bEOCPMCPHJH_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>bool FBFJPEPMAOF = 9;</code>
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @param value The bEOCPMCPHJH to add.
        * @return This builder for chaining.
        */
-      public Builder clearFBFJPEPMAOF() {
-        
-        fBFJPEPMAOF_ = false;
+      public Builder addBEOCPMCPHJH(int value) {
+        ensureBEOCPMCPHJHIsMutable();
+        bEOCPMCPHJH_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @param values The bEOCPMCPHJH to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllBEOCPMCPHJH(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureBEOCPMCPHJHIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, bEOCPMCPHJH_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 BEOCPMCPHJH = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBEOCPMCPHJH() {
+        bEOCPMCPHJH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000020);
         onChanged();
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 11;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
+      private com.google.protobuf.Internal.IntList dOGJLOBEEPC_ = emptyIntList();
+      private void ensureDOGJLOBEEPCIsMutable() {
+        if (!((bitField0_ & 0x00000040) != 0)) {
+          dOGJLOBEEPC_ = mutableCopy(dOGJLOBEEPC_);
+          bitField0_ |= 0x00000040;
+         }
       }
       /**
-       * <code>int32 retcode = 11;</code>
-       * @param value The retcode to set.
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @return A list containing the dOGJLOBEEPC.
+       */
+      public java.util.List<java.lang.Integer>
+          getDOGJLOBEEPCList() {
+        return ((bitField0_ & 0x00000040) != 0) ?
+                 java.util.Collections.unmodifiableList(dOGJLOBEEPC_) : dOGJLOBEEPC_;
+      }
+      /**
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @return The count of dOGJLOBEEPC.
+       */
+      public int getDOGJLOBEEPCCount() {
+        return dOGJLOBEEPC_.size();
+      }
+      /**
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @param index The index of the element to return.
+       * @return The dOGJLOBEEPC at the given index.
+       */
+      public int getDOGJLOBEEPC(int index) {
+        return dOGJLOBEEPC_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The dOGJLOBEEPC to set.
        * @return This builder for chaining.
        */
-      public Builder setRetcode(int value) {
-        
-        retcode_ = value;
+      public Builder setDOGJLOBEEPC(
+          int index, int value) {
+        ensureDOGJLOBEEPCIsMutable();
+        dOGJLOBEEPC_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @param value The dOGJLOBEEPC to add.
        * @return This builder for chaining.
        */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
+      public Builder addDOGJLOBEEPC(int value) {
+        ensureDOGJLOBEEPCIsMutable();
+        dOGJLOBEEPC_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @param values The dOGJLOBEEPC to add.
+       * @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_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 DOGJLOBEEPC = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDOGJLOBEEPC() {
+        dOGJLOBEEPC_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
         onChanged();
         return this;
       }
 
       private com.google.protobuf.Internal.IntList unlockAreaList_ = emptyIntList();
       private void ensureUnlockAreaListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000080) != 0)) {
           unlockAreaList_ = mutableCopy(unlockAreaList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000080;
          }
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <code>repeated uint32 unlock_area_list = 13;</code>
        * @return A list containing the unlockAreaList.
        */
       public java.util.List<java.lang.Integer>
           getUnlockAreaListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000080) != 0) ?
                  java.util.Collections.unmodifiableList(unlockAreaList_) : unlockAreaList_;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <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 = 12;</code>
+       * <code>repeated uint32 unlock_area_list = 13;</code>
        * @param index The index of the element to return.
        * @return The unlockAreaList at the given index.
        */
@@ -1829,7 +2245,7 @@ public final class GetScenePointRspOuterClass {
         return unlockAreaList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <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.
@@ -1842,7 +2258,7 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <code>repeated uint32 unlock_area_list = 13;</code>
        * @param value The unlockAreaList to add.
        * @return This builder for chaining.
        */
@@ -1853,7 +2269,7 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <code>repeated uint32 unlock_area_list = 13;</code>
        * @param values The unlockAreaList to add.
        * @return This builder for chaining.
        */
@@ -1866,551 +2282,125 @@ public final class GetScenePointRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlock_area_list = 12;</code>
+       * <code>repeated uint32 unlock_area_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnlockAreaList() {
         unlockAreaList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList pPDDIADEDIC_ = emptyIntList();
-      private void ensurePPDDIADEDICIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          pPDDIADEDIC_ = mutableCopy(pPDDIADEDIC_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @return A list containing the pPDDIADEDIC.
-       */
-      public java.util.List<java.lang.Integer>
-          getPPDDIADEDICList() {
-        return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(pPDDIADEDIC_) : pPDDIADEDIC_;
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @return The count of pPDDIADEDIC.
-       */
-      public int getPPDDIADEDICCount() {
-        return pPDDIADEDIC_.size();
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @param index The index of the element to return.
-       * @return The pPDDIADEDIC at the given index.
-       */
-      public int getPPDDIADEDIC(int index) {
-        return pPDDIADEDIC_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @param index The index to set the value at.
-       * @param value The pPDDIADEDIC to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPPDDIADEDIC(
-          int index, int value) {
-        ensurePPDDIADEDICIsMutable();
-        pPDDIADEDIC_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @param value The pPDDIADEDIC to add.
-       * @return This builder for chaining.
-       */
-      public Builder addPPDDIADEDIC(int value) {
-        ensurePPDDIADEDICIsMutable();
-        pPDDIADEDIC_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @param values The pPDDIADEDIC to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllPPDDIADEDIC(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensurePPDDIADEDICIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, pPDDIADEDIC_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 PPDDIADEDIC = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPPDDIADEDIC() {
-        pPDDIADEDIC_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000008);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList oGKCOCBLNLF_ = emptyIntList();
-      private void ensureOGKCOCBLNLFIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          oGKCOCBLNLF_ = mutableCopy(oGKCOCBLNLF_);
-          bitField0_ |= 0x00000010;
-         }
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @return A list containing the oGKCOCBLNLF.
-       */
-      public java.util.List<java.lang.Integer>
-          getOGKCOCBLNLFList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(oGKCOCBLNLF_) : oGKCOCBLNLF_;
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @return The count of oGKCOCBLNLF.
-       */
-      public int getOGKCOCBLNLFCount() {
-        return oGKCOCBLNLF_.size();
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @param index The index of the element to return.
-       * @return The oGKCOCBLNLF at the given index.
-       */
-      public int getOGKCOCBLNLF(int index) {
-        return oGKCOCBLNLF_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The oGKCOCBLNLF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOGKCOCBLNLF(
-          int index, int value) {
-        ensureOGKCOCBLNLFIsMutable();
-        oGKCOCBLNLF_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @param value The oGKCOCBLNLF to add.
-       * @return This builder for chaining.
-       */
-      public Builder addOGKCOCBLNLF(int value) {
-        ensureOGKCOCBLNLFIsMutable();
-        oGKCOCBLNLF_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @param values The oGKCOCBLNLF to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllOGKCOCBLNLF(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureOGKCOCBLNLFIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, oGKCOCBLNLF_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 OGKCOCBLNLF = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOGKCOCBLNLF() {
-        oGKCOCBLNLF_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList eBIFELCKPEA_ = emptyIntList();
-      private void ensureEBIFELCKPEAIsMutable() {
-        if (!((bitField0_ & 0x00000020) != 0)) {
-          eBIFELCKPEA_ = mutableCopy(eBIFELCKPEA_);
-          bitField0_ |= 0x00000020;
-         }
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @return A list containing the eBIFELCKPEA.
-       */
-      public java.util.List<java.lang.Integer>
-          getEBIFELCKPEAList() {
-        return ((bitField0_ & 0x00000020) != 0) ?
-                 java.util.Collections.unmodifiableList(eBIFELCKPEA_) : eBIFELCKPEA_;
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @return The count of eBIFELCKPEA.
-       */
-      public int getEBIFELCKPEACount() {
-        return eBIFELCKPEA_.size();
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @param index The index of the element to return.
-       * @return The eBIFELCKPEA at the given index.
-       */
-      public int getEBIFELCKPEA(int index) {
-        return eBIFELCKPEA_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @param index The index to set the value at.
-       * @param value The eBIFELCKPEA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEBIFELCKPEA(
-          int index, int value) {
-        ensureEBIFELCKPEAIsMutable();
-        eBIFELCKPEA_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @param value The eBIFELCKPEA to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEBIFELCKPEA(int value) {
-        ensureEBIFELCKPEAIsMutable();
-        eBIFELCKPEA_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @param values The eBIFELCKPEA to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEBIFELCKPEA(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureEBIFELCKPEAIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, eBIFELCKPEA_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 EBIFELCKPEA = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEBIFELCKPEA() {
-        eBIFELCKPEA_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000020);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList jJOHJDFINFN_ = emptyIntList();
-      private void ensureJJOHJDFINFNIsMutable() {
-        if (!((bitField0_ & 0x00000040) != 0)) {
-          jJOHJDFINFN_ = mutableCopy(jJOHJDFINFN_);
-          bitField0_ |= 0x00000040;
-         }
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @return A list containing the jJOHJDFINFN.
-       */
-      public java.util.List<java.lang.Integer>
-          getJJOHJDFINFNList() {
-        return ((bitField0_ & 0x00000040) != 0) ?
-                 java.util.Collections.unmodifiableList(jJOHJDFINFN_) : jJOHJDFINFN_;
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @return The count of jJOHJDFINFN.
-       */
-      public int getJJOHJDFINFNCount() {
-        return jJOHJDFINFN_.size();
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @param index The index of the element to return.
-       * @return The jJOHJDFINFN at the given index.
-       */
-      public int getJJOHJDFINFN(int index) {
-        return jJOHJDFINFN_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The jJOHJDFINFN to set.
-       * @return This builder for chaining.
-       */
-      public Builder setJJOHJDFINFN(
-          int index, int value) {
-        ensureJJOHJDFINFNIsMutable();
-        jJOHJDFINFN_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @param value The jJOHJDFINFN to add.
-       * @return This builder for chaining.
-       */
-      public Builder addJJOHJDFINFN(int value) {
-        ensureJJOHJDFINFNIsMutable();
-        jJOHJDFINFN_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @param values The jJOHJDFINFN to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllJJOHJDFINFN(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureJJOHJDFINFNIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jJOHJDFINFN_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JJOHJDFINFN = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearJJOHJDFINFN() {
-        jJOHJDFINFN_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000040);
-        onChanged();
-        return this;
-      }
-
-      private int belongUid_ ;
-      /**
-       * <code>uint32 belong_uid = 14;</code>
-       * @return The belongUid.
-       */
-      @java.lang.Override
-      public int getBelongUid() {
-        return belongUid_;
-      }
-      /**
-       * <code>uint32 belong_uid = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBelongUid() {
-        
-        belongUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList jCLHNODLPOH_ = emptyIntList();
-      private void ensureJCLHNODLPOHIsMutable() {
-        if (!((bitField0_ & 0x00000080) != 0)) {
-          jCLHNODLPOH_ = mutableCopy(jCLHNODLPOH_);
-          bitField0_ |= 0x00000080;
-         }
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @return A list containing the jCLHNODLPOH.
-       */
-      public java.util.List<java.lang.Integer>
-          getJCLHNODLPOHList() {
-        return ((bitField0_ & 0x00000080) != 0) ?
-                 java.util.Collections.unmodifiableList(jCLHNODLPOH_) : jCLHNODLPOH_;
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @return The count of jCLHNODLPOH.
-       */
-      public int getJCLHNODLPOHCount() {
-        return jCLHNODLPOH_.size();
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @param index The index of the element to return.
-       * @return The jCLHNODLPOH at the given index.
-       */
-      public int getJCLHNODLPOH(int index) {
-        return jCLHNODLPOH_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @param index The index to set the value at.
-       * @param value The jCLHNODLPOH to set.
-       * @return This builder for chaining.
-       */
-      public Builder setJCLHNODLPOH(
-          int index, int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @param value The jCLHNODLPOH to add.
-       * @return This builder for chaining.
-       */
-      public Builder addJCLHNODLPOH(int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @param values The jCLHNODLPOH to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllJCLHNODLPOH(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureJCLHNODLPOHIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jCLHNODLPOH_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 JCLHNODLPOH = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearJCLHNODLPOH() {
-        jCLHNODLPOH_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000080);
         onChanged();
         return this;
       }
 
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 2;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList kOPAHGHMECF_ = emptyIntList();
-      private void ensureKOPAHGHMECFIsMutable() {
+      private com.google.protobuf.Internal.IntList oGLOLEOEAGD_ = emptyIntList();
+      private void ensureOGLOLEOEAGDIsMutable() {
         if (!((bitField0_ & 0x00000100) != 0)) {
-          kOPAHGHMECF_ = mutableCopy(kOPAHGHMECF_);
+          oGLOLEOEAGD_ = mutableCopy(oGLOLEOEAGD_);
           bitField0_ |= 0x00000100;
          }
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-       * @return A list containing the kOPAHGHMECF.
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+       * @return A list containing the oGLOLEOEAGD.
        */
       public java.util.List<java.lang.Integer>
-          getKOPAHGHMECFList() {
+          getOGLOLEOEAGDList() {
         return ((bitField0_ & 0x00000100) != 0) ?
-                 java.util.Collections.unmodifiableList(kOPAHGHMECF_) : kOPAHGHMECF_;
+                 java.util.Collections.unmodifiableList(oGLOLEOEAGD_) : oGLOLEOEAGD_;
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-       * @return The count of kOPAHGHMECF.
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+       * @return The count of oGLOLEOEAGD.
        */
-      public int getKOPAHGHMECFCount() {
-        return kOPAHGHMECF_.size();
+      public int getOGLOLEOEAGDCount() {
+        return oGLOLEOEAGD_.size();
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
        * @param index The index of the element to return.
-       * @return The kOPAHGHMECF at the given index.
+       * @return The oGLOLEOEAGD at the given index.
        */
-      public int getKOPAHGHMECF(int index) {
-        return kOPAHGHMECF_.getInt(index);
+      public int getOGLOLEOEAGD(int index) {
+        return oGLOLEOEAGD_.getInt(index);
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
        * @param index The index to set the value at.
-       * @param value The kOPAHGHMECF to set.
+       * @param value The oGLOLEOEAGD to set.
        * @return This builder for chaining.
        */
-      public Builder setKOPAHGHMECF(
+      public Builder setOGLOLEOEAGD(
           int index, int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.setInt(index, value);
+        ensureOGLOLEOEAGDIsMutable();
+        oGLOLEOEAGD_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-       * @param value The kOPAHGHMECF to add.
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+       * @param value The oGLOLEOEAGD to add.
        * @return This builder for chaining.
        */
-      public Builder addKOPAHGHMECF(int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.addInt(value);
+      public Builder addOGLOLEOEAGD(int value) {
+        ensureOGLOLEOEAGDIsMutable();
+        oGLOLEOEAGD_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
-       * @param values The kOPAHGHMECF to add.
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
+       * @param values The oGLOLEOEAGD to add.
        * @return This builder for chaining.
        */
-      public Builder addAllKOPAHGHMECF(
+      public Builder addAllOGLOLEOEAGD(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureKOPAHGHMECFIsMutable();
+        ensureOGLOLEOEAGDIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, kOPAHGHMECF_);
+            values, oGLOLEOEAGD_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 KOPAHGHMECF = 3;</code>
+       * <code>repeated uint32 OGLOLEOEAGD = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKOPAHGHMECF() {
-        kOPAHGHMECF_ = emptyIntList();
+      public Builder clearOGLOLEOEAGD() {
+        oGLOLEOEAGD_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000100);
         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>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewPlayer() {
+        
+        isNewPlayer_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2478,16 +2468,16 @@ public final class GetScenePointRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026GetScenePointRsp.proto\"\256\002\n\020GetScenePoi" +
-      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\031\n\021un" +
-      "hide_point_list\030\006 \003(\r\022\023\n\013FBFJPEPMAOF\030\t \001" +
-      "(\010\022\017\n\007retcode\030\013 \001(\005\022\030\n\020unlock_area_list\030" +
-      "\014 \003(\r\022\023\n\013PPDDIADEDIC\030\010 \003(\r\022\023\n\013OGKCOCBLNL" +
-      "F\030\n \003(\r\022\023\n\013EBIFELCKPEA\030\007 \003(\r\022\023\n\013JJOHJDFI" +
-      "NFN\030\004 \003(\r\022\022\n\nbelong_uid\030\016 \001(\r\022\023\n\013JCLHNOD" +
-      "LPOH\030\r \003(\r\022\020\n\010scene_id\030\002 \001(\r\022\023\n\013KOPAHGHM" +
-      "ECF\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006" +
-      "proto3"
+      "\n\026GetScenePointRsp.proto\"\265\002\n\020GetScenePoi" +
+      "ntRsp\022\033\n\023unlocked_point_list\030\001 \003(\r\022\023\n\013FE" +
+      "LMBEACBLB\030\002 \003(\r\022\031\n\021locked_point_list\030\004 \003" +
+      "(\r\022\022\n\npoint_list\030\005 \003(\r\022\022\n\nbelong_uid\030\006 \001" +
+      "(\r\022\017\n\007retcode\030\010 \001(\005\022\020\n\010scene_id\030\t \001(\r\022\031\n" +
+      "\021unhide_point_list\030\n \003(\r\022\023\n\013BEOCPMCPHJH\030" +
+      "\013 \003(\r\022\023\n\013DOGJLOBEEPC\030\014 \003(\r\022\030\n\020unlock_are" +
+      "a_list\030\r \003(\r\022\023\n\013OGLOLEOEAGD\030\016 \003(\r\022\025\n\ris_" +
+      "new_player\030\017 \001(\010B\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2498,7 +2488,7 @@ public final class GetScenePointRspOuterClass {
     internal_static_GetScenePointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetScenePointRsp_descriptor,
-        new java.lang.String[] { "UnlockedPointList", "UnhidePointList", "FBFJPEPMAOF", "Retcode", "UnlockAreaList", "PPDDIADEDIC", "OGKCOCBLNLF", "EBIFELCKPEA", "JJOHJDFINFN", "BelongUid", "JCLHNODLPOH", "SceneId", "KOPAHGHMECF", });
+        new java.lang.String[] { "UnlockedPointList", "FELMBEACBLB", "LockedPointList", "PointList", "BelongUid", "Retcode", "SceneId", "UnhidePointList", "BEOCPMCPHJH", "DOGJLOBEEPC", "UnlockAreaList", "OGLOLEOEAGD", "IsNewPlayer", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetShopReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetShopReqOuterClass.java
index c61f75f54..557dd2c43 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetShopReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetShopReqOuterClass.java
@@ -19,17 +19,12 @@ public final class GetShopReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 shop_type = 4;</code>
+     * <code>uint32 shop_type = 14;</code>
      * @return The shopType.
      */
     int getShopType();
   }
   /**
-   * <pre>
-   * CmdId: 9681
-   * Obf: BLGEHKEBJAA
-   * </pre>
-   *
    * Protobuf type {@code GetShopReq}
    */
   public static final class GetShopReq extends
@@ -74,7 +69,7 @@ public final class GetShopReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 112: {
 
               shopType_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class GetShopReqOuterClass {
               emu.grasscutter.net.proto.GetShopReqOuterClass.GetShopReq.class, emu.grasscutter.net.proto.GetShopReqOuterClass.GetShopReq.Builder.class);
     }
 
-    public static final int SHOP_TYPE_FIELD_NUMBER = 4;
+    public static final int SHOP_TYPE_FIELD_NUMBER = 14;
     private int shopType_;
     /**
-     * <code>uint32 shop_type = 4;</code>
+     * <code>uint32 shop_type = 14;</code>
      * @return The shopType.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class GetShopReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (shopType_ != 0) {
-        output.writeUInt32(4, shopType_);
+        output.writeUInt32(14, shopType_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class GetShopReqOuterClass {
       size = 0;
       if (shopType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, shopType_);
+          .computeUInt32Size(14, shopType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class GetShopReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9681
-     * Obf: BLGEHKEBJAA
-     * </pre>
-     *
      * Protobuf type {@code GetShopReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class GetShopReqOuterClass {
 
       private int shopType_ ;
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 14;</code>
        * @return The shopType.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class GetShopReqOuterClass {
         return shopType_;
       }
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 14;</code>
        * @param value The shopType to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class GetShopReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearShopType() {
@@ -527,7 +517,7 @@ public final class GetShopReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020GetShopReq.proto\"\037\n\nGetShopReq\022\021\n\tshop" +
-      "_type\030\004 \001(\rB\033\n\031emu.grasscutter.net.proto" +
+      "_type\030\016 \001(\rB\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetShopRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetShopRspOuterClass.java
index 1fd4b435f..8acb1046c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetShopRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetShopRspOuterClass.java
@@ -19,32 +19,27 @@ public final class GetShopRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      * @return Whether the shop field is set.
      */
     boolean hasShop();
     /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      * @return The shop.
      */
     emu.grasscutter.net.proto.ShopOuterClass.Shop getShop();
     /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      */
     emu.grasscutter.net.proto.ShopOuterClass.ShopOrBuilder getShopOrBuilder();
+
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 22793
-   * Obf: JKOBDIPLIKB
-   * </pre>
-   *
    * Protobuf type {@code GetShopRsp}
    */
   public static final class GetShopRsp extends
@@ -89,7 +84,7 @@ public final class GetShopRspOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 10: {
               emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder subBuilder = null;
               if (shop_ != null) {
                 subBuilder = shop_.toBuilder();
@@ -102,7 +97,7 @@ public final class GetShopRspOuterClass {
 
               break;
             }
-            case 56: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
@@ -139,21 +134,10 @@ public final class GetShopRspOuterClass {
               emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp.class, emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int SHOP_FIELD_NUMBER = 2;
+    public static final int SHOP_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.ShopOuterClass.Shop shop_;
     /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      * @return Whether the shop field is set.
      */
     @java.lang.Override
@@ -161,7 +145,7 @@ public final class GetShopRspOuterClass {
       return shop_ != null;
     }
     /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      * @return The shop.
      */
     @java.lang.Override
@@ -169,13 +153,24 @@ public final class GetShopRspOuterClass {
       return shop_ == null ? emu.grasscutter.net.proto.ShopOuterClass.Shop.getDefaultInstance() : shop_;
     }
     /**
-     * <code>.Shop shop = 2;</code>
+     * <code>.Shop shop = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShopOuterClass.ShopOrBuilder getShopOrBuilder() {
       return getShop();
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 12;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +186,10 @@ public final class GetShopRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (shop_ != null) {
-        output.writeMessage(2, getShop());
+        output.writeMessage(1, getShop());
       }
       if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class GetShopRspOuterClass {
       size = 0;
       if (shop_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getShop());
+          .computeMessageSize(1, getShop());
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class GetShopRspOuterClass {
       }
       emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp other = (emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (hasShop() != other.hasShop()) return false;
       if (hasShop()) {
         if (!getShop()
             .equals(other.getShop())) return false;
       }
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class GetShopRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (hasShop()) {
         hash = (37 * hash) + SHOP_FIELD_NUMBER;
         hash = (53 * hash) + getShop().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class GetShopRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22793
-     * Obf: JKOBDIPLIKB
-     * </pre>
-     *
      * Protobuf type {@code GetShopRsp}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class GetShopRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         if (shopBuilder_ == null) {
           shop_ = null;
         } else {
           shop_ = null;
           shopBuilder_ = null;
         }
+        retcode_ = 0;
+
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class GetShopRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp buildPartial() {
         emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp result = new emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp(this);
-        result.retcode_ = retcode_;
         if (shopBuilder_ == null) {
           result.shop_ = shop_;
         } else {
           result.shop_ = shopBuilder_.build();
         }
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class GetShopRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp other) {
         if (other == emu.grasscutter.net.proto.GetShopRspOuterClass.GetShopRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.hasShop()) {
           mergeShop(other.getShop());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +503,18 @@ public final class GetShopRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ShopOuterClass.Shop shop_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopOuterClass.Shop, emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder, emu.grasscutter.net.proto.ShopOuterClass.ShopOrBuilder> shopBuilder_;
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        * @return Whether the shop field is set.
        */
       public boolean hasShop() {
         return shopBuilder_ != null || shop_ != null;
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        * @return The shop.
        */
       public emu.grasscutter.net.proto.ShopOuterClass.Shop getShop() {
@@ -566,7 +525,7 @@ public final class GetShopRspOuterClass {
         }
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public Builder setShop(emu.grasscutter.net.proto.ShopOuterClass.Shop value) {
         if (shopBuilder_ == null) {
@@ -582,7 +541,7 @@ public final class GetShopRspOuterClass {
         return this;
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public Builder setShop(
           emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder builderForValue) {
@@ -596,7 +555,7 @@ public final class GetShopRspOuterClass {
         return this;
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public Builder mergeShop(emu.grasscutter.net.proto.ShopOuterClass.Shop value) {
         if (shopBuilder_ == null) {
@@ -614,7 +573,7 @@ public final class GetShopRspOuterClass {
         return this;
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public Builder clearShop() {
         if (shopBuilder_ == null) {
@@ -628,7 +587,7 @@ public final class GetShopRspOuterClass {
         return this;
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder getShopBuilder() {
         
@@ -636,7 +595,7 @@ public final class GetShopRspOuterClass {
         return getShopFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       public emu.grasscutter.net.proto.ShopOuterClass.ShopOrBuilder getShopOrBuilder() {
         if (shopBuilder_ != null) {
@@ -647,7 +606,7 @@ public final class GetShopRspOuterClass {
         }
       }
       /**
-       * <code>.Shop shop = 2;</code>
+       * <code>.Shop shop = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ShopOuterClass.Shop, emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder, emu.grasscutter.net.proto.ShopOuterClass.ShopOrBuilder> 
@@ -662,6 +621,37 @@ public final class GetShopRspOuterClass {
         }
         return shopBuilder_;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 12;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 12;</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 = 12;</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) {
@@ -730,8 +720,8 @@ public final class GetShopRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020GetShopRsp.proto\032\nShop.proto\"2\n\nGetSho" +
-      "pRsp\022\017\n\007retcode\030\007 \001(\005\022\023\n\004shop\030\002 \001(\0132\005.Sh" +
-      "opB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "pRsp\022\023\n\004shop\030\001 \001(\0132\005.Shop\022\017\n\007retcode\030\014 \001" +
+      "(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -743,7 +733,7 @@ public final class GetShopRspOuterClass {
     internal_static_GetShopRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetShopRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Shop", });
+        new java.lang.String[] { "Shop", "Retcode", });
     emu.grasscutter.net.proto.ShopOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataReqOuterClass.java
index 6e83fbf75..91396c0db 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetShopmallDataReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 2616
-   * Obf: GKCCFCPCHAK
-   * </pre>
-   *
    * Protobuf type {@code GetShopmallDataReq}
    */
   public static final class GetShopmallDataReq extends
@@ -245,11 +240,6 @@ public final class GetShopmallDataReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2616
-     * Obf: GKCCFCPCHAK
-     * </pre>
-     *
      * Protobuf type {@code GetShopmallDataReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java
index 5d14182a4..259ad2a7f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetShopmallDataRspOuterClass.java
@@ -19,34 +19,29 @@ public final class GetShopmallDataRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @return A list containing the shopTypeList.
      */
     java.util.List<java.lang.Integer> getShopTypeListList();
     /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @return The count of shopTypeList.
      */
     int getShopTypeListCount();
     /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @param index The index of the element to return.
      * @return The shopTypeList at the given index.
      */
     int getShopTypeList(int index);
+
+    /**
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 1087
-   * Obf: PJGBDGNCIEN
-   * </pre>
-   *
    * Protobuf type {@code GetShopmallDataRsp}
    */
   public static final class GetShopmallDataRsp extends
@@ -93,7 +88,7 @@ public final class GetShopmallDataRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 shopTypeList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +96,7 @@ public final class GetShopmallDataRspOuterClass {
               shopTypeList_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -114,7 +109,7 @@ public final class GetShopmallDataRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 88: {
+            case 32: {
 
               retcode_ = input.readInt32();
               break;
@@ -154,21 +149,10 @@ public final class GetShopmallDataRspOuterClass {
               emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp.class, emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int SHOP_TYPE_LIST_FIELD_NUMBER = 7;
+    public static final int SHOP_TYPE_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList shopTypeList_;
     /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @return A list containing the shopTypeList.
      */
     @java.lang.Override
@@ -177,14 +161,14 @@ public final class GetShopmallDataRspOuterClass {
       return shopTypeList_;
     }
     /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @return The count of shopTypeList.
      */
     public int getShopTypeListCount() {
       return shopTypeList_.size();
     }
     /**
-     * <code>repeated uint32 shop_type_list = 7;</code>
+     * <code>repeated uint32 shop_type_list = 1;</code>
      * @param index The index of the element to return.
      * @return The shopTypeList at the given index.
      */
@@ -193,6 +177,17 @@ public final class GetShopmallDataRspOuterClass {
     }
     private int shopTypeListMemoizedSerializedSize = -1;
 
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
+    /**
+     * <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() {
@@ -209,14 +204,14 @@ public final class GetShopmallDataRspOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getShopTypeListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(shopTypeListMemoizedSerializedSize);
       }
       for (int i = 0; i < shopTypeList_.size(); i++) {
         output.writeUInt32NoTag(shopTypeList_.getInt(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeInt32(4, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -243,7 +238,7 @@ public final class GetShopmallDataRspOuterClass {
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeInt32Size(4, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -260,10 +255,10 @@ public final class GetShopmallDataRspOuterClass {
       }
       emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp other = (emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getShopTypeListList()
           .equals(other.getShopTypeListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class GetShopmallDataRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getShopTypeListCount() > 0) {
         hash = (37 * hash) + SHOP_TYPE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getShopTypeListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class GetShopmallDataRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1087
-     * Obf: PJGBDGNCIEN
-     * </pre>
-     *
      * Protobuf type {@code GetShopmallDataRsp}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class GetShopmallDataRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         shopTypeList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class GetShopmallDataRspOuterClass {
       public emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp buildPartial() {
         emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp result = new emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           shopTypeList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.shopTypeList_ = shopTypeList_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -504,9 +494,6 @@ public final class GetShopmallDataRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp other) {
         if (other == emu.grasscutter.net.proto.GetShopmallDataRspOuterClass.GetShopmallDataRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (!other.shopTypeList_.isEmpty()) {
           if (shopTypeList_.isEmpty()) {
             shopTypeList_ = other.shopTypeList_;
@@ -517,6 +504,9 @@ public final class GetShopmallDataRspOuterClass {
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,37 +537,6 @@ public final class GetShopmallDataRspOuterClass {
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 11;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 11;</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 = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList shopTypeList_ = emptyIntList();
       private void ensureShopTypeListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -586,7 +545,7 @@ public final class GetShopmallDataRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @return A list containing the shopTypeList.
        */
       public java.util.List<java.lang.Integer>
@@ -595,14 +554,14 @@ public final class GetShopmallDataRspOuterClass {
                  java.util.Collections.unmodifiableList(shopTypeList_) : shopTypeList_;
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @return The count of shopTypeList.
        */
       public int getShopTypeListCount() {
         return shopTypeList_.size();
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @param index The index of the element to return.
        * @return The shopTypeList at the given index.
        */
@@ -610,7 +569,7 @@ public final class GetShopmallDataRspOuterClass {
         return shopTypeList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The shopTypeList to set.
        * @return This builder for chaining.
@@ -623,7 +582,7 @@ public final class GetShopmallDataRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @param value The shopTypeList to add.
        * @return This builder for chaining.
        */
@@ -634,7 +593,7 @@ public final class GetShopmallDataRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @param values The shopTypeList to add.
        * @return This builder for chaining.
        */
@@ -647,7 +606,7 @@ public final class GetShopmallDataRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 shop_type_list = 7;</code>
+       * <code>repeated uint32 shop_type_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearShopTypeList() {
@@ -656,6 +615,37 @@ public final class GetShopmallDataRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <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) {
@@ -724,8 +714,8 @@ public final class GetShopmallDataRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030GetShopmallDataRsp.proto\"=\n\022GetShopmal" +
-      "lDataRsp\022\017\n\007retcode\030\013 \001(\005\022\026\n\016shop_type_l" +
-      "ist\030\007 \003(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "lDataRsp\022\026\n\016shop_type_list\030\001 \003(\r\022\017\n\007retc" +
+      "ode\030\004 \001(\005B\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +727,7 @@ public final class GetShopmallDataRspOuterClass {
     internal_static_GetShopmallDataRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetShopmallDataRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ShopTypeList", });
+        new java.lang.String[] { "ShopTypeList", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefListRspOuterClass.java
new file mode 100644
index 000000000..18595226c
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefListRspOuterClass.java
@@ -0,0 +1,1402 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: GetUgcDungeonBriefListRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class GetUgcDungeonBriefListRspOuterClass {
+  private GetUgcDungeonBriefListRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface GetUgcDungeonBriefListRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:GetUgcDungeonBriefListRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> 
+        getStarredRoomListList();
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getStarredRoomList(int index);
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    int getStarredRoomListCount();
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder> 
+        getStarredRoomListOrBuilderList();
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder getStarredRoomListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> 
+        getBriefListList();
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getBriefList(int index);
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    int getBriefListCount();
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder> 
+        getBriefListOrBuilderList();
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder getBriefListOrBuilder(
+        int index);
+
+    /**
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+     * @return The enum numeric value on the wire for getBriefType.
+     */
+    int getGetBriefTypeValue();
+    /**
+     * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+     * @return The getBriefType.
+     */
+    emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType getGetBriefType();
+  }
+  /**
+   * Protobuf type {@code GetUgcDungeonBriefListRsp}
+   */
+  public static final class GetUgcDungeonBriefListRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:GetUgcDungeonBriefListRsp)
+      GetUgcDungeonBriefListRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetUgcDungeonBriefListRsp.newBuilder() to construct.
+    private GetUgcDungeonBriefListRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private GetUgcDungeonBriefListRsp() {
+      starredRoomList_ = java.util.Collections.emptyList();
+      briefList_ = java.util.Collections.emptyList();
+      getBriefType_ = 0;
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new GetUgcDungeonBriefListRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetUgcDungeonBriefListRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                starredRoomList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              starredRoomList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.parser(), extensionRegistry));
+              break;
+            }
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                briefList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              briefList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.parser(), extensionRegistry));
+              break;
+            }
+            case 72: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 96: {
+              int rawValue = input.readEnum();
+
+              getBriefType_ = rawValue;
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          starredRoomList_ = java.util.Collections.unmodifiableList(starredRoomList_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          briefList_ = java.util.Collections.unmodifiableList(briefList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.internal_static_GetUgcDungeonBriefListRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.internal_static_GetUgcDungeonBriefListRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.class, emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.Builder.class);
+    }
+
+    public static final int STARRED_ROOM_LIST_FIELD_NUMBER = 7;
+    private java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> starredRoomList_;
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> getStarredRoomListList() {
+      return starredRoomList_;
+    }
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder> 
+        getStarredRoomListOrBuilderList() {
+      return starredRoomList_;
+    }
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    @java.lang.Override
+    public int getStarredRoomListCount() {
+      return starredRoomList_.size();
+    }
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getStarredRoomList(int index) {
+      return starredRoomList_.get(index);
+    }
+    /**
+     * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder getStarredRoomListOrBuilder(
+        int index) {
+      return starredRoomList_.get(index);
+    }
+
+    public static final int BRIEF_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> briefList_;
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> getBriefListList() {
+      return briefList_;
+    }
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder> 
+        getBriefListOrBuilderList() {
+      return briefList_;
+    }
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getBriefListCount() {
+      return briefList_.size();
+    }
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getBriefList(int index) {
+      return briefList_.get(index);
+    }
+    /**
+     * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder getBriefListOrBuilder(
+        int index) {
+      return briefList_.get(index);
+    }
+
+    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 GET_BRIEF_TYPE_FIELD_NUMBER = 12;
+    private int getBriefType_;
+    /**
+     * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+     * @return The enum numeric value on the wire for getBriefType.
+     */
+    @java.lang.Override public int getGetBriefTypeValue() {
+      return getBriefType_;
+    }
+    /**
+     * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+     * @return The getBriefType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType getGetBriefType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType result = emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.valueOf(getBriefType_);
+      return result == null ? emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.UNRECOGNIZED : result;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < starredRoomList_.size(); i++) {
+        output.writeMessage(7, starredRoomList_.get(i));
+      }
+      for (int i = 0; i < briefList_.size(); i++) {
+        output.writeMessage(8, briefList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(9, retcode_);
+      }
+      if (getBriefType_ != emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.GetUgcDungeonBriefType_NONE.getNumber()) {
+        output.writeEnum(12, getBriefType_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < starredRoomList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, starredRoomList_.get(i));
+      }
+      for (int i = 0; i < briefList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, briefList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(9, retcode_);
+      }
+      if (getBriefType_ != emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.GetUgcDungeonBriefType_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(12, getBriefType_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp other = (emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp) obj;
+
+      if (!getStarredRoomListList()
+          .equals(other.getStarredRoomListList())) return false;
+      if (!getBriefListList()
+          .equals(other.getBriefListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getBriefType_ != other.getBriefType_) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getStarredRoomListCount() > 0) {
+        hash = (37 * hash) + STARRED_ROOM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getStarredRoomListList().hashCode();
+      }
+      if (getBriefListCount() > 0) {
+        hash = (37 * hash) + BRIEF_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBriefListList().hashCode();
+      }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + GET_BRIEF_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getBriefType_;
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code GetUgcDungeonBriefListRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:GetUgcDungeonBriefListRsp)
+        emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.internal_static_GetUgcDungeonBriefListRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.internal_static_GetUgcDungeonBriefListRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.class, emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getStarredRoomListFieldBuilder();
+          getBriefListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (starredRoomListBuilder_ == null) {
+          starredRoomList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          starredRoomListBuilder_.clear();
+        }
+        if (briefListBuilder_ == null) {
+          briefList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          briefListBuilder_.clear();
+        }
+        retcode_ = 0;
+
+        getBriefType_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.internal_static_GetUgcDungeonBriefListRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp build() {
+        emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp buildPartial() {
+        emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp result = new emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp(this);
+        int from_bitField0_ = bitField0_;
+        if (starredRoomListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            starredRoomList_ = java.util.Collections.unmodifiableList(starredRoomList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.starredRoomList_ = starredRoomList_;
+        } else {
+          result.starredRoomList_ = starredRoomListBuilder_.build();
+        }
+        if (briefListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            briefList_ = java.util.Collections.unmodifiableList(briefList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.briefList_ = briefList_;
+        } else {
+          result.briefList_ = briefListBuilder_.build();
+        }
+        result.retcode_ = retcode_;
+        result.getBriefType_ = getBriefType_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp other) {
+        if (other == emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp.getDefaultInstance()) return this;
+        if (starredRoomListBuilder_ == null) {
+          if (!other.starredRoomList_.isEmpty()) {
+            if (starredRoomList_.isEmpty()) {
+              starredRoomList_ = other.starredRoomList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureStarredRoomListIsMutable();
+              starredRoomList_.addAll(other.starredRoomList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.starredRoomList_.isEmpty()) {
+            if (starredRoomListBuilder_.isEmpty()) {
+              starredRoomListBuilder_.dispose();
+              starredRoomListBuilder_ = null;
+              starredRoomList_ = other.starredRoomList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              starredRoomListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getStarredRoomListFieldBuilder() : null;
+            } else {
+              starredRoomListBuilder_.addAllMessages(other.starredRoomList_);
+            }
+          }
+        }
+        if (briefListBuilder_ == null) {
+          if (!other.briefList_.isEmpty()) {
+            if (briefList_.isEmpty()) {
+              briefList_ = other.briefList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureBriefListIsMutable();
+              briefList_.addAll(other.briefList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.briefList_.isEmpty()) {
+            if (briefListBuilder_.isEmpty()) {
+              briefListBuilder_.dispose();
+              briefListBuilder_ = null;
+              briefList_ = other.briefList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              briefListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getBriefListFieldBuilder() : null;
+            } else {
+              briefListBuilder_.addAllMessages(other.briefList_);
+            }
+          }
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getBriefType_ != 0) {
+          setGetBriefTypeValue(other.getGetBriefTypeValue());
+        }
+        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.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> starredRoomList_ =
+        java.util.Collections.emptyList();
+      private void ensureStarredRoomListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          starredRoomList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData>(starredRoomList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder> starredRoomListBuilder_;
+
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> getStarredRoomListList() {
+        if (starredRoomListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(starredRoomList_);
+        } else {
+          return starredRoomListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public int getStarredRoomListCount() {
+        if (starredRoomListBuilder_ == null) {
+          return starredRoomList_.size();
+        } else {
+          return starredRoomListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getStarredRoomList(int index) {
+        if (starredRoomListBuilder_ == null) {
+          return starredRoomList_.get(index);
+        } else {
+          return starredRoomListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder setStarredRoomList(
+          int index, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData value) {
+        if (starredRoomListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.set(index, value);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder setStarredRoomList(
+          int index, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder builderForValue) {
+        if (starredRoomListBuilder_ == null) {
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          starredRoomListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder addStarredRoomList(emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData value) {
+        if (starredRoomListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.add(value);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder addStarredRoomList(
+          int index, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData value) {
+        if (starredRoomListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.add(index, value);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder addStarredRoomList(
+          emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder builderForValue) {
+        if (starredRoomListBuilder_ == null) {
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          starredRoomListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder addStarredRoomList(
+          int index, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder builderForValue) {
+        if (starredRoomListBuilder_ == null) {
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          starredRoomListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder addAllStarredRoomList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData> values) {
+        if (starredRoomListBuilder_ == null) {
+          ensureStarredRoomListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, starredRoomList_);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder clearStarredRoomList() {
+        if (starredRoomListBuilder_ == null) {
+          starredRoomList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public Builder removeStarredRoomList(int index) {
+        if (starredRoomListBuilder_ == null) {
+          ensureStarredRoomListIsMutable();
+          starredRoomList_.remove(index);
+          onChanged();
+        } else {
+          starredRoomListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder getStarredRoomListBuilder(
+          int index) {
+        return getStarredRoomListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder getStarredRoomListOrBuilder(
+          int index) {
+        if (starredRoomListBuilder_ == null) {
+          return starredRoomList_.get(index);  } else {
+          return starredRoomListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder> 
+           getStarredRoomListOrBuilderList() {
+        if (starredRoomListBuilder_ != null) {
+          return starredRoomListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(starredRoomList_);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder addStarredRoomListBuilder() {
+        return getStarredRoomListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder addStarredRoomListBuilder(
+          int index) {
+        return getStarredRoomListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .UgcDungeonStarredRoomData starred_room_list = 7;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder> 
+           getStarredRoomListBuilderList() {
+        return getStarredRoomListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder> 
+          getStarredRoomListFieldBuilder() {
+        if (starredRoomListBuilder_ == null) {
+          starredRoomListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder>(
+                  starredRoomList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          starredRoomList_ = null;
+        }
+        return starredRoomListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> briefList_ =
+        java.util.Collections.emptyList();
+      private void ensureBriefListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          briefList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief>(briefList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder> briefListBuilder_;
+
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> getBriefListList() {
+        if (briefListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(briefList_);
+        } else {
+          return briefListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public int getBriefListCount() {
+        if (briefListBuilder_ == null) {
+          return briefList_.size();
+        } else {
+          return briefListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getBriefList(int index) {
+        if (briefListBuilder_ == null) {
+          return briefList_.get(index);
+        } else {
+          return briefListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder setBriefList(
+          int index, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief value) {
+        if (briefListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBriefListIsMutable();
+          briefList_.set(index, value);
+          onChanged();
+        } else {
+          briefListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder setBriefList(
+          int index, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder builderForValue) {
+        if (briefListBuilder_ == null) {
+          ensureBriefListIsMutable();
+          briefList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          briefListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder addBriefList(emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief value) {
+        if (briefListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBriefListIsMutable();
+          briefList_.add(value);
+          onChanged();
+        } else {
+          briefListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder addBriefList(
+          int index, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief value) {
+        if (briefListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBriefListIsMutable();
+          briefList_.add(index, value);
+          onChanged();
+        } else {
+          briefListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder addBriefList(
+          emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder builderForValue) {
+        if (briefListBuilder_ == null) {
+          ensureBriefListIsMutable();
+          briefList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          briefListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder addBriefList(
+          int index, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder builderForValue) {
+        if (briefListBuilder_ == null) {
+          ensureBriefListIsMutable();
+          briefList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          briefListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder addAllBriefList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief> values) {
+        if (briefListBuilder_ == null) {
+          ensureBriefListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, briefList_);
+          onChanged();
+        } else {
+          briefListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder clearBriefList() {
+        if (briefListBuilder_ == null) {
+          briefList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          briefListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public Builder removeBriefList(int index) {
+        if (briefListBuilder_ == null) {
+          ensureBriefListIsMutable();
+          briefList_.remove(index);
+          onChanged();
+        } else {
+          briefListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder getBriefListBuilder(
+          int index) {
+        return getBriefListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder getBriefListOrBuilder(
+          int index) {
+        if (briefListBuilder_ == null) {
+          return briefList_.get(index);  } else {
+          return briefListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder> 
+           getBriefListOrBuilderList() {
+        if (briefListBuilder_ != null) {
+          return briefListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(briefList_);
+        }
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder addBriefListBuilder() {
+        return getBriefListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder addBriefListBuilder(
+          int index) {
+        return getBriefListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .UgcDungeonBrief brief_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder> 
+           getBriefListBuilderList() {
+        return getBriefListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder> 
+          getBriefListFieldBuilder() {
+        if (briefListBuilder_ == null) {
+          briefListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder>(
+                  briefList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          briefList_ = null;
+        }
+        return briefListBuilder_;
+      }
+
+      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 int getBriefType_ = 0;
+      /**
+       * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+       * @return The enum numeric value on the wire for getBriefType.
+       */
+      @java.lang.Override public int getGetBriefTypeValue() {
+        return getBriefType_;
+      }
+      /**
+       * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+       * @param value The enum numeric value on the wire for getBriefType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGetBriefTypeValue(int value) {
+        
+        getBriefType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+       * @return The getBriefType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType getGetBriefType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType result = emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.valueOf(getBriefType_);
+        return result == null ? emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+       * @param value The getBriefType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGetBriefType(emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.GetUgcDungeonBriefType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        getBriefType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.GetUgcDungeonBriefType get_brief_type = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGetBriefType() {
+        
+        getBriefType_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:GetUgcDungeonBriefListRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:GetUgcDungeonBriefListRsp)
+    private static final emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp();
+    }
+
+    public static emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<GetUgcDungeonBriefListRsp>
+        PARSER = new com.google.protobuf.AbstractParser<GetUgcDungeonBriefListRsp>() {
+      @java.lang.Override
+      public GetUgcDungeonBriefListRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new GetUgcDungeonBriefListRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<GetUgcDungeonBriefListRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<GetUgcDungeonBriefListRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GetUgcDungeonBriefListRspOuterClass.GetUgcDungeonBriefListRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_GetUgcDungeonBriefListRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_GetUgcDungeonBriefListRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\037GetUgcDungeonBriefListRsp.proto\032\037UgcDu" +
+      "ngeonStarredRoomData.proto\032\025UgcDungeonBr" +
+      "ief.proto\032\034GetUgcDungeonBriefType.proto\"" +
+      "\272\001\n\031GetUgcDungeonBriefListRsp\0225\n\021starred" +
+      "_room_list\030\007 \003(\0132\032.UgcDungeonStarredRoom" +
+      "Data\022$\n\nbrief_list\030\010 \003(\0132\020.UgcDungeonBri" +
+      "ef\022\017\n\007retcode\030\t \001(\005\022/\n\016get_brief_type\030\014 " +
+      "\001(\0162\027.GetUgcDungeonBriefTypeB\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.getDescriptor(),
+        });
+    internal_static_GetUgcDungeonBriefListRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_GetUgcDungeonBriefListRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_GetUgcDungeonBriefListRsp_descriptor,
+        new java.lang.String[] { "StarredRoomList", "BriefList", "Retcode", "GetBriefType", });
+    emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefTypeOuterClass.java
new file mode 100644
index 000000000..ffacde180
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetUgcDungeonBriefTypeOuterClass.java
@@ -0,0 +1,206 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: GetUgcDungeonBriefType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class GetUgcDungeonBriefTypeOuterClass {
+  private GetUgcDungeonBriefTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code GetUgcDungeonBriefType}
+   */
+  public enum GetUgcDungeonBriefType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>GetUgcDungeonBriefType_NONE = 0;</code>
+     */
+    GetUgcDungeonBriefType_NONE(0),
+    /**
+     * <code>GetUgcDungeonBriefType_STARRED_DUNGEON = 1;</code>
+     */
+    GetUgcDungeonBriefType_STARRED_DUNGEON(1),
+    /**
+     * <code>GetUgcDungeonBriefType_STARRED_ROOM = 2;</code>
+     */
+    GetUgcDungeonBriefType_STARRED_ROOM(2),
+    /**
+     * <code>GetUgcDungeonBriefType_OWNER = 3;</code>
+     */
+    GetUgcDungeonBriefType_OWNER(3),
+    /**
+     * <code>GetUgcDungeonBriefType_HISTORY = 4;</code>
+     */
+    GetUgcDungeonBriefType_HISTORY(4),
+    /**
+     * <code>GetUgcDungeonBriefType_SEARCH = 5;</code>
+     */
+    GetUgcDungeonBriefType_SEARCH(5),
+    /**
+     * <code>GetUgcDungeonBriefType_OFFICIAL = 6;</code>
+     */
+    GetUgcDungeonBriefType_OFFICIAL(6),
+    /**
+     * <code>GetUgcDungeonBriefType_TEMPLATE = 7;</code>
+     */
+    GetUgcDungeonBriefType_TEMPLATE(7),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>GetUgcDungeonBriefType_NONE = 0;</code>
+     */
+    public static final int GetUgcDungeonBriefType_NONE_VALUE = 0;
+    /**
+     * <code>GetUgcDungeonBriefType_STARRED_DUNGEON = 1;</code>
+     */
+    public static final int GetUgcDungeonBriefType_STARRED_DUNGEON_VALUE = 1;
+    /**
+     * <code>GetUgcDungeonBriefType_STARRED_ROOM = 2;</code>
+     */
+    public static final int GetUgcDungeonBriefType_STARRED_ROOM_VALUE = 2;
+    /**
+     * <code>GetUgcDungeonBriefType_OWNER = 3;</code>
+     */
+    public static final int GetUgcDungeonBriefType_OWNER_VALUE = 3;
+    /**
+     * <code>GetUgcDungeonBriefType_HISTORY = 4;</code>
+     */
+    public static final int GetUgcDungeonBriefType_HISTORY_VALUE = 4;
+    /**
+     * <code>GetUgcDungeonBriefType_SEARCH = 5;</code>
+     */
+    public static final int GetUgcDungeonBriefType_SEARCH_VALUE = 5;
+    /**
+     * <code>GetUgcDungeonBriefType_OFFICIAL = 6;</code>
+     */
+    public static final int GetUgcDungeonBriefType_OFFICIAL_VALUE = 6;
+    /**
+     * <code>GetUgcDungeonBriefType_TEMPLATE = 7;</code>
+     */
+    public static final int GetUgcDungeonBriefType_TEMPLATE_VALUE = 7;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static GetUgcDungeonBriefType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static GetUgcDungeonBriefType forNumber(int value) {
+      switch (value) {
+        case 0: return GetUgcDungeonBriefType_NONE;
+        case 1: return GetUgcDungeonBriefType_STARRED_DUNGEON;
+        case 2: return GetUgcDungeonBriefType_STARRED_ROOM;
+        case 3: return GetUgcDungeonBriefType_OWNER;
+        case 4: return GetUgcDungeonBriefType_HISTORY;
+        case 5: return GetUgcDungeonBriefType_SEARCH;
+        case 6: return GetUgcDungeonBriefType_OFFICIAL;
+        case 7: return GetUgcDungeonBriefType_TEMPLATE;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<GetUgcDungeonBriefType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        GetUgcDungeonBriefType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<GetUgcDungeonBriefType>() {
+            public GetUgcDungeonBriefType findValueByNumber(int number) {
+              return GetUgcDungeonBriefType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.GetUgcDungeonBriefTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final GetUgcDungeonBriefType[] VALUES = values();
+
+    public static GetUgcDungeonBriefType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private GetUgcDungeonBriefType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:GetUgcDungeonBriefType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\034GetUgcDungeonBriefType.proto*\301\002\n\026GetUg" +
+      "cDungeonBriefType\022\037\n\033GetUgcDungeonBriefT" +
+      "ype_NONE\020\000\022*\n&GetUgcDungeonBriefType_STA" +
+      "RRED_DUNGEON\020\001\022\'\n#GetUgcDungeonBriefType" +
+      "_STARRED_ROOM\020\002\022 \n\034GetUgcDungeonBriefTyp" +
+      "e_OWNER\020\003\022\"\n\036GetUgcDungeonBriefType_HIST" +
+      "ORY\020\004\022!\n\035GetUgcDungeonBriefType_SEARCH\020\005" +
+      "\022#\n\037GetUgcDungeonBriefType_OFFICIAL\020\006\022#\n" +
+      "\037GetUgcDungeonBriefType_TEMPLATE\020\007B\033\n\031em" +
+      "u.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetQuickSlotListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetQuickSlotListReqOuterClass.java
new file mode 100644
index 000000000..1e0cb2a12
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetQuickSlotListReqOuterClass.java
@@ -0,0 +1,466 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: GetWidgetQuickSlotListReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class GetWidgetQuickSlotListReqOuterClass {
+  private GetWidgetQuickSlotListReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface GetWidgetQuickSlotListReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:GetWidgetQuickSlotListReq)
+      com.google.protobuf.MessageOrBuilder {
+  }
+  /**
+   * Protobuf type {@code GetWidgetQuickSlotListReq}
+   */
+  public static final class GetWidgetQuickSlotListReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:GetWidgetQuickSlotListReq)
+      GetWidgetQuickSlotListReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use GetWidgetQuickSlotListReq.newBuilder() to construct.
+    private GetWidgetQuickSlotListReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private GetWidgetQuickSlotListReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new GetWidgetQuickSlotListReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private GetWidgetQuickSlotListReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.internal_static_GetWidgetQuickSlotListReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.internal_static_GetWidgetQuickSlotListReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.class, emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.Builder.class);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq other = (emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq) obj;
+
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code GetWidgetQuickSlotListReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:GetWidgetQuickSlotListReq)
+        emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.internal_static_GetWidgetQuickSlotListReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.internal_static_GetWidgetQuickSlotListReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.class, emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.internal_static_GetWidgetQuickSlotListReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq build() {
+        emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq buildPartial() {
+        emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq result = new emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq(this);
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq) {
+          return mergeFrom((emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq other) {
+        if (other == emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq.getDefaultInstance()) return this;
+        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.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:GetWidgetQuickSlotListReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:GetWidgetQuickSlotListReq)
+    private static final emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq();
+    }
+
+    public static emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<GetWidgetQuickSlotListReq>
+        PARSER = new com.google.protobuf.AbstractParser<GetWidgetQuickSlotListReq>() {
+      @java.lang.Override
+      public GetWidgetQuickSlotListReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new GetWidgetQuickSlotListReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<GetWidgetQuickSlotListReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<GetWidgetQuickSlotListReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.GetWidgetQuickSlotListReqOuterClass.GetWidgetQuickSlotListReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_GetWidgetQuickSlotListReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_GetWidgetQuickSlotListReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\037GetWidgetQuickSlotListReq.proto\"\033\n\031Get" +
+      "WidgetQuickSlotListReqB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_GetWidgetQuickSlotListReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_GetWidgetQuickSlotListReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_GetWidgetQuickSlotListReq_descriptor,
+        new java.lang.String[] { });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotReqOuterClass.java
index 459ea542f..bcb83c5e1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotReqOuterClass.java
@@ -19,11 +19,6 @@ public final class GetWidgetSlotReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 24304
-   * Obf: BCJMLGNMNHC
-   * </pre>
-   *
    * Protobuf type {@code GetWidgetSlotReq}
    */
   public static final class GetWidgetSlotReq extends
@@ -245,11 +240,6 @@ public final class GetWidgetSlotReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24304
-     * Obf: BCJMLGNMNHC
-     * </pre>
-     *
      * Protobuf type {@code GetWidgetSlotReq}
      */
     public static final class Builder extends
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 43aeaef0d..ec182474b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/GetWidgetSlotRspOuterClass.java
@@ -19,41 +19,36 @@ public final class GetWidgetSlotRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>int32 retcode = 9;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> 
         getSlotListList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index);
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     int getSlotListCount();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
         getSlotListOrBuilderList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28535
-   * Obf: GGCAFNBKPHG
-   * </pre>
-   *
    * Protobuf type {@code GetWidgetSlotRsp}
    */
   public static final class GetWidgetSlotRsp extends
@@ -100,12 +95,12 @@ public final class GetWidgetSlotRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 58: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 slotList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,17 +144,28 @@ public final class GetWidgetSlotRspOuterClass {
               emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.class, emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp.Builder.class);
     }
 
-    public static final int SLOT_LIST_FIELD_NUMBER = 7;
+    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;
     private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_;
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
@@ -167,21 +173,21 @@ public final class GetWidgetSlotRspOuterClass {
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     @java.lang.Override
     public int getSlotListCount() {
       return slotList_.size();
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
       return slotList_.get(index);
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 7;</code>
+     * <code>repeated .WidgetSlotData slot_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
@@ -189,17 +195,6 @@ public final class GetWidgetSlotRspOuterClass {
       return slotList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
-    /**
-     * <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() {
@@ -215,10 +210,10 @@ public final class GetWidgetSlotRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(9, retcode_);
       }
       for (int i = 0; i < slotList_.size(); i++) {
-        output.writeMessage(7, slotList_.get(i));
+        output.writeMessage(10, slotList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class GetWidgetSlotRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(9, retcode_);
       }
       for (int i = 0; i < slotList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, slotList_.get(i));
+          .computeMessageSize(10, slotList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class GetWidgetSlotRspOuterClass {
       }
       emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp other = (emu.grasscutter.net.proto.GetWidgetSlotRspOuterClass.GetWidgetSlotRsp) obj;
 
-      if (!getSlotListList()
-          .equals(other.getSlotListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getSlotListList()
+          .equals(other.getSlotListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class GetWidgetSlotRspOuterClass {
       }
       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,11 +364,6 @@ public final class GetWidgetSlotRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28535
-     * Obf: GGCAFNBKPHG
-     * </pre>
-     *
      * Protobuf type {@code GetWidgetSlotRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class GetWidgetSlotRspOuterClass {
       @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;
       }
 
@@ -447,6 +437,7 @@ public final class GetWidgetSlotRspOuterClass {
       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_);
@@ -456,7 +447,6 @@ public final class GetWidgetSlotRspOuterClass {
         } else {
           result.slotList_ = slotListBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class GetWidgetSlotRspOuterClass {
 
       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()) {
@@ -531,9 +524,6 @@ public final class GetWidgetSlotRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class GetWidgetSlotRspOuterClass {
       }
       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() {
@@ -577,7 +598,7 @@ public final class GetWidgetSlotRspOuterClass {
           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 = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
         if (slotListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class GetWidgetSlotRspOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public int getSlotListCount() {
         if (slotListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class GetWidgetSlotRspOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class GetWidgetSlotRspOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -624,7 +645,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
         if (slotListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -671,7 +692,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder addSlotList(
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder addAllSlotList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> values) {
@@ -714,7 +735,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder clearSlotList() {
         if (slotListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public Builder removeSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class GetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotListBuilder(
           int index) {
         return getSlotListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class GetWidgetSlotRspOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
            getSlotListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class GetWidgetSlotRspOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</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 = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class GetWidgetSlotRspOuterClass {
             index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 7;</code>
+       * <code>repeated .WidgetSlotData slot_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder> 
            getSlotListBuilderList() {
@@ -803,37 +824,6 @@ public final class GetWidgetSlotRspOuterClass {
         }
         return slotListBuilder_;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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) {
@@ -902,8 +892,8 @@ public final class GetWidgetSlotRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026GetWidgetSlotRsp.proto\032\024WidgetSlotData" +
-      ".proto\"G\n\020GetWidgetSlotRsp\022\"\n\tslot_list\030" +
-      "\007 \003(\0132\017.WidgetSlotData\022\017\n\007retcode\030\004 \001(\005B" +
+      ".proto\"G\n\020GetWidgetSlotRsp\022\017\n\007retcode\030\t " +
+      "\001(\005\022\"\n\tslot_list\030\n \003(\0132\017.WidgetSlotDataB" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -916,7 +906,7 @@ public final class GetWidgetSlotRspOuterClass {
     internal_static_GetWidgetSlotRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_GetWidgetSlotRsp_descriptor,
-        new java.lang.String[] { "SlotList", "Retcode", });
+        new java.lang.String[] { "Retcode", "SlotList", });
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HideAndSeekSelectAvatarRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HideAndSeekSelectAvatarRspOuterClass.java
index bb9500be7..4f18a73ae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HideAndSeekSelectAvatarRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HideAndSeekSelectAvatarRspOuterClass.java
@@ -19,23 +19,18 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 avatar_id = 3;</code>
+     * <code>uint32 avatar_id = 5;</code>
      * @return The avatarId.
      */
     int getAvatarId();
+
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 4472
-   * Obf: NBGFNPFNHDL
-   * </pre>
-   *
    * Protobuf type {@code HideAndSeekSelectAvatarRsp}
    */
   public static final class HideAndSeekSelectAvatarRsp extends
@@ -80,16 +75,16 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 24: {
+            case 40: {
 
               avatarId_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
               emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp.class, emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int AVATAR_ID_FIELD_NUMBER = 3;
+    public static final int AVATAR_ID_FIELD_NUMBER = 5;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 3;</code>
+     * <code>uint32 avatar_id = 5;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       return avatarId_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
+    /**
+     * <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() {
@@ -158,11 +153,11 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
       if (avatarId_ != 0) {
-        output.writeUInt32(3, avatarId_);
+        output.writeUInt32(5, avatarId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, avatarId_);
+          .computeUInt32Size(5, avatarId_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       }
       emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp other = (emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4472
-     * Obf: NBGFNPFNHDL
-     * </pre>
-     *
      * Protobuf type {@code HideAndSeekSelectAvatarRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         avatarId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp buildPartial() {
         emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp result = new emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp(this);
-        result.retcode_ = retcode_;
         result.avatarId_ = avatarId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp other) {
         if (other == emu.grasscutter.net.proto.HideAndSeekSelectAvatarRspOuterClass.HideAndSeekSelectAvatarRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 2;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 3;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 3;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 3;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -529,6 +488,37 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
         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;
+        onChanged();
+        return this;
+      }
+      /**
+       * <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) {
@@ -597,8 +587,8 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n HideAndSeekSelectAvatarRsp.proto\"@\n\032Hi" +
-      "deAndSeekSelectAvatarRsp\022\017\n\007retcode\030\002 \001(" +
-      "\005\022\021\n\tavatar_id\030\003 \001(\rB\033\n\031emu.grasscutter." +
+      "deAndSeekSelectAvatarRsp\022\021\n\tavatar_id\030\005 " +
+      "\001(\r\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class HideAndSeekSelectAvatarRspOuterClass {
     internal_static_HideAndSeekSelectAvatarRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HideAndSeekSelectAvatarRsp_descriptor,
-        new java.lang.String[] { "Retcode", "AvatarId", });
+        new java.lang.String[] { "AvatarId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java
index 92d34ab6b..f09cee3fb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HitClientTrivialNotifyOuterClass.java
@@ -19,30 +19,29 @@ public final class HitClientTrivialNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 owner_entity_id = 8;</code>
-     * @return The ownerEntityId.
-     */
-    int getOwnerEntityId();
-
-    /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      * @return Whether the position field is set.
      */
     boolean hasPosition();
     /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      * @return The position.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
     /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
+
+    /**
+     * <code>uint32 owner_entity_id = 15;</code>
+     * @return The ownerEntityId.
+     */
+    int getOwnerEntityId();
   }
   /**
    * <pre>
-   * CmdId: 20211
-   * Obf: OEHPGPJNGDB
+   * CmdId: 25759
    * </pre>
    *
    * Protobuf type {@code HitClientTrivialNotify}
@@ -89,7 +88,7 @@ public final class HitClientTrivialNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 82: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -102,7 +101,7 @@ public final class HitClientTrivialNotifyOuterClass {
 
               break;
             }
-            case 64: {
+            case 120: {
 
               ownerEntityId_ = input.readUInt32();
               break;
@@ -139,21 +138,10 @@ public final class HitClientTrivialNotifyOuterClass {
               emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify.class, emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify.Builder.class);
     }
 
-    public static final int OWNER_ENTITY_ID_FIELD_NUMBER = 8;
-    private int ownerEntityId_;
-    /**
-     * <code>uint32 owner_entity_id = 8;</code>
-     * @return The ownerEntityId.
-     */
-    @java.lang.Override
-    public int getOwnerEntityId() {
-      return ownerEntityId_;
-    }
-
-    public static final int POSITION_FIELD_NUMBER = 5;
+    public static final int POSITION_FIELD_NUMBER = 10;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
     /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      * @return Whether the position field is set.
      */
     @java.lang.Override
@@ -161,7 +149,7 @@ public final class HitClientTrivialNotifyOuterClass {
       return position_ != null;
     }
     /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      * @return The position.
      */
     @java.lang.Override
@@ -169,13 +157,24 @@ public final class HitClientTrivialNotifyOuterClass {
       return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
     }
     /**
-     * <code>.Vector position = 5;</code>
+     * <code>.Vector position = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
       return getPosition();
     }
 
+    public static final int OWNER_ENTITY_ID_FIELD_NUMBER = 15;
+    private int ownerEntityId_;
+    /**
+     * <code>uint32 owner_entity_id = 15;</code>
+     * @return The ownerEntityId.
+     */
+    @java.lang.Override
+    public int getOwnerEntityId() {
+      return ownerEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +190,10 @@ public final class HitClientTrivialNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (position_ != null) {
-        output.writeMessage(5, getPosition());
+        output.writeMessage(10, getPosition());
       }
       if (ownerEntityId_ != 0) {
-        output.writeUInt32(8, ownerEntityId_);
+        output.writeUInt32(15, ownerEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +206,11 @@ public final class HitClientTrivialNotifyOuterClass {
       size = 0;
       if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getPosition());
+          .computeMessageSize(10, getPosition());
       }
       if (ownerEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, ownerEntityId_);
+          .computeUInt32Size(15, ownerEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +227,13 @@ public final class HitClientTrivialNotifyOuterClass {
       }
       emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify other = (emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify) obj;
 
-      if (getOwnerEntityId()
-          != other.getOwnerEntityId()) return false;
       if (hasPosition() != other.hasPosition()) return false;
       if (hasPosition()) {
         if (!getPosition()
             .equals(other.getPosition())) return false;
       }
+      if (getOwnerEntityId()
+          != other.getOwnerEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +245,12 @@ public final class HitClientTrivialNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + OWNER_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerEntityId();
       if (hasPosition()) {
         hash = (37 * hash) + POSITION_FIELD_NUMBER;
         hash = (53 * hash) + getPosition().hashCode();
       }
+      hash = (37 * hash) + OWNER_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -349,8 +348,7 @@ public final class HitClientTrivialNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20211
-     * Obf: OEHPGPJNGDB
+     * CmdId: 25759
      * </pre>
      *
      * Protobuf type {@code HitClientTrivialNotify}
@@ -390,14 +388,14 @@ public final class HitClientTrivialNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        ownerEntityId_ = 0;
-
         if (positionBuilder_ == null) {
           position_ = null;
         } else {
           position_ = null;
           positionBuilder_ = null;
         }
+        ownerEntityId_ = 0;
+
         return this;
       }
 
@@ -424,12 +422,12 @@ public final class HitClientTrivialNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify buildPartial() {
         emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify result = new emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify(this);
-        result.ownerEntityId_ = ownerEntityId_;
         if (positionBuilder_ == null) {
           result.position_ = position_;
         } else {
           result.position_ = positionBuilder_.build();
         }
+        result.ownerEntityId_ = ownerEntityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +476,12 @@ public final class HitClientTrivialNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify other) {
         if (other == emu.grasscutter.net.proto.HitClientTrivialNotifyOuterClass.HitClientTrivialNotify.getDefaultInstance()) return this;
-        if (other.getOwnerEntityId() != 0) {
-          setOwnerEntityId(other.getOwnerEntityId());
-        }
         if (other.hasPosition()) {
           mergePosition(other.getPosition());
         }
+        if (other.getOwnerEntityId() != 0) {
+          setOwnerEntityId(other.getOwnerEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +511,18 @@ public final class HitClientTrivialNotifyOuterClass {
         return this;
       }
 
-      private int ownerEntityId_ ;
-      /**
-       * <code>uint32 owner_entity_id = 8;</code>
-       * @return The ownerEntityId.
-       */
-      @java.lang.Override
-      public int getOwnerEntityId() {
-        return ownerEntityId_;
-      }
-      /**
-       * <code>uint32 owner_entity_id = 8;</code>
-       * @param value The ownerEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOwnerEntityId(int value) {
-        
-        ownerEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 owner_entity_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOwnerEntityId() {
-        
-        ownerEntityId_ = 0;
-        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 = 5;</code>
+       * <code>.Vector position = 10;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -566,7 +533,7 @@ public final class HitClientTrivialNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -582,7 +549,7 @@ public final class HitClientTrivialNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -596,7 +563,7 @@ public final class HitClientTrivialNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -614,7 +581,7 @@ public final class HitClientTrivialNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -628,7 +595,7 @@ public final class HitClientTrivialNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -636,7 +603,7 @@ public final class HitClientTrivialNotifyOuterClass {
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -647,7 +614,7 @@ public final class HitClientTrivialNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 5;</code>
+       * <code>.Vector position = 10;</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> 
@@ -662,6 +629,37 @@ public final class HitClientTrivialNotifyOuterClass {
         }
         return positionBuilder_;
       }
+
+      private int ownerEntityId_ ;
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @return The ownerEntityId.
+       */
+      @java.lang.Override
+      public int getOwnerEntityId() {
+        return ownerEntityId_;
+      }
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @param value The ownerEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnerEntityId(int value) {
+        
+        ownerEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 owner_entity_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOwnerEntityId() {
+        
+        ownerEntityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,9 +728,9 @@ public final class HitClientTrivialNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034HitClientTrivialNotify.proto\032\014Vector.p" +
-      "roto\"L\n\026HitClientTrivialNotify\022\027\n\017owner_" +
-      "entity_id\030\010 \001(\r\022\031\n\010position\030\005 \001(\0132\007.Vect" +
-      "orB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "roto\"L\n\026HitClientTrivialNotify\022\031\n\010positi" +
+      "on\030\n \001(\0132\007.Vector\022\027\n\017owner_entity_id\030\017 \001" +
+      "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -744,7 +742,7 @@ public final class HitClientTrivialNotifyOuterClass {
     internal_static_HitClientTrivialNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HitClientTrivialNotify_descriptor,
-        new java.lang.String[] { "OwnerEntityId", "Position", });
+        new java.lang.String[] { "Position", "OwnerEntityId", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitColliderTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitColliderTypeOuterClass.java
index 0f7604e5b..823b3a634 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HitColliderTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HitColliderTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class HitColliderTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: CDFCOLHODGF
-   * </pre>
-   *
    * Protobuf enum {@code HitColliderType}
    */
   public enum HitColliderType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitCollisionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitCollisionOuterClass.java
index d0a87df70..d2d8be794 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HitCollisionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HitCollisionOuterClass.java
@@ -19,69 +19,65 @@ public final class HitCollisionOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float NBANAGMDLHB = 15;</code>
-     * @return The nBANAGMDLHB.
+     * <code>float DDLIENJBAKB = 3;</code>
+     * @return The dDLIENJBAKB.
      */
-    float getNBANAGMDLHB();
+    float getDDLIENJBAKB();
 
     /**
-     * <code>int32 hit_box_index = 6;</code>
-     * @return The hitBoxIndex.
-     */
-    int getHitBoxIndex();
-
-    /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      * @return Whether the hitPoint field is set.
      */
     boolean hasHitPoint();
     /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      * @return The hitPoint.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint();
     /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder();
 
     /**
-     * <code>float DMGGIJNBFNN = 11;</code>
-     * @return The dMGGIJNBFNN.
-     */
-    float getDMGGIJNBFNN();
-
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     * @return Whether the hitDir field is set.
-     */
-    boolean hasHitDir();
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     * @return The hitDir.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getHitDir();
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitDirOrBuilder();
-
-    /**
-     * <code>.HitColliderType hit_collider_type = 4;</code>
+     * <code>.HitColliderType hit_collider_type = 6;</code>
      * @return The enum numeric value on the wire for hitColliderType.
      */
     int getHitColliderTypeValue();
     /**
-     * <code>.HitColliderType hit_collider_type = 4;</code>
+     * <code>.HitColliderType hit_collider_type = 6;</code>
      * @return The hitColliderType.
      */
     emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType getHitColliderType();
+
+    /**
+     * <code>float GGHMAHBOMKE = 7;</code>
+     * @return The gGHMAHBOMKE.
+     */
+    float getGGHMAHBOMKE();
+
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     * @return Whether the eDOEECEACHH field is set.
+     */
+    boolean hasEDOEECEACHH();
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     * @return The eDOEECEACHH.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getEDOEECEACHH();
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEDOEECEACHHOrBuilder();
+
+    /**
+     * <code>int32 hit_box_index = 12;</code>
+     * @return The hitBoxIndex.
+     */
+    int getHitBoxIndex();
   }
   /**
-   * <pre>
-   * Obf: AABMKDICGED
-   * </pre>
-   *
    * Protobuf type {@code HitCollision}
    */
   public static final class HitCollision extends
@@ -127,36 +123,12 @@ public final class HitCollisionOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-              int rawValue = input.readEnum();
+            case 29: {
 
-              hitColliderType_ = rawValue;
+              dDLIENJBAKB_ = input.readFloat();
               break;
             }
-            case 48: {
-
-              hitBoxIndex_ = input.readInt32();
-              break;
-            }
-            case 66: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (hitDir_ != null) {
-                subBuilder = hitDir_.toBuilder();
-              }
-              hitDir_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(hitDir_);
-                hitDir_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 93: {
-
-              dMGGIJNBFNN_ = input.readFloat();
-              break;
-            }
-            case 106: {
+            case 42: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (hitPoint_ != null) {
                 subBuilder = hitPoint_.toBuilder();
@@ -169,9 +141,33 @@ public final class HitCollisionOuterClass {
 
               break;
             }
-            case 125: {
+            case 48: {
+              int rawValue = input.readEnum();
 
-              nBANAGMDLHB_ = input.readFloat();
+              hitColliderType_ = rawValue;
+              break;
+            }
+            case 61: {
+
+              gGHMAHBOMKE_ = input.readFloat();
+              break;
+            }
+            case 82: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (eDOEECEACHH_ != null) {
+                subBuilder = eDOEECEACHH_.toBuilder();
+              }
+              eDOEECEACHH_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(eDOEECEACHH_);
+                eDOEECEACHH_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 96: {
+
+              hitBoxIndex_ = input.readInt32();
               break;
             }
             default: {
@@ -206,32 +202,21 @@ public final class HitCollisionOuterClass {
               emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.class, emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.Builder.class);
     }
 
-    public static final int NBANAGMDLHB_FIELD_NUMBER = 15;
-    private float nBANAGMDLHB_;
+    public static final int DDLIENJBAKB_FIELD_NUMBER = 3;
+    private float dDLIENJBAKB_;
     /**
-     * <code>float NBANAGMDLHB = 15;</code>
-     * @return The nBANAGMDLHB.
+     * <code>float DDLIENJBAKB = 3;</code>
+     * @return The dDLIENJBAKB.
      */
     @java.lang.Override
-    public float getNBANAGMDLHB() {
-      return nBANAGMDLHB_;
+    public float getDDLIENJBAKB() {
+      return dDLIENJBAKB_;
     }
 
-    public static final int HIT_BOX_INDEX_FIELD_NUMBER = 6;
-    private int hitBoxIndex_;
-    /**
-     * <code>int32 hit_box_index = 6;</code>
-     * @return The hitBoxIndex.
-     */
-    @java.lang.Override
-    public int getHitBoxIndex() {
-      return hitBoxIndex_;
-    }
-
-    public static final int HIT_POINT_FIELD_NUMBER = 13;
+    public static final int HIT_POINT_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector hitPoint_;
     /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      * @return Whether the hitPoint field is set.
      */
     @java.lang.Override
@@ -239,7 +224,7 @@ public final class HitCollisionOuterClass {
       return hitPoint_ != null;
     }
     /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      * @return The hitPoint.
      */
     @java.lang.Override
@@ -247,61 +232,24 @@ public final class HitCollisionOuterClass {
       return hitPoint_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitPoint_;
     }
     /**
-     * <code>.Vector hit_point = 13;</code>
+     * <code>.Vector hit_point = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder() {
       return getHitPoint();
     }
 
-    public static final int DMGGIJNBFNN_FIELD_NUMBER = 11;
-    private float dMGGIJNBFNN_;
-    /**
-     * <code>float DMGGIJNBFNN = 11;</code>
-     * @return The dMGGIJNBFNN.
-     */
-    @java.lang.Override
-    public float getDMGGIJNBFNN() {
-      return dMGGIJNBFNN_;
-    }
-
-    public static final int HIT_DIR_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector hitDir_;
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     * @return Whether the hitDir field is set.
-     */
-    @java.lang.Override
-    public boolean hasHitDir() {
-      return hitDir_ != null;
-    }
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     * @return The hitDir.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitDir() {
-      return hitDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitDir_;
-    }
-    /**
-     * <code>.Vector hit_dir = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitDirOrBuilder() {
-      return getHitDir();
-    }
-
-    public static final int HIT_COLLIDER_TYPE_FIELD_NUMBER = 4;
+    public static final int HIT_COLLIDER_TYPE_FIELD_NUMBER = 6;
     private int hitColliderType_;
     /**
-     * <code>.HitColliderType hit_collider_type = 4;</code>
+     * <code>.HitColliderType hit_collider_type = 6;</code>
      * @return The enum numeric value on the wire for hitColliderType.
      */
     @java.lang.Override public int getHitColliderTypeValue() {
       return hitColliderType_;
     }
     /**
-     * <code>.HitColliderType hit_collider_type = 4;</code>
+     * <code>.HitColliderType hit_collider_type = 6;</code>
      * @return The hitColliderType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType getHitColliderType() {
@@ -310,6 +258,54 @@ public final class HitCollisionOuterClass {
       return result == null ? emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.UNRECOGNIZED : result;
     }
 
+    public static final int GGHMAHBOMKE_FIELD_NUMBER = 7;
+    private float gGHMAHBOMKE_;
+    /**
+     * <code>float GGHMAHBOMKE = 7;</code>
+     * @return The gGHMAHBOMKE.
+     */
+    @java.lang.Override
+    public float getGGHMAHBOMKE() {
+      return gGHMAHBOMKE_;
+    }
+
+    public static final int EDOEECEACHH_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector eDOEECEACHH_;
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     * @return Whether the eDOEECEACHH field is set.
+     */
+    @java.lang.Override
+    public boolean hasEDOEECEACHH() {
+      return eDOEECEACHH_ != null;
+    }
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     * @return The eDOEECEACHH.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getEDOEECEACHH() {
+      return eDOEECEACHH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eDOEECEACHH_;
+    }
+    /**
+     * <code>.Vector EDOEECEACHH = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEDOEECEACHHOrBuilder() {
+      return getEDOEECEACHH();
+    }
+
+    public static final int HIT_BOX_INDEX_FIELD_NUMBER = 12;
+    private int hitBoxIndex_;
+    /**
+     * <code>int32 hit_box_index = 12;</code>
+     * @return The hitBoxIndex.
+     */
+    @java.lang.Override
+    public int getHitBoxIndex() {
+      return hitBoxIndex_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -324,23 +320,23 @@ public final class HitCollisionOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
-        output.writeEnum(4, hitColliderType_);
-      }
-      if (hitBoxIndex_ != 0) {
-        output.writeInt32(6, hitBoxIndex_);
-      }
-      if (hitDir_ != null) {
-        output.writeMessage(8, getHitDir());
-      }
-      if (dMGGIJNBFNN_ != 0F) {
-        output.writeFloat(11, dMGGIJNBFNN_);
+      if (dDLIENJBAKB_ != 0F) {
+        output.writeFloat(3, dDLIENJBAKB_);
       }
       if (hitPoint_ != null) {
-        output.writeMessage(13, getHitPoint());
+        output.writeMessage(5, getHitPoint());
       }
-      if (nBANAGMDLHB_ != 0F) {
-        output.writeFloat(15, nBANAGMDLHB_);
+      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
+        output.writeEnum(6, hitColliderType_);
+      }
+      if (gGHMAHBOMKE_ != 0F) {
+        output.writeFloat(7, gGHMAHBOMKE_);
+      }
+      if (eDOEECEACHH_ != null) {
+        output.writeMessage(10, getEDOEECEACHH());
+      }
+      if (hitBoxIndex_ != 0) {
+        output.writeInt32(12, hitBoxIndex_);
       }
       unknownFields.writeTo(output);
     }
@@ -351,29 +347,29 @@ public final class HitCollisionOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
+      if (dDLIENJBAKB_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, hitColliderType_);
-      }
-      if (hitBoxIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, hitBoxIndex_);
-      }
-      if (hitDir_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getHitDir());
-      }
-      if (dMGGIJNBFNN_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(11, dMGGIJNBFNN_);
+          .computeFloatSize(3, dDLIENJBAKB_);
       }
       if (hitPoint_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getHitPoint());
+          .computeMessageSize(5, getHitPoint());
       }
-      if (nBANAGMDLHB_ != 0F) {
+      if (hitColliderType_ != emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.HIT_COLLIDER_INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(15, nBANAGMDLHB_);
+          .computeEnumSize(6, hitColliderType_);
+      }
+      if (gGHMAHBOMKE_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(7, gGHMAHBOMKE_);
+      }
+      if (eDOEECEACHH_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getEDOEECEACHH());
+      }
+      if (hitBoxIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, hitBoxIndex_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -390,25 +386,25 @@ public final class HitCollisionOuterClass {
       }
       emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision other = (emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision) obj;
 
-      if (java.lang.Float.floatToIntBits(getNBANAGMDLHB())
+      if (java.lang.Float.floatToIntBits(getDDLIENJBAKB())
           != java.lang.Float.floatToIntBits(
-              other.getNBANAGMDLHB())) return false;
-      if (getHitBoxIndex()
-          != other.getHitBoxIndex()) return false;
+              other.getDDLIENJBAKB())) return false;
       if (hasHitPoint() != other.hasHitPoint()) return false;
       if (hasHitPoint()) {
         if (!getHitPoint()
             .equals(other.getHitPoint())) return false;
       }
-      if (java.lang.Float.floatToIntBits(getDMGGIJNBFNN())
-          != java.lang.Float.floatToIntBits(
-              other.getDMGGIJNBFNN())) return false;
-      if (hasHitDir() != other.hasHitDir()) return false;
-      if (hasHitDir()) {
-        if (!getHitDir()
-            .equals(other.getHitDir())) return false;
-      }
       if (hitColliderType_ != other.hitColliderType_) return false;
+      if (java.lang.Float.floatToIntBits(getGGHMAHBOMKE())
+          != java.lang.Float.floatToIntBits(
+              other.getGGHMAHBOMKE())) return false;
+      if (hasEDOEECEACHH() != other.hasEDOEECEACHH()) return false;
+      if (hasEDOEECEACHH()) {
+        if (!getEDOEECEACHH()
+            .equals(other.getEDOEECEACHH())) return false;
+      }
+      if (getHitBoxIndex()
+          != other.getHitBoxIndex()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -420,24 +416,24 @@ public final class HitCollisionOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NBANAGMDLHB_FIELD_NUMBER;
+      hash = (37 * hash) + DDLIENJBAKB_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getNBANAGMDLHB());
-      hash = (37 * hash) + HIT_BOX_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getHitBoxIndex();
+          getDDLIENJBAKB());
       if (hasHitPoint()) {
         hash = (37 * hash) + HIT_POINT_FIELD_NUMBER;
         hash = (53 * hash) + getHitPoint().hashCode();
       }
-      hash = (37 * hash) + DMGGIJNBFNN_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getDMGGIJNBFNN());
-      if (hasHitDir()) {
-        hash = (37 * hash) + HIT_DIR_FIELD_NUMBER;
-        hash = (53 * hash) + getHitDir().hashCode();
-      }
       hash = (37 * hash) + HIT_COLLIDER_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + hitColliderType_;
+      hash = (37 * hash) + GGHMAHBOMKE_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getGGHMAHBOMKE());
+      if (hasEDOEECEACHH()) {
+        hash = (37 * hash) + EDOEECEACHH_FIELD_NUMBER;
+        hash = (53 * hash) + getEDOEECEACHH().hashCode();
+      }
+      hash = (37 * hash) + HIT_BOX_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getHitBoxIndex();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -534,10 +530,6 @@ public final class HitCollisionOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AABMKDICGED
-     * </pre>
-     *
      * Protobuf type {@code HitCollision}
      */
     public static final class Builder extends
@@ -575,9 +567,7 @@ public final class HitCollisionOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nBANAGMDLHB_ = 0F;
-
-        hitBoxIndex_ = 0;
+        dDLIENJBAKB_ = 0F;
 
         if (hitPointBuilder_ == null) {
           hitPoint_ = null;
@@ -585,16 +575,18 @@ public final class HitCollisionOuterClass {
           hitPoint_ = null;
           hitPointBuilder_ = null;
         }
-        dMGGIJNBFNN_ = 0F;
-
-        if (hitDirBuilder_ == null) {
-          hitDir_ = null;
-        } else {
-          hitDir_ = null;
-          hitDirBuilder_ = null;
-        }
         hitColliderType_ = 0;
 
+        gGHMAHBOMKE_ = 0F;
+
+        if (eDOEECEACHHBuilder_ == null) {
+          eDOEECEACHH_ = null;
+        } else {
+          eDOEECEACHH_ = null;
+          eDOEECEACHHBuilder_ = null;
+        }
+        hitBoxIndex_ = 0;
+
         return this;
       }
 
@@ -621,20 +613,20 @@ public final class HitCollisionOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision buildPartial() {
         emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision result = new emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision(this);
-        result.nBANAGMDLHB_ = nBANAGMDLHB_;
-        result.hitBoxIndex_ = hitBoxIndex_;
+        result.dDLIENJBAKB_ = dDLIENJBAKB_;
         if (hitPointBuilder_ == null) {
           result.hitPoint_ = hitPoint_;
         } else {
           result.hitPoint_ = hitPointBuilder_.build();
         }
-        result.dMGGIJNBFNN_ = dMGGIJNBFNN_;
-        if (hitDirBuilder_ == null) {
-          result.hitDir_ = hitDir_;
-        } else {
-          result.hitDir_ = hitDirBuilder_.build();
-        }
         result.hitColliderType_ = hitColliderType_;
+        result.gGHMAHBOMKE_ = gGHMAHBOMKE_;
+        if (eDOEECEACHHBuilder_ == null) {
+          result.eDOEECEACHH_ = eDOEECEACHH_;
+        } else {
+          result.eDOEECEACHH_ = eDOEECEACHHBuilder_.build();
+        }
+        result.hitBoxIndex_ = hitBoxIndex_;
         onBuilt();
         return result;
       }
@@ -683,24 +675,24 @@ public final class HitCollisionOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision other) {
         if (other == emu.grasscutter.net.proto.HitCollisionOuterClass.HitCollision.getDefaultInstance()) return this;
-        if (other.getNBANAGMDLHB() != 0F) {
-          setNBANAGMDLHB(other.getNBANAGMDLHB());
-        }
-        if (other.getHitBoxIndex() != 0) {
-          setHitBoxIndex(other.getHitBoxIndex());
+        if (other.getDDLIENJBAKB() != 0F) {
+          setDDLIENJBAKB(other.getDDLIENJBAKB());
         }
         if (other.hasHitPoint()) {
           mergeHitPoint(other.getHitPoint());
         }
-        if (other.getDMGGIJNBFNN() != 0F) {
-          setDMGGIJNBFNN(other.getDMGGIJNBFNN());
-        }
-        if (other.hasHitDir()) {
-          mergeHitDir(other.getHitDir());
-        }
         if (other.hitColliderType_ != 0) {
           setHitColliderTypeValue(other.getHitColliderTypeValue());
         }
+        if (other.getGGHMAHBOMKE() != 0F) {
+          setGGHMAHBOMKE(other.getGGHMAHBOMKE());
+        }
+        if (other.hasEDOEECEACHH()) {
+          mergeEDOEECEACHH(other.getEDOEECEACHH());
+        }
+        if (other.getHitBoxIndex() != 0) {
+          setHitBoxIndex(other.getHitBoxIndex());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -730,64 +722,33 @@ public final class HitCollisionOuterClass {
         return this;
       }
 
-      private float nBANAGMDLHB_ ;
+      private float dDLIENJBAKB_ ;
       /**
-       * <code>float NBANAGMDLHB = 15;</code>
-       * @return The nBANAGMDLHB.
+       * <code>float DDLIENJBAKB = 3;</code>
+       * @return The dDLIENJBAKB.
        */
       @java.lang.Override
-      public float getNBANAGMDLHB() {
-        return nBANAGMDLHB_;
+      public float getDDLIENJBAKB() {
+        return dDLIENJBAKB_;
       }
       /**
-       * <code>float NBANAGMDLHB = 15;</code>
-       * @param value The nBANAGMDLHB to set.
+       * <code>float DDLIENJBAKB = 3;</code>
+       * @param value The dDLIENJBAKB to set.
        * @return This builder for chaining.
        */
-      public Builder setNBANAGMDLHB(float value) {
+      public Builder setDDLIENJBAKB(float value) {
         
-        nBANAGMDLHB_ = value;
+        dDLIENJBAKB_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float NBANAGMDLHB = 15;</code>
+       * <code>float DDLIENJBAKB = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNBANAGMDLHB() {
+      public Builder clearDDLIENJBAKB() {
         
-        nBANAGMDLHB_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private int hitBoxIndex_ ;
-      /**
-       * <code>int32 hit_box_index = 6;</code>
-       * @return The hitBoxIndex.
-       */
-      @java.lang.Override
-      public int getHitBoxIndex() {
-        return hitBoxIndex_;
-      }
-      /**
-       * <code>int32 hit_box_index = 6;</code>
-       * @param value The hitBoxIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHitBoxIndex(int value) {
-        
-        hitBoxIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 hit_box_index = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHitBoxIndex() {
-        
-        hitBoxIndex_ = 0;
+        dDLIENJBAKB_ = 0F;
         onChanged();
         return this;
       }
@@ -796,14 +757,14 @@ public final class HitCollisionOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> hitPointBuilder_;
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        * @return Whether the hitPoint field is set.
        */
       public boolean hasHitPoint() {
         return hitPointBuilder_ != null || hitPoint_ != null;
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        * @return The hitPoint.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitPoint() {
@@ -814,7 +775,7 @@ public final class HitCollisionOuterClass {
         }
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public Builder setHitPoint(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (hitPointBuilder_ == null) {
@@ -830,7 +791,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public Builder setHitPoint(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -844,7 +805,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public Builder mergeHitPoint(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (hitPointBuilder_ == null) {
@@ -862,7 +823,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public Builder clearHitPoint() {
         if (hitPointBuilder_ == null) {
@@ -876,7 +837,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHitPointBuilder() {
         
@@ -884,7 +845,7 @@ public final class HitCollisionOuterClass {
         return getHitPointFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitPointOrBuilder() {
         if (hitPointBuilder_ != null) {
@@ -895,7 +856,7 @@ public final class HitCollisionOuterClass {
         }
       }
       /**
-       * <code>.Vector hit_point = 13;</code>
+       * <code>.Vector hit_point = 5;</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> 
@@ -911,166 +872,16 @@ public final class HitCollisionOuterClass {
         return hitPointBuilder_;
       }
 
-      private float dMGGIJNBFNN_ ;
-      /**
-       * <code>float DMGGIJNBFNN = 11;</code>
-       * @return The dMGGIJNBFNN.
-       */
-      @java.lang.Override
-      public float getDMGGIJNBFNN() {
-        return dMGGIJNBFNN_;
-      }
-      /**
-       * <code>float DMGGIJNBFNN = 11;</code>
-       * @param value The dMGGIJNBFNN to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDMGGIJNBFNN(float value) {
-        
-        dMGGIJNBFNN_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float DMGGIJNBFNN = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDMGGIJNBFNN() {
-        
-        dMGGIJNBFNN_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector hitDir_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> hitDirBuilder_;
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       * @return Whether the hitDir field is set.
-       */
-      public boolean hasHitDir() {
-        return hitDirBuilder_ != null || hitDir_ != null;
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       * @return The hitDir.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getHitDir() {
-        if (hitDirBuilder_ == null) {
-          return hitDir_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitDir_;
-        } else {
-          return hitDirBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public Builder setHitDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hitDirBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          hitDir_ = value;
-          onChanged();
-        } else {
-          hitDirBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public Builder setHitDir(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (hitDirBuilder_ == null) {
-          hitDir_ = builderForValue.build();
-          onChanged();
-        } else {
-          hitDirBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public Builder mergeHitDir(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (hitDirBuilder_ == null) {
-          if (hitDir_ != null) {
-            hitDir_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(hitDir_).mergeFrom(value).buildPartial();
-          } else {
-            hitDir_ = value;
-          }
-          onChanged();
-        } else {
-          hitDirBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public Builder clearHitDir() {
-        if (hitDirBuilder_ == null) {
-          hitDir_ = null;
-          onChanged();
-        } else {
-          hitDir_ = null;
-          hitDirBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getHitDirBuilder() {
-        
-        onChanged();
-        return getHitDirFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getHitDirOrBuilder() {
-        if (hitDirBuilder_ != null) {
-          return hitDirBuilder_.getMessageOrBuilder();
-        } else {
-          return hitDir_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : hitDir_;
-        }
-      }
-      /**
-       * <code>.Vector hit_dir = 8;</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> 
-          getHitDirFieldBuilder() {
-        if (hitDirBuilder_ == null) {
-          hitDirBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getHitDir(),
-                  getParentForChildren(),
-                  isClean());
-          hitDir_ = null;
-        }
-        return hitDirBuilder_;
-      }
-
       private int hitColliderType_ = 0;
       /**
-       * <code>.HitColliderType hit_collider_type = 4;</code>
+       * <code>.HitColliderType hit_collider_type = 6;</code>
        * @return The enum numeric value on the wire for hitColliderType.
        */
       @java.lang.Override public int getHitColliderTypeValue() {
         return hitColliderType_;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 4;</code>
+       * <code>.HitColliderType hit_collider_type = 6;</code>
        * @param value The enum numeric value on the wire for hitColliderType to set.
        * @return This builder for chaining.
        */
@@ -1081,7 +892,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 4;</code>
+       * <code>.HitColliderType hit_collider_type = 6;</code>
        * @return The hitColliderType.
        */
       @java.lang.Override
@@ -1091,7 +902,7 @@ public final class HitCollisionOuterClass {
         return result == null ? emu.grasscutter.net.proto.HitColliderTypeOuterClass.HitColliderType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 4;</code>
+       * <code>.HitColliderType hit_collider_type = 6;</code>
        * @param value The hitColliderType to set.
        * @return This builder for chaining.
        */
@@ -1105,7 +916,7 @@ public final class HitCollisionOuterClass {
         return this;
       }
       /**
-       * <code>.HitColliderType hit_collider_type = 4;</code>
+       * <code>.HitColliderType hit_collider_type = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearHitColliderType() {
@@ -1114,6 +925,187 @@ public final class HitCollisionOuterClass {
         onChanged();
         return this;
       }
+
+      private float gGHMAHBOMKE_ ;
+      /**
+       * <code>float GGHMAHBOMKE = 7;</code>
+       * @return The gGHMAHBOMKE.
+       */
+      @java.lang.Override
+      public float getGGHMAHBOMKE() {
+        return gGHMAHBOMKE_;
+      }
+      /**
+       * <code>float GGHMAHBOMKE = 7;</code>
+       * @param value The gGHMAHBOMKE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGGHMAHBOMKE(float value) {
+        
+        gGHMAHBOMKE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float GGHMAHBOMKE = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGGHMAHBOMKE() {
+        
+        gGHMAHBOMKE_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector eDOEECEACHH_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> eDOEECEACHHBuilder_;
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       * @return Whether the eDOEECEACHH field is set.
+       */
+      public boolean hasEDOEECEACHH() {
+        return eDOEECEACHHBuilder_ != null || eDOEECEACHH_ != null;
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       * @return The eDOEECEACHH.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getEDOEECEACHH() {
+        if (eDOEECEACHHBuilder_ == null) {
+          return eDOEECEACHH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eDOEECEACHH_;
+        } else {
+          return eDOEECEACHHBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public Builder setEDOEECEACHH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (eDOEECEACHHBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          eDOEECEACHH_ = value;
+          onChanged();
+        } else {
+          eDOEECEACHHBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public Builder setEDOEECEACHH(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (eDOEECEACHHBuilder_ == null) {
+          eDOEECEACHH_ = builderForValue.build();
+          onChanged();
+        } else {
+          eDOEECEACHHBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public Builder mergeEDOEECEACHH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (eDOEECEACHHBuilder_ == null) {
+          if (eDOEECEACHH_ != null) {
+            eDOEECEACHH_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(eDOEECEACHH_).mergeFrom(value).buildPartial();
+          } else {
+            eDOEECEACHH_ = value;
+          }
+          onChanged();
+        } else {
+          eDOEECEACHHBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public Builder clearEDOEECEACHH() {
+        if (eDOEECEACHHBuilder_ == null) {
+          eDOEECEACHH_ = null;
+          onChanged();
+        } else {
+          eDOEECEACHH_ = null;
+          eDOEECEACHHBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getEDOEECEACHHBuilder() {
+        
+        onChanged();
+        return getEDOEECEACHHFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEDOEECEACHHOrBuilder() {
+        if (eDOEECEACHHBuilder_ != null) {
+          return eDOEECEACHHBuilder_.getMessageOrBuilder();
+        } else {
+          return eDOEECEACHH_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eDOEECEACHH_;
+        }
+      }
+      /**
+       * <code>.Vector EDOEECEACHH = 10;</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> 
+          getEDOEECEACHHFieldBuilder() {
+        if (eDOEECEACHHBuilder_ == null) {
+          eDOEECEACHHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getEDOEECEACHH(),
+                  getParentForChildren(),
+                  isClean());
+          eDOEECEACHH_ = null;
+        }
+        return eDOEECEACHHBuilder_;
+      }
+
+      private int hitBoxIndex_ ;
+      /**
+       * <code>int32 hit_box_index = 12;</code>
+       * @return The hitBoxIndex.
+       */
+      @java.lang.Override
+      public int getHitBoxIndex() {
+        return hitBoxIndex_;
+      }
+      /**
+       * <code>int32 hit_box_index = 12;</code>
+       * @param value The hitBoxIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHitBoxIndex(int value) {
+        
+        hitBoxIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 hit_box_index = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHitBoxIndex() {
+        
+        hitBoxIndex_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1182,12 +1174,12 @@ public final class HitCollisionOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022HitCollision.proto\032\014Vector.proto\032\025HitC" +
-      "olliderType.proto\"\262\001\n\014HitCollision\022\023\n\013NB" +
-      "ANAGMDLHB\030\017 \001(\002\022\025\n\rhit_box_index\030\006 \001(\005\022\032" +
-      "\n\thit_point\030\r \001(\0132\007.Vector\022\023\n\013DMGGIJNBFN" +
-      "N\030\013 \001(\002\022\030\n\007hit_dir\030\010 \001(\0132\007.Vector\022+\n\021hit" +
-      "_collider_type\030\004 \001(\0162\020.HitColliderTypeB\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "olliderType.proto\"\266\001\n\014HitCollision\022\023\n\013DD" +
+      "LIENJBAKB\030\003 \001(\002\022\032\n\thit_point\030\005 \001(\0132\007.Vec" +
+      "tor\022+\n\021hit_collider_type\030\006 \001(\0162\020.HitColl" +
+      "iderType\022\023\n\013GGHMAHBOMKE\030\007 \001(\002\022\034\n\013EDOEECE" +
+      "ACHH\030\n \001(\0132\007.Vector\022\025\n\rhit_box_index\030\014 \001" +
+      "(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1200,7 +1192,7 @@ public final class HitCollisionOuterClass {
     internal_static_HitCollision_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HitCollision_descriptor,
-        new java.lang.String[] { "NBANAGMDLHB", "HitBoxIndex", "HitPoint", "DMGGIJNBFNN", "HitDir", "HitColliderType", });
+        new java.lang.String[] { "DDLIENJBAKB", "HitPoint", "HitColliderType", "GGHMAHBOMKE", "EDOEECEACHH", "HitBoxIndex", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HitColliderTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java
index c56efac56..fb8660ed6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HitTreeNotifyOuterClass.java
@@ -18,21 +18,6 @@ public final class HitTreeNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:HitTreeNotify)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     * @return Whether the treePos field is set.
-     */
-    boolean hasTreePos();
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     * @return The treePos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos();
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder();
-
     /**
      * <code>.Vector drop_pos = 7;</code>
      * @return Whether the dropPos field is set.
@@ -49,17 +34,27 @@ public final class HitTreeNotifyOuterClass {
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDropPosOrBuilder();
 
     /**
-     * <code>uint32 tree_type = 10;</code>
+     * <code>.Vector tree_pos = 3;</code>
+     * @return Whether the treePos field is set.
+     */
+    boolean hasTreePos();
+    /**
+     * <code>.Vector tree_pos = 3;</code>
+     * @return The treePos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos();
+    /**
+     * <code>.Vector tree_pos = 3;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder();
+
+    /**
+     * <code>uint32 tree_type = 4;</code>
      * @return The treeType.
      */
     int getTreeType();
   }
   /**
-   * <pre>
-   * CmdId: 8766
-   * Obf: BAGAPIFEAFI
-   * </pre>
-   *
    * Protobuf type {@code HitTreeNotify}
    */
   public static final class HitTreeNotify extends
@@ -104,20 +99,7 @@ public final class HitTreeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (dropPos_ != null) {
-                subBuilder = dropPos_.toBuilder();
-              }
-              dropPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(dropPos_);
-                dropPos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 74: {
+            case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (treePos_ != null) {
                 subBuilder = treePos_.toBuilder();
@@ -130,11 +112,24 @@ public final class HitTreeNotifyOuterClass {
 
               break;
             }
-            case 80: {
+            case 32: {
 
               treeType_ = input.readUInt32();
               break;
             }
+            case 58: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (dropPos_ != null) {
+                subBuilder = dropPos_.toBuilder();
+              }
+              dropPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(dropPos_);
+                dropPos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -167,32 +162,6 @@ public final class HitTreeNotifyOuterClass {
               emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.class, emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.Builder.class);
     }
 
-    public static final int TREE_POS_FIELD_NUMBER = 9;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     * @return Whether the treePos field is set.
-     */
-    @java.lang.Override
-    public boolean hasTreePos() {
-      return treePos_ != null;
-    }
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     * @return The treePos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
-      return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
-    }
-    /**
-     * <code>.Vector tree_pos = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
-      return getTreePos();
-    }
-
     public static final int DROP_POS_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
     /**
@@ -219,10 +188,36 @@ public final class HitTreeNotifyOuterClass {
       return getDropPos();
     }
 
-    public static final int TREE_TYPE_FIELD_NUMBER = 10;
+    public static final int TREE_POS_FIELD_NUMBER = 3;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
+    /**
+     * <code>.Vector tree_pos = 3;</code>
+     * @return Whether the treePos field is set.
+     */
+    @java.lang.Override
+    public boolean hasTreePos() {
+      return treePos_ != null;
+    }
+    /**
+     * <code>.Vector tree_pos = 3;</code>
+     * @return The treePos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
+      return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
+    }
+    /**
+     * <code>.Vector tree_pos = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
+      return getTreePos();
+    }
+
+    public static final int TREE_TYPE_FIELD_NUMBER = 4;
     private int treeType_;
     /**
-     * <code>uint32 tree_type = 10;</code>
+     * <code>uint32 tree_type = 4;</code>
      * @return The treeType.
      */
     @java.lang.Override
@@ -244,14 +239,14 @@ public final class HitTreeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (dropPos_ != null) {
-        output.writeMessage(7, getDropPos());
-      }
       if (treePos_ != null) {
-        output.writeMessage(9, getTreePos());
+        output.writeMessage(3, getTreePos());
       }
       if (treeType_ != 0) {
-        output.writeUInt32(10, treeType_);
+        output.writeUInt32(4, treeType_);
+      }
+      if (dropPos_ != null) {
+        output.writeMessage(7, getDropPos());
       }
       unknownFields.writeTo(output);
     }
@@ -262,17 +257,17 @@ public final class HitTreeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (dropPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getDropPos());
-      }
       if (treePos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getTreePos());
+          .computeMessageSize(3, getTreePos());
       }
       if (treeType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, treeType_);
+          .computeUInt32Size(4, treeType_);
+      }
+      if (dropPos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, getDropPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -289,16 +284,16 @@ public final class HitTreeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other = (emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify) obj;
 
-      if (hasTreePos() != other.hasTreePos()) return false;
-      if (hasTreePos()) {
-        if (!getTreePos()
-            .equals(other.getTreePos())) return false;
-      }
       if (hasDropPos() != other.hasDropPos()) return false;
       if (hasDropPos()) {
         if (!getDropPos()
             .equals(other.getDropPos())) return false;
       }
+      if (hasTreePos() != other.hasTreePos()) return false;
+      if (hasTreePos()) {
+        if (!getTreePos()
+            .equals(other.getTreePos())) return false;
+      }
       if (getTreeType()
           != other.getTreeType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -312,14 +307,14 @@ public final class HitTreeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasTreePos()) {
-        hash = (37 * hash) + TREE_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getTreePos().hashCode();
-      }
       if (hasDropPos()) {
         hash = (37 * hash) + DROP_POS_FIELD_NUMBER;
         hash = (53 * hash) + getDropPos().hashCode();
       }
+      if (hasTreePos()) {
+        hash = (37 * hash) + TREE_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getTreePos().hashCode();
+      }
       hash = (37 * hash) + TREE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getTreeType();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -418,11 +413,6 @@ public final class HitTreeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8766
-     * Obf: BAGAPIFEAFI
-     * </pre>
-     *
      * Protobuf type {@code HitTreeNotify}
      */
     public static final class Builder extends
@@ -460,18 +450,18 @@ public final class HitTreeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (treePosBuilder_ == null) {
-          treePos_ = null;
-        } else {
-          treePos_ = null;
-          treePosBuilder_ = null;
-        }
         if (dropPosBuilder_ == null) {
           dropPos_ = null;
         } else {
           dropPos_ = null;
           dropPosBuilder_ = null;
         }
+        if (treePosBuilder_ == null) {
+          treePos_ = null;
+        } else {
+          treePos_ = null;
+          treePosBuilder_ = null;
+        }
         treeType_ = 0;
 
         return this;
@@ -500,16 +490,16 @@ public final class HitTreeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify buildPartial() {
         emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify result = new emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify(this);
-        if (treePosBuilder_ == null) {
-          result.treePos_ = treePos_;
-        } else {
-          result.treePos_ = treePosBuilder_.build();
-        }
         if (dropPosBuilder_ == null) {
           result.dropPos_ = dropPos_;
         } else {
           result.dropPos_ = dropPosBuilder_.build();
         }
+        if (treePosBuilder_ == null) {
+          result.treePos_ = treePos_;
+        } else {
+          result.treePos_ = treePosBuilder_.build();
+        }
         result.treeType_ = treeType_;
         onBuilt();
         return result;
@@ -559,12 +549,12 @@ public final class HitTreeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify other) {
         if (other == emu.grasscutter.net.proto.HitTreeNotifyOuterClass.HitTreeNotify.getDefaultInstance()) return this;
-        if (other.hasTreePos()) {
-          mergeTreePos(other.getTreePos());
-        }
         if (other.hasDropPos()) {
           mergeDropPos(other.getDropPos());
         }
+        if (other.hasTreePos()) {
+          mergeTreePos(other.getTreePos());
+        }
         if (other.getTreeType() != 0) {
           setTreeType(other.getTreeType());
         }
@@ -597,125 +587,6 @@ public final class HitTreeNotifyOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_;
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       * @return Whether the treePos field is set.
-       */
-      public boolean hasTreePos() {
-        return treePosBuilder_ != null || treePos_ != null;
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       * @return The treePos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
-        if (treePosBuilder_ == null) {
-          return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
-        } else {
-          return treePosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (treePosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          treePos_ = value;
-          onChanged();
-        } else {
-          treePosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public Builder setTreePos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (treePosBuilder_ == null) {
-          treePos_ = builderForValue.build();
-          onChanged();
-        } else {
-          treePosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (treePosBuilder_ == null) {
-          if (treePos_ != null) {
-            treePos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(treePos_).mergeFrom(value).buildPartial();
-          } else {
-            treePos_ = value;
-          }
-          onChanged();
-        } else {
-          treePosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public Builder clearTreePos() {
-        if (treePosBuilder_ == null) {
-          treePos_ = null;
-          onChanged();
-        } else {
-          treePos_ = null;
-          treePosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() {
-        
-        onChanged();
-        return getTreePosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
-        if (treePosBuilder_ != null) {
-          return treePosBuilder_.getMessageOrBuilder();
-        } else {
-          return treePos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
-        }
-      }
-      /**
-       * <code>.Vector tree_pos = 9;</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> 
-          getTreePosFieldBuilder() {
-        if (treePosBuilder_ == null) {
-          treePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getTreePos(),
-                  getParentForChildren(),
-                  isClean());
-          treePos_ = null;
-        }
-        return treePosBuilder_;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector dropPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dropPosBuilder_;
@@ -835,9 +706,128 @@ public final class HitTreeNotifyOuterClass {
         return dropPosBuilder_;
       }
 
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector treePos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> treePosBuilder_;
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       * @return Whether the treePos field is set.
+       */
+      public boolean hasTreePos() {
+        return treePosBuilder_ != null || treePos_ != null;
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       * @return The treePos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getTreePos() {
+        if (treePosBuilder_ == null) {
+          return treePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
+        } else {
+          return treePosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public Builder setTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (treePosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          treePos_ = value;
+          onChanged();
+        } else {
+          treePosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public Builder setTreePos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (treePosBuilder_ == null) {
+          treePos_ = builderForValue.build();
+          onChanged();
+        } else {
+          treePosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public Builder mergeTreePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (treePosBuilder_ == null) {
+          if (treePos_ != null) {
+            treePos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(treePos_).mergeFrom(value).buildPartial();
+          } else {
+            treePos_ = value;
+          }
+          onChanged();
+        } else {
+          treePosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public Builder clearTreePos() {
+        if (treePosBuilder_ == null) {
+          treePos_ = null;
+          onChanged();
+        } else {
+          treePos_ = null;
+          treePosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTreePosBuilder() {
+        
+        onChanged();
+        return getTreePosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTreePosOrBuilder() {
+        if (treePosBuilder_ != null) {
+          return treePosBuilder_.getMessageOrBuilder();
+        } else {
+          return treePos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : treePos_;
+        }
+      }
+      /**
+       * <code>.Vector tree_pos = 3;</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> 
+          getTreePosFieldBuilder() {
+        if (treePosBuilder_ == null) {
+          treePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getTreePos(),
+                  getParentForChildren(),
+                  isClean());
+          treePos_ = null;
+        }
+        return treePosBuilder_;
+      }
+
       private int treeType_ ;
       /**
-       * <code>uint32 tree_type = 10;</code>
+       * <code>uint32 tree_type = 4;</code>
        * @return The treeType.
        */
       @java.lang.Override
@@ -845,7 +835,7 @@ public final class HitTreeNotifyOuterClass {
         return treeType_;
       }
       /**
-       * <code>uint32 tree_type = 10;</code>
+       * <code>uint32 tree_type = 4;</code>
        * @param value The treeType to set.
        * @return This builder for chaining.
        */
@@ -856,7 +846,7 @@ public final class HitTreeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 tree_type = 10;</code>
+       * <code>uint32 tree_type = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTreeType() {
@@ -933,9 +923,9 @@ public final class HitTreeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023HitTreeNotify.proto\032\014Vector.proto\"X\n\rH" +
-      "itTreeNotify\022\031\n\010tree_pos\030\t \001(\0132\007.Vector\022" +
-      "\031\n\010drop_pos\030\007 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
-      "\n \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "itTreeNotify\022\031\n\010drop_pos\030\007 \001(\0132\007.Vector\022" +
+      "\031\n\010tree_pos\030\003 \001(\0132\007.Vector\022\021\n\ttree_type\030" +
+      "\004 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -948,7 +938,7 @@ public final class HitTreeNotifyOuterClass {
     internal_static_HitTreeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HitTreeNotify_descriptor,
-        new java.lang.String[] { "TreePos", "DropPos", "TreeType", });
+        new java.lang.String[] { "DropPos", "TreePos", "TreeType", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAllUnlockedBgmIdListNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAllUnlockedBgmIdListNotifyOuterClass.java
index 9df59cd22..326f9b382 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAllUnlockedBgmIdListNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAllUnlockedBgmIdListNotifyOuterClass.java
@@ -19,28 +19,29 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @return A list containing the allUnlockedBgmIdList.
      */
     java.util.List<java.lang.Integer> getAllUnlockedBgmIdListList();
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @return The count of allUnlockedBgmIdList.
      */
     int getAllUnlockedBgmIdListCount();
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The allUnlockedBgmIdList at the given index.
      */
     int getAllUnlockedBgmIdList(int index);
+
+    /**
+     * <code>bool PFOKFHLOKEJ = 7;</code>
+     * @return The pFOKFHLOKEJ.
+     */
+    boolean getPFOKFHLOKEJ();
   }
   /**
-   * <pre>
-   * CmdId: 23471
-   * Obf: OLKBNMDBLPN
-   * </pre>
-   *
    * Protobuf type {@code HomeAllUnlockedBgmIdListNotify}
    */
   public static final class HomeAllUnlockedBgmIdListNotify extends
@@ -87,7 +88,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 allUnlockedBgmIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +96,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
               allUnlockedBgmIdList_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -108,6 +109,11 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 56: {
+
+              pFOKFHLOKEJ_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,10 +149,10 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
               emu.grasscutter.net.proto.HomeAllUnlockedBgmIdListNotifyOuterClass.HomeAllUnlockedBgmIdListNotify.class, emu.grasscutter.net.proto.HomeAllUnlockedBgmIdListNotifyOuterClass.HomeAllUnlockedBgmIdListNotify.Builder.class);
     }
 
-    public static final int ALL_UNLOCKED_BGM_ID_LIST_FIELD_NUMBER = 1;
+    public static final int ALL_UNLOCKED_BGM_ID_LIST_FIELD_NUMBER = 6;
     private com.google.protobuf.Internal.IntList allUnlockedBgmIdList_;
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @return A list containing the allUnlockedBgmIdList.
      */
     @java.lang.Override
@@ -155,14 +161,14 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
       return allUnlockedBgmIdList_;
     }
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @return The count of allUnlockedBgmIdList.
      */
     public int getAllUnlockedBgmIdListCount() {
       return allUnlockedBgmIdList_.size();
     }
     /**
-     * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+     * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
      * @param index The index of the element to return.
      * @return The allUnlockedBgmIdList at the given index.
      */
@@ -171,6 +177,17 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
     }
     private int allUnlockedBgmIdListMemoizedSerializedSize = -1;
 
+    public static final int PFOKFHLOKEJ_FIELD_NUMBER = 7;
+    private boolean pFOKFHLOKEJ_;
+    /**
+     * <code>bool PFOKFHLOKEJ = 7;</code>
+     * @return The pFOKFHLOKEJ.
+     */
+    @java.lang.Override
+    public boolean getPFOKFHLOKEJ() {
+      return pFOKFHLOKEJ_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -187,12 +204,15 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getAllUnlockedBgmIdListList().size() > 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(allUnlockedBgmIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < allUnlockedBgmIdList_.size(); i++) {
         output.writeUInt32NoTag(allUnlockedBgmIdList_.getInt(i));
       }
+      if (pFOKFHLOKEJ_ != false) {
+        output.writeBool(7, pFOKFHLOKEJ_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -216,6 +236,10 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         }
         allUnlockedBgmIdListMemoizedSerializedSize = dataSize;
       }
+      if (pFOKFHLOKEJ_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(7, pFOKFHLOKEJ_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -233,6 +257,8 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
 
       if (!getAllUnlockedBgmIdListList()
           .equals(other.getAllUnlockedBgmIdListList())) return false;
+      if (getPFOKFHLOKEJ()
+          != other.getPFOKFHLOKEJ()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -248,6 +274,9 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         hash = (37 * hash) + ALL_UNLOCKED_BGM_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAllUnlockedBgmIdListList().hashCode();
       }
+      hash = (37 * hash) + PFOKFHLOKEJ_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getPFOKFHLOKEJ());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +373,6 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23471
-     * Obf: OLKBNMDBLPN
-     * </pre>
-     *
      * Protobuf type {@code HomeAllUnlockedBgmIdListNotify}
      */
     public static final class Builder extends
@@ -388,6 +412,8 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         super.clear();
         allUnlockedBgmIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        pFOKFHLOKEJ_ = false;
+
         return this;
       }
 
@@ -420,6 +446,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.allUnlockedBgmIdList_ = allUnlockedBgmIdList_;
+        result.pFOKFHLOKEJ_ = pFOKFHLOKEJ_;
         onBuilt();
         return result;
       }
@@ -478,6 +505,9 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
           }
           onChanged();
         }
+        if (other.getPFOKFHLOKEJ() != false) {
+          setPFOKFHLOKEJ(other.getPFOKFHLOKEJ());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -516,7 +546,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @return A list containing the allUnlockedBgmIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +555,14 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
                  java.util.Collections.unmodifiableList(allUnlockedBgmIdList_) : allUnlockedBgmIdList_;
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @return The count of allUnlockedBgmIdList.
        */
       public int getAllUnlockedBgmIdListCount() {
         return allUnlockedBgmIdList_.size();
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @param index The index of the element to return.
        * @return The allUnlockedBgmIdList at the given index.
        */
@@ -540,7 +570,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         return allUnlockedBgmIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @param index The index to set the value at.
        * @param value The allUnlockedBgmIdList to set.
        * @return This builder for chaining.
@@ -553,7 +583,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @param value The allUnlockedBgmIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +594,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @param values The allUnlockedBgmIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +607,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 all_unlocked_bgm_id_list = 1;</code>
+       * <code>repeated uint32 all_unlocked_bgm_id_list = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAllUnlockedBgmIdList() {
@@ -586,6 +616,37 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean pFOKFHLOKEJ_ ;
+      /**
+       * <code>bool PFOKFHLOKEJ = 7;</code>
+       * @return The pFOKFHLOKEJ.
+       */
+      @java.lang.Override
+      public boolean getPFOKFHLOKEJ() {
+        return pFOKFHLOKEJ_;
+      }
+      /**
+       * <code>bool PFOKFHLOKEJ = 7;</code>
+       * @param value The pFOKFHLOKEJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPFOKFHLOKEJ(boolean value) {
+        
+        pFOKFHLOKEJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool PFOKFHLOKEJ = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPFOKFHLOKEJ() {
+        
+        pFOKFHLOKEJ_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -653,10 +714,11 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n$HomeAllUnlockedBgmIdListNotify.proto\"B" +
+      "\n$HomeAllUnlockedBgmIdListNotify.proto\"W" +
       "\n\036HomeAllUnlockedBgmIdListNotify\022 \n\030all_" +
-      "unlocked_bgm_id_list\030\001 \003(\rB\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "unlocked_bgm_id_list\030\006 \003(\r\022\023\n\013PFOKFHLOKE" +
+      "J\030\007 \001(\010B\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -667,7 +729,7 @@ public final class HomeAllUnlockedBgmIdListNotifyOuterClass {
     internal_static_HomeAllUnlockedBgmIdListNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAllUnlockedBgmIdListNotify_descriptor,
-        new java.lang.String[] { "AllUnlockedBgmIdList", });
+        new java.lang.String[] { "AllUnlockedBgmIdList", "PFOKFHLOKEJ", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAnimalDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAnimalDataOuterClass.java
index 7273308d9..10c36941d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAnimalDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAnimalDataOuterClass.java
@@ -19,46 +19,42 @@ public final class HomeAnimalDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector spawnRot = 7;</code>
-     * @return Whether the spawnRot field is set.
-     */
-    boolean hasSpawnRot();
-    /**
-     * <code>.Vector spawnRot = 7;</code>
-     * @return The spawnRot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
-    /**
-     * <code>.Vector spawnRot = 7;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
-
-    /**
-     * <code>uint32 furniture_id = 6;</code>
+     * <code>uint32 furniture_id = 5;</code>
      * @return The furnitureId.
      */
     int getFurnitureId();
 
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      * @return Whether the spawnPos field is set.
      */
     boolean hasSpawnPos();
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      * @return The spawnPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
+
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     * @return Whether the spawnRot field is set.
+     */
+    boolean hasSpawnRot();
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     * @return The spawnRot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: IHNPIOGOGKD
-   * </pre>
-   *
    * Protobuf type {@code HomeAnimalData}
    */
   public static final class HomeAnimalData extends
@@ -103,7 +99,12 @@ public final class HomeAnimalDataOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 40: {
+
+              furnitureId_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnPos_ != null) {
                 subBuilder = spawnPos_.toBuilder();
@@ -116,12 +117,7 @@ public final class HomeAnimalDataOuterClass {
 
               break;
             }
-            case 48: {
-
-              furnitureId_ = input.readUInt32();
-              break;
-            }
-            case 58: {
+            case 122: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnRot_ != null) {
                 subBuilder = spawnRot_.toBuilder();
@@ -166,36 +162,10 @@ public final class HomeAnimalDataOuterClass {
               emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.class, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder.class);
     }
 
-    public static final int SPAWNROT_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-    /**
-     * <code>.Vector spawnRot = 7;</code>
-     * @return Whether the spawnRot field is set.
-     */
-    @java.lang.Override
-    public boolean hasSpawnRot() {
-      return spawnRot_ != null;
-    }
-    /**
-     * <code>.Vector spawnRot = 7;</code>
-     * @return The spawnRot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-    }
-    /**
-     * <code>.Vector spawnRot = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-      return getSpawnRot();
-    }
-
-    public static final int FURNITURE_ID_FIELD_NUMBER = 6;
+    public static final int FURNITURE_ID_FIELD_NUMBER = 5;
     private int furnitureId_;
     /**
-     * <code>uint32 furniture_id = 6;</code>
+     * <code>uint32 furniture_id = 5;</code>
      * @return The furnitureId.
      */
     @java.lang.Override
@@ -203,10 +173,10 @@ public final class HomeAnimalDataOuterClass {
       return furnitureId_;
     }
 
-    public static final int SPAWN_POS_FIELD_NUMBER = 4;
+    public static final int SPAWN_POS_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      * @return Whether the spawnPos field is set.
      */
     @java.lang.Override
@@ -214,7 +184,7 @@ public final class HomeAnimalDataOuterClass {
       return spawnPos_ != null;
     }
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      * @return The spawnPos.
      */
     @java.lang.Override
@@ -222,13 +192,39 @@ public final class HomeAnimalDataOuterClass {
       return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
     }
     /**
-     * <code>.Vector spawn_pos = 4;</code>
+     * <code>.Vector spawn_pos = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
       return getSpawnPos();
     }
 
+    public static final int SPAWN_ROT_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     * @return Whether the spawnRot field is set.
+     */
+    @java.lang.Override
+    public boolean hasSpawnRot() {
+      return spawnRot_ != null;
+    }
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     * @return The spawnRot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+    }
+    /**
+     * <code>.Vector spawn_rot = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+      return getSpawnRot();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -243,14 +239,14 @@ public final class HomeAnimalDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (spawnPos_ != null) {
-        output.writeMessage(4, getSpawnPos());
-      }
       if (furnitureId_ != 0) {
-        output.writeUInt32(6, furnitureId_);
+        output.writeUInt32(5, furnitureId_);
+      }
+      if (spawnPos_ != null) {
+        output.writeMessage(12, getSpawnPos());
       }
       if (spawnRot_ != null) {
-        output.writeMessage(7, getSpawnRot());
+        output.writeMessage(15, getSpawnRot());
       }
       unknownFields.writeTo(output);
     }
@@ -261,17 +257,17 @@ public final class HomeAnimalDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (spawnPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getSpawnPos());
-      }
       if (furnitureId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, furnitureId_);
+          .computeUInt32Size(5, furnitureId_);
+      }
+      if (spawnPos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getSpawnPos());
       }
       if (spawnRot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getSpawnRot());
+          .computeMessageSize(15, getSpawnRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -288,11 +284,6 @@ public final class HomeAnimalDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData other = (emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData) obj;
 
-      if (hasSpawnRot() != other.hasSpawnRot()) return false;
-      if (hasSpawnRot()) {
-        if (!getSpawnRot()
-            .equals(other.getSpawnRot())) return false;
-      }
       if (getFurnitureId()
           != other.getFurnitureId()) return false;
       if (hasSpawnPos() != other.hasSpawnPos()) return false;
@@ -300,6 +291,11 @@ public final class HomeAnimalDataOuterClass {
         if (!getSpawnPos()
             .equals(other.getSpawnPos())) return false;
       }
+      if (hasSpawnRot() != other.hasSpawnRot()) return false;
+      if (hasSpawnRot()) {
+        if (!getSpawnRot()
+            .equals(other.getSpawnRot())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -311,16 +307,16 @@ public final class HomeAnimalDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasSpawnRot()) {
-        hash = (37 * hash) + SPAWNROT_FIELD_NUMBER;
-        hash = (53 * hash) + getSpawnRot().hashCode();
-      }
       hash = (37 * hash) + FURNITURE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getFurnitureId();
       if (hasSpawnPos()) {
         hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getSpawnPos().hashCode();
       }
+      if (hasSpawnRot()) {
+        hash = (37 * hash) + SPAWN_ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getSpawnRot().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -417,10 +413,6 @@ public final class HomeAnimalDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IHNPIOGOGKD
-     * </pre>
-     *
      * Protobuf type {@code HomeAnimalData}
      */
     public static final class Builder extends
@@ -458,12 +450,6 @@ public final class HomeAnimalDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
-        } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
-        }
         furnitureId_ = 0;
 
         if (spawnPosBuilder_ == null) {
@@ -472,6 +458,12 @@ public final class HomeAnimalDataOuterClass {
           spawnPos_ = null;
           spawnPosBuilder_ = null;
         }
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
+        } else {
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
+        }
         return this;
       }
 
@@ -498,17 +490,17 @@ public final class HomeAnimalDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData buildPartial() {
         emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData result = new emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData(this);
-        if (spawnRotBuilder_ == null) {
-          result.spawnRot_ = spawnRot_;
-        } else {
-          result.spawnRot_ = spawnRotBuilder_.build();
-        }
         result.furnitureId_ = furnitureId_;
         if (spawnPosBuilder_ == null) {
           result.spawnPos_ = spawnPos_;
         } else {
           result.spawnPos_ = spawnPosBuilder_.build();
         }
+        if (spawnRotBuilder_ == null) {
+          result.spawnRot_ = spawnRot_;
+        } else {
+          result.spawnRot_ = spawnRotBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -557,15 +549,15 @@ public final class HomeAnimalDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData other) {
         if (other == emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.getDefaultInstance()) return this;
-        if (other.hasSpawnRot()) {
-          mergeSpawnRot(other.getSpawnRot());
-        }
         if (other.getFurnitureId() != 0) {
           setFurnitureId(other.getFurnitureId());
         }
         if (other.hasSpawnPos()) {
           mergeSpawnPos(other.getSpawnPos());
         }
+        if (other.hasSpawnRot()) {
+          mergeSpawnRot(other.getSpawnRot());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -595,128 +587,9 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       * @return Whether the spawnRot field is set.
-       */
-      public boolean hasSpawnRot() {
-        return spawnRotBuilder_ != null || spawnRot_ != null;
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       * @return The spawnRot.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        } else {
-          return spawnRotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          spawnRot_ = value;
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public Builder setSpawnRot(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = builderForValue.build();
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (spawnRot_ != null) {
-            spawnRot_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
-          } else {
-            spawnRot_ = value;
-          }
-          onChanged();
-        } else {
-          spawnRotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public Builder clearSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
-          onChanged();
-        } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
-        
-        onChanged();
-        return getSpawnRotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector spawnRot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-        if (spawnRotBuilder_ != null) {
-          return spawnRotBuilder_.getMessageOrBuilder();
-        } else {
-          return spawnRot_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 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> 
-          getSpawnRotFieldBuilder() {
-        if (spawnRotBuilder_ == null) {
-          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSpawnRot(),
-                  getParentForChildren(),
-                  isClean());
-          spawnRot_ = null;
-        }
-        return spawnRotBuilder_;
-      }
-
       private int furnitureId_ ;
       /**
-       * <code>uint32 furniture_id = 6;</code>
+       * <code>uint32 furniture_id = 5;</code>
        * @return The furnitureId.
        */
       @java.lang.Override
@@ -724,7 +597,7 @@ public final class HomeAnimalDataOuterClass {
         return furnitureId_;
       }
       /**
-       * <code>uint32 furniture_id = 6;</code>
+       * <code>uint32 furniture_id = 5;</code>
        * @param value The furnitureId to set.
        * @return This builder for chaining.
        */
@@ -735,7 +608,7 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 furniture_id = 6;</code>
+       * <code>uint32 furniture_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearFurnitureId() {
@@ -749,14 +622,14 @@ public final class HomeAnimalDataOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        * @return Whether the spawnPos field is set.
        */
       public boolean hasSpawnPos() {
         return spawnPosBuilder_ != null || spawnPos_ != null;
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        * @return The spawnPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -767,7 +640,7 @@ public final class HomeAnimalDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -783,7 +656,7 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder setSpawnPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -797,7 +670,7 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -815,7 +688,7 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder clearSpawnPos() {
         if (spawnPosBuilder_ == null) {
@@ -829,7 +702,7 @@ public final class HomeAnimalDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
         
@@ -837,7 +710,7 @@ public final class HomeAnimalDataOuterClass {
         return getSpawnPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
         if (spawnPosBuilder_ != null) {
@@ -848,7 +721,7 @@ public final class HomeAnimalDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 4;</code>
+       * <code>.Vector spawn_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> 
@@ -863,6 +736,125 @@ public final class HomeAnimalDataOuterClass {
         }
         return spawnPosBuilder_;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       * @return Whether the spawnRot field is set.
+       */
+      public boolean hasSpawnRot() {
+        return spawnRotBuilder_ != null || spawnRot_ != null;
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       * @return The spawnRot.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        } else {
+          return spawnRotBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          spawnRot_ = value;
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public Builder setSpawnRot(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = builderForValue.build();
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (spawnRot_ != null) {
+            spawnRot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
+          } else {
+            spawnRot_ = value;
+          }
+          onChanged();
+        } else {
+          spawnRotBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public Builder clearSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
+          onChanged();
+        } else {
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
+        
+        onChanged();
+        return getSpawnRotFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector spawn_rot = 15;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+        if (spawnRotBuilder_ != null) {
+          return spawnRotBuilder_.getMessageOrBuilder();
+        } else {
+          return spawnRot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 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> 
+          getSpawnRotFieldBuilder() {
+        if (spawnRotBuilder_ == null) {
+          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getSpawnRot(),
+                  getParentForChildren(),
+                  isClean());
+          spawnRot_ = null;
+        }
+        return spawnRotBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -930,11 +922,11 @@ public final class HomeAnimalDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024HomeAnimalData.proto\032\014Vector.proto\"]\n\016" +
-      "HomeAnimalData\022\031\n\010spawnRot\030\007 \001(\0132\007.Vecto" +
-      "r\022\024\n\014furniture_id\030\006 \001(\r\022\032\n\tspawn_pos\030\004 \001" +
-      "(\0132\007.VectorB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "\n\024HomeAnimalData.proto\032\014Vector.proto\"^\n\016" +
+      "HomeAnimalData\022\024\n\014furniture_id\030\005 \001(\r\022\032\n\t" +
+      "spawn_pos\030\014 \001(\0132\007.Vector\022\032\n\tspawn_rot\030\017 " +
+      "\001(\0132\007.VectorB\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -946,7 +938,7 @@ public final class HomeAnimalDataOuterClass {
     internal_static_HomeAnimalData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAnimalData_descriptor,
-        new java.lang.String[] { "SpawnRot", "FurnitureId", "SpawnPos", });
+        new java.lang.String[] { "FurnitureId", "SpawnPos", "SpawnRot", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarAllFinishRewardNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarAllFinishRewardNotifyOuterClass.java
index b6383137c..9f32e09ff 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarAllFinishRewardNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarAllFinishRewardNotifyOuterClass.java
@@ -19,28 +19,29 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @return A list containing the eventIdList.
      */
     java.util.List<java.lang.Integer> getEventIdListList();
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @return The count of eventIdList.
      */
     int getEventIdListCount();
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The eventIdList at the given index.
      */
     int getEventIdList(int index);
+
+    /**
+     * <code>bool PFOKFHLOKEJ = 11;</code>
+     * @return The pFOKFHLOKEJ.
+     */
+    boolean getPFOKFHLOKEJ();
   }
   /**
-   * <pre>
-   * CmdId: 9497
-   * Obf: PLHINAALPPO
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarAllFinishRewardNotify}
    */
   public static final class HomeAvatarAllFinishRewardNotify extends
@@ -87,7 +88,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 eventIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +96,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
               eventIdList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -108,6 +109,11 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 88: {
+
+              pFOKFHLOKEJ_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,10 +149,10 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
               emu.grasscutter.net.proto.HomeAvatarAllFinishRewardNotifyOuterClass.HomeAvatarAllFinishRewardNotify.class, emu.grasscutter.net.proto.HomeAvatarAllFinishRewardNotifyOuterClass.HomeAvatarAllFinishRewardNotify.Builder.class);
     }
 
-    public static final int EVENT_ID_LIST_FIELD_NUMBER = 12;
+    public static final int EVENT_ID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList eventIdList_;
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @return A list containing the eventIdList.
      */
     @java.lang.Override
@@ -155,14 +161,14 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
       return eventIdList_;
     }
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @return The count of eventIdList.
      */
     public int getEventIdListCount() {
       return eventIdList_.size();
     }
     /**
-     * <code>repeated uint32 event_id_list = 12;</code>
+     * <code>repeated uint32 event_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The eventIdList at the given index.
      */
@@ -171,6 +177,17 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
     }
     private int eventIdListMemoizedSerializedSize = -1;
 
+    public static final int PFOKFHLOKEJ_FIELD_NUMBER = 11;
+    private boolean pFOKFHLOKEJ_;
+    /**
+     * <code>bool PFOKFHLOKEJ = 11;</code>
+     * @return The pFOKFHLOKEJ.
+     */
+    @java.lang.Override
+    public boolean getPFOKFHLOKEJ() {
+      return pFOKFHLOKEJ_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -187,12 +204,15 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getEventIdListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(eventIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < eventIdList_.size(); i++) {
         output.writeUInt32NoTag(eventIdList_.getInt(i));
       }
+      if (pFOKFHLOKEJ_ != false) {
+        output.writeBool(11, pFOKFHLOKEJ_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -216,6 +236,10 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         }
         eventIdListMemoizedSerializedSize = dataSize;
       }
+      if (pFOKFHLOKEJ_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, pFOKFHLOKEJ_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -233,6 +257,8 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
 
       if (!getEventIdListList()
           .equals(other.getEventIdListList())) return false;
+      if (getPFOKFHLOKEJ()
+          != other.getPFOKFHLOKEJ()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -248,6 +274,9 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         hash = (37 * hash) + EVENT_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getEventIdListList().hashCode();
       }
+      hash = (37 * hash) + PFOKFHLOKEJ_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getPFOKFHLOKEJ());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +373,6 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9497
-     * Obf: PLHINAALPPO
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarAllFinishRewardNotify}
      */
     public static final class Builder extends
@@ -388,6 +412,8 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         super.clear();
         eventIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        pFOKFHLOKEJ_ = false;
+
         return this;
       }
 
@@ -420,6 +446,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.eventIdList_ = eventIdList_;
+        result.pFOKFHLOKEJ_ = pFOKFHLOKEJ_;
         onBuilt();
         return result;
       }
@@ -478,6 +505,9 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
           }
           onChanged();
         }
+        if (other.getPFOKFHLOKEJ() != false) {
+          setPFOKFHLOKEJ(other.getPFOKFHLOKEJ());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -516,7 +546,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @return A list containing the eventIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +555,14 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
                  java.util.Collections.unmodifiableList(eventIdList_) : eventIdList_;
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @return The count of eventIdList.
        */
       public int getEventIdListCount() {
         return eventIdList_.size();
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @param index The index of the element to return.
        * @return The eventIdList at the given index.
        */
@@ -540,7 +570,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         return eventIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The eventIdList to set.
        * @return This builder for chaining.
@@ -553,7 +583,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @param value The eventIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +594,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @param values The eventIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +607,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 event_id_list = 12;</code>
+       * <code>repeated uint32 event_id_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearEventIdList() {
@@ -586,6 +616,37 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean pFOKFHLOKEJ_ ;
+      /**
+       * <code>bool PFOKFHLOKEJ = 11;</code>
+       * @return The pFOKFHLOKEJ.
+       */
+      @java.lang.Override
+      public boolean getPFOKFHLOKEJ() {
+        return pFOKFHLOKEJ_;
+      }
+      /**
+       * <code>bool PFOKFHLOKEJ = 11;</code>
+       * @param value The pFOKFHLOKEJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPFOKFHLOKEJ(boolean value) {
+        
+        pFOKFHLOKEJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool PFOKFHLOKEJ = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPFOKFHLOKEJ() {
+        
+        pFOKFHLOKEJ_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -654,9 +715,9 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%HomeAvatarAllFinishRewardNotify.proto\"" +
-      "8\n\037HomeAvatarAllFinishRewardNotify\022\025\n\rev" +
-      "ent_id_list\030\014 \003(\rB\033\n\031emu.grasscutter.net" +
-      ".protob\006proto3"
+      "M\n\037HomeAvatarAllFinishRewardNotify\022\025\n\rev" +
+      "ent_id_list\030\001 \003(\r\022\023\n\013PFOKFHLOKEJ\030\013 \001(\010B\033" +
+      "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -667,7 +728,7 @@ public final class HomeAvatarAllFinishRewardNotifyOuterClass {
     internal_static_HomeAvatarAllFinishRewardNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarAllFinishRewardNotify_descriptor,
-        new java.lang.String[] { "EventIdList", });
+        new java.lang.String[] { "EventIdList", "PFOKFHLOKEJ", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarCostumeChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarCostumeChangeNotifyOuterClass.java
index 86a18b57e..0f93df782 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarCostumeChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarCostumeChangeNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 costume_id = 7;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     int getCostumeId();
 
     /**
-     * <code>uint32 avatar_id = 11;</code>
+     * <code>uint32 avatar_id = 15;</code>
      * @return The avatarId.
      */
     int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 28208
-   * Obf: BKMJMAFFLFP
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarCostumeChangeNotify}
    */
   public static final class HomeAvatarCostumeChangeNotify extends
@@ -80,12 +75,12 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 104: {
 
               costumeId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 120: {
 
               avatarId_ = input.readUInt32();
               break;
@@ -122,10 +117,10 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
               emu.grasscutter.net.proto.HomeAvatarCostumeChangeNotifyOuterClass.HomeAvatarCostumeChangeNotify.class, emu.grasscutter.net.proto.HomeAvatarCostumeChangeNotifyOuterClass.HomeAvatarCostumeChangeNotify.Builder.class);
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 7;
+    public static final int COSTUME_ID_FIELD_NUMBER = 13;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 7;</code>
+     * <code>uint32 costume_id = 13;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
       return costumeId_;
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 11;
+    public static final int AVATAR_ID_FIELD_NUMBER = 15;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 11;</code>
+     * <code>uint32 avatar_id = 15;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (costumeId_ != 0) {
-        output.writeUInt32(7, costumeId_);
+        output.writeUInt32(13, costumeId_);
       }
       if (avatarId_ != 0) {
-        output.writeUInt32(11, avatarId_);
+        output.writeUInt32(15, avatarId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
       size = 0;
       if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, costumeId_);
+          .computeUInt32Size(13, costumeId_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, avatarId_);
+          .computeUInt32Size(15, avatarId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28208
-     * Obf: BKMJMAFFLFP
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarCostumeChangeNotify}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 7;</code>
+       * <code>uint32 costume_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -501,7 +491,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
 
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 11;</code>
+       * <code>uint32 avatar_id = 15;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 11;</code>
+       * <code>uint32 avatar_id = 15;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 11;</code>
+       * <code>uint32 avatar_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -598,7 +588,7 @@ public final class HomeAvatarCostumeChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n#HomeAvatarCostumeChangeNotify.proto\"F\n" +
       "\035HomeAvatarCostumeChangeNotify\022\022\n\ncostum" +
-      "e_id\030\007 \001(\r\022\021\n\tavatar_id\030\013 \001(\rB\033\n\031emu.gra" +
+      "e_id\030\r \001(\r\022\021\n\tavatar_id\030\017 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetReqOuterClass.java
index fda875509..9684657ae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetReqOuterClass.java
@@ -19,23 +19,18 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_id = 9;</code>
-     * @return The avatarId.
-     */
-    int getAvatarId();
-
-    /**
-     * <code>uint32 event_id = 10;</code>
+     * <code>uint32 event_id = 13;</code>
      * @return The eventId.
      */
     int getEventId();
+
+    /**
+     * <code>uint32 avatar_id = 10;</code>
+     * @return The avatarId.
+     */
+    int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 26566
-   * Obf: BKHPKONPAPN
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarRewardEventGetReq}
    */
   public static final class HomeAvatarRewardEventGetReq extends
@@ -80,12 +75,12 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 80: {
 
               avatarId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 104: {
 
               eventId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
               emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq.class, emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq.Builder.class);
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 9;
-    private int avatarId_;
-    /**
-     * <code>uint32 avatar_id = 9;</code>
-     * @return The avatarId.
-     */
-    @java.lang.Override
-    public int getAvatarId() {
-      return avatarId_;
-    }
-
-    public static final int EVENT_ID_FIELD_NUMBER = 10;
+    public static final int EVENT_ID_FIELD_NUMBER = 13;
     private int eventId_;
     /**
-     * <code>uint32 event_id = 10;</code>
+     * <code>uint32 event_id = 13;</code>
      * @return The eventId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       return eventId_;
     }
 
+    public static final int AVATAR_ID_FIELD_NUMBER = 10;
+    private int avatarId_;
+    /**
+     * <code>uint32 avatar_id = 10;</code>
+     * @return The avatarId.
+     */
+    @java.lang.Override
+    public int getAvatarId() {
+      return avatarId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarId_ != 0) {
-        output.writeUInt32(9, avatarId_);
+        output.writeUInt32(10, avatarId_);
       }
       if (eventId_ != 0) {
-        output.writeUInt32(10, eventId_);
+        output.writeUInt32(13, eventId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       size = 0;
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, avatarId_);
+          .computeUInt32Size(10, avatarId_);
       }
       if (eventId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, eventId_);
+          .computeUInt32Size(13, eventId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq other = (emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq) obj;
 
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
       if (getEventId()
           != other.getEventId()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEventId();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26566
-     * Obf: BKHPKONPAPN
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarRewardEventGetReq}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarId_ = 0;
-
         eventId_ = 0;
 
+        avatarId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq result = new emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq(this);
-        result.avatarId_ = avatarId_;
         result.eventId_ = eventId_;
+        result.avatarId_ = avatarId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarRewardEventGetReqOuterClass.HomeAvatarRewardEventGetReq.getDefaultInstance()) return this;
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         if (other.getEventId() != 0) {
           setEventId(other.getEventId());
         }
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
         return this;
       }
 
-      private int avatarId_ ;
-      /**
-       * <code>uint32 avatar_id = 9;</code>
-       * @return The avatarId.
-       */
-      @java.lang.Override
-      public int getAvatarId() {
-        return avatarId_;
-      }
-      /**
-       * <code>uint32 avatar_id = 9;</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 = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarId() {
-        
-        avatarId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int eventId_ ;
       /**
-       * <code>uint32 event_id = 10;</code>
+       * <code>uint32 event_id = 13;</code>
        * @return The eventId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
         return eventId_;
       }
       /**
-       * <code>uint32 event_id = 10;</code>
+       * <code>uint32 event_id = 13;</code>
        * @param value The eventId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 event_id = 10;</code>
+       * <code>uint32 event_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEventId() {
@@ -529,6 +488,37 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int avatarId_ ;
+      /**
+       * <code>uint32 avatar_id = 10;</code>
+       * @return The avatarId.
+       */
+      @java.lang.Override
+      public int getAvatarId() {
+        return avatarId_;
+      }
+      /**
+       * <code>uint32 avatar_id = 10;</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 = 10;</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) {
@@ -597,8 +587,8 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!HomeAvatarRewardEventGetReq.proto\"B\n\033H" +
-      "omeAvatarRewardEventGetReq\022\021\n\tavatar_id\030" +
-      "\t \001(\r\022\020\n\010event_id\030\n \001(\rB\033\n\031emu.grasscutt" +
+      "omeAvatarRewardEventGetReq\022\020\n\010event_id\030\r" +
+      " \001(\r\022\021\n\tavatar_id\030\n \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class HomeAvatarRewardEventGetReqOuterClass {
     internal_static_HomeAvatarRewardEventGetReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarRewardEventGetReq_descriptor,
-        new java.lang.String[] { "AvatarId", "EventId", });
+        new java.lang.String[] { "EventId", "AvatarId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetRspOuterClass.java
index 29f39f7c5..5fc2cb80d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventGetRspOuterClass.java
@@ -19,47 +19,42 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>uint32 event_id = 2;</code>
+     * @return The eventId.
+     */
+    int getEventId();
+
+    /**
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getItemListList();
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
         int index);
 
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
-
-    /**
-     * <code>uint32 event_id = 13;</code>
-     * @return The eventId.
-     */
-    int getEventId();
   }
   /**
-   * <pre>
-   * CmdId: 25571
-   * Obf: BDMGFBJLCFC
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarRewardEventGetRsp}
    */
   public static final class HomeAvatarRewardEventGetRsp extends
@@ -106,17 +101,12 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 104: {
+            case 16: {
 
               eventId_ = input.readUInt32();
               break;
             }
-            case 122: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -125,6 +115,11 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
+            case 88: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,17 +155,28 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
               emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp.class, emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp.Builder.class);
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 15;
+    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 ITEM_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -178,21 +184,21 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
       return itemList_.get(index);
     }
     /**
-     * <code>repeated .ItemParam item_list = 15;</code>
+     * <code>repeated .ItemParam item_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -200,10 +206,10 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       return itemList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 10;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 10;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -211,17 +217,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       return retcode_;
     }
 
-    public static final int EVENT_ID_FIELD_NUMBER = 13;
-    private int eventId_;
-    /**
-     * <code>uint32 event_id = 13;</code>
-     * @return The eventId.
-     */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -236,14 +231,14 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
-      }
       if (eventId_ != 0) {
-        output.writeUInt32(13, eventId_);
+        output.writeUInt32(2, eventId_);
       }
       for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(15, itemList_.get(i));
+        output.writeMessage(10, itemList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(11, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -254,17 +249,17 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, retcode_);
-      }
       if (eventId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, eventId_);
+          .computeUInt32Size(2, eventId_);
       }
       for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, itemList_.get(i));
+          .computeMessageSize(10, itemList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(11, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -281,12 +276,12 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp other = (emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp) obj;
 
+      if (getEventId()
+          != other.getEventId()) return false;
       if (!getItemListList()
           .equals(other.getItemListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getEventId()
-          != other.getEventId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -298,14 +293,14 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEventId();
       if (getItemListCount() > 0) {
         hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemListList().hashCode();
       }
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEventId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,11 +397,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25571
-     * Obf: BDMGFBJLCFC
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarRewardEventGetRsp}
      */
     public static final class Builder extends
@@ -445,6 +435,8 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        eventId_ = 0;
+
         if (itemListBuilder_ == null) {
           itemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -453,8 +445,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
         retcode_ = 0;
 
-        eventId_ = 0;
-
         return this;
       }
 
@@ -482,6 +472,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       public emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp result = new emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp(this);
         int from_bitField0_ = bitField0_;
+        result.eventId_ = eventId_;
         if (itemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             itemList_ = java.util.Collections.unmodifiableList(itemList_);
@@ -492,7 +483,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
           result.itemList_ = itemListBuilder_.build();
         }
         result.retcode_ = retcode_;
-        result.eventId_ = eventId_;
         onBuilt();
         return result;
       }
@@ -541,6 +531,9 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarRewardEventGetRspOuterClass.HomeAvatarRewardEventGetRsp.getDefaultInstance()) return this;
+        if (other.getEventId() != 0) {
+          setEventId(other.getEventId());
+        }
         if (itemListBuilder_ == null) {
           if (!other.itemList_.isEmpty()) {
             if (itemList_.isEmpty()) {
@@ -570,9 +563,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getEventId() != 0) {
-          setEventId(other.getEventId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -603,6 +593,37 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
       }
       private int bitField0_;
 
+      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 java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_ =
         java.util.Collections.emptyList();
       private void ensureItemListIsMutable() {
@@ -616,7 +637,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -626,7 +647,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -636,7 +657,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -646,7 +667,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -663,7 +684,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -677,7 +698,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemListBuilder_ == null) {
@@ -693,7 +714,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -710,7 +731,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -724,7 +745,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -738,7 +759,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -753,7 +774,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -766,7 +787,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -779,14 +800,14 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
           int index) {
@@ -796,7 +817,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getItemListOrBuilderList() {
@@ -807,14 +828,14 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
           int index) {
@@ -822,7 +843,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_list = 15;</code>
+       * <code>repeated .ItemParam item_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getItemListBuilderList() {
@@ -845,7 +866,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -853,7 +874,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -864,7 +885,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 10;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -873,37 +894,6 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 13;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <code>uint32 event_id = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -973,8 +963,8 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n!HomeAvatarRewardEventGetRsp.proto\032\017Ite" +
       "mParam.proto\"_\n\033HomeAvatarRewardEventGet" +
-      "Rsp\022\035\n\titem_list\030\017 \003(\0132\n.ItemParam\022\017\n\007re" +
-      "tcode\030\n \001(\005\022\020\n\010event_id\030\r \001(\rB\033\n\031emu.gra" +
+      "Rsp\022\020\n\010event_id\030\002 \001(\r\022\035\n\titem_list\030\n \003(\013" +
+      "2\n.ItemParam\022\017\n\007retcode\030\013 \001(\005B\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -987,7 +977,7 @@ public final class HomeAvatarRewardEventGetRspOuterClass {
     internal_static_HomeAvatarRewardEventGetRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarRewardEventGetRsp_descriptor,
-        new java.lang.String[] { "ItemList", "Retcode", "EventId", });
+        new java.lang.String[] { "EventId", "ItemList", "Retcode", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventInfoOuterClass.java
index c441d34b5..8e4574d59 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 guid = 11;</code>
-     * @return The guid.
-     */
-    int getGuid();
-
-    /**
-     * <code>uint32 event_id = 8;</code>
-     * @return The eventId.
-     */
-    int getEventId();
-
-    /**
-     * <code>uint32 avatar_id = 5;</code>
+     * <code>uint32 avatar_id = 1;</code>
      * @return The avatarId.
      */
     int getAvatarId();
 
     /**
-     * <code>uint32 random_position = 1;</code>
+     * <code>uint32 suite_id = 7;</code>
+     * @return The suiteId.
+     */
+    int getSuiteId();
+
+    /**
+     * <code>uint32 guid = 8;</code>
+     * @return The guid.
+     */
+    int getGuid();
+
+    /**
+     * <code>uint32 random_position = 12;</code>
      * @return The randomPosition.
      */
     int getRandomPosition();
 
     /**
-     * <code>uint32 suite_id = 3;</code>
-     * @return The suiteId.
+     * <code>uint32 event_id = 15;</code>
+     * @return The eventId.
      */
-    int getSuiteId();
+    int getEventId();
   }
   /**
-   * <pre>
-   * Obf: HOLFHPKHFLL
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarRewardEventInfo}
    */
   public static final class HomeAvatarRewardEventInfo extends
@@ -99,27 +95,27 @@ public final class HomeAvatarRewardEventInfoOuterClass {
               break;
             case 8: {
 
-              randomPosition_ = input.readUInt32();
+              avatarId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 56: {
 
               suiteId_ = input.readUInt32();
               break;
             }
-            case 40: {
-
-              avatarId_ = input.readUInt32();
-              break;
-            }
             case 64: {
 
-              eventId_ = input.readUInt32();
+              guid_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 96: {
 
-              guid_ = input.readUInt32();
+              randomPosition_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              eventId_ = input.readUInt32();
               break;
             }
             default: {
@@ -154,32 +150,10 @@ public final class HomeAvatarRewardEventInfoOuterClass {
               emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.class, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 11;
-    private int guid_;
-    /**
-     * <code>uint32 guid = 11;</code>
-     * @return The guid.
-     */
-    @java.lang.Override
-    public int getGuid() {
-      return guid_;
-    }
-
-    public static final int EVENT_ID_FIELD_NUMBER = 8;
-    private int eventId_;
-    /**
-     * <code>uint32 event_id = 8;</code>
-     * @return The eventId.
-     */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
-    }
-
-    public static final int AVATAR_ID_FIELD_NUMBER = 5;
+    public static final int AVATAR_ID_FIELD_NUMBER = 1;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 5;</code>
+     * <code>uint32 avatar_id = 1;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -187,10 +161,32 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       return avatarId_;
     }
 
-    public static final int RANDOM_POSITION_FIELD_NUMBER = 1;
+    public static final int SUITE_ID_FIELD_NUMBER = 7;
+    private int suiteId_;
+    /**
+     * <code>uint32 suite_id = 7;</code>
+     * @return The suiteId.
+     */
+    @java.lang.Override
+    public int getSuiteId() {
+      return suiteId_;
+    }
+
+    public static final int GUID_FIELD_NUMBER = 8;
+    private int guid_;
+    /**
+     * <code>uint32 guid = 8;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public int getGuid() {
+      return guid_;
+    }
+
+    public static final int RANDOM_POSITION_FIELD_NUMBER = 12;
     private int randomPosition_;
     /**
-     * <code>uint32 random_position = 1;</code>
+     * <code>uint32 random_position = 12;</code>
      * @return The randomPosition.
      */
     @java.lang.Override
@@ -198,15 +194,15 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       return randomPosition_;
     }
 
-    public static final int SUITE_ID_FIELD_NUMBER = 3;
-    private int suiteId_;
+    public static final int EVENT_ID_FIELD_NUMBER = 15;
+    private int eventId_;
     /**
-     * <code>uint32 suite_id = 3;</code>
-     * @return The suiteId.
+     * <code>uint32 event_id = 15;</code>
+     * @return The eventId.
      */
     @java.lang.Override
-    public int getSuiteId() {
-      return suiteId_;
+    public int getEventId() {
+      return eventId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -223,20 +219,20 @@ public final class HomeAvatarRewardEventInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (randomPosition_ != 0) {
-        output.writeUInt32(1, randomPosition_);
+      if (avatarId_ != 0) {
+        output.writeUInt32(1, avatarId_);
       }
       if (suiteId_ != 0) {
-        output.writeUInt32(3, suiteId_);
-      }
-      if (avatarId_ != 0) {
-        output.writeUInt32(5, avatarId_);
-      }
-      if (eventId_ != 0) {
-        output.writeUInt32(8, eventId_);
+        output.writeUInt32(7, suiteId_);
       }
       if (guid_ != 0) {
-        output.writeUInt32(11, guid_);
+        output.writeUInt32(8, guid_);
+      }
+      if (randomPosition_ != 0) {
+        output.writeUInt32(12, randomPosition_);
+      }
+      if (eventId_ != 0) {
+        output.writeUInt32(15, eventId_);
       }
       unknownFields.writeTo(output);
     }
@@ -247,25 +243,25 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (randomPosition_ != 0) {
+      if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, randomPosition_);
+          .computeUInt32Size(1, avatarId_);
       }
       if (suiteId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, suiteId_);
-      }
-      if (avatarId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, avatarId_);
-      }
-      if (eventId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, eventId_);
+          .computeUInt32Size(7, suiteId_);
       }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, guid_);
+          .computeUInt32Size(8, guid_);
+      }
+      if (randomPosition_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, randomPosition_);
+      }
+      if (eventId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, eventId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -282,16 +278,16 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo other = (emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo) obj;
 
-      if (getGuid()
-          != other.getGuid()) return false;
-      if (getEventId()
-          != other.getEventId()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
-      if (getRandomPosition()
-          != other.getRandomPosition()) return false;
       if (getSuiteId()
           != other.getSuiteId()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
+      if (getRandomPosition()
+          != other.getRandomPosition()) return false;
+      if (getEventId()
+          != other.getEventId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -303,16 +299,16 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + getGuid();
-      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEventId();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
-      hash = (37 * hash) + RANDOM_POSITION_FIELD_NUMBER;
-      hash = (53 * hash) + getRandomPosition();
       hash = (37 * hash) + SUITE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSuiteId();
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + getGuid();
+      hash = (37 * hash) + RANDOM_POSITION_FIELD_NUMBER;
+      hash = (53 * hash) + getRandomPosition();
+      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEventId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -409,10 +405,6 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HOLFHPKHFLL
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarRewardEventInfo}
      */
     public static final class Builder extends
@@ -450,15 +442,15 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        guid_ = 0;
-
-        eventId_ = 0;
-
         avatarId_ = 0;
 
+        suiteId_ = 0;
+
+        guid_ = 0;
+
         randomPosition_ = 0;
 
-        suiteId_ = 0;
+        eventId_ = 0;
 
         return this;
       }
@@ -486,11 +478,11 @@ public final class HomeAvatarRewardEventInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo result = new emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo(this);
-        result.guid_ = guid_;
-        result.eventId_ = eventId_;
         result.avatarId_ = avatarId_;
-        result.randomPosition_ = randomPosition_;
         result.suiteId_ = suiteId_;
+        result.guid_ = guid_;
+        result.randomPosition_ = randomPosition_;
+        result.eventId_ = eventId_;
         onBuilt();
         return result;
       }
@@ -539,20 +531,20 @@ public final class HomeAvatarRewardEventInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.getDefaultInstance()) return this;
-        if (other.getGuid() != 0) {
-          setGuid(other.getGuid());
-        }
-        if (other.getEventId() != 0) {
-          setEventId(other.getEventId());
-        }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
+        if (other.getSuiteId() != 0) {
+          setSuiteId(other.getSuiteId());
+        }
+        if (other.getGuid() != 0) {
+          setGuid(other.getGuid());
+        }
         if (other.getRandomPosition() != 0) {
           setRandomPosition(other.getRandomPosition());
         }
-        if (other.getSuiteId() != 0) {
-          setSuiteId(other.getSuiteId());
+        if (other.getEventId() != 0) {
+          setEventId(other.getEventId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -583,71 +575,9 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return this;
       }
 
-      private int guid_ ;
-      /**
-       * <code>uint32 guid = 11;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public int getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint32 guid = 11;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(int value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 guid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 8;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 event_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 5;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -655,7 +585,7 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 5;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -666,7 +596,7 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 5;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -676,40 +606,9 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return this;
       }
 
-      private int randomPosition_ ;
-      /**
-       * <code>uint32 random_position = 1;</code>
-       * @return The randomPosition.
-       */
-      @java.lang.Override
-      public int getRandomPosition() {
-        return randomPosition_;
-      }
-      /**
-       * <code>uint32 random_position = 1;</code>
-       * @param value The randomPosition to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRandomPosition(int value) {
-        
-        randomPosition_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 random_position = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRandomPosition() {
-        
-        randomPosition_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int suiteId_ ;
       /**
-       * <code>uint32 suite_id = 3;</code>
+       * <code>uint32 suite_id = 7;</code>
        * @return The suiteId.
        */
       @java.lang.Override
@@ -717,7 +616,7 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return suiteId_;
       }
       /**
-       * <code>uint32 suite_id = 3;</code>
+       * <code>uint32 suite_id = 7;</code>
        * @param value The suiteId to set.
        * @return This builder for chaining.
        */
@@ -728,7 +627,7 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 suite_id = 3;</code>
+       * <code>uint32 suite_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSuiteId() {
@@ -737,6 +636,99 @@ public final class HomeAvatarRewardEventInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int guid_ ;
+      /**
+       * <code>uint32 guid = 8;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public int getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint32 guid = 8;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(int value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 guid = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int randomPosition_ ;
+      /**
+       * <code>uint32 random_position = 12;</code>
+       * @return The randomPosition.
+       */
+      @java.lang.Override
+      public int getRandomPosition() {
+        return randomPosition_;
+      }
+      /**
+       * <code>uint32 random_position = 12;</code>
+       * @param value The randomPosition to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRandomPosition(int value) {
+        
+        randomPosition_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 random_position = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRandomPosition() {
+        
+        randomPosition_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int eventId_ ;
+      /**
+       * <code>uint32 event_id = 15;</code>
+       * @return The eventId.
+       */
+      @java.lang.Override
+      public int getEventId() {
+        return eventId_;
+      }
+      /**
+       * <code>uint32 event_id = 15;</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 = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEventId() {
+        
+        eventId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -805,9 +797,9 @@ public final class HomeAvatarRewardEventInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037HomeAvatarRewardEventInfo.proto\"y\n\031Hom" +
-      "eAvatarRewardEventInfo\022\014\n\004guid\030\013 \001(\r\022\020\n\010" +
-      "event_id\030\010 \001(\r\022\021\n\tavatar_id\030\005 \001(\r\022\027\n\017ran" +
-      "dom_position\030\001 \001(\r\022\020\n\010suite_id\030\003 \001(\rB\033\n\031" +
+      "eAvatarRewardEventInfo\022\021\n\tavatar_id\030\001 \001(" +
+      "\r\022\020\n\010suite_id\030\007 \001(\r\022\014\n\004guid\030\010 \001(\r\022\027\n\017ran" +
+      "dom_position\030\014 \001(\r\022\020\n\010event_id\030\017 \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -819,7 +811,7 @@ public final class HomeAvatarRewardEventInfoOuterClass {
     internal_static_HomeAvatarRewardEventInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarRewardEventInfo_descriptor,
-        new java.lang.String[] { "Guid", "EventId", "AvatarId", "RandomPosition", "SuiteId", });
+        new java.lang.String[] { "AvatarId", "SuiteId", "Guid", "RandomPosition", "EventId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventNotifyOuterClass.java
index 452522df6..73f14d313 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarRewardEventNotifyOuterClass.java
@@ -18,6 +18,12 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:HomeAvatarRewardEventNotify)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>bool is_event_trigger = 1;</code>
+     * @return The isEventTrigger.
+     */
+    boolean getIsEventTrigger();
+
     /**
      * <code>.HomeAvatarRewardEventInfo reward_event = 4;</code>
      * @return Whether the rewardEvent field is set.
@@ -34,41 +40,30 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
     emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder getRewardEventOrBuilder();
 
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo> 
         getPendingListList();
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo getPendingList(int index);
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     int getPendingListCount();
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder> 
         getPendingListOrBuilderList();
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder getPendingListOrBuilder(
         int index);
-
-    /**
-     * <code>bool is_event_trigger = 7;</code>
-     * @return The isEventTrigger.
-     */
-    boolean getIsEventTrigger();
   }
   /**
-   * <pre>
-   * CmdId: 2640
-   * Obf: DCCPJJPIGAB
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarRewardEventNotify}
    */
   public static final class HomeAvatarRewardEventNotify extends
@@ -115,6 +110,11 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
             case 0:
               done = true;
               break;
+            case 8: {
+
+              isEventTrigger_ = input.readBool();
+              break;
+            }
             case 34: {
               emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder subBuilder = null;
               if (rewardEvent_ != null) {
@@ -128,12 +128,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
 
               break;
             }
-            case 56: {
-
-              isEventTrigger_ = input.readBool();
-              break;
-            }
-            case 98: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 pendingList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -177,6 +172,17 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
               emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify.class, emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify.Builder.class);
     }
 
+    public static final int IS_EVENT_TRIGGER_FIELD_NUMBER = 1;
+    private boolean isEventTrigger_;
+    /**
+     * <code>bool is_event_trigger = 1;</code>
+     * @return The isEventTrigger.
+     */
+    @java.lang.Override
+    public boolean getIsEventTrigger() {
+      return isEventTrigger_;
+    }
+
     public static final int REWARD_EVENT_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo rewardEvent_;
     /**
@@ -203,17 +209,17 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       return getRewardEvent();
     }
 
-    public static final int PENDING_LIST_FIELD_NUMBER = 12;
+    public static final int PENDING_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo> pendingList_;
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo> getPendingListList() {
       return pendingList_;
     }
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder> 
@@ -221,21 +227,21 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       return pendingList_;
     }
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     @java.lang.Override
     public int getPendingListCount() {
       return pendingList_.size();
     }
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo getPendingList(int index) {
       return pendingList_.get(index);
     }
     /**
-     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+     * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder getPendingListOrBuilder(
@@ -243,17 +249,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       return pendingList_.get(index);
     }
 
-    public static final int IS_EVENT_TRIGGER_FIELD_NUMBER = 7;
-    private boolean isEventTrigger_;
-    /**
-     * <code>bool is_event_trigger = 7;</code>
-     * @return The isEventTrigger.
-     */
-    @java.lang.Override
-    public boolean getIsEventTrigger() {
-      return isEventTrigger_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -268,14 +263,14 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (isEventTrigger_ != false) {
+        output.writeBool(1, isEventTrigger_);
+      }
       if (rewardEvent_ != null) {
         output.writeMessage(4, getRewardEvent());
       }
-      if (isEventTrigger_ != false) {
-        output.writeBool(7, isEventTrigger_);
-      }
       for (int i = 0; i < pendingList_.size(); i++) {
-        output.writeMessage(12, pendingList_.get(i));
+        output.writeMessage(6, pendingList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -286,17 +281,17 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isEventTrigger_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1, isEventTrigger_);
+      }
       if (rewardEvent_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getRewardEvent());
       }
-      if (isEventTrigger_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isEventTrigger_);
-      }
       for (int i = 0; i < pendingList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, pendingList_.get(i));
+          .computeMessageSize(6, pendingList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,6 +308,8 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify other = (emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify) obj;
 
+      if (getIsEventTrigger()
+          != other.getIsEventTrigger()) return false;
       if (hasRewardEvent() != other.hasRewardEvent()) return false;
       if (hasRewardEvent()) {
         if (!getRewardEvent()
@@ -320,8 +317,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       }
       if (!getPendingListList()
           .equals(other.getPendingListList())) return false;
-      if (getIsEventTrigger()
-          != other.getIsEventTrigger()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -333,6 +328,9 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_EVENT_TRIGGER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsEventTrigger());
       if (hasRewardEvent()) {
         hash = (37 * hash) + REWARD_EVENT_FIELD_NUMBER;
         hash = (53 * hash) + getRewardEvent().hashCode();
@@ -341,9 +339,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         hash = (37 * hash) + PENDING_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPendingListList().hashCode();
       }
-      hash = (37 * hash) + IS_EVENT_TRIGGER_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsEventTrigger());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -440,11 +435,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2640
-     * Obf: DCCPJJPIGAB
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarRewardEventNotify}
      */
     public static final class Builder extends
@@ -483,6 +473,8 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isEventTrigger_ = false;
+
         if (rewardEventBuilder_ == null) {
           rewardEvent_ = null;
         } else {
@@ -495,8 +487,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         } else {
           pendingListBuilder_.clear();
         }
-        isEventTrigger_ = false;
-
         return this;
       }
 
@@ -524,6 +514,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       public emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify result = new emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify(this);
         int from_bitField0_ = bitField0_;
+        result.isEventTrigger_ = isEventTrigger_;
         if (rewardEventBuilder_ == null) {
           result.rewardEvent_ = rewardEvent_;
         } else {
@@ -538,7 +529,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         } else {
           result.pendingList_ = pendingListBuilder_.build();
         }
-        result.isEventTrigger_ = isEventTrigger_;
         onBuilt();
         return result;
       }
@@ -587,6 +577,9 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarRewardEventNotifyOuterClass.HomeAvatarRewardEventNotify.getDefaultInstance()) return this;
+        if (other.getIsEventTrigger() != false) {
+          setIsEventTrigger(other.getIsEventTrigger());
+        }
         if (other.hasRewardEvent()) {
           mergeRewardEvent(other.getRewardEvent());
         }
@@ -616,9 +609,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
             }
           }
         }
-        if (other.getIsEventTrigger() != false) {
-          setIsEventTrigger(other.getIsEventTrigger());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -649,6 +639,37 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
       }
       private int bitField0_;
 
+      private boolean isEventTrigger_ ;
+      /**
+       * <code>bool is_event_trigger = 1;</code>
+       * @return The isEventTrigger.
+       */
+      @java.lang.Override
+      public boolean getIsEventTrigger() {
+        return isEventTrigger_;
+      }
+      /**
+       * <code>bool is_event_trigger = 1;</code>
+       * @param value The isEventTrigger to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsEventTrigger(boolean value) {
+        
+        isEventTrigger_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_event_trigger = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsEventTrigger() {
+        
+        isEventTrigger_ = false;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo rewardEvent_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder> rewardEventBuilder_;
@@ -781,7 +802,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
           emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder> pendingListBuilder_;
 
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo> getPendingListList() {
         if (pendingListBuilder_ == null) {
@@ -791,7 +812,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public int getPendingListCount() {
         if (pendingListBuilder_ == null) {
@@ -801,7 +822,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo getPendingList(int index) {
         if (pendingListBuilder_ == null) {
@@ -811,7 +832,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder setPendingList(
           int index, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo value) {
@@ -828,7 +849,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder setPendingList(
           int index, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder builderForValue) {
@@ -842,7 +863,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder addPendingList(emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo value) {
         if (pendingListBuilder_ == null) {
@@ -858,7 +879,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder addPendingList(
           int index, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo value) {
@@ -875,7 +896,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder addPendingList(
           emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder builderForValue) {
@@ -889,7 +910,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder addPendingList(
           int index, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder builderForValue) {
@@ -903,7 +924,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder addAllPendingList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo> values) {
@@ -918,7 +939,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder clearPendingList() {
         if (pendingListBuilder_ == null) {
@@ -931,7 +952,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public Builder removePendingList(int index) {
         if (pendingListBuilder_ == null) {
@@ -944,14 +965,14 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder getPendingListBuilder(
           int index) {
         return getPendingListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder getPendingListOrBuilder(
           int index) {
@@ -961,7 +982,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfoOrBuilder> 
            getPendingListOrBuilderList() {
@@ -972,14 +993,14 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder addPendingListBuilder() {
         return getPendingListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder addPendingListBuilder(
           int index) {
@@ -987,7 +1008,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
             index, emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 12;</code>
+       * <code>repeated .HomeAvatarRewardEventInfo pending_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.HomeAvatarRewardEventInfo.Builder> 
            getPendingListBuilderList() {
@@ -1007,37 +1028,6 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
         }
         return pendingListBuilder_;
       }
-
-      private boolean isEventTrigger_ ;
-      /**
-       * <code>bool is_event_trigger = 7;</code>
-       * @return The isEventTrigger.
-       */
-      @java.lang.Override
-      public boolean getIsEventTrigger() {
-        return isEventTrigger_;
-      }
-      /**
-       * <code>bool is_event_trigger = 7;</code>
-       * @param value The isEventTrigger to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsEventTrigger(boolean value) {
-        
-        isEventTrigger_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_event_trigger = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsEventTrigger() {
-        
-        isEventTrigger_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1107,10 +1097,10 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!HomeAvatarRewardEventNotify.proto\032\037Hom" +
       "eAvatarRewardEventInfo.proto\"\233\001\n\033HomeAva" +
-      "tarRewardEventNotify\0220\n\014reward_event\030\004 \001" +
-      "(\0132\032.HomeAvatarRewardEventInfo\0220\n\014pendin" +
-      "g_list\030\014 \003(\0132\032.HomeAvatarRewardEventInfo" +
-      "\022\030\n\020is_event_trigger\030\007 \001(\010B\033\n\031emu.grassc" +
+      "tarRewardEventNotify\022\030\n\020is_event_trigger" +
+      "\030\001 \001(\010\0220\n\014reward_event\030\004 \001(\0132\032.HomeAvata" +
+      "rRewardEventInfo\0220\n\014pending_list\030\006 \003(\0132\032" +
+      ".HomeAvatarRewardEventInfoB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1123,7 +1113,7 @@ public final class HomeAvatarRewardEventNotifyOuterClass {
     internal_static_HomeAvatarRewardEventNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarRewardEventNotify_descriptor,
-        new java.lang.String[] { "RewardEvent", "PendingList", "IsEventTrigger", });
+        new java.lang.String[] { "IsEventTrigger", "RewardEvent", "PendingList", });
     emu.grasscutter.net.proto.HomeAvatarRewardEventInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonAllEventNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonAllEventNotifyOuterClass.java
index 6b3c4a607..a4e4b54f8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonAllEventNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonAllEventNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo> 
         getSummonEventListList();
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo getSummonEventList(int index);
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     int getSummonEventListCount();
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder> 
         getSummonEventListOrBuilderList();
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder getSummonEventListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 6401
-   * Obf: BPCEHNJGDLB
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarSummonAllEventNotify}
    */
   public static final class HomeAvatarSummonAllEventNotify extends
@@ -94,7 +89,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 summonEventList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
               emu.grasscutter.net.proto.HomeAvatarSummonAllEventNotifyOuterClass.HomeAvatarSummonAllEventNotify.class, emu.grasscutter.net.proto.HomeAvatarSummonAllEventNotifyOuterClass.HomeAvatarSummonAllEventNotify.Builder.class);
     }
 
-    public static final int SUMMON_EVENT_LIST_FIELD_NUMBER = 15;
+    public static final int SUMMON_EVENT_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo> summonEventList_;
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo> getSummonEventListList() {
       return summonEventList_;
     }
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
       return summonEventList_;
     }
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     @java.lang.Override
     public int getSummonEventListCount() {
       return summonEventList_.size();
     }
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo getSummonEventList(int index) {
       return summonEventList_.get(index);
     }
     /**
-     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+     * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder getSummonEventListOrBuilder(
@@ -193,7 +188,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < summonEventList_.size(); i++) {
-        output.writeMessage(15, summonEventList_.get(i));
+        output.writeMessage(12, summonEventList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
       size = 0;
       for (int i = 0; i < summonEventList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, summonEventList_.get(i));
+          .computeMessageSize(12, summonEventList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6401
-     * Obf: BPCEHNJGDLB
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarSummonAllEventNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
           emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder> summonEventListBuilder_;
 
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo> getSummonEventListList() {
         if (summonEventListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public int getSummonEventListCount() {
         if (summonEventListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo getSummonEventList(int index) {
         if (summonEventListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder setSummonEventList(
           int index, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo value) {
@@ -585,7 +575,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder setSummonEventList(
           int index, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder addSummonEventList(emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo value) {
         if (summonEventListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder addSummonEventList(
           int index, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo value) {
@@ -632,7 +622,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder addSummonEventList(
           emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder addSummonEventList(
           int index, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder addAllSummonEventList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo> values) {
@@ -675,7 +665,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder clearSummonEventList() {
         if (summonEventListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public Builder removeSummonEventList(int index) {
         if (summonEventListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder getSummonEventListBuilder(
           int index) {
         return getSummonEventListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder getSummonEventListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfoOrBuilder> 
            getSummonEventListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder addSummonEventListBuilder() {
         return getSummonEventListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder addSummonEventListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
             index, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 15;</code>
+       * <code>repeated .HomeAvatarSummonEventInfo summon_event_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder> 
            getSummonEventListBuilderList() {
@@ -834,7 +824,7 @@ public final class HomeAvatarSummonAllEventNotifyOuterClass {
       "\n$HomeAvatarSummonAllEventNotify.proto\032\037" +
       "HomeAvatarSummonEventInfo.proto\"W\n\036HomeA" +
       "vatarSummonAllEventNotify\0225\n\021summon_even" +
-      "t_list\030\017 \003(\0132\032.HomeAvatarSummonEventInfo" +
+      "t_list\030\014 \003(\0132\032.HomeAvatarSummonEventInfo" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventInfoOuterClass.java
index e7998900a..b9369a5d8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventInfoOuterClass.java
@@ -19,46 +19,42 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 guid = 2;</code>
+     * <code>uint32 event_id = 2;</code>
+     * @return The eventId.
+     */
+    int getEventId();
+
+    /**
+     * <code>uint32 guid = 4;</code>
      * @return The guid.
      */
     int getGuid();
 
     /**
-     * <code>uint32 event_over_time = 4;</code>
+     * <code>uint32 event_over_time = 7;</code>
      * @return The eventOverTime.
      */
     int getEventOverTime();
 
-    /**
-     * <code>uint32 event_id = 6;</code>
-     * @return The eventId.
-     */
-    int getEventId();
-
     /**
      * <code>uint32 suit_id = 9;</code>
      * @return The suitId.
      */
     int getSuitId();
 
+    /**
+     * <code>uint32 random_position = 11;</code>
+     * @return The randomPosition.
+     */
+    int getRandomPosition();
+
     /**
      * <code>uint32 avatar_id = 14;</code>
      * @return The avatarId.
      */
     int getAvatarId();
-
-    /**
-     * <code>uint32 random_position = 12;</code>
-     * @return The randomPosition.
-     */
-    int getRandomPosition();
   }
   /**
-   * <pre>
-   * Obf: JMKEALMLNEH
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarSummonEventInfo}
    */
   public static final class HomeAvatarSummonEventInfo extends
@@ -105,17 +101,17 @@ public final class HomeAvatarSummonEventInfoOuterClass {
               break;
             case 16: {
 
-              guid_ = input.readUInt32();
+              eventId_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              eventOverTime_ = input.readUInt32();
+              guid_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 56: {
 
-              eventId_ = input.readUInt32();
+              eventOverTime_ = input.readUInt32();
               break;
             }
             case 72: {
@@ -123,7 +119,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
               suitId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
               randomPosition_ = input.readUInt32();
               break;
@@ -165,10 +161,21 @@ public final class HomeAvatarSummonEventInfoOuterClass {
               emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.class, emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 2;
+    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 GUID_FIELD_NUMBER = 4;
     private int guid_;
     /**
-     * <code>uint32 guid = 2;</code>
+     * <code>uint32 guid = 4;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -176,10 +183,10 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       return guid_;
     }
 
-    public static final int EVENT_OVER_TIME_FIELD_NUMBER = 4;
+    public static final int EVENT_OVER_TIME_FIELD_NUMBER = 7;
     private int eventOverTime_;
     /**
-     * <code>uint32 event_over_time = 4;</code>
+     * <code>uint32 event_over_time = 7;</code>
      * @return The eventOverTime.
      */
     @java.lang.Override
@@ -187,17 +194,6 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       return eventOverTime_;
     }
 
-    public static final int EVENT_ID_FIELD_NUMBER = 6;
-    private int eventId_;
-    /**
-     * <code>uint32 event_id = 6;</code>
-     * @return The eventId.
-     */
-    @java.lang.Override
-    public int getEventId() {
-      return eventId_;
-    }
-
     public static final int SUIT_ID_FIELD_NUMBER = 9;
     private int suitId_;
     /**
@@ -209,6 +205,17 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       return suitId_;
     }
 
+    public static final int RANDOM_POSITION_FIELD_NUMBER = 11;
+    private int randomPosition_;
+    /**
+     * <code>uint32 random_position = 11;</code>
+     * @return The randomPosition.
+     */
+    @java.lang.Override
+    public int getRandomPosition() {
+      return randomPosition_;
+    }
+
     public static final int AVATAR_ID_FIELD_NUMBER = 14;
     private int avatarId_;
     /**
@@ -220,17 +227,6 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       return avatarId_;
     }
 
-    public static final int RANDOM_POSITION_FIELD_NUMBER = 12;
-    private int randomPosition_;
-    /**
-     * <code>uint32 random_position = 12;</code>
-     * @return The randomPosition.
-     */
-    @java.lang.Override
-    public int getRandomPosition() {
-      return randomPosition_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -245,20 +241,20 @@ public final class HomeAvatarSummonEventInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (eventId_ != 0) {
+        output.writeUInt32(2, eventId_);
+      }
       if (guid_ != 0) {
-        output.writeUInt32(2, guid_);
+        output.writeUInt32(4, guid_);
       }
       if (eventOverTime_ != 0) {
-        output.writeUInt32(4, eventOverTime_);
-      }
-      if (eventId_ != 0) {
-        output.writeUInt32(6, eventId_);
+        output.writeUInt32(7, eventOverTime_);
       }
       if (suitId_ != 0) {
         output.writeUInt32(9, suitId_);
       }
       if (randomPosition_ != 0) {
-        output.writeUInt32(12, randomPosition_);
+        output.writeUInt32(11, randomPosition_);
       }
       if (avatarId_ != 0) {
         output.writeUInt32(14, avatarId_);
@@ -272,17 +268,17 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (eventId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, eventId_);
+      }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, guid_);
+          .computeUInt32Size(4, guid_);
       }
       if (eventOverTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, eventOverTime_);
-      }
-      if (eventId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, eventId_);
+          .computeUInt32Size(7, eventOverTime_);
       }
       if (suitId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -290,7 +286,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       }
       if (randomPosition_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, randomPosition_);
+          .computeUInt32Size(11, randomPosition_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -311,18 +307,18 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo other = (emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo) obj;
 
+      if (getEventId()
+          != other.getEventId()) return false;
       if (getGuid()
           != other.getGuid()) return false;
       if (getEventOverTime()
           != other.getEventOverTime()) return false;
-      if (getEventId()
-          != other.getEventId()) return false;
       if (getSuitId()
           != other.getSuitId()) return false;
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
       if (getRandomPosition()
           != other.getRandomPosition()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -334,18 +330,18 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEventId();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + getGuid();
       hash = (37 * hash) + EVENT_OVER_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEventOverTime();
-      hash = (37 * hash) + EVENT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEventId();
       hash = (37 * hash) + SUIT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSuitId();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + RANDOM_POSITION_FIELD_NUMBER;
       hash = (53 * hash) + getRandomPosition();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -442,10 +438,6 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JMKEALMLNEH
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarSummonEventInfo}
      */
     public static final class Builder extends
@@ -483,18 +475,18 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        eventId_ = 0;
+
         guid_ = 0;
 
         eventOverTime_ = 0;
 
-        eventId_ = 0;
-
         suitId_ = 0;
 
-        avatarId_ = 0;
-
         randomPosition_ = 0;
 
+        avatarId_ = 0;
+
         return this;
       }
 
@@ -521,12 +513,12 @@ public final class HomeAvatarSummonEventInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo result = new emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo(this);
+        result.eventId_ = eventId_;
         result.guid_ = guid_;
         result.eventOverTime_ = eventOverTime_;
-        result.eventId_ = eventId_;
         result.suitId_ = suitId_;
-        result.avatarId_ = avatarId_;
         result.randomPosition_ = randomPosition_;
+        result.avatarId_ = avatarId_;
         onBuilt();
         return result;
       }
@@ -575,24 +567,24 @@ public final class HomeAvatarSummonEventInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarSummonEventInfoOuterClass.HomeAvatarSummonEventInfo.getDefaultInstance()) return this;
+        if (other.getEventId() != 0) {
+          setEventId(other.getEventId());
+        }
         if (other.getGuid() != 0) {
           setGuid(other.getGuid());
         }
         if (other.getEventOverTime() != 0) {
           setEventOverTime(other.getEventOverTime());
         }
-        if (other.getEventId() != 0) {
-          setEventId(other.getEventId());
-        }
         if (other.getSuitId() != 0) {
           setSuitId(other.getSuitId());
         }
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         if (other.getRandomPosition() != 0) {
           setRandomPosition(other.getRandomPosition());
         }
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,9 +614,40 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         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 guid_ ;
       /**
-       * <code>uint32 guid = 2;</code>
+       * <code>uint32 guid = 4;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -632,7 +655,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return guid_;
       }
       /**
-       * <code>uint32 guid = 2;</code>
+       * <code>uint32 guid = 4;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -643,7 +666,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 guid = 2;</code>
+       * <code>uint32 guid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -655,7 +678,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
 
       private int eventOverTime_ ;
       /**
-       * <code>uint32 event_over_time = 4;</code>
+       * <code>uint32 event_over_time = 7;</code>
        * @return The eventOverTime.
        */
       @java.lang.Override
@@ -663,7 +686,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return eventOverTime_;
       }
       /**
-       * <code>uint32 event_over_time = 4;</code>
+       * <code>uint32 event_over_time = 7;</code>
        * @param value The eventOverTime to set.
        * @return This builder for chaining.
        */
@@ -674,7 +697,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 event_over_time = 4;</code>
+       * <code>uint32 event_over_time = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEventOverTime() {
@@ -684,37 +707,6 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return this;
       }
 
-      private int eventId_ ;
-      /**
-       * <code>uint32 event_id = 6;</code>
-       * @return The eventId.
-       */
-      @java.lang.Override
-      public int getEventId() {
-        return eventId_;
-      }
-      /**
-       * <code>uint32 event_id = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEventId() {
-        
-        eventId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int suitId_ ;
       /**
        * <code>uint32 suit_id = 9;</code>
@@ -746,6 +738,37 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         return this;
       }
 
+      private int randomPosition_ ;
+      /**
+       * <code>uint32 random_position = 11;</code>
+       * @return The randomPosition.
+       */
+      @java.lang.Override
+      public int getRandomPosition() {
+        return randomPosition_;
+      }
+      /**
+       * <code>uint32 random_position = 11;</code>
+       * @param value The randomPosition to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRandomPosition(int value) {
+        
+        randomPosition_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 random_position = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRandomPosition() {
+        
+        randomPosition_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int avatarId_ ;
       /**
        * <code>uint32 avatar_id = 14;</code>
@@ -776,37 +799,6 @@ public final class HomeAvatarSummonEventInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int randomPosition_ ;
-      /**
-       * <code>uint32 random_position = 12;</code>
-       * @return The randomPosition.
-       */
-      @java.lang.Override
-      public int getRandomPosition() {
-        return randomPosition_;
-      }
-      /**
-       * <code>uint32 random_position = 12;</code>
-       * @param value The randomPosition to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRandomPosition(int value) {
-        
-        randomPosition_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 random_position = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRandomPosition() {
-        
-        randomPosition_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -875,10 +867,10 @@ public final class HomeAvatarSummonEventInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037HomeAvatarSummonEventInfo.proto\"\221\001\n\031Ho" +
-      "meAvatarSummonEventInfo\022\014\n\004guid\030\002 \001(\r\022\027\n" +
-      "\017event_over_time\030\004 \001(\r\022\020\n\010event_id\030\006 \001(\r" +
-      "\022\017\n\007suit_id\030\t \001(\r\022\021\n\tavatar_id\030\016 \001(\r\022\027\n\017" +
-      "random_position\030\014 \001(\rB\033\n\031emu.grasscutter" +
+      "meAvatarSummonEventInfo\022\020\n\010event_id\030\002 \001(" +
+      "\r\022\014\n\004guid\030\004 \001(\r\022\027\n\017event_over_time\030\007 \001(\r" +
+      "\022\017\n\007suit_id\030\t \001(\r\022\027\n\017random_position\030\013 \001" +
+      "(\r\022\021\n\tavatar_id\030\016 \001(\rB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -890,7 +882,7 @@ public final class HomeAvatarSummonEventInfoOuterClass {
     internal_static_HomeAvatarSummonEventInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarSummonEventInfo_descriptor,
-        new java.lang.String[] { "Guid", "EventOverTime", "EventId", "SuitId", "AvatarId", "RandomPosition", });
+        new java.lang.String[] { "EventId", "Guid", "EventOverTime", "SuitId", "RandomPosition", "AvatarId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventReqOuterClass.java
index 4fc7a7fcc..a13bee97b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarSummonEventReqOuterClass.java
@@ -19,29 +19,24 @@ public final class HomeAvatarSummonEventReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_id = 4;</code>
-     * @return The avatarId.
+     * <code>uint32 guid = 6;</code>
+     * @return The guid.
      */
-    int getAvatarId();
+    int getGuid();
 
     /**
-     * <code>uint32 suit_id = 1;</code>
+     * <code>uint32 suit_id = 14;</code>
      * @return The suitId.
      */
     int getSuitId();
 
     /**
-     * <code>uint32 guid = 5;</code>
-     * @return The guid.
+     * <code>uint32 avatar_id = 3;</code>
+     * @return The avatarId.
      */
-    int getGuid();
+    int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 9238
-   * Obf: JIJKLANOOHE
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarSummonEventReq}
    */
   public static final class HomeAvatarSummonEventReq extends
@@ -86,21 +81,21 @@ public final class HomeAvatarSummonEventReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              suitId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
+            case 24: {
 
               avatarId_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 48: {
 
               guid_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              suitId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,21 @@ public final class HomeAvatarSummonEventReqOuterClass {
               emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq.class, emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq.Builder.class);
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 4;
-    private int avatarId_;
+    public static final int GUID_FIELD_NUMBER = 6;
+    private int guid_;
     /**
-     * <code>uint32 avatar_id = 4;</code>
-     * @return The avatarId.
+     * <code>uint32 guid = 6;</code>
+     * @return The guid.
      */
     @java.lang.Override
-    public int getAvatarId() {
-      return avatarId_;
+    public int getGuid() {
+      return guid_;
     }
 
-    public static final int SUIT_ID_FIELD_NUMBER = 1;
+    public static final int SUIT_ID_FIELD_NUMBER = 14;
     private int suitId_;
     /**
-     * <code>uint32 suit_id = 1;</code>
+     * <code>uint32 suit_id = 14;</code>
      * @return The suitId.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class HomeAvatarSummonEventReqOuterClass {
       return suitId_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 5;
-    private int guid_;
+    public static final int AVATAR_ID_FIELD_NUMBER = 3;
+    private int avatarId_;
     /**
-     * <code>uint32 guid = 5;</code>
-     * @return The guid.
+     * <code>uint32 avatar_id = 3;</code>
+     * @return The avatarId.
      */
     @java.lang.Override
-    public int getGuid() {
-      return guid_;
+    public int getAvatarId() {
+      return avatarId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +175,14 @@ public final class HomeAvatarSummonEventReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (suitId_ != 0) {
-        output.writeUInt32(1, suitId_);
-      }
       if (avatarId_ != 0) {
-        output.writeUInt32(4, avatarId_);
+        output.writeUInt32(3, avatarId_);
       }
       if (guid_ != 0) {
-        output.writeUInt32(5, guid_);
+        output.writeUInt32(6, guid_);
+      }
+      if (suitId_ != 0) {
+        output.writeUInt32(14, suitId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class HomeAvatarSummonEventReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (suitId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, suitId_);
-      }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, avatarId_);
+          .computeUInt32Size(3, avatarId_);
       }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, guid_);
+          .computeUInt32Size(6, guid_);
+      }
+      if (suitId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, suitId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class HomeAvatarSummonEventReqOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq other = (emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq) obj;
 
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
-      if (getSuitId()
-          != other.getSuitId()) return false;
       if (getGuid()
           != other.getGuid()) return false;
+      if (getSuitId()
+          != other.getSuitId()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class HomeAvatarSummonEventReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
-      hash = (37 * hash) + SUIT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSuitId();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + getGuid();
+      hash = (37 * hash) + SUIT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSuitId();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class HomeAvatarSummonEventReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9238
-     * Obf: JIJKLANOOHE
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarSummonEventReq}
      */
     public static final class Builder extends
@@ -386,11 +376,11 @@ public final class HomeAvatarSummonEventReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarId_ = 0;
+        guid_ = 0;
 
         suitId_ = 0;
 
-        guid_ = 0;
+        avatarId_ = 0;
 
         return this;
       }
@@ -418,9 +408,9 @@ public final class HomeAvatarSummonEventReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq result = new emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq(this);
-        result.avatarId_ = avatarId_;
-        result.suitId_ = suitId_;
         result.guid_ = guid_;
+        result.suitId_ = suitId_;
+        result.avatarId_ = avatarId_;
         onBuilt();
         return result;
       }
@@ -469,14 +459,14 @@ public final class HomeAvatarSummonEventReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarSummonEventReqOuterClass.HomeAvatarSummonEventReq.getDefaultInstance()) return this;
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
+        if (other.getGuid() != 0) {
+          setGuid(other.getGuid());
         }
         if (other.getSuitId() != 0) {
           setSuitId(other.getSuitId());
         }
-        if (other.getGuid() != 0) {
-          setGuid(other.getGuid());
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +497,9 @@ public final class HomeAvatarSummonEventReqOuterClass {
         return this;
       }
 
-      private int avatarId_ ;
-      /**
-       * <code>uint32 avatar_id = 4;</code>
-       * @return The avatarId.
-       */
-      @java.lang.Override
-      public int getAvatarId() {
-        return avatarId_;
-      }
-      /**
-       * <code>uint32 avatar_id = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarId() {
-        
-        avatarId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int suitId_ ;
-      /**
-       * <code>uint32 suit_id = 1;</code>
-       * @return The suitId.
-       */
-      @java.lang.Override
-      public int getSuitId() {
-        return suitId_;
-      }
-      /**
-       * <code>uint32 suit_id = 1;</code>
-       * @param value The suitId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSuitId(int value) {
-        
-        suitId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 suit_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSuitId() {
-        
-        suitId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int guid_ ;
       /**
-       * <code>uint32 guid = 5;</code>
+       * <code>uint32 guid = 6;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -579,7 +507,7 @@ public final class HomeAvatarSummonEventReqOuterClass {
         return guid_;
       }
       /**
-       * <code>uint32 guid = 5;</code>
+       * <code>uint32 guid = 6;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -590,7 +518,7 @@ public final class HomeAvatarSummonEventReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 guid = 5;</code>
+       * <code>uint32 guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -599,6 +527,68 @@ public final class HomeAvatarSummonEventReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int suitId_ ;
+      /**
+       * <code>uint32 suit_id = 14;</code>
+       * @return The suitId.
+       */
+      @java.lang.Override
+      public int getSuitId() {
+        return suitId_;
+      }
+      /**
+       * <code>uint32 suit_id = 14;</code>
+       * @param value The suitId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSuitId(int value) {
+        
+        suitId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 suit_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSuitId() {
+        
+        suitId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int avatarId_ ;
+      /**
+       * <code>uint32 avatar_id = 3;</code>
+       * @return The avatarId.
+       */
+      @java.lang.Override
+      public int getAvatarId() {
+        return avatarId_;
+      }
+      /**
+       * <code>uint32 avatar_id = 3;</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 = 3;</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 +657,8 @@ public final class HomeAvatarSummonEventReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036HomeAvatarSummonEventReq.proto\"L\n\030Home" +
-      "AvatarSummonEventReq\022\021\n\tavatar_id\030\004 \001(\r\022" +
-      "\017\n\007suit_id\030\001 \001(\r\022\014\n\004guid\030\005 \001(\rB\033\n\031emu.gr" +
+      "AvatarSummonEventReq\022\014\n\004guid\030\006 \001(\r\022\017\n\007su" +
+      "it_id\030\016 \001(\r\022\021\n\tavatar_id\030\003 \001(\rB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class HomeAvatarSummonEventReqOuterClass {
     internal_static_HomeAvatarSummonEventReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarSummonEventReq_descriptor,
-        new java.lang.String[] { "AvatarId", "SuitId", "Guid", });
+        new java.lang.String[] { "Guid", "SuitId", "AvatarId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoNotifyOuterClass.java
index 025d4e438..5da9bfe3a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoNotifyOuterClass.java
@@ -43,11 +43,6 @@ public final class HomeAvatarTalkFinishInfoNotifyOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 1817
-   * Obf: NBLCEJMJBPL
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarTalkFinishInfoNotify}
    */
   public static final class HomeAvatarTalkFinishInfoNotify extends
@@ -336,11 +331,6 @@ public final class HomeAvatarTalkFinishInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1817
-     * Obf: NBLCEJMJBPL
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarTalkFinishInfoNotify}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoOuterClass.java
index dbd1b34cd..4a50fa88b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkFinishInfoOuterClass.java
@@ -19,33 +19,29 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @return A list containing the finishTalkIdList.
      */
     java.util.List<java.lang.Integer> getFinishTalkIdListList();
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @return The count of finishTalkIdList.
      */
     int getFinishTalkIdListCount();
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The finishTalkIdList at the given index.
      */
     int getFinishTalkIdList(int index);
 
     /**
-     * <code>uint32 avatar_id = 8;</code>
+     * <code>uint32 avatar_id = 2;</code>
      * @return The avatarId.
      */
     int getAvatarId();
   }
   /**
-   * <pre>
-   * Obf: HLKGIAEKCLP
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarTalkFinishInfo}
    */
   public static final class HomeAvatarTalkFinishInfo extends
@@ -92,7 +88,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 finishTalkIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -100,7 +96,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
               finishTalkIdList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -113,7 +109,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 64: {
+            case 16: {
 
               avatarId_ = input.readUInt32();
               break;
@@ -153,10 +149,10 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
               emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.class, emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder.class);
     }
 
-    public static final int FINISH_TALK_ID_LIST_FIELD_NUMBER = 4;
+    public static final int FINISH_TALK_ID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList finishTalkIdList_;
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @return A list containing the finishTalkIdList.
      */
     @java.lang.Override
@@ -165,14 +161,14 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
       return finishTalkIdList_;
     }
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @return The count of finishTalkIdList.
      */
     public int getFinishTalkIdListCount() {
       return finishTalkIdList_.size();
     }
     /**
-     * <code>repeated uint32 finish_talk_id_list = 4;</code>
+     * <code>repeated uint32 finish_talk_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The finishTalkIdList at the given index.
      */
@@ -181,10 +177,10 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
     }
     private int finishTalkIdListMemoizedSerializedSize = -1;
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 8;
+    public static final int AVATAR_ID_FIELD_NUMBER = 2;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 8;</code>
+     * <code>uint32 avatar_id = 2;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -208,14 +204,14 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getFinishTalkIdListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(finishTalkIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishTalkIdList_.size(); i++) {
         output.writeUInt32NoTag(finishTalkIdList_.getInt(i));
       }
       if (avatarId_ != 0) {
-        output.writeUInt32(8, avatarId_);
+        output.writeUInt32(2, avatarId_);
       }
       unknownFields.writeTo(output);
     }
@@ -242,7 +238,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, avatarId_);
+          .computeUInt32Size(2, avatarId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -376,10 +372,6 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HLKGIAEKCLP
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarTalkFinishInfo}
      */
     public static final class Builder extends
@@ -553,7 +545,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @return A list containing the finishTalkIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -562,14 +554,14 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
                  java.util.Collections.unmodifiableList(finishTalkIdList_) : finishTalkIdList_;
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @return The count of finishTalkIdList.
        */
       public int getFinishTalkIdListCount() {
         return finishTalkIdList_.size();
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @param index The index of the element to return.
        * @return The finishTalkIdList at the given index.
        */
@@ -577,7 +569,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return finishTalkIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The finishTalkIdList to set.
        * @return This builder for chaining.
@@ -590,7 +582,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @param value The finishTalkIdList to add.
        * @return This builder for chaining.
        */
@@ -601,7 +593,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @param values The finishTalkIdList to add.
        * @return This builder for chaining.
        */
@@ -614,7 +606,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_talk_id_list = 4;</code>
+       * <code>repeated uint32 finish_talk_id_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishTalkIdList() {
@@ -626,7 +618,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
 
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 8;</code>
+       * <code>uint32 avatar_id = 2;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -634,7 +626,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 8;</code>
+       * <code>uint32 avatar_id = 2;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -645,7 +637,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 8;</code>
+       * <code>uint32 avatar_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -723,7 +715,7 @@ public final class HomeAvatarTalkFinishInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036HomeAvatarTalkFinishInfo.proto\"J\n\030Home" +
       "AvatarTalkFinishInfo\022\033\n\023finish_talk_id_l" +
-      "ist\030\004 \003(\r\022\021\n\tavatar_id\030\010 \001(\rB\033\n\031emu.gras" +
+      "ist\030\001 \003(\r\022\021\n\tavatar_id\030\002 \001(\rB\033\n\031emu.gras" +
       "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java
index 2e0be11bc..0b0320e4a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkReqOuterClass.java
@@ -19,23 +19,18 @@ public final class HomeAvatarTalkReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_id = 7;</code>
-     * @return The avatarId.
-     */
-    int getAvatarId();
-
-    /**
-     * <code>uint32 talk_id = 6;</code>
+     * <code>uint32 talk_id = 4;</code>
      * @return The talkId.
      */
     int getTalkId();
+
+    /**
+     * <code>uint32 avatar_id = 8;</code>
+     * @return The avatarId.
+     */
+    int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 22316
-   * Obf: APHEBEHHMEL
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarTalkReq}
    */
   public static final class HomeAvatarTalkReq extends
@@ -80,12 +75,12 @@ public final class HomeAvatarTalkReqOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 32: {
 
               talkId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 64: {
 
               avatarId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class HomeAvatarTalkReqOuterClass {
               emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq.class, emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq.Builder.class);
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 7;
-    private int avatarId_;
-    /**
-     * <code>uint32 avatar_id = 7;</code>
-     * @return The avatarId.
-     */
-    @java.lang.Override
-    public int getAvatarId() {
-      return avatarId_;
-    }
-
-    public static final int TALK_ID_FIELD_NUMBER = 6;
+    public static final int TALK_ID_FIELD_NUMBER = 4;
     private int talkId_;
     /**
-     * <code>uint32 talk_id = 6;</code>
+     * <code>uint32 talk_id = 4;</code>
      * @return The talkId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class HomeAvatarTalkReqOuterClass {
       return talkId_;
     }
 
+    public static final int AVATAR_ID_FIELD_NUMBER = 8;
+    private int avatarId_;
+    /**
+     * <code>uint32 avatar_id = 8;</code>
+     * @return The avatarId.
+     */
+    @java.lang.Override
+    public int getAvatarId() {
+      return avatarId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class HomeAvatarTalkReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (talkId_ != 0) {
-        output.writeUInt32(6, talkId_);
+        output.writeUInt32(4, talkId_);
       }
       if (avatarId_ != 0) {
-        output.writeUInt32(7, avatarId_);
+        output.writeUInt32(8, avatarId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class HomeAvatarTalkReqOuterClass {
       size = 0;
       if (talkId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, talkId_);
+          .computeUInt32Size(4, talkId_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, avatarId_);
+          .computeUInt32Size(8, avatarId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HomeAvatarTalkReqOuterClass {
       }
       emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq other = (emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq) obj;
 
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
       if (getTalkId()
           != other.getTalkId()) return false;
+      if (getAvatarId()
+          != other.getAvatarId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class HomeAvatarTalkReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + TALK_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTalkId();
+      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAvatarId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class HomeAvatarTalkReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22316
-     * Obf: APHEBEHHMEL
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarTalkReq}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class HomeAvatarTalkReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarId_ = 0;
-
         talkId_ = 0;
 
+        avatarId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class HomeAvatarTalkReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq buildPartial() {
         emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq result = new emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq(this);
-        result.avatarId_ = avatarId_;
         result.talkId_ = talkId_;
+        result.avatarId_ = avatarId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class HomeAvatarTalkReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq other) {
         if (other == emu.grasscutter.net.proto.HomeAvatarTalkReqOuterClass.HomeAvatarTalkReq.getDefaultInstance()) return this;
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         if (other.getTalkId() != 0) {
           setTalkId(other.getTalkId());
         }
+        if (other.getAvatarId() != 0) {
+          setAvatarId(other.getAvatarId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class HomeAvatarTalkReqOuterClass {
         return this;
       }
 
-      private int avatarId_ ;
-      /**
-       * <code>uint32 avatar_id = 7;</code>
-       * @return The avatarId.
-       */
-      @java.lang.Override
-      public int getAvatarId() {
-        return avatarId_;
-      }
-      /**
-       * <code>uint32 avatar_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarId() {
-        
-        avatarId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int talkId_ ;
       /**
-       * <code>uint32 talk_id = 6;</code>
+       * <code>uint32 talk_id = 4;</code>
        * @return The talkId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class HomeAvatarTalkReqOuterClass {
         return talkId_;
       }
       /**
-       * <code>uint32 talk_id = 6;</code>
+       * <code>uint32 talk_id = 4;</code>
        * @param value The talkId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class HomeAvatarTalkReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 talk_id = 6;</code>
+       * <code>uint32 talk_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTalkId() {
@@ -529,6 +488,37 @@ public final class HomeAvatarTalkReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int avatarId_ ;
+      /**
+       * <code>uint32 avatar_id = 8;</code>
+       * @return The avatarId.
+       */
+      @java.lang.Override
+      public int getAvatarId() {
+        return avatarId_;
+      }
+      /**
+       * <code>uint32 avatar_id = 8;</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 = 8;</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) {
@@ -597,7 +587,7 @@ public final class HomeAvatarTalkReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027HomeAvatarTalkReq.proto\"7\n\021HomeAvatarT" +
-      "alkReq\022\021\n\tavatar_id\030\007 \001(\r\022\017\n\007talk_id\030\006 \001" +
+      "alkReq\022\017\n\007talk_id\030\004 \001(\r\022\021\n\tavatar_id\030\010 \001" +
       "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -609,7 +599,7 @@ public final class HomeAvatarTalkReqOuterClass {
     internal_static_HomeAvatarTalkReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeAvatarTalkReq_descriptor,
-        new java.lang.String[] { "AvatarId", "TalkId", });
+        new java.lang.String[] { "TalkId", "AvatarId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkRspOuterClass.java
index 12e0aa0fa..4dc33c120 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeAvatarTalkRspOuterClass.java
@@ -19,32 +19,27 @@ public final class HomeAvatarTalkRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      * @return Whether the avatarTalkInfo field is set.
      */
     boolean hasAvatarTalkInfo();
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      * @return The avatarTalkInfo.
      */
     emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo getAvatarTalkInfo();
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      */
     emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfoOrBuilder getAvatarTalkInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 1147
-   * Obf: BMKBKBJBHLM
-   * </pre>
-   *
    * Protobuf type {@code HomeAvatarTalkRsp}
    */
   public static final class HomeAvatarTalkRsp extends
@@ -89,7 +84,12 @@ public final class HomeAvatarTalkRspOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 24: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 66: {
               emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder subBuilder = null;
               if (avatarTalkInfo_ != null) {
                 subBuilder = avatarTalkInfo_.toBuilder();
@@ -102,11 +102,6 @@ public final class HomeAvatarTalkRspOuterClass {
 
               break;
             }
-            case 120: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +134,10 @@ public final class HomeAvatarTalkRspOuterClass {
               emu.grasscutter.net.proto.HomeAvatarTalkRspOuterClass.HomeAvatarTalkRsp.class, emu.grasscutter.net.proto.HomeAvatarTalkRspOuterClass.HomeAvatarTalkRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -150,10 +145,10 @@ public final class HomeAvatarTalkRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_TALK_INFO_FIELD_NUMBER = 11;
+    public static final int AVATAR_TALK_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo avatarTalkInfo_;
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      * @return Whether the avatarTalkInfo field is set.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class HomeAvatarTalkRspOuterClass {
       return avatarTalkInfo_ != null;
     }
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      * @return The avatarTalkInfo.
      */
     @java.lang.Override
@@ -169,7 +164,7 @@ public final class HomeAvatarTalkRspOuterClass {
       return avatarTalkInfo_ == null ? emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.getDefaultInstance() : avatarTalkInfo_;
     }
     /**
-     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+     * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfoOrBuilder getAvatarTalkInfoOrBuilder() {
@@ -190,11 +185,11 @@ public final class HomeAvatarTalkRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarTalkInfo_ != null) {
-        output.writeMessage(11, getAvatarTalkInfo());
-      }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(3, retcode_);
+      }
+      if (avatarTalkInfo_ != null) {
+        output.writeMessage(8, getAvatarTalkInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class HomeAvatarTalkRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarTalkInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getAvatarTalkInfo());
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(3, retcode_);
+      }
+      if (avatarTalkInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getAvatarTalkInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class HomeAvatarTalkRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1147
-     * Obf: BMKBKBJBHLM
-     * </pre>
-     *
      * Protobuf type {@code HomeAvatarTalkRsp}
      */
     public static final class Builder extends
@@ -515,7 +505,7 @@ public final class HomeAvatarTalkRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -523,7 +513,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -534,7 +524,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -548,14 +538,14 @@ public final class HomeAvatarTalkRspOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo, emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder, emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfoOrBuilder> avatarTalkInfoBuilder_;
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        * @return Whether the avatarTalkInfo field is set.
        */
       public boolean hasAvatarTalkInfo() {
         return avatarTalkInfoBuilder_ != null || avatarTalkInfo_ != null;
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        * @return The avatarTalkInfo.
        */
       public emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo getAvatarTalkInfo() {
@@ -566,7 +556,7 @@ public final class HomeAvatarTalkRspOuterClass {
         }
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public Builder setAvatarTalkInfo(emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo value) {
         if (avatarTalkInfoBuilder_ == null) {
@@ -582,7 +572,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public Builder setAvatarTalkInfo(
           emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder builderForValue) {
@@ -596,7 +586,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public Builder mergeAvatarTalkInfo(emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo value) {
         if (avatarTalkInfoBuilder_ == null) {
@@ -614,7 +604,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public Builder clearAvatarTalkInfo() {
         if (avatarTalkInfoBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder getAvatarTalkInfoBuilder() {
         
@@ -636,7 +626,7 @@ public final class HomeAvatarTalkRspOuterClass {
         return getAvatarTalkInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfoOrBuilder getAvatarTalkInfoOrBuilder() {
         if (avatarTalkInfoBuilder_ != null) {
@@ -647,7 +637,7 @@ public final class HomeAvatarTalkRspOuterClass {
         }
       }
       /**
-       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 11;</code>
+       * <code>.HomeAvatarTalkFinishInfo avatar_talk_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo, emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfo.Builder, emu.grasscutter.net.proto.HomeAvatarTalkFinishInfoOuterClass.HomeAvatarTalkFinishInfoOrBuilder> 
@@ -731,7 +721,7 @@ public final class HomeAvatarTalkRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\027HomeAvatarTalkRsp.proto\032\036HomeAvatarTal" +
       "kFinishInfo.proto\"Y\n\021HomeAvatarTalkRsp\022\017" +
-      "\n\007retcode\030\017 \001(\005\0223\n\020avatar_talk_info\030\013 \001(" +
+      "\n\007retcode\030\003 \001(\005\0223\n\020avatar_talk_info\030\010 \001(" +
       "\0132\031.HomeAvatarTalkFinishInfoB\033\n\031emu.gras" +
       "scutter.net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoNotifyOuterClass.java
index 71b436751..1bf1a2044 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class HomeBasicInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      * @return Whether the basicInfo field is set.
      */
     boolean hasBasicInfo();
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      * @return The basicInfo.
      */
     emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo getBasicInfo();
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      */
     emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfoOrBuilder getBasicInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 4186
-   * Obf: NFPAMFOGOFB
-   * </pre>
-   *
    * Protobuf type {@code HomeBasicInfoNotify}
    */
   public static final class HomeBasicInfoNotify extends
@@ -83,7 +78,7 @@ public final class HomeBasicInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 66: {
               emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder subBuilder = null;
               if (basicInfo_ != null) {
                 subBuilder = basicInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class HomeBasicInfoNotifyOuterClass {
               emu.grasscutter.net.proto.HomeBasicInfoNotifyOuterClass.HomeBasicInfoNotify.class, emu.grasscutter.net.proto.HomeBasicInfoNotifyOuterClass.HomeBasicInfoNotify.Builder.class);
     }
 
-    public static final int BASIC_INFO_FIELD_NUMBER = 1;
+    public static final int BASIC_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo basicInfo_;
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      * @return Whether the basicInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class HomeBasicInfoNotifyOuterClass {
       return basicInfo_ != null;
     }
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      * @return The basicInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class HomeBasicInfoNotifyOuterClass {
       return basicInfo_ == null ? emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.getDefaultInstance() : basicInfo_;
     }
     /**
-     * <code>.HomeBasicInfo basic_info = 1;</code>
+     * <code>.HomeBasicInfo basic_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfoOrBuilder getBasicInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class HomeBasicInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (basicInfo_ != null) {
-        output.writeMessage(1, getBasicInfo());
+        output.writeMessage(8, getBasicInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class HomeBasicInfoNotifyOuterClass {
       size = 0;
       if (basicInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getBasicInfo());
+          .computeMessageSize(8, getBasicInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class HomeBasicInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4186
-     * Obf: NFPAMFOGOFB
-     * </pre>
-     *
      * Protobuf type {@code HomeBasicInfoNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class HomeBasicInfoNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo, emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder, emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfoOrBuilder> basicInfoBuilder_;
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        * @return Whether the basicInfo field is set.
        */
       public boolean hasBasicInfo() {
         return basicInfoBuilder_ != null || basicInfo_ != null;
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        * @return The basicInfo.
        */
       public emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo getBasicInfo() {
@@ -496,7 +486,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public Builder setBasicInfo(emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo value) {
         if (basicInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public Builder setBasicInfo(
           emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public Builder mergeBasicInfo(emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo value) {
         if (basicInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public Builder clearBasicInfo() {
         if (basicInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder getBasicInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         return getBasicInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfoOrBuilder getBasicInfoOrBuilder() {
         if (basicInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class HomeBasicInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.HomeBasicInfo basic_info = 1;</code>
+       * <code>.HomeBasicInfo basic_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo, emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder, emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfoOrBuilder> 
@@ -661,7 +651,7 @@ public final class HomeBasicInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031HomeBasicInfoNotify.proto\032\023HomeBasicIn" +
       "fo.proto\"9\n\023HomeBasicInfoNotify\022\"\n\nbasic" +
-      "_info\030\001 \001(\0132\016.HomeBasicInfoB\033\n\031emu.grass" +
+      "_info\030\010 \001(\0132\016.HomeBasicInfoB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
index 0d38ac20f..f0832421b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBasicInfoOuterClass.java
@@ -19,73 +19,79 @@ public final class HomeBasicInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 level = 11;</code>
-     * @return The level.
-     */
-    int getLevel();
-
-    /**
-     * <code>string owner_nick_name = 5;</code>
+     * <code>string owner_nick_name = 2;</code>
      * @return The ownerNickName.
      */
     java.lang.String getOwnerNickName();
     /**
-     * <code>string owner_nick_name = 5;</code>
+     * <code>string owner_nick_name = 2;</code>
      * @return The bytes for ownerNickName.
      */
     com.google.protobuf.ByteString
         getOwnerNickNameBytes();
 
     /**
-     * <code>bool is_in_edit_mode = 9;</code>
-     * @return The isInEditMode.
-     */
-    boolean getIsInEditMode();
-
-    /**
-     * <code>uint32 cur_room_scene_id = 13;</code>
-     * @return The curRoomSceneId.
-     */
-    int getCurRoomSceneId();
-
-    /**
-     * <code>uint32 cur_module_id = 8;</code>
-     * @return The curModuleId.
-     */
-    int getCurModuleId();
-
-    /**
-     * <code>uint64 exp = 10;</code>
+     * <code>uint64 exp = 4;</code>
      * @return The exp.
      */
     long getExp();
 
     /**
-     * <code>uint32 home_owner_uid = 14;</code>
+     * <pre>
+     * 13
+     * </pre>
+     *
+     * <code>uint32 cur_module_id = 7;</code>
+     * @return The curModuleId.
+     */
+    int getCurModuleId();
+
+    /**
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+     * @return Whether the limitedShopInfo field is set.
+     */
+    boolean hasLimitedShopInfo();
+    /**
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+     * @return The limitedShopInfo.
+     */
+    emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getLimitedShopInfo();
+    /**
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+     */
+    emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getLimitedShopInfoOrBuilder();
+
+    /**
+     * <code>uint32 level = 11;</code>
+     * @return The level.
+     */
+    int getLevel();
+
+    /**
+     * <code>uint32 home_owner_uid = 12;</code>
      * @return The homeOwnerUid.
      */
     int getHomeOwnerUid();
 
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-     * @return Whether the limitedShopInfo field is set.
+     * <code>uint32 FCMIKLCEAKA = 13;</code>
+     * @return The fCMIKLCEAKA.
      */
-    boolean hasLimitedShopInfo();
+    int getFCMIKLCEAKA();
+
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-     * @return The limitedShopInfo.
+     * <code>bool is_in_edit_mode = 14;</code>
+     * @return The isInEditMode.
      */
-    emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getLimitedShopInfo();
+    boolean getIsInEditMode();
+
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
+     * <code>uint32 cur_room_scene_id = 15;</code>
+     * @return The curRoomSceneId.
      */
-    emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getLimitedShopInfoOrBuilder();
+    int getCurRoomSceneId();
   }
   /**
-   * <pre>
-   * Obf: ICMPDPAEKNA
-   * </pre>
-   *
    * Protobuf type {@code HomeBasicInfo}
    */
   public static final class HomeBasicInfo extends
@@ -131,43 +137,23 @@ public final class HomeBasicInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
               ownerNickName_ = s;
               break;
             }
-            case 64: {
-
-              curModuleId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              isInEditMode_ = input.readBool();
-              break;
-            }
-            case 80: {
+            case 32: {
 
               exp_ = input.readUInt64();
               break;
             }
-            case 88: {
+            case 56: {
 
-              level_ = input.readUInt32();
+              curModuleId_ = input.readUInt32();
               break;
             }
-            case 104: {
-
-              curRoomSceneId_ = input.readUInt32();
-              break;
-            }
-            case 112: {
-
-              homeOwnerUid_ = input.readUInt32();
-              break;
-            }
-            case 122: {
+            case 74: {
               emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder subBuilder = null;
               if (limitedShopInfo_ != null) {
                 subBuilder = limitedShopInfo_.toBuilder();
@@ -180,6 +166,31 @@ public final class HomeBasicInfoOuterClass {
 
               break;
             }
+            case 88: {
+
+              level_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              homeOwnerUid_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              fCMIKLCEAKA_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+
+              isInEditMode_ = input.readBool();
+              break;
+            }
+            case 120: {
+
+              curRoomSceneId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -212,21 +223,10 @@ public final class HomeBasicInfoOuterClass {
               emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.class, emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.Builder.class);
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 11;
-    private int level_;
-    /**
-     * <code>uint32 level = 11;</code>
-     * @return The level.
-     */
-    @java.lang.Override
-    public int getLevel() {
-      return level_;
-    }
-
-    public static final int OWNER_NICK_NAME_FIELD_NUMBER = 5;
+    public static final int OWNER_NICK_NAME_FIELD_NUMBER = 2;
     private volatile java.lang.Object ownerNickName_;
     /**
-     * <code>string owner_nick_name = 5;</code>
+     * <code>string owner_nick_name = 2;</code>
      * @return The ownerNickName.
      */
     @java.lang.Override
@@ -243,7 +243,7 @@ public final class HomeBasicInfoOuterClass {
       }
     }
     /**
-     * <code>string owner_nick_name = 5;</code>
+     * <code>string owner_nick_name = 2;</code>
      * @return The bytes for ownerNickName.
      */
     @java.lang.Override
@@ -261,43 +261,10 @@ public final class HomeBasicInfoOuterClass {
       }
     }
 
-    public static final int IS_IN_EDIT_MODE_FIELD_NUMBER = 9;
-    private boolean isInEditMode_;
-    /**
-     * <code>bool is_in_edit_mode = 9;</code>
-     * @return The isInEditMode.
-     */
-    @java.lang.Override
-    public boolean getIsInEditMode() {
-      return isInEditMode_;
-    }
-
-    public static final int CUR_ROOM_SCENE_ID_FIELD_NUMBER = 13;
-    private int curRoomSceneId_;
-    /**
-     * <code>uint32 cur_room_scene_id = 13;</code>
-     * @return The curRoomSceneId.
-     */
-    @java.lang.Override
-    public int getCurRoomSceneId() {
-      return curRoomSceneId_;
-    }
-
-    public static final int CUR_MODULE_ID_FIELD_NUMBER = 8;
-    private int curModuleId_;
-    /**
-     * <code>uint32 cur_module_id = 8;</code>
-     * @return The curModuleId.
-     */
-    @java.lang.Override
-    public int getCurModuleId() {
-      return curModuleId_;
-    }
-
-    public static final int EXP_FIELD_NUMBER = 10;
+    public static final int EXP_FIELD_NUMBER = 4;
     private long exp_;
     /**
-     * <code>uint64 exp = 10;</code>
+     * <code>uint64 exp = 4;</code>
      * @return The exp.
      */
     @java.lang.Override
@@ -305,21 +272,25 @@ public final class HomeBasicInfoOuterClass {
       return exp_;
     }
 
-    public static final int HOME_OWNER_UID_FIELD_NUMBER = 14;
-    private int homeOwnerUid_;
+    public static final int CUR_MODULE_ID_FIELD_NUMBER = 7;
+    private int curModuleId_;
     /**
-     * <code>uint32 home_owner_uid = 14;</code>
-     * @return The homeOwnerUid.
+     * <pre>
+     * 13
+     * </pre>
+     *
+     * <code>uint32 cur_module_id = 7;</code>
+     * @return The curModuleId.
      */
     @java.lang.Override
-    public int getHomeOwnerUid() {
-      return homeOwnerUid_;
+    public int getCurModuleId() {
+      return curModuleId_;
     }
 
-    public static final int LIMITED_SHOP_INFO_FIELD_NUMBER = 15;
+    public static final int LIMITED_SHOP_INFO_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo limitedShopInfo_;
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
      * @return Whether the limitedShopInfo field is set.
      */
     @java.lang.Override
@@ -327,7 +298,7 @@ public final class HomeBasicInfoOuterClass {
       return limitedShopInfo_ != null;
     }
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
      * @return The limitedShopInfo.
      */
     @java.lang.Override
@@ -335,13 +306,68 @@ public final class HomeBasicInfoOuterClass {
       return limitedShopInfo_ == null ? emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : limitedShopInfo_;
     }
     /**
-     * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
+     * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getLimitedShopInfoOrBuilder() {
       return getLimitedShopInfo();
     }
 
+    public static final int LEVEL_FIELD_NUMBER = 11;
+    private int level_;
+    /**
+     * <code>uint32 level = 11;</code>
+     * @return The level.
+     */
+    @java.lang.Override
+    public int getLevel() {
+      return level_;
+    }
+
+    public static final int HOME_OWNER_UID_FIELD_NUMBER = 12;
+    private int homeOwnerUid_;
+    /**
+     * <code>uint32 home_owner_uid = 12;</code>
+     * @return The homeOwnerUid.
+     */
+    @java.lang.Override
+    public int getHomeOwnerUid() {
+      return homeOwnerUid_;
+    }
+
+    public static final int FCMIKLCEAKA_FIELD_NUMBER = 13;
+    private int fCMIKLCEAKA_;
+    /**
+     * <code>uint32 FCMIKLCEAKA = 13;</code>
+     * @return The fCMIKLCEAKA.
+     */
+    @java.lang.Override
+    public int getFCMIKLCEAKA() {
+      return fCMIKLCEAKA_;
+    }
+
+    public static final int IS_IN_EDIT_MODE_FIELD_NUMBER = 14;
+    private boolean isInEditMode_;
+    /**
+     * <code>bool is_in_edit_mode = 14;</code>
+     * @return The isInEditMode.
+     */
+    @java.lang.Override
+    public boolean getIsInEditMode() {
+      return isInEditMode_;
+    }
+
+    public static final int CUR_ROOM_SCENE_ID_FIELD_NUMBER = 15;
+    private int curRoomSceneId_;
+    /**
+     * <code>uint32 cur_room_scene_id = 15;</code>
+     * @return The curRoomSceneId.
+     */
+    @java.lang.Override
+    public int getCurRoomSceneId() {
+      return curRoomSceneId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -357,28 +383,31 @@ public final class HomeBasicInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ownerNickName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, ownerNickName_);
-      }
-      if (curModuleId_ != 0) {
-        output.writeUInt32(8, curModuleId_);
-      }
-      if (isInEditMode_ != false) {
-        output.writeBool(9, isInEditMode_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ownerNickName_);
       }
       if (exp_ != 0L) {
-        output.writeUInt64(10, exp_);
+        output.writeUInt64(4, exp_);
+      }
+      if (curModuleId_ != 0) {
+        output.writeUInt32(7, curModuleId_);
+      }
+      if (limitedShopInfo_ != null) {
+        output.writeMessage(9, getLimitedShopInfo());
       }
       if (level_ != 0) {
         output.writeUInt32(11, level_);
       }
-      if (curRoomSceneId_ != 0) {
-        output.writeUInt32(13, curRoomSceneId_);
-      }
       if (homeOwnerUid_ != 0) {
-        output.writeUInt32(14, homeOwnerUid_);
+        output.writeUInt32(12, homeOwnerUid_);
       }
-      if (limitedShopInfo_ != null) {
-        output.writeMessage(15, getLimitedShopInfo());
+      if (fCMIKLCEAKA_ != 0) {
+        output.writeUInt32(13, fCMIKLCEAKA_);
+      }
+      if (isInEditMode_ != false) {
+        output.writeBool(14, isInEditMode_);
+      }
+      if (curRoomSceneId_ != 0) {
+        output.writeUInt32(15, curRoomSceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -390,35 +419,39 @@ public final class HomeBasicInfoOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ownerNickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, ownerNickName_);
-      }
-      if (curModuleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, curModuleId_);
-      }
-      if (isInEditMode_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isInEditMode_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, ownerNickName_);
       }
       if (exp_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, exp_);
+          .computeUInt64Size(4, exp_);
+      }
+      if (curModuleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, curModuleId_);
+      }
+      if (limitedShopInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getLimitedShopInfo());
       }
       if (level_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(11, level_);
       }
-      if (curRoomSceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, curRoomSceneId_);
-      }
       if (homeOwnerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, homeOwnerUid_);
+          .computeUInt32Size(12, homeOwnerUid_);
       }
-      if (limitedShopInfo_ != null) {
+      if (fCMIKLCEAKA_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getLimitedShopInfo());
+          .computeUInt32Size(13, fCMIKLCEAKA_);
+      }
+      if (isInEditMode_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isInEditMode_);
+      }
+      if (curRoomSceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, curRoomSceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -435,25 +468,27 @@ public final class HomeBasicInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo other = (emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo) obj;
 
-      if (getLevel()
-          != other.getLevel()) return false;
       if (!getOwnerNickName()
           .equals(other.getOwnerNickName())) return false;
-      if (getIsInEditMode()
-          != other.getIsInEditMode()) return false;
-      if (getCurRoomSceneId()
-          != other.getCurRoomSceneId()) return false;
-      if (getCurModuleId()
-          != other.getCurModuleId()) return false;
       if (getExp()
           != other.getExp()) return false;
-      if (getHomeOwnerUid()
-          != other.getHomeOwnerUid()) return false;
+      if (getCurModuleId()
+          != other.getCurModuleId()) return false;
       if (hasLimitedShopInfo() != other.hasLimitedShopInfo()) return false;
       if (hasLimitedShopInfo()) {
         if (!getLimitedShopInfo()
             .equals(other.getLimitedShopInfo())) return false;
       }
+      if (getLevel()
+          != other.getLevel()) return false;
+      if (getHomeOwnerUid()
+          != other.getHomeOwnerUid()) return false;
+      if (getFCMIKLCEAKA()
+          != other.getFCMIKLCEAKA()) return false;
+      if (getIsInEditMode()
+          != other.getIsInEditMode()) return false;
+      if (getCurRoomSceneId()
+          != other.getCurRoomSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -465,26 +500,28 @@ public final class HomeBasicInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getLevel();
       hash = (37 * hash) + OWNER_NICK_NAME_FIELD_NUMBER;
       hash = (53 * hash) + getOwnerNickName().hashCode();
+      hash = (37 * hash) + EXP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getExp());
+      hash = (37 * hash) + CUR_MODULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurModuleId();
+      if (hasLimitedShopInfo()) {
+        hash = (37 * hash) + LIMITED_SHOP_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getLimitedShopInfo().hashCode();
+      }
+      hash = (37 * hash) + LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getLevel();
+      hash = (37 * hash) + HOME_OWNER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getHomeOwnerUid();
+      hash = (37 * hash) + FCMIKLCEAKA_FIELD_NUMBER;
+      hash = (53 * hash) + getFCMIKLCEAKA();
       hash = (37 * hash) + IS_IN_EDIT_MODE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsInEditMode());
       hash = (37 * hash) + CUR_ROOM_SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCurRoomSceneId();
-      hash = (37 * hash) + CUR_MODULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCurModuleId();
-      hash = (37 * hash) + EXP_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getExp());
-      hash = (37 * hash) + HOME_OWNER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getHomeOwnerUid();
-      if (hasLimitedShopInfo()) {
-        hash = (37 * hash) + LIMITED_SHOP_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getLimitedShopInfo().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -581,10 +618,6 @@ public final class HomeBasicInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ICMPDPAEKNA
-     * </pre>
-     *
      * Protobuf type {@code HomeBasicInfo}
      */
     public static final class Builder extends
@@ -622,19 +655,11 @@ public final class HomeBasicInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        level_ = 0;
-
         ownerNickName_ = "";
 
-        isInEditMode_ = false;
-
-        curRoomSceneId_ = 0;
-
-        curModuleId_ = 0;
-
         exp_ = 0L;
 
-        homeOwnerUid_ = 0;
+        curModuleId_ = 0;
 
         if (limitedShopInfoBuilder_ == null) {
           limitedShopInfo_ = null;
@@ -642,6 +667,16 @@ public final class HomeBasicInfoOuterClass {
           limitedShopInfo_ = null;
           limitedShopInfoBuilder_ = null;
         }
+        level_ = 0;
+
+        homeOwnerUid_ = 0;
+
+        fCMIKLCEAKA_ = 0;
+
+        isInEditMode_ = false;
+
+        curRoomSceneId_ = 0;
+
         return this;
       }
 
@@ -668,18 +703,19 @@ public final class HomeBasicInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo buildPartial() {
         emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo result = new emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo(this);
-        result.level_ = level_;
         result.ownerNickName_ = ownerNickName_;
-        result.isInEditMode_ = isInEditMode_;
-        result.curRoomSceneId_ = curRoomSceneId_;
-        result.curModuleId_ = curModuleId_;
         result.exp_ = exp_;
-        result.homeOwnerUid_ = homeOwnerUid_;
+        result.curModuleId_ = curModuleId_;
         if (limitedShopInfoBuilder_ == null) {
           result.limitedShopInfo_ = limitedShopInfo_;
         } else {
           result.limitedShopInfo_ = limitedShopInfoBuilder_.build();
         }
+        result.level_ = level_;
+        result.homeOwnerUid_ = homeOwnerUid_;
+        result.fCMIKLCEAKA_ = fCMIKLCEAKA_;
+        result.isInEditMode_ = isInEditMode_;
+        result.curRoomSceneId_ = curRoomSceneId_;
         onBuilt();
         return result;
       }
@@ -728,31 +764,34 @@ public final class HomeBasicInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo other) {
         if (other == emu.grasscutter.net.proto.HomeBasicInfoOuterClass.HomeBasicInfo.getDefaultInstance()) return this;
-        if (other.getLevel() != 0) {
-          setLevel(other.getLevel());
-        }
         if (!other.getOwnerNickName().isEmpty()) {
           ownerNickName_ = other.ownerNickName_;
           onChanged();
         }
+        if (other.getExp() != 0L) {
+          setExp(other.getExp());
+        }
+        if (other.getCurModuleId() != 0) {
+          setCurModuleId(other.getCurModuleId());
+        }
+        if (other.hasLimitedShopInfo()) {
+          mergeLimitedShopInfo(other.getLimitedShopInfo());
+        }
+        if (other.getLevel() != 0) {
+          setLevel(other.getLevel());
+        }
+        if (other.getHomeOwnerUid() != 0) {
+          setHomeOwnerUid(other.getHomeOwnerUid());
+        }
+        if (other.getFCMIKLCEAKA() != 0) {
+          setFCMIKLCEAKA(other.getFCMIKLCEAKA());
+        }
         if (other.getIsInEditMode() != false) {
           setIsInEditMode(other.getIsInEditMode());
         }
         if (other.getCurRoomSceneId() != 0) {
           setCurRoomSceneId(other.getCurRoomSceneId());
         }
-        if (other.getCurModuleId() != 0) {
-          setCurModuleId(other.getCurModuleId());
-        }
-        if (other.getExp() != 0L) {
-          setExp(other.getExp());
-        }
-        if (other.getHomeOwnerUid() != 0) {
-          setHomeOwnerUid(other.getHomeOwnerUid());
-        }
-        if (other.hasLimitedShopInfo()) {
-          mergeLimitedShopInfo(other.getLimitedShopInfo());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -782,6 +821,275 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
 
+      private java.lang.Object ownerNickName_ = "";
+      /**
+       * <code>string owner_nick_name = 2;</code>
+       * @return The ownerNickName.
+       */
+      public java.lang.String getOwnerNickName() {
+        java.lang.Object ref = ownerNickName_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          ownerNickName_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string owner_nick_name = 2;</code>
+       * @return The bytes for ownerNickName.
+       */
+      public com.google.protobuf.ByteString
+          getOwnerNickNameBytes() {
+        java.lang.Object ref = ownerNickName_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          ownerNickName_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string owner_nick_name = 2;</code>
+       * @param value The ownerNickName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnerNickName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        ownerNickName_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string owner_nick_name = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOwnerNickName() {
+        
+        ownerNickName_ = getDefaultInstance().getOwnerNickName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string owner_nick_name = 2;</code>
+       * @param value The bytes for ownerNickName to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOwnerNickNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        ownerNickName_ = value;
+        onChanged();
+        return this;
+      }
+
+      private long exp_ ;
+      /**
+       * <code>uint64 exp = 4;</code>
+       * @return The exp.
+       */
+      @java.lang.Override
+      public long getExp() {
+        return exp_;
+      }
+      /**
+       * <code>uint64 exp = 4;</code>
+       * @param value The exp to set.
+       * @return This builder for chaining.
+       */
+      public Builder setExp(long value) {
+        
+        exp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 exp = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearExp() {
+        
+        exp_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int curModuleId_ ;
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 cur_module_id = 7;</code>
+       * @return The curModuleId.
+       */
+      @java.lang.Override
+      public int getCurModuleId() {
+        return curModuleId_;
+      }
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 cur_module_id = 7;</code>
+       * @param value The curModuleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurModuleId(int value) {
+        
+        curModuleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 13
+       * </pre>
+       *
+       * <code>uint32 cur_module_id = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurModuleId() {
+        
+        curModuleId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo limitedShopInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> limitedShopInfoBuilder_;
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       * @return Whether the limitedShopInfo field is set.
+       */
+      public boolean hasLimitedShopInfo() {
+        return limitedShopInfoBuilder_ != null || limitedShopInfo_ != null;
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       * @return The limitedShopInfo.
+       */
+      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getLimitedShopInfo() {
+        if (limitedShopInfoBuilder_ == null) {
+          return limitedShopInfo_ == null ? emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : limitedShopInfo_;
+        } else {
+          return limitedShopInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public Builder setLimitedShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
+        if (limitedShopInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          limitedShopInfo_ = value;
+          onChanged();
+        } else {
+          limitedShopInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public Builder setLimitedShopInfo(
+          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder builderForValue) {
+        if (limitedShopInfoBuilder_ == null) {
+          limitedShopInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          limitedShopInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public Builder mergeLimitedShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
+        if (limitedShopInfoBuilder_ == null) {
+          if (limitedShopInfo_ != null) {
+            limitedShopInfo_ =
+              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.newBuilder(limitedShopInfo_).mergeFrom(value).buildPartial();
+          } else {
+            limitedShopInfo_ = value;
+          }
+          onChanged();
+        } else {
+          limitedShopInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public Builder clearLimitedShopInfo() {
+        if (limitedShopInfoBuilder_ == null) {
+          limitedShopInfo_ = null;
+          onChanged();
+        } else {
+          limitedShopInfo_ = null;
+          limitedShopInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder getLimitedShopInfoBuilder() {
+        
+        onChanged();
+        return getLimitedShopInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getLimitedShopInfoOrBuilder() {
+        if (limitedShopInfoBuilder_ != null) {
+          return limitedShopInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return limitedShopInfo_ == null ?
+              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : limitedShopInfo_;
+        }
+      }
+      /**
+       * <code>.HomeLimitedShopInfo limited_shop_info = 9;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> 
+          getLimitedShopInfoFieldBuilder() {
+        if (limitedShopInfoBuilder_ == null) {
+          limitedShopInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder>(
+                  getLimitedShopInfo(),
+                  getParentForChildren(),
+                  isClean());
+          limitedShopInfo_ = null;
+        }
+        return limitedShopInfoBuilder_;
+      }
+
       private int level_ ;
       /**
        * <code>uint32 level = 11;</code>
@@ -813,85 +1121,71 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
 
-      private java.lang.Object ownerNickName_ = "";
+      private int homeOwnerUid_ ;
       /**
-       * <code>string owner_nick_name = 5;</code>
-       * @return The ownerNickName.
+       * <code>uint32 home_owner_uid = 12;</code>
+       * @return The homeOwnerUid.
        */
-      public java.lang.String getOwnerNickName() {
-        java.lang.Object ref = ownerNickName_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          ownerNickName_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getHomeOwnerUid() {
+        return homeOwnerUid_;
       }
       /**
-       * <code>string owner_nick_name = 5;</code>
-       * @return The bytes for ownerNickName.
-       */
-      public com.google.protobuf.ByteString
-          getOwnerNickNameBytes() {
-        java.lang.Object ref = ownerNickName_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          ownerNickName_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string owner_nick_name = 5;</code>
-       * @param value The ownerNickName to set.
+       * <code>uint32 home_owner_uid = 12;</code>
+       * @param value The homeOwnerUid to set.
        * @return This builder for chaining.
        */
-      public Builder setOwnerNickName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        ownerNickName_ = value;
+      public Builder setHomeOwnerUid(int value) {
+        
+        homeOwnerUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string owner_nick_name = 5;</code>
+       * <code>uint32 home_owner_uid = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearOwnerNickName() {
+      public Builder clearHomeOwnerUid() {
         
-        ownerNickName_ = getDefaultInstance().getOwnerNickName();
+        homeOwnerUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int fCMIKLCEAKA_ ;
+      /**
+       * <code>uint32 FCMIKLCEAKA = 13;</code>
+       * @return The fCMIKLCEAKA.
+       */
+      @java.lang.Override
+      public int getFCMIKLCEAKA() {
+        return fCMIKLCEAKA_;
+      }
+      /**
+       * <code>uint32 FCMIKLCEAKA = 13;</code>
+       * @param value The fCMIKLCEAKA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFCMIKLCEAKA(int value) {
+        
+        fCMIKLCEAKA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string owner_nick_name = 5;</code>
-       * @param value The bytes for ownerNickName to set.
+       * <code>uint32 FCMIKLCEAKA = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder setOwnerNickNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+      public Builder clearFCMIKLCEAKA() {
         
-        ownerNickName_ = value;
+        fCMIKLCEAKA_ = 0;
         onChanged();
         return this;
       }
 
       private boolean isInEditMode_ ;
       /**
-       * <code>bool is_in_edit_mode = 9;</code>
+       * <code>bool is_in_edit_mode = 14;</code>
        * @return The isInEditMode.
        */
       @java.lang.Override
@@ -899,7 +1193,7 @@ public final class HomeBasicInfoOuterClass {
         return isInEditMode_;
       }
       /**
-       * <code>bool is_in_edit_mode = 9;</code>
+       * <code>bool is_in_edit_mode = 14;</code>
        * @param value The isInEditMode to set.
        * @return This builder for chaining.
        */
@@ -910,7 +1204,7 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_in_edit_mode = 9;</code>
+       * <code>bool is_in_edit_mode = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsInEditMode() {
@@ -922,7 +1216,7 @@ public final class HomeBasicInfoOuterClass {
 
       private int curRoomSceneId_ ;
       /**
-       * <code>uint32 cur_room_scene_id = 13;</code>
+       * <code>uint32 cur_room_scene_id = 15;</code>
        * @return The curRoomSceneId.
        */
       @java.lang.Override
@@ -930,7 +1224,7 @@ public final class HomeBasicInfoOuterClass {
         return curRoomSceneId_;
       }
       /**
-       * <code>uint32 cur_room_scene_id = 13;</code>
+       * <code>uint32 cur_room_scene_id = 15;</code>
        * @param value The curRoomSceneId to set.
        * @return This builder for chaining.
        */
@@ -941,7 +1235,7 @@ public final class HomeBasicInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_room_scene_id = 13;</code>
+       * <code>uint32 cur_room_scene_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurRoomSceneId() {
@@ -950,218 +1244,6 @@ public final class HomeBasicInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int curModuleId_ ;
-      /**
-       * <code>uint32 cur_module_id = 8;</code>
-       * @return The curModuleId.
-       */
-      @java.lang.Override
-      public int getCurModuleId() {
-        return curModuleId_;
-      }
-      /**
-       * <code>uint32 cur_module_id = 8;</code>
-       * @param value The curModuleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurModuleId(int value) {
-        
-        curModuleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_module_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurModuleId() {
-        
-        curModuleId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long exp_ ;
-      /**
-       * <code>uint64 exp = 10;</code>
-       * @return The exp.
-       */
-      @java.lang.Override
-      public long getExp() {
-        return exp_;
-      }
-      /**
-       * <code>uint64 exp = 10;</code>
-       * @param value The exp to set.
-       * @return This builder for chaining.
-       */
-      public Builder setExp(long value) {
-        
-        exp_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 exp = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearExp() {
-        
-        exp_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int homeOwnerUid_ ;
-      /**
-       * <code>uint32 home_owner_uid = 14;</code>
-       * @return The homeOwnerUid.
-       */
-      @java.lang.Override
-      public int getHomeOwnerUid() {
-        return homeOwnerUid_;
-      }
-      /**
-       * <code>uint32 home_owner_uid = 14;</code>
-       * @param value The homeOwnerUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHomeOwnerUid(int value) {
-        
-        homeOwnerUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 home_owner_uid = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHomeOwnerUid() {
-        
-        homeOwnerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo limitedShopInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> limitedShopInfoBuilder_;
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       * @return Whether the limitedShopInfo field is set.
-       */
-      public boolean hasLimitedShopInfo() {
-        return limitedShopInfoBuilder_ != null || limitedShopInfo_ != null;
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       * @return The limitedShopInfo.
-       */
-      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getLimitedShopInfo() {
-        if (limitedShopInfoBuilder_ == null) {
-          return limitedShopInfo_ == null ? emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : limitedShopInfo_;
-        } else {
-          return limitedShopInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public Builder setLimitedShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
-        if (limitedShopInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          limitedShopInfo_ = value;
-          onChanged();
-        } else {
-          limitedShopInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public Builder setLimitedShopInfo(
-          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder builderForValue) {
-        if (limitedShopInfoBuilder_ == null) {
-          limitedShopInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          limitedShopInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public Builder mergeLimitedShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
-        if (limitedShopInfoBuilder_ == null) {
-          if (limitedShopInfo_ != null) {
-            limitedShopInfo_ =
-              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.newBuilder(limitedShopInfo_).mergeFrom(value).buildPartial();
-          } else {
-            limitedShopInfo_ = value;
-          }
-          onChanged();
-        } else {
-          limitedShopInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public Builder clearLimitedShopInfo() {
-        if (limitedShopInfoBuilder_ == null) {
-          limitedShopInfo_ = null;
-          onChanged();
-        } else {
-          limitedShopInfo_ = null;
-          limitedShopInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder getLimitedShopInfoBuilder() {
-        
-        onChanged();
-        return getLimitedShopInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getLimitedShopInfoOrBuilder() {
-        if (limitedShopInfoBuilder_ != null) {
-          return limitedShopInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return limitedShopInfo_ == null ?
-              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : limitedShopInfo_;
-        }
-      }
-      /**
-       * <code>.HomeLimitedShopInfo limited_shop_info = 15;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> 
-          getLimitedShopInfoFieldBuilder() {
-        if (limitedShopInfoBuilder_ == null) {
-          limitedShopInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder>(
-                  getLimitedShopInfo(),
-                  getParentForChildren(),
-                  isClean());
-          limitedShopInfo_ = null;
-        }
-        return limitedShopInfoBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1230,13 +1312,14 @@ public final class HomeBasicInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023HomeBasicInfo.proto\032\031HomeLimitedShopIn" +
-      "fo.proto\"\330\001\n\rHomeBasicInfo\022\r\n\005level\030\013 \001(" +
-      "\r\022\027\n\017owner_nick_name\030\005 \001(\t\022\027\n\017is_in_edit" +
-      "_mode\030\t \001(\010\022\031\n\021cur_room_scene_id\030\r \001(\r\022\025" +
-      "\n\rcur_module_id\030\010 \001(\r\022\013\n\003exp\030\n \001(\004\022\026\n\016ho" +
-      "me_owner_uid\030\016 \001(\r\022/\n\021limited_shop_info\030" +
-      "\017 \001(\0132\024.HomeLimitedShopInfoB\033\n\031emu.grass" +
-      "cutter.net.protob\006proto3"
+      "fo.proto\"\355\001\n\rHomeBasicInfo\022\027\n\017owner_nick" +
+      "_name\030\002 \001(\t\022\013\n\003exp\030\004 \001(\004\022\025\n\rcur_module_i" +
+      "d\030\007 \001(\r\022/\n\021limited_shop_info\030\t \001(\0132\024.Hom" +
+      "eLimitedShopInfo\022\r\n\005level\030\013 \001(\r\022\026\n\016home_" +
+      "owner_uid\030\014 \001(\r\022\023\n\013FCMIKLCEAKA\030\r \001(\r\022\027\n\017" +
+      "is_in_edit_mode\030\016 \001(\010\022\031\n\021cur_room_scene_" +
+      "id\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1248,7 +1331,7 @@ public final class HomeBasicInfoOuterClass {
     internal_static_HomeBasicInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBasicInfo_descriptor,
-        new java.lang.String[] { "Level", "OwnerNickName", "IsInEditMode", "CurRoomSceneId", "CurModuleId", "Exp", "HomeOwnerUid", "LimitedShopInfo", });
+        new java.lang.String[] { "OwnerNickName", "Exp", "CurModuleId", "LimitedShopInfo", "Level", "HomeOwnerUid", "FCMIKLCEAKA", "IsInEditMode", "CurRoomSceneId", });
     emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
index 3d61bc31e..9d3a94033 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockArrangementInfoOuterClass.java
@@ -19,268 +19,264 @@ public final class HomeBlockArrangementInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> 
-        getDotPatternListList();
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index);
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    int getDotPatternListCount();
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
-        getDotPatternListOrBuilderList();
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
-        getDeployFurniureListList();
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index);
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    int getDeployFurniureListCount();
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getDeployFurniureListOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> 
-        getFurnitureSuiteListList();
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index);
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    int getFurnitureSuiteListCount();
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
-        getFurnitureSuiteListOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> 
-        getFurnitureCustomSuiteListList();
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index);
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    int getFurnitureCustomSuiteListCount();
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
-        getFurnitureCustomSuiteListOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 block_id = 8;</code>
-     * @return The blockId.
-     */
-    int getBlockId();
-
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> 
-        getFurnitureGroupListList();
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData getFurnitureGroupList(int index);
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    int getFurnitureGroupListCount();
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> 
-        getFurnitureGroupListOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder getFurnitureGroupListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> 
-        getDeployAnimalListList();
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData getDeployAnimalList(int index);
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    int getDeployAnimalListCount();
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> 
-        getDeployAnimalListOrBuilderList();
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder getDeployAnimalListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> 
-        getFieldListList();
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index);
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    int getFieldListCount();
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
-        getFieldListOrBuilderList();
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 comfort_value = 13;</code>
+     * <code>uint32 comfort_value = 1;</code>
      * @return The comfortValue.
      */
     int getComfortValue();
 
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
+        getDeployFurniureListList();
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index);
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    int getDeployFurniureListCount();
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getDeployFurniureListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> 
+        getDotPatternListList();
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index);
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    int getDotPatternListCount();
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
+        getDotPatternListOrBuilderList();
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
         getPersistentFurnitureListList();
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index);
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     int getPersistentFurnitureListCount();
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
         getPersistentFurnitureListOrBuilderList();
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
         int index);
 
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> 
+        getFurnitureGroupListList();
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData getFurnitureGroupList(int index);
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    int getFurnitureGroupListCount();
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> 
+        getFurnitureGroupListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder getFurnitureGroupListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> 
         getDeployNpcListList();
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData getDeployNpcList(int index);
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     int getDeployNpcListCount();
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
         getDeployNpcListOrBuilderList();
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder getDeployNpcListOrBuilder(
         int index);
 
     /**
-     * <code>bool is_unlocked = 6;</code>
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> 
+        getDeployAnimalListList();
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData getDeployAnimalList(int index);
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    int getDeployAnimalListCount();
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> 
+        getDeployAnimalListOrBuilderList();
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder getDeployAnimalListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> 
+        getFurnitureCustomSuiteListList();
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index);
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    int getFurnitureCustomSuiteListCount();
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
+        getFurnitureCustomSuiteListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> 
+        getFurnitureSuiteListList();
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index);
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    int getFurnitureSuiteListCount();
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
+        getFurnitureSuiteListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 block_id = 12;</code>
+     * @return The blockId.
+     */
+    int getBlockId();
+
+    /**
+     * <code>bool is_unlocked = 13;</code>
      * @return The isUnlocked.
      */
     boolean getIsUnlocked();
 
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> 
         getWeekendDjinnInfoListList();
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo getWeekendDjinnInfoList(int index);
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     int getWeekendDjinnInfoListCount();
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder> 
         getWeekendDjinnInfoListOrBuilderList();
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder getWeekendDjinnInfoListOrBuilder(
         int index);
+
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> 
+        getFieldListList();
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index);
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    int getFieldListCount();
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
+        getFieldListOrBuilderList();
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * Obf: KOODNOKODIG
-   * </pre>
-   *
    * Protobuf type {@code HomeBlockArrangementInfo}
    */
   public static final class HomeBlockArrangementInfo extends
@@ -293,16 +289,16 @@ public final class HomeBlockArrangementInfoOuterClass {
       super(builder);
     }
     private HomeBlockArrangementInfo() {
-      dotPatternList_ = java.util.Collections.emptyList();
       deployFurniureList_ = java.util.Collections.emptyList();
-      furnitureSuiteList_ = java.util.Collections.emptyList();
-      furnitureCustomSuiteList_ = java.util.Collections.emptyList();
-      furnitureGroupList_ = java.util.Collections.emptyList();
-      deployAnimalList_ = java.util.Collections.emptyList();
-      fieldList_ = java.util.Collections.emptyList();
+      dotPatternList_ = java.util.Collections.emptyList();
       persistentFurnitureList_ = java.util.Collections.emptyList();
+      furnitureGroupList_ = java.util.Collections.emptyList();
       deployNpcList_ = java.util.Collections.emptyList();
+      deployAnimalList_ = java.util.Collections.emptyList();
+      furnitureCustomSuiteList_ = java.util.Collections.emptyList();
+      furnitureSuiteList_ = java.util.Collections.emptyList();
       weekendDjinnInfoList_ = java.util.Collections.emptyList();
+      fieldList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -336,103 +332,57 @@ public final class HomeBlockArrangementInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                dotPatternList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              dotPatternList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.parser(), extensionRegistry));
+            case 8: {
+
+              comfortValue_ = input.readUInt32();
               break;
             }
             case 18: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                furnitureCustomSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData>();
-                mutable_bitField0_ |= 0x00000008;
-              }
-              furnitureCustomSuiteList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.parser(), extensionRegistry));
-              break;
-            }
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000200) != 0)) {
-                weekendDjinnInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo>();
-                mutable_bitField0_ |= 0x00000200;
-              }
-              weekendDjinnInfoList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                furnitureGroupList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData>();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              furnitureGroupList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.parser(), extensionRegistry));
-              break;
-            }
-            case 48: {
-
-              isUnlocked_ = input.readBool();
-              break;
-            }
-            case 64: {
-
-              blockId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
-                deployNpcList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData>();
-                mutable_bitField0_ |= 0x00000100;
-              }
-              deployNpcList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.parser(), extensionRegistry));
-              break;
-            }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
-                persistentFurnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
-                mutable_bitField0_ |= 0x00000080;
-              }
-              persistentFurnitureList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
-              break;
-            }
-            case 90: {
-              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
-                fieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData>();
-                mutable_bitField0_ |= 0x00000040;
-              }
-              fieldList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.parser(), extensionRegistry));
-              break;
-            }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 deployFurniureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               deployFurniureList_.add(
                   input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
-            case 104: {
-
-              comfortValue_ = input.readUInt32();
+            case 26: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                dotPatternList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              dotPatternList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.parser(), extensionRegistry));
               break;
             }
-            case 114: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                furnitureSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData>();
+                persistentFurnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
                 mutable_bitField0_ |= 0x00000004;
               }
-              furnitureSuiteList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.parser(), extensionRegistry));
+              persistentFurnitureList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
-            case 122: {
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                furnitureGroupList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData>();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              furnitureGroupList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.parser(), extensionRegistry));
+              break;
+            }
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                deployNpcList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData>();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              deployNpcList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.parser(), extensionRegistry));
+              break;
+            }
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000020) != 0)) {
                 deployAnimalList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData>();
                 mutable_bitField0_ |= 0x00000020;
@@ -441,6 +391,52 @@ public final class HomeBlockArrangementInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.parser(), extensionRegistry));
               break;
             }
+            case 82: {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                furnitureCustomSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData>();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              furnitureCustomSuiteList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.parser(), extensionRegistry));
+              break;
+            }
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+                furnitureSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData>();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              furnitureSuiteList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.parser(), extensionRegistry));
+              break;
+            }
+            case 96: {
+
+              blockId_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              isUnlocked_ = input.readBool();
+              break;
+            }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
+                weekendDjinnInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo>();
+                mutable_bitField0_ |= 0x00000100;
+              }
+              weekendDjinnInfoList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 122: {
+              if (!((mutable_bitField0_ & 0x00000200) != 0)) {
+                fieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData>();
+                mutable_bitField0_ |= 0x00000200;
+              }
+              fieldList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -457,35 +453,35 @@ public final class HomeBlockArrangementInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          dotPatternList_ = java.util.Collections.unmodifiableList(dotPatternList_);
-        }
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          furnitureCustomSuiteList_ = java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
-        }
-        if (((mutable_bitField0_ & 0x00000200) != 0)) {
-          weekendDjinnInfoList_ = java.util.Collections.unmodifiableList(weekendDjinnInfoList_);
-        }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          furnitureGroupList_ = java.util.Collections.unmodifiableList(furnitureGroupList_);
-        }
-        if (((mutable_bitField0_ & 0x00000100) != 0)) {
-          deployNpcList_ = java.util.Collections.unmodifiableList(deployNpcList_);
-        }
-        if (((mutable_bitField0_ & 0x00000080) != 0)) {
-          persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
-        }
-        if (((mutable_bitField0_ & 0x00000040) != 0)) {
-          fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          dotPatternList_ = java.util.Collections.unmodifiableList(dotPatternList_);
+        }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          furnitureSuiteList_ = java.util.Collections.unmodifiableList(furnitureSuiteList_);
+          persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
+        }
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          furnitureGroupList_ = java.util.Collections.unmodifiableList(furnitureGroupList_);
+        }
+        if (((mutable_bitField0_ & 0x00000010) != 0)) {
+          deployNpcList_ = java.util.Collections.unmodifiableList(deployNpcList_);
         }
         if (((mutable_bitField0_ & 0x00000020) != 0)) {
           deployAnimalList_ = java.util.Collections.unmodifiableList(deployAnimalList_);
         }
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          furnitureCustomSuiteList_ = java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
+        }
+        if (((mutable_bitField0_ & 0x00000080) != 0)) {
+          furnitureSuiteList_ = java.util.Collections.unmodifiableList(furnitureSuiteList_);
+        }
+        if (((mutable_bitField0_ & 0x00000100) != 0)) {
+          weekendDjinnInfoList_ = java.util.Collections.unmodifiableList(weekendDjinnInfoList_);
+        }
+        if (((mutable_bitField0_ & 0x00000200) != 0)) {
+          fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -503,301 +499,10 @@ public final class HomeBlockArrangementInfoOuterClass {
               emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.class, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder.class);
     }
 
-    public static final int DOT_PATTERN_LIST_FIELD_NUMBER = 1;
-    private java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> dotPatternList_;
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> getDotPatternListList() {
-      return dotPatternList_;
-    }
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
-        getDotPatternListOrBuilderList() {
-      return dotPatternList_;
-    }
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    @java.lang.Override
-    public int getDotPatternListCount() {
-      return dotPatternList_.size();
-    }
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index) {
-      return dotPatternList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
-        int index) {
-      return dotPatternList_.get(index);
-    }
-
-    public static final int DEPLOYFURNIURELIST_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> deployFurniureList_;
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getDeployFurniureListList() {
-      return deployFurniureList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getDeployFurniureListOrBuilderList() {
-      return deployFurniureList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    @java.lang.Override
-    public int getDeployFurniureListCount() {
-      return deployFurniureList_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
-      return deployFurniureList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
-        int index) {
-      return deployFurniureList_.get(index);
-    }
-
-    public static final int FURNITURE_SUITE_LIST_FIELD_NUMBER = 14;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> furnitureSuiteList_;
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> getFurnitureSuiteListList() {
-      return furnitureSuiteList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
-        getFurnitureSuiteListOrBuilderList() {
-      return furnitureSuiteList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    @java.lang.Override
-    public int getFurnitureSuiteListCount() {
-      return furnitureSuiteList_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index) {
-      return furnitureSuiteList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
-        int index) {
-      return furnitureSuiteList_.get(index);
-    }
-
-    public static final int FURNITURE_CUSTOM_SUITE_LIST_FIELD_NUMBER = 2;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> furnitureCustomSuiteList_;
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> getFurnitureCustomSuiteListList() {
-      return furnitureCustomSuiteList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
-        getFurnitureCustomSuiteListOrBuilderList() {
-      return furnitureCustomSuiteList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    @java.lang.Override
-    public int getFurnitureCustomSuiteListCount() {
-      return furnitureCustomSuiteList_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index) {
-      return furnitureCustomSuiteList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
-        int index) {
-      return furnitureCustomSuiteList_.get(index);
-    }
-
-    public static final int BLOCK_ID_FIELD_NUMBER = 8;
-    private int blockId_;
-    /**
-     * <code>uint32 block_id = 8;</code>
-     * @return The blockId.
-     */
-    @java.lang.Override
-    public int getBlockId() {
-      return blockId_;
-    }
-
-    public static final int FURNITURE_GROUP_LIST_FIELD_NUMBER = 4;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> furnitureGroupList_;
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> getFurnitureGroupListList() {
-      return furnitureGroupList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> 
-        getFurnitureGroupListOrBuilderList() {
-      return furnitureGroupList_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    @java.lang.Override
-    public int getFurnitureGroupListCount() {
-      return furnitureGroupList_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData getFurnitureGroupList(int index) {
-      return furnitureGroupList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder getFurnitureGroupListOrBuilder(
-        int index) {
-      return furnitureGroupList_.get(index);
-    }
-
-    public static final int DEPLOY_ANIMAL_LIST_FIELD_NUMBER = 15;
-    private java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> deployAnimalList_;
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> getDeployAnimalListList() {
-      return deployAnimalList_;
-    }
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> 
-        getDeployAnimalListOrBuilderList() {
-      return deployAnimalList_;
-    }
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    @java.lang.Override
-    public int getDeployAnimalListCount() {
-      return deployAnimalList_.size();
-    }
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData getDeployAnimalList(int index) {
-      return deployAnimalList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder getDeployAnimalListOrBuilder(
-        int index) {
-      return deployAnimalList_.get(index);
-    }
-
-    public static final int FIELD_LIST_FIELD_NUMBER = 11;
-    private java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> fieldList_;
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> getFieldListList() {
-      return fieldList_;
-    }
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
-        getFieldListOrBuilderList() {
-      return fieldList_;
-    }
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    @java.lang.Override
-    public int getFieldListCount() {
-      return fieldList_.size();
-    }
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index) {
-      return fieldList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeBlockFieldData field_list = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
-        int index) {
-      return fieldList_.get(index);
-    }
-
-    public static final int COMFORT_VALUE_FIELD_NUMBER = 13;
+    public static final int COMFORT_VALUE_FIELD_NUMBER = 1;
     private int comfortValue_;
     /**
-     * <code>uint32 comfort_value = 13;</code>
+     * <code>uint32 comfort_value = 1;</code>
      * @return The comfortValue.
      */
     @java.lang.Override
@@ -805,17 +510,97 @@ public final class HomeBlockArrangementInfoOuterClass {
       return comfortValue_;
     }
 
-    public static final int PERSISTENTFURNITURELIST_FIELD_NUMBER = 10;
+    public static final int DEPLOY_FURNIURE_LIST_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> deployFurniureList_;
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getDeployFurniureListList() {
+      return deployFurniureList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getDeployFurniureListOrBuilderList() {
+      return deployFurniureList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    @java.lang.Override
+    public int getDeployFurniureListCount() {
+      return deployFurniureList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
+      return deployFurniureList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
+        int index) {
+      return deployFurniureList_.get(index);
+    }
+
+    public static final int DOT_PATTERN_LIST_FIELD_NUMBER = 3;
+    private java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> dotPatternList_;
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> getDotPatternListList() {
+      return dotPatternList_;
+    }
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
+        getDotPatternListOrBuilderList() {
+      return dotPatternList_;
+    }
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    @java.lang.Override
+    public int getDotPatternListCount() {
+      return dotPatternList_.size();
+    }
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index) {
+      return dotPatternList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
+        int index) {
+      return dotPatternList_.get(index);
+    }
+
+    public static final int PERSISTENT_FURNITURE_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> persistentFurnitureList_;
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getPersistentFurnitureListList() {
       return persistentFurnitureList_;
     }
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
@@ -823,21 +608,21 @@ public final class HomeBlockArrangementInfoOuterClass {
       return persistentFurnitureList_;
     }
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     @java.lang.Override
     public int getPersistentFurnitureListCount() {
       return persistentFurnitureList_.size();
     }
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
       return persistentFurnitureList_.get(index);
     }
     /**
-     * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+     * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
@@ -845,17 +630,57 @@ public final class HomeBlockArrangementInfoOuterClass {
       return persistentFurnitureList_.get(index);
     }
 
-    public static final int DEPLOY_NPC_LIST_FIELD_NUMBER = 9;
+    public static final int FURNITURE_GROUP_LIST_FIELD_NUMBER = 6;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> furnitureGroupList_;
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> getFurnitureGroupListList() {
+      return furnitureGroupList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> 
+        getFurnitureGroupListOrBuilderList() {
+      return furnitureGroupList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    @java.lang.Override
+    public int getFurnitureGroupListCount() {
+      return furnitureGroupList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData getFurnitureGroupList(int index) {
+      return furnitureGroupList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder getFurnitureGroupListOrBuilder(
+        int index) {
+      return furnitureGroupList_.get(index);
+    }
+
+    public static final int DEPLOY_NPC_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> deployNpcList_;
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> getDeployNpcListList() {
       return deployNpcList_;
     }
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
@@ -863,21 +688,21 @@ public final class HomeBlockArrangementInfoOuterClass {
       return deployNpcList_;
     }
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     @java.lang.Override
     public int getDeployNpcListCount() {
       return deployNpcList_.size();
     }
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData getDeployNpcList(int index) {
       return deployNpcList_.get(index);
     }
     /**
-     * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+     * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder getDeployNpcListOrBuilder(
@@ -885,10 +710,141 @@ public final class HomeBlockArrangementInfoOuterClass {
       return deployNpcList_.get(index);
     }
 
-    public static final int IS_UNLOCKED_FIELD_NUMBER = 6;
+    public static final int DEPLOY_ANIMAL_LIST_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> deployAnimalList_;
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> getDeployAnimalListList() {
+      return deployAnimalList_;
+    }
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> 
+        getDeployAnimalListOrBuilderList() {
+      return deployAnimalList_;
+    }
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    @java.lang.Override
+    public int getDeployAnimalListCount() {
+      return deployAnimalList_.size();
+    }
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData getDeployAnimalList(int index) {
+      return deployAnimalList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder getDeployAnimalListOrBuilder(
+        int index) {
+      return deployAnimalList_.get(index);
+    }
+
+    public static final int FURNITURE_CUSTOM_SUITE_LIST_FIELD_NUMBER = 10;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> furnitureCustomSuiteList_;
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> getFurnitureCustomSuiteListList() {
+      return furnitureCustomSuiteList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
+        getFurnitureCustomSuiteListOrBuilderList() {
+      return furnitureCustomSuiteList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    @java.lang.Override
+    public int getFurnitureCustomSuiteListCount() {
+      return furnitureCustomSuiteList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index) {
+      return furnitureCustomSuiteList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
+        int index) {
+      return furnitureCustomSuiteList_.get(index);
+    }
+
+    public static final int FURNITURE_SUITE_LIST_FIELD_NUMBER = 11;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> furnitureSuiteList_;
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> getFurnitureSuiteListList() {
+      return furnitureSuiteList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
+        getFurnitureSuiteListOrBuilderList() {
+      return furnitureSuiteList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    @java.lang.Override
+    public int getFurnitureSuiteListCount() {
+      return furnitureSuiteList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index) {
+      return furnitureSuiteList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
+        int index) {
+      return furnitureSuiteList_.get(index);
+    }
+
+    public static final int BLOCK_ID_FIELD_NUMBER = 12;
+    private int blockId_;
+    /**
+     * <code>uint32 block_id = 12;</code>
+     * @return The blockId.
+     */
+    @java.lang.Override
+    public int getBlockId() {
+      return blockId_;
+    }
+
+    public static final int IS_UNLOCKED_FIELD_NUMBER = 13;
     private boolean isUnlocked_;
     /**
-     * <code>bool is_unlocked = 6;</code>
+     * <code>bool is_unlocked = 13;</code>
      * @return The isUnlocked.
      */
     @java.lang.Override
@@ -896,17 +852,17 @@ public final class HomeBlockArrangementInfoOuterClass {
       return isUnlocked_;
     }
 
-    public static final int WEEKEND_DJINN_INFO_LIST_FIELD_NUMBER = 3;
+    public static final int WEEKEND_DJINN_INFO_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> weekendDjinnInfoList_;
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> getWeekendDjinnInfoListList() {
       return weekendDjinnInfoList_;
     }
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder> 
@@ -914,21 +870,21 @@ public final class HomeBlockArrangementInfoOuterClass {
       return weekendDjinnInfoList_;
     }
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     @java.lang.Override
     public int getWeekendDjinnInfoListCount() {
       return weekendDjinnInfoList_.size();
     }
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo getWeekendDjinnInfoList(int index) {
       return weekendDjinnInfoList_.get(index);
     }
     /**
-     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+     * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder getWeekendDjinnInfoListOrBuilder(
@@ -936,6 +892,46 @@ public final class HomeBlockArrangementInfoOuterClass {
       return weekendDjinnInfoList_.get(index);
     }
 
+    public static final int FIELD_LIST_FIELD_NUMBER = 15;
+    private java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> fieldList_;
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> getFieldListList() {
+      return fieldList_;
+    }
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
+        getFieldListOrBuilderList() {
+      return fieldList_;
+    }
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    @java.lang.Override
+    public int getFieldListCount() {
+      return fieldList_.size();
+    }
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index) {
+      return fieldList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
+        int index) {
+      return fieldList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -950,44 +946,44 @@ public final class HomeBlockArrangementInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < dotPatternList_.size(); i++) {
-        output.writeMessage(1, dotPatternList_.get(i));
-      }
-      for (int i = 0; i < furnitureCustomSuiteList_.size(); i++) {
-        output.writeMessage(2, furnitureCustomSuiteList_.get(i));
-      }
-      for (int i = 0; i < weekendDjinnInfoList_.size(); i++) {
-        output.writeMessage(3, weekendDjinnInfoList_.get(i));
-      }
-      for (int i = 0; i < furnitureGroupList_.size(); i++) {
-        output.writeMessage(4, furnitureGroupList_.get(i));
-      }
-      if (isUnlocked_ != false) {
-        output.writeBool(6, isUnlocked_);
-      }
-      if (blockId_ != 0) {
-        output.writeUInt32(8, blockId_);
-      }
-      for (int i = 0; i < deployNpcList_.size(); i++) {
-        output.writeMessage(9, deployNpcList_.get(i));
-      }
-      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
-        output.writeMessage(10, persistentFurnitureList_.get(i));
-      }
-      for (int i = 0; i < fieldList_.size(); i++) {
-        output.writeMessage(11, fieldList_.get(i));
+      if (comfortValue_ != 0) {
+        output.writeUInt32(1, comfortValue_);
       }
       for (int i = 0; i < deployFurniureList_.size(); i++) {
-        output.writeMessage(12, deployFurniureList_.get(i));
+        output.writeMessage(2, deployFurniureList_.get(i));
       }
-      if (comfortValue_ != 0) {
-        output.writeUInt32(13, comfortValue_);
+      for (int i = 0; i < dotPatternList_.size(); i++) {
+        output.writeMessage(3, dotPatternList_.get(i));
       }
-      for (int i = 0; i < furnitureSuiteList_.size(); i++) {
-        output.writeMessage(14, furnitureSuiteList_.get(i));
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
+        output.writeMessage(4, persistentFurnitureList_.get(i));
+      }
+      for (int i = 0; i < furnitureGroupList_.size(); i++) {
+        output.writeMessage(6, furnitureGroupList_.get(i));
+      }
+      for (int i = 0; i < deployNpcList_.size(); i++) {
+        output.writeMessage(8, deployNpcList_.get(i));
       }
       for (int i = 0; i < deployAnimalList_.size(); i++) {
-        output.writeMessage(15, deployAnimalList_.get(i));
+        output.writeMessage(9, deployAnimalList_.get(i));
+      }
+      for (int i = 0; i < furnitureCustomSuiteList_.size(); i++) {
+        output.writeMessage(10, furnitureCustomSuiteList_.get(i));
+      }
+      for (int i = 0; i < furnitureSuiteList_.size(); i++) {
+        output.writeMessage(11, furnitureSuiteList_.get(i));
+      }
+      if (blockId_ != 0) {
+        output.writeUInt32(12, blockId_);
+      }
+      if (isUnlocked_ != false) {
+        output.writeBool(13, isUnlocked_);
+      }
+      for (int i = 0; i < weekendDjinnInfoList_.size(); i++) {
+        output.writeMessage(14, weekendDjinnInfoList_.get(i));
+      }
+      for (int i = 0; i < fieldList_.size(); i++) {
+        output.writeMessage(15, fieldList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -998,57 +994,57 @@ public final class HomeBlockArrangementInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < dotPatternList_.size(); i++) {
+      if (comfortValue_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, dotPatternList_.get(i));
-      }
-      for (int i = 0; i < furnitureCustomSuiteList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, furnitureCustomSuiteList_.get(i));
-      }
-      for (int i = 0; i < weekendDjinnInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, weekendDjinnInfoList_.get(i));
-      }
-      for (int i = 0; i < furnitureGroupList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, furnitureGroupList_.get(i));
-      }
-      if (isUnlocked_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isUnlocked_);
-      }
-      if (blockId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, blockId_);
-      }
-      for (int i = 0; i < deployNpcList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, deployNpcList_.get(i));
-      }
-      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, persistentFurnitureList_.get(i));
-      }
-      for (int i = 0; i < fieldList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, fieldList_.get(i));
+          .computeUInt32Size(1, comfortValue_);
       }
       for (int i = 0; i < deployFurniureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, deployFurniureList_.get(i));
+          .computeMessageSize(2, deployFurniureList_.get(i));
       }
-      if (comfortValue_ != 0) {
+      for (int i = 0; i < dotPatternList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, comfortValue_);
+          .computeMessageSize(3, dotPatternList_.get(i));
       }
-      for (int i = 0; i < furnitureSuiteList_.size(); i++) {
+      for (int i = 0; i < persistentFurnitureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, furnitureSuiteList_.get(i));
+          .computeMessageSize(4, persistentFurnitureList_.get(i));
+      }
+      for (int i = 0; i < furnitureGroupList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(6, furnitureGroupList_.get(i));
+      }
+      for (int i = 0; i < deployNpcList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, deployNpcList_.get(i));
       }
       for (int i = 0; i < deployAnimalList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, deployAnimalList_.get(i));
+          .computeMessageSize(9, deployAnimalList_.get(i));
+      }
+      for (int i = 0; i < furnitureCustomSuiteList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, furnitureCustomSuiteList_.get(i));
+      }
+      for (int i = 0; i < furnitureSuiteList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, furnitureSuiteList_.get(i));
+      }
+      if (blockId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, blockId_);
+      }
+      if (isUnlocked_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, isUnlocked_);
+      }
+      for (int i = 0; i < weekendDjinnInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, weekendDjinnInfoList_.get(i));
+      }
+      for (int i = 0; i < fieldList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, fieldList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1065,32 +1061,32 @@ public final class HomeBlockArrangementInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo other = (emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo) obj;
 
-      if (!getDotPatternListList()
-          .equals(other.getDotPatternListList())) return false;
-      if (!getDeployFurniureListList()
-          .equals(other.getDeployFurniureListList())) return false;
-      if (!getFurnitureSuiteListList()
-          .equals(other.getFurnitureSuiteListList())) return false;
-      if (!getFurnitureCustomSuiteListList()
-          .equals(other.getFurnitureCustomSuiteListList())) return false;
-      if (getBlockId()
-          != other.getBlockId()) return false;
-      if (!getFurnitureGroupListList()
-          .equals(other.getFurnitureGroupListList())) return false;
-      if (!getDeployAnimalListList()
-          .equals(other.getDeployAnimalListList())) return false;
-      if (!getFieldListList()
-          .equals(other.getFieldListList())) return false;
       if (getComfortValue()
           != other.getComfortValue()) return false;
+      if (!getDeployFurniureListList()
+          .equals(other.getDeployFurniureListList())) return false;
+      if (!getDotPatternListList()
+          .equals(other.getDotPatternListList())) return false;
       if (!getPersistentFurnitureListList()
           .equals(other.getPersistentFurnitureListList())) return false;
+      if (!getFurnitureGroupListList()
+          .equals(other.getFurnitureGroupListList())) return false;
       if (!getDeployNpcListList()
           .equals(other.getDeployNpcListList())) return false;
+      if (!getDeployAnimalListList()
+          .equals(other.getDeployAnimalListList())) return false;
+      if (!getFurnitureCustomSuiteListList()
+          .equals(other.getFurnitureCustomSuiteListList())) return false;
+      if (!getFurnitureSuiteListList()
+          .equals(other.getFurnitureSuiteListList())) return false;
+      if (getBlockId()
+          != other.getBlockId()) return false;
       if (getIsUnlocked()
           != other.getIsUnlocked()) return false;
       if (!getWeekendDjinnInfoListList()
           .equals(other.getWeekendDjinnInfoListList())) return false;
+      if (!getFieldListList()
+          .equals(other.getFieldListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1102,46 +1098,42 @@ public final class HomeBlockArrangementInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + COMFORT_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getComfortValue();
+      if (getDeployFurniureListCount() > 0) {
+        hash = (37 * hash) + DEPLOY_FURNIURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDeployFurniureListList().hashCode();
+      }
       if (getDotPatternListCount() > 0) {
         hash = (37 * hash) + DOT_PATTERN_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDotPatternListList().hashCode();
       }
-      if (getDeployFurniureListCount() > 0) {
-        hash = (37 * hash) + DEPLOYFURNIURELIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDeployFurniureListList().hashCode();
+      if (getPersistentFurnitureListCount() > 0) {
+        hash = (37 * hash) + PERSISTENT_FURNITURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPersistentFurnitureListList().hashCode();
       }
-      if (getFurnitureSuiteListCount() > 0) {
-        hash = (37 * hash) + FURNITURE_SUITE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFurnitureSuiteListList().hashCode();
-      }
-      if (getFurnitureCustomSuiteListCount() > 0) {
-        hash = (37 * hash) + FURNITURE_CUSTOM_SUITE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFurnitureCustomSuiteListList().hashCode();
-      }
-      hash = (37 * hash) + BLOCK_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getBlockId();
       if (getFurnitureGroupListCount() > 0) {
         hash = (37 * hash) + FURNITURE_GROUP_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFurnitureGroupListList().hashCode();
       }
-      if (getDeployAnimalListCount() > 0) {
-        hash = (37 * hash) + DEPLOY_ANIMAL_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getDeployAnimalListList().hashCode();
-      }
-      if (getFieldListCount() > 0) {
-        hash = (37 * hash) + FIELD_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFieldListList().hashCode();
-      }
-      hash = (37 * hash) + COMFORT_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getComfortValue();
-      if (getPersistentFurnitureListCount() > 0) {
-        hash = (37 * hash) + PERSISTENTFURNITURELIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPersistentFurnitureListList().hashCode();
-      }
       if (getDeployNpcListCount() > 0) {
         hash = (37 * hash) + DEPLOY_NPC_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getDeployNpcListList().hashCode();
       }
+      if (getDeployAnimalListCount() > 0) {
+        hash = (37 * hash) + DEPLOY_ANIMAL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDeployAnimalListList().hashCode();
+      }
+      if (getFurnitureCustomSuiteListCount() > 0) {
+        hash = (37 * hash) + FURNITURE_CUSTOM_SUITE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFurnitureCustomSuiteListList().hashCode();
+      }
+      if (getFurnitureSuiteListCount() > 0) {
+        hash = (37 * hash) + FURNITURE_SUITE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFurnitureSuiteListList().hashCode();
+      }
+      hash = (37 * hash) + BLOCK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getBlockId();
       hash = (37 * hash) + IS_UNLOCKED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsUnlocked());
@@ -1149,6 +1141,10 @@ public final class HomeBlockArrangementInfoOuterClass {
         hash = (37 * hash) + WEEKEND_DJINN_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getWeekendDjinnInfoListList().hashCode();
       }
+      if (getFieldListCount() > 0) {
+        hash = (37 * hash) + FIELD_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFieldListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1245,10 +1241,6 @@ public final class HomeBlockArrangementInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KOODNOKODIG
-     * </pre>
-     *
      * Protobuf type {@code HomeBlockArrangementInfo}
      */
     public static final class Builder extends
@@ -1281,87 +1273,87 @@ public final class HomeBlockArrangementInfoOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getDotPatternListFieldBuilder();
           getDeployFurniureListFieldBuilder();
-          getFurnitureSuiteListFieldBuilder();
-          getFurnitureCustomSuiteListFieldBuilder();
-          getFurnitureGroupListFieldBuilder();
-          getDeployAnimalListFieldBuilder();
-          getFieldListFieldBuilder();
+          getDotPatternListFieldBuilder();
           getPersistentFurnitureListFieldBuilder();
+          getFurnitureGroupListFieldBuilder();
           getDeployNpcListFieldBuilder();
+          getDeployAnimalListFieldBuilder();
+          getFurnitureCustomSuiteListFieldBuilder();
+          getFurnitureSuiteListFieldBuilder();
           getWeekendDjinnInfoListFieldBuilder();
+          getFieldListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (dotPatternListBuilder_ == null) {
-          dotPatternList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          dotPatternListBuilder_.clear();
-        }
+        comfortValue_ = 0;
+
         if (deployFurniureListBuilder_ == null) {
           deployFurniureList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           deployFurniureListBuilder_.clear();
         }
-        if (furnitureSuiteListBuilder_ == null) {
-          furnitureSuiteList_ = java.util.Collections.emptyList();
+        if (dotPatternListBuilder_ == null) {
+          dotPatternList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          dotPatternListBuilder_.clear();
+        }
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
         } else {
-          furnitureSuiteListBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          furnitureCustomSuiteList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        } else {
-          furnitureCustomSuiteListBuilder_.clear();
-        }
-        blockId_ = 0;
-
         if (furnitureGroupListBuilder_ == null) {
           furnitureGroupList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           furnitureGroupListBuilder_.clear();
         }
+        if (deployNpcListBuilder_ == null) {
+          deployNpcList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        } else {
+          deployNpcListBuilder_.clear();
+        }
         if (deployAnimalListBuilder_ == null) {
           deployAnimalList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000020);
         } else {
           deployAnimalListBuilder_.clear();
         }
-        if (fieldListBuilder_ == null) {
-          fieldList_ = java.util.Collections.emptyList();
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          furnitureCustomSuiteList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000040);
         } else {
-          fieldListBuilder_.clear();
+          furnitureCustomSuiteListBuilder_.clear();
         }
-        comfortValue_ = 0;
-
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureList_ = java.util.Collections.emptyList();
+        if (furnitureSuiteListBuilder_ == null) {
+          furnitureSuiteList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
         } else {
-          persistentFurnitureListBuilder_.clear();
-        }
-        if (deployNpcListBuilder_ == null) {
-          deployNpcList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000100);
-        } else {
-          deployNpcListBuilder_.clear();
+          furnitureSuiteListBuilder_.clear();
         }
+        blockId_ = 0;
+
         isUnlocked_ = false;
 
         if (weekendDjinnInfoListBuilder_ == null) {
           weekendDjinnInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000200);
+          bitField0_ = (bitField0_ & ~0x00000100);
         } else {
           weekendDjinnInfoListBuilder_.clear();
         }
+        if (fieldListBuilder_ == null) {
+          fieldList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000200);
+        } else {
+          fieldListBuilder_.clear();
+        }
         return this;
       }
 
@@ -1389,52 +1381,52 @@ public final class HomeBlockArrangementInfoOuterClass {
       public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo buildPartial() {
         emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo result = new emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo(this);
         int from_bitField0_ = bitField0_;
-        if (dotPatternListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            dotPatternList_ = java.util.Collections.unmodifiableList(dotPatternList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.dotPatternList_ = dotPatternList_;
-        } else {
-          result.dotPatternList_ = dotPatternListBuilder_.build();
-        }
+        result.comfortValue_ = comfortValue_;
         if (deployFurniureListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             deployFurniureList_ = java.util.Collections.unmodifiableList(deployFurniureList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.deployFurniureList_ = deployFurniureList_;
         } else {
           result.deployFurniureList_ = deployFurniureListBuilder_.build();
         }
-        if (furnitureSuiteListBuilder_ == null) {
+        if (dotPatternListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            dotPatternList_ = java.util.Collections.unmodifiableList(dotPatternList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.dotPatternList_ = dotPatternList_;
+        } else {
+          result.dotPatternList_ = dotPatternListBuilder_.build();
+        }
+        if (persistentFurnitureListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
-            furnitureSuiteList_ = java.util.Collections.unmodifiableList(furnitureSuiteList_);
+            persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
             bitField0_ = (bitField0_ & ~0x00000004);
           }
-          result.furnitureSuiteList_ = furnitureSuiteList_;
+          result.persistentFurnitureList_ = persistentFurnitureList_;
         } else {
-          result.furnitureSuiteList_ = furnitureSuiteListBuilder_.build();
+          result.persistentFurnitureList_ = persistentFurnitureListBuilder_.build();
         }
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
-            furnitureCustomSuiteList_ = java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
-            bitField0_ = (bitField0_ & ~0x00000008);
-          }
-          result.furnitureCustomSuiteList_ = furnitureCustomSuiteList_;
-        } else {
-          result.furnitureCustomSuiteList_ = furnitureCustomSuiteListBuilder_.build();
-        }
-        result.blockId_ = blockId_;
         if (furnitureGroupListBuilder_ == null) {
-          if (((bitField0_ & 0x00000010) != 0)) {
+          if (((bitField0_ & 0x00000008) != 0)) {
             furnitureGroupList_ = java.util.Collections.unmodifiableList(furnitureGroupList_);
-            bitField0_ = (bitField0_ & ~0x00000010);
+            bitField0_ = (bitField0_ & ~0x00000008);
           }
           result.furnitureGroupList_ = furnitureGroupList_;
         } else {
           result.furnitureGroupList_ = furnitureGroupListBuilder_.build();
         }
+        if (deployNpcListBuilder_ == null) {
+          if (((bitField0_ & 0x00000010) != 0)) {
+            deployNpcList_ = java.util.Collections.unmodifiableList(deployNpcList_);
+            bitField0_ = (bitField0_ & ~0x00000010);
+          }
+          result.deployNpcList_ = deployNpcList_;
+        } else {
+          result.deployNpcList_ = deployNpcListBuilder_.build();
+        }
         if (deployAnimalListBuilder_ == null) {
           if (((bitField0_ & 0x00000020) != 0)) {
             deployAnimalList_ = java.util.Collections.unmodifiableList(deployAnimalList_);
@@ -1444,44 +1436,44 @@ public final class HomeBlockArrangementInfoOuterClass {
         } else {
           result.deployAnimalList_ = deployAnimalListBuilder_.build();
         }
-        if (fieldListBuilder_ == null) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
           if (((bitField0_ & 0x00000040) != 0)) {
-            fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
+            furnitureCustomSuiteList_ = java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
             bitField0_ = (bitField0_ & ~0x00000040);
           }
-          result.fieldList_ = fieldList_;
+          result.furnitureCustomSuiteList_ = furnitureCustomSuiteList_;
         } else {
-          result.fieldList_ = fieldListBuilder_.build();
+          result.furnitureCustomSuiteList_ = furnitureCustomSuiteListBuilder_.build();
         }
-        result.comfortValue_ = comfortValue_;
-        if (persistentFurnitureListBuilder_ == null) {
+        if (furnitureSuiteListBuilder_ == null) {
           if (((bitField0_ & 0x00000080) != 0)) {
-            persistentFurnitureList_ = java.util.Collections.unmodifiableList(persistentFurnitureList_);
+            furnitureSuiteList_ = java.util.Collections.unmodifiableList(furnitureSuiteList_);
             bitField0_ = (bitField0_ & ~0x00000080);
           }
-          result.persistentFurnitureList_ = persistentFurnitureList_;
+          result.furnitureSuiteList_ = furnitureSuiteList_;
         } else {
-          result.persistentFurnitureList_ = persistentFurnitureListBuilder_.build();
-        }
-        if (deployNpcListBuilder_ == null) {
-          if (((bitField0_ & 0x00000100) != 0)) {
-            deployNpcList_ = java.util.Collections.unmodifiableList(deployNpcList_);
-            bitField0_ = (bitField0_ & ~0x00000100);
-          }
-          result.deployNpcList_ = deployNpcList_;
-        } else {
-          result.deployNpcList_ = deployNpcListBuilder_.build();
+          result.furnitureSuiteList_ = furnitureSuiteListBuilder_.build();
         }
+        result.blockId_ = blockId_;
         result.isUnlocked_ = isUnlocked_;
         if (weekendDjinnInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000200) != 0)) {
+          if (((bitField0_ & 0x00000100) != 0)) {
             weekendDjinnInfoList_ = java.util.Collections.unmodifiableList(weekendDjinnInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000200);
+            bitField0_ = (bitField0_ & ~0x00000100);
           }
           result.weekendDjinnInfoList_ = weekendDjinnInfoList_;
         } else {
           result.weekendDjinnInfoList_ = weekendDjinnInfoListBuilder_.build();
         }
+        if (fieldListBuilder_ == null) {
+          if (((bitField0_ & 0x00000200) != 0)) {
+            fieldList_ = java.util.Collections.unmodifiableList(fieldList_);
+            bitField0_ = (bitField0_ & ~0x00000200);
+          }
+          result.fieldList_ = fieldList_;
+        } else {
+          result.fieldList_ = fieldListBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1530,37 +1522,14 @@ public final class HomeBlockArrangementInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo other) {
         if (other == emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.getDefaultInstance()) return this;
-        if (dotPatternListBuilder_ == null) {
-          if (!other.dotPatternList_.isEmpty()) {
-            if (dotPatternList_.isEmpty()) {
-              dotPatternList_ = other.dotPatternList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureDotPatternListIsMutable();
-              dotPatternList_.addAll(other.dotPatternList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.dotPatternList_.isEmpty()) {
-            if (dotPatternListBuilder_.isEmpty()) {
-              dotPatternListBuilder_.dispose();
-              dotPatternListBuilder_ = null;
-              dotPatternList_ = other.dotPatternList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              dotPatternListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getDotPatternListFieldBuilder() : null;
-            } else {
-              dotPatternListBuilder_.addAllMessages(other.dotPatternList_);
-            }
-          }
+        if (other.getComfortValue() != 0) {
+          setComfortValue(other.getComfortValue());
         }
         if (deployFurniureListBuilder_ == null) {
           if (!other.deployFurniureList_.isEmpty()) {
             if (deployFurniureList_.isEmpty()) {
               deployFurniureList_ = other.deployFurniureList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureDeployFurniureListIsMutable();
               deployFurniureList_.addAll(other.deployFurniureList_);
@@ -1573,7 +1542,7 @@ public final class HomeBlockArrangementInfoOuterClass {
               deployFurniureListBuilder_.dispose();
               deployFurniureListBuilder_ = null;
               deployFurniureList_ = other.deployFurniureList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               deployFurniureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getDeployFurniureListFieldBuilder() : null;
@@ -1582,66 +1551,63 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
-        if (furnitureSuiteListBuilder_ == null) {
-          if (!other.furnitureSuiteList_.isEmpty()) {
-            if (furnitureSuiteList_.isEmpty()) {
-              furnitureSuiteList_ = other.furnitureSuiteList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+        if (dotPatternListBuilder_ == null) {
+          if (!other.dotPatternList_.isEmpty()) {
+            if (dotPatternList_.isEmpty()) {
+              dotPatternList_ = other.dotPatternList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
-              ensureFurnitureSuiteListIsMutable();
-              furnitureSuiteList_.addAll(other.furnitureSuiteList_);
+              ensureDotPatternListIsMutable();
+              dotPatternList_.addAll(other.dotPatternList_);
             }
             onChanged();
           }
         } else {
-          if (!other.furnitureSuiteList_.isEmpty()) {
-            if (furnitureSuiteListBuilder_.isEmpty()) {
-              furnitureSuiteListBuilder_.dispose();
-              furnitureSuiteListBuilder_ = null;
-              furnitureSuiteList_ = other.furnitureSuiteList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-              furnitureSuiteListBuilder_ = 
+          if (!other.dotPatternList_.isEmpty()) {
+            if (dotPatternListBuilder_.isEmpty()) {
+              dotPatternListBuilder_.dispose();
+              dotPatternListBuilder_ = null;
+              dotPatternList_ = other.dotPatternList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              dotPatternListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getFurnitureSuiteListFieldBuilder() : null;
+                   getDotPatternListFieldBuilder() : null;
             } else {
-              furnitureSuiteListBuilder_.addAllMessages(other.furnitureSuiteList_);
+              dotPatternListBuilder_.addAllMessages(other.dotPatternList_);
             }
           }
         }
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          if (!other.furnitureCustomSuiteList_.isEmpty()) {
-            if (furnitureCustomSuiteList_.isEmpty()) {
-              furnitureCustomSuiteList_ = other.furnitureCustomSuiteList_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+        if (persistentFurnitureListBuilder_ == null) {
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureList_.isEmpty()) {
+              persistentFurnitureList_ = other.persistentFurnitureList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
-              ensureFurnitureCustomSuiteListIsMutable();
-              furnitureCustomSuiteList_.addAll(other.furnitureCustomSuiteList_);
+              ensurePersistentFurnitureListIsMutable();
+              persistentFurnitureList_.addAll(other.persistentFurnitureList_);
             }
             onChanged();
           }
         } else {
-          if (!other.furnitureCustomSuiteList_.isEmpty()) {
-            if (furnitureCustomSuiteListBuilder_.isEmpty()) {
-              furnitureCustomSuiteListBuilder_.dispose();
-              furnitureCustomSuiteListBuilder_ = null;
-              furnitureCustomSuiteList_ = other.furnitureCustomSuiteList_;
-              bitField0_ = (bitField0_ & ~0x00000008);
-              furnitureCustomSuiteListBuilder_ = 
+          if (!other.persistentFurnitureList_.isEmpty()) {
+            if (persistentFurnitureListBuilder_.isEmpty()) {
+              persistentFurnitureListBuilder_.dispose();
+              persistentFurnitureListBuilder_ = null;
+              persistentFurnitureList_ = other.persistentFurnitureList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+              persistentFurnitureListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getFurnitureCustomSuiteListFieldBuilder() : null;
+                   getPersistentFurnitureListFieldBuilder() : null;
             } else {
-              furnitureCustomSuiteListBuilder_.addAllMessages(other.furnitureCustomSuiteList_);
+              persistentFurnitureListBuilder_.addAllMessages(other.persistentFurnitureList_);
             }
           }
         }
-        if (other.getBlockId() != 0) {
-          setBlockId(other.getBlockId());
-        }
         if (furnitureGroupListBuilder_ == null) {
           if (!other.furnitureGroupList_.isEmpty()) {
             if (furnitureGroupList_.isEmpty()) {
               furnitureGroupList_ = other.furnitureGroupList_;
-              bitField0_ = (bitField0_ & ~0x00000010);
+              bitField0_ = (bitField0_ & ~0x00000008);
             } else {
               ensureFurnitureGroupListIsMutable();
               furnitureGroupList_.addAll(other.furnitureGroupList_);
@@ -1654,7 +1620,7 @@ public final class HomeBlockArrangementInfoOuterClass {
               furnitureGroupListBuilder_.dispose();
               furnitureGroupListBuilder_ = null;
               furnitureGroupList_ = other.furnitureGroupList_;
-              bitField0_ = (bitField0_ & ~0x00000010);
+              bitField0_ = (bitField0_ & ~0x00000008);
               furnitureGroupListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getFurnitureGroupListFieldBuilder() : null;
@@ -1663,6 +1629,32 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
+        if (deployNpcListBuilder_ == null) {
+          if (!other.deployNpcList_.isEmpty()) {
+            if (deployNpcList_.isEmpty()) {
+              deployNpcList_ = other.deployNpcList_;
+              bitField0_ = (bitField0_ & ~0x00000010);
+            } else {
+              ensureDeployNpcListIsMutable();
+              deployNpcList_.addAll(other.deployNpcList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.deployNpcList_.isEmpty()) {
+            if (deployNpcListBuilder_.isEmpty()) {
+              deployNpcListBuilder_.dispose();
+              deployNpcListBuilder_ = null;
+              deployNpcList_ = other.deployNpcList_;
+              bitField0_ = (bitField0_ & ~0x00000010);
+              deployNpcListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getDeployNpcListFieldBuilder() : null;
+            } else {
+              deployNpcListBuilder_.addAllMessages(other.deployNpcList_);
+            }
+          }
+        }
         if (deployAnimalListBuilder_ == null) {
           if (!other.deployAnimalList_.isEmpty()) {
             if (deployAnimalList_.isEmpty()) {
@@ -1689,86 +1681,60 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
-        if (fieldListBuilder_ == null) {
-          if (!other.fieldList_.isEmpty()) {
-            if (fieldList_.isEmpty()) {
-              fieldList_ = other.fieldList_;
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          if (!other.furnitureCustomSuiteList_.isEmpty()) {
+            if (furnitureCustomSuiteList_.isEmpty()) {
+              furnitureCustomSuiteList_ = other.furnitureCustomSuiteList_;
               bitField0_ = (bitField0_ & ~0x00000040);
             } else {
-              ensureFieldListIsMutable();
-              fieldList_.addAll(other.fieldList_);
+              ensureFurnitureCustomSuiteListIsMutable();
+              furnitureCustomSuiteList_.addAll(other.furnitureCustomSuiteList_);
             }
             onChanged();
           }
         } else {
-          if (!other.fieldList_.isEmpty()) {
-            if (fieldListBuilder_.isEmpty()) {
-              fieldListBuilder_.dispose();
-              fieldListBuilder_ = null;
-              fieldList_ = other.fieldList_;
+          if (!other.furnitureCustomSuiteList_.isEmpty()) {
+            if (furnitureCustomSuiteListBuilder_.isEmpty()) {
+              furnitureCustomSuiteListBuilder_.dispose();
+              furnitureCustomSuiteListBuilder_ = null;
+              furnitureCustomSuiteList_ = other.furnitureCustomSuiteList_;
               bitField0_ = (bitField0_ & ~0x00000040);
-              fieldListBuilder_ = 
+              furnitureCustomSuiteListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getFieldListFieldBuilder() : null;
+                   getFurnitureCustomSuiteListFieldBuilder() : null;
             } else {
-              fieldListBuilder_.addAllMessages(other.fieldList_);
+              furnitureCustomSuiteListBuilder_.addAllMessages(other.furnitureCustomSuiteList_);
             }
           }
         }
-        if (other.getComfortValue() != 0) {
-          setComfortValue(other.getComfortValue());
-        }
-        if (persistentFurnitureListBuilder_ == null) {
-          if (!other.persistentFurnitureList_.isEmpty()) {
-            if (persistentFurnitureList_.isEmpty()) {
-              persistentFurnitureList_ = other.persistentFurnitureList_;
+        if (furnitureSuiteListBuilder_ == null) {
+          if (!other.furnitureSuiteList_.isEmpty()) {
+            if (furnitureSuiteList_.isEmpty()) {
+              furnitureSuiteList_ = other.furnitureSuiteList_;
               bitField0_ = (bitField0_ & ~0x00000080);
             } else {
-              ensurePersistentFurnitureListIsMutable();
-              persistentFurnitureList_.addAll(other.persistentFurnitureList_);
+              ensureFurnitureSuiteListIsMutable();
+              furnitureSuiteList_.addAll(other.furnitureSuiteList_);
             }
             onChanged();
           }
         } else {
-          if (!other.persistentFurnitureList_.isEmpty()) {
-            if (persistentFurnitureListBuilder_.isEmpty()) {
-              persistentFurnitureListBuilder_.dispose();
-              persistentFurnitureListBuilder_ = null;
-              persistentFurnitureList_ = other.persistentFurnitureList_;
+          if (!other.furnitureSuiteList_.isEmpty()) {
+            if (furnitureSuiteListBuilder_.isEmpty()) {
+              furnitureSuiteListBuilder_.dispose();
+              furnitureSuiteListBuilder_ = null;
+              furnitureSuiteList_ = other.furnitureSuiteList_;
               bitField0_ = (bitField0_ & ~0x00000080);
-              persistentFurnitureListBuilder_ = 
+              furnitureSuiteListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPersistentFurnitureListFieldBuilder() : null;
+                   getFurnitureSuiteListFieldBuilder() : null;
             } else {
-              persistentFurnitureListBuilder_.addAllMessages(other.persistentFurnitureList_);
+              furnitureSuiteListBuilder_.addAllMessages(other.furnitureSuiteList_);
             }
           }
         }
-        if (deployNpcListBuilder_ == null) {
-          if (!other.deployNpcList_.isEmpty()) {
-            if (deployNpcList_.isEmpty()) {
-              deployNpcList_ = other.deployNpcList_;
-              bitField0_ = (bitField0_ & ~0x00000100);
-            } else {
-              ensureDeployNpcListIsMutable();
-              deployNpcList_.addAll(other.deployNpcList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.deployNpcList_.isEmpty()) {
-            if (deployNpcListBuilder_.isEmpty()) {
-              deployNpcListBuilder_.dispose();
-              deployNpcListBuilder_ = null;
-              deployNpcList_ = other.deployNpcList_;
-              bitField0_ = (bitField0_ & ~0x00000100);
-              deployNpcListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getDeployNpcListFieldBuilder() : null;
-            } else {
-              deployNpcListBuilder_.addAllMessages(other.deployNpcList_);
-            }
-          }
+        if (other.getBlockId() != 0) {
+          setBlockId(other.getBlockId());
         }
         if (other.getIsUnlocked() != false) {
           setIsUnlocked(other.getIsUnlocked());
@@ -1777,7 +1743,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           if (!other.weekendDjinnInfoList_.isEmpty()) {
             if (weekendDjinnInfoList_.isEmpty()) {
               weekendDjinnInfoList_ = other.weekendDjinnInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000200);
+              bitField0_ = (bitField0_ & ~0x00000100);
             } else {
               ensureWeekendDjinnInfoListIsMutable();
               weekendDjinnInfoList_.addAll(other.weekendDjinnInfoList_);
@@ -1790,7 +1756,7 @@ public final class HomeBlockArrangementInfoOuterClass {
               weekendDjinnInfoListBuilder_.dispose();
               weekendDjinnInfoListBuilder_ = null;
               weekendDjinnInfoList_ = other.weekendDjinnInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000200);
+              bitField0_ = (bitField0_ & ~0x00000100);
               weekendDjinnInfoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getWeekendDjinnInfoListFieldBuilder() : null;
@@ -1799,6 +1765,32 @@ public final class HomeBlockArrangementInfoOuterClass {
             }
           }
         }
+        if (fieldListBuilder_ == null) {
+          if (!other.fieldList_.isEmpty()) {
+            if (fieldList_.isEmpty()) {
+              fieldList_ = other.fieldList_;
+              bitField0_ = (bitField0_ & ~0x00000200);
+            } else {
+              ensureFieldListIsMutable();
+              fieldList_.addAll(other.fieldList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.fieldList_.isEmpty()) {
+            if (fieldListBuilder_.isEmpty()) {
+              fieldListBuilder_.dispose();
+              fieldListBuilder_ = null;
+              fieldList_ = other.fieldList_;
+              bitField0_ = (bitField0_ & ~0x00000200);
+              fieldListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getFieldListFieldBuilder() : null;
+            } else {
+              fieldListBuilder_.addAllMessages(other.fieldList_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1829,252 +1821,43 @@ public final class HomeBlockArrangementInfoOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> dotPatternList_ =
-        java.util.Collections.emptyList();
-      private void ensureDotPatternListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          dotPatternList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern>(dotPatternList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> dotPatternListBuilder_;
-
+      private int comfortValue_ ;
       /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
+       * <code>uint32 comfort_value = 1;</code>
+       * @return The comfortValue.
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> getDotPatternListList() {
-        if (dotPatternListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(dotPatternList_);
-        } else {
-          return dotPatternListBuilder_.getMessageList();
-        }
+      @java.lang.Override
+      public int getComfortValue() {
+        return comfortValue_;
       }
       /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
+       * <code>uint32 comfort_value = 1;</code>
+       * @param value The comfortValue to set.
+       * @return This builder for chaining.
        */
-      public int getDotPatternListCount() {
-        if (dotPatternListBuilder_ == null) {
-          return dotPatternList_.size();
-        } else {
-          return dotPatternListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index) {
-        if (dotPatternListBuilder_ == null) {
-          return dotPatternList_.get(index);
-        } else {
-          return dotPatternListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder setDotPatternList(
-          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
-        if (dotPatternListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDotPatternListIsMutable();
-          dotPatternList_.set(index, value);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.setMessage(index, value);
-        }
+      public Builder setComfortValue(int value) {
+        
+        comfortValue_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
+       * <code>uint32 comfort_value = 1;</code>
+       * @return This builder for chaining.
        */
-      public Builder setDotPatternList(
-          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
-        if (dotPatternListBuilder_ == null) {
-          ensureDotPatternListIsMutable();
-          dotPatternList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          dotPatternListBuilder_.setMessage(index, builderForValue.build());
-        }
+      public Builder clearComfortValue() {
+        
+        comfortValue_ = 0;
+        onChanged();
         return this;
       }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder addDotPatternList(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
-        if (dotPatternListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDotPatternListIsMutable();
-          dotPatternList_.add(value);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder addDotPatternList(
-          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
-        if (dotPatternListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDotPatternListIsMutable();
-          dotPatternList_.add(index, value);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder addDotPatternList(
-          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
-        if (dotPatternListBuilder_ == null) {
-          ensureDotPatternListIsMutable();
-          dotPatternList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          dotPatternListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder addDotPatternList(
-          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
-        if (dotPatternListBuilder_ == null) {
-          ensureDotPatternListIsMutable();
-          dotPatternList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          dotPatternListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder addAllDotPatternList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> values) {
-        if (dotPatternListBuilder_ == null) {
-          ensureDotPatternListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, dotPatternList_);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder clearDotPatternList() {
-        if (dotPatternListBuilder_ == null) {
-          dotPatternList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public Builder removeDotPatternList(int index) {
-        if (dotPatternListBuilder_ == null) {
-          ensureDotPatternListIsMutable();
-          dotPatternList_.remove(index);
-          onChanged();
-        } else {
-          dotPatternListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder getDotPatternListBuilder(
-          int index) {
-        return getDotPatternListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
-          int index) {
-        if (dotPatternListBuilder_ == null) {
-          return dotPatternList_.get(index);  } else {
-          return dotPatternListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
-           getDotPatternListOrBuilderList() {
-        if (dotPatternListBuilder_ != null) {
-          return dotPatternListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(dotPatternList_);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder addDotPatternListBuilder() {
-        return getDotPatternListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder addDotPatternListBuilder(
-          int index) {
-        return getDotPatternListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 1;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder> 
-           getDotPatternListBuilderList() {
-        return getDotPatternListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
-          getDotPatternListFieldBuilder() {
-        if (dotPatternListBuilder_ == null) {
-          dotPatternListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder>(
-                  dotPatternList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          dotPatternList_ = null;
-        }
-        return dotPatternListBuilder_;
-      }
 
       private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> deployFurniureList_ =
         java.util.Collections.emptyList();
       private void ensureDeployFurniureListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           deployFurniureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(deployFurniureList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -2082,7 +1865,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> deployFurniureListBuilder_;
 
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getDeployFurniureListList() {
         if (deployFurniureListBuilder_ == null) {
@@ -2092,7 +1875,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public int getDeployFurniureListCount() {
         if (deployFurniureListBuilder_ == null) {
@@ -2102,7 +1885,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDeployFurniureList(int index) {
         if (deployFurniureListBuilder_ == null) {
@@ -2112,7 +1895,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
@@ -2129,7 +1912,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder setDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -2143,7 +1926,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder addDeployFurniureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
         if (deployFurniureListBuilder_ == null) {
@@ -2159,7 +1942,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
@@ -2176,7 +1959,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder addDeployFurniureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -2190,7 +1973,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder addDeployFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -2204,7 +1987,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder addAllDeployFurniureList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
@@ -2219,12 +2002,12 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder clearDeployFurniureList() {
         if (deployFurniureListBuilder_ == null) {
           deployFurniureList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           deployFurniureListBuilder_.clear();
@@ -2232,7 +2015,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public Builder removeDeployFurniureList(int index) {
         if (deployFurniureListBuilder_ == null) {
@@ -2245,14 +2028,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getDeployFurniureListBuilder(
           int index) {
         return getDeployFurniureListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDeployFurniureListOrBuilder(
           int index) {
@@ -2262,7 +2045,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
            getDeployFurniureListOrBuilderList() {
@@ -2273,14 +2056,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder() {
         return getDeployFurniureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDeployFurniureListBuilder(
           int index) {
@@ -2288,7 +2071,7 @@ public final class HomeBlockArrangementInfoOuterClass {
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData deployFurniureList = 12;</code>
+       * <code>repeated .HomeFurnitureData deploy_furniure_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
            getDeployFurniureListBuilderList() {
@@ -2301,7 +2084,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           deployFurniureListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
                   deployFurniureList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           deployFurniureList_ = null;
@@ -2309,523 +2092,492 @@ public final class HomeBlockArrangementInfoOuterClass {
         return deployFurniureListBuilder_;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> furnitureSuiteList_ =
+      private java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> dotPatternList_ =
         java.util.Collections.emptyList();
-      private void ensureFurnitureSuiteListIsMutable() {
+      private void ensureDotPatternListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          dotPatternList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern>(dotPatternList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> dotPatternListBuilder_;
+
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> getDotPatternListList() {
+        if (dotPatternListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(dotPatternList_);
+        } else {
+          return dotPatternListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public int getDotPatternListCount() {
+        if (dotPatternListBuilder_ == null) {
+          return dotPatternList_.size();
+        } else {
+          return dotPatternListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern getDotPatternList(int index) {
+        if (dotPatternListBuilder_ == null) {
+          return dotPatternList_.get(index);
+        } else {
+          return dotPatternListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder setDotPatternList(
+          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
+        if (dotPatternListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDotPatternListIsMutable();
+          dotPatternList_.set(index, value);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder setDotPatternList(
+          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
+        if (dotPatternListBuilder_ == null) {
+          ensureDotPatternListIsMutable();
+          dotPatternList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          dotPatternListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder addDotPatternList(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
+        if (dotPatternListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDotPatternListIsMutable();
+          dotPatternList_.add(value);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder addDotPatternList(
+          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern value) {
+        if (dotPatternListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDotPatternListIsMutable();
+          dotPatternList_.add(index, value);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder addDotPatternList(
+          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
+        if (dotPatternListBuilder_ == null) {
+          ensureDotPatternListIsMutable();
+          dotPatternList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          dotPatternListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder addDotPatternList(
+          int index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder builderForValue) {
+        if (dotPatternListBuilder_ == null) {
+          ensureDotPatternListIsMutable();
+          dotPatternList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          dotPatternListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder addAllDotPatternList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern> values) {
+        if (dotPatternListBuilder_ == null) {
+          ensureDotPatternListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, dotPatternList_);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder clearDotPatternList() {
+        if (dotPatternListBuilder_ == null) {
+          dotPatternList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public Builder removeDotPatternList(int index) {
+        if (dotPatternListBuilder_ == null) {
+          ensureDotPatternListIsMutable();
+          dotPatternList_.remove(index);
+          onChanged();
+        } else {
+          dotPatternListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder getDotPatternListBuilder(
+          int index) {
+        return getDotPatternListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder getDotPatternListOrBuilder(
+          int index) {
+        if (dotPatternListBuilder_ == null) {
+          return dotPatternList_.get(index);  } else {
+          return dotPatternListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
+           getDotPatternListOrBuilderList() {
+        if (dotPatternListBuilder_ != null) {
+          return dotPatternListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(dotPatternList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder addDotPatternListBuilder() {
+        return getDotPatternListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder addDotPatternListBuilder(
+          int index) {
+        return getDotPatternListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockDotPattern dot_pattern_list = 3;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder> 
+           getDotPatternListBuilderList() {
+        return getDotPatternListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder> 
+          getDotPatternListFieldBuilder() {
+        if (dotPatternListBuilder_ == null) {
+          dotPatternListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPatternOrBuilder>(
+                  dotPatternList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          dotPatternList_ = null;
+        }
+        return dotPatternListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> persistentFurnitureList_ =
+        java.util.Collections.emptyList();
+      private void ensurePersistentFurnitureListIsMutable() {
         if (!((bitField0_ & 0x00000004) != 0)) {
-          furnitureSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData>(furnitureSuiteList_);
+          persistentFurnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(persistentFurnitureList_);
           bitField0_ |= 0x00000004;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> furnitureSuiteListBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> persistentFurnitureListBuilder_;
 
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> getFurnitureSuiteListList() {
-        if (furnitureSuiteListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(furnitureSuiteList_);
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getPersistentFurnitureListList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         } else {
-          return furnitureSuiteListBuilder_.getMessageList();
+          return persistentFurnitureListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public int getFurnitureSuiteListCount() {
-        if (furnitureSuiteListBuilder_ == null) {
-          return furnitureSuiteList_.size();
+      public int getPersistentFurnitureListCount() {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.size();
         } else {
-          return furnitureSuiteListBuilder_.getCount();
+          return persistentFurnitureListBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index) {
-        if (furnitureSuiteListBuilder_ == null) {
-          return furnitureSuiteList_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);
         } else {
-          return furnitureSuiteListBuilder_.getMessage(index);
+          return persistentFurnitureListBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder setFurnitureSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
-        if (furnitureSuiteListBuilder_ == null) {
+      public Builder setPersistentFurnitureList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.set(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, value);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.setMessage(index, value);
+          persistentFurnitureListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder setFurnitureSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
-        if (furnitureSuiteListBuilder_ == null) {
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.set(index, builderForValue.build());
+      public Builder setPersistentFurnitureList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.setMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder addFurnitureSuiteList(emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
-        if (furnitureSuiteListBuilder_ == null) {
+      public Builder addPersistentFurnitureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.add(value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(value);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.addMessage(value);
+          persistentFurnitureListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder addFurnitureSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
-        if (furnitureSuiteListBuilder_ == null) {
+      public Builder addPersistentFurnitureList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (persistentFurnitureListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.add(index, value);
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, value);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.addMessage(index, value);
+          persistentFurnitureListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder addFurnitureSuiteList(
-          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
-        if (furnitureSuiteListBuilder_ == null) {
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.add(builderForValue.build());
+      public Builder addPersistentFurnitureList(
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(builderForValue.build());
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.addMessage(builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder addFurnitureSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
-        if (furnitureSuiteListBuilder_ == null) {
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.add(index, builderForValue.build());
+      public Builder addPersistentFurnitureList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.addMessage(index, builderForValue.build());
+          persistentFurnitureListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder addAllFurnitureSuiteList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> values) {
-        if (furnitureSuiteListBuilder_ == null) {
-          ensureFurnitureSuiteListIsMutable();
+      public Builder addAllPersistentFurnitureList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, furnitureSuiteList_);
+              values, persistentFurnitureList_);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.addAllMessages(values);
+          persistentFurnitureListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder clearFurnitureSuiteList() {
-        if (furnitureSuiteListBuilder_ == null) {
-          furnitureSuiteList_ = java.util.Collections.emptyList();
+      public Builder clearPersistentFurnitureList() {
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000004);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.clear();
+          persistentFurnitureListBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public Builder removeFurnitureSuiteList(int index) {
-        if (furnitureSuiteListBuilder_ == null) {
-          ensureFurnitureSuiteListIsMutable();
-          furnitureSuiteList_.remove(index);
+      public Builder removePersistentFurnitureList(int index) {
+        if (persistentFurnitureListBuilder_ == null) {
+          ensurePersistentFurnitureListIsMutable();
+          persistentFurnitureList_.remove(index);
           onChanged();
         } else {
-          furnitureSuiteListBuilder_.remove(index);
+          persistentFurnitureListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder getFurnitureSuiteListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getPersistentFurnitureListBuilder(
           int index) {
-        return getFurnitureSuiteListFieldBuilder().getBuilder(index);
+        return getPersistentFurnitureListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
           int index) {
-        if (furnitureSuiteListBuilder_ == null) {
-          return furnitureSuiteList_.get(index);  } else {
-          return furnitureSuiteListBuilder_.getMessageOrBuilder(index);
+        if (persistentFurnitureListBuilder_ == null) {
+          return persistentFurnitureList_.get(index);  } else {
+          return persistentFurnitureListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
-           getFurnitureSuiteListOrBuilderList() {
-        if (furnitureSuiteListBuilder_ != null) {
-          return furnitureSuiteListBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+           getPersistentFurnitureListOrBuilderList() {
+        if (persistentFurnitureListBuilder_ != null) {
+          return persistentFurnitureListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(furnitureSuiteList_);
+          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder addFurnitureSuiteListBuilder() {
-        return getFurnitureSuiteListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.getDefaultInstance());
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder() {
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder addFurnitureSuiteListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder(
           int index) {
-        return getFurnitureSuiteListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.getDefaultInstance());
+        return getPersistentFurnitureListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 14;</code>
+       * <code>repeated .HomeFurnitureData persistent_furniture_list = 4;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder> 
-           getFurnitureSuiteListBuilderList() {
-        return getFurnitureSuiteListFieldBuilder().getBuilderList();
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
+           getPersistentFurnitureListBuilderList() {
+        return getPersistentFurnitureListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
-          getFurnitureSuiteListFieldBuilder() {
-        if (furnitureSuiteListBuilder_ == null) {
-          furnitureSuiteListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder>(
-                  furnitureSuiteList_,
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+          getPersistentFurnitureListFieldBuilder() {
+        if (persistentFurnitureListBuilder_ == null) {
+          persistentFurnitureListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
+                  persistentFurnitureList_,
                   ((bitField0_ & 0x00000004) != 0),
                   getParentForChildren(),
                   isClean());
-          furnitureSuiteList_ = null;
+          persistentFurnitureList_ = null;
         }
-        return furnitureSuiteListBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> furnitureCustomSuiteList_ =
-        java.util.Collections.emptyList();
-      private void ensureFurnitureCustomSuiteListIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
-          furnitureCustomSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData>(furnitureCustomSuiteList_);
-          bitField0_ |= 0x00000008;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> furnitureCustomSuiteListBuilder_;
-
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> getFurnitureCustomSuiteListList() {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
-        } else {
-          return furnitureCustomSuiteListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public int getFurnitureCustomSuiteListCount() {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          return furnitureCustomSuiteList_.size();
-        } else {
-          return furnitureCustomSuiteListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          return furnitureCustomSuiteList_.get(index);
-        } else {
-          return furnitureCustomSuiteListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder setFurnitureCustomSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.set(index, value);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder setFurnitureCustomSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder addFurnitureCustomSuiteList(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.add(value);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder addFurnitureCustomSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.add(index, value);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder addFurnitureCustomSuiteList(
-          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder addFurnitureCustomSuiteList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder addAllFurnitureCustomSuiteList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> values) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          ensureFurnitureCustomSuiteListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, furnitureCustomSuiteList_);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder clearFurnitureCustomSuiteList() {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          furnitureCustomSuiteList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public Builder removeFurnitureCustomSuiteList(int index) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          ensureFurnitureCustomSuiteListIsMutable();
-          furnitureCustomSuiteList_.remove(index);
-          onChanged();
-        } else {
-          furnitureCustomSuiteListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder getFurnitureCustomSuiteListBuilder(
-          int index) {
-        return getFurnitureCustomSuiteListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
-          int index) {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          return furnitureCustomSuiteList_.get(index);  } else {
-          return furnitureCustomSuiteListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
-           getFurnitureCustomSuiteListOrBuilderList() {
-        if (furnitureCustomSuiteListBuilder_ != null) {
-          return furnitureCustomSuiteListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder addFurnitureCustomSuiteListBuilder() {
-        return getFurnitureCustomSuiteListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder addFurnitureCustomSuiteListBuilder(
-          int index) {
-        return getFurnitureCustomSuiteListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder> 
-           getFurnitureCustomSuiteListBuilderList() {
-        return getFurnitureCustomSuiteListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
-          getFurnitureCustomSuiteListFieldBuilder() {
-        if (furnitureCustomSuiteListBuilder_ == null) {
-          furnitureCustomSuiteListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder>(
-                  furnitureCustomSuiteList_,
-                  ((bitField0_ & 0x00000008) != 0),
-                  getParentForChildren(),
-                  isClean());
-          furnitureCustomSuiteList_ = null;
-        }
-        return furnitureCustomSuiteListBuilder_;
-      }
-
-      private int blockId_ ;
-      /**
-       * <code>uint32 block_id = 8;</code>
-       * @return The blockId.
-       */
-      @java.lang.Override
-      public int getBlockId() {
-        return blockId_;
-      }
-      /**
-       * <code>uint32 block_id = 8;</code>
-       * @param value The blockId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBlockId(int value) {
-        
-        blockId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 block_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBlockId() {
-        
-        blockId_ = 0;
-        onChanged();
-        return this;
+        return persistentFurnitureListBuilder_;
       }
 
       private java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> furnitureGroupList_ =
         java.util.Collections.emptyList();
       private void ensureFurnitureGroupListIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
+        if (!((bitField0_ & 0x00000008) != 0)) {
           furnitureGroupList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData>(furnitureGroupList_);
-          bitField0_ |= 0x00000010;
+          bitField0_ |= 0x00000008;
          }
       }
 
@@ -2833,7 +2585,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> furnitureGroupListBuilder_;
 
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> getFurnitureGroupListList() {
         if (furnitureGroupListBuilder_ == null) {
@@ -2843,7 +2595,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public int getFurnitureGroupListCount() {
         if (furnitureGroupListBuilder_ == null) {
@@ -2853,7 +2605,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData getFurnitureGroupList(int index) {
         if (furnitureGroupListBuilder_ == null) {
@@ -2863,7 +2615,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder setFurnitureGroupList(
           int index, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData value) {
@@ -2880,7 +2632,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder setFurnitureGroupList(
           int index, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder builderForValue) {
@@ -2894,7 +2646,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder addFurnitureGroupList(emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData value) {
         if (furnitureGroupListBuilder_ == null) {
@@ -2910,7 +2662,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder addFurnitureGroupList(
           int index, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData value) {
@@ -2927,7 +2679,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder addFurnitureGroupList(
           emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder builderForValue) {
@@ -2941,7 +2693,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder addFurnitureGroupList(
           int index, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder builderForValue) {
@@ -2955,7 +2707,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder addAllFurnitureGroupList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData> values) {
@@ -2970,12 +2722,12 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder clearFurnitureGroupList() {
         if (furnitureGroupListBuilder_ == null) {
           furnitureGroupList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000010);
+          bitField0_ = (bitField0_ & ~0x00000008);
           onChanged();
         } else {
           furnitureGroupListBuilder_.clear();
@@ -2983,7 +2735,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public Builder removeFurnitureGroupList(int index) {
         if (furnitureGroupListBuilder_ == null) {
@@ -2996,14 +2748,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder getFurnitureGroupListBuilder(
           int index) {
         return getFurnitureGroupListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder getFurnitureGroupListOrBuilder(
           int index) {
@@ -3013,7 +2765,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder> 
            getFurnitureGroupListOrBuilderList() {
@@ -3024,14 +2776,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder addFurnitureGroupListBuilder() {
         return getFurnitureGroupListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder addFurnitureGroupListBuilder(
           int index) {
@@ -3039,7 +2791,7 @@ public final class HomeBlockArrangementInfoOuterClass {
             index, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 4;</code>
+       * <code>repeated .HomeFurnitureGroupData furniture_group_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder> 
            getFurnitureGroupListBuilderList() {
@@ -3052,7 +2804,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           furnitureGroupListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupDataOrBuilder>(
                   furnitureGroupList_,
-                  ((bitField0_ & 0x00000010) != 0),
+                  ((bitField0_ & 0x00000008) != 0),
                   getParentForChildren(),
                   isClean());
           furnitureGroupList_ = null;
@@ -3060,6 +2812,246 @@ public final class HomeBlockArrangementInfoOuterClass {
         return furnitureGroupListBuilder_;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> deployNpcList_ =
+        java.util.Collections.emptyList();
+      private void ensureDeployNpcListIsMutable() {
+        if (!((bitField0_ & 0x00000010) != 0)) {
+          deployNpcList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData>(deployNpcList_);
+          bitField0_ |= 0x00000010;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> deployNpcListBuilder_;
+
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> getDeployNpcListList() {
+        if (deployNpcListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(deployNpcList_);
+        } else {
+          return deployNpcListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public int getDeployNpcListCount() {
+        if (deployNpcListBuilder_ == null) {
+          return deployNpcList_.size();
+        } else {
+          return deployNpcListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData getDeployNpcList(int index) {
+        if (deployNpcListBuilder_ == null) {
+          return deployNpcList_.get(index);
+        } else {
+          return deployNpcListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder setDeployNpcList(
+          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
+        if (deployNpcListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.set(index, value);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder setDeployNpcList(
+          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
+        if (deployNpcListBuilder_ == null) {
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          deployNpcListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder addDeployNpcList(emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
+        if (deployNpcListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.add(value);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder addDeployNpcList(
+          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
+        if (deployNpcListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.add(index, value);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder addDeployNpcList(
+          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
+        if (deployNpcListBuilder_ == null) {
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          deployNpcListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder addDeployNpcList(
+          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
+        if (deployNpcListBuilder_ == null) {
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          deployNpcListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder addAllDeployNpcList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> values) {
+        if (deployNpcListBuilder_ == null) {
+          ensureDeployNpcListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, deployNpcList_);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder clearDeployNpcList() {
+        if (deployNpcListBuilder_ == null) {
+          deployNpcList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000010);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public Builder removeDeployNpcList(int index) {
+        if (deployNpcListBuilder_ == null) {
+          ensureDeployNpcListIsMutable();
+          deployNpcList_.remove(index);
+          onChanged();
+        } else {
+          deployNpcListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder getDeployNpcListBuilder(
+          int index) {
+        return getDeployNpcListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder getDeployNpcListOrBuilder(
+          int index) {
+        if (deployNpcListBuilder_ == null) {
+          return deployNpcList_.get(index);  } else {
+          return deployNpcListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
+           getDeployNpcListOrBuilderList() {
+        if (deployNpcListBuilder_ != null) {
+          return deployNpcListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(deployNpcList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder addDeployNpcListBuilder() {
+        return getDeployNpcListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder addDeployNpcListBuilder(
+          int index) {
+        return getDeployNpcListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeNpcData deploy_npc_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder> 
+           getDeployNpcListBuilderList() {
+        return getDeployNpcListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
+          getDeployNpcListFieldBuilder() {
+        if (deployNpcListBuilder_ == null) {
+          deployNpcListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder>(
+                  deployNpcList_,
+                  ((bitField0_ & 0x00000010) != 0),
+                  getParentForChildren(),
+                  isClean());
+          deployNpcList_ = null;
+        }
+        return deployNpcListBuilder_;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> deployAnimalList_ =
         java.util.Collections.emptyList();
       private void ensureDeployAnimalListIsMutable() {
@@ -3073,7 +3065,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> deployAnimalListBuilder_;
 
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> getDeployAnimalListList() {
         if (deployAnimalListBuilder_ == null) {
@@ -3083,7 +3075,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public int getDeployAnimalListCount() {
         if (deployAnimalListBuilder_ == null) {
@@ -3093,7 +3085,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData getDeployAnimalList(int index) {
         if (deployAnimalListBuilder_ == null) {
@@ -3103,7 +3095,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder setDeployAnimalList(
           int index, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData value) {
@@ -3120,7 +3112,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder setDeployAnimalList(
           int index, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder builderForValue) {
@@ -3134,7 +3126,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder addDeployAnimalList(emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData value) {
         if (deployAnimalListBuilder_ == null) {
@@ -3150,7 +3142,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder addDeployAnimalList(
           int index, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData value) {
@@ -3167,7 +3159,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder addDeployAnimalList(
           emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder builderForValue) {
@@ -3181,7 +3173,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder addDeployAnimalList(
           int index, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder builderForValue) {
@@ -3195,7 +3187,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder addAllDeployAnimalList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData> values) {
@@ -3210,7 +3202,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder clearDeployAnimalList() {
         if (deployAnimalListBuilder_ == null) {
@@ -3223,7 +3215,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public Builder removeDeployAnimalList(int index) {
         if (deployAnimalListBuilder_ == null) {
@@ -3236,14 +3228,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder getDeployAnimalListBuilder(
           int index) {
         return getDeployAnimalListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder getDeployAnimalListOrBuilder(
           int index) {
@@ -3253,7 +3245,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalDataOrBuilder> 
            getDeployAnimalListOrBuilderList() {
@@ -3264,14 +3256,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder addDeployAnimalListBuilder() {
         return getDeployAnimalListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder addDeployAnimalListBuilder(
           int index) {
@@ -3279,7 +3271,7 @@ public final class HomeBlockArrangementInfoOuterClass {
             index, emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeAnimalData deploy_animal_list = 15;</code>
+       * <code>repeated .HomeAnimalData deploy_animal_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeAnimalDataOuterClass.HomeAnimalData.Builder> 
            getDeployAnimalListBuilderList() {
@@ -3300,760 +3292,520 @@ public final class HomeBlockArrangementInfoOuterClass {
         return deployAnimalListBuilder_;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> fieldList_ =
+      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> furnitureCustomSuiteList_ =
         java.util.Collections.emptyList();
-      private void ensureFieldListIsMutable() {
+      private void ensureFurnitureCustomSuiteListIsMutable() {
         if (!((bitField0_ & 0x00000040) != 0)) {
-          fieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData>(fieldList_);
+          furnitureCustomSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData>(furnitureCustomSuiteList_);
           bitField0_ |= 0x00000040;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> fieldListBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> furnitureCustomSuiteListBuilder_;
 
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> getFieldListList() {
-        if (fieldListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(fieldList_);
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> getFurnitureCustomSuiteListList() {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
         } else {
-          return fieldListBuilder_.getMessageList();
+          return furnitureCustomSuiteListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public int getFieldListCount() {
-        if (fieldListBuilder_ == null) {
-          return fieldList_.size();
+      public int getFurnitureCustomSuiteListCount() {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          return furnitureCustomSuiteList_.size();
         } else {
-          return fieldListBuilder_.getCount();
+          return furnitureCustomSuiteListBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index) {
-        if (fieldListBuilder_ == null) {
-          return fieldList_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData getFurnitureCustomSuiteList(int index) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          return furnitureCustomSuiteList_.get(index);
         } else {
-          return fieldListBuilder_.getMessage(index);
+          return furnitureCustomSuiteListBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder setFieldList(
-          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
-        if (fieldListBuilder_ == null) {
+      public Builder setFurnitureCustomSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFieldListIsMutable();
-          fieldList_.set(index, value);
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.set(index, value);
           onChanged();
         } else {
-          fieldListBuilder_.setMessage(index, value);
+          furnitureCustomSuiteListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder setFieldList(
-          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
-        if (fieldListBuilder_ == null) {
-          ensureFieldListIsMutable();
-          fieldList_.set(index, builderForValue.build());
+      public Builder setFurnitureCustomSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          fieldListBuilder_.setMessage(index, builderForValue.build());
+          furnitureCustomSuiteListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder addFieldList(emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
-        if (fieldListBuilder_ == null) {
+      public Builder addFurnitureCustomSuiteList(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFieldListIsMutable();
-          fieldList_.add(value);
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.add(value);
           onChanged();
         } else {
-          fieldListBuilder_.addMessage(value);
+          furnitureCustomSuiteListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder addFieldList(
-          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
-        if (fieldListBuilder_ == null) {
+      public Builder addFurnitureCustomSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData value) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensureFieldListIsMutable();
-          fieldList_.add(index, value);
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.add(index, value);
           onChanged();
         } else {
-          fieldListBuilder_.addMessage(index, value);
+          furnitureCustomSuiteListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder addFieldList(
-          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
-        if (fieldListBuilder_ == null) {
-          ensureFieldListIsMutable();
-          fieldList_.add(builderForValue.build());
+      public Builder addFurnitureCustomSuiteList(
+          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.add(builderForValue.build());
           onChanged();
         } else {
-          fieldListBuilder_.addMessage(builderForValue.build());
+          furnitureCustomSuiteListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder addFieldList(
-          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
-        if (fieldListBuilder_ == null) {
-          ensureFieldListIsMutable();
-          fieldList_.add(index, builderForValue.build());
+      public Builder addFurnitureCustomSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder builderForValue) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          fieldListBuilder_.addMessage(index, builderForValue.build());
+          furnitureCustomSuiteListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder addAllFieldList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> values) {
-        if (fieldListBuilder_ == null) {
-          ensureFieldListIsMutable();
+      public Builder addAllFurnitureCustomSuiteList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData> values) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          ensureFurnitureCustomSuiteListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, fieldList_);
+              values, furnitureCustomSuiteList_);
           onChanged();
         } else {
-          fieldListBuilder_.addAllMessages(values);
+          furnitureCustomSuiteListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder clearFieldList() {
-        if (fieldListBuilder_ == null) {
-          fieldList_ = java.util.Collections.emptyList();
+      public Builder clearFurnitureCustomSuiteList() {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          furnitureCustomSuiteList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000040);
           onChanged();
         } else {
-          fieldListBuilder_.clear();
+          furnitureCustomSuiteListBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public Builder removeFieldList(int index) {
-        if (fieldListBuilder_ == null) {
-          ensureFieldListIsMutable();
-          fieldList_.remove(index);
+      public Builder removeFurnitureCustomSuiteList(int index) {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          ensureFurnitureCustomSuiteListIsMutable();
+          furnitureCustomSuiteList_.remove(index);
           onChanged();
         } else {
-          fieldListBuilder_.remove(index);
+          furnitureCustomSuiteListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder getFieldListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder getFurnitureCustomSuiteListBuilder(
           int index) {
-        return getFieldListFieldBuilder().getBuilder(index);
+        return getFurnitureCustomSuiteListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder getFurnitureCustomSuiteListOrBuilder(
           int index) {
-        if (fieldListBuilder_ == null) {
-          return fieldList_.get(index);  } else {
-          return fieldListBuilder_.getMessageOrBuilder(index);
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          return furnitureCustomSuiteList_.get(index);  } else {
+          return furnitureCustomSuiteListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
-           getFieldListOrBuilderList() {
-        if (fieldListBuilder_ != null) {
-          return fieldListBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
+           getFurnitureCustomSuiteListOrBuilderList() {
+        if (furnitureCustomSuiteListBuilder_ != null) {
+          return furnitureCustomSuiteListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(fieldList_);
+          return java.util.Collections.unmodifiableList(furnitureCustomSuiteList_);
         }
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder addFieldListBuilder() {
-        return getFieldListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.getDefaultInstance());
+      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder addFurnitureCustomSuiteListBuilder() {
+        return getFurnitureCustomSuiteListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder addFieldListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder addFurnitureCustomSuiteListBuilder(
           int index) {
-        return getFieldListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.getDefaultInstance());
+        return getFurnitureCustomSuiteListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeBlockFieldData field_list = 11;</code>
+       * <code>repeated .HomeFurnitureCustomSuiteData furniture_custom_suite_list = 10;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder> 
-           getFieldListBuilderList() {
-        return getFieldListFieldBuilder().getBuilderList();
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder> 
+           getFurnitureCustomSuiteListBuilderList() {
+        return getFurnitureCustomSuiteListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
-          getFieldListFieldBuilder() {
-        if (fieldListBuilder_ == null) {
-          fieldListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder>(
-                  fieldList_,
+          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder> 
+          getFurnitureCustomSuiteListFieldBuilder() {
+        if (furnitureCustomSuiteListBuilder_ == null) {
+          furnitureCustomSuiteListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteDataOrBuilder>(
+                  furnitureCustomSuiteList_,
                   ((bitField0_ & 0x00000040) != 0),
                   getParentForChildren(),
                   isClean());
-          fieldList_ = null;
+          furnitureCustomSuiteList_ = null;
         }
-        return fieldListBuilder_;
+        return furnitureCustomSuiteListBuilder_;
       }
 
-      private int comfortValue_ ;
-      /**
-       * <code>uint32 comfort_value = 13;</code>
-       * @return The comfortValue.
-       */
-      @java.lang.Override
-      public int getComfortValue() {
-        return comfortValue_;
-      }
-      /**
-       * <code>uint32 comfort_value = 13;</code>
-       * @param value The comfortValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setComfortValue(int value) {
-        
-        comfortValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 comfort_value = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearComfortValue() {
-        
-        comfortValue_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> persistentFurnitureList_ =
+      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> furnitureSuiteList_ =
         java.util.Collections.emptyList();
-      private void ensurePersistentFurnitureListIsMutable() {
+      private void ensureFurnitureSuiteListIsMutable() {
         if (!((bitField0_ & 0x00000080) != 0)) {
-          persistentFurnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(persistentFurnitureList_);
+          furnitureSuiteList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData>(furnitureSuiteList_);
           bitField0_ |= 0x00000080;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> persistentFurnitureListBuilder_;
+          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> furnitureSuiteListBuilder_;
 
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getPersistentFurnitureListList() {
-        if (persistentFurnitureListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> getFurnitureSuiteListList() {
+        if (furnitureSuiteListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(furnitureSuiteList_);
         } else {
-          return persistentFurnitureListBuilder_.getMessageList();
+          return furnitureSuiteListBuilder_.getMessageList();
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public int getPersistentFurnitureListCount() {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.size();
+      public int getFurnitureSuiteListCount() {
+        if (furnitureSuiteListBuilder_ == null) {
+          return furnitureSuiteList_.size();
         } else {
-          return persistentFurnitureListBuilder_.getCount();
+          return furnitureSuiteListBuilder_.getCount();
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getPersistentFurnitureList(int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.get(index);
+      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData getFurnitureSuiteList(int index) {
+        if (furnitureSuiteListBuilder_ == null) {
+          return furnitureSuiteList_.get(index);
         } else {
-          return persistentFurnitureListBuilder_.getMessage(index);
+          return furnitureSuiteListBuilder_.getMessage(index);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder setPersistentFurnitureList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+      public Builder setFurnitureSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
+        if (furnitureSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.set(index, value);
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.set(index, value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.setMessage(index, value);
+          furnitureSuiteListBuilder_.setMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder setPersistentFurnitureList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.set(index, builderForValue.build());
+      public Builder setFurnitureSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
+        if (furnitureSuiteListBuilder_ == null) {
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.set(index, builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.setMessage(index, builderForValue.build());
+          furnitureSuiteListBuilder_.setMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder addPersistentFurnitureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+      public Builder addFurnitureSuiteList(emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
+        if (furnitureSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(value);
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.add(value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(value);
+          furnitureSuiteListBuilder_.addMessage(value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder addPersistentFurnitureList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (persistentFurnitureListBuilder_ == null) {
+      public Builder addFurnitureSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData value) {
+        if (furnitureSuiteListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(index, value);
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.add(index, value);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(index, value);
+          furnitureSuiteListBuilder_.addMessage(index, value);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder addPersistentFurnitureList(
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(builderForValue.build());
+      public Builder addFurnitureSuiteList(
+          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
+        if (furnitureSuiteListBuilder_ == null) {
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.add(builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(builderForValue.build());
+          furnitureSuiteListBuilder_.addMessage(builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder addPersistentFurnitureList(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.add(index, builderForValue.build());
+      public Builder addFurnitureSuiteList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder builderForValue) {
+        if (furnitureSuiteListBuilder_ == null) {
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.add(index, builderForValue.build());
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addMessage(index, builderForValue.build());
+          furnitureSuiteListBuilder_.addMessage(index, builderForValue.build());
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder addAllPersistentFurnitureList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
+      public Builder addAllFurnitureSuiteList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData> values) {
+        if (furnitureSuiteListBuilder_ == null) {
+          ensureFurnitureSuiteListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, persistentFurnitureList_);
+              values, furnitureSuiteList_);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.addAllMessages(values);
+          furnitureSuiteListBuilder_.addAllMessages(values);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder clearPersistentFurnitureList() {
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureList_ = java.util.Collections.emptyList();
+      public Builder clearFurnitureSuiteList() {
+        if (furnitureSuiteListBuilder_ == null) {
+          furnitureSuiteList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000080);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.clear();
+          furnitureSuiteListBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public Builder removePersistentFurnitureList(int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          ensurePersistentFurnitureListIsMutable();
-          persistentFurnitureList_.remove(index);
+      public Builder removeFurnitureSuiteList(int index) {
+        if (furnitureSuiteListBuilder_ == null) {
+          ensureFurnitureSuiteListIsMutable();
+          furnitureSuiteList_.remove(index);
           onChanged();
         } else {
-          persistentFurnitureListBuilder_.remove(index);
+          furnitureSuiteListBuilder_.remove(index);
         }
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getPersistentFurnitureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder getFurnitureSuiteListBuilder(
           int index) {
-        return getPersistentFurnitureListFieldBuilder().getBuilder(index);
+        return getFurnitureSuiteListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getPersistentFurnitureListOrBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder getFurnitureSuiteListOrBuilder(
           int index) {
-        if (persistentFurnitureListBuilder_ == null) {
-          return persistentFurnitureList_.get(index);  } else {
-          return persistentFurnitureListBuilder_.getMessageOrBuilder(index);
+        if (furnitureSuiteListBuilder_ == null) {
+          return furnitureSuiteList_.get(index);  } else {
+          return furnitureSuiteListBuilder_.getMessageOrBuilder(index);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-           getPersistentFurnitureListOrBuilderList() {
-        if (persistentFurnitureListBuilder_ != null) {
-          return persistentFurnitureListBuilder_.getMessageOrBuilderList();
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
+           getFurnitureSuiteListOrBuilderList() {
+        if (furnitureSuiteListBuilder_ != null) {
+          return furnitureSuiteListBuilder_.getMessageOrBuilderList();
         } else {
-          return java.util.Collections.unmodifiableList(persistentFurnitureList_);
+          return java.util.Collections.unmodifiableList(furnitureSuiteList_);
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder() {
-        return getPersistentFurnitureListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder addFurnitureSuiteListBuilder() {
+        return getFurnitureSuiteListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addPersistentFurnitureListBuilder(
+      public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder addFurnitureSuiteListBuilder(
           int index) {
-        return getPersistentFurnitureListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+        return getFurnitureSuiteListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData persistentFurnitureList = 10;</code>
+       * <code>repeated .HomeFurnitureSuiteData furniture_suite_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
-           getPersistentFurnitureListBuilderList() {
-        return getPersistentFurnitureListFieldBuilder().getBuilderList();
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder> 
+           getFurnitureSuiteListBuilderList() {
+        return getFurnitureSuiteListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getPersistentFurnitureListFieldBuilder() {
-        if (persistentFurnitureListBuilder_ == null) {
-          persistentFurnitureListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  persistentFurnitureList_,
+          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder> 
+          getFurnitureSuiteListFieldBuilder() {
+        if (furnitureSuiteListBuilder_ == null) {
+          furnitureSuiteListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteDataOrBuilder>(
+                  furnitureSuiteList_,
                   ((bitField0_ & 0x00000080) != 0),
                   getParentForChildren(),
                   isClean());
-          persistentFurnitureList_ = null;
+          furnitureSuiteList_ = null;
         }
-        return persistentFurnitureListBuilder_;
+        return furnitureSuiteListBuilder_;
       }
 
-      private java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> deployNpcList_ =
-        java.util.Collections.emptyList();
-      private void ensureDeployNpcListIsMutable() {
-        if (!((bitField0_ & 0x00000100) != 0)) {
-          deployNpcList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData>(deployNpcList_);
-          bitField0_ |= 0x00000100;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> deployNpcListBuilder_;
-
+      private int blockId_ ;
       /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+       * <code>uint32 block_id = 12;</code>
+       * @return The blockId.
        */
-      public java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> getDeployNpcListList() {
-        if (deployNpcListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(deployNpcList_);
-        } else {
-          return deployNpcListBuilder_.getMessageList();
-        }
+      @java.lang.Override
+      public int getBlockId() {
+        return blockId_;
       }
       /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+       * <code>uint32 block_id = 12;</code>
+       * @param value The blockId to set.
+       * @return This builder for chaining.
        */
-      public int getDeployNpcListCount() {
-        if (deployNpcListBuilder_ == null) {
-          return deployNpcList_.size();
-        } else {
-          return deployNpcListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData getDeployNpcList(int index) {
-        if (deployNpcListBuilder_ == null) {
-          return deployNpcList_.get(index);
-        } else {
-          return deployNpcListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder setDeployNpcList(
-          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
-        if (deployNpcListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.set(index, value);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.setMessage(index, value);
-        }
+      public Builder setBlockId(int value) {
+        
+        blockId_ = value;
+        onChanged();
         return this;
       }
       /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
+       * <code>uint32 block_id = 12;</code>
+       * @return This builder for chaining.
        */
-      public Builder setDeployNpcList(
-          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
-        if (deployNpcListBuilder_ == null) {
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          deployNpcListBuilder_.setMessage(index, builderForValue.build());
-        }
+      public Builder clearBlockId() {
+        
+        blockId_ = 0;
+        onChanged();
         return this;
       }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder addDeployNpcList(emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
-        if (deployNpcListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.add(value);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder addDeployNpcList(
-          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData value) {
-        if (deployNpcListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.add(index, value);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder addDeployNpcList(
-          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
-        if (deployNpcListBuilder_ == null) {
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          deployNpcListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder addDeployNpcList(
-          int index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder builderForValue) {
-        if (deployNpcListBuilder_ == null) {
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          deployNpcListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder addAllDeployNpcList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData> values) {
-        if (deployNpcListBuilder_ == null) {
-          ensureDeployNpcListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, deployNpcList_);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder clearDeployNpcList() {
-        if (deployNpcListBuilder_ == null) {
-          deployNpcList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000100);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public Builder removeDeployNpcList(int index) {
-        if (deployNpcListBuilder_ == null) {
-          ensureDeployNpcListIsMutable();
-          deployNpcList_.remove(index);
-          onChanged();
-        } else {
-          deployNpcListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder getDeployNpcListBuilder(
-          int index) {
-        return getDeployNpcListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder getDeployNpcListOrBuilder(
-          int index) {
-        if (deployNpcListBuilder_ == null) {
-          return deployNpcList_.get(index);  } else {
-          return deployNpcListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
-           getDeployNpcListOrBuilderList() {
-        if (deployNpcListBuilder_ != null) {
-          return deployNpcListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(deployNpcList_);
-        }
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder addDeployNpcListBuilder() {
-        return getDeployNpcListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder addDeployNpcListBuilder(
-          int index) {
-        return getDeployNpcListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeNpcData deploy_npc_list = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder> 
-           getDeployNpcListBuilderList() {
-        return getDeployNpcListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder> 
-          getDeployNpcListFieldBuilder() {
-        if (deployNpcListBuilder_ == null) {
-          deployNpcListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcDataOrBuilder>(
-                  deployNpcList_,
-                  ((bitField0_ & 0x00000100) != 0),
-                  getParentForChildren(),
-                  isClean());
-          deployNpcList_ = null;
-        }
-        return deployNpcListBuilder_;
-      }
 
       private boolean isUnlocked_ ;
       /**
-       * <code>bool is_unlocked = 6;</code>
+       * <code>bool is_unlocked = 13;</code>
        * @return The isUnlocked.
        */
       @java.lang.Override
@@ -4061,7 +3813,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return isUnlocked_;
       }
       /**
-       * <code>bool is_unlocked = 6;</code>
+       * <code>bool is_unlocked = 13;</code>
        * @param value The isUnlocked to set.
        * @return This builder for chaining.
        */
@@ -4072,7 +3824,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_unlocked = 6;</code>
+       * <code>bool is_unlocked = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsUnlocked() {
@@ -4085,9 +3837,9 @@ public final class HomeBlockArrangementInfoOuterClass {
       private java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> weekendDjinnInfoList_ =
         java.util.Collections.emptyList();
       private void ensureWeekendDjinnInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000200) != 0)) {
+        if (!((bitField0_ & 0x00000100) != 0)) {
           weekendDjinnInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo>(weekendDjinnInfoList_);
-          bitField0_ |= 0x00000200;
+          bitField0_ |= 0x00000100;
          }
       }
 
@@ -4095,7 +3847,7 @@ public final class HomeBlockArrangementInfoOuterClass {
           emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder> weekendDjinnInfoListBuilder_;
 
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> getWeekendDjinnInfoListList() {
         if (weekendDjinnInfoListBuilder_ == null) {
@@ -4105,7 +3857,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public int getWeekendDjinnInfoListCount() {
         if (weekendDjinnInfoListBuilder_ == null) {
@@ -4115,7 +3867,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo getWeekendDjinnInfoList(int index) {
         if (weekendDjinnInfoListBuilder_ == null) {
@@ -4125,7 +3877,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder setWeekendDjinnInfoList(
           int index, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo value) {
@@ -4142,7 +3894,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder setWeekendDjinnInfoList(
           int index, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder builderForValue) {
@@ -4156,7 +3908,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder addWeekendDjinnInfoList(emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo value) {
         if (weekendDjinnInfoListBuilder_ == null) {
@@ -4172,7 +3924,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder addWeekendDjinnInfoList(
           int index, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo value) {
@@ -4189,7 +3941,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder addWeekendDjinnInfoList(
           emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder builderForValue) {
@@ -4203,7 +3955,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder addWeekendDjinnInfoList(
           int index, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder builderForValue) {
@@ -4217,7 +3969,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder addAllWeekendDjinnInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo> values) {
@@ -4232,12 +3984,12 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder clearWeekendDjinnInfoList() {
         if (weekendDjinnInfoListBuilder_ == null) {
           weekendDjinnInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000200);
+          bitField0_ = (bitField0_ & ~0x00000100);
           onChanged();
         } else {
           weekendDjinnInfoListBuilder_.clear();
@@ -4245,7 +3997,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public Builder removeWeekendDjinnInfoList(int index) {
         if (weekendDjinnInfoListBuilder_ == null) {
@@ -4258,14 +4010,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder getWeekendDjinnInfoListBuilder(
           int index) {
         return getWeekendDjinnInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder getWeekendDjinnInfoListOrBuilder(
           int index) {
@@ -4275,7 +4027,7 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder> 
            getWeekendDjinnInfoListOrBuilderList() {
@@ -4286,14 +4038,14 @@ public final class HomeBlockArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder addWeekendDjinnInfoListBuilder() {
         return getWeekendDjinnInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder addWeekendDjinnInfoListBuilder(
           int index) {
@@ -4301,7 +4053,7 @@ public final class HomeBlockArrangementInfoOuterClass {
             index, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 3;</code>
+       * <code>repeated .WeekendDjinnInfo weekend_djinn_info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder> 
            getWeekendDjinnInfoListBuilderList() {
@@ -4314,13 +4066,253 @@ public final class HomeBlockArrangementInfoOuterClass {
           weekendDjinnInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfoOrBuilder>(
                   weekendDjinnInfoList_,
-                  ((bitField0_ & 0x00000200) != 0),
+                  ((bitField0_ & 0x00000100) != 0),
                   getParentForChildren(),
                   isClean());
           weekendDjinnInfoList_ = null;
         }
         return weekendDjinnInfoListBuilder_;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> fieldList_ =
+        java.util.Collections.emptyList();
+      private void ensureFieldListIsMutable() {
+        if (!((bitField0_ & 0x00000200) != 0)) {
+          fieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData>(fieldList_);
+          bitField0_ |= 0x00000200;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> fieldListBuilder_;
+
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> getFieldListList() {
+        if (fieldListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(fieldList_);
+        } else {
+          return fieldListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public int getFieldListCount() {
+        if (fieldListBuilder_ == null) {
+          return fieldList_.size();
+        } else {
+          return fieldListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData getFieldList(int index) {
+        if (fieldListBuilder_ == null) {
+          return fieldList_.get(index);
+        } else {
+          return fieldListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder setFieldList(
+          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
+        if (fieldListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFieldListIsMutable();
+          fieldList_.set(index, value);
+          onChanged();
+        } else {
+          fieldListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder setFieldList(
+          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
+        if (fieldListBuilder_ == null) {
+          ensureFieldListIsMutable();
+          fieldList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          fieldListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder addFieldList(emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
+        if (fieldListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFieldListIsMutable();
+          fieldList_.add(value);
+          onChanged();
+        } else {
+          fieldListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder addFieldList(
+          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData value) {
+        if (fieldListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureFieldListIsMutable();
+          fieldList_.add(index, value);
+          onChanged();
+        } else {
+          fieldListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder addFieldList(
+          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
+        if (fieldListBuilder_ == null) {
+          ensureFieldListIsMutable();
+          fieldList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          fieldListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder addFieldList(
+          int index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder builderForValue) {
+        if (fieldListBuilder_ == null) {
+          ensureFieldListIsMutable();
+          fieldList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          fieldListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder addAllFieldList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData> values) {
+        if (fieldListBuilder_ == null) {
+          ensureFieldListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fieldList_);
+          onChanged();
+        } else {
+          fieldListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder clearFieldList() {
+        if (fieldListBuilder_ == null) {
+          fieldList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000200);
+          onChanged();
+        } else {
+          fieldListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public Builder removeFieldList(int index) {
+        if (fieldListBuilder_ == null) {
+          ensureFieldListIsMutable();
+          fieldList_.remove(index);
+          onChanged();
+        } else {
+          fieldListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder getFieldListBuilder(
+          int index) {
+        return getFieldListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder getFieldListOrBuilder(
+          int index) {
+        if (fieldListBuilder_ == null) {
+          return fieldList_.get(index);  } else {
+          return fieldListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
+           getFieldListOrBuilderList() {
+        if (fieldListBuilder_ != null) {
+          return fieldListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(fieldList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder addFieldListBuilder() {
+        return getFieldListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder addFieldListBuilder(
+          int index) {
+        return getFieldListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockFieldData field_list = 15;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder> 
+           getFieldListBuilderList() {
+        return getFieldListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder> 
+          getFieldListFieldBuilder() {
+        if (fieldListBuilder_ == null) {
+          fieldListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldDataOrBuilder>(
+                  fieldList_,
+                  ((bitField0_ & 0x00000200) != 0),
+                  getParentForChildren(),
+                  isClean());
+          fieldList_ = null;
+        }
+        return fieldListBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4388,58 +4380,58 @@ public final class HomeBlockArrangementInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\036HomeBlockArrangementInfo.proto\032\031HomeBl" +
-      "ockDotPattern.proto\032\027HomeFurnitureData.p" +
-      "roto\032\034HomeFurnitureSuiteData.proto\032\"Home" +
-      "FurnitureCustomSuiteData.proto\032\034HomeFurn" +
-      "itureGroupData.proto\032\024HomeAnimalData.pro" +
-      "to\032\030HomeBlockFieldData.proto\032\021HomeNpcDat" +
-      "a.proto\032\026WeekendDjinnInfo.proto\"\320\004\n\030Home" +
-      "BlockArrangementInfo\022.\n\020dot_pattern_list" +
-      "\030\001 \003(\0132\024.HomeBlockDotPattern\022.\n\022deployFu" +
-      "rniureList\030\014 \003(\0132\022.HomeFurnitureData\0225\n\024" +
-      "furniture_suite_list\030\016 \003(\0132\027.HomeFurnitu" +
-      "reSuiteData\022B\n\033furniture_custom_suite_li" +
-      "st\030\002 \003(\0132\035.HomeFurnitureCustomSuiteData\022" +
-      "\020\n\010block_id\030\010 \001(\r\0225\n\024furniture_group_lis" +
-      "t\030\004 \003(\0132\027.HomeFurnitureGroupData\022+\n\022depl" +
-      "oy_animal_list\030\017 \003(\0132\017.HomeAnimalData\022\'\n" +
-      "\nfield_list\030\013 \003(\0132\023.HomeBlockFieldData\022\025" +
-      "\n\rcomfort_value\030\r \001(\r\0223\n\027persistentFurni" +
-      "tureList\030\n \003(\0132\022.HomeFurnitureData\022%\n\017de" +
-      "ploy_npc_list\030\t \003(\0132\014.HomeNpcData\022\023\n\013is_" +
-      "unlocked\030\006 \001(\010\0222\n\027weekend_djinn_info_lis" +
-      "t\030\003 \003(\0132\021.WeekendDjinnInfoB\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "\n\036HomeBlockArrangementInfo.proto\032\027HomeFu" +
+      "rnitureData.proto\032\031HomeBlockDotPattern.p" +
+      "roto\032\034HomeFurnitureGroupData.proto\032\021Home" +
+      "NpcData.proto\032\024HomeAnimalData.proto\032\"Hom" +
+      "eFurnitureCustomSuiteData.proto\032\034HomeFur" +
+      "nitureSuiteData.proto\032\026WeekendDjinnInfo." +
+      "proto\032\030HomeBlockFieldData.proto\"\324\004\n\030Home" +
+      "BlockArrangementInfo\022\025\n\rcomfort_value\030\001 " +
+      "\001(\r\0220\n\024deploy_furniure_list\030\002 \003(\0132\022.Home" +
+      "FurnitureData\022.\n\020dot_pattern_list\030\003 \003(\0132" +
+      "\024.HomeBlockDotPattern\0225\n\031persistent_furn" +
+      "iture_list\030\004 \003(\0132\022.HomeFurnitureData\0225\n\024" +
+      "furniture_group_list\030\006 \003(\0132\027.HomeFurnitu" +
+      "reGroupData\022%\n\017deploy_npc_list\030\010 \003(\0132\014.H" +
+      "omeNpcData\022+\n\022deploy_animal_list\030\t \003(\0132\017" +
+      ".HomeAnimalData\022B\n\033furniture_custom_suit" +
+      "e_list\030\n \003(\0132\035.HomeFurnitureCustomSuiteD" +
+      "ata\0225\n\024furniture_suite_list\030\013 \003(\0132\027.Home" +
+      "FurnitureSuiteData\022\020\n\010block_id\030\014 \001(\r\022\023\n\013" +
+      "is_unlocked\030\r \001(\010\0222\n\027weekend_djinn_info_" +
+      "list\030\016 \003(\0132\021.WeekendDjinnInfo\022\'\n\nfield_l" +
+      "ist\030\017 \003(\0132\023.HomeBlockFieldDataB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HomeAnimalDataOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HomeNpcDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeAnimalDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.getDescriptor(),
         });
     internal_static_HomeBlockArrangementInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_HomeBlockArrangementInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBlockArrangementInfo_descriptor,
-        new java.lang.String[] { "DotPatternList", "DeployFurniureList", "FurnitureSuiteList", "FurnitureCustomSuiteList", "BlockId", "FurnitureGroupList", "DeployAnimalList", "FieldList", "ComfortValue", "PersistentFurnitureList", "DeployNpcList", "IsUnlocked", "WeekendDjinnInfoList", });
-    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.getDescriptor();
+        new java.lang.String[] { "ComfortValue", "DeployFurniureList", "DotPatternList", "PersistentFurnitureList", "FurnitureGroupList", "DeployNpcList", "DeployAnimalList", "FurnitureCustomSuiteList", "FurnitureSuiteList", "BlockId", "IsUnlocked", "WeekendDjinnInfoList", "FieldList", });
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.HomeNpcDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeAnimalDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockDotPatternOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockDotPatternOuterClass.java
index f569e40e1..465b45872 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockDotPatternOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockDotPatternOuterClass.java
@@ -19,28 +19,24 @@ public final class HomeBlockDotPatternOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 width = 10;</code>
-     * @return The width.
+     * <code>uint32 height = 8;</code>
+     * @return The height.
      */
-    int getWidth();
+    int getHeight();
 
     /**
-     * <code>bytes data = 8;</code>
+     * <code>bytes data = 14;</code>
      * @return The data.
      */
     com.google.protobuf.ByteString getData();
 
     /**
-     * <code>uint32 height = 7;</code>
-     * @return The height.
+     * <code>uint32 width = 15;</code>
+     * @return The width.
      */
-    int getHeight();
+    int getWidth();
   }
   /**
-   * <pre>
-   * Obf: CEIDPNFLOBJ
-   * </pre>
-   *
    * Protobuf type {@code HomeBlockDotPattern}
    */
   public static final class HomeBlockDotPattern extends
@@ -86,17 +82,17 @@ public final class HomeBlockDotPatternOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 64: {
 
               height_ = input.readUInt32();
               break;
             }
-            case 66: {
+            case 114: {
 
               data_ = input.readBytes();
               break;
             }
-            case 80: {
+            case 120: {
 
               width_ = input.readUInt32();
               break;
@@ -133,21 +129,21 @@ public final class HomeBlockDotPatternOuterClass {
               emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.class, emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.Builder.class);
     }
 
-    public static final int WIDTH_FIELD_NUMBER = 10;
-    private int width_;
+    public static final int HEIGHT_FIELD_NUMBER = 8;
+    private int height_;
     /**
-     * <code>uint32 width = 10;</code>
-     * @return The width.
+     * <code>uint32 height = 8;</code>
+     * @return The height.
      */
     @java.lang.Override
-    public int getWidth() {
-      return width_;
+    public int getHeight() {
+      return height_;
     }
 
-    public static final int DATA_FIELD_NUMBER = 8;
+    public static final int DATA_FIELD_NUMBER = 14;
     private com.google.protobuf.ByteString data_;
     /**
-     * <code>bytes data = 8;</code>
+     * <code>bytes data = 14;</code>
      * @return The data.
      */
     @java.lang.Override
@@ -155,15 +151,15 @@ public final class HomeBlockDotPatternOuterClass {
       return data_;
     }
 
-    public static final int HEIGHT_FIELD_NUMBER = 7;
-    private int height_;
+    public static final int WIDTH_FIELD_NUMBER = 15;
+    private int width_;
     /**
-     * <code>uint32 height = 7;</code>
-     * @return The height.
+     * <code>uint32 width = 15;</code>
+     * @return The width.
      */
     @java.lang.Override
-    public int getHeight() {
-      return height_;
+    public int getWidth() {
+      return width_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -181,13 +177,13 @@ public final class HomeBlockDotPatternOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (height_ != 0) {
-        output.writeUInt32(7, height_);
+        output.writeUInt32(8, height_);
       }
       if (!data_.isEmpty()) {
-        output.writeBytes(8, data_);
+        output.writeBytes(14, data_);
       }
       if (width_ != 0) {
-        output.writeUInt32(10, width_);
+        output.writeUInt32(15, width_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +196,15 @@ public final class HomeBlockDotPatternOuterClass {
       size = 0;
       if (height_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, height_);
+          .computeUInt32Size(8, height_);
       }
       if (!data_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(8, data_);
+          .computeBytesSize(14, data_);
       }
       if (width_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, width_);
+          .computeUInt32Size(15, width_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +221,12 @@ public final class HomeBlockDotPatternOuterClass {
       }
       emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern other = (emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern) obj;
 
-      if (getWidth()
-          != other.getWidth()) return false;
-      if (!getData()
-          .equals(other.getData())) return false;
       if (getHeight()
           != other.getHeight()) return false;
+      if (!getData()
+          .equals(other.getData())) return false;
+      if (getWidth()
+          != other.getWidth()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +238,12 @@ public final class HomeBlockDotPatternOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + WIDTH_FIELD_NUMBER;
-      hash = (53 * hash) + getWidth();
-      hash = (37 * hash) + DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getData().hashCode();
       hash = (37 * hash) + HEIGHT_FIELD_NUMBER;
       hash = (53 * hash) + getHeight();
+      hash = (37 * hash) + DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getData().hashCode();
+      hash = (37 * hash) + WIDTH_FIELD_NUMBER;
+      hash = (53 * hash) + getWidth();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,10 +340,6 @@ public final class HomeBlockDotPatternOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CEIDPNFLOBJ
-     * </pre>
-     *
      * Protobuf type {@code HomeBlockDotPattern}
      */
     public static final class Builder extends
@@ -385,11 +377,11 @@ public final class HomeBlockDotPatternOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        width_ = 0;
+        height_ = 0;
 
         data_ = com.google.protobuf.ByteString.EMPTY;
 
-        height_ = 0;
+        width_ = 0;
 
         return this;
       }
@@ -417,9 +409,9 @@ public final class HomeBlockDotPatternOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern buildPartial() {
         emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern result = new emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern(this);
-        result.width_ = width_;
-        result.data_ = data_;
         result.height_ = height_;
+        result.data_ = data_;
+        result.width_ = width_;
         onBuilt();
         return result;
       }
@@ -468,14 +460,14 @@ public final class HomeBlockDotPatternOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern other) {
         if (other == emu.grasscutter.net.proto.HomeBlockDotPatternOuterClass.HomeBlockDotPattern.getDefaultInstance()) return this;
-        if (other.getWidth() != 0) {
-          setWidth(other.getWidth());
+        if (other.getHeight() != 0) {
+          setHeight(other.getHeight());
         }
         if (other.getData() != com.google.protobuf.ByteString.EMPTY) {
           setData(other.getData());
         }
-        if (other.getHeight() != 0) {
-          setHeight(other.getHeight());
+        if (other.getWidth() != 0) {
+          setWidth(other.getWidth());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -506,40 +498,40 @@ public final class HomeBlockDotPatternOuterClass {
         return this;
       }
 
-      private int width_ ;
+      private int height_ ;
       /**
-       * <code>uint32 width = 10;</code>
-       * @return The width.
+       * <code>uint32 height = 8;</code>
+       * @return The height.
        */
       @java.lang.Override
-      public int getWidth() {
-        return width_;
+      public int getHeight() {
+        return height_;
       }
       /**
-       * <code>uint32 width = 10;</code>
-       * @param value The width to set.
+       * <code>uint32 height = 8;</code>
+       * @param value The height to set.
        * @return This builder for chaining.
        */
-      public Builder setWidth(int value) {
+      public Builder setHeight(int value) {
         
-        width_ = value;
+        height_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 width = 10;</code>
+       * <code>uint32 height = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWidth() {
+      public Builder clearHeight() {
         
-        width_ = 0;
+        height_ = 0;
         onChanged();
         return this;
       }
 
       private com.google.protobuf.ByteString data_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes data = 8;</code>
+       * <code>bytes data = 14;</code>
        * @return The data.
        */
       @java.lang.Override
@@ -547,7 +539,7 @@ public final class HomeBlockDotPatternOuterClass {
         return data_;
       }
       /**
-       * <code>bytes data = 8;</code>
+       * <code>bytes data = 14;</code>
        * @param value The data to set.
        * @return This builder for chaining.
        */
@@ -561,7 +553,7 @@ public final class HomeBlockDotPatternOuterClass {
         return this;
       }
       /**
-       * <code>bytes data = 8;</code>
+       * <code>bytes data = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearData() {
@@ -571,33 +563,33 @@ public final class HomeBlockDotPatternOuterClass {
         return this;
       }
 
-      private int height_ ;
+      private int width_ ;
       /**
-       * <code>uint32 height = 7;</code>
-       * @return The height.
+       * <code>uint32 width = 15;</code>
+       * @return The width.
        */
       @java.lang.Override
-      public int getHeight() {
-        return height_;
+      public int getWidth() {
+        return width_;
       }
       /**
-       * <code>uint32 height = 7;</code>
-       * @param value The height to set.
+       * <code>uint32 width = 15;</code>
+       * @param value The width to set.
        * @return This builder for chaining.
        */
-      public Builder setHeight(int value) {
+      public Builder setWidth(int value) {
         
-        height_ = value;
+        width_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 height = 7;</code>
+       * <code>uint32 width = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHeight() {
+      public Builder clearWidth() {
         
-        height_ = 0;
+        width_ = 0;
         onChanged();
         return this;
       }
@@ -669,8 +661,8 @@ public final class HomeBlockDotPatternOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031HomeBlockDotPattern.proto\"B\n\023HomeBlock" +
-      "DotPattern\022\r\n\005width\030\n \001(\r\022\014\n\004data\030\010 \001(\014\022" +
-      "\016\n\006height\030\007 \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "DotPattern\022\016\n\006height\030\010 \001(\r\022\014\n\004data\030\016 \001(\014" +
+      "\022\r\n\005width\030\017 \001(\rB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -682,7 +674,7 @@ public final class HomeBlockDotPatternOuterClass {
     internal_static_HomeBlockDotPattern_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBlockDotPattern_descriptor,
-        new java.lang.String[] { "Width", "Data", "Height", });
+        new java.lang.String[] { "Height", "Data", "Width", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockFieldDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockFieldDataOuterClass.java
index 627a19e69..b8b021ad9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockFieldDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockFieldDataOuterClass.java
@@ -19,76 +19,72 @@ public final class HomeBlockFieldDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData> 
         getSubFieldListList();
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData getSubFieldList(int index);
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     int getSubFieldListCount();
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder> 
         getSubFieldListOrBuilderList();
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder getSubFieldListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 furniture_id = 1;</code>
+     * <code>uint32 furniture_id = 6;</code>
      * @return The furnitureId.
      */
     int getFurnitureId();
 
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>uint32 guid = 7;</code>
+     * @return The guid.
+     */
+    int getGuid();
+
+    /**
+     * <code>.Vector rot = 12;</code>
      * @return Whether the rot field is set.
      */
     boolean hasRot();
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>.Vector rot = 12;</code>
      * @return The rot.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>.Vector rot = 12;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
 
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
-
-    /**
-     * <code>uint32 guid = 13;</code>
-     * @return The guid.
-     */
-    int getGuid();
   }
   /**
-   * <pre>
-   * Obf: ONEIGKNNOGN
-   * </pre>
-   *
    * Protobuf type {@code HomeBlockFieldData}
    */
   public static final class HomeBlockFieldData extends
@@ -135,12 +131,26 @@ public final class HomeBlockFieldDataOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 42: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                subFieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              subFieldList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.parser(), extensionRegistry));
+              break;
+            }
+            case 48: {
 
               furnitureId_ = input.readUInt32();
               break;
             }
-            case 66: {
+            case 56: {
+
+              guid_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -153,21 +163,7 @@ public final class HomeBlockFieldDataOuterClass {
 
               break;
             }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                subFieldList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              subFieldList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.parser(), extensionRegistry));
-              break;
-            }
-            case 104: {
-
-              guid_ = input.readUInt32();
-              break;
-            }
-            case 122: {
+            case 114: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -215,17 +211,17 @@ public final class HomeBlockFieldDataOuterClass {
               emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.class, emu.grasscutter.net.proto.HomeBlockFieldDataOuterClass.HomeBlockFieldData.Builder.class);
     }
 
-    public static final int SUB_FIELD_LIST_FIELD_NUMBER = 10;
+    public static final int SUB_FIELD_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData> subFieldList_;
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData> getSubFieldListList() {
       return subFieldList_;
     }
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder> 
@@ -233,21 +229,21 @@ public final class HomeBlockFieldDataOuterClass {
       return subFieldList_;
     }
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     @java.lang.Override
     public int getSubFieldListCount() {
       return subFieldList_.size();
     }
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData getSubFieldList(int index) {
       return subFieldList_.get(index);
     }
     /**
-     * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+     * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder getSubFieldListOrBuilder(
@@ -255,10 +251,10 @@ public final class HomeBlockFieldDataOuterClass {
       return subFieldList_.get(index);
     }
 
-    public static final int FURNITURE_ID_FIELD_NUMBER = 1;
+    public static final int FURNITURE_ID_FIELD_NUMBER = 6;
     private int furnitureId_;
     /**
-     * <code>uint32 furniture_id = 1;</code>
+     * <code>uint32 furniture_id = 6;</code>
      * @return The furnitureId.
      */
     @java.lang.Override
@@ -266,10 +262,21 @@ public final class HomeBlockFieldDataOuterClass {
       return furnitureId_;
     }
 
-    public static final int ROT_FIELD_NUMBER = 8;
+    public static final int GUID_FIELD_NUMBER = 7;
+    private int guid_;
+    /**
+     * <code>uint32 guid = 7;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public int getGuid() {
+      return guid_;
+    }
+
+    public static final int ROT_FIELD_NUMBER = 12;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>.Vector rot = 12;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -277,7 +284,7 @@ public final class HomeBlockFieldDataOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>.Vector rot = 12;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -285,17 +292,17 @@ public final class HomeBlockFieldDataOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 8;</code>
+     * <code>.Vector rot = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
       return getRot();
     }
 
-    public static final int POS_FIELD_NUMBER = 15;
+    public static final int POS_FIELD_NUMBER = 14;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -303,7 +310,7 @@ public final class HomeBlockFieldDataOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -311,24 +318,13 @@ public final class HomeBlockFieldDataOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 15;</code>
+     * <code>.Vector pos = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
       return getPos();
     }
 
-    public static final int GUID_FIELD_NUMBER = 13;
-    private int guid_;
-    /**
-     * <code>uint32 guid = 13;</code>
-     * @return The guid.
-     */
-    @java.lang.Override
-    public int getGuid() {
-      return guid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -343,20 +339,20 @@ public final class HomeBlockFieldDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (furnitureId_ != 0) {
-        output.writeUInt32(1, furnitureId_);
-      }
-      if (rot_ != null) {
-        output.writeMessage(8, getRot());
-      }
       for (int i = 0; i < subFieldList_.size(); i++) {
-        output.writeMessage(10, subFieldList_.get(i));
+        output.writeMessage(5, subFieldList_.get(i));
+      }
+      if (furnitureId_ != 0) {
+        output.writeUInt32(6, furnitureId_);
       }
       if (guid_ != 0) {
-        output.writeUInt32(13, guid_);
+        output.writeUInt32(7, guid_);
+      }
+      if (rot_ != null) {
+        output.writeMessage(12, getRot());
       }
       if (pos_ != null) {
-        output.writeMessage(15, getPos());
+        output.writeMessage(14, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -367,25 +363,25 @@ public final class HomeBlockFieldDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (furnitureId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, furnitureId_);
-      }
-      if (rot_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getRot());
-      }
       for (int i = 0; i < subFieldList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, subFieldList_.get(i));
+          .computeMessageSize(5, subFieldList_.get(i));
+      }
+      if (furnitureId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, furnitureId_);
       }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, guid_);
+          .computeUInt32Size(7, guid_);
+      }
+      if (rot_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getRot());
       }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getPos());
+          .computeMessageSize(14, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -406,6 +402,8 @@ public final class HomeBlockFieldDataOuterClass {
           .equals(other.getSubFieldListList())) return false;
       if (getFurnitureId()
           != other.getFurnitureId()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (hasRot() != other.hasRot()) return false;
       if (hasRot()) {
         if (!getRot()
@@ -416,8 +414,6 @@ public final class HomeBlockFieldDataOuterClass {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
-      if (getGuid()
-          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -435,6 +431,8 @@ public final class HomeBlockFieldDataOuterClass {
       }
       hash = (37 * hash) + FURNITURE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getFurnitureId();
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + getGuid();
       if (hasRot()) {
         hash = (37 * hash) + ROT_FIELD_NUMBER;
         hash = (53 * hash) + getRot().hashCode();
@@ -443,8 +441,6 @@ public final class HomeBlockFieldDataOuterClass {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + getGuid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -541,10 +537,6 @@ public final class HomeBlockFieldDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ONEIGKNNOGN
-     * </pre>
-     *
      * Protobuf type {@code HomeBlockFieldData}
      */
     public static final class Builder extends
@@ -591,6 +583,8 @@ public final class HomeBlockFieldDataOuterClass {
         }
         furnitureId_ = 0;
 
+        guid_ = 0;
+
         if (rotBuilder_ == null) {
           rot_ = null;
         } else {
@@ -603,8 +597,6 @@ public final class HomeBlockFieldDataOuterClass {
           pos_ = null;
           posBuilder_ = null;
         }
-        guid_ = 0;
-
         return this;
       }
 
@@ -642,6 +634,7 @@ public final class HomeBlockFieldDataOuterClass {
           result.subFieldList_ = subFieldListBuilder_.build();
         }
         result.furnitureId_ = furnitureId_;
+        result.guid_ = guid_;
         if (rotBuilder_ == null) {
           result.rot_ = rot_;
         } else {
@@ -652,7 +645,6 @@ public final class HomeBlockFieldDataOuterClass {
         } else {
           result.pos_ = posBuilder_.build();
         }
-        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -730,15 +722,15 @@ public final class HomeBlockFieldDataOuterClass {
         if (other.getFurnitureId() != 0) {
           setFurnitureId(other.getFurnitureId());
         }
+        if (other.getGuid() != 0) {
+          setGuid(other.getGuid());
+        }
         if (other.hasRot()) {
           mergeRot(other.getRot());
         }
         if (other.hasPos()) {
           mergePos(other.getPos());
         }
-        if (other.getGuid() != 0) {
-          setGuid(other.getGuid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -782,7 +774,7 @@ public final class HomeBlockFieldDataOuterClass {
           emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder> subFieldListBuilder_;
 
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData> getSubFieldListList() {
         if (subFieldListBuilder_ == null) {
@@ -792,7 +784,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public int getSubFieldListCount() {
         if (subFieldListBuilder_ == null) {
@@ -802,7 +794,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData getSubFieldList(int index) {
         if (subFieldListBuilder_ == null) {
@@ -812,7 +804,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder setSubFieldList(
           int index, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData value) {
@@ -829,7 +821,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder setSubFieldList(
           int index, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder builderForValue) {
@@ -843,7 +835,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder addSubFieldList(emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData value) {
         if (subFieldListBuilder_ == null) {
@@ -859,7 +851,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder addSubFieldList(
           int index, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData value) {
@@ -876,7 +868,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder addSubFieldList(
           emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder builderForValue) {
@@ -890,7 +882,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder addSubFieldList(
           int index, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder builderForValue) {
@@ -904,7 +896,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder addAllSubFieldList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData> values) {
@@ -919,7 +911,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder clearSubFieldList() {
         if (subFieldListBuilder_ == null) {
@@ -932,7 +924,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public Builder removeSubFieldList(int index) {
         if (subFieldListBuilder_ == null) {
@@ -945,14 +937,14 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder getSubFieldListBuilder(
           int index) {
         return getSubFieldListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder getSubFieldListOrBuilder(
           int index) {
@@ -962,7 +954,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldDataOrBuilder> 
            getSubFieldListOrBuilderList() {
@@ -973,14 +965,14 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder addSubFieldListBuilder() {
         return getSubFieldListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder addSubFieldListBuilder(
           int index) {
@@ -988,7 +980,7 @@ public final class HomeBlockFieldDataOuterClass {
             index, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeBlockSubFieldData sub_field_list = 10;</code>
+       * <code>repeated .HomeBlockSubFieldData sub_field_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder> 
            getSubFieldListBuilderList() {
@@ -1011,7 +1003,7 @@ public final class HomeBlockFieldDataOuterClass {
 
       private int furnitureId_ ;
       /**
-       * <code>uint32 furniture_id = 1;</code>
+       * <code>uint32 furniture_id = 6;</code>
        * @return The furnitureId.
        */
       @java.lang.Override
@@ -1019,7 +1011,7 @@ public final class HomeBlockFieldDataOuterClass {
         return furnitureId_;
       }
       /**
-       * <code>uint32 furniture_id = 1;</code>
+       * <code>uint32 furniture_id = 6;</code>
        * @param value The furnitureId to set.
        * @return This builder for chaining.
        */
@@ -1030,7 +1022,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 furniture_id = 1;</code>
+       * <code>uint32 furniture_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearFurnitureId() {
@@ -1040,18 +1032,49 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
 
+      private int guid_ ;
+      /**
+       * <code>uint32 guid = 7;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public int getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint32 guid = 7;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(int value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 guid = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -1062,7 +1085,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -1078,7 +1101,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1092,7 +1115,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -1110,7 +1133,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -1124,7 +1147,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -1132,7 +1155,7 @@ public final class HomeBlockFieldDataOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -1143,7 +1166,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 8;</code>
+       * <code>.Vector rot = 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> 
@@ -1163,14 +1186,14 @@ public final class HomeBlockFieldDataOuterClass {
       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 = 15;</code>
+       * <code>.Vector pos = 14;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -1181,7 +1204,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1197,7 +1220,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1211,7 +1234,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1229,7 +1252,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -1243,7 +1266,7 @@ public final class HomeBlockFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -1251,7 +1274,7 @@ public final class HomeBlockFieldDataOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -1262,7 +1285,7 @@ public final class HomeBlockFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 15;</code>
+       * <code>.Vector pos = 14;</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> 
@@ -1277,37 +1300,6 @@ public final class HomeBlockFieldDataOuterClass {
         }
         return posBuilder_;
       }
-
-      private int guid_ ;
-      /**
-       * <code>uint32 guid = 13;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public int getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint32 guid = 13;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(int value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 guid = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1377,10 +1369,10 @@ public final class HomeBlockFieldDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030HomeBlockFieldData.proto\032\033HomeBlockSub" +
       "FieldData.proto\032\014Vector.proto\"\224\001\n\022HomeBl" +
-      "ockFieldData\022.\n\016sub_field_list\030\n \003(\0132\026.H" +
-      "omeBlockSubFieldData\022\024\n\014furniture_id\030\001 \001" +
-      "(\r\022\024\n\003rot\030\010 \001(\0132\007.Vector\022\024\n\003pos\030\017 \001(\0132\007." +
-      "Vector\022\014\n\004guid\030\r \001(\rB\033\n\031emu.grasscutter." +
+      "ockFieldData\022.\n\016sub_field_list\030\005 \003(\0132\026.H" +
+      "omeBlockSubFieldData\022\024\n\014furniture_id\030\006 \001" +
+      "(\r\022\014\n\004guid\030\007 \001(\r\022\024\n\003rot\030\014 \001(\0132\007.Vector\022\024" +
+      "\n\003pos\030\016 \001(\0132\007.VectorB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1394,7 +1386,7 @@ public final class HomeBlockFieldDataOuterClass {
     internal_static_HomeBlockFieldData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeBlockFieldData_descriptor,
-        new java.lang.String[] { "SubFieldList", "FurnitureId", "Rot", "Pos", "Guid", });
+        new java.lang.String[] { "SubFieldList", "FurnitureId", "Guid", "Rot", "Pos", });
     emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockSubFieldDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockSubFieldDataOuterClass.java
index 9ae74bbae..5860702df 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockSubFieldDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeBlockSubFieldDataOuterClass.java
@@ -19,40 +19,36 @@ public final class HomeBlockSubFieldDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      * @return Whether the rot field is set.
      */
     boolean hasRot();
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      * @return The rot.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
 
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: HEOEAKDEIJA
-   * </pre>
-   *
    * Protobuf type {@code HomeBlockSubFieldData}
    */
   public static final class HomeBlockSubFieldData extends
@@ -97,7 +93,7 @@ public final class HomeBlockSubFieldDataOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 10: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -110,7 +106,7 @@ public final class HomeBlockSubFieldDataOuterClass {
 
               break;
             }
-            case 66: {
+            case 42: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -155,10 +151,10 @@ public final class HomeBlockSubFieldDataOuterClass {
               emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.class, emu.grasscutter.net.proto.HomeBlockSubFieldDataOuterClass.HomeBlockSubFieldData.Builder.class);
     }
 
-    public static final int ROT_FIELD_NUMBER = 2;
+    public static final int ROT_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -166,7 +162,7 @@ public final class HomeBlockSubFieldDataOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -174,17 +170,17 @@ public final class HomeBlockSubFieldDataOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 2;</code>
+     * <code>.Vector rot = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
       return getRot();
     }
 
-    public static final int POS_FIELD_NUMBER = 8;
+    public static final int POS_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -192,7 +188,7 @@ public final class HomeBlockSubFieldDataOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -200,7 +196,7 @@ public final class HomeBlockSubFieldDataOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 8;</code>
+     * <code>.Vector pos = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
@@ -222,10 +218,10 @@ public final class HomeBlockSubFieldDataOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (rot_ != null) {
-        output.writeMessage(2, getRot());
+        output.writeMessage(1, getRot());
       }
       if (pos_ != null) {
-        output.writeMessage(8, getPos());
+        output.writeMessage(5, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -238,11 +234,11 @@ public final class HomeBlockSubFieldDataOuterClass {
       size = 0;
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getRot());
+          .computeMessageSize(1, getRot());
       }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getPos());
+          .computeMessageSize(5, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -384,10 +380,6 @@ public final class HomeBlockSubFieldDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HEOEAKDEIJA
-     * </pre>
-     *
      * Protobuf type {@code HomeBlockSubFieldData}
      */
     public static final class Builder extends
@@ -560,14 +552,14 @@ public final class HomeBlockSubFieldDataOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -578,7 +570,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -594,7 +586,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -608,7 +600,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -626,7 +618,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -640,7 +632,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -648,7 +640,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -659,7 +651,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 2;</code>
+       * <code>.Vector rot = 1;</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> 
@@ -679,14 +671,14 @@ public final class HomeBlockSubFieldDataOuterClass {
       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 = 8;</code>
+       * <code>.Vector pos = 5;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -697,7 +689,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -713,7 +705,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -727,7 +719,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -745,7 +737,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -759,7 +751,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -767,7 +759,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -778,7 +770,7 @@ public final class HomeBlockSubFieldDataOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 8;</code>
+       * <code>.Vector pos = 5;</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> 
@@ -861,8 +853,8 @@ public final class HomeBlockSubFieldDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033HomeBlockSubFieldData.proto\032\014Vector.pr" +
-      "oto\"C\n\025HomeBlockSubFieldData\022\024\n\003rot\030\002 \001(" +
-      "\0132\007.Vector\022\024\n\003pos\030\010 \001(\0132\007.VectorB\033\n\031emu." +
+      "oto\"C\n\025HomeBlockSubFieldData\022\024\n\003rot\030\001 \001(" +
+      "\0132\007.Vector\022\024\n\003pos\030\005 \001(\0132\007.VectorB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmNotifyOuterClass.java
index b809bbc9b..423cdef80 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeChangeBgmNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 bgm_id = 2;</code>
+     * <code>uint32 bgm_id = 4;</code>
      * @return The bgmId.
      */
     int getBgmId();
   }
   /**
-   * <pre>
-   * CmdId: 2031
-   * Obf: HIJFHJEALCJ
-   * </pre>
-   *
    * Protobuf type {@code HomeChangeBgmNotify}
    */
   public static final class HomeChangeBgmNotify extends
@@ -74,7 +69,7 @@ public final class HomeChangeBgmNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
               bgmId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeChangeBgmNotifyOuterClass {
               emu.grasscutter.net.proto.HomeChangeBgmNotifyOuterClass.HomeChangeBgmNotify.class, emu.grasscutter.net.proto.HomeChangeBgmNotifyOuterClass.HomeChangeBgmNotify.Builder.class);
     }
 
-    public static final int BGM_ID_FIELD_NUMBER = 2;
+    public static final int BGM_ID_FIELD_NUMBER = 4;
     private int bgmId_;
     /**
-     * <code>uint32 bgm_id = 2;</code>
+     * <code>uint32 bgm_id = 4;</code>
      * @return The bgmId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeChangeBgmNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (bgmId_ != 0) {
-        output.writeUInt32(2, bgmId_);
+        output.writeUInt32(4, bgmId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeChangeBgmNotifyOuterClass {
       size = 0;
       if (bgmId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, bgmId_);
+          .computeUInt32Size(4, bgmId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeChangeBgmNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2031
-     * Obf: HIJFHJEALCJ
-     * </pre>
-     *
      * Protobuf type {@code HomeChangeBgmNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeChangeBgmNotifyOuterClass {
 
       private int bgmId_ ;
       /**
-       * <code>uint32 bgm_id = 2;</code>
+       * <code>uint32 bgm_id = 4;</code>
        * @return The bgmId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeChangeBgmNotifyOuterClass {
         return bgmId_;
       }
       /**
-       * <code>uint32 bgm_id = 2;</code>
+       * <code>uint32 bgm_id = 4;</code>
        * @param value The bgmId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeChangeBgmNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 bgm_id = 2;</code>
+       * <code>uint32 bgm_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearBgmId() {
@@ -527,7 +517,7 @@ public final class HomeChangeBgmNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031HomeChangeBgmNotify.proto\"%\n\023HomeChang" +
-      "eBgmNotify\022\016\n\006bgm_id\030\002 \001(\rB\033\n\031emu.grassc" +
+      "eBgmNotify\022\016\n\006bgm_id\030\004 \001(\rB\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/HomeChangeBgmReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmReqOuterClass.java
index 1610b4d21..9da103a9d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeBgmReqOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeChangeBgmReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 bgm_id = 1;</code>
+     * <code>uint32 bgm_id = 13;</code>
      * @return The bgmId.
      */
     int getBgmId();
   }
   /**
-   * <pre>
-   * CmdId: 28739
-   * Obf: EONIDLEEINE
-   * </pre>
-   *
    * Protobuf type {@code HomeChangeBgmReq}
    */
   public static final class HomeChangeBgmReq extends
@@ -74,7 +69,7 @@ public final class HomeChangeBgmReqOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 104: {
 
               bgmId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeChangeBgmReqOuterClass {
               emu.grasscutter.net.proto.HomeChangeBgmReqOuterClass.HomeChangeBgmReq.class, emu.grasscutter.net.proto.HomeChangeBgmReqOuterClass.HomeChangeBgmReq.Builder.class);
     }
 
-    public static final int BGM_ID_FIELD_NUMBER = 1;
+    public static final int BGM_ID_FIELD_NUMBER = 13;
     private int bgmId_;
     /**
-     * <code>uint32 bgm_id = 1;</code>
+     * <code>uint32 bgm_id = 13;</code>
      * @return The bgmId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeChangeBgmReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (bgmId_ != 0) {
-        output.writeUInt32(1, bgmId_);
+        output.writeUInt32(13, bgmId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeChangeBgmReqOuterClass {
       size = 0;
       if (bgmId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, bgmId_);
+          .computeUInt32Size(13, bgmId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeChangeBgmReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28739
-     * Obf: EONIDLEEINE
-     * </pre>
-     *
      * Protobuf type {@code HomeChangeBgmReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeChangeBgmReqOuterClass {
 
       private int bgmId_ ;
       /**
-       * <code>uint32 bgm_id = 1;</code>
+       * <code>uint32 bgm_id = 13;</code>
        * @return The bgmId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeChangeBgmReqOuterClass {
         return bgmId_;
       }
       /**
-       * <code>uint32 bgm_id = 1;</code>
+       * <code>uint32 bgm_id = 13;</code>
        * @param value The bgmId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeChangeBgmReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 bgm_id = 1;</code>
+       * <code>uint32 bgm_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearBgmId() {
@@ -527,7 +517,7 @@ public final class HomeChangeBgmReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026HomeChangeBgmReq.proto\"\"\n\020HomeChangeBg" +
-      "mReq\022\016\n\006bgm_id\030\001 \001(\rB\033\n\031emu.grasscutter." +
+      "mReq\022\016\n\006bgm_id\030\r \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/HomeChangeEditModeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeReqOuterClass.java
index c9843bc19..116e0bb08 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeReqOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeChangeEditModeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_enter_edit_mode = 2;</code>
+     * <code>bool is_enter_edit_mode = 7;</code>
      * @return The isEnterEditMode.
      */
     boolean getIsEnterEditMode();
   }
   /**
-   * <pre>
-   * CmdId: 8351
-   * Obf: ALGDHNPEBCO
-   * </pre>
-   *
    * Protobuf type {@code HomeChangeEditModeReq}
    */
   public static final class HomeChangeEditModeReq extends
@@ -74,7 +69,7 @@ public final class HomeChangeEditModeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 56: {
 
               isEnterEditMode_ = input.readBool();
               break;
@@ -111,10 +106,10 @@ public final class HomeChangeEditModeReqOuterClass {
               emu.grasscutter.net.proto.HomeChangeEditModeReqOuterClass.HomeChangeEditModeReq.class, emu.grasscutter.net.proto.HomeChangeEditModeReqOuterClass.HomeChangeEditModeReq.Builder.class);
     }
 
-    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 2;
+    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 7;
     private boolean isEnterEditMode_;
     /**
-     * <code>bool is_enter_edit_mode = 2;</code>
+     * <code>bool is_enter_edit_mode = 7;</code>
      * @return The isEnterEditMode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeChangeEditModeReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isEnterEditMode_ != false) {
-        output.writeBool(2, isEnterEditMode_);
+        output.writeBool(7, isEnterEditMode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeChangeEditModeReqOuterClass {
       size = 0;
       if (isEnterEditMode_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isEnterEditMode_);
+          .computeBoolSize(7, isEnterEditMode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class HomeChangeEditModeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8351
-     * Obf: ALGDHNPEBCO
-     * </pre>
-     *
      * Protobuf type {@code HomeChangeEditModeReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class HomeChangeEditModeReqOuterClass {
 
       private boolean isEnterEditMode_ ;
       /**
-       * <code>bool is_enter_edit_mode = 2;</code>
+       * <code>bool is_enter_edit_mode = 7;</code>
        * @return The isEnterEditMode.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class HomeChangeEditModeReqOuterClass {
         return isEnterEditMode_;
       }
       /**
-       * <code>bool is_enter_edit_mode = 2;</code>
+       * <code>bool is_enter_edit_mode = 7;</code>
        * @param value The isEnterEditMode to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class HomeChangeEditModeReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enter_edit_mode = 2;</code>
+       * <code>bool is_enter_edit_mode = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnterEditMode() {
@@ -528,7 +518,7 @@ public final class HomeChangeEditModeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033HomeChangeEditModeReq.proto\"3\n\025HomeCha" +
-      "ngeEditModeReq\022\032\n\022is_enter_edit_mode\030\002 \001" +
+      "ngeEditModeReq\022\032\n\022is_enter_edit_mode\030\007 \001" +
       "(\010B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeRspOuterClass.java
index a6bf222c2..81924868e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChangeEditModeRspOuterClass.java
@@ -19,23 +19,18 @@ public final class HomeChangeEditModeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>bool is_enter_edit_mode = 6;</code>
+     * <code>bool is_enter_edit_mode = 9;</code>
      * @return The isEnterEditMode.
      */
     boolean getIsEnterEditMode();
+
+    /**
+     * <code>int32 retcode = 10;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 7491
-   * Obf: CICADGGFJOK
-   * </pre>
-   *
    * Protobuf type {@code HomeChangeEditModeRsp}
    */
   public static final class HomeChangeEditModeRsp extends
@@ -80,16 +75,16 @@ public final class HomeChangeEditModeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 48: {
+            case 72: {
 
               isEnterEditMode_ = input.readBool();
               break;
             }
+            case 80: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class HomeChangeEditModeRspOuterClass {
               emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.class, emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 6;
+    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 9;
     private boolean isEnterEditMode_;
     /**
-     * <code>bool is_enter_edit_mode = 6;</code>
+     * <code>bool is_enter_edit_mode = 9;</code>
      * @return The isEnterEditMode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class HomeChangeEditModeRspOuterClass {
       return isEnterEditMode_;
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class HomeChangeEditModeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
       if (isEnterEditMode_ != false) {
-        output.writeBool(6, isEnterEditMode_);
+        output.writeBool(9, isEnterEditMode_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(10, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class HomeChangeEditModeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
       if (isEnterEditMode_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isEnterEditMode_);
+          .computeBoolSize(9, isEnterEditMode_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(10, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HomeChangeEditModeRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp other = (emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getIsEnterEditMode()
           != other.getIsEnterEditMode()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class HomeChangeEditModeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + IS_ENTER_EDIT_MODE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEnterEditMode());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class HomeChangeEditModeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7491
-     * Obf: CICADGGFJOK
-     * </pre>
-     *
      * Protobuf type {@code HomeChangeEditModeRsp}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class HomeChangeEditModeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         isEnterEditMode_ = false;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class HomeChangeEditModeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp buildPartial() {
         emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp result = new emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp(this);
-        result.retcode_ = retcode_;
         result.isEnterEditMode_ = isEnterEditMode_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class HomeChangeEditModeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp other) {
         if (other == emu.grasscutter.net.proto.HomeChangeEditModeRspOuterClass.HomeChangeEditModeRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getIsEnterEditMode() != false) {
           setIsEnterEditMode(other.getIsEnterEditMode());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class HomeChangeEditModeRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 2;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isEnterEditMode_ ;
       /**
-       * <code>bool is_enter_edit_mode = 6;</code>
+       * <code>bool is_enter_edit_mode = 9;</code>
        * @return The isEnterEditMode.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class HomeChangeEditModeRspOuterClass {
         return isEnterEditMode_;
       }
       /**
-       * <code>bool is_enter_edit_mode = 6;</code>
+       * <code>bool is_enter_edit_mode = 9;</code>
        * @param value The isEnterEditMode to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class HomeChangeEditModeRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enter_edit_mode = 6;</code>
+       * <code>bool is_enter_edit_mode = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnterEditMode() {
@@ -530,6 +489,37 @@ public final class HomeChangeEditModeRspOuterClass {
         onChanged();
         return this;
       }
+
+      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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +588,8 @@ public final class HomeChangeEditModeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033HomeChangeEditModeRsp.proto\"D\n\025HomeCha" +
-      "ngeEditModeRsp\022\017\n\007retcode\030\002 \001(\005\022\032\n\022is_en" +
-      "ter_edit_mode\030\006 \001(\010B\033\n\031emu.grasscutter.n" +
+      "ngeEditModeRsp\022\032\n\022is_enter_edit_mode\030\t \001" +
+      "(\010\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class HomeChangeEditModeRspOuterClass {
     internal_static_HomeChangeEditModeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeChangeEditModeRsp_descriptor,
-        new java.lang.String[] { "Retcode", "IsEnterEditMode", });
+        new java.lang.String[] { "IsEnterEditMode", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleReqOuterClass.java
index f3ce9cb7e..02ae53277 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleReqOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeChooseModuleReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 module_id = 15;</code>
+     * <code>uint32 module_id = 13;</code>
      * @return The moduleId.
      */
     int getModuleId();
   }
   /**
-   * <pre>
-   * CmdId: 29914
-   * Obf: AGDOOFPMMBE
-   * </pre>
-   *
    * Protobuf type {@code HomeChooseModuleReq}
    */
   public static final class HomeChooseModuleReq extends
@@ -74,7 +69,7 @@ public final class HomeChooseModuleReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 104: {
 
               moduleId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeChooseModuleReqOuterClass {
               emu.grasscutter.net.proto.HomeChooseModuleReqOuterClass.HomeChooseModuleReq.class, emu.grasscutter.net.proto.HomeChooseModuleReqOuterClass.HomeChooseModuleReq.Builder.class);
     }
 
-    public static final int MODULE_ID_FIELD_NUMBER = 15;
+    public static final int MODULE_ID_FIELD_NUMBER = 13;
     private int moduleId_;
     /**
-     * <code>uint32 module_id = 15;</code>
+     * <code>uint32 module_id = 13;</code>
      * @return The moduleId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeChooseModuleReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (moduleId_ != 0) {
-        output.writeUInt32(15, moduleId_);
+        output.writeUInt32(13, moduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeChooseModuleReqOuterClass {
       size = 0;
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, moduleId_);
+          .computeUInt32Size(13, moduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeChooseModuleReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29914
-     * Obf: AGDOOFPMMBE
-     * </pre>
-     *
      * Protobuf type {@code HomeChooseModuleReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeChooseModuleReqOuterClass {
 
       private int moduleId_ ;
       /**
-       * <code>uint32 module_id = 15;</code>
+       * <code>uint32 module_id = 13;</code>
        * @return The moduleId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeChooseModuleReqOuterClass {
         return moduleId_;
       }
       /**
-       * <code>uint32 module_id = 15;</code>
+       * <code>uint32 module_id = 13;</code>
        * @param value The moduleId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeChooseModuleReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 module_id = 15;</code>
+       * <code>uint32 module_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearModuleId() {
@@ -527,7 +517,7 @@ public final class HomeChooseModuleReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031HomeChooseModuleReq.proto\"(\n\023HomeChoos" +
-      "eModuleReq\022\021\n\tmodule_id\030\017 \001(\rB\033\n\031emu.gra" +
+      "eModuleReq\022\021\n\tmodule_id\030\r \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleRspOuterClass.java
index ddd346626..6f6bb6bb9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeChooseModuleRspOuterClass.java
@@ -18,24 +18,19 @@ public final class HomeChooseModuleRspOuterClass {
       // @@protoc_insertion_point(interface_extends:HomeChooseModuleRsp)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 module_id = 7;</code>
-     * @return The moduleId.
-     */
-    int getModuleId();
-
     /**
      * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 module_id = 12;</code>
+     * @return The moduleId.
+     */
+    int getModuleId();
   }
   /**
-   * <pre>
-   * CmdId: 20087
-   * Obf: JHDBAFEAKGO
-   * </pre>
-   *
    * Protobuf type {@code HomeChooseModuleRsp}
    */
   public static final class HomeChooseModuleRsp extends
@@ -85,7 +80,7 @@ public final class HomeChooseModuleRspOuterClass {
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
+            case 96: {
 
               moduleId_ = input.readUInt32();
               break;
@@ -122,17 +117,6 @@ public final class HomeChooseModuleRspOuterClass {
               emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp.class, emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp.Builder.class);
     }
 
-    public static final int MODULE_ID_FIELD_NUMBER = 7;
-    private int moduleId_;
-    /**
-     * <code>uint32 module_id = 7;</code>
-     * @return The moduleId.
-     */
-    @java.lang.Override
-    public int getModuleId() {
-      return moduleId_;
-    }
-
     public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
@@ -144,6 +128,17 @@ public final class HomeChooseModuleRspOuterClass {
       return retcode_;
     }
 
+    public static final int MODULE_ID_FIELD_NUMBER = 12;
+    private int moduleId_;
+    /**
+     * <code>uint32 module_id = 12;</code>
+     * @return The moduleId.
+     */
+    @java.lang.Override
+    public int getModuleId() {
+      return moduleId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -162,7 +157,7 @@ public final class HomeChooseModuleRspOuterClass {
         output.writeInt32(1, retcode_);
       }
       if (moduleId_ != 0) {
-        output.writeUInt32(7, moduleId_);
+        output.writeUInt32(12, moduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -179,7 +174,7 @@ public final class HomeChooseModuleRspOuterClass {
       }
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, moduleId_);
+          .computeUInt32Size(12, moduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HomeChooseModuleRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp other = (emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp) obj;
 
-      if (getModuleId()
-          != other.getModuleId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getModuleId()
+          != other.getModuleId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class HomeChooseModuleRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getModuleId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getModuleId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class HomeChooseModuleRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20087
-     * Obf: JHDBAFEAKGO
-     * </pre>
-     *
      * Protobuf type {@code HomeChooseModuleRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class HomeChooseModuleRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        moduleId_ = 0;
-
         retcode_ = 0;
 
+        moduleId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class HomeChooseModuleRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp buildPartial() {
         emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp result = new emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp(this);
-        result.moduleId_ = moduleId_;
         result.retcode_ = retcode_;
+        result.moduleId_ = moduleId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class HomeChooseModuleRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp other) {
         if (other == emu.grasscutter.net.proto.HomeChooseModuleRspOuterClass.HomeChooseModuleRsp.getDefaultInstance()) return this;
-        if (other.getModuleId() != 0) {
-          setModuleId(other.getModuleId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getModuleId() != 0) {
+          setModuleId(other.getModuleId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,37 +458,6 @@ public final class HomeChooseModuleRspOuterClass {
         return this;
       }
 
-      private int moduleId_ ;
-      /**
-       * <code>uint32 module_id = 7;</code>
-       * @return The moduleId.
-       */
-      @java.lang.Override
-      public int getModuleId() {
-        return moduleId_;
-      }
-      /**
-       * <code>uint32 module_id = 7;</code>
-       * @param value The moduleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setModuleId(int value) {
-        
-        moduleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 module_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearModuleId() {
-        
-        moduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
        * <code>int32 retcode = 1;</code>
@@ -529,6 +488,37 @@ public final class HomeChooseModuleRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int moduleId_ ;
+      /**
+       * <code>uint32 module_id = 12;</code>
+       * @return The moduleId.
+       */
+      @java.lang.Override
+      public int getModuleId() {
+        return moduleId_;
+      }
+      /**
+       * <code>uint32 module_id = 12;</code>
+       * @param value The moduleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setModuleId(int value) {
+        
+        moduleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 module_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearModuleId() {
+        
+        moduleId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class HomeChooseModuleRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031HomeChooseModuleRsp.proto\"9\n\023HomeChoos" +
-      "eModuleRsp\022\021\n\tmodule_id\030\007 \001(\r\022\017\n\007retcode" +
-      "\030\001 \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "eModuleRsp\022\017\n\007retcode\030\001 \001(\005\022\021\n\tmodule_id" +
+      "\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class HomeChooseModuleRspOuterClass {
     internal_static_HomeChooseModuleRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeChooseModuleRsp_descriptor,
-        new java.lang.String[] { "ModuleId", "Retcode", });
+        new java.lang.String[] { "Retcode", "ModuleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeComfortInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeComfortInfoNotifyOuterClass.java
index a1129662d..1c3ad0f57 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeComfortInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeComfortInfoNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class HomeComfortInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> 
         getModuleInfoListList();
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo getModuleInfoList(int index);
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     int getModuleInfoListCount();
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder> 
         getModuleInfoListOrBuilderList();
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder getModuleInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 4153
-   * Obf: CHCBFKOPHLG
-   * </pre>
-   *
    * Protobuf type {@code HomeComfortInfoNotify}
    */
   public static final class HomeComfortInfoNotify extends
@@ -94,7 +89,7 @@ public final class HomeComfortInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 moduleInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class HomeComfortInfoNotifyOuterClass {
               emu.grasscutter.net.proto.HomeComfortInfoNotifyOuterClass.HomeComfortInfoNotify.class, emu.grasscutter.net.proto.HomeComfortInfoNotifyOuterClass.HomeComfortInfoNotify.Builder.class);
     }
 
-    public static final int MODULE_INFO_LIST_FIELD_NUMBER = 11;
+    public static final int MODULE_INFO_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> moduleInfoList_;
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> getModuleInfoListList() {
       return moduleInfoList_;
     }
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class HomeComfortInfoNotifyOuterClass {
       return moduleInfoList_;
     }
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     @java.lang.Override
     public int getModuleInfoListCount() {
       return moduleInfoList_.size();
     }
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo getModuleInfoList(int index) {
       return moduleInfoList_.get(index);
     }
     /**
-     * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+     * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder getModuleInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class HomeComfortInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < moduleInfoList_.size(); i++) {
-        output.writeMessage(11, moduleInfoList_.get(i));
+        output.writeMessage(12, moduleInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class HomeComfortInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < moduleInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, moduleInfoList_.get(i));
+          .computeMessageSize(12, moduleInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class HomeComfortInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4153
-     * Obf: CHCBFKOPHLG
-     * </pre>
-     *
      * Protobuf type {@code HomeComfortInfoNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class HomeComfortInfoNotifyOuterClass {
           emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder> moduleInfoListBuilder_;
 
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> getModuleInfoListList() {
         if (moduleInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public int getModuleInfoListCount() {
         if (moduleInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo getModuleInfoList(int index) {
         if (moduleInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder setModuleInfoList(
           int index, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo value) {
@@ -585,7 +575,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder setModuleInfoList(
           int index, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder addModuleInfoList(emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo value) {
         if (moduleInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder addModuleInfoList(
           int index, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo value) {
@@ -632,7 +622,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder addModuleInfoList(
           emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder addModuleInfoList(
           int index, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder addAllModuleInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo> values) {
@@ -675,7 +665,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder clearModuleInfoList() {
         if (moduleInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public Builder removeModuleInfoList(int index) {
         if (moduleInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class HomeComfortInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder getModuleInfoListBuilder(
           int index) {
         return getModuleInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder getModuleInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class HomeComfortInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfoOrBuilder> 
            getModuleInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class HomeComfortInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder addModuleInfoListBuilder() {
         return getModuleInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder addModuleInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class HomeComfortInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeModuleComfortInfo module_info_list = 11;</code>
+       * <code>repeated .HomeModuleComfortInfo module_info_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder> 
            getModuleInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class HomeComfortInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033HomeComfortInfoNotify.proto\032\033HomeModul" +
       "eComfortInfo.proto\"I\n\025HomeComfortInfoNot" +
-      "ify\0220\n\020module_info_list\030\013 \003(\0132\026.HomeModu" +
+      "ify\0220\n\020module_info_list\030\014 \003(\0132\026.HomeModu" +
       "leComfortInfoB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishReqOuterClass.java
index 89882c3e8..3a7f6bc69 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishReqOuterClass.java
@@ -19,11 +19,6 @@ public final class HomeEnterEditModeFinishReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 4149
-   * Obf: NCEKAKPOPHC
-   * </pre>
-   *
    * Protobuf type {@code HomeEnterEditModeFinishReq}
    */
   public static final class HomeEnterEditModeFinishReq extends
@@ -245,11 +240,6 @@ public final class HomeEnterEditModeFinishReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4149
-     * Obf: NCEKAKPOPHC
-     * </pre>
-     *
      * Protobuf type {@code HomeEnterEditModeFinishReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishRspOuterClass.java
index f221de418..0c70f9cc5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeEnterEditModeFinishRspOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeEnterEditModeFinishRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 1;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 21433
-   * Obf: CFJKONMEIIG
-   * </pre>
-   *
    * Protobuf type {@code HomeEnterEditModeFinishRsp}
    */
   public static final class HomeEnterEditModeFinishRsp extends
@@ -74,7 +69,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeEnterEditModeFinishRspOuterClass {
               emu.grasscutter.net.proto.HomeEnterEditModeFinishRspOuterClass.HomeEnterEditModeFinishRsp.class, emu.grasscutter.net.proto.HomeEnterEditModeFinishRspOuterClass.HomeEnterEditModeFinishRsp.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>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeEnterEditModeFinishRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21433
-     * Obf: CFJKONMEIIG
-     * </pre>
-     *
      * Protobuf type {@code HomeEnterEditModeFinishRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 1;</code>
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class HomeEnterEditModeFinishRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n HomeEnterEditModeFinishRsp.proto\"-\n\032Ho" +
-      "meEnterEditModeFinishRsp\022\017\n\007retcode\030\001 \001(" +
+      "meEnterEditModeFinishRsp\022\017\n\007retcode\030\014 \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/HomeFurnitureCustomSuiteDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureCustomSuiteDataOuterClass.java
index 8497413fe..1a3cd7f1a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureCustomSuiteDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureCustomSuiteDataOuterClass.java
@@ -19,48 +19,44 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>.Vector spawn_pos = 2;</code>
+     * @return Whether the spawnPos field is set.
+     */
+    boolean hasSpawnPos();
+    /**
+     * <code>.Vector spawn_pos = 2;</code>
+     * @return The spawnPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
+    /**
+     * <code>.Vector spawn_pos = 2;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
+
+    /**
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @return A list containing the includedFurnitureIndexList.
      */
     java.util.List<java.lang.Integer> getIncludedFurnitureIndexListList();
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @return The count of includedFurnitureIndexList.
      */
     int getIncludedFurnitureIndexListCount();
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @param index The index of the element to return.
      * @return The includedFurnitureIndexList at the given index.
      */
     int getIncludedFurnitureIndexList(int index);
 
     /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return Whether the spawnPos field is set.
-     */
-    boolean hasSpawnPos();
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return The spawnPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
-
-    /**
-     * <code>uint32 guid = 10;</code>
+     * <code>uint32 guid = 12;</code>
      * @return The guid.
      */
     int getGuid();
   }
   /**
-   * <pre>
-   * Obf: POCJBKACJPC
-   * </pre>
-   *
    * Protobuf type {@code HomeFurnitureCustomSuiteData}
    */
   public static final class HomeFurnitureCustomSuiteData extends
@@ -107,7 +103,20 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 18: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (spawnPos_ != null) {
+                subBuilder = spawnPos_.toBuilder();
+              }
+              spawnPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(spawnPos_);
+                spawnPos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 includedFurnitureIndexList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -115,7 +124,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
               includedFurnitureIndexList_.addInt(input.readInt32());
               break;
             }
-            case 58: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -128,24 +137,11 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 80: {
+            case 96: {
 
               guid_ = input.readUInt32();
               break;
             }
-            case 114: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (spawnPos_ != null) {
-                subBuilder = spawnPos_.toBuilder();
-              }
-              spawnPos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(spawnPos_);
-                spawnPos_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -181,10 +177,36 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
               emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.class, emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.Builder.class);
     }
 
-    public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 7;
+    public static final int SPAWN_POS_FIELD_NUMBER = 2;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
+    /**
+     * <code>.Vector spawn_pos = 2;</code>
+     * @return Whether the spawnPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasSpawnPos() {
+      return spawnPos_ != null;
+    }
+    /**
+     * <code>.Vector spawn_pos = 2;</code>
+     * @return The spawnPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
+      return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
+    }
+    /**
+     * <code>.Vector spawn_pos = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
+      return getSpawnPos();
+    }
+
+    public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList includedFurnitureIndexList_;
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @return A list containing the includedFurnitureIndexList.
      */
     @java.lang.Override
@@ -193,14 +215,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       return includedFurnitureIndexList_;
     }
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @return The count of includedFurnitureIndexList.
      */
     public int getIncludedFurnitureIndexListCount() {
       return includedFurnitureIndexList_.size();
     }
     /**
-     * <code>repeated int32 included_furniture_index_list = 7;</code>
+     * <code>repeated int32 included_furniture_index_list = 3;</code>
      * @param index The index of the element to return.
      * @return The includedFurnitureIndexList at the given index.
      */
@@ -209,36 +231,10 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
     }
     private int includedFurnitureIndexListMemoizedSerializedSize = -1;
 
-    public static final int SPAWN_POS_FIELD_NUMBER = 14;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return Whether the spawnPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasSpawnPos() {
-      return spawnPos_ != null;
-    }
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return The spawnPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
-      return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
-    }
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
-      return getSpawnPos();
-    }
-
-    public static final int GUID_FIELD_NUMBER = 10;
+    public static final int GUID_FIELD_NUMBER = 12;
     private int guid_;
     /**
-     * <code>uint32 guid = 10;</code>
+     * <code>uint32 guid = 12;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -261,18 +257,18 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (spawnPos_ != null) {
+        output.writeMessage(2, getSpawnPos());
+      }
       if (getIncludedFurnitureIndexListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(includedFurnitureIndexListMemoizedSerializedSize);
       }
       for (int i = 0; i < includedFurnitureIndexList_.size(); i++) {
         output.writeInt32NoTag(includedFurnitureIndexList_.getInt(i));
       }
       if (guid_ != 0) {
-        output.writeUInt32(10, guid_);
-      }
-      if (spawnPos_ != null) {
-        output.writeMessage(14, getSpawnPos());
+        output.writeUInt32(12, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -283,6 +279,10 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (spawnPos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, getSpawnPos());
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < includedFurnitureIndexList_.size(); i++) {
@@ -299,11 +299,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, guid_);
-      }
-      if (spawnPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSpawnPos());
+          .computeUInt32Size(12, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -320,13 +316,13 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData other = (emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData) obj;
 
-      if (!getIncludedFurnitureIndexListList()
-          .equals(other.getIncludedFurnitureIndexListList())) return false;
       if (hasSpawnPos() != other.hasSpawnPos()) return false;
       if (hasSpawnPos()) {
         if (!getSpawnPos()
             .equals(other.getSpawnPos())) return false;
       }
+      if (!getIncludedFurnitureIndexListList()
+          .equals(other.getIncludedFurnitureIndexListList())) return false;
       if (getGuid()
           != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -340,14 +336,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getIncludedFurnitureIndexListCount() > 0) {
-        hash = (37 * hash) + INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getIncludedFurnitureIndexListList().hashCode();
-      }
       if (hasSpawnPos()) {
         hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getSpawnPos().hashCode();
       }
+      if (getIncludedFurnitureIndexListCount() > 0) {
+        hash = (37 * hash) + INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getIncludedFurnitureIndexListList().hashCode();
+      }
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + getGuid();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -446,10 +442,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: POCJBKACJPC
-     * </pre>
-     *
      * Protobuf type {@code HomeFurnitureCustomSuiteData}
      */
     public static final class Builder extends
@@ -487,14 +479,14 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        includedFurnitureIndexList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (spawnPosBuilder_ == null) {
           spawnPos_ = null;
         } else {
           spawnPos_ = null;
           spawnPosBuilder_ = null;
         }
+        includedFurnitureIndexList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         guid_ = 0;
 
         return this;
@@ -524,16 +516,16 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       public emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData buildPartial() {
         emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData result = new emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData(this);
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          includedFurnitureIndexList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.includedFurnitureIndexList_ = includedFurnitureIndexList_;
         if (spawnPosBuilder_ == null) {
           result.spawnPos_ = spawnPos_;
         } else {
           result.spawnPos_ = spawnPosBuilder_.build();
         }
+        if (((bitField0_ & 0x00000001) != 0)) {
+          includedFurnitureIndexList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.includedFurnitureIndexList_ = includedFurnitureIndexList_;
         result.guid_ = guid_;
         onBuilt();
         return result;
@@ -583,6 +575,9 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData other) {
         if (other == emu.grasscutter.net.proto.HomeFurnitureCustomSuiteDataOuterClass.HomeFurnitureCustomSuiteData.getDefaultInstance()) return this;
+        if (other.hasSpawnPos()) {
+          mergeSpawnPos(other.getSpawnPos());
+        }
         if (!other.includedFurnitureIndexList_.isEmpty()) {
           if (includedFurnitureIndexList_.isEmpty()) {
             includedFurnitureIndexList_ = other.includedFurnitureIndexList_;
@@ -593,9 +588,6 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
           }
           onChanged();
         }
-        if (other.hasSpawnPos()) {
-          mergeSpawnPos(other.getSpawnPos());
-        }
         if (other.getGuid() != 0) {
           setGuid(other.getGuid());
         }
@@ -629,97 +621,18 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList includedFurnitureIndexList_ = emptyIntList();
-      private void ensureIncludedFurnitureIndexListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          includedFurnitureIndexList_ = mutableCopy(includedFurnitureIndexList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @return A list containing the includedFurnitureIndexList.
-       */
-      public java.util.List<java.lang.Integer>
-          getIncludedFurnitureIndexListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(includedFurnitureIndexList_) : includedFurnitureIndexList_;
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @return The count of includedFurnitureIndexList.
-       */
-      public int getIncludedFurnitureIndexListCount() {
-        return includedFurnitureIndexList_.size();
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @param index The index of the element to return.
-       * @return The includedFurnitureIndexList at the given index.
-       */
-      public int getIncludedFurnitureIndexList(int index) {
-        return includedFurnitureIndexList_.getInt(index);
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @param index The index to set the value at.
-       * @param value The includedFurnitureIndexList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIncludedFurnitureIndexList(
-          int index, int value) {
-        ensureIncludedFurnitureIndexListIsMutable();
-        includedFurnitureIndexList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @param value The includedFurnitureIndexList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addIncludedFurnitureIndexList(int value) {
-        ensureIncludedFurnitureIndexListIsMutable();
-        includedFurnitureIndexList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @param values The includedFurnitureIndexList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllIncludedFurnitureIndexList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureIncludedFurnitureIndexListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, includedFurnitureIndexList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 included_furniture_index_list = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIncludedFurnitureIndexList() {
-        includedFurnitureIndexList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        * @return Whether the spawnPos field is set.
        */
       public boolean hasSpawnPos() {
         return spawnPosBuilder_ != null || spawnPos_ != null;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        * @return The spawnPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -730,7 +643,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -746,7 +659,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public Builder setSpawnPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -760,7 +673,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -778,7 +691,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public Builder clearSpawnPos() {
         if (spawnPosBuilder_ == null) {
@@ -792,7 +705,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
         
@@ -800,7 +713,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return getSpawnPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
         if (spawnPosBuilder_ != null) {
@@ -811,7 +724,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_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> 
@@ -827,9 +740,88 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return spawnPosBuilder_;
       }
 
+      private com.google.protobuf.Internal.IntList includedFurnitureIndexList_ = emptyIntList();
+      private void ensureIncludedFurnitureIndexListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          includedFurnitureIndexList_ = mutableCopy(includedFurnitureIndexList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @return A list containing the includedFurnitureIndexList.
+       */
+      public java.util.List<java.lang.Integer>
+          getIncludedFurnitureIndexListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(includedFurnitureIndexList_) : includedFurnitureIndexList_;
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @return The count of includedFurnitureIndexList.
+       */
+      public int getIncludedFurnitureIndexListCount() {
+        return includedFurnitureIndexList_.size();
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The includedFurnitureIndexList at the given index.
+       */
+      public int getIncludedFurnitureIndexList(int index) {
+        return includedFurnitureIndexList_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The includedFurnitureIndexList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIncludedFurnitureIndexList(
+          int index, int value) {
+        ensureIncludedFurnitureIndexListIsMutable();
+        includedFurnitureIndexList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @param value The includedFurnitureIndexList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addIncludedFurnitureIndexList(int value) {
+        ensureIncludedFurnitureIndexListIsMutable();
+        includedFurnitureIndexList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @param values The includedFurnitureIndexList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllIncludedFurnitureIndexList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureIncludedFurnitureIndexListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, includedFurnitureIndexList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIncludedFurnitureIndexList() {
+        includedFurnitureIndexList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private int guid_ ;
       /**
-       * <code>uint32 guid = 10;</code>
+       * <code>uint32 guid = 12;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -837,7 +829,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return guid_;
       }
       /**
-       * <code>uint32 guid = 10;</code>
+       * <code>uint32 guid = 12;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -848,7 +840,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 guid = 10;</code>
+       * <code>uint32 guid = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -926,8 +918,8 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"HomeFurnitureCustomSuiteData.proto\032\014Ve" +
       "ctor.proto\"o\n\034HomeFurnitureCustomSuiteDa" +
-      "ta\022%\n\035included_furniture_index_list\030\007 \003(" +
-      "\005\022\032\n\tspawn_pos\030\016 \001(\0132\007.Vector\022\014\n\004guid\030\n " +
+      "ta\022\032\n\tspawn_pos\030\002 \001(\0132\007.Vector\022%\n\035includ" +
+      "ed_furniture_index_list\030\003 \003(\005\022\014\n\004guid\030\014 " +
       "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -940,7 +932,7 @@ public final class HomeFurnitureCustomSuiteDataOuterClass {
     internal_static_HomeFurnitureCustomSuiteData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeFurnitureCustomSuiteData_descriptor,
-        new java.lang.String[] { "IncludedFurnitureIndexList", "SpawnPos", "Guid", });
+        new java.lang.String[] { "SpawnPos", "IncludedFurnitureIndexList", "Guid", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureDataOuterClass.java
index 7bec367c5..2240a8644 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureDataOuterClass.java
@@ -19,64 +19,60 @@ public final class HomeFurnitureDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 guid = 4;</code>
+     * <code>uint32 guid = 3;</code>
      * @return The guid.
      */
     int getGuid();
 
     /**
-     * <code>.Vector spawnRot = 5;</code>
-     * @return Whether the spawnRot field is set.
+     * <code>.Vector spawn_pos = 4;</code>
+     * @return Whether the spawnPos field is set.
      */
-    boolean hasSpawnRot();
+    boolean hasSpawnPos();
     /**
-     * <code>.Vector spawnRot = 5;</code>
-     * @return The spawnRot.
+     * <code>.Vector spawn_pos = 4;</code>
+     * @return The spawnPos.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
     /**
-     * <code>.Vector spawnRot = 5;</code>
+     * <code>.Vector spawn_pos = 4;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
 
     /**
-     * <code>uint32 furniture_id = 14;</code>
+     * <code>uint32 furniture_id = 6;</code>
      * @return The furnitureId.
      */
     int getFurnitureId();
 
     /**
-     * <code>uint32 version = 1;</code>
+     * <code>uint32 version = 8;</code>
      * @return The version.
      */
     int getVersion();
 
     /**
-     * <code>int32 parent_furniture_index = 8;</code>
+     * <code>int32 parent_furniture_index = 9;</code>
      * @return The parentFurnitureIndex.
      */
     int getParentFurnitureIndex();
 
     /**
-     * <code>.Vector spawn_pos = 11;</code>
-     * @return Whether the spawnPos field is set.
+     * <code>.Vector spawn_rot = 10;</code>
+     * @return Whether the spawnRot field is set.
      */
-    boolean hasSpawnPos();
+    boolean hasSpawnRot();
     /**
-     * <code>.Vector spawn_pos = 11;</code>
-     * @return The spawnPos.
+     * <code>.Vector spawn_rot = 10;</code>
+     * @return The spawnRot.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
     /**
-     * <code>.Vector spawn_pos = 11;</code>
+     * <code>.Vector spawn_rot = 10;</code>
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: MICPALMIGLK
-   * </pre>
-   *
    * Protobuf type {@code HomeFurnitureData}
    */
   public static final class HomeFurnitureData extends
@@ -121,35 +117,12 @@ public final class HomeFurnitureDataOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              version_ = input.readUInt32();
-              break;
-            }
-            case 32: {
+            case 24: {
 
               guid_ = input.readUInt32();
               break;
             }
-            case 42: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (spawnRot_ != null) {
-                subBuilder = spawnRot_.toBuilder();
-              }
-              spawnRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(spawnRot_);
-                spawnRot_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 64: {
-
-              parentFurnitureIndex_ = input.readInt32();
-              break;
-            }
-            case 90: {
+            case 34: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnPos_ != null) {
                 subBuilder = spawnPos_.toBuilder();
@@ -162,11 +135,34 @@ public final class HomeFurnitureDataOuterClass {
 
               break;
             }
-            case 112: {
+            case 48: {
 
               furnitureId_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              version_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              parentFurnitureIndex_ = input.readInt32();
+              break;
+            }
+            case 82: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (spawnRot_ != null) {
+                subBuilder = spawnRot_.toBuilder();
+              }
+              spawnRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(spawnRot_);
+                spawnRot_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -199,10 +195,10 @@ public final class HomeFurnitureDataOuterClass {
               emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.class, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 4;
+    public static final int GUID_FIELD_NUMBER = 3;
     private int guid_;
     /**
-     * <code>uint32 guid = 4;</code>
+     * <code>uint32 guid = 3;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -210,69 +206,10 @@ public final class HomeFurnitureDataOuterClass {
       return guid_;
     }
 
-    public static final int SPAWNROT_FIELD_NUMBER = 5;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-    /**
-     * <code>.Vector spawnRot = 5;</code>
-     * @return Whether the spawnRot field is set.
-     */
-    @java.lang.Override
-    public boolean hasSpawnRot() {
-      return spawnRot_ != null;
-    }
-    /**
-     * <code>.Vector spawnRot = 5;</code>
-     * @return The spawnRot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-    }
-    /**
-     * <code>.Vector spawnRot = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-      return getSpawnRot();
-    }
-
-    public static final int FURNITURE_ID_FIELD_NUMBER = 14;
-    private int furnitureId_;
-    /**
-     * <code>uint32 furniture_id = 14;</code>
-     * @return The furnitureId.
-     */
-    @java.lang.Override
-    public int getFurnitureId() {
-      return furnitureId_;
-    }
-
-    public static final int VERSION_FIELD_NUMBER = 1;
-    private int version_;
-    /**
-     * <code>uint32 version = 1;</code>
-     * @return The version.
-     */
-    @java.lang.Override
-    public int getVersion() {
-      return version_;
-    }
-
-    public static final int PARENT_FURNITURE_INDEX_FIELD_NUMBER = 8;
-    private int parentFurnitureIndex_;
-    /**
-     * <code>int32 parent_furniture_index = 8;</code>
-     * @return The parentFurnitureIndex.
-     */
-    @java.lang.Override
-    public int getParentFurnitureIndex() {
-      return parentFurnitureIndex_;
-    }
-
-    public static final int SPAWN_POS_FIELD_NUMBER = 11;
+    public static final int SPAWN_POS_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
     /**
-     * <code>.Vector spawn_pos = 11;</code>
+     * <code>.Vector spawn_pos = 4;</code>
      * @return Whether the spawnPos field is set.
      */
     @java.lang.Override
@@ -280,7 +217,7 @@ public final class HomeFurnitureDataOuterClass {
       return spawnPos_ != null;
     }
     /**
-     * <code>.Vector spawn_pos = 11;</code>
+     * <code>.Vector spawn_pos = 4;</code>
      * @return The spawnPos.
      */
     @java.lang.Override
@@ -288,13 +225,72 @@ public final class HomeFurnitureDataOuterClass {
       return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
     }
     /**
-     * <code>.Vector spawn_pos = 11;</code>
+     * <code>.Vector spawn_pos = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
       return getSpawnPos();
     }
 
+    public static final int FURNITURE_ID_FIELD_NUMBER = 6;
+    private int furnitureId_;
+    /**
+     * <code>uint32 furniture_id = 6;</code>
+     * @return The furnitureId.
+     */
+    @java.lang.Override
+    public int getFurnitureId() {
+      return furnitureId_;
+    }
+
+    public static final int VERSION_FIELD_NUMBER = 8;
+    private int version_;
+    /**
+     * <code>uint32 version = 8;</code>
+     * @return The version.
+     */
+    @java.lang.Override
+    public int getVersion() {
+      return version_;
+    }
+
+    public static final int PARENT_FURNITURE_INDEX_FIELD_NUMBER = 9;
+    private int parentFurnitureIndex_;
+    /**
+     * <code>int32 parent_furniture_index = 9;</code>
+     * @return The parentFurnitureIndex.
+     */
+    @java.lang.Override
+    public int getParentFurnitureIndex() {
+      return parentFurnitureIndex_;
+    }
+
+    public static final int SPAWN_ROT_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+    /**
+     * <code>.Vector spawn_rot = 10;</code>
+     * @return Whether the spawnRot field is set.
+     */
+    @java.lang.Override
+    public boolean hasSpawnRot() {
+      return spawnRot_ != null;
+    }
+    /**
+     * <code>.Vector spawn_rot = 10;</code>
+     * @return The spawnRot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+    }
+    /**
+     * <code>.Vector spawn_rot = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+      return getSpawnRot();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -309,23 +305,23 @@ public final class HomeFurnitureDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (version_ != 0) {
-        output.writeUInt32(1, version_);
-      }
       if (guid_ != 0) {
-        output.writeUInt32(4, guid_);
-      }
-      if (spawnRot_ != null) {
-        output.writeMessage(5, getSpawnRot());
-      }
-      if (parentFurnitureIndex_ != 0) {
-        output.writeInt32(8, parentFurnitureIndex_);
+        output.writeUInt32(3, guid_);
       }
       if (spawnPos_ != null) {
-        output.writeMessage(11, getSpawnPos());
+        output.writeMessage(4, getSpawnPos());
       }
       if (furnitureId_ != 0) {
-        output.writeUInt32(14, furnitureId_);
+        output.writeUInt32(6, furnitureId_);
+      }
+      if (version_ != 0) {
+        output.writeUInt32(8, version_);
+      }
+      if (parentFurnitureIndex_ != 0) {
+        output.writeInt32(9, parentFurnitureIndex_);
+      }
+      if (spawnRot_ != null) {
+        output.writeMessage(10, getSpawnRot());
       }
       unknownFields.writeTo(output);
     }
@@ -336,29 +332,29 @@ public final class HomeFurnitureDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (version_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, version_);
-      }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, guid_);
-      }
-      if (spawnRot_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getSpawnRot());
-      }
-      if (parentFurnitureIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, parentFurnitureIndex_);
+          .computeUInt32Size(3, guid_);
       }
       if (spawnPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getSpawnPos());
+          .computeMessageSize(4, getSpawnPos());
       }
       if (furnitureId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, furnitureId_);
+          .computeUInt32Size(6, furnitureId_);
+      }
+      if (version_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, version_);
+      }
+      if (parentFurnitureIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(9, parentFurnitureIndex_);
+      }
+      if (spawnRot_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getSpawnRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -377,10 +373,10 @@ public final class HomeFurnitureDataOuterClass {
 
       if (getGuid()
           != other.getGuid()) return false;
-      if (hasSpawnRot() != other.hasSpawnRot()) return false;
-      if (hasSpawnRot()) {
-        if (!getSpawnRot()
-            .equals(other.getSpawnRot())) return false;
+      if (hasSpawnPos() != other.hasSpawnPos()) return false;
+      if (hasSpawnPos()) {
+        if (!getSpawnPos()
+            .equals(other.getSpawnPos())) return false;
       }
       if (getFurnitureId()
           != other.getFurnitureId()) return false;
@@ -388,10 +384,10 @@ public final class HomeFurnitureDataOuterClass {
           != other.getVersion()) return false;
       if (getParentFurnitureIndex()
           != other.getParentFurnitureIndex()) return false;
-      if (hasSpawnPos() != other.hasSpawnPos()) return false;
-      if (hasSpawnPos()) {
-        if (!getSpawnPos()
-            .equals(other.getSpawnPos())) return false;
+      if (hasSpawnRot() != other.hasSpawnRot()) return false;
+      if (hasSpawnRot()) {
+        if (!getSpawnRot()
+            .equals(other.getSpawnRot())) return false;
       }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -406,9 +402,9 @@ public final class HomeFurnitureDataOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + getGuid();
-      if (hasSpawnRot()) {
-        hash = (37 * hash) + SPAWNROT_FIELD_NUMBER;
-        hash = (53 * hash) + getSpawnRot().hashCode();
+      if (hasSpawnPos()) {
+        hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getSpawnPos().hashCode();
       }
       hash = (37 * hash) + FURNITURE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getFurnitureId();
@@ -416,9 +412,9 @@ public final class HomeFurnitureDataOuterClass {
       hash = (53 * hash) + getVersion();
       hash = (37 * hash) + PARENT_FURNITURE_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getParentFurnitureIndex();
-      if (hasSpawnPos()) {
-        hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getSpawnPos().hashCode();
+      if (hasSpawnRot()) {
+        hash = (37 * hash) + SPAWN_ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getSpawnRot().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -516,10 +512,6 @@ public final class HomeFurnitureDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MICPALMIGLK
-     * </pre>
-     *
      * Protobuf type {@code HomeFurnitureData}
      */
     public static final class Builder extends
@@ -559,11 +551,11 @@ public final class HomeFurnitureDataOuterClass {
         super.clear();
         guid_ = 0;
 
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
+        if (spawnPosBuilder_ == null) {
+          spawnPos_ = null;
         } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
+          spawnPos_ = null;
+          spawnPosBuilder_ = null;
         }
         furnitureId_ = 0;
 
@@ -571,11 +563,11 @@ public final class HomeFurnitureDataOuterClass {
 
         parentFurnitureIndex_ = 0;
 
-        if (spawnPosBuilder_ == null) {
-          spawnPos_ = null;
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
         } else {
-          spawnPos_ = null;
-          spawnPosBuilder_ = null;
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
         }
         return this;
       }
@@ -604,19 +596,19 @@ public final class HomeFurnitureDataOuterClass {
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData buildPartial() {
         emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData result = new emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData(this);
         result.guid_ = guid_;
-        if (spawnRotBuilder_ == null) {
-          result.spawnRot_ = spawnRot_;
-        } else {
-          result.spawnRot_ = spawnRotBuilder_.build();
-        }
-        result.furnitureId_ = furnitureId_;
-        result.version_ = version_;
-        result.parentFurnitureIndex_ = parentFurnitureIndex_;
         if (spawnPosBuilder_ == null) {
           result.spawnPos_ = spawnPos_;
         } else {
           result.spawnPos_ = spawnPosBuilder_.build();
         }
+        result.furnitureId_ = furnitureId_;
+        result.version_ = version_;
+        result.parentFurnitureIndex_ = parentFurnitureIndex_;
+        if (spawnRotBuilder_ == null) {
+          result.spawnRot_ = spawnRot_;
+        } else {
+          result.spawnRot_ = spawnRotBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -668,8 +660,8 @@ public final class HomeFurnitureDataOuterClass {
         if (other.getGuid() != 0) {
           setGuid(other.getGuid());
         }
-        if (other.hasSpawnRot()) {
-          mergeSpawnRot(other.getSpawnRot());
+        if (other.hasSpawnPos()) {
+          mergeSpawnPos(other.getSpawnPos());
         }
         if (other.getFurnitureId() != 0) {
           setFurnitureId(other.getFurnitureId());
@@ -680,8 +672,8 @@ public final class HomeFurnitureDataOuterClass {
         if (other.getParentFurnitureIndex() != 0) {
           setParentFurnitureIndex(other.getParentFurnitureIndex());
         }
-        if (other.hasSpawnPos()) {
-          mergeSpawnPos(other.getSpawnPos());
+        if (other.hasSpawnRot()) {
+          mergeSpawnRot(other.getSpawnRot());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -714,7 +706,7 @@ public final class HomeFurnitureDataOuterClass {
 
       private int guid_ ;
       /**
-       * <code>uint32 guid = 4;</code>
+       * <code>uint32 guid = 3;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -722,7 +714,7 @@ public final class HomeFurnitureDataOuterClass {
         return guid_;
       }
       /**
-       * <code>uint32 guid = 4;</code>
+       * <code>uint32 guid = 3;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -733,7 +725,7 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 guid = 4;</code>
+       * <code>uint32 guid = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -743,230 +735,18 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       * @return Whether the spawnRot field is set.
-       */
-      public boolean hasSpawnRot() {
-        return spawnRotBuilder_ != null || spawnRot_ != null;
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       * @return The spawnRot.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        } else {
-          return spawnRotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          spawnRot_ = value;
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public Builder setSpawnRot(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = builderForValue.build();
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (spawnRot_ != null) {
-            spawnRot_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
-          } else {
-            spawnRot_ = value;
-          }
-          onChanged();
-        } else {
-          spawnRotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public Builder clearSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
-          onChanged();
-        } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
-        
-        onChanged();
-        return getSpawnRotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-        if (spawnRotBuilder_ != null) {
-          return spawnRotBuilder_.getMessageOrBuilder();
-        } else {
-          return spawnRot_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 5;</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> 
-          getSpawnRotFieldBuilder() {
-        if (spawnRotBuilder_ == null) {
-          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSpawnRot(),
-                  getParentForChildren(),
-                  isClean());
-          spawnRot_ = null;
-        }
-        return spawnRotBuilder_;
-      }
-
-      private int furnitureId_ ;
-      /**
-       * <code>uint32 furniture_id = 14;</code>
-       * @return The furnitureId.
-       */
-      @java.lang.Override
-      public int getFurnitureId() {
-        return furnitureId_;
-      }
-      /**
-       * <code>uint32 furniture_id = 14;</code>
-       * @param value The furnitureId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFurnitureId(int value) {
-        
-        furnitureId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 furniture_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFurnitureId() {
-        
-        furnitureId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int version_ ;
-      /**
-       * <code>uint32 version = 1;</code>
-       * @return The version.
-       */
-      @java.lang.Override
-      public int getVersion() {
-        return version_;
-      }
-      /**
-       * <code>uint32 version = 1;</code>
-       * @param value The version to set.
-       * @return This builder for chaining.
-       */
-      public Builder setVersion(int value) {
-        
-        version_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 version = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearVersion() {
-        
-        version_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int parentFurnitureIndex_ ;
-      /**
-       * <code>int32 parent_furniture_index = 8;</code>
-       * @return The parentFurnitureIndex.
-       */
-      @java.lang.Override
-      public int getParentFurnitureIndex() {
-        return parentFurnitureIndex_;
-      }
-      /**
-       * <code>int32 parent_furniture_index = 8;</code>
-       * @param value The parentFurnitureIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParentFurnitureIndex(int value) {
-        
-        parentFurnitureIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 parent_furniture_index = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParentFurnitureIndex() {
-        
-        parentFurnitureIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        * @return Whether the spawnPos field is set.
        */
       public boolean hasSpawnPos() {
         return spawnPosBuilder_ != null || spawnPos_ != null;
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        * @return The spawnPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -977,7 +757,7 @@ public final class HomeFurnitureDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -993,7 +773,7 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public Builder setSpawnPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1007,7 +787,7 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -1025,7 +805,7 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public Builder clearSpawnPos() {
         if (spawnPosBuilder_ == null) {
@@ -1039,7 +819,7 @@ public final class HomeFurnitureDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
         
@@ -1047,7 +827,7 @@ public final class HomeFurnitureDataOuterClass {
         return getSpawnPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 4;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
         if (spawnPosBuilder_ != null) {
@@ -1058,7 +838,7 @@ public final class HomeFurnitureDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 11;</code>
+       * <code>.Vector spawn_pos = 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> 
@@ -1073,6 +853,218 @@ public final class HomeFurnitureDataOuterClass {
         }
         return spawnPosBuilder_;
       }
+
+      private int furnitureId_ ;
+      /**
+       * <code>uint32 furniture_id = 6;</code>
+       * @return The furnitureId.
+       */
+      @java.lang.Override
+      public int getFurnitureId() {
+        return furnitureId_;
+      }
+      /**
+       * <code>uint32 furniture_id = 6;</code>
+       * @param value The furnitureId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFurnitureId(int value) {
+        
+        furnitureId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 furniture_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFurnitureId() {
+        
+        furnitureId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int version_ ;
+      /**
+       * <code>uint32 version = 8;</code>
+       * @return The version.
+       */
+      @java.lang.Override
+      public int getVersion() {
+        return version_;
+      }
+      /**
+       * <code>uint32 version = 8;</code>
+       * @param value The version to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVersion(int value) {
+        
+        version_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 version = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVersion() {
+        
+        version_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int parentFurnitureIndex_ ;
+      /**
+       * <code>int32 parent_furniture_index = 9;</code>
+       * @return The parentFurnitureIndex.
+       */
+      @java.lang.Override
+      public int getParentFurnitureIndex() {
+        return parentFurnitureIndex_;
+      }
+      /**
+       * <code>int32 parent_furniture_index = 9;</code>
+       * @param value The parentFurnitureIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParentFurnitureIndex(int value) {
+        
+        parentFurnitureIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 parent_furniture_index = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParentFurnitureIndex() {
+        
+        parentFurnitureIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       * @return Whether the spawnRot field is set.
+       */
+      public boolean hasSpawnRot() {
+        return spawnRotBuilder_ != null || spawnRot_ != null;
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       * @return The spawnRot.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        } else {
+          return spawnRotBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          spawnRot_ = value;
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public Builder setSpawnRot(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = builderForValue.build();
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (spawnRot_ != null) {
+            spawnRot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
+          } else {
+            spawnRot_ = value;
+          }
+          onChanged();
+        } else {
+          spawnRotBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public Builder clearSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
+          onChanged();
+        } else {
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
+        
+        onChanged();
+        return getSpawnRotFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+        if (spawnRotBuilder_ != null) {
+          return spawnRotBuilder_.getMessageOrBuilder();
+        } else {
+          return spawnRot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 10;</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> 
+          getSpawnRotFieldBuilder() {
+        if (spawnRotBuilder_ == null) {
+          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getSpawnRot(),
+                  getParentForChildren(),
+                  isClean());
+          spawnRot_ = null;
+        }
+        return spawnRotBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1141,11 +1133,11 @@ public final class HomeFurnitureDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027HomeFurnitureData.proto\032\014Vector.proto\"" +
-      "\237\001\n\021HomeFurnitureData\022\014\n\004guid\030\004 \001(\r\022\031\n\010s" +
-      "pawnRot\030\005 \001(\0132\007.Vector\022\024\n\014furniture_id\030\016" +
-      " \001(\r\022\017\n\007version\030\001 \001(\r\022\036\n\026parent_furnitur" +
-      "e_index\030\010 \001(\005\022\032\n\tspawn_pos\030\013 \001(\0132\007.Vecto" +
-      "rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\240\001\n\021HomeFurnitureData\022\014\n\004guid\030\003 \001(\r\022\032\n\ts" +
+      "pawn_pos\030\004 \001(\0132\007.Vector\022\024\n\014furniture_id\030" +
+      "\006 \001(\r\022\017\n\007version\030\010 \001(\r\022\036\n\026parent_furnitu" +
+      "re_index\030\t \001(\005\022\032\n\tspawn_rot\030\n \001(\0132\007.Vect" +
+      "orB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1157,7 +1149,7 @@ public final class HomeFurnitureDataOuterClass {
     internal_static_HomeFurnitureData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeFurnitureData_descriptor,
-        new java.lang.String[] { "Guid", "SpawnRot", "FurnitureId", "Version", "ParentFurnitureIndex", "SpawnPos", });
+        new java.lang.String[] { "Guid", "SpawnPos", "FurnitureId", "Version", "ParentFurnitureIndex", "SpawnRot", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureGroupDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureGroupDataOuterClass.java
index 61cc747ce..5c7b01a11 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureGroupDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureGroupDataOuterClass.java
@@ -19,40 +19,36 @@ public final class HomeFurnitureGroupDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 group_furniture_index = 9;</code>
-     * @return The groupFurnitureIndex.
-     */
-    int getGroupFurnitureIndex();
-
-    /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
         getVirtualFurniureListList();
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getVirtualFurniureList(int index);
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     int getVirtualFurniureListCount();
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
         getVirtualFurniureListOrBuilderList();
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getVirtualFurniureListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 group_furniture_index = 14;</code>
+     * @return The groupFurnitureIndex.
+     */
+    int getGroupFurnitureIndex();
   }
   /**
-   * <pre>
-   * Obf: HFMLKOOJPAO
-   * </pre>
-   *
    * Protobuf type {@code HomeFurnitureGroupData}
    */
   public static final class HomeFurnitureGroupData extends
@@ -99,12 +95,7 @@ public final class HomeFurnitureGroupDataOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
-
-              groupFurnitureIndex_ = input.readUInt32();
-              break;
-            }
-            case 122: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 virtualFurniureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,6 +104,11 @@ public final class HomeFurnitureGroupDataOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
+            case 112: {
+
+              groupFurnitureIndex_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -148,28 +144,17 @@ public final class HomeFurnitureGroupDataOuterClass {
               emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.class, emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.Builder.class);
     }
 
-    public static final int GROUP_FURNITURE_INDEX_FIELD_NUMBER = 9;
-    private int groupFurnitureIndex_;
-    /**
-     * <code>uint32 group_furniture_index = 9;</code>
-     * @return The groupFurnitureIndex.
-     */
-    @java.lang.Override
-    public int getGroupFurnitureIndex() {
-      return groupFurnitureIndex_;
-    }
-
-    public static final int VIRTUAL_FURNIURE_LIST_FIELD_NUMBER = 15;
+    public static final int VIRTUAL_FURNIURE_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> virtualFurniureList_;
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getVirtualFurniureListList() {
       return virtualFurniureList_;
     }
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
@@ -177,21 +162,21 @@ public final class HomeFurnitureGroupDataOuterClass {
       return virtualFurniureList_;
     }
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     @java.lang.Override
     public int getVirtualFurniureListCount() {
       return virtualFurniureList_.size();
     }
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getVirtualFurniureList(int index) {
       return virtualFurniureList_.get(index);
     }
     /**
-     * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+     * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getVirtualFurniureListOrBuilder(
@@ -199,6 +184,17 @@ public final class HomeFurnitureGroupDataOuterClass {
       return virtualFurniureList_.get(index);
     }
 
+    public static final int GROUP_FURNITURE_INDEX_FIELD_NUMBER = 14;
+    private int groupFurnitureIndex_;
+    /**
+     * <code>uint32 group_furniture_index = 14;</code>
+     * @return The groupFurnitureIndex.
+     */
+    @java.lang.Override
+    public int getGroupFurnitureIndex() {
+      return groupFurnitureIndex_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -213,11 +209,11 @@ public final class HomeFurnitureGroupDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (groupFurnitureIndex_ != 0) {
-        output.writeUInt32(9, groupFurnitureIndex_);
-      }
       for (int i = 0; i < virtualFurniureList_.size(); i++) {
-        output.writeMessage(15, virtualFurniureList_.get(i));
+        output.writeMessage(9, virtualFurniureList_.get(i));
+      }
+      if (groupFurnitureIndex_ != 0) {
+        output.writeUInt32(14, groupFurnitureIndex_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,13 +224,13 @@ public final class HomeFurnitureGroupDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (groupFurnitureIndex_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, groupFurnitureIndex_);
-      }
       for (int i = 0; i < virtualFurniureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, virtualFurniureList_.get(i));
+          .computeMessageSize(9, virtualFurniureList_.get(i));
+      }
+      if (groupFurnitureIndex_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, groupFurnitureIndex_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -251,10 +247,10 @@ public final class HomeFurnitureGroupDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData other = (emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData) obj;
 
-      if (getGroupFurnitureIndex()
-          != other.getGroupFurnitureIndex()) return false;
       if (!getVirtualFurniureListList()
           .equals(other.getVirtualFurniureListList())) return false;
+      if (getGroupFurnitureIndex()
+          != other.getGroupFurnitureIndex()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -266,12 +262,12 @@ public final class HomeFurnitureGroupDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GROUP_FURNITURE_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getGroupFurnitureIndex();
       if (getVirtualFurniureListCount() > 0) {
         hash = (37 * hash) + VIRTUAL_FURNIURE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getVirtualFurniureListList().hashCode();
       }
+      hash = (37 * hash) + GROUP_FURNITURE_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getGroupFurnitureIndex();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -368,10 +364,6 @@ public final class HomeFurnitureGroupDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HFMLKOOJPAO
-     * </pre>
-     *
      * Protobuf type {@code HomeFurnitureGroupData}
      */
     public static final class Builder extends
@@ -410,14 +402,14 @@ public final class HomeFurnitureGroupDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        groupFurnitureIndex_ = 0;
-
         if (virtualFurniureListBuilder_ == null) {
           virtualFurniureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           virtualFurniureListBuilder_.clear();
         }
+        groupFurnitureIndex_ = 0;
+
         return this;
       }
 
@@ -445,7 +437,6 @@ public final class HomeFurnitureGroupDataOuterClass {
       public emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData buildPartial() {
         emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData result = new emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData(this);
         int from_bitField0_ = bitField0_;
-        result.groupFurnitureIndex_ = groupFurnitureIndex_;
         if (virtualFurniureListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             virtualFurniureList_ = java.util.Collections.unmodifiableList(virtualFurniureList_);
@@ -455,6 +446,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         } else {
           result.virtualFurniureList_ = virtualFurniureListBuilder_.build();
         }
+        result.groupFurnitureIndex_ = groupFurnitureIndex_;
         onBuilt();
         return result;
       }
@@ -503,9 +495,6 @@ public final class HomeFurnitureGroupDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData other) {
         if (other == emu.grasscutter.net.proto.HomeFurnitureGroupDataOuterClass.HomeFurnitureGroupData.getDefaultInstance()) return this;
-        if (other.getGroupFurnitureIndex() != 0) {
-          setGroupFurnitureIndex(other.getGroupFurnitureIndex());
-        }
         if (virtualFurniureListBuilder_ == null) {
           if (!other.virtualFurniureList_.isEmpty()) {
             if (virtualFurniureList_.isEmpty()) {
@@ -532,6 +521,9 @@ public final class HomeFurnitureGroupDataOuterClass {
             }
           }
         }
+        if (other.getGroupFurnitureIndex() != 0) {
+          setGroupFurnitureIndex(other.getGroupFurnitureIndex());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -562,37 +554,6 @@ public final class HomeFurnitureGroupDataOuterClass {
       }
       private int bitField0_;
 
-      private int groupFurnitureIndex_ ;
-      /**
-       * <code>uint32 group_furniture_index = 9;</code>
-       * @return The groupFurnitureIndex.
-       */
-      @java.lang.Override
-      public int getGroupFurnitureIndex() {
-        return groupFurnitureIndex_;
-      }
-      /**
-       * <code>uint32 group_furniture_index = 9;</code>
-       * @param value The groupFurnitureIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGroupFurnitureIndex(int value) {
-        
-        groupFurnitureIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 group_furniture_index = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGroupFurnitureIndex() {
-        
-        groupFurnitureIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> virtualFurniureList_ =
         java.util.Collections.emptyList();
       private void ensureVirtualFurniureListIsMutable() {
@@ -606,7 +567,7 @@ public final class HomeFurnitureGroupDataOuterClass {
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> virtualFurniureListBuilder_;
 
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getVirtualFurniureListList() {
         if (virtualFurniureListBuilder_ == null) {
@@ -616,7 +577,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public int getVirtualFurniureListCount() {
         if (virtualFurniureListBuilder_ == null) {
@@ -626,7 +587,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getVirtualFurniureList(int index) {
         if (virtualFurniureListBuilder_ == null) {
@@ -636,7 +597,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder setVirtualFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
@@ -653,7 +614,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder setVirtualFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -667,7 +628,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder addVirtualFurniureList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
         if (virtualFurniureListBuilder_ == null) {
@@ -683,7 +644,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder addVirtualFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
@@ -700,7 +661,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder addVirtualFurniureList(
           emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -714,7 +675,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder addVirtualFurniureList(
           int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
@@ -728,7 +689,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder addAllVirtualFurniureList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
@@ -743,7 +704,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder clearVirtualFurniureList() {
         if (virtualFurniureListBuilder_ == null) {
@@ -756,7 +717,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public Builder removeVirtualFurniureList(int index) {
         if (virtualFurniureListBuilder_ == null) {
@@ -769,14 +730,14 @@ public final class HomeFurnitureGroupDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getVirtualFurniureListBuilder(
           int index) {
         return getVirtualFurniureListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getVirtualFurniureListOrBuilder(
           int index) {
@@ -786,7 +747,7 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
            getVirtualFurniureListOrBuilderList() {
@@ -797,14 +758,14 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addVirtualFurniureListBuilder() {
         return getVirtualFurniureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addVirtualFurniureListBuilder(
           int index) {
@@ -812,7 +773,7 @@ public final class HomeFurnitureGroupDataOuterClass {
             index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeFurnitureData virtual_furniure_list = 15;</code>
+       * <code>repeated .HomeFurnitureData virtual_furniure_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
            getVirtualFurniureListBuilderList() {
@@ -832,6 +793,37 @@ public final class HomeFurnitureGroupDataOuterClass {
         }
         return virtualFurniureListBuilder_;
       }
+
+      private int groupFurnitureIndex_ ;
+      /**
+       * <code>uint32 group_furniture_index = 14;</code>
+       * @return The groupFurnitureIndex.
+       */
+      @java.lang.Override
+      public int getGroupFurnitureIndex() {
+        return groupFurnitureIndex_;
+      }
+      /**
+       * <code>uint32 group_furniture_index = 14;</code>
+       * @param value The groupFurnitureIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGroupFurnitureIndex(int value) {
+        
+        groupFurnitureIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 group_furniture_index = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGroupFurnitureIndex() {
+        
+        groupFurnitureIndex_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -901,9 +893,9 @@ public final class HomeFurnitureGroupDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034HomeFurnitureGroupData.proto\032\027HomeFurn" +
       "itureData.proto\"j\n\026HomeFurnitureGroupDat" +
-      "a\022\035\n\025group_furniture_index\030\t \001(\r\0221\n\025virt" +
-      "ual_furniure_list\030\017 \003(\0132\022.HomeFurnitureD" +
-      "ataB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "a\0221\n\025virtual_furniure_list\030\t \003(\0132\022.HomeF" +
+      "urnitureData\022\035\n\025group_furniture_index\030\016 " +
+      "\001(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -915,7 +907,7 @@ public final class HomeFurnitureGroupDataOuterClass {
     internal_static_HomeFurnitureGroupData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeFurnitureGroupData_descriptor,
-        new java.lang.String[] { "GroupFurnitureIndex", "VirtualFurniureList", });
+        new java.lang.String[] { "VirtualFurniureList", "GroupFurnitureIndex", });
     emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureSuiteDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureSuiteDataOuterClass.java
index adbb3086d..c384c157a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureSuiteDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeFurnitureSuiteDataOuterClass.java
@@ -19,60 +19,56 @@ public final class HomeFurnitureSuiteDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return Whether the spawnPos field is set.
+     * <code>bool is_allow_summon = 4;</code>
+     * @return The isAllowSummon.
      */
-    boolean hasSpawnPos();
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return The spawnPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
+    boolean getIsAllowSummon();
 
     /**
-     * <code>uint32 guid = 10;</code>
+     * <code>uint32 guid = 9;</code>
      * @return The guid.
      */
     int getGuid();
 
     /**
-     * <code>uint32 suite_id = 8;</code>
+     * <code>uint32 suite_id = 11;</code>
      * @return The suiteId.
      */
     int getSuiteId();
 
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>.Vector spawn_pos = 12;</code>
+     * @return Whether the spawnPos field is set.
+     */
+    boolean hasSpawnPos();
+    /**
+     * <code>.Vector spawn_pos = 12;</code>
+     * @return The spawnPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
+    /**
+     * <code>.Vector spawn_pos = 12;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
+
+    /**
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @return A list containing the includedFurnitureIndexList.
      */
     java.util.List<java.lang.Integer> getIncludedFurnitureIndexListList();
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @return The count of includedFurnitureIndexList.
      */
     int getIncludedFurnitureIndexListCount();
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @param index The index of the element to return.
      * @return The includedFurnitureIndexList at the given index.
      */
     int getIncludedFurnitureIndexList(int index);
-
-    /**
-     * <code>bool is_allow_summon = 7;</code>
-     * @return The isAllowSummon.
-     */
-    boolean getIsAllowSummon();
   }
   /**
-   * <pre>
-   * Obf: EKELBKHKMLP
-   * </pre>
-   *
    * Protobuf type {@code HomeFurnitureSuiteData}
    */
   public static final class HomeFurnitureSuiteData extends
@@ -119,43 +115,22 @@ public final class HomeFurnitureSuiteDataOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                includedFurnitureIndexList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              includedFurnitureIndexList_.addInt(input.readInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                includedFurnitureIndexList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                includedFurnitureIndexList_.addInt(input.readInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 56: {
+            case 32: {
 
               isAllowSummon_ = input.readBool();
               break;
             }
-            case 64: {
-
-              suiteId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
+            case 72: {
 
               guid_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 88: {
+
+              suiteId_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnPos_ != null) {
                 subBuilder = spawnPos_.toBuilder();
@@ -168,6 +143,27 @@ public final class HomeFurnitureSuiteDataOuterClass {
 
               break;
             }
+            case 120: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                includedFurnitureIndexList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              includedFurnitureIndexList_.addInt(input.readInt32());
+              break;
+            }
+            case 122: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                includedFurnitureIndexList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                includedFurnitureIndexList_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -203,36 +199,21 @@ public final class HomeFurnitureSuiteDataOuterClass {
               emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.class, emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.Builder.class);
     }
 
-    public static final int SPAWN_POS_FIELD_NUMBER = 14;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
+    public static final int IS_ALLOW_SUMMON_FIELD_NUMBER = 4;
+    private boolean isAllowSummon_;
     /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return Whether the spawnPos field is set.
+     * <code>bool is_allow_summon = 4;</code>
+     * @return The isAllowSummon.
      */
     @java.lang.Override
-    public boolean hasSpawnPos() {
-      return spawnPos_ != null;
-    }
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     * @return The spawnPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
-      return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
-    }
-    /**
-     * <code>.Vector spawn_pos = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
-      return getSpawnPos();
+    public boolean getIsAllowSummon() {
+      return isAllowSummon_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 10;
+    public static final int GUID_FIELD_NUMBER = 9;
     private int guid_;
     /**
-     * <code>uint32 guid = 10;</code>
+     * <code>uint32 guid = 9;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -240,10 +221,10 @@ public final class HomeFurnitureSuiteDataOuterClass {
       return guid_;
     }
 
-    public static final int SUITE_ID_FIELD_NUMBER = 8;
+    public static final int SUITE_ID_FIELD_NUMBER = 11;
     private int suiteId_;
     /**
-     * <code>uint32 suite_id = 8;</code>
+     * <code>uint32 suite_id = 11;</code>
      * @return The suiteId.
      */
     @java.lang.Override
@@ -251,10 +232,36 @@ public final class HomeFurnitureSuiteDataOuterClass {
       return suiteId_;
     }
 
-    public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 3;
+    public static final int SPAWN_POS_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
+    /**
+     * <code>.Vector spawn_pos = 12;</code>
+     * @return Whether the spawnPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasSpawnPos() {
+      return spawnPos_ != null;
+    }
+    /**
+     * <code>.Vector spawn_pos = 12;</code>
+     * @return The spawnPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
+      return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
+    }
+    /**
+     * <code>.Vector spawn_pos = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
+      return getSpawnPos();
+    }
+
+    public static final int INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.IntList includedFurnitureIndexList_;
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @return A list containing the includedFurnitureIndexList.
      */
     @java.lang.Override
@@ -263,14 +270,14 @@ public final class HomeFurnitureSuiteDataOuterClass {
       return includedFurnitureIndexList_;
     }
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @return The count of includedFurnitureIndexList.
      */
     public int getIncludedFurnitureIndexListCount() {
       return includedFurnitureIndexList_.size();
     }
     /**
-     * <code>repeated int32 included_furniture_index_list = 3;</code>
+     * <code>repeated int32 included_furniture_index_list = 15;</code>
      * @param index The index of the element to return.
      * @return The includedFurnitureIndexList at the given index.
      */
@@ -279,17 +286,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
     }
     private int includedFurnitureIndexListMemoizedSerializedSize = -1;
 
-    public static final int IS_ALLOW_SUMMON_FIELD_NUMBER = 7;
-    private boolean isAllowSummon_;
-    /**
-     * <code>bool is_allow_summon = 7;</code>
-     * @return The isAllowSummon.
-     */
-    @java.lang.Override
-    public boolean getIsAllowSummon() {
-      return isAllowSummon_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -305,25 +301,25 @@ public final class HomeFurnitureSuiteDataOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (isAllowSummon_ != false) {
+        output.writeBool(4, isAllowSummon_);
+      }
+      if (guid_ != 0) {
+        output.writeUInt32(9, guid_);
+      }
+      if (suiteId_ != 0) {
+        output.writeUInt32(11, suiteId_);
+      }
+      if (spawnPos_ != null) {
+        output.writeMessage(12, getSpawnPos());
+      }
       if (getIncludedFurnitureIndexListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(122);
         output.writeUInt32NoTag(includedFurnitureIndexListMemoizedSerializedSize);
       }
       for (int i = 0; i < includedFurnitureIndexList_.size(); i++) {
         output.writeInt32NoTag(includedFurnitureIndexList_.getInt(i));
       }
-      if (isAllowSummon_ != false) {
-        output.writeBool(7, isAllowSummon_);
-      }
-      if (suiteId_ != 0) {
-        output.writeUInt32(8, suiteId_);
-      }
-      if (guid_ != 0) {
-        output.writeUInt32(10, guid_);
-      }
-      if (spawnPos_ != null) {
-        output.writeMessage(14, getSpawnPos());
-      }
       unknownFields.writeTo(output);
     }
 
@@ -333,6 +329,22 @@ public final class HomeFurnitureSuiteDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isAllowSummon_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(4, isAllowSummon_);
+      }
+      if (guid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, guid_);
+      }
+      if (suiteId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, suiteId_);
+      }
+      if (spawnPos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getSpawnPos());
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < includedFurnitureIndexList_.size(); i++) {
@@ -347,22 +359,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
         }
         includedFurnitureIndexListMemoizedSerializedSize = dataSize;
       }
-      if (isAllowSummon_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isAllowSummon_);
-      }
-      if (suiteId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, suiteId_);
-      }
-      if (guid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, guid_);
-      }
-      if (spawnPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSpawnPos());
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -378,19 +374,19 @@ public final class HomeFurnitureSuiteDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData other = (emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData) obj;
 
+      if (getIsAllowSummon()
+          != other.getIsAllowSummon()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
+      if (getSuiteId()
+          != other.getSuiteId()) return false;
       if (hasSpawnPos() != other.hasSpawnPos()) return false;
       if (hasSpawnPos()) {
         if (!getSpawnPos()
             .equals(other.getSpawnPos())) return false;
       }
-      if (getGuid()
-          != other.getGuid()) return false;
-      if (getSuiteId()
-          != other.getSuiteId()) return false;
       if (!getIncludedFurnitureIndexListList()
           .equals(other.getIncludedFurnitureIndexListList())) return false;
-      if (getIsAllowSummon()
-          != other.getIsAllowSummon()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -402,21 +398,21 @@ public final class HomeFurnitureSuiteDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasSpawnPos()) {
-        hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getSpawnPos().hashCode();
-      }
+      hash = (37 * hash) + IS_ALLOW_SUMMON_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsAllowSummon());
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + getGuid();
       hash = (37 * hash) + SUITE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSuiteId();
+      if (hasSpawnPos()) {
+        hash = (37 * hash) + SPAWN_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getSpawnPos().hashCode();
+      }
       if (getIncludedFurnitureIndexListCount() > 0) {
         hash = (37 * hash) + INCLUDED_FURNITURE_INDEX_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getIncludedFurnitureIndexListList().hashCode();
       }
-      hash = (37 * hash) + IS_ALLOW_SUMMON_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsAllowSummon());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -513,10 +509,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EKELBKHKMLP
-     * </pre>
-     *
      * Protobuf type {@code HomeFurnitureSuiteData}
      */
     public static final class Builder extends
@@ -554,20 +546,20 @@ public final class HomeFurnitureSuiteDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isAllowSummon_ = false;
+
+        guid_ = 0;
+
+        suiteId_ = 0;
+
         if (spawnPosBuilder_ == null) {
           spawnPos_ = null;
         } else {
           spawnPos_ = null;
           spawnPosBuilder_ = null;
         }
-        guid_ = 0;
-
-        suiteId_ = 0;
-
         includedFurnitureIndexList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        isAllowSummon_ = false;
-
         return this;
       }
 
@@ -595,19 +587,19 @@ public final class HomeFurnitureSuiteDataOuterClass {
       public emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData buildPartial() {
         emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData result = new emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData(this);
         int from_bitField0_ = bitField0_;
+        result.isAllowSummon_ = isAllowSummon_;
+        result.guid_ = guid_;
+        result.suiteId_ = suiteId_;
         if (spawnPosBuilder_ == null) {
           result.spawnPos_ = spawnPos_;
         } else {
           result.spawnPos_ = spawnPosBuilder_.build();
         }
-        result.guid_ = guid_;
-        result.suiteId_ = suiteId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           includedFurnitureIndexList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.includedFurnitureIndexList_ = includedFurnitureIndexList_;
-        result.isAllowSummon_ = isAllowSummon_;
         onBuilt();
         return result;
       }
@@ -656,8 +648,8 @@ public final class HomeFurnitureSuiteDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData other) {
         if (other == emu.grasscutter.net.proto.HomeFurnitureSuiteDataOuterClass.HomeFurnitureSuiteData.getDefaultInstance()) return this;
-        if (other.hasSpawnPos()) {
-          mergeSpawnPos(other.getSpawnPos());
+        if (other.getIsAllowSummon() != false) {
+          setIsAllowSummon(other.getIsAllowSummon());
         }
         if (other.getGuid() != 0) {
           setGuid(other.getGuid());
@@ -665,6 +657,9 @@ public final class HomeFurnitureSuiteDataOuterClass {
         if (other.getSuiteId() != 0) {
           setSuiteId(other.getSuiteId());
         }
+        if (other.hasSpawnPos()) {
+          mergeSpawnPos(other.getSpawnPos());
+        }
         if (!other.includedFurnitureIndexList_.isEmpty()) {
           if (includedFurnitureIndexList_.isEmpty()) {
             includedFurnitureIndexList_ = other.includedFurnitureIndexList_;
@@ -675,9 +670,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
           }
           onChanged();
         }
-        if (other.getIsAllowSummon() != false) {
-          setIsAllowSummon(other.getIsAllowSummon());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -708,18 +700,111 @@ public final class HomeFurnitureSuiteDataOuterClass {
       }
       private int bitField0_;
 
+      private boolean isAllowSummon_ ;
+      /**
+       * <code>bool is_allow_summon = 4;</code>
+       * @return The isAllowSummon.
+       */
+      @java.lang.Override
+      public boolean getIsAllowSummon() {
+        return isAllowSummon_;
+      }
+      /**
+       * <code>bool is_allow_summon = 4;</code>
+       * @param value The isAllowSummon to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsAllowSummon(boolean value) {
+        
+        isAllowSummon_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_allow_summon = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsAllowSummon() {
+        
+        isAllowSummon_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int guid_ ;
+      /**
+       * <code>uint32 guid = 9;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public int getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint32 guid = 9;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(int value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 guid = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int suiteId_ ;
+      /**
+       * <code>uint32 suite_id = 11;</code>
+       * @return The suiteId.
+       */
+      @java.lang.Override
+      public int getSuiteId() {
+        return suiteId_;
+      }
+      /**
+       * <code>uint32 suite_id = 11;</code>
+       * @param value The suiteId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSuiteId(int value) {
+        
+        suiteId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 suite_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSuiteId() {
+        
+        suiteId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        * @return Whether the spawnPos field is set.
        */
       public boolean hasSpawnPos() {
         return spawnPosBuilder_ != null || spawnPos_ != null;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        * @return The spawnPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -730,7 +815,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -746,7 +831,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder setSpawnPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -760,7 +845,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -778,7 +863,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public Builder clearSpawnPos() {
         if (spawnPosBuilder_ == null) {
@@ -792,7 +877,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
         
@@ -800,7 +885,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return getSpawnPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_pos = 12;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
         if (spawnPosBuilder_ != null) {
@@ -811,7 +896,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 14;</code>
+       * <code>.Vector spawn_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> 
@@ -827,68 +912,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return spawnPosBuilder_;
       }
 
-      private int guid_ ;
-      /**
-       * <code>uint32 guid = 10;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public int getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint32 guid = 10;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(int value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 guid = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int suiteId_ ;
-      /**
-       * <code>uint32 suite_id = 8;</code>
-       * @return The suiteId.
-       */
-      @java.lang.Override
-      public int getSuiteId() {
-        return suiteId_;
-      }
-      /**
-       * <code>uint32 suite_id = 8;</code>
-       * @param value The suiteId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSuiteId(int value) {
-        
-        suiteId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 suite_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSuiteId() {
-        
-        suiteId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList includedFurnitureIndexList_ = emptyIntList();
       private void ensureIncludedFurnitureIndexListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -897,7 +920,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
          }
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @return A list containing the includedFurnitureIndexList.
        */
       public java.util.List<java.lang.Integer>
@@ -906,14 +929,14 @@ public final class HomeFurnitureSuiteDataOuterClass {
                  java.util.Collections.unmodifiableList(includedFurnitureIndexList_) : includedFurnitureIndexList_;
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @return The count of includedFurnitureIndexList.
        */
       public int getIncludedFurnitureIndexListCount() {
         return includedFurnitureIndexList_.size();
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @param index The index of the element to return.
        * @return The includedFurnitureIndexList at the given index.
        */
@@ -921,7 +944,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return includedFurnitureIndexList_.getInt(index);
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @param index The index to set the value at.
        * @param value The includedFurnitureIndexList to set.
        * @return This builder for chaining.
@@ -934,7 +957,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @param value The includedFurnitureIndexList to add.
        * @return This builder for chaining.
        */
@@ -945,7 +968,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @param values The includedFurnitureIndexList to add.
        * @return This builder for chaining.
        */
@@ -958,7 +981,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 included_furniture_index_list = 3;</code>
+       * <code>repeated int32 included_furniture_index_list = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearIncludedFurnitureIndexList() {
@@ -967,37 +990,6 @@ public final class HomeFurnitureSuiteDataOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean isAllowSummon_ ;
-      /**
-       * <code>bool is_allow_summon = 7;</code>
-       * @return The isAllowSummon.
-       */
-      @java.lang.Override
-      public boolean getIsAllowSummon() {
-        return isAllowSummon_;
-      }
-      /**
-       * <code>bool is_allow_summon = 7;</code>
-       * @param value The isAllowSummon to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsAllowSummon(boolean value) {
-        
-        isAllowSummon_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_allow_summon = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsAllowSummon() {
-        
-        isAllowSummon_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1066,10 +1058,10 @@ public final class HomeFurnitureSuiteDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034HomeFurnitureSuiteData.proto\032\014Vector.p" +
-      "roto\"\224\001\n\026HomeFurnitureSuiteData\022\032\n\tspawn" +
-      "_pos\030\016 \001(\0132\007.Vector\022\014\n\004guid\030\n \001(\r\022\020\n\010sui" +
-      "te_id\030\010 \001(\r\022%\n\035included_furniture_index_" +
-      "list\030\003 \003(\005\022\027\n\017is_allow_summon\030\007 \001(\010B\033\n\031e" +
+      "roto\"\224\001\n\026HomeFurnitureSuiteData\022\027\n\017is_al" +
+      "low_summon\030\004 \001(\010\022\014\n\004guid\030\t \001(\r\022\020\n\010suite_" +
+      "id\030\013 \001(\r\022\032\n\tspawn_pos\030\014 \001(\0132\007.Vector\022%\n\035" +
+      "included_furniture_index_list\030\017 \003(\005B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1082,7 +1074,7 @@ public final class HomeFurnitureSuiteDataOuterClass {
     internal_static_HomeFurnitureSuiteData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeFurnitureSuiteData_descriptor,
-        new java.lang.String[] { "SpawnPos", "Guid", "SuiteId", "IncludedFurnitureIndexList", "IsAllowSummon", });
+        new java.lang.String[] { "IsAllowSummon", "Guid", "SuiteId", "SpawnPos", "IncludedFurnitureIndexList", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoReqOuterClass.java
index 257d93dbd..cd685c438 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoReqOuterClass.java
@@ -19,28 +19,23 @@ public final class HomeGetArrangementInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @return A list containing the sceneIdList.
      */
     java.util.List<java.lang.Integer> getSceneIdListList();
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @return The count of sceneIdList.
      */
     int getSceneIdListCount();
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @param index The index of the element to return.
      * @return The sceneIdList at the given index.
      */
     int getSceneIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 22421
-   * Obf: NLOCIBLJBAO
-   * </pre>
-   *
    * Protobuf type {@code HomeGetArrangementInfoReq}
    */
   public static final class HomeGetArrangementInfoReq extends
@@ -87,7 +82,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 72: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
               sceneIdList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class HomeGetArrangementInfoReqOuterClass {
               emu.grasscutter.net.proto.HomeGetArrangementInfoReqOuterClass.HomeGetArrangementInfoReq.class, emu.grasscutter.net.proto.HomeGetArrangementInfoReqOuterClass.HomeGetArrangementInfoReq.Builder.class);
     }
 
-    public static final int SCENE_ID_LIST_FIELD_NUMBER = 15;
+    public static final int SCENE_ID_LIST_FIELD_NUMBER = 9;
     private com.google.protobuf.Internal.IntList sceneIdList_;
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @return A list containing the sceneIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class HomeGetArrangementInfoReqOuterClass {
       return sceneIdList_;
     }
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @return The count of sceneIdList.
      */
     public int getSceneIdListCount() {
       return sceneIdList_.size();
     }
     /**
-     * <code>repeated uint32 scene_id_list = 15;</code>
+     * <code>repeated uint32 scene_id_list = 9;</code>
      * @param index The index of the element to return.
      * @return The sceneIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getSceneIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(74);
         output.writeUInt32NoTag(sceneIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < sceneIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class HomeGetArrangementInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22421
-     * Obf: NLOCIBLJBAO
-     * </pre>
-     *
      * Protobuf type {@code HomeGetArrangementInfoReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @return A list containing the sceneIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class HomeGetArrangementInfoReqOuterClass {
                  java.util.Collections.unmodifiableList(sceneIdList_) : sceneIdList_;
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @return The count of sceneIdList.
        */
       public int getSceneIdListCount() {
         return sceneIdList_.size();
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @param index The index of the element to return.
        * @return The sceneIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
         return sceneIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @param index The index to set the value at.
        * @param value The sceneIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @param value The sceneIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @param values The sceneIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_id_list = 15;</code>
+       * <code>repeated uint32 scene_id_list = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneIdList() {
@@ -655,7 +645,7 @@ public final class HomeGetArrangementInfoReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037HomeGetArrangementInfoReq.proto\"2\n\031Hom" +
       "eGetArrangementInfoReq\022\025\n\rscene_id_list\030" +
-      "\017 \003(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "\t \003(\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/HomeGetArrangementInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoRspOuterClass.java
index bba0b5e52..d9e68c4a3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetArrangementInfoRspOuterClass.java
@@ -19,41 +19,36 @@ public final class HomeGetArrangementInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> 
         getSceneArrangementInfoListList();
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfoList(int index);
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     int getSceneArrangementInfoListCount();
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> 
         getSceneArrangementInfoListOrBuilderList();
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoListOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 24303
-   * Obf: BHJNKKACMMH
-   * </pre>
-   *
    * Protobuf type {@code HomeGetArrangementInfoRsp}
    */
   public static final class HomeGetArrangementInfoRsp extends
@@ -100,7 +95,12 @@ public final class HomeGetArrangementInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 32: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneArrangementInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.parser(), extensionRegistry));
               break;
             }
-            case 96: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +144,28 @@ public final class HomeGetArrangementInfoRspOuterClass {
               emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp.class, emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp.Builder.class);
     }
 
-    public static final int SCENE_ARRANGEMENT_INFO_LIST_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int SCENE_ARRANGEMENT_INFO_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> sceneArrangementInfoList_;
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> getSceneArrangementInfoListList() {
       return sceneArrangementInfoList_;
     }
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class HomeGetArrangementInfoRspOuterClass {
       return sceneArrangementInfoList_;
     }
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     @java.lang.Override
     public int getSceneArrangementInfoListCount() {
       return sceneArrangementInfoList_.size();
     }
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfoList(int index) {
       return sceneArrangementInfoList_.get(index);
     }
     /**
-     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+     * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoListOrBuilder(
@@ -189,17 +195,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
       return sceneArrangementInfoList_.get(index);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 12;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class HomeGetArrangementInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < sceneArrangementInfoList_.size(); i++) {
-        output.writeMessage(4, sceneArrangementInfoList_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(4, retcode_);
+      }
+      for (int i = 0; i < sceneArrangementInfoList_.size(); i++) {
+        output.writeMessage(11, sceneArrangementInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class HomeGetArrangementInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < sceneArrangementInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, sceneArrangementInfoList_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(4, retcode_);
+      }
+      for (int i = 0; i < sceneArrangementInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, sceneArrangementInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class HomeGetArrangementInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp other = (emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp) obj;
 
-      if (!getSceneArrangementInfoListList()
-          .equals(other.getSceneArrangementInfoListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getSceneArrangementInfoListList()
+          .equals(other.getSceneArrangementInfoListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class HomeGetArrangementInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getSceneArrangementInfoListCount() > 0) {
         hash = (37 * hash) + SCENE_ARRANGEMENT_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSceneArrangementInfoListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24303
-     * Obf: BHJNKKACMMH
-     * </pre>
-     *
      * Protobuf type {@code HomeGetArrangementInfoRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class HomeGetArrangementInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (sceneArrangementInfoListBuilder_ == null) {
           sceneArrangementInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           sceneArrangementInfoListBuilder_.clear();
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
       public emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp buildPartial() {
         emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp result = new emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (sceneArrangementInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             sceneArrangementInfoList_ = java.util.Collections.unmodifiableList(sceneArrangementInfoList_);
@@ -456,7 +447,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
         } else {
           result.sceneArrangementInfoList_ = sceneArrangementInfoListBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class HomeGetArrangementInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp other) {
         if (other == emu.grasscutter.net.proto.HomeGetArrangementInfoRspOuterClass.HomeGetArrangementInfoRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (sceneArrangementInfoListBuilder_ == null) {
           if (!other.sceneArrangementInfoList_.isEmpty()) {
             if (sceneArrangementInfoList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class HomeGetArrangementInfoRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> sceneArrangementInfoList_ =
         java.util.Collections.emptyList();
       private void ensureSceneArrangementInfoListIsMutable() {
@@ -577,7 +598,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
           emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> sceneArrangementInfoListBuilder_;
 
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> getSceneArrangementInfoListList() {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public int getSceneArrangementInfoListCount() {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfoList(int index) {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder setSceneArrangementInfoList(
           int index, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
@@ -624,7 +645,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder setSceneArrangementInfoList(
           int index, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder addSceneArrangementInfoList(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder addSceneArrangementInfoList(
           int index, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
@@ -671,7 +692,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder addSceneArrangementInfoList(
           emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder addSceneArrangementInfoList(
           int index, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder addAllSceneArrangementInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo> values) {
@@ -714,7 +735,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder clearSceneArrangementInfoList() {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public Builder removeSceneArrangementInfoList(int index) {
         if (sceneArrangementInfoListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class HomeGetArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder getSceneArrangementInfoListBuilder(
           int index) {
         return getSceneArrangementInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> 
            getSceneArrangementInfoListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder addSceneArrangementInfoListBuilder() {
         return getSceneArrangementInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder addSceneArrangementInfoListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
             index, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 4;</code>
+       * <code>repeated .HomeSceneArrangementInfo scene_arrangement_info_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder> 
            getSceneArrangementInfoListBuilderList() {
@@ -803,37 +824,6 @@ public final class HomeGetArrangementInfoRspOuterClass {
         }
         return sceneArrangementInfoListBuilder_;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 12;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 12;</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 = 12;</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) {
@@ -903,9 +893,9 @@ public final class HomeGetArrangementInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037HomeGetArrangementInfoRsp.proto\032\036HomeS" +
       "ceneArrangementInfo.proto\"l\n\031HomeGetArra" +
-      "ngementInfoRsp\022>\n\033scene_arrangement_info" +
-      "_list\030\004 \003(\0132\031.HomeSceneArrangementInfo\022\017" +
-      "\n\007retcode\030\014 \001(\005B\033\n\031emu.grasscutter.net.p" +
+      "ngementInfoRsp\022\017\n\007retcode\030\004 \001(\005\022>\n\033scene" +
+      "_arrangement_info_list\030\013 \003(\0132\031.HomeScene" +
+      "ArrangementInfoB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +908,7 @@ public final class HomeGetArrangementInfoRspOuterClass {
     internal_static_HomeGetArrangementInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeGetArrangementInfoRsp_descriptor,
-        new java.lang.String[] { "SceneArrangementInfoList", "Retcode", });
+        new java.lang.String[] { "Retcode", "SceneArrangementInfoList", });
     emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeGetBasicInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetBasicInfoReqOuterClass.java
index e1cbe5518..cbfa240e8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeGetBasicInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeGetBasicInfoReqOuterClass.java
@@ -19,11 +19,6 @@ public final class HomeGetBasicInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 27734
-   * Obf: IEPBGIKMJFE
-   * </pre>
-   *
    * Protobuf type {@code HomeGetBasicInfoReq}
    */
   public static final class HomeGetBasicInfoReq extends
@@ -245,11 +240,6 @@ public final class HomeGetBasicInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27734
-     * Obf: IEPBGIKMJFE
-     * </pre>
-     *
      * Protobuf type {@code HomeGetBasicInfoReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoOuterClass.java
index ca534a10f..b3da9cf74 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoOuterClass.java
@@ -18,65 +18,61 @@ public final class HomeLimitedShopInfoOuterClass {
       // @@protoc_insertion_point(interface_extends:HomeLimitedShopInfo)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>fixed32 end_time = 13;</code>
-     * @return The endTime.
-     */
-    int getEndTime();
-
-    /**
-     * <code>fixed32 start_time = 6;</code>
-     * @return The startTime.
-     */
-    int getStartTime();
-
-    /**
-     * <code>fixed32 LMJPHDCDAJK = 15;</code>
-     * @return The lMJPHDCDAJK.
-     */
-    int getLMJPHDCDAJK();
-
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     * @return Whether the djinnRot field is set.
-     */
-    boolean hasDjinnRot();
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     * @return The djinnRot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot();
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder();
-
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     * @return Whether the djinnPos field is set.
-     */
-    boolean hasDjinnPos();
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     * @return The djinnPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos();
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder();
-
     /**
      * <code>uint32 uid = 2;</code>
      * @return The uid.
      */
     int getUid();
+
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     * @return Whether the djinnRot field is set.
+     */
+    boolean hasDjinnRot();
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     * @return The djinnRot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot();
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder();
+
+    /**
+     * <code>fixed32 next_guest_open_time = 5;</code>
+     * @return The nextGuestOpenTime.
+     */
+    int getNextGuestOpenTime();
+
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     * @return Whether the djinnPos field is set.
+     */
+    boolean hasDjinnPos();
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     * @return The djinnPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos();
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder();
+
+    /**
+     * <code>fixed32 next_close_time = 10;</code>
+     * @return The nextCloseTime.
+     */
+    int getNextCloseTime();
+
+    /**
+     * <code>fixed32 next_open_time = 12;</code>
+     * @return The nextOpenTime.
+     */
+    int getNextOpenTime();
   }
   /**
-   * <pre>
-   * Obf: BOPJHGACPAM
-   * </pre>
-   *
    * Protobuf type {@code HomeLimitedShopInfo}
    */
   public static final class HomeLimitedShopInfo extends
@@ -126,12 +122,7 @@ public final class HomeLimitedShopInfoOuterClass {
               uid_ = input.readUInt32();
               break;
             }
-            case 53: {
-
-              startTime_ = input.readFixed32();
-              break;
-            }
-            case 58: {
+            case 26: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (djinnRot_ != null) {
                 subBuilder = djinnRot_.toBuilder();
@@ -144,7 +135,12 @@ public final class HomeLimitedShopInfoOuterClass {
 
               break;
             }
-            case 66: {
+            case 45: {
+
+              nextGuestOpenTime_ = input.readFixed32();
+              break;
+            }
+            case 58: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (djinnPos_ != null) {
                 subBuilder = djinnPos_.toBuilder();
@@ -157,14 +153,14 @@ public final class HomeLimitedShopInfoOuterClass {
 
               break;
             }
-            case 109: {
+            case 85: {
 
-              endTime_ = input.readFixed32();
+              nextCloseTime_ = input.readFixed32();
               break;
             }
-            case 125: {
+            case 101: {
 
-              lMJPHDCDAJK_ = input.readFixed32();
+              nextOpenTime_ = input.readFixed32();
               break;
             }
             default: {
@@ -199,91 +195,6 @@ public final class HomeLimitedShopInfoOuterClass {
               emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.class, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder.class);
     }
 
-    public static final int END_TIME_FIELD_NUMBER = 13;
-    private int endTime_;
-    /**
-     * <code>fixed32 end_time = 13;</code>
-     * @return The endTime.
-     */
-    @java.lang.Override
-    public int getEndTime() {
-      return endTime_;
-    }
-
-    public static final int START_TIME_FIELD_NUMBER = 6;
-    private int startTime_;
-    /**
-     * <code>fixed32 start_time = 6;</code>
-     * @return The startTime.
-     */
-    @java.lang.Override
-    public int getStartTime() {
-      return startTime_;
-    }
-
-    public static final int LMJPHDCDAJK_FIELD_NUMBER = 15;
-    private int lMJPHDCDAJK_;
-    /**
-     * <code>fixed32 LMJPHDCDAJK = 15;</code>
-     * @return The lMJPHDCDAJK.
-     */
-    @java.lang.Override
-    public int getLMJPHDCDAJK() {
-      return lMJPHDCDAJK_;
-    }
-
-    public static final int DJINN_ROT_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnRot_;
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     * @return Whether the djinnRot field is set.
-     */
-    @java.lang.Override
-    public boolean hasDjinnRot() {
-      return djinnRot_ != null;
-    }
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     * @return The djinnRot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot() {
-      return djinnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
-    }
-    /**
-     * <code>.Vector djinn_rot = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder() {
-      return getDjinnRot();
-    }
-
-    public static final int DJINN_POS_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     * @return Whether the djinnPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasDjinnPos() {
-      return djinnPos_ != null;
-    }
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     * @return The djinnPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos() {
-      return djinnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
-    }
-    /**
-     * <code>.Vector djinn_pos = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder() {
-      return getDjinnPos();
-    }
-
     public static final int UID_FIELD_NUMBER = 2;
     private int uid_;
     /**
@@ -295,6 +206,91 @@ public final class HomeLimitedShopInfoOuterClass {
       return uid_;
     }
 
+    public static final int DJINN_ROT_FIELD_NUMBER = 3;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnRot_;
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     * @return Whether the djinnRot field is set.
+     */
+    @java.lang.Override
+    public boolean hasDjinnRot() {
+      return djinnRot_ != null;
+    }
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     * @return The djinnRot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot() {
+      return djinnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
+    }
+    /**
+     * <code>.Vector djinn_rot = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder() {
+      return getDjinnRot();
+    }
+
+    public static final int NEXT_GUEST_OPEN_TIME_FIELD_NUMBER = 5;
+    private int nextGuestOpenTime_;
+    /**
+     * <code>fixed32 next_guest_open_time = 5;</code>
+     * @return The nextGuestOpenTime.
+     */
+    @java.lang.Override
+    public int getNextGuestOpenTime() {
+      return nextGuestOpenTime_;
+    }
+
+    public static final int DJINN_POS_FIELD_NUMBER = 7;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     * @return Whether the djinnPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasDjinnPos() {
+      return djinnPos_ != null;
+    }
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     * @return The djinnPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos() {
+      return djinnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
+    }
+    /**
+     * <code>.Vector djinn_pos = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder() {
+      return getDjinnPos();
+    }
+
+    public static final int NEXT_CLOSE_TIME_FIELD_NUMBER = 10;
+    private int nextCloseTime_;
+    /**
+     * <code>fixed32 next_close_time = 10;</code>
+     * @return The nextCloseTime.
+     */
+    @java.lang.Override
+    public int getNextCloseTime() {
+      return nextCloseTime_;
+    }
+
+    public static final int NEXT_OPEN_TIME_FIELD_NUMBER = 12;
+    private int nextOpenTime_;
+    /**
+     * <code>fixed32 next_open_time = 12;</code>
+     * @return The nextOpenTime.
+     */
+    @java.lang.Override
+    public int getNextOpenTime() {
+      return nextOpenTime_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -312,20 +308,20 @@ public final class HomeLimitedShopInfoOuterClass {
       if (uid_ != 0) {
         output.writeUInt32(2, uid_);
       }
-      if (startTime_ != 0) {
-        output.writeFixed32(6, startTime_);
-      }
       if (djinnRot_ != null) {
-        output.writeMessage(7, getDjinnRot());
+        output.writeMessage(3, getDjinnRot());
+      }
+      if (nextGuestOpenTime_ != 0) {
+        output.writeFixed32(5, nextGuestOpenTime_);
       }
       if (djinnPos_ != null) {
-        output.writeMessage(8, getDjinnPos());
+        output.writeMessage(7, getDjinnPos());
       }
-      if (endTime_ != 0) {
-        output.writeFixed32(13, endTime_);
+      if (nextCloseTime_ != 0) {
+        output.writeFixed32(10, nextCloseTime_);
       }
-      if (lMJPHDCDAJK_ != 0) {
-        output.writeFixed32(15, lMJPHDCDAJK_);
+      if (nextOpenTime_ != 0) {
+        output.writeFixed32(12, nextOpenTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -340,25 +336,25 @@ public final class HomeLimitedShopInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, uid_);
       }
-      if (startTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFixed32Size(6, startTime_);
-      }
       if (djinnRot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getDjinnRot());
+          .computeMessageSize(3, getDjinnRot());
+      }
+      if (nextGuestOpenTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFixed32Size(5, nextGuestOpenTime_);
       }
       if (djinnPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getDjinnPos());
+          .computeMessageSize(7, getDjinnPos());
       }
-      if (endTime_ != 0) {
+      if (nextCloseTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFixed32Size(13, endTime_);
+          .computeFixed32Size(10, nextCloseTime_);
       }
-      if (lMJPHDCDAJK_ != 0) {
+      if (nextOpenTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFixed32Size(15, lMJPHDCDAJK_);
+          .computeFixed32Size(12, nextOpenTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -375,24 +371,24 @@ public final class HomeLimitedShopInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo other = (emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo) obj;
 
-      if (getEndTime()
-          != other.getEndTime()) return false;
-      if (getStartTime()
-          != other.getStartTime()) return false;
-      if (getLMJPHDCDAJK()
-          != other.getLMJPHDCDAJK()) return false;
+      if (getUid()
+          != other.getUid()) return false;
       if (hasDjinnRot() != other.hasDjinnRot()) return false;
       if (hasDjinnRot()) {
         if (!getDjinnRot()
             .equals(other.getDjinnRot())) return false;
       }
+      if (getNextGuestOpenTime()
+          != other.getNextGuestOpenTime()) return false;
       if (hasDjinnPos() != other.hasDjinnPos()) return false;
       if (hasDjinnPos()) {
         if (!getDjinnPos()
             .equals(other.getDjinnPos())) return false;
       }
-      if (getUid()
-          != other.getUid()) return false;
+      if (getNextCloseTime()
+          != other.getNextCloseTime()) return false;
+      if (getNextOpenTime()
+          != other.getNextOpenTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -404,22 +400,22 @@ public final class HomeLimitedShopInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + END_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getEndTime();
-      hash = (37 * hash) + START_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getStartTime();
-      hash = (37 * hash) + LMJPHDCDAJK_FIELD_NUMBER;
-      hash = (53 * hash) + getLMJPHDCDAJK();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       if (hasDjinnRot()) {
         hash = (37 * hash) + DJINN_ROT_FIELD_NUMBER;
         hash = (53 * hash) + getDjinnRot().hashCode();
       }
+      hash = (37 * hash) + NEXT_GUEST_OPEN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextGuestOpenTime();
       if (hasDjinnPos()) {
         hash = (37 * hash) + DJINN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getDjinnPos().hashCode();
       }
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
+      hash = (37 * hash) + NEXT_CLOSE_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextCloseTime();
+      hash = (37 * hash) + NEXT_OPEN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextOpenTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -516,10 +512,6 @@ public final class HomeLimitedShopInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BOPJHGACPAM
-     * </pre>
-     *
      * Protobuf type {@code HomeLimitedShopInfo}
      */
     public static final class Builder extends
@@ -557,11 +549,7 @@ public final class HomeLimitedShopInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        endTime_ = 0;
-
-        startTime_ = 0;
-
-        lMJPHDCDAJK_ = 0;
+        uid_ = 0;
 
         if (djinnRotBuilder_ == null) {
           djinnRot_ = null;
@@ -569,13 +557,17 @@ public final class HomeLimitedShopInfoOuterClass {
           djinnRot_ = null;
           djinnRotBuilder_ = null;
         }
+        nextGuestOpenTime_ = 0;
+
         if (djinnPosBuilder_ == null) {
           djinnPos_ = null;
         } else {
           djinnPos_ = null;
           djinnPosBuilder_ = null;
         }
-        uid_ = 0;
+        nextCloseTime_ = 0;
+
+        nextOpenTime_ = 0;
 
         return this;
       }
@@ -603,20 +595,20 @@ public final class HomeLimitedShopInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo buildPartial() {
         emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo result = new emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo(this);
-        result.endTime_ = endTime_;
-        result.startTime_ = startTime_;
-        result.lMJPHDCDAJK_ = lMJPHDCDAJK_;
+        result.uid_ = uid_;
         if (djinnRotBuilder_ == null) {
           result.djinnRot_ = djinnRot_;
         } else {
           result.djinnRot_ = djinnRotBuilder_.build();
         }
+        result.nextGuestOpenTime_ = nextGuestOpenTime_;
         if (djinnPosBuilder_ == null) {
           result.djinnPos_ = djinnPos_;
         } else {
           result.djinnPos_ = djinnPosBuilder_.build();
         }
-        result.uid_ = uid_;
+        result.nextCloseTime_ = nextCloseTime_;
+        result.nextOpenTime_ = nextOpenTime_;
         onBuilt();
         return result;
       }
@@ -665,23 +657,23 @@ public final class HomeLimitedShopInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo other) {
         if (other == emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance()) return this;
-        if (other.getEndTime() != 0) {
-          setEndTime(other.getEndTime());
-        }
-        if (other.getStartTime() != 0) {
-          setStartTime(other.getStartTime());
-        }
-        if (other.getLMJPHDCDAJK() != 0) {
-          setLMJPHDCDAJK(other.getLMJPHDCDAJK());
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
         }
         if (other.hasDjinnRot()) {
           mergeDjinnRot(other.getDjinnRot());
         }
+        if (other.getNextGuestOpenTime() != 0) {
+          setNextGuestOpenTime(other.getNextGuestOpenTime());
+        }
         if (other.hasDjinnPos()) {
           mergeDjinnPos(other.getDjinnPos());
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
+        if (other.getNextCloseTime() != 0) {
+          setNextCloseTime(other.getNextCloseTime());
+        }
+        if (other.getNextOpenTime() != 0) {
+          setNextOpenTime(other.getNextOpenTime());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -712,337 +704,6 @@ public final class HomeLimitedShopInfoOuterClass {
         return this;
       }
 
-      private int endTime_ ;
-      /**
-       * <code>fixed32 end_time = 13;</code>
-       * @return The endTime.
-       */
-      @java.lang.Override
-      public int getEndTime() {
-        return endTime_;
-      }
-      /**
-       * <code>fixed32 end_time = 13;</code>
-       * @param value The endTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEndTime(int value) {
-        
-        endTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>fixed32 end_time = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEndTime() {
-        
-        endTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int startTime_ ;
-      /**
-       * <code>fixed32 start_time = 6;</code>
-       * @return The startTime.
-       */
-      @java.lang.Override
-      public int getStartTime() {
-        return startTime_;
-      }
-      /**
-       * <code>fixed32 start_time = 6;</code>
-       * @param value The startTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStartTime(int value) {
-        
-        startTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>fixed32 start_time = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStartTime() {
-        
-        startTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int lMJPHDCDAJK_ ;
-      /**
-       * <code>fixed32 LMJPHDCDAJK = 15;</code>
-       * @return The lMJPHDCDAJK.
-       */
-      @java.lang.Override
-      public int getLMJPHDCDAJK() {
-        return lMJPHDCDAJK_;
-      }
-      /**
-       * <code>fixed32 LMJPHDCDAJK = 15;</code>
-       * @param value The lMJPHDCDAJK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLMJPHDCDAJK(int value) {
-        
-        lMJPHDCDAJK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>fixed32 LMJPHDCDAJK = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLMJPHDCDAJK() {
-        
-        lMJPHDCDAJK_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnRot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> djinnRotBuilder_;
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       * @return Whether the djinnRot field is set.
-       */
-      public boolean hasDjinnRot() {
-        return djinnRotBuilder_ != null || djinnRot_ != null;
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       * @return The djinnRot.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot() {
-        if (djinnRotBuilder_ == null) {
-          return djinnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
-        } else {
-          return djinnRotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public Builder setDjinnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (djinnRotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          djinnRot_ = value;
-          onChanged();
-        } else {
-          djinnRotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public Builder setDjinnRot(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (djinnRotBuilder_ == null) {
-          djinnRot_ = builderForValue.build();
-          onChanged();
-        } else {
-          djinnRotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public Builder mergeDjinnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (djinnRotBuilder_ == null) {
-          if (djinnRot_ != null) {
-            djinnRot_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(djinnRot_).mergeFrom(value).buildPartial();
-          } else {
-            djinnRot_ = value;
-          }
-          onChanged();
-        } else {
-          djinnRotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public Builder clearDjinnRot() {
-        if (djinnRotBuilder_ == null) {
-          djinnRot_ = null;
-          onChanged();
-        } else {
-          djinnRot_ = null;
-          djinnRotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDjinnRotBuilder() {
-        
-        onChanged();
-        return getDjinnRotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector djinn_rot = 7;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder() {
-        if (djinnRotBuilder_ != null) {
-          return djinnRotBuilder_.getMessageOrBuilder();
-        } else {
-          return djinnRot_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
-        }
-      }
-      /**
-       * <code>.Vector djinn_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> 
-          getDjinnRotFieldBuilder() {
-        if (djinnRotBuilder_ == null) {
-          djinnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getDjinnRot(),
-                  getParentForChildren(),
-                  isClean());
-          djinnRot_ = null;
-        }
-        return djinnRotBuilder_;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> djinnPosBuilder_;
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       * @return Whether the djinnPos field is set.
-       */
-      public boolean hasDjinnPos() {
-        return djinnPosBuilder_ != null || djinnPos_ != null;
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       * @return The djinnPos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos() {
-        if (djinnPosBuilder_ == null) {
-          return djinnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
-        } else {
-          return djinnPosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public Builder setDjinnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (djinnPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          djinnPos_ = value;
-          onChanged();
-        } else {
-          djinnPosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public Builder setDjinnPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (djinnPosBuilder_ == null) {
-          djinnPos_ = builderForValue.build();
-          onChanged();
-        } else {
-          djinnPosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public Builder mergeDjinnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (djinnPosBuilder_ == null) {
-          if (djinnPos_ != null) {
-            djinnPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(djinnPos_).mergeFrom(value).buildPartial();
-          } else {
-            djinnPos_ = value;
-          }
-          onChanged();
-        } else {
-          djinnPosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public Builder clearDjinnPos() {
-        if (djinnPosBuilder_ == null) {
-          djinnPos_ = null;
-          onChanged();
-        } else {
-          djinnPos_ = null;
-          djinnPosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDjinnPosBuilder() {
-        
-        onChanged();
-        return getDjinnPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder() {
-        if (djinnPosBuilder_ != null) {
-          return djinnPosBuilder_.getMessageOrBuilder();
-        } else {
-          return djinnPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
-        }
-      }
-      /**
-       * <code>.Vector djinn_pos = 8;</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> 
-          getDjinnPosFieldBuilder() {
-        if (djinnPosBuilder_ == null) {
-          djinnPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getDjinnPos(),
-                  getParentForChildren(),
-                  isClean());
-          djinnPos_ = null;
-        }
-        return djinnPosBuilder_;
-      }
-
       private int uid_ ;
       /**
        * <code>uint32 uid = 2;</code>
@@ -1073,6 +734,337 @@ public final class HomeLimitedShopInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnRot_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> djinnRotBuilder_;
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       * @return Whether the djinnRot field is set.
+       */
+      public boolean hasDjinnRot() {
+        return djinnRotBuilder_ != null || djinnRot_ != null;
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       * @return The djinnRot.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnRot() {
+        if (djinnRotBuilder_ == null) {
+          return djinnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
+        } else {
+          return djinnRotBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public Builder setDjinnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (djinnRotBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          djinnRot_ = value;
+          onChanged();
+        } else {
+          djinnRotBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public Builder setDjinnRot(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (djinnRotBuilder_ == null) {
+          djinnRot_ = builderForValue.build();
+          onChanged();
+        } else {
+          djinnRotBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public Builder mergeDjinnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (djinnRotBuilder_ == null) {
+          if (djinnRot_ != null) {
+            djinnRot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(djinnRot_).mergeFrom(value).buildPartial();
+          } else {
+            djinnRot_ = value;
+          }
+          onChanged();
+        } else {
+          djinnRotBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public Builder clearDjinnRot() {
+        if (djinnRotBuilder_ == null) {
+          djinnRot_ = null;
+          onChanged();
+        } else {
+          djinnRot_ = null;
+          djinnRotBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDjinnRotBuilder() {
+        
+        onChanged();
+        return getDjinnRotFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnRotOrBuilder() {
+        if (djinnRotBuilder_ != null) {
+          return djinnRotBuilder_.getMessageOrBuilder();
+        } else {
+          return djinnRot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnRot_;
+        }
+      }
+      /**
+       * <code>.Vector djinn_rot = 3;</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> 
+          getDjinnRotFieldBuilder() {
+        if (djinnRotBuilder_ == null) {
+          djinnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getDjinnRot(),
+                  getParentForChildren(),
+                  isClean());
+          djinnRot_ = null;
+        }
+        return djinnRotBuilder_;
+      }
+
+      private int nextGuestOpenTime_ ;
+      /**
+       * <code>fixed32 next_guest_open_time = 5;</code>
+       * @return The nextGuestOpenTime.
+       */
+      @java.lang.Override
+      public int getNextGuestOpenTime() {
+        return nextGuestOpenTime_;
+      }
+      /**
+       * <code>fixed32 next_guest_open_time = 5;</code>
+       * @param value The nextGuestOpenTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextGuestOpenTime(int value) {
+        
+        nextGuestOpenTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>fixed32 next_guest_open_time = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextGuestOpenTime() {
+        
+        nextGuestOpenTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> djinnPosBuilder_;
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       * @return Whether the djinnPos field is set.
+       */
+      public boolean hasDjinnPos() {
+        return djinnPosBuilder_ != null || djinnPos_ != null;
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       * @return The djinnPos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDjinnPos() {
+        if (djinnPosBuilder_ == null) {
+          return djinnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
+        } else {
+          return djinnPosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public Builder setDjinnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (djinnPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          djinnPos_ = value;
+          onChanged();
+        } else {
+          djinnPosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public Builder setDjinnPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (djinnPosBuilder_ == null) {
+          djinnPos_ = builderForValue.build();
+          onChanged();
+        } else {
+          djinnPosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public Builder mergeDjinnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (djinnPosBuilder_ == null) {
+          if (djinnPos_ != null) {
+            djinnPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(djinnPos_).mergeFrom(value).buildPartial();
+          } else {
+            djinnPos_ = value;
+          }
+          onChanged();
+        } else {
+          djinnPosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public Builder clearDjinnPos() {
+        if (djinnPosBuilder_ == null) {
+          djinnPos_ = null;
+          onChanged();
+        } else {
+          djinnPos_ = null;
+          djinnPosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDjinnPosBuilder() {
+        
+        onChanged();
+        return getDjinnPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector djinn_pos = 7;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder() {
+        if (djinnPosBuilder_ != null) {
+          return djinnPosBuilder_.getMessageOrBuilder();
+        } else {
+          return djinnPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : djinnPos_;
+        }
+      }
+      /**
+       * <code>.Vector djinn_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> 
+          getDjinnPosFieldBuilder() {
+        if (djinnPosBuilder_ == null) {
+          djinnPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getDjinnPos(),
+                  getParentForChildren(),
+                  isClean());
+          djinnPos_ = null;
+        }
+        return djinnPosBuilder_;
+      }
+
+      private int nextCloseTime_ ;
+      /**
+       * <code>fixed32 next_close_time = 10;</code>
+       * @return The nextCloseTime.
+       */
+      @java.lang.Override
+      public int getNextCloseTime() {
+        return nextCloseTime_;
+      }
+      /**
+       * <code>fixed32 next_close_time = 10;</code>
+       * @param value The nextCloseTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextCloseTime(int value) {
+        
+        nextCloseTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>fixed32 next_close_time = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextCloseTime() {
+        
+        nextCloseTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nextOpenTime_ ;
+      /**
+       * <code>fixed32 next_open_time = 12;</code>
+       * @return The nextOpenTime.
+       */
+      @java.lang.Override
+      public int getNextOpenTime() {
+        return nextOpenTime_;
+      }
+      /**
+       * <code>fixed32 next_open_time = 12;</code>
+       * @param value The nextOpenTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextOpenTime(int value) {
+        
+        nextOpenTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>fixed32 next_open_time = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextOpenTime() {
+        
+        nextOpenTime_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1141,11 +1133,12 @@ public final class HomeLimitedShopInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031HomeLimitedShopInfo.proto\032\014Vector.prot" +
-      "o\"\225\001\n\023HomeLimitedShopInfo\022\020\n\010end_time\030\r " +
-      "\001(\007\022\022\n\nstart_time\030\006 \001(\007\022\023\n\013LMJPHDCDAJK\030\017" +
-      " \001(\007\022\032\n\tdjinn_rot\030\007 \001(\0132\007.Vector\022\032\n\tdjin" +
-      "n_pos\030\010 \001(\0132\007.Vector\022\013\n\003uid\030\002 \001(\rB\033\n\031emu" +
-      ".grasscutter.net.protob\006proto3"
+      "o\"\251\001\n\023HomeLimitedShopInfo\022\013\n\003uid\030\002 \001(\r\022\032" +
+      "\n\tdjinn_rot\030\003 \001(\0132\007.Vector\022\034\n\024next_guest" +
+      "_open_time\030\005 \001(\007\022\032\n\tdjinn_pos\030\007 \001(\0132\007.Ve" +
+      "ctor\022\027\n\017next_close_time\030\n \001(\007\022\026\n\016next_op" +
+      "en_time\030\014 \001(\007B\033\n\031emu.grasscutter.net.pro" +
+      "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1157,7 +1150,7 @@ public final class HomeLimitedShopInfoOuterClass {
     internal_static_HomeLimitedShopInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeLimitedShopInfo_descriptor,
-        new java.lang.String[] { "EndTime", "StartTime", "LMJPHDCDAJK", "DjinnRot", "DjinnPos", "Uid", });
+        new java.lang.String[] { "Uid", "DjinnRot", "NextGuestOpenTime", "DjinnPos", "NextCloseTime", "NextOpenTime", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoRspOuterClass.java
index 53af75e9b..fda847c19 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeLimitedShopInfoRspOuterClass.java
@@ -19,32 +19,27 @@ public final class HomeLimitedShopInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      * @return Whether the shopInfo field is set.
      */
     boolean hasShopInfo();
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      * @return The shopInfo.
      */
     emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getShopInfo();
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      */
     emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getShopInfoOrBuilder();
-
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8746
-   * Obf: JIFGKGGIDNN
-   * </pre>
-   *
    * Protobuf type {@code HomeLimitedShopInfoRsp}
    */
   public static final class HomeLimitedShopInfoRsp extends
@@ -89,12 +84,12 @@ public final class HomeLimitedShopInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 90: {
+            case 58: {
               emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder subBuilder = null;
               if (shopInfo_ != null) {
                 subBuilder = shopInfo_.toBuilder();
@@ -139,10 +134,21 @@ public final class HomeLimitedShopInfoRspOuterClass {
               emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp.class, emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp.Builder.class);
     }
 
-    public static final int SHOP_INFO_FIELD_NUMBER = 11;
+    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 SHOP_INFO_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo shopInfo_;
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      * @return Whether the shopInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +156,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
       return shopInfo_ != null;
     }
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      * @return The shopInfo.
      */
     @java.lang.Override
@@ -158,24 +164,13 @@ public final class HomeLimitedShopInfoRspOuterClass {
       return shopInfo_ == null ? emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.getDefaultInstance() : shopInfo_;
     }
     /**
-     * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+     * <code>.HomeLimitedShopInfo shop_info = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getShopInfoOrBuilder() {
       return getShopInfo();
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +186,10 @@ public final class HomeLimitedShopInfoRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(5, retcode_);
       }
       if (shopInfo_ != null) {
-        output.writeMessage(11, getShopInfo());
+        output.writeMessage(7, getShopInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class HomeLimitedShopInfoRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       if (shopInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getShopInfo());
+          .computeMessageSize(7, getShopInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class HomeLimitedShopInfoRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp other = (emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp) obj;
 
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (hasShopInfo() != other.hasShopInfo()) return false;
       if (hasShopInfo()) {
         if (!getShopInfo()
             .equals(other.getShopInfo())) return false;
       }
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class HomeLimitedShopInfoRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (hasShopInfo()) {
         hash = (37 * hash) + SHOP_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getShopInfo().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class HomeLimitedShopInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8746
-     * Obf: JIFGKGGIDNN
-     * </pre>
-     *
      * Protobuf type {@code HomeLimitedShopInfoRsp}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class HomeLimitedShopInfoRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (shopInfoBuilder_ == null) {
           shopInfo_ = null;
         } else {
           shopInfo_ = null;
           shopInfoBuilder_ = null;
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class HomeLimitedShopInfoRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp buildPartial() {
         emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp result = new emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp(this);
+        result.retcode_ = retcode_;
         if (shopInfoBuilder_ == null) {
           result.shopInfo_ = shopInfo_;
         } else {
           result.shopInfo_ = shopInfoBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class HomeLimitedShopInfoRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp other) {
         if (other == emu.grasscutter.net.proto.HomeLimitedShopInfoRspOuterClass.HomeLimitedShopInfoRsp.getDefaultInstance()) return this;
-        if (other.hasShopInfo()) {
-          mergeShopInfo(other.getShopInfo());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.hasShopInfo()) {
+          mergeShopInfo(other.getShopInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,18 +503,49 @@ public final class HomeLimitedShopInfoRspOuterClass {
         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.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo shopInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> shopInfoBuilder_;
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        * @return Whether the shopInfo field is set.
        */
       public boolean hasShopInfo() {
         return shopInfoBuilder_ != null || shopInfo_ != null;
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        * @return The shopInfo.
        */
       public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo getShopInfo() {
@@ -535,7 +556,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         }
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public Builder setShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
         if (shopInfoBuilder_ == null) {
@@ -551,7 +572,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public Builder setShopInfo(
           emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder builderForValue) {
@@ -565,7 +586,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public Builder mergeShopInfo(emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo value) {
         if (shopInfoBuilder_ == null) {
@@ -583,7 +604,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public Builder clearShopInfo() {
         if (shopInfoBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder getShopInfoBuilder() {
         
@@ -605,7 +626,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         return getShopInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       public emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder getShopInfoOrBuilder() {
         if (shopInfoBuilder_ != null) {
@@ -616,7 +637,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
         }
       }
       /**
-       * <code>.HomeLimitedShopInfo shop_info = 11;</code>
+       * <code>.HomeLimitedShopInfo shop_info = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfo.Builder, emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.HomeLimitedShopInfoOrBuilder> 
@@ -631,37 +652,6 @@ public final class HomeLimitedShopInfoRspOuterClass {
         }
         return shopInfoBuilder_;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 2;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 2;</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 = 2;</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) {
@@ -731,8 +721,8 @@ public final class HomeLimitedShopInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034HomeLimitedShopInfoRsp.proto\032\031HomeLimi" +
       "tedShopInfo.proto\"R\n\026HomeLimitedShopInfo" +
-      "Rsp\022\'\n\tshop_info\030\013 \001(\0132\024.HomeLimitedShop" +
-      "Info\022\017\n\007retcode\030\002 \001(\005B\033\n\031emu.grasscutter" +
+      "Rsp\022\017\n\007retcode\030\005 \001(\005\022\'\n\tshop_info\030\007 \001(\0132" +
+      "\024.HomeLimitedShopInfoB\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class HomeLimitedShopInfoRspOuterClass {
     internal_static_HomeLimitedShopInfoRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeLimitedShopInfoRsp_descriptor,
-        new java.lang.String[] { "ShopInfo", "Retcode", });
+        new java.lang.String[] { "Retcode", "ShopInfo", });
     emu.grasscutter.net.proto.HomeLimitedShopInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointFurnitureDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointFurnitureDataOuterClass.java
index aa68773be..ac89d2a14 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointFurnitureDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointFurnitureDataOuterClass.java
@@ -84,10 +84,6 @@ public final class HomeMarkPointFurnitureDataOuterClass {
     public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.ExtraCase getExtraCase();
   }
   /**
-   * <pre>
-   * Obf: MDHHDACNAEL
-   * </pre>
-   *
    * Protobuf type {@code HomeMarkPointFurnitureData}
    */
   public static final class HomeMarkPointFurnitureData extends
@@ -615,10 +611,6 @@ public final class HomeMarkPointFurnitureDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MDHHDACNAEL
-     * </pre>
-     *
      * Protobuf type {@code HomeMarkPointFurnitureData}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNPCDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNPCDataOuterClass.java
index 51eb363bc..77b7b131f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNPCDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNPCDataOuterClass.java
@@ -31,10 +31,6 @@ public final class HomeMarkPointNPCDataOuterClass {
     int getCostumeId();
   }
   /**
-   * <pre>
-   * Obf: DEEONIENNBB
-   * </pre>
-   *
    * Protobuf type {@code HomeMarkPointNPCData}
    */
   public static final class HomeMarkPointNPCData extends
@@ -310,10 +306,6 @@ public final class HomeMarkPointNPCDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DEEONIENNBB
-     * </pre>
-     *
      * Protobuf type {@code HomeMarkPointNPCData}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNotifyOuterClass.java
index 49020cf75..486eed69e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointNotifyOuterClass.java
@@ -43,11 +43,6 @@ public final class HomeMarkPointNotifyOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 23013
-   * Obf: GKDFNALJFOI
-   * </pre>
-   *
    * Protobuf type {@code HomeMarkPointNotify}
    */
   public static final class HomeMarkPointNotify extends
@@ -336,11 +331,6 @@ public final class HomeMarkPointNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23013
-     * Obf: GKDFNALJFOI
-     * </pre>
-     *
      * Protobuf type {@code HomeMarkPointNotify}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
index 0635f01f0..0b665da3a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSceneDataOuterClass.java
@@ -19,76 +19,72 @@ public final class HomeMarkPointSceneDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> 
-        getFurnitureListList();
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData getFurnitureList(int index);
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    int getFurnitureListCount();
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> 
-        getFurnitureListOrBuilderList();
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder getFurnitureListOrBuilder(
-        int index);
-
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     * @return Whether the safePointPos field is set.
-     */
-    boolean hasSafePointPos();
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     * @return The safePointPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
-
-    /**
-     * <code>uint32 module_id = 9;</code>
-     * @return The moduleId.
-     */
-    int getModuleId();
-
-    /**
-     * <code>uint32 scene_id = 5;</code>
+     * <code>uint32 scene_id = 2;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> 
+        getFurnitureListList();
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData getFurnitureList(int index);
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    int getFurnitureListCount();
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> 
+        getFurnitureListOrBuilderList();
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder getFurnitureListOrBuilder(
+        int index);
+
+    /**
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      * @return Whether the teapotSpiritPos field is set.
      */
     boolean hasTeapotSpiritPos();
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      * @return The teapotSpiritPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos();
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder();
+
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     * @return Whether the safePointPos field is set.
+     */
+    boolean hasSafePointPos();
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     * @return The safePointPos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos();
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder();
+
+    /**
+     * <code>uint32 module_id = 13;</code>
+     * @return The moduleId.
+     */
+    int getModuleId();
   }
   /**
-   * <pre>
-   * Obf: OKNHJBLIEGA
-   * </pre>
-   *
    * Protobuf type {@code HomeMarkPointSceneData}
    */
   public static final class HomeMarkPointSceneData extends
@@ -135,7 +131,21 @@ public final class HomeMarkPointSceneDataOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 16: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 34: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                furnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              furnitureList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.parser(), extensionRegistry));
+              break;
+            }
+            case 42: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (teapotSpiritPos_ != null) {
                 subBuilder = teapotSpiritPos_.toBuilder();
@@ -148,21 +158,7 @@ public final class HomeMarkPointSceneDataOuterClass {
 
               break;
             }
-            case 40: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             case 58: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                furnitureList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              furnitureList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.parser(), extensionRegistry));
-              break;
-            }
-            case 66: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (safePointPos_ != null) {
                 subBuilder = safePointPos_.toBuilder();
@@ -175,7 +171,7 @@ public final class HomeMarkPointSceneDataOuterClass {
 
               break;
             }
-            case 72: {
+            case 104: {
 
               moduleId_ = input.readUInt32();
               break;
@@ -215,87 +211,10 @@ public final class HomeMarkPointSceneDataOuterClass {
               emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData.class, emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData.Builder.class);
     }
 
-    public static final int FURNITURE_LIST_FIELD_NUMBER = 7;
-    private java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> furnitureList_;
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> getFurnitureListList() {
-      return furnitureList_;
-    }
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> 
-        getFurnitureListOrBuilderList() {
-      return furnitureList_;
-    }
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    @java.lang.Override
-    public int getFurnitureListCount() {
-      return furnitureList_.size();
-    }
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData getFurnitureList(int index) {
-      return furnitureList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder getFurnitureListOrBuilder(
-        int index) {
-      return furnitureList_.get(index);
-    }
-
-    public static final int SAFE_POINT_POS_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     * @return Whether the safePointPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasSafePointPos() {
-      return safePointPos_ != null;
-    }
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     * @return The safePointPos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
-    }
-    /**
-     * <code>.Vector safe_point_pos = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-      return getSafePointPos();
-    }
-
-    public static final int MODULE_ID_FIELD_NUMBER = 9;
-    private int moduleId_;
-    /**
-     * <code>uint32 module_id = 9;</code>
-     * @return The moduleId.
-     */
-    @java.lang.Override
-    public int getModuleId() {
-      return moduleId_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 5;
+    public static final int SCENE_ID_FIELD_NUMBER = 2;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 5;</code>
+     * <code>uint32 scene_id = 2;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -303,10 +222,50 @@ public final class HomeMarkPointSceneDataOuterClass {
       return sceneId_;
     }
 
-    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 3;
+    public static final int FURNITURE_LIST_FIELD_NUMBER = 4;
+    private java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> furnitureList_;
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> getFurnitureListList() {
+      return furnitureList_;
+    }
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> 
+        getFurnitureListOrBuilderList() {
+      return furnitureList_;
+    }
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    @java.lang.Override
+    public int getFurnitureListCount() {
+      return furnitureList_.size();
+    }
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData getFurnitureList(int index) {
+      return furnitureList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder getFurnitureListOrBuilder(
+        int index) {
+      return furnitureList_.get(index);
+    }
+
+    public static final int TEAPOT_SPIRIT_POS_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      * @return Whether the teapotSpiritPos field is set.
      */
     @java.lang.Override
@@ -314,7 +273,7 @@ public final class HomeMarkPointSceneDataOuterClass {
       return teapotSpiritPos_ != null;
     }
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      * @return The teapotSpiritPos.
      */
     @java.lang.Override
@@ -322,13 +281,50 @@ public final class HomeMarkPointSceneDataOuterClass {
       return teapotSpiritPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : teapotSpiritPos_;
     }
     /**
-     * <code>.Vector teapot_spirit_pos = 3;</code>
+     * <code>.Vector teapot_spirit_pos = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
       return getTeapotSpiritPos();
     }
 
+    public static final int SAFE_POINT_POS_FIELD_NUMBER = 7;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     * @return Whether the safePointPos field is set.
+     */
+    @java.lang.Override
+    public boolean hasSafePointPos() {
+      return safePointPos_ != null;
+    }
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     * @return The safePointPos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+      return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+    }
+    /**
+     * <code>.Vector safe_point_pos = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+      return getSafePointPos();
+    }
+
+    public static final int MODULE_ID_FIELD_NUMBER = 13;
+    private int moduleId_;
+    /**
+     * <code>uint32 module_id = 13;</code>
+     * @return The moduleId.
+     */
+    @java.lang.Override
+    public int getModuleId() {
+      return moduleId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -343,20 +339,20 @@ public final class HomeMarkPointSceneDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (teapotSpiritPos_ != null) {
-        output.writeMessage(3, getTeapotSpiritPos());
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(5, sceneId_);
+        output.writeUInt32(2, sceneId_);
       }
       for (int i = 0; i < furnitureList_.size(); i++) {
-        output.writeMessage(7, furnitureList_.get(i));
+        output.writeMessage(4, furnitureList_.get(i));
+      }
+      if (teapotSpiritPos_ != null) {
+        output.writeMessage(5, getTeapotSpiritPos());
       }
       if (safePointPos_ != null) {
-        output.writeMessage(8, getSafePointPos());
+        output.writeMessage(7, getSafePointPos());
       }
       if (moduleId_ != 0) {
-        output.writeUInt32(9, moduleId_);
+        output.writeUInt32(13, moduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -367,25 +363,25 @@ public final class HomeMarkPointSceneDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (teapotSpiritPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getTeapotSpiritPos());
-      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sceneId_);
+          .computeUInt32Size(2, sceneId_);
       }
       for (int i = 0; i < furnitureList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, furnitureList_.get(i));
+          .computeMessageSize(4, furnitureList_.get(i));
+      }
+      if (teapotSpiritPos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, getTeapotSpiritPos());
       }
       if (safePointPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getSafePointPos());
+          .computeMessageSize(7, getSafePointPos());
       }
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, moduleId_);
+          .computeUInt32Size(13, moduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -402,8 +398,15 @@ public final class HomeMarkPointSceneDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData other = (emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData) obj;
 
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (!getFurnitureListList()
           .equals(other.getFurnitureListList())) return false;
+      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
+      if (hasTeapotSpiritPos()) {
+        if (!getTeapotSpiritPos()
+            .equals(other.getTeapotSpiritPos())) return false;
+      }
       if (hasSafePointPos() != other.hasSafePointPos()) return false;
       if (hasSafePointPos()) {
         if (!getSafePointPos()
@@ -411,13 +414,6 @@ public final class HomeMarkPointSceneDataOuterClass {
       }
       if (getModuleId()
           != other.getModuleId()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
-      if (hasTeapotSpiritPos() != other.hasTeapotSpiritPos()) return false;
-      if (hasTeapotSpiritPos()) {
-        if (!getTeapotSpiritPos()
-            .equals(other.getTeapotSpiritPos())) return false;
-      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -429,22 +425,22 @@ public final class HomeMarkPointSceneDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       if (getFurnitureListCount() > 0) {
         hash = (37 * hash) + FURNITURE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFurnitureListList().hashCode();
       }
+      if (hasTeapotSpiritPos()) {
+        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
+      }
       if (hasSafePointPos()) {
         hash = (37 * hash) + SAFE_POINT_POS_FIELD_NUMBER;
         hash = (53 * hash) + getSafePointPos().hashCode();
       }
       hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getModuleId();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      if (hasTeapotSpiritPos()) {
-        hash = (37 * hash) + TEAPOT_SPIRIT_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getTeapotSpiritPos().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -541,10 +537,6 @@ public final class HomeMarkPointSceneDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OKNHJBLIEGA
-     * </pre>
-     *
      * Protobuf type {@code HomeMarkPointSceneData}
      */
     public static final class Builder extends
@@ -583,12 +575,20 @@ public final class HomeMarkPointSceneDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        sceneId_ = 0;
+
         if (furnitureListBuilder_ == null) {
           furnitureList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           furnitureListBuilder_.clear();
         }
+        if (teapotSpiritPosBuilder_ == null) {
+          teapotSpiritPos_ = null;
+        } else {
+          teapotSpiritPos_ = null;
+          teapotSpiritPosBuilder_ = null;
+        }
         if (safePointPosBuilder_ == null) {
           safePointPos_ = null;
         } else {
@@ -597,14 +597,6 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
         moduleId_ = 0;
 
-        sceneId_ = 0;
-
-        if (teapotSpiritPosBuilder_ == null) {
-          teapotSpiritPos_ = null;
-        } else {
-          teapotSpiritPos_ = null;
-          teapotSpiritPosBuilder_ = null;
-        }
         return this;
       }
 
@@ -632,6 +624,7 @@ public final class HomeMarkPointSceneDataOuterClass {
       public emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData buildPartial() {
         emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData result = new emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData(this);
         int from_bitField0_ = bitField0_;
+        result.sceneId_ = sceneId_;
         if (furnitureListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             furnitureList_ = java.util.Collections.unmodifiableList(furnitureList_);
@@ -641,18 +634,17 @@ public final class HomeMarkPointSceneDataOuterClass {
         } else {
           result.furnitureList_ = furnitureListBuilder_.build();
         }
+        if (teapotSpiritPosBuilder_ == null) {
+          result.teapotSpiritPos_ = teapotSpiritPos_;
+        } else {
+          result.teapotSpiritPos_ = teapotSpiritPosBuilder_.build();
+        }
         if (safePointPosBuilder_ == null) {
           result.safePointPos_ = safePointPos_;
         } else {
           result.safePointPos_ = safePointPosBuilder_.build();
         }
         result.moduleId_ = moduleId_;
-        result.sceneId_ = sceneId_;
-        if (teapotSpiritPosBuilder_ == null) {
-          result.teapotSpiritPos_ = teapotSpiritPos_;
-        } else {
-          result.teapotSpiritPos_ = teapotSpiritPosBuilder_.build();
-        }
         onBuilt();
         return result;
       }
@@ -701,6 +693,9 @@ public final class HomeMarkPointSceneDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData other) {
         if (other == emu.grasscutter.net.proto.HomeMarkPointSceneDataOuterClass.HomeMarkPointSceneData.getDefaultInstance()) return this;
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         if (furnitureListBuilder_ == null) {
           if (!other.furnitureList_.isEmpty()) {
             if (furnitureList_.isEmpty()) {
@@ -727,18 +722,15 @@ public final class HomeMarkPointSceneDataOuterClass {
             }
           }
         }
+        if (other.hasTeapotSpiritPos()) {
+          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
+        }
         if (other.hasSafePointPos()) {
           mergeSafePointPos(other.getSafePointPos());
         }
         if (other.getModuleId() != 0) {
           setModuleId(other.getModuleId());
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
-        if (other.hasTeapotSpiritPos()) {
-          mergeTeapotSpiritPos(other.getTeapotSpiritPos());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -769,6 +761,37 @@ public final class HomeMarkPointSceneDataOuterClass {
       }
       private int bitField0_;
 
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 2;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 2;</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 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> furnitureList_ =
         java.util.Collections.emptyList();
       private void ensureFurnitureListIsMutable() {
@@ -782,7 +805,7 @@ public final class HomeMarkPointSceneDataOuterClass {
           emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> furnitureListBuilder_;
 
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> getFurnitureListList() {
         if (furnitureListBuilder_ == null) {
@@ -792,7 +815,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public int getFurnitureListCount() {
         if (furnitureListBuilder_ == null) {
@@ -802,7 +825,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData getFurnitureList(int index) {
         if (furnitureListBuilder_ == null) {
@@ -812,7 +835,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder setFurnitureList(
           int index, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData value) {
@@ -829,7 +852,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder setFurnitureList(
           int index, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder builderForValue) {
@@ -843,7 +866,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder addFurnitureList(emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData value) {
         if (furnitureListBuilder_ == null) {
@@ -859,7 +882,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder addFurnitureList(
           int index, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData value) {
@@ -876,7 +899,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder addFurnitureList(
           emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder builderForValue) {
@@ -890,7 +913,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder addFurnitureList(
           int index, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder builderForValue) {
@@ -904,7 +927,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder addAllFurnitureList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData> values) {
@@ -919,7 +942,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder clearFurnitureList() {
         if (furnitureListBuilder_ == null) {
@@ -932,7 +955,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public Builder removeFurnitureList(int index) {
         if (furnitureListBuilder_ == null) {
@@ -945,14 +968,14 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder getFurnitureListBuilder(
           int index) {
         return getFurnitureListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder getFurnitureListOrBuilder(
           int index) {
@@ -962,7 +985,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureDataOrBuilder> 
            getFurnitureListOrBuilderList() {
@@ -973,14 +996,14 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder addFurnitureListBuilder() {
         return getFurnitureListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder addFurnitureListBuilder(
           int index) {
@@ -988,7 +1011,7 @@ public final class HomeMarkPointSceneDataOuterClass {
             index, emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.getDefaultInstance());
       }
       /**
-       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 7;</code>
+       * <code>repeated .HomeMarkPointFurnitureData furniture_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.HomeMarkPointFurnitureData.Builder> 
            getFurnitureListBuilderList() {
@@ -1009,199 +1032,18 @@ public final class HomeMarkPointSceneDataOuterClass {
         return furnitureListBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       * @return Whether the safePointPos field is set.
-       */
-      public boolean hasSafePointPos() {
-        return safePointPosBuilder_ != null || safePointPos_ != null;
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       * @return The safePointPos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
-        if (safePointPosBuilder_ == null) {
-          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
-        } else {
-          return safePointPosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (safePointPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          safePointPos_ = value;
-          onChanged();
-        } else {
-          safePointPosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public Builder setSafePointPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = builderForValue.build();
-          onChanged();
-        } else {
-          safePointPosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public Builder mergeSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (safePointPosBuilder_ == null) {
-          if (safePointPos_ != null) {
-            safePointPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(safePointPos_).mergeFrom(value).buildPartial();
-          } else {
-            safePointPos_ = value;
-          }
-          onChanged();
-        } else {
-          safePointPosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public Builder clearSafePointPos() {
-        if (safePointPosBuilder_ == null) {
-          safePointPos_ = null;
-          onChanged();
-        } else {
-          safePointPos_ = null;
-          safePointPosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
-        
-        onChanged();
-        return getSafePointPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
-        if (safePointPosBuilder_ != null) {
-          return safePointPosBuilder_.getMessageOrBuilder();
-        } else {
-          return safePointPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
-        }
-      }
-      /**
-       * <code>.Vector safe_point_pos = 8;</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> 
-          getSafePointPosFieldBuilder() {
-        if (safePointPosBuilder_ == null) {
-          safePointPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSafePointPos(),
-                  getParentForChildren(),
-                  isClean());
-          safePointPos_ = null;
-        }
-        return safePointPosBuilder_;
-      }
-
-      private int moduleId_ ;
-      /**
-       * <code>uint32 module_id = 9;</code>
-       * @return The moduleId.
-       */
-      @java.lang.Override
-      public int getModuleId() {
-        return moduleId_;
-      }
-      /**
-       * <code>uint32 module_id = 9;</code>
-       * @param value The moduleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setModuleId(int value) {
-        
-        moduleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 module_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearModuleId() {
-        
-        moduleId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 5;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector teapotSpiritPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> teapotSpiritPosBuilder_;
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        * @return Whether the teapotSpiritPos field is set.
        */
       public boolean hasTeapotSpiritPos() {
         return teapotSpiritPosBuilder_ != null || teapotSpiritPos_ != null;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        * @return The teapotSpiritPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getTeapotSpiritPos() {
@@ -1212,7 +1054,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public Builder setTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (teapotSpiritPosBuilder_ == null) {
@@ -1228,7 +1070,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public Builder setTeapotSpiritPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1242,7 +1084,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public Builder mergeTeapotSpiritPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (teapotSpiritPosBuilder_ == null) {
@@ -1260,7 +1102,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public Builder clearTeapotSpiritPos() {
         if (teapotSpiritPosBuilder_ == null) {
@@ -1274,7 +1116,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getTeapotSpiritPosBuilder() {
         
@@ -1282,7 +1124,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         return getTeapotSpiritPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getTeapotSpiritPosOrBuilder() {
         if (teapotSpiritPosBuilder_ != null) {
@@ -1293,7 +1135,7 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
       }
       /**
-       * <code>.Vector teapot_spirit_pos = 3;</code>
+       * <code>.Vector teapot_spirit_pos = 5;</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> 
@@ -1308,6 +1150,156 @@ public final class HomeMarkPointSceneDataOuterClass {
         }
         return teapotSpiritPosBuilder_;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector safePointPos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> safePointPosBuilder_;
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       * @return Whether the safePointPos field is set.
+       */
+      public boolean hasSafePointPos() {
+        return safePointPosBuilder_ != null || safePointPos_ != null;
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       * @return The safePointPos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          return safePointPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+        } else {
+          return safePointPosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public Builder setSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (safePointPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          safePointPos_ = value;
+          onChanged();
+        } else {
+          safePointPosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public Builder setSafePointPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = builderForValue.build();
+          onChanged();
+        } else {
+          safePointPosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public Builder mergeSafePointPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (safePointPosBuilder_ == null) {
+          if (safePointPos_ != null) {
+            safePointPos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(safePointPos_).mergeFrom(value).buildPartial();
+          } else {
+            safePointPos_ = value;
+          }
+          onChanged();
+        } else {
+          safePointPosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public Builder clearSafePointPos() {
+        if (safePointPosBuilder_ == null) {
+          safePointPos_ = null;
+          onChanged();
+        } else {
+          safePointPos_ = null;
+          safePointPosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSafePointPosBuilder() {
+        
+        onChanged();
+        return getSafePointPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector safe_point_pos = 7;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSafePointPosOrBuilder() {
+        if (safePointPosBuilder_ != null) {
+          return safePointPosBuilder_.getMessageOrBuilder();
+        } else {
+          return safePointPos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : safePointPos_;
+        }
+      }
+      /**
+       * <code>.Vector safe_point_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> 
+          getSafePointPosFieldBuilder() {
+        if (safePointPosBuilder_ == null) {
+          safePointPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getSafePointPos(),
+                  getParentForChildren(),
+                  isClean());
+          safePointPos_ = null;
+        }
+        return safePointPosBuilder_;
+      }
+
+      private int moduleId_ ;
+      /**
+       * <code>uint32 module_id = 13;</code>
+       * @return The moduleId.
+       */
+      @java.lang.Override
+      public int getModuleId() {
+        return moduleId_;
+      }
+      /**
+       * <code>uint32 module_id = 13;</code>
+       * @param value The moduleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setModuleId(int value) {
+        
+        moduleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 module_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearModuleId() {
+        
+        moduleId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1377,11 +1369,11 @@ public final class HomeMarkPointSceneDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034HomeMarkPointSceneData.proto\032 HomeMark" +
       "PointFurnitureData.proto\032\014Vector.proto\"\267" +
-      "\001\n\026HomeMarkPointSceneData\0223\n\016furniture_l" +
-      "ist\030\007 \003(\0132\033.HomeMarkPointFurnitureData\022\037" +
-      "\n\016safe_point_pos\030\010 \001(\0132\007.Vector\022\021\n\tmodul" +
-      "e_id\030\t \001(\r\022\020\n\010scene_id\030\005 \001(\r\022\"\n\021teapot_s" +
-      "pirit_pos\030\003 \001(\0132\007.VectorB\033\n\031emu.grasscut" +
+      "\001\n\026HomeMarkPointSceneData\022\020\n\010scene_id\030\002 " +
+      "\001(\r\0223\n\016furniture_list\030\004 \003(\0132\033.HomeMarkPo" +
+      "intFurnitureData\022\"\n\021teapot_spirit_pos\030\005 " +
+      "\001(\0132\007.Vector\022\037\n\016safe_point_pos\030\007 \001(\0132\007.V" +
+      "ector\022\021\n\tmodule_id\030\r \001(\rB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1395,7 +1387,7 @@ public final class HomeMarkPointSceneDataOuterClass {
     internal_static_HomeMarkPointSceneData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeMarkPointSceneData_descriptor,
-        new java.lang.String[] { "FurnitureList", "SafePointPos", "ModuleId", "SceneId", "TeapotSpiritPos", });
+        new java.lang.String[] { "SceneId", "FurnitureList", "TeapotSpiritPos", "SafePointPos", "ModuleId", });
     emu.grasscutter.net.proto.HomeMarkPointFurnitureDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSuiteDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSuiteDataOuterClass.java
index b1d9dfea3..8b098704c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSuiteDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeMarkPointSuiteDataOuterClass.java
@@ -25,10 +25,6 @@ public final class HomeMarkPointSuiteDataOuterClass {
     int getSuiteId();
   }
   /**
-   * <pre>
-   * Obf: KMHJEPCDMMK
-   * </pre>
-   *
    * Protobuf type {@code HomeMarkPointSuiteData}
    */
   public static final class HomeMarkPointSuiteData extends
@@ -277,10 +273,6 @@ public final class HomeMarkPointSuiteDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KMHJEPCDMMK
-     * </pre>
-     *
      * Protobuf type {@code HomeMarkPointSuiteData}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleComfortInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleComfortInfoOuterClass.java
index a20d3f778..41291ac57 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleComfortInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleComfortInfoOuterClass.java
@@ -19,39 +19,35 @@ public final class HomeModuleComfortInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 room_scene_comfort_value = 2;</code>
-     * @return The roomSceneComfortValue.
-     */
-    int getRoomSceneComfortValue();
-
-    /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @return A list containing the worldSceneBlockComfortValueList.
      */
     java.util.List<java.lang.Integer> getWorldSceneBlockComfortValueListList();
     /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @return The count of worldSceneBlockComfortValueList.
      */
     int getWorldSceneBlockComfortValueListCount();
     /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @param index The index of the element to return.
      * @return The worldSceneBlockComfortValueList at the given index.
      */
     int getWorldSceneBlockComfortValueList(int index);
 
     /**
-     * <code>uint32 module_id = 3;</code>
+     * <code>uint32 room_scene_comfort_value = 10;</code>
+     * @return The roomSceneComfortValue.
+     */
+    int getRoomSceneComfortValue();
+
+    /**
+     * <code>uint32 module_id = 12;</code>
      * @return The moduleId.
      */
     int getModuleId();
   }
   /**
-   * <pre>
-   * Obf: GCMBDAFNLEG
-   * </pre>
-   *
    * Protobuf type {@code HomeModuleComfortInfo}
    */
   public static final class HomeModuleComfortInfo extends
@@ -98,17 +94,7 @@ public final class HomeModuleComfortInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              roomSceneComfortValue_ = input.readUInt32();
-              break;
-            }
-            case 24: {
-
-              moduleId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
+            case 72: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 worldSceneBlockComfortValueList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -116,7 +102,7 @@ public final class HomeModuleComfortInfoOuterClass {
               worldSceneBlockComfortValueList_.addInt(input.readUInt32());
               break;
             }
-            case 82: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -129,6 +115,16 @@ public final class HomeModuleComfortInfoOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 80: {
+
+              roomSceneComfortValue_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              moduleId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -164,21 +160,10 @@ public final class HomeModuleComfortInfoOuterClass {
               emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.class, emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.Builder.class);
     }
 
-    public static final int ROOM_SCENE_COMFORT_VALUE_FIELD_NUMBER = 2;
-    private int roomSceneComfortValue_;
-    /**
-     * <code>uint32 room_scene_comfort_value = 2;</code>
-     * @return The roomSceneComfortValue.
-     */
-    @java.lang.Override
-    public int getRoomSceneComfortValue() {
-      return roomSceneComfortValue_;
-    }
-
-    public static final int WORLD_SCENE_BLOCK_COMFORT_VALUE_LIST_FIELD_NUMBER = 10;
+    public static final int WORLD_SCENE_BLOCK_COMFORT_VALUE_LIST_FIELD_NUMBER = 9;
     private com.google.protobuf.Internal.IntList worldSceneBlockComfortValueList_;
     /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @return A list containing the worldSceneBlockComfortValueList.
      */
     @java.lang.Override
@@ -187,14 +172,14 @@ public final class HomeModuleComfortInfoOuterClass {
       return worldSceneBlockComfortValueList_;
     }
     /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @return The count of worldSceneBlockComfortValueList.
      */
     public int getWorldSceneBlockComfortValueListCount() {
       return worldSceneBlockComfortValueList_.size();
     }
     /**
-     * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+     * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
      * @param index The index of the element to return.
      * @return The worldSceneBlockComfortValueList at the given index.
      */
@@ -203,10 +188,21 @@ public final class HomeModuleComfortInfoOuterClass {
     }
     private int worldSceneBlockComfortValueListMemoizedSerializedSize = -1;
 
-    public static final int MODULE_ID_FIELD_NUMBER = 3;
+    public static final int ROOM_SCENE_COMFORT_VALUE_FIELD_NUMBER = 10;
+    private int roomSceneComfortValue_;
+    /**
+     * <code>uint32 room_scene_comfort_value = 10;</code>
+     * @return The roomSceneComfortValue.
+     */
+    @java.lang.Override
+    public int getRoomSceneComfortValue() {
+      return roomSceneComfortValue_;
+    }
+
+    public static final int MODULE_ID_FIELD_NUMBER = 12;
     private int moduleId_;
     /**
-     * <code>uint32 module_id = 3;</code>
+     * <code>uint32 module_id = 12;</code>
      * @return The moduleId.
      */
     @java.lang.Override
@@ -229,19 +225,19 @@ public final class HomeModuleComfortInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (roomSceneComfortValue_ != 0) {
-        output.writeUInt32(2, roomSceneComfortValue_);
-      }
-      if (moduleId_ != 0) {
-        output.writeUInt32(3, moduleId_);
-      }
       if (getWorldSceneBlockComfortValueListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(74);
         output.writeUInt32NoTag(worldSceneBlockComfortValueListMemoizedSerializedSize);
       }
       for (int i = 0; i < worldSceneBlockComfortValueList_.size(); i++) {
         output.writeUInt32NoTag(worldSceneBlockComfortValueList_.getInt(i));
       }
+      if (roomSceneComfortValue_ != 0) {
+        output.writeUInt32(10, roomSceneComfortValue_);
+      }
+      if (moduleId_ != 0) {
+        output.writeUInt32(12, moduleId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -251,14 +247,6 @@ public final class HomeModuleComfortInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (roomSceneComfortValue_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, roomSceneComfortValue_);
-      }
-      if (moduleId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, moduleId_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < worldSceneBlockComfortValueList_.size(); i++) {
@@ -273,6 +261,14 @@ public final class HomeModuleComfortInfoOuterClass {
         }
         worldSceneBlockComfortValueListMemoizedSerializedSize = dataSize;
       }
+      if (roomSceneComfortValue_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, roomSceneComfortValue_);
+      }
+      if (moduleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, moduleId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -288,10 +284,10 @@ public final class HomeModuleComfortInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo other = (emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo) obj;
 
-      if (getRoomSceneComfortValue()
-          != other.getRoomSceneComfortValue()) return false;
       if (!getWorldSceneBlockComfortValueListList()
           .equals(other.getWorldSceneBlockComfortValueListList())) return false;
+      if (getRoomSceneComfortValue()
+          != other.getRoomSceneComfortValue()) return false;
       if (getModuleId()
           != other.getModuleId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -305,12 +301,12 @@ public final class HomeModuleComfortInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ROOM_SCENE_COMFORT_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getRoomSceneComfortValue();
       if (getWorldSceneBlockComfortValueListCount() > 0) {
         hash = (37 * hash) + WORLD_SCENE_BLOCK_COMFORT_VALUE_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getWorldSceneBlockComfortValueListList().hashCode();
       }
+      hash = (37 * hash) + ROOM_SCENE_COMFORT_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getRoomSceneComfortValue();
       hash = (37 * hash) + MODULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getModuleId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -409,10 +405,6 @@ public final class HomeModuleComfortInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GCMBDAFNLEG
-     * </pre>
-     *
      * Protobuf type {@code HomeModuleComfortInfo}
      */
     public static final class Builder extends
@@ -450,10 +442,10 @@ public final class HomeModuleComfortInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        roomSceneComfortValue_ = 0;
-
         worldSceneBlockComfortValueList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        roomSceneComfortValue_ = 0;
+
         moduleId_ = 0;
 
         return this;
@@ -483,12 +475,12 @@ public final class HomeModuleComfortInfoOuterClass {
       public emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo buildPartial() {
         emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo result = new emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo(this);
         int from_bitField0_ = bitField0_;
-        result.roomSceneComfortValue_ = roomSceneComfortValue_;
         if (((bitField0_ & 0x00000001) != 0)) {
           worldSceneBlockComfortValueList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.worldSceneBlockComfortValueList_ = worldSceneBlockComfortValueList_;
+        result.roomSceneComfortValue_ = roomSceneComfortValue_;
         result.moduleId_ = moduleId_;
         onBuilt();
         return result;
@@ -538,9 +530,6 @@ public final class HomeModuleComfortInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo other) {
         if (other == emu.grasscutter.net.proto.HomeModuleComfortInfoOuterClass.HomeModuleComfortInfo.getDefaultInstance()) return this;
-        if (other.getRoomSceneComfortValue() != 0) {
-          setRoomSceneComfortValue(other.getRoomSceneComfortValue());
-        }
         if (!other.worldSceneBlockComfortValueList_.isEmpty()) {
           if (worldSceneBlockComfortValueList_.isEmpty()) {
             worldSceneBlockComfortValueList_ = other.worldSceneBlockComfortValueList_;
@@ -551,6 +540,9 @@ public final class HomeModuleComfortInfoOuterClass {
           }
           onChanged();
         }
+        if (other.getRoomSceneComfortValue() != 0) {
+          setRoomSceneComfortValue(other.getRoomSceneComfortValue());
+        }
         if (other.getModuleId() != 0) {
           setModuleId(other.getModuleId());
         }
@@ -584,37 +576,6 @@ public final class HomeModuleComfortInfoOuterClass {
       }
       private int bitField0_;
 
-      private int roomSceneComfortValue_ ;
-      /**
-       * <code>uint32 room_scene_comfort_value = 2;</code>
-       * @return The roomSceneComfortValue.
-       */
-      @java.lang.Override
-      public int getRoomSceneComfortValue() {
-        return roomSceneComfortValue_;
-      }
-      /**
-       * <code>uint32 room_scene_comfort_value = 2;</code>
-       * @param value The roomSceneComfortValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRoomSceneComfortValue(int value) {
-        
-        roomSceneComfortValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 room_scene_comfort_value = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRoomSceneComfortValue() {
-        
-        roomSceneComfortValue_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList worldSceneBlockComfortValueList_ = emptyIntList();
       private void ensureWorldSceneBlockComfortValueListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -623,7 +584,7 @@ public final class HomeModuleComfortInfoOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @return A list containing the worldSceneBlockComfortValueList.
        */
       public java.util.List<java.lang.Integer>
@@ -632,14 +593,14 @@ public final class HomeModuleComfortInfoOuterClass {
                  java.util.Collections.unmodifiableList(worldSceneBlockComfortValueList_) : worldSceneBlockComfortValueList_;
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @return The count of worldSceneBlockComfortValueList.
        */
       public int getWorldSceneBlockComfortValueListCount() {
         return worldSceneBlockComfortValueList_.size();
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @param index The index of the element to return.
        * @return The worldSceneBlockComfortValueList at the given index.
        */
@@ -647,7 +608,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return worldSceneBlockComfortValueList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @param index The index to set the value at.
        * @param value The worldSceneBlockComfortValueList to set.
        * @return This builder for chaining.
@@ -660,7 +621,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @param value The worldSceneBlockComfortValueList to add.
        * @return This builder for chaining.
        */
@@ -671,7 +632,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @param values The worldSceneBlockComfortValueList to add.
        * @return This builder for chaining.
        */
@@ -684,7 +645,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 world_scene_block_comfort_value_list = 10;</code>
+       * <code>repeated uint32 world_scene_block_comfort_value_list = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearWorldSceneBlockComfortValueList() {
@@ -694,9 +655,40 @@ public final class HomeModuleComfortInfoOuterClass {
         return this;
       }
 
+      private int roomSceneComfortValue_ ;
+      /**
+       * <code>uint32 room_scene_comfort_value = 10;</code>
+       * @return The roomSceneComfortValue.
+       */
+      @java.lang.Override
+      public int getRoomSceneComfortValue() {
+        return roomSceneComfortValue_;
+      }
+      /**
+       * <code>uint32 room_scene_comfort_value = 10;</code>
+       * @param value The roomSceneComfortValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRoomSceneComfortValue(int value) {
+        
+        roomSceneComfortValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 room_scene_comfort_value = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRoomSceneComfortValue() {
+        
+        roomSceneComfortValue_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int moduleId_ ;
       /**
-       * <code>uint32 module_id = 3;</code>
+       * <code>uint32 module_id = 12;</code>
        * @return The moduleId.
        */
       @java.lang.Override
@@ -704,7 +696,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return moduleId_;
       }
       /**
-       * <code>uint32 module_id = 3;</code>
+       * <code>uint32 module_id = 12;</code>
        * @param value The moduleId to set.
        * @return This builder for chaining.
        */
@@ -715,7 +707,7 @@ public final class HomeModuleComfortInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 module_id = 3;</code>
+       * <code>uint32 module_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearModuleId() {
@@ -792,9 +784,9 @@ public final class HomeModuleComfortInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033HomeModuleComfortInfo.proto\"z\n\025HomeMod" +
-      "uleComfortInfo\022 \n\030room_scene_comfort_val" +
-      "ue\030\002 \001(\r\022,\n$world_scene_block_comfort_va" +
-      "lue_list\030\n \003(\r\022\021\n\tmodule_id\030\003 \001(\rB\033\n\031emu" +
+      "uleComfortInfo\022,\n$world_scene_block_comf" +
+      "ort_value_list\030\t \003(\r\022 \n\030room_scene_comfo" +
+      "rt_value\030\n \001(\r\022\021\n\tmodule_id\030\014 \001(\rB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -806,7 +798,7 @@ public final class HomeModuleComfortInfoOuterClass {
     internal_static_HomeModuleComfortInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeModuleComfortInfo_descriptor,
-        new java.lang.String[] { "RoomSceneComfortValue", "WorldSceneBlockComfortValueList", "ModuleId", });
+        new java.lang.String[] { "WorldSceneBlockComfortValueList", "RoomSceneComfortValue", "ModuleId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenReqOuterClass.java
index 79dc5194e..17f3b2f46 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenReqOuterClass.java
@@ -19,28 +19,23 @@ public final class HomeModuleSeenReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return A list containing the seenModuleIdList.
      */
     java.util.List<java.lang.Integer> getSeenModuleIdListList();
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return The count of seenModuleIdList.
      */
     int getSeenModuleIdListCount();
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
     int getSeenModuleIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 27692
-   * Obf: KNOGFPMPFGK
-   * </pre>
-   *
    * Protobuf type {@code HomeModuleSeenReq}
    */
   public static final class HomeModuleSeenReq extends
@@ -87,7 +82,7 @@ public final class HomeModuleSeenReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 seenModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class HomeModuleSeenReqOuterClass {
               seenModuleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 66: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class HomeModuleSeenReqOuterClass {
               emu.grasscutter.net.proto.HomeModuleSeenReqOuterClass.HomeModuleSeenReq.class, emu.grasscutter.net.proto.HomeModuleSeenReqOuterClass.HomeModuleSeenReq.Builder.class);
     }
 
-    public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 8;
+    public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList seenModuleIdList_;
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return A list containing the seenModuleIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class HomeModuleSeenReqOuterClass {
       return seenModuleIdList_;
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return The count of seenModuleIdList.
      */
     public int getSeenModuleIdListCount() {
       return seenModuleIdList_.size();
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class HomeModuleSeenReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getSeenModuleIdListList().size() > 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(seenModuleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < seenModuleIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class HomeModuleSeenReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27692
-     * Obf: KNOGFPMPFGK
-     * </pre>
-     *
      * Protobuf type {@code HomeModuleSeenReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class HomeModuleSeenReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return A list containing the seenModuleIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class HomeModuleSeenReqOuterClass {
                  java.util.Collections.unmodifiableList(seenModuleIdList_) : seenModuleIdList_;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return The count of seenModuleIdList.
        */
       public int getSeenModuleIdListCount() {
         return seenModuleIdList_.size();
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The seenModuleIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class HomeModuleSeenReqOuterClass {
         return seenModuleIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The seenModuleIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class HomeModuleSeenReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param value The seenModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class HomeModuleSeenReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param values The seenModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class HomeModuleSeenReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSeenModuleIdList() {
@@ -654,7 +644,7 @@ public final class HomeModuleSeenReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027HomeModuleSeenReq.proto\"0\n\021HomeModuleS" +
-      "eenReq\022\033\n\023seen_module_id_list\030\010 \003(\rB\033\n\031e" +
+      "eenReq\022\033\n\023seen_module_id_list\030\005 \003(\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/HomeModuleSeenRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenRspOuterClass.java
index 0bf6e74d8..2ffd3e053 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleSeenRspOuterClass.java
@@ -19,34 +19,29 @@ public final class HomeModuleSeenRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>int32 retcode = 1;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return A list containing the seenModuleIdList.
      */
     java.util.List<java.lang.Integer> getSeenModuleIdListList();
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return The count of seenModuleIdList.
      */
     int getSeenModuleIdListCount();
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
     int getSeenModuleIdList(int index);
-
-    /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 3944
-   * Obf: IAGPCJIHFMC
-   * </pre>
-   *
    * Protobuf type {@code HomeModuleSeenRsp}
    */
   public static final class HomeModuleSeenRsp extends
@@ -93,7 +88,12 @@ public final class HomeModuleSeenRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 seenModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +101,7 @@ public final class HomeModuleSeenRspOuterClass {
               seenModuleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -114,11 +114,6 @@ public final class HomeModuleSeenRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +149,21 @@ public final class HomeModuleSeenRspOuterClass {
               emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp.class, emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp.Builder.class);
     }
 
-    public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 2;
+    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 SEEN_MODULE_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList seenModuleIdList_;
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return A list containing the seenModuleIdList.
      */
     @java.lang.Override
@@ -166,14 +172,14 @@ public final class HomeModuleSeenRspOuterClass {
       return seenModuleIdList_;
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @return The count of seenModuleIdList.
      */
     public int getSeenModuleIdListCount() {
       return seenModuleIdList_.size();
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 2;</code>
+     * <code>repeated uint32 seen_module_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
@@ -182,17 +188,6 @@ public final class HomeModuleSeenRspOuterClass {
     }
     private int seenModuleIdListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -208,16 +203,16 @@ public final class HomeModuleSeenRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (retcode_ != 0) {
+        output.writeInt32(1, retcode_);
+      }
       if (getSeenModuleIdListList().size() > 0) {
-        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(seenModuleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < seenModuleIdList_.size(); i++) {
         output.writeUInt32NoTag(seenModuleIdList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -227,6 +222,10 @@ public final class HomeModuleSeenRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, retcode_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < seenModuleIdList_.size(); i++) {
@@ -241,10 +240,6 @@ public final class HomeModuleSeenRspOuterClass {
         }
         seenModuleIdListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -260,10 +255,10 @@ public final class HomeModuleSeenRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp other = (emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp) obj;
 
-      if (!getSeenModuleIdListList()
-          .equals(other.getSeenModuleIdListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getSeenModuleIdListList()
+          .equals(other.getSeenModuleIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class HomeModuleSeenRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getSeenModuleIdListCount() > 0) {
         hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSeenModuleIdListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class HomeModuleSeenRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3944
-     * Obf: IAGPCJIHFMC
-     * </pre>
-     *
      * Protobuf type {@code HomeModuleSeenRsp}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class HomeModuleSeenRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        seenModuleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
+        seenModuleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class HomeModuleSeenRspOuterClass {
       public emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp buildPartial() {
         emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp result = new emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           seenModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.seenModuleIdList_ = seenModuleIdList_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -504,6 +494,9 @@ public final class HomeModuleSeenRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp other) {
         if (other == emu.grasscutter.net.proto.HomeModuleSeenRspOuterClass.HomeModuleSeenRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (!other.seenModuleIdList_.isEmpty()) {
           if (seenModuleIdList_.isEmpty()) {
             seenModuleIdList_ = other.seenModuleIdList_;
@@ -514,9 +507,6 @@ public final class HomeModuleSeenRspOuterClass {
           }
           onChanged();
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,6 +537,37 @@ public final class HomeModuleSeenRspOuterClass {
       }
       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 com.google.protobuf.Internal.IntList seenModuleIdList_ = emptyIntList();
       private void ensureSeenModuleIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -555,7 +576,7 @@ public final class HomeModuleSeenRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return A list containing the seenModuleIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -564,14 +585,14 @@ public final class HomeModuleSeenRspOuterClass {
                  java.util.Collections.unmodifiableList(seenModuleIdList_) : seenModuleIdList_;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return The count of seenModuleIdList.
        */
       public int getSeenModuleIdListCount() {
         return seenModuleIdList_.size();
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The seenModuleIdList at the given index.
        */
@@ -579,7 +600,7 @@ public final class HomeModuleSeenRspOuterClass {
         return seenModuleIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The seenModuleIdList to set.
        * @return This builder for chaining.
@@ -592,7 +613,7 @@ public final class HomeModuleSeenRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param value The seenModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -603,7 +624,7 @@ public final class HomeModuleSeenRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @param values The seenModuleIdList to add.
        * @return This builder for chaining.
        */
@@ -616,7 +637,7 @@ public final class HomeModuleSeenRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 seen_module_id_list = 2;</code>
+       * <code>repeated uint32 seen_module_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSeenModuleIdList() {
@@ -625,37 +646,6 @@ public final class HomeModuleSeenRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -724,8 +714,8 @@ public final class HomeModuleSeenRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027HomeModuleSeenRsp.proto\"A\n\021HomeModuleS" +
-      "eenRsp\022\033\n\023seen_module_id_list\030\002 \003(\r\022\017\n\007r" +
-      "etcode\030\017 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "eenRsp\022\017\n\007retcode\030\001 \001(\005\022\033\n\023seen_module_i" +
+      "d_list\030\005 \003(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +727,7 @@ public final class HomeModuleSeenRspOuterClass {
     internal_static_HomeModuleSeenRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeModuleSeenRsp_descriptor,
-        new java.lang.String[] { "SeenModuleIdList", "Retcode", });
+        new java.lang.String[] { "Retcode", "SeenModuleIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleUnlockNotifyOuterClass.java
index 21f981f03..4908784b1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleUnlockNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeModuleUnlockNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeModuleUnlockNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 module_id = 6;</code>
+     * <code>uint32 module_id = 8;</code>
      * @return The moduleId.
      */
     int getModuleId();
   }
   /**
-   * <pre>
-   * CmdId: 811
-   * Obf: HFALGGLELPP
-   * </pre>
-   *
    * Protobuf type {@code HomeModuleUnlockNotify}
    */
   public static final class HomeModuleUnlockNotify extends
@@ -74,7 +69,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 64: {
 
               moduleId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeModuleUnlockNotifyOuterClass {
               emu.grasscutter.net.proto.HomeModuleUnlockNotifyOuterClass.HomeModuleUnlockNotify.class, emu.grasscutter.net.proto.HomeModuleUnlockNotifyOuterClass.HomeModuleUnlockNotify.Builder.class);
     }
 
-    public static final int MODULE_ID_FIELD_NUMBER = 6;
+    public static final int MODULE_ID_FIELD_NUMBER = 8;
     private int moduleId_;
     /**
-     * <code>uint32 module_id = 6;</code>
+     * <code>uint32 module_id = 8;</code>
      * @return The moduleId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (moduleId_ != 0) {
-        output.writeUInt32(6, moduleId_);
+        output.writeUInt32(8, moduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
       size = 0;
       if (moduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, moduleId_);
+          .computeUInt32Size(8, moduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeModuleUnlockNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 811
-     * Obf: HFALGGLELPP
-     * </pre>
-     *
      * Protobuf type {@code HomeModuleUnlockNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
 
       private int moduleId_ ;
       /**
-       * <code>uint32 module_id = 6;</code>
+       * <code>uint32 module_id = 8;</code>
        * @return The moduleId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
         return moduleId_;
       }
       /**
-       * <code>uint32 module_id = 6;</code>
+       * <code>uint32 module_id = 8;</code>
        * @param value The moduleId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 module_id = 6;</code>
+       * <code>uint32 module_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearModuleId() {
@@ -527,7 +517,7 @@ public final class HomeModuleUnlockNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034HomeModuleUnlockNotify.proto\"+\n\026HomeMo" +
-      "duleUnlockNotify\022\021\n\tmodule_id\030\006 \001(\rB\033\n\031e" +
+      "duleUnlockNotify\022\021\n\tmodule_id\030\010 \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/HomeNpcDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeNpcDataOuterClass.java
index 10ea8a7d4..39404c6ea 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeNpcDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeNpcDataOuterClass.java
@@ -19,52 +19,48 @@ public final class HomeNpcDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector spawnRot = 12;</code>
-     * @return Whether the spawnRot field is set.
-     */
-    boolean hasSpawnRot();
-    /**
-     * <code>.Vector spawnRot = 12;</code>
-     * @return The spawnRot.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
-    /**
-     * <code>.Vector spawnRot = 12;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
-
-    /**
-     * <code>uint32 avatar_id = 10;</code>
+     * <code>uint32 avatar_id = 5;</code>
      * @return The avatarId.
      */
     int getAvatarId();
 
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      * @return Whether the spawnPos field is set.
      */
     boolean hasSpawnPos();
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      * @return The spawnPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos();
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder();
 
     /**
-     * <code>uint32 costume_id = 1;</code>
+     * <code>uint32 costume_id = 12;</code>
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     * @return Whether the spawnRot field is set.
+     */
+    boolean hasSpawnRot();
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     * @return The spawnRot.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot();
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: JOHOIPNEGBM
-   * </pre>
-   *
    * Protobuf type {@code HomeNpcData}
    */
   public static final class HomeNpcData extends
@@ -109,12 +105,12 @@ public final class HomeNpcDataOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 40: {
 
-              costumeId_ = input.readUInt32();
+              avatarId_ = input.readUInt32();
               break;
             }
-            case 18: {
+            case 50: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnPos_ != null) {
                 subBuilder = spawnPos_.toBuilder();
@@ -127,12 +123,12 @@ public final class HomeNpcDataOuterClass {
 
               break;
             }
-            case 80: {
+            case 96: {
 
-              avatarId_ = input.readUInt32();
+              costumeId_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (spawnRot_ != null) {
                 subBuilder = spawnRot_.toBuilder();
@@ -177,36 +173,10 @@ public final class HomeNpcDataOuterClass {
               emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.class, emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.Builder.class);
     }
 
-    public static final int SPAWNROT_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-    /**
-     * <code>.Vector spawnRot = 12;</code>
-     * @return Whether the spawnRot field is set.
-     */
-    @java.lang.Override
-    public boolean hasSpawnRot() {
-      return spawnRot_ != null;
-    }
-    /**
-     * <code>.Vector spawnRot = 12;</code>
-     * @return The spawnRot.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-    }
-    /**
-     * <code>.Vector spawnRot = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-      return getSpawnRot();
-    }
-
-    public static final int AVATAR_ID_FIELD_NUMBER = 10;
+    public static final int AVATAR_ID_FIELD_NUMBER = 5;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 10;</code>
+     * <code>uint32 avatar_id = 5;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -214,10 +184,10 @@ public final class HomeNpcDataOuterClass {
       return avatarId_;
     }
 
-    public static final int SPAWN_POS_FIELD_NUMBER = 2;
+    public static final int SPAWN_POS_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnPos_;
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      * @return Whether the spawnPos field is set.
      */
     @java.lang.Override
@@ -225,7 +195,7 @@ public final class HomeNpcDataOuterClass {
       return spawnPos_ != null;
     }
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      * @return The spawnPos.
      */
     @java.lang.Override
@@ -233,17 +203,17 @@ public final class HomeNpcDataOuterClass {
       return spawnPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnPos_;
     }
     /**
-     * <code>.Vector spawn_pos = 2;</code>
+     * <code>.Vector spawn_pos = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
       return getSpawnPos();
     }
 
-    public static final int COSTUME_ID_FIELD_NUMBER = 1;
+    public static final int COSTUME_ID_FIELD_NUMBER = 12;
     private int costumeId_;
     /**
-     * <code>uint32 costume_id = 1;</code>
+     * <code>uint32 costume_id = 12;</code>
      * @return The costumeId.
      */
     @java.lang.Override
@@ -251,6 +221,32 @@ public final class HomeNpcDataOuterClass {
       return costumeId_;
     }
 
+    public static final int SPAWN_ROT_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     * @return Whether the spawnRot field is set.
+     */
+    @java.lang.Override
+    public boolean hasSpawnRot() {
+      return spawnRot_ != null;
+    }
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     * @return The spawnRot.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+      return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+    }
+    /**
+     * <code>.Vector spawn_rot = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+      return getSpawnRot();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -265,17 +261,17 @@ public final class HomeNpcDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (costumeId_ != 0) {
-        output.writeUInt32(1, costumeId_);
+      if (avatarId_ != 0) {
+        output.writeUInt32(5, avatarId_);
       }
       if (spawnPos_ != null) {
-        output.writeMessage(2, getSpawnPos());
+        output.writeMessage(6, getSpawnPos());
       }
-      if (avatarId_ != 0) {
-        output.writeUInt32(10, avatarId_);
+      if (costumeId_ != 0) {
+        output.writeUInt32(12, costumeId_);
       }
       if (spawnRot_ != null) {
-        output.writeMessage(12, getSpawnRot());
+        output.writeMessage(13, getSpawnRot());
       }
       unknownFields.writeTo(output);
     }
@@ -286,21 +282,21 @@ public final class HomeNpcDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (costumeId_ != 0) {
+      if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, costumeId_);
+          .computeUInt32Size(5, avatarId_);
       }
       if (spawnPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getSpawnPos());
+          .computeMessageSize(6, getSpawnPos());
       }
-      if (avatarId_ != 0) {
+      if (costumeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, avatarId_);
+          .computeUInt32Size(12, costumeId_);
       }
       if (spawnRot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getSpawnRot());
+          .computeMessageSize(13, getSpawnRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -317,11 +313,6 @@ public final class HomeNpcDataOuterClass {
       }
       emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData other = (emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData) obj;
 
-      if (hasSpawnRot() != other.hasSpawnRot()) return false;
-      if (hasSpawnRot()) {
-        if (!getSpawnRot()
-            .equals(other.getSpawnRot())) return false;
-      }
       if (getAvatarId()
           != other.getAvatarId()) return false;
       if (hasSpawnPos() != other.hasSpawnPos()) return false;
@@ -331,6 +322,11 @@ public final class HomeNpcDataOuterClass {
       }
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (hasSpawnRot() != other.hasSpawnRot()) return false;
+      if (hasSpawnRot()) {
+        if (!getSpawnRot()
+            .equals(other.getSpawnRot())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -342,10 +338,6 @@ public final class HomeNpcDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasSpawnRot()) {
-        hash = (37 * hash) + SPAWNROT_FIELD_NUMBER;
-        hash = (53 * hash) + getSpawnRot().hashCode();
-      }
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
       if (hasSpawnPos()) {
@@ -354,6 +346,10 @@ public final class HomeNpcDataOuterClass {
       }
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
+      if (hasSpawnRot()) {
+        hash = (37 * hash) + SPAWN_ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getSpawnRot().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -450,10 +446,6 @@ public final class HomeNpcDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JOHOIPNEGBM
-     * </pre>
-     *
      * Protobuf type {@code HomeNpcData}
      */
     public static final class Builder extends
@@ -491,12 +483,6 @@ public final class HomeNpcDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
-        } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
-        }
         avatarId_ = 0;
 
         if (spawnPosBuilder_ == null) {
@@ -507,6 +493,12 @@ public final class HomeNpcDataOuterClass {
         }
         costumeId_ = 0;
 
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
+        } else {
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
+        }
         return this;
       }
 
@@ -533,11 +525,6 @@ public final class HomeNpcDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData buildPartial() {
         emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData result = new emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData(this);
-        if (spawnRotBuilder_ == null) {
-          result.spawnRot_ = spawnRot_;
-        } else {
-          result.spawnRot_ = spawnRotBuilder_.build();
-        }
         result.avatarId_ = avatarId_;
         if (spawnPosBuilder_ == null) {
           result.spawnPos_ = spawnPos_;
@@ -545,6 +532,11 @@ public final class HomeNpcDataOuterClass {
           result.spawnPos_ = spawnPosBuilder_.build();
         }
         result.costumeId_ = costumeId_;
+        if (spawnRotBuilder_ == null) {
+          result.spawnRot_ = spawnRot_;
+        } else {
+          result.spawnRot_ = spawnRotBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -593,9 +585,6 @@ public final class HomeNpcDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData other) {
         if (other == emu.grasscutter.net.proto.HomeNpcDataOuterClass.HomeNpcData.getDefaultInstance()) return this;
-        if (other.hasSpawnRot()) {
-          mergeSpawnRot(other.getSpawnRot());
-        }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
         }
@@ -605,6 +594,9 @@ public final class HomeNpcDataOuterClass {
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.hasSpawnRot()) {
+          mergeSpawnRot(other.getSpawnRot());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -634,128 +626,9 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       * @return Whether the spawnRot field is set.
-       */
-      public boolean hasSpawnRot() {
-        return spawnRotBuilder_ != null || spawnRot_ != null;
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       * @return The spawnRot.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        } else {
-          return spawnRotBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          spawnRot_ = value;
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public Builder setSpawnRot(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = builderForValue.build();
-          onChanged();
-        } else {
-          spawnRotBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (spawnRotBuilder_ == null) {
-          if (spawnRot_ != null) {
-            spawnRot_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
-          } else {
-            spawnRot_ = value;
-          }
-          onChanged();
-        } else {
-          spawnRotBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public Builder clearSpawnRot() {
-        if (spawnRotBuilder_ == null) {
-          spawnRot_ = null;
-          onChanged();
-        } else {
-          spawnRot_ = null;
-          spawnRotBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
-        
-        onChanged();
-        return getSpawnRotFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector spawnRot = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
-        if (spawnRotBuilder_ != null) {
-          return spawnRotBuilder_.getMessageOrBuilder();
-        } else {
-          return spawnRot_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
-        }
-      }
-      /**
-       * <code>.Vector spawnRot = 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> 
-          getSpawnRotFieldBuilder() {
-        if (spawnRotBuilder_ == null) {
-          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSpawnRot(),
-                  getParentForChildren(),
-                  isClean());
-          spawnRot_ = null;
-        }
-        return spawnRotBuilder_;
-      }
-
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 10;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -763,7 +636,7 @@ public final class HomeNpcDataOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 10;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -774,7 +647,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 10;</code>
+       * <code>uint32 avatar_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -788,14 +661,14 @@ public final class HomeNpcDataOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnPosBuilder_;
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        * @return Whether the spawnPos field is set.
        */
       public boolean hasSpawnPos() {
         return spawnPosBuilder_ != null || spawnPos_ != null;
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        * @return The spawnPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnPos() {
@@ -806,7 +679,7 @@ public final class HomeNpcDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public Builder setSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -822,7 +695,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public Builder setSpawnPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -836,7 +709,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public Builder mergeSpawnPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (spawnPosBuilder_ == null) {
@@ -854,7 +727,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public Builder clearSpawnPos() {
         if (spawnPosBuilder_ == null) {
@@ -868,7 +741,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnPosBuilder() {
         
@@ -876,7 +749,7 @@ public final class HomeNpcDataOuterClass {
         return getSpawnPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnPosOrBuilder() {
         if (spawnPosBuilder_ != null) {
@@ -887,7 +760,7 @@ public final class HomeNpcDataOuterClass {
         }
       }
       /**
-       * <code>.Vector spawn_pos = 2;</code>
+       * <code>.Vector spawn_pos = 6;</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> 
@@ -905,7 +778,7 @@ public final class HomeNpcDataOuterClass {
 
       private int costumeId_ ;
       /**
-       * <code>uint32 costume_id = 1;</code>
+       * <code>uint32 costume_id = 12;</code>
        * @return The costumeId.
        */
       @java.lang.Override
@@ -913,7 +786,7 @@ public final class HomeNpcDataOuterClass {
         return costumeId_;
       }
       /**
-       * <code>uint32 costume_id = 1;</code>
+       * <code>uint32 costume_id = 12;</code>
        * @param value The costumeId to set.
        * @return This builder for chaining.
        */
@@ -924,7 +797,7 @@ public final class HomeNpcDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 costume_id = 1;</code>
+       * <code>uint32 costume_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearCostumeId() {
@@ -933,6 +806,125 @@ public final class HomeNpcDataOuterClass {
         onChanged();
         return this;
       }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector spawnRot_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> spawnRotBuilder_;
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       * @return Whether the spawnRot field is set.
+       */
+      public boolean hasSpawnRot() {
+        return spawnRotBuilder_ != null || spawnRot_ != null;
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       * @return The spawnRot.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          return spawnRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        } else {
+          return spawnRotBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public Builder setSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          spawnRot_ = value;
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public Builder setSpawnRot(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = builderForValue.build();
+          onChanged();
+        } else {
+          spawnRotBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public Builder mergeSpawnRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (spawnRotBuilder_ == null) {
+          if (spawnRot_ != null) {
+            spawnRot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(spawnRot_).mergeFrom(value).buildPartial();
+          } else {
+            spawnRot_ = value;
+          }
+          onChanged();
+        } else {
+          spawnRotBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public Builder clearSpawnRot() {
+        if (spawnRotBuilder_ == null) {
+          spawnRot_ = null;
+          onChanged();
+        } else {
+          spawnRot_ = null;
+          spawnRotBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSpawnRotBuilder() {
+        
+        onChanged();
+        return getSpawnRotFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSpawnRotOrBuilder() {
+        if (spawnRotBuilder_ != null) {
+          return spawnRotBuilder_.getMessageOrBuilder();
+        } else {
+          return spawnRot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : spawnRot_;
+        }
+      }
+      /**
+       * <code>.Vector spawn_rot = 13;</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> 
+          getSpawnRotFieldBuilder() {
+        if (spawnRotBuilder_ == null) {
+          spawnRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getSpawnRot(),
+                  getParentForChildren(),
+                  isClean());
+          spawnRot_ = null;
+        }
+        return spawnRotBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1000,11 +992,11 @@ public final class HomeNpcDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021HomeNpcData.proto\032\014Vector.proto\"k\n\013Hom" +
-      "eNpcData\022\031\n\010spawnRot\030\014 \001(\0132\007.Vector\022\021\n\ta" +
-      "vatar_id\030\n \001(\r\022\032\n\tspawn_pos\030\002 \001(\0132\007.Vect" +
-      "or\022\022\n\ncostume_id\030\001 \001(\rB\033\n\031emu.grasscutte" +
-      "r.net.protob\006proto3"
+      "\n\021HomeNpcData.proto\032\014Vector.proto\"l\n\013Hom" +
+      "eNpcData\022\021\n\tavatar_id\030\005 \001(\r\022\032\n\tspawn_pos" +
+      "\030\006 \001(\0132\007.Vector\022\022\n\ncostume_id\030\014 \001(\r\022\032\n\ts" +
+      "pawn_rot\030\r \001(\0132\007.VectorB\033\n\031emu.grasscutt" +
+      "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1016,7 +1008,7 @@ public final class HomeNpcDataOuterClass {
     internal_static_HomeNpcData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeNpcData_descriptor,
-        new java.lang.String[] { "SpawnRot", "AvatarId", "SpawnPos", "CostumeId", });
+        new java.lang.String[] { "AvatarId", "SpawnPos", "CostumeId", "SpawnRot", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomePreChangeEditModeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomePreChangeEditModeNotifyOuterClass.java
index d3a55a0b6..5a62697b6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomePreChangeEditModeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomePreChangeEditModeNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class HomePreChangeEditModeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_enter_edit_mode = 14;</code>
+     * <code>bool is_enter_edit_mode = 4;</code>
      * @return The isEnterEditMode.
      */
     boolean getIsEnterEditMode();
   }
   /**
-   * <pre>
-   * CmdId: 27578
-   * Obf: AMAHNNLDPHO
-   * </pre>
-   *
    * Protobuf type {@code HomePreChangeEditModeNotify}
    */
   public static final class HomePreChangeEditModeNotify extends
@@ -74,7 +69,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 32: {
 
               isEnterEditMode_ = input.readBool();
               break;
@@ -111,10 +106,10 @@ public final class HomePreChangeEditModeNotifyOuterClass {
               emu.grasscutter.net.proto.HomePreChangeEditModeNotifyOuterClass.HomePreChangeEditModeNotify.class, emu.grasscutter.net.proto.HomePreChangeEditModeNotifyOuterClass.HomePreChangeEditModeNotify.Builder.class);
     }
 
-    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 14;
+    public static final int IS_ENTER_EDIT_MODE_FIELD_NUMBER = 4;
     private boolean isEnterEditMode_;
     /**
-     * <code>bool is_enter_edit_mode = 14;</code>
+     * <code>bool is_enter_edit_mode = 4;</code>
      * @return The isEnterEditMode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isEnterEditMode_ != false) {
-        output.writeBool(14, isEnterEditMode_);
+        output.writeBool(4, isEnterEditMode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
       size = 0;
       if (isEnterEditMode_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isEnterEditMode_);
+          .computeBoolSize(4, isEnterEditMode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class HomePreChangeEditModeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27578
-     * Obf: AMAHNNLDPHO
-     * </pre>
-     *
      * Protobuf type {@code HomePreChangeEditModeNotify}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
 
       private boolean isEnterEditMode_ ;
       /**
-       * <code>bool is_enter_edit_mode = 14;</code>
+       * <code>bool is_enter_edit_mode = 4;</code>
        * @return The isEnterEditMode.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
         return isEnterEditMode_;
       }
       /**
-       * <code>bool is_enter_edit_mode = 14;</code>
+       * <code>bool is_enter_edit_mode = 4;</code>
        * @param value The isEnterEditMode to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enter_edit_mode = 14;</code>
+       * <code>bool is_enter_edit_mode = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnterEditMode() {
@@ -529,7 +519,7 @@ public final class HomePreChangeEditModeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!HomePreChangeEditModeNotify.proto\"9\n\033H" +
       "omePreChangeEditModeNotify\022\032\n\022is_enter_e" +
-      "dit_mode\030\016 \001(\010B\033\n\031emu.grasscutter.net.pr" +
+      "dit_mode\030\004 \001(\010B\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeSaveBlueprintToSlotRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeSaveBlueprintToSlotRspOuterClass.java
new file mode 100644
index 000000000..65c946ddd
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeSaveBlueprintToSlotRspOuterClass.java
@@ -0,0 +1,556 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: HomeSaveBlueprintToSlotRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class HomeSaveBlueprintToSlotRspOuterClass {
+  private HomeSaveBlueprintToSlotRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface HomeSaveBlueprintToSlotRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:HomeSaveBlueprintToSlotRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <pre>
+     *PNBDIKIJDOJ IIMDJNNJIEP = 2;
+     * </pre>
+     *
+     * <code>int32 retcode = 1;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+  }
+  /**
+   * Protobuf type {@code HomeSaveBlueprintToSlotRsp}
+   */
+  public static final class HomeSaveBlueprintToSlotRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:HomeSaveBlueprintToSlotRsp)
+      HomeSaveBlueprintToSlotRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use HomeSaveBlueprintToSlotRsp.newBuilder() to construct.
+    private HomeSaveBlueprintToSlotRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private HomeSaveBlueprintToSlotRsp() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new HomeSaveBlueprintToSlotRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private HomeSaveBlueprintToSlotRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.internal_static_HomeSaveBlueprintToSlotRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.internal_static_HomeSaveBlueprintToSlotRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.class, emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.Builder.class);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 1;
+    private int retcode_;
+    /**
+     * <pre>
+     *PNBDIKIJDOJ IIMDJNNJIEP = 2;
+     * </pre>
+     *
+     * <code>int32 retcode = 1;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (retcode_ != 0) {
+        output.writeInt32(1, retcode_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, retcode_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp other = (emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp) obj;
+
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code HomeSaveBlueprintToSlotRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:HomeSaveBlueprintToSlotRsp)
+        emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.internal_static_HomeSaveBlueprintToSlotRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.internal_static_HomeSaveBlueprintToSlotRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.class, emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        retcode_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.internal_static_HomeSaveBlueprintToSlotRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp build() {
+        emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp buildPartial() {
+        emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp result = new emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp(this);
+        result.retcode_ = retcode_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp other) {
+        if (other == emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp.getDefaultInstance()) return this;
+        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.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <pre>
+       *PNBDIKIJDOJ IIMDJNNJIEP = 2;
+       * </pre>
+       *
+       * <code>int32 retcode = 1;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <pre>
+       *PNBDIKIJDOJ IIMDJNNJIEP = 2;
+       * </pre>
+       *
+       * <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;
+      }
+      /**
+       * <pre>
+       *PNBDIKIJDOJ IIMDJNNJIEP = 2;
+       * </pre>
+       *
+       * <code>int32 retcode = 1;</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) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:HomeSaveBlueprintToSlotRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:HomeSaveBlueprintToSlotRsp)
+    private static final emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp();
+    }
+
+    public static emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<HomeSaveBlueprintToSlotRsp>
+        PARSER = new com.google.protobuf.AbstractParser<HomeSaveBlueprintToSlotRsp>() {
+      @java.lang.Override
+      public HomeSaveBlueprintToSlotRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new HomeSaveBlueprintToSlotRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<HomeSaveBlueprintToSlotRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<HomeSaveBlueprintToSlotRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeSaveBlueprintToSlotRspOuterClass.HomeSaveBlueprintToSlotRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_HomeSaveBlueprintToSlotRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_HomeSaveBlueprintToSlotRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n HomeSaveBlueprintToSlotRsp.proto\"-\n\032Ho" +
+      "meSaveBlueprintToSlotRsp\022\017\n\007retcode\030\001 \001(" +
+      "\005B\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_HomeSaveBlueprintToSlotRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_HomeSaveBlueprintToSlotRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_HomeSaveBlueprintToSlotRsp_descriptor,
+        new java.lang.String[] { "Retcode", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneArrangementInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneArrangementInfoOuterClass.java
index 4d72f909c..cf7a6d48e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneArrangementInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneArrangementInfoOuterClass.java
@@ -19,137 +19,32 @@ public final class HomeSceneArrangementInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> 
-        getBlockArrangementInfoListList();
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index);
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    int getBlockArrangementInfoListCount();
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
-        getBlockArrangementInfoListOrBuilderList();
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
-        getHDOFAHGPJGKList();
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getHDOFAHGPJGK(int index);
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    int getHDOFAHGPJGKCount();
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getHDOFAHGPJGKOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getHDOFAHGPJGKOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
-        getMLECLIOFALAList();
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMLECLIOFALA(int index);
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    int getMLECLIOFALACount();
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getMLECLIOFALAOrBuilderList();
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMLECLIOFALAOrBuilder(
-        int index);
-
-    /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      * @return Whether the bornRot field is set.
      */
     boolean hasBornRot();
     /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      * @return The bornRot.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getBornRot();
     /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornRotOrBuilder();
 
     /**
-     * <code>uint32 scene_id = 8;</code>
-     * @return The sceneId.
+     * <code>bool BMAEDEOKOHL = 2;</code>
+     * @return The bMAEDEOKOHL.
      */
-    int getSceneId();
+    boolean getBMAEDEOKOHL();
 
     /**
-     * <code>uint32 bgm_id = 3;</code>
-     * @return The bgmId.
-     */
-    int getBgmId();
-
-    /**
-     * <code>uint32 comfort_value = 5;</code>
+     * <code>uint32 comfort_value = 3;</code>
      * @return The comfortValue.
      */
     int getComfortValue();
 
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     * @return Whether the mainHouse field is set.
-     */
-    boolean hasMainHouse();
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     * @return The mainHouse.
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse();
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     */
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder();
-
-    /**
-     * <code>uint32 tmp_version = 13;</code>
-     * @return The tmpVersion.
-     */
-    int getTmpVersion();
-
-    /**
-     * <code>bool is_set_born_pos = 1;</code>
-     * @return The isSetBornPos.
-     */
-    boolean getIsSetBornPos();
-
     /**
      * <code>.Vector djinn_pos = 4;</code>
      * @return Whether the djinnPos field is set.
@@ -166,25 +61,162 @@ public final class HomeSceneArrangementInfoOuterClass {
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDjinnPosOrBuilder();
 
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      * @return Whether the bornPos field is set.
      */
     boolean hasBornPos();
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      * @return The bornPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getBornPos();
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornPosOrBuilder();
+
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
+        getDoorListList();
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDoorList(int index);
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    int getDoorListCount();
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getDoorListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDoorListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 tmp_version = 8;</code>
+     * @return The tmpVersion.
+     */
+    int getTmpVersion();
+
+    /**
+     * <code>uint32 scene_id = 9;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     * @return Whether the mainHouse field is set.
+     */
+    boolean hasMainHouse();
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     * @return The mainHouse.
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse();
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder();
+
+    /**
+     * <code>bool is_set_born_pos = 11;</code>
+     * @return The isSetBornPos.
+     */
+    boolean getIsSetBornPos();
+
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> 
+        getBlockArrangementInfoListList();
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index);
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    int getBlockArrangementInfoListCount();
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
+        getBlockArrangementInfoListOrBuilderList();
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> 
+        getStairListList();
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getStairList(int index);
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    int getStairListCount();
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getStairListOrBuilderList();
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getStairListOrBuilder(
+        int index);
+
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     * @return Whether the dFCFKJBCCAH field is set.
+     */
+    boolean hasDFCFKJBCCAH();
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     * @return The dFCFKJBCCAH.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getDFCFKJBCCAH();
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDFCFKJBCCAHOrBuilder();
+
+    /**
+     * <code>uint32 bgm_id = 15;</code>
+     * @return The bgmId.
+     */
+    int getBgmId();
+
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     * @return Whether the eJAPJLENOGL field is set.
+     */
+    boolean hasEJAPJLENOGL();
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     * @return The eJAPJLENOGL.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getEJAPJLENOGL();
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEJAPJLENOGLOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: LEMEOONDDGM
-   * </pre>
-   *
    * Protobuf type {@code HomeSceneArrangementInfo}
    */
   public static final class HomeSceneArrangementInfo extends
@@ -197,9 +229,9 @@ public final class HomeSceneArrangementInfoOuterClass {
       super(builder);
     }
     private HomeSceneArrangementInfo() {
+      doorList_ = java.util.Collections.emptyList();
       blockArrangementInfoList_ = java.util.Collections.emptyList();
-      hDOFAHGPJGK_ = java.util.Collections.emptyList();
-      mLECLIOFALA_ = java.util.Collections.emptyList();
+      stairList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -233,23 +265,27 @@ public final class HomeSceneArrangementInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 10: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (bornRot_ != null) {
+                subBuilder = bornRot_.toBuilder();
+              }
+              bornRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(bornRot_);
+                bornRot_ = subBuilder.buildPartial();
+              }
 
-              isSetBornPos_ = input.readBool();
               break;
             }
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                blockArrangementInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              blockArrangementInfoList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.parser(), extensionRegistry));
+            case 16: {
+
+              bMAEDEOKOHL_ = input.readBool();
               break;
             }
             case 24: {
 
-              bgmId_ = input.readUInt32();
+              comfortValue_ = input.readUInt32();
               break;
             }
             case 34: {
@@ -265,52 +301,7 @@ public final class HomeSceneArrangementInfoOuterClass {
 
               break;
             }
-            case 40: {
-
-              comfortValue_ = input.readUInt32();
-              break;
-            }
-            case 50: {
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder subBuilder = null;
-              if (mainHouse_ != null) {
-                subBuilder = mainHouse_.toBuilder();
-              }
-              mainHouse_ = input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(mainHouse_);
-                mainHouse_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                hDOFAHGPJGK_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              hDOFAHGPJGK_.add(
-                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
-              break;
-            }
-            case 64: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (bornRot_ != null) {
-                subBuilder = bornRot_.toBuilder();
-              }
-              bornRot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(bornRot_);
-                bornRot_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 82: {
+            case 42: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (bornPos_ != null) {
                 subBuilder = bornPos_.toBuilder();
@@ -323,20 +314,92 @@ public final class HomeSceneArrangementInfoOuterClass {
 
               break;
             }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                mLECLIOFALA_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
-                mutable_bitField0_ |= 0x00000004;
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                doorList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
+                mutable_bitField0_ |= 0x00000001;
               }
-              mLECLIOFALA_.add(
+              doorList_.add(
                   input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
               break;
             }
-            case 104: {
+            case 64: {
 
               tmpVersion_ = input.readUInt32();
               break;
             }
+            case 72: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder subBuilder = null;
+              if (mainHouse_ != null) {
+                subBuilder = mainHouse_.toBuilder();
+              }
+              mainHouse_ = input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(mainHouse_);
+                mainHouse_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 88: {
+
+              isSetBornPos_ = input.readBool();
+              break;
+            }
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                blockArrangementInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              blockArrangementInfoList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                stairList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              stairList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.parser(), extensionRegistry));
+              break;
+            }
+            case 114: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (dFCFKJBCCAH_ != null) {
+                subBuilder = dFCFKJBCCAH_.toBuilder();
+              }
+              dFCFKJBCCAH_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(dFCFKJBCCAH_);
+                dFCFKJBCCAH_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 120: {
+
+              bgmId_ = input.readUInt32();
+              break;
+            }
+            case 7082: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (eJAPJLENOGL_ != null) {
+                subBuilder = eJAPJLENOGL_.toBuilder();
+              }
+              eJAPJLENOGL_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(eJAPJLENOGL_);
+                eJAPJLENOGL_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -353,13 +416,13 @@ public final class HomeSceneArrangementInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          blockArrangementInfoList_ = java.util.Collections.unmodifiableList(blockArrangementInfoList_);
+          doorList_ = java.util.Collections.unmodifiableList(doorList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          hDOFAHGPJGK_ = java.util.Collections.unmodifiableList(hDOFAHGPJGK_);
+          blockArrangementInfoList_ = java.util.Collections.unmodifiableList(blockArrangementInfoList_);
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          mLECLIOFALA_ = java.util.Collections.unmodifiableList(mLECLIOFALA_);
+          stairList_ = java.util.Collections.unmodifiableList(stairList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -378,130 +441,10 @@ public final class HomeSceneArrangementInfoOuterClass {
               emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.class, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder.class);
     }
 
-    public static final int BLOCK_ARRANGEMENT_INFO_LIST_FIELD_NUMBER = 2;
-    private java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> blockArrangementInfoList_;
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> getBlockArrangementInfoListList() {
-      return blockArrangementInfoList_;
-    }
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
-        getBlockArrangementInfoListOrBuilderList() {
-      return blockArrangementInfoList_;
-    }
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    @java.lang.Override
-    public int getBlockArrangementInfoListCount() {
-      return blockArrangementInfoList_.size();
-    }
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index) {
-      return blockArrangementInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
-        int index) {
-      return blockArrangementInfoList_.get(index);
-    }
-
-    public static final int HDOFAHGPJGK_FIELD_NUMBER = 7;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> hDOFAHGPJGK_;
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getHDOFAHGPJGKList() {
-      return hDOFAHGPJGK_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getHDOFAHGPJGKOrBuilderList() {
-      return hDOFAHGPJGK_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    @java.lang.Override
-    public int getHDOFAHGPJGKCount() {
-      return hDOFAHGPJGK_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getHDOFAHGPJGK(int index) {
-      return hDOFAHGPJGK_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getHDOFAHGPJGKOrBuilder(
-        int index) {
-      return hDOFAHGPJGK_.get(index);
-    }
-
-    public static final int MLECLIOFALA_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> mLECLIOFALA_;
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getMLECLIOFALAList() {
-      return mLECLIOFALA_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-        getMLECLIOFALAOrBuilderList() {
-      return mLECLIOFALA_;
-    }
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    @java.lang.Override
-    public int getMLECLIOFALACount() {
-      return mLECLIOFALA_.size();
-    }
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMLECLIOFALA(int index) {
-      return mLECLIOFALA_.get(index);
-    }
-    /**
-     * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMLECLIOFALAOrBuilder(
-        int index) {
-      return mLECLIOFALA_.get(index);
-    }
-
-    public static final int BORN_ROT_FIELD_NUMBER = 9;
+    public static final int BORN_ROT_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector bornRot_;
     /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      * @return Whether the bornRot field is set.
      */
     @java.lang.Override
@@ -509,7 +452,7 @@ public final class HomeSceneArrangementInfoOuterClass {
       return bornRot_ != null;
     }
     /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      * @return The bornRot.
      */
     @java.lang.Override
@@ -517,39 +460,28 @@ public final class HomeSceneArrangementInfoOuterClass {
       return bornRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bornRot_;
     }
     /**
-     * <code>.Vector born_rot = 9;</code>
+     * <code>.Vector born_rot = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornRotOrBuilder() {
       return getBornRot();
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 8;
-    private int sceneId_;
+    public static final int BMAEDEOKOHL_FIELD_NUMBER = 2;
+    private boolean bMAEDEOKOHL_;
     /**
-     * <code>uint32 scene_id = 8;</code>
-     * @return The sceneId.
+     * <code>bool BMAEDEOKOHL = 2;</code>
+     * @return The bMAEDEOKOHL.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public boolean getBMAEDEOKOHL() {
+      return bMAEDEOKOHL_;
     }
 
-    public static final int BGM_ID_FIELD_NUMBER = 3;
-    private int bgmId_;
-    /**
-     * <code>uint32 bgm_id = 3;</code>
-     * @return The bgmId.
-     */
-    @java.lang.Override
-    public int getBgmId() {
-      return bgmId_;
-    }
-
-    public static final int COMFORT_VALUE_FIELD_NUMBER = 5;
+    public static final int COMFORT_VALUE_FIELD_NUMBER = 3;
     private int comfortValue_;
     /**
-     * <code>uint32 comfort_value = 5;</code>
+     * <code>uint32 comfort_value = 3;</code>
      * @return The comfortValue.
      */
     @java.lang.Override
@@ -557,54 +489,6 @@ public final class HomeSceneArrangementInfoOuterClass {
       return comfortValue_;
     }
 
-    public static final int MAIN_HOUSE_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData mainHouse_;
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     * @return Whether the mainHouse field is set.
-     */
-    @java.lang.Override
-    public boolean hasMainHouse() {
-      return mainHouse_ != null;
-    }
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     * @return The mainHouse.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse() {
-      return mainHouse_ == null ? emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
-    }
-    /**
-     * <code>.HomeFurnitureData main_house = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder() {
-      return getMainHouse();
-    }
-
-    public static final int TMP_VERSION_FIELD_NUMBER = 13;
-    private int tmpVersion_;
-    /**
-     * <code>uint32 tmp_version = 13;</code>
-     * @return The tmpVersion.
-     */
-    @java.lang.Override
-    public int getTmpVersion() {
-      return tmpVersion_;
-    }
-
-    public static final int IS_SET_BORN_POS_FIELD_NUMBER = 1;
-    private boolean isSetBornPos_;
-    /**
-     * <code>bool is_set_born_pos = 1;</code>
-     * @return The isSetBornPos.
-     */
-    @java.lang.Override
-    public boolean getIsSetBornPos() {
-      return isSetBornPos_;
-    }
-
     public static final int DJINN_POS_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
     /**
@@ -631,10 +515,10 @@ public final class HomeSceneArrangementInfoOuterClass {
       return getDjinnPos();
     }
 
-    public static final int BORN_POS_FIELD_NUMBER = 10;
+    public static final int BORN_POS_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector bornPos_;
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      * @return Whether the bornPos field is set.
      */
     @java.lang.Override
@@ -642,7 +526,7 @@ public final class HomeSceneArrangementInfoOuterClass {
       return bornPos_ != null;
     }
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      * @return The bornPos.
      */
     @java.lang.Override
@@ -650,13 +534,255 @@ public final class HomeSceneArrangementInfoOuterClass {
       return bornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bornPos_;
     }
     /**
-     * <code>.Vector born_pos = 10;</code>
+     * <code>.Vector born_pos = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornPosOrBuilder() {
       return getBornPos();
     }
 
+    public static final int DOOR_LIST_FIELD_NUMBER = 6;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> doorList_;
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getDoorListList() {
+      return doorList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getDoorListOrBuilderList() {
+      return doorList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    @java.lang.Override
+    public int getDoorListCount() {
+      return doorList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDoorList(int index) {
+      return doorList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureData door_list = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDoorListOrBuilder(
+        int index) {
+      return doorList_.get(index);
+    }
+
+    public static final int TMP_VERSION_FIELD_NUMBER = 8;
+    private int tmpVersion_;
+    /**
+     * <code>uint32 tmp_version = 8;</code>
+     * @return The tmpVersion.
+     */
+    @java.lang.Override
+    public int getTmpVersion() {
+      return tmpVersion_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 9;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 9;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int MAIN_HOUSE_FIELD_NUMBER = 10;
+    private emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData mainHouse_;
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     * @return Whether the mainHouse field is set.
+     */
+    @java.lang.Override
+    public boolean hasMainHouse() {
+      return mainHouse_ != null;
+    }
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     * @return The mainHouse.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse() {
+      return mainHouse_ == null ? emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
+    }
+    /**
+     * <code>.HomeFurnitureData main_house = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder() {
+      return getMainHouse();
+    }
+
+    public static final int IS_SET_BORN_POS_FIELD_NUMBER = 11;
+    private boolean isSetBornPos_;
+    /**
+     * <code>bool is_set_born_pos = 11;</code>
+     * @return The isSetBornPos.
+     */
+    @java.lang.Override
+    public boolean getIsSetBornPos() {
+      return isSetBornPos_;
+    }
+
+    public static final int BLOCK_ARRANGEMENT_INFO_LIST_FIELD_NUMBER = 12;
+    private java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> blockArrangementInfoList_;
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> getBlockArrangementInfoListList() {
+      return blockArrangementInfoList_;
+    }
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
+        getBlockArrangementInfoListOrBuilderList() {
+      return blockArrangementInfoList_;
+    }
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    @java.lang.Override
+    public int getBlockArrangementInfoListCount() {
+      return blockArrangementInfoList_.size();
+    }
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index) {
+      return blockArrangementInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
+        int index) {
+      return blockArrangementInfoList_.get(index);
+    }
+
+    public static final int STAIR_LIST_FIELD_NUMBER = 13;
+    private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> stairList_;
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getStairListList() {
+      return stairList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+        getStairListOrBuilderList() {
+      return stairList_;
+    }
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    @java.lang.Override
+    public int getStairListCount() {
+      return stairList_.size();
+    }
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getStairList(int index) {
+      return stairList_.get(index);
+    }
+    /**
+     * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getStairListOrBuilder(
+        int index) {
+      return stairList_.get(index);
+    }
+
+    public static final int DFCFKJBCCAH_FIELD_NUMBER = 14;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector dFCFKJBCCAH_;
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     * @return Whether the dFCFKJBCCAH field is set.
+     */
+    @java.lang.Override
+    public boolean hasDFCFKJBCCAH() {
+      return dFCFKJBCCAH_ != null;
+    }
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     * @return The dFCFKJBCCAH.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDFCFKJBCCAH() {
+      return dFCFKJBCCAH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dFCFKJBCCAH_;
+    }
+    /**
+     * <code>.Vector DFCFKJBCCAH = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDFCFKJBCCAHOrBuilder() {
+      return getDFCFKJBCCAH();
+    }
+
+    public static final int BGM_ID_FIELD_NUMBER = 15;
+    private int bgmId_;
+    /**
+     * <code>uint32 bgm_id = 15;</code>
+     * @return The bgmId.
+     */
+    @java.lang.Override
+    public int getBgmId() {
+      return bgmId_;
+    }
+
+    public static final int EJAPJLENOGL_FIELD_NUMBER = 885;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector eJAPJLENOGL_;
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     * @return Whether the eJAPJLENOGL field is set.
+     */
+    @java.lang.Override
+    public boolean hasEJAPJLENOGL() {
+      return eJAPJLENOGL_ != null;
+    }
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     * @return The eJAPJLENOGL.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getEJAPJLENOGL() {
+      return eJAPJLENOGL_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eJAPJLENOGL_;
+    }
+    /**
+     * <code>.Vector EJAPJLENOGL = 885;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEJAPJLENOGLOrBuilder() {
+      return getEJAPJLENOGL();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -671,41 +797,50 @@ public final class HomeSceneArrangementInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isSetBornPos_ != false) {
-        output.writeBool(1, isSetBornPos_);
+      if (bornRot_ != null) {
+        output.writeMessage(1, getBornRot());
       }
-      for (int i = 0; i < blockArrangementInfoList_.size(); i++) {
-        output.writeMessage(2, blockArrangementInfoList_.get(i));
+      if (bMAEDEOKOHL_ != false) {
+        output.writeBool(2, bMAEDEOKOHL_);
       }
-      if (bgmId_ != 0) {
-        output.writeUInt32(3, bgmId_);
+      if (comfortValue_ != 0) {
+        output.writeUInt32(3, comfortValue_);
       }
       if (djinnPos_ != null) {
         output.writeMessage(4, getDjinnPos());
       }
-      if (comfortValue_ != 0) {
-        output.writeUInt32(5, comfortValue_);
-      }
-      if (mainHouse_ != null) {
-        output.writeMessage(6, getMainHouse());
-      }
-      for (int i = 0; i < hDOFAHGPJGK_.size(); i++) {
-        output.writeMessage(7, hDOFAHGPJGK_.get(i));
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(8, sceneId_);
-      }
-      if (bornRot_ != null) {
-        output.writeMessage(9, getBornRot());
-      }
       if (bornPos_ != null) {
-        output.writeMessage(10, getBornPos());
+        output.writeMessage(5, getBornPos());
       }
-      for (int i = 0; i < mLECLIOFALA_.size(); i++) {
-        output.writeMessage(12, mLECLIOFALA_.get(i));
+      for (int i = 0; i < doorList_.size(); i++) {
+        output.writeMessage(6, doorList_.get(i));
       }
       if (tmpVersion_ != 0) {
-        output.writeUInt32(13, tmpVersion_);
+        output.writeUInt32(8, tmpVersion_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(9, sceneId_);
+      }
+      if (mainHouse_ != null) {
+        output.writeMessage(10, getMainHouse());
+      }
+      if (isSetBornPos_ != false) {
+        output.writeBool(11, isSetBornPos_);
+      }
+      for (int i = 0; i < blockArrangementInfoList_.size(); i++) {
+        output.writeMessage(12, blockArrangementInfoList_.get(i));
+      }
+      for (int i = 0; i < stairList_.size(); i++) {
+        output.writeMessage(13, stairList_.get(i));
+      }
+      if (dFCFKJBCCAH_ != null) {
+        output.writeMessage(14, getDFCFKJBCCAH());
+      }
+      if (bgmId_ != 0) {
+        output.writeUInt32(15, bgmId_);
+      }
+      if (eJAPJLENOGL_ != null) {
+        output.writeMessage(885, getEJAPJLENOGL());
       }
       unknownFields.writeTo(output);
     }
@@ -716,53 +851,65 @@ public final class HomeSceneArrangementInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isSetBornPos_ != false) {
+      if (bornRot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isSetBornPos_);
+          .computeMessageSize(1, getBornRot());
       }
-      for (int i = 0; i < blockArrangementInfoList_.size(); i++) {
+      if (bMAEDEOKOHL_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, blockArrangementInfoList_.get(i));
+          .computeBoolSize(2, bMAEDEOKOHL_);
       }
-      if (bgmId_ != 0) {
+      if (comfortValue_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, bgmId_);
+          .computeUInt32Size(3, comfortValue_);
       }
       if (djinnPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, getDjinnPos());
       }
-      if (comfortValue_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, comfortValue_);
-      }
-      if (mainHouse_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getMainHouse());
-      }
-      for (int i = 0; i < hDOFAHGPJGK_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, hDOFAHGPJGK_.get(i));
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, sceneId_);
-      }
-      if (bornRot_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getBornRot());
-      }
       if (bornPos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, getBornPos());
+          .computeMessageSize(5, getBornPos());
       }
-      for (int i = 0; i < mLECLIOFALA_.size(); i++) {
+      for (int i = 0; i < doorList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, mLECLIOFALA_.get(i));
+          .computeMessageSize(6, doorList_.get(i));
       }
       if (tmpVersion_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, tmpVersion_);
+          .computeUInt32Size(8, tmpVersion_);
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, sceneId_);
+      }
+      if (mainHouse_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getMainHouse());
+      }
+      if (isSetBornPos_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isSetBornPos_);
+      }
+      for (int i = 0; i < blockArrangementInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, blockArrangementInfoList_.get(i));
+      }
+      for (int i = 0; i < stairList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, stairList_.get(i));
+      }
+      if (dFCFKJBCCAH_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getDFCFKJBCCAH());
+      }
+      if (bgmId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, bgmId_);
+      }
+      if (eJAPJLENOGL_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(885, getEJAPJLENOGL());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -779,32 +926,15 @@ public final class HomeSceneArrangementInfoOuterClass {
       }
       emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo other = (emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo) obj;
 
-      if (!getBlockArrangementInfoListList()
-          .equals(other.getBlockArrangementInfoListList())) return false;
-      if (!getHDOFAHGPJGKList()
-          .equals(other.getHDOFAHGPJGKList())) return false;
-      if (!getMLECLIOFALAList()
-          .equals(other.getMLECLIOFALAList())) return false;
       if (hasBornRot() != other.hasBornRot()) return false;
       if (hasBornRot()) {
         if (!getBornRot()
             .equals(other.getBornRot())) return false;
       }
-      if (getSceneId()
-          != other.getSceneId()) return false;
-      if (getBgmId()
-          != other.getBgmId()) return false;
+      if (getBMAEDEOKOHL()
+          != other.getBMAEDEOKOHL()) return false;
       if (getComfortValue()
           != other.getComfortValue()) return false;
-      if (hasMainHouse() != other.hasMainHouse()) return false;
-      if (hasMainHouse()) {
-        if (!getMainHouse()
-            .equals(other.getMainHouse())) return false;
-      }
-      if (getTmpVersion()
-          != other.getTmpVersion()) return false;
-      if (getIsSetBornPos()
-          != other.getIsSetBornPos()) return false;
       if (hasDjinnPos() != other.hasDjinnPos()) return false;
       if (hasDjinnPos()) {
         if (!getDjinnPos()
@@ -815,6 +945,35 @@ public final class HomeSceneArrangementInfoOuterClass {
         if (!getBornPos()
             .equals(other.getBornPos())) return false;
       }
+      if (!getDoorListList()
+          .equals(other.getDoorListList())) return false;
+      if (getTmpVersion()
+          != other.getTmpVersion()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
+      if (hasMainHouse() != other.hasMainHouse()) return false;
+      if (hasMainHouse()) {
+        if (!getMainHouse()
+            .equals(other.getMainHouse())) return false;
+      }
+      if (getIsSetBornPos()
+          != other.getIsSetBornPos()) return false;
+      if (!getBlockArrangementInfoListList()
+          .equals(other.getBlockArrangementInfoListList())) return false;
+      if (!getStairListList()
+          .equals(other.getStairListList())) return false;
+      if (hasDFCFKJBCCAH() != other.hasDFCFKJBCCAH()) return false;
+      if (hasDFCFKJBCCAH()) {
+        if (!getDFCFKJBCCAH()
+            .equals(other.getDFCFKJBCCAH())) return false;
+      }
+      if (getBgmId()
+          != other.getBgmId()) return false;
+      if (hasEJAPJLENOGL() != other.hasEJAPJLENOGL()) return false;
+      if (hasEJAPJLENOGL()) {
+        if (!getEJAPJLENOGL()
+            .equals(other.getEJAPJLENOGL())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -826,37 +985,15 @@ public final class HomeSceneArrangementInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getBlockArrangementInfoListCount() > 0) {
-        hash = (37 * hash) + BLOCK_ARRANGEMENT_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getBlockArrangementInfoListList().hashCode();
-      }
-      if (getHDOFAHGPJGKCount() > 0) {
-        hash = (37 * hash) + HDOFAHGPJGK_FIELD_NUMBER;
-        hash = (53 * hash) + getHDOFAHGPJGKList().hashCode();
-      }
-      if (getMLECLIOFALACount() > 0) {
-        hash = (37 * hash) + MLECLIOFALA_FIELD_NUMBER;
-        hash = (53 * hash) + getMLECLIOFALAList().hashCode();
-      }
       if (hasBornRot()) {
         hash = (37 * hash) + BORN_ROT_FIELD_NUMBER;
         hash = (53 * hash) + getBornRot().hashCode();
       }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      hash = (37 * hash) + BGM_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getBgmId();
+      hash = (37 * hash) + BMAEDEOKOHL_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getBMAEDEOKOHL());
       hash = (37 * hash) + COMFORT_VALUE_FIELD_NUMBER;
       hash = (53 * hash) + getComfortValue();
-      if (hasMainHouse()) {
-        hash = (37 * hash) + MAIN_HOUSE_FIELD_NUMBER;
-        hash = (53 * hash) + getMainHouse().hashCode();
-      }
-      hash = (37 * hash) + TMP_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getTmpVersion();
-      hash = (37 * hash) + IS_SET_BORN_POS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSetBornPos());
       if (hasDjinnPos()) {
         hash = (37 * hash) + DJINN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getDjinnPos().hashCode();
@@ -865,6 +1002,39 @@ public final class HomeSceneArrangementInfoOuterClass {
         hash = (37 * hash) + BORN_POS_FIELD_NUMBER;
         hash = (53 * hash) + getBornPos().hashCode();
       }
+      if (getDoorListCount() > 0) {
+        hash = (37 * hash) + DOOR_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getDoorListList().hashCode();
+      }
+      hash = (37 * hash) + TMP_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getTmpVersion();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
+      if (hasMainHouse()) {
+        hash = (37 * hash) + MAIN_HOUSE_FIELD_NUMBER;
+        hash = (53 * hash) + getMainHouse().hashCode();
+      }
+      hash = (37 * hash) + IS_SET_BORN_POS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSetBornPos());
+      if (getBlockArrangementInfoListCount() > 0) {
+        hash = (37 * hash) + BLOCK_ARRANGEMENT_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBlockArrangementInfoListList().hashCode();
+      }
+      if (getStairListCount() > 0) {
+        hash = (37 * hash) + STAIR_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getStairListList().hashCode();
+      }
+      if (hasDFCFKJBCCAH()) {
+        hash = (37 * hash) + DFCFKJBCCAH_FIELD_NUMBER;
+        hash = (53 * hash) + getDFCFKJBCCAH().hashCode();
+      }
+      hash = (37 * hash) + BGM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getBgmId();
+      if (hasEJAPJLENOGL()) {
+        hash = (37 * hash) + EJAPJLENOGL_FIELD_NUMBER;
+        hash = (53 * hash) + getEJAPJLENOGL().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -961,10 +1131,6 @@ public final class HomeSceneArrangementInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LEMEOONDDGM
-     * </pre>
-     *
      * Protobuf type {@code HomeSceneArrangementInfo}
      */
     public static final class Builder extends
@@ -997,54 +1163,24 @@ public final class HomeSceneArrangementInfoOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getDoorListFieldBuilder();
           getBlockArrangementInfoListFieldBuilder();
-          getHDOFAHGPJGKFieldBuilder();
-          getMLECLIOFALAFieldBuilder();
+          getStairListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (blockArrangementInfoListBuilder_ == null) {
-          blockArrangementInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          blockArrangementInfoListBuilder_.clear();
-        }
-        if (hDOFAHGPJGKBuilder_ == null) {
-          hDOFAHGPJGK_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        } else {
-          hDOFAHGPJGKBuilder_.clear();
-        }
-        if (mLECLIOFALABuilder_ == null) {
-          mLECLIOFALA_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        } else {
-          mLECLIOFALABuilder_.clear();
-        }
         if (bornRotBuilder_ == null) {
           bornRot_ = null;
         } else {
           bornRot_ = null;
           bornRotBuilder_ = null;
         }
-        sceneId_ = 0;
-
-        bgmId_ = 0;
+        bMAEDEOKOHL_ = false;
 
         comfortValue_ = 0;
 
-        if (mainHouseBuilder_ == null) {
-          mainHouse_ = null;
-        } else {
-          mainHouse_ = null;
-          mainHouseBuilder_ = null;
-        }
-        tmpVersion_ = 0;
-
-        isSetBornPos_ = false;
-
         if (djinnPosBuilder_ == null) {
           djinnPos_ = null;
         } else {
@@ -1057,6 +1193,50 @@ public final class HomeSceneArrangementInfoOuterClass {
           bornPos_ = null;
           bornPosBuilder_ = null;
         }
+        if (doorListBuilder_ == null) {
+          doorList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          doorListBuilder_.clear();
+        }
+        tmpVersion_ = 0;
+
+        sceneId_ = 0;
+
+        if (mainHouseBuilder_ == null) {
+          mainHouse_ = null;
+        } else {
+          mainHouse_ = null;
+          mainHouseBuilder_ = null;
+        }
+        isSetBornPos_ = false;
+
+        if (blockArrangementInfoListBuilder_ == null) {
+          blockArrangementInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          blockArrangementInfoListBuilder_.clear();
+        }
+        if (stairListBuilder_ == null) {
+          stairList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          stairListBuilder_.clear();
+        }
+        if (dFCFKJBCCAHBuilder_ == null) {
+          dFCFKJBCCAH_ = null;
+        } else {
+          dFCFKJBCCAH_ = null;
+          dFCFKJBCCAHBuilder_ = null;
+        }
+        bgmId_ = 0;
+
+        if (eJAPJLENOGLBuilder_ == null) {
+          eJAPJLENOGL_ = null;
+        } else {
+          eJAPJLENOGL_ = null;
+          eJAPJLENOGLBuilder_ = null;
+        }
         return this;
       }
 
@@ -1084,48 +1264,13 @@ public final class HomeSceneArrangementInfoOuterClass {
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo buildPartial() {
         emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo result = new emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo(this);
         int from_bitField0_ = bitField0_;
-        if (blockArrangementInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            blockArrangementInfoList_ = java.util.Collections.unmodifiableList(blockArrangementInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.blockArrangementInfoList_ = blockArrangementInfoList_;
-        } else {
-          result.blockArrangementInfoList_ = blockArrangementInfoListBuilder_.build();
-        }
-        if (hDOFAHGPJGKBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
-            hDOFAHGPJGK_ = java.util.Collections.unmodifiableList(hDOFAHGPJGK_);
-            bitField0_ = (bitField0_ & ~0x00000002);
-          }
-          result.hDOFAHGPJGK_ = hDOFAHGPJGK_;
-        } else {
-          result.hDOFAHGPJGK_ = hDOFAHGPJGKBuilder_.build();
-        }
-        if (mLECLIOFALABuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
-            mLECLIOFALA_ = java.util.Collections.unmodifiableList(mLECLIOFALA_);
-            bitField0_ = (bitField0_ & ~0x00000004);
-          }
-          result.mLECLIOFALA_ = mLECLIOFALA_;
-        } else {
-          result.mLECLIOFALA_ = mLECLIOFALABuilder_.build();
-        }
         if (bornRotBuilder_ == null) {
           result.bornRot_ = bornRot_;
         } else {
           result.bornRot_ = bornRotBuilder_.build();
         }
-        result.sceneId_ = sceneId_;
-        result.bgmId_ = bgmId_;
+        result.bMAEDEOKOHL_ = bMAEDEOKOHL_;
         result.comfortValue_ = comfortValue_;
-        if (mainHouseBuilder_ == null) {
-          result.mainHouse_ = mainHouse_;
-        } else {
-          result.mainHouse_ = mainHouseBuilder_.build();
-        }
-        result.tmpVersion_ = tmpVersion_;
-        result.isSetBornPos_ = isSetBornPos_;
         if (djinnPosBuilder_ == null) {
           result.djinnPos_ = djinnPos_;
         } else {
@@ -1136,6 +1281,52 @@ public final class HomeSceneArrangementInfoOuterClass {
         } else {
           result.bornPos_ = bornPosBuilder_.build();
         }
+        if (doorListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            doorList_ = java.util.Collections.unmodifiableList(doorList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.doorList_ = doorList_;
+        } else {
+          result.doorList_ = doorListBuilder_.build();
+        }
+        result.tmpVersion_ = tmpVersion_;
+        result.sceneId_ = sceneId_;
+        if (mainHouseBuilder_ == null) {
+          result.mainHouse_ = mainHouse_;
+        } else {
+          result.mainHouse_ = mainHouseBuilder_.build();
+        }
+        result.isSetBornPos_ = isSetBornPos_;
+        if (blockArrangementInfoListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            blockArrangementInfoList_ = java.util.Collections.unmodifiableList(blockArrangementInfoList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.blockArrangementInfoList_ = blockArrangementInfoList_;
+        } else {
+          result.blockArrangementInfoList_ = blockArrangementInfoListBuilder_.build();
+        }
+        if (stairListBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            stairList_ = java.util.Collections.unmodifiableList(stairList_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.stairList_ = stairList_;
+        } else {
+          result.stairList_ = stairListBuilder_.build();
+        }
+        if (dFCFKJBCCAHBuilder_ == null) {
+          result.dFCFKJBCCAH_ = dFCFKJBCCAH_;
+        } else {
+          result.dFCFKJBCCAH_ = dFCFKJBCCAHBuilder_.build();
+        }
+        result.bgmId_ = bgmId_;
+        if (eJAPJLENOGLBuilder_ == null) {
+          result.eJAPJLENOGL_ = eJAPJLENOGL_;
+        } else {
+          result.eJAPJLENOGL_ = eJAPJLENOGLBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -1184,11 +1375,64 @@ public final class HomeSceneArrangementInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo other) {
         if (other == emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.getDefaultInstance()) return this;
+        if (other.hasBornRot()) {
+          mergeBornRot(other.getBornRot());
+        }
+        if (other.getBMAEDEOKOHL() != false) {
+          setBMAEDEOKOHL(other.getBMAEDEOKOHL());
+        }
+        if (other.getComfortValue() != 0) {
+          setComfortValue(other.getComfortValue());
+        }
+        if (other.hasDjinnPos()) {
+          mergeDjinnPos(other.getDjinnPos());
+        }
+        if (other.hasBornPos()) {
+          mergeBornPos(other.getBornPos());
+        }
+        if (doorListBuilder_ == null) {
+          if (!other.doorList_.isEmpty()) {
+            if (doorList_.isEmpty()) {
+              doorList_ = other.doorList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureDoorListIsMutable();
+              doorList_.addAll(other.doorList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.doorList_.isEmpty()) {
+            if (doorListBuilder_.isEmpty()) {
+              doorListBuilder_.dispose();
+              doorListBuilder_ = null;
+              doorList_ = other.doorList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              doorListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getDoorListFieldBuilder() : null;
+            } else {
+              doorListBuilder_.addAllMessages(other.doorList_);
+            }
+          }
+        }
+        if (other.getTmpVersion() != 0) {
+          setTmpVersion(other.getTmpVersion());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
+        if (other.hasMainHouse()) {
+          mergeMainHouse(other.getMainHouse());
+        }
+        if (other.getIsSetBornPos() != false) {
+          setIsSetBornPos(other.getIsSetBornPos());
+        }
         if (blockArrangementInfoListBuilder_ == null) {
           if (!other.blockArrangementInfoList_.isEmpty()) {
             if (blockArrangementInfoList_.isEmpty()) {
               blockArrangementInfoList_ = other.blockArrangementInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureBlockArrangementInfoListIsMutable();
               blockArrangementInfoList_.addAll(other.blockArrangementInfoList_);
@@ -1201,7 +1445,7 @@ public final class HomeSceneArrangementInfoOuterClass {
               blockArrangementInfoListBuilder_.dispose();
               blockArrangementInfoListBuilder_ = null;
               blockArrangementInfoList_ = other.blockArrangementInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               blockArrangementInfoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getBlockArrangementInfoListFieldBuilder() : null;
@@ -1210,84 +1454,40 @@ public final class HomeSceneArrangementInfoOuterClass {
             }
           }
         }
-        if (hDOFAHGPJGKBuilder_ == null) {
-          if (!other.hDOFAHGPJGK_.isEmpty()) {
-            if (hDOFAHGPJGK_.isEmpty()) {
-              hDOFAHGPJGK_ = other.hDOFAHGPJGK_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+        if (stairListBuilder_ == null) {
+          if (!other.stairList_.isEmpty()) {
+            if (stairList_.isEmpty()) {
+              stairList_ = other.stairList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
             } else {
-              ensureHDOFAHGPJGKIsMutable();
-              hDOFAHGPJGK_.addAll(other.hDOFAHGPJGK_);
+              ensureStairListIsMutable();
+              stairList_.addAll(other.stairList_);
             }
             onChanged();
           }
         } else {
-          if (!other.hDOFAHGPJGK_.isEmpty()) {
-            if (hDOFAHGPJGKBuilder_.isEmpty()) {
-              hDOFAHGPJGKBuilder_.dispose();
-              hDOFAHGPJGKBuilder_ = null;
-              hDOFAHGPJGK_ = other.hDOFAHGPJGK_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              hDOFAHGPJGKBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getHDOFAHGPJGKFieldBuilder() : null;
-            } else {
-              hDOFAHGPJGKBuilder_.addAllMessages(other.hDOFAHGPJGK_);
-            }
-          }
-        }
-        if (mLECLIOFALABuilder_ == null) {
-          if (!other.mLECLIOFALA_.isEmpty()) {
-            if (mLECLIOFALA_.isEmpty()) {
-              mLECLIOFALA_ = other.mLECLIOFALA_;
+          if (!other.stairList_.isEmpty()) {
+            if (stairListBuilder_.isEmpty()) {
+              stairListBuilder_.dispose();
+              stairListBuilder_ = null;
+              stairList_ = other.stairList_;
               bitField0_ = (bitField0_ & ~0x00000004);
-            } else {
-              ensureMLECLIOFALAIsMutable();
-              mLECLIOFALA_.addAll(other.mLECLIOFALA_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.mLECLIOFALA_.isEmpty()) {
-            if (mLECLIOFALABuilder_.isEmpty()) {
-              mLECLIOFALABuilder_.dispose();
-              mLECLIOFALABuilder_ = null;
-              mLECLIOFALA_ = other.mLECLIOFALA_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-              mLECLIOFALABuilder_ = 
+              stairListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getMLECLIOFALAFieldBuilder() : null;
+                   getStairListFieldBuilder() : null;
             } else {
-              mLECLIOFALABuilder_.addAllMessages(other.mLECLIOFALA_);
+              stairListBuilder_.addAllMessages(other.stairList_);
             }
           }
         }
-        if (other.hasBornRot()) {
-          mergeBornRot(other.getBornRot());
-        }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
+        if (other.hasDFCFKJBCCAH()) {
+          mergeDFCFKJBCCAH(other.getDFCFKJBCCAH());
         }
         if (other.getBgmId() != 0) {
           setBgmId(other.getBgmId());
         }
-        if (other.getComfortValue() != 0) {
-          setComfortValue(other.getComfortValue());
-        }
-        if (other.hasMainHouse()) {
-          mergeMainHouse(other.getMainHouse());
-        }
-        if (other.getTmpVersion() != 0) {
-          setTmpVersion(other.getTmpVersion());
-        }
-        if (other.getIsSetBornPos() != false) {
-          setIsSetBornPos(other.getIsSetBornPos());
-        }
-        if (other.hasDjinnPos()) {
-          mergeDjinnPos(other.getDjinnPos());
-        }
-        if (other.hasBornPos()) {
-          mergeBornPos(other.getBornPos());
+        if (other.hasEJAPJLENOGL()) {
+          mergeEJAPJLENOGL(other.getEJAPJLENOGL());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1319,738 +1519,18 @@ public final class HomeSceneArrangementInfoOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> blockArrangementInfoList_ =
-        java.util.Collections.emptyList();
-      private void ensureBlockArrangementInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          blockArrangementInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo>(blockArrangementInfoList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> blockArrangementInfoListBuilder_;
-
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> getBlockArrangementInfoListList() {
-        if (blockArrangementInfoListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(blockArrangementInfoList_);
-        } else {
-          return blockArrangementInfoListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public int getBlockArrangementInfoListCount() {
-        if (blockArrangementInfoListBuilder_ == null) {
-          return blockArrangementInfoList_.size();
-        } else {
-          return blockArrangementInfoListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          return blockArrangementInfoList_.get(index);
-        } else {
-          return blockArrangementInfoListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder setBlockArrangementInfoList(
-          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.set(index, value);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder setBlockArrangementInfoList(
-          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder addBlockArrangementInfoList(emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.add(value);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder addBlockArrangementInfoList(
-          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.add(index, value);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder addBlockArrangementInfoList(
-          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder addBlockArrangementInfoList(
-          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder addAllBlockArrangementInfoList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> values) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          ensureBlockArrangementInfoListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, blockArrangementInfoList_);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder clearBlockArrangementInfoList() {
-        if (blockArrangementInfoListBuilder_ == null) {
-          blockArrangementInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public Builder removeBlockArrangementInfoList(int index) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          ensureBlockArrangementInfoListIsMutable();
-          blockArrangementInfoList_.remove(index);
-          onChanged();
-        } else {
-          blockArrangementInfoListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder getBlockArrangementInfoListBuilder(
-          int index) {
-        return getBlockArrangementInfoListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
-          int index) {
-        if (blockArrangementInfoListBuilder_ == null) {
-          return blockArrangementInfoList_.get(index);  } else {
-          return blockArrangementInfoListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
-           getBlockArrangementInfoListOrBuilderList() {
-        if (blockArrangementInfoListBuilder_ != null) {
-          return blockArrangementInfoListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(blockArrangementInfoList_);
-        }
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder addBlockArrangementInfoListBuilder() {
-        return getBlockArrangementInfoListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder addBlockArrangementInfoListBuilder(
-          int index) {
-        return getBlockArrangementInfoListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 2;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder> 
-           getBlockArrangementInfoListBuilderList() {
-        return getBlockArrangementInfoListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
-          getBlockArrangementInfoListFieldBuilder() {
-        if (blockArrangementInfoListBuilder_ == null) {
-          blockArrangementInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder>(
-                  blockArrangementInfoList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          blockArrangementInfoList_ = null;
-        }
-        return blockArrangementInfoListBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> hDOFAHGPJGK_ =
-        java.util.Collections.emptyList();
-      private void ensureHDOFAHGPJGKIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          hDOFAHGPJGK_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(hDOFAHGPJGK_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> hDOFAHGPJGKBuilder_;
-
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getHDOFAHGPJGKList() {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(hDOFAHGPJGK_);
-        } else {
-          return hDOFAHGPJGKBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public int getHDOFAHGPJGKCount() {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          return hDOFAHGPJGK_.size();
-        } else {
-          return hDOFAHGPJGKBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getHDOFAHGPJGK(int index) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          return hDOFAHGPJGK_.get(index);
-        } else {
-          return hDOFAHGPJGKBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder setHDOFAHGPJGK(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.set(index, value);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder setHDOFAHGPJGK(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder addHDOFAHGPJGK(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.add(value);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder addHDOFAHGPJGK(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.add(index, value);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder addHDOFAHGPJGK(
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.add(builderForValue.build());
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder addHDOFAHGPJGK(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder addAllHDOFAHGPJGK(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          ensureHDOFAHGPJGKIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, hDOFAHGPJGK_);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder clearHDOFAHGPJGK() {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          hDOFAHGPJGK_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public Builder removeHDOFAHGPJGK(int index) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          ensureHDOFAHGPJGKIsMutable();
-          hDOFAHGPJGK_.remove(index);
-          onChanged();
-        } else {
-          hDOFAHGPJGKBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getHDOFAHGPJGKBuilder(
-          int index) {
-        return getHDOFAHGPJGKFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getHDOFAHGPJGKOrBuilder(
-          int index) {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          return hDOFAHGPJGK_.get(index);  } else {
-          return hDOFAHGPJGKBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-           getHDOFAHGPJGKOrBuilderList() {
-        if (hDOFAHGPJGKBuilder_ != null) {
-          return hDOFAHGPJGKBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(hDOFAHGPJGK_);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addHDOFAHGPJGKBuilder() {
-        return getHDOFAHGPJGKFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addHDOFAHGPJGKBuilder(
-          int index) {
-        return getHDOFAHGPJGKFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureData HDOFAHGPJGK = 7;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
-           getHDOFAHGPJGKBuilderList() {
-        return getHDOFAHGPJGKFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getHDOFAHGPJGKFieldBuilder() {
-        if (hDOFAHGPJGKBuilder_ == null) {
-          hDOFAHGPJGKBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  hDOFAHGPJGK_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          hDOFAHGPJGK_ = null;
-        }
-        return hDOFAHGPJGKBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> mLECLIOFALA_ =
-        java.util.Collections.emptyList();
-      private void ensureMLECLIOFALAIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          mLECLIOFALA_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(mLECLIOFALA_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> mLECLIOFALABuilder_;
-
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getMLECLIOFALAList() {
-        if (mLECLIOFALABuilder_ == null) {
-          return java.util.Collections.unmodifiableList(mLECLIOFALA_);
-        } else {
-          return mLECLIOFALABuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public int getMLECLIOFALACount() {
-        if (mLECLIOFALABuilder_ == null) {
-          return mLECLIOFALA_.size();
-        } else {
-          return mLECLIOFALABuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMLECLIOFALA(int index) {
-        if (mLECLIOFALABuilder_ == null) {
-          return mLECLIOFALA_.get(index);
-        } else {
-          return mLECLIOFALABuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder setMLECLIOFALA(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (mLECLIOFALABuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.set(index, value);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder setMLECLIOFALA(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (mLECLIOFALABuilder_ == null) {
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder addMLECLIOFALA(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (mLECLIOFALABuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.add(value);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder addMLECLIOFALA(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (mLECLIOFALABuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.add(index, value);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder addMLECLIOFALA(
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (mLECLIOFALABuilder_ == null) {
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.add(builderForValue.build());
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder addMLECLIOFALA(
-          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (mLECLIOFALABuilder_ == null) {
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder addAllMLECLIOFALA(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
-        if (mLECLIOFALABuilder_ == null) {
-          ensureMLECLIOFALAIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, mLECLIOFALA_);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder clearMLECLIOFALA() {
-        if (mLECLIOFALABuilder_ == null) {
-          mLECLIOFALA_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public Builder removeMLECLIOFALA(int index) {
-        if (mLECLIOFALABuilder_ == null) {
-          ensureMLECLIOFALAIsMutable();
-          mLECLIOFALA_.remove(index);
-          onChanged();
-        } else {
-          mLECLIOFALABuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getMLECLIOFALABuilder(
-          int index) {
-        return getMLECLIOFALAFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMLECLIOFALAOrBuilder(
-          int index) {
-        if (mLECLIOFALABuilder_ == null) {
-          return mLECLIOFALA_.get(index);  } else {
-          return mLECLIOFALABuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-           getMLECLIOFALAOrBuilderList() {
-        if (mLECLIOFALABuilder_ != null) {
-          return mLECLIOFALABuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(mLECLIOFALA_);
-        }
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addMLECLIOFALABuilder() {
-        return getMLECLIOFALAFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addMLECLIOFALABuilder(
-          int index) {
-        return getMLECLIOFALAFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .HomeFurnitureData MLECLIOFALA = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
-           getMLECLIOFALABuilderList() {
-        return getMLECLIOFALAFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getMLECLIOFALAFieldBuilder() {
-        if (mLECLIOFALABuilder_ == null) {
-          mLECLIOFALABuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  mLECLIOFALA_,
-                  ((bitField0_ & 0x00000004) != 0),
-                  getParentForChildren(),
-                  isClean());
-          mLECLIOFALA_ = null;
-        }
-        return mLECLIOFALABuilder_;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector bornRot_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> bornRotBuilder_;
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        * @return Whether the bornRot field is set.
        */
       public boolean hasBornRot() {
         return bornRotBuilder_ != null || bornRot_ != null;
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        * @return The bornRot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getBornRot() {
@@ -2061,7 +1541,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public Builder setBornRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (bornRotBuilder_ == null) {
@@ -2077,7 +1557,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public Builder setBornRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -2091,7 +1571,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public Builder mergeBornRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (bornRotBuilder_ == null) {
@@ -2109,7 +1589,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public Builder clearBornRot() {
         if (bornRotBuilder_ == null) {
@@ -2123,7 +1603,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getBornRotBuilder() {
         
@@ -2131,7 +1611,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return getBornRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornRotOrBuilder() {
         if (bornRotBuilder_ != null) {
@@ -2142,7 +1622,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector born_rot = 9;</code>
+       * <code>.Vector born_rot = 1;</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> 
@@ -2158,71 +1638,40 @@ public final class HomeSceneArrangementInfoOuterClass {
         return bornRotBuilder_;
       }
 
-      private int sceneId_ ;
+      private boolean bMAEDEOKOHL_ ;
       /**
-       * <code>uint32 scene_id = 8;</code>
-       * @return The sceneId.
+       * <code>bool BMAEDEOKOHL = 2;</code>
+       * @return The bMAEDEOKOHL.
        */
       @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
+      public boolean getBMAEDEOKOHL() {
+        return bMAEDEOKOHL_;
       }
       /**
-       * <code>uint32 scene_id = 8;</code>
-       * @param value The sceneId to set.
+       * <code>bool BMAEDEOKOHL = 2;</code>
+       * @param value The bMAEDEOKOHL to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneId(int value) {
+      public Builder setBMAEDEOKOHL(boolean value) {
         
-        sceneId_ = value;
+        bMAEDEOKOHL_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 scene_id = 8;</code>
+       * <code>bool BMAEDEOKOHL = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneId() {
+      public Builder clearBMAEDEOKOHL() {
         
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int bgmId_ ;
-      /**
-       * <code>uint32 bgm_id = 3;</code>
-       * @return The bgmId.
-       */
-      @java.lang.Override
-      public int getBgmId() {
-        return bgmId_;
-      }
-      /**
-       * <code>uint32 bgm_id = 3;</code>
-       * @param value The bgmId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBgmId(int value) {
-        
-        bgmId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 bgm_id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBgmId() {
-        
-        bgmId_ = 0;
+        bMAEDEOKOHL_ = false;
         onChanged();
         return this;
       }
 
       private int comfortValue_ ;
       /**
-       * <code>uint32 comfort_value = 5;</code>
+       * <code>uint32 comfort_value = 3;</code>
        * @return The comfortValue.
        */
       @java.lang.Override
@@ -2230,7 +1679,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return comfortValue_;
       }
       /**
-       * <code>uint32 comfort_value = 5;</code>
+       * <code>uint32 comfort_value = 3;</code>
        * @param value The comfortValue to set.
        * @return This builder for chaining.
        */
@@ -2241,7 +1690,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 comfort_value = 5;</code>
+       * <code>uint32 comfort_value = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearComfortValue() {
@@ -2251,187 +1700,6 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData mainHouse_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> mainHouseBuilder_;
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       * @return Whether the mainHouse field is set.
-       */
-      public boolean hasMainHouse() {
-        return mainHouseBuilder_ != null || mainHouse_ != null;
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       * @return The mainHouse.
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse() {
-        if (mainHouseBuilder_ == null) {
-          return mainHouse_ == null ? emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
-        } else {
-          return mainHouseBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public Builder setMainHouse(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (mainHouseBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          mainHouse_ = value;
-          onChanged();
-        } else {
-          mainHouseBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public Builder setMainHouse(
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
-        if (mainHouseBuilder_ == null) {
-          mainHouse_ = builderForValue.build();
-          onChanged();
-        } else {
-          mainHouseBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public Builder mergeMainHouse(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
-        if (mainHouseBuilder_ == null) {
-          if (mainHouse_ != null) {
-            mainHouse_ =
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.newBuilder(mainHouse_).mergeFrom(value).buildPartial();
-          } else {
-            mainHouse_ = value;
-          }
-          onChanged();
-        } else {
-          mainHouseBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public Builder clearMainHouse() {
-        if (mainHouseBuilder_ == null) {
-          mainHouse_ = null;
-          onChanged();
-        } else {
-          mainHouse_ = null;
-          mainHouseBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getMainHouseBuilder() {
-        
-        onChanged();
-        return getMainHouseFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder() {
-        if (mainHouseBuilder_ != null) {
-          return mainHouseBuilder_.getMessageOrBuilder();
-        } else {
-          return mainHouse_ == null ?
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
-        }
-      }
-      /**
-       * <code>.HomeFurnitureData main_house = 6;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
-          getMainHouseFieldBuilder() {
-        if (mainHouseBuilder_ == null) {
-          mainHouseBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
-                  getMainHouse(),
-                  getParentForChildren(),
-                  isClean());
-          mainHouse_ = null;
-        }
-        return mainHouseBuilder_;
-      }
-
-      private int tmpVersion_ ;
-      /**
-       * <code>uint32 tmp_version = 13;</code>
-       * @return The tmpVersion.
-       */
-      @java.lang.Override
-      public int getTmpVersion() {
-        return tmpVersion_;
-      }
-      /**
-       * <code>uint32 tmp_version = 13;</code>
-       * @param value The tmpVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTmpVersion(int value) {
-        
-        tmpVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 tmp_version = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTmpVersion() {
-        
-        tmpVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isSetBornPos_ ;
-      /**
-       * <code>bool is_set_born_pos = 1;</code>
-       * @return The isSetBornPos.
-       */
-      @java.lang.Override
-      public boolean getIsSetBornPos() {
-        return isSetBornPos_;
-      }
-      /**
-       * <code>bool is_set_born_pos = 1;</code>
-       * @param value The isSetBornPos to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSetBornPos(boolean value) {
-        
-        isSetBornPos_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_set_born_pos = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSetBornPos() {
-        
-        isSetBornPos_ = false;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VectorOuterClass.Vector djinnPos_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> djinnPosBuilder_;
@@ -2555,14 +1823,14 @@ public final class HomeSceneArrangementInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> bornPosBuilder_;
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        * @return Whether the bornPos field is set.
        */
       public boolean hasBornPos() {
         return bornPosBuilder_ != null || bornPos_ != null;
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        * @return The bornPos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getBornPos() {
@@ -2573,7 +1841,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public Builder setBornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (bornPosBuilder_ == null) {
@@ -2589,7 +1857,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public Builder setBornPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -2603,7 +1871,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public Builder mergeBornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (bornPosBuilder_ == null) {
@@ -2621,7 +1889,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public Builder clearBornPos() {
         if (bornPosBuilder_ == null) {
@@ -2635,7 +1903,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getBornPosBuilder() {
         
@@ -2643,7 +1911,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         return getBornPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornPosOrBuilder() {
         if (bornPosBuilder_ != null) {
@@ -2654,7 +1922,7 @@ public final class HomeSceneArrangementInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector born_pos = 10;</code>
+       * <code>.Vector born_pos = 5;</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> 
@@ -2669,6 +1937,1207 @@ public final class HomeSceneArrangementInfoOuterClass {
         }
         return bornPosBuilder_;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> doorList_ =
+        java.util.Collections.emptyList();
+      private void ensureDoorListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          doorList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(doorList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> doorListBuilder_;
+
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getDoorListList() {
+        if (doorListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(doorList_);
+        } else {
+          return doorListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public int getDoorListCount() {
+        if (doorListBuilder_ == null) {
+          return doorList_.size();
+        } else {
+          return doorListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getDoorList(int index) {
+        if (doorListBuilder_ == null) {
+          return doorList_.get(index);
+        } else {
+          return doorListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder setDoorList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (doorListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDoorListIsMutable();
+          doorList_.set(index, value);
+          onChanged();
+        } else {
+          doorListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder setDoorList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (doorListBuilder_ == null) {
+          ensureDoorListIsMutable();
+          doorList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          doorListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder addDoorList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (doorListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDoorListIsMutable();
+          doorList_.add(value);
+          onChanged();
+        } else {
+          doorListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder addDoorList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (doorListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDoorListIsMutable();
+          doorList_.add(index, value);
+          onChanged();
+        } else {
+          doorListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder addDoorList(
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (doorListBuilder_ == null) {
+          ensureDoorListIsMutable();
+          doorList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          doorListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder addDoorList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (doorListBuilder_ == null) {
+          ensureDoorListIsMutable();
+          doorList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          doorListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder addAllDoorList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
+        if (doorListBuilder_ == null) {
+          ensureDoorListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, doorList_);
+          onChanged();
+        } else {
+          doorListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder clearDoorList() {
+        if (doorListBuilder_ == null) {
+          doorList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          doorListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public Builder removeDoorList(int index) {
+        if (doorListBuilder_ == null) {
+          ensureDoorListIsMutable();
+          doorList_.remove(index);
+          onChanged();
+        } else {
+          doorListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getDoorListBuilder(
+          int index) {
+        return getDoorListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getDoorListOrBuilder(
+          int index) {
+        if (doorListBuilder_ == null) {
+          return doorList_.get(index);  } else {
+          return doorListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+           getDoorListOrBuilderList() {
+        if (doorListBuilder_ != null) {
+          return doorListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(doorList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDoorListBuilder() {
+        return getDoorListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addDoorListBuilder(
+          int index) {
+        return getDoorListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeFurnitureData door_list = 6;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
+           getDoorListBuilderList() {
+        return getDoorListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+          getDoorListFieldBuilder() {
+        if (doorListBuilder_ == null) {
+          doorListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
+                  doorList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          doorList_ = null;
+        }
+        return doorListBuilder_;
+      }
+
+      private int tmpVersion_ ;
+      /**
+       * <code>uint32 tmp_version = 8;</code>
+       * @return The tmpVersion.
+       */
+      @java.lang.Override
+      public int getTmpVersion() {
+        return tmpVersion_;
+      }
+      /**
+       * <code>uint32 tmp_version = 8;</code>
+       * @param value The tmpVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTmpVersion(int value) {
+        
+        tmpVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 tmp_version = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTmpVersion() {
+        
+        tmpVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 9;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData mainHouse_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> mainHouseBuilder_;
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       * @return Whether the mainHouse field is set.
+       */
+      public boolean hasMainHouse() {
+        return mainHouseBuilder_ != null || mainHouse_ != null;
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       * @return The mainHouse.
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getMainHouse() {
+        if (mainHouseBuilder_ == null) {
+          return mainHouse_ == null ? emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
+        } else {
+          return mainHouseBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public Builder setMainHouse(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (mainHouseBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          mainHouse_ = value;
+          onChanged();
+        } else {
+          mainHouseBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public Builder setMainHouse(
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (mainHouseBuilder_ == null) {
+          mainHouse_ = builderForValue.build();
+          onChanged();
+        } else {
+          mainHouseBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public Builder mergeMainHouse(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (mainHouseBuilder_ == null) {
+          if (mainHouse_ != null) {
+            mainHouse_ =
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.newBuilder(mainHouse_).mergeFrom(value).buildPartial();
+          } else {
+            mainHouse_ = value;
+          }
+          onChanged();
+        } else {
+          mainHouseBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public Builder clearMainHouse() {
+        if (mainHouseBuilder_ == null) {
+          mainHouse_ = null;
+          onChanged();
+        } else {
+          mainHouse_ = null;
+          mainHouseBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getMainHouseBuilder() {
+        
+        onChanged();
+        return getMainHouseFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getMainHouseOrBuilder() {
+        if (mainHouseBuilder_ != null) {
+          return mainHouseBuilder_.getMessageOrBuilder();
+        } else {
+          return mainHouse_ == null ?
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance() : mainHouse_;
+        }
+      }
+      /**
+       * <code>.HomeFurnitureData main_house = 10;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+          getMainHouseFieldBuilder() {
+        if (mainHouseBuilder_ == null) {
+          mainHouseBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
+                  getMainHouse(),
+                  getParentForChildren(),
+                  isClean());
+          mainHouse_ = null;
+        }
+        return mainHouseBuilder_;
+      }
+
+      private boolean isSetBornPos_ ;
+      /**
+       * <code>bool is_set_born_pos = 11;</code>
+       * @return The isSetBornPos.
+       */
+      @java.lang.Override
+      public boolean getIsSetBornPos() {
+        return isSetBornPos_;
+      }
+      /**
+       * <code>bool is_set_born_pos = 11;</code>
+       * @param value The isSetBornPos to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSetBornPos(boolean value) {
+        
+        isSetBornPos_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_set_born_pos = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSetBornPos() {
+        
+        isSetBornPos_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> blockArrangementInfoList_ =
+        java.util.Collections.emptyList();
+      private void ensureBlockArrangementInfoListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          blockArrangementInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo>(blockArrangementInfoList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> blockArrangementInfoListBuilder_;
+
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> getBlockArrangementInfoListList() {
+        if (blockArrangementInfoListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(blockArrangementInfoList_);
+        } else {
+          return blockArrangementInfoListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public int getBlockArrangementInfoListCount() {
+        if (blockArrangementInfoListBuilder_ == null) {
+          return blockArrangementInfoList_.size();
+        } else {
+          return blockArrangementInfoListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo getBlockArrangementInfoList(int index) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          return blockArrangementInfoList_.get(index);
+        } else {
+          return blockArrangementInfoListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder setBlockArrangementInfoList(
+          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.set(index, value);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder setBlockArrangementInfoList(
+          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder addBlockArrangementInfoList(emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.add(value);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder addBlockArrangementInfoList(
+          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo value) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.add(index, value);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder addBlockArrangementInfoList(
+          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder addBlockArrangementInfoList(
+          int index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder builderForValue) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder addAllBlockArrangementInfoList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo> values) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          ensureBlockArrangementInfoListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, blockArrangementInfoList_);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder clearBlockArrangementInfoList() {
+        if (blockArrangementInfoListBuilder_ == null) {
+          blockArrangementInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public Builder removeBlockArrangementInfoList(int index) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          ensureBlockArrangementInfoListIsMutable();
+          blockArrangementInfoList_.remove(index);
+          onChanged();
+        } else {
+          blockArrangementInfoListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder getBlockArrangementInfoListBuilder(
+          int index) {
+        return getBlockArrangementInfoListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder getBlockArrangementInfoListOrBuilder(
+          int index) {
+        if (blockArrangementInfoListBuilder_ == null) {
+          return blockArrangementInfoList_.get(index);  } else {
+          return blockArrangementInfoListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
+           getBlockArrangementInfoListOrBuilderList() {
+        if (blockArrangementInfoListBuilder_ != null) {
+          return blockArrangementInfoListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(blockArrangementInfoList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder addBlockArrangementInfoListBuilder() {
+        return getBlockArrangementInfoListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder addBlockArrangementInfoListBuilder(
+          int index) {
+        return getBlockArrangementInfoListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeBlockArrangementInfo block_arrangement_info_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder> 
+           getBlockArrangementInfoListBuilderList() {
+        return getBlockArrangementInfoListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder> 
+          getBlockArrangementInfoListFieldBuilder() {
+        if (blockArrangementInfoListBuilder_ == null) {
+          blockArrangementInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfo.Builder, emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.HomeBlockArrangementInfoOrBuilder>(
+                  blockArrangementInfoList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          blockArrangementInfoList_ = null;
+        }
+        return blockArrangementInfoListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> stairList_ =
+        java.util.Collections.emptyList();
+      private void ensureStairListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          stairList_ = new java.util.ArrayList<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData>(stairList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> stairListBuilder_;
+
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> getStairListList() {
+        if (stairListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(stairList_);
+        } else {
+          return stairListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public int getStairListCount() {
+        if (stairListBuilder_ == null) {
+          return stairList_.size();
+        } else {
+          return stairListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData getStairList(int index) {
+        if (stairListBuilder_ == null) {
+          return stairList_.get(index);
+        } else {
+          return stairListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder setStairList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (stairListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStairListIsMutable();
+          stairList_.set(index, value);
+          onChanged();
+        } else {
+          stairListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder setStairList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (stairListBuilder_ == null) {
+          ensureStairListIsMutable();
+          stairList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          stairListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder addStairList(emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (stairListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStairListIsMutable();
+          stairList_.add(value);
+          onChanged();
+        } else {
+          stairListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder addStairList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData value) {
+        if (stairListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureStairListIsMutable();
+          stairList_.add(index, value);
+          onChanged();
+        } else {
+          stairListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder addStairList(
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (stairListBuilder_ == null) {
+          ensureStairListIsMutable();
+          stairList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          stairListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder addStairList(
+          int index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder builderForValue) {
+        if (stairListBuilder_ == null) {
+          ensureStairListIsMutable();
+          stairList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          stairListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder addAllStairList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData> values) {
+        if (stairListBuilder_ == null) {
+          ensureStairListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, stairList_);
+          onChanged();
+        } else {
+          stairListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder clearStairList() {
+        if (stairListBuilder_ == null) {
+          stairList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+        } else {
+          stairListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public Builder removeStairList(int index) {
+        if (stairListBuilder_ == null) {
+          ensureStairListIsMutable();
+          stairList_.remove(index);
+          onChanged();
+        } else {
+          stairListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder getStairListBuilder(
+          int index) {
+        return getStairListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder getStairListOrBuilder(
+          int index) {
+        if (stairListBuilder_ == null) {
+          return stairList_.get(index);  } else {
+          return stairListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+           getStairListOrBuilderList() {
+        if (stairListBuilder_ != null) {
+          return stairListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(stairList_);
+        }
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addStairListBuilder() {
+        return getStairListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder addStairListBuilder(
+          int index) {
+        return getStairListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .HomeFurnitureData stair_list = 13;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder> 
+           getStairListBuilderList() {
+        return getStairListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder> 
+          getStairListFieldBuilder() {
+        if (stairListBuilder_ == null) {
+          stairListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureData.Builder, emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.HomeFurnitureDataOrBuilder>(
+                  stairList_,
+                  ((bitField0_ & 0x00000004) != 0),
+                  getParentForChildren(),
+                  isClean());
+          stairList_ = null;
+        }
+        return stairListBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector dFCFKJBCCAH_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> dFCFKJBCCAHBuilder_;
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       * @return Whether the dFCFKJBCCAH field is set.
+       */
+      public boolean hasDFCFKJBCCAH() {
+        return dFCFKJBCCAHBuilder_ != null || dFCFKJBCCAH_ != null;
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       * @return The dFCFKJBCCAH.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDFCFKJBCCAH() {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          return dFCFKJBCCAH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dFCFKJBCCAH_;
+        } else {
+          return dFCFKJBCCAHBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public Builder setDFCFKJBCCAH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          dFCFKJBCCAH_ = value;
+          onChanged();
+        } else {
+          dFCFKJBCCAHBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public Builder setDFCFKJBCCAH(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          dFCFKJBCCAH_ = builderForValue.build();
+          onChanged();
+        } else {
+          dFCFKJBCCAHBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public Builder mergeDFCFKJBCCAH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          if (dFCFKJBCCAH_ != null) {
+            dFCFKJBCCAH_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(dFCFKJBCCAH_).mergeFrom(value).buildPartial();
+          } else {
+            dFCFKJBCCAH_ = value;
+          }
+          onChanged();
+        } else {
+          dFCFKJBCCAHBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public Builder clearDFCFKJBCCAH() {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          dFCFKJBCCAH_ = null;
+          onChanged();
+        } else {
+          dFCFKJBCCAH_ = null;
+          dFCFKJBCCAHBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDFCFKJBCCAHBuilder() {
+        
+        onChanged();
+        return getDFCFKJBCCAHFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDFCFKJBCCAHOrBuilder() {
+        if (dFCFKJBCCAHBuilder_ != null) {
+          return dFCFKJBCCAHBuilder_.getMessageOrBuilder();
+        } else {
+          return dFCFKJBCCAH_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : dFCFKJBCCAH_;
+        }
+      }
+      /**
+       * <code>.Vector DFCFKJBCCAH = 14;</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> 
+          getDFCFKJBCCAHFieldBuilder() {
+        if (dFCFKJBCCAHBuilder_ == null) {
+          dFCFKJBCCAHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getDFCFKJBCCAH(),
+                  getParentForChildren(),
+                  isClean());
+          dFCFKJBCCAH_ = null;
+        }
+        return dFCFKJBCCAHBuilder_;
+      }
+
+      private int bgmId_ ;
+      /**
+       * <code>uint32 bgm_id = 15;</code>
+       * @return The bgmId.
+       */
+      @java.lang.Override
+      public int getBgmId() {
+        return bgmId_;
+      }
+      /**
+       * <code>uint32 bgm_id = 15;</code>
+       * @param value The bgmId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBgmId(int value) {
+        
+        bgmId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 bgm_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBgmId() {
+        
+        bgmId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector eJAPJLENOGL_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> eJAPJLENOGLBuilder_;
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       * @return Whether the eJAPJLENOGL field is set.
+       */
+      public boolean hasEJAPJLENOGL() {
+        return eJAPJLENOGLBuilder_ != null || eJAPJLENOGL_ != null;
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       * @return The eJAPJLENOGL.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getEJAPJLENOGL() {
+        if (eJAPJLENOGLBuilder_ == null) {
+          return eJAPJLENOGL_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eJAPJLENOGL_;
+        } else {
+          return eJAPJLENOGLBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public Builder setEJAPJLENOGL(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (eJAPJLENOGLBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          eJAPJLENOGL_ = value;
+          onChanged();
+        } else {
+          eJAPJLENOGLBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public Builder setEJAPJLENOGL(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (eJAPJLENOGLBuilder_ == null) {
+          eJAPJLENOGL_ = builderForValue.build();
+          onChanged();
+        } else {
+          eJAPJLENOGLBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public Builder mergeEJAPJLENOGL(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (eJAPJLENOGLBuilder_ == null) {
+          if (eJAPJLENOGL_ != null) {
+            eJAPJLENOGL_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(eJAPJLENOGL_).mergeFrom(value).buildPartial();
+          } else {
+            eJAPJLENOGL_ = value;
+          }
+          onChanged();
+        } else {
+          eJAPJLENOGLBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public Builder clearEJAPJLENOGL() {
+        if (eJAPJLENOGLBuilder_ == null) {
+          eJAPJLENOGL_ = null;
+          onChanged();
+        } else {
+          eJAPJLENOGL_ = null;
+          eJAPJLENOGLBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getEJAPJLENOGLBuilder() {
+        
+        onChanged();
+        return getEJAPJLENOGLFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getEJAPJLENOGLOrBuilder() {
+        if (eJAPJLENOGLBuilder_ != null) {
+          return eJAPJLENOGLBuilder_.getMessageOrBuilder();
+        } else {
+          return eJAPJLENOGL_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : eJAPJLENOGL_;
+        }
+      }
+      /**
+       * <code>.Vector EJAPJLENOGL = 885;</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> 
+          getEJAPJLENOGLFieldBuilder() {
+        if (eJAPJLENOGLBuilder_ == null) {
+          eJAPJLENOGLBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getEJAPJLENOGL(),
+                  getParentForChildren(),
+                  isClean());
+          eJAPJLENOGL_ = null;
+        }
+        return eJAPJLENOGLBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2736,37 +3205,39 @@ public final class HomeSceneArrangementInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\036HomeSceneArrangementInfo.proto\032\036HomeBl" +
-      "ockArrangementInfo.proto\032\027HomeFurnitureD" +
-      "ata.proto\032\014Vector.proto\"\215\003\n\030HomeSceneArr" +
-      "angementInfo\022>\n\033block_arrangement_info_l" +
-      "ist\030\002 \003(\0132\031.HomeBlockArrangementInfo\022\'\n\013" +
-      "HDOFAHGPJGK\030\007 \003(\0132\022.HomeFurnitureData\022\'\n" +
-      "\013MLECLIOFALA\030\014 \003(\0132\022.HomeFurnitureData\022\031" +
-      "\n\010born_rot\030\t \001(\0132\007.Vector\022\020\n\010scene_id\030\010 " +
-      "\001(\r\022\016\n\006bgm_id\030\003 \001(\r\022\025\n\rcomfort_value\030\005 \001" +
-      "(\r\022&\n\nmain_house\030\006 \001(\0132\022.HomeFurnitureDa" +
-      "ta\022\023\n\013tmp_version\030\r \001(\r\022\027\n\017is_set_born_p" +
-      "os\030\001 \001(\010\022\032\n\tdjinn_pos\030\004 \001(\0132\007.Vector\022\031\n\010" +
-      "born_pos\030\n \001(\0132\007.VectorB\033\n\031emu.grasscutt" +
-      "er.net.protob\006proto3"
+      "\n\036HomeSceneArrangementInfo.proto\032\014Vector" +
+      ".proto\032\027HomeFurnitureData.proto\032\036HomeBlo" +
+      "ckArrangementInfo.proto\"\334\003\n\030HomeSceneArr" +
+      "angementInfo\022\031\n\010born_rot\030\001 \001(\0132\007.Vector\022" +
+      "\023\n\013BMAEDEOKOHL\030\002 \001(\010\022\025\n\rcomfort_value\030\003 " +
+      "\001(\r\022\032\n\tdjinn_pos\030\004 \001(\0132\007.Vector\022\031\n\010born_" +
+      "pos\030\005 \001(\0132\007.Vector\022%\n\tdoor_list\030\006 \003(\0132\022." +
+      "HomeFurnitureData\022\023\n\013tmp_version\030\010 \001(\r\022\020" +
+      "\n\010scene_id\030\t \001(\r\022&\n\nmain_house\030\n \001(\0132\022.H" +
+      "omeFurnitureData\022\027\n\017is_set_born_pos\030\013 \001(" +
+      "\010\022>\n\033block_arrangement_info_list\030\014 \003(\0132\031" +
+      ".HomeBlockArrangementInfo\022&\n\nstair_list\030" +
+      "\r \003(\0132\022.HomeFurnitureData\022\034\n\013DFCFKJBCCAH" +
+      "\030\016 \001(\0132\007.Vector\022\016\n\006bgm_id\030\017 \001(\r\022\035\n\013EJAPJ" +
+      "LENOGL\030\365\006 \001(\0132\007.VectorB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.getDescriptor(),
         });
     internal_static_HomeSceneArrangementInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_HomeSceneArrangementInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeSceneArrangementInfo_descriptor,
-        new java.lang.String[] { "BlockArrangementInfoList", "HDOFAHGPJGK", "MLECLIOFALA", "BornRot", "SceneId", "BgmId", "ComfortValue", "MainHouse", "TmpVersion", "IsSetBornPos", "DjinnPos", "BornPos", });
-    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor();
+        new java.lang.String[] { "BornRot", "BMAEDEOKOHL", "ComfortValue", "DjinnPos", "BornPos", "DoorList", "TmpVersion", "SceneId", "MainHouse", "IsSetBornPos", "BlockArrangementInfoList", "StairList", "DFCFKJBCCAH", "BgmId", "EJAPJLENOGL", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeFurnitureDataOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HomeBlockArrangementInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpReqOuterClass.java
index e22d521fa..50812e9a1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpReqOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeSceneJumpReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_enter_room_scene = 12;</code>
+     * <code>bool is_enter_room_scene = 15;</code>
      * @return The isEnterRoomScene.
      */
     boolean getIsEnterRoomScene();
   }
   /**
-   * <pre>
-   * CmdId: 2482
-   * Obf: DIFFHJFFHGE
-   * </pre>
-   *
    * Protobuf type {@code HomeSceneJumpReq}
    */
   public static final class HomeSceneJumpReq extends
@@ -74,7 +69,7 @@ public final class HomeSceneJumpReqOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 120: {
 
               isEnterRoomScene_ = input.readBool();
               break;
@@ -111,10 +106,10 @@ public final class HomeSceneJumpReqOuterClass {
               emu.grasscutter.net.proto.HomeSceneJumpReqOuterClass.HomeSceneJumpReq.class, emu.grasscutter.net.proto.HomeSceneJumpReqOuterClass.HomeSceneJumpReq.Builder.class);
     }
 
-    public static final int IS_ENTER_ROOM_SCENE_FIELD_NUMBER = 12;
+    public static final int IS_ENTER_ROOM_SCENE_FIELD_NUMBER = 15;
     private boolean isEnterRoomScene_;
     /**
-     * <code>bool is_enter_room_scene = 12;</code>
+     * <code>bool is_enter_room_scene = 15;</code>
      * @return The isEnterRoomScene.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeSceneJumpReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isEnterRoomScene_ != false) {
-        output.writeBool(12, isEnterRoomScene_);
+        output.writeBool(15, isEnterRoomScene_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeSceneJumpReqOuterClass {
       size = 0;
       if (isEnterRoomScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isEnterRoomScene_);
+          .computeBoolSize(15, isEnterRoomScene_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class HomeSceneJumpReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2482
-     * Obf: DIFFHJFFHGE
-     * </pre>
-     *
      * Protobuf type {@code HomeSceneJumpReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class HomeSceneJumpReqOuterClass {
 
       private boolean isEnterRoomScene_ ;
       /**
-       * <code>bool is_enter_room_scene = 12;</code>
+       * <code>bool is_enter_room_scene = 15;</code>
        * @return The isEnterRoomScene.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class HomeSceneJumpReqOuterClass {
         return isEnterRoomScene_;
       }
       /**
-       * <code>bool is_enter_room_scene = 12;</code>
+       * <code>bool is_enter_room_scene = 15;</code>
        * @param value The isEnterRoomScene to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class HomeSceneJumpReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enter_room_scene = 12;</code>
+       * <code>bool is_enter_room_scene = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnterRoomScene() {
@@ -528,7 +518,7 @@ public final class HomeSceneJumpReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026HomeSceneJumpReq.proto\"/\n\020HomeSceneJum" +
-      "pReq\022\033\n\023is_enter_room_scene\030\014 \001(\010B\033\n\031emu" +
+      "pReq\022\033\n\023is_enter_room_scene\030\017 \001(\010B\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpRspOuterClass.java
index 0fe293602..8086e5d9c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeSceneJumpRspOuterClass.java
@@ -19,23 +19,18 @@ public final class HomeSceneJumpRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>bool is_enter_room_scene = 8;</code>
+     * <code>bool is_enter_room_scene = 7;</code>
      * @return The isEnterRoomScene.
      */
     boolean getIsEnterRoomScene();
+
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 22825
-   * Obf: OEJJANGAIPG
-   * </pre>
-   *
    * Protobuf type {@code HomeSceneJumpRsp}
    */
   public static final class HomeSceneJumpRsp extends
@@ -80,12 +75,12 @@ public final class HomeSceneJumpRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 56: {
 
               isEnterRoomScene_ = input.readBool();
               break;
             }
-            case 112: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -122,21 +117,10 @@ public final class HomeSceneJumpRspOuterClass {
               emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp.class, emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp.Builder.class);
     }
 
-    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 IS_ENTER_ROOM_SCENE_FIELD_NUMBER = 8;
+    public static final int IS_ENTER_ROOM_SCENE_FIELD_NUMBER = 7;
     private boolean isEnterRoomScene_;
     /**
-     * <code>bool is_enter_room_scene = 8;</code>
+     * <code>bool is_enter_room_scene = 7;</code>
      * @return The isEnterRoomScene.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class HomeSceneJumpRspOuterClass {
       return isEnterRoomScene_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class HomeSceneJumpRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isEnterRoomScene_ != false) {
-        output.writeBool(8, isEnterRoomScene_);
+        output.writeBool(7, isEnterRoomScene_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class HomeSceneJumpRspOuterClass {
       size = 0;
       if (isEnterRoomScene_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isEnterRoomScene_);
+          .computeBoolSize(7, isEnterRoomScene_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class HomeSceneJumpRspOuterClass {
       }
       emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp other = (emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getIsEnterRoomScene()
           != other.getIsEnterRoomScene()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class HomeSceneJumpRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + IS_ENTER_ROOM_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEnterRoomScene());
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class HomeSceneJumpRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22825
-     * Obf: OEJJANGAIPG
-     * </pre>
-     *
      * Protobuf type {@code HomeSceneJumpRsp}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class HomeSceneJumpRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         isEnterRoomScene_ = false;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class HomeSceneJumpRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp buildPartial() {
         emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp result = new emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp(this);
-        result.retcode_ = retcode_;
         result.isEnterRoomScene_ = isEnterRoomScene_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class HomeSceneJumpRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp other) {
         if (other == emu.grasscutter.net.proto.HomeSceneJumpRspOuterClass.HomeSceneJumpRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getIsEnterRoomScene() != false) {
           setIsEnterRoomScene(other.getIsEnterRoomScene());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class HomeSceneJumpRspOuterClass {
         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 boolean isEnterRoomScene_ ;
       /**
-       * <code>bool is_enter_room_scene = 8;</code>
+       * <code>bool is_enter_room_scene = 7;</code>
        * @return The isEnterRoomScene.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class HomeSceneJumpRspOuterClass {
         return isEnterRoomScene_;
       }
       /**
-       * <code>bool is_enter_room_scene = 8;</code>
+       * <code>bool is_enter_room_scene = 7;</code>
        * @param value The isEnterRoomScene to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class HomeSceneJumpRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_enter_room_scene = 8;</code>
+       * <code>bool is_enter_room_scene = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEnterRoomScene() {
@@ -530,6 +489,37 @@ public final class HomeSceneJumpRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</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) {
@@ -598,8 +588,8 @@ public final class HomeSceneJumpRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026HomeSceneJumpRsp.proto\"@\n\020HomeSceneJum" +
-      "pRsp\022\017\n\007retcode\030\016 \001(\005\022\033\n\023is_enter_room_s" +
-      "cene\030\010 \001(\010B\033\n\031emu.grasscutter.net.protob" +
+      "pRsp\022\033\n\023is_enter_room_scene\030\007 \001(\010\022\017\n\007ret" +
+      "code\030\r \001(\005B\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class HomeSceneJumpRspOuterClass {
     internal_static_HomeSceneJumpRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeSceneJumpRsp_descriptor,
-        new java.lang.String[] { "Retcode", "IsEnterRoomScene", });
+        new java.lang.String[] { "IsEnterRoomScene", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeTransferReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeTransferReqOuterClass.java
index 6f2bfac37..f10822b94 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeTransferReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeTransferReqOuterClass.java
@@ -19,29 +19,24 @@ public final class HomeTransferReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 guid = 12;</code>
-     * @return The guid.
-     */
-    int getGuid();
-
-    /**
-     * <code>bool is_transfer_to_main_house_point = 5;</code>
+     * <code>bool is_transfer_to_main_house_point = 1;</code>
      * @return The isTransferToMainHousePoint.
      */
     boolean getIsTransferToMainHousePoint();
 
     /**
-     * <code>bool is_transfer_to_safe_point = 3;</code>
+     * <code>bool is_transfer_to_safe_point = 14;</code>
      * @return The isTransferToSafePoint.
      */
     boolean getIsTransferToSafePoint();
+
+    /**
+     * <code>uint32 guid = 6;</code>
+     * @return The guid.
+     */
+    int getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 28287
-   * Obf: LEOKBBDBAKN
-   * </pre>
-   *
    * Protobuf type {@code HomeTransferReq}
    */
   public static final class HomeTransferReq extends
@@ -86,21 +81,21 @@ public final class HomeTransferReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              isTransferToSafePoint_ = input.readBool();
-              break;
-            }
-            case 40: {
+            case 8: {
 
               isTransferToMainHousePoint_ = input.readBool();
               break;
             }
-            case 96: {
+            case 48: {
 
               guid_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              isTransferToSafePoint_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class HomeTransferReqOuterClass {
               emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq.class, emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq.Builder.class);
     }
 
-    public static final int GUID_FIELD_NUMBER = 12;
-    private int guid_;
-    /**
-     * <code>uint32 guid = 12;</code>
-     * @return The guid.
-     */
-    @java.lang.Override
-    public int getGuid() {
-      return guid_;
-    }
-
-    public static final int IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER = 5;
+    public static final int IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER = 1;
     private boolean isTransferToMainHousePoint_;
     /**
-     * <code>bool is_transfer_to_main_house_point = 5;</code>
+     * <code>bool is_transfer_to_main_house_point = 1;</code>
      * @return The isTransferToMainHousePoint.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class HomeTransferReqOuterClass {
       return isTransferToMainHousePoint_;
     }
 
-    public static final int IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER = 3;
+    public static final int IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER = 14;
     private boolean isTransferToSafePoint_;
     /**
-     * <code>bool is_transfer_to_safe_point = 3;</code>
+     * <code>bool is_transfer_to_safe_point = 14;</code>
      * @return The isTransferToSafePoint.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class HomeTransferReqOuterClass {
       return isTransferToSafePoint_;
     }
 
+    public static final int GUID_FIELD_NUMBER = 6;
+    private int guid_;
+    /**
+     * <code>uint32 guid = 6;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public int getGuid() {
+      return guid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class HomeTransferReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isTransferToSafePoint_ != false) {
-        output.writeBool(3, isTransferToSafePoint_);
-      }
       if (isTransferToMainHousePoint_ != false) {
-        output.writeBool(5, isTransferToMainHousePoint_);
+        output.writeBool(1, isTransferToMainHousePoint_);
       }
       if (guid_ != 0) {
-        output.writeUInt32(12, guid_);
+        output.writeUInt32(6, guid_);
+      }
+      if (isTransferToSafePoint_ != false) {
+        output.writeBool(14, isTransferToSafePoint_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class HomeTransferReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isTransferToSafePoint_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isTransferToSafePoint_);
-      }
       if (isTransferToMainHousePoint_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isTransferToMainHousePoint_);
+          .computeBoolSize(1, isTransferToMainHousePoint_);
       }
       if (guid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, guid_);
+          .computeUInt32Size(6, guid_);
+      }
+      if (isTransferToSafePoint_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(14, isTransferToSafePoint_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class HomeTransferReqOuterClass {
       }
       emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq other = (emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq) obj;
 
-      if (getGuid()
-          != other.getGuid()) return false;
       if (getIsTransferToMainHousePoint()
           != other.getIsTransferToMainHousePoint()) return false;
       if (getIsTransferToSafePoint()
           != other.getIsTransferToSafePoint()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,14 +237,14 @@ public final class HomeTransferReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + getGuid();
       hash = (37 * hash) + IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTransferToMainHousePoint());
       hash = (37 * hash) + IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTransferToSafePoint());
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + getGuid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -346,11 +341,6 @@ public final class HomeTransferReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28287
-     * Obf: LEOKBBDBAKN
-     * </pre>
-     *
      * Protobuf type {@code HomeTransferReq}
      */
     public static final class Builder extends
@@ -388,12 +378,12 @@ public final class HomeTransferReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        guid_ = 0;
-
         isTransferToMainHousePoint_ = false;
 
         isTransferToSafePoint_ = false;
 
+        guid_ = 0;
+
         return this;
       }
 
@@ -420,9 +410,9 @@ public final class HomeTransferReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq buildPartial() {
         emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq result = new emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq(this);
-        result.guid_ = guid_;
         result.isTransferToMainHousePoint_ = isTransferToMainHousePoint_;
         result.isTransferToSafePoint_ = isTransferToSafePoint_;
+        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -471,15 +461,15 @@ public final class HomeTransferReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq other) {
         if (other == emu.grasscutter.net.proto.HomeTransferReqOuterClass.HomeTransferReq.getDefaultInstance()) return this;
-        if (other.getGuid() != 0) {
-          setGuid(other.getGuid());
-        }
         if (other.getIsTransferToMainHousePoint() != false) {
           setIsTransferToMainHousePoint(other.getIsTransferToMainHousePoint());
         }
         if (other.getIsTransferToSafePoint() != false) {
           setIsTransferToSafePoint(other.getIsTransferToSafePoint());
         }
+        if (other.getGuid() != 0) {
+          setGuid(other.getGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,40 +499,9 @@ public final class HomeTransferReqOuterClass {
         return this;
       }
 
-      private int guid_ ;
-      /**
-       * <code>uint32 guid = 12;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public int getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint32 guid = 12;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(int value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 guid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isTransferToMainHousePoint_ ;
       /**
-       * <code>bool is_transfer_to_main_house_point = 5;</code>
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
        * @return The isTransferToMainHousePoint.
        */
       @java.lang.Override
@@ -550,7 +509,7 @@ public final class HomeTransferReqOuterClass {
         return isTransferToMainHousePoint_;
       }
       /**
-       * <code>bool is_transfer_to_main_house_point = 5;</code>
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
        * @param value The isTransferToMainHousePoint to set.
        * @return This builder for chaining.
        */
@@ -561,7 +520,7 @@ public final class HomeTransferReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_transfer_to_main_house_point = 5;</code>
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsTransferToMainHousePoint() {
@@ -573,7 +532,7 @@ public final class HomeTransferReqOuterClass {
 
       private boolean isTransferToSafePoint_ ;
       /**
-       * <code>bool is_transfer_to_safe_point = 3;</code>
+       * <code>bool is_transfer_to_safe_point = 14;</code>
        * @return The isTransferToSafePoint.
        */
       @java.lang.Override
@@ -581,7 +540,7 @@ public final class HomeTransferReqOuterClass {
         return isTransferToSafePoint_;
       }
       /**
-       * <code>bool is_transfer_to_safe_point = 3;</code>
+       * <code>bool is_transfer_to_safe_point = 14;</code>
        * @param value The isTransferToSafePoint to set.
        * @return This builder for chaining.
        */
@@ -592,7 +551,7 @@ public final class HomeTransferReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_transfer_to_safe_point = 3;</code>
+       * <code>bool is_transfer_to_safe_point = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsTransferToSafePoint() {
@@ -601,6 +560,37 @@ public final class HomeTransferReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int guid_ ;
+      /**
+       * <code>uint32 guid = 6;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public int getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint32 guid = 6;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(int value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 guid = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -669,9 +659,9 @@ public final class HomeTransferReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025HomeTransferReq.proto\"k\n\017HomeTransferR" +
-      "eq\022\014\n\004guid\030\014 \001(\r\022\'\n\037is_transfer_to_main_" +
-      "house_point\030\005 \001(\010\022!\n\031is_transfer_to_safe" +
-      "_point\030\003 \001(\010B\033\n\031emu.grasscutter.net.prot" +
+      "eq\022\'\n\037is_transfer_to_main_house_point\030\001 " +
+      "\001(\010\022!\n\031is_transfer_to_safe_point\030\016 \001(\010\022\014" +
+      "\n\004guid\030\006 \001(\rB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +673,7 @@ public final class HomeTransferReqOuterClass {
     internal_static_HomeTransferReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HomeTransferReq_descriptor,
-        new java.lang.String[] { "Guid", "IsTransferToMainHousePoint", "IsTransferToSafePoint", });
+        new java.lang.String[] { "IsTransferToMainHousePoint", "IsTransferToSafePoint", "Guid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoReqOuterClass.java
index 5665a331e..95b7c841a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoReqOuterClass.java
@@ -19,26 +19,21 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      * @return Whether the sceneArrangementInfo field is set.
      */
     boolean hasSceneArrangementInfo();
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      * @return The sceneArrangementInfo.
      */
     emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfo();
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      */
     emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 4976
-   * Obf: LBFIBLCPDEL
-   * </pre>
-   *
    * Protobuf type {@code HomeUpdateArrangementInfoReq}
    */
   public static final class HomeUpdateArrangementInfoReq extends
@@ -83,7 +78,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 66: {
               emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder subBuilder = null;
               if (sceneArrangementInfo_ != null) {
                 subBuilder = sceneArrangementInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
               emu.grasscutter.net.proto.HomeUpdateArrangementInfoReqOuterClass.HomeUpdateArrangementInfoReq.class, emu.grasscutter.net.proto.HomeUpdateArrangementInfoReqOuterClass.HomeUpdateArrangementInfoReq.Builder.class);
     }
 
-    public static final int SCENE_ARRANGEMENT_INFO_FIELD_NUMBER = 15;
+    public static final int SCENE_ARRANGEMENT_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo sceneArrangementInfo_;
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      * @return Whether the sceneArrangementInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       return sceneArrangementInfo_ != null;
     }
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      * @return The sceneArrangementInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       return sceneArrangementInfo_ == null ? emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.getDefaultInstance() : sceneArrangementInfo_;
     }
     /**
-     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+     * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneArrangementInfo_ != null) {
-        output.writeMessage(15, getSceneArrangementInfo());
+        output.writeMessage(8, getSceneArrangementInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       size = 0;
       if (sceneArrangementInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getSceneArrangementInfo());
+          .computeMessageSize(8, getSceneArrangementInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4976
-     * Obf: LBFIBLCPDEL
-     * </pre>
-     *
      * Protobuf type {@code HomeUpdateArrangementInfoReq}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> sceneArrangementInfoBuilder_;
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        * @return Whether the sceneArrangementInfo field is set.
        */
       public boolean hasSceneArrangementInfo() {
         return sceneArrangementInfoBuilder_ != null || sceneArrangementInfo_ != null;
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        * @return The sceneArrangementInfo.
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo getSceneArrangementInfo() {
@@ -496,7 +486,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         }
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public Builder setSceneArrangementInfo(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
         if (sceneArrangementInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public Builder setSceneArrangementInfo(
           emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public Builder mergeSceneArrangementInfo(emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo value) {
         if (sceneArrangementInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public Builder clearSceneArrangementInfo() {
         if (sceneArrangementInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         return this;
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder getSceneArrangementInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         return getSceneArrangementInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       public emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder getSceneArrangementInfoOrBuilder() {
         if (sceneArrangementInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
         }
       }
       /**
-       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 15;</code>
+       * <code>.HomeSceneArrangementInfo scene_arrangement_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfo.Builder, emu.grasscutter.net.proto.HomeSceneArrangementInfoOuterClass.HomeSceneArrangementInfoOrBuilder> 
@@ -662,7 +652,7 @@ public final class HomeUpdateArrangementInfoReqOuterClass {
       "\n\"HomeUpdateArrangementInfoReq.proto\032\036Ho" +
       "meSceneArrangementInfo.proto\"Y\n\034HomeUpda" +
       "teArrangementInfoReq\0229\n\026scene_arrangemen" +
-      "t_info\030\017 \001(\0132\031.HomeSceneArrangementInfoB" +
+      "t_info\030\010 \001(\0132\031.HomeSceneArrangementInfoB" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoRspOuterClass.java
index d9722896d..a4d371ee1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HomeUpdateArrangementInfoRspOuterClass.java
@@ -19,17 +19,12 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28545
-   * Obf: MILPFBIHKIJ
-   * </pre>
-   *
    * Protobuf type {@code HomeUpdateArrangementInfoRsp}
    */
   public static final class HomeUpdateArrangementInfoRsp extends
@@ -74,7 +69,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
               emu.grasscutter.net.proto.HomeUpdateArrangementInfoRspOuterClass.HomeUpdateArrangementInfoRsp.class, emu.grasscutter.net.proto.HomeUpdateArrangementInfoRspOuterClass.HomeUpdateArrangementInfoRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 3;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(3, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(3, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28545
-     * Obf: MILPFBIHKIJ
-     * </pre>
-     *
      * Protobuf type {@code HomeUpdateArrangementInfoRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 3;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 3;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -528,7 +518,7 @@ public final class HomeUpdateArrangementInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"HomeUpdateArrangementInfoRsp.proto\"/\n\034" +
       "HomeUpdateArrangementInfoRsp\022\017\n\007retcode\030" +
-      "\002 \001(\005B\033\n\031emu.grasscutter.net.protob\006prot" +
+      "\003 \001(\005B\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/HostPlayerNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
index c32acb4d9..ed9981216 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HostPlayerNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class HostPlayerNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 host_uid = 8;</code>
+     * <code>uint32 host_uid = 1;</code>
      * @return The hostUid.
      */
     int getHostUid();
 
     /**
-     * <code>uint32 host_peer_id = 7;</code>
+     * <code>uint32 host_peer_id = 9;</code>
      * @return The hostPeerId.
      */
     int getHostPeerId();
   }
   /**
-   * <pre>
-   * CmdId: 9459
-   * Obf: JBPDNKOINAN
-   * </pre>
-   *
    * Protobuf type {@code HostPlayerNotify}
    */
   public static final class HostPlayerNotify extends
@@ -80,16 +75,16 @@ public final class HostPlayerNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              hostPeerId_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 8: {
 
               hostUid_ = input.readUInt32();
               break;
             }
+            case 72: {
+
+              hostPeerId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class HostPlayerNotifyOuterClass {
               emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify.class, emu.grasscutter.net.proto.HostPlayerNotifyOuterClass.HostPlayerNotify.Builder.class);
     }
 
-    public static final int HOST_UID_FIELD_NUMBER = 8;
+    public static final int HOST_UID_FIELD_NUMBER = 1;
     private int hostUid_;
     /**
-     * <code>uint32 host_uid = 8;</code>
+     * <code>uint32 host_uid = 1;</code>
      * @return The hostUid.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class HostPlayerNotifyOuterClass {
       return hostUid_;
     }
 
-    public static final int HOST_PEER_ID_FIELD_NUMBER = 7;
+    public static final int HOST_PEER_ID_FIELD_NUMBER = 9;
     private int hostPeerId_;
     /**
-     * <code>uint32 host_peer_id = 7;</code>
+     * <code>uint32 host_peer_id = 9;</code>
      * @return The hostPeerId.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class HostPlayerNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (hostPeerId_ != 0) {
-        output.writeUInt32(7, hostPeerId_);
-      }
       if (hostUid_ != 0) {
-        output.writeUInt32(8, hostUid_);
+        output.writeUInt32(1, hostUid_);
+      }
+      if (hostPeerId_ != 0) {
+        output.writeUInt32(9, hostPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class HostPlayerNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (hostPeerId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, hostPeerId_);
-      }
       if (hostUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, hostUid_);
+          .computeUInt32Size(1, hostUid_);
+      }
+      if (hostPeerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, hostPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class HostPlayerNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9459
-     * Obf: JBPDNKOINAN
-     * </pre>
-     *
      * Protobuf type {@code HostPlayerNotify}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class HostPlayerNotifyOuterClass {
 
       private int hostUid_ ;
       /**
-       * <code>uint32 host_uid = 8;</code>
+       * <code>uint32 host_uid = 1;</code>
        * @return The hostUid.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class HostPlayerNotifyOuterClass {
         return hostUid_;
       }
       /**
-       * <code>uint32 host_uid = 8;</code>
+       * <code>uint32 host_uid = 1;</code>
        * @param value The hostUid to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class HostPlayerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 host_uid = 8;</code>
+       * <code>uint32 host_uid = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearHostUid() {
@@ -501,7 +491,7 @@ public final class HostPlayerNotifyOuterClass {
 
       private int hostPeerId_ ;
       /**
-       * <code>uint32 host_peer_id = 7;</code>
+       * <code>uint32 host_peer_id = 9;</code>
        * @return The hostPeerId.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class HostPlayerNotifyOuterClass {
         return hostPeerId_;
       }
       /**
-       * <code>uint32 host_peer_id = 7;</code>
+       * <code>uint32 host_peer_id = 9;</code>
        * @param value The hostPeerId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class HostPlayerNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 host_peer_id = 7;</code>
+       * <code>uint32 host_peer_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearHostPeerId() {
@@ -597,7 +587,7 @@ public final class HostPlayerNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026HostPlayerNotify.proto\":\n\020HostPlayerNo" +
-      "tify\022\020\n\010host_uid\030\010 \001(\r\022\024\n\014host_peer_id\030\007" +
+      "tify\022\020\n\010host_uid\030\001 \001(\r\022\024\n\014host_peer_id\030\t" +
       " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferDataOuterClass.java
index 86daa8fcb..d7506f760 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferDataOuterClass.java
@@ -19,42 +19,38 @@ public final class HuntingOfferDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     * @return Whether the huntingPair field is set.
-     */
-    boolean hasHuntingPair();
-    /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     * @return The huntingPair.
-     */
-    emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getHuntingPair();
-    /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     */
-    emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getHuntingPairOrBuilder();
-
-    /**
-     * <code>.HuntingOfferState state = 11;</code>
+     * <code>.HuntingOfferState state = 9;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.HuntingOfferState state = 11;</code>
+     * <code>.HuntingOfferState state = 9;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState getState();
 
     /**
-     * <code>uint32 city_id = 15;</code>
+     * <code>uint32 city_id = 12;</code>
      * @return The cityId.
      */
     int getCityId();
+
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     * @return Whether the huntingPair field is set.
+     */
+    boolean hasHuntingPair();
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     * @return The huntingPair.
+     */
+    emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getHuntingPair();
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     */
+    emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getHuntingPairOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: DHGAICOLFFI
-   * </pre>
-   *
    * Protobuf type {@code HuntingOfferData}
    */
   public static final class HuntingOfferData extends
@@ -100,7 +96,18 @@ public final class HuntingOfferDataOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 72: {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
+            case 96: {
+
+              cityId_ = input.readUInt32();
+              break;
+            }
+            case 114: {
               emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder subBuilder = null;
               if (huntingPair_ != null) {
                 subBuilder = huntingPair_.toBuilder();
@@ -113,17 +120,6 @@ public final class HuntingOfferDataOuterClass {
 
               break;
             }
-            case 88: {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-            case 120: {
-
-              cityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -156,43 +152,17 @@ public final class HuntingOfferDataOuterClass {
               emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData.class, emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData.Builder.class);
     }
 
-    public static final int HUNTING_PAIR_FIELD_NUMBER = 3;
-    private emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair huntingPair_;
-    /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     * @return Whether the huntingPair field is set.
-     */
-    @java.lang.Override
-    public boolean hasHuntingPair() {
-      return huntingPair_ != null;
-    }
-    /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     * @return The huntingPair.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getHuntingPair() {
-      return huntingPair_ == null ? emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.getDefaultInstance() : huntingPair_;
-    }
-    /**
-     * <code>.HuntingPair hunting_pair = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getHuntingPairOrBuilder() {
-      return getHuntingPair();
-    }
-
-    public static final int STATE_FIELD_NUMBER = 11;
+    public static final int STATE_FIELD_NUMBER = 9;
     private int state_;
     /**
-     * <code>.HuntingOfferState state = 11;</code>
+     * <code>.HuntingOfferState state = 9;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.HuntingOfferState state = 11;</code>
+     * <code>.HuntingOfferState state = 9;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState getState() {
@@ -201,10 +171,10 @@ public final class HuntingOfferDataOuterClass {
       return result == null ? emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.UNRECOGNIZED : result;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 15;
+    public static final int CITY_ID_FIELD_NUMBER = 12;
     private int cityId_;
     /**
-     * <code>uint32 city_id = 15;</code>
+     * <code>uint32 city_id = 12;</code>
      * @return The cityId.
      */
     @java.lang.Override
@@ -212,6 +182,32 @@ public final class HuntingOfferDataOuterClass {
       return cityId_;
     }
 
+    public static final int HUNTING_PAIR_FIELD_NUMBER = 14;
+    private emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair huntingPair_;
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     * @return Whether the huntingPair field is set.
+     */
+    @java.lang.Override
+    public boolean hasHuntingPair() {
+      return huntingPair_ != null;
+    }
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     * @return The huntingPair.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getHuntingPair() {
+      return huntingPair_ == null ? emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.getDefaultInstance() : huntingPair_;
+    }
+    /**
+     * <code>.HuntingPair hunting_pair = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getHuntingPairOrBuilder() {
+      return getHuntingPair();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -226,14 +222,14 @@ public final class HuntingOfferDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (huntingPair_ != null) {
-        output.writeMessage(3, getHuntingPair());
-      }
-      if (state_ != emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.HUNTING_OFFER_STATE_NONE.getNumber()) {
-        output.writeEnum(11, state_);
+      if (state_ != emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.HuntingOfferState_NONE.getNumber()) {
+        output.writeEnum(9, state_);
       }
       if (cityId_ != 0) {
-        output.writeUInt32(15, cityId_);
+        output.writeUInt32(12, cityId_);
+      }
+      if (huntingPair_ != null) {
+        output.writeMessage(14, getHuntingPair());
       }
       unknownFields.writeTo(output);
     }
@@ -244,17 +240,17 @@ public final class HuntingOfferDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (huntingPair_ != null) {
+      if (state_ != emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.HuntingOfferState_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getHuntingPair());
-      }
-      if (state_ != emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.HUNTING_OFFER_STATE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, state_);
+          .computeEnumSize(9, state_);
       }
       if (cityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, cityId_);
+          .computeUInt32Size(12, cityId_);
+      }
+      if (huntingPair_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getHuntingPair());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -271,14 +267,14 @@ public final class HuntingOfferDataOuterClass {
       }
       emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData other = (emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData) obj;
 
+      if (state_ != other.state_) return false;
+      if (getCityId()
+          != other.getCityId()) return false;
       if (hasHuntingPair() != other.hasHuntingPair()) return false;
       if (hasHuntingPair()) {
         if (!getHuntingPair()
             .equals(other.getHuntingPair())) return false;
       }
-      if (state_ != other.state_) return false;
-      if (getCityId()
-          != other.getCityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -290,14 +286,14 @@ public final class HuntingOfferDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasHuntingPair()) {
-        hash = (37 * hash) + HUNTING_PAIR_FIELD_NUMBER;
-        hash = (53 * hash) + getHuntingPair().hashCode();
-      }
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
       hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCityId();
+      if (hasHuntingPair()) {
+        hash = (37 * hash) + HUNTING_PAIR_FIELD_NUMBER;
+        hash = (53 * hash) + getHuntingPair().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -394,10 +390,6 @@ public final class HuntingOfferDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DHGAICOLFFI
-     * </pre>
-     *
      * Protobuf type {@code HuntingOfferData}
      */
     public static final class Builder extends
@@ -435,16 +427,16 @@ public final class HuntingOfferDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        state_ = 0;
+
+        cityId_ = 0;
+
         if (huntingPairBuilder_ == null) {
           huntingPair_ = null;
         } else {
           huntingPair_ = null;
           huntingPairBuilder_ = null;
         }
-        state_ = 0;
-
-        cityId_ = 0;
-
         return this;
       }
 
@@ -471,13 +463,13 @@ public final class HuntingOfferDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData buildPartial() {
         emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData result = new emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData(this);
+        result.state_ = state_;
+        result.cityId_ = cityId_;
         if (huntingPairBuilder_ == null) {
           result.huntingPair_ = huntingPair_;
         } else {
           result.huntingPair_ = huntingPairBuilder_.build();
         }
-        result.state_ = state_;
-        result.cityId_ = cityId_;
         onBuilt();
         return result;
       }
@@ -526,15 +518,15 @@ public final class HuntingOfferDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData other) {
         if (other == emu.grasscutter.net.proto.HuntingOfferDataOuterClass.HuntingOfferData.getDefaultInstance()) return this;
-        if (other.hasHuntingPair()) {
-          mergeHuntingPair(other.getHuntingPair());
-        }
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
         if (other.getCityId() != 0) {
           setCityId(other.getCityId());
         }
+        if (other.hasHuntingPair()) {
+          mergeHuntingPair(other.getHuntingPair());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,18 +556,103 @@ public final class HuntingOfferDataOuterClass {
         return this;
       }
 
+      private int state_ = 0;
+      /**
+       * <code>.HuntingOfferState state = 9;</code>
+       * @return The enum numeric value on the wire for state.
+       */
+      @java.lang.Override public int getStateValue() {
+        return state_;
+      }
+      /**
+       * <code>.HuntingOfferState state = 9;</code>
+       * @param value The enum numeric value on the wire for state to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStateValue(int value) {
+        
+        state_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.HuntingOfferState state = 9;</code>
+       * @return The state.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState getState() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState result = emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.valueOf(state_);
+        return result == null ? emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.HuntingOfferState state = 9;</code>
+       * @param value The state to set.
+       * @return This builder for chaining.
+       */
+      public Builder setState(emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        state_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.HuntingOfferState state = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearState() {
+        
+        state_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cityId_ ;
+      /**
+       * <code>uint32 city_id = 12;</code>
+       * @return The cityId.
+       */
+      @java.lang.Override
+      public int getCityId() {
+        return cityId_;
+      }
+      /**
+       * <code>uint32 city_id = 12;</code>
+       * @param value The cityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCityId(int value) {
+        
+        cityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 city_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCityId() {
+        
+        cityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair huntingPair_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder> huntingPairBuilder_;
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        * @return Whether the huntingPair field is set.
        */
       public boolean hasHuntingPair() {
         return huntingPairBuilder_ != null || huntingPair_ != null;
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        * @return The huntingPair.
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair getHuntingPair() {
@@ -586,7 +663,7 @@ public final class HuntingOfferDataOuterClass {
         }
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public Builder setHuntingPair(emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair value) {
         if (huntingPairBuilder_ == null) {
@@ -602,7 +679,7 @@ public final class HuntingOfferDataOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public Builder setHuntingPair(
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder builderForValue) {
@@ -616,7 +693,7 @@ public final class HuntingOfferDataOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public Builder mergeHuntingPair(emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair value) {
         if (huntingPairBuilder_ == null) {
@@ -634,7 +711,7 @@ public final class HuntingOfferDataOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public Builder clearHuntingPair() {
         if (huntingPairBuilder_ == null) {
@@ -648,7 +725,7 @@ public final class HuntingOfferDataOuterClass {
         return this;
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder getHuntingPairBuilder() {
         
@@ -656,7 +733,7 @@ public final class HuntingOfferDataOuterClass {
         return getHuntingPairFieldBuilder().getBuilder();
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       public emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder getHuntingPairOrBuilder() {
         if (huntingPairBuilder_ != null) {
@@ -667,7 +744,7 @@ public final class HuntingOfferDataOuterClass {
         }
       }
       /**
-       * <code>.HuntingPair hunting_pair = 3;</code>
+       * <code>.HuntingPair hunting_pair = 14;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPairOrBuilder> 
@@ -682,91 +759,6 @@ public final class HuntingOfferDataOuterClass {
         }
         return huntingPairBuilder_;
       }
-
-      private int state_ = 0;
-      /**
-       * <code>.HuntingOfferState state = 11;</code>
-       * @return The enum numeric value on the wire for state.
-       */
-      @java.lang.Override public int getStateValue() {
-        return state_;
-      }
-      /**
-       * <code>.HuntingOfferState state = 11;</code>
-       * @param value The enum numeric value on the wire for state to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStateValue(int value) {
-        
-        state_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.HuntingOfferState state = 11;</code>
-       * @return The state.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState getState() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState result = emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.valueOf(state_);
-        return result == null ? emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.HuntingOfferState state = 11;</code>
-       * @param value The state to set.
-       * @return This builder for chaining.
-       */
-      public Builder setState(emu.grasscutter.net.proto.HuntingOfferStateOuterClass.HuntingOfferState value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        state_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.HuntingOfferState state = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearState() {
-        
-        state_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int cityId_ ;
-      /**
-       * <code>uint32 city_id = 15;</code>
-       * @return The cityId.
-       */
-      @java.lang.Override
-      public int getCityId() {
-        return cityId_;
-      }
-      /**
-       * <code>uint32 city_id = 15;</code>
-       * @param value The cityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCityId(int value) {
-        
-        cityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 city_id = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCityId() {
-        
-        cityId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -834,27 +826,27 @@ public final class HuntingOfferDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026HuntingOfferData.proto\032\021HuntingPair.pr" +
-      "oto\032\027HuntingOfferState.proto\"j\n\020HuntingO" +
-      "fferData\022\"\n\014hunting_pair\030\003 \001(\0132\014.Hunting" +
-      "Pair\022!\n\005state\030\013 \001(\0162\022.HuntingOfferState\022" +
-      "\017\n\007city_id\030\017 \001(\rB\033\n\031emu.grasscutter.net." +
+      "\n\026HuntingOfferData.proto\032\027HuntingOfferSt" +
+      "ate.proto\032\021HuntingPair.proto\"j\n\020HuntingO" +
+      "fferData\022!\n\005state\030\t \001(\0162\022.HuntingOfferSt" +
+      "ate\022\017\n\007city_id\030\014 \001(\r\022\"\n\014hunting_pair\030\016 \001" +
+      "(\0132\014.HuntingPairB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.HuntingPairOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.HuntingOfferStateOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.HuntingPairOuterClass.getDescriptor(),
         });
     internal_static_HuntingOfferData_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_HuntingOfferData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_HuntingOfferData_descriptor,
-        new java.lang.String[] { "HuntingPair", "State", "CityId", });
-    emu.grasscutter.net.proto.HuntingPairOuterClass.getDescriptor();
+        new java.lang.String[] { "State", "CityId", "HuntingPair", });
     emu.grasscutter.net.proto.HuntingOfferStateOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.HuntingPairOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferStateOuterClass.java
index b4673cb85..24e3e80b7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HuntingOfferStateOuterClass.java
@@ -15,49 +15,45 @@ public final class HuntingOfferStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DINBLJHHDJN
-   * </pre>
-   *
    * Protobuf enum {@code HuntingOfferState}
    */
   public enum HuntingOfferState
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
-     * <code>HUNTING_OFFER_STATE_NONE = 0;</code>
+     * <code>HuntingOfferState_NONE = 0;</code>
      */
-    HUNTING_OFFER_STATE_NONE(0),
+    HuntingOfferState_NONE(0),
     /**
-     * <code>HUNTING_OFFER_STATE_STARTED = 1;</code>
+     * <code>HuntingOfferState_STARTED = 1;</code>
      */
-    HUNTING_OFFER_STATE_STARTED(1),
+    HuntingOfferState_STARTED(1),
     /**
-     * <code>HUNTING_OFFER_STATE_UNSTARTED = 2;</code>
+     * <code>HuntingOfferState_UNSTARTED = 2;</code>
      */
-    HUNTING_OFFER_STATE_UNSTARTED(2),
+    HuntingOfferState_UNSTARTED(2),
     /**
-     * <code>HUNTING_OFFER_STATE_SUCC = 3;</code>
+     * <code>HuntingOfferState_SUCC = 3;</code>
      */
-    HUNTING_OFFER_STATE_SUCC(3),
+    HuntingOfferState_SUCC(3),
     UNRECOGNIZED(-1),
     ;
 
     /**
-     * <code>HUNTING_OFFER_STATE_NONE = 0;</code>
+     * <code>HuntingOfferState_NONE = 0;</code>
      */
-    public static final int HUNTING_OFFER_STATE_NONE_VALUE = 0;
+    public static final int HuntingOfferState_NONE_VALUE = 0;
     /**
-     * <code>HUNTING_OFFER_STATE_STARTED = 1;</code>
+     * <code>HuntingOfferState_STARTED = 1;</code>
      */
-    public static final int HUNTING_OFFER_STATE_STARTED_VALUE = 1;
+    public static final int HuntingOfferState_STARTED_VALUE = 1;
     /**
-     * <code>HUNTING_OFFER_STATE_UNSTARTED = 2;</code>
+     * <code>HuntingOfferState_UNSTARTED = 2;</code>
      */
-    public static final int HUNTING_OFFER_STATE_UNSTARTED_VALUE = 2;
+    public static final int HuntingOfferState_UNSTARTED_VALUE = 2;
     /**
-     * <code>HUNTING_OFFER_STATE_SUCC = 3;</code>
+     * <code>HuntingOfferState_SUCC = 3;</code>
      */
-    public static final int HUNTING_OFFER_STATE_SUCC_VALUE = 3;
+    public static final int HuntingOfferState_SUCC_VALUE = 3;
 
 
     public final int getNumber() {
@@ -84,10 +80,10 @@ public final class HuntingOfferStateOuterClass {
      */
     public static HuntingOfferState forNumber(int value) {
       switch (value) {
-        case 0: return HUNTING_OFFER_STATE_NONE;
-        case 1: return HUNTING_OFFER_STATE_STARTED;
-        case 2: return HUNTING_OFFER_STATE_UNSTARTED;
-        case 3: return HUNTING_OFFER_STATE_SUCC;
+        case 0: return HuntingOfferState_NONE;
+        case 1: return HuntingOfferState_STARTED;
+        case 2: return HuntingOfferState_UNSTARTED;
+        case 3: return HuntingOfferState_SUCC;
         default: return null;
       }
     }
@@ -153,12 +149,12 @@ public final class HuntingOfferStateOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027HuntingOfferState.proto*\223\001\n\021HuntingOff" +
-      "erState\022\034\n\030HUNTING_OFFER_STATE_NONE\020\000\022\037\n" +
-      "\033HUNTING_OFFER_STATE_STARTED\020\001\022!\n\035HUNTIN" +
-      "G_OFFER_STATE_UNSTARTED\020\002\022\034\n\030HUNTING_OFF" +
-      "ER_STATE_SUCC\020\003B\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "\n\027HuntingOfferState.proto*\213\001\n\021HuntingOff" +
+      "erState\022\032\n\026HuntingOfferState_NONE\020\000\022\035\n\031H" +
+      "untingOfferState_STARTED\020\001\022\037\n\033HuntingOff" +
+      "erState_UNSTARTED\020\002\022\032\n\026HuntingOfferState" +
+      "_SUCC\020\003B\033\n\031emu.grasscutter.net.protob\006pr" +
+      "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/HuntingPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/HuntingPairOuterClass.java
index 31c00f2b1..e3045399c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/HuntingPairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/HuntingPairOuterClass.java
@@ -19,7 +19,7 @@ public final class HuntingPairOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 monster_config_id = 2;</code>
+     * <code>uint32 monster_config_id = 10;</code>
      * @return The monsterConfigId.
      */
     int getMonsterConfigId();
@@ -31,10 +31,6 @@ public final class HuntingPairOuterClass {
     int getRefreshId();
   }
   /**
-   * <pre>
-   * Obf: AIOLAOJBABD
-   * </pre>
-   *
    * Protobuf type {@code HuntingPair}
    */
   public static final class HuntingPair extends
@@ -79,7 +75,7 @@ public final class HuntingPairOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 80: {
 
               monsterConfigId_ = input.readUInt32();
               break;
@@ -121,10 +117,10 @@ public final class HuntingPairOuterClass {
               emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.class, emu.grasscutter.net.proto.HuntingPairOuterClass.HuntingPair.Builder.class);
     }
 
-    public static final int MONSTER_CONFIG_ID_FIELD_NUMBER = 2;
+    public static final int MONSTER_CONFIG_ID_FIELD_NUMBER = 10;
     private int monsterConfigId_;
     /**
-     * <code>uint32 monster_config_id = 2;</code>
+     * <code>uint32 monster_config_id = 10;</code>
      * @return The monsterConfigId.
      */
     @java.lang.Override
@@ -158,7 +154,7 @@ public final class HuntingPairOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (monsterConfigId_ != 0) {
-        output.writeUInt32(2, monsterConfigId_);
+        output.writeUInt32(10, monsterConfigId_);
       }
       if (refreshId_ != 0) {
         output.writeUInt32(11, refreshId_);
@@ -174,7 +170,7 @@ public final class HuntingPairOuterClass {
       size = 0;
       if (monsterConfigId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, monsterConfigId_);
+          .computeUInt32Size(10, monsterConfigId_);
       }
       if (refreshId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -310,10 +306,6 @@ public final class HuntingPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AIOLAOJBABD
-     * </pre>
-     *
      * Protobuf type {@code HuntingPair}
      */
     public static final class Builder extends
@@ -468,7 +460,7 @@ public final class HuntingPairOuterClass {
 
       private int monsterConfigId_ ;
       /**
-       * <code>uint32 monster_config_id = 2;</code>
+       * <code>uint32 monster_config_id = 10;</code>
        * @return The monsterConfigId.
        */
       @java.lang.Override
@@ -476,7 +468,7 @@ public final class HuntingPairOuterClass {
         return monsterConfigId_;
       }
       /**
-       * <code>uint32 monster_config_id = 2;</code>
+       * <code>uint32 monster_config_id = 10;</code>
        * @param value The monsterConfigId to set.
        * @return This builder for chaining.
        */
@@ -487,7 +479,7 @@ public final class HuntingPairOuterClass {
         return this;
       }
       /**
-       * <code>uint32 monster_config_id = 2;</code>
+       * <code>uint32 monster_config_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearMonsterConfigId() {
@@ -595,7 +587,7 @@ public final class HuntingPairOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021HuntingPair.proto\"<\n\013HuntingPair\022\031\n\021mo" +
-      "nster_config_id\030\002 \001(\r\022\022\n\nrefresh_id\030\013 \001(" +
+      "nster_config_id\030\n \001(\r\022\022\n\nrefresh_id\030\013 \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/InferencePageInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
index acabd226b..bbdc926ef 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InferencePageInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class InferencePageInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> 
-        getUnlockWordListList();
-    /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo getUnlockWordList(int index);
-    /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
-     */
-    int getUnlockWordListCount();
-    /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder> 
-        getUnlockWordListOrBuilderList();
-    /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder getUnlockWordListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 page_id = 13;</code>
+     * <code>uint32 page_id = 6;</code>
      * @return The pageId.
      */
     int getPageId();
+
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> 
+        getUnlockWordListList();
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index);
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    int getUnlockWordListCount();
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
+        getUnlockWordListOrBuilderList();
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * Obf: BMEHNPACBEM
-   * </pre>
-   *
    * Protobuf type {@code InferencePageInfo}
    */
   public static final class InferencePageInfo extends
@@ -99,18 +95,18 @@ public final class InferencePageInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 48: {
+
+              pageId_ = input.readUInt32();
+              break;
+            }
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                unlockWordList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo>();
+                unlockWordList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo>();
                 mutable_bitField0_ |= 0x00000001;
               }
               unlockWordList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 104: {
-
-              pageId_ = input.readUInt32();
+                  input.readMessage(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.parser(), extensionRegistry));
               break;
             }
             default: {
@@ -148,57 +144,57 @@ public final class InferencePageInfoOuterClass {
               emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.class, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder.class);
     }
 
-    public static final int UNLOCK_WORD_LIST_FIELD_NUMBER = 7;
-    private java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> unlockWordList_;
+    public static final int PAGE_ID_FIELD_NUMBER = 6;
+    private int pageId_;
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+     * <code>uint32 page_id = 6;</code>
+     * @return The pageId.
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> getUnlockWordListList() {
+    public int getPageId() {
+      return pageId_;
+    }
+
+    public static final int UNLOCK_WORD_LIST_FIELD_NUMBER = 11;
+    private java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> unlockWordList_;
+    /**
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> getUnlockWordListList() {
       return unlockWordList_;
     }
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
      */
     @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder> 
+    public java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
         getUnlockWordListOrBuilderList() {
       return unlockWordList_;
     }
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
      */
     @java.lang.Override
     public int getUnlockWordListCount() {
       return unlockWordList_.size();
     }
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo getUnlockWordList(int index) {
+    public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index) {
       return unlockWordList_.get(index);
     }
     /**
-     * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+     * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder getUnlockWordListOrBuilder(
+    public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
         int index) {
       return unlockWordList_.get(index);
     }
 
-    public static final int PAGE_ID_FIELD_NUMBER = 13;
-    private int pageId_;
-    /**
-     * <code>uint32 page_id = 13;</code>
-     * @return The pageId.
-     */
-    @java.lang.Override
-    public int getPageId() {
-      return pageId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -213,11 +209,11 @@ public final class InferencePageInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < unlockWordList_.size(); i++) {
-        output.writeMessage(7, unlockWordList_.get(i));
-      }
       if (pageId_ != 0) {
-        output.writeUInt32(13, pageId_);
+        output.writeUInt32(6, pageId_);
+      }
+      for (int i = 0; i < unlockWordList_.size(); i++) {
+        output.writeMessage(11, unlockWordList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -228,13 +224,13 @@ public final class InferencePageInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < unlockWordList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, unlockWordList_.get(i));
-      }
       if (pageId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pageId_);
+          .computeUInt32Size(6, pageId_);
+      }
+      for (int i = 0; i < unlockWordList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, unlockWordList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -251,10 +247,10 @@ public final class InferencePageInfoOuterClass {
       }
       emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo other = (emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo) obj;
 
-      if (!getUnlockWordListList()
-          .equals(other.getUnlockWordListList())) return false;
       if (getPageId()
           != other.getPageId()) return false;
+      if (!getUnlockWordListList()
+          .equals(other.getUnlockWordListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -266,12 +262,12 @@ public final class InferencePageInfoOuterClass {
       }
       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;
@@ -368,10 +364,6 @@ public final class InferencePageInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BMEHNPACBEM
-     * </pre>
-     *
      * Protobuf type {@code InferencePageInfo}
      */
     public static final class Builder extends
@@ -410,14 +402,14 @@ public final class InferencePageInfoOuterClass {
       @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;
       }
 
@@ -445,6 +437,7 @@ public final class InferencePageInfoOuterClass {
       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_);
@@ -454,7 +447,6 @@ public final class InferencePageInfoOuterClass {
         } else {
           result.unlockWordList_ = unlockWordListBuilder_.build();
         }
-        result.pageId_ = pageId_;
         onBuilt();
         return result;
       }
@@ -503,6 +495,9 @@ public final class InferencePageInfoOuterClass {
 
       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()) {
@@ -529,9 +524,6 @@ public final class InferencePageInfoOuterClass {
             }
           }
         }
-        if (other.getPageId() != 0) {
-          setPageId(other.getPageId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -562,22 +554,53 @@ public final class InferencePageInfoOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> unlockWordList_ =
+      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() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          unlockWordList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo>(unlockWordList_);
+          unlockWordList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo>(unlockWordList_);
           bitField0_ |= 0x00000001;
          }
       }
 
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder> unlockWordListBuilder_;
+          emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> unlockWordListBuilder_;
 
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> getUnlockWordListList() {
+      public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> getUnlockWordListList() {
         if (unlockWordListBuilder_ == null) {
           return java.util.Collections.unmodifiableList(unlockWordList_);
         } else {
@@ -585,7 +608,7 @@ public final class InferencePageInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public int getUnlockWordListCount() {
         if (unlockWordListBuilder_ == null) {
@@ -595,9 +618,9 @@ public final class InferencePageInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo getUnlockWordList(int index) {
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getUnlockWordList(int index) {
         if (unlockWordListBuilder_ == null) {
           return unlockWordList_.get(index);
         } else {
@@ -605,10 +628,10 @@ public final class InferencePageInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder setUnlockWordList(
-          int index, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo value) {
+          int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
         if (unlockWordListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -622,10 +645,10 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder setUnlockWordList(
-          int index, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder builderForValue) {
+          int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
         if (unlockWordListBuilder_ == null) {
           ensureUnlockWordListIsMutable();
           unlockWordList_.set(index, builderForValue.build());
@@ -636,9 +659,9 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public Builder addUnlockWordList(emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo value) {
+      public Builder addUnlockWordList(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
         if (unlockWordListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -652,10 +675,10 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder addUnlockWordList(
-          int index, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo value) {
+          int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo value) {
         if (unlockWordListBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
@@ -669,10 +692,10 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder addUnlockWordList(
-          emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder builderForValue) {
+          emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
         if (unlockWordListBuilder_ == null) {
           ensureUnlockWordListIsMutable();
           unlockWordList_.add(builderForValue.build());
@@ -683,10 +706,10 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder addUnlockWordList(
-          int index, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder builderForValue) {
+          int index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder builderForValue) {
         if (unlockWordListBuilder_ == null) {
           ensureUnlockWordListIsMutable();
           unlockWordList_.add(index, builderForValue.build());
@@ -697,10 +720,10 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder addAllUnlockWordList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo> values) {
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo> values) {
         if (unlockWordListBuilder_ == null) {
           ensureUnlockWordListIsMutable();
           com.google.protobuf.AbstractMessageLite.Builder.addAll(
@@ -712,7 +735,7 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder clearUnlockWordList() {
         if (unlockWordListBuilder_ == null) {
@@ -725,7 +748,7 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
       public Builder removeUnlockWordList(int index) {
         if (unlockWordListBuilder_ == null) {
@@ -738,16 +761,16 @@ public final class InferencePageInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder getUnlockWordListBuilder(
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder getUnlockWordListBuilder(
           int index) {
         return getUnlockWordListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder getUnlockWordListOrBuilder(
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder getUnlockWordListOrBuilder(
           int index) {
         if (unlockWordListBuilder_ == null) {
           return unlockWordList_.get(index);  } else {
@@ -755,9 +778,9 @@ public final class InferencePageInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public java.util.List<? extends emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder> 
+      public java.util.List<? extends emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
            getUnlockWordListOrBuilderList() {
         if (unlockWordListBuilder_ != null) {
           return unlockWordListBuilder_.getMessageOrBuilderList();
@@ -766,33 +789,33 @@ public final class InferencePageInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder addUnlockWordListBuilder() {
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder addUnlockWordListBuilder() {
         return getUnlockWordListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.getDefaultInstance());
+            emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder addUnlockWordListBuilder(
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder addUnlockWordListBuilder(
           int index) {
         return getUnlockWordListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.getDefaultInstance());
+            index, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InfernceWordInfo unlock_word_list = 7;</code>
+       * <code>repeated .InferenceWordInfo unlock_word_list = 11;</code>
        */
-      public java.util.List<emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder> 
+      public java.util.List<emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder> 
            getUnlockWordListBuilderList() {
         return getUnlockWordListFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder> 
+          emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder> 
           getUnlockWordListFieldBuilder() {
         if (unlockWordListBuilder_ == null) {
           unlockWordListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfo.Builder, emu.grasscutter.net.proto.InfernceWordInfoOuterClass.InfernceWordInfoOrBuilder>(
+              emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder>(
                   unlockWordList_,
                   ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
@@ -801,37 +824,6 @@ public final class InferencePageInfoOuterClass {
         }
         return unlockWordListBuilder_;
       }
-
-      private int pageId_ ;
-      /**
-       * <code>uint32 page_id = 13;</code>
-       * @return The pageId.
-       */
-      @java.lang.Override
-      public int getPageId() {
-        return pageId_;
-      }
-      /**
-       * <code>uint32 page_id = 13;</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 = 13;</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) {
@@ -899,24 +891,24 @@ public final class InferencePageInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027InferencePageInfo.proto\032\026InfernceWordI" +
-      "nfo.proto\"Q\n\021InferencePageInfo\022+\n\020unlock" +
-      "_word_list\030\007 \003(\0132\021.InfernceWordInfo\022\017\n\007p" +
-      "age_id\030\r \001(\rB\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\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" +
+      "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.InfernceWordInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.InferenceWordInfoOuterClass.getDescriptor(),
         });
     internal_static_InferencePageInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_InferencePageInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InferencePageInfo_descriptor,
-        new java.lang.String[] { "UnlockWordList", "PageId", });
-    emu.grasscutter.net.proto.InfernceWordInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "PageId", "UnlockWordList", });
+    emu.grasscutter.net.proto.InferenceWordInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InferenceWordInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InferenceWordInfoOuterClass.java
new file mode 100644
index 000000000..3e32fbeff
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InferenceWordInfoOuterClass.java
@@ -0,0 +1,821 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InferenceWordInfo.proto
+
+package emu.grasscutter.net.proto;
+
+public final class InferenceWordInfoOuterClass {
+  private InferenceWordInfoOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface InferenceWordInfoOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:InferenceWordInfo)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool DHBPEBDBMNK = 1;</code>
+     * @return The dHBPEBDBMNK.
+     */
+    boolean getDHBPEBDBMNK();
+
+    /**
+     * <code>bool CAJHCPIPBOO = 2;</code>
+     * @return The cAJHCPIPBOO.
+     */
+    boolean getCAJHCPIPBOO();
+
+    /**
+     * <code>uint32 word_id = 4;</code>
+     * @return The wordId.
+     */
+    int getWordId();
+
+    /**
+     * <code>uint32 unlock_by_word_id = 5;</code>
+     * @return The unlockByWordId.
+     */
+    int getUnlockByWordId();
+
+    /**
+     * <code>bool ENFPKOPNHKK = 11;</code>
+     * @return The eNFPKOPNHKK.
+     */
+    boolean getENFPKOPNHKK();
+  }
+  /**
+   * Protobuf type {@code InferenceWordInfo}
+   */
+  public static final class InferenceWordInfo extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:InferenceWordInfo)
+      InferenceWordInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use InferenceWordInfo.newBuilder() to construct.
+    private InferenceWordInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private InferenceWordInfo() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new InferenceWordInfo();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private InferenceWordInfo(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              dHBPEBDBMNK_ = input.readBool();
+              break;
+            }
+            case 16: {
+
+              cAJHCPIPBOO_ = input.readBool();
+              break;
+            }
+            case 32: {
+
+              wordId_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              unlockByWordId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              eNFPKOPNHKK_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.internal_static_InferenceWordInfo_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.internal_static_InferenceWordInfo_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.class, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder.class);
+    }
+
+    public static final int DHBPEBDBMNK_FIELD_NUMBER = 1;
+    private boolean dHBPEBDBMNK_;
+    /**
+     * <code>bool DHBPEBDBMNK = 1;</code>
+     * @return The dHBPEBDBMNK.
+     */
+    @java.lang.Override
+    public boolean getDHBPEBDBMNK() {
+      return dHBPEBDBMNK_;
+    }
+
+    public static final int CAJHCPIPBOO_FIELD_NUMBER = 2;
+    private boolean cAJHCPIPBOO_;
+    /**
+     * <code>bool CAJHCPIPBOO = 2;</code>
+     * @return The cAJHCPIPBOO.
+     */
+    @java.lang.Override
+    public boolean getCAJHCPIPBOO() {
+      return cAJHCPIPBOO_;
+    }
+
+    public static final int WORD_ID_FIELD_NUMBER = 4;
+    private int wordId_;
+    /**
+     * <code>uint32 word_id = 4;</code>
+     * @return The wordId.
+     */
+    @java.lang.Override
+    public int getWordId() {
+      return wordId_;
+    }
+
+    public static final int UNLOCK_BY_WORD_ID_FIELD_NUMBER = 5;
+    private int unlockByWordId_;
+    /**
+     * <code>uint32 unlock_by_word_id = 5;</code>
+     * @return The unlockByWordId.
+     */
+    @java.lang.Override
+    public int getUnlockByWordId() {
+      return unlockByWordId_;
+    }
+
+    public static final int ENFPKOPNHKK_FIELD_NUMBER = 11;
+    private boolean eNFPKOPNHKK_;
+    /**
+     * <code>bool ENFPKOPNHKK = 11;</code>
+     * @return The eNFPKOPNHKK.
+     */
+    @java.lang.Override
+    public boolean getENFPKOPNHKK() {
+      return eNFPKOPNHKK_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (dHBPEBDBMNK_ != false) {
+        output.writeBool(1, dHBPEBDBMNK_);
+      }
+      if (cAJHCPIPBOO_ != false) {
+        output.writeBool(2, cAJHCPIPBOO_);
+      }
+      if (wordId_ != 0) {
+        output.writeUInt32(4, wordId_);
+      }
+      if (unlockByWordId_ != 0) {
+        output.writeUInt32(5, unlockByWordId_);
+      }
+      if (eNFPKOPNHKK_ != false) {
+        output.writeBool(11, eNFPKOPNHKK_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (dHBPEBDBMNK_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1, dHBPEBDBMNK_);
+      }
+      if (cAJHCPIPBOO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(2, cAJHCPIPBOO_);
+      }
+      if (wordId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, wordId_);
+      }
+      if (unlockByWordId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, unlockByWordId_);
+      }
+      if (eNFPKOPNHKK_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, eNFPKOPNHKK_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo other = (emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo) obj;
+
+      if (getDHBPEBDBMNK()
+          != other.getDHBPEBDBMNK()) return false;
+      if (getCAJHCPIPBOO()
+          != other.getCAJHCPIPBOO()) return false;
+      if (getWordId()
+          != other.getWordId()) return false;
+      if (getUnlockByWordId()
+          != other.getUnlockByWordId()) return false;
+      if (getENFPKOPNHKK()
+          != other.getENFPKOPNHKK()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DHBPEBDBMNK_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getDHBPEBDBMNK());
+      hash = (37 * hash) + CAJHCPIPBOO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCAJHCPIPBOO());
+      hash = (37 * hash) + WORD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getWordId();
+      hash = (37 * hash) + UNLOCK_BY_WORD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getUnlockByWordId();
+      hash = (37 * hash) + ENFPKOPNHKK_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getENFPKOPNHKK());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code InferenceWordInfo}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:InferenceWordInfo)
+        emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfoOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.internal_static_InferenceWordInfo_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.internal_static_InferenceWordInfo_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.class, emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        dHBPEBDBMNK_ = false;
+
+        cAJHCPIPBOO_ = false;
+
+        wordId_ = 0;
+
+        unlockByWordId_ = 0;
+
+        eNFPKOPNHKK_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.internal_static_InferenceWordInfo_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo build() {
+        emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo buildPartial() {
+        emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo result = new emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo(this);
+        result.dHBPEBDBMNK_ = dHBPEBDBMNK_;
+        result.cAJHCPIPBOO_ = cAJHCPIPBOO_;
+        result.wordId_ = wordId_;
+        result.unlockByWordId_ = unlockByWordId_;
+        result.eNFPKOPNHKK_ = eNFPKOPNHKK_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo) {
+          return mergeFrom((emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo other) {
+        if (other == emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo.getDefaultInstance()) return this;
+        if (other.getDHBPEBDBMNK() != false) {
+          setDHBPEBDBMNK(other.getDHBPEBDBMNK());
+        }
+        if (other.getCAJHCPIPBOO() != false) {
+          setCAJHCPIPBOO(other.getCAJHCPIPBOO());
+        }
+        if (other.getWordId() != 0) {
+          setWordId(other.getWordId());
+        }
+        if (other.getUnlockByWordId() != 0) {
+          setUnlockByWordId(other.getUnlockByWordId());
+        }
+        if (other.getENFPKOPNHKK() != false) {
+          setENFPKOPNHKK(other.getENFPKOPNHKK());
+        }
+        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.InferenceWordInfoOuterClass.InferenceWordInfo parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean dHBPEBDBMNK_ ;
+      /**
+       * <code>bool DHBPEBDBMNK = 1;</code>
+       * @return The dHBPEBDBMNK.
+       */
+      @java.lang.Override
+      public boolean getDHBPEBDBMNK() {
+        return dHBPEBDBMNK_;
+      }
+      /**
+       * <code>bool DHBPEBDBMNK = 1;</code>
+       * @param value The dHBPEBDBMNK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDHBPEBDBMNK(boolean value) {
+        
+        dHBPEBDBMNK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool DHBPEBDBMNK = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDHBPEBDBMNK() {
+        
+        dHBPEBDBMNK_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean cAJHCPIPBOO_ ;
+      /**
+       * <code>bool CAJHCPIPBOO = 2;</code>
+       * @return The cAJHCPIPBOO.
+       */
+      @java.lang.Override
+      public boolean getCAJHCPIPBOO() {
+        return cAJHCPIPBOO_;
+      }
+      /**
+       * <code>bool CAJHCPIPBOO = 2;</code>
+       * @param value The cAJHCPIPBOO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCAJHCPIPBOO(boolean value) {
+        
+        cAJHCPIPBOO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool CAJHCPIPBOO = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCAJHCPIPBOO() {
+        
+        cAJHCPIPBOO_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int wordId_ ;
+      /**
+       * <code>uint32 word_id = 4;</code>
+       * @return The wordId.
+       */
+      @java.lang.Override
+      public int getWordId() {
+        return wordId_;
+      }
+      /**
+       * <code>uint32 word_id = 4;</code>
+       * @param value The wordId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWordId(int value) {
+        
+        wordId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 word_id = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWordId() {
+        
+        wordId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int unlockByWordId_ ;
+      /**
+       * <code>uint32 unlock_by_word_id = 5;</code>
+       * @return The unlockByWordId.
+       */
+      @java.lang.Override
+      public int getUnlockByWordId() {
+        return unlockByWordId_;
+      }
+      /**
+       * <code>uint32 unlock_by_word_id = 5;</code>
+       * @param value The unlockByWordId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockByWordId(int value) {
+        
+        unlockByWordId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 unlock_by_word_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockByWordId() {
+        
+        unlockByWordId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean eNFPKOPNHKK_ ;
+      /**
+       * <code>bool ENFPKOPNHKK = 11;</code>
+       * @return The eNFPKOPNHKK.
+       */
+      @java.lang.Override
+      public boolean getENFPKOPNHKK() {
+        return eNFPKOPNHKK_;
+      }
+      /**
+       * <code>bool ENFPKOPNHKK = 11;</code>
+       * @param value The eNFPKOPNHKK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setENFPKOPNHKK(boolean value) {
+        
+        eNFPKOPNHKK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool ENFPKOPNHKK = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearENFPKOPNHKK() {
+        
+        eNFPKOPNHKK_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:InferenceWordInfo)
+    }
+
+    // @@protoc_insertion_point(class_scope:InferenceWordInfo)
+    private static final emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo();
+    }
+
+    public static emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<InferenceWordInfo>
+        PARSER = new com.google.protobuf.AbstractParser<InferenceWordInfo>() {
+      @java.lang.Override
+      public InferenceWordInfo parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new InferenceWordInfo(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<InferenceWordInfo> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<InferenceWordInfo> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.InferenceWordInfoOuterClass.InferenceWordInfo getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_InferenceWordInfo_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_InferenceWordInfo_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\027InferenceWordInfo.proto\"~\n\021InferenceWo" +
+      "rdInfo\022\023\n\013DHBPEBDBMNK\030\001 \001(\010\022\023\n\013CAJHCPIPB" +
+      "OO\030\002 \001(\010\022\017\n\007word_id\030\004 \001(\r\022\031\n\021unlock_by_w" +
+      "ord_id\030\005 \001(\r\022\023\n\013ENFPKOPNHKK\030\013 \001(\010B\033\n\031emu" +
+      ".grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_InferenceWordInfo_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_InferenceWordInfo_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_InferenceWordInfo_descriptor,
+        new java.lang.String[] { "DHBPEBDBMNK", "CAJHCPIPBOO", "WordId", "UnlockByWordId", "ENFPKOPNHKK", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InterOpTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InterOpTypeOuterClass.java
index e27209871..3c636f605 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InterOpTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InterOpTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class InterOpTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: BGICOOCNDKD
-   * </pre>
-   *
    * Protobuf enum {@code InterOpType}
    */
   public enum InterOpType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InteractTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InteractTypeOuterClass.java
index 14e8ede37..c46198944 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InteractTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InteractTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class InteractTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: MMHNBMOLJBI
-   * </pre>
-   *
    * Protobuf enum {@code InteractType}
    */
   public enum InteractType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationMonsterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationMonsterOuterClass.java
index 587093200..3839e1644 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationMonsterOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationMonsterOuterClass.java
@@ -19,141 +19,159 @@ public final class InvestigationMonsterOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     * @return Whether the weeklyBossResinDiscountInfo field is set.
-     */
-    boolean hasWeeklyBossResinDiscountInfo();
-    /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     * @return The weeklyBossResinDiscountInfo.
-     */
-    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo();
-    /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     */
-    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder();
-
-    /**
-     * <code>uint32 monster_id = 564;</code>
-     * @return The monsterId.
-     */
-    int getMonsterId();
-
-    /**
-     * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-     * @return The enum numeric value on the wire for lockState.
-     */
-    int getLockStateValue();
-    /**
-     * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-     * @return The lockState.
-     */
-    emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState getLockState();
-
-    /**
-     * <code>bool is_area_locked = 6;</code>
-     * @return The isAreaLocked.
-     */
-    boolean getIsAreaLocked();
-
-    /**
-     * <code>.Vector pos = 12;</code>
-     * @return Whether the pos field is set.
-     */
-    boolean hasPos();
-    /**
-     * <code>.Vector pos = 12;</code>
-     * @return The pos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
-    /**
-     * <code>.Vector pos = 12;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
-
-    /**
-     * <code>uint32 resin = 5;</code>
-     * @return The resin.
-     */
-    int getResin();
-
-    /**
-     * <code>uint32 refresh_interval = 11;</code>
-     * @return The refreshInterval.
-     */
-    int getRefreshInterval();
-
-    /**
-     * <code>uint32 level = 8;</code>
-     * @return The level.
-     */
-    int getLevel();
-
-    /**
-     * <code>uint32 max_boss_chest_num = 14;</code>
-     * @return The maxBossChestNum.
-     */
-    int getMaxBossChestNum();
-
-    /**
-     * <code>uint32 boss_chest_num = 15;</code>
-     * @return The bossChestNum.
-     */
-    int getBossChestNum();
-
-    /**
-     * <code>uint32 next_refresh_time = 2;</code>
-     * @return The nextRefreshTime.
-     */
-    int getNextRefreshTime();
-
-    /**
-     * <code>uint32 HJMMAOMEHOL = 326;</code>
-     * @return The hJMMAOMEHOL.
-     */
-    int getHJMMAOMEHOL();
-
-    /**
-     * <code>uint32 scene_id = 4;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
-     * <code>uint32 id = 3;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     int getId();
 
     /**
-     * <code>uint32 city_id = 10;</code>
-     * @return The cityId.
-     */
-    int getCityId();
-
-    /**
-     * <code>bool is_alive = 13;</code>
+     * <code>bool is_alive = 2;</code>
      * @return The isAlive.
      */
     boolean getIsAlive();
 
     /**
-     * <code>uint32 group_id = 34;</code>
+     * <pre>
+     * 6
+     * </pre>
+     *
+     * <code>uint32 boss_chest_num = 3;</code>
+     * @return The bossChestNum.
+     */
+    int getBossChestNum();
+
+    /**
+     * <code>uint32 resin = 4;</code>
+     * @return The resin.
+     */
+    int getResin();
+
+    /**
+     * <code>bool is_area_locked = 5;</code>
+     * @return The isAreaLocked.
+     */
+    boolean getIsAreaLocked();
+
+    /**
+     * <pre>
+     * 3
+     * </pre>
+     *
+     * <code>uint32 max_boss_chest_num = 6;</code>
+     * @return The maxBossChestNum.
+     */
+    int getMaxBossChestNum();
+
+    /**
+     * <code>uint32 next_refresh_time = 7;</code>
+     * @return The nextRefreshTime.
+     */
+    int getNextRefreshTime();
+
+    /**
+     * <code>uint32 city_id = 8;</code>
+     * @return The cityId.
+     */
+    int getCityId();
+
+    /**
+     * <pre>
+     * 12
+     * </pre>
+     *
+     * <code>uint32 next_boss_chest_refresh_time = 9;</code>
+     * @return The nextBossChestRefreshTime.
+     */
+    int getNextBossChestRefreshTime();
+
+    /**
+     * <code>uint32 scene_id = 10;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <code>.Vector pos = 11;</code>
+     * @return Whether the pos field is set.
+     */
+    boolean hasPos();
+    /**
+     * <code>.Vector pos = 11;</code>
+     * @return The pos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
+    /**
+     * <code>.Vector pos = 11;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+
+    /**
+     * <pre>
+     * 9
+     * </pre>
+     *
+     * <code>uint32 refresh_interval = 12;</code>
+     * @return The refreshInterval.
+     */
+    int getRefreshInterval();
+
+    /**
+     * <code>.LockState lock_state = 13;</code>
+     * @return The enum numeric value on the wire for lockState.
+     */
+    int getLockStateValue();
+    /**
+     * <code>.LockState lock_state = 13;</code>
+     * @return The lockState.
+     */
+    emu.grasscutter.net.proto.LockStateOuterClass.LockState getLockState();
+
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     * @return Whether the weeklyBossResinDiscountInfo field is set.
+     */
+    boolean hasWeeklyBossResinDiscountInfo();
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     * @return The weeklyBossResinDiscountInfo.
+     */
+    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo();
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     */
+    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder();
+
+    /**
+     * <code>uint32 level = 15;</code>
+     * @return The level.
+     */
+    int getLevel();
+
+    /**
+     * <code>bool IDNKJEEDOGC = 533;</code>
+     * @return The iDNKJEEDOGC.
+     */
+    boolean getIDNKJEEDOGC();
+
+    /**
+     * <code>uint32 monster_id = 1129;</code>
+     * @return The monsterId.
+     */
+    int getMonsterId();
+
+    /**
+     * <code>uint32 group_id = 1335;</code>
      * @return The groupId.
      */
     int getGroupId();
 
     /**
-     * <code>uint32 EOLGBLICEIA = 9;</code>
-     * @return The eOLGBLICEIA.
+     * <code>uint32 AGIENJJKPBE = 1612;</code>
+     * @return The aGIENJJKPBE.
      */
-    int getEOLGBLICEIA();
+    int getAGIENJJKPBE();
   }
   /**
-   * <pre>
-   * Obf: GAEBGPCOKLO
-   * </pre>
-   *
    * Protobuf type {@code InvestigationMonster}
    */
   public static final class InvestigationMonster extends
@@ -200,70 +218,56 @@ public final class InvestigationMonsterOuterClass {
               done = true;
               break;
             case 8: {
-              int rawValue = input.readEnum();
-
-              lockState_ = rawValue;
-              break;
-            }
-            case 16: {
-
-              nextRefreshTime_ = input.readUInt32();
-              break;
-            }
-            case 24: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 16: {
 
-              sceneId_ = input.readUInt32();
+              isAlive_ = input.readBool();
               break;
             }
-            case 40: {
+            case 24: {
+
+              bossChestNum_ = input.readUInt32();
+              break;
+            }
+            case 32: {
 
               resin_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 40: {
 
               isAreaLocked_ = input.readBool();
               break;
             }
-            case 58: {
-              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder subBuilder = null;
-              if (weeklyBossResinDiscountInfo_ != null) {
-                subBuilder = weeklyBossResinDiscountInfo_.toBuilder();
-              }
-              weeklyBossResinDiscountInfo_ = input.readMessage(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(weeklyBossResinDiscountInfo_);
-                weeklyBossResinDiscountInfo_ = subBuilder.buildPartial();
-              }
+            case 48: {
 
+              maxBossChestNum_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              nextRefreshTime_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              level_ = input.readUInt32();
+              cityId_ = input.readUInt32();
               break;
             }
             case 72: {
 
-              eOLGBLICEIA_ = input.readUInt32();
+              nextBossChestRefreshTime_ = input.readUInt32();
               break;
             }
             case 80: {
 
-              cityId_ = input.readUInt32();
+              sceneId_ = input.readUInt32();
               break;
             }
-            case 88: {
-
-              refreshInterval_ = input.readUInt32();
-              break;
-            }
-            case 98: {
+            case 90: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -276,34 +280,53 @@ public final class InvestigationMonsterOuterClass {
 
               break;
             }
-            case 104: {
+            case 96: {
 
-              isAlive_ = input.readBool();
+              refreshInterval_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 104: {
+              int rawValue = input.readEnum();
+
+              lockState_ = rawValue;
+              break;
+            }
+            case 114: {
+              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder subBuilder = null;
+              if (weeklyBossResinDiscountInfo_ != null) {
+                subBuilder = weeklyBossResinDiscountInfo_.toBuilder();
+              }
+              weeklyBossResinDiscountInfo_ = input.readMessage(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(weeklyBossResinDiscountInfo_);
+                weeklyBossResinDiscountInfo_ = subBuilder.buildPartial();
+              }
 
-              maxBossChestNum_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              bossChestNum_ = input.readUInt32();
+              level_ = input.readUInt32();
               break;
             }
-            case 272: {
+            case 4264: {
+
+              iDNKJEEDOGC_ = input.readBool();
+              break;
+            }
+            case 9032: {
+
+              monsterId_ = input.readUInt32();
+              break;
+            }
+            case 10680: {
 
               groupId_ = input.readUInt32();
               break;
             }
-            case 2608: {
+            case 12896: {
 
-              hJMMAOMEHOL_ = input.readUInt32();
-              break;
-            }
-            case 4512: {
-
-              monsterId_ = input.readUInt32();
+              aGIENJJKPBE_ = input.readUInt32();
               break;
             }
             default: {
@@ -338,303 +361,10 @@ public final class InvestigationMonsterOuterClass {
               emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.class, emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.Builder.class);
     }
 
-    /**
-     * <pre>
-     * Obf: KAHDDLDLNOG
-     * </pre>
-     *
-     * Protobuf enum {@code InvestigationMonster.LockState}
-     */
-    public enum LockState
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>LOCK_NONE = 0;</code>
-       */
-      LOCK_NONE(0),
-      /**
-       * <code>LOCK_QUEST = 1;</code>
-       */
-      LOCK_QUEST(1),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>LOCK_NONE = 0;</code>
-       */
-      public static final int LOCK_NONE_VALUE = 0;
-      /**
-       * <code>LOCK_QUEST = 1;</code>
-       */
-      public static final int LOCK_QUEST_VALUE = 1;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static LockState valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static LockState forNumber(int value) {
-        switch (value) {
-          case 0: return LOCK_NONE;
-          case 1: return LOCK_QUEST;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<LockState>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          LockState> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<LockState>() {
-              public LockState findValueByNumber(int number) {
-                return LockState.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final LockState[] VALUES = values();
-
-      public static LockState valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private LockState(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:InvestigationMonster.LockState)
-    }
-
-    public static final int WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
-    /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     * @return Whether the weeklyBossResinDiscountInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWeeklyBossResinDiscountInfo() {
-      return weeklyBossResinDiscountInfo_ != null;
-    }
-    /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     * @return The weeklyBossResinDiscountInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() {
-      return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
-    }
-    /**
-     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() {
-      return getWeeklyBossResinDiscountInfo();
-    }
-
-    public static final int MONSTER_ID_FIELD_NUMBER = 564;
-    private int monsterId_;
-    /**
-     * <code>uint32 monster_id = 564;</code>
-     * @return The monsterId.
-     */
-    @java.lang.Override
-    public int getMonsterId() {
-      return monsterId_;
-    }
-
-    public static final int LOCK_STATE_FIELD_NUMBER = 1;
-    private int lockState_;
-    /**
-     * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-     * @return The enum numeric value on the wire for lockState.
-     */
-    @java.lang.Override public int getLockStateValue() {
-      return lockState_;
-    }
-    /**
-     * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-     * @return The lockState.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState getLockState() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState result = emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.valueOf(lockState_);
-      return result == null ? emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.UNRECOGNIZED : result;
-    }
-
-    public static final int IS_AREA_LOCKED_FIELD_NUMBER = 6;
-    private boolean isAreaLocked_;
-    /**
-     * <code>bool is_area_locked = 6;</code>
-     * @return The isAreaLocked.
-     */
-    @java.lang.Override
-    public boolean getIsAreaLocked() {
-      return isAreaLocked_;
-    }
-
-    public static final int POS_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-    /**
-     * <code>.Vector pos = 12;</code>
-     * @return Whether the pos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPos() {
-      return pos_ != null;
-    }
-    /**
-     * <code>.Vector pos = 12;</code>
-     * @return The pos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
-    }
-
-    public static final int RESIN_FIELD_NUMBER = 5;
-    private int resin_;
-    /**
-     * <code>uint32 resin = 5;</code>
-     * @return The resin.
-     */
-    @java.lang.Override
-    public int getResin() {
-      return resin_;
-    }
-
-    public static final int REFRESH_INTERVAL_FIELD_NUMBER = 11;
-    private int refreshInterval_;
-    /**
-     * <code>uint32 refresh_interval = 11;</code>
-     * @return The refreshInterval.
-     */
-    @java.lang.Override
-    public int getRefreshInterval() {
-      return refreshInterval_;
-    }
-
-    public static final int LEVEL_FIELD_NUMBER = 8;
-    private int level_;
-    /**
-     * <code>uint32 level = 8;</code>
-     * @return The level.
-     */
-    @java.lang.Override
-    public int getLevel() {
-      return level_;
-    }
-
-    public static final int MAX_BOSS_CHEST_NUM_FIELD_NUMBER = 14;
-    private int maxBossChestNum_;
-    /**
-     * <code>uint32 max_boss_chest_num = 14;</code>
-     * @return The maxBossChestNum.
-     */
-    @java.lang.Override
-    public int getMaxBossChestNum() {
-      return maxBossChestNum_;
-    }
-
-    public static final int BOSS_CHEST_NUM_FIELD_NUMBER = 15;
-    private int bossChestNum_;
-    /**
-     * <code>uint32 boss_chest_num = 15;</code>
-     * @return The bossChestNum.
-     */
-    @java.lang.Override
-    public int getBossChestNum() {
-      return bossChestNum_;
-    }
-
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 2;
-    private int nextRefreshTime_;
-    /**
-     * <code>uint32 next_refresh_time = 2;</code>
-     * @return The nextRefreshTime.
-     */
-    @java.lang.Override
-    public int getNextRefreshTime() {
-      return nextRefreshTime_;
-    }
-
-    public static final int HJMMAOMEHOL_FIELD_NUMBER = 326;
-    private int hJMMAOMEHOL_;
-    /**
-     * <code>uint32 HJMMAOMEHOL = 326;</code>
-     * @return The hJMMAOMEHOL.
-     */
-    @java.lang.Override
-    public int getHJMMAOMEHOL() {
-      return hJMMAOMEHOL_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 4;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 4;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
-    public static final int ID_FIELD_NUMBER = 3;
+    public static final int ID_FIELD_NUMBER = 1;
     private int id_;
     /**
-     * <code>uint32 id = 3;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -642,21 +372,10 @@ public final class InvestigationMonsterOuterClass {
       return id_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 10;
-    private int cityId_;
-    /**
-     * <code>uint32 city_id = 10;</code>
-     * @return The cityId.
-     */
-    @java.lang.Override
-    public int getCityId() {
-      return cityId_;
-    }
-
-    public static final int IS_ALIVE_FIELD_NUMBER = 13;
+    public static final int IS_ALIVE_FIELD_NUMBER = 2;
     private boolean isAlive_;
     /**
-     * <code>bool is_alive = 13;</code>
+     * <code>bool is_alive = 2;</code>
      * @return The isAlive.
      */
     @java.lang.Override
@@ -664,10 +383,229 @@ public final class InvestigationMonsterOuterClass {
       return isAlive_;
     }
 
-    public static final int GROUP_ID_FIELD_NUMBER = 34;
+    public static final int BOSS_CHEST_NUM_FIELD_NUMBER = 3;
+    private int bossChestNum_;
+    /**
+     * <pre>
+     * 6
+     * </pre>
+     *
+     * <code>uint32 boss_chest_num = 3;</code>
+     * @return The bossChestNum.
+     */
+    @java.lang.Override
+    public int getBossChestNum() {
+      return bossChestNum_;
+    }
+
+    public static final int RESIN_FIELD_NUMBER = 4;
+    private int resin_;
+    /**
+     * <code>uint32 resin = 4;</code>
+     * @return The resin.
+     */
+    @java.lang.Override
+    public int getResin() {
+      return resin_;
+    }
+
+    public static final int IS_AREA_LOCKED_FIELD_NUMBER = 5;
+    private boolean isAreaLocked_;
+    /**
+     * <code>bool is_area_locked = 5;</code>
+     * @return The isAreaLocked.
+     */
+    @java.lang.Override
+    public boolean getIsAreaLocked() {
+      return isAreaLocked_;
+    }
+
+    public static final int MAX_BOSS_CHEST_NUM_FIELD_NUMBER = 6;
+    private int maxBossChestNum_;
+    /**
+     * <pre>
+     * 3
+     * </pre>
+     *
+     * <code>uint32 max_boss_chest_num = 6;</code>
+     * @return The maxBossChestNum.
+     */
+    @java.lang.Override
+    public int getMaxBossChestNum() {
+      return maxBossChestNum_;
+    }
+
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 7;
+    private int nextRefreshTime_;
+    /**
+     * <code>uint32 next_refresh_time = 7;</code>
+     * @return The nextRefreshTime.
+     */
+    @java.lang.Override
+    public int getNextRefreshTime() {
+      return nextRefreshTime_;
+    }
+
+    public static final int CITY_ID_FIELD_NUMBER = 8;
+    private int cityId_;
+    /**
+     * <code>uint32 city_id = 8;</code>
+     * @return The cityId.
+     */
+    @java.lang.Override
+    public int getCityId() {
+      return cityId_;
+    }
+
+    public static final int NEXT_BOSS_CHEST_REFRESH_TIME_FIELD_NUMBER = 9;
+    private int nextBossChestRefreshTime_;
+    /**
+     * <pre>
+     * 12
+     * </pre>
+     *
+     * <code>uint32 next_boss_chest_refresh_time = 9;</code>
+     * @return The nextBossChestRefreshTime.
+     */
+    @java.lang.Override
+    public int getNextBossChestRefreshTime() {
+      return nextBossChestRefreshTime_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 10;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 10;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int POS_FIELD_NUMBER = 11;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    /**
+     * <code>.Vector pos = 11;</code>
+     * @return Whether the pos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPos() {
+      return pos_ != null;
+    }
+    /**
+     * <code>.Vector pos = 11;</code>
+     * @return The pos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
+    }
+
+    public static final int REFRESH_INTERVAL_FIELD_NUMBER = 12;
+    private int refreshInterval_;
+    /**
+     * <pre>
+     * 9
+     * </pre>
+     *
+     * <code>uint32 refresh_interval = 12;</code>
+     * @return The refreshInterval.
+     */
+    @java.lang.Override
+    public int getRefreshInterval() {
+      return refreshInterval_;
+    }
+
+    public static final int LOCK_STATE_FIELD_NUMBER = 13;
+    private int lockState_;
+    /**
+     * <code>.LockState lock_state = 13;</code>
+     * @return The enum numeric value on the wire for lockState.
+     */
+    @java.lang.Override public int getLockStateValue() {
+      return lockState_;
+    }
+    /**
+     * <code>.LockState lock_state = 13;</code>
+     * @return The lockState.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.LockStateOuterClass.LockState getLockState() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.LockStateOuterClass.LockState result = emu.grasscutter.net.proto.LockStateOuterClass.LockState.valueOf(lockState_);
+      return result == null ? emu.grasscutter.net.proto.LockStateOuterClass.LockState.UNRECOGNIZED : result;
+    }
+
+    public static final int WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER = 14;
+    private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     * @return Whether the weeklyBossResinDiscountInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasWeeklyBossResinDiscountInfo() {
+      return weeklyBossResinDiscountInfo_ != null;
+    }
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     * @return The weeklyBossResinDiscountInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() {
+      return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
+    }
+    /**
+     * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() {
+      return getWeeklyBossResinDiscountInfo();
+    }
+
+    public static final int LEVEL_FIELD_NUMBER = 15;
+    private int level_;
+    /**
+     * <code>uint32 level = 15;</code>
+     * @return The level.
+     */
+    @java.lang.Override
+    public int getLevel() {
+      return level_;
+    }
+
+    public static final int IDNKJEEDOGC_FIELD_NUMBER = 533;
+    private boolean iDNKJEEDOGC_;
+    /**
+     * <code>bool IDNKJEEDOGC = 533;</code>
+     * @return The iDNKJEEDOGC.
+     */
+    @java.lang.Override
+    public boolean getIDNKJEEDOGC() {
+      return iDNKJEEDOGC_;
+    }
+
+    public static final int MONSTER_ID_FIELD_NUMBER = 1129;
+    private int monsterId_;
+    /**
+     * <code>uint32 monster_id = 1129;</code>
+     * @return The monsterId.
+     */
+    @java.lang.Override
+    public int getMonsterId() {
+      return monsterId_;
+    }
+
+    public static final int GROUP_ID_FIELD_NUMBER = 1335;
     private int groupId_;
     /**
-     * <code>uint32 group_id = 34;</code>
+     * <code>uint32 group_id = 1335;</code>
      * @return The groupId.
      */
     @java.lang.Override
@@ -675,15 +613,15 @@ public final class InvestigationMonsterOuterClass {
       return groupId_;
     }
 
-    public static final int EOLGBLICEIA_FIELD_NUMBER = 9;
-    private int eOLGBLICEIA_;
+    public static final int AGIENJJKPBE_FIELD_NUMBER = 1612;
+    private int aGIENJJKPBE_;
     /**
-     * <code>uint32 EOLGBLICEIA = 9;</code>
-     * @return The eOLGBLICEIA.
+     * <code>uint32 AGIENJJKPBE = 1612;</code>
+     * @return The aGIENJJKPBE.
      */
     @java.lang.Override
-    public int getEOLGBLICEIA() {
-      return eOLGBLICEIA_;
+    public int getAGIENJJKPBE() {
+      return aGIENJJKPBE_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -700,59 +638,62 @@ public final class InvestigationMonsterOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (lockState_ != emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.LOCK_NONE.getNumber()) {
-        output.writeEnum(1, lockState_);
-      }
-      if (nextRefreshTime_ != 0) {
-        output.writeUInt32(2, nextRefreshTime_);
-      }
       if (id_ != 0) {
-        output.writeUInt32(3, id_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(4, sceneId_);
-      }
-      if (resin_ != 0) {
-        output.writeUInt32(5, resin_);
-      }
-      if (isAreaLocked_ != false) {
-        output.writeBool(6, isAreaLocked_);
-      }
-      if (weeklyBossResinDiscountInfo_ != null) {
-        output.writeMessage(7, getWeeklyBossResinDiscountInfo());
-      }
-      if (level_ != 0) {
-        output.writeUInt32(8, level_);
-      }
-      if (eOLGBLICEIA_ != 0) {
-        output.writeUInt32(9, eOLGBLICEIA_);
-      }
-      if (cityId_ != 0) {
-        output.writeUInt32(10, cityId_);
-      }
-      if (refreshInterval_ != 0) {
-        output.writeUInt32(11, refreshInterval_);
-      }
-      if (pos_ != null) {
-        output.writeMessage(12, getPos());
+        output.writeUInt32(1, id_);
       }
       if (isAlive_ != false) {
-        output.writeBool(13, isAlive_);
-      }
-      if (maxBossChestNum_ != 0) {
-        output.writeUInt32(14, maxBossChestNum_);
+        output.writeBool(2, isAlive_);
       }
       if (bossChestNum_ != 0) {
-        output.writeUInt32(15, bossChestNum_);
+        output.writeUInt32(3, bossChestNum_);
       }
-      if (groupId_ != 0) {
-        output.writeUInt32(34, groupId_);
+      if (resin_ != 0) {
+        output.writeUInt32(4, resin_);
       }
-      if (hJMMAOMEHOL_ != 0) {
-        output.writeUInt32(326, hJMMAOMEHOL_);
+      if (isAreaLocked_ != false) {
+        output.writeBool(5, isAreaLocked_);
+      }
+      if (maxBossChestNum_ != 0) {
+        output.writeUInt32(6, maxBossChestNum_);
+      }
+      if (nextRefreshTime_ != 0) {
+        output.writeUInt32(7, nextRefreshTime_);
+      }
+      if (cityId_ != 0) {
+        output.writeUInt32(8, cityId_);
+      }
+      if (nextBossChestRefreshTime_ != 0) {
+        output.writeUInt32(9, nextBossChestRefreshTime_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(10, sceneId_);
+      }
+      if (pos_ != null) {
+        output.writeMessage(11, getPos());
+      }
+      if (refreshInterval_ != 0) {
+        output.writeUInt32(12, refreshInterval_);
+      }
+      if (lockState_ != emu.grasscutter.net.proto.LockStateOuterClass.LockState.LOCK_NONE.getNumber()) {
+        output.writeEnum(13, lockState_);
+      }
+      if (weeklyBossResinDiscountInfo_ != null) {
+        output.writeMessage(14, getWeeklyBossResinDiscountInfo());
+      }
+      if (level_ != 0) {
+        output.writeUInt32(15, level_);
+      }
+      if (iDNKJEEDOGC_ != false) {
+        output.writeBool(533, iDNKJEEDOGC_);
       }
       if (monsterId_ != 0) {
-        output.writeUInt32(564, monsterId_);
+        output.writeUInt32(1129, monsterId_);
+      }
+      if (groupId_ != 0) {
+        output.writeUInt32(1335, groupId_);
+      }
+      if (aGIENJJKPBE_ != 0) {
+        output.writeUInt32(1612, aGIENJJKPBE_);
       }
       unknownFields.writeTo(output);
     }
@@ -763,77 +704,81 @@ public final class InvestigationMonsterOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (lockState_ != emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.LOCK_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, lockState_);
-      }
-      if (nextRefreshTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, nextRefreshTime_);
-      }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, id_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, sceneId_);
-      }
-      if (resin_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, resin_);
-      }
-      if (isAreaLocked_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isAreaLocked_);
-      }
-      if (weeklyBossResinDiscountInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getWeeklyBossResinDiscountInfo());
-      }
-      if (level_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, level_);
-      }
-      if (eOLGBLICEIA_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, eOLGBLICEIA_);
-      }
-      if (cityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, cityId_);
-      }
-      if (refreshInterval_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, refreshInterval_);
-      }
-      if (pos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getPos());
+          .computeUInt32Size(1, id_);
       }
       if (isAlive_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isAlive_);
-      }
-      if (maxBossChestNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, maxBossChestNum_);
+          .computeBoolSize(2, isAlive_);
       }
       if (bossChestNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, bossChestNum_);
+          .computeUInt32Size(3, bossChestNum_);
       }
-      if (groupId_ != 0) {
+      if (resin_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(34, groupId_);
+          .computeUInt32Size(4, resin_);
       }
-      if (hJMMAOMEHOL_ != 0) {
+      if (isAreaLocked_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(326, hJMMAOMEHOL_);
+          .computeBoolSize(5, isAreaLocked_);
+      }
+      if (maxBossChestNum_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, maxBossChestNum_);
+      }
+      if (nextRefreshTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, nextRefreshTime_);
+      }
+      if (cityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, cityId_);
+      }
+      if (nextBossChestRefreshTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, nextBossChestRefreshTime_);
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, sceneId_);
+      }
+      if (pos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, getPos());
+      }
+      if (refreshInterval_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, refreshInterval_);
+      }
+      if (lockState_ != emu.grasscutter.net.proto.LockStateOuterClass.LockState.LOCK_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(13, lockState_);
+      }
+      if (weeklyBossResinDiscountInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getWeeklyBossResinDiscountInfo());
+      }
+      if (level_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, level_);
+      }
+      if (iDNKJEEDOGC_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(533, iDNKJEEDOGC_);
       }
       if (monsterId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(564, monsterId_);
+          .computeUInt32Size(1129, monsterId_);
+      }
+      if (groupId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1335, groupId_);
+      }
+      if (aGIENJJKPBE_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1612, aGIENJJKPBE_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -850,47 +795,49 @@ public final class InvestigationMonsterOuterClass {
       }
       emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster other = (emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster) obj;
 
-      if (hasWeeklyBossResinDiscountInfo() != other.hasWeeklyBossResinDiscountInfo()) return false;
-      if (hasWeeklyBossResinDiscountInfo()) {
-        if (!getWeeklyBossResinDiscountInfo()
-            .equals(other.getWeeklyBossResinDiscountInfo())) return false;
-      }
-      if (getMonsterId()
-          != other.getMonsterId()) return false;
-      if (lockState_ != other.lockState_) return false;
+      if (getId()
+          != other.getId()) return false;
+      if (getIsAlive()
+          != other.getIsAlive()) return false;
+      if (getBossChestNum()
+          != other.getBossChestNum()) return false;
+      if (getResin()
+          != other.getResin()) return false;
       if (getIsAreaLocked()
           != other.getIsAreaLocked()) return false;
+      if (getMaxBossChestNum()
+          != other.getMaxBossChestNum()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getCityId()
+          != other.getCityId()) return false;
+      if (getNextBossChestRefreshTime()
+          != other.getNextBossChestRefreshTime()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
-      if (getResin()
-          != other.getResin()) return false;
       if (getRefreshInterval()
           != other.getRefreshInterval()) return false;
+      if (lockState_ != other.lockState_) return false;
+      if (hasWeeklyBossResinDiscountInfo() != other.hasWeeklyBossResinDiscountInfo()) return false;
+      if (hasWeeklyBossResinDiscountInfo()) {
+        if (!getWeeklyBossResinDiscountInfo()
+            .equals(other.getWeeklyBossResinDiscountInfo())) return false;
+      }
       if (getLevel()
           != other.getLevel()) return false;
-      if (getMaxBossChestNum()
-          != other.getMaxBossChestNum()) return false;
-      if (getBossChestNum()
-          != other.getBossChestNum()) return false;
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
-      if (getHJMMAOMEHOL()
-          != other.getHJMMAOMEHOL()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
-      if (getId()
-          != other.getId()) return false;
-      if (getCityId()
-          != other.getCityId()) return false;
-      if (getIsAlive()
-          != other.getIsAlive()) return false;
+      if (getIDNKJEEDOGC()
+          != other.getIDNKJEEDOGC()) return false;
+      if (getMonsterId()
+          != other.getMonsterId()) return false;
       if (getGroupId()
           != other.getGroupId()) return false;
-      if (getEOLGBLICEIA()
-          != other.getEOLGBLICEIA()) return false;
+      if (getAGIENJJKPBE()
+          != other.getAGIENJJKPBE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -902,48 +849,51 @@ public final class InvestigationMonsterOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasWeeklyBossResinDiscountInfo()) {
-        hash = (37 * hash) + WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getWeeklyBossResinDiscountInfo().hashCode();
-      }
-      hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMonsterId();
-      hash = (37 * hash) + LOCK_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + lockState_;
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
+      hash = (37 * hash) + IS_ALIVE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsAlive());
+      hash = (37 * hash) + BOSS_CHEST_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getBossChestNum();
+      hash = (37 * hash) + RESIN_FIELD_NUMBER;
+      hash = (53 * hash) + getResin();
       hash = (37 * hash) + IS_AREA_LOCKED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsAreaLocked());
+      hash = (37 * hash) + MAX_BOSS_CHEST_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxBossChestNum();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCityId();
+      hash = (37 * hash) + NEXT_BOSS_CHEST_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextBossChestRefreshTime();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
-      hash = (37 * hash) + RESIN_FIELD_NUMBER;
-      hash = (53 * hash) + getResin();
       hash = (37 * hash) + REFRESH_INTERVAL_FIELD_NUMBER;
       hash = (53 * hash) + getRefreshInterval();
+      hash = (37 * hash) + LOCK_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + lockState_;
+      if (hasWeeklyBossResinDiscountInfo()) {
+        hash = (37 * hash) + WEEKLY_BOSS_RESIN_DISCOUNT_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getWeeklyBossResinDiscountInfo().hashCode();
+      }
       hash = (37 * hash) + LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getLevel();
-      hash = (37 * hash) + MAX_BOSS_CHEST_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxBossChestNum();
-      hash = (37 * hash) + BOSS_CHEST_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getBossChestNum();
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
-      hash = (37 * hash) + HJMMAOMEHOL_FIELD_NUMBER;
-      hash = (53 * hash) + getHJMMAOMEHOL();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId();
-      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCityId();
-      hash = (37 * hash) + IS_ALIVE_FIELD_NUMBER;
+      hash = (37 * hash) + IDNKJEEDOGC_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsAlive());
+          getIDNKJEEDOGC());
+      hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getMonsterId();
       hash = (37 * hash) + GROUP_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGroupId();
-      hash = (37 * hash) + EOLGBLICEIA_FIELD_NUMBER;
-      hash = (53 * hash) + getEOLGBLICEIA();
+      hash = (37 * hash) + AGIENJJKPBE_FIELD_NUMBER;
+      hash = (53 * hash) + getAGIENJJKPBE();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1040,10 +990,6 @@ public final class InvestigationMonsterOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GAEBGPCOKLO
-     * </pre>
-     *
      * Protobuf type {@code InvestigationMonster}
      */
     public static final class Builder extends
@@ -1081,49 +1027,51 @@ public final class InvestigationMonsterOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          weeklyBossResinDiscountInfo_ = null;
-        } else {
-          weeklyBossResinDiscountInfo_ = null;
-          weeklyBossResinDiscountInfoBuilder_ = null;
-        }
-        monsterId_ = 0;
+        id_ = 0;
 
-        lockState_ = 0;
+        isAlive_ = false;
+
+        bossChestNum_ = 0;
+
+        resin_ = 0;
 
         isAreaLocked_ = false;
 
+        maxBossChestNum_ = 0;
+
+        nextRefreshTime_ = 0;
+
+        cityId_ = 0;
+
+        nextBossChestRefreshTime_ = 0;
+
+        sceneId_ = 0;
+
         if (posBuilder_ == null) {
           pos_ = null;
         } else {
           pos_ = null;
           posBuilder_ = null;
         }
-        resin_ = 0;
-
         refreshInterval_ = 0;
 
+        lockState_ = 0;
+
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          weeklyBossResinDiscountInfo_ = null;
+        } else {
+          weeklyBossResinDiscountInfo_ = null;
+          weeklyBossResinDiscountInfoBuilder_ = null;
+        }
         level_ = 0;
 
-        maxBossChestNum_ = 0;
+        iDNKJEEDOGC_ = false;
 
-        bossChestNum_ = 0;
-
-        nextRefreshTime_ = 0;
-
-        hJMMAOMEHOL_ = 0;
-
-        sceneId_ = 0;
-
-        id_ = 0;
-
-        cityId_ = 0;
-
-        isAlive_ = false;
+        monsterId_ = 0;
 
         groupId_ = 0;
 
-        eOLGBLICEIA_ = 0;
+        aGIENJJKPBE_ = 0;
 
         return this;
       }
@@ -1151,32 +1099,33 @@ public final class InvestigationMonsterOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster buildPartial() {
         emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster result = new emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster(this);
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfo_;
-        } else {
-          result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfoBuilder_.build();
-        }
-        result.monsterId_ = monsterId_;
-        result.lockState_ = lockState_;
+        result.id_ = id_;
+        result.isAlive_ = isAlive_;
+        result.bossChestNum_ = bossChestNum_;
+        result.resin_ = resin_;
         result.isAreaLocked_ = isAreaLocked_;
+        result.maxBossChestNum_ = maxBossChestNum_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.cityId_ = cityId_;
+        result.nextBossChestRefreshTime_ = nextBossChestRefreshTime_;
+        result.sceneId_ = sceneId_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
-        result.resin_ = resin_;
         result.refreshInterval_ = refreshInterval_;
+        result.lockState_ = lockState_;
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfo_;
+        } else {
+          result.weeklyBossResinDiscountInfo_ = weeklyBossResinDiscountInfoBuilder_.build();
+        }
         result.level_ = level_;
-        result.maxBossChestNum_ = maxBossChestNum_;
-        result.bossChestNum_ = bossChestNum_;
-        result.nextRefreshTime_ = nextRefreshTime_;
-        result.hJMMAOMEHOL_ = hJMMAOMEHOL_;
-        result.sceneId_ = sceneId_;
-        result.id_ = id_;
-        result.cityId_ = cityId_;
-        result.isAlive_ = isAlive_;
+        result.iDNKJEEDOGC_ = iDNKJEEDOGC_;
+        result.monsterId_ = monsterId_;
         result.groupId_ = groupId_;
-        result.eOLGBLICEIA_ = eOLGBLICEIA_;
+        result.aGIENJJKPBE_ = aGIENJJKPBE_;
         onBuilt();
         return result;
       }
@@ -1225,59 +1174,62 @@ public final class InvestigationMonsterOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster other) {
         if (other == emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.getDefaultInstance()) return this;
-        if (other.hasWeeklyBossResinDiscountInfo()) {
-          mergeWeeklyBossResinDiscountInfo(other.getWeeklyBossResinDiscountInfo());
-        }
-        if (other.getMonsterId() != 0) {
-          setMonsterId(other.getMonsterId());
-        }
-        if (other.lockState_ != 0) {
-          setLockStateValue(other.getLockStateValue());
-        }
-        if (other.getIsAreaLocked() != false) {
-          setIsAreaLocked(other.getIsAreaLocked());
-        }
-        if (other.hasPos()) {
-          mergePos(other.getPos());
-        }
-        if (other.getResin() != 0) {
-          setResin(other.getResin());
-        }
-        if (other.getRefreshInterval() != 0) {
-          setRefreshInterval(other.getRefreshInterval());
-        }
-        if (other.getLevel() != 0) {
-          setLevel(other.getLevel());
-        }
-        if (other.getMaxBossChestNum() != 0) {
-          setMaxBossChestNum(other.getMaxBossChestNum());
-        }
-        if (other.getBossChestNum() != 0) {
-          setBossChestNum(other.getBossChestNum());
-        }
-        if (other.getNextRefreshTime() != 0) {
-          setNextRefreshTime(other.getNextRefreshTime());
-        }
-        if (other.getHJMMAOMEHOL() != 0) {
-          setHJMMAOMEHOL(other.getHJMMAOMEHOL());
-        }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         if (other.getId() != 0) {
           setId(other.getId());
         }
-        if (other.getCityId() != 0) {
-          setCityId(other.getCityId());
-        }
         if (other.getIsAlive() != false) {
           setIsAlive(other.getIsAlive());
         }
+        if (other.getBossChestNum() != 0) {
+          setBossChestNum(other.getBossChestNum());
+        }
+        if (other.getResin() != 0) {
+          setResin(other.getResin());
+        }
+        if (other.getIsAreaLocked() != false) {
+          setIsAreaLocked(other.getIsAreaLocked());
+        }
+        if (other.getMaxBossChestNum() != 0) {
+          setMaxBossChestNum(other.getMaxBossChestNum());
+        }
+        if (other.getNextRefreshTime() != 0) {
+          setNextRefreshTime(other.getNextRefreshTime());
+        }
+        if (other.getCityId() != 0) {
+          setCityId(other.getCityId());
+        }
+        if (other.getNextBossChestRefreshTime() != 0) {
+          setNextBossChestRefreshTime(other.getNextBossChestRefreshTime());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
+        if (other.hasPos()) {
+          mergePos(other.getPos());
+        }
+        if (other.getRefreshInterval() != 0) {
+          setRefreshInterval(other.getRefreshInterval());
+        }
+        if (other.lockState_ != 0) {
+          setLockStateValue(other.getLockStateValue());
+        }
+        if (other.hasWeeklyBossResinDiscountInfo()) {
+          mergeWeeklyBossResinDiscountInfo(other.getWeeklyBossResinDiscountInfo());
+        }
+        if (other.getLevel() != 0) {
+          setLevel(other.getLevel());
+        }
+        if (other.getIDNKJEEDOGC() != false) {
+          setIDNKJEEDOGC(other.getIDNKJEEDOGC());
+        }
+        if (other.getMonsterId() != 0) {
+          setMonsterId(other.getMonsterId());
+        }
         if (other.getGroupId() != 0) {
           setGroupId(other.getGroupId());
         }
-        if (other.getEOLGBLICEIA() != 0) {
-          setEOLGBLICEIA(other.getEOLGBLICEIA());
+        if (other.getAGIENJJKPBE() != 0) {
+          setAGIENJJKPBE(other.getAGIENJJKPBE());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1308,213 +1260,145 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> weeklyBossResinDiscountInfoBuilder_;
+      private int id_ ;
       /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       * @return Whether the weeklyBossResinDiscountInfo field is set.
-       */
-      public boolean hasWeeklyBossResinDiscountInfo() {
-        return weeklyBossResinDiscountInfoBuilder_ != null || weeklyBossResinDiscountInfo_ != null;
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       * @return The weeklyBossResinDiscountInfo.
-       */
-      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
-        } else {
-          return weeklyBossResinDiscountInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public Builder setWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          weeklyBossResinDiscountInfo_ = value;
-          onChanged();
-        } else {
-          weeklyBossResinDiscountInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public Builder setWeeklyBossResinDiscountInfo(
-          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder builderForValue) {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          weeklyBossResinDiscountInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          weeklyBossResinDiscountInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public Builder mergeWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          if (weeklyBossResinDiscountInfo_ != null) {
-            weeklyBossResinDiscountInfo_ =
-              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.newBuilder(weeklyBossResinDiscountInfo_).mergeFrom(value).buildPartial();
-          } else {
-            weeklyBossResinDiscountInfo_ = value;
-          }
-          onChanged();
-        } else {
-          weeklyBossResinDiscountInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public Builder clearWeeklyBossResinDiscountInfo() {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          weeklyBossResinDiscountInfo_ = null;
-          onChanged();
-        } else {
-          weeklyBossResinDiscountInfo_ = null;
-          weeklyBossResinDiscountInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder getWeeklyBossResinDiscountInfoBuilder() {
-        
-        onChanged();
-        return getWeeklyBossResinDiscountInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() {
-        if (weeklyBossResinDiscountInfoBuilder_ != null) {
-          return weeklyBossResinDiscountInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return weeklyBossResinDiscountInfo_ == null ?
-              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
-        }
-      }
-      /**
-       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 7;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> 
-          getWeeklyBossResinDiscountInfoFieldBuilder() {
-        if (weeklyBossResinDiscountInfoBuilder_ == null) {
-          weeklyBossResinDiscountInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder>(
-                  getWeeklyBossResinDiscountInfo(),
-                  getParentForChildren(),
-                  isClean());
-          weeklyBossResinDiscountInfo_ = null;
-        }
-        return weeklyBossResinDiscountInfoBuilder_;
-      }
-
-      private int monsterId_ ;
-      /**
-       * <code>uint32 monster_id = 564;</code>
-       * @return The monsterId.
+       * <code>uint32 id = 1;</code>
+       * @return The id.
        */
       @java.lang.Override
-      public int getMonsterId() {
-        return monsterId_;
+      public int getId() {
+        return id_;
       }
       /**
-       * <code>uint32 monster_id = 564;</code>
-       * @param value The monsterId to set.
+       * <code>uint32 id = 1;</code>
+       * @param value The id to set.
        * @return This builder for chaining.
        */
-      public Builder setMonsterId(int value) {
+      public Builder setId(int value) {
         
-        monsterId_ = value;
+        id_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 monster_id = 564;</code>
+       * <code>uint32 id = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMonsterId() {
+      public Builder clearId() {
         
-        monsterId_ = 0;
+        id_ = 0;
         onChanged();
         return this;
       }
 
-      private int lockState_ = 0;
+      private boolean isAlive_ ;
       /**
-       * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-       * @return The enum numeric value on the wire for lockState.
-       */
-      @java.lang.Override public int getLockStateValue() {
-        return lockState_;
-      }
-      /**
-       * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-       * @param value The enum numeric value on the wire for lockState to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLockStateValue(int value) {
-        
-        lockState_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-       * @return The lockState.
+       * <code>bool is_alive = 2;</code>
+       * @return The isAlive.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState getLockState() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState result = emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.valueOf(lockState_);
-        return result == null ? emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState.UNRECOGNIZED : result;
+      public boolean getIsAlive() {
+        return isAlive_;
       }
       /**
-       * <code>.InvestigationMonster.LockState lock_state = 1;</code>
-       * @param value The lockState to set.
+       * <code>bool is_alive = 2;</code>
+       * @param value The isAlive to set.
        * @return This builder for chaining.
        */
-      public Builder setLockState(emu.grasscutter.net.proto.InvestigationMonsterOuterClass.InvestigationMonster.LockState value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setIsAlive(boolean value) {
         
-        lockState_ = value.getNumber();
+        isAlive_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.InvestigationMonster.LockState lock_state = 1;</code>
+       * <code>bool is_alive = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLockState() {
+      public Builder clearIsAlive() {
         
-        lockState_ = 0;
+        isAlive_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int bossChestNum_ ;
+      /**
+       * <pre>
+       * 6
+       * </pre>
+       *
+       * <code>uint32 boss_chest_num = 3;</code>
+       * @return The bossChestNum.
+       */
+      @java.lang.Override
+      public int getBossChestNum() {
+        return bossChestNum_;
+      }
+      /**
+       * <pre>
+       * 6
+       * </pre>
+       *
+       * <code>uint32 boss_chest_num = 3;</code>
+       * @param value The bossChestNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBossChestNum(int value) {
+        
+        bossChestNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 6
+       * </pre>
+       *
+       * <code>uint32 boss_chest_num = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBossChestNum() {
+        
+        bossChestNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int resin_ ;
+      /**
+       * <code>uint32 resin = 4;</code>
+       * @return The resin.
+       */
+      @java.lang.Override
+      public int getResin() {
+        return resin_;
+      }
+      /**
+       * <code>uint32 resin = 4;</code>
+       * @param value The resin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setResin(int value) {
+        
+        resin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 resin = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearResin() {
+        
+        resin_ = 0;
         onChanged();
         return this;
       }
 
       private boolean isAreaLocked_ ;
       /**
-       * <code>bool is_area_locked = 6;</code>
+       * <code>bool is_area_locked = 5;</code>
        * @return The isAreaLocked.
        */
       @java.lang.Override
@@ -1522,7 +1406,7 @@ public final class InvestigationMonsterOuterClass {
         return isAreaLocked_;
       }
       /**
-       * <code>bool is_area_locked = 6;</code>
+       * <code>bool is_area_locked = 5;</code>
        * @param value The isAreaLocked to set.
        * @return This builder for chaining.
        */
@@ -1533,7 +1417,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>bool is_area_locked = 6;</code>
+       * <code>bool is_area_locked = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAreaLocked() {
@@ -1543,18 +1427,197 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
 
+      private int maxBossChestNum_ ;
+      /**
+       * <pre>
+       * 3
+       * </pre>
+       *
+       * <code>uint32 max_boss_chest_num = 6;</code>
+       * @return The maxBossChestNum.
+       */
+      @java.lang.Override
+      public int getMaxBossChestNum() {
+        return maxBossChestNum_;
+      }
+      /**
+       * <pre>
+       * 3
+       * </pre>
+       *
+       * <code>uint32 max_boss_chest_num = 6;</code>
+       * @param value The maxBossChestNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMaxBossChestNum(int value) {
+        
+        maxBossChestNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 3
+       * </pre>
+       *
+       * <code>uint32 max_boss_chest_num = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaxBossChestNum() {
+        
+        maxBossChestNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nextRefreshTime_ ;
+      /**
+       * <code>uint32 next_refresh_time = 7;</code>
+       * @return The nextRefreshTime.
+       */
+      @java.lang.Override
+      public int getNextRefreshTime() {
+        return nextRefreshTime_;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 7;</code>
+       * @param value The nextRefreshTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextRefreshTime(int value) {
+        
+        nextRefreshTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextRefreshTime() {
+        
+        nextRefreshTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cityId_ ;
+      /**
+       * <code>uint32 city_id = 8;</code>
+       * @return The cityId.
+       */
+      @java.lang.Override
+      public int getCityId() {
+        return cityId_;
+      }
+      /**
+       * <code>uint32 city_id = 8;</code>
+       * @param value The cityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCityId(int value) {
+        
+        cityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 city_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCityId() {
+        
+        cityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nextBossChestRefreshTime_ ;
+      /**
+       * <pre>
+       * 12
+       * </pre>
+       *
+       * <code>uint32 next_boss_chest_refresh_time = 9;</code>
+       * @return The nextBossChestRefreshTime.
+       */
+      @java.lang.Override
+      public int getNextBossChestRefreshTime() {
+        return nextBossChestRefreshTime_;
+      }
+      /**
+       * <pre>
+       * 12
+       * </pre>
+       *
+       * <code>uint32 next_boss_chest_refresh_time = 9;</code>
+       * @param value The nextBossChestRefreshTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextBossChestRefreshTime(int value) {
+        
+        nextBossChestRefreshTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       * 12
+       * </pre>
+       *
+       * <code>uint32 next_boss_chest_refresh_time = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextBossChestRefreshTime() {
+        
+        nextBossChestRefreshTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 10;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 10;</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 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       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 = 12;</code>
+       * <code>.Vector pos = 11;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -1565,7 +1628,7 @@ public final class InvestigationMonsterOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1581,7 +1644,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1595,7 +1658,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -1613,7 +1676,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -1627,7 +1690,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -1635,7 +1698,7 @@ public final class InvestigationMonsterOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -1646,7 +1709,7 @@ public final class InvestigationMonsterOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 12;</code>
+       * <code>.Vector pos = 11;</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> 
@@ -1662,40 +1725,13 @@ public final class InvestigationMonsterOuterClass {
         return posBuilder_;
       }
 
-      private int resin_ ;
-      /**
-       * <code>uint32 resin = 5;</code>
-       * @return The resin.
-       */
-      @java.lang.Override
-      public int getResin() {
-        return resin_;
-      }
-      /**
-       * <code>uint32 resin = 5;</code>
-       * @param value The resin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setResin(int value) {
-        
-        resin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 resin = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearResin() {
-        
-        resin_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int refreshInterval_ ;
       /**
-       * <code>uint32 refresh_interval = 11;</code>
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>uint32 refresh_interval = 12;</code>
        * @return The refreshInterval.
        */
       @java.lang.Override
@@ -1703,7 +1739,11 @@ public final class InvestigationMonsterOuterClass {
         return refreshInterval_;
       }
       /**
-       * <code>uint32 refresh_interval = 11;</code>
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>uint32 refresh_interval = 12;</code>
        * @param value The refreshInterval to set.
        * @return This builder for chaining.
        */
@@ -1714,7 +1754,11 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>uint32 refresh_interval = 11;</code>
+       * <pre>
+       * 9
+       * </pre>
+       *
+       * <code>uint32 refresh_interval = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRefreshInterval() {
@@ -1724,9 +1768,182 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
 
+      private int lockState_ = 0;
+      /**
+       * <code>.LockState lock_state = 13;</code>
+       * @return The enum numeric value on the wire for lockState.
+       */
+      @java.lang.Override public int getLockStateValue() {
+        return lockState_;
+      }
+      /**
+       * <code>.LockState lock_state = 13;</code>
+       * @param value The enum numeric value on the wire for lockState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLockStateValue(int value) {
+        
+        lockState_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.LockState lock_state = 13;</code>
+       * @return The lockState.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.LockStateOuterClass.LockState getLockState() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.LockStateOuterClass.LockState result = emu.grasscutter.net.proto.LockStateOuterClass.LockState.valueOf(lockState_);
+        return result == null ? emu.grasscutter.net.proto.LockStateOuterClass.LockState.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.LockState lock_state = 13;</code>
+       * @param value The lockState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLockState(emu.grasscutter.net.proto.LockStateOuterClass.LockState value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        lockState_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.LockState lock_state = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLockState() {
+        
+        lockState_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo weeklyBossResinDiscountInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> weeklyBossResinDiscountInfoBuilder_;
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       * @return Whether the weeklyBossResinDiscountInfo field is set.
+       */
+      public boolean hasWeeklyBossResinDiscountInfo() {
+        return weeklyBossResinDiscountInfoBuilder_ != null || weeklyBossResinDiscountInfo_ != null;
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       * @return The weeklyBossResinDiscountInfo.
+       */
+      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo getWeeklyBossResinDiscountInfo() {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          return weeklyBossResinDiscountInfo_ == null ? emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
+        } else {
+          return weeklyBossResinDiscountInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public Builder setWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          weeklyBossResinDiscountInfo_ = value;
+          onChanged();
+        } else {
+          weeklyBossResinDiscountInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public Builder setWeeklyBossResinDiscountInfo(
+          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder builderForValue) {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          weeklyBossResinDiscountInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          weeklyBossResinDiscountInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public Builder mergeWeeklyBossResinDiscountInfo(emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo value) {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          if (weeklyBossResinDiscountInfo_ != null) {
+            weeklyBossResinDiscountInfo_ =
+              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.newBuilder(weeklyBossResinDiscountInfo_).mergeFrom(value).buildPartial();
+          } else {
+            weeklyBossResinDiscountInfo_ = value;
+          }
+          onChanged();
+        } else {
+          weeklyBossResinDiscountInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public Builder clearWeeklyBossResinDiscountInfo() {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          weeklyBossResinDiscountInfo_ = null;
+          onChanged();
+        } else {
+          weeklyBossResinDiscountInfo_ = null;
+          weeklyBossResinDiscountInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder getWeeklyBossResinDiscountInfoBuilder() {
+        
+        onChanged();
+        return getWeeklyBossResinDiscountInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      public emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder getWeeklyBossResinDiscountInfoOrBuilder() {
+        if (weeklyBossResinDiscountInfoBuilder_ != null) {
+          return weeklyBossResinDiscountInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return weeklyBossResinDiscountInfo_ == null ?
+              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.getDefaultInstance() : weeklyBossResinDiscountInfo_;
+        }
+      }
+      /**
+       * <code>.WeeklyBossResinDiscountInfo weekly_boss_resin_discount_info = 14;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder> 
+          getWeeklyBossResinDiscountInfoFieldBuilder() {
+        if (weeklyBossResinDiscountInfoBuilder_ == null) {
+          weeklyBossResinDiscountInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfo.Builder, emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.WeeklyBossResinDiscountInfoOrBuilder>(
+                  getWeeklyBossResinDiscountInfo(),
+                  getParentForChildren(),
+                  isClean());
+          weeklyBossResinDiscountInfo_ = null;
+        }
+        return weeklyBossResinDiscountInfoBuilder_;
+      }
+
       private int level_ ;
       /**
-       * <code>uint32 level = 8;</code>
+       * <code>uint32 level = 15;</code>
        * @return The level.
        */
       @java.lang.Override
@@ -1734,7 +1951,7 @@ public final class InvestigationMonsterOuterClass {
         return level_;
       }
       /**
-       * <code>uint32 level = 8;</code>
+       * <code>uint32 level = 15;</code>
        * @param value The level to set.
        * @return This builder for chaining.
        */
@@ -1745,7 +1962,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>uint32 level = 8;</code>
+       * <code>uint32 level = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearLevel() {
@@ -1755,257 +1972,71 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
 
-      private int maxBossChestNum_ ;
+      private boolean iDNKJEEDOGC_ ;
       /**
-       * <code>uint32 max_boss_chest_num = 14;</code>
-       * @return The maxBossChestNum.
+       * <code>bool IDNKJEEDOGC = 533;</code>
+       * @return The iDNKJEEDOGC.
        */
       @java.lang.Override
-      public int getMaxBossChestNum() {
-        return maxBossChestNum_;
+      public boolean getIDNKJEEDOGC() {
+        return iDNKJEEDOGC_;
       }
       /**
-       * <code>uint32 max_boss_chest_num = 14;</code>
-       * @param value The maxBossChestNum to set.
+       * <code>bool IDNKJEEDOGC = 533;</code>
+       * @param value The iDNKJEEDOGC to set.
        * @return This builder for chaining.
        */
-      public Builder setMaxBossChestNum(int value) {
+      public Builder setIDNKJEEDOGC(boolean value) {
         
-        maxBossChestNum_ = value;
+        iDNKJEEDOGC_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 max_boss_chest_num = 14;</code>
+       * <code>bool IDNKJEEDOGC = 533;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMaxBossChestNum() {
+      public Builder clearIDNKJEEDOGC() {
         
-        maxBossChestNum_ = 0;
+        iDNKJEEDOGC_ = false;
         onChanged();
         return this;
       }
 
-      private int bossChestNum_ ;
+      private int monsterId_ ;
       /**
-       * <code>uint32 boss_chest_num = 15;</code>
-       * @return The bossChestNum.
+       * <code>uint32 monster_id = 1129;</code>
+       * @return The monsterId.
        */
       @java.lang.Override
-      public int getBossChestNum() {
-        return bossChestNum_;
+      public int getMonsterId() {
+        return monsterId_;
       }
       /**
-       * <code>uint32 boss_chest_num = 15;</code>
-       * @param value The bossChestNum to set.
+       * <code>uint32 monster_id = 1129;</code>
+       * @param value The monsterId to set.
        * @return This builder for chaining.
        */
-      public Builder setBossChestNum(int value) {
+      public Builder setMonsterId(int value) {
         
-        bossChestNum_ = value;
+        monsterId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 boss_chest_num = 15;</code>
+       * <code>uint32 monster_id = 1129;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBossChestNum() {
+      public Builder clearMonsterId() {
         
-        bossChestNum_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int nextRefreshTime_ ;
-      /**
-       * <code>uint32 next_refresh_time = 2;</code>
-       * @return The nextRefreshTime.
-       */
-      @java.lang.Override
-      public int getNextRefreshTime() {
-        return nextRefreshTime_;
-      }
-      /**
-       * <code>uint32 next_refresh_time = 2;</code>
-       * @param value The nextRefreshTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNextRefreshTime(int value) {
-        
-        nextRefreshTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 next_refresh_time = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNextRefreshTime() {
-        
-        nextRefreshTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int hJMMAOMEHOL_ ;
-      /**
-       * <code>uint32 HJMMAOMEHOL = 326;</code>
-       * @return The hJMMAOMEHOL.
-       */
-      @java.lang.Override
-      public int getHJMMAOMEHOL() {
-        return hJMMAOMEHOL_;
-      }
-      /**
-       * <code>uint32 HJMMAOMEHOL = 326;</code>
-       * @param value The hJMMAOMEHOL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHJMMAOMEHOL(int value) {
-        
-        hJMMAOMEHOL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 HJMMAOMEHOL = 326;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHJMMAOMEHOL() {
-        
-        hJMMAOMEHOL_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 4;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int id_ ;
-      /**
-       * <code>uint32 id = 3;</code>
-       * @return The id.
-       */
-      @java.lang.Override
-      public int getId() {
-        return id_;
-      }
-      /**
-       * <code>uint32 id = 3;</code>
-       * @param value The id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setId(int value) {
-        
-        id_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 id = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearId() {
-        
-        id_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int cityId_ ;
-      /**
-       * <code>uint32 city_id = 10;</code>
-       * @return The cityId.
-       */
-      @java.lang.Override
-      public int getCityId() {
-        return cityId_;
-      }
-      /**
-       * <code>uint32 city_id = 10;</code>
-       * @param value The cityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCityId(int value) {
-        
-        cityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 city_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCityId() {
-        
-        cityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isAlive_ ;
-      /**
-       * <code>bool is_alive = 13;</code>
-       * @return The isAlive.
-       */
-      @java.lang.Override
-      public boolean getIsAlive() {
-        return isAlive_;
-      }
-      /**
-       * <code>bool is_alive = 13;</code>
-       * @param value The isAlive to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsAlive(boolean value) {
-        
-        isAlive_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_alive = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsAlive() {
-        
-        isAlive_ = false;
+        monsterId_ = 0;
         onChanged();
         return this;
       }
 
       private int groupId_ ;
       /**
-       * <code>uint32 group_id = 34;</code>
+       * <code>uint32 group_id = 1335;</code>
        * @return The groupId.
        */
       @java.lang.Override
@@ -2013,7 +2044,7 @@ public final class InvestigationMonsterOuterClass {
         return groupId_;
       }
       /**
-       * <code>uint32 group_id = 34;</code>
+       * <code>uint32 group_id = 1335;</code>
        * @param value The groupId to set.
        * @return This builder for chaining.
        */
@@ -2024,7 +2055,7 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
       /**
-       * <code>uint32 group_id = 34;</code>
+       * <code>uint32 group_id = 1335;</code>
        * @return This builder for chaining.
        */
       public Builder clearGroupId() {
@@ -2034,33 +2065,33 @@ public final class InvestigationMonsterOuterClass {
         return this;
       }
 
-      private int eOLGBLICEIA_ ;
+      private int aGIENJJKPBE_ ;
       /**
-       * <code>uint32 EOLGBLICEIA = 9;</code>
-       * @return The eOLGBLICEIA.
+       * <code>uint32 AGIENJJKPBE = 1612;</code>
+       * @return The aGIENJJKPBE.
        */
       @java.lang.Override
-      public int getEOLGBLICEIA() {
-        return eOLGBLICEIA_;
+      public int getAGIENJJKPBE() {
+        return aGIENJJKPBE_;
       }
       /**
-       * <code>uint32 EOLGBLICEIA = 9;</code>
-       * @param value The eOLGBLICEIA to set.
+       * <code>uint32 AGIENJJKPBE = 1612;</code>
+       * @param value The aGIENJJKPBE to set.
        * @return This builder for chaining.
        */
-      public Builder setEOLGBLICEIA(int value) {
+      public Builder setAGIENJJKPBE(int value) {
         
-        eOLGBLICEIA_ = value;
+        aGIENJJKPBE_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 EOLGBLICEIA = 9;</code>
+       * <code>uint32 AGIENJJKPBE = 1612;</code>
        * @return This builder for chaining.
        */
-      public Builder clearEOLGBLICEIA() {
+      public Builder clearAGIENJJKPBE() {
         
-        eOLGBLICEIA_ = 0;
+        aGIENJJKPBE_ = 0;
         onChanged();
         return this;
       }
@@ -2131,37 +2162,39 @@ public final class InvestigationMonsterOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032InvestigationMonster.proto\032!WeeklyBoss" +
-      "ResinDiscountInfo.proto\032\014Vector.proto\"\206\004" +
-      "\n\024InvestigationMonster\022E\n\037weekly_boss_re" +
-      "sin_discount_info\030\007 \001(\0132\034.WeeklyBossResi" +
-      "nDiscountInfo\022\023\n\nmonster_id\030\264\004 \001(\r\0223\n\nlo" +
-      "ck_state\030\001 \001(\0162\037.InvestigationMonster.Lo" +
-      "ckState\022\026\n\016is_area_locked\030\006 \001(\010\022\024\n\003pos\030\014" +
-      " \001(\0132\007.Vector\022\r\n\005resin\030\005 \001(\r\022\030\n\020refresh_" +
-      "interval\030\013 \001(\r\022\r\n\005level\030\010 \001(\r\022\032\n\022max_bos" +
-      "s_chest_num\030\016 \001(\r\022\026\n\016boss_chest_num\030\017 \001(" +
-      "\r\022\031\n\021next_refresh_time\030\002 \001(\r\022\024\n\013HJMMAOME" +
-      "HOL\030\306\002 \001(\r\022\020\n\010scene_id\030\004 \001(\r\022\n\n\002id\030\003 \001(\r" +
-      "\022\017\n\007city_id\030\n \001(\r\022\020\n\010is_alive\030\r \001(\010\022\020\n\010g" +
-      "roup_id\030\" \001(\r\022\023\n\013EOLGBLICEIA\030\t \001(\r\"*\n\tLo" +
-      "ckState\022\r\n\tLOCK_NONE\020\000\022\016\n\nLOCK_QUEST\020\001B\033" +
-      "\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\032InvestigationMonster.proto\032\014Vector.pro" +
+      "to\032\017LockState.proto\032!WeeklyBossResinDisc" +
+      "ountInfo.proto\"\355\003\n\024InvestigationMonster\022" +
+      "\n\n\002id\030\001 \001(\r\022\020\n\010is_alive\030\002 \001(\010\022\026\n\016boss_ch" +
+      "est_num\030\003 \001(\r\022\r\n\005resin\030\004 \001(\r\022\026\n\016is_area_" +
+      "locked\030\005 \001(\010\022\032\n\022max_boss_chest_num\030\006 \001(\r" +
+      "\022\031\n\021next_refresh_time\030\007 \001(\r\022\017\n\007city_id\030\010" +
+      " \001(\r\022$\n\034next_boss_chest_refresh_time\030\t \001" +
+      "(\r\022\020\n\010scene_id\030\n \001(\r\022\024\n\003pos\030\013 \001(\0132\007.Vect" +
+      "or\022\030\n\020refresh_interval\030\014 \001(\r\022\036\n\nlock_sta" +
+      "te\030\r \001(\0162\n.LockState\022E\n\037weekly_boss_resi" +
+      "n_discount_info\030\016 \001(\0132\034.WeeklyBossResinD" +
+      "iscountInfo\022\r\n\005level\030\017 \001(\r\022\024\n\013IDNKJEEDOG" +
+      "C\030\225\004 \001(\010\022\023\n\nmonster_id\030\351\010 \001(\r\022\021\n\010group_i" +
+      "d\030\267\n \001(\r\022\024\n\013AGIENJJKPBE\030\314\014 \001(\rB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.LockStateOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor(),
         });
     internal_static_InvestigationMonster_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_InvestigationMonster_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InvestigationMonster_descriptor,
-        new java.lang.String[] { "WeeklyBossResinDiscountInfo", "MonsterId", "LockState", "IsAreaLocked", "Pos", "Resin", "RefreshInterval", "Level", "MaxBossChestNum", "BossChestNum", "NextRefreshTime", "HJMMAOMEHOL", "SceneId", "Id", "CityId", "IsAlive", "GroupId", "EOLGBLICEIA", });
-    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "Id", "IsAlive", "BossChestNum", "Resin", "IsAreaLocked", "MaxBossChestNum", "NextRefreshTime", "CityId", "NextBossChestRefreshTime", "SceneId", "Pos", "RefreshInterval", "LockState", "WeeklyBossResinDiscountInfo", "Level", "IDNKJEEDOGC", "MonsterId", "GroupId", "AGIENJJKPBE", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.LockStateOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.WeeklyBossResinDiscountInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationOuterClass.java
index 7875404fa..4a09587e3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationOuterClass.java
@@ -19,39 +19,35 @@ public final class InvestigationOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 id = 8;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     int getId();
 
     /**
-     * <code>uint32 progress = 7;</code>
-     * @return The progress.
-     */
-    int getProgress();
-
-    /**
-     * <code>.Investigation.State state = 12;</code>
+     * <code>.Investigation.State state = 8;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.Investigation.State state = 12;</code>
+     * <code>.Investigation.State state = 8;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State getState();
 
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 9;</code>
      * @return The totalProgress.
      */
     int getTotalProgress();
+
+    /**
+     * <code>uint32 progress = 12;</code>
+     * @return The progress.
+     */
+    int getProgress();
   }
   /**
-   * <pre>
-   * Obf: LJAJANHHOML
-   * </pre>
-   *
    * Protobuf type {@code Investigation}
    */
   public static final class Investigation extends
@@ -97,27 +93,27 @@ public final class InvestigationOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              progress_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 8: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 64: {
               int rawValue = input.readEnum();
 
               state_ = rawValue;
               break;
             }
-            case 112: {
+            case 72: {
 
               totalProgress_ = input.readUInt32();
               break;
             }
+            case 96: {
+
+              progress_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -151,10 +147,6 @@ public final class InvestigationOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: GMMLBMGDPPP
-     * </pre>
-     *
      * Protobuf enum {@code Investigation.State}
      */
     public enum State
@@ -280,10 +272,10 @@ public final class InvestigationOuterClass {
       // @@protoc_insertion_point(enum_scope:Investigation.State)
     }
 
-    public static final int ID_FIELD_NUMBER = 8;
+    public static final int ID_FIELD_NUMBER = 1;
     private int id_;
     /**
-     * <code>uint32 id = 8;</code>
+     * <code>uint32 id = 1;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -291,28 +283,17 @@ public final class InvestigationOuterClass {
       return id_;
     }
 
-    public static final int PROGRESS_FIELD_NUMBER = 7;
-    private int progress_;
-    /**
-     * <code>uint32 progress = 7;</code>
-     * @return The progress.
-     */
-    @java.lang.Override
-    public int getProgress() {
-      return progress_;
-    }
-
-    public static final int STATE_FIELD_NUMBER = 12;
+    public static final int STATE_FIELD_NUMBER = 8;
     private int state_;
     /**
-     * <code>.Investigation.State state = 12;</code>
+     * <code>.Investigation.State state = 8;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.Investigation.State state = 12;</code>
+     * <code>.Investigation.State state = 8;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State getState() {
@@ -321,10 +302,10 @@ public final class InvestigationOuterClass {
       return result == null ? emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State.UNRECOGNIZED : result;
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 14;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 9;
     private int totalProgress_;
     /**
-     * <code>uint32 total_progress = 14;</code>
+     * <code>uint32 total_progress = 9;</code>
      * @return The totalProgress.
      */
     @java.lang.Override
@@ -332,6 +313,17 @@ public final class InvestigationOuterClass {
       return totalProgress_;
     }
 
+    public static final int PROGRESS_FIELD_NUMBER = 12;
+    private int progress_;
+    /**
+     * <code>uint32 progress = 12;</code>
+     * @return The progress.
+     */
+    @java.lang.Override
+    public int getProgress() {
+      return progress_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -346,17 +338,17 @@ public final class InvestigationOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (progress_ != 0) {
-        output.writeUInt32(7, progress_);
-      }
       if (id_ != 0) {
-        output.writeUInt32(8, id_);
+        output.writeUInt32(1, id_);
       }
       if (state_ != emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State.INVALID.getNumber()) {
-        output.writeEnum(12, state_);
+        output.writeEnum(8, state_);
       }
       if (totalProgress_ != 0) {
-        output.writeUInt32(14, totalProgress_);
+        output.writeUInt32(9, totalProgress_);
+      }
+      if (progress_ != 0) {
+        output.writeUInt32(12, progress_);
       }
       unknownFields.writeTo(output);
     }
@@ -367,21 +359,21 @@ public final class InvestigationOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (progress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, progress_);
-      }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, id_);
+          .computeUInt32Size(1, id_);
       }
       if (state_ != emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State.INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(12, state_);
+          .computeEnumSize(8, state_);
       }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, totalProgress_);
+          .computeUInt32Size(9, totalProgress_);
+      }
+      if (progress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, progress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -400,11 +392,11 @@ public final class InvestigationOuterClass {
 
       if (getId()
           != other.getId()) return false;
-      if (getProgress()
-          != other.getProgress()) return false;
       if (state_ != other.state_) return false;
       if (getTotalProgress()
           != other.getTotalProgress()) return false;
+      if (getProgress()
+          != other.getProgress()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -418,12 +410,12 @@ public final class InvestigationOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ID_FIELD_NUMBER;
       hash = (53 * hash) + getId();
-      hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getProgress();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
       hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getTotalProgress();
+      hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getProgress();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -520,10 +512,6 @@ public final class InvestigationOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LJAJANHHOML
-     * </pre>
-     *
      * Protobuf type {@code Investigation}
      */
     public static final class Builder extends
@@ -563,12 +551,12 @@ public final class InvestigationOuterClass {
         super.clear();
         id_ = 0;
 
-        progress_ = 0;
-
         state_ = 0;
 
         totalProgress_ = 0;
 
+        progress_ = 0;
+
         return this;
       }
 
@@ -596,9 +584,9 @@ public final class InvestigationOuterClass {
       public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation buildPartial() {
         emu.grasscutter.net.proto.InvestigationOuterClass.Investigation result = new emu.grasscutter.net.proto.InvestigationOuterClass.Investigation(this);
         result.id_ = id_;
-        result.progress_ = progress_;
         result.state_ = state_;
         result.totalProgress_ = totalProgress_;
+        result.progress_ = progress_;
         onBuilt();
         return result;
       }
@@ -650,15 +638,15 @@ public final class InvestigationOuterClass {
         if (other.getId() != 0) {
           setId(other.getId());
         }
-        if (other.getProgress() != 0) {
-          setProgress(other.getProgress());
-        }
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
         if (other.getTotalProgress() != 0) {
           setTotalProgress(other.getTotalProgress());
         }
+        if (other.getProgress() != 0) {
+          setProgress(other.getProgress());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -690,7 +678,7 @@ public final class InvestigationOuterClass {
 
       private int id_ ;
       /**
-       * <code>uint32 id = 8;</code>
+       * <code>uint32 id = 1;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -698,7 +686,7 @@ public final class InvestigationOuterClass {
         return id_;
       }
       /**
-       * <code>uint32 id = 8;</code>
+       * <code>uint32 id = 1;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -709,7 +697,7 @@ public final class InvestigationOuterClass {
         return this;
       }
       /**
-       * <code>uint32 id = 8;</code>
+       * <code>uint32 id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -719,47 +707,16 @@ public final class InvestigationOuterClass {
         return this;
       }
 
-      private int progress_ ;
-      /**
-       * <code>uint32 progress = 7;</code>
-       * @return The progress.
-       */
-      @java.lang.Override
-      public int getProgress() {
-        return progress_;
-      }
-      /**
-       * <code>uint32 progress = 7;</code>
-       * @param value The progress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setProgress(int value) {
-        
-        progress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 progress = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearProgress() {
-        
-        progress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int state_ = 0;
       /**
-       * <code>.Investigation.State state = 12;</code>
+       * <code>.Investigation.State state = 8;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.Investigation.State state = 12;</code>
+       * <code>.Investigation.State state = 8;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -770,7 +727,7 @@ public final class InvestigationOuterClass {
         return this;
       }
       /**
-       * <code>.Investigation.State state = 12;</code>
+       * <code>.Investigation.State state = 8;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -780,7 +737,7 @@ public final class InvestigationOuterClass {
         return result == null ? emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.State.UNRECOGNIZED : result;
       }
       /**
-       * <code>.Investigation.State state = 12;</code>
+       * <code>.Investigation.State state = 8;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -794,7 +751,7 @@ public final class InvestigationOuterClass {
         return this;
       }
       /**
-       * <code>.Investigation.State state = 12;</code>
+       * <code>.Investigation.State state = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -806,7 +763,7 @@ public final class InvestigationOuterClass {
 
       private int totalProgress_ ;
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 9;</code>
        * @return The totalProgress.
        */
       @java.lang.Override
@@ -814,7 +771,7 @@ public final class InvestigationOuterClass {
         return totalProgress_;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 9;</code>
        * @param value The totalProgress to set.
        * @return This builder for chaining.
        */
@@ -825,7 +782,7 @@ public final class InvestigationOuterClass {
         return this;
       }
       /**
-       * <code>uint32 total_progress = 14;</code>
+       * <code>uint32 total_progress = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalProgress() {
@@ -834,6 +791,37 @@ public final class InvestigationOuterClass {
         onChanged();
         return this;
       }
+
+      private int progress_ ;
+      /**
+       * <code>uint32 progress = 12;</code>
+       * @return The progress.
+       */
+      @java.lang.Override
+      public int getProgress() {
+        return progress_;
+      }
+      /**
+       * <code>uint32 progress = 12;</code>
+       * @param value The progress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setProgress(int value) {
+        
+        progress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 progress = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearProgress() {
+        
+        progress_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -902,9 +890,9 @@ public final class InvestigationOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023Investigation.proto\"\261\001\n\rInvestigation\022" +
-      "\n\n\002id\030\010 \001(\r\022\020\n\010progress\030\007 \001(\r\022#\n\005state\030\014" +
-      " \001(\0162\024.Investigation.State\022\026\n\016total_prog" +
-      "ress\030\016 \001(\r\"E\n\005State\022\013\n\007INVALID\020\000\022\017\n\013IN_P" +
+      "\n\n\002id\030\001 \001(\r\022#\n\005state\030\010 \001(\0162\024.Investigati" +
+      "on.State\022\026\n\016total_progress\030\t \001(\r\022\020\n\010prog" +
+      "ress\030\014 \001(\r\"E\n\005State\022\013\n\007INVALID\020\000\022\017\n\013IN_P" +
       "ROGRESS\020\001\022\014\n\010COMPLETE\020\002\022\020\n\014REWARD_TAKEN\020" +
       "\003B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
@@ -917,7 +905,7 @@ public final class InvestigationOuterClass {
     internal_static_Investigation_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Investigation_descriptor,
-        new java.lang.String[] { "Id", "Progress", "State", "TotalProgress", });
+        new java.lang.String[] { "Id", "State", "TotalProgress", "Progress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationTargetOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationTargetOuterClass.java
index 5edd4f899..d70ef4a70 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/InvestigationTargetOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/InvestigationTargetOuterClass.java
@@ -19,45 +19,41 @@ public final class InvestigationTargetOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 total_progress = 12;</code>
-     * @return The totalProgress.
-     */
-    int getTotalProgress();
-
-    /**
-     * <code>uint32 progress = 15;</code>
+     * <code>uint32 progress = 1;</code>
      * @return The progress.
      */
     int getProgress();
 
     /**
-     * <code>uint32 quest_id = 4;</code>
-     * @return The questId.
+     * <code>uint32 total_progress = 4;</code>
+     * @return The totalProgress.
      */
-    int getQuestId();
+    int getTotalProgress();
 
     /**
-     * <code>uint32 investigation_id = 8;</code>
+     * <code>uint32 investigation_id = 10;</code>
      * @return The investigationId.
      */
     int getInvestigationId();
 
     /**
-     * <code>.InvestigationTarget.State state = 1;</code>
+     * <code>uint32 quest_id = 11;</code>
+     * @return The questId.
+     */
+    int getQuestId();
+
+    /**
+     * <code>.InvestigationTarget.State state = 13;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.InvestigationTarget.State state = 1;</code>
+     * <code>.InvestigationTarget.State state = 13;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State getState();
   }
   /**
-   * <pre>
-   * Obf: CHDNBCDJCEJ
-   * </pre>
-   *
    * Protobuf type {@code InvestigationTarget}
    */
   public static final class InvestigationTarget extends
@@ -104,29 +100,29 @@ public final class InvestigationTargetOuterClass {
               done = true;
               break;
             case 8: {
-              int rawValue = input.readEnum();
 
-              state_ = rawValue;
+              progress_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              questId_ = input.readUInt32();
+              totalProgress_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 80: {
 
               investigationId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
-              totalProgress_ = input.readUInt32();
+              questId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 104: {
+              int rawValue = input.readEnum();
 
-              progress_ = input.readUInt32();
+              state_ = rawValue;
               break;
             }
             default: {
@@ -162,10 +158,6 @@ public final class InvestigationTargetOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: MBMPKODCOJI
-     * </pre>
-     *
      * Protobuf enum {@code InvestigationTarget.State}
      */
     public enum State
@@ -291,21 +283,10 @@ public final class InvestigationTargetOuterClass {
       // @@protoc_insertion_point(enum_scope:InvestigationTarget.State)
     }
 
-    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 12;
-    private int totalProgress_;
-    /**
-     * <code>uint32 total_progress = 12;</code>
-     * @return The totalProgress.
-     */
-    @java.lang.Override
-    public int getTotalProgress() {
-      return totalProgress_;
-    }
-
-    public static final int PROGRESS_FIELD_NUMBER = 15;
+    public static final int PROGRESS_FIELD_NUMBER = 1;
     private int progress_;
     /**
-     * <code>uint32 progress = 15;</code>
+     * <code>uint32 progress = 1;</code>
      * @return The progress.
      */
     @java.lang.Override
@@ -313,21 +294,21 @@ public final class InvestigationTargetOuterClass {
       return progress_;
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 4;
-    private int questId_;
+    public static final int TOTAL_PROGRESS_FIELD_NUMBER = 4;
+    private int totalProgress_;
     /**
-     * <code>uint32 quest_id = 4;</code>
-     * @return The questId.
+     * <code>uint32 total_progress = 4;</code>
+     * @return The totalProgress.
      */
     @java.lang.Override
-    public int getQuestId() {
-      return questId_;
+    public int getTotalProgress() {
+      return totalProgress_;
     }
 
-    public static final int INVESTIGATION_ID_FIELD_NUMBER = 8;
+    public static final int INVESTIGATION_ID_FIELD_NUMBER = 10;
     private int investigationId_;
     /**
-     * <code>uint32 investigation_id = 8;</code>
+     * <code>uint32 investigation_id = 10;</code>
      * @return The investigationId.
      */
     @java.lang.Override
@@ -335,17 +316,28 @@ public final class InvestigationTargetOuterClass {
       return investigationId_;
     }
 
-    public static final int STATE_FIELD_NUMBER = 1;
+    public static final int QUEST_ID_FIELD_NUMBER = 11;
+    private int questId_;
+    /**
+     * <code>uint32 quest_id = 11;</code>
+     * @return The questId.
+     */
+    @java.lang.Override
+    public int getQuestId() {
+      return questId_;
+    }
+
+    public static final int STATE_FIELD_NUMBER = 13;
     private int state_;
     /**
-     * <code>.InvestigationTarget.State state = 1;</code>
+     * <code>.InvestigationTarget.State state = 13;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.InvestigationTarget.State state = 1;</code>
+     * <code>.InvestigationTarget.State state = 13;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State getState() {
@@ -368,20 +360,20 @@ public final class InvestigationTargetOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (state_ != emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State.INVALID.getNumber()) {
-        output.writeEnum(1, state_);
-      }
-      if (questId_ != 0) {
-        output.writeUInt32(4, questId_);
-      }
-      if (investigationId_ != 0) {
-        output.writeUInt32(8, investigationId_);
+      if (progress_ != 0) {
+        output.writeUInt32(1, progress_);
       }
       if (totalProgress_ != 0) {
-        output.writeUInt32(12, totalProgress_);
+        output.writeUInt32(4, totalProgress_);
       }
-      if (progress_ != 0) {
-        output.writeUInt32(15, progress_);
+      if (investigationId_ != 0) {
+        output.writeUInt32(10, investigationId_);
+      }
+      if (questId_ != 0) {
+        output.writeUInt32(11, questId_);
+      }
+      if (state_ != emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State.INVALID.getNumber()) {
+        output.writeEnum(13, state_);
       }
       unknownFields.writeTo(output);
     }
@@ -392,25 +384,25 @@ public final class InvestigationTargetOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (state_ != emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State.INVALID.getNumber()) {
+      if (progress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, state_);
-      }
-      if (questId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, questId_);
-      }
-      if (investigationId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, investigationId_);
+          .computeUInt32Size(1, progress_);
       }
       if (totalProgress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, totalProgress_);
+          .computeUInt32Size(4, totalProgress_);
       }
-      if (progress_ != 0) {
+      if (investigationId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, progress_);
+          .computeUInt32Size(10, investigationId_);
+      }
+      if (questId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, questId_);
+      }
+      if (state_ != emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State.INVALID.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(13, state_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -427,14 +419,14 @@ public final class InvestigationTargetOuterClass {
       }
       emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget other = (emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget) obj;
 
-      if (getTotalProgress()
-          != other.getTotalProgress()) return false;
       if (getProgress()
           != other.getProgress()) return false;
-      if (getQuestId()
-          != other.getQuestId()) return false;
+      if (getTotalProgress()
+          != other.getTotalProgress()) return false;
       if (getInvestigationId()
           != other.getInvestigationId()) return false;
+      if (getQuestId()
+          != other.getQuestId()) return false;
       if (state_ != other.state_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -447,14 +439,14 @@ public final class InvestigationTargetOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getTotalProgress();
       hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getProgress();
-      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestId();
+      hash = (37 * hash) + TOTAL_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getTotalProgress();
       hash = (37 * hash) + INVESTIGATION_ID_FIELD_NUMBER;
       hash = (53 * hash) + getInvestigationId();
+      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestId();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
       hash = (29 * hash) + unknownFields.hashCode();
@@ -553,10 +545,6 @@ public final class InvestigationTargetOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CHDNBCDJCEJ
-     * </pre>
-     *
      * Protobuf type {@code InvestigationTarget}
      */
     public static final class Builder extends
@@ -594,14 +582,14 @@ public final class InvestigationTargetOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        totalProgress_ = 0;
-
         progress_ = 0;
 
-        questId_ = 0;
+        totalProgress_ = 0;
 
         investigationId_ = 0;
 
+        questId_ = 0;
+
         state_ = 0;
 
         return this;
@@ -630,10 +618,10 @@ public final class InvestigationTargetOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget buildPartial() {
         emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget result = new emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget(this);
-        result.totalProgress_ = totalProgress_;
         result.progress_ = progress_;
-        result.questId_ = questId_;
+        result.totalProgress_ = totalProgress_;
         result.investigationId_ = investigationId_;
+        result.questId_ = questId_;
         result.state_ = state_;
         onBuilt();
         return result;
@@ -683,18 +671,18 @@ public final class InvestigationTargetOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget other) {
         if (other == emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.getDefaultInstance()) return this;
-        if (other.getTotalProgress() != 0) {
-          setTotalProgress(other.getTotalProgress());
-        }
         if (other.getProgress() != 0) {
           setProgress(other.getProgress());
         }
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
+        if (other.getTotalProgress() != 0) {
+          setTotalProgress(other.getTotalProgress());
         }
         if (other.getInvestigationId() != 0) {
           setInvestigationId(other.getInvestigationId());
         }
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
+        }
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
@@ -727,40 +715,9 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
 
-      private int totalProgress_ ;
-      /**
-       * <code>uint32 total_progress = 12;</code>
-       * @return The totalProgress.
-       */
-      @java.lang.Override
-      public int getTotalProgress() {
-        return totalProgress_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 total_progress = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalProgress() {
-        
-        totalProgress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int progress_ ;
       /**
-       * <code>uint32 progress = 15;</code>
+       * <code>uint32 progress = 1;</code>
        * @return The progress.
        */
       @java.lang.Override
@@ -768,7 +725,7 @@ public final class InvestigationTargetOuterClass {
         return progress_;
       }
       /**
-       * <code>uint32 progress = 15;</code>
+       * <code>uint32 progress = 1;</code>
        * @param value The progress to set.
        * @return This builder for chaining.
        */
@@ -779,7 +736,7 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
       /**
-       * <code>uint32 progress = 15;</code>
+       * <code>uint32 progress = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearProgress() {
@@ -789,40 +746,40 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
 
-      private int questId_ ;
+      private int totalProgress_ ;
       /**
-       * <code>uint32 quest_id = 4;</code>
-       * @return The questId.
+       * <code>uint32 total_progress = 4;</code>
+       * @return The totalProgress.
        */
       @java.lang.Override
-      public int getQuestId() {
-        return questId_;
+      public int getTotalProgress() {
+        return totalProgress_;
       }
       /**
-       * <code>uint32 quest_id = 4;</code>
-       * @param value The questId to set.
+       * <code>uint32 total_progress = 4;</code>
+       * @param value The totalProgress to set.
        * @return This builder for chaining.
        */
-      public Builder setQuestId(int value) {
+      public Builder setTotalProgress(int value) {
         
-        questId_ = value;
+        totalProgress_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 quest_id = 4;</code>
+       * <code>uint32 total_progress = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQuestId() {
+      public Builder clearTotalProgress() {
         
-        questId_ = 0;
+        totalProgress_ = 0;
         onChanged();
         return this;
       }
 
       private int investigationId_ ;
       /**
-       * <code>uint32 investigation_id = 8;</code>
+       * <code>uint32 investigation_id = 10;</code>
        * @return The investigationId.
        */
       @java.lang.Override
@@ -830,7 +787,7 @@ public final class InvestigationTargetOuterClass {
         return investigationId_;
       }
       /**
-       * <code>uint32 investigation_id = 8;</code>
+       * <code>uint32 investigation_id = 10;</code>
        * @param value The investigationId to set.
        * @return This builder for chaining.
        */
@@ -841,7 +798,7 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
       /**
-       * <code>uint32 investigation_id = 8;</code>
+       * <code>uint32 investigation_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearInvestigationId() {
@@ -851,16 +808,47 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
 
+      private int questId_ ;
+      /**
+       * <code>uint32 quest_id = 11;</code>
+       * @return The questId.
+       */
+      @java.lang.Override
+      public int getQuestId() {
+        return questId_;
+      }
+      /**
+       * <code>uint32 quest_id = 11;</code>
+       * @param value The questId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQuestId(int value) {
+        
+        questId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 quest_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQuestId() {
+        
+        questId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int state_ = 0;
       /**
-       * <code>.InvestigationTarget.State state = 1;</code>
+       * <code>.InvestigationTarget.State state = 13;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.InvestigationTarget.State state = 1;</code>
+       * <code>.InvestigationTarget.State state = 13;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -871,7 +859,7 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
       /**
-       * <code>.InvestigationTarget.State state = 1;</code>
+       * <code>.InvestigationTarget.State state = 13;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -881,7 +869,7 @@ public final class InvestigationTargetOuterClass {
         return result == null ? emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.State.UNRECOGNIZED : result;
       }
       /**
-       * <code>.InvestigationTarget.State state = 1;</code>
+       * <code>.InvestigationTarget.State state = 13;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -895,7 +883,7 @@ public final class InvestigationTargetOuterClass {
         return this;
       }
       /**
-       * <code>.InvestigationTarget.State state = 1;</code>
+       * <code>.InvestigationTarget.State state = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -972,9 +960,9 @@ public final class InvestigationTargetOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031InvestigationTarget.proto\"\335\001\n\023Investig" +
-      "ationTarget\022\026\n\016total_progress\030\014 \001(\r\022\020\n\010p" +
-      "rogress\030\017 \001(\r\022\020\n\010quest_id\030\004 \001(\r\022\030\n\020inves" +
-      "tigation_id\030\010 \001(\r\022)\n\005state\030\001 \001(\0162\032.Inves" +
+      "ationTarget\022\020\n\010progress\030\001 \001(\r\022\026\n\016total_p" +
+      "rogress\030\004 \001(\r\022\030\n\020investigation_id\030\n \001(\r\022" +
+      "\020\n\010quest_id\030\013 \001(\r\022)\n\005state\030\r \001(\0162\032.Inves" +
       "tigationTarget.State\"E\n\005State\022\013\n\007INVALID" +
       "\020\000\022\017\n\013IN_PROGRESS\020\001\022\014\n\010COMPLETE\020\002\022\020\n\014REW" +
       "ARD_TAKEN\020\003B\033\n\031emu.grasscutter.net.proto" +
@@ -989,7 +977,7 @@ public final class InvestigationTargetOuterClass {
     internal_static_InvestigationTarget_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_InvestigationTarget_descriptor,
-        new java.lang.String[] { "TotalProgress", "Progress", "QuestId", "InvestigationId", "State", });
+        new java.lang.String[] { "Progress", "TotalProgress", "InvestigationId", "QuestId", "State", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java
index afc4662b9..528b079b7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemAddHintNotifyOuterClass.java
@@ -19,104 +19,99 @@ public final class ItemAddHintNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool NAMDHIDNAMP = 1;</code>
-     * @return The nAMDHIDNAMP.
-     */
-    boolean getNAMDHIDNAMP();
-
-    /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> 
         getItemListList();
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index);
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder(
         int index);
 
     /**
-     * <code>bool OFKEJDENKLE = 10;</code>
-     * @return The oFKEJDENKLE.
-     */
-    boolean getOFKEJDENKLE();
-
-    /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> 
         getOverflowTransformedItemListList();
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index);
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     int getOverflowTransformedItemListCount();
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
         getOverflowTransformedItemListOrBuilderList();
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 quest_id = 11;</code>
-     * @return The questId.
+     * <code>bool is_transfered_from_avatar_card = 5;</code>
+     * @return The isTransferedFromAvatarCard.
      */
-    int getQuestId();
+    boolean getIsTransferedFromAvatarCard();
 
     /**
-     * <code>bool DJAHPNGMNGA = 3;</code>
-     * @return The dJAHPNGMNGA.
+     * <code>.Vector position = 6;</code>
+     * @return Whether the position field is set.
      */
-    boolean getDJAHPNGMNGA();
+    boolean hasPosition();
+    /**
+     * <code>.Vector position = 6;</code>
+     * @return The position.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
+    /**
+     * <code>.Vector position = 6;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
 
     /**
-     * <code>uint32 reason = 8;</code>
+     * <code>uint32 reason = 9;</code>
      * @return The reason.
      */
     int getReason();
 
     /**
-     * <code>.Vector position = 13;</code>
-     * @return Whether the position field is set.
+     * <code>bool is_position_valid = 11;</code>
+     * @return The isPositionValid.
      */
-    boolean hasPosition();
+    boolean getIsPositionValid();
+
     /**
-     * <code>.Vector position = 13;</code>
-     * @return The position.
+     * <code>bool is_general_reward_hiden = 12;</code>
+     * @return The isGeneralRewardHiden.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition();
+    boolean getIsGeneralRewardHiden();
+
     /**
-     * <code>.Vector position = 13;</code>
+     * <code>uint32 quest_id = 13;</code>
+     * @return The questId.
      */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder();
+    int getQuestId();
   }
   /**
-   * <pre>
-   * CmdId: 20755
-   * Obf: CNDHGNFOGNJ
-   * </pre>
-   *
    * Protobuf type {@code ItemAddHintNotify}
    */
   public static final class ItemAddHintNotify extends
@@ -164,17 +159,7 @@ public final class ItemAddHintNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              nAMDHIDNAMP_ = input.readBool();
-              break;
-            }
-            case 24: {
-
-              dJAHPNGMNGA_ = input.readBool();
-              break;
-            }
-            case 42: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint>();
                 mutable_bitField0_ |= 0x00000001;
@@ -183,22 +168,7 @@ public final class ItemAddHintNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.parser(), extensionRegistry));
               break;
             }
-            case 64: {
-
-              reason_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              oFKEJDENKLE_ = input.readBool();
-              break;
-            }
-            case 88: {
-
-              questId_ = input.readUInt32();
-              break;
-            }
-            case 98: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 overflowTransformedItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint>();
                 mutable_bitField0_ |= 0x00000002;
@@ -207,7 +177,12 @@ public final class ItemAddHintNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.parser(), extensionRegistry));
               break;
             }
-            case 106: {
+            case 40: {
+
+              isTransferedFromAvatarCard_ = input.readBool();
+              break;
+            }
+            case 50: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (position_ != null) {
                 subBuilder = position_.toBuilder();
@@ -220,6 +195,26 @@ public final class ItemAddHintNotifyOuterClass {
 
               break;
             }
+            case 72: {
+
+              reason_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              isPositionValid_ = input.readBool();
+              break;
+            }
+            case 96: {
+
+              isGeneralRewardHiden_ = input.readBool();
+              break;
+            }
+            case 104: {
+
+              questId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -258,28 +253,17 @@ public final class ItemAddHintNotifyOuterClass {
               emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.class, emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.Builder.class);
     }
 
-    public static final int NAMDHIDNAMP_FIELD_NUMBER = 1;
-    private boolean nAMDHIDNAMP_;
-    /**
-     * <code>bool NAMDHIDNAMP = 1;</code>
-     * @return The nAMDHIDNAMP.
-     */
-    @java.lang.Override
-    public boolean getNAMDHIDNAMP() {
-      return nAMDHIDNAMP_;
-    }
-
-    public static final int ITEM_LIST_FIELD_NUMBER = 5;
+    public static final int ITEM_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> itemList_;
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
@@ -287,21 +271,21 @@ public final class ItemAddHintNotifyOuterClass {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index) {
       return itemList_.get(index);
     }
     /**
-     * <code>repeated .ItemHint item_list = 5;</code>
+     * <code>repeated .ItemHint item_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder(
@@ -309,28 +293,17 @@ public final class ItemAddHintNotifyOuterClass {
       return itemList_.get(index);
     }
 
-    public static final int OFKEJDENKLE_FIELD_NUMBER = 10;
-    private boolean oFKEJDENKLE_;
-    /**
-     * <code>bool OFKEJDENKLE = 10;</code>
-     * @return The oFKEJDENKLE.
-     */
-    @java.lang.Override
-    public boolean getOFKEJDENKLE() {
-      return oFKEJDENKLE_;
-    }
-
-    public static final int OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER = 12;
+    public static final int OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> overflowTransformedItemList_;
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> getOverflowTransformedItemListList() {
       return overflowTransformedItemList_;
     }
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
@@ -338,21 +311,21 @@ public final class ItemAddHintNotifyOuterClass {
       return overflowTransformedItemList_;
     }
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     @java.lang.Override
     public int getOverflowTransformedItemListCount() {
       return overflowTransformedItemList_.size();
     }
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index) {
       return overflowTransformedItemList_.get(index);
     }
     /**
-     * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+     * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder(
@@ -360,43 +333,21 @@ public final class ItemAddHintNotifyOuterClass {
       return overflowTransformedItemList_.get(index);
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 11;
-    private int questId_;
+    public static final int IS_TRANSFERED_FROM_AVATAR_CARD_FIELD_NUMBER = 5;
+    private boolean isTransferedFromAvatarCard_;
     /**
-     * <code>uint32 quest_id = 11;</code>
-     * @return The questId.
+     * <code>bool is_transfered_from_avatar_card = 5;</code>
+     * @return The isTransferedFromAvatarCard.
      */
     @java.lang.Override
-    public int getQuestId() {
-      return questId_;
+    public boolean getIsTransferedFromAvatarCard() {
+      return isTransferedFromAvatarCard_;
     }
 
-    public static final int DJAHPNGMNGA_FIELD_NUMBER = 3;
-    private boolean dJAHPNGMNGA_;
-    /**
-     * <code>bool DJAHPNGMNGA = 3;</code>
-     * @return The dJAHPNGMNGA.
-     */
-    @java.lang.Override
-    public boolean getDJAHPNGMNGA() {
-      return dJAHPNGMNGA_;
-    }
-
-    public static final int REASON_FIELD_NUMBER = 8;
-    private int reason_;
-    /**
-     * <code>uint32 reason = 8;</code>
-     * @return The reason.
-     */
-    @java.lang.Override
-    public int getReason() {
-      return reason_;
-    }
-
-    public static final int POSITION_FIELD_NUMBER = 13;
+    public static final int POSITION_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector position_;
     /**
-     * <code>.Vector position = 13;</code>
+     * <code>.Vector position = 6;</code>
      * @return Whether the position field is set.
      */
     @java.lang.Override
@@ -404,7 +355,7 @@ public final class ItemAddHintNotifyOuterClass {
       return position_ != null;
     }
     /**
-     * <code>.Vector position = 13;</code>
+     * <code>.Vector position = 6;</code>
      * @return The position.
      */
     @java.lang.Override
@@ -412,13 +363,57 @@ public final class ItemAddHintNotifyOuterClass {
       return position_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : position_;
     }
     /**
-     * <code>.Vector position = 13;</code>
+     * <code>.Vector position = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
       return getPosition();
     }
 
+    public static final int REASON_FIELD_NUMBER = 9;
+    private int reason_;
+    /**
+     * <code>uint32 reason = 9;</code>
+     * @return The reason.
+     */
+    @java.lang.Override
+    public int getReason() {
+      return reason_;
+    }
+
+    public static final int IS_POSITION_VALID_FIELD_NUMBER = 11;
+    private boolean isPositionValid_;
+    /**
+     * <code>bool is_position_valid = 11;</code>
+     * @return The isPositionValid.
+     */
+    @java.lang.Override
+    public boolean getIsPositionValid() {
+      return isPositionValid_;
+    }
+
+    public static final int IS_GENERAL_REWARD_HIDEN_FIELD_NUMBER = 12;
+    private boolean isGeneralRewardHiden_;
+    /**
+     * <code>bool is_general_reward_hiden = 12;</code>
+     * @return The isGeneralRewardHiden.
+     */
+    @java.lang.Override
+    public boolean getIsGeneralRewardHiden() {
+      return isGeneralRewardHiden_;
+    }
+
+    public static final int QUEST_ID_FIELD_NUMBER = 13;
+    private int questId_;
+    /**
+     * <code>uint32 quest_id = 13;</code>
+     * @return The questId.
+     */
+    @java.lang.Override
+    public int getQuestId() {
+      return questId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -433,29 +428,29 @@ public final class ItemAddHintNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (nAMDHIDNAMP_ != false) {
-        output.writeBool(1, nAMDHIDNAMP_);
-      }
-      if (dJAHPNGMNGA_ != false) {
-        output.writeBool(3, dJAHPNGMNGA_);
-      }
       for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(5, itemList_.get(i));
-      }
-      if (reason_ != 0) {
-        output.writeUInt32(8, reason_);
-      }
-      if (oFKEJDENKLE_ != false) {
-        output.writeBool(10, oFKEJDENKLE_);
-      }
-      if (questId_ != 0) {
-        output.writeUInt32(11, questId_);
+        output.writeMessage(2, itemList_.get(i));
       }
       for (int i = 0; i < overflowTransformedItemList_.size(); i++) {
-        output.writeMessage(12, overflowTransformedItemList_.get(i));
+        output.writeMessage(3, overflowTransformedItemList_.get(i));
+      }
+      if (isTransferedFromAvatarCard_ != false) {
+        output.writeBool(5, isTransferedFromAvatarCard_);
       }
       if (position_ != null) {
-        output.writeMessage(13, getPosition());
+        output.writeMessage(6, getPosition());
+      }
+      if (reason_ != 0) {
+        output.writeUInt32(9, reason_);
+      }
+      if (isPositionValid_ != false) {
+        output.writeBool(11, isPositionValid_);
+      }
+      if (isGeneralRewardHiden_ != false) {
+        output.writeBool(12, isGeneralRewardHiden_);
+      }
+      if (questId_ != 0) {
+        output.writeUInt32(13, questId_);
       }
       unknownFields.writeTo(output);
     }
@@ -466,37 +461,37 @@ public final class ItemAddHintNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (nAMDHIDNAMP_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, nAMDHIDNAMP_);
-      }
-      if (dJAHPNGMNGA_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, dJAHPNGMNGA_);
-      }
       for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, itemList_.get(i));
-      }
-      if (reason_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, reason_);
-      }
-      if (oFKEJDENKLE_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(10, oFKEJDENKLE_);
-      }
-      if (questId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, questId_);
+          .computeMessageSize(2, itemList_.get(i));
       }
       for (int i = 0; i < overflowTransformedItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, overflowTransformedItemList_.get(i));
+          .computeMessageSize(3, overflowTransformedItemList_.get(i));
+      }
+      if (isTransferedFromAvatarCard_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, isTransferedFromAvatarCard_);
       }
       if (position_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getPosition());
+          .computeMessageSize(6, getPosition());
+      }
+      if (reason_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, reason_);
+      }
+      if (isPositionValid_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isPositionValid_);
+      }
+      if (isGeneralRewardHiden_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isGeneralRewardHiden_);
+      }
+      if (questId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, questId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -513,25 +508,25 @@ public final class ItemAddHintNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify other = (emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify) obj;
 
-      if (getNAMDHIDNAMP()
-          != other.getNAMDHIDNAMP()) return false;
       if (!getItemListList()
           .equals(other.getItemListList())) return false;
-      if (getOFKEJDENKLE()
-          != other.getOFKEJDENKLE()) return false;
       if (!getOverflowTransformedItemListList()
           .equals(other.getOverflowTransformedItemListList())) return false;
-      if (getQuestId()
-          != other.getQuestId()) return false;
-      if (getDJAHPNGMNGA()
-          != other.getDJAHPNGMNGA()) return false;
-      if (getReason()
-          != other.getReason()) return false;
+      if (getIsTransferedFromAvatarCard()
+          != other.getIsTransferedFromAvatarCard()) return false;
       if (hasPosition() != other.hasPosition()) return false;
       if (hasPosition()) {
         if (!getPosition()
             .equals(other.getPosition())) return false;
       }
+      if (getReason()
+          != other.getReason()) return false;
+      if (getIsPositionValid()
+          != other.getIsPositionValid()) return false;
+      if (getIsGeneralRewardHiden()
+          != other.getIsGeneralRewardHiden()) return false;
+      if (getQuestId()
+          != other.getQuestId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -543,31 +538,31 @@ public final class ItemAddHintNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NAMDHIDNAMP_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getNAMDHIDNAMP());
       if (getItemListCount() > 0) {
         hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemListList().hashCode();
       }
-      hash = (37 * hash) + OFKEJDENKLE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getOFKEJDENKLE());
       if (getOverflowTransformedItemListCount() > 0) {
         hash = (37 * hash) + OVERFLOW_TRANSFORMED_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getOverflowTransformedItemListList().hashCode();
       }
-      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestId();
-      hash = (37 * hash) + DJAHPNGMNGA_FIELD_NUMBER;
+      hash = (37 * hash) + IS_TRANSFERED_FROM_AVATAR_CARD_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getDJAHPNGMNGA());
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + getReason();
+          getIsTransferedFromAvatarCard());
       if (hasPosition()) {
         hash = (37 * hash) + POSITION_FIELD_NUMBER;
         hash = (53 * hash) + getPosition().hashCode();
       }
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + getReason();
+      hash = (37 * hash) + IS_POSITION_VALID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsPositionValid());
+      hash = (37 * hash) + IS_GENERAL_REWARD_HIDEN_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsGeneralRewardHiden());
+      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -664,11 +659,6 @@ public final class ItemAddHintNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20755
-     * Obf: CNDHGNFOGNJ
-     * </pre>
-     *
      * Protobuf type {@code ItemAddHintNotify}
      */
     public static final class Builder extends
@@ -708,27 +698,19 @@ public final class ItemAddHintNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nAMDHIDNAMP_ = false;
-
         if (itemListBuilder_ == null) {
           itemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           itemListBuilder_.clear();
         }
-        oFKEJDENKLE_ = false;
-
         if (overflowTransformedItemListBuilder_ == null) {
           overflowTransformedItemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           overflowTransformedItemListBuilder_.clear();
         }
-        questId_ = 0;
-
-        dJAHPNGMNGA_ = false;
-
-        reason_ = 0;
+        isTransferedFromAvatarCard_ = false;
 
         if (positionBuilder_ == null) {
           position_ = null;
@@ -736,6 +718,14 @@ public final class ItemAddHintNotifyOuterClass {
           position_ = null;
           positionBuilder_ = null;
         }
+        reason_ = 0;
+
+        isPositionValid_ = false;
+
+        isGeneralRewardHiden_ = false;
+
+        questId_ = 0;
+
         return this;
       }
 
@@ -763,7 +753,6 @@ public final class ItemAddHintNotifyOuterClass {
       public emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify buildPartial() {
         emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify result = new emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify(this);
         int from_bitField0_ = bitField0_;
-        result.nAMDHIDNAMP_ = nAMDHIDNAMP_;
         if (itemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             itemList_ = java.util.Collections.unmodifiableList(itemList_);
@@ -773,7 +762,6 @@ public final class ItemAddHintNotifyOuterClass {
         } else {
           result.itemList_ = itemListBuilder_.build();
         }
-        result.oFKEJDENKLE_ = oFKEJDENKLE_;
         if (overflowTransformedItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             overflowTransformedItemList_ = java.util.Collections.unmodifiableList(overflowTransformedItemList_);
@@ -783,14 +771,16 @@ public final class ItemAddHintNotifyOuterClass {
         } else {
           result.overflowTransformedItemList_ = overflowTransformedItemListBuilder_.build();
         }
-        result.questId_ = questId_;
-        result.dJAHPNGMNGA_ = dJAHPNGMNGA_;
-        result.reason_ = reason_;
+        result.isTransferedFromAvatarCard_ = isTransferedFromAvatarCard_;
         if (positionBuilder_ == null) {
           result.position_ = position_;
         } else {
           result.position_ = positionBuilder_.build();
         }
+        result.reason_ = reason_;
+        result.isPositionValid_ = isPositionValid_;
+        result.isGeneralRewardHiden_ = isGeneralRewardHiden_;
+        result.questId_ = questId_;
         onBuilt();
         return result;
       }
@@ -839,9 +829,6 @@ public final class ItemAddHintNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify other) {
         if (other == emu.grasscutter.net.proto.ItemAddHintNotifyOuterClass.ItemAddHintNotify.getDefaultInstance()) return this;
-        if (other.getNAMDHIDNAMP() != false) {
-          setNAMDHIDNAMP(other.getNAMDHIDNAMP());
-        }
         if (itemListBuilder_ == null) {
           if (!other.itemList_.isEmpty()) {
             if (itemList_.isEmpty()) {
@@ -868,9 +855,6 @@ public final class ItemAddHintNotifyOuterClass {
             }
           }
         }
-        if (other.getOFKEJDENKLE() != false) {
-          setOFKEJDENKLE(other.getOFKEJDENKLE());
-        }
         if (overflowTransformedItemListBuilder_ == null) {
           if (!other.overflowTransformedItemList_.isEmpty()) {
             if (overflowTransformedItemList_.isEmpty()) {
@@ -897,17 +881,23 @@ public final class ItemAddHintNotifyOuterClass {
             }
           }
         }
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
+        if (other.getIsTransferedFromAvatarCard() != false) {
+          setIsTransferedFromAvatarCard(other.getIsTransferedFromAvatarCard());
         }
-        if (other.getDJAHPNGMNGA() != false) {
-          setDJAHPNGMNGA(other.getDJAHPNGMNGA());
+        if (other.hasPosition()) {
+          mergePosition(other.getPosition());
         }
         if (other.getReason() != 0) {
           setReason(other.getReason());
         }
-        if (other.hasPosition()) {
-          mergePosition(other.getPosition());
+        if (other.getIsPositionValid() != false) {
+          setIsPositionValid(other.getIsPositionValid());
+        }
+        if (other.getIsGeneralRewardHiden() != false) {
+          setIsGeneralRewardHiden(other.getIsGeneralRewardHiden());
+        }
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -939,37 +929,6 @@ public final class ItemAddHintNotifyOuterClass {
       }
       private int bitField0_;
 
-      private boolean nAMDHIDNAMP_ ;
-      /**
-       * <code>bool NAMDHIDNAMP = 1;</code>
-       * @return The nAMDHIDNAMP.
-       */
-      @java.lang.Override
-      public boolean getNAMDHIDNAMP() {
-        return nAMDHIDNAMP_;
-      }
-      /**
-       * <code>bool NAMDHIDNAMP = 1;</code>
-       * @param value The nAMDHIDNAMP to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNAMDHIDNAMP(boolean value) {
-        
-        nAMDHIDNAMP_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool NAMDHIDNAMP = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNAMDHIDNAMP() {
-        
-        nAMDHIDNAMP_ = false;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> itemList_ =
         java.util.Collections.emptyList();
       private void ensureItemListIsMutable() {
@@ -983,7 +942,7 @@ public final class ItemAddHintNotifyOuterClass {
           emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -993,7 +952,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -1003,7 +962,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -1013,7 +972,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
@@ -1030,7 +989,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1044,7 +1003,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
         if (itemListBuilder_ == null) {
@@ -1060,7 +1019,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
@@ -1077,7 +1036,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1091,7 +1050,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1105,7 +1064,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> values) {
@@ -1120,7 +1079,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -1133,7 +1092,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -1146,14 +1105,14 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getItemListOrBuilder(
           int index) {
@@ -1163,7 +1122,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
            getItemListOrBuilderList() {
@@ -1174,14 +1133,14 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addItemListBuilder(
           int index) {
@@ -1189,7 +1148,7 @@ public final class ItemAddHintNotifyOuterClass {
             index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemHint item_list = 5;</code>
+       * <code>repeated .ItemHint item_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder> 
            getItemListBuilderList() {
@@ -1210,37 +1169,6 @@ public final class ItemAddHintNotifyOuterClass {
         return itemListBuilder_;
       }
 
-      private boolean oFKEJDENKLE_ ;
-      /**
-       * <code>bool OFKEJDENKLE = 10;</code>
-       * @return The oFKEJDENKLE.
-       */
-      @java.lang.Override
-      public boolean getOFKEJDENKLE() {
-        return oFKEJDENKLE_;
-      }
-      /**
-       * <code>bool OFKEJDENKLE = 10;</code>
-       * @param value The oFKEJDENKLE to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOFKEJDENKLE(boolean value) {
-        
-        oFKEJDENKLE_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool OFKEJDENKLE = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOFKEJDENKLE() {
-        
-        oFKEJDENKLE_ = false;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> overflowTransformedItemList_ =
         java.util.Collections.emptyList();
       private void ensureOverflowTransformedItemListIsMutable() {
@@ -1254,7 +1182,7 @@ public final class ItemAddHintNotifyOuterClass {
           emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> overflowTransformedItemListBuilder_;
 
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> getOverflowTransformedItemListList() {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1264,7 +1192,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public int getOverflowTransformedItemListCount() {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1274,7 +1202,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint getOverflowTransformedItemList(int index) {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1284,7 +1212,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder setOverflowTransformedItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
@@ -1301,7 +1229,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder setOverflowTransformedItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1315,7 +1243,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder addOverflowTransformedItemList(emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1331,7 +1259,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder addOverflowTransformedItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint value) {
@@ -1348,7 +1276,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder addOverflowTransformedItemList(
           emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1362,7 +1290,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder addOverflowTransformedItemList(
           int index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder builderForValue) {
@@ -1376,7 +1304,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder addAllOverflowTransformedItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint> values) {
@@ -1391,7 +1319,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder clearOverflowTransformedItemList() {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1404,7 +1332,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public Builder removeOverflowTransformedItemList(int index) {
         if (overflowTransformedItemListBuilder_ == null) {
@@ -1417,14 +1345,14 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder getOverflowTransformedItemListBuilder(
           int index) {
         return getOverflowTransformedItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder getOverflowTransformedItemListOrBuilder(
           int index) {
@@ -1434,7 +1362,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemHintOuterClass.ItemHintOrBuilder> 
            getOverflowTransformedItemListOrBuilderList() {
@@ -1445,14 +1373,14 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflowTransformedItemListBuilder() {
         return getOverflowTransformedItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder addOverflowTransformedItemListBuilder(
           int index) {
@@ -1460,7 +1388,7 @@ public final class ItemAddHintNotifyOuterClass {
             index, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemHint overflow_transformed_item_list = 12;</code>
+       * <code>repeated .ItemHint overflow_transformed_item_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder> 
            getOverflowTransformedItemListBuilderList() {
@@ -1481,95 +1409,33 @@ public final class ItemAddHintNotifyOuterClass {
         return overflowTransformedItemListBuilder_;
       }
 
-      private int questId_ ;
+      private boolean isTransferedFromAvatarCard_ ;
       /**
-       * <code>uint32 quest_id = 11;</code>
-       * @return The questId.
+       * <code>bool is_transfered_from_avatar_card = 5;</code>
+       * @return The isTransferedFromAvatarCard.
        */
       @java.lang.Override
-      public int getQuestId() {
-        return questId_;
+      public boolean getIsTransferedFromAvatarCard() {
+        return isTransferedFromAvatarCard_;
       }
       /**
-       * <code>uint32 quest_id = 11;</code>
-       * @param value The questId to set.
+       * <code>bool is_transfered_from_avatar_card = 5;</code>
+       * @param value The isTransferedFromAvatarCard to set.
        * @return This builder for chaining.
        */
-      public Builder setQuestId(int value) {
+      public Builder setIsTransferedFromAvatarCard(boolean value) {
         
-        questId_ = value;
+        isTransferedFromAvatarCard_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 quest_id = 11;</code>
+       * <code>bool is_transfered_from_avatar_card = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQuestId() {
+      public Builder clearIsTransferedFromAvatarCard() {
         
-        questId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean dJAHPNGMNGA_ ;
-      /**
-       * <code>bool DJAHPNGMNGA = 3;</code>
-       * @return The dJAHPNGMNGA.
-       */
-      @java.lang.Override
-      public boolean getDJAHPNGMNGA() {
-        return dJAHPNGMNGA_;
-      }
-      /**
-       * <code>bool DJAHPNGMNGA = 3;</code>
-       * @param value The dJAHPNGMNGA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDJAHPNGMNGA(boolean value) {
-        
-        dJAHPNGMNGA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool DJAHPNGMNGA = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDJAHPNGMNGA() {
-        
-        dJAHPNGMNGA_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int reason_ ;
-      /**
-       * <code>uint32 reason = 8;</code>
-       * @return The reason.
-       */
-      @java.lang.Override
-      public int getReason() {
-        return reason_;
-      }
-      /**
-       * <code>uint32 reason = 8;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(int value) {
-        
-        reason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reason = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = 0;
+        isTransferedFromAvatarCard_ = false;
         onChanged();
         return this;
       }
@@ -1578,14 +1444,14 @@ public final class ItemAddHintNotifyOuterClass {
       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 = 13;</code>
+       * <code>.Vector position = 6;</code>
        * @return Whether the position field is set.
        */
       public boolean hasPosition() {
         return positionBuilder_ != null || position_ != null;
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        * @return The position.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPosition() {
@@ -1596,7 +1462,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public Builder setPosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -1612,7 +1478,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public Builder setPosition(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1626,7 +1492,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public Builder mergePosition(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (positionBuilder_ == null) {
@@ -1644,7 +1510,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public Builder clearPosition() {
         if (positionBuilder_ == null) {
@@ -1658,7 +1524,7 @@ public final class ItemAddHintNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPositionBuilder() {
         
@@ -1666,7 +1532,7 @@ public final class ItemAddHintNotifyOuterClass {
         return getPositionFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPositionOrBuilder() {
         if (positionBuilder_ != null) {
@@ -1677,7 +1543,7 @@ public final class ItemAddHintNotifyOuterClass {
         }
       }
       /**
-       * <code>.Vector position = 13;</code>
+       * <code>.Vector position = 6;</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> 
@@ -1692,6 +1558,130 @@ public final class ItemAddHintNotifyOuterClass {
         }
         return positionBuilder_;
       }
+
+      private int reason_ ;
+      /**
+       * <code>uint32 reason = 9;</code>
+       * @return The reason.
+       */
+      @java.lang.Override
+      public int getReason() {
+        return reason_;
+      }
+      /**
+       * <code>uint32 reason = 9;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(int value) {
+        
+        reason_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reason = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isPositionValid_ ;
+      /**
+       * <code>bool is_position_valid = 11;</code>
+       * @return The isPositionValid.
+       */
+      @java.lang.Override
+      public boolean getIsPositionValid() {
+        return isPositionValid_;
+      }
+      /**
+       * <code>bool is_position_valid = 11;</code>
+       * @param value The isPositionValid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsPositionValid(boolean value) {
+        
+        isPositionValid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_position_valid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsPositionValid() {
+        
+        isPositionValid_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isGeneralRewardHiden_ ;
+      /**
+       * <code>bool is_general_reward_hiden = 12;</code>
+       * @return The isGeneralRewardHiden.
+       */
+      @java.lang.Override
+      public boolean getIsGeneralRewardHiden() {
+        return isGeneralRewardHiden_;
+      }
+      /**
+       * <code>bool is_general_reward_hiden = 12;</code>
+       * @param value The isGeneralRewardHiden to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsGeneralRewardHiden(boolean value) {
+        
+        isGeneralRewardHiden_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_general_reward_hiden = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsGeneralRewardHiden() {
+        
+        isGeneralRewardHiden_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int questId_ ;
+      /**
+       * <code>uint32 quest_id = 13;</code>
+       * @return The questId.
+       */
+      @java.lang.Override
+      public int getQuestId() {
+        return questId_;
+      }
+      /**
+       * <code>uint32 quest_id = 13;</code>
+       * @param value The questId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQuestId(int value) {
+        
+        questId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 quest_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQuestId() {
+        
+        questId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1760,13 +1750,14 @@ public final class ItemAddHintNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027ItemAddHintNotify.proto\032\016ItemHint.prot" +
-      "o\032\014Vector.proto\"\340\001\n\021ItemAddHintNotify\022\023\n" +
-      "\013NAMDHIDNAMP\030\001 \001(\010\022\034\n\titem_list\030\005 \003(\0132\t." +
-      "ItemHint\022\023\n\013OFKEJDENKLE\030\n \001(\010\0221\n\036overflo" +
-      "w_transformed_item_list\030\014 \003(\0132\t.ItemHint" +
-      "\022\020\n\010quest_id\030\013 \001(\r\022\023\n\013DJAHPNGMNGA\030\003 \001(\010\022" +
-      "\016\n\006reason\030\010 \001(\r\022\031\n\010position\030\r \001(\0132\007.Vect" +
-      "orB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "o\032\014Vector.proto\"\205\002\n\021ItemAddHintNotify\022\034\n" +
+      "\titem_list\030\002 \003(\0132\t.ItemHint\0221\n\036overflow_" +
+      "transformed_item_list\030\003 \003(\0132\t.ItemHint\022&" +
+      "\n\036is_transfered_from_avatar_card\030\005 \001(\010\022\031" +
+      "\n\010position\030\006 \001(\0132\007.Vector\022\016\n\006reason\030\t \001(" +
+      "\r\022\031\n\021is_position_valid\030\013 \001(\010\022\037\n\027is_gener" +
+      "al_reward_hiden\030\014 \001(\010\022\020\n\010quest_id\030\r \001(\rB" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1779,7 +1770,7 @@ public final class ItemAddHintNotifyOuterClass {
     internal_static_ItemAddHintNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ItemAddHintNotify_descriptor,
-        new java.lang.String[] { "NAMDHIDNAMP", "ItemList", "OFKEJDENKLE", "OverflowTransformedItemList", "QuestId", "DJAHPNGMNGA", "Reason", "Position", });
+        new java.lang.String[] { "ItemList", "OverflowTransformedItemList", "IsTransferedFromAvatarCard", "Position", "Reason", "IsPositionValid", "IsGeneralRewardHiden", "QuestId", });
     emu.grasscutter.net.proto.ItemHintOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java
index d2f725f23..1fe8c0d94 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemHintOuterClass.java
@@ -19,34 +19,30 @@ public final class ItemHintOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 count = 7;</code>
+     * <code>uint32 count = 1;</code>
      * @return The count.
      */
     int getCount();
 
     /**
-     * <code>uint32 item_id = 9;</code>
+     * <code>bool is_new = 2;</code>
+     * @return The isNew.
+     */
+    boolean getIsNew();
+
+    /**
+     * <code>uint32 item_id = 10;</code>
      * @return The itemId.
      */
     int getItemId();
 
     /**
-     * <code>uint64 guid = 14;</code>
+     * <code>uint64 guid = 15;</code>
      * @return The guid.
      */
     long getGuid();
-
-    /**
-     * <code>bool is_new = 8;</code>
-     * @return The isNew.
-     */
-    boolean getIsNew();
   }
   /**
-   * <pre>
-   * Obf: OLBNAADPLKJ
-   * </pre>
-   *
    * Protobuf type {@code ItemHint}
    */
   public static final class ItemHint extends
@@ -91,22 +87,22 @@ public final class ItemHintOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 8: {
 
               count_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 16: {
 
               isNew_ = input.readBool();
               break;
             }
-            case 72: {
+            case 80: {
 
               itemId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 120: {
 
               guid_ = input.readUInt64();
               break;
@@ -143,10 +139,10 @@ public final class ItemHintOuterClass {
               emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.class, emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint.Builder.class);
     }
 
-    public static final int COUNT_FIELD_NUMBER = 7;
+    public static final int COUNT_FIELD_NUMBER = 1;
     private int count_;
     /**
-     * <code>uint32 count = 7;</code>
+     * <code>uint32 count = 1;</code>
      * @return The count.
      */
     @java.lang.Override
@@ -154,10 +150,21 @@ public final class ItemHintOuterClass {
       return count_;
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 9;
+    public static final int IS_NEW_FIELD_NUMBER = 2;
+    private boolean isNew_;
+    /**
+     * <code>bool is_new = 2;</code>
+     * @return The isNew.
+     */
+    @java.lang.Override
+    public boolean getIsNew() {
+      return isNew_;
+    }
+
+    public static final int ITEM_ID_FIELD_NUMBER = 10;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 9;</code>
+     * <code>uint32 item_id = 10;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -165,10 +172,10 @@ public final class ItemHintOuterClass {
       return itemId_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 14;
+    public static final int GUID_FIELD_NUMBER = 15;
     private long guid_;
     /**
-     * <code>uint64 guid = 14;</code>
+     * <code>uint64 guid = 15;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -176,17 +183,6 @@ public final class ItemHintOuterClass {
       return guid_;
     }
 
-    public static final int IS_NEW_FIELD_NUMBER = 8;
-    private boolean isNew_;
-    /**
-     * <code>bool is_new = 8;</code>
-     * @return The isNew.
-     */
-    @java.lang.Override
-    public boolean getIsNew() {
-      return isNew_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,16 +198,16 @@ public final class ItemHintOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (count_ != 0) {
-        output.writeUInt32(7, count_);
+        output.writeUInt32(1, count_);
       }
       if (isNew_ != false) {
-        output.writeBool(8, isNew_);
+        output.writeBool(2, isNew_);
       }
       if (itemId_ != 0) {
-        output.writeUInt32(9, itemId_);
+        output.writeUInt32(10, itemId_);
       }
       if (guid_ != 0L) {
-        output.writeUInt64(14, guid_);
+        output.writeUInt64(15, guid_);
       }
       unknownFields.writeTo(output);
     }
@@ -224,19 +220,19 @@ public final class ItemHintOuterClass {
       size = 0;
       if (count_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, count_);
+          .computeUInt32Size(1, count_);
       }
       if (isNew_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isNew_);
+          .computeBoolSize(2, isNew_);
       }
       if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, itemId_);
+          .computeUInt32Size(10, itemId_);
       }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, guid_);
+          .computeUInt64Size(15, guid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -255,12 +251,12 @@ public final class ItemHintOuterClass {
 
       if (getCount()
           != other.getCount()) return false;
+      if (getIsNew()
+          != other.getIsNew()) return false;
       if (getItemId()
           != other.getItemId()) return false;
       if (getGuid()
           != other.getGuid()) return false;
-      if (getIsNew()
-          != other.getIsNew()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -274,14 +270,14 @@ public final class ItemHintOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getCount();
+      hash = (37 * hash) + IS_NEW_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsNew());
       hash = (37 * hash) + ITEM_ID_FIELD_NUMBER;
       hash = (53 * hash) + getItemId();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
-      hash = (37 * hash) + IS_NEW_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsNew());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,10 +374,6 @@ public final class ItemHintOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OLBNAADPLKJ
-     * </pre>
-     *
      * Protobuf type {@code ItemHint}
      */
     public static final class Builder extends
@@ -421,12 +413,12 @@ public final class ItemHintOuterClass {
         super.clear();
         count_ = 0;
 
+        isNew_ = false;
+
         itemId_ = 0;
 
         guid_ = 0L;
 
-        isNew_ = false;
-
         return this;
       }
 
@@ -454,9 +446,9 @@ public final class ItemHintOuterClass {
       public emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint buildPartial() {
         emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint result = new emu.grasscutter.net.proto.ItemHintOuterClass.ItemHint(this);
         result.count_ = count_;
+        result.isNew_ = isNew_;
         result.itemId_ = itemId_;
         result.guid_ = guid_;
-        result.isNew_ = isNew_;
         onBuilt();
         return result;
       }
@@ -508,15 +500,15 @@ public final class ItemHintOuterClass {
         if (other.getCount() != 0) {
           setCount(other.getCount());
         }
+        if (other.getIsNew() != false) {
+          setIsNew(other.getIsNew());
+        }
         if (other.getItemId() != 0) {
           setItemId(other.getItemId());
         }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
-        if (other.getIsNew() != false) {
-          setIsNew(other.getIsNew());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -548,7 +540,7 @@ public final class ItemHintOuterClass {
 
       private int count_ ;
       /**
-       * <code>uint32 count = 7;</code>
+       * <code>uint32 count = 1;</code>
        * @return The count.
        */
       @java.lang.Override
@@ -556,7 +548,7 @@ public final class ItemHintOuterClass {
         return count_;
       }
       /**
-       * <code>uint32 count = 7;</code>
+       * <code>uint32 count = 1;</code>
        * @param value The count to set.
        * @return This builder for chaining.
        */
@@ -567,7 +559,7 @@ public final class ItemHintOuterClass {
         return this;
       }
       /**
-       * <code>uint32 count = 7;</code>
+       * <code>uint32 count = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearCount() {
@@ -577,9 +569,40 @@ public final class ItemHintOuterClass {
         return this;
       }
 
+      private boolean isNew_ ;
+      /**
+       * <code>bool is_new = 2;</code>
+       * @return The isNew.
+       */
+      @java.lang.Override
+      public boolean getIsNew() {
+        return isNew_;
+      }
+      /**
+       * <code>bool is_new = 2;</code>
+       * @param value The isNew to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsNew(boolean value) {
+        
+        isNew_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_new = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNew() {
+        
+        isNew_ = false;
+        onChanged();
+        return this;
+      }
+
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 10;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -587,7 +610,7 @@ public final class ItemHintOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 10;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -598,7 +621,7 @@ public final class ItemHintOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 9;</code>
+       * <code>uint32 item_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -610,7 +633,7 @@ public final class ItemHintOuterClass {
 
       private long guid_ ;
       /**
-       * <code>uint64 guid = 14;</code>
+       * <code>uint64 guid = 15;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -618,7 +641,7 @@ public final class ItemHintOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 14;</code>
+       * <code>uint64 guid = 15;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -629,7 +652,7 @@ public final class ItemHintOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 14;</code>
+       * <code>uint64 guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -638,37 +661,6 @@ public final class ItemHintOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean isNew_ ;
-      /**
-       * <code>bool is_new = 8;</code>
-       * @return The isNew.
-       */
-      @java.lang.Override
-      public boolean getIsNew() {
-        return isNew_;
-      }
-      /**
-       * <code>bool is_new = 8;</code>
-       * @param value The isNew to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsNew(boolean value) {
-        
-        isNew_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_new = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsNew() {
-        
-        isNew_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +728,9 @@ public final class ItemHintOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016ItemHint.proto\"H\n\010ItemHint\022\r\n\005count\030\007 " +
-      "\001(\r\022\017\n\007item_id\030\t \001(\r\022\014\n\004guid\030\016 \001(\004\022\016\n\006is" +
-      "_new\030\010 \001(\010B\033\n\031emu.grasscutter.net.protob" +
+      "\n\016ItemHint.proto\"H\n\010ItemHint\022\r\n\005count\030\001 " +
+      "\001(\r\022\016\n\006is_new\030\002 \001(\010\022\017\n\007item_id\030\n \001(\r\022\014\n\004" +
+      "guid\030\017 \001(\004B\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class ItemHintOuterClass {
     internal_static_ItemHint_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ItemHint_descriptor,
-        new java.lang.String[] { "Count", "ItemId", "Guid", "IsNew", });
+        new java.lang.String[] { "Count", "IsNew", "ItemId", "Guid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemOuterClass.java
index 57667f8bf..111be8510 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ItemOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemOuterClass.java
@@ -78,10 +78,6 @@ public final class ItemOuterClass {
     public emu.grasscutter.net.proto.ItemOuterClass.Item.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * Obf: EPFDENHAINI
-   * </pre>
-   *
    * Protobuf type {@code Item}
    */
   public static final class Item extends
@@ -590,10 +586,6 @@ public final class ItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EPFDENHAINI
-     * </pre>
-     *
      * Protobuf type {@code Item}
      */
     public static final class Builder extends
@@ -1357,7 +1349,7 @@ public final class ItemOuterClass {
       "o\032\017Furniture.proto\"\210\001\n\004Item\022\017\n\007item_id\030\001" +
       " \001(\r\022\014\n\004guid\030\002 \001(\004\022\035\n\010material\030\005 \001(\0132\t.M" +
       "aterialH\000\022\027\n\005equip\030\006 \001(\0132\006.EquipH\000\022\037\n\tfu" +
-      "rniture\030\007 \001(\0132\n.FurnitureH\000B\010\n\006detailB\033\n" +
+      "rniture\030\007 \001(\0132\n.FurnitureH\000B\010\n\006DetailB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ItemParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ItemParamOuterClass.java
index e808a4a04..cd3a80c6b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ItemParamOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ItemParamOuterClass.java
@@ -32,7 +32,7 @@ public final class ItemParamOuterClass {
   }
   /**
    * <pre>
-   * Obf: GKCILFACLDH
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ItemParam}
@@ -311,7 +311,7 @@ public final class ItemParamOuterClass {
     }
     /**
      * <pre>
-     * Obf: GKCILFACLDH
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ItemParam}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java
new file mode 100644
index 000000000..521179e80
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/LackingResourceInfoOuterClass.java
@@ -0,0 +1,2567 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: LackingResourceInfo.proto
+
+package emu.grasscutter.net.proto;
+
+public final class LackingResourceInfoOuterClass {
+  private LackingResourceInfoOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface LackingResourceInfoOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:LackingResourceInfo)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @return A list containing the jAODPKILOHD.
+     */
+    java.util.List<java.lang.Integer> getJAODPKILOHDList();
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @return The count of jAODPKILOHD.
+     */
+    int getJAODPKILOHDCount();
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @param index The index of the element to return.
+     * @return The jAODPKILOHD at the given index.
+     */
+    int getJAODPKILOHD(int index);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    int getIGIDHGKOODOCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    boolean containsIGIDHGKOODO(
+        int key);
+    /**
+     * Use {@link #getIGIDHGKOODOMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getIGIDHGKOODO();
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getIGIDHGKOODOMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+
+    int getIGIDHGKOODOOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+
+    int getIGIDHGKOODOOrThrow(
+        int key);
+
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @return A list containing the oBAKLGMMOEO.
+     */
+    java.util.List<java.lang.Integer> getOBAKLGMMOEOList();
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @return The count of oBAKLGMMOEO.
+     */
+    int getOBAKLGMMOEOCount();
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @param index The index of the element to return.
+     * @return The oBAKLGMMOEO at the given index.
+     */
+    int getOBAKLGMMOEO(int index);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    int getLELGNGJOJAICount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    boolean containsLELGNGJOJAI(
+        int key);
+    /**
+     * Use {@link #getLELGNGJOJAIMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getLELGNGJOJAI();
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getLELGNGJOJAIMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+
+    int getLELGNGJOJAIOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+
+    int getLELGNGJOJAIOrThrow(
+        int key);
+
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @return A list containing the aOECKDLECIJ.
+     */
+    java.util.List<java.lang.Integer> getAOECKDLECIJList();
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @return The count of aOECKDLECIJ.
+     */
+    int getAOECKDLECIJCount();
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @param index The index of the element to return.
+     * @return The aOECKDLECIJ at the given index.
+     */
+    int getAOECKDLECIJ(int index);
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    int getACAAJJBNCDMCount();
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    boolean containsACAAJJBNCDM(
+        int key);
+    /**
+     * Use {@link #getACAAJJBNCDMMap()} instead.
+     */
+    @java.lang.Deprecated
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getACAAJJBNCDM();
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    java.util.Map<java.lang.Integer, java.lang.Integer>
+    getACAAJJBNCDMMap();
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+
+    int getACAAJJBNCDMOrDefault(
+        int key,
+        int defaultValue);
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+
+    int getACAAJJBNCDMOrThrow(
+        int key);
+
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @return A list containing the lHEGFHKBMKF.
+     */
+    java.util.List<java.lang.Integer> getLHEGFHKBMKFList();
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @return The count of lHEGFHKBMKF.
+     */
+    int getLHEGFHKBMKFCount();
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @param index The index of the element to return.
+     * @return The lHEGFHKBMKF at the given index.
+     */
+    int getLHEGFHKBMKF(int index);
+
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @return A list containing the hIIHFCBJLDI.
+     */
+    java.util.List<java.lang.Integer> getHIIHFCBJLDIList();
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @return The count of hIIHFCBJLDI.
+     */
+    int getHIIHFCBJLDICount();
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @param index The index of the element to return.
+     * @return The hIIHFCBJLDI at the given index.
+     */
+    int getHIIHFCBJLDI(int index);
+
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @return A list containing the hCPKDCNKPGD.
+     */
+    java.util.List<java.lang.Integer> getHCPKDCNKPGDList();
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @return The count of hCPKDCNKPGD.
+     */
+    int getHCPKDCNKPGDCount();
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @param index The index of the element to return.
+     * @return The hCPKDCNKPGD at the given index.
+     */
+    int getHCPKDCNKPGD(int index);
+  }
+  /**
+   * Protobuf type {@code LackingResourceInfo}
+   */
+  public static final class LackingResourceInfo extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:LackingResourceInfo)
+      LackingResourceInfoOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use LackingResourceInfo.newBuilder() to construct.
+    private LackingResourceInfo(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private LackingResourceInfo() {
+      jAODPKILOHD_ = emptyIntList();
+      oBAKLGMMOEO_ = emptyIntList();
+      aOECKDLECIJ_ = emptyIntList();
+      lHEGFHKBMKF_ = emptyIntList();
+      hIIHFCBJLDI_ = emptyIntList();
+      hCPKDCNKPGD_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new LackingResourceInfo();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private LackingResourceInfo(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                jAODPKILOHD_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              jAODPKILOHD_.addInt(input.readUInt32());
+              break;
+            }
+            case 10: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                jAODPKILOHD_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                jAODPKILOHD_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                iGIDHGKOODO_ = com.google.protobuf.MapField.newMapField(
+                    IGIDHGKOODODefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              iGIDHGKOODO__ = input.readMessage(
+                  IGIDHGKOODODefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              iGIDHGKOODO_.getMutableMap().put(
+                  iGIDHGKOODO__.getKey(), iGIDHGKOODO__.getValue());
+              break;
+            }
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                oBAKLGMMOEO_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              oBAKLGMMOEO_.addInt(input.readUInt32());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                oBAKLGMMOEO_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                oBAKLGMMOEO_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 34: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                lELGNGJOJAI_ = com.google.protobuf.MapField.newMapField(
+                    LELGNGJOJAIDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000008;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              lELGNGJOJAI__ = input.readMessage(
+                  LELGNGJOJAIDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              lELGNGJOJAI_.getMutableMap().put(
+                  lELGNGJOJAI__.getKey(), lELGNGJOJAI__.getValue());
+              break;
+            }
+            case 40: {
+              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
+                aOECKDLECIJ_ = newIntList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              aOECKDLECIJ_.addInt(input.readUInt32());
+              break;
+            }
+            case 42: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
+                aOECKDLECIJ_ = newIntList();
+                mutable_bitField0_ |= 0x00000010;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                aOECKDLECIJ_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 50: {
+              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
+                aCAAJJBNCDM_ = com.google.protobuf.MapField.newMapField(
+                    ACAAJJBNCDMDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000020;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              aCAAJJBNCDM__ = input.readMessage(
+                  ACAAJJBNCDMDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              aCAAJJBNCDM_.getMutableMap().put(
+                  aCAAJJBNCDM__.getKey(), aCAAJJBNCDM__.getValue());
+              break;
+            }
+            case 56: {
+              if (!((mutable_bitField0_ & 0x00000040) != 0)) {
+                lHEGFHKBMKF_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              lHEGFHKBMKF_.addInt(input.readUInt32());
+              break;
+            }
+            case 58: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000040) != 0) && input.getBytesUntilLimit() > 0) {
+                lHEGFHKBMKF_ = newIntList();
+                mutable_bitField0_ |= 0x00000040;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                lHEGFHKBMKF_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 64: {
+              if (!((mutable_bitField0_ & 0x00000080) != 0)) {
+                hIIHFCBJLDI_ = newIntList();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              hIIHFCBJLDI_.addInt(input.readUInt32());
+              break;
+            }
+            case 66: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000080) != 0) && input.getBytesUntilLimit() > 0) {
+                hIIHFCBJLDI_ = newIntList();
+                mutable_bitField0_ |= 0x00000080;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                hIIHFCBJLDI_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000100) != 0)) {
+                hCPKDCNKPGD_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
+              }
+              hCPKDCNKPGD_.addInt(input.readUInt32());
+              break;
+            }
+            case 74: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000100) != 0) && input.getBytesUntilLimit() > 0) {
+                hCPKDCNKPGD_ = newIntList();
+                mutable_bitField0_ |= 0x00000100;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                hCPKDCNKPGD_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          jAODPKILOHD_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          oBAKLGMMOEO_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000010) != 0)) {
+          aOECKDLECIJ_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000040) != 0)) {
+          lHEGFHKBMKF_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000080) != 0)) {
+          hIIHFCBJLDI_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000100) != 0)) {
+          hCPKDCNKPGD_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_descriptor;
+    }
+
+    @SuppressWarnings({"rawtypes"})
+    @java.lang.Override
+    protected com.google.protobuf.MapField internalGetMapField(
+        int number) {
+      switch (number) {
+        case 2:
+          return internalGetIGIDHGKOODO();
+        case 4:
+          return internalGetLELGNGJOJAI();
+        case 6:
+          return internalGetACAAJJBNCDM();
+        default:
+          throw new RuntimeException(
+              "Invalid map field number: " + number);
+      }
+    }
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.class, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder.class);
+    }
+
+    public static final int JAODPKILOHD_FIELD_NUMBER = 1;
+    private com.google.protobuf.Internal.IntList jAODPKILOHD_;
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @return A list containing the jAODPKILOHD.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getJAODPKILOHDList() {
+      return jAODPKILOHD_;
+    }
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @return The count of jAODPKILOHD.
+     */
+    public int getJAODPKILOHDCount() {
+      return jAODPKILOHD_.size();
+    }
+    /**
+     * <code>repeated uint32 JAODPKILOHD = 1;</code>
+     * @param index The index of the element to return.
+     * @return The jAODPKILOHD at the given index.
+     */
+    public int getJAODPKILOHD(int index) {
+      return jAODPKILOHD_.getInt(index);
+    }
+    private int jAODPKILOHDMemoizedSerializedSize = -1;
+
+    public static final int IGIDHGKOODO_FIELD_NUMBER = 2;
+    private static final class IGIDHGKOODODefaultEntryHolder {
+      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.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_IGIDHGKOODOEntry_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> iGIDHGKOODO_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetIGIDHGKOODO() {
+      if (iGIDHGKOODO_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            IGIDHGKOODODefaultEntryHolder.defaultEntry);
+      }
+      return iGIDHGKOODO_;
+    }
+
+    public int getIGIDHGKOODOCount() {
+      return internalGetIGIDHGKOODO().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsIGIDHGKOODO(
+        int key) {
+      
+      return internalGetIGIDHGKOODO().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getIGIDHGKOODOMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getIGIDHGKOODO() {
+      return getIGIDHGKOODOMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getIGIDHGKOODOMap() {
+      return internalGetIGIDHGKOODO().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    @java.lang.Override
+
+    public int getIGIDHGKOODOOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetIGIDHGKOODO().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+     */
+    @java.lang.Override
+
+    public int getIGIDHGKOODOOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetIGIDHGKOODO().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int OBAKLGMMOEO_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList oBAKLGMMOEO_;
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @return A list containing the oBAKLGMMOEO.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getOBAKLGMMOEOList() {
+      return oBAKLGMMOEO_;
+    }
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @return The count of oBAKLGMMOEO.
+     */
+    public int getOBAKLGMMOEOCount() {
+      return oBAKLGMMOEO_.size();
+    }
+    /**
+     * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+     * @param index The index of the element to return.
+     * @return The oBAKLGMMOEO at the given index.
+     */
+    public int getOBAKLGMMOEO(int index) {
+      return oBAKLGMMOEO_.getInt(index);
+    }
+    private int oBAKLGMMOEOMemoizedSerializedSize = -1;
+
+    public static final int LELGNGJOJAI_FIELD_NUMBER = 4;
+    private static final class LELGNGJOJAIDefaultEntryHolder {
+      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.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_LELGNGJOJAIEntry_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> lELGNGJOJAI_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetLELGNGJOJAI() {
+      if (lELGNGJOJAI_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            LELGNGJOJAIDefaultEntryHolder.defaultEntry);
+      }
+      return lELGNGJOJAI_;
+    }
+
+    public int getLELGNGJOJAICount() {
+      return internalGetLELGNGJOJAI().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsLELGNGJOJAI(
+        int key) {
+      
+      return internalGetLELGNGJOJAI().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getLELGNGJOJAIMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getLELGNGJOJAI() {
+      return getLELGNGJOJAIMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getLELGNGJOJAIMap() {
+      return internalGetLELGNGJOJAI().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    @java.lang.Override
+
+    public int getLELGNGJOJAIOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetLELGNGJOJAI().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+     */
+    @java.lang.Override
+
+    public int getLELGNGJOJAIOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetLELGNGJOJAI().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int AOECKDLECIJ_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList aOECKDLECIJ_;
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @return A list containing the aOECKDLECIJ.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getAOECKDLECIJList() {
+      return aOECKDLECIJ_;
+    }
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @return The count of aOECKDLECIJ.
+     */
+    public int getAOECKDLECIJCount() {
+      return aOECKDLECIJ_.size();
+    }
+    /**
+     * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+     * @param index The index of the element to return.
+     * @return The aOECKDLECIJ at the given index.
+     */
+    public int getAOECKDLECIJ(int index) {
+      return aOECKDLECIJ_.getInt(index);
+    }
+    private int aOECKDLECIJMemoizedSerializedSize = -1;
+
+    public static final int ACAAJJBNCDM_FIELD_NUMBER = 6;
+    private static final class ACAAJJBNCDMDefaultEntryHolder {
+      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.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_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> aCAAJJBNCDM_;
+    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+    internalGetACAAJJBNCDM() {
+      if (aCAAJJBNCDM_ == null) {
+        return com.google.protobuf.MapField.emptyMapField(
+            ACAAJJBNCDMDefaultEntryHolder.defaultEntry);
+      }
+      return aCAAJJBNCDM_;
+    }
+
+    public int getACAAJJBNCDMCount() {
+      return internalGetACAAJJBNCDM().getMap().size();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+
+    @java.lang.Override
+    public boolean containsACAAJJBNCDM(
+        int key) {
+      
+      return internalGetACAAJJBNCDM().getMap().containsKey(key);
+    }
+    /**
+     * Use {@link #getACAAJJBNCDMMap()} instead.
+     */
+    @java.lang.Override
+    @java.lang.Deprecated
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getACAAJJBNCDM() {
+      return getACAAJJBNCDMMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    @java.lang.Override
+
+    public java.util.Map<java.lang.Integer, java.lang.Integer> getACAAJJBNCDMMap() {
+      return internalGetACAAJJBNCDM().getMap();
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    @java.lang.Override
+
+    public int getACAAJJBNCDMOrDefault(
+        int key,
+        int defaultValue) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetACAAJJBNCDM().getMap();
+      return map.containsKey(key) ? map.get(key) : defaultValue;
+    }
+    /**
+     * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+     */
+    @java.lang.Override
+
+    public int getACAAJJBNCDMOrThrow(
+        int key) {
+      
+      java.util.Map<java.lang.Integer, java.lang.Integer> map =
+          internalGetACAAJJBNCDM().getMap();
+      if (!map.containsKey(key)) {
+        throw new java.lang.IllegalArgumentException();
+      }
+      return map.get(key);
+    }
+
+    public static final int LHEGFHKBMKF_FIELD_NUMBER = 7;
+    private com.google.protobuf.Internal.IntList lHEGFHKBMKF_;
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @return A list containing the lHEGFHKBMKF.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLHEGFHKBMKFList() {
+      return lHEGFHKBMKF_;
+    }
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @return The count of lHEGFHKBMKF.
+     */
+    public int getLHEGFHKBMKFCount() {
+      return lHEGFHKBMKF_.size();
+    }
+    /**
+     * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+     * @param index The index of the element to return.
+     * @return The lHEGFHKBMKF at the given index.
+     */
+    public int getLHEGFHKBMKF(int index) {
+      return lHEGFHKBMKF_.getInt(index);
+    }
+    private int lHEGFHKBMKFMemoizedSerializedSize = -1;
+
+    public static final int HIIHFCBJLDI_FIELD_NUMBER = 8;
+    private com.google.protobuf.Internal.IntList hIIHFCBJLDI_;
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @return A list containing the hIIHFCBJLDI.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getHIIHFCBJLDIList() {
+      return hIIHFCBJLDI_;
+    }
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @return The count of hIIHFCBJLDI.
+     */
+    public int getHIIHFCBJLDICount() {
+      return hIIHFCBJLDI_.size();
+    }
+    /**
+     * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+     * @param index The index of the element to return.
+     * @return The hIIHFCBJLDI at the given index.
+     */
+    public int getHIIHFCBJLDI(int index) {
+      return hIIHFCBJLDI_.getInt(index);
+    }
+    private int hIIHFCBJLDIMemoizedSerializedSize = -1;
+
+    public static final int HCPKDCNKPGD_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList hCPKDCNKPGD_;
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @return A list containing the hCPKDCNKPGD.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getHCPKDCNKPGDList() {
+      return hCPKDCNKPGD_;
+    }
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @return The count of hCPKDCNKPGD.
+     */
+    public int getHCPKDCNKPGDCount() {
+      return hCPKDCNKPGD_.size();
+    }
+    /**
+     * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+     * @param index The index of the element to return.
+     * @return The hCPKDCNKPGD at the given index.
+     */
+    public int getHCPKDCNKPGD(int index) {
+      return hCPKDCNKPGD_.getInt(index);
+    }
+    private int hCPKDCNKPGDMemoizedSerializedSize = -1;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (getJAODPKILOHDList().size() > 0) {
+        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(jAODPKILOHDMemoizedSerializedSize);
+      }
+      for (int i = 0; i < jAODPKILOHD_.size(); i++) {
+        output.writeUInt32NoTag(jAODPKILOHD_.getInt(i));
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetIGIDHGKOODO(),
+          IGIDHGKOODODefaultEntryHolder.defaultEntry,
+          2);
+      if (getOBAKLGMMOEOList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(oBAKLGMMOEOMemoizedSerializedSize);
+      }
+      for (int i = 0; i < oBAKLGMMOEO_.size(); i++) {
+        output.writeUInt32NoTag(oBAKLGMMOEO_.getInt(i));
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetLELGNGJOJAI(),
+          LELGNGJOJAIDefaultEntryHolder.defaultEntry,
+          4);
+      if (getAOECKDLECIJList().size() > 0) {
+        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(aOECKDLECIJMemoizedSerializedSize);
+      }
+      for (int i = 0; i < aOECKDLECIJ_.size(); i++) {
+        output.writeUInt32NoTag(aOECKDLECIJ_.getInt(i));
+      }
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetACAAJJBNCDM(),
+          ACAAJJBNCDMDefaultEntryHolder.defaultEntry,
+          6);
+      if (getLHEGFHKBMKFList().size() > 0) {
+        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(lHEGFHKBMKFMemoizedSerializedSize);
+      }
+      for (int i = 0; i < lHEGFHKBMKF_.size(); i++) {
+        output.writeUInt32NoTag(lHEGFHKBMKF_.getInt(i));
+      }
+      if (getHIIHFCBJLDIList().size() > 0) {
+        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(hIIHFCBJLDIMemoizedSerializedSize);
+      }
+      for (int i = 0; i < hIIHFCBJLDI_.size(); i++) {
+        output.writeUInt32NoTag(hIIHFCBJLDI_.getInt(i));
+      }
+      if (getHCPKDCNKPGDList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(hCPKDCNKPGDMemoizedSerializedSize);
+      }
+      for (int i = 0; i < hCPKDCNKPGD_.size(); i++) {
+        output.writeUInt32NoTag(hCPKDCNKPGD_.getInt(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < jAODPKILOHD_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(jAODPKILOHD_.getInt(i));
+        }
+        size += dataSize;
+        if (!getJAODPKILOHDList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        jAODPKILOHDMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetIGIDHGKOODO().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        iGIDHGKOODO__ = IGIDHGKOODODefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(2, iGIDHGKOODO__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < oBAKLGMMOEO_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(oBAKLGMMOEO_.getInt(i));
+        }
+        size += dataSize;
+        if (!getOBAKLGMMOEOList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        oBAKLGMMOEOMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetLELGNGJOJAI().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        lELGNGJOJAI__ = LELGNGJOJAIDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(4, lELGNGJOJAI__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < aOECKDLECIJ_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(aOECKDLECIJ_.getInt(i));
+        }
+        size += dataSize;
+        if (!getAOECKDLECIJList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        aOECKDLECIJMemoizedSerializedSize = dataSize;
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetACAAJJBNCDM().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        aCAAJJBNCDM__ = ACAAJJBNCDMDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(6, aCAAJJBNCDM__);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < lHEGFHKBMKF_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(lHEGFHKBMKF_.getInt(i));
+        }
+        size += dataSize;
+        if (!getLHEGFHKBMKFList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        lHEGFHKBMKFMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < hIIHFCBJLDI_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(hIIHFCBJLDI_.getInt(i));
+        }
+        size += dataSize;
+        if (!getHIIHFCBJLDIList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        hIIHFCBJLDIMemoizedSerializedSize = dataSize;
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < hCPKDCNKPGD_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(hCPKDCNKPGD_.getInt(i));
+        }
+        size += dataSize;
+        if (!getHCPKDCNKPGDList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        hCPKDCNKPGDMemoizedSerializedSize = dataSize;
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo other = (emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo) obj;
+
+      if (!getJAODPKILOHDList()
+          .equals(other.getJAODPKILOHDList())) return false;
+      if (!internalGetIGIDHGKOODO().equals(
+          other.internalGetIGIDHGKOODO())) return false;
+      if (!getOBAKLGMMOEOList()
+          .equals(other.getOBAKLGMMOEOList())) return false;
+      if (!internalGetLELGNGJOJAI().equals(
+          other.internalGetLELGNGJOJAI())) return false;
+      if (!getAOECKDLECIJList()
+          .equals(other.getAOECKDLECIJList())) return false;
+      if (!internalGetACAAJJBNCDM().equals(
+          other.internalGetACAAJJBNCDM())) return false;
+      if (!getLHEGFHKBMKFList()
+          .equals(other.getLHEGFHKBMKFList())) return false;
+      if (!getHIIHFCBJLDIList()
+          .equals(other.getHIIHFCBJLDIList())) return false;
+      if (!getHCPKDCNKPGDList()
+          .equals(other.getHCPKDCNKPGDList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getJAODPKILOHDCount() > 0) {
+        hash = (37 * hash) + JAODPKILOHD_FIELD_NUMBER;
+        hash = (53 * hash) + getJAODPKILOHDList().hashCode();
+      }
+      if (!internalGetIGIDHGKOODO().getMap().isEmpty()) {
+        hash = (37 * hash) + IGIDHGKOODO_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetIGIDHGKOODO().hashCode();
+      }
+      if (getOBAKLGMMOEOCount() > 0) {
+        hash = (37 * hash) + OBAKLGMMOEO_FIELD_NUMBER;
+        hash = (53 * hash) + getOBAKLGMMOEOList().hashCode();
+      }
+      if (!internalGetLELGNGJOJAI().getMap().isEmpty()) {
+        hash = (37 * hash) + LELGNGJOJAI_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetLELGNGJOJAI().hashCode();
+      }
+      if (getAOECKDLECIJCount() > 0) {
+        hash = (37 * hash) + AOECKDLECIJ_FIELD_NUMBER;
+        hash = (53 * hash) + getAOECKDLECIJList().hashCode();
+      }
+      if (!internalGetACAAJJBNCDM().getMap().isEmpty()) {
+        hash = (37 * hash) + ACAAJJBNCDM_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetACAAJJBNCDM().hashCode();
+      }
+      if (getLHEGFHKBMKFCount() > 0) {
+        hash = (37 * hash) + LHEGFHKBMKF_FIELD_NUMBER;
+        hash = (53 * hash) + getLHEGFHKBMKFList().hashCode();
+      }
+      if (getHIIHFCBJLDICount() > 0) {
+        hash = (37 * hash) + HIIHFCBJLDI_FIELD_NUMBER;
+        hash = (53 * hash) + getHIIHFCBJLDIList().hashCode();
+      }
+      if (getHCPKDCNKPGDCount() > 0) {
+        hash = (37 * hash) + HCPKDCNKPGD_FIELD_NUMBER;
+        hash = (53 * hash) + getHCPKDCNKPGDList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code LackingResourceInfo}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:LackingResourceInfo)
+        emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_descriptor;
+      }
+
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMapField(
+          int number) {
+        switch (number) {
+          case 2:
+            return internalGetIGIDHGKOODO();
+          case 4:
+            return internalGetLELGNGJOJAI();
+          case 6:
+            return internalGetACAAJJBNCDM();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @SuppressWarnings({"rawtypes"})
+      protected com.google.protobuf.MapField internalGetMutableMapField(
+          int number) {
+        switch (number) {
+          case 2:
+            return internalGetMutableIGIDHGKOODO();
+          case 4:
+            return internalGetMutableLELGNGJOJAI();
+          case 6:
+            return internalGetMutableACAAJJBNCDM();
+          default:
+            throw new RuntimeException(
+                "Invalid map field number: " + number);
+        }
+      }
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.class, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        jAODPKILOHD_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        internalGetMutableIGIDHGKOODO().clear();
+        oBAKLGMMOEO_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        internalGetMutableLELGNGJOJAI().clear();
+        aOECKDLECIJ_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000010);
+        internalGetMutableACAAJJBNCDM().clear();
+        lHEGFHKBMKF_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        hIIHFCBJLDI_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000080);
+        hCPKDCNKPGD_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000100);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.internal_static_LackingResourceInfo_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo build() {
+        emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo buildPartial() {
+        emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo result = new emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo(this);
+        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          jAODPKILOHD_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.jAODPKILOHD_ = jAODPKILOHD_;
+        result.iGIDHGKOODO_ = internalGetIGIDHGKOODO();
+        result.iGIDHGKOODO_.makeImmutable();
+        if (((bitField0_ & 0x00000004) != 0)) {
+          oBAKLGMMOEO_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.oBAKLGMMOEO_ = oBAKLGMMOEO_;
+        result.lELGNGJOJAI_ = internalGetLELGNGJOJAI();
+        result.lELGNGJOJAI_.makeImmutable();
+        if (((bitField0_ & 0x00000010) != 0)) {
+          aOECKDLECIJ_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000010);
+        }
+        result.aOECKDLECIJ_ = aOECKDLECIJ_;
+        result.aCAAJJBNCDM_ = internalGetACAAJJBNCDM();
+        result.aCAAJJBNCDM_.makeImmutable();
+        if (((bitField0_ & 0x00000040) != 0)) {
+          lHEGFHKBMKF_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000040);
+        }
+        result.lHEGFHKBMKF_ = lHEGFHKBMKF_;
+        if (((bitField0_ & 0x00000080) != 0)) {
+          hIIHFCBJLDI_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000080);
+        }
+        result.hIIHFCBJLDI_ = hIIHFCBJLDI_;
+        if (((bitField0_ & 0x00000100) != 0)) {
+          hCPKDCNKPGD_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000100);
+        }
+        result.hCPKDCNKPGD_ = hCPKDCNKPGD_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo) {
+          return mergeFrom((emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo other) {
+        if (other == emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance()) return this;
+        if (!other.jAODPKILOHD_.isEmpty()) {
+          if (jAODPKILOHD_.isEmpty()) {
+            jAODPKILOHD_ = other.jAODPKILOHD_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureJAODPKILOHDIsMutable();
+            jAODPKILOHD_.addAll(other.jAODPKILOHD_);
+          }
+          onChanged();
+        }
+        internalGetMutableIGIDHGKOODO().mergeFrom(
+            other.internalGetIGIDHGKOODO());
+        if (!other.oBAKLGMMOEO_.isEmpty()) {
+          if (oBAKLGMMOEO_.isEmpty()) {
+            oBAKLGMMOEO_ = other.oBAKLGMMOEO_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureOBAKLGMMOEOIsMutable();
+            oBAKLGMMOEO_.addAll(other.oBAKLGMMOEO_);
+          }
+          onChanged();
+        }
+        internalGetMutableLELGNGJOJAI().mergeFrom(
+            other.internalGetLELGNGJOJAI());
+        if (!other.aOECKDLECIJ_.isEmpty()) {
+          if (aOECKDLECIJ_.isEmpty()) {
+            aOECKDLECIJ_ = other.aOECKDLECIJ_;
+            bitField0_ = (bitField0_ & ~0x00000010);
+          } else {
+            ensureAOECKDLECIJIsMutable();
+            aOECKDLECIJ_.addAll(other.aOECKDLECIJ_);
+          }
+          onChanged();
+        }
+        internalGetMutableACAAJJBNCDM().mergeFrom(
+            other.internalGetACAAJJBNCDM());
+        if (!other.lHEGFHKBMKF_.isEmpty()) {
+          if (lHEGFHKBMKF_.isEmpty()) {
+            lHEGFHKBMKF_ = other.lHEGFHKBMKF_;
+            bitField0_ = (bitField0_ & ~0x00000040);
+          } else {
+            ensureLHEGFHKBMKFIsMutable();
+            lHEGFHKBMKF_.addAll(other.lHEGFHKBMKF_);
+          }
+          onChanged();
+        }
+        if (!other.hIIHFCBJLDI_.isEmpty()) {
+          if (hIIHFCBJLDI_.isEmpty()) {
+            hIIHFCBJLDI_ = other.hIIHFCBJLDI_;
+            bitField0_ = (bitField0_ & ~0x00000080);
+          } else {
+            ensureHIIHFCBJLDIIsMutable();
+            hIIHFCBJLDI_.addAll(other.hIIHFCBJLDI_);
+          }
+          onChanged();
+        }
+        if (!other.hCPKDCNKPGD_.isEmpty()) {
+          if (hCPKDCNKPGD_.isEmpty()) {
+            hCPKDCNKPGD_ = other.hCPKDCNKPGD_;
+            bitField0_ = (bitField0_ & ~0x00000100);
+          } else {
+            ensureHCPKDCNKPGDIsMutable();
+            hCPKDCNKPGD_.addAll(other.hCPKDCNKPGD_);
+          }
+          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.LackingResourceInfoOuterClass.LackingResourceInfo parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList jAODPKILOHD_ = emptyIntList();
+      private void ensureJAODPKILOHDIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          jAODPKILOHD_ = mutableCopy(jAODPKILOHD_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @return A list containing the jAODPKILOHD.
+       */
+      public java.util.List<java.lang.Integer>
+          getJAODPKILOHDList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(jAODPKILOHD_) : jAODPKILOHD_;
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @return The count of jAODPKILOHD.
+       */
+      public int getJAODPKILOHDCount() {
+        return jAODPKILOHD_.size();
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @param index The index of the element to return.
+       * @return The jAODPKILOHD at the given index.
+       */
+      public int getJAODPKILOHD(int index) {
+        return jAODPKILOHD_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The jAODPKILOHD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJAODPKILOHD(
+          int index, int value) {
+        ensureJAODPKILOHDIsMutable();
+        jAODPKILOHD_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @param value The jAODPKILOHD to add.
+       * @return This builder for chaining.
+       */
+      public Builder addJAODPKILOHD(int value) {
+        ensureJAODPKILOHDIsMutable();
+        jAODPKILOHD_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @param values The jAODPKILOHD to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllJAODPKILOHD(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureJAODPKILOHDIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, jAODPKILOHD_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 JAODPKILOHD = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJAODPKILOHD() {
+        jAODPKILOHD_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> iGIDHGKOODO_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetIGIDHGKOODO() {
+        if (iGIDHGKOODO_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              IGIDHGKOODODefaultEntryHolder.defaultEntry);
+        }
+        return iGIDHGKOODO_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableIGIDHGKOODO() {
+        onChanged();;
+        if (iGIDHGKOODO_ == null) {
+          iGIDHGKOODO_ = com.google.protobuf.MapField.newMapField(
+              IGIDHGKOODODefaultEntryHolder.defaultEntry);
+        }
+        if (!iGIDHGKOODO_.isMutable()) {
+          iGIDHGKOODO_ = iGIDHGKOODO_.copy();
+        }
+        return iGIDHGKOODO_;
+      }
+
+      public int getIGIDHGKOODOCount() {
+        return internalGetIGIDHGKOODO().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsIGIDHGKOODO(
+          int key) {
+        
+        return internalGetIGIDHGKOODO().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getIGIDHGKOODOMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getIGIDHGKOODO() {
+        return getIGIDHGKOODOMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getIGIDHGKOODOMap() {
+        return internalGetIGIDHGKOODO().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+      @java.lang.Override
+
+      public int getIGIDHGKOODOOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetIGIDHGKOODO().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+      @java.lang.Override
+
+      public int getIGIDHGKOODOOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetIGIDHGKOODO().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearIGIDHGKOODO() {
+        internalGetMutableIGIDHGKOODO().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+
+      public Builder removeIGIDHGKOODO(
+          int key) {
+        
+        internalGetMutableIGIDHGKOODO().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableIGIDHGKOODO() {
+        return internalGetMutableIGIDHGKOODO().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+      public Builder putIGIDHGKOODO(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableIGIDHGKOODO().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; IGIDHGKOODO = 2;</code>
+       */
+
+      public Builder putAllIGIDHGKOODO(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableIGIDHGKOODO().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList oBAKLGMMOEO_ = emptyIntList();
+      private void ensureOBAKLGMMOEOIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          oBAKLGMMOEO_ = mutableCopy(oBAKLGMMOEO_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @return A list containing the oBAKLGMMOEO.
+       */
+      public java.util.List<java.lang.Integer>
+          getOBAKLGMMOEOList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(oBAKLGMMOEO_) : oBAKLGMMOEO_;
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @return The count of oBAKLGMMOEO.
+       */
+      public int getOBAKLGMMOEOCount() {
+        return oBAKLGMMOEO_.size();
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @param index The index of the element to return.
+       * @return The oBAKLGMMOEO at the given index.
+       */
+      public int getOBAKLGMMOEO(int index) {
+        return oBAKLGMMOEO_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The oBAKLGMMOEO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOBAKLGMMOEO(
+          int index, int value) {
+        ensureOBAKLGMMOEOIsMutable();
+        oBAKLGMMOEO_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @param value The oBAKLGMMOEO to add.
+       * @return This builder for chaining.
+       */
+      public Builder addOBAKLGMMOEO(int value) {
+        ensureOBAKLGMMOEOIsMutable();
+        oBAKLGMMOEO_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @param values The oBAKLGMMOEO to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllOBAKLGMMOEO(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureOBAKLGMMOEOIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, oBAKLGMMOEO_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 OBAKLGMMOEO = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOBAKLGMMOEO() {
+        oBAKLGMMOEO_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> lELGNGJOJAI_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetLELGNGJOJAI() {
+        if (lELGNGJOJAI_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              LELGNGJOJAIDefaultEntryHolder.defaultEntry);
+        }
+        return lELGNGJOJAI_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableLELGNGJOJAI() {
+        onChanged();;
+        if (lELGNGJOJAI_ == null) {
+          lELGNGJOJAI_ = com.google.protobuf.MapField.newMapField(
+              LELGNGJOJAIDefaultEntryHolder.defaultEntry);
+        }
+        if (!lELGNGJOJAI_.isMutable()) {
+          lELGNGJOJAI_ = lELGNGJOJAI_.copy();
+        }
+        return lELGNGJOJAI_;
+      }
+
+      public int getLELGNGJOJAICount() {
+        return internalGetLELGNGJOJAI().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsLELGNGJOJAI(
+          int key) {
+        
+        return internalGetLELGNGJOJAI().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getLELGNGJOJAIMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getLELGNGJOJAI() {
+        return getLELGNGJOJAIMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getLELGNGJOJAIMap() {
+        return internalGetLELGNGJOJAI().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+      @java.lang.Override
+
+      public int getLELGNGJOJAIOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetLELGNGJOJAI().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+      @java.lang.Override
+
+      public int getLELGNGJOJAIOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetLELGNGJOJAI().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearLELGNGJOJAI() {
+        internalGetMutableLELGNGJOJAI().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+
+      public Builder removeLELGNGJOJAI(
+          int key) {
+        
+        internalGetMutableLELGNGJOJAI().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableLELGNGJOJAI() {
+        return internalGetMutableLELGNGJOJAI().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+      public Builder putLELGNGJOJAI(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableLELGNGJOJAI().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; LELGNGJOJAI = 4;</code>
+       */
+
+      public Builder putAllLELGNGJOJAI(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableLELGNGJOJAI().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList aOECKDLECIJ_ = emptyIntList();
+      private void ensureAOECKDLECIJIsMutable() {
+        if (!((bitField0_ & 0x00000010) != 0)) {
+          aOECKDLECIJ_ = mutableCopy(aOECKDLECIJ_);
+          bitField0_ |= 0x00000010;
+         }
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @return A list containing the aOECKDLECIJ.
+       */
+      public java.util.List<java.lang.Integer>
+          getAOECKDLECIJList() {
+        return ((bitField0_ & 0x00000010) != 0) ?
+                 java.util.Collections.unmodifiableList(aOECKDLECIJ_) : aOECKDLECIJ_;
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @return The count of aOECKDLECIJ.
+       */
+      public int getAOECKDLECIJCount() {
+        return aOECKDLECIJ_.size();
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @param index The index of the element to return.
+       * @return The aOECKDLECIJ at the given index.
+       */
+      public int getAOECKDLECIJ(int index) {
+        return aOECKDLECIJ_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @param index The index to set the value at.
+       * @param value The aOECKDLECIJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAOECKDLECIJ(
+          int index, int value) {
+        ensureAOECKDLECIJIsMutable();
+        aOECKDLECIJ_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @param value The aOECKDLECIJ to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAOECKDLECIJ(int value) {
+        ensureAOECKDLECIJIsMutable();
+        aOECKDLECIJ_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @param values The aOECKDLECIJ to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllAOECKDLECIJ(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureAOECKDLECIJIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, aOECKDLECIJ_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 AOECKDLECIJ = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAOECKDLECIJ() {
+        aOECKDLECIJ_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000010);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.MapField<
+          java.lang.Integer, java.lang.Integer> aCAAJJBNCDM_;
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetACAAJJBNCDM() {
+        if (aCAAJJBNCDM_ == null) {
+          return com.google.protobuf.MapField.emptyMapField(
+              ACAAJJBNCDMDefaultEntryHolder.defaultEntry);
+        }
+        return aCAAJJBNCDM_;
+      }
+      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
+      internalGetMutableACAAJJBNCDM() {
+        onChanged();;
+        if (aCAAJJBNCDM_ == null) {
+          aCAAJJBNCDM_ = com.google.protobuf.MapField.newMapField(
+              ACAAJJBNCDMDefaultEntryHolder.defaultEntry);
+        }
+        if (!aCAAJJBNCDM_.isMutable()) {
+          aCAAJJBNCDM_ = aCAAJJBNCDM_.copy();
+        }
+        return aCAAJJBNCDM_;
+      }
+
+      public int getACAAJJBNCDMCount() {
+        return internalGetACAAJJBNCDM().getMap().size();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+
+      @java.lang.Override
+      public boolean containsACAAJJBNCDM(
+          int key) {
+        
+        return internalGetACAAJJBNCDM().getMap().containsKey(key);
+      }
+      /**
+       * Use {@link #getACAAJJBNCDMMap()} instead.
+       */
+      @java.lang.Override
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getACAAJJBNCDM() {
+        return getACAAJJBNCDMMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+      @java.lang.Override
+
+      public java.util.Map<java.lang.Integer, java.lang.Integer> getACAAJJBNCDMMap() {
+        return internalGetACAAJJBNCDM().getMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+      @java.lang.Override
+
+      public int getACAAJJBNCDMOrDefault(
+          int key,
+          int defaultValue) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetACAAJJBNCDM().getMap();
+        return map.containsKey(key) ? map.get(key) : defaultValue;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+      @java.lang.Override
+
+      public int getACAAJJBNCDMOrThrow(
+          int key) {
+        
+        java.util.Map<java.lang.Integer, java.lang.Integer> map =
+            internalGetACAAJJBNCDM().getMap();
+        if (!map.containsKey(key)) {
+          throw new java.lang.IllegalArgumentException();
+        }
+        return map.get(key);
+      }
+
+      public Builder clearACAAJJBNCDM() {
+        internalGetMutableACAAJJBNCDM().getMutableMap()
+            .clear();
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+
+      public Builder removeACAAJJBNCDM(
+          int key) {
+        
+        internalGetMutableACAAJJBNCDM().getMutableMap()
+            .remove(key);
+        return this;
+      }
+      /**
+       * Use alternate mutation accessors instead.
+       */
+      @java.lang.Deprecated
+      public java.util.Map<java.lang.Integer, java.lang.Integer>
+      getMutableACAAJJBNCDM() {
+        return internalGetMutableACAAJJBNCDM().getMutableMap();
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+      public Builder putACAAJJBNCDM(
+          int key,
+          int value) {
+        
+        
+        internalGetMutableACAAJJBNCDM().getMutableMap()
+            .put(key, value);
+        return this;
+      }
+      /**
+       * <code>map&lt;uint32, uint32&gt; ACAAJJBNCDM = 6;</code>
+       */
+
+      public Builder putAllACAAJJBNCDM(
+          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
+        internalGetMutableACAAJJBNCDM().getMutableMap()
+            .putAll(values);
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList lHEGFHKBMKF_ = emptyIntList();
+      private void ensureLHEGFHKBMKFIsMutable() {
+        if (!((bitField0_ & 0x00000040) != 0)) {
+          lHEGFHKBMKF_ = mutableCopy(lHEGFHKBMKF_);
+          bitField0_ |= 0x00000040;
+         }
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @return A list containing the lHEGFHKBMKF.
+       */
+      public java.util.List<java.lang.Integer>
+          getLHEGFHKBMKFList() {
+        return ((bitField0_ & 0x00000040) != 0) ?
+                 java.util.Collections.unmodifiableList(lHEGFHKBMKF_) : lHEGFHKBMKF_;
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @return The count of lHEGFHKBMKF.
+       */
+      public int getLHEGFHKBMKFCount() {
+        return lHEGFHKBMKF_.size();
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @param index The index of the element to return.
+       * @return The lHEGFHKBMKF at the given index.
+       */
+      public int getLHEGFHKBMKF(int index) {
+        return lHEGFHKBMKF_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @param index The index to set the value at.
+       * @param value The lHEGFHKBMKF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLHEGFHKBMKF(
+          int index, int value) {
+        ensureLHEGFHKBMKFIsMutable();
+        lHEGFHKBMKF_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @param value The lHEGFHKBMKF to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLHEGFHKBMKF(int value) {
+        ensureLHEGFHKBMKFIsMutable();
+        lHEGFHKBMKF_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @param values The lHEGFHKBMKF to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLHEGFHKBMKF(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLHEGFHKBMKFIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, lHEGFHKBMKF_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 LHEGFHKBMKF = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLHEGFHKBMKF() {
+        lHEGFHKBMKF_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000040);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList hIIHFCBJLDI_ = emptyIntList();
+      private void ensureHIIHFCBJLDIIsMutable() {
+        if (!((bitField0_ & 0x00000080) != 0)) {
+          hIIHFCBJLDI_ = mutableCopy(hIIHFCBJLDI_);
+          bitField0_ |= 0x00000080;
+         }
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @return A list containing the hIIHFCBJLDI.
+       */
+      public java.util.List<java.lang.Integer>
+          getHIIHFCBJLDIList() {
+        return ((bitField0_ & 0x00000080) != 0) ?
+                 java.util.Collections.unmodifiableList(hIIHFCBJLDI_) : hIIHFCBJLDI_;
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @return The count of hIIHFCBJLDI.
+       */
+      public int getHIIHFCBJLDICount() {
+        return hIIHFCBJLDI_.size();
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @param index The index of the element to return.
+       * @return The hIIHFCBJLDI at the given index.
+       */
+      public int getHIIHFCBJLDI(int index) {
+        return hIIHFCBJLDI_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The hIIHFCBJLDI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHIIHFCBJLDI(
+          int index, int value) {
+        ensureHIIHFCBJLDIIsMutable();
+        hIIHFCBJLDI_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @param value The hIIHFCBJLDI to add.
+       * @return This builder for chaining.
+       */
+      public Builder addHIIHFCBJLDI(int value) {
+        ensureHIIHFCBJLDIIsMutable();
+        hIIHFCBJLDI_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @param values The hIIHFCBJLDI to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllHIIHFCBJLDI(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureHIIHFCBJLDIIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, hIIHFCBJLDI_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HIIHFCBJLDI = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHIIHFCBJLDI() {
+        hIIHFCBJLDI_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000080);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList hCPKDCNKPGD_ = emptyIntList();
+      private void ensureHCPKDCNKPGDIsMutable() {
+        if (!((bitField0_ & 0x00000100) != 0)) {
+          hCPKDCNKPGD_ = mutableCopy(hCPKDCNKPGD_);
+          bitField0_ |= 0x00000100;
+         }
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @return A list containing the hCPKDCNKPGD.
+       */
+      public java.util.List<java.lang.Integer>
+          getHCPKDCNKPGDList() {
+        return ((bitField0_ & 0x00000100) != 0) ?
+                 java.util.Collections.unmodifiableList(hCPKDCNKPGD_) : hCPKDCNKPGD_;
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @return The count of hCPKDCNKPGD.
+       */
+      public int getHCPKDCNKPGDCount() {
+        return hCPKDCNKPGD_.size();
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @param index The index of the element to return.
+       * @return The hCPKDCNKPGD at the given index.
+       */
+      public int getHCPKDCNKPGD(int index) {
+        return hCPKDCNKPGD_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @param index The index to set the value at.
+       * @param value The hCPKDCNKPGD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHCPKDCNKPGD(
+          int index, int value) {
+        ensureHCPKDCNKPGDIsMutable();
+        hCPKDCNKPGD_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @param value The hCPKDCNKPGD to add.
+       * @return This builder for chaining.
+       */
+      public Builder addHCPKDCNKPGD(int value) {
+        ensureHCPKDCNKPGDIsMutable();
+        hCPKDCNKPGD_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @param values The hCPKDCNKPGD to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllHCPKDCNKPGD(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureHCPKDCNKPGDIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, hCPKDCNKPGD_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 HCPKDCNKPGD = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHCPKDCNKPGD() {
+        hCPKDCNKPGD_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000100);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:LackingResourceInfo)
+    }
+
+    // @@protoc_insertion_point(class_scope:LackingResourceInfo)
+    private static final emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo();
+    }
+
+    public static emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<LackingResourceInfo>
+        PARSER = new com.google.protobuf.AbstractParser<LackingResourceInfo>() {
+      @java.lang.Override
+      public LackingResourceInfo parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new LackingResourceInfo(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<LackingResourceInfo> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<LackingResourceInfo> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_LackingResourceInfo_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_LackingResourceInfo_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_LackingResourceInfo_IGIDHGKOODOEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_LackingResourceInfo_LELGNGJOJAIEntry_fieldAccessorTable;
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\031LackingResourceInfo.proto\"\343\003\n\023LackingR" +
+      "esourceInfo\022\023\n\013JAODPKILOHD\030\001 \003(\r\022:\n\013IGID" +
+      "HGKOODO\030\002 \003(\0132%.LackingResourceInfo.IGID" +
+      "HGKOODOEntry\022\023\n\013OBAKLGMMOEO\030\003 \003(\r\022:\n\013LEL" +
+      "GNGJOJAI\030\004 \003(\0132%.LackingResourceInfo.LEL" +
+      "GNGJOJAIEntry\022\023\n\013AOECKDLECIJ\030\005 \003(\r\022:\n\013AC" +
+      "AAJJBNCDM\030\006 \003(\0132%.LackingResourceInfo.AC" +
+      "AAJJBNCDMEntry\022\023\n\013LHEGFHKBMKF\030\007 \003(\r\022\023\n\013H" +
+      "IIHFCBJLDI\030\010 \003(\r\022\023\n\013HCPKDCNKPGD\030\t \003(\r\0322\n" +
+      "\020IGIDHGKOODOEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030" +
+      "\002 \001(\r:\0028\001\0322\n\020LELGNGJOJAIEntry\022\013\n\003key\030\001 \001" +
+      "(\r\022\r\n\005value\030\002 \001(\r:\0028\001\0322\n\020ACAAJJBNCDMEntr" +
+      "y\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"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_LackingResourceInfo_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_LackingResourceInfo_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_LackingResourceInfo_descriptor,
+        new java.lang.String[] { "JAODPKILOHD", "IGIDHGKOODO", "OBAKLGMMOEO", "LELGNGJOJAI", "AOECKDLECIJ", "ACAAJJBNCDM", "LHEGFHKBMKF", "HIIHFCBJLDI", "HCPKDCNKPGD", });
+    internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor =
+      internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(0);
+    internal_static_LackingResourceInfo_IGIDHGKOODOEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_LackingResourceInfo_IGIDHGKOODOEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor =
+      internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(1);
+    internal_static_LackingResourceInfo_LELGNGJOJAIEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_LackingResourceInfo_LELGNGJOJAIEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+    internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor =
+      internal_static_LackingResourceInfo_descriptor.getNestedTypes().get(2);
+    internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_LackingResourceInfo_ACAAJJBNCDMEntry_descriptor,
+        new java.lang.String[] { "Key", "Value", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
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 1259c65fb..86d7c5980 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/LifeStateChangeNotifyOuterClass.java
@@ -19,82 +19,102 @@ public final class LifeStateChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 7;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 4;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 4;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 4;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <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 = 4;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 source_entity_id = 5;</code>
-     * @return The sourceEntityId.
-     */
-    int getSourceEntityId();
-
-    /**
-     * <code>uint32 move_reliable_seq = 11;</code>
-     * @return The moveReliableSeq.
-     */
-    int getMoveReliableSeq();
-
-    /**
-     * <code>string attack_tag = 13;</code>
+     * <code>string attack_tag = 2;</code>
      * @return The attackTag.
      */
     java.lang.String getAttackTag();
     /**
-     * <code>string attack_tag = 13;</code>
+     * <code>string attack_tag = 2;</code>
      * @return The bytes for attackTag.
      */
     com.google.protobuf.ByteString
         getAttackTagBytes();
 
     /**
-     * <code>.PlayerDieType die_type = 14;</code>
+     * <code>uint32 move_reliable_seq = 3;</code>
+     * @return The moveReliableSeq.
+     */
+    int getMoveReliableSeq();
+
+    /**
+     * <code>repeated string EPGOBHIEDOI = 5;</code>
+     * @return A list containing the ePGOBHIEDOI.
+     */
+    java.util.List<java.lang.String>
+        getEPGOBHIEDOIList();
+    /**
+     * <code>repeated string EPGOBHIEDOI = 5;</code>
+     * @return The count of ePGOBHIEDOI.
+     */
+    int getEPGOBHIEDOICount();
+    /**
+     * <code>repeated string EPGOBHIEDOI = 5;</code>
+     * @param index The index of the element to return.
+     * @return The ePGOBHIEDOI at the given index.
+     */
+    java.lang.String getEPGOBHIEDOI(int 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.
+     */
+    com.google.protobuf.ByteString
+        getEPGOBHIEDOIBytes(int index);
+
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint32 life_state = 8;</code>
+     * @return The lifeState.
+     */
+    int getLifeState();
+
+    /**
+     * <code>.PlayerDieType die_type = 10;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     int getDieTypeValue();
     /**
-     * <code>.PlayerDieType die_type = 14;</code>
+     * <code>.PlayerDieType die_type = 10;</code>
      * @return The dieType.
      */
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
 
     /**
-     * <code>uint32 life_state = 1;</code>
-     * @return The lifeState.
+     * <code>repeated .ServerBuff server_buff_list = 13;</code>
      */
-    int getLifeState();
+    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>
+     * @return The sourceEntityId.
+     */
+    int getSourceEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 25474
-   * Obf: DHFIJCFHMOG
-   * </pre>
-   *
    * Protobuf type {@code LifeStateChangeNotify}
    */
   public static final class LifeStateChangeNotify extends
@@ -107,9 +127,10 @@ public final class LifeStateChangeNotifyOuterClass {
       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
@@ -143,47 +164,56 @@ public final class LifeStateChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              lifeState_ = input.readUInt32();
-              break;
-            }
-            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 40: {
-
-              sourceEntityId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              moveReliableSeq_ = input.readUInt32();
-              break;
-            }
-            case 106: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
               attackTag_ = s;
               break;
             }
-            case 112: {
+            case 24: {
+
+              moveReliableSeq_ = input.readUInt32();
+              break;
+            }
+            case 42: {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                ePGOBHIEDOI_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              ePGOBHIEDOI_.add(s);
+              break;
+            }
+            case 48: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              lifeState_ = input.readUInt32();
+              break;
+            }
+            case 80: {
               int rawValue = input.readEnum();
 
               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));
+              break;
+            }
+            case 112: {
+
+              sourceEntityId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -200,6 +230,9 @@ public final class LifeStateChangeNotifyOuterClass {
             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();
@@ -219,83 +252,10 @@ public final class LifeStateChangeNotifyOuterClass {
               emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify.class, emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 7;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 7;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 4;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <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 = 4;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 4;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <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 = 4;</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 = 5;
-    private int sourceEntityId_;
-    /**
-     * <code>uint32 source_entity_id = 5;</code>
-     * @return The sourceEntityId.
-     */
-    @java.lang.Override
-    public int getSourceEntityId() {
-      return sourceEntityId_;
-    }
-
-    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 11;
-    private int moveReliableSeq_;
-    /**
-     * <code>uint32 move_reliable_seq = 11;</code>
-     * @return The moveReliableSeq.
-     */
-    @java.lang.Override
-    public int getMoveReliableSeq() {
-      return moveReliableSeq_;
-    }
-
-    public static final int ATTACK_TAG_FIELD_NUMBER = 13;
+    public static final int ATTACK_TAG_FIELD_NUMBER = 2;
     private volatile java.lang.Object attackTag_;
     /**
-     * <code>string attack_tag = 13;</code>
+     * <code>string attack_tag = 2;</code>
      * @return The attackTag.
      */
     @java.lang.Override
@@ -312,7 +272,7 @@ public final class LifeStateChangeNotifyOuterClass {
       }
     }
     /**
-     * <code>string attack_tag = 13;</code>
+     * <code>string attack_tag = 2;</code>
      * @return The bytes for attackTag.
      */
     @java.lang.Override
@@ -330,17 +290,85 @@ public final class LifeStateChangeNotifyOuterClass {
       }
     }
 
-    public static final int DIE_TYPE_FIELD_NUMBER = 14;
+    public static final int MOVE_RELIABLE_SEQ_FIELD_NUMBER = 3;
+    private int moveReliableSeq_;
+    /**
+     * <code>uint32 move_reliable_seq = 3;</code>
+     * @return The moveReliableSeq.
+     */
+    @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 static final int ENTITY_ID_FIELD_NUMBER = 6;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int LIFE_STATE_FIELD_NUMBER = 8;
+    private int lifeState_;
+    /**
+     * <code>uint32 life_state = 8;</code>
+     * @return The lifeState.
+     */
+    @java.lang.Override
+    public int getLifeState() {
+      return lifeState_;
+    }
+
+    public static final int DIE_TYPE_FIELD_NUMBER = 10;
     private int dieType_;
     /**
-     * <code>.PlayerDieType die_type = 14;</code>
+     * <code>.PlayerDieType die_type = 10;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     @java.lang.Override public int getDieTypeValue() {
       return dieType_;
     }
     /**
-     * <code>.PlayerDieType die_type = 14;</code>
+     * <code>.PlayerDieType die_type = 10;</code>
      * @return The dieType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@@ -349,15 +377,55 @@ public final class LifeStateChangeNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
     }
 
-    public static final int LIFE_STATE_FIELD_NUMBER = 1;
-    private int lifeState_;
+    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 13;
+    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
     /**
-     * <code>uint32 life_state = 1;</code>
-     * @return The lifeState.
+     * <code>repeated .ServerBuff server_buff_list = 13;</code>
      */
     @java.lang.Override
-    public int getLifeState() {
-      return lifeState_;
+    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;
+    private int sourceEntityId_;
+    /**
+     * <code>uint32 source_entity_id = 14;</code>
+     * @return The sourceEntityId.
+     */
+    @java.lang.Override
+    public int getSourceEntityId() {
+      return sourceEntityId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -374,26 +442,29 @@ public final class LifeStateChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (lifeState_ != 0) {
-        output.writeUInt32(1, lifeState_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(4, serverBuffList_.get(i));
-      }
-      if (sourceEntityId_ != 0) {
-        output.writeUInt32(5, sourceEntityId_);
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, attackTag_);
       }
       if (moveReliableSeq_ != 0) {
-        output.writeUInt32(11, moveReliableSeq_);
+        output.writeUInt32(3, moveReliableSeq_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, attackTag_);
+      for (int i = 0; i < ePGOBHIEDOI_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, ePGOBHIEDOI_.getRaw(i));
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(6, entityId_);
+      }
+      if (lifeState_ != 0) {
+        output.writeUInt32(8, lifeState_);
       }
       if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(14, dieType_);
+        output.writeEnum(10, dieType_);
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(13, serverBuffList_.get(i));
+      }
+      if (sourceEntityId_ != 0) {
+        output.writeUInt32(14, sourceEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -404,32 +475,40 @@ public final class LifeStateChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (lifeState_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, lifeState_);
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, serverBuffList_.get(i));
-      }
-      if (sourceEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sourceEntityId_);
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, attackTag_);
       }
       if (moveReliableSeq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, moveReliableSeq_);
+          .computeUInt32Size(3, moveReliableSeq_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(attackTag_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, attackTag_);
+      {
+        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) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, entityId_);
+      }
+      if (lifeState_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, lifeState_);
       }
       if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, dieType_);
+          .computeEnumSize(10, dieType_);
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, serverBuffList_.get(i));
+      }
+      if (sourceEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, sourceEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -446,19 +525,21 @@ public final class LifeStateChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify other = (emu.grasscutter.net.proto.LifeStateChangeNotifyOuterClass.LifeStateChangeNotify) obj;
 
+      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 (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 (getMoveReliableSeq()
-          != other.getMoveReliableSeq()) return false;
-      if (!getAttackTag()
-          .equals(other.getAttackTag())) return false;
-      if (dieType_ != other.dieType_) return false;
-      if (getLifeState()
-          != other.getLifeState()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -470,22 +551,26 @@ public final class LifeStateChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().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) + 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 = (37 * hash) + MOVE_RELIABLE_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getMoveReliableSeq();
-      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) + LIFE_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + getLifeState();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -582,11 +667,6 @@ public final class LifeStateChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25474
-     * Obf: DHFIJCFHMOG
-     * </pre>
-     *
      * Protobuf type {@code LifeStateChangeNotify}
      */
     public static final class Builder extends
@@ -625,24 +705,26 @@ public final class LifeStateChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        attackTag_ = "";
+
+        moveReliableSeq_ = 0;
+
+        ePGOBHIEDOI_ = com.google.protobuf.LazyStringArrayList.EMPTY;
+        bitField0_ = (bitField0_ & ~0x00000001);
         entityId_ = 0;
 
+        lifeState_ = 0;
+
+        dieType_ = 0;
+
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           serverBuffListBuilder_.clear();
         }
         sourceEntityId_ = 0;
 
-        moveReliableSeq_ = 0;
-
-        attackTag_ = "";
-
-        dieType_ = 0;
-
-        lifeState_ = 0;
-
         return this;
       }
 
@@ -670,21 +752,26 @@ public final class LifeStateChangeNotifyOuterClass {
       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_ & 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();
         }
         result.sourceEntityId_ = sourceEntityId_;
-        result.moveReliableSeq_ = moveReliableSeq_;
-        result.attackTag_ = attackTag_;
-        result.dieType_ = dieType_;
-        result.lifeState_ = lifeState_;
         onBuilt();
         return result;
       }
@@ -733,14 +820,37 @@ public final class LifeStateChangeNotifyOuterClass {
 
       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_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureServerBuffListIsMutable();
               serverBuffList_.addAll(other.serverBuffList_);
@@ -753,7 +863,7 @@ public final class LifeStateChangeNotifyOuterClass {
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -765,19 +875,6 @@ public final class LifeStateChangeNotifyOuterClass {
         if (other.getSourceEntityId() != 0) {
           setSourceEntityId(other.getSourceEntityId());
         }
-        if (other.getMoveReliableSeq() != 0) {
-          setMoveReliableSeq(other.getMoveReliableSeq());
-        }
-        if (!other.getAttackTag().isEmpty()) {
-          attackTag_ = other.attackTag_;
-          onChanged();
-        }
-        if (other.dieType_ != 0) {
-          setDieTypeValue(other.getDieTypeValue());
-        }
-        if (other.getLifeState() != 0) {
-          setLifeState(other.getLifeState());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -808,342 +905,9 @@ public final class LifeStateChangeNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 7;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      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>repeated .ServerBuff server_buff_list = 4;</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 = 4;</code>
-       */
-      public int getServerBuffListCount() {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.size();
-        } else {
-          return serverBuffListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</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 = 4;</code>
-       */
-      public Builder clearServerBuffList() {
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 4;</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 = 4;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
-          int index) {
-        return getServerBuffListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 4;</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 = 4;</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 = 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 = 4;</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 = 4;</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 int sourceEntityId_ ;
-      /**
-       * <code>uint32 source_entity_id = 5;</code>
-       * @return The sourceEntityId.
-       */
-      @java.lang.Override
-      public int getSourceEntityId() {
-        return sourceEntityId_;
-      }
-      /**
-       * <code>uint32 source_entity_id = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSourceEntityId() {
-        
-        sourceEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int moveReliableSeq_ ;
-      /**
-       * <code>uint32 move_reliable_seq = 11;</code>
-       * @return The moveReliableSeq.
-       */
-      @java.lang.Override
-      public int getMoveReliableSeq() {
-        return moveReliableSeq_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 move_reliable_seq = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMoveReliableSeq() {
-        
-        moveReliableSeq_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object attackTag_ = "";
       /**
-       * <code>string attack_tag = 13;</code>
+       * <code>string attack_tag = 2;</code>
        * @return The attackTag.
        */
       public java.lang.String getAttackTag() {
@@ -1159,7 +923,7 @@ public final class LifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>string attack_tag = 13;</code>
+       * <code>string attack_tag = 2;</code>
        * @return The bytes for attackTag.
        */
       public com.google.protobuf.ByteString
@@ -1176,7 +940,7 @@ public final class LifeStateChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>string attack_tag = 13;</code>
+       * <code>string attack_tag = 2;</code>
        * @param value The attackTag to set.
        * @return This builder for chaining.
        */
@@ -1191,7 +955,7 @@ public final class LifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string attack_tag = 13;</code>
+       * <code>string attack_tag = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearAttackTag() {
@@ -1201,7 +965,7 @@ public final class LifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string attack_tag = 13;</code>
+       * <code>string attack_tag = 2;</code>
        * @param value The bytes for attackTag to set.
        * @return This builder for chaining.
        */
@@ -1217,16 +981,219 @@ public final class LifeStateChangeNotifyOuterClass {
         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.
+       */
+      public Builder setMoveReliableSeq(int value) {
+        
+        moveReliableSeq_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 move_reliable_seq = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMoveReliableSeq() {
+        
+        moveReliableSeq_ = 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 = 5;</code>
+       * @return A list containing the ePGOBHIEDOI.
+       */
+      public com.google.protobuf.ProtocolStringList
+          getEPGOBHIEDOIList() {
+        return ePGOBHIEDOI_.getUnmodifiableView();
+      }
+      /**
+       * <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);
+      }
+      /**
+       * <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.
+       */
+      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 = 5;</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 = 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_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated string EPGOBHIEDOI = 5;</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 = 5;</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 entityId_ ;
+      /**
+       * <code>uint32 entity_id = 6;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 6;</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 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int lifeState_ ;
+      /**
+       * <code>uint32 life_state = 8;</code>
+       * @return The lifeState.
+       */
+      @java.lang.Override
+      public int getLifeState() {
+        return lifeState_;
+      }
+      /**
+       * <code>uint32 life_state = 8;</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 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLifeState() {
+        
+        lifeState_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int dieType_ = 0;
       /**
-       * <code>.PlayerDieType die_type = 14;</code>
+       * <code>.PlayerDieType die_type = 10;</code>
        * @return The enum numeric value on the wire for dieType.
        */
       @java.lang.Override public int getDieTypeValue() {
         return dieType_;
       }
       /**
-       * <code>.PlayerDieType die_type = 14;</code>
+       * <code>.PlayerDieType die_type = 10;</code>
        * @param value The enum numeric value on the wire for dieType to set.
        * @return This builder for chaining.
        */
@@ -1237,7 +1204,7 @@ public final class LifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 14;</code>
+       * <code>.PlayerDieType die_type = 10;</code>
        * @return The dieType.
        */
       @java.lang.Override
@@ -1247,7 +1214,7 @@ public final class LifeStateChangeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerDieType die_type = 14;</code>
+       * <code>.PlayerDieType die_type = 10;</code>
        * @param value The dieType to set.
        * @return This builder for chaining.
        */
@@ -1261,7 +1228,7 @@ public final class LifeStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 14;</code>
+       * <code>.PlayerDieType die_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieType() {
@@ -1271,33 +1238,273 @@ public final class LifeStateChangeNotifyOuterClass {
         return this;
       }
 
-      private int lifeState_ ;
+      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>uint32 life_state = 1;</code>
-       * @return The lifeState.
+       * <code>repeated .ServerBuff server_buff_list = 13;</code>
        */
-      @java.lang.Override
-      public int getLifeState() {
-        return lifeState_;
+      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>uint32 life_state = 1;</code>
-       * @param value The lifeState to set.
+       * <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>
+       * @return The sourceEntityId.
+       */
+      @java.lang.Override
+      public int getSourceEntityId() {
+        return sourceEntityId_;
+      }
+      /**
+       * <code>uint32 source_entity_id = 14;</code>
+       * @param value The sourceEntityId to set.
        * @return This builder for chaining.
        */
-      public Builder setLifeState(int value) {
+      public Builder setSourceEntityId(int value) {
         
-        lifeState_ = value;
+        sourceEntityId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 life_state = 1;</code>
+       * <code>uint32 source_entity_id = 14;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLifeState() {
+      public Builder clearSourceEntityId() {
         
-        lifeState_ = 0;
+        sourceEntityId_ = 0;
         onChanged();
         return this;
       }
@@ -1368,29 +1575,30 @@ public final class LifeStateChangeNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033LifeStateChangeNotify.proto\032\020ServerBuf" +
-      "f.proto\032\023PlayerDieType.proto\"\320\001\n\025LifeSta" +
-      "teChangeNotify\022\021\n\tentity_id\030\007 \001(\r\022%\n\020ser" +
-      "ver_buff_list\030\004 \003(\0132\013.ServerBuff\022\030\n\020sour" +
-      "ce_entity_id\030\005 \001(\r\022\031\n\021move_reliable_seq\030" +
-      "\013 \001(\r\022\022\n\nattack_tag\030\r \001(\t\022 \n\010die_type\030\016 " +
-      "\001(\0162\016.PlayerDieType\022\022\n\nlife_state\030\001 \001(\rB" +
-      "\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\033LifeStateChangeNotify.proto\032\023PlayerDie" +
+      "Type.proto\032\020ServerBuff.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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
         });
     internal_static_LifeStateChangeNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_LifeStateChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_LifeStateChangeNotify_descriptor,
-        new java.lang.String[] { "EntityId", "ServerBuffList", "SourceEntityId", "MoveReliableSeq", "AttackTag", "DieType", "LifeState", });
-    emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
+        new java.lang.String[] { "AttackTag", "MoveReliableSeq", "EPGOBHIEDOI", "EntityId", "LifeState", "DieType", "ServerBuffList", "SourceEntityId", });
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LockStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LockStateOuterClass.java
new file mode 100644
index 000000000..42d7b19cf
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/LockStateOuterClass.java
@@ -0,0 +1,145 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: LockState.proto
+
+package emu.grasscutter.net.proto;
+
+public final class LockStateOuterClass {
+  private LockStateOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code LockState}
+   */
+  public enum LockState
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>LOCK_NONE = 0;</code>
+     */
+    LOCK_NONE(0),
+    /**
+     * <code>LOCK_QUEST = 1;</code>
+     */
+    LOCK_QUEST(1),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>LOCK_NONE = 0;</code>
+     */
+    public static final int LOCK_NONE_VALUE = 0;
+    /**
+     * <code>LOCK_QUEST = 1;</code>
+     */
+    public static final int LOCK_QUEST_VALUE = 1;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static LockState valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static LockState forNumber(int value) {
+      switch (value) {
+        case 0: return LOCK_NONE;
+        case 1: return LOCK_QUEST;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<LockState>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        LockState> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<LockState>() {
+            public LockState findValueByNumber(int number) {
+              return LockState.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.LockStateOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final LockState[] VALUES = values();
+
+    public static LockState valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private LockState(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:LockState)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\017LockState.proto**\n\tLockState\022\r\n\tLOCK_N" +
+      "ONE\020\000\022\016\n\nLOCK_QUEST\020\001B\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/LuaShellTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/LuaShellTypeOuterClass.java
index 39eaa07b6..eb5b547bb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/LuaShellTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/LuaShellTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class LuaShellTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: CILPGEMKHFH
-   * </pre>
-   *
    * Protobuf enum {@code LuaShellType}
    */
   public enum LuaShellType
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 bcd6c67e2..0e2ddae31 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MPLevelEntityInfoOuterClass.java
@@ -19,37 +19,33 @@ public final class MPLevelEntityInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 7;</code>
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * @return Whether the abilityInfo field is set.
+     */
+    boolean hasAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     * @return The abilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 10;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
-     * @return Whether the abilityInfo field is set.
-     */
-    boolean hasAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
-     * @return The abilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder();
-
-    /**
-     * <code>uint32 authority_peer_id = 6;</code>
+     * <code>uint32 authority_peer_id = 15;</code>
      * @return The authorityPeerId.
      */
     int getAuthorityPeerId();
   }
   /**
-   * <pre>
-   * Obf: EPAFCHAOKLI
-   * </pre>
-   *
    * Protobuf type {@code MPLevelEntityInfo}
    */
   public static final class MPLevelEntityInfo extends
@@ -94,17 +90,7 @@ public final class MPLevelEntityInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              authorityPeerId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 74: {
+            case 66: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (abilityInfo_ != null) {
                 subBuilder = abilityInfo_.toBuilder();
@@ -117,6 +103,16 @@ public final class MPLevelEntityInfoOuterClass {
 
               break;
             }
+            case 80: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              authorityPeerId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,21 +145,10 @@ public final class MPLevelEntityInfoOuterClass {
               emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.class, emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 7;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 7;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int ABILITY_INFO_FIELD_NUMBER = 9;
+    public static final int ABILITY_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo abilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
      * @return Whether the abilityInfo field is set.
      */
     @java.lang.Override
@@ -171,7 +156,7 @@ public final class MPLevelEntityInfoOuterClass {
       return abilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
      * @return The abilityInfo.
      */
     @java.lang.Override
@@ -179,17 +164,28 @@ public final class MPLevelEntityInfoOuterClass {
       return abilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : abilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+     * <code>.AbilitySyncStateInfo ability_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
       return getAbilityInfo();
     }
 
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 6;
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 10;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 15;
     private int authorityPeerId_;
     /**
-     * <code>uint32 authority_peer_id = 6;</code>
+     * <code>uint32 authority_peer_id = 15;</code>
      * @return The authorityPeerId.
      */
     @java.lang.Override
@@ -211,14 +207,14 @@ public final class MPLevelEntityInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (authorityPeerId_ != 0) {
-        output.writeUInt32(6, authorityPeerId_);
+      if (abilityInfo_ != null) {
+        output.writeMessage(8, getAbilityInfo());
       }
       if (entityId_ != 0) {
-        output.writeUInt32(7, entityId_);
+        output.writeUInt32(10, entityId_);
       }
-      if (abilityInfo_ != null) {
-        output.writeMessage(9, getAbilityInfo());
+      if (authorityPeerId_ != 0) {
+        output.writeUInt32(15, authorityPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +225,17 @@ public final class MPLevelEntityInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (authorityPeerId_ != 0) {
+      if (abilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, authorityPeerId_);
+          .computeMessageSize(8, getAbilityInfo());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, entityId_);
+          .computeUInt32Size(10, entityId_);
       }
-      if (abilityInfo_ != null) {
+      if (authorityPeerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getAbilityInfo());
+          .computeUInt32Size(15, authorityPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,13 +252,13 @@ public final class MPLevelEntityInfoOuterClass {
       }
       emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo other = (emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (hasAbilityInfo() != other.hasAbilityInfo()) return false;
       if (hasAbilityInfo()) {
         if (!getAbilityInfo()
             .equals(other.getAbilityInfo())) return false;
       }
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (getAuthorityPeerId()
           != other.getAuthorityPeerId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -276,12 +272,12 @@ public final class MPLevelEntityInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (hasAbilityInfo()) {
         hash = (37 * hash) + ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityInfo().hashCode();
       }
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAuthorityPeerId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -380,10 +376,6 @@ public final class MPLevelEntityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EPAFCHAOKLI
-     * </pre>
-     *
      * Protobuf type {@code MPLevelEntityInfo}
      */
     public static final class Builder extends
@@ -421,14 +413,14 @@ public final class MPLevelEntityInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         if (abilityInfoBuilder_ == null) {
           abilityInfo_ = null;
         } else {
           abilityInfo_ = null;
           abilityInfoBuilder_ = null;
         }
+        entityId_ = 0;
+
         authorityPeerId_ = 0;
 
         return this;
@@ -457,12 +449,12 @@ public final class MPLevelEntityInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo buildPartial() {
         emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo result = new emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo(this);
-        result.entityId_ = entityId_;
         if (abilityInfoBuilder_ == null) {
           result.abilityInfo_ = abilityInfo_;
         } else {
           result.abilityInfo_ = abilityInfoBuilder_.build();
         }
+        result.entityId_ = entityId_;
         result.authorityPeerId_ = authorityPeerId_;
         onBuilt();
         return result;
@@ -512,12 +504,12 @@ public final class MPLevelEntityInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo other) {
         if (other == emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.hasAbilityInfo()) {
           mergeAbilityInfo(other.getAbilityInfo());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         if (other.getAuthorityPeerId() != 0) {
           setAuthorityPeerId(other.getAuthorityPeerId());
         }
@@ -550,49 +542,18 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 7;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo abilityInfo_;
       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 = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        * @return Whether the abilityInfo field is set.
        */
       public boolean hasAbilityInfo() {
         return abilityInfoBuilder_ != null || abilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        * @return The abilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAbilityInfo() {
@@ -603,7 +564,7 @@ public final class MPLevelEntityInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public Builder setAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -619,7 +580,7 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public Builder setAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -633,7 +594,7 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public Builder mergeAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (abilityInfoBuilder_ == null) {
@@ -651,7 +612,7 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public Builder clearAbilityInfo() {
         if (abilityInfoBuilder_ == null) {
@@ -665,7 +626,7 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAbilityInfoBuilder() {
         
@@ -673,7 +634,7 @@ public final class MPLevelEntityInfoOuterClass {
         return getAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo ability_info = 8;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder() {
         if (abilityInfoBuilder_ != null) {
@@ -684,7 +645,7 @@ public final class MPLevelEntityInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo ability_info = 9;</code>
+       * <code>.AbilitySyncStateInfo 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> 
@@ -700,9 +661,40 @@ public final class MPLevelEntityInfoOuterClass {
         return abilityInfoBuilder_;
       }
 
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 10;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>uint32 entity_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int authorityPeerId_ ;
       /**
-       * <code>uint32 authority_peer_id = 6;</code>
+       * <code>uint32 authority_peer_id = 15;</code>
        * @return The authorityPeerId.
        */
       @java.lang.Override
@@ -710,7 +702,7 @@ public final class MPLevelEntityInfoOuterClass {
         return authorityPeerId_;
       }
       /**
-       * <code>uint32 authority_peer_id = 6;</code>
+       * <code>uint32 authority_peer_id = 15;</code>
        * @param value The authorityPeerId to set.
        * @return This builder for chaining.
        */
@@ -721,7 +713,7 @@ public final class MPLevelEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 authority_peer_id = 6;</code>
+       * <code>uint32 authority_peer_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAuthorityPeerId() {
@@ -798,10 +790,10 @@ public final class MPLevelEntityInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027MPLevelEntityInfo.proto\032\032AbilitySyncSt" +
-      "ateInfo.proto\"n\n\021MPLevelEntityInfo\022\021\n\ten" +
-      "tity_id\030\007 \001(\r\022+\n\014ability_info\030\t \001(\0132\025.Ab" +
-      "ilitySyncStateInfo\022\031\n\021authority_peer_id\030" +
-      "\006 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "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" +
       "o3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +806,7 @@ public final class MPLevelEntityInfoOuterClass {
     internal_static_MPLevelEntityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MPLevelEntityInfo_descriptor,
-        new java.lang.String[] { "EntityId", "AbilityInfo", "AuthorityPeerId", });
+        new java.lang.String[] { "AbilityInfo", "EntityId", "AuthorityPeerId", });
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MailChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MailChangeNotifyOuterClass.java
index dca1ae040..1b262c14c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MailChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MailChangeNotifyOuterClass.java
@@ -19,52 +19,47 @@ public final class MailChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @return A list containing the delMailIdList.
      */
     java.util.List<java.lang.Integer> getDelMailIdListList();
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @return The count of delMailIdList.
      */
     int getDelMailIdListCount();
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The delMailIdList at the given index.
      */
     int getDelMailIdList(int index);
 
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> 
         getMailListList();
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index);
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     int getMailListCount();
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
         getMailListOrBuilderList();
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 7569
-   * Obf: COPGIOFFCBJ
-   * </pre>
-   *
    * Protobuf type {@code MailChangeNotify}
    */
   public static final class MailChangeNotify extends
@@ -112,16 +107,7 @@ public final class MailChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                mailList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MailDataOuterClass.MailData>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              mailList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.MailDataOuterClass.MailData.parser(), extensionRegistry));
-              break;
-            }
-            case 88: {
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 delMailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -129,7 +115,7 @@ public final class MailChangeNotifyOuterClass {
               delMailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 90: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -142,6 +128,15 @@ public final class MailChangeNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                mailList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MailDataOuterClass.MailData>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              mailList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.MailDataOuterClass.MailData.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -157,12 +152,12 @@ public final class MailChangeNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          mailList_ = java.util.Collections.unmodifiableList(mailList_);
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           delMailIdList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          mailList_ = java.util.Collections.unmodifiableList(mailList_);
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -180,10 +175,10 @@ public final class MailChangeNotifyOuterClass {
               emu.grasscutter.net.proto.MailChangeNotifyOuterClass.MailChangeNotify.class, emu.grasscutter.net.proto.MailChangeNotifyOuterClass.MailChangeNotify.Builder.class);
     }
 
-    public static final int DEL_MAIL_ID_LIST_FIELD_NUMBER = 11;
+    public static final int DEL_MAIL_ID_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList delMailIdList_;
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @return A list containing the delMailIdList.
      */
     @java.lang.Override
@@ -192,14 +187,14 @@ public final class MailChangeNotifyOuterClass {
       return delMailIdList_;
     }
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @return The count of delMailIdList.
      */
     public int getDelMailIdListCount() {
       return delMailIdList_.size();
     }
     /**
-     * <code>repeated uint32 del_mail_id_list = 11;</code>
+     * <code>repeated uint32 del_mail_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The delMailIdList at the given index.
      */
@@ -208,17 +203,17 @@ public final class MailChangeNotifyOuterClass {
     }
     private int delMailIdListMemoizedSerializedSize = -1;
 
-    public static final int MAIL_LIST_FIELD_NUMBER = 3;
+    public static final int MAIL_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> mailList_;
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
       return mailList_;
     }
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
@@ -226,21 +221,21 @@ public final class MailChangeNotifyOuterClass {
       return mailList_;
     }
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     @java.lang.Override
     public int getMailListCount() {
       return mailList_.size();
     }
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
       return mailList_.get(index);
     }
     /**
-     * <code>repeated .MailData mail_list = 3;</code>
+     * <code>repeated .MailData mail_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
@@ -263,16 +258,16 @@ public final class MailChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      for (int i = 0; i < mailList_.size(); i++) {
-        output.writeMessage(3, mailList_.get(i));
-      }
       if (getDelMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(delMailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < delMailIdList_.size(); i++) {
         output.writeUInt32NoTag(delMailIdList_.getInt(i));
       }
+      for (int i = 0; i < mailList_.size(); i++) {
+        output.writeMessage(14, mailList_.get(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -282,10 +277,6 @@ public final class MailChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < mailList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, mailList_.get(i));
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < delMailIdList_.size(); i++) {
@@ -300,6 +291,10 @@ public final class MailChangeNotifyOuterClass {
         }
         delMailIdListMemoizedSerializedSize = dataSize;
       }
+      for (int i = 0; i < mailList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, mailList_.get(i));
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -434,11 +429,6 @@ public final class MailChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7569
-     * Obf: COPGIOFFCBJ
-     * </pre>
-     *
      * Protobuf type {@code MailChangeNotify}
      */
     public static final class Builder extends
@@ -648,7 +638,7 @@ public final class MailChangeNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @return A list containing the delMailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -657,14 +647,14 @@ public final class MailChangeNotifyOuterClass {
                  java.util.Collections.unmodifiableList(delMailIdList_) : delMailIdList_;
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @return The count of delMailIdList.
        */
       public int getDelMailIdListCount() {
         return delMailIdList_.size();
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @param index The index of the element to return.
        * @return The delMailIdList at the given index.
        */
@@ -672,7 +662,7 @@ public final class MailChangeNotifyOuterClass {
         return delMailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @param index The index to set the value at.
        * @param value The delMailIdList to set.
        * @return This builder for chaining.
@@ -685,7 +675,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @param value The delMailIdList to add.
        * @return This builder for chaining.
        */
@@ -696,7 +686,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @param values The delMailIdList to add.
        * @return This builder for chaining.
        */
@@ -709,7 +699,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 del_mail_id_list = 11;</code>
+       * <code>repeated uint32 del_mail_id_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearDelMailIdList() {
@@ -732,7 +722,7 @@ public final class MailChangeNotifyOuterClass {
           emu.grasscutter.net.proto.MailDataOuterClass.MailData, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder, emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> mailListBuilder_;
 
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData> getMailListList() {
         if (mailListBuilder_ == null) {
@@ -742,7 +732,7 @@ public final class MailChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public int getMailListCount() {
         if (mailListBuilder_ == null) {
@@ -752,7 +742,7 @@ public final class MailChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData getMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -762,7 +752,7 @@ public final class MailChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -779,7 +769,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder setMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -793,7 +783,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder addMailList(emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
         if (mailListBuilder_ == null) {
@@ -809,7 +799,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData value) {
@@ -826,7 +816,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder addMailList(
           emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -840,7 +830,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder addMailList(
           int index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder builderForValue) {
@@ -854,7 +844,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder addAllMailList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailData> values) {
@@ -869,7 +859,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder clearMailList() {
         if (mailListBuilder_ == null) {
@@ -882,7 +872,7 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public Builder removeMailList(int index) {
         if (mailListBuilder_ == null) {
@@ -895,14 +885,14 @@ public final class MailChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder getMailListBuilder(
           int index) {
         return getMailListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder getMailListOrBuilder(
           int index) {
@@ -912,7 +902,7 @@ public final class MailChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MailDataOuterClass.MailDataOrBuilder> 
            getMailListOrBuilderList() {
@@ -923,14 +913,14 @@ public final class MailChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder() {
         return getMailListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder addMailListBuilder(
           int index) {
@@ -938,7 +928,7 @@ public final class MailChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.MailDataOuterClass.MailData.getDefaultInstance());
       }
       /**
-       * <code>repeated .MailData mail_list = 3;</code>
+       * <code>repeated .MailData mail_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder> 
            getMailListBuilderList() {
@@ -1027,7 +1017,7 @@ public final class MailChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\026MailChangeNotify.proto\032\016MailData.proto" +
       "\"J\n\020MailChangeNotify\022\030\n\020del_mail_id_list" +
-      "\030\013 \003(\r\022\034\n\tmail_list\030\003 \003(\0132\t.MailDataB\033\n\031" +
+      "\030\r \003(\r\022\034\n\tmail_list\030\016 \003(\0132\t.MailDataB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MailCollectStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MailCollectStateOuterClass.java
index 1d6ff51f4..24a360aa4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MailCollectStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MailCollectStateOuterClass.java
@@ -15,10 +15,6 @@ public final class MailCollectStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: EDOAABBJLID
-   * </pre>
-   *
    * Protobuf enum {@code MailCollectState}
    */
   public enum MailCollectState
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MailDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MailDataOuterClass.java
index cd8ad699f..6dee3c5e9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MailDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MailDataOuterClass.java
@@ -19,7 +19,7 @@ public final class MailDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 mailId = 1;</code>
+     * <code>uint32 mail_id = 1;</code>
      * @return The mailId.
      */
     int getMailId();
@@ -136,10 +136,6 @@ public final class MailDataOuterClass {
     emu.grasscutter.net.proto.MailCollectStateOuterClass.MailCollectState getCollectState();
   }
   /**
-   * <pre>
-   * Obf: NGGHHPIHNPM
-   * </pre>
-   *
    * Protobuf type {@code MailData}
    */
   public static final class MailData extends
@@ -298,10 +294,10 @@ public final class MailDataOuterClass {
               emu.grasscutter.net.proto.MailDataOuterClass.MailData.class, emu.grasscutter.net.proto.MailDataOuterClass.MailData.Builder.class);
     }
 
-    public static final int MAILID_FIELD_NUMBER = 1;
+    public static final int MAIL_ID_FIELD_NUMBER = 1;
     private int mailId_;
     /**
-     * <code>uint32 mailId = 1;</code>
+     * <code>uint32 mail_id = 1;</code>
      * @return The mailId.
      */
     @java.lang.Override
@@ -649,7 +645,7 @@ public final class MailDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MAILID_FIELD_NUMBER;
+      hash = (37 * hash) + MAIL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMailId();
       if (hasMailTextContent()) {
         hash = (37 * hash) + MAIL_TEXT_CONTENT_FIELD_NUMBER;
@@ -775,10 +771,6 @@ public final class MailDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NGGHHPIHNPM
-     * </pre>
-     *
      * Protobuf type {@code MailData}
      */
     public static final class Builder extends
@@ -1044,7 +1036,7 @@ public final class MailDataOuterClass {
 
       private int mailId_ ;
       /**
-       * <code>uint32 mailId = 1;</code>
+       * <code>uint32 mail_id = 1;</code>
        * @return The mailId.
        */
       @java.lang.Override
@@ -1052,7 +1044,7 @@ public final class MailDataOuterClass {
         return mailId_;
       }
       /**
-       * <code>uint32 mailId = 1;</code>
+       * <code>uint32 mail_id = 1;</code>
        * @param value The mailId to set.
        * @return This builder for chaining.
        */
@@ -1063,7 +1055,7 @@ public final class MailDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 mailId = 1;</code>
+       * <code>uint32 mail_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailId() {
@@ -1850,15 +1842,15 @@ public final class MailDataOuterClass {
     java.lang.String[] descriptorData = {
       "\n\016MailData.proto\032\025MailTextContent.proto\032" +
       "\016MailItem.proto\032\026MailCollectState.proto\"" +
-      "\241\002\n\010MailData\022\016\n\006mailId\030\001 \001(\r\022+\n\021mail_tex" +
-      "t_content\030\004 \001(\0132\020.MailTextContent\022\034\n\tite" +
-      "m_list\030\007 \003(\0132\t.MailItem\022\021\n\tsend_time\030\010 \001" +
-      "(\r\022\023\n\013expire_time\030\t \001(\r\022\022\n\nimportance\030\n " +
-      "\001(\r\022\017\n\007is_read\030\013 \001(\010\022\031\n\021is_attachment_go" +
-      "t\030\014 \001(\010\022\021\n\tconfig_id\030\r \001(\r\022\025\n\rargument_l" +
-      "ist\030\016 \003(\t\022(\n\rcollect_state\030\017 \001(\0162\021.MailC" +
-      "ollectStateB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "\242\002\n\010MailData\022\017\n\007mail_id\030\001 \001(\r\022+\n\021mail_te" +
+      "xt_content\030\004 \001(\0132\020.MailTextContent\022\034\n\tit" +
+      "em_list\030\007 \003(\0132\t.MailItem\022\021\n\tsend_time\030\010 " +
+      "\001(\r\022\023\n\013expire_time\030\t \001(\r\022\022\n\nimportance\030\n" +
+      " \001(\r\022\017\n\007is_read\030\013 \001(\010\022\031\n\021is_attachment_g" +
+      "ot\030\014 \001(\010\022\021\n\tconfig_id\030\r \001(\r\022\025\n\rargument_" +
+      "list\030\016 \003(\t\022(\n\rcollect_state\030\017 \001(\0162\021.Mail" +
+      "CollectStateB\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MailItemOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MailItemOuterClass.java
index 37f709e44..2a27fd07b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MailItemOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MailItemOuterClass.java
@@ -49,10 +49,6 @@ public final class MailItemOuterClass {
     emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfoOrBuilder getDeleteInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: BNPJNAPNHKB
-   * </pre>
-   *
    * Protobuf type {@code MailItem}
    */
   public static final class MailItem extends
@@ -384,10 +380,6 @@ public final class MailItemOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BNPJNAPNHKB
-     * </pre>
-     *
      * Protobuf type {@code MailItem}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MailTextContentOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MailTextContentOuterClass.java
index f6235bed8..193452f21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MailTextContentOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MailTextContentOuterClass.java
@@ -55,10 +55,6 @@ public final class MailTextContentOuterClass {
         getSenderBytes();
   }
   /**
-   * <pre>
-   * Obf: GONDLGCFODB
-   * </pre>
-   *
    * Protobuf type {@code MailTextContent}
    */
   public static final class MailTextContent extends
@@ -445,10 +441,6 @@ public final class MailTextContentOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GONDLGCFODB
-     * </pre>
-     *
      * Protobuf type {@code MailTextContent}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapAreaChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapAreaChangeNotifyOuterClass.java
index 70f008774..0f299abe1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapAreaChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapAreaChangeNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class MapAreaChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> 
         getMapAreaInfoListList();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index);
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     int getMapAreaInfoListCount();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
         getMapAreaInfoListOrBuilderList();
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 21970
-   * Obf: EHGEGMPIFKC
-   * </pre>
-   *
    * Protobuf type {@code MapAreaChangeNotify}
    */
   public static final class MapAreaChangeNotify extends
@@ -94,7 +89,7 @@ public final class MapAreaChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mapAreaInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class MapAreaChangeNotifyOuterClass {
               emu.grasscutter.net.proto.MapAreaChangeNotifyOuterClass.MapAreaChangeNotify.class, emu.grasscutter.net.proto.MapAreaChangeNotifyOuterClass.MapAreaChangeNotify.Builder.class);
     }
 
-    public static final int MAP_AREA_INFO_LIST_FIELD_NUMBER = 1;
+    public static final int MAP_AREA_INFO_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> mapAreaInfoList_;
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> getMapAreaInfoListList() {
       return mapAreaInfoList_;
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class MapAreaChangeNotifyOuterClass {
       return mapAreaInfoList_;
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     @java.lang.Override
     public int getMapAreaInfoListCount() {
       return mapAreaInfoList_.size();
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index) {
       return mapAreaInfoList_.get(index);
     }
     /**
-     * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+     * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class MapAreaChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < mapAreaInfoList_.size(); i++) {
-        output.writeMessage(1, mapAreaInfoList_.get(i));
+        output.writeMessage(7, mapAreaInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class MapAreaChangeNotifyOuterClass {
       size = 0;
       for (int i = 0; i < mapAreaInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, mapAreaInfoList_.get(i));
+          .computeMessageSize(7, mapAreaInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class MapAreaChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21970
-     * Obf: EHGEGMPIFKC
-     * </pre>
-     *
      * Protobuf type {@code MapAreaChangeNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class MapAreaChangeNotifyOuterClass {
           emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> mapAreaInfoListBuilder_;
 
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> getMapAreaInfoListList() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class MapAreaChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public int getMapAreaInfoListCount() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class MapAreaChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo getMapAreaInfoList(int index) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class MapAreaChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder setMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
@@ -585,7 +575,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder setMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder addMapAreaInfoList(emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder addMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo value) {
@@ -632,7 +622,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder addMapAreaInfoList(
           emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder addMapAreaInfoList(
           int index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder addAllMapAreaInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo> values) {
@@ -675,7 +665,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder clearMapAreaInfoList() {
         if (mapAreaInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public Builder removeMapAreaInfoList(int index) {
         if (mapAreaInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class MapAreaChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder getMapAreaInfoListBuilder(
           int index) {
         return getMapAreaInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder getMapAreaInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class MapAreaChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfoOrBuilder> 
            getMapAreaInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class MapAreaChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder addMapAreaInfoListBuilder() {
         return getMapAreaInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder addMapAreaInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class MapAreaChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapAreaInfo map_area_info_list = 1;</code>
+       * <code>repeated .MapAreaInfo map_area_info_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapAreaInfoOuterClass.MapAreaInfo.Builder> 
            getMapAreaInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class MapAreaChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\031MapAreaChangeNotify.proto\032\021MapAreaInfo" +
       ".proto\"?\n\023MapAreaChangeNotify\022(\n\022map_are" +
-      "a_info_list\030\001 \003(\0132\014.MapAreaInfoB\033\n\031emu.g" +
+      "a_info_list\030\007 \003(\0132\014.MapAreaInfoB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapAreaInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapAreaInfoOuterClass.java
index 37852152f..c84fc4416 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapAreaInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapAreaInfoOuterClass.java
@@ -31,10 +31,6 @@ public final class MapAreaInfoOuterClass {
     boolean getIsOpen();
   }
   /**
-   * <pre>
-   * Obf: NOPIOICPEHD
-   * </pre>
-   *
    * Protobuf type {@code MapAreaInfo}
    */
   public static final class MapAreaInfo extends
@@ -311,10 +307,6 @@ public final class MapAreaInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NOPIOICPEHD
-     * </pre>
-     *
      * Protobuf type {@code MapAreaInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
index da0a8f25d..9977d98bf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapLayerInfoOuterClass.java
@@ -19,55 +19,55 @@ public final class MapLayerInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
+     * @return A list containing the unlockedMapLayerGroupIdList.
+     */
+    java.util.List<java.lang.Integer> getUnlockedMapLayerGroupIdListList();
+    /**
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
+     * @return The count of unlockedMapLayerGroupIdList.
+     */
+    int getUnlockedMapLayerGroupIdListCount();
+    /**
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedMapLayerGroupIdList at the given index.
+     */
+    int getUnlockedMapLayerGroupIdList(int index);
+
+    /**
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
      * @return A list containing the unlockedMapLayerIdList.
      */
     java.util.List<java.lang.Integer> getUnlockedMapLayerIdListList();
     /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
      * @return The count of unlockedMapLayerIdList.
      */
     int getUnlockedMapLayerIdListCount();
     /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The unlockedMapLayerIdList at the given index.
      */
     int getUnlockedMapLayerIdList(int index);
 
     /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
      * @return A list containing the unlockedMapLayerFloorIdList.
      */
     java.util.List<java.lang.Integer> getUnlockedMapLayerFloorIdListList();
     /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
      * @return The count of unlockedMapLayerFloorIdList.
      */
     int getUnlockedMapLayerFloorIdListCount();
     /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
      * @param index The index of the element to return.
      * @return The unlockedMapLayerFloorIdList at the given index.
      */
     int getUnlockedMapLayerFloorIdList(int index);
-
-    /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
-     * @return A list containing the unlockedMapLayerGroupIdList.
-     */
-    java.util.List<java.lang.Integer> getUnlockedMapLayerGroupIdListList();
-    /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
-     * @return The count of unlockedMapLayerGroupIdList.
-     */
-    int getUnlockedMapLayerGroupIdListCount();
-    /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedMapLayerGroupIdList at the given index.
-     */
-    int getUnlockedMapLayerGroupIdList(int index);
   }
   /**
    * Protobuf type {@code MapLayerInfo}
@@ -82,9 +82,9 @@ public final class MapLayerInfoOuterClass {
       super(builder);
     }
     private MapLayerInfo() {
+      unlockedMapLayerGroupIdList_ = emptyIntList();
       unlockedMapLayerIdList_ = emptyIntList();
       unlockedMapLayerFloorIdList_ = emptyIntList();
-      unlockedMapLayerGroupIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -118,20 +118,20 @@ public final class MapLayerInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 16: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 unlockedMapLayerGroupIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               unlockedMapLayerGroupIdList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 18: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerGroupIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerGroupIdList_.addInt(input.readUInt32());
@@ -139,20 +139,20 @@ public final class MapLayerInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 88: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 24: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 unlockedMapLayerIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               unlockedMapLayerIdList_.addInt(input.readUInt32());
               break;
             }
-            case 90: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerIdList_.addInt(input.readUInt32());
@@ -160,20 +160,20 @@ public final class MapLayerInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 unlockedMapLayerFloorIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               unlockedMapLayerFloorIdList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerFloorIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 unlockedMapLayerFloorIdList_.addInt(input.readUInt32());
@@ -196,13 +196,13 @@ public final class MapLayerInfoOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           unlockedMapLayerGroupIdList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           unlockedMapLayerIdList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           unlockedMapLayerFloorIdList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -222,66 +222,10 @@ public final class MapLayerInfoOuterClass {
               emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.class, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder.class);
     }
 
-    public static final int UNLOCKED_MAP_LAYER_ID_LIST_FIELD_NUMBER = 11;
-    private com.google.protobuf.Internal.IntList unlockedMapLayerIdList_;
-    /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-     * @return A list containing the unlockedMapLayerIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getUnlockedMapLayerIdListList() {
-      return unlockedMapLayerIdList_;
-    }
-    /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-     * @return The count of unlockedMapLayerIdList.
-     */
-    public int getUnlockedMapLayerIdListCount() {
-      return unlockedMapLayerIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedMapLayerIdList at the given index.
-     */
-    public int getUnlockedMapLayerIdList(int index) {
-      return unlockedMapLayerIdList_.getInt(index);
-    }
-    private int unlockedMapLayerIdListMemoizedSerializedSize = -1;
-
-    public static final int UNLOCKED_MAP_LAYER_FLOOR_ID_LIST_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList unlockedMapLayerFloorIdList_;
-    /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-     * @return A list containing the unlockedMapLayerFloorIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getUnlockedMapLayerFloorIdListList() {
-      return unlockedMapLayerFloorIdList_;
-    }
-    /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-     * @return The count of unlockedMapLayerFloorIdList.
-     */
-    public int getUnlockedMapLayerFloorIdListCount() {
-      return unlockedMapLayerFloorIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedMapLayerFloorIdList at the given index.
-     */
-    public int getUnlockedMapLayerFloorIdList(int index) {
-      return unlockedMapLayerFloorIdList_.getInt(index);
-    }
-    private int unlockedMapLayerFloorIdListMemoizedSerializedSize = -1;
-
-    public static final int UNLOCKED_MAP_LAYER_GROUP_ID_LIST_FIELD_NUMBER = 3;
+    public static final int UNLOCKED_MAP_LAYER_GROUP_ID_LIST_FIELD_NUMBER = 2;
     private com.google.protobuf.Internal.IntList unlockedMapLayerGroupIdList_;
     /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
      * @return A list containing the unlockedMapLayerGroupIdList.
      */
     @java.lang.Override
@@ -290,14 +234,14 @@ public final class MapLayerInfoOuterClass {
       return unlockedMapLayerGroupIdList_;
     }
     /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
      * @return The count of unlockedMapLayerGroupIdList.
      */
     public int getUnlockedMapLayerGroupIdListCount() {
       return unlockedMapLayerGroupIdList_.size();
     }
     /**
-     * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+     * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
      * @param index The index of the element to return.
      * @return The unlockedMapLayerGroupIdList at the given index.
      */
@@ -306,6 +250,62 @@ public final class MapLayerInfoOuterClass {
     }
     private int unlockedMapLayerGroupIdListMemoizedSerializedSize = -1;
 
+    public static final int UNLOCKED_MAP_LAYER_ID_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.IntList unlockedMapLayerIdList_;
+    /**
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+     * @return A list containing the unlockedMapLayerIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnlockedMapLayerIdListList() {
+      return unlockedMapLayerIdList_;
+    }
+    /**
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+     * @return The count of unlockedMapLayerIdList.
+     */
+    public int getUnlockedMapLayerIdListCount() {
+      return unlockedMapLayerIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedMapLayerIdList at the given index.
+     */
+    public int getUnlockedMapLayerIdList(int index) {
+      return unlockedMapLayerIdList_.getInt(index);
+    }
+    private int unlockedMapLayerIdListMemoizedSerializedSize = -1;
+
+    public static final int UNLOCKED_MAP_LAYER_FLOOR_ID_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList unlockedMapLayerFloorIdList_;
+    /**
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+     * @return A list containing the unlockedMapLayerFloorIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnlockedMapLayerFloorIdListList() {
+      return unlockedMapLayerFloorIdList_;
+    }
+    /**
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+     * @return The count of unlockedMapLayerFloorIdList.
+     */
+    public int getUnlockedMapLayerFloorIdListCount() {
+      return unlockedMapLayerFloorIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedMapLayerFloorIdList at the given index.
+     */
+    public int getUnlockedMapLayerFloorIdList(int index) {
+      return unlockedMapLayerFloorIdList_.getInt(index);
+    }
+    private int unlockedMapLayerFloorIdListMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -322,21 +322,21 @@ public final class MapLayerInfoOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getUnlockedMapLayerGroupIdListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(18);
         output.writeUInt32NoTag(unlockedMapLayerGroupIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockedMapLayerGroupIdList_.size(); i++) {
         output.writeUInt32NoTag(unlockedMapLayerGroupIdList_.getInt(i));
       }
       if (getUnlockedMapLayerIdListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(unlockedMapLayerIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockedMapLayerIdList_.size(); i++) {
         output.writeUInt32NoTag(unlockedMapLayerIdList_.getInt(i));
       }
       if (getUnlockedMapLayerFloorIdListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(98);
         output.writeUInt32NoTag(unlockedMapLayerFloorIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockedMapLayerFloorIdList_.size(); i++) {
@@ -408,12 +408,12 @@ public final class MapLayerInfoOuterClass {
       }
       emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo other = (emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo) obj;
 
+      if (!getUnlockedMapLayerGroupIdListList()
+          .equals(other.getUnlockedMapLayerGroupIdListList())) return false;
       if (!getUnlockedMapLayerIdListList()
           .equals(other.getUnlockedMapLayerIdListList())) return false;
       if (!getUnlockedMapLayerFloorIdListList()
           .equals(other.getUnlockedMapLayerFloorIdListList())) return false;
-      if (!getUnlockedMapLayerGroupIdListList()
-          .equals(other.getUnlockedMapLayerGroupIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -425,6 +425,10 @@ public final class MapLayerInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getUnlockedMapLayerGroupIdListCount() > 0) {
+        hash = (37 * hash) + UNLOCKED_MAP_LAYER_GROUP_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnlockedMapLayerGroupIdListList().hashCode();
+      }
       if (getUnlockedMapLayerIdListCount() > 0) {
         hash = (37 * hash) + UNLOCKED_MAP_LAYER_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedMapLayerIdListList().hashCode();
@@ -433,10 +437,6 @@ public final class MapLayerInfoOuterClass {
         hash = (37 * hash) + UNLOCKED_MAP_LAYER_FLOOR_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedMapLayerFloorIdListList().hashCode();
       }
-      if (getUnlockedMapLayerGroupIdListCount() > 0) {
-        hash = (37 * hash) + UNLOCKED_MAP_LAYER_GROUP_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getUnlockedMapLayerGroupIdListList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -570,11 +570,11 @@ public final class MapLayerInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        unlockedMapLayerIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        unlockedMapLayerFloorIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         unlockedMapLayerGroupIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        unlockedMapLayerIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        unlockedMapLayerFloorIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
@@ -604,20 +604,20 @@ public final class MapLayerInfoOuterClass {
         emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo result = new emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          unlockedMapLayerIdList_.makeImmutable();
+          unlockedMapLayerGroupIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.unlockedMapLayerIdList_ = unlockedMapLayerIdList_;
+        result.unlockedMapLayerGroupIdList_ = unlockedMapLayerGroupIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          unlockedMapLayerFloorIdList_.makeImmutable();
+          unlockedMapLayerIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.unlockedMapLayerFloorIdList_ = unlockedMapLayerFloorIdList_;
+        result.unlockedMapLayerIdList_ = unlockedMapLayerIdList_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          unlockedMapLayerGroupIdList_.makeImmutable();
+          unlockedMapLayerFloorIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.unlockedMapLayerGroupIdList_ = unlockedMapLayerGroupIdList_;
+        result.unlockedMapLayerFloorIdList_ = unlockedMapLayerFloorIdList_;
         onBuilt();
         return result;
       }
@@ -666,10 +666,20 @@ public final class MapLayerInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo other) {
         if (other == emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance()) return this;
+        if (!other.unlockedMapLayerGroupIdList_.isEmpty()) {
+          if (unlockedMapLayerGroupIdList_.isEmpty()) {
+            unlockedMapLayerGroupIdList_ = other.unlockedMapLayerGroupIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureUnlockedMapLayerGroupIdListIsMutable();
+            unlockedMapLayerGroupIdList_.addAll(other.unlockedMapLayerGroupIdList_);
+          }
+          onChanged();
+        }
         if (!other.unlockedMapLayerIdList_.isEmpty()) {
           if (unlockedMapLayerIdList_.isEmpty()) {
             unlockedMapLayerIdList_ = other.unlockedMapLayerIdList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureUnlockedMapLayerIdListIsMutable();
             unlockedMapLayerIdList_.addAll(other.unlockedMapLayerIdList_);
@@ -679,23 +689,13 @@ public final class MapLayerInfoOuterClass {
         if (!other.unlockedMapLayerFloorIdList_.isEmpty()) {
           if (unlockedMapLayerFloorIdList_.isEmpty()) {
             unlockedMapLayerFloorIdList_ = other.unlockedMapLayerFloorIdList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureUnlockedMapLayerFloorIdListIsMutable();
             unlockedMapLayerFloorIdList_.addAll(other.unlockedMapLayerFloorIdList_);
           }
           onChanged();
         }
-        if (!other.unlockedMapLayerGroupIdList_.isEmpty()) {
-          if (unlockedMapLayerGroupIdList_.isEmpty()) {
-            unlockedMapLayerGroupIdList_ = other.unlockedMapLayerGroupIdList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureUnlockedMapLayerGroupIdListIsMutable();
-            unlockedMapLayerGroupIdList_.addAll(other.unlockedMapLayerGroupIdList_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -726,189 +726,31 @@ public final class MapLayerInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList unlockedMapLayerIdList_ = emptyIntList();
-      private void ensureUnlockedMapLayerIdListIsMutable() {
+      private com.google.protobuf.Internal.IntList unlockedMapLayerGroupIdList_ = emptyIntList();
+      private void ensureUnlockedMapLayerGroupIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          unlockedMapLayerIdList_ = mutableCopy(unlockedMapLayerIdList_);
+          unlockedMapLayerGroupIdList_ = mutableCopy(unlockedMapLayerGroupIdList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @return A list containing the unlockedMapLayerIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getUnlockedMapLayerIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockedMapLayerIdList_) : unlockedMapLayerIdList_;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @return The count of unlockedMapLayerIdList.
-       */
-      public int getUnlockedMapLayerIdListCount() {
-        return unlockedMapLayerIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @param index The index of the element to return.
-       * @return The unlockedMapLayerIdList at the given index.
-       */
-      public int getUnlockedMapLayerIdList(int index) {
-        return unlockedMapLayerIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @param index The index to set the value at.
-       * @param value The unlockedMapLayerIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnlockedMapLayerIdList(
-          int index, int value) {
-        ensureUnlockedMapLayerIdListIsMutable();
-        unlockedMapLayerIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @param value The unlockedMapLayerIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addUnlockedMapLayerIdList(int value) {
-        ensureUnlockedMapLayerIdListIsMutable();
-        unlockedMapLayerIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @param values The unlockedMapLayerIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllUnlockedMapLayerIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUnlockedMapLayerIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockedMapLayerIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_id_list = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnlockedMapLayerIdList() {
-        unlockedMapLayerIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList unlockedMapLayerFloorIdList_ = emptyIntList();
-      private void ensureUnlockedMapLayerFloorIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          unlockedMapLayerFloorIdList_ = mutableCopy(unlockedMapLayerFloorIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @return A list containing the unlockedMapLayerFloorIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getUnlockedMapLayerFloorIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockedMapLayerFloorIdList_) : unlockedMapLayerFloorIdList_;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @return The count of unlockedMapLayerFloorIdList.
-       */
-      public int getUnlockedMapLayerFloorIdListCount() {
-        return unlockedMapLayerFloorIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @param index The index of the element to return.
-       * @return The unlockedMapLayerFloorIdList at the given index.
-       */
-      public int getUnlockedMapLayerFloorIdList(int index) {
-        return unlockedMapLayerFloorIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @param index The index to set the value at.
-       * @param value The unlockedMapLayerFloorIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnlockedMapLayerFloorIdList(
-          int index, int value) {
-        ensureUnlockedMapLayerFloorIdListIsMutable();
-        unlockedMapLayerFloorIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @param value The unlockedMapLayerFloorIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addUnlockedMapLayerFloorIdList(int value) {
-        ensureUnlockedMapLayerFloorIdListIsMutable();
-        unlockedMapLayerFloorIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @param values The unlockedMapLayerFloorIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllUnlockedMapLayerFloorIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUnlockedMapLayerFloorIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockedMapLayerFloorIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnlockedMapLayerFloorIdList() {
-        unlockedMapLayerFloorIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList unlockedMapLayerGroupIdList_ = emptyIntList();
-      private void ensureUnlockedMapLayerGroupIdListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          unlockedMapLayerGroupIdList_ = mutableCopy(unlockedMapLayerGroupIdList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @return A list containing the unlockedMapLayerGroupIdList.
        */
       public java.util.List<java.lang.Integer>
           getUnlockedMapLayerGroupIdListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(unlockedMapLayerGroupIdList_) : unlockedMapLayerGroupIdList_;
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @return The count of unlockedMapLayerGroupIdList.
        */
       public int getUnlockedMapLayerGroupIdListCount() {
         return unlockedMapLayerGroupIdList_.size();
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @param index The index of the element to return.
        * @return The unlockedMapLayerGroupIdList at the given index.
        */
@@ -916,7 +758,7 @@ public final class MapLayerInfoOuterClass {
         return unlockedMapLayerGroupIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @param index The index to set the value at.
        * @param value The unlockedMapLayerGroupIdList to set.
        * @return This builder for chaining.
@@ -929,7 +771,7 @@ public final class MapLayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @param value The unlockedMapLayerGroupIdList to add.
        * @return This builder for chaining.
        */
@@ -940,7 +782,7 @@ public final class MapLayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @param values The unlockedMapLayerGroupIdList to add.
        * @return This builder for chaining.
        */
@@ -953,11 +795,169 @@ public final class MapLayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 unlocked_map_layer_group_id_list = 3;</code>
+       * <code>repeated uint32 unlocked_map_layer_group_id_list = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearUnlockedMapLayerGroupIdList() {
         unlockedMapLayerGroupIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unlockedMapLayerIdList_ = emptyIntList();
+      private void ensureUnlockedMapLayerIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          unlockedMapLayerIdList_ = mutableCopy(unlockedMapLayerIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @return A list containing the unlockedMapLayerIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnlockedMapLayerIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(unlockedMapLayerIdList_) : unlockedMapLayerIdList_;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @return The count of unlockedMapLayerIdList.
+       */
+      public int getUnlockedMapLayerIdListCount() {
+        return unlockedMapLayerIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The unlockedMapLayerIdList at the given index.
+       */
+      public int getUnlockedMapLayerIdList(int index) {
+        return unlockedMapLayerIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The unlockedMapLayerIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockedMapLayerIdList(
+          int index, int value) {
+        ensureUnlockedMapLayerIdListIsMutable();
+        unlockedMapLayerIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @param value The unlockedMapLayerIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnlockedMapLayerIdList(int value) {
+        ensureUnlockedMapLayerIdListIsMutable();
+        unlockedMapLayerIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @param values The unlockedMapLayerIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnlockedMapLayerIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnlockedMapLayerIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unlockedMapLayerIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_id_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockedMapLayerIdList() {
+        unlockedMapLayerIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unlockedMapLayerFloorIdList_ = emptyIntList();
+      private void ensureUnlockedMapLayerFloorIdListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          unlockedMapLayerFloorIdList_ = mutableCopy(unlockedMapLayerFloorIdList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @return A list containing the unlockedMapLayerFloorIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnlockedMapLayerFloorIdListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(unlockedMapLayerFloorIdList_) : unlockedMapLayerFloorIdList_;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @return The count of unlockedMapLayerFloorIdList.
+       */
+      public int getUnlockedMapLayerFloorIdListCount() {
+        return unlockedMapLayerFloorIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @param index The index of the element to return.
+       * @return The unlockedMapLayerFloorIdList at the given index.
+       */
+      public int getUnlockedMapLayerFloorIdList(int index) {
+        return unlockedMapLayerFloorIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The unlockedMapLayerFloorIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockedMapLayerFloorIdList(
+          int index, int value) {
+        ensureUnlockedMapLayerFloorIdListIsMutable();
+        unlockedMapLayerFloorIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @param value The unlockedMapLayerFloorIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnlockedMapLayerFloorIdList(int value) {
+        ensureUnlockedMapLayerFloorIdListIsMutable();
+        unlockedMapLayerFloorIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @param values The unlockedMapLayerFloorIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnlockedMapLayerFloorIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnlockedMapLayerFloorIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unlockedMapLayerFloorIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_map_layer_floor_id_list = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockedMapLayerFloorIdList() {
+        unlockedMapLayerFloorIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
@@ -1029,10 +1029,10 @@ public final class MapLayerInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022MapLayerInfo.proto\"\206\001\n\014MapLayerInfo\022\"\n" +
-      "\032unlocked_map_layer_id_list\030\013 \003(\r\022(\n unl" +
-      "ocked_map_layer_floor_id_list\030\017 \003(\r\022(\n u" +
-      "nlocked_map_layer_group_id_list\030\003 \003(\rB\033\n" +
+      "\n\022MapLayerInfo.proto\"\206\001\n\014MapLayerInfo\022(\n" +
+      " unlocked_map_layer_group_id_list\030\002 \003(\r\022" +
+      "\"\n\032unlocked_map_layer_id_list\030\003 \003(\r\022(\n u" +
+      "nlocked_map_layer_floor_id_list\030\014 \003(\rB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1044,7 +1044,7 @@ public final class MapLayerInfoOuterClass {
     internal_static_MapLayerInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MapLayerInfo_descriptor,
-        new java.lang.String[] { "UnlockedMapLayerIdList", "UnlockedMapLayerFloorIdList", "UnlockedMapLayerGroupIdList", });
+        new java.lang.String[] { "UnlockedMapLayerGroupIdList", "UnlockedMapLayerIdList", "UnlockedMapLayerFloorIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkFromTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkFromTypeOuterClass.java
index 7f7f45699..4e24caa30 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkFromTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkFromTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MapMarkFromTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: MNFIJMCNPLC
-   * </pre>
-   *
    * Protobuf enum {@code MapMarkFromType}
    */
   public enum MapMarkFromType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointOuterClass.java
index 2e5e2e1f4..fde292b3b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointOuterClass.java
@@ -86,16 +86,12 @@ public final class MapMarkPointOuterClass {
     int getQuestId();
 
     /**
-     * <code>uint32 HJMMAOMEHOL = 8;</code>
-     * @return The hJMMAOMEHOL.
+     * <code>uint32 AGIENJJKPBE = 8;</code>
+     * @return The aGIENJJKPBE.
      */
-    int getHJMMAOMEHOL();
+    int getAGIENJJKPBE();
   }
   /**
-   * <pre>
-   * Obf: HJDOENNHBIL
-   * </pre>
-   *
    * Protobuf type {@code MapMarkPoint}
    */
   public static final class MapMarkPoint extends
@@ -191,7 +187,7 @@ public final class MapMarkPointOuterClass {
             }
             case 64: {
 
-              hJMMAOMEHOL_ = input.readUInt32();
+              aGIENJJKPBE_ = input.readUInt32();
               break;
             }
             default: {
@@ -361,15 +357,15 @@ public final class MapMarkPointOuterClass {
       return questId_;
     }
 
-    public static final int HJMMAOMEHOL_FIELD_NUMBER = 8;
-    private int hJMMAOMEHOL_;
+    public static final int AGIENJJKPBE_FIELD_NUMBER = 8;
+    private int aGIENJJKPBE_;
     /**
-     * <code>uint32 HJMMAOMEHOL = 8;</code>
-     * @return The hJMMAOMEHOL.
+     * <code>uint32 AGIENJJKPBE = 8;</code>
+     * @return The aGIENJJKPBE.
      */
     @java.lang.Override
-    public int getHJMMAOMEHOL() {
-      return hJMMAOMEHOL_;
+    public int getAGIENJJKPBE() {
+      return aGIENJJKPBE_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -407,8 +403,8 @@ public final class MapMarkPointOuterClass {
       if (questId_ != 0) {
         output.writeUInt32(7, questId_);
       }
-      if (hJMMAOMEHOL_ != 0) {
-        output.writeUInt32(8, hJMMAOMEHOL_);
+      if (aGIENJJKPBE_ != 0) {
+        output.writeUInt32(8, aGIENJJKPBE_);
       }
       unknownFields.writeTo(output);
     }
@@ -446,9 +442,9 @@ public final class MapMarkPointOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, questId_);
       }
-      if (hJMMAOMEHOL_ != 0) {
+      if (aGIENJJKPBE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, hJMMAOMEHOL_);
+          .computeUInt32Size(8, aGIENJJKPBE_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -480,8 +476,8 @@ public final class MapMarkPointOuterClass {
       if (fromType_ != other.fromType_) return false;
       if (getQuestId()
           != other.getQuestId()) return false;
-      if (getHJMMAOMEHOL()
-          != other.getHJMMAOMEHOL()) return false;
+      if (getAGIENJJKPBE()
+          != other.getAGIENJJKPBE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -509,8 +505,8 @@ public final class MapMarkPointOuterClass {
       hash = (53 * hash) + fromType_;
       hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
       hash = (53 * hash) + getQuestId();
-      hash = (37 * hash) + HJMMAOMEHOL_FIELD_NUMBER;
-      hash = (53 * hash) + getHJMMAOMEHOL();
+      hash = (37 * hash) + AGIENJJKPBE_FIELD_NUMBER;
+      hash = (53 * hash) + getAGIENJJKPBE();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -607,10 +603,6 @@ public final class MapMarkPointOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HJDOENNHBIL
-     * </pre>
-     *
      * Protobuf type {@code MapMarkPoint}
      */
     public static final class Builder extends
@@ -666,7 +658,7 @@ public final class MapMarkPointOuterClass {
 
         questId_ = 0;
 
-        hJMMAOMEHOL_ = 0;
+        aGIENJJKPBE_ = 0;
 
         return this;
       }
@@ -705,7 +697,7 @@ public final class MapMarkPointOuterClass {
         result.monsterId_ = monsterId_;
         result.fromType_ = fromType_;
         result.questId_ = questId_;
-        result.hJMMAOMEHOL_ = hJMMAOMEHOL_;
+        result.aGIENJJKPBE_ = aGIENJJKPBE_;
         onBuilt();
         return result;
       }
@@ -776,8 +768,8 @@ public final class MapMarkPointOuterClass {
         if (other.getQuestId() != 0) {
           setQuestId(other.getQuestId());
         }
-        if (other.getHJMMAOMEHOL() != 0) {
-          setHJMMAOMEHOL(other.getHJMMAOMEHOL());
+        if (other.getAGIENJJKPBE() != 0) {
+          setAGIENJJKPBE(other.getAGIENJJKPBE());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1204,33 +1196,33 @@ public final class MapMarkPointOuterClass {
         return this;
       }
 
-      private int hJMMAOMEHOL_ ;
+      private int aGIENJJKPBE_ ;
       /**
-       * <code>uint32 HJMMAOMEHOL = 8;</code>
-       * @return The hJMMAOMEHOL.
+       * <code>uint32 AGIENJJKPBE = 8;</code>
+       * @return The aGIENJJKPBE.
        */
       @java.lang.Override
-      public int getHJMMAOMEHOL() {
-        return hJMMAOMEHOL_;
+      public int getAGIENJJKPBE() {
+        return aGIENJJKPBE_;
       }
       /**
-       * <code>uint32 HJMMAOMEHOL = 8;</code>
-       * @param value The hJMMAOMEHOL to set.
+       * <code>uint32 AGIENJJKPBE = 8;</code>
+       * @param value The aGIENJJKPBE to set.
        * @return This builder for chaining.
        */
-      public Builder setHJMMAOMEHOL(int value) {
+      public Builder setAGIENJJKPBE(int value) {
         
-        hJMMAOMEHOL_ = value;
+        aGIENJJKPBE_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 HJMMAOMEHOL = 8;</code>
+       * <code>uint32 AGIENJJKPBE = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHJMMAOMEHOL() {
+      public Builder clearAGIENJJKPBE() {
         
-        hJMMAOMEHOL_ = 0;
+        aGIENJJKPBE_ = 0;
         onChanged();
         return this;
       }
@@ -1307,8 +1299,8 @@ public final class MapMarkPointOuterClass {
       "name\030\002 \001(\t\022\024\n\003pos\030\003 \001(\0132\007.Vector\022%\n\npoin" +
       "t_type\030\004 \001(\0162\021.MapMarkPointType\022\022\n\nmonst" +
       "er_id\030\005 \001(\r\022#\n\tfrom_type\030\006 \001(\0162\020.MapMark" +
-      "FromType\022\020\n\010quest_id\030\007 \001(\r\022\023\n\013HJMMAOMEHO" +
-      "L\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "FromType\022\020\n\010quest_id\030\007 \001(\r\022\023\n\013AGIENJJKPB" +
+      "E\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1323,7 +1315,7 @@ public final class MapMarkPointOuterClass {
     internal_static_MapMarkPoint_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MapMarkPoint_descriptor,
-        new java.lang.String[] { "SceneId", "Name", "Pos", "PointType", "MonsterId", "FromType", "QuestId", "HJMMAOMEHOL", });
+        new java.lang.String[] { "SceneId", "Name", "Pos", "PointType", "MonsterId", "FromType", "QuestId", "AGIENJJKPBE", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MapMarkPointTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MapMarkFromTypeOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointTypeOuterClass.java
index b7b4cd237..a837ef863 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkPointTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MapMarkPointTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: BPDPOCMBCLI
-   * </pre>
-   *
    * Protobuf enum {@code MapMarkPointType}
    */
   public enum MapMarkPointType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsInfoOuterClass.java
index 4f326f943..ab6eb4653 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsInfoOuterClass.java
@@ -47,10 +47,6 @@ public final class MapMarkTipsInfoOuterClass {
     int getPointIdList(int index);
   }
   /**
-   * <pre>
-   * Obf: FCABMPGKCEL
-   * </pre>
-   *
    * Protobuf type {@code MapMarkTipsInfo}
    */
   public static final class MapMarkTipsInfo extends
@@ -390,10 +386,6 @@ public final class MapMarkTipsInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FCABMPGKCEL
-     * </pre>
-     *
      * Protobuf type {@code MapMarkTipsInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsTypeOuterClass.java
index 7c12b71c7..808adc23a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MapMarkTipsTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MapMarkTipsTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: EEDDJAMKPAE
-   * </pre>
-   *
    * Protobuf enum {@code MapMarkTipsType}
    */
   public enum MapMarkTipsType
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 72d22f0e9..249cb11be 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MarkMapReqOuterClass.java
@@ -19,52 +19,47 @@ public final class MarkMapReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      * @return Whether the mark field is set.
      */
     boolean hasMark();
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      * @return The mark.
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark();
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder();
 
     /**
-     * <code>.MarkMapReq.Operation op = 3;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    int getOpValue();
-    /**
-     * <code>.MarkMapReq.Operation op = 3;</code>
-     * @return The op.
-     */
-    emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp();
-
-    /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      * @return Whether the old field is set.
      */
     boolean hasOld();
     /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      * @return The old.
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld();
     /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder();
+
+    /**
+     * <code>.MarkMapReq.Operation op = 15;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    int getOpValue();
+    /**
+     * <code>.MarkMapReq.Operation op = 15;</code>
+     * @return The op.
+     */
+    emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp();
   }
   /**
-   * <pre>
-   * CmdId: 1812
-   * Obf: OIHCCJMLEGJ
-   * </pre>
-   *
    * Protobuf type {@code MarkMapReq}
    */
   public static final class MarkMapReq extends
@@ -110,13 +105,20 @@ public final class MarkMapReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-              int rawValue = input.readEnum();
+            case 26: {
+              emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder subBuilder = null;
+              if (old_ != null) {
+                subBuilder = old_.toBuilder();
+              }
+              old_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(old_);
+                old_ = subBuilder.buildPartial();
+              }
 
-              op_ = rawValue;
               break;
             }
-            case 50: {
+            case 74: {
               emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder subBuilder = null;
               if (mark_ != null) {
                 subBuilder = mark_.toBuilder();
@@ -129,17 +131,10 @@ public final class MarkMapReqOuterClass {
 
               break;
             }
-            case 122: {
-              emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder subBuilder = null;
-              if (old_ != null) {
-                subBuilder = old_.toBuilder();
-              }
-              old_ = input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(old_);
-                old_ = subBuilder.buildPartial();
-              }
+            case 120: {
+              int rawValue = input.readEnum();
 
+              op_ = rawValue;
               break;
             }
             default: {
@@ -175,10 +170,6 @@ public final class MarkMapReqOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: NIELEKBPCIJ
-     * </pre>
-     *
      * Protobuf enum {@code MarkMapReq.Operation}
      */
     public enum Operation
@@ -304,10 +295,10 @@ public final class MarkMapReqOuterClass {
       // @@protoc_insertion_point(enum_scope:MarkMapReq.Operation)
     }
 
-    public static final int MARK_FIELD_NUMBER = 6;
+    public static final int MARK_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint mark_;
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      * @return Whether the mark field is set.
      */
     @java.lang.Override
@@ -315,7 +306,7 @@ public final class MarkMapReqOuterClass {
       return mark_ != null;
     }
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      * @return The mark.
      */
     @java.lang.Override
@@ -323,36 +314,17 @@ public final class MarkMapReqOuterClass {
       return mark_ == null ? emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance() : mark_;
     }
     /**
-     * <code>.MapMarkPoint mark = 6;</code>
+     * <code>.MapMarkPoint mark = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder() {
       return getMark();
     }
 
-    public static final int OP_FIELD_NUMBER = 3;
-    private int op_;
-    /**
-     * <code>.MarkMapReq.Operation op = 3;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    @java.lang.Override public int getOpValue() {
-      return op_;
-    }
-    /**
-     * <code>.MarkMapReq.Operation op = 3;</code>
-     * @return The op.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation result = emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.valueOf(op_);
-      return result == null ? emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.UNRECOGNIZED : result;
-    }
-
-    public static final int OLD_FIELD_NUMBER = 15;
+    public static final int OLD_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint old_;
     /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      * @return Whether the old field is set.
      */
     @java.lang.Override
@@ -360,7 +332,7 @@ public final class MarkMapReqOuterClass {
       return old_ != null;
     }
     /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      * @return The old.
      */
     @java.lang.Override
@@ -368,13 +340,32 @@ public final class MarkMapReqOuterClass {
       return old_ == null ? emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance() : old_;
     }
     /**
-     * <code>.MapMarkPoint old = 15;</code>
+     * <code>.MapMarkPoint old = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder() {
       return getOld();
     }
 
+    public static final int OP_FIELD_NUMBER = 15;
+    private int op_;
+    /**
+     * <code>.MarkMapReq.Operation op = 15;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    @java.lang.Override public int getOpValue() {
+      return op_;
+    }
+    /**
+     * <code>.MarkMapReq.Operation op = 15;</code>
+     * @return The op.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation result = emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.valueOf(op_);
+      return result == null ? emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -389,14 +380,14 @@ public final class MarkMapReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
-        output.writeEnum(3, op_);
+      if (old_ != null) {
+        output.writeMessage(3, getOld());
       }
       if (mark_ != null) {
-        output.writeMessage(6, getMark());
+        output.writeMessage(9, getMark());
       }
-      if (old_ != null) {
-        output.writeMessage(15, getOld());
+      if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
+        output.writeEnum(15, op_);
       }
       unknownFields.writeTo(output);
     }
@@ -407,17 +398,17 @@ public final class MarkMapReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
+      if (old_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, op_);
+          .computeMessageSize(3, getOld());
       }
       if (mark_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getMark());
+          .computeMessageSize(9, getMark());
       }
-      if (old_ != null) {
+      if (op_ != emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.OPERATION_ADD.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getOld());
+          .computeEnumSize(15, op_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -439,12 +430,12 @@ public final class MarkMapReqOuterClass {
         if (!getMark()
             .equals(other.getMark())) return false;
       }
-      if (op_ != other.op_) return false;
       if (hasOld() != other.hasOld()) return false;
       if (hasOld()) {
         if (!getOld()
             .equals(other.getOld())) return false;
       }
+      if (op_ != other.op_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -460,12 +451,12 @@ public final class MarkMapReqOuterClass {
         hash = (37 * hash) + MARK_FIELD_NUMBER;
         hash = (53 * hash) + getMark().hashCode();
       }
-      hash = (37 * hash) + OP_FIELD_NUMBER;
-      hash = (53 * hash) + op_;
       if (hasOld()) {
         hash = (37 * hash) + OLD_FIELD_NUMBER;
         hash = (53 * hash) + getOld().hashCode();
       }
+      hash = (37 * hash) + OP_FIELD_NUMBER;
+      hash = (53 * hash) + op_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -562,11 +553,6 @@ public final class MarkMapReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1812
-     * Obf: OIHCCJMLEGJ
-     * </pre>
-     *
      * Protobuf type {@code MarkMapReq}
      */
     public static final class Builder extends
@@ -610,14 +596,14 @@ public final class MarkMapReqOuterClass {
           mark_ = null;
           markBuilder_ = null;
         }
-        op_ = 0;
-
         if (oldBuilder_ == null) {
           old_ = null;
         } else {
           old_ = null;
           oldBuilder_ = null;
         }
+        op_ = 0;
+
         return this;
       }
 
@@ -649,12 +635,12 @@ public final class MarkMapReqOuterClass {
         } else {
           result.mark_ = markBuilder_.build();
         }
-        result.op_ = op_;
         if (oldBuilder_ == null) {
           result.old_ = old_;
         } else {
           result.old_ = oldBuilder_.build();
         }
+        result.op_ = op_;
         onBuilt();
         return result;
       }
@@ -706,12 +692,12 @@ public final class MarkMapReqOuterClass {
         if (other.hasMark()) {
           mergeMark(other.getMark());
         }
-        if (other.op_ != 0) {
-          setOpValue(other.getOpValue());
-        }
         if (other.hasOld()) {
           mergeOld(other.getOld());
         }
+        if (other.op_ != 0) {
+          setOpValue(other.getOpValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -745,14 +731,14 @@ public final class MarkMapReqOuterClass {
       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 = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        * @return Whether the mark field is set.
        */
       public boolean hasMark() {
         return markBuilder_ != null || mark_ != null;
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        * @return The mark.
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMark() {
@@ -763,7 +749,7 @@ public final class MarkMapReqOuterClass {
         }
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public Builder setMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markBuilder_ == null) {
@@ -779,7 +765,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public Builder setMark(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -793,7 +779,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public Builder mergeMark(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markBuilder_ == null) {
@@ -811,7 +797,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public Builder clearMark() {
         if (markBuilder_ == null) {
@@ -825,7 +811,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkBuilder() {
         
@@ -833,7 +819,7 @@ public final class MarkMapReqOuterClass {
         return getMarkFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkOrBuilder() {
         if (markBuilder_ != null) {
@@ -844,7 +830,7 @@ public final class MarkMapReqOuterClass {
         }
       }
       /**
-       * <code>.MapMarkPoint mark = 6;</code>
+       * <code>.MapMarkPoint mark = 9;</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> 
@@ -860,72 +846,18 @@ public final class MarkMapReqOuterClass {
         return markBuilder_;
       }
 
-      private int op_ = 0;
-      /**
-       * <code>.MarkMapReq.Operation op = 3;</code>
-       * @return The enum numeric value on the wire for op.
-       */
-      @java.lang.Override public int getOpValue() {
-        return op_;
-      }
-      /**
-       * <code>.MarkMapReq.Operation 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;
-      }
-      /**
-       * <code>.MarkMapReq.Operation op = 3;</code>
-       * @return The op.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation result = emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.valueOf(op_);
-        return result == null ? emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.MarkMapReq.Operation op = 3;</code>
-       * @param value The op to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOp(emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        op_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.MarkMapReq.Operation op = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOp() {
-        
-        op_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint old_;
       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 = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        * @return Whether the old field is set.
        */
       public boolean hasOld() {
         return oldBuilder_ != null || old_ != null;
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        * @return The old.
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getOld() {
@@ -936,7 +868,7 @@ public final class MarkMapReqOuterClass {
         }
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public Builder setOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (oldBuilder_ == null) {
@@ -952,7 +884,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public Builder setOld(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -966,7 +898,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public Builder mergeOld(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (oldBuilder_ == null) {
@@ -984,7 +916,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public Builder clearOld() {
         if (oldBuilder_ == null) {
@@ -998,7 +930,7 @@ public final class MarkMapReqOuterClass {
         return this;
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getOldBuilder() {
         
@@ -1006,7 +938,7 @@ public final class MarkMapReqOuterClass {
         return getOldFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getOldOrBuilder() {
         if (oldBuilder_ != null) {
@@ -1017,7 +949,7 @@ public final class MarkMapReqOuterClass {
         }
       }
       /**
-       * <code>.MapMarkPoint old = 15;</code>
+       * <code>.MapMarkPoint old = 3;</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> 
@@ -1032,6 +964,60 @@ public final class MarkMapReqOuterClass {
         }
         return oldBuilder_;
       }
+
+      private int op_ = 0;
+      /**
+       * <code>.MarkMapReq.Operation op = 15;</code>
+       * @return The enum numeric value on the wire for op.
+       */
+      @java.lang.Override public int getOpValue() {
+        return op_;
+      }
+      /**
+       * <code>.MarkMapReq.Operation op = 15;</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>.MarkMapReq.Operation op = 15;</code>
+       * @return The op.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation getOp() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation result = emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.valueOf(op_);
+        return result == null ? emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.MarkMapReq.Operation op = 15;</code>
+       * @param value The op to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOp(emu.grasscutter.net.proto.MarkMapReqOuterClass.MarkMapReq.Operation value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        op_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.MarkMapReq.Operation op = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOp() {
+        
+        op_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1099,26 +1085,29 @@ public final class MarkMapReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020MarkMapReq.proto\032\022MapMarkPoint.proto\"\301" +
-      "\001\n\nMarkMapReq\022\033\n\004mark\030\006 \001(\0132\r.MapMarkPoi" +
-      "nt\022!\n\002op\030\003 \001(\0162\025.MarkMapReq.Operation\022\032\n" +
-      "\003old\030\017 \001(\0132\r.MapMarkPoint\"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" +
-      "u.grasscutter.net.protob\006proto3"
+      "\n\020MarkMapReq.proto\032\022MapMarkPoint.proto\032\017" +
+      "Operation.proto\"\301\001\n\nMarkMapReq\022\033\n\004mark\030\t" +
+      " \001(\0132\r.MapMarkPoint\022\032\n\003old\030\003 \001(\0132\r.MapMa" +
+      "rkPoint\022!\n\002op\030\017 \001(\0162\025.MarkMapReq.Operati" +
+      "on\"W\n\tOperation\022\021\n\rOPERATION_ADD\020\000\022\021\n\rOP" +
+      "ERATION_MOD\020\001\022\021\n\rOPERATION_DEL\020\002\022\021\n\rOPER" +
+      "ATION_GET\020\003B\033\n\031emu.grasscutter.net.proto" +
+      "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.OperationOuterClass.getDescriptor(),
         });
     internal_static_MarkMapReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_MarkMapReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MarkMapReq_descriptor,
-        new java.lang.String[] { "Mark", "Op", "Old", });
+        new java.lang.String[] { "Mark", "Old", "Op", });
     emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.OperationOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MarkMapRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MarkMapRspOuterClass.java
index cf47a1a3a..964c9e02b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MarkMapRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MarkMapRspOuterClass.java
@@ -19,41 +19,36 @@ public final class MarkMapRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> 
         getMarkListList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index);
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     int getMarkListCount();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
         getMarkListOrBuilderList();
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
         int index);
+
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 28945
-   * Obf: BKCHBPAFDAC
-   * </pre>
-   *
    * Protobuf type {@code MarkMapRsp}
    */
   public static final class MarkMapRsp extends
@@ -100,12 +95,7 @@ public final class MarkMapRspOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 98: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 markList_ = new java.util.ArrayList<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint>();
                 mutable_bitField0_ |= 0x00000001;
@@ -114,6 +104,11 @@ public final class MarkMapRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.parser(), extensionRegistry));
               break;
             }
+            case 96: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,28 +144,17 @@ public final class MarkMapRspOuterClass {
               emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp.class, emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int MARK_LIST_FIELD_NUMBER = 12;
+    public static final int MARK_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_;
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
@@ -178,21 +162,21 @@ public final class MarkMapRspOuterClass {
       return markList_;
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     @java.lang.Override
     public int getMarkListCount() {
       return markList_.size();
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
       return markList_.get(index);
     }
     /**
-     * <code>repeated .MapMarkPoint mark_list = 12;</code>
+     * <code>repeated .MapMarkPoint mark_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
@@ -200,6 +184,17 @@ public final class MarkMapRspOuterClass {
       return markList_.get(index);
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 12;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class MarkMapRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
-      }
       for (int i = 0; i < markList_.size(); i++) {
-        output.writeMessage(12, markList_.get(i));
+        output.writeMessage(11, markList_.get(i));
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class MarkMapRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
-      }
       for (int i = 0; i < markList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, markList_.get(i));
+          .computeMessageSize(11, markList_.get(i));
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class MarkMapRspOuterClass {
       }
       emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp other = (emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getMarkListList()
           .equals(other.getMarkListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class MarkMapRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getMarkListCount() > 0) {
         hash = (37 * hash) + MARK_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMarkListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class MarkMapRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28945
-     * Obf: BKCHBPAFDAC
-     * </pre>
-     *
      * Protobuf type {@code MarkMapRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class MarkMapRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         if (markListBuilder_ == null) {
           markList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           markListBuilder_.clear();
         }
+        retcode_ = 0;
+
         return this;
       }
 
@@ -447,7 +437,6 @@ public final class MarkMapRspOuterClass {
       public emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp buildPartial() {
         emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp result = new emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (markListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             markList_ = java.util.Collections.unmodifiableList(markList_);
@@ -457,6 +446,7 @@ public final class MarkMapRspOuterClass {
         } else {
           result.markList_ = markListBuilder_.build();
         }
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,9 +495,6 @@ public final class MarkMapRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp other) {
         if (other == emu.grasscutter.net.proto.MarkMapRspOuterClass.MarkMapRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (markListBuilder_ == null) {
           if (!other.markList_.isEmpty()) {
             if (markList_.isEmpty()) {
@@ -534,6 +521,9 @@ public final class MarkMapRspOuterClass {
             }
           }
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,37 +554,6 @@ public final class MarkMapRspOuterClass {
       }
       private int bitField0_;
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> markList_ =
         java.util.Collections.emptyList();
       private void ensureMarkListIsMutable() {
@@ -608,7 +567,7 @@ public final class MarkMapRspOuterClass {
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> markListBuilder_;
 
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> getMarkListList() {
         if (markListBuilder_ == null) {
@@ -618,7 +577,7 @@ public final class MarkMapRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public int getMarkListCount() {
         if (markListBuilder_ == null) {
@@ -628,7 +587,7 @@ public final class MarkMapRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint getMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -638,7 +597,7 @@ public final class MarkMapRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -655,7 +614,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder setMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -669,7 +628,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder addMarkList(emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
         if (markListBuilder_ == null) {
@@ -685,7 +644,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint value) {
@@ -702,7 +661,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder addMarkList(
           emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -716,7 +675,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder addMarkList(
           int index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder builderForValue) {
@@ -730,7 +689,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder addAllMarkList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint> values) {
@@ -745,7 +704,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder clearMarkList() {
         if (markListBuilder_ == null) {
@@ -758,7 +717,7 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public Builder removeMarkList(int index) {
         if (markListBuilder_ == null) {
@@ -771,14 +730,14 @@ public final class MarkMapRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder getMarkListBuilder(
           int index) {
         return getMarkListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder getMarkListOrBuilder(
           int index) {
@@ -788,7 +747,7 @@ public final class MarkMapRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPointOrBuilder> 
            getMarkListOrBuilderList() {
@@ -799,14 +758,14 @@ public final class MarkMapRspOuterClass {
         }
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder() {
         return getMarkListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder addMarkListBuilder(
           int index) {
@@ -814,7 +773,7 @@ public final class MarkMapRspOuterClass {
             index, emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.getDefaultInstance());
       }
       /**
-       * <code>repeated .MapMarkPoint mark_list = 12;</code>
+       * <code>repeated .MapMarkPoint mark_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.MapMarkPointOuterClass.MapMarkPoint.Builder> 
            getMarkListBuilderList() {
@@ -834,6 +793,37 @@ public final class MarkMapRspOuterClass {
         }
         return markListBuilder_;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 12;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 12;</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 = 12;</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) {
@@ -902,8 +892,8 @@ public final class MarkMapRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020MarkMapRsp.proto\032\022MapMarkPoint.proto\"?" +
-      "\n\nMarkMapRsp\022\017\n\007retcode\030\007 \001(\005\022 \n\tmark_li" +
-      "st\030\014 \003(\0132\r.MapMarkPointB\033\n\031emu.grasscutt" +
+      "\n\nMarkMapRsp\022 \n\tmark_list\030\013 \003(\0132\r.MapMar" +
+      "kPoint\022\017\n\007retcode\030\014 \001(\005B\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -916,7 +906,7 @@ public final class MarkMapRspOuterClass {
     internal_static_MarkMapRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MarkMapRsp_descriptor,
-        new java.lang.String[] { "Retcode", "MarkList", });
+        new java.lang.String[] { "MarkList", "Retcode", });
     emu.grasscutter.net.proto.MapMarkPointOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MassivePropParamOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MassivePropParamOuterClass.java
index 8148db135..d0592c999 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MassivePropParamOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MassivePropParamOuterClass.java
@@ -66,7 +66,7 @@ public final class MassivePropParamOuterClass {
   }
   /**
    * <pre>
-   * Obf: BDEEMMBPFDH
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code MassivePropParam}
@@ -504,7 +504,7 @@ public final class MassivePropParamOuterClass {
     }
     /**
      * <pre>
-     * Obf: BDEEMMBPFDH
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code MassivePropParam}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MassivePropSyncInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MassivePropSyncInfoOuterClass.java
index b89600532..f425a1311 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MassivePropSyncInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MassivePropSyncInfoOuterClass.java
@@ -50,7 +50,7 @@ public final class MassivePropSyncInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: HMEMJBACNJE
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code MassivePropSyncInfo}
@@ -370,7 +370,7 @@ public final class MassivePropSyncInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: HMEMJBACNJE
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code MassivePropSyncInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MatchTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MatchTypeOuterClass.java
index 35c0b5a90..923e9d3f2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MatchTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MatchTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MatchTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DAHBJFKJLHG
-   * </pre>
-   *
    * Protobuf enum {@code MatchType}
    */
   public enum MatchType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MaterialDeleteInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MaterialDeleteInfoOuterClass.java
index 0078aebd2..188b442bf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MaterialDeleteInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MaterialDeleteInfoOuterClass.java
@@ -19,10 +19,10 @@ public final class MaterialDeleteInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool has_delete_config = 1;</code>
-     * @return The hasDeleteConfig.
+     * <code>bool delete_time_num_map = 1;</code>
+     * @return The deleteTimeNumMap.
      */
-    boolean getHasDeleteConfig();
+    boolean getDeleteTimeNumMap();
 
     /**
      * <code>.MaterialDeleteInfo.CountDownDelete count_down_delete = 2;</code>
@@ -72,10 +72,6 @@ public final class MaterialDeleteInfoOuterClass {
     public emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo.DeleteInfoCase getDeleteInfoCase();
   }
   /**
-   * <pre>
-   * Obf: FNECFKCJNOG
-   * </pre>
-   *
    * Protobuf type {@code MaterialDeleteInfo}
    */
   public static final class MaterialDeleteInfo extends
@@ -122,7 +118,7 @@ public final class MaterialDeleteInfoOuterClass {
               break;
             case 8: {
 
-              hasDeleteConfig_ = input.readBool();
+              deleteTimeNumMap_ = input.readBool();
               break;
             }
             case 18: {
@@ -244,10 +240,6 @@ public final class MaterialDeleteInfoOuterClass {
       int getConfigCountDownTime();
     }
     /**
-     * <pre>
-     * Obf: OKEMONGEMOM
-     * </pre>
-     *
      * Protobuf type {@code MaterialDeleteInfo.CountDownDelete}
      */
     public static final class CountDownDelete extends
@@ -625,10 +617,6 @@ public final class MaterialDeleteInfoOuterClass {
         return builder;
       }
       /**
-       * <pre>
-       * Obf: OKEMONGEMOM
-       * </pre>
-       *
        * Protobuf type {@code MaterialDeleteInfo.CountDownDelete}
        */
       public static final class Builder extends
@@ -1026,10 +1014,6 @@ public final class MaterialDeleteInfoOuterClass {
       int getDeleteTime();
     }
     /**
-     * <pre>
-     * Obf: FBKLFJIOOPN
-     * </pre>
-     *
      * Protobuf type {@code MaterialDeleteInfo.DateTimeDelete}
      */
     public static final class DateTimeDelete extends
@@ -1278,10 +1262,6 @@ public final class MaterialDeleteInfoOuterClass {
         return builder;
       }
       /**
-       * <pre>
-       * Obf: FBKLFJIOOPN
-       * </pre>
-       *
        * Protobuf type {@code MaterialDeleteInfo.DateTimeDelete}
        */
       public static final class Builder extends
@@ -1562,10 +1542,6 @@ public final class MaterialDeleteInfoOuterClass {
       int getConfigCountDownTime();
     }
     /**
-     * <pre>
-     * Obf: HMLHBMKPHCA
-     * </pre>
-     *
      * Protobuf type {@code MaterialDeleteInfo.DelayWeekCountDownDelete}
      */
     public static final class DelayWeekCountDownDelete extends
@@ -1970,10 +1946,6 @@ public final class MaterialDeleteInfoOuterClass {
         return builder;
       }
       /**
-       * <pre>
-       * Obf: HMLHBMKPHCA
-       * </pre>
-       *
        * Protobuf type {@code MaterialDeleteInfo.DelayWeekCountDownDelete}
        */
       public static final class Builder extends
@@ -2440,15 +2412,15 @@ public final class MaterialDeleteInfoOuterClass {
           deleteInfoCase_);
     }
 
-    public static final int HAS_DELETE_CONFIG_FIELD_NUMBER = 1;
-    private boolean hasDeleteConfig_;
+    public static final int DELETE_TIME_NUM_MAP_FIELD_NUMBER = 1;
+    private boolean deleteTimeNumMap_;
     /**
-     * <code>bool has_delete_config = 1;</code>
-     * @return The hasDeleteConfig.
+     * <code>bool delete_time_num_map = 1;</code>
+     * @return The deleteTimeNumMap.
      */
     @java.lang.Override
-    public boolean getHasDeleteConfig() {
-      return hasDeleteConfig_;
+    public boolean getDeleteTimeNumMap() {
+      return deleteTimeNumMap_;
     }
 
     public static final int COUNT_DOWN_DELETE_FIELD_NUMBER = 2;
@@ -2558,8 +2530,8 @@ public final class MaterialDeleteInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (hasDeleteConfig_ != false) {
-        output.writeBool(1, hasDeleteConfig_);
+      if (deleteTimeNumMap_ != false) {
+        output.writeBool(1, deleteTimeNumMap_);
       }
       if (deleteInfoCase_ == 2) {
         output.writeMessage(2, (emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo.CountDownDelete) deleteInfo_);
@@ -2579,9 +2551,9 @@ public final class MaterialDeleteInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (hasDeleteConfig_ != false) {
+      if (deleteTimeNumMap_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, hasDeleteConfig_);
+          .computeBoolSize(1, deleteTimeNumMap_);
       }
       if (deleteInfoCase_ == 2) {
         size += com.google.protobuf.CodedOutputStream
@@ -2610,8 +2582,8 @@ public final class MaterialDeleteInfoOuterClass {
       }
       emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo other = (emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo) obj;
 
-      if (getHasDeleteConfig()
-          != other.getHasDeleteConfig()) return false;
+      if (getDeleteTimeNumMap()
+          != other.getDeleteTimeNumMap()) return false;
       if (!getDeleteInfoCase().equals(other.getDeleteInfoCase())) return false;
       switch (deleteInfoCase_) {
         case 2:
@@ -2640,9 +2612,9 @@ public final class MaterialDeleteInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + HAS_DELETE_CONFIG_FIELD_NUMBER;
+      hash = (37 * hash) + DELETE_TIME_NUM_MAP_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getHasDeleteConfig());
+          getDeleteTimeNumMap());
       switch (deleteInfoCase_) {
         case 2:
           hash = (37 * hash) + COUNT_DOWN_DELETE_FIELD_NUMBER;
@@ -2755,10 +2727,6 @@ public final class MaterialDeleteInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FNECFKCJNOG
-     * </pre>
-     *
      * Protobuf type {@code MaterialDeleteInfo}
      */
     public static final class Builder extends
@@ -2796,7 +2764,7 @@ public final class MaterialDeleteInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        hasDeleteConfig_ = false;
+        deleteTimeNumMap_ = false;
 
         deleteInfoCase_ = 0;
         deleteInfo_ = null;
@@ -2826,7 +2794,7 @@ public final class MaterialDeleteInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo buildPartial() {
         emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo result = new emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo(this);
-        result.hasDeleteConfig_ = hasDeleteConfig_;
+        result.deleteTimeNumMap_ = deleteTimeNumMap_;
         if (deleteInfoCase_ == 2) {
           if (countDownDeleteBuilder_ == null) {
             result.deleteInfo_ = deleteInfo_;
@@ -2897,8 +2865,8 @@ public final class MaterialDeleteInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo other) {
         if (other == emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfo.getDefaultInstance()) return this;
-        if (other.getHasDeleteConfig() != false) {
-          setHasDeleteConfig(other.getHasDeleteConfig());
+        if (other.getDeleteTimeNumMap() != false) {
+          setDeleteTimeNumMap(other.getDeleteTimeNumMap());
         }
         switch (other.getDeleteInfoCase()) {
           case COUNT_DOWN_DELETE: {
@@ -2961,33 +2929,33 @@ public final class MaterialDeleteInfoOuterClass {
       }
 
 
-      private boolean hasDeleteConfig_ ;
+      private boolean deleteTimeNumMap_ ;
       /**
-       * <code>bool has_delete_config = 1;</code>
-       * @return The hasDeleteConfig.
+       * <code>bool delete_time_num_map = 1;</code>
+       * @return The deleteTimeNumMap.
        */
       @java.lang.Override
-      public boolean getHasDeleteConfig() {
-        return hasDeleteConfig_;
+      public boolean getDeleteTimeNumMap() {
+        return deleteTimeNumMap_;
       }
       /**
-       * <code>bool has_delete_config = 1;</code>
-       * @param value The hasDeleteConfig to set.
+       * <code>bool delete_time_num_map = 1;</code>
+       * @param value The deleteTimeNumMap to set.
        * @return This builder for chaining.
        */
-      public Builder setHasDeleteConfig(boolean value) {
+      public Builder setDeleteTimeNumMap(boolean value) {
         
-        hasDeleteConfig_ = value;
+        deleteTimeNumMap_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool has_delete_config = 1;</code>
+       * <code>bool delete_time_num_map = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearHasDeleteConfig() {
+      public Builder clearDeleteTimeNumMap() {
         
-        hasDeleteConfig_ = false;
+        deleteTimeNumMap_ = false;
         onChanged();
         return this;
       }
@@ -3506,27 +3474,27 @@ public final class MaterialDeleteInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030MaterialDeleteInfo.proto\"\357\005\n\022MaterialD" +
-      "eleteInfo\022\031\n\021has_delete_config\030\001 \001(\010\022@\n\021" +
-      "count_down_delete\030\002 \001(\0132#.MaterialDelete" +
-      "Info.CountDownDeleteH\000\0229\n\013date_delete\030\003 " +
-      "\001(\0132\".MaterialDeleteInfo.DateTimeDeleteH" +
-      "\000\022T\n\034delay_week_count_down_delete\030\004 \001(\0132" +
-      ",.MaterialDeleteInfo.DelayWeekCountDownD" +
-      "eleteH\000\032\302\001\n\017CountDownDelete\022V\n\023delete_ti" +
-      "me_num_map\030\001 \003(\01329.MaterialDeleteInfo.Co" +
-      "untDownDelete.DeleteTimeNumMapEntry\022\036\n\026c" +
-      "onfig_count_down_time\030\002 \001(\r\0327\n\025DeleteTim" +
-      "eNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r" +
-      ":\0028\001\032%\n\016DateTimeDelete\022\023\n\013delete_time\030\001 " +
-      "\001(\r\032\357\001\n\030DelayWeekCountDownDelete\022_\n\023dele" +
-      "te_time_num_map\030\001 \003(\0132B.MaterialDeleteIn" +
-      "fo.DelayWeekCountDownDelete.DeleteTimeNu" +
-      "mMapEntry\022\031\n\021config_delay_week\030\002 \001(\r\022\036\n\026" +
-      "config_count_down_time\030\003 \001(\r\0327\n\025DeleteTi" +
-      "meNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(" +
-      "\r:\0028\001B\r\n\013delete_infoB\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "\n\030MaterialDeleteInfo.proto\"\361\005\n\022MaterialD" +
+      "eleteInfo\022\033\n\023delete_time_num_map\030\001 \001(\010\022@" +
+      "\n\021count_down_delete\030\002 \001(\0132#.MaterialDele" +
+      "teInfo.CountDownDeleteH\000\0229\n\013date_delete\030" +
+      "\003 \001(\0132\".MaterialDeleteInfo.DateTimeDelet" +
+      "eH\000\022T\n\034delay_week_count_down_delete\030\004 \001(" +
+      "\0132,.MaterialDeleteInfo.DelayWeekCountDow" +
+      "nDeleteH\000\032\302\001\n\017CountDownDelete\022V\n\023delete_" +
+      "time_num_map\030\001 \003(\01329.MaterialDeleteInfo." +
+      "CountDownDelete.DeleteTimeNumMapEntry\022\036\n" +
+      "\026config_count_down_time\030\002 \001(\r\0327\n\025DeleteT" +
+      "imeNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" +
+      "(\r:\0028\001\032%\n\016DateTimeDelete\022\023\n\013delete_time\030" +
+      "\001 \001(\r\032\357\001\n\030DelayWeekCountDownDelete\022_\n\023de" +
+      "lete_time_num_map\030\001 \003(\0132B.MaterialDelete" +
+      "Info.DelayWeekCountDownDelete.DeleteTime" +
+      "NumMapEntry\022\031\n\021config_delay_week\030\002 \001(\r\022\036" +
+      "\n\026config_count_down_time\030\003 \001(\r\0327\n\025Delete" +
+      "TimeNumMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 " +
+      "\001(\r:\0028\001B\r\n\013delete_infoB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3537,7 +3505,7 @@ public final class MaterialDeleteInfoOuterClass {
     internal_static_MaterialDeleteInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MaterialDeleteInfo_descriptor,
-        new java.lang.String[] { "HasDeleteConfig", "CountDownDelete", "DateDelete", "DelayWeekCountDownDelete", "DeleteInfo", });
+        new java.lang.String[] { "DeleteTimeNumMap", "CountDownDelete", "DateDelete", "DelayWeekCountDownDelete", "DeleteInfo", });
     internal_static_MaterialDeleteInfo_CountDownDelete_descriptor =
       internal_static_MaterialDeleteInfo_descriptor.getNestedTypes().get(0);
     internal_static_MaterialDeleteInfo_CountDownDelete_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MaterialOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MaterialOuterClass.java
index 5ca2e5e62..62b242c39 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MaterialOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MaterialOuterClass.java
@@ -40,10 +40,6 @@ public final class MaterialOuterClass {
     emu.grasscutter.net.proto.MaterialDeleteInfoOuterClass.MaterialDeleteInfoOrBuilder getDeleteInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: LCHIHMEJNML
-   * </pre>
-   *
    * Protobuf type {@code Material}
    */
   public static final class Material extends
@@ -347,10 +343,6 @@ public final class MaterialOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LCHIHMEJNML
-     * </pre>
-     *
      * Protobuf type {@code Material}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MathQuaternionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MathQuaternionOuterClass.java
index 83487eb8c..a8e139b16 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MathQuaternionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MathQuaternionOuterClass.java
@@ -43,10 +43,6 @@ public final class MathQuaternionOuterClass {
     float getW();
   }
   /**
-   * <pre>
-   * Obf: IPIFDKJKEEJ
-   * </pre>
-   *
    * Protobuf type {@code MathQuaternion}
    */
   public static final class MathQuaternion extends
@@ -384,10 +380,6 @@ public final class MathQuaternionOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IPIFDKJKEEJ
-     * </pre>
-     *
      * Protobuf type {@code MathQuaternion}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ModifierDurabilityOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ModifierDurabilityOuterClass.java
index 27a5291cb..de2800e41 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ModifierDurabilityOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ModifierDurabilityOuterClass.java
@@ -32,7 +32,7 @@ public final class ModifierDurabilityOuterClass {
   }
   /**
    * <pre>
-   * Obf: GCNLPIHMJOL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ModifierDurability}
@@ -315,7 +315,7 @@ public final class ModifierDurabilityOuterClass {
     }
     /**
      * <pre>
-     * Obf: GCNLPIHMJOL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ModifierDurability}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MonsterBornTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MonsterBornTypeOuterClass.java
index 022c45b88..d572a65ef 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MonsterBornTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MonsterBornTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MonsterBornTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: LNFJOAGMCEF
-   * </pre>
-   *
    * Protobuf enum {@code MonsterBornType}
    */
   public enum MonsterBornType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MonsterRouteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MonsterRouteOuterClass.java
index ffc04467e..5f628658c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MonsterRouteOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MonsterRouteOuterClass.java
@@ -59,12 +59,20 @@ public final class MonsterRouteOuterClass {
      * @return The arriveRange.
      */
     float getArriveRange();
+
+    /**
+     * <code>bool OFDFDKHNJGA = 5;</code>
+     * @return The oFDFDKHNJGA.
+     */
+    boolean getOFDFDKHNJGA();
+
+    /**
+     * <code>bool GPLDNOGEBDI = 6;</code>
+     * @return The gPLDNOGEBDI.
+     */
+    boolean getGPLDNOGEBDI();
   }
   /**
-   * <pre>
-   * Obf: OKAKLDGDFDP
-   * </pre>
-   *
    * Protobuf type {@code MonsterRoute}
    */
   public static final class MonsterRoute extends
@@ -135,6 +143,16 @@ public final class MonsterRouteOuterClass {
               arriveRange_ = input.readFloat();
               break;
             }
+            case 40: {
+
+              oFDFDKHNJGA_ = input.readBool();
+              break;
+            }
+            case 48: {
+
+              gPLDNOGEBDI_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -243,6 +261,28 @@ public final class MonsterRouteOuterClass {
       return arriveRange_;
     }
 
+    public static final int OFDFDKHNJGA_FIELD_NUMBER = 5;
+    private boolean oFDFDKHNJGA_;
+    /**
+     * <code>bool OFDFDKHNJGA = 5;</code>
+     * @return The oFDFDKHNJGA.
+     */
+    @java.lang.Override
+    public boolean getOFDFDKHNJGA() {
+      return oFDFDKHNJGA_;
+    }
+
+    public static final int GPLDNOGEBDI_FIELD_NUMBER = 6;
+    private boolean gPLDNOGEBDI_;
+    /**
+     * <code>bool GPLDNOGEBDI = 6;</code>
+     * @return The gPLDNOGEBDI.
+     */
+    @java.lang.Override
+    public boolean getGPLDNOGEBDI() {
+      return gPLDNOGEBDI_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -269,6 +309,12 @@ public final class MonsterRouteOuterClass {
       if (arriveRange_ != 0F) {
         output.writeFloat(4, arriveRange_);
       }
+      if (oFDFDKHNJGA_ != false) {
+        output.writeBool(5, oFDFDKHNJGA_);
+      }
+      if (gPLDNOGEBDI_ != false) {
+        output.writeBool(6, gPLDNOGEBDI_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -294,6 +340,14 @@ public final class MonsterRouteOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeFloatSize(4, arriveRange_);
       }
+      if (oFDFDKHNJGA_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, oFDFDKHNJGA_);
+      }
+      if (gPLDNOGEBDI_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(6, gPLDNOGEBDI_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -318,6 +372,10 @@ public final class MonsterRouteOuterClass {
       if (java.lang.Float.floatToIntBits(getArriveRange())
           != java.lang.Float.floatToIntBits(
               other.getArriveRange())) return false;
+      if (getOFDFDKHNJGA()
+          != other.getOFDFDKHNJGA()) return false;
+      if (getGPLDNOGEBDI()
+          != other.getGPLDNOGEBDI()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -340,6 +398,12 @@ public final class MonsterRouteOuterClass {
       hash = (37 * hash) + ARRIVE_RANGE_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getArriveRange());
+      hash = (37 * hash) + OFDFDKHNJGA_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOFDFDKHNJGA());
+      hash = (37 * hash) + GPLDNOGEBDI_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getGPLDNOGEBDI());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -436,10 +500,6 @@ public final class MonsterRouteOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OKAKLDGDFDP
-     * </pre>
-     *
      * Protobuf type {@code MonsterRoute}
      */
     public static final class Builder extends
@@ -490,6 +550,10 @@ public final class MonsterRouteOuterClass {
 
         arriveRange_ = 0F;
 
+        oFDFDKHNJGA_ = false;
+
+        gPLDNOGEBDI_ = false;
+
         return this;
       }
 
@@ -529,6 +593,8 @@ public final class MonsterRouteOuterClass {
         result.speedLevel_ = speedLevel_;
         result.routeType_ = routeType_;
         result.arriveRange_ = arriveRange_;
+        result.oFDFDKHNJGA_ = oFDFDKHNJGA_;
+        result.gPLDNOGEBDI_ = gPLDNOGEBDI_;
         onBuilt();
         return result;
       }
@@ -612,6 +678,12 @@ public final class MonsterRouteOuterClass {
         if (other.getArriveRange() != 0F) {
           setArriveRange(other.getArriveRange());
         }
+        if (other.getOFDFDKHNJGA() != false) {
+          setOFDFDKHNJGA(other.getOFDFDKHNJGA());
+        }
+        if (other.getGPLDNOGEBDI() != false) {
+          setGPLDNOGEBDI(other.getGPLDNOGEBDI());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -974,6 +1046,68 @@ public final class MonsterRouteOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean oFDFDKHNJGA_ ;
+      /**
+       * <code>bool OFDFDKHNJGA = 5;</code>
+       * @return The oFDFDKHNJGA.
+       */
+      @java.lang.Override
+      public boolean getOFDFDKHNJGA() {
+        return oFDFDKHNJGA_;
+      }
+      /**
+       * <code>bool OFDFDKHNJGA = 5;</code>
+       * @param value The oFDFDKHNJGA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOFDFDKHNJGA(boolean value) {
+        
+        oFDFDKHNJGA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool OFDFDKHNJGA = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOFDFDKHNJGA() {
+        
+        oFDFDKHNJGA_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean gPLDNOGEBDI_ ;
+      /**
+       * <code>bool GPLDNOGEBDI = 6;</code>
+       * @return The gPLDNOGEBDI.
+       */
+      @java.lang.Override
+      public boolean getGPLDNOGEBDI() {
+        return gPLDNOGEBDI_;
+      }
+      /**
+       * <code>bool GPLDNOGEBDI = 6;</code>
+       * @param value The gPLDNOGEBDI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGPLDNOGEBDI(boolean value) {
+        
+        gPLDNOGEBDI_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool GPLDNOGEBDI = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGPLDNOGEBDI() {
+        
+        gPLDNOGEBDI_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1041,11 +1175,12 @@ public final class MonsterRouteOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022MonsterRoute.proto\032\020RoutePoint.proto\"p" +
-      "\n\014MonsterRoute\022!\n\014route_points\030\001 \003(\0132\013.R" +
-      "outePoint\022\023\n\013speed_level\030\002 \001(\r\022\022\n\nroute_" +
-      "type\030\003 \001(\r\022\024\n\014arrive_range\030\004 \001(\002B\033\n\031emu." +
-      "grasscutter.net.protob\006proto3"
+      "\n\022MonsterRoute.proto\032\020RoutePoint.proto\"\232" +
+      "\001\n\014MonsterRoute\022!\n\014route_points\030\001 \003(\0132\013." +
+      "RoutePoint\022\023\n\013speed_level\030\002 \001(\r\022\022\n\nroute" +
+      "_type\030\003 \001(\r\022\024\n\014arrive_range\030\004 \001(\002\022\023\n\013OFD" +
+      "FDKHNJGA\030\005 \001(\010\022\023\n\013GPLDNOGEBDI\030\006 \001(\010B\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1057,7 +1192,7 @@ public final class MonsterRouteOuterClass {
     internal_static_MonsterRoute_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MonsterRoute_descriptor,
-        new java.lang.String[] { "RoutePoints", "SpeedLevel", "RouteType", "ArriveRange", });
+        new java.lang.String[] { "RoutePoints", "SpeedLevel", "RouteType", "ArriveRange", "OFDFDKHNJGA", "GPLDNOGEBDI", });
     emu.grasscutter.net.proto.RoutePointOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MotionInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MotionInfoOuterClass.java
index 3c841b8ff..248930a01 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MotionInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MotionInfoOuterClass.java
@@ -130,12 +130,20 @@ public final class MotionInfoOuterClass {
      * @return The intervalVelocity.
      */
     long getIntervalVelocity();
+
+    /**
+     * <code>uint32 BIMCAJGDDOI = 10;</code>
+     * @return The bIMCAJGDDOI.
+     */
+    int getBIMCAJGDDOI();
+
+    /**
+     * <code>uint32 HJCDICMBDKE = 11;</code>
+     * @return The hJCDICMBDKE.
+     */
+    int getHJCDICMBDKE();
   }
   /**
-   * <pre>
-   * Obf: LJEPKMPIOKJ
-   * </pre>
-   *
    * Protobuf type {@code MotionInfo}
    */
   public static final class MotionInfo extends
@@ -265,6 +273,16 @@ public final class MotionInfoOuterClass {
               intervalVelocity_ = input.readUInt64();
               break;
             }
+            case 80: {
+
+              bIMCAJGDDOI_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              hJCDICMBDKE_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -496,6 +514,28 @@ public final class MotionInfoOuterClass {
       return intervalVelocity_;
     }
 
+    public static final int BIMCAJGDDOI_FIELD_NUMBER = 10;
+    private int bIMCAJGDDOI_;
+    /**
+     * <code>uint32 BIMCAJGDDOI = 10;</code>
+     * @return The bIMCAJGDDOI.
+     */
+    @java.lang.Override
+    public int getBIMCAJGDDOI() {
+      return bIMCAJGDDOI_;
+    }
+
+    public static final int HJCDICMBDKE_FIELD_NUMBER = 11;
+    private int hJCDICMBDKE_;
+    /**
+     * <code>uint32 HJCDICMBDKE = 11;</code>
+     * @return The hJCDICMBDKE.
+     */
+    @java.lang.Override
+    public int getHJCDICMBDKE() {
+      return hJCDICMBDKE_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -537,6 +577,12 @@ public final class MotionInfoOuterClass {
       if (intervalVelocity_ != 0L) {
         output.writeUInt64(9, intervalVelocity_);
       }
+      if (bIMCAJGDDOI_ != 0) {
+        output.writeUInt32(10, bIMCAJGDDOI_);
+      }
+      if (hJCDICMBDKE_ != 0) {
+        output.writeUInt32(11, hJCDICMBDKE_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -582,6 +628,14 @@ public final class MotionInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(9, intervalVelocity_);
       }
+      if (bIMCAJGDDOI_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, bIMCAJGDDOI_);
+      }
+      if (hJCDICMBDKE_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, hJCDICMBDKE_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -626,6 +680,10 @@ public final class MotionInfoOuterClass {
           != other.getSceneTime()) return false;
       if (getIntervalVelocity()
           != other.getIntervalVelocity()) return false;
+      if (getBIMCAJGDDOI()
+          != other.getBIMCAJGDDOI()) return false;
+      if (getHJCDICMBDKE()
+          != other.getHJCDICMBDKE()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -666,6 +724,10 @@ public final class MotionInfoOuterClass {
       hash = (37 * hash) + INTERVAL_VELOCITY_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getIntervalVelocity());
+      hash = (37 * hash) + BIMCAJGDDOI_FIELD_NUMBER;
+      hash = (53 * hash) + getBIMCAJGDDOI();
+      hash = (37 * hash) + HJCDICMBDKE_FIELD_NUMBER;
+      hash = (53 * hash) + getHJCDICMBDKE();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -762,10 +824,6 @@ public final class MotionInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LJEPKMPIOKJ
-     * </pre>
-     *
      * Protobuf type {@code MotionInfo}
      */
     public static final class Builder extends
@@ -842,6 +900,10 @@ public final class MotionInfoOuterClass {
 
         intervalVelocity_ = 0L;
 
+        bIMCAJGDDOI_ = 0;
+
+        hJCDICMBDKE_ = 0;
+
         return this;
       }
 
@@ -902,6 +964,8 @@ public final class MotionInfoOuterClass {
         result.refId_ = refId_;
         result.sceneTime_ = sceneTime_;
         result.intervalVelocity_ = intervalVelocity_;
+        result.bIMCAJGDDOI_ = bIMCAJGDDOI_;
+        result.hJCDICMBDKE_ = hJCDICMBDKE_;
         onBuilt();
         return result;
       }
@@ -1000,6 +1064,12 @@ public final class MotionInfoOuterClass {
         if (other.getIntervalVelocity() != 0L) {
           setIntervalVelocity(other.getIntervalVelocity());
         }
+        if (other.getBIMCAJGDDOI() != 0) {
+          setBIMCAJGDDOI(other.getBIMCAJGDDOI());
+        }
+        if (other.getHJCDICMBDKE() != 0) {
+          setHJCDICMBDKE(other.getHJCDICMBDKE());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1892,6 +1962,68 @@ public final class MotionInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int bIMCAJGDDOI_ ;
+      /**
+       * <code>uint32 BIMCAJGDDOI = 10;</code>
+       * @return The bIMCAJGDDOI.
+       */
+      @java.lang.Override
+      public int getBIMCAJGDDOI() {
+        return bIMCAJGDDOI_;
+      }
+      /**
+       * <code>uint32 BIMCAJGDDOI = 10;</code>
+       * @param value The bIMCAJGDDOI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBIMCAJGDDOI(int value) {
+        
+        bIMCAJGDDOI_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 BIMCAJGDDOI = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBIMCAJGDDOI() {
+        
+        bIMCAJGDDOI_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int hJCDICMBDKE_ ;
+      /**
+       * <code>uint32 HJCDICMBDKE = 11;</code>
+       * @return The hJCDICMBDKE.
+       */
+      @java.lang.Override
+      public int getHJCDICMBDKE() {
+        return hJCDICMBDKE_;
+      }
+      /**
+       * <code>uint32 HJCDICMBDKE = 11;</code>
+       * @param value The hJCDICMBDKE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHJCDICMBDKE(int value) {
+        
+        hJCDICMBDKE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 HJCDICMBDKE = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHJCDICMBDKE() {
+        
+        hJCDICMBDKE_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1960,13 +2092,14 @@ public final class MotionInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020MotionInfo.proto\032\014Vector.proto\032\021Motion" +
-      "State.proto\"\337\001\n\nMotionInfo\022\024\n\003pos\030\001 \001(\0132" +
+      "State.proto\"\211\002\n\nMotionInfo\022\024\n\003pos\030\001 \001(\0132" +
       "\007.Vector\022\024\n\003rot\030\002 \001(\0132\007.Vector\022\026\n\005speed\030" +
       "\003 \001(\0132\007.Vector\022\033\n\005state\030\004 \001(\0162\014.MotionSt" +
       "ate\022\027\n\006params\030\005 \003(\0132\007.Vector\022\030\n\007ref_pos\030" +
       "\006 \001(\0132\007.Vector\022\016\n\006ref_id\030\007 \001(\r\022\022\n\nscene_" +
-      "time\030\010 \001(\r\022\031\n\021interval_velocity\030\t \001(\004B\033\n" +
-      "\031emu.grasscutter.net.protob\006proto3"
+      "time\030\010 \001(\r\022\031\n\021interval_velocity\030\t \001(\004\022\023\n" +
+      "\013BIMCAJGDDOI\030\n \001(\r\022\023\n\013HJCDICMBDKE\030\013 \001(\rB" +
+      "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1979,7 +2112,7 @@ public final class MotionInfoOuterClass {
     internal_static_MotionInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MotionInfo_descriptor,
-        new java.lang.String[] { "Pos", "Rot", "Speed", "State", "Params", "RefPos", "RefId", "SceneTime", "IntervalVelocity", });
+        new java.lang.String[] { "Pos", "Rot", "Speed", "State", "Params", "RefPos", "RefId", "SceneTime", "IntervalVelocity", "BIMCAJGDDOI", "HJCDICMBDKE", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MotionStateOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MotionStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MotionStateOuterClass.java
index 9276ddf48..5f4eb563f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MotionStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MotionStateOuterClass.java
@@ -16,7 +16,7 @@ public final class MotionStateOuterClass {
   }
   /**
    * <pre>
-   * Obf: KGHLDGDMFOB
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code MotionState}
@@ -292,9 +292,173 @@ public final class MotionStateOuterClass {
      */
     MOTION_STATE_DIVE_SWIM_DASH(66),
     /**
-     * <code>MOTION_STATE_NUM = 67;</code>
+     * <code>MOTION_STATE_ARC_LIGHT = 67;</code>
      */
-    MOTION_STATE_NUM(67),
+    MOTION_STATE_ARC_LIGHT(67),
+    /**
+     * <code>MOTION_STATE_ARC_LIGHT_SAFE = 68;</code>
+     */
+    MOTION_STATE_ARC_LIGHT_SAFE(68),
+    /**
+     * <code>MOTION_STATE_VEHICLE_STANDBY = 69;</code>
+     */
+    MOTION_STATE_VEHICLE_STANDBY(69),
+    /**
+     * <code>MOTION_STATE_VEHICLE_RUN = 70;</code>
+     */
+    MOTION_STATE_VEHICLE_RUN(70),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DASH = 71;</code>
+     */
+    MOTION_STATE_VEHICLE_DASH(71),
+    /**
+     * <code>MOTION_STATE_VEHICLE_CLIMB = 72;</code>
+     */
+    MOTION_STATE_VEHICLE_CLIMB(72),
+    /**
+     * <code>MOTION_STATE_VEHICLE_CLIMB_JUMP = 73;</code>
+     */
+    MOTION_STATE_VEHICLE_CLIMB_JUMP(73),
+    /**
+     * <code>MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB = 74;</code>
+     */
+    MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB(74),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FIGHT = 75;</code>
+     */
+    MOTION_STATE_VEHICLE_FIGHT(75),
+    /**
+     * <code>MOTION_STATE_VEHICLE_JUMP = 76;</code>
+     */
+    MOTION_STATE_VEHICLE_JUMP(76),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DROP = 77;</code>
+     */
+    MOTION_STATE_VEHICLE_DROP(77),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY = 78;</code>
+     */
+    MOTION_STATE_VEHICLE_FLY(78),
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_MOVE = 79;</code>
+     */
+    MOTION_STATE_VEHICLE_SWIM_MOVE(79),
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_IDLE = 80;</code>
+     */
+    MOTION_STATE_VEHICLE_SWIM_IDLE(80),
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_DASH = 81;</code>
+     */
+    MOTION_STATE_VEHICLE_SWIM_DASH(81),
+    /**
+     * <code>MOTION_STATE_VEHICLE_SLIP = 82;</code>
+     */
+    MOTION_STATE_VEHICLE_SLIP(82),
+    /**
+     * <code>MOTION_STATE_VEHICLE_GO_UPSTAIRS = 83;</code>
+     */
+    MOTION_STATE_VEHICLE_GO_UPSTAIRS(83),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FALL_ON_GROUND = 84;</code>
+     */
+    MOTION_STATE_VEHICLE_FALL_ON_GROUND(84),
+    /**
+     * <code>MOTION_STATE_VEHICLE_JUMP_OFF_WALL = 85;</code>
+     */
+    MOTION_STATE_VEHICLE_JUMP_OFF_WALL(85),
+    /**
+     * <code>MOTION_STATE_VEHICLE_POWERED_FLY = 86;</code>
+     */
+    MOTION_STATE_VEHICLE_POWERED_FLY(86),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_STANDBY = 87;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_STANDBY(87),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_RUN = 88;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_RUN(88),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_DASH = 89;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_DASH(89),
+    /**
+     * <code>MOTION_STATE_VEHICLE_NOTIFY = 90;</code>
+     */
+    MOTION_STATE_VEHICLE_NOTIFY(90),
+    /**
+     * <code>MOTION_STATE_VEHICLE_LAND_SPEED = 91;</code>
+     */
+    MOTION_STATE_VEHICLE_LAND_SPEED(91),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE = 92;</code>
+     */
+    MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE(92),
+    /**
+     * <code>MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG = 93;</code>
+     */
+    MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG(93),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FOLLOW_ROUTE = 94;</code>
+     */
+    MOTION_STATE_VEHICLE_FOLLOW_ROUTE(94),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_IDLE = 95;</code>
+     */
+    MOTION_STATE_VEHICLE_FLY_IDLE(95),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_SLOW = 96;</code>
+     */
+    MOTION_STATE_VEHICLE_FLY_SLOW(96),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_FAST = 97;</code>
+     */
+    MOTION_STATE_VEHICLE_FLY_FAST(97),
+    /**
+     * <code>MOTION_STATE_VEHICLE_AIR_COMPENSATION = 98;</code>
+     */
+    MOTION_STATE_VEHICLE_AIR_COMPENSATION(98),
+    /**
+     * <code>MOTION_STATE_VEHICLE_ARC_LIGHT = 99;</code>
+     */
+    MOTION_STATE_VEHICLE_ARC_LIGHT(99),
+    /**
+     * <code>MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE = 100;</code>
+     */
+    MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE(100),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE = 101;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE(101),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE = 102;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE(102),
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_DASH = 103;</code>
+     */
+    MOTION_STATE_VEHICLE_DANGER_SWIM_DASH(103),
+    /**
+     * <code>MOTION_STATE_FOLLOW_CURVE_ROUTE = 104;</code>
+     */
+    MOTION_STATE_FOLLOW_CURVE_ROUTE(104),
+    /**
+     * <code>MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE = 105;</code>
+     */
+    MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE(105),
+    /**
+     * <code>MOTION_STATE_NATSAURUS_NORMAL = 106;</code>
+     */
+    MOTION_STATE_NATSAURUS_NORMAL(106),
+    /**
+     * <code>MOTION_STATE_NATSAURUS_ENTERING = 107;</code>
+     */
+    MOTION_STATE_NATSAURUS_ENTERING(107),
+    /**
+     * <code>MOTION_STATE_NUM = 108;</code>
+     */
+    MOTION_STATE_NUM(108),
     UNRECOGNIZED(-1),
     ;
 
@@ -567,9 +731,173 @@ public final class MotionStateOuterClass {
      */
     public static final int MOTION_STATE_DIVE_SWIM_DASH_VALUE = 66;
     /**
-     * <code>MOTION_STATE_NUM = 67;</code>
+     * <code>MOTION_STATE_ARC_LIGHT = 67;</code>
      */
-    public static final int MOTION_STATE_NUM_VALUE = 67;
+    public static final int MOTION_STATE_ARC_LIGHT_VALUE = 67;
+    /**
+     * <code>MOTION_STATE_ARC_LIGHT_SAFE = 68;</code>
+     */
+    public static final int MOTION_STATE_ARC_LIGHT_SAFE_VALUE = 68;
+    /**
+     * <code>MOTION_STATE_VEHICLE_STANDBY = 69;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_STANDBY_VALUE = 69;
+    /**
+     * <code>MOTION_STATE_VEHICLE_RUN = 70;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_RUN_VALUE = 70;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DASH = 71;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DASH_VALUE = 71;
+    /**
+     * <code>MOTION_STATE_VEHICLE_CLIMB = 72;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_CLIMB_VALUE = 72;
+    /**
+     * <code>MOTION_STATE_VEHICLE_CLIMB_JUMP = 73;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_CLIMB_JUMP_VALUE = 73;
+    /**
+     * <code>MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB = 74;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB_VALUE = 74;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FIGHT = 75;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FIGHT_VALUE = 75;
+    /**
+     * <code>MOTION_STATE_VEHICLE_JUMP = 76;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_JUMP_VALUE = 76;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DROP = 77;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DROP_VALUE = 77;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY = 78;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FLY_VALUE = 78;
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_MOVE = 79;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_SWIM_MOVE_VALUE = 79;
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_IDLE = 80;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_SWIM_IDLE_VALUE = 80;
+    /**
+     * <code>MOTION_STATE_VEHICLE_SWIM_DASH = 81;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_SWIM_DASH_VALUE = 81;
+    /**
+     * <code>MOTION_STATE_VEHICLE_SLIP = 82;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_SLIP_VALUE = 82;
+    /**
+     * <code>MOTION_STATE_VEHICLE_GO_UPSTAIRS = 83;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_GO_UPSTAIRS_VALUE = 83;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FALL_ON_GROUND = 84;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FALL_ON_GROUND_VALUE = 84;
+    /**
+     * <code>MOTION_STATE_VEHICLE_JUMP_OFF_WALL = 85;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_JUMP_OFF_WALL_VALUE = 85;
+    /**
+     * <code>MOTION_STATE_VEHICLE_POWERED_FLY = 86;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_POWERED_FLY_VALUE = 86;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_STANDBY = 87;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_STANDBY_VALUE = 87;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_RUN = 88;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_RUN_VALUE = 88;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_DASH = 89;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_DASH_VALUE = 89;
+    /**
+     * <code>MOTION_STATE_VEHICLE_NOTIFY = 90;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_NOTIFY_VALUE = 90;
+    /**
+     * <code>MOTION_STATE_VEHICLE_LAND_SPEED = 91;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_LAND_SPEED_VALUE = 91;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE = 92;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE_VALUE = 92;
+    /**
+     * <code>MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG = 93;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG_VALUE = 93;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FOLLOW_ROUTE = 94;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FOLLOW_ROUTE_VALUE = 94;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_IDLE = 95;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FLY_IDLE_VALUE = 95;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_SLOW = 96;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FLY_SLOW_VALUE = 96;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FLY_FAST = 97;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FLY_FAST_VALUE = 97;
+    /**
+     * <code>MOTION_STATE_VEHICLE_AIR_COMPENSATION = 98;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_AIR_COMPENSATION_VALUE = 98;
+    /**
+     * <code>MOTION_STATE_VEHICLE_ARC_LIGHT = 99;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_ARC_LIGHT_VALUE = 99;
+    /**
+     * <code>MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE = 100;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE_VALUE = 100;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE = 101;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE_VALUE = 101;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE = 102;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE_VALUE = 102;
+    /**
+     * <code>MOTION_STATE_VEHICLE_DANGER_SWIM_DASH = 103;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_DANGER_SWIM_DASH_VALUE = 103;
+    /**
+     * <code>MOTION_STATE_FOLLOW_CURVE_ROUTE = 104;</code>
+     */
+    public static final int MOTION_STATE_FOLLOW_CURVE_ROUTE_VALUE = 104;
+    /**
+     * <code>MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE = 105;</code>
+     */
+    public static final int MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE_VALUE = 105;
+    /**
+     * <code>MOTION_STATE_NATSAURUS_NORMAL = 106;</code>
+     */
+    public static final int MOTION_STATE_NATSAURUS_NORMAL_VALUE = 106;
+    /**
+     * <code>MOTION_STATE_NATSAURUS_ENTERING = 107;</code>
+     */
+    public static final int MOTION_STATE_NATSAURUS_ENTERING_VALUE = 107;
+    /**
+     * <code>MOTION_STATE_NUM = 108;</code>
+     */
+    public static final int MOTION_STATE_NUM_VALUE = 108;
 
 
     public final int getNumber() {
@@ -663,7 +991,48 @@ public final class MotionStateOuterClass {
         case 64: return MOTION_STATE_DIVE_SWIM_MOVE;
         case 65: return MOTION_STATE_DIVE_SWIM_IDLE;
         case 66: return MOTION_STATE_DIVE_SWIM_DASH;
-        case 67: return MOTION_STATE_NUM;
+        case 67: return MOTION_STATE_ARC_LIGHT;
+        case 68: return MOTION_STATE_ARC_LIGHT_SAFE;
+        case 69: return MOTION_STATE_VEHICLE_STANDBY;
+        case 70: return MOTION_STATE_VEHICLE_RUN;
+        case 71: return MOTION_STATE_VEHICLE_DASH;
+        case 72: return MOTION_STATE_VEHICLE_CLIMB;
+        case 73: return MOTION_STATE_VEHICLE_CLIMB_JUMP;
+        case 74: return MOTION_STATE_VEHICLE_STANDBY_TO_CLIMB;
+        case 75: return MOTION_STATE_VEHICLE_FIGHT;
+        case 76: return MOTION_STATE_VEHICLE_JUMP;
+        case 77: return MOTION_STATE_VEHICLE_DROP;
+        case 78: return MOTION_STATE_VEHICLE_FLY;
+        case 79: return MOTION_STATE_VEHICLE_SWIM_MOVE;
+        case 80: return MOTION_STATE_VEHICLE_SWIM_IDLE;
+        case 81: return MOTION_STATE_VEHICLE_SWIM_DASH;
+        case 82: return MOTION_STATE_VEHICLE_SLIP;
+        case 83: return MOTION_STATE_VEHICLE_GO_UPSTAIRS;
+        case 84: return MOTION_STATE_VEHICLE_FALL_ON_GROUND;
+        case 85: return MOTION_STATE_VEHICLE_JUMP_OFF_WALL;
+        case 86: return MOTION_STATE_VEHICLE_POWERED_FLY;
+        case 87: return MOTION_STATE_VEHICLE_DANGER_STANDBY;
+        case 88: return MOTION_STATE_VEHICLE_DANGER_RUN;
+        case 89: return MOTION_STATE_VEHICLE_DANGER_DASH;
+        case 90: return MOTION_STATE_VEHICLE_NOTIFY;
+        case 91: return MOTION_STATE_VEHICLE_LAND_SPEED;
+        case 92: return MOTION_STATE_VEHICLE_DASH_BEFORE_SHAKE;
+        case 93: return MOTION_STATE_VEHICLE_QUEST_FORCE_DRAG;
+        case 94: return MOTION_STATE_VEHICLE_FOLLOW_ROUTE;
+        case 95: return MOTION_STATE_VEHICLE_FLY_IDLE;
+        case 96: return MOTION_STATE_VEHICLE_FLY_SLOW;
+        case 97: return MOTION_STATE_VEHICLE_FLY_FAST;
+        case 98: return MOTION_STATE_VEHICLE_AIR_COMPENSATION;
+        case 99: return MOTION_STATE_VEHICLE_ARC_LIGHT;
+        case 100: return MOTION_STATE_VEHICLE_ARC_LIGHT_SAFE;
+        case 101: return MOTION_STATE_VEHICLE_DANGER_SWIM_MOVE;
+        case 102: return MOTION_STATE_VEHICLE_DANGER_SWIM_IDLE;
+        case 103: return MOTION_STATE_VEHICLE_DANGER_SWIM_DASH;
+        case 104: return MOTION_STATE_FOLLOW_CURVE_ROUTE;
+        case 105: return MOTION_STATE_VEHICLE_FOLLOW_CURVE_ROUTE;
+        case 106: return MOTION_STATE_NATSAURUS_NORMAL;
+        case 107: return MOTION_STATE_NATSAURUS_ENTERING;
+        case 108: return MOTION_STATE_NUM;
         default: return null;
       }
     }
@@ -729,7 +1098,7 @@ public final class MotionStateOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021MotionState.proto*\344\017\n\013MotionState\022\025\n\021M" +
+      "\n\021MotionState.proto*\310\033\n\013MotionState\022\025\n\021M" +
       "OTION_STATE_NONE\020\000\022\026\n\022MOTION_STATE_RESET" +
       "\020\001\022\030\n\024MOTION_STATE_STANDBY\020\002\022\035\n\031MOTION_S" +
       "TATE_STANDBY_MOVE\020\003\022\025\n\021MOTION_STATE_WALK" +
@@ -779,8 +1148,46 @@ public final class MotionStateOuterClass {
       "E_DEBUG\020>\022\036\n\032MOTION_STATE_OCEAN_CURRENT\020" +
       "?\022\037\n\033MOTION_STATE_DIVE_SWIM_MOVE\020@\022\037\n\033MO" +
       "TION_STATE_DIVE_SWIM_IDLE\020A\022\037\n\033MOTION_ST" +
-      "ATE_DIVE_SWIM_DASH\020B\022\024\n\020MOTION_STATE_NUM" +
-      "\020CB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "ATE_DIVE_SWIM_DASH\020B\022\032\n\026MOTION_STATE_ARC" +
+      "_LIGHT\020C\022\037\n\033MOTION_STATE_ARC_LIGHT_SAFE\020" +
+      "D\022 \n\034MOTION_STATE_VEHICLE_STANDBY\020E\022\034\n\030M" +
+      "OTION_STATE_VEHICLE_RUN\020F\022\035\n\031MOTION_STAT" +
+      "E_VEHICLE_DASH\020G\022\036\n\032MOTION_STATE_VEHICLE" +
+      "_CLIMB\020H\022#\n\037MOTION_STATE_VEHICLE_CLIMB_J" +
+      "UMP\020I\022)\n%MOTION_STATE_VEHICLE_STANDBY_TO" +
+      "_CLIMB\020J\022\036\n\032MOTION_STATE_VEHICLE_FIGHT\020K" +
+      "\022\035\n\031MOTION_STATE_VEHICLE_JUMP\020L\022\035\n\031MOTIO" +
+      "N_STATE_VEHICLE_DROP\020M\022\034\n\030MOTION_STATE_V" +
+      "EHICLE_FLY\020N\022\"\n\036MOTION_STATE_VEHICLE_SWI" +
+      "M_MOVE\020O\022\"\n\036MOTION_STATE_VEHICLE_SWIM_ID" +
+      "LE\020P\022\"\n\036MOTION_STATE_VEHICLE_SWIM_DASH\020Q" +
+      "\022\035\n\031MOTION_STATE_VEHICLE_SLIP\020R\022$\n MOTIO" +
+      "N_STATE_VEHICLE_GO_UPSTAIRS\020S\022\'\n#MOTION_" +
+      "STATE_VEHICLE_FALL_ON_GROUND\020T\022&\n\"MOTION" +
+      "_STATE_VEHICLE_JUMP_OFF_WALL\020U\022$\n MOTION" +
+      "_STATE_VEHICLE_POWERED_FLY\020V\022\'\n#MOTION_S" +
+      "TATE_VEHICLE_DANGER_STANDBY\020W\022#\n\037MOTION_" +
+      "STATE_VEHICLE_DANGER_RUN\020X\022$\n MOTION_STA" +
+      "TE_VEHICLE_DANGER_DASH\020Y\022\037\n\033MOTION_STATE" +
+      "_VEHICLE_NOTIFY\020Z\022#\n\037MOTION_STATE_VEHICL" +
+      "E_LAND_SPEED\020[\022*\n&MOTION_STATE_VEHICLE_D" +
+      "ASH_BEFORE_SHAKE\020\\\022)\n%MOTION_STATE_VEHIC" +
+      "LE_QUEST_FORCE_DRAG\020]\022%\n!MOTION_STATE_VE" +
+      "HICLE_FOLLOW_ROUTE\020^\022!\n\035MOTION_STATE_VEH" +
+      "ICLE_FLY_IDLE\020_\022!\n\035MOTION_STATE_VEHICLE_" +
+      "FLY_SLOW\020`\022!\n\035MOTION_STATE_VEHICLE_FLY_F" +
+      "AST\020a\022)\n%MOTION_STATE_VEHICLE_AIR_COMPEN" +
+      "SATION\020b\022\"\n\036MOTION_STATE_VEHICLE_ARC_LIG" +
+      "HT\020c\022\'\n#MOTION_STATE_VEHICLE_ARC_LIGHT_S" +
+      "AFE\020d\022)\n%MOTION_STATE_VEHICLE_DANGER_SWI" +
+      "M_MOVE\020e\022)\n%MOTION_STATE_VEHICLE_DANGER_" +
+      "SWIM_IDLE\020f\022)\n%MOTION_STATE_VEHICLE_DANG" +
+      "ER_SWIM_DASH\020g\022#\n\037MOTION_STATE_FOLLOW_CU" +
+      "RVE_ROUTE\020h\022+\n\'MOTION_STATE_VEHICLE_FOLL" +
+      "OW_CURVE_ROUTE\020i\022!\n\035MOTION_STATE_NATSAUR" +
+      "US_NORMAL\020j\022#\n\037MOTION_STATE_NATSAURUS_EN" +
+      "TERING\020k\022\024\n\020MOTION_STATE_NUM\020lB\033\n\031emu.gr" +
+      "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MovingPlatformTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MovingPlatformTypeOuterClass.java
index d72fe2165..70d5664dc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MovingPlatformTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MovingPlatformTypeOuterClass.java
@@ -16,7 +16,7 @@ public final class MovingPlatformTypeOuterClass {
   }
   /**
    * <pre>
-   * Obf: FMMMMIIKELD
+   * 5.0.0
    * </pre>
    *
    * Protobuf enum {@code MovingPlatformType}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MpPlayRewardInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MpPlayRewardInfoOuterClass.java
index d7393df0c..27b3b3d00 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MpPlayRewardInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MpPlayRewardInfoOuterClass.java
@@ -60,7 +60,7 @@ public final class MpPlayRewardInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: BGGFBNKFLHN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code MpPlayRewardInfo}
@@ -474,7 +474,7 @@ public final class MpPlayRewardInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: BGGFBNKFLHN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code MpPlayRewardInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java
index 7a409fa97..f01156577 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MpSettingTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class MpSettingTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: BICPJCKHOPA
-   * </pre>
-   *
    * Protobuf enum {@code MpSettingType}
    */
   public enum MpSettingType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameActivityDetailInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameActivityDetailInfoOuterClass.java
index aea29ad22..5b77f945a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameActivityDetailInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameActivityDetailInfoOuterClass.java
@@ -19,35 +19,21 @@ public final class MusicGameActivityDetailInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> 
-        getLDBACGEPLLEList();
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getLDBACGEPLLE(int index);
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    int getLDBACGEPLLECount();
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-        getLDBACGEPLLEOrBuilderList();
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getLDBACGEPLLEOrBuilder(
-        int index);
-
-    /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     int getMusicGameRecordMapCount();
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     boolean containsMusicGameRecordMap(
         int key);
@@ -58,53 +44,40 @@ public final class MusicGameActivityDetailInfoOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord>
     getMusicGameRecordMap();
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord>
     getMusicGameRecordMapMap();
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
 
     emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord getMusicGameRecordMapOrDefault(
         int key,
         emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord defaultValue);
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
 
     emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord getMusicGameRecordMapOrThrow(
         int key);
-
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> 
-        getOHEAGJIPKGFList();
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getOHEAGJIPKGF(int index);
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    int getOHEAGJIPKGFCount();
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-        getOHEAGJIPKGFOrBuilderList();
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getOHEAGJIPKGFOrBuilder(
-        int index);
   }
   /**
-   * <pre>
-   * Obf: OEHHDNDMFHH
-   * </pre>
-   *
    * Protobuf type {@code MusicGameActivityDetailInfo}
    */
   public static final class MusicGameActivityDetailInfo extends
@@ -117,8 +90,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
       super(builder);
     }
     private MusicGameActivityDetailInfo() {
-      lDBACGEPLLE_ = java.util.Collections.emptyList();
-      oHEAGJIPKGF_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -152,11 +123,11 @@ public final class MusicGameActivityDetailInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 42: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 musicGameRecordMap_ = com.google.protobuf.MapField.newMapField(
                     MusicGameRecordMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord>
               musicGameRecordMap__ = input.readMessage(
@@ -165,24 +136,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
                   musicGameRecordMap__.getKey(), musicGameRecordMap__.getValue());
               break;
             }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                lDBACGEPLLE_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              lDBACGEPLLE_.add(
-                  input.readMessage(emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 114: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                oHEAGJIPKGF_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo>();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              oHEAGJIPKGF_.add(
-                  input.readMessage(emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -198,12 +151,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          lDBACGEPLLE_ = java.util.Collections.unmodifiableList(lDBACGEPLLE_);
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          oHEAGJIPKGF_ = java.util.Collections.unmodifiableList(oHEAGJIPKGF_);
-        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -218,7 +165,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 4:
+        case 5:
           return internalGetMusicGameRecordMap();
         default:
           throw new RuntimeException(
@@ -233,47 +180,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
               emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.class, emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.Builder.class);
     }
 
-    public static final int LDBACGEPLLE_FIELD_NUMBER = 9;
-    private java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> lDBACGEPLLE_;
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> getLDBACGEPLLEList() {
-      return lDBACGEPLLE_;
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-        getLDBACGEPLLEOrBuilderList() {
-      return lDBACGEPLLE_;
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    @java.lang.Override
-    public int getLDBACGEPLLECount() {
-      return lDBACGEPLLE_.size();
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getLDBACGEPLLE(int index) {
-      return lDBACGEPLLE_.get(index);
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getLDBACGEPLLEOrBuilder(
-        int index) {
-      return lDBACGEPLLE_.get(index);
-    }
-
-    public static final int MUSIC_GAME_RECORD_MAP_FIELD_NUMBER = 4;
+    public static final int MUSIC_GAME_RECORD_MAP_FIELD_NUMBER = 5;
     private static final class MusicGameRecordMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord> defaultEntry =
@@ -300,7 +207,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return internalGetMusicGameRecordMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
 
     @java.lang.Override
@@ -318,7 +230,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return getMusicGameRecordMapMap();
     }
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     @java.lang.Override
 
@@ -326,7 +243,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return internalGetMusicGameRecordMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     @java.lang.Override
 
@@ -339,7 +261,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+     * <pre>
+     *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+     *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+     * </pre>
+     *
+     * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
      */
     @java.lang.Override
 
@@ -354,46 +281,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return map.get(key);
     }
 
-    public static final int OHEAGJIPKGF_FIELD_NUMBER = 14;
-    private java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> oHEAGJIPKGF_;
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> getOHEAGJIPKGFList() {
-      return oHEAGJIPKGF_;
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-        getOHEAGJIPKGFOrBuilderList() {
-      return oHEAGJIPKGF_;
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    @java.lang.Override
-    public int getOHEAGJIPKGFCount() {
-      return oHEAGJIPKGF_.size();
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getOHEAGJIPKGF(int index) {
-      return oHEAGJIPKGF_.get(index);
-    }
-    /**
-     * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getOHEAGJIPKGFOrBuilder(
-        int index) {
-      return oHEAGJIPKGF_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -413,13 +300,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
           output,
           internalGetMusicGameRecordMap(),
           MusicGameRecordMapDefaultEntryHolder.defaultEntry,
-          4);
-      for (int i = 0; i < lDBACGEPLLE_.size(); i++) {
-        output.writeMessage(9, lDBACGEPLLE_.get(i));
-      }
-      for (int i = 0; i < oHEAGJIPKGF_.size(); i++) {
-        output.writeMessage(14, oHEAGJIPKGF_.get(i));
-      }
+          5);
       unknownFields.writeTo(output);
     }
 
@@ -437,15 +318,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, musicGameRecordMap__);
-      }
-      for (int i = 0; i < lDBACGEPLLE_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, lDBACGEPLLE_.get(i));
-      }
-      for (int i = 0; i < oHEAGJIPKGF_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, oHEAGJIPKGF_.get(i));
+            .computeMessageSize(5, musicGameRecordMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -462,12 +335,8 @@ public final class MusicGameActivityDetailInfoOuterClass {
       }
       emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo other = (emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo) obj;
 
-      if (!getLDBACGEPLLEList()
-          .equals(other.getLDBACGEPLLEList())) return false;
       if (!internalGetMusicGameRecordMap().equals(
           other.internalGetMusicGameRecordMap())) return false;
-      if (!getOHEAGJIPKGFList()
-          .equals(other.getOHEAGJIPKGFList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -479,18 +348,10 @@ public final class MusicGameActivityDetailInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getLDBACGEPLLECount() > 0) {
-        hash = (37 * hash) + LDBACGEPLLE_FIELD_NUMBER;
-        hash = (53 * hash) + getLDBACGEPLLEList().hashCode();
-      }
       if (!internalGetMusicGameRecordMap().getMap().isEmpty()) {
         hash = (37 * hash) + MUSIC_GAME_RECORD_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetMusicGameRecordMap().hashCode();
       }
-      if (getOHEAGJIPKGFCount() > 0) {
-        hash = (37 * hash) + OHEAGJIPKGF_FIELD_NUMBER;
-        hash = (53 * hash) + getOHEAGJIPKGFList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -587,10 +448,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OEHHDNDMFHH
-     * </pre>
-     *
      * Protobuf type {@code MusicGameActivityDetailInfo}
      */
     public static final class Builder extends
@@ -606,7 +463,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 5:
             return internalGetMusicGameRecordMap();
           default:
             throw new RuntimeException(
@@ -617,7 +474,7 @@ public final class MusicGameActivityDetailInfoOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 4:
+          case 5:
             return internalGetMutableMusicGameRecordMap();
           default:
             throw new RuntimeException(
@@ -645,26 +502,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getLDBACGEPLLEFieldBuilder();
-          getOHEAGJIPKGFFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (lDBACGEPLLEBuilder_ == null) {
-          lDBACGEPLLE_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          lDBACGEPLLEBuilder_.clear();
-        }
         internalGetMutableMusicGameRecordMap().clear();
-        if (oHEAGJIPKGFBuilder_ == null) {
-          oHEAGJIPKGF_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        } else {
-          oHEAGJIPKGFBuilder_.clear();
-        }
         return this;
       }
 
@@ -692,26 +535,8 @@ public final class MusicGameActivityDetailInfoOuterClass {
       public emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo buildPartial() {
         emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo result = new emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo(this);
         int from_bitField0_ = bitField0_;
-        if (lDBACGEPLLEBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            lDBACGEPLLE_ = java.util.Collections.unmodifiableList(lDBACGEPLLE_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.lDBACGEPLLE_ = lDBACGEPLLE_;
-        } else {
-          result.lDBACGEPLLE_ = lDBACGEPLLEBuilder_.build();
-        }
         result.musicGameRecordMap_ = internalGetMusicGameRecordMap();
         result.musicGameRecordMap_.makeImmutable();
-        if (oHEAGJIPKGFBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
-            oHEAGJIPKGF_ = java.util.Collections.unmodifiableList(oHEAGJIPKGF_);
-            bitField0_ = (bitField0_ & ~0x00000004);
-          }
-          result.oHEAGJIPKGF_ = oHEAGJIPKGF_;
-        } else {
-          result.oHEAGJIPKGF_ = oHEAGJIPKGFBuilder_.build();
-        }
         onBuilt();
         return result;
       }
@@ -760,60 +585,8 @@ public final class MusicGameActivityDetailInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo other) {
         if (other == emu.grasscutter.net.proto.MusicGameActivityDetailInfoOuterClass.MusicGameActivityDetailInfo.getDefaultInstance()) return this;
-        if (lDBACGEPLLEBuilder_ == null) {
-          if (!other.lDBACGEPLLE_.isEmpty()) {
-            if (lDBACGEPLLE_.isEmpty()) {
-              lDBACGEPLLE_ = other.lDBACGEPLLE_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureLDBACGEPLLEIsMutable();
-              lDBACGEPLLE_.addAll(other.lDBACGEPLLE_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.lDBACGEPLLE_.isEmpty()) {
-            if (lDBACGEPLLEBuilder_.isEmpty()) {
-              lDBACGEPLLEBuilder_.dispose();
-              lDBACGEPLLEBuilder_ = null;
-              lDBACGEPLLE_ = other.lDBACGEPLLE_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              lDBACGEPLLEBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getLDBACGEPLLEFieldBuilder() : null;
-            } else {
-              lDBACGEPLLEBuilder_.addAllMessages(other.lDBACGEPLLE_);
-            }
-          }
-        }
         internalGetMutableMusicGameRecordMap().mergeFrom(
             other.internalGetMusicGameRecordMap());
-        if (oHEAGJIPKGFBuilder_ == null) {
-          if (!other.oHEAGJIPKGF_.isEmpty()) {
-            if (oHEAGJIPKGF_.isEmpty()) {
-              oHEAGJIPKGF_ = other.oHEAGJIPKGF_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-            } else {
-              ensureOHEAGJIPKGFIsMutable();
-              oHEAGJIPKGF_.addAll(other.oHEAGJIPKGF_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.oHEAGJIPKGF_.isEmpty()) {
-            if (oHEAGJIPKGFBuilder_.isEmpty()) {
-              oHEAGJIPKGFBuilder_.dispose();
-              oHEAGJIPKGFBuilder_ = null;
-              oHEAGJIPKGF_ = other.oHEAGJIPKGF_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-              oHEAGJIPKGFBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getOHEAGJIPKGFFieldBuilder() : null;
-            } else {
-              oHEAGJIPKGFBuilder_.addAllMessages(other.oHEAGJIPKGF_);
-            }
-          }
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -844,246 +617,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> lDBACGEPLLE_ =
-        java.util.Collections.emptyList();
-      private void ensureLDBACGEPLLEIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          lDBACGEPLLE_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo>(lDBACGEPLLE_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> lDBACGEPLLEBuilder_;
-
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> getLDBACGEPLLEList() {
-        if (lDBACGEPLLEBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(lDBACGEPLLE_);
-        } else {
-          return lDBACGEPLLEBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public int getLDBACGEPLLECount() {
-        if (lDBACGEPLLEBuilder_ == null) {
-          return lDBACGEPLLE_.size();
-        } else {
-          return lDBACGEPLLEBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getLDBACGEPLLE(int index) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          return lDBACGEPLLE_.get(index);
-        } else {
-          return lDBACGEPLLEBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder setLDBACGEPLLE(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.set(index, value);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder setLDBACGEPLLE(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder addLDBACGEPLLE(emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.add(value);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder addLDBACGEPLLE(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.add(index, value);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder addLDBACGEPLLE(
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.add(builderForValue.build());
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder addLDBACGEPLLE(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder addAllLDBACGEPLLE(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> values) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          ensureLDBACGEPLLEIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, lDBACGEPLLE_);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder clearLDBACGEPLLE() {
-        if (lDBACGEPLLEBuilder_ == null) {
-          lDBACGEPLLE_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public Builder removeLDBACGEPLLE(int index) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          ensureLDBACGEPLLEIsMutable();
-          lDBACGEPLLE_.remove(index);
-          onChanged();
-        } else {
-          lDBACGEPLLEBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder getLDBACGEPLLEBuilder(
-          int index) {
-        return getLDBACGEPLLEFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getLDBACGEPLLEOrBuilder(
-          int index) {
-        if (lDBACGEPLLEBuilder_ == null) {
-          return lDBACGEPLLE_.get(index);  } else {
-          return lDBACGEPLLEBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-           getLDBACGEPLLEOrBuilderList() {
-        if (lDBACGEPLLEBuilder_ != null) {
-          return lDBACGEPLLEBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(lDBACGEPLLE_);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder addLDBACGEPLLEBuilder() {
-        return getLDBACGEPLLEFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder addLDBACGEPLLEBuilder(
-          int index) {
-        return getLDBACGEPLLEFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo LDBACGEPLLE = 9;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder> 
-           getLDBACGEPLLEBuilderList() {
-        return getLDBACGEPLLEFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-          getLDBACGEPLLEFieldBuilder() {
-        if (lDBACGEPLLEBuilder_ == null) {
-          lDBACGEPLLEBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder>(
-                  lDBACGEPLLE_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          lDBACGEPLLE_ = null;
-        }
-        return lDBACGEPLLEBuilder_;
-      }
-
       private com.google.protobuf.MapField<
           java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord> musicGameRecordMap_;
       private com.google.protobuf.MapField<java.lang.Integer, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord>
@@ -1111,7 +644,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return internalGetMusicGameRecordMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
 
       @java.lang.Override
@@ -1129,7 +667,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return getMusicGameRecordMapMap();
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
       @java.lang.Override
 
@@ -1137,7 +680,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return internalGetMusicGameRecordMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
       @java.lang.Override
 
@@ -1150,7 +698,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
       @java.lang.Override
 
@@ -1171,7 +724,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
 
       public Builder removeMusicGameRecordMap(
@@ -1190,7 +748,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return internalGetMutableMusicGameRecordMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
       public Builder putMusicGameRecordMap(
           int key,
@@ -1202,7 +765,12 @@ public final class MusicGameActivityDetailInfoOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 4;</code>
+       * <pre>
+       *repeated UgcMusicBriefInfo POGDNKLBFJM = 10;
+       *repeated UgcMusicBriefInfo LBJCOBNDKBD = 15;
+       * </pre>
+       *
+       * <code>map&lt;uint32, .MusicGameRecord&gt; music_game_record_map = 5;</code>
        */
 
       public Builder putAllMusicGameRecordMap(
@@ -1211,246 +779,6 @@ public final class MusicGameActivityDetailInfoOuterClass {
             .putAll(values);
         return this;
       }
-
-      private java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> oHEAGJIPKGF_ =
-        java.util.Collections.emptyList();
-      private void ensureOHEAGJIPKGFIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          oHEAGJIPKGF_ = new java.util.ArrayList<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo>(oHEAGJIPKGF_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> oHEAGJIPKGFBuilder_;
-
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> getOHEAGJIPKGFList() {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(oHEAGJIPKGF_);
-        } else {
-          return oHEAGJIPKGFBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public int getOHEAGJIPKGFCount() {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          return oHEAGJIPKGF_.size();
-        } else {
-          return oHEAGJIPKGFBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo getOHEAGJIPKGF(int index) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          return oHEAGJIPKGF_.get(index);
-        } else {
-          return oHEAGJIPKGFBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder setOHEAGJIPKGF(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.set(index, value);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder setOHEAGJIPKGF(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder addOHEAGJIPKGF(emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.add(value);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder addOHEAGJIPKGF(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo value) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.add(index, value);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder addOHEAGJIPKGF(
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.add(builderForValue.build());
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder addOHEAGJIPKGF(
-          int index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder builderForValue) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder addAllOHEAGJIPKGF(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo> values) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          ensureOHEAGJIPKGFIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, oHEAGJIPKGF_);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder clearOHEAGJIPKGF() {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          oHEAGJIPKGF_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public Builder removeOHEAGJIPKGF(int index) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          ensureOHEAGJIPKGFIsMutable();
-          oHEAGJIPKGF_.remove(index);
-          onChanged();
-        } else {
-          oHEAGJIPKGFBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder getOHEAGJIPKGFBuilder(
-          int index) {
-        return getOHEAGJIPKGFFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder getOHEAGJIPKGFOrBuilder(
-          int index) {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          return oHEAGJIPKGF_.get(index);  } else {
-          return oHEAGJIPKGFBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-           getOHEAGJIPKGFOrBuilderList() {
-        if (oHEAGJIPKGFBuilder_ != null) {
-          return oHEAGJIPKGFBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(oHEAGJIPKGF_);
-        }
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder addOHEAGJIPKGFBuilder() {
-        return getOHEAGJIPKGFFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder addOHEAGJIPKGFBuilder(
-          int index) {
-        return getOHEAGJIPKGFFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .UgcMusicBriefInfo OHEAGJIPKGF = 14;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder> 
-           getOHEAGJIPKGFBuilderList() {
-        return getOHEAGJIPKGFFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder> 
-          getOHEAGJIPKGFFieldBuilder() {
-        if (oHEAGJIPKGFBuilder_ == null) {
-          oHEAGJIPKGFBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfo.Builder, emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.UgcMusicBriefInfoOrBuilder>(
-                  oHEAGJIPKGF_,
-                  ((bitField0_ & 0x00000004) != 0),
-                  getParentForChildren(),
-                  isClean());
-          oHEAGJIPKGF_ = null;
-        }
-        return oHEAGJIPKGFBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1523,21 +851,18 @@ public final class MusicGameActivityDetailInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n!MusicGameActivityDetailInfo.proto\032\027Ugc" +
-      "MusicBriefInfo.proto\032\025MusicGameRecord.pr" +
-      "oto\"\221\002\n\033MusicGameActivityDetailInfo\022\'\n\013L" +
-      "DBACGEPLLE\030\t \003(\0132\022.UgcMusicBriefInfo\022S\n\025" +
-      "music_game_record_map\030\004 \003(\01324.MusicGameA" +
-      "ctivityDetailInfo.MusicGameRecordMapEntr" +
-      "y\022\'\n\013OHEAGJIPKGF\030\016 \003(\0132\022.UgcMusicBriefIn" +
-      "fo\032K\n\027MusicGameRecordMapEntry\022\013\n\003key\030\001 \001" +
-      "(\r\022\037\n\005value\030\002 \001(\0132\020.MusicGameRecord:\0028\001B" +
-      "\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n!MusicGameActivityDetailInfo.proto\032\025Mus" +
+      "icGameRecord.proto\"\277\001\n\033MusicGameActivity" +
+      "DetailInfo\022S\n\025music_game_record_map\030\005 \003(" +
+      "\01324.MusicGameActivityDetailInfo.MusicGam" +
+      "eRecordMapEntry\032K\n\027MusicGameRecordMapEnt" +
+      "ry\022\013\n\003key\030\001 \001(\r\022\037\n\005value\030\002 \001(\0132\020.MusicGa" +
+      "meRecord:\0028\001B\033\n\031emu.grasscutter.net.prot" +
+      "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.MusicGameRecordOuterClass.getDescriptor(),
         });
     internal_static_MusicGameActivityDetailInfo_descriptor =
@@ -1545,14 +870,13 @@ public final class MusicGameActivityDetailInfoOuterClass {
     internal_static_MusicGameActivityDetailInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MusicGameActivityDetailInfo_descriptor,
-        new java.lang.String[] { "LDBACGEPLLE", "MusicGameRecordMap", "OHEAGJIPKGF", });
+        new java.lang.String[] { "MusicGameRecordMap", });
     internal_static_MusicGameActivityDetailInfo_MusicGameRecordMapEntry_descriptor =
       internal_static_MusicGameActivityDetailInfo_descriptor.getNestedTypes().get(0);
     internal_static_MusicGameActivityDetailInfo_MusicGameRecordMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MusicGameActivityDetailInfo_MusicGameRecordMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
-    emu.grasscutter.net.proto.UgcMusicBriefInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MusicGameRecordOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameRecordOuterClass.java
index 5c9decf4a..34e80030d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/MusicGameRecordOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/MusicGameRecordOuterClass.java
@@ -19,26 +19,26 @@ public final class MusicGameRecordOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 max_combo = 5;</code>
+     * <code>uint32 max_score = 4;</code>
+     * @return The maxScore.
+     */
+    int getMaxScore();
+
+    /**
+     * <code>uint32 max_combo = 9;</code>
      * @return The maxCombo.
      */
     int getMaxCombo();
 
     /**
-     * <code>bool is_unlock = 8;</code>
+     * <code>bool is_unlock = 14;</code>
      * @return The isUnlock.
      */
     boolean getIsUnlock();
-
-    /**
-     * <code>uint32 max_score = 1;</code>
-     * @return The maxScore.
-     */
-    int getMaxScore();
   }
   /**
    * <pre>
-   * Obf: GEKMKNGAIHD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code MusicGameRecord}
@@ -85,17 +85,17 @@ public final class MusicGameRecordOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 32: {
 
               maxScore_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 72: {
 
               maxCombo_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 112: {
 
               isUnlock_ = input.readBool();
               break;
@@ -132,10 +132,21 @@ public final class MusicGameRecordOuterClass {
               emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord.class, emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord.Builder.class);
     }
 
-    public static final int MAX_COMBO_FIELD_NUMBER = 5;
+    public static final int MAX_SCORE_FIELD_NUMBER = 4;
+    private int maxScore_;
+    /**
+     * <code>uint32 max_score = 4;</code>
+     * @return The maxScore.
+     */
+    @java.lang.Override
+    public int getMaxScore() {
+      return maxScore_;
+    }
+
+    public static final int MAX_COMBO_FIELD_NUMBER = 9;
     private int maxCombo_;
     /**
-     * <code>uint32 max_combo = 5;</code>
+     * <code>uint32 max_combo = 9;</code>
      * @return The maxCombo.
      */
     @java.lang.Override
@@ -143,10 +154,10 @@ public final class MusicGameRecordOuterClass {
       return maxCombo_;
     }
 
-    public static final int IS_UNLOCK_FIELD_NUMBER = 8;
+    public static final int IS_UNLOCK_FIELD_NUMBER = 14;
     private boolean isUnlock_;
     /**
-     * <code>bool is_unlock = 8;</code>
+     * <code>bool is_unlock = 14;</code>
      * @return The isUnlock.
      */
     @java.lang.Override
@@ -154,17 +165,6 @@ public final class MusicGameRecordOuterClass {
       return isUnlock_;
     }
 
-    public static final int MAX_SCORE_FIELD_NUMBER = 1;
-    private int maxScore_;
-    /**
-     * <code>uint32 max_score = 1;</code>
-     * @return The maxScore.
-     */
-    @java.lang.Override
-    public int getMaxScore() {
-      return maxScore_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,13 +180,13 @@ public final class MusicGameRecordOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (maxScore_ != 0) {
-        output.writeUInt32(1, maxScore_);
+        output.writeUInt32(4, maxScore_);
       }
       if (maxCombo_ != 0) {
-        output.writeUInt32(5, maxCombo_);
+        output.writeUInt32(9, maxCombo_);
       }
       if (isUnlock_ != false) {
-        output.writeBool(8, isUnlock_);
+        output.writeBool(14, isUnlock_);
       }
       unknownFields.writeTo(output);
     }
@@ -199,15 +199,15 @@ public final class MusicGameRecordOuterClass {
       size = 0;
       if (maxScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, maxScore_);
+          .computeUInt32Size(4, maxScore_);
       }
       if (maxCombo_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, maxCombo_);
+          .computeUInt32Size(9, maxCombo_);
       }
       if (isUnlock_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isUnlock_);
+          .computeBoolSize(14, isUnlock_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -224,12 +224,12 @@ public final class MusicGameRecordOuterClass {
       }
       emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord other = (emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord) obj;
 
+      if (getMaxScore()
+          != other.getMaxScore()) return false;
       if (getMaxCombo()
           != other.getMaxCombo()) return false;
       if (getIsUnlock()
           != other.getIsUnlock()) return false;
-      if (getMaxScore()
-          != other.getMaxScore()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -241,13 +241,13 @@ public final class MusicGameRecordOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + MAX_SCORE_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxScore();
       hash = (37 * hash) + MAX_COMBO_FIELD_NUMBER;
       hash = (53 * hash) + getMaxCombo();
       hash = (37 * hash) + IS_UNLOCK_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsUnlock());
-      hash = (37 * hash) + MAX_SCORE_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxScore();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,7 +345,7 @@ public final class MusicGameRecordOuterClass {
     }
     /**
      * <pre>
-     * Obf: GEKMKNGAIHD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code MusicGameRecord}
@@ -385,12 +385,12 @@ public final class MusicGameRecordOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        maxScore_ = 0;
+
         maxCombo_ = 0;
 
         isUnlock_ = false;
 
-        maxScore_ = 0;
-
         return this;
       }
 
@@ -417,9 +417,9 @@ public final class MusicGameRecordOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord buildPartial() {
         emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord result = new emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord(this);
+        result.maxScore_ = maxScore_;
         result.maxCombo_ = maxCombo_;
         result.isUnlock_ = isUnlock_;
-        result.maxScore_ = maxScore_;
         onBuilt();
         return result;
       }
@@ -468,15 +468,15 @@ public final class MusicGameRecordOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord other) {
         if (other == emu.grasscutter.net.proto.MusicGameRecordOuterClass.MusicGameRecord.getDefaultInstance()) return this;
+        if (other.getMaxScore() != 0) {
+          setMaxScore(other.getMaxScore());
+        }
         if (other.getMaxCombo() != 0) {
           setMaxCombo(other.getMaxCombo());
         }
         if (other.getIsUnlock() != false) {
           setIsUnlock(other.getIsUnlock());
         }
-        if (other.getMaxScore() != 0) {
-          setMaxScore(other.getMaxScore());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -506,9 +506,40 @@ public final class MusicGameRecordOuterClass {
         return this;
       }
 
+      private int maxScore_ ;
+      /**
+       * <code>uint32 max_score = 4;</code>
+       * @return The maxScore.
+       */
+      @java.lang.Override
+      public int getMaxScore() {
+        return maxScore_;
+      }
+      /**
+       * <code>uint32 max_score = 4;</code>
+       * @param value The maxScore to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMaxScore(int value) {
+        
+        maxScore_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 max_score = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaxScore() {
+        
+        maxScore_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int maxCombo_ ;
       /**
-       * <code>uint32 max_combo = 5;</code>
+       * <code>uint32 max_combo = 9;</code>
        * @return The maxCombo.
        */
       @java.lang.Override
@@ -516,7 +547,7 @@ public final class MusicGameRecordOuterClass {
         return maxCombo_;
       }
       /**
-       * <code>uint32 max_combo = 5;</code>
+       * <code>uint32 max_combo = 9;</code>
        * @param value The maxCombo to set.
        * @return This builder for chaining.
        */
@@ -527,7 +558,7 @@ public final class MusicGameRecordOuterClass {
         return this;
       }
       /**
-       * <code>uint32 max_combo = 5;</code>
+       * <code>uint32 max_combo = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaxCombo() {
@@ -539,7 +570,7 @@ public final class MusicGameRecordOuterClass {
 
       private boolean isUnlock_ ;
       /**
-       * <code>bool is_unlock = 8;</code>
+       * <code>bool is_unlock = 14;</code>
        * @return The isUnlock.
        */
       @java.lang.Override
@@ -547,7 +578,7 @@ public final class MusicGameRecordOuterClass {
         return isUnlock_;
       }
       /**
-       * <code>bool is_unlock = 8;</code>
+       * <code>bool is_unlock = 14;</code>
        * @param value The isUnlock to set.
        * @return This builder for chaining.
        */
@@ -558,7 +589,7 @@ public final class MusicGameRecordOuterClass {
         return this;
       }
       /**
-       * <code>bool is_unlock = 8;</code>
+       * <code>bool is_unlock = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsUnlock() {
@@ -567,37 +598,6 @@ public final class MusicGameRecordOuterClass {
         onChanged();
         return this;
       }
-
-      private int maxScore_ ;
-      /**
-       * <code>uint32 max_score = 1;</code>
-       * @return The maxScore.
-       */
-      @java.lang.Override
-      public int getMaxScore() {
-        return maxScore_;
-      }
-      /**
-       * <code>uint32 max_score = 1;</code>
-       * @param value The maxScore to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMaxScore(int value) {
-        
-        maxScore_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 max_score = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaxScore() {
-        
-        maxScore_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -666,8 +666,8 @@ public final class MusicGameRecordOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025MusicGameRecord.proto\"J\n\017MusicGameReco" +
-      "rd\022\021\n\tmax_combo\030\005 \001(\r\022\021\n\tis_unlock\030\010 \001(\010" +
-      "\022\021\n\tmax_score\030\001 \001(\rB\033\n\031emu.grasscutter.n" +
+      "rd\022\021\n\tmax_score\030\004 \001(\r\022\021\n\tmax_combo\030\t \001(\r" +
+      "\022\021\n\tis_unlock\030\016 \001(\010B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +679,7 @@ public final class MusicGameRecordOuterClass {
     internal_static_MusicGameRecord_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_MusicGameRecord_descriptor,
-        new java.lang.String[] { "MaxCombo", "IsUnlock", "MaxScore", });
+        new java.lang.String[] { "MaxScore", "MaxCombo", "IsUnlock", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NeedBeginTimeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NeedBeginTimeOuterClass.java
new file mode 100644
index 000000000..b070bd175
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NeedBeginTimeOuterClass.java
@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: NeedBeginTime.proto
+
+package emu.grasscutter.net.proto;
+
+public final class NeedBeginTimeOuterClass {
+  private NeedBeginTimeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface NeedBeginTimeOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:NeedBeginTime)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 config_need_begin_time = 4;</code>
+     * @return The configNeedBeginTime.
+     */
+    int getConfigNeedBeginTime();
+
+    /**
+     * <code>bool is_limit = 9;</code>
+     * @return The isLimit.
+     */
+    boolean getIsLimit();
+  }
+  /**
+   * Protobuf type {@code NeedBeginTime}
+   */
+  public static final class NeedBeginTime extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:NeedBeginTime)
+      NeedBeginTimeOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use NeedBeginTime.newBuilder() to construct.
+    private NeedBeginTime(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private NeedBeginTime() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new NeedBeginTime();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NeedBeginTime(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 32: {
+
+              configNeedBeginTime_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              isLimit_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.internal_static_NeedBeginTime_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.internal_static_NeedBeginTime_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.class, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder.class);
+    }
+
+    public static final int CONFIG_NEED_BEGIN_TIME_FIELD_NUMBER = 4;
+    private int configNeedBeginTime_;
+    /**
+     * <code>uint32 config_need_begin_time = 4;</code>
+     * @return The configNeedBeginTime.
+     */
+    @java.lang.Override
+    public int getConfigNeedBeginTime() {
+      return configNeedBeginTime_;
+    }
+
+    public static final int IS_LIMIT_FIELD_NUMBER = 9;
+    private boolean isLimit_;
+    /**
+     * <code>bool is_limit = 9;</code>
+     * @return The isLimit.
+     */
+    @java.lang.Override
+    public boolean getIsLimit() {
+      return isLimit_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (configNeedBeginTime_ != 0) {
+        output.writeUInt32(4, configNeedBeginTime_);
+      }
+      if (isLimit_ != false) {
+        output.writeBool(9, isLimit_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (configNeedBeginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, configNeedBeginTime_);
+      }
+      if (isLimit_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isLimit_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime other = (emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime) obj;
+
+      if (getConfigNeedBeginTime()
+          != other.getConfigNeedBeginTime()) return false;
+      if (getIsLimit()
+          != other.getIsLimit()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CONFIG_NEED_BEGIN_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigNeedBeginTime();
+      hash = (37 * hash) + IS_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsLimit());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code NeedBeginTime}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:NeedBeginTime)
+        emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTimeOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.internal_static_NeedBeginTime_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.internal_static_NeedBeginTime_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.class, emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        configNeedBeginTime_ = 0;
+
+        isLimit_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.internal_static_NeedBeginTime_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime build() {
+        emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime buildPartial() {
+        emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime result = new emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime(this);
+        result.configNeedBeginTime_ = configNeedBeginTime_;
+        result.isLimit_ = isLimit_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime) {
+          return mergeFrom((emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime other) {
+        if (other == emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime.getDefaultInstance()) return this;
+        if (other.getConfigNeedBeginTime() != 0) {
+          setConfigNeedBeginTime(other.getConfigNeedBeginTime());
+        }
+        if (other.getIsLimit() != false) {
+          setIsLimit(other.getIsLimit());
+        }
+        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.NeedBeginTimeOuterClass.NeedBeginTime parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int configNeedBeginTime_ ;
+      /**
+       * <code>uint32 config_need_begin_time = 4;</code>
+       * @return The configNeedBeginTime.
+       */
+      @java.lang.Override
+      public int getConfigNeedBeginTime() {
+        return configNeedBeginTime_;
+      }
+      /**
+       * <code>uint32 config_need_begin_time = 4;</code>
+       * @param value The configNeedBeginTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigNeedBeginTime(int value) {
+        
+        configNeedBeginTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_need_begin_time = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigNeedBeginTime() {
+        
+        configNeedBeginTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isLimit_ ;
+      /**
+       * <code>bool is_limit = 9;</code>
+       * @return The isLimit.
+       */
+      @java.lang.Override
+      public boolean getIsLimit() {
+        return isLimit_;
+      }
+      /**
+       * <code>bool is_limit = 9;</code>
+       * @param value The isLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsLimit(boolean value) {
+        
+        isLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_limit = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsLimit() {
+        
+        isLimit_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:NeedBeginTime)
+    }
+
+    // @@protoc_insertion_point(class_scope:NeedBeginTime)
+    private static final emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime();
+    }
+
+    public static emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<NeedBeginTime>
+        PARSER = new com.google.protobuf.AbstractParser<NeedBeginTime>() {
+      @java.lang.Override
+      public NeedBeginTime parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NeedBeginTime(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<NeedBeginTime> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NeedBeginTime> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedBeginTimeOuterClass.NeedBeginTime getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_NeedBeginTime_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_NeedBeginTime_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\023NeedBeginTime.proto\"A\n\rNeedBeginTime\022\036" +
+      "\n\026config_need_begin_time\030\004 \001(\r\022\020\n\010is_lim" +
+      "it\030\t \001(\010B\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_NeedBeginTime_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_NeedBeginTime_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_NeedBeginTime_descriptor,
+        new java.lang.String[] { "ConfigNeedBeginTime", "IsLimit", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NeedPlayerLevelOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NeedPlayerLevelOuterClass.java
new file mode 100644
index 000000000..a295c4f09
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NeedPlayerLevelOuterClass.java
@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: NeedPlayerLevel.proto
+
+package emu.grasscutter.net.proto;
+
+public final class NeedPlayerLevelOuterClass {
+  private NeedPlayerLevelOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface NeedPlayerLevelOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:NeedPlayerLevel)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>bool is_limit = 13;</code>
+     * @return The isLimit.
+     */
+    boolean getIsLimit();
+
+    /**
+     * <code>uint32 config_need_player_level = 14;</code>
+     * @return The configNeedPlayerLevel.
+     */
+    int getConfigNeedPlayerLevel();
+  }
+  /**
+   * Protobuf type {@code NeedPlayerLevel}
+   */
+  public static final class NeedPlayerLevel extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:NeedPlayerLevel)
+      NeedPlayerLevelOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use NeedPlayerLevel.newBuilder() to construct.
+    private NeedPlayerLevel(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private NeedPlayerLevel() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new NeedPlayerLevel();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private NeedPlayerLevel(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 104: {
+
+              isLimit_ = input.readBool();
+              break;
+            }
+            case 112: {
+
+              configNeedPlayerLevel_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.internal_static_NeedPlayerLevel_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.internal_static_NeedPlayerLevel_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.class, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder.class);
+    }
+
+    public static final int IS_LIMIT_FIELD_NUMBER = 13;
+    private boolean isLimit_;
+    /**
+     * <code>bool is_limit = 13;</code>
+     * @return The isLimit.
+     */
+    @java.lang.Override
+    public boolean getIsLimit() {
+      return isLimit_;
+    }
+
+    public static final int CONFIG_NEED_PLAYER_LEVEL_FIELD_NUMBER = 14;
+    private int configNeedPlayerLevel_;
+    /**
+     * <code>uint32 config_need_player_level = 14;</code>
+     * @return The configNeedPlayerLevel.
+     */
+    @java.lang.Override
+    public int getConfigNeedPlayerLevel() {
+      return configNeedPlayerLevel_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (isLimit_ != false) {
+        output.writeBool(13, isLimit_);
+      }
+      if (configNeedPlayerLevel_ != 0) {
+        output.writeUInt32(14, configNeedPlayerLevel_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (isLimit_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, isLimit_);
+      }
+      if (configNeedPlayerLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, configNeedPlayerLevel_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel other = (emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel) obj;
+
+      if (getIsLimit()
+          != other.getIsLimit()) return false;
+      if (getConfigNeedPlayerLevel()
+          != other.getConfigNeedPlayerLevel()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsLimit());
+      hash = (37 * hash) + CONFIG_NEED_PLAYER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getConfigNeedPlayerLevel();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code NeedPlayerLevel}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:NeedPlayerLevel)
+        emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevelOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.internal_static_NeedPlayerLevel_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.internal_static_NeedPlayerLevel_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.class, emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        isLimit_ = false;
+
+        configNeedPlayerLevel_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.internal_static_NeedPlayerLevel_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel build() {
+        emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel buildPartial() {
+        emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel result = new emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel(this);
+        result.isLimit_ = isLimit_;
+        result.configNeedPlayerLevel_ = configNeedPlayerLevel_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel) {
+          return mergeFrom((emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel other) {
+        if (other == emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel.getDefaultInstance()) return this;
+        if (other.getIsLimit() != false) {
+          setIsLimit(other.getIsLimit());
+        }
+        if (other.getConfigNeedPlayerLevel() != 0) {
+          setConfigNeedPlayerLevel(other.getConfigNeedPlayerLevel());
+        }
+        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.NeedPlayerLevelOuterClass.NeedPlayerLevel parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private boolean isLimit_ ;
+      /**
+       * <code>bool is_limit = 13;</code>
+       * @return The isLimit.
+       */
+      @java.lang.Override
+      public boolean getIsLimit() {
+        return isLimit_;
+      }
+      /**
+       * <code>bool is_limit = 13;</code>
+       * @param value The isLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsLimit(boolean value) {
+        
+        isLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_limit = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsLimit() {
+        
+        isLimit_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int configNeedPlayerLevel_ ;
+      /**
+       * <code>uint32 config_need_player_level = 14;</code>
+       * @return The configNeedPlayerLevel.
+       */
+      @java.lang.Override
+      public int getConfigNeedPlayerLevel() {
+        return configNeedPlayerLevel_;
+      }
+      /**
+       * <code>uint32 config_need_player_level = 14;</code>
+       * @param value The configNeedPlayerLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setConfigNeedPlayerLevel(int value) {
+        
+        configNeedPlayerLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 config_need_player_level = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearConfigNeedPlayerLevel() {
+        
+        configNeedPlayerLevel_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:NeedPlayerLevel)
+    }
+
+    // @@protoc_insertion_point(class_scope:NeedPlayerLevel)
+    private static final emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel();
+    }
+
+    public static emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<NeedPlayerLevel>
+        PARSER = new com.google.protobuf.AbstractParser<NeedPlayerLevel>() {
+      @java.lang.Override
+      public NeedPlayerLevel parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new NeedPlayerLevel(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<NeedPlayerLevel> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<NeedPlayerLevel> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.NeedPlayerLevelOuterClass.NeedPlayerLevel getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_NeedPlayerLevel_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_NeedPlayerLevel_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\025NeedPlayerLevel.proto\"E\n\017NeedPlayerLev" +
+      "el\022\020\n\010is_limit\030\r \001(\010\022 \n\030config_need_play" +
+      "er_level\030\016 \001(\rB\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_NeedPlayerLevel_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_NeedPlayerLevel_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_NeedPlayerLevel_descriptor,
+        new java.lang.String[] { "IsLimit", "ConfigNeedPlayerLevel", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NightCrowGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NightCrowGadgetInfoOuterClass.java
index 49b0d343b..899626404 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NightCrowGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NightCrowGadgetInfoOuterClass.java
@@ -37,7 +37,7 @@ public final class NightCrowGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: OHIBCIDJNDB
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code NightCrowGadgetInfo}
@@ -344,7 +344,7 @@ public final class NightCrowGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: OHIBCIDJNDB
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code NightCrowGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/NormalUidOpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/NormalUidOpNotifyOuterClass.java
index bf7c76bf4..d2ff6dc9f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NormalUidOpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NormalUidOpNotifyOuterClass.java
@@ -19,57 +19,52 @@ public final class NormalUidOpNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @return A list containing the paramList.
-     */
-    java.util.List<java.lang.Integer> getParamListList();
-    /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @return The count of paramList.
-     */
-    int getParamListCount();
-    /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    int getParamList(int index);
-
-    /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @return A list containing the paramUidList.
      */
     java.util.List<java.lang.Integer> getParamUidListList();
     /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @return The count of paramUidList.
      */
     int getParamUidListCount();
     /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @param index The index of the element to return.
      * @return The paramUidList at the given index.
      */
     int getParamUidList(int index);
 
     /**
-     * <code>uint32 param_index = 15;</code>
+     * <code>repeated uint32 param_list = 6;</code>
+     * @return A list containing the paramList.
+     */
+    java.util.List<java.lang.Integer> getParamListList();
+    /**
+     * <code>repeated uint32 param_list = 6;</code>
+     * @return The count of paramList.
+     */
+    int getParamListCount();
+    /**
+     * <code>repeated uint32 param_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    int getParamList(int index);
+
+    /**
+     * <code>uint32 param_index = 7;</code>
      * @return The paramIndex.
      */
     int getParamIndex();
 
     /**
-     * <code>uint32 duration = 14;</code>
+     * <code>uint32 duration = 8;</code>
      * @return The duration.
      */
     int getDuration();
   }
   /**
-   * <pre>
-   * CmdId: 23286
-   * Obf: NMOLPBAOJOH
-   * </pre>
-   *
    * Protobuf type {@code NormalUidOpNotify}
    */
   public static final class NormalUidOpNotify extends
@@ -82,8 +77,8 @@ public final class NormalUidOpNotifyOuterClass {
       super(builder);
     }
     private NormalUidOpNotify() {
-      paramList_ = emptyIntList();
       paramUidList_ = emptyIntList();
+      paramList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -117,41 +112,20 @@ public final class NormalUidOpNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
+            case 16: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              paramList_.addInt(input.readUInt32());
-              break;
-            }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                paramList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 104: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 paramUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               paramUidList_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 18: {
               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) {
                 paramUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 paramUidList_.addInt(input.readUInt32());
@@ -159,16 +133,37 @@ public final class NormalUidOpNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 112: {
-
-              duration_ = input.readUInt32();
+            case 48: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                paramList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              paramList_.addInt(input.readUInt32());
               break;
             }
-            case 120: {
+            case 50: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                paramList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                paramList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 56: {
 
               paramIndex_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              duration_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -185,10 +180,10 @@ public final class NormalUidOpNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          paramList_.makeImmutable(); // C
+          paramUidList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          paramUidList_.makeImmutable(); // C
+          paramList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -207,38 +202,10 @@ public final class NormalUidOpNotifyOuterClass {
               emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify.class, emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify.Builder.class);
     }
 
-    public static final int PARAM_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList paramList_;
-    /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @return A list containing the paramList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getParamListList() {
-      return paramList_;
-    }
-    /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @return The count of paramList.
-     */
-    public int getParamListCount() {
-      return paramList_.size();
-    }
-    /**
-     * <code>repeated uint32 param_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    public int getParamList(int index) {
-      return paramList_.getInt(index);
-    }
-    private int paramListMemoizedSerializedSize = -1;
-
-    public static final int PARAM_UID_LIST_FIELD_NUMBER = 13;
+    public static final int PARAM_UID_LIST_FIELD_NUMBER = 2;
     private com.google.protobuf.Internal.IntList paramUidList_;
     /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @return A list containing the paramUidList.
      */
     @java.lang.Override
@@ -247,14 +214,14 @@ public final class NormalUidOpNotifyOuterClass {
       return paramUidList_;
     }
     /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @return The count of paramUidList.
      */
     public int getParamUidListCount() {
       return paramUidList_.size();
     }
     /**
-     * <code>repeated uint32 param_uid_list = 13;</code>
+     * <code>repeated uint32 param_uid_list = 2;</code>
      * @param index The index of the element to return.
      * @return The paramUidList at the given index.
      */
@@ -263,10 +230,38 @@ public final class NormalUidOpNotifyOuterClass {
     }
     private int paramUidListMemoizedSerializedSize = -1;
 
-    public static final int PARAM_INDEX_FIELD_NUMBER = 15;
+    public static final int PARAM_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList paramList_;
+    /**
+     * <code>repeated uint32 param_list = 6;</code>
+     * @return A list containing the paramList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getParamListList() {
+      return paramList_;
+    }
+    /**
+     * <code>repeated uint32 param_list = 6;</code>
+     * @return The count of paramList.
+     */
+    public int getParamListCount() {
+      return paramList_.size();
+    }
+    /**
+     * <code>repeated uint32 param_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    public int getParamList(int index) {
+      return paramList_.getInt(index);
+    }
+    private int paramListMemoizedSerializedSize = -1;
+
+    public static final int PARAM_INDEX_FIELD_NUMBER = 7;
     private int paramIndex_;
     /**
-     * <code>uint32 param_index = 15;</code>
+     * <code>uint32 param_index = 7;</code>
      * @return The paramIndex.
      */
     @java.lang.Override
@@ -274,10 +269,10 @@ public final class NormalUidOpNotifyOuterClass {
       return paramIndex_;
     }
 
-    public static final int DURATION_FIELD_NUMBER = 14;
+    public static final int DURATION_FIELD_NUMBER = 8;
     private int duration_;
     /**
-     * <code>uint32 duration = 14;</code>
+     * <code>uint32 duration = 8;</code>
      * @return The duration.
      */
     @java.lang.Override
@@ -300,25 +295,25 @@ public final class NormalUidOpNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(paramListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < paramList_.size(); i++) {
-        output.writeUInt32NoTag(paramList_.getInt(i));
-      }
       if (getParamUidListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(18);
         output.writeUInt32NoTag(paramUidListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramUidList_.size(); i++) {
         output.writeUInt32NoTag(paramUidList_.getInt(i));
       }
-      if (duration_ != 0) {
-        output.writeUInt32(14, duration_);
+      if (getParamListList().size() > 0) {
+        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(paramListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < paramList_.size(); i++) {
+        output.writeUInt32NoTag(paramList_.getInt(i));
       }
       if (paramIndex_ != 0) {
-        output.writeUInt32(15, paramIndex_);
+        output.writeUInt32(7, paramIndex_);
+      }
+      if (duration_ != 0) {
+        output.writeUInt32(8, duration_);
       }
       unknownFields.writeTo(output);
     }
@@ -329,20 +324,6 @@ public final class NormalUidOpNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      {
-        int dataSize = 0;
-        for (int i = 0; i < paramList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(paramList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getParamListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        paramListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < paramUidList_.size(); i++) {
@@ -357,13 +338,27 @@ public final class NormalUidOpNotifyOuterClass {
         }
         paramUidListMemoizedSerializedSize = dataSize;
       }
-      if (duration_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, duration_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < paramList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(paramList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getParamListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        paramListMemoizedSerializedSize = dataSize;
       }
       if (paramIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, paramIndex_);
+          .computeUInt32Size(7, paramIndex_);
+      }
+      if (duration_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, duration_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -380,10 +375,10 @@ public final class NormalUidOpNotifyOuterClass {
       }
       emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify other = (emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify) obj;
 
-      if (!getParamListList()
-          .equals(other.getParamListList())) return false;
       if (!getParamUidListList()
           .equals(other.getParamUidListList())) return false;
+      if (!getParamListList()
+          .equals(other.getParamListList())) return false;
       if (getParamIndex()
           != other.getParamIndex()) return false;
       if (getDuration()
@@ -399,14 +394,14 @@ public final class NormalUidOpNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getParamListCount() > 0) {
-        hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getParamListList().hashCode();
-      }
       if (getParamUidListCount() > 0) {
         hash = (37 * hash) + PARAM_UID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamUidListList().hashCode();
       }
+      if (getParamListCount() > 0) {
+        hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getParamListList().hashCode();
+      }
       hash = (37 * hash) + PARAM_INDEX_FIELD_NUMBER;
       hash = (53 * hash) + getParamIndex();
       hash = (37 * hash) + DURATION_FIELD_NUMBER;
@@ -507,11 +502,6 @@ public final class NormalUidOpNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23286
-     * Obf: NMOLPBAOJOH
-     * </pre>
-     *
      * Protobuf type {@code NormalUidOpNotify}
      */
     public static final class Builder extends
@@ -549,9 +539,9 @@ public final class NormalUidOpNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         paramUidList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        paramList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         paramIndex_ = 0;
 
@@ -585,15 +575,15 @@ public final class NormalUidOpNotifyOuterClass {
         emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify result = new emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify(this);
         int from_bitField0_ = bitField0_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          paramList_.makeImmutable();
+          paramUidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.paramList_ = paramList_;
+        result.paramUidList_ = paramUidList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          paramUidList_.makeImmutable();
+          paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.paramUidList_ = paramUidList_;
+        result.paramList_ = paramList_;
         result.paramIndex_ = paramIndex_;
         result.duration_ = duration_;
         onBuilt();
@@ -644,26 +634,26 @@ public final class NormalUidOpNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify other) {
         if (other == emu.grasscutter.net.proto.NormalUidOpNotifyOuterClass.NormalUidOpNotify.getDefaultInstance()) return this;
-        if (!other.paramList_.isEmpty()) {
-          if (paramList_.isEmpty()) {
-            paramList_ = other.paramList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureParamListIsMutable();
-            paramList_.addAll(other.paramList_);
-          }
-          onChanged();
-        }
         if (!other.paramUidList_.isEmpty()) {
           if (paramUidList_.isEmpty()) {
             paramUidList_ = other.paramUidList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureParamUidListIsMutable();
             paramUidList_.addAll(other.paramUidList_);
           }
           onChanged();
         }
+        if (!other.paramList_.isEmpty()) {
+          if (paramList_.isEmpty()) {
+            paramList_ = other.paramList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureParamListIsMutable();
+            paramList_.addAll(other.paramList_);
+          }
+          onChanged();
+        }
         if (other.getParamIndex() != 0) {
           setParamIndex(other.getParamIndex());
         }
@@ -700,110 +690,31 @@ public final class NormalUidOpNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
-      private void ensureParamListIsMutable() {
+      private com.google.protobuf.Internal.IntList paramUidList_ = emptyIntList();
+      private void ensureParamUidListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          paramList_ = mutableCopy(paramList_);
+          paramUidList_ = mutableCopy(paramUidList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @return A list containing the paramList.
-       */
-      public java.util.List<java.lang.Integer>
-          getParamListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @return The count of paramList.
-       */
-      public int getParamListCount() {
-        return paramList_.size();
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @param index The index of the element to return.
-       * @return The paramList at the given index.
-       */
-      public int getParamList(int index) {
-        return paramList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The paramList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParamList(
-          int index, int value) {
-        ensureParamListIsMutable();
-        paramList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @param value The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addParamList(int value) {
-        ensureParamListIsMutable();
-        paramList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @param values The paramList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllParamList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureParamListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, paramList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_list = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParamList() {
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList paramUidList_ = emptyIntList();
-      private void ensureParamUidListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          paramUidList_ = mutableCopy(paramUidList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @return A list containing the paramUidList.
        */
       public java.util.List<java.lang.Integer>
           getParamUidListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(paramUidList_) : paramUidList_;
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @return The count of paramUidList.
        */
       public int getParamUidListCount() {
         return paramUidList_.size();
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @param index The index of the element to return.
        * @return The paramUidList at the given index.
        */
@@ -811,7 +722,7 @@ public final class NormalUidOpNotifyOuterClass {
         return paramUidList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @param index The index to set the value at.
        * @param value The paramUidList to set.
        * @return This builder for chaining.
@@ -824,7 +735,7 @@ public final class NormalUidOpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @param value The paramUidList to add.
        * @return This builder for chaining.
        */
@@ -835,7 +746,7 @@ public final class NormalUidOpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @param values The paramUidList to add.
        * @return This builder for chaining.
        */
@@ -848,11 +759,90 @@ public final class NormalUidOpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 param_uid_list = 13;</code>
+       * <code>repeated uint32 param_uid_list = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearParamUidList() {
         paramUidList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
+      private void ensureParamListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          paramList_ = mutableCopy(paramList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @return A list containing the paramList.
+       */
+      public java.util.List<java.lang.Integer>
+          getParamListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(paramList_) : paramList_;
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @return The count of paramList.
+       */
+      public int getParamListCount() {
+        return paramList_.size();
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @param index The index of the element to return.
+       * @return The paramList at the given index.
+       */
+      public int getParamList(int index) {
+        return paramList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @param index The index to set the value at.
+       * @param value The paramList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamList(
+          int index, int value) {
+        ensureParamListIsMutable();
+        paramList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @param value The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addParamList(int value) {
+        ensureParamListIsMutable();
+        paramList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @param values The paramList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllParamList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureParamListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, paramList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_list = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamList() {
+        paramList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
@@ -860,7 +850,7 @@ public final class NormalUidOpNotifyOuterClass {
 
       private int paramIndex_ ;
       /**
-       * <code>uint32 param_index = 15;</code>
+       * <code>uint32 param_index = 7;</code>
        * @return The paramIndex.
        */
       @java.lang.Override
@@ -868,7 +858,7 @@ public final class NormalUidOpNotifyOuterClass {
         return paramIndex_;
       }
       /**
-       * <code>uint32 param_index = 15;</code>
+       * <code>uint32 param_index = 7;</code>
        * @param value The paramIndex to set.
        * @return This builder for chaining.
        */
@@ -879,7 +869,7 @@ public final class NormalUidOpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param_index = 15;</code>
+       * <code>uint32 param_index = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearParamIndex() {
@@ -891,7 +881,7 @@ public final class NormalUidOpNotifyOuterClass {
 
       private int duration_ ;
       /**
-       * <code>uint32 duration = 14;</code>
+       * <code>uint32 duration = 8;</code>
        * @return The duration.
        */
       @java.lang.Override
@@ -899,7 +889,7 @@ public final class NormalUidOpNotifyOuterClass {
         return duration_;
       }
       /**
-       * <code>uint32 duration = 14;</code>
+       * <code>uint32 duration = 8;</code>
        * @param value The duration to set.
        * @return This builder for chaining.
        */
@@ -910,7 +900,7 @@ public final class NormalUidOpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 duration = 14;</code>
+       * <code>uint32 duration = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearDuration() {
@@ -987,9 +977,9 @@ public final class NormalUidOpNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027NormalUidOpNotify.proto\"f\n\021NormalUidOp" +
-      "Notify\022\022\n\nparam_list\030\n \003(\r\022\026\n\016param_uid_" +
-      "list\030\r \003(\r\022\023\n\013param_index\030\017 \001(\r\022\020\n\010durat" +
-      "ion\030\016 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "Notify\022\026\n\016param_uid_list\030\002 \003(\r\022\022\n\nparam_" +
+      "list\030\006 \003(\r\022\023\n\013param_index\030\007 \001(\r\022\020\n\010durat" +
+      "ion\030\010 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1001,7 +991,7 @@ public final class NormalUidOpNotifyOuterClass {
     internal_static_NormalUidOpNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NormalUidOpNotify_descriptor,
-        new java.lang.String[] { "ParamList", "ParamUidList", "ParamIndex", "Duration", });
+        new java.lang.String[] { "ParamUidList", "ParamList", "ParamIndex", "Duration", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 a31ee5a16..96d986d4f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkReqOuterClass.java
@@ -19,29 +19,24 @@ public final class NpcTalkReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 talk_id = 8;</code>
+     * <code>uint32 entity_id = 8;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint32 talk_id = 14;</code>
      * @return The talkId.
      */
     int getTalkId();
 
     /**
-     * <code>uint32 npc_entity_id = 11;</code>
+     * <code>uint32 npc_entity_id = 2;</code>
      * @return The npcEntityId.
      */
     int getNpcEntityId();
-
-    /**
-     * <code>uint32 entity_id = 3;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 3174
-   * Obf: NMMAMHCFAAD
-   * </pre>
-   *
    * Protobuf type {@code NpcTalkReq}
    */
   public static final class NpcTalkReq extends
@@ -86,19 +81,19 @@ public final class NpcTalkReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 16: {
 
-              entityId_ = input.readUInt32();
+              npcEntityId_ = input.readUInt32();
               break;
             }
             case 64: {
 
-              talkId_ = input.readUInt32();
+              entityId_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 112: {
 
-              npcEntityId_ = input.readUInt32();
+              talkId_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,10 +128,21 @@ public final class NpcTalkReqOuterClass {
               emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.class, emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.Builder.class);
     }
 
-    public static final int TALK_ID_FIELD_NUMBER = 8;
+    public static final int ENTITY_ID_FIELD_NUMBER = 8;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 8;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int TALK_ID_FIELD_NUMBER = 14;
     private int talkId_;
     /**
-     * <code>uint32 talk_id = 8;</code>
+     * <code>uint32 talk_id = 14;</code>
      * @return The talkId.
      */
     @java.lang.Override
@@ -144,10 +150,10 @@ public final class NpcTalkReqOuterClass {
       return talkId_;
     }
 
-    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 11;
+    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 2;
     private int npcEntityId_;
     /**
-     * <code>uint32 npc_entity_id = 11;</code>
+     * <code>uint32 npc_entity_id = 2;</code>
      * @return The npcEntityId.
      */
     @java.lang.Override
@@ -155,17 +161,6 @@ public final class NpcTalkReqOuterClass {
       return npcEntityId_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 3;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 3;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class NpcTalkReqOuterClass {
     @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(3, entityId_);
+        output.writeUInt32(8, entityId_);
       }
       if (talkId_ != 0) {
-        output.writeUInt32(8, talkId_);
-      }
-      if (npcEntityId_ != 0) {
-        output.writeUInt32(11, npcEntityId_);
+        output.writeUInt32(14, talkId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class NpcTalkReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (npcEntityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, npcEntityId_);
+      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, entityId_);
+          .computeUInt32Size(8, entityId_);
       }
       if (talkId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, talkId_);
-      }
-      if (npcEntityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, npcEntityId_);
+          .computeUInt32Size(14, talkId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class NpcTalkReqOuterClass {
       }
       emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq other = (emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (getTalkId()
           != other.getTalkId()) return false;
       if (getNpcEntityId()
           != other.getNpcEntityId()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class NpcTalkReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      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 = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class NpcTalkReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3174
-     * Obf: NMMAMHCFAAD
-     * </pre>
-     *
      * Protobuf type {@code NpcTalkReq}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class NpcTalkReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         talkId_ = 0;
 
         npcEntityId_ = 0;
 
-        entityId_ = 0;
-
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class NpcTalkReqOuterClass {
       @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.entityId_ = entityId_;
         result.talkId_ = talkId_;
         result.npcEntityId_ = npcEntityId_;
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class NpcTalkReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq other) {
         if (other == emu.grasscutter.net.proto.NpcTalkReqOuterClass.NpcTalkReq.getDefaultInstance()) return this;
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         if (other.getTalkId() != 0) {
           setTalkId(other.getTalkId());
         }
         if (other.getNpcEntityId() != 0) {
           setNpcEntityId(other.getNpcEntityId());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,9 +497,40 @@ public final class NpcTalkReqOuterClass {
         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 int talkId_ ;
       /**
-       * <code>uint32 talk_id = 8;</code>
+       * <code>uint32 talk_id = 14;</code>
        * @return The talkId.
        */
       @java.lang.Override
@@ -517,7 +538,7 @@ public final class NpcTalkReqOuterClass {
         return talkId_;
       }
       /**
-       * <code>uint32 talk_id = 8;</code>
+       * <code>uint32 talk_id = 14;</code>
        * @param value The talkId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +549,7 @@ public final class NpcTalkReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 talk_id = 8;</code>
+       * <code>uint32 talk_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearTalkId() {
@@ -540,7 +561,7 @@ public final class NpcTalkReqOuterClass {
 
       private int npcEntityId_ ;
       /**
-       * <code>uint32 npc_entity_id = 11;</code>
+       * <code>uint32 npc_entity_id = 2;</code>
        * @return The npcEntityId.
        */
       @java.lang.Override
@@ -548,7 +569,7 @@ public final class NpcTalkReqOuterClass {
         return npcEntityId_;
       }
       /**
-       * <code>uint32 npc_entity_id = 11;</code>
+       * <code>uint32 npc_entity_id = 2;</code>
        * @param value The npcEntityId to set.
        * @return This builder for chaining.
        */
@@ -559,7 +580,7 @@ public final class NpcTalkReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 npc_entity_id = 11;</code>
+       * <code>uint32 npc_entity_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearNpcEntityId() {
@@ -568,37 +589,6 @@ public final class NpcTalkReqOuterClass {
         onChanged();
         return this;
       }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 3;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 entity_id = 3;</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) {
@@ -666,9 +656,9 @@ public final class NpcTalkReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020NpcTalkReq.proto\"G\n\nNpcTalkReq\022\017\n\007talk" +
-      "_id\030\010 \001(\r\022\025\n\rnpc_entity_id\030\013 \001(\r\022\021\n\tenti" +
-      "ty_id\030\003 \001(\rB\033\n\031emu.grasscutter.net.proto" +
+      "\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" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class NpcTalkReqOuterClass {
     internal_static_NpcTalkReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NpcTalkReq_descriptor,
-        new java.lang.String[] { "TalkId", "NpcEntityId", "EntityId", });
+        new java.lang.String[] { "EntityId", "TalkId", "NpcEntityId", });
   }
 
   // @@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 28b838cd8..96967b53f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/NpcTalkRspOuterClass.java
@@ -19,35 +19,30 @@ public final class NpcTalkRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 entity_id = 14;</code>
-     * @return The entityId.
+     * <code>uint32 npc_entity_id = 3;</code>
+     * @return The npcEntityId.
      */
-    int getEntityId();
+    int getNpcEntityId();
 
     /**
-     * <code>uint32 cur_talk_id = 7;</code>
+     * <code>uint32 cur_talk_id = 5;</code>
      * @return The curTalkId.
      */
     int getCurTalkId();
 
     /**
-     * <code>uint32 npc_entity_id = 9;</code>
-     * @return The npcEntityId.
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
      */
-    int getNpcEntityId();
+    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 3890
-   * Obf: CJMFBCFOJFL
-   * </pre>
-   *
    * Protobuf type {@code NpcTalkRsp}
    */
   public static final class NpcTalkRsp extends
@@ -92,22 +87,22 @@ public final class NpcTalkRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 56: {
-
-              curTalkId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 24: {
 
               npcEntityId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 40: {
+
+              curTalkId_ = input.readUInt32();
+              break;
+            }
+            case 120: {
 
               entityId_ = input.readUInt32();
               break;
@@ -144,10 +139,10 @@ public final class NpcTalkRspOuterClass {
               emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.class, emu.grasscutter.net.proto.NpcTalkRspOuterClass.NpcTalkRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,21 +150,21 @@ public final class NpcTalkRspOuterClass {
       return retcode_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 14;
-    private int entityId_;
+    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 3;
+    private int npcEntityId_;
     /**
-     * <code>uint32 entity_id = 14;</code>
-     * @return The entityId.
+     * <code>uint32 npc_entity_id = 3;</code>
+     * @return The npcEntityId.
      */
     @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
+    public int getNpcEntityId() {
+      return npcEntityId_;
     }
 
-    public static final int CUR_TALK_ID_FIELD_NUMBER = 7;
+    public static final int CUR_TALK_ID_FIELD_NUMBER = 5;
     private int curTalkId_;
     /**
-     * <code>uint32 cur_talk_id = 7;</code>
+     * <code>uint32 cur_talk_id = 5;</code>
      * @return The curTalkId.
      */
     @java.lang.Override
@@ -177,15 +172,15 @@ public final class NpcTalkRspOuterClass {
       return curTalkId_;
     }
 
-    public static final int NPC_ENTITY_ID_FIELD_NUMBER = 9;
-    private int npcEntityId_;
+    public static final int ENTITY_ID_FIELD_NUMBER = 15;
+    private int entityId_;
     /**
-     * <code>uint32 npc_entity_id = 9;</code>
-     * @return The npcEntityId.
+     * <code>uint32 entity_id = 15;</code>
+     * @return The entityId.
      */
     @java.lang.Override
-    public int getNpcEntityId() {
-      return npcEntityId_;
+    public int getEntityId() {
+      return entityId_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -203,16 +198,16 @@ public final class NpcTalkRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
-      }
-      if (curTalkId_ != 0) {
-        output.writeUInt32(7, curTalkId_);
+        output.writeInt32(1, retcode_);
       }
       if (npcEntityId_ != 0) {
-        output.writeUInt32(9, npcEntityId_);
+        output.writeUInt32(3, npcEntityId_);
+      }
+      if (curTalkId_ != 0) {
+        output.writeUInt32(5, curTalkId_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(14, entityId_);
+        output.writeUInt32(15, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -225,19 +220,19 @@ public final class NpcTalkRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
-      }
-      if (curTalkId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, curTalkId_);
+          .computeInt32Size(1, retcode_);
       }
       if (npcEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, npcEntityId_);
+          .computeUInt32Size(3, npcEntityId_);
+      }
+      if (curTalkId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, curTalkId_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, entityId_);
+          .computeUInt32Size(15, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +251,12 @@ public final class NpcTalkRspOuterClass {
 
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (getCurTalkId()
-          != other.getCurTalkId()) return false;
       if (getNpcEntityId()
           != other.getNpcEntityId()) return false;
+      if (getCurTalkId()
+          != other.getCurTalkId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class NpcTalkRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      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) + CUR_TALK_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurTalkId();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class NpcTalkRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3890
-     * Obf: CJMFBCFOJFL
-     * </pre>
-     *
      * Protobuf type {@code NpcTalkRsp}
      */
     public static final class Builder extends
@@ -421,11 +411,11 @@ public final class NpcTalkRspOuterClass {
         super.clear();
         retcode_ = 0;
 
-        entityId_ = 0;
+        npcEntityId_ = 0;
 
         curTalkId_ = 0;
 
-        npcEntityId_ = 0;
+        entityId_ = 0;
 
         return this;
       }
@@ -454,9 +444,9 @@ public final class NpcTalkRspOuterClass {
       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.entityId_ = entityId_;
-        result.curTalkId_ = curTalkId_;
         result.npcEntityId_ = npcEntityId_;
+        result.curTalkId_ = curTalkId_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -508,14 +498,14 @@ public final class NpcTalkRspOuterClass {
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        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());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -548,7 +538,7 @@ public final class NpcTalkRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 1;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -556,7 +546,7 @@ public final class NpcTalkRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 1;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -567,7 +557,7 @@ public final class NpcTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -577,71 +567,9 @@ public final class NpcTalkRspOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 14;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 entity_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int curTalkId_ ;
-      /**
-       * <code>uint32 cur_talk_id = 7;</code>
-       * @return The curTalkId.
-       */
-      @java.lang.Override
-      public int getCurTalkId() {
-        return curTalkId_;
-      }
-      /**
-       * <code>uint32 cur_talk_id = 7;</code>
-       * @param value The curTalkId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurTalkId(int value) {
-        
-        curTalkId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_talk_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurTalkId() {
-        
-        curTalkId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int npcEntityId_ ;
       /**
-       * <code>uint32 npc_entity_id = 9;</code>
+       * <code>uint32 npc_entity_id = 3;</code>
        * @return The npcEntityId.
        */
       @java.lang.Override
@@ -649,7 +577,7 @@ public final class NpcTalkRspOuterClass {
         return npcEntityId_;
       }
       /**
-       * <code>uint32 npc_entity_id = 9;</code>
+       * <code>uint32 npc_entity_id = 3;</code>
        * @param value The npcEntityId to set.
        * @return This builder for chaining.
        */
@@ -660,7 +588,7 @@ public final class NpcTalkRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 npc_entity_id = 9;</code>
+       * <code>uint32 npc_entity_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearNpcEntityId() {
@@ -669,6 +597,68 @@ public final class NpcTalkRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int curTalkId_ ;
+      /**
+       * <code>uint32 cur_talk_id = 5;</code>
+       * @return The curTalkId.
+       */
+      @java.lang.Override
+      public int getCurTalkId() {
+        return curTalkId_;
+      }
+      /**
+       * <code>uint32 cur_talk_id = 5;</code>
+       * @param value The curTalkId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurTalkId(int value) {
+        
+        curTalkId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_talk_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurTalkId() {
+        
+        curTalkId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 15;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 15;</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 = 15;</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) {
@@ -737,8 +727,8 @@ public final class NpcTalkRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020NpcTalkRsp.proto\"\\\n\nNpcTalkRsp\022\017\n\007retc" +
-      "ode\030\004 \001(\005\022\021\n\tentity_id\030\016 \001(\r\022\023\n\013cur_talk" +
-      "_id\030\007 \001(\r\022\025\n\rnpc_entity_id\030\t \001(\rB\033\n\031emu." +
+      "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." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +740,7 @@ public final class NpcTalkRspOuterClass {
     internal_static_NpcTalkRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_NpcTalkRsp_descriptor,
-        new java.lang.String[] { "Retcode", "EntityId", "CurTalkId", "NpcEntityId", });
+        new java.lang.String[] { "Retcode", "NpcEntityId", "CurTalkId", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleInfoOuterClass.java
index 1fc24e778..f18bb66b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleInfoOuterClass.java
@@ -19,72 +19,68 @@ public final class ObstacleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     * @return Whether the rotation field is set.
-     */
-    boolean hasRotation();
-    /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     * @return The rotation.
-     */
-    emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion getRotation();
-    /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     */
-    emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder getRotationOrBuilder();
-
-    /**
-     * <code>.ObstacleInfo.ShapeType shape = 5;</code>
+     * <code>.ObstacleInfo.ShapeType shape = 4;</code>
      * @return The enum numeric value on the wire for shape.
      */
     int getShapeValue();
     /**
-     * <code>.ObstacleInfo.ShapeType shape = 5;</code>
+     * <code>.ObstacleInfo.ShapeType shape = 4;</code>
      * @return The shape.
      */
     emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType getShape();
 
     /**
-     * <code>int32 obstacle_id = 6;</code>
+     * <code>.MathQuaternion rotation = 5;</code>
+     * @return Whether the rotation field is set.
+     */
+    boolean hasRotation();
+    /**
+     * <code>.MathQuaternion rotation = 5;</code>
+     * @return The rotation.
+     */
+    emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion getRotation();
+    /**
+     * <code>.MathQuaternion rotation = 5;</code>
+     */
+    emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder getRotationOrBuilder();
+
+    /**
+     * <code>.Vector3Int extents = 6;</code>
+     * @return Whether the extents field is set.
+     */
+    boolean hasExtents();
+    /**
+     * <code>.Vector3Int extents = 6;</code>
+     * @return The extents.
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getExtents();
+    /**
+     * <code>.Vector3Int extents = 6;</code>
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getExtentsOrBuilder();
+
+    /**
+     * <code>int32 obstacle_id = 12;</code>
      * @return The obstacleId.
      */
     int getObstacleId();
 
     /**
-     * <code>.Vector3Int extents = 15;</code>
-     * @return Whether the extents field is set.
-     */
-    boolean hasExtents();
-    /**
-     * <code>.Vector3Int extents = 15;</code>
-     * @return The extents.
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getExtents();
-    /**
-     * <code>.Vector3Int extents = 15;</code>
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getExtentsOrBuilder();
-
-    /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      * @return Whether the center field is set.
      */
     boolean hasCenter();
     /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      * @return The center.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getCenter();
     /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCenterOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: HDJAECHANAJ
-   * </pre>
-   *
    * Protobuf type {@code ObstacleInfo}
    */
   public static final class ObstacleInfo extends
@@ -130,7 +126,13 @@ public final class ObstacleInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 32: {
+              int rawValue = input.readEnum();
+
+              shape_ = rawValue;
+              break;
+            }
+            case 42: {
               emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.Builder subBuilder = null;
               if (rotation_ != null) {
                 subBuilder = rotation_.toBuilder();
@@ -143,31 +145,7 @@ public final class ObstacleInfoOuterClass {
 
               break;
             }
-            case 40: {
-              int rawValue = input.readEnum();
-
-              shape_ = rawValue;
-              break;
-            }
-            case 48: {
-
-              obstacleId_ = input.readInt32();
-              break;
-            }
-            case 74: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (center_ != null) {
-                subBuilder = center_.toBuilder();
-              }
-              center_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(center_);
-                center_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 122: {
+            case 50: {
               emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null;
               if (extents_ != null) {
                 subBuilder = extents_.toBuilder();
@@ -180,6 +158,24 @@ public final class ObstacleInfoOuterClass {
 
               break;
             }
+            case 96: {
+
+              obstacleId_ = input.readInt32();
+              break;
+            }
+            case 106: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (center_ != null) {
+                subBuilder = center_.toBuilder();
+              }
+              center_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(center_);
+                center_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -213,10 +209,6 @@ public final class ObstacleInfoOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: HEJHGAICHLM
-     * </pre>
-     *
      * Protobuf enum {@code ObstacleInfo.ShapeType}
      */
     public enum ShapeType
@@ -324,43 +316,17 @@ public final class ObstacleInfoOuterClass {
       // @@protoc_insertion_point(enum_scope:ObstacleInfo.ShapeType)
     }
 
-    public static final int ROTATION_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion rotation_;
-    /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     * @return Whether the rotation field is set.
-     */
-    @java.lang.Override
-    public boolean hasRotation() {
-      return rotation_ != null;
-    }
-    /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     * @return The rotation.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion getRotation() {
-      return rotation_ == null ? emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.getDefaultInstance() : rotation_;
-    }
-    /**
-     * <code>.MathQuaternion rotation = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder getRotationOrBuilder() {
-      return getRotation();
-    }
-
-    public static final int SHAPE_FIELD_NUMBER = 5;
+    public static final int SHAPE_FIELD_NUMBER = 4;
     private int shape_;
     /**
-     * <code>.ObstacleInfo.ShapeType shape = 5;</code>
+     * <code>.ObstacleInfo.ShapeType shape = 4;</code>
      * @return The enum numeric value on the wire for shape.
      */
     @java.lang.Override public int getShapeValue() {
       return shape_;
     }
     /**
-     * <code>.ObstacleInfo.ShapeType shape = 5;</code>
+     * <code>.ObstacleInfo.ShapeType shape = 4;</code>
      * @return The shape.
      */
     @java.lang.Override public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType getShape() {
@@ -369,21 +335,36 @@ public final class ObstacleInfoOuterClass {
       return result == null ? emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.UNRECOGNIZED : result;
     }
 
-    public static final int OBSTACLE_ID_FIELD_NUMBER = 6;
-    private int obstacleId_;
+    public static final int ROTATION_FIELD_NUMBER = 5;
+    private emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion rotation_;
     /**
-     * <code>int32 obstacle_id = 6;</code>
-     * @return The obstacleId.
+     * <code>.MathQuaternion rotation = 5;</code>
+     * @return Whether the rotation field is set.
      */
     @java.lang.Override
-    public int getObstacleId() {
-      return obstacleId_;
+    public boolean hasRotation() {
+      return rotation_ != null;
+    }
+    /**
+     * <code>.MathQuaternion rotation = 5;</code>
+     * @return The rotation.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion getRotation() {
+      return rotation_ == null ? emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.getDefaultInstance() : rotation_;
+    }
+    /**
+     * <code>.MathQuaternion rotation = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder getRotationOrBuilder() {
+      return getRotation();
     }
 
-    public static final int EXTENTS_FIELD_NUMBER = 15;
+    public static final int EXTENTS_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int extents_;
     /**
-     * <code>.Vector3Int extents = 15;</code>
+     * <code>.Vector3Int extents = 6;</code>
      * @return Whether the extents field is set.
      */
     @java.lang.Override
@@ -391,7 +372,7 @@ public final class ObstacleInfoOuterClass {
       return extents_ != null;
     }
     /**
-     * <code>.Vector3Int extents = 15;</code>
+     * <code>.Vector3Int extents = 6;</code>
      * @return The extents.
      */
     @java.lang.Override
@@ -399,17 +380,28 @@ public final class ObstacleInfoOuterClass {
       return extents_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : extents_;
     }
     /**
-     * <code>.Vector3Int extents = 15;</code>
+     * <code>.Vector3Int extents = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getExtentsOrBuilder() {
       return getExtents();
     }
 
-    public static final int CENTER_FIELD_NUMBER = 9;
+    public static final int OBSTACLE_ID_FIELD_NUMBER = 12;
+    private int obstacleId_;
+    /**
+     * <code>int32 obstacle_id = 12;</code>
+     * @return The obstacleId.
+     */
+    @java.lang.Override
+    public int getObstacleId() {
+      return obstacleId_;
+    }
+
+    public static final int CENTER_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector center_;
     /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      * @return Whether the center field is set.
      */
     @java.lang.Override
@@ -417,7 +409,7 @@ public final class ObstacleInfoOuterClass {
       return center_ != null;
     }
     /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      * @return The center.
      */
     @java.lang.Override
@@ -425,7 +417,7 @@ public final class ObstacleInfoOuterClass {
       return center_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : center_;
     }
     /**
-     * <code>.Vector center = 9;</code>
+     * <code>.Vector center = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCenterOrBuilder() {
@@ -446,20 +438,20 @@ public final class ObstacleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (rotation_ != null) {
-        output.writeMessage(4, getRotation());
-      }
       if (shape_ != emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.OBSTACLE_SHAPE_CAPSULE.getNumber()) {
-        output.writeEnum(5, shape_);
+        output.writeEnum(4, shape_);
       }
-      if (obstacleId_ != 0) {
-        output.writeInt32(6, obstacleId_);
-      }
-      if (center_ != null) {
-        output.writeMessage(9, getCenter());
+      if (rotation_ != null) {
+        output.writeMessage(5, getRotation());
       }
       if (extents_ != null) {
-        output.writeMessage(15, getExtents());
+        output.writeMessage(6, getExtents());
+      }
+      if (obstacleId_ != 0) {
+        output.writeInt32(12, obstacleId_);
+      }
+      if (center_ != null) {
+        output.writeMessage(13, getCenter());
       }
       unknownFields.writeTo(output);
     }
@@ -470,25 +462,25 @@ public final class ObstacleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (rotation_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getRotation());
-      }
       if (shape_ != emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.OBSTACLE_SHAPE_CAPSULE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, shape_);
+          .computeEnumSize(4, shape_);
       }
-      if (obstacleId_ != 0) {
+      if (rotation_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, obstacleId_);
-      }
-      if (center_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getCenter());
+          .computeMessageSize(5, getRotation());
       }
       if (extents_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getExtents());
+          .computeMessageSize(6, getExtents());
+      }
+      if (obstacleId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, obstacleId_);
+      }
+      if (center_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, getCenter());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -505,19 +497,19 @@ public final class ObstacleInfoOuterClass {
       }
       emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo other = (emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo) obj;
 
+      if (shape_ != other.shape_) return false;
       if (hasRotation() != other.hasRotation()) return false;
       if (hasRotation()) {
         if (!getRotation()
             .equals(other.getRotation())) return false;
       }
-      if (shape_ != other.shape_) return false;
-      if (getObstacleId()
-          != other.getObstacleId()) return false;
       if (hasExtents() != other.hasExtents()) return false;
       if (hasExtents()) {
         if (!getExtents()
             .equals(other.getExtents())) return false;
       }
+      if (getObstacleId()
+          != other.getObstacleId()) return false;
       if (hasCenter() != other.hasCenter()) return false;
       if (hasCenter()) {
         if (!getCenter()
@@ -534,18 +526,18 @@ public final class ObstacleInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SHAPE_FIELD_NUMBER;
+      hash = (53 * hash) + shape_;
       if (hasRotation()) {
         hash = (37 * hash) + ROTATION_FIELD_NUMBER;
         hash = (53 * hash) + getRotation().hashCode();
       }
-      hash = (37 * hash) + SHAPE_FIELD_NUMBER;
-      hash = (53 * hash) + shape_;
-      hash = (37 * hash) + OBSTACLE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getObstacleId();
       if (hasExtents()) {
         hash = (37 * hash) + EXTENTS_FIELD_NUMBER;
         hash = (53 * hash) + getExtents().hashCode();
       }
+      hash = (37 * hash) + OBSTACLE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getObstacleId();
       if (hasCenter()) {
         hash = (37 * hash) + CENTER_FIELD_NUMBER;
         hash = (53 * hash) + getCenter().hashCode();
@@ -646,10 +638,6 @@ public final class ObstacleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HDJAECHANAJ
-     * </pre>
-     *
      * Protobuf type {@code ObstacleInfo}
      */
     public static final class Builder extends
@@ -687,22 +675,22 @@ public final class ObstacleInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        shape_ = 0;
+
         if (rotationBuilder_ == null) {
           rotation_ = null;
         } else {
           rotation_ = null;
           rotationBuilder_ = null;
         }
-        shape_ = 0;
-
-        obstacleId_ = 0;
-
         if (extentsBuilder_ == null) {
           extents_ = null;
         } else {
           extents_ = null;
           extentsBuilder_ = null;
         }
+        obstacleId_ = 0;
+
         if (centerBuilder_ == null) {
           center_ = null;
         } else {
@@ -735,18 +723,18 @@ public final class ObstacleInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo buildPartial() {
         emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo result = new emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo(this);
+        result.shape_ = shape_;
         if (rotationBuilder_ == null) {
           result.rotation_ = rotation_;
         } else {
           result.rotation_ = rotationBuilder_.build();
         }
-        result.shape_ = shape_;
-        result.obstacleId_ = obstacleId_;
         if (extentsBuilder_ == null) {
           result.extents_ = extents_;
         } else {
           result.extents_ = extentsBuilder_.build();
         }
+        result.obstacleId_ = obstacleId_;
         if (centerBuilder_ == null) {
           result.center_ = center_;
         } else {
@@ -800,18 +788,18 @@ public final class ObstacleInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo other) {
         if (other == emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.getDefaultInstance()) return this;
-        if (other.hasRotation()) {
-          mergeRotation(other.getRotation());
-        }
         if (other.shape_ != 0) {
           setShapeValue(other.getShapeValue());
         }
-        if (other.getObstacleId() != 0) {
-          setObstacleId(other.getObstacleId());
+        if (other.hasRotation()) {
+          mergeRotation(other.getRotation());
         }
         if (other.hasExtents()) {
           mergeExtents(other.getExtents());
         }
+        if (other.getObstacleId() != 0) {
+          setObstacleId(other.getObstacleId());
+        }
         if (other.hasCenter()) {
           mergeCenter(other.getCenter());
         }
@@ -844,18 +832,72 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
 
+      private int shape_ = 0;
+      /**
+       * <code>.ObstacleInfo.ShapeType shape = 4;</code>
+       * @return The enum numeric value on the wire for shape.
+       */
+      @java.lang.Override public int getShapeValue() {
+        return shape_;
+      }
+      /**
+       * <code>.ObstacleInfo.ShapeType shape = 4;</code>
+       * @param value The enum numeric value on the wire for shape to set.
+       * @return This builder for chaining.
+       */
+      public Builder setShapeValue(int value) {
+        
+        shape_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ObstacleInfo.ShapeType shape = 4;</code>
+       * @return The shape.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType getShape() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType result = emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.valueOf(shape_);
+        return result == null ? emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.ObstacleInfo.ShapeType shape = 4;</code>
+       * @param value The shape to set.
+       * @return This builder for chaining.
+       */
+      public Builder setShape(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        shape_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.ObstacleInfo.ShapeType shape = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearShape() {
+        
+        shape_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion rotation_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion, emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.Builder, emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder> rotationBuilder_;
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        * @return Whether the rotation field is set.
        */
       public boolean hasRotation() {
         return rotationBuilder_ != null || rotation_ != null;
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        * @return The rotation.
        */
       public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion getRotation() {
@@ -866,7 +908,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public Builder setRotation(emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion value) {
         if (rotationBuilder_ == null) {
@@ -882,7 +924,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public Builder setRotation(
           emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.Builder builderForValue) {
@@ -896,7 +938,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public Builder mergeRotation(emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion value) {
         if (rotationBuilder_ == null) {
@@ -914,7 +956,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public Builder clearRotation() {
         if (rotationBuilder_ == null) {
@@ -928,7 +970,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.Builder getRotationBuilder() {
         
@@ -936,7 +978,7 @@ public final class ObstacleInfoOuterClass {
         return getRotationFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       public emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder getRotationOrBuilder() {
         if (rotationBuilder_ != null) {
@@ -947,7 +989,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.MathQuaternion rotation = 4;</code>
+       * <code>.MathQuaternion rotation = 5;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion, emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternion.Builder, emu.grasscutter.net.proto.MathQuaternionOuterClass.MathQuaternionOrBuilder> 
@@ -963,103 +1005,18 @@ public final class ObstacleInfoOuterClass {
         return rotationBuilder_;
       }
 
-      private int shape_ = 0;
-      /**
-       * <code>.ObstacleInfo.ShapeType shape = 5;</code>
-       * @return The enum numeric value on the wire for shape.
-       */
-      @java.lang.Override public int getShapeValue() {
-        return shape_;
-      }
-      /**
-       * <code>.ObstacleInfo.ShapeType shape = 5;</code>
-       * @param value The enum numeric value on the wire for shape to set.
-       * @return This builder for chaining.
-       */
-      public Builder setShapeValue(int value) {
-        
-        shape_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ObstacleInfo.ShapeType shape = 5;</code>
-       * @return The shape.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType getShape() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType result = emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.valueOf(shape_);
-        return result == null ? emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.ObstacleInfo.ShapeType shape = 5;</code>
-       * @param value The shape to set.
-       * @return This builder for chaining.
-       */
-      public Builder setShape(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.ShapeType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        shape_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.ObstacleInfo.ShapeType shape = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearShape() {
-        
-        shape_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int obstacleId_ ;
-      /**
-       * <code>int32 obstacle_id = 6;</code>
-       * @return The obstacleId.
-       */
-      @java.lang.Override
-      public int getObstacleId() {
-        return obstacleId_;
-      }
-      /**
-       * <code>int32 obstacle_id = 6;</code>
-       * @param value The obstacleId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setObstacleId(int value) {
-        
-        obstacleId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 obstacle_id = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearObstacleId() {
-        
-        obstacleId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int extents_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> extentsBuilder_;
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        * @return Whether the extents field is set.
        */
       public boolean hasExtents() {
         return extentsBuilder_ != null || extents_ != null;
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        * @return The extents.
        */
       public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getExtents() {
@@ -1070,7 +1027,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public Builder setExtents(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
         if (extentsBuilder_ == null) {
@@ -1086,7 +1043,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public Builder setExtents(
           emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) {
@@ -1100,7 +1057,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public Builder mergeExtents(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
         if (extentsBuilder_ == null) {
@@ -1118,7 +1075,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public Builder clearExtents() {
         if (extentsBuilder_ == null) {
@@ -1132,7 +1089,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getExtentsBuilder() {
         
@@ -1140,7 +1097,7 @@ public final class ObstacleInfoOuterClass {
         return getExtentsFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getExtentsOrBuilder() {
         if (extentsBuilder_ != null) {
@@ -1151,7 +1108,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector3Int extents = 15;</code>
+       * <code>.Vector3Int extents = 6;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> 
@@ -1167,18 +1124,49 @@ public final class ObstacleInfoOuterClass {
         return extentsBuilder_;
       }
 
+      private int obstacleId_ ;
+      /**
+       * <code>int32 obstacle_id = 12;</code>
+       * @return The obstacleId.
+       */
+      @java.lang.Override
+      public int getObstacleId() {
+        return obstacleId_;
+      }
+      /**
+       * <code>int32 obstacle_id = 12;</code>
+       * @param value The obstacleId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setObstacleId(int value) {
+        
+        obstacleId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 obstacle_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearObstacleId() {
+        
+        obstacleId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.VectorOuterClass.Vector center_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> centerBuilder_;
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        * @return Whether the center field is set.
        */
       public boolean hasCenter() {
         return centerBuilder_ != null || center_ != null;
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        * @return The center.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getCenter() {
@@ -1189,7 +1177,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public Builder setCenter(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (centerBuilder_ == null) {
@@ -1205,7 +1193,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public Builder setCenter(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1219,7 +1207,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public Builder mergeCenter(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (centerBuilder_ == null) {
@@ -1237,7 +1225,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public Builder clearCenter() {
         if (centerBuilder_ == null) {
@@ -1251,7 +1239,7 @@ public final class ObstacleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getCenterBuilder() {
         
@@ -1259,7 +1247,7 @@ public final class ObstacleInfoOuterClass {
         return getCenterFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCenterOrBuilder() {
         if (centerBuilder_ != null) {
@@ -1270,7 +1258,7 @@ public final class ObstacleInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector center = 9;</code>
+       * <code>.Vector center = 13;</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> 
@@ -1354,10 +1342,10 @@ public final class ObstacleInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\022ObstacleInfo.proto\032\024MathQuaternion.pro" +
       "to\032\020Vector3Int.proto\032\014Vector.proto\"\346\001\n\014O" +
-      "bstacleInfo\022!\n\010rotation\030\004 \001(\0132\017.MathQuat" +
-      "ernion\022&\n\005shape\030\005 \001(\0162\027.ObstacleInfo.Sha" +
-      "peType\022\023\n\013obstacle_id\030\006 \001(\005\022\034\n\007extents\030\017" +
-      " \001(\0132\013.Vector3Int\022\027\n\006center\030\t \001(\0132\007.Vect" +
+      "bstacleInfo\022&\n\005shape\030\004 \001(\0162\027.ObstacleInf" +
+      "o.ShapeType\022!\n\010rotation\030\005 \001(\0132\017.MathQuat" +
+      "ernion\022\034\n\007extents\030\006 \001(\0132\013.Vector3Int\022\023\n\013" +
+      "obstacle_id\030\014 \001(\005\022\027\n\006center\030\r \001(\0132\007.Vect" +
       "or\"?\n\tShapeType\022\032\n\026OBSTACLE_SHAPE_CAPSUL" +
       "E\020\000\022\026\n\022OBSTACLE_SHAPE_BOX\020\001B\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
@@ -1374,7 +1362,7 @@ public final class ObstacleInfoOuterClass {
     internal_static_ObstacleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ObstacleInfo_descriptor,
-        new java.lang.String[] { "Rotation", "Shape", "ObstacleId", "Extents", "Center", });
+        new java.lang.String[] { "Shape", "Rotation", "Extents", "ObstacleId", "Center", });
     emu.grasscutter.net.proto.MathQuaternionOuterClass.getDescriptor();
     emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java
index 9dc1cfe47..71c001cdb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ObstacleModifyNotifyOuterClass.java
@@ -19,58 +19,87 @@ public final class ObstacleModifyNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> 
+        getAddObstaclesList();
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index);
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    int getAddObstaclesCount();
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> 
+        getAddObstaclesOrBuilderList();
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @return A list containing the pBGEEKLDIKE.
+     */
+    java.util.List<java.lang.Integer> getPBGEEKLDIKEList();
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @return The count of pBGEEKLDIKE.
+     */
+    int getPBGEEKLDIKECount();
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @param index The index of the element to return.
+     * @return The pBGEEKLDIKE at the given index.
+     */
+    int getPBGEEKLDIKE(int index);
+
+    /**
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @return A list containing the removeObstacleIds.
      */
     java.util.List<java.lang.Integer> getRemoveObstacleIdsList();
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @return The count of removeObstacleIds.
      */
     int getRemoveObstacleIdsCount();
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @param index The index of the element to return.
      * @return The removeObstacleIds at the given index.
      */
     int getRemoveObstacleIds(int index);
 
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @return A list containing the eHFGKOLBOMK.
      */
-    java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> 
-        getAddObstaclesList();
+    java.util.List<java.lang.Integer> getEHFGKOLBOMKList();
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @return The count of eHFGKOLBOMK.
      */
-    emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index);
+    int getEHFGKOLBOMKCount();
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @param index The index of the element to return.
+     * @return The eHFGKOLBOMK at the given index.
      */
-    int getAddObstaclesCount();
-    /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> 
-        getAddObstaclesOrBuilderList();
-    /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
-     */
-    emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder(
-        int index);
+    int getEHFGKOLBOMK(int index);
 
     /**
-     * <code>uint32 scene_id = 9;</code>
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     int getSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 2314
-   * Obf: EOGNKGLIDKH
-   * </pre>
-   *
    * Protobuf type {@code ObstacleModifyNotify}
    */
   public static final class ObstacleModifyNotify extends
@@ -83,8 +112,10 @@ public final class ObstacleModifyNotifyOuterClass {
       super(builder);
     }
     private ObstacleModifyNotify() {
-      removeObstacleIds_ = emptyIntList();
       addObstacles_ = java.util.Collections.emptyList();
+      pBGEEKLDIKE_ = emptyIntList();
+      removeObstacleIds_ = emptyIntList();
+      eHFGKOLBOMK_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -118,20 +149,50 @@ public final class ObstacleModifyNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                removeObstacleIds_ = newIntList();
+                addObstacles_ = new java.util.ArrayList<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo>();
                 mutable_bitField0_ |= 0x00000001;
               }
+              addObstacles_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.parser(), extensionRegistry));
+              break;
+            }
+            case 40: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                pBGEEKLDIKE_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              pBGEEKLDIKE_.addInt(input.readInt32());
+              break;
+            }
+            case 42: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                pBGEEKLDIKE_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                pBGEEKLDIKE_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                removeObstacleIds_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
               removeObstacleIds_.addInt(input.readInt32());
               break;
             }
-            case 50: {
+            case 74: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
                 removeObstacleIds_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
                 removeObstacleIds_.addInt(input.readInt32());
@@ -139,18 +200,30 @@ public final class ObstacleModifyNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
-
-              sceneId_ = input.readUInt32();
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                eHFGKOLBOMK_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              eHFGKOLBOMK_.addInt(input.readInt32());
               break;
             }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                addObstacles_ = new java.util.ArrayList<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo>();
-                mutable_bitField0_ |= 0x00000002;
+            case 98: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
+                eHFGKOLBOMK_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
               }
-              addObstacles_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.parser(), extensionRegistry));
+              while (input.getBytesUntilLimit() > 0) {
+                eHFGKOLBOMK_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 112: {
+
+              sceneId_ = input.readUInt32();
               break;
             }
             default: {
@@ -169,10 +242,16 @@ public final class ObstacleModifyNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          removeObstacleIds_.makeImmutable(); // C
+          addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_);
+          pBGEEKLDIKE_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          removeObstacleIds_.makeImmutable(); // C
+        }
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          eHFGKOLBOMK_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -191,10 +270,78 @@ public final class ObstacleModifyNotifyOuterClass {
               emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.class, emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.Builder.class);
     }
 
-    public static final int REMOVE_OBSTACLE_IDS_FIELD_NUMBER = 6;
+    public static final int ADD_OBSTACLES_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> addObstacles_;
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> getAddObstaclesList() {
+      return addObstacles_;
+    }
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> 
+        getAddObstaclesOrBuilderList() {
+      return addObstacles_;
+    }
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    @java.lang.Override
+    public int getAddObstaclesCount() {
+      return addObstacles_.size();
+    }
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index) {
+      return addObstacles_.get(index);
+    }
+    /**
+     * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder(
+        int index) {
+      return addObstacles_.get(index);
+    }
+
+    public static final int PBGEEKLDIKE_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList pBGEEKLDIKE_;
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @return A list containing the pBGEEKLDIKE.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getPBGEEKLDIKEList() {
+      return pBGEEKLDIKE_;
+    }
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @return The count of pBGEEKLDIKE.
+     */
+    public int getPBGEEKLDIKECount() {
+      return pBGEEKLDIKE_.size();
+    }
+    /**
+     * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+     * @param index The index of the element to return.
+     * @return The pBGEEKLDIKE at the given index.
+     */
+    public int getPBGEEKLDIKE(int index) {
+      return pBGEEKLDIKE_.getInt(index);
+    }
+    private int pBGEEKLDIKEMemoizedSerializedSize = -1;
+
+    public static final int REMOVE_OBSTACLE_IDS_FIELD_NUMBER = 9;
     private com.google.protobuf.Internal.IntList removeObstacleIds_;
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @return A list containing the removeObstacleIds.
      */
     @java.lang.Override
@@ -203,14 +350,14 @@ public final class ObstacleModifyNotifyOuterClass {
       return removeObstacleIds_;
     }
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @return The count of removeObstacleIds.
      */
     public int getRemoveObstacleIdsCount() {
       return removeObstacleIds_.size();
     }
     /**
-     * <code>repeated int32 remove_obstacle_ids = 6;</code>
+     * <code>repeated int32 remove_obstacle_ids = 9;</code>
      * @param index The index of the element to return.
      * @return The removeObstacleIds at the given index.
      */
@@ -219,50 +366,38 @@ public final class ObstacleModifyNotifyOuterClass {
     }
     private int removeObstacleIdsMemoizedSerializedSize = -1;
 
-    public static final int ADD_OBSTACLES_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> addObstacles_;
+    public static final int EHFGKOLBOMK_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList eHFGKOLBOMK_;
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @return A list containing the eHFGKOLBOMK.
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> getAddObstaclesList() {
-      return addObstacles_;
+    public java.util.List<java.lang.Integer>
+        getEHFGKOLBOMKList() {
+      return eHFGKOLBOMK_;
     }
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @return The count of eHFGKOLBOMK.
      */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> 
-        getAddObstaclesOrBuilderList() {
-      return addObstacles_;
+    public int getEHFGKOLBOMKCount() {
+      return eHFGKOLBOMK_.size();
     }
     /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+     * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+     * @param index The index of the element to return.
+     * @return The eHFGKOLBOMK at the given index.
      */
-    @java.lang.Override
-    public int getAddObstaclesCount() {
-      return addObstacles_.size();
-    }
-    /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index) {
-      return addObstacles_.get(index);
-    }
-    /**
-     * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder(
-        int index) {
-      return addObstacles_.get(index);
+    public int getEHFGKOLBOMK(int index) {
+      return eHFGKOLBOMK_.getInt(index);
     }
+    private int eHFGKOLBOMKMemoizedSerializedSize = -1;
 
-    public static final int SCENE_ID_FIELD_NUMBER = 9;
+    public static final int SCENE_ID_FIELD_NUMBER = 14;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 9;</code>
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -285,18 +420,32 @@ public final class ObstacleModifyNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      for (int i = 0; i < addObstacles_.size(); i++) {
+        output.writeMessage(2, addObstacles_.get(i));
+      }
+      if (getPBGEEKLDIKEList().size() > 0) {
+        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(pBGEEKLDIKEMemoizedSerializedSize);
+      }
+      for (int i = 0; i < pBGEEKLDIKE_.size(); i++) {
+        output.writeInt32NoTag(pBGEEKLDIKE_.getInt(i));
+      }
       if (getRemoveObstacleIdsList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(74);
         output.writeUInt32NoTag(removeObstacleIdsMemoizedSerializedSize);
       }
       for (int i = 0; i < removeObstacleIds_.size(); i++) {
         output.writeInt32NoTag(removeObstacleIds_.getInt(i));
       }
-      if (sceneId_ != 0) {
-        output.writeUInt32(9, sceneId_);
+      if (getEHFGKOLBOMKList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(eHFGKOLBOMKMemoizedSerializedSize);
       }
-      for (int i = 0; i < addObstacles_.size(); i++) {
-        output.writeMessage(10, addObstacles_.get(i));
+      for (int i = 0; i < eHFGKOLBOMK_.size(); i++) {
+        output.writeInt32NoTag(eHFGKOLBOMK_.getInt(i));
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(14, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -307,6 +456,24 @@ public final class ObstacleModifyNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      for (int i = 0; i < addObstacles_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, addObstacles_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < pBGEEKLDIKE_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(pBGEEKLDIKE_.getInt(i));
+        }
+        size += dataSize;
+        if (!getPBGEEKLDIKEList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        pBGEEKLDIKEMemoizedSerializedSize = dataSize;
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < removeObstacleIds_.size(); i++) {
@@ -321,13 +488,23 @@ public final class ObstacleModifyNotifyOuterClass {
         }
         removeObstacleIdsMemoizedSerializedSize = dataSize;
       }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < eHFGKOLBOMK_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(eHFGKOLBOMK_.getInt(i));
+        }
+        size += dataSize;
+        if (!getEHFGKOLBOMKList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        eHFGKOLBOMKMemoizedSerializedSize = dataSize;
+      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, sceneId_);
-      }
-      for (int i = 0; i < addObstacles_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, addObstacles_.get(i));
+          .computeUInt32Size(14, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,10 +521,14 @@ public final class ObstacleModifyNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify other = (emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify) obj;
 
-      if (!getRemoveObstacleIdsList()
-          .equals(other.getRemoveObstacleIdsList())) return false;
       if (!getAddObstaclesList()
           .equals(other.getAddObstaclesList())) return false;
+      if (!getPBGEEKLDIKEList()
+          .equals(other.getPBGEEKLDIKEList())) return false;
+      if (!getRemoveObstacleIdsList()
+          .equals(other.getRemoveObstacleIdsList())) return false;
+      if (!getEHFGKOLBOMKList()
+          .equals(other.getEHFGKOLBOMKList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -361,13 +542,21 @@ public final class ObstacleModifyNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getAddObstaclesCount() > 0) {
+        hash = (37 * hash) + ADD_OBSTACLES_FIELD_NUMBER;
+        hash = (53 * hash) + getAddObstaclesList().hashCode();
+      }
+      if (getPBGEEKLDIKECount() > 0) {
+        hash = (37 * hash) + PBGEEKLDIKE_FIELD_NUMBER;
+        hash = (53 * hash) + getPBGEEKLDIKEList().hashCode();
+      }
       if (getRemoveObstacleIdsCount() > 0) {
         hash = (37 * hash) + REMOVE_OBSTACLE_IDS_FIELD_NUMBER;
         hash = (53 * hash) + getRemoveObstacleIdsList().hashCode();
       }
-      if (getAddObstaclesCount() > 0) {
-        hash = (37 * hash) + ADD_OBSTACLES_FIELD_NUMBER;
-        hash = (53 * hash) + getAddObstaclesList().hashCode();
+      if (getEHFGKOLBOMKCount() > 0) {
+        hash = (37 * hash) + EHFGKOLBOMK_FIELD_NUMBER;
+        hash = (53 * hash) + getEHFGKOLBOMKList().hashCode();
       }
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
@@ -467,11 +656,6 @@ public final class ObstacleModifyNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2314
-     * Obf: EOGNKGLIDKH
-     * </pre>
-     *
      * Protobuf type {@code ObstacleModifyNotify}
      */
     public static final class Builder extends
@@ -510,14 +694,18 @@ public final class ObstacleModifyNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        removeObstacleIds_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (addObstaclesBuilder_ == null) {
           addObstacles_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           addObstaclesBuilder_.clear();
         }
+        pBGEEKLDIKE_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        removeObstacleIds_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        eHFGKOLBOMK_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
         sceneId_ = 0;
 
         return this;
@@ -547,20 +735,30 @@ public final class ObstacleModifyNotifyOuterClass {
       public emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify buildPartial() {
         emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify result = new emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify(this);
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          removeObstacleIds_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.removeObstacleIds_ = removeObstacleIds_;
         if (addObstaclesBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             addObstacles_ = java.util.Collections.unmodifiableList(addObstacles_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.addObstacles_ = addObstacles_;
         } else {
           result.addObstacles_ = addObstaclesBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          pBGEEKLDIKE_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.pBGEEKLDIKE_ = pBGEEKLDIKE_;
+        if (((bitField0_ & 0x00000004) != 0)) {
+          removeObstacleIds_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        }
+        result.removeObstacleIds_ = removeObstacleIds_;
+        if (((bitField0_ & 0x00000008) != 0)) {
+          eHFGKOLBOMK_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000008);
+        }
+        result.eHFGKOLBOMK_ = eHFGKOLBOMK_;
         result.sceneId_ = sceneId_;
         onBuilt();
         return result;
@@ -610,21 +808,11 @@ public final class ObstacleModifyNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify other) {
         if (other == emu.grasscutter.net.proto.ObstacleModifyNotifyOuterClass.ObstacleModifyNotify.getDefaultInstance()) return this;
-        if (!other.removeObstacleIds_.isEmpty()) {
-          if (removeObstacleIds_.isEmpty()) {
-            removeObstacleIds_ = other.removeObstacleIds_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureRemoveObstacleIdsIsMutable();
-            removeObstacleIds_.addAll(other.removeObstacleIds_);
-          }
-          onChanged();
-        }
         if (addObstaclesBuilder_ == null) {
           if (!other.addObstacles_.isEmpty()) {
             if (addObstacles_.isEmpty()) {
               addObstacles_ = other.addObstacles_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureAddObstaclesIsMutable();
               addObstacles_.addAll(other.addObstacles_);
@@ -637,7 +825,7 @@ public final class ObstacleModifyNotifyOuterClass {
               addObstaclesBuilder_.dispose();
               addObstaclesBuilder_ = null;
               addObstacles_ = other.addObstacles_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               addObstaclesBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getAddObstaclesFieldBuilder() : null;
@@ -646,6 +834,36 @@ public final class ObstacleModifyNotifyOuterClass {
             }
           }
         }
+        if (!other.pBGEEKLDIKE_.isEmpty()) {
+          if (pBGEEKLDIKE_.isEmpty()) {
+            pBGEEKLDIKE_ = other.pBGEEKLDIKE_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensurePBGEEKLDIKEIsMutable();
+            pBGEEKLDIKE_.addAll(other.pBGEEKLDIKE_);
+          }
+          onChanged();
+        }
+        if (!other.removeObstacleIds_.isEmpty()) {
+          if (removeObstacleIds_.isEmpty()) {
+            removeObstacleIds_ = other.removeObstacleIds_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureRemoveObstacleIdsIsMutable();
+            removeObstacleIds_.addAll(other.removeObstacleIds_);
+          }
+          onChanged();
+        }
+        if (!other.eHFGKOLBOMK_.isEmpty()) {
+          if (eHFGKOLBOMK_.isEmpty()) {
+            eHFGKOLBOMK_ = other.eHFGKOLBOMK_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+          } else {
+            ensureEHFGKOLBOMKIsMutable();
+            eHFGKOLBOMK_.addAll(other.eHFGKOLBOMK_);
+          }
+          onChanged();
+        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
@@ -679,91 +897,12 @@ public final class ObstacleModifyNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList removeObstacleIds_ = emptyIntList();
-      private void ensureRemoveObstacleIdsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          removeObstacleIds_ = mutableCopy(removeObstacleIds_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @return A list containing the removeObstacleIds.
-       */
-      public java.util.List<java.lang.Integer>
-          getRemoveObstacleIdsList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(removeObstacleIds_) : removeObstacleIds_;
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @return The count of removeObstacleIds.
-       */
-      public int getRemoveObstacleIdsCount() {
-        return removeObstacleIds_.size();
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @param index The index of the element to return.
-       * @return The removeObstacleIds at the given index.
-       */
-      public int getRemoveObstacleIds(int index) {
-        return removeObstacleIds_.getInt(index);
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @param index The index to set the value at.
-       * @param value The removeObstacleIds to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRemoveObstacleIds(
-          int index, int value) {
-        ensureRemoveObstacleIdsIsMutable();
-        removeObstacleIds_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @param value The removeObstacleIds to add.
-       * @return This builder for chaining.
-       */
-      public Builder addRemoveObstacleIds(int value) {
-        ensureRemoveObstacleIdsIsMutable();
-        removeObstacleIds_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @param values The removeObstacleIds to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllRemoveObstacleIds(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureRemoveObstacleIdsIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, removeObstacleIds_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 remove_obstacle_ids = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRemoveObstacleIds() {
-        removeObstacleIds_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> addObstacles_ =
         java.util.Collections.emptyList();
       private void ensureAddObstaclesIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           addObstacles_ = new java.util.ArrayList<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo>(addObstacles_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -771,7 +910,7 @@ public final class ObstacleModifyNotifyOuterClass {
           emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> addObstaclesBuilder_;
 
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> getAddObstaclesList() {
         if (addObstaclesBuilder_ == null) {
@@ -781,7 +920,7 @@ public final class ObstacleModifyNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public int getAddObstaclesCount() {
         if (addObstaclesBuilder_ == null) {
@@ -791,7 +930,7 @@ public final class ObstacleModifyNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo getAddObstacles(int index) {
         if (addObstaclesBuilder_ == null) {
@@ -801,7 +940,7 @@ public final class ObstacleModifyNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder setAddObstacles(
           int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) {
@@ -818,7 +957,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder setAddObstacles(
           int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) {
@@ -832,7 +971,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder addAddObstacles(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) {
         if (addObstaclesBuilder_ == null) {
@@ -848,7 +987,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder addAddObstacles(
           int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo value) {
@@ -865,7 +1004,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder addAddObstacles(
           emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) {
@@ -879,7 +1018,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder addAddObstacles(
           int index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder builderForValue) {
@@ -893,7 +1032,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder addAllAddObstacles(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> values) {
@@ -908,12 +1047,12 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder clearAddObstacles() {
         if (addObstaclesBuilder_ == null) {
           addObstacles_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           addObstaclesBuilder_.clear();
@@ -921,7 +1060,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public Builder removeAddObstacles(int index) {
         if (addObstaclesBuilder_ == null) {
@@ -934,14 +1073,14 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder getAddObstaclesBuilder(
           int index) {
         return getAddObstaclesFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder getAddObstaclesOrBuilder(
           int index) {
@@ -951,7 +1090,7 @@ public final class ObstacleModifyNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder> 
            getAddObstaclesOrBuilderList() {
@@ -962,14 +1101,14 @@ public final class ObstacleModifyNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder addAddObstaclesBuilder() {
         return getAddObstaclesFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder addAddObstaclesBuilder(
           int index) {
@@ -977,7 +1116,7 @@ public final class ObstacleModifyNotifyOuterClass {
             index, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ObstacleInfo add_obstacles = 10;</code>
+       * <code>repeated .ObstacleInfo add_obstacles = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder> 
            getAddObstaclesBuilderList() {
@@ -990,7 +1129,7 @@ public final class ObstacleModifyNotifyOuterClass {
           addObstaclesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.Builder, emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfoOrBuilder>(
                   addObstacles_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           addObstacles_ = null;
@@ -998,9 +1137,246 @@ public final class ObstacleModifyNotifyOuterClass {
         return addObstaclesBuilder_;
       }
 
+      private com.google.protobuf.Internal.IntList pBGEEKLDIKE_ = emptyIntList();
+      private void ensurePBGEEKLDIKEIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          pBGEEKLDIKE_ = mutableCopy(pBGEEKLDIKE_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @return A list containing the pBGEEKLDIKE.
+       */
+      public java.util.List<java.lang.Integer>
+          getPBGEEKLDIKEList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(pBGEEKLDIKE_) : pBGEEKLDIKE_;
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @return The count of pBGEEKLDIKE.
+       */
+      public int getPBGEEKLDIKECount() {
+        return pBGEEKLDIKE_.size();
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @param index The index of the element to return.
+       * @return The pBGEEKLDIKE at the given index.
+       */
+      public int getPBGEEKLDIKE(int index) {
+        return pBGEEKLDIKE_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @param index The index to set the value at.
+       * @param value The pBGEEKLDIKE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPBGEEKLDIKE(
+          int index, int value) {
+        ensurePBGEEKLDIKEIsMutable();
+        pBGEEKLDIKE_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @param value The pBGEEKLDIKE to add.
+       * @return This builder for chaining.
+       */
+      public Builder addPBGEEKLDIKE(int value) {
+        ensurePBGEEKLDIKEIsMutable();
+        pBGEEKLDIKE_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @param values The pBGEEKLDIKE to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPBGEEKLDIKE(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePBGEEKLDIKEIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, pBGEEKLDIKE_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 PBGEEKLDIKE = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPBGEEKLDIKE() {
+        pBGEEKLDIKE_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList removeObstacleIds_ = emptyIntList();
+      private void ensureRemoveObstacleIdsIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          removeObstacleIds_ = mutableCopy(removeObstacleIds_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @return A list containing the removeObstacleIds.
+       */
+      public java.util.List<java.lang.Integer>
+          getRemoveObstacleIdsList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(removeObstacleIds_) : removeObstacleIds_;
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @return The count of removeObstacleIds.
+       */
+      public int getRemoveObstacleIdsCount() {
+        return removeObstacleIds_.size();
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @param index The index of the element to return.
+       * @return The removeObstacleIds at the given index.
+       */
+      public int getRemoveObstacleIds(int index) {
+        return removeObstacleIds_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @param index The index to set the value at.
+       * @param value The removeObstacleIds to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRemoveObstacleIds(
+          int index, int value) {
+        ensureRemoveObstacleIdsIsMutable();
+        removeObstacleIds_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @param value The removeObstacleIds to add.
+       * @return This builder for chaining.
+       */
+      public Builder addRemoveObstacleIds(int value) {
+        ensureRemoveObstacleIdsIsMutable();
+        removeObstacleIds_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @param values The removeObstacleIds to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllRemoveObstacleIds(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureRemoveObstacleIdsIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, removeObstacleIds_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 remove_obstacle_ids = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRemoveObstacleIds() {
+        removeObstacleIds_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList eHFGKOLBOMK_ = emptyIntList();
+      private void ensureEHFGKOLBOMKIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          eHFGKOLBOMK_ = mutableCopy(eHFGKOLBOMK_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @return A list containing the eHFGKOLBOMK.
+       */
+      public java.util.List<java.lang.Integer>
+          getEHFGKOLBOMKList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(eHFGKOLBOMK_) : eHFGKOLBOMK_;
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @return The count of eHFGKOLBOMK.
+       */
+      public int getEHFGKOLBOMKCount() {
+        return eHFGKOLBOMK_.size();
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @param index The index of the element to return.
+       * @return The eHFGKOLBOMK at the given index.
+       */
+      public int getEHFGKOLBOMK(int index) {
+        return eHFGKOLBOMK_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The eHFGKOLBOMK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEHFGKOLBOMK(
+          int index, int value) {
+        ensureEHFGKOLBOMKIsMutable();
+        eHFGKOLBOMK_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @param value The eHFGKOLBOMK to add.
+       * @return This builder for chaining.
+       */
+      public Builder addEHFGKOLBOMK(int value) {
+        ensureEHFGKOLBOMKIsMutable();
+        eHFGKOLBOMK_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @param values The eHFGKOLBOMK to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllEHFGKOLBOMK(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureEHFGKOLBOMKIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, eHFGKOLBOMK_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 EHFGKOLBOMK = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEHFGKOLBOMK() {
+        eHFGKOLBOMK_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -1008,7 +1384,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -1019,7 +1395,7 @@ public final class ObstacleModifyNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -1096,10 +1472,11 @@ public final class ObstacleModifyNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032ObstacleModifyNotify.proto\032\022ObstacleIn" +
-      "fo.proto\"k\n\024ObstacleModifyNotify\022\033\n\023remo" +
-      "ve_obstacle_ids\030\006 \003(\005\022$\n\radd_obstacles\030\n" +
-      " \003(\0132\r.ObstacleInfo\022\020\n\010scene_id\030\t \001(\rB\033\n" +
-      "\031emu.grasscutter.net.protob\006proto3"
+      "fo.proto\"\225\001\n\024ObstacleModifyNotify\022$\n\radd" +
+      "_obstacles\030\002 \003(\0132\r.ObstacleInfo\022\023\n\013PBGEE" +
+      "KLDIKE\030\005 \003(\005\022\033\n\023remove_obstacle_ids\030\t \003(" +
+      "\005\022\023\n\013EHFGKOLBOMK\030\014 \003(\005\022\020\n\010scene_id\030\016 \001(\r" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1111,7 +1488,7 @@ public final class ObstacleModifyNotifyOuterClass {
     internal_static_ObstacleModifyNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ObstacleModifyNotify_descriptor,
-        new java.lang.String[] { "RemoveObstacleIds", "AddObstacles", "SceneId", });
+        new java.lang.String[] { "AddObstacles", "PBGEEKLDIKE", "RemoveObstacleIds", "EHFGKOLBOMK", "SceneId", });
     emu.grasscutter.net.proto.ObstacleInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OfferingInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OfferingInfoOuterClass.java
index 405cfb725..2ba4e99eb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OfferingInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OfferingInfoOuterClass.java
@@ -26,7 +26,7 @@ public final class OfferingInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: CDAACMGIFGG
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code OfferingInfo}
@@ -278,7 +278,7 @@ public final class OfferingInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: CDAACMGIFGG
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code OfferingInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java
index 83849d833..389b7352e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OnlinePlayerInfoOuterClass.java
@@ -37,10 +37,10 @@ public final class OnlinePlayerInfoOuterClass {
         getNicknameBytes();
 
     /**
-     * <code>uint32 player_level = 3;</code>
-     * @return The playerLevel.
+     * <code>uint32 cur_player_num_in_world = 3;</code>
+     * @return The curPlayerNumInWorld.
      */
-    int getPlayerLevel();
+    int getCurPlayerNumInWorld();
 
     /**
      * <code>uint32 avatar_id = 4;</code>
@@ -60,10 +60,10 @@ public final class OnlinePlayerInfoOuterClass {
     emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType getMpSettingType();
 
     /**
-     * <code>uint32 cur_player_num_in_world = 6;</code>
-     * @return The curPlayerNumInWorld.
+     * <code>uint32 player_level = 6;</code>
+     * @return The playerLevel.
      */
-    int getCurPlayerNumInWorld();
+    int getPlayerLevel();
 
     /**
      * <code>uint32 world_level = 7;</code>
@@ -147,7 +147,8 @@ public final class OnlinePlayerInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: BJKIIJGIJPA
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code OnlinePlayerInfo}
@@ -214,7 +215,7 @@ public final class OnlinePlayerInfoOuterClass {
             }
             case 24: {
 
-              playerLevel_ = input.readUInt32();
+              curPlayerNumInWorld_ = input.readUInt32();
               break;
             }
             case 32: {
@@ -230,7 +231,7 @@ public final class OnlinePlayerInfoOuterClass {
             }
             case 48: {
 
-              curPlayerNumInWorld_ = input.readUInt32();
+              playerLevel_ = input.readUInt32();
               break;
             }
             case 56: {
@@ -379,15 +380,15 @@ public final class OnlinePlayerInfoOuterClass {
       }
     }
 
-    public static final int PLAYER_LEVEL_FIELD_NUMBER = 3;
-    private int playerLevel_;
+    public static final int CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER = 3;
+    private int curPlayerNumInWorld_;
     /**
-     * <code>uint32 player_level = 3;</code>
-     * @return The playerLevel.
+     * <code>uint32 cur_player_num_in_world = 3;</code>
+     * @return The curPlayerNumInWorld.
      */
     @java.lang.Override
-    public int getPlayerLevel() {
-      return playerLevel_;
+    public int getCurPlayerNumInWorld() {
+      return curPlayerNumInWorld_;
     }
 
     public static final int AVATAR_ID_FIELD_NUMBER = 4;
@@ -420,15 +421,15 @@ public final class OnlinePlayerInfoOuterClass {
       return result == null ? emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.UNRECOGNIZED : result;
     }
 
-    public static final int CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER = 6;
-    private int curPlayerNumInWorld_;
+    public static final int PLAYER_LEVEL_FIELD_NUMBER = 6;
+    private int playerLevel_;
     /**
-     * <code>uint32 cur_player_num_in_world = 6;</code>
-     * @return The curPlayerNumInWorld.
+     * <code>uint32 player_level = 6;</code>
+     * @return The playerLevel.
      */
     @java.lang.Override
-    public int getCurPlayerNumInWorld() {
-      return curPlayerNumInWorld_;
+    public int getPlayerLevel() {
+      return playerLevel_;
     }
 
     public static final int WORLD_LEVEL_FIELD_NUMBER = 7;
@@ -642,8 +643,8 @@ public final class OnlinePlayerInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 2, nickname_);
       }
-      if (playerLevel_ != 0) {
-        output.writeUInt32(3, playerLevel_);
+      if (curPlayerNumInWorld_ != 0) {
+        output.writeUInt32(3, curPlayerNumInWorld_);
       }
       if (avatarId_ != 0) {
         output.writeUInt32(4, avatarId_);
@@ -651,8 +652,8 @@ public final class OnlinePlayerInfoOuterClass {
       if (mpSettingType_ != emu.grasscutter.net.proto.MpSettingTypeOuterClass.MpSettingType.MP_SETTING_TYPE_NO_ENTER.getNumber()) {
         output.writeEnum(5, mpSettingType_);
       }
-      if (curPlayerNumInWorld_ != 0) {
-        output.writeUInt32(6, curPlayerNumInWorld_);
+      if (playerLevel_ != 0) {
+        output.writeUInt32(6, playerLevel_);
       }
       if (worldLevel_ != 0) {
         output.writeUInt32(7, worldLevel_);
@@ -695,9 +696,9 @@ public final class OnlinePlayerInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, nickname_);
       }
-      if (playerLevel_ != 0) {
+      if (curPlayerNumInWorld_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, playerLevel_);
+          .computeUInt32Size(3, curPlayerNumInWorld_);
       }
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -707,9 +708,9 @@ public final class OnlinePlayerInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeEnumSize(5, mpSettingType_);
       }
-      if (curPlayerNumInWorld_ != 0) {
+      if (playerLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, curPlayerNumInWorld_);
+          .computeUInt32Size(6, playerLevel_);
       }
       if (worldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -765,13 +766,13 @@ public final class OnlinePlayerInfoOuterClass {
           != other.getUid()) return false;
       if (!getNickname()
           .equals(other.getNickname())) return false;
-      if (getPlayerLevel()
-          != other.getPlayerLevel()) return false;
+      if (getCurPlayerNumInWorld()
+          != other.getCurPlayerNumInWorld()) return false;
       if (getAvatarId()
           != other.getAvatarId()) return false;
       if (mpSettingType_ != other.mpSettingType_) return false;
-      if (getCurPlayerNumInWorld()
-          != other.getCurPlayerNumInWorld()) return false;
+      if (getPlayerLevel()
+          != other.getPlayerLevel()) return false;
       if (getWorldLevel()
           != other.getWorldLevel()) return false;
       if (!getOnlineId()
@@ -804,14 +805,14 @@ public final class OnlinePlayerInfoOuterClass {
       hash = (53 * hash) + getUid();
       hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
       hash = (53 * hash) + getNickname().hashCode();
-      hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getPlayerLevel();
+      hash = (37 * hash) + CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER;
+      hash = (53 * hash) + getCurPlayerNumInWorld();
       hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + MP_SETTING_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + mpSettingType_;
-      hash = (37 * hash) + CUR_PLAYER_NUM_IN_WORLD_FIELD_NUMBER;
-      hash = (53 * hash) + getCurPlayerNumInWorld();
+      hash = (37 * hash) + PLAYER_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getPlayerLevel();
       hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getWorldLevel();
       hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
@@ -927,7 +928,8 @@ public final class OnlinePlayerInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: BJKIIJGIJPA
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code OnlinePlayerInfo}
@@ -971,13 +973,13 @@ public final class OnlinePlayerInfoOuterClass {
 
         nickname_ = "";
 
-        playerLevel_ = 0;
+        curPlayerNumInWorld_ = 0;
 
         avatarId_ = 0;
 
         mpSettingType_ = 0;
 
-        curPlayerNumInWorld_ = 0;
+        playerLevel_ = 0;
 
         worldLevel_ = 0;
 
@@ -1026,10 +1028,10 @@ public final class OnlinePlayerInfoOuterClass {
         int from_bitField0_ = bitField0_;
         result.uid_ = uid_;
         result.nickname_ = nickname_;
-        result.playerLevel_ = playerLevel_;
+        result.curPlayerNumInWorld_ = curPlayerNumInWorld_;
         result.avatarId_ = avatarId_;
         result.mpSettingType_ = mpSettingType_;
-        result.curPlayerNumInWorld_ = curPlayerNumInWorld_;
+        result.playerLevel_ = playerLevel_;
         result.worldLevel_ = worldLevel_;
         result.onlineId_ = onlineId_;
         result.nameCardId_ = nameCardId_;
@@ -1100,8 +1102,8 @@ public final class OnlinePlayerInfoOuterClass {
           nickname_ = other.nickname_;
           onChanged();
         }
-        if (other.getPlayerLevel() != 0) {
-          setPlayerLevel(other.getPlayerLevel());
+        if (other.getCurPlayerNumInWorld() != 0) {
+          setCurPlayerNumInWorld(other.getCurPlayerNumInWorld());
         }
         if (other.getAvatarId() != 0) {
           setAvatarId(other.getAvatarId());
@@ -1109,8 +1111,8 @@ public final class OnlinePlayerInfoOuterClass {
         if (other.mpSettingType_ != 0) {
           setMpSettingTypeValue(other.getMpSettingTypeValue());
         }
-        if (other.getCurPlayerNumInWorld() != 0) {
-          setCurPlayerNumInWorld(other.getCurPlayerNumInWorld());
+        if (other.getPlayerLevel() != 0) {
+          setPlayerLevel(other.getPlayerLevel());
         }
         if (other.getWorldLevel() != 0) {
           setWorldLevel(other.getWorldLevel());
@@ -1280,33 +1282,33 @@ public final class OnlinePlayerInfoOuterClass {
         return this;
       }
 
-      private int playerLevel_ ;
+      private int curPlayerNumInWorld_ ;
       /**
-       * <code>uint32 player_level = 3;</code>
-       * @return The playerLevel.
+       * <code>uint32 cur_player_num_in_world = 3;</code>
+       * @return The curPlayerNumInWorld.
        */
       @java.lang.Override
-      public int getPlayerLevel() {
-        return playerLevel_;
+      public int getCurPlayerNumInWorld() {
+        return curPlayerNumInWorld_;
       }
       /**
-       * <code>uint32 player_level = 3;</code>
-       * @param value The playerLevel to set.
+       * <code>uint32 cur_player_num_in_world = 3;</code>
+       * @param value The curPlayerNumInWorld to set.
        * @return This builder for chaining.
        */
-      public Builder setPlayerLevel(int value) {
+      public Builder setCurPlayerNumInWorld(int value) {
         
-        playerLevel_ = value;
+        curPlayerNumInWorld_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 player_level = 3;</code>
+       * <code>uint32 cur_player_num_in_world = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearPlayerLevel() {
+      public Builder clearCurPlayerNumInWorld() {
         
-        playerLevel_ = 0;
+        curPlayerNumInWorld_ = 0;
         onChanged();
         return this;
       }
@@ -1396,33 +1398,33 @@ public final class OnlinePlayerInfoOuterClass {
         return this;
       }
 
-      private int curPlayerNumInWorld_ ;
+      private int playerLevel_ ;
       /**
-       * <code>uint32 cur_player_num_in_world = 6;</code>
-       * @return The curPlayerNumInWorld.
+       * <code>uint32 player_level = 6;</code>
+       * @return The playerLevel.
        */
       @java.lang.Override
-      public int getCurPlayerNumInWorld() {
-        return curPlayerNumInWorld_;
+      public int getPlayerLevel() {
+        return playerLevel_;
       }
       /**
-       * <code>uint32 cur_player_num_in_world = 6;</code>
-       * @param value The curPlayerNumInWorld to set.
+       * <code>uint32 player_level = 6;</code>
+       * @param value The playerLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setCurPlayerNumInWorld(int value) {
+      public Builder setPlayerLevel(int value) {
         
-        curPlayerNumInWorld_ = value;
+        playerLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 cur_player_num_in_world = 6;</code>
+       * <code>uint32 player_level = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCurPlayerNumInWorld() {
+      public Builder clearPlayerLevel() {
         
-        curPlayerNumInWorld_ = 0;
+        playerLevel_ = 0;
         onChanged();
         return this;
       }
@@ -1984,9 +1986,9 @@ public final class OnlinePlayerInfoOuterClass {
       "\n\026OnlinePlayerInfo.proto\032\023MpSettingType." +
       "proto\032\024ProfilePicture.proto\"\313\002\n\020OnlinePl" +
       "ayerInfo\022\013\n\003uid\030\001 \001(\r\022\020\n\010nickname\030\002 \001(\t\022" +
-      "\024\n\014player_level\030\003 \001(\r\022\021\n\tavatar_id\030\004 \001(\r" +
-      "\022\'\n\017mp_setting_type\030\005 \001(\0162\016.MpSettingTyp" +
-      "e\022\037\n\027cur_player_num_in_world\030\006 \001(\r\022\023\n\013wo" +
+      "\037\n\027cur_player_num_in_world\030\003 \001(\r\022\021\n\tavat" +
+      "ar_id\030\004 \001(\r\022\'\n\017mp_setting_type\030\005 \001(\0162\016.M" +
+      "pSettingType\022\024\n\014player_level\030\006 \001(\r\022\023\n\013wo" +
       "rld_level\030\007 \001(\r\022\021\n\tonline_id\030\010 \001(\t\022\024\n\014na" +
       "me_card_id\030\t \001(\r\022\032\n\022blacklist_uid_list\030\n" +
       " \003(\r\022\021\n\tsignature\030\013 \001(\t\022(\n\017profile_pictu" +
@@ -2004,7 +2006,7 @@ public final class OnlinePlayerInfoOuterClass {
     internal_static_OnlinePlayerInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_OnlinePlayerInfo_descriptor,
-        new java.lang.String[] { "Uid", "Nickname", "PlayerLevel", "AvatarId", "MpSettingType", "CurPlayerNumInWorld", "WorldLevel", "OnlineId", "NameCardId", "BlacklistUidList", "Signature", "ProfilePicture", "PsnId", });
+        new java.lang.String[] { "Uid", "Nickname", "CurPlayerNumInWorld", "AvatarId", "MpSettingType", "PlayerLevel", "WorldLevel", "OnlineId", "NameCardId", "BlacklistUidList", "Signature", "ProfilePicture", "PsnId", });
     emu.grasscutter.net.proto.MpSettingTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ProfilePictureOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OpenBlossomCircleCampGuideNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OpenBlossomCircleCampGuideNotifyOuterClass.java
index ca4306751..9a7fb5b9a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OpenBlossomCircleCampGuideNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OpenBlossomCircleCampGuideNotifyOuterClass.java
@@ -36,17 +36,12 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
     int getCircleCampIdList(int index);
 
     /**
-     * <code>uint32 refresh_id = 6;</code>
+     * <code>uint32 refresh_id = 15;</code>
      * @return The refreshId.
      */
     int getRefreshId();
   }
   /**
-   * <pre>
-   * CmdId: 4362
-   * Obf: LDJNJFGOKHF
-   * </pre>
-   *
    * Protobuf type {@code OpenBlossomCircleCampGuideNotify}
    */
   public static final class OpenBlossomCircleCampGuideNotify extends
@@ -114,7 +109,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 48: {
+            case 120: {
 
               refreshId_ = input.readUInt32();
               break;
@@ -182,10 +177,10 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
     }
     private int circleCampIdListMemoizedSerializedSize = -1;
 
-    public static final int REFRESH_ID_FIELD_NUMBER = 6;
+    public static final int REFRESH_ID_FIELD_NUMBER = 15;
     private int refreshId_;
     /**
-     * <code>uint32 refresh_id = 6;</code>
+     * <code>uint32 refresh_id = 15;</code>
      * @return The refreshId.
      */
     @java.lang.Override
@@ -216,7 +211,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
         output.writeUInt32NoTag(circleCampIdList_.getInt(i));
       }
       if (refreshId_ != 0) {
-        output.writeUInt32(6, refreshId_);
+        output.writeUInt32(15, refreshId_);
       }
       unknownFields.writeTo(output);
     }
@@ -243,7 +238,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
       }
       if (refreshId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, refreshId_);
+          .computeUInt32Size(15, refreshId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -377,11 +372,6 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4362
-     * Obf: LDJNJFGOKHF
-     * </pre>
-     *
      * Protobuf type {@code OpenBlossomCircleCampGuideNotify}
      */
     public static final class Builder extends
@@ -628,7 +618,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
 
       private int refreshId_ ;
       /**
-       * <code>uint32 refresh_id = 6;</code>
+       * <code>uint32 refresh_id = 15;</code>
        * @return The refreshId.
        */
       @java.lang.Override
@@ -636,7 +626,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
         return refreshId_;
       }
       /**
-       * <code>uint32 refresh_id = 6;</code>
+       * <code>uint32 refresh_id = 15;</code>
        * @param value The refreshId to set.
        * @return This builder for chaining.
        */
@@ -647,7 +637,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 refresh_id = 6;</code>
+       * <code>uint32 refresh_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRefreshId() {
@@ -726,7 +716,7 @@ public final class OpenBlossomCircleCampGuideNotifyOuterClass {
       "\n&OpenBlossomCircleCampGuideNotify.proto" +
       "\"S\n OpenBlossomCircleCampGuideNotify\022\033\n\023" +
       "circle_camp_id_list\030\004 \003(\r\022\022\n\nrefresh_id\030" +
-      "\006 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
+      "\017 \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/OpenStateChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateChangeNotifyOuterClass.java
index ff8c57804..37b082c21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OpenStateChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateChangeNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class OpenStateChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     int getOpenStateMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     boolean containsOpenStateMap(
         int key);
@@ -34,30 +34,25 @@ public final class OpenStateChangeNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOpenStateMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOpenStateMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
 
     int getOpenStateMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
 
     int getOpenStateMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 5778
-   * Obf: KEIOJEIOCDI
-   * </pre>
-   *
    * Protobuf type {@code OpenStateChangeNotify}
    */
   public static final class OpenStateChangeNotify extends
@@ -103,7 +98,7 @@ public final class OpenStateChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 74: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 openStateMap_ = com.google.protobuf.MapField.newMapField(
                     OpenStateMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class OpenStateChangeNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 9:
+        case 7:
           return internalGetOpenStateMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class OpenStateChangeNotifyOuterClass {
               emu.grasscutter.net.proto.OpenStateChangeNotifyOuterClass.OpenStateChangeNotify.class, emu.grasscutter.net.proto.OpenStateChangeNotifyOuterClass.OpenStateChangeNotify.Builder.class);
     }
 
-    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 9;
+    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 7;
     private static final class OpenStateMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -187,7 +182,7 @@ public final class OpenStateChangeNotifyOuterClass {
       return internalGetOpenStateMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class OpenStateChangeNotifyOuterClass {
       return getOpenStateMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class OpenStateChangeNotifyOuterClass {
       return internalGetOpenStateMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class OpenStateChangeNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class OpenStateChangeNotifyOuterClass {
           output,
           internalGetOpenStateMap(),
           OpenStateMapDefaultEntryHolder.defaultEntry,
-          9);
+          7);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class OpenStateChangeNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(9, openStateMap__);
+            .computeMessageSize(7, openStateMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class OpenStateChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5778
-     * Obf: KEIOJEIOCDI
-     * </pre>
-     *
      * Protobuf type {@code OpenStateChangeNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class OpenStateChangeNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 9:
+          case 7:
             return internalGetOpenStateMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class OpenStateChangeNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 9:
+          case 7:
             return internalGetMutableOpenStateMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return internalGetOpenStateMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return getOpenStateMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return internalGetOpenStateMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
 
       public Builder removeOpenStateMap(
@@ -688,7 +678,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return internalGetMutableOpenStateMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
       public Builder putOpenStateMap(
           int key,
@@ -700,7 +690,7 @@ public final class OpenStateChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 9;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 7;</code>
        */
 
       public Builder putAllOpenStateMap(
@@ -782,7 +772,7 @@ public final class OpenStateChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033OpenStateChangeNotify.proto\"\216\001\n\025OpenSt" +
-      "ateChangeNotify\022@\n\016open_state_map\030\t \003(\0132" +
+      "ateChangeNotify\022@\n\016open_state_map\030\007 \003(\0132" +
       "(.OpenStateChangeNotify.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/OpenStateUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
index 8fdc65cc5..a8a36635d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OpenStateUpdateNotifyOuterClass.java
@@ -19,11 +19,11 @@ public final class OpenStateUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     int getOpenStateMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     boolean containsOpenStateMap(
         int key);
@@ -34,30 +34,25 @@ public final class OpenStateUpdateNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOpenStateMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOpenStateMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
 
     int getOpenStateMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
 
     int getOpenStateMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 9279
-   * Obf: HBGDILLIJDK
-   * </pre>
-   *
    * Protobuf type {@code OpenStateUpdateNotify}
    */
   public static final class OpenStateUpdateNotify extends
@@ -103,7 +98,7 @@ public final class OpenStateUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 106: {
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 openStateMap_ = com.google.protobuf.MapField.newMapField(
                     OpenStateMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class OpenStateUpdateNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 13:
+        case 11:
           return internalGetOpenStateMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class OpenStateUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify.class, emu.grasscutter.net.proto.OpenStateUpdateNotifyOuterClass.OpenStateUpdateNotify.Builder.class);
     }
 
-    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 13;
+    public static final int OPEN_STATE_MAP_FIELD_NUMBER = 11;
     private static final class OpenStateMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -187,7 +182,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       return internalGetOpenStateMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       return getOpenStateMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       return internalGetOpenStateMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class OpenStateUpdateNotifyOuterClass {
           output,
           internalGetOpenStateMap(),
           OpenStateMapDefaultEntryHolder.defaultEntry,
-          13);
+          11);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class OpenStateUpdateNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, openStateMap__);
+            .computeMessageSize(11, openStateMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class OpenStateUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9279
-     * Obf: HBGDILLIJDK
-     * </pre>
-     *
      * Protobuf type {@code OpenStateUpdateNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 11:
             return internalGetOpenStateMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class OpenStateUpdateNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 11:
             return internalGetMutableOpenStateMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return internalGetOpenStateMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return getOpenStateMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return internalGetOpenStateMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
 
       public Builder removeOpenStateMap(
@@ -688,7 +678,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return internalGetMutableOpenStateMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
       public Builder putOpenStateMap(
           int key,
@@ -700,7 +690,7 @@ public final class OpenStateUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; open_state_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; open_state_map = 11;</code>
        */
 
       public Builder putAllOpenStateMap(
@@ -782,7 +772,7 @@ public final class OpenStateUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033OpenStateUpdateNotify.proto\"\216\001\n\025OpenSt" +
-      "ateUpdateNotify\022@\n\016open_state_map\030\r \003(\0132" +
+      "ateUpdateNotify\022@\n\016open_state_map\030\013 \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/OperationOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OperationOuterClass.java
new file mode 100644
index 000000000..eaea06812
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OperationOuterClass.java
@@ -0,0 +1,163 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: Operation.proto
+
+package emu.grasscutter.net.proto;
+
+public final class OperationOuterClass {
+  private OperationOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code Operation}
+   */
+  public enum Operation
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>ADD = 0;</code>
+     */
+    ADD(0),
+    /**
+     * <code>MOD = 1;</code>
+     */
+    MOD(1),
+    /**
+     * <code>DEL = 2;</code>
+     */
+    DEL(2),
+    /**
+     * <code>GET = 3;</code>
+     */
+    GET(3),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>ADD = 0;</code>
+     */
+    public static final int ADD_VALUE = 0;
+    /**
+     * <code>MOD = 1;</code>
+     */
+    public static final int MOD_VALUE = 1;
+    /**
+     * <code>DEL = 2;</code>
+     */
+    public static final int DEL_VALUE = 2;
+    /**
+     * <code>GET = 3;</code>
+     */
+    public static final int GET_VALUE = 3;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static Operation valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static Operation forNumber(int value) {
+      switch (value) {
+        case 0: return ADD;
+        case 1: return MOD;
+        case 2: return DEL;
+        case 3: return GET;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<Operation>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        Operation> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<Operation>() {
+            public Operation findValueByNumber(int number) {
+              return Operation.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.OperationOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final Operation[] VALUES = values();
+
+    public static Operation valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private Operation(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:Operation)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\017Operation.proto*/\n\tOperation\022\007\n\003ADD\020\000\022" +
+      "\007\n\003MOD\020\001\022\007\n\003DEL\020\002\022\007\n\003GET\020\003B\033\n\031emu.grassc" +
+      "utter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OptionTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OptionTypeOuterClass.java
new file mode 100644
index 000000000..f009b7fc7
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OptionTypeOuterClass.java
@@ -0,0 +1,155 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: OptionType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class OptionTypeOuterClass {
+  private OptionTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code OptionType}
+   */
+  public enum OptionType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>OPTION_NONE = 0;</code>
+     */
+    OPTION_NONE(0),
+    /**
+     * <code>OPTION_NORMAL = 1;</code>
+     */
+    OPTION_NORMAL(1),
+    /**
+     * <code>OPTION_FIRST_CAN_GO = 2;</code>
+     */
+    OPTION_FIRST_CAN_GO(2),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>OPTION_NONE = 0;</code>
+     */
+    public static final int OPTION_NONE_VALUE = 0;
+    /**
+     * <code>OPTION_NORMAL = 1;</code>
+     */
+    public static final int OPTION_NORMAL_VALUE = 1;
+    /**
+     * <code>OPTION_FIRST_CAN_GO = 2;</code>
+     */
+    public static final int OPTION_FIRST_CAN_GO_VALUE = 2;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static OptionType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static OptionType forNumber(int value) {
+      switch (value) {
+        case 0: return OPTION_NONE;
+        case 1: return OPTION_NORMAL;
+        case 2: return OPTION_FIRST_CAN_GO;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<OptionType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        OptionType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<OptionType>() {
+            public OptionType findValueByNumber(int number) {
+              return OptionType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.OptionTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final OptionType[] VALUES = values();
+
+    public static OptionType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private OptionType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:OptionType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\020OptionType.proto*I\n\nOptionType\022\017\n\013OPTI" +
+      "ON_NONE\020\000\022\021\n\rOPTION_NORMAL\020\001\022\027\n\023OPTION_F" +
+      "IRST_CAN_GO\020\002B\033\n\031emu.grasscutter.net.pro" +
+      "tob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/OtherPlayerEnterHomeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/OtherPlayerEnterHomeNotifyOuterClass.java
index 8ddceb306..d1e9d1235 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/OtherPlayerEnterHomeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/OtherPlayerEnterHomeNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string nickname = 13;</code>
+     * <code>string nickname = 3;</code>
      * @return The nickname.
      */
     java.lang.String getNickname();
     /**
-     * <code>string nickname = 13;</code>
+     * <code>string nickname = 3;</code>
      * @return The bytes for nickname.
      */
     com.google.protobuf.ByteString
         getNicknameBytes();
 
     /**
-     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass.OtherPlayerEnterHomeNotify.Reason getReason();
   }
   /**
-   * <pre>
-   * CmdId: 25817
-   * Obf: MGNDPKIPKGO
-   * </pre>
-   *
    * Protobuf type {@code OtherPlayerEnterHomeNotify}
    */
   public static final class OtherPlayerEnterHomeNotify extends
@@ -93,13 +88,13 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 106: {
+            case 26: {
               java.lang.String s = input.readStringRequireUtf8();
 
               nickname_ = s;
               break;
             }
-            case 112: {
+            case 56: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
@@ -138,10 +133,6 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: CMPPPMNICGG
-     * </pre>
-     *
      * Protobuf enum {@code OtherPlayerEnterHomeNotify.Reason}
      */
     public enum Reason
@@ -258,10 +249,10 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:OtherPlayerEnterHomeNotify.Reason)
     }
 
-    public static final int NICKNAME_FIELD_NUMBER = 13;
+    public static final int NICKNAME_FIELD_NUMBER = 3;
     private volatile java.lang.Object nickname_;
     /**
-     * <code>string nickname = 13;</code>
+     * <code>string nickname = 3;</code>
      * @return The nickname.
      */
     @java.lang.Override
@@ -278,7 +269,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
       }
     }
     /**
-     * <code>string nickname = 13;</code>
+     * <code>string nickname = 3;</code>
      * @return The bytes for nickname.
      */
     @java.lang.Override
@@ -296,17 +287,17 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
       }
     }
 
-    public static final int REASON_FIELD_NUMBER = 14;
+    public static final int REASON_FIELD_NUMBER = 7;
     private int reason_;
     /**
-     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+     * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass.OtherPlayerEnterHomeNotify.Reason getReason() {
@@ -330,10 +321,10 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
     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, 13, nickname_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, nickname_);
       }
       if (reason_ != emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass.OtherPlayerEnterHomeNotify.Reason.INVALID.getNumber()) {
-        output.writeEnum(14, reason_);
+        output.writeEnum(7, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -345,11 +336,11 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, nickname_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, nickname_);
       }
       if (reason_ != emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass.OtherPlayerEnterHomeNotify.Reason.INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, reason_);
+          .computeEnumSize(7, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -480,11 +471,6 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25817
-     * Obf: MGNDPKIPKGO
-     * </pre>
-     *
      * Protobuf type {@code OtherPlayerEnterHomeNotify}
      */
     public static final class Builder extends
@@ -640,7 +626,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
 
       private java.lang.Object nickname_ = "";
       /**
-       * <code>string nickname = 13;</code>
+       * <code>string nickname = 3;</code>
        * @return The nickname.
        */
       public java.lang.String getNickname() {
@@ -656,7 +642,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         }
       }
       /**
-       * <code>string nickname = 13;</code>
+       * <code>string nickname = 3;</code>
        * @return The bytes for nickname.
        */
       public com.google.protobuf.ByteString
@@ -673,7 +659,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         }
       }
       /**
-       * <code>string nickname = 13;</code>
+       * <code>string nickname = 3;</code>
        * @param value The nickname to set.
        * @return This builder for chaining.
        */
@@ -688,7 +674,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string nickname = 13;</code>
+       * <code>string nickname = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearNickname() {
@@ -698,7 +684,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string nickname = 13;</code>
+       * <code>string nickname = 3;</code>
        * @param value The bytes for nickname to set.
        * @return This builder for chaining.
        */
@@ -716,14 +702,14 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
 
       private int reason_ = 0;
       /**
-       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -734,7 +720,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -744,7 +730,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.OtherPlayerEnterHomeNotifyOuterClass.OtherPlayerEnterHomeNotify.Reason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -758,7 +744,7 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 14;</code>
+       * <code>.OtherPlayerEnterHomeNotify.Reason reason = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -835,8 +821,8 @@ public final class OtherPlayerEnterHomeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n OtherPlayerEnterHomeNotify.proto\"\217\001\n\032O" +
-      "therPlayerEnterHomeNotify\022\020\n\010nickname\030\r " +
-      "\001(\t\0222\n\006reason\030\016 \001(\0162\".OtherPlayerEnterHo" +
+      "therPlayerEnterHomeNotify\022\020\n\010nickname\030\003 " +
+      "\001(\t\0222\n\006reason\030\007 \001(\0162\".OtherPlayerEnterHo" +
       "meNotify.Reason\"+\n\006Reason\022\013\n\007INVALID\020\000\022\t" +
       "\n\005ENTER\020\001\022\t\n\005LEAVE\020\002B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshPolyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshPolyOuterClass.java
index 16bb540da..58017491b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshPolyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshPolyOuterClass.java
@@ -19,62 +19,58 @@ public final class PBNavMeshPolyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 area = 1;</code>
+     * <code>repeated int32 vects = 1;</code>
+     * @return A list containing the vects.
+     */
+    java.util.List<java.lang.Integer> getVectsList();
+    /**
+     * <code>repeated int32 vects = 1;</code>
+     * @return The count of vects.
+     */
+    int getVectsCount();
+    /**
+     * <code>repeated int32 vects = 1;</code>
+     * @param index The index of the element to return.
+     * @return The vects at the given index.
+     */
+    int getVects(int index);
+
+    /**
+     * <code>int32 area = 7;</code>
      * @return The area.
      */
     int getArea();
 
     /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
+     * <code>repeated .EdgeType edge_types = 8;</code>
      * @return A list containing the edgeTypes.
      */
-    java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType> getEdgeTypesList();
+    java.util.List<emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType> getEdgeTypesList();
     /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
+     * <code>repeated .EdgeType edge_types = 8;</code>
      * @return The count of edgeTypes.
      */
     int getEdgeTypesCount();
     /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
+     * <code>repeated .EdgeType edge_types = 8;</code>
      * @param index The index of the element to return.
      * @return The edgeTypes at the given index.
      */
-    emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType getEdgeTypes(int index);
+    emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType getEdgeTypes(int index);
     /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
+     * <code>repeated .EdgeType edge_types = 8;</code>
      * @return A list containing the enum numeric values on the wire for edgeTypes.
      */
     java.util.List<java.lang.Integer>
     getEdgeTypesValueList();
     /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
+     * <code>repeated .EdgeType edge_types = 8;</code>
      * @param index The index of the value to return.
      * @return The enum numeric value on the wire of edgeTypes at the given index.
      */
     int getEdgeTypesValue(int index);
-
-    /**
-     * <code>repeated int32 vects = 7;</code>
-     * @return A list containing the vects.
-     */
-    java.util.List<java.lang.Integer> getVectsList();
-    /**
-     * <code>repeated int32 vects = 7;</code>
-     * @return The count of vects.
-     */
-    int getVectsCount();
-    /**
-     * <code>repeated int32 vects = 7;</code>
-     * @param index The index of the element to return.
-     * @return The vects at the given index.
-     */
-    int getVects(int index);
   }
   /**
-   * <pre>
-   * Obf: KFCPBANHIDH
-   * </pre>
-   *
    * Protobuf type {@code PBNavMeshPoly}
    */
   public static final class PBNavMeshPoly extends
@@ -87,8 +83,8 @@ public final class PBNavMeshPolyOuterClass {
       super(builder);
     }
     private PBNavMeshPoly() {
-      edgeTypes_ = java.util.Collections.emptyList();
       vects_ = emptyIntList();
+      edgeTypes_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -123,24 +119,19 @@ public final class PBNavMeshPolyOuterClass {
               done = true;
               break;
             case 8: {
-
-              area_ = input.readInt32();
-              break;
-            }
-            case 56: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 vects_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               vects_.addInt(input.readInt32());
               break;
             }
-            case 58: {
+            case 10: {
               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) {
                 vects_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 vects_.addInt(input.readInt32());
@@ -148,23 +139,28 @@ public final class PBNavMeshPolyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 88: {
+            case 56: {
+
+              area_ = input.readInt32();
+              break;
+            }
+            case 64: {
               int rawValue = input.readEnum();
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 edgeTypes_ = new java.util.ArrayList<java.lang.Integer>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               edgeTypes_.add(rawValue);
               break;
             }
-            case 90: {
+            case 66: {
               int length = input.readRawVarint32();
               int oldLimit = input.pushLimit(length);
               while(input.getBytesUntilLimit() > 0) {
                 int rawValue = input.readEnum();
-                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                   edgeTypes_ = new java.util.ArrayList<java.lang.Integer>();
-                  mutable_bitField0_ |= 0x00000001;
+                  mutable_bitField0_ |= 0x00000002;
                 }
                 edgeTypes_.add(rawValue);
               }
@@ -186,10 +182,10 @@ public final class PBNavMeshPolyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           vects_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           edgeTypes_ = java.util.Collections.unmodifiableList(edgeTypes_);
         }
         this.unknownFields = unknownFields.build();
@@ -209,209 +205,10 @@ public final class PBNavMeshPolyOuterClass {
               emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.class, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder.class);
     }
 
-    /**
-     * <pre>
-     * Obf: LDJGIJGJJBP
-     * </pre>
-     *
-     * Protobuf enum {@code PBNavMeshPoly.EdgeType}
-     */
-    public enum EdgeType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>INNER = 0;</code>
-       */
-      INNER(0),
-      /**
-       * <code>TILE_BOUND = 1;</code>
-       */
-      TILE_BOUND(1),
-      /**
-       * <code>TILE_BOUND_UNCONNECT = 2;</code>
-       */
-      TILE_BOUND_UNCONNECT(2),
-      /**
-       * <code>TILE_BOUND_OVERIDE = 3;</code>
-       */
-      TILE_BOUND_OVERIDE(3),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>INNER = 0;</code>
-       */
-      public static final int INNER_VALUE = 0;
-      /**
-       * <code>TILE_BOUND = 1;</code>
-       */
-      public static final int TILE_BOUND_VALUE = 1;
-      /**
-       * <code>TILE_BOUND_UNCONNECT = 2;</code>
-       */
-      public static final int TILE_BOUND_UNCONNECT_VALUE = 2;
-      /**
-       * <code>TILE_BOUND_OVERIDE = 3;</code>
-       */
-      public static final int TILE_BOUND_OVERIDE_VALUE = 3;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static EdgeType valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static EdgeType forNumber(int value) {
-        switch (value) {
-          case 0: return INNER;
-          case 1: return TILE_BOUND;
-          case 2: return TILE_BOUND_UNCONNECT;
-          case 3: return TILE_BOUND_OVERIDE;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<EdgeType>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          EdgeType> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<EdgeType>() {
-              public EdgeType findValueByNumber(int number) {
-                return EdgeType.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final EdgeType[] VALUES = values();
-
-      public static EdgeType valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private EdgeType(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:PBNavMeshPoly.EdgeType)
-    }
-
-    public static final int AREA_FIELD_NUMBER = 1;
-    private int area_;
-    /**
-     * <code>int32 area = 1;</code>
-     * @return The area.
-     */
-    @java.lang.Override
-    public int getArea() {
-      return area_;
-    }
-
-    public static final int EDGE_TYPES_FIELD_NUMBER = 11;
-    private java.util.List<java.lang.Integer> edgeTypes_;
-    private static final com.google.protobuf.Internal.ListAdapter.Converter<
-        java.lang.Integer, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType> edgeTypes_converter_ =
-            new com.google.protobuf.Internal.ListAdapter.Converter<
-                java.lang.Integer, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType>() {
-              public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType convert(java.lang.Integer from) {
-                @SuppressWarnings("deprecation")
-                emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType result = emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType.valueOf(from);
-                return result == null ? emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType.UNRECOGNIZED : result;
-              }
-            };
-    /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-     * @return A list containing the edgeTypes.
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType> getEdgeTypesList() {
-      return new com.google.protobuf.Internal.ListAdapter<
-          java.lang.Integer, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType>(edgeTypes_, edgeTypes_converter_);
-    }
-    /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-     * @return The count of edgeTypes.
-     */
-    @java.lang.Override
-    public int getEdgeTypesCount() {
-      return edgeTypes_.size();
-    }
-    /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-     * @param index The index of the element to return.
-     * @return The edgeTypes at the given index.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType getEdgeTypes(int index) {
-      return edgeTypes_converter_.convert(edgeTypes_.get(index));
-    }
-    /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-     * @return A list containing the enum numeric values on the wire for edgeTypes.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-    getEdgeTypesValueList() {
-      return edgeTypes_;
-    }
-    /**
-     * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-     * @param index The index of the value to return.
-     * @return The enum numeric value on the wire of edgeTypes at the given index.
-     */
-    @java.lang.Override
-    public int getEdgeTypesValue(int index) {
-      return edgeTypes_.get(index);
-    }
-    private int edgeTypesMemoizedSerializedSize;
-
-    public static final int VECTS_FIELD_NUMBER = 7;
+    public static final int VECTS_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList vects_;
     /**
-     * <code>repeated int32 vects = 7;</code>
+     * <code>repeated int32 vects = 1;</code>
      * @return A list containing the vects.
      */
     @java.lang.Override
@@ -420,14 +217,14 @@ public final class PBNavMeshPolyOuterClass {
       return vects_;
     }
     /**
-     * <code>repeated int32 vects = 7;</code>
+     * <code>repeated int32 vects = 1;</code>
      * @return The count of vects.
      */
     public int getVectsCount() {
       return vects_.size();
     }
     /**
-     * <code>repeated int32 vects = 7;</code>
+     * <code>repeated int32 vects = 1;</code>
      * @param index The index of the element to return.
      * @return The vects at the given index.
      */
@@ -436,6 +233,75 @@ public final class PBNavMeshPolyOuterClass {
     }
     private int vectsMemoizedSerializedSize = -1;
 
+    public static final int AREA_FIELD_NUMBER = 7;
+    private int area_;
+    /**
+     * <code>int32 area = 7;</code>
+     * @return The area.
+     */
+    @java.lang.Override
+    public int getArea() {
+      return area_;
+    }
+
+    public static final int EDGE_TYPES_FIELD_NUMBER = 8;
+    private java.util.List<java.lang.Integer> edgeTypes_;
+    private static final com.google.protobuf.Internal.ListAdapter.Converter<
+        java.lang.Integer, emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType> edgeTypes_converter_ =
+            new com.google.protobuf.Internal.ListAdapter.Converter<
+                java.lang.Integer, emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType>() {
+              public emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType convert(java.lang.Integer from) {
+                @SuppressWarnings("deprecation")
+                emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType result = emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType.valueOf(from);
+                return result == null ? emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType.UNRECOGNIZED : result;
+              }
+            };
+    /**
+     * <code>repeated .EdgeType edge_types = 8;</code>
+     * @return A list containing the edgeTypes.
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType> getEdgeTypesList() {
+      return new com.google.protobuf.Internal.ListAdapter<
+          java.lang.Integer, emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType>(edgeTypes_, edgeTypes_converter_);
+    }
+    /**
+     * <code>repeated .EdgeType edge_types = 8;</code>
+     * @return The count of edgeTypes.
+     */
+    @java.lang.Override
+    public int getEdgeTypesCount() {
+      return edgeTypes_.size();
+    }
+    /**
+     * <code>repeated .EdgeType edge_types = 8;</code>
+     * @param index The index of the element to return.
+     * @return The edgeTypes at the given index.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType getEdgeTypes(int index) {
+      return edgeTypes_converter_.convert(edgeTypes_.get(index));
+    }
+    /**
+     * <code>repeated .EdgeType edge_types = 8;</code>
+     * @return A list containing the enum numeric values on the wire for edgeTypes.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+    getEdgeTypesValueList() {
+      return edgeTypes_;
+    }
+    /**
+     * <code>repeated .EdgeType edge_types = 8;</code>
+     * @param index The index of the value to return.
+     * @return The enum numeric value on the wire of edgeTypes at the given index.
+     */
+    @java.lang.Override
+    public int getEdgeTypesValue(int index) {
+      return edgeTypes_.get(index);
+    }
+    private int edgeTypesMemoizedSerializedSize;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -451,18 +317,18 @@ public final class PBNavMeshPolyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (area_ != 0) {
-        output.writeInt32(1, area_);
-      }
       if (getVectsList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(vectsMemoizedSerializedSize);
       }
       for (int i = 0; i < vects_.size(); i++) {
         output.writeInt32NoTag(vects_.getInt(i));
       }
+      if (area_ != 0) {
+        output.writeInt32(7, area_);
+      }
       if (getEdgeTypesList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(edgeTypesMemoizedSerializedSize);
       }
       for (int i = 0; i < edgeTypes_.size(); i++) {
@@ -477,10 +343,6 @@ public final class PBNavMeshPolyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (area_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, area_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < vects_.size(); i++) {
@@ -495,6 +357,10 @@ public final class PBNavMeshPolyOuterClass {
         }
         vectsMemoizedSerializedSize = dataSize;
       }
+      if (area_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(7, area_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < edgeTypes_.size(); i++) {
@@ -522,11 +388,11 @@ public final class PBNavMeshPolyOuterClass {
       }
       emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly other = (emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly) obj;
 
+      if (!getVectsList()
+          .equals(other.getVectsList())) return false;
       if (getArea()
           != other.getArea()) return false;
       if (!edgeTypes_.equals(other.edgeTypes_)) return false;
-      if (!getVectsList()
-          .equals(other.getVectsList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -538,16 +404,16 @@ public final class PBNavMeshPolyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getVectsCount() > 0) {
+        hash = (37 * hash) + VECTS_FIELD_NUMBER;
+        hash = (53 * hash) + getVectsList().hashCode();
+      }
       hash = (37 * hash) + AREA_FIELD_NUMBER;
       hash = (53 * hash) + getArea();
       if (getEdgeTypesCount() > 0) {
         hash = (37 * hash) + EDGE_TYPES_FIELD_NUMBER;
         hash = (53 * hash) + edgeTypes_.hashCode();
       }
-      if (getVectsCount() > 0) {
-        hash = (37 * hash) + VECTS_FIELD_NUMBER;
-        hash = (53 * hash) + getVectsList().hashCode();
-      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -644,10 +510,6 @@ public final class PBNavMeshPolyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KFCPBANHIDH
-     * </pre>
-     *
      * Protobuf type {@code PBNavMeshPoly}
      */
     public static final class Builder extends
@@ -685,11 +547,11 @@ public final class PBNavMeshPolyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        vects_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         area_ = 0;
 
         edgeTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        vects_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
@@ -718,17 +580,17 @@ public final class PBNavMeshPolyOuterClass {
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly buildPartial() {
         emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly result = new emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly(this);
         int from_bitField0_ = bitField0_;
-        result.area_ = area_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          edgeTypes_ = java.util.Collections.unmodifiableList(edgeTypes_);
+          vects_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.edgeTypes_ = edgeTypes_;
+        result.vects_ = vects_;
+        result.area_ = area_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          vects_.makeImmutable();
+          edgeTypes_ = java.util.Collections.unmodifiableList(edgeTypes_);
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.vects_ = vects_;
+        result.edgeTypes_ = edgeTypes_;
         onBuilt();
         return result;
       }
@@ -777,29 +639,29 @@ public final class PBNavMeshPolyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly other) {
         if (other == emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.getDefaultInstance()) return this;
+        if (!other.vects_.isEmpty()) {
+          if (vects_.isEmpty()) {
+            vects_ = other.vects_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureVectsIsMutable();
+            vects_.addAll(other.vects_);
+          }
+          onChanged();
+        }
         if (other.getArea() != 0) {
           setArea(other.getArea());
         }
         if (!other.edgeTypes_.isEmpty()) {
           if (edgeTypes_.isEmpty()) {
             edgeTypes_ = other.edgeTypes_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureEdgeTypesIsMutable();
             edgeTypes_.addAll(other.edgeTypes_);
           }
           onChanged();
         }
-        if (!other.vects_.isEmpty()) {
-          if (vects_.isEmpty()) {
-            vects_ = other.vects_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureVectsIsMutable();
-            vects_.addAll(other.vects_);
-          }
-          onChanged();
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -830,202 +692,31 @@ public final class PBNavMeshPolyOuterClass {
       }
       private int bitField0_;
 
-      private int area_ ;
-      /**
-       * <code>int32 area = 1;</code>
-       * @return The area.
-       */
-      @java.lang.Override
-      public int getArea() {
-        return area_;
-      }
-      /**
-       * <code>int32 area = 1;</code>
-       * @param value The area to set.
-       * @return This builder for chaining.
-       */
-      public Builder setArea(int value) {
-        
-        area_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 area = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearArea() {
-        
-        area_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<java.lang.Integer> edgeTypes_ =
-        java.util.Collections.emptyList();
-      private void ensureEdgeTypesIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          edgeTypes_ = new java.util.ArrayList<java.lang.Integer>(edgeTypes_);
-          bitField0_ |= 0x00000001;
-        }
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @return A list containing the edgeTypes.
-       */
-      public java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType> getEdgeTypesList() {
-        return new com.google.protobuf.Internal.ListAdapter<
-            java.lang.Integer, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType>(edgeTypes_, edgeTypes_converter_);
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @return The count of edgeTypes.
-       */
-      public int getEdgeTypesCount() {
-        return edgeTypes_.size();
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param index The index of the element to return.
-       * @return The edgeTypes at the given index.
-       */
-      public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType getEdgeTypes(int index) {
-        return edgeTypes_converter_.convert(edgeTypes_.get(index));
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param index The index to set the value at.
-       * @param value The edgeTypes to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEdgeTypes(
-          int index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureEdgeTypesIsMutable();
-        edgeTypes_.set(index, value.getNumber());
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param value The edgeTypes to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEdgeTypes(emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        ensureEdgeTypesIsMutable();
-        edgeTypes_.add(value.getNumber());
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param values The edgeTypes to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEdgeTypes(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType> values) {
-        ensureEdgeTypesIsMutable();
-        for (emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.EdgeType value : values) {
-          edgeTypes_.add(value.getNumber());
-        }
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEdgeTypes() {
-        edgeTypes_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @return A list containing the enum numeric values on the wire for edgeTypes.
-       */
-      public java.util.List<java.lang.Integer>
-      getEdgeTypesValueList() {
-        return java.util.Collections.unmodifiableList(edgeTypes_);
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param index The index of the value to return.
-       * @return The enum numeric value on the wire of edgeTypes at the given index.
-       */
-      public int getEdgeTypesValue(int index) {
-        return edgeTypes_.get(index);
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param index The index of the value to return.
-       * @return The enum numeric value on the wire of edgeTypes at the given index.
-       * @return This builder for chaining.
-       */
-      public Builder setEdgeTypesValue(
-          int index, int value) {
-        ensureEdgeTypesIsMutable();
-        edgeTypes_.set(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param value The enum numeric value on the wire for edgeTypes to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEdgeTypesValue(int value) {
-        ensureEdgeTypesIsMutable();
-        edgeTypes_.add(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated .PBNavMeshPoly.EdgeType edge_types = 11;</code>
-       * @param values The enum numeric values on the wire for edgeTypes to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEdgeTypesValue(
-          java.lang.Iterable<java.lang.Integer> values) {
-        ensureEdgeTypesIsMutable();
-        for (int value : values) {
-          edgeTypes_.add(value);
-        }
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList vects_ = emptyIntList();
       private void ensureVectsIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           vects_ = mutableCopy(vects_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @return A list containing the vects.
        */
       public java.util.List<java.lang.Integer>
           getVectsList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(vects_) : vects_;
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @return The count of vects.
        */
       public int getVectsCount() {
         return vects_.size();
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @param index The index of the element to return.
        * @return The vects at the given index.
        */
@@ -1033,7 +724,7 @@ public final class PBNavMeshPolyOuterClass {
         return vects_.getInt(index);
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @param index The index to set the value at.
        * @param value The vects to set.
        * @return This builder for chaining.
@@ -1046,7 +737,7 @@ public final class PBNavMeshPolyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @param value The vects to add.
        * @return This builder for chaining.
        */
@@ -1057,7 +748,7 @@ public final class PBNavMeshPolyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @param values The vects to add.
        * @return This builder for chaining.
        */
@@ -1070,15 +761,186 @@ public final class PBNavMeshPolyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 vects = 7;</code>
+       * <code>repeated int32 vects = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearVects() {
         vects_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int area_ ;
+      /**
+       * <code>int32 area = 7;</code>
+       * @return The area.
+       */
+      @java.lang.Override
+      public int getArea() {
+        return area_;
+      }
+      /**
+       * <code>int32 area = 7;</code>
+       * @param value The area to set.
+       * @return This builder for chaining.
+       */
+      public Builder setArea(int value) {
+        
+        area_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 area = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearArea() {
+        
+        area_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<java.lang.Integer> edgeTypes_ =
+        java.util.Collections.emptyList();
+      private void ensureEdgeTypesIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          edgeTypes_ = new java.util.ArrayList<java.lang.Integer>(edgeTypes_);
+          bitField0_ |= 0x00000002;
+        }
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @return A list containing the edgeTypes.
+       */
+      public java.util.List<emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType> getEdgeTypesList() {
+        return new com.google.protobuf.Internal.ListAdapter<
+            java.lang.Integer, emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType>(edgeTypes_, edgeTypes_converter_);
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @return The count of edgeTypes.
+       */
+      public int getEdgeTypesCount() {
+        return edgeTypes_.size();
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param index The index of the element to return.
+       * @return The edgeTypes at the given index.
+       */
+      public emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType getEdgeTypes(int index) {
+        return edgeTypes_converter_.convert(edgeTypes_.get(index));
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The edgeTypes to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEdgeTypes(
+          int index, emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureEdgeTypesIsMutable();
+        edgeTypes_.set(index, value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param value The edgeTypes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addEdgeTypes(emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        ensureEdgeTypesIsMutable();
+        edgeTypes_.add(value.getNumber());
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param values The edgeTypes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllEdgeTypes(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType> values) {
+        ensureEdgeTypesIsMutable();
+        for (emu.grasscutter.net.proto.EdgeTypeOuterClass.EdgeType value : values) {
+          edgeTypes_.add(value.getNumber());
+        }
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEdgeTypes() {
+        edgeTypes_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @return A list containing the enum numeric values on the wire for edgeTypes.
+       */
+      public java.util.List<java.lang.Integer>
+      getEdgeTypesValueList() {
+        return java.util.Collections.unmodifiableList(edgeTypes_);
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param index The index of the value to return.
+       * @return The enum numeric value on the wire of edgeTypes at the given index.
+       */
+      public int getEdgeTypesValue(int index) {
+        return edgeTypes_.get(index);
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param index The index of the value to return.
+       * @return The enum numeric value on the wire of edgeTypes at the given index.
+       * @return This builder for chaining.
+       */
+      public Builder setEdgeTypesValue(
+          int index, int value) {
+        ensureEdgeTypesIsMutable();
+        edgeTypes_.set(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param value The enum numeric value on the wire for edgeTypes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addEdgeTypesValue(int value) {
+        ensureEdgeTypesIsMutable();
+        edgeTypes_.add(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated .EdgeType edge_types = 8;</code>
+       * @param values The enum numeric values on the wire for edgeTypes to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllEdgeTypesValue(
+          java.lang.Iterable<java.lang.Integer> values) {
+        ensureEdgeTypesIsMutable();
+        for (int value : values) {
+          edgeTypes_.add(value);
+        }
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1146,23 +1008,23 @@ public final class PBNavMeshPolyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023PBNavMeshPoly.proto\"\262\001\n\rPBNavMeshPoly\022" +
-      "\014\n\004area\030\001 \001(\005\022+\n\nedge_types\030\013 \003(\0162\027.PBNa" +
-      "vMeshPoly.EdgeType\022\r\n\005vects\030\007 \003(\005\"W\n\010Edg" +
-      "eType\022\t\n\005INNER\020\000\022\016\n\nTILE_BOUND\020\001\022\030\n\024TILE" +
-      "_BOUND_UNCONNECT\020\002\022\026\n\022TILE_BOUND_OVERIDE" +
-      "\020\003B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\023PBNavMeshPoly.proto\032\016EdgeType.proto\"K\n" +
+      "\rPBNavMeshPoly\022\r\n\005vects\030\001 \003(\005\022\014\n\004area\030\007 " +
+      "\001(\005\022\035\n\nedge_types\030\010 \003(\0162\t.EdgeTypeB\033\n\031em" +
+      "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.EdgeTypeOuterClass.getDescriptor(),
         });
     internal_static_PBNavMeshPoly_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PBNavMeshPoly_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PBNavMeshPoly_descriptor,
-        new java.lang.String[] { "Area", "EdgeTypes", "Vects", });
+        new java.lang.String[] { "Vects", "Area", "EdgeTypes", });
+    emu.grasscutter.net.proto.EdgeTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshTileOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshTileOuterClass.java
index a49ce06f2..f73e0fa79 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshTileOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PBNavMeshTileOuterClass.java
@@ -19,58 +19,54 @@ public final class PBNavMeshTileOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
-        getVecsList();
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index);
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    int getVecsCount();
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getVecsOrBuilderList();
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> 
         getPolysList();
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly getPolys(int index);
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     int getPolysCount();
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder> 
         getPolysOrBuilderList();
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder getPolysOrBuilder(
         int index);
+
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
+        getVecsList();
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index);
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    int getVecsCount();
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getVecsOrBuilderList();
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * Obf: PPNJOACGDIN
-   * </pre>
-   *
    * Protobuf type {@code PBNavMeshTile}
    */
   public static final class PBNavMeshTile extends
@@ -83,8 +79,8 @@ public final class PBNavMeshTileOuterClass {
       super(builder);
     }
     private PBNavMeshTile() {
-      vecs_ = java.util.Collections.emptyList();
       polys_ = java.util.Collections.emptyList();
+      vecs_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -118,24 +114,24 @@ public final class PBNavMeshTileOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                vecs_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              vecs_.add(
-                  input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry));
-              break;
-            }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 polys_ = new java.util.ArrayList<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               polys_.add(
                   input.readMessage(emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.parser(), extensionRegistry));
               break;
             }
+            case 114: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                vecs_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              vecs_.add(
+                  input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -152,10 +148,10 @@ public final class PBNavMeshTileOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          vecs_ = java.util.Collections.unmodifiableList(vecs_);
+          polys_ = java.util.Collections.unmodifiableList(polys_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          polys_ = java.util.Collections.unmodifiableList(polys_);
+          vecs_ = java.util.Collections.unmodifiableList(vecs_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -174,57 +170,17 @@ public final class PBNavMeshTileOuterClass {
               emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.class, emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.Builder.class);
     }
 
-    public static final int VECS_FIELD_NUMBER = 3;
-    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> vecs_;
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getVecsList() {
-      return vecs_;
-    }
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getVecsOrBuilderList() {
-      return vecs_;
-    }
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    @java.lang.Override
-    public int getVecsCount() {
-      return vecs_.size();
-    }
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index) {
-      return vecs_.get(index);
-    }
-    /**
-     * <code>repeated .Vector vecs = 3;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
-        int index) {
-      return vecs_.get(index);
-    }
-
-    public static final int POLYS_FIELD_NUMBER = 5;
+    public static final int POLYS_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> polys_;
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> getPolysList() {
       return polys_;
     }
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder> 
@@ -232,21 +188,21 @@ public final class PBNavMeshTileOuterClass {
       return polys_;
     }
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     @java.lang.Override
     public int getPolysCount() {
       return polys_.size();
     }
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly getPolys(int index) {
       return polys_.get(index);
     }
     /**
-     * <code>repeated .PBNavMeshPoly polys = 5;</code>
+     * <code>repeated .PBNavMeshPoly polys = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder getPolysOrBuilder(
@@ -254,6 +210,46 @@ public final class PBNavMeshTileOuterClass {
       return polys_.get(index);
     }
 
+    public static final int VECS_FIELD_NUMBER = 14;
+    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> vecs_;
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getVecsList() {
+      return vecs_;
+    }
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getVecsOrBuilderList() {
+      return vecs_;
+    }
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    @java.lang.Override
+    public int getVecsCount() {
+      return vecs_.size();
+    }
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index) {
+      return vecs_.get(index);
+    }
+    /**
+     * <code>repeated .Vector vecs = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
+        int index) {
+      return vecs_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -268,11 +264,11 @@ public final class PBNavMeshTileOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < vecs_.size(); i++) {
-        output.writeMessage(3, vecs_.get(i));
-      }
       for (int i = 0; i < polys_.size(); i++) {
-        output.writeMessage(5, polys_.get(i));
+        output.writeMessage(2, polys_.get(i));
+      }
+      for (int i = 0; i < vecs_.size(); i++) {
+        output.writeMessage(14, vecs_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -283,13 +279,13 @@ public final class PBNavMeshTileOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < vecs_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, vecs_.get(i));
-      }
       for (int i = 0; i < polys_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, polys_.get(i));
+          .computeMessageSize(2, polys_.get(i));
+      }
+      for (int i = 0; i < vecs_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, vecs_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -306,10 +302,10 @@ public final class PBNavMeshTileOuterClass {
       }
       emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile other = (emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile) obj;
 
-      if (!getVecsList()
-          .equals(other.getVecsList())) return false;
       if (!getPolysList()
           .equals(other.getPolysList())) return false;
+      if (!getVecsList()
+          .equals(other.getVecsList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -321,14 +317,14 @@ public final class PBNavMeshTileOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getVecsCount() > 0) {
-        hash = (37 * hash) + VECS_FIELD_NUMBER;
-        hash = (53 * hash) + getVecsList().hashCode();
-      }
       if (getPolysCount() > 0) {
         hash = (37 * hash) + POLYS_FIELD_NUMBER;
         hash = (53 * hash) + getPolysList().hashCode();
       }
+      if (getVecsCount() > 0) {
+        hash = (37 * hash) + VECS_FIELD_NUMBER;
+        hash = (53 * hash) + getVecsList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -425,10 +421,6 @@ public final class PBNavMeshTileOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PPNJOACGDIN
-     * </pre>
-     *
      * Protobuf type {@code PBNavMeshTile}
      */
     public static final class Builder extends
@@ -461,25 +453,25 @@ public final class PBNavMeshTileOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getVecsFieldBuilder();
           getPolysFieldBuilder();
+          getVecsFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (vecsBuilder_ == null) {
-          vecs_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          vecsBuilder_.clear();
-        }
         if (polysBuilder_ == null) {
           polys_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           polysBuilder_.clear();
         }
+        if (vecsBuilder_ == null) {
+          vecs_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          vecsBuilder_.clear();
+        }
         return this;
       }
 
@@ -507,24 +499,24 @@ public final class PBNavMeshTileOuterClass {
       public emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile buildPartial() {
         emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile result = new emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile(this);
         int from_bitField0_ = bitField0_;
-        if (vecsBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            vecs_ = java.util.Collections.unmodifiableList(vecs_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.vecs_ = vecs_;
-        } else {
-          result.vecs_ = vecsBuilder_.build();
-        }
         if (polysBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             polys_ = java.util.Collections.unmodifiableList(polys_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.polys_ = polys_;
         } else {
           result.polys_ = polysBuilder_.build();
         }
+        if (vecsBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            vecs_ = java.util.Collections.unmodifiableList(vecs_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.vecs_ = vecs_;
+        } else {
+          result.vecs_ = vecsBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -573,37 +565,11 @@ public final class PBNavMeshTileOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile other) {
         if (other == emu.grasscutter.net.proto.PBNavMeshTileOuterClass.PBNavMeshTile.getDefaultInstance()) return this;
-        if (vecsBuilder_ == null) {
-          if (!other.vecs_.isEmpty()) {
-            if (vecs_.isEmpty()) {
-              vecs_ = other.vecs_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureVecsIsMutable();
-              vecs_.addAll(other.vecs_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.vecs_.isEmpty()) {
-            if (vecsBuilder_.isEmpty()) {
-              vecsBuilder_.dispose();
-              vecsBuilder_ = null;
-              vecs_ = other.vecs_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              vecsBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getVecsFieldBuilder() : null;
-            } else {
-              vecsBuilder_.addAllMessages(other.vecs_);
-            }
-          }
-        }
         if (polysBuilder_ == null) {
           if (!other.polys_.isEmpty()) {
             if (polys_.isEmpty()) {
               polys_ = other.polys_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensurePolysIsMutable();
               polys_.addAll(other.polys_);
@@ -616,7 +582,7 @@ public final class PBNavMeshTileOuterClass {
               polysBuilder_.dispose();
               polysBuilder_ = null;
               polys_ = other.polys_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               polysBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPolysFieldBuilder() : null;
@@ -625,6 +591,32 @@ public final class PBNavMeshTileOuterClass {
             }
           }
         }
+        if (vecsBuilder_ == null) {
+          if (!other.vecs_.isEmpty()) {
+            if (vecs_.isEmpty()) {
+              vecs_ = other.vecs_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureVecsIsMutable();
+              vecs_.addAll(other.vecs_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.vecs_.isEmpty()) {
+            if (vecsBuilder_.isEmpty()) {
+              vecsBuilder_.dispose();
+              vecsBuilder_ = null;
+              vecs_ = other.vecs_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              vecsBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getVecsFieldBuilder() : null;
+            } else {
+              vecsBuilder_.addAllMessages(other.vecs_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -655,252 +647,12 @@ public final class PBNavMeshTileOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> vecs_ =
-        java.util.Collections.emptyList();
-      private void ensureVecsIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          vecs_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>(vecs_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> vecsBuilder_;
-
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getVecsList() {
-        if (vecsBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(vecs_);
-        } else {
-          return vecsBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public int getVecsCount() {
-        if (vecsBuilder_ == null) {
-          return vecs_.size();
-        } else {
-          return vecsBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index) {
-        if (vecsBuilder_ == null) {
-          return vecs_.get(index);
-        } else {
-          return vecsBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder setVecs(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (vecsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureVecsIsMutable();
-          vecs_.set(index, value);
-          onChanged();
-        } else {
-          vecsBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder setVecs(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (vecsBuilder_ == null) {
-          ensureVecsIsMutable();
-          vecs_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          vecsBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder addVecs(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (vecsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureVecsIsMutable();
-          vecs_.add(value);
-          onChanged();
-        } else {
-          vecsBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder addVecs(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (vecsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureVecsIsMutable();
-          vecs_.add(index, value);
-          onChanged();
-        } else {
-          vecsBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder addVecs(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (vecsBuilder_ == null) {
-          ensureVecsIsMutable();
-          vecs_.add(builderForValue.build());
-          onChanged();
-        } else {
-          vecsBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder addVecs(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (vecsBuilder_ == null) {
-          ensureVecsIsMutable();
-          vecs_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          vecsBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder addAllVecs(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
-        if (vecsBuilder_ == null) {
-          ensureVecsIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, vecs_);
-          onChanged();
-        } else {
-          vecsBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder clearVecs() {
-        if (vecsBuilder_ == null) {
-          vecs_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          vecsBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public Builder removeVecs(int index) {
-        if (vecsBuilder_ == null) {
-          ensureVecsIsMutable();
-          vecs_.remove(index);
-          onChanged();
-        } else {
-          vecsBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVecsBuilder(
-          int index) {
-        return getVecsFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
-          int index) {
-        if (vecsBuilder_ == null) {
-          return vecs_.get(index);  } else {
-          return vecsBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-           getVecsOrBuilderList() {
-        if (vecsBuilder_ != null) {
-          return vecsBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(vecs_);
-        }
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addVecsBuilder() {
-        return getVecsFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addVecsBuilder(
-          int index) {
-        return getVecsFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Vector vecs = 3;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
-           getVecsBuilderList() {
-        return getVecsFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getVecsFieldBuilder() {
-        if (vecsBuilder_ == null) {
-          vecsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  vecs_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          vecs_ = null;
-        }
-        return vecsBuilder_;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> polys_ =
         java.util.Collections.emptyList();
       private void ensurePolysIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           polys_ = new java.util.ArrayList<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly>(polys_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -908,7 +660,7 @@ public final class PBNavMeshTileOuterClass {
           emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder> polysBuilder_;
 
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> getPolysList() {
         if (polysBuilder_ == null) {
@@ -918,7 +670,7 @@ public final class PBNavMeshTileOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public int getPolysCount() {
         if (polysBuilder_ == null) {
@@ -928,7 +680,7 @@ public final class PBNavMeshTileOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly getPolys(int index) {
         if (polysBuilder_ == null) {
@@ -938,7 +690,7 @@ public final class PBNavMeshTileOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder setPolys(
           int index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly value) {
@@ -955,7 +707,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder setPolys(
           int index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder builderForValue) {
@@ -969,7 +721,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder addPolys(emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly value) {
         if (polysBuilder_ == null) {
@@ -985,7 +737,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder addPolys(
           int index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly value) {
@@ -1002,7 +754,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder addPolys(
           emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder builderForValue) {
@@ -1016,7 +768,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder addPolys(
           int index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder builderForValue) {
@@ -1030,7 +782,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder addAllPolys(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly> values) {
@@ -1045,12 +797,12 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder clearPolys() {
         if (polysBuilder_ == null) {
           polys_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           polysBuilder_.clear();
@@ -1058,7 +810,7 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public Builder removePolys(int index) {
         if (polysBuilder_ == null) {
@@ -1071,14 +823,14 @@ public final class PBNavMeshTileOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder getPolysBuilder(
           int index) {
         return getPolysFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder getPolysOrBuilder(
           int index) {
@@ -1088,7 +840,7 @@ public final class PBNavMeshTileOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder> 
            getPolysOrBuilderList() {
@@ -1099,14 +851,14 @@ public final class PBNavMeshTileOuterClass {
         }
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder addPolysBuilder() {
         return getPolysFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.getDefaultInstance());
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder addPolysBuilder(
           int index) {
@@ -1114,7 +866,7 @@ public final class PBNavMeshTileOuterClass {
             index, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.getDefaultInstance());
       }
       /**
-       * <code>repeated .PBNavMeshPoly polys = 5;</code>
+       * <code>repeated .PBNavMeshPoly polys = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder> 
            getPolysBuilderList() {
@@ -1127,13 +879,253 @@ public final class PBNavMeshTileOuterClass {
           polysBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPoly.Builder, emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.PBNavMeshPolyOrBuilder>(
                   polys_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           polys_ = null;
         }
         return polysBuilder_;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> vecs_ =
+        java.util.Collections.emptyList();
+      private void ensureVecsIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          vecs_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>(vecs_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> vecsBuilder_;
+
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getVecsList() {
+        if (vecsBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(vecs_);
+        } else {
+          return vecsBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public int getVecsCount() {
+        if (vecsBuilder_ == null) {
+          return vecs_.size();
+        } else {
+          return vecsBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getVecs(int index) {
+        if (vecsBuilder_ == null) {
+          return vecs_.get(index);
+        } else {
+          return vecsBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder setVecs(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vecsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureVecsIsMutable();
+          vecs_.set(index, value);
+          onChanged();
+        } else {
+          vecsBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder setVecs(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (vecsBuilder_ == null) {
+          ensureVecsIsMutable();
+          vecs_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          vecsBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder addVecs(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vecsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureVecsIsMutable();
+          vecs_.add(value);
+          onChanged();
+        } else {
+          vecsBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder addVecs(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vecsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureVecsIsMutable();
+          vecs_.add(index, value);
+          onChanged();
+        } else {
+          vecsBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder addVecs(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (vecsBuilder_ == null) {
+          ensureVecsIsMutable();
+          vecs_.add(builderForValue.build());
+          onChanged();
+        } else {
+          vecsBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder addVecs(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (vecsBuilder_ == null) {
+          ensureVecsIsMutable();
+          vecs_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          vecsBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder addAllVecs(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
+        if (vecsBuilder_ == null) {
+          ensureVecsIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, vecs_);
+          onChanged();
+        } else {
+          vecsBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder clearVecs() {
+        if (vecsBuilder_ == null) {
+          vecs_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          vecsBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public Builder removeVecs(int index) {
+        if (vecsBuilder_ == null) {
+          ensureVecsIsMutable();
+          vecs_.remove(index);
+          onChanged();
+        } else {
+          vecsBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVecsBuilder(
+          int index) {
+        return getVecsFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVecsOrBuilder(
+          int index) {
+        if (vecsBuilder_ == null) {
+          return vecs_.get(index);  } else {
+          return vecsBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+           getVecsOrBuilderList() {
+        if (vecsBuilder_ != null) {
+          return vecsBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(vecs_);
+        }
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addVecsBuilder() {
+        return getVecsFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addVecsBuilder(
+          int index) {
+        return getVecsFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Vector vecs = 14;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
+           getVecsBuilderList() {
+        return getVecsFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+          getVecsFieldBuilder() {
+        if (vecsBuilder_ == null) {
+          vecsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  vecs_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          vecs_ = null;
+        }
+        return vecsBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1201,26 +1193,26 @@ public final class PBNavMeshTileOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023PBNavMeshTile.proto\032\014Vector.proto\032\023PBN" +
-      "avMeshPoly.proto\"E\n\rPBNavMeshTile\022\025\n\004vec" +
-      "s\030\003 \003(\0132\007.Vector\022\035\n\005polys\030\005 \003(\0132\016.PBNavM" +
-      "eshPolyB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "\n\023PBNavMeshTile.proto\032\023PBNavMeshPoly.pro" +
+      "to\032\014Vector.proto\"E\n\rPBNavMeshTile\022\035\n\005pol" +
+      "ys\030\002 \003(\0132\016.PBNavMeshPoly\022\025\n\004vecs\030\016 \003(\0132\007" +
+      ".VectorB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
         });
     internal_static_PBNavMeshTile_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PBNavMeshTile_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PBNavMeshTile_descriptor,
-        new java.lang.String[] { "Vecs", "Polys", });
-    emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+        new java.lang.String[] { "Polys", "Vecs", });
     emu.grasscutter.net.proto.PBNavMeshPolyOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java
index afcc15cff..33bac4a21 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ParamListOuterClass.java
@@ -37,7 +37,7 @@ public final class ParamListOuterClass {
   }
   /**
    * <pre>
-   * Obf: BLCNFAPGDKG
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ParamList}
@@ -344,7 +344,7 @@ public final class ParamListOuterClass {
     }
     /**
      * <pre>
-     * Obf: BLCNFAPGDKG
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ParamList}
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 3fa25aae5..141c292e4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestOuterClass.java
@@ -19,118 +19,126 @@ public final class ParentQuestOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 video_key = 4;</code>
-     * @return The videoKey.
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * @return Whether the randomInfo field is set.
      */
-    long getVideoKey();
+    boolean hasRandomInfo();
+    /**
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * @return The randomInfo.
+     */
+    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo();
+    /**
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     */
+    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder();
 
     /**
-     * <code>uint32 parent_quest_state = 8;</code>
-     * @return The parentQuestState.
-     */
-    int getParentQuestState();
-
-    /**
-     * <code>uint32 quest_var_seq = 15;</code>
-     * @return The questVarSeq.
-     */
-    int getQuestVarSeq();
-
-    /**
-     * <code>bool is_random = 11;</code>
-     * @return The isRandom.
-     */
-    boolean getIsRandom();
-
-    /**
-     * <code>uint32 accept_time = 3;</code>
-     * @return The acceptTime.
-     */
-    int getAcceptTime();
-
-    /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> 
         getChildQuestListList();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index);
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     int getChildQuestListCount();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
         getChildQuestListOrBuilderList();
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
         int index);
 
     /**
-     * <code>repeated int32 quest_var = 7;</code>
-     * @return A list containing the questVar.
+     * <code>uint32 quest_var_seq = 3;</code>
+     * @return The questVarSeq.
      */
-    java.util.List<java.lang.Integer> getQuestVarList();
-    /**
-     * <code>repeated int32 quest_var = 7;</code>
-     * @return The count of questVar.
-     */
-    int getQuestVarCount();
-    /**
-     * <code>repeated int32 quest_var = 7;</code>
-     * @param index The index of the element to return.
-     * @return The questVar at the given index.
-     */
-    int getQuestVar(int index);
+    int getQuestVarSeq();
 
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>uint32 parent_quest_state = 4;</code>
+     * @return The parentQuestState.
+     */
+    int getParentQuestState();
+
+    /**
+     * <code>bool is_random = 5;</code>
+     * @return The isRandom.
+     */
+    boolean getIsRandom();
+
+    /**
+     * <code>bool MGIJFMCBJKE = 6;</code>
+     * @return The mGIJFMCBJKE.
+     */
+    boolean getMGIJFMCBJKE();
+
+    /**
+     * <code>uint32 accept_time = 7;</code>
+     * @return The acceptTime.
+     */
+    int getAcceptTime();
+
+    /**
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> 
         getInferencePageListList();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index);
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     int getInferencePageListCount();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
         getInferencePageListOrBuilderList();
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
         int index);
 
     /**
-     * <code>bool is_finished = 14;</code>
-     * @return The isFinished.
-     */
-    boolean getIsFinished();
-
-    /**
-     * <code>uint32 parent_quest_id = 5;</code>
+     * <code>uint32 parent_quest_id = 9;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>bool CKJMKGOKNED = 10;</code>
+     * @return The cKJMKGOKNED.
+     */
+    boolean getCKJMKGOKNED();
+
+    /**
+     * <pre>
+     *repeated DJJEGLDMNAG AHHODEACDAL = 11;
+     * </pre>
+     *
+     * <code>bool is_finished = 12;</code>
+     * @return The isFinished.
+     */
+    boolean getIsFinished();
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     int getTimeVarMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     boolean containsTimeVarMap(
         int key);
@@ -141,44 +149,48 @@ public final class ParentQuestOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getTimeVarMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getTimeVarMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
 
     int getTimeVarMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
 
     int getTimeVarMapOrThrow(
         int key);
 
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
-     * @return Whether the randomInfo field is set.
+     * <code>repeated int32 quest_var = 14;</code>
+     * @return A list containing the questVar.
      */
-    boolean hasRandomInfo();
+    java.util.List<java.lang.Integer> getQuestVarList();
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
-     * @return The randomInfo.
+     * <code>repeated int32 quest_var = 14;</code>
+     * @return The count of questVar.
      */
-    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo();
+    int getQuestVarCount();
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
+     * <code>repeated int32 quest_var = 14;</code>
+     * @param index The index of the element to return.
+     * @return The questVar at the given index.
      */
-    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder();
+    int getQuestVar(int index);
+
+    /**
+     * <code>uint64 video_key = 15;</code>
+     * @return The videoKey.
+     */
+    long getVideoKey();
   }
   /**
-   * <pre>
-   * Obf: HJOGPKJDLID
-   * </pre>
-   *
    * Protobuf type {@code ParentQuest}
    */
   public static final class ParentQuest extends
@@ -192,8 +204,8 @@ public final class ParentQuestOuterClass {
     }
     private ParentQuest() {
       childQuestList_ = java.util.Collections.emptyList();
-      questVar_ = emptyIntList();
       inferencePageList_ = java.util.Collections.emptyList();
+      questVar_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -228,15 +240,6 @@ public final class ParentQuestOuterClass {
               done = true;
               break;
             case 10: {
-              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));
-              break;
-            }
-            case 18: {
               emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder subBuilder = null;
               if (randomInfo_ != null) {
                 subBuilder = randomInfo_.toBuilder();
@@ -249,61 +252,69 @@ public final class ParentQuestOuterClass {
 
               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));
+              break;
+            }
             case 24: {
 
-              acceptTime_ = input.readUInt32();
+              questVarSeq_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              videoKey_ = input.readUInt64();
+              parentQuestState_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              parentQuestId_ = input.readUInt32();
+              isRandom_ = input.readBool();
+              break;
+            }
+            case 48: {
+
+              mGIJFMCBJKE_ = input.readBool();
               break;
             }
             case 56: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                questVar_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              questVar_.addInt(input.readInt32());
-              break;
-            }
-            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 64: {
 
-              parentQuestState_ = input.readUInt32();
+              acceptTime_ = input.readUInt32();
               break;
             }
-            case 74: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 inferencePageList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo>();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               inferencePageList_.add(
                   input.readMessage(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.parser(), extensionRegistry));
               break;
             }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+            case 72: {
+
+              parentQuestId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              cKJMKGOKNED_ = input.readBool();
+              break;
+            }
+            case 96: {
+
+              isFinished_ = input.readBool();
+              break;
+            }
+            case 106: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 timeVarMap_ = com.google.protobuf.MapField.newMapField(
                     TimeVarMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000004;
               }
               com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
               timeVarMap__ = input.readMessage(
@@ -312,19 +323,30 @@ public final class ParentQuestOuterClass {
                   timeVarMap__.getKey(), timeVarMap__.getValue());
               break;
             }
-            case 88: {
-
-              isRandom_ = input.readBool();
+            case 112: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                questVar_ = newIntList();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              questVar_.addInt(input.readInt32());
               break;
             }
-            case 112: {
-
-              isFinished_ = input.readBool();
+            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: {
 
-              questVarSeq_ = input.readUInt32();
+              videoKey_ = input.readUInt64();
               break;
             }
             default: {
@@ -346,11 +368,11 @@ public final class ParentQuestOuterClass {
           childQuestList_ = java.util.Collections.unmodifiableList(childQuestList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          questVar_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
         }
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          questVar_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -365,7 +387,7 @@ public final class ParentQuestOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 10:
+        case 13:
           return internalGetTimeVarMap();
         default:
           throw new RuntimeException(
@@ -380,72 +402,43 @@ public final class ParentQuestOuterClass {
               emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.class, emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.Builder.class);
     }
 
-    public static final int VIDEO_KEY_FIELD_NUMBER = 4;
-    private long videoKey_;
+    public static final int RANDOM_INFO_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
     /**
-     * <code>uint64 video_key = 4;</code>
-     * @return The videoKey.
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * @return Whether the randomInfo field is set.
      */
     @java.lang.Override
-    public long getVideoKey() {
-      return videoKey_;
+    public boolean hasRandomInfo() {
+      return randomInfo_ != null;
     }
-
-    public static final int PARENT_QUEST_STATE_FIELD_NUMBER = 8;
-    private int parentQuestState_;
     /**
-     * <code>uint32 parent_quest_state = 8;</code>
-     * @return The parentQuestState.
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
+     * @return The randomInfo.
      */
     @java.lang.Override
-    public int getParentQuestState() {
-      return parentQuestState_;
+    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
+      return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
     }
-
-    public static final int QUEST_VAR_SEQ_FIELD_NUMBER = 15;
-    private int questVarSeq_;
     /**
-     * <code>uint32 quest_var_seq = 15;</code>
-     * @return The questVarSeq.
+     * <code>.ParentQuestRandomInfo random_info = 1;</code>
      */
     @java.lang.Override
-    public int getQuestVarSeq() {
-      return questVarSeq_;
+    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
+      return getRandomInfo();
     }
 
-    public static final int IS_RANDOM_FIELD_NUMBER = 11;
-    private boolean isRandom_;
-    /**
-     * <code>bool is_random = 11;</code>
-     * @return The isRandom.
-     */
-    @java.lang.Override
-    public boolean getIsRandom() {
-      return isRandom_;
-    }
-
-    public static final int ACCEPT_TIME_FIELD_NUMBER = 3;
-    private int acceptTime_;
-    /**
-     * <code>uint32 accept_time = 3;</code>
-     * @return The acceptTime.
-     */
-    @java.lang.Override
-    public int getAcceptTime() {
-      return acceptTime_;
-    }
-
-    public static final int CHILD_QUEST_LIST_FIELD_NUMBER = 1;
+    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 = 1;</code>
+     * <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 = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
@@ -453,21 +446,21 @@ public final class ParentQuestOuterClass {
       return childQuestList_;
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     @java.lang.Override
     public int getChildQuestListCount() {
       return childQuestList_.size();
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
       return childQuestList_.get(index);
     }
     /**
-     * <code>repeated .ChildQuest child_quest_list = 1;</code>
+     * <code>repeated .ChildQuest child_quest_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
@@ -475,45 +468,72 @@ public final class ParentQuestOuterClass {
       return childQuestList_.get(index);
     }
 
-    public static final int QUEST_VAR_FIELD_NUMBER = 7;
-    private com.google.protobuf.Internal.IntList questVar_;
+    public static final int QUEST_VAR_SEQ_FIELD_NUMBER = 3;
+    private int questVarSeq_;
     /**
-     * <code>repeated int32 quest_var = 7;</code>
-     * @return A list containing the questVar.
+     * <code>uint32 quest_var_seq = 3;</code>
+     * @return The questVarSeq.
      */
     @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getQuestVarList() {
-      return questVar_;
+    public int getQuestVarSeq() {
+      return questVarSeq_;
     }
-    /**
-     * <code>repeated int32 quest_var = 7;</code>
-     * @return The count of questVar.
-     */
-    public int getQuestVarCount() {
-      return questVar_.size();
-    }
-    /**
-     * <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);
-    }
-    private int questVarMemoizedSerializedSize = -1;
 
-    public static final int INFERENCE_PAGE_LIST_FIELD_NUMBER = 9;
+    public static final int PARENT_QUEST_STATE_FIELD_NUMBER = 4;
+    private int parentQuestState_;
+    /**
+     * <code>uint32 parent_quest_state = 4;</code>
+     * @return The parentQuestState.
+     */
+    @java.lang.Override
+    public int getParentQuestState() {
+      return parentQuestState_;
+    }
+
+    public static final int IS_RANDOM_FIELD_NUMBER = 5;
+    private boolean isRandom_;
+    /**
+     * <code>bool is_random = 5;</code>
+     * @return The isRandom.
+     */
+    @java.lang.Override
+    public boolean getIsRandom() {
+      return isRandom_;
+    }
+
+    public static final int MGIJFMCBJKE_FIELD_NUMBER = 6;
+    private boolean mGIJFMCBJKE_;
+    /**
+     * <code>bool MGIJFMCBJKE = 6;</code>
+     * @return The mGIJFMCBJKE.
+     */
+    @java.lang.Override
+    public boolean getMGIJFMCBJKE() {
+      return mGIJFMCBJKE_;
+    }
+
+    public static final int ACCEPT_TIME_FIELD_NUMBER = 7;
+    private int acceptTime_;
+    /**
+     * <code>uint32 accept_time = 7;</code>
+     * @return The acceptTime.
+     */
+    @java.lang.Override
+    public int getAcceptTime() {
+      return acceptTime_;
+    }
+
+    public static final int INFERENCE_PAGE_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> inferencePageList_;
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> getInferencePageListList() {
       return inferencePageList_;
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
@@ -521,21 +541,21 @@ public final class ParentQuestOuterClass {
       return inferencePageList_;
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     @java.lang.Override
     public int getInferencePageListCount() {
       return inferencePageList_.size();
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index) {
       return inferencePageList_.get(index);
     }
     /**
-     * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+     * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
@@ -543,21 +563,10 @@ public final class ParentQuestOuterClass {
       return inferencePageList_.get(index);
     }
 
-    public static final int IS_FINISHED_FIELD_NUMBER = 14;
-    private boolean isFinished_;
-    /**
-     * <code>bool is_finished = 14;</code>
-     * @return The isFinished.
-     */
-    @java.lang.Override
-    public boolean getIsFinished() {
-      return isFinished_;
-    }
-
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 5;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 9;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 5;</code>
+     * <code>uint32 parent_quest_id = 9;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -565,7 +574,33 @@ public final class ParentQuestOuterClass {
       return parentQuestId_;
     }
 
-    public static final int TIME_VAR_MAP_FIELD_NUMBER = 10;
+    public static final int CKJMKGOKNED_FIELD_NUMBER = 10;
+    private boolean cKJMKGOKNED_;
+    /**
+     * <code>bool CKJMKGOKNED = 10;</code>
+     * @return The cKJMKGOKNED.
+     */
+    @java.lang.Override
+    public boolean getCKJMKGOKNED() {
+      return cKJMKGOKNED_;
+    }
+
+    public static final int IS_FINISHED_FIELD_NUMBER = 12;
+    private boolean isFinished_;
+    /**
+     * <pre>
+     *repeated DJJEGLDMNAG AHHODEACDAL = 11;
+     * </pre>
+     *
+     * <code>bool is_finished = 12;</code>
+     * @return The isFinished.
+     */
+    @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 =
@@ -592,7 +627,7 @@ public final class ParentQuestOuterClass {
       return internalGetTimeVarMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
 
     @java.lang.Override
@@ -610,7 +645,7 @@ public final class ParentQuestOuterClass {
       return getTimeVarMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     @java.lang.Override
 
@@ -618,7 +653,7 @@ public final class ParentQuestOuterClass {
       return internalGetTimeVarMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     @java.lang.Override
 
@@ -631,7 +666,7 @@ public final class ParentQuestOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
      */
     @java.lang.Override
 
@@ -646,30 +681,43 @@ public final class ParentQuestOuterClass {
       return map.get(key);
     }
 
-    public static final int RANDOM_INFO_FIELD_NUMBER = 2;
-    private emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo randomInfo_;
+    public static final int QUEST_VAR_FIELD_NUMBER = 14;
+    private com.google.protobuf.Internal.IntList questVar_;
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
-     * @return Whether the randomInfo field is set.
+     * <code>repeated int32 quest_var = 14;</code>
+     * @return A list containing the questVar.
      */
     @java.lang.Override
-    public boolean hasRandomInfo() {
-      return randomInfo_ != null;
+    public java.util.List<java.lang.Integer>
+        getQuestVarList() {
+      return questVar_;
     }
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
-     * @return The randomInfo.
+     * <code>repeated int32 quest_var = 14;</code>
+     * @return The count of questVar.
      */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo getRandomInfo() {
-      return randomInfo_ == null ? emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance() : randomInfo_;
+    public int getQuestVarCount() {
+      return questVar_.size();
     }
     /**
-     * <code>.ParentQuestRandomInfo random_info = 2;</code>
+     * <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);
+    }
+    private int questVarMemoizedSerializedSize = -1;
+
+    public static final int VIDEO_KEY_FIELD_NUMBER = 15;
+    private long videoKey_;
+    /**
+     * <code>uint64 video_key = 15;</code>
+     * @return The videoKey.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfoOrBuilder getRandomInfoOrBuilder() {
-      return getRandomInfo();
+    public long getVideoKey() {
+      return videoKey_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -687,48 +735,54 @@ public final class ParentQuestOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      for (int i = 0; i < childQuestList_.size(); i++) {
-        output.writeMessage(1, childQuestList_.get(i));
-      }
       if (randomInfo_ != null) {
-        output.writeMessage(2, getRandomInfo());
+        output.writeMessage(1, getRandomInfo());
       }
-      if (acceptTime_ != 0) {
-        output.writeUInt32(3, acceptTime_);
+      for (int i = 0; i < childQuestList_.size(); i++) {
+        output.writeMessage(2, childQuestList_.get(i));
       }
-      if (videoKey_ != 0L) {
-        output.writeUInt64(4, videoKey_);
-      }
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(5, parentQuestId_);
-      }
-      if (getQuestVarList().size() > 0) {
-        output.writeUInt32NoTag(58);
-        output.writeUInt32NoTag(questVarMemoizedSerializedSize);
-      }
-      for (int i = 0; i < questVar_.size(); i++) {
-        output.writeInt32NoTag(questVar_.getInt(i));
+      if (questVarSeq_ != 0) {
+        output.writeUInt32(3, questVarSeq_);
       }
       if (parentQuestState_ != 0) {
-        output.writeUInt32(8, parentQuestState_);
+        output.writeUInt32(4, parentQuestState_);
+      }
+      if (isRandom_ != false) {
+        output.writeBool(5, isRandom_);
+      }
+      if (mGIJFMCBJKE_ != false) {
+        output.writeBool(6, mGIJFMCBJKE_);
+      }
+      if (acceptTime_ != 0) {
+        output.writeUInt32(7, acceptTime_);
       }
       for (int i = 0; i < inferencePageList_.size(); i++) {
-        output.writeMessage(9, inferencePageList_.get(i));
+        output.writeMessage(8, inferencePageList_.get(i));
+      }
+      if (parentQuestId_ != 0) {
+        output.writeUInt32(9, parentQuestId_);
+      }
+      if (cKJMKGOKNED_ != false) {
+        output.writeBool(10, cKJMKGOKNED_);
+      }
+      if (isFinished_ != false) {
+        output.writeBool(12, isFinished_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetTimeVarMap(),
           TimeVarMapDefaultEntryHolder.defaultEntry,
-          10);
-      if (isRandom_ != false) {
-        output.writeBool(11, isRandom_);
+          13);
+      if (getQuestVarList().size() > 0) {
+        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(questVarMemoizedSerializedSize);
       }
-      if (isFinished_ != false) {
-        output.writeBool(14, isFinished_);
+      for (int i = 0; i < questVar_.size(); i++) {
+        output.writeInt32NoTag(questVar_.getInt(i));
       }
-      if (questVarSeq_ != 0) {
-        output.writeUInt32(15, questVarSeq_);
+      if (videoKey_ != 0L) {
+        output.writeUInt64(15, videoKey_);
       }
       unknownFields.writeTo(output);
     }
@@ -739,25 +793,59 @@ public final class ParentQuestOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < childQuestList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, childQuestList_.get(i));
-      }
       if (randomInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getRandomInfo());
+          .computeMessageSize(1, getRandomInfo());
+      }
+      for (int i = 0; i < childQuestList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, childQuestList_.get(i));
+      }
+      if (questVarSeq_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, questVarSeq_);
+      }
+      if (parentQuestState_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, parentQuestState_);
+      }
+      if (isRandom_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, isRandom_);
+      }
+      if (mGIJFMCBJKE_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(6, mGIJFMCBJKE_);
       }
       if (acceptTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, acceptTime_);
+          .computeUInt32Size(7, acceptTime_);
       }
-      if (videoKey_ != 0L) {
+      for (int i = 0; i < inferencePageList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, videoKey_);
+          .computeMessageSize(8, inferencePageList_.get(i));
       }
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, parentQuestId_);
+          .computeUInt32Size(9, parentQuestId_);
+      }
+      if (cKJMKGOKNED_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, cKJMKGOKNED_);
+      }
+      if (isFinished_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isFinished_);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetTimeVarMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        timeVarMap__ = TimeVarMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(13, timeVarMap__);
       }
       {
         int dataSize = 0;
@@ -773,35 +861,9 @@ public final class ParentQuestOuterClass {
         }
         questVarMemoizedSerializedSize = dataSize;
       }
-      if (parentQuestState_ != 0) {
+      if (videoKey_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, parentQuestState_);
-      }
-      for (int i = 0; i < inferencePageList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, inferencePageList_.get(i));
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetTimeVarMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        timeVarMap__ = TimeVarMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(10, timeVarMap__);
-      }
-      if (isRandom_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isRandom_);
-      }
-      if (isFinished_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isFinished_);
-      }
-      if (questVarSeq_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, questVarSeq_);
+          .computeUInt64Size(15, videoKey_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -818,33 +880,37 @@ public final class ParentQuestOuterClass {
       }
       emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest other = (emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest) obj;
 
-      if (getVideoKey()
-          != other.getVideoKey()) return false;
-      if (getParentQuestState()
-          != other.getParentQuestState()) return false;
-      if (getQuestVarSeq()
-          != other.getQuestVarSeq()) return false;
-      if (getIsRandom()
-          != other.getIsRandom()) return false;
-      if (getAcceptTime()
-          != other.getAcceptTime()) return false;
-      if (!getChildQuestListList()
-          .equals(other.getChildQuestListList())) return false;
-      if (!getQuestVarList()
-          .equals(other.getQuestVarList())) return false;
-      if (!getInferencePageListList()
-          .equals(other.getInferencePageListList())) return false;
-      if (getIsFinished()
-          != other.getIsFinished()) return false;
-      if (getParentQuestId()
-          != other.getParentQuestId()) return false;
-      if (!internalGetTimeVarMap().equals(
-          other.internalGetTimeVarMap())) return false;
       if (hasRandomInfo() != other.hasRandomInfo()) return false;
       if (hasRandomInfo()) {
         if (!getRandomInfo()
             .equals(other.getRandomInfo())) return false;
       }
+      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 (getMGIJFMCBJKE()
+          != other.getMGIJFMCBJKE()) return false;
+      if (getAcceptTime()
+          != other.getAcceptTime()) return false;
+      if (!getInferencePageListList()
+          .equals(other.getInferencePageListList())) return false;
+      if (getParentQuestId()
+          != other.getParentQuestId()) return false;
+      if (getCKJMKGOKNED()
+          != other.getCKJMKGOKNED()) 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 (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -856,43 +922,49 @@ public final class ParentQuestOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + VIDEO_KEY_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getVideoKey());
-      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 = (37 * hash) + IS_RANDOM_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsRandom());
-      hash = (37 * hash) + ACCEPT_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getAcceptTime();
+      if (hasRandomInfo()) {
+        hash = (37 * hash) + RANDOM_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getRandomInfo().hashCode();
+      }
       if (getChildQuestListCount() > 0) {
         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) + MGIJFMCBJKE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getMGIJFMCBJKE());
+      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) + CKJMKGOKNED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCKJMKGOKNED());
+      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();
       }
-      if (getInferencePageListCount() > 0) {
-        hash = (37 * hash) + INFERENCE_PAGE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getInferencePageListList().hashCode();
-      }
-      hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFinished());
-      hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestId();
-      if (!internalGetTimeVarMap().getMap().isEmpty()) {
-        hash = (37 * hash) + TIME_VAR_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetTimeVarMap().hashCode();
-      }
-      if (hasRandomInfo()) {
-        hash = (37 * hash) + RANDOM_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getRandomInfo().hashCode();
-      }
+      hash = (37 * hash) + VIDEO_KEY_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getVideoKey());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -989,10 +1061,6 @@ public final class ParentQuestOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HJOGPKJDLID
-     * </pre>
-     *
      * Protobuf type {@code ParentQuest}
      */
     public static final class Builder extends
@@ -1008,7 +1076,7 @@ public final class ParentQuestOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 13:
             return internalGetTimeVarMap();
           default:
             throw new RuntimeException(
@@ -1019,7 +1087,7 @@ public final class ParentQuestOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 13:
             return internalGetMutableTimeVarMap();
           default:
             throw new RuntimeException(
@@ -1054,41 +1122,45 @@ public final class ParentQuestOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        videoKey_ = 0L;
-
-        parentQuestState_ = 0;
-
-        questVarSeq_ = 0;
-
-        isRandom_ = false;
-
-        acceptTime_ = 0;
-
-        if (childQuestListBuilder_ == null) {
-          childQuestList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          childQuestListBuilder_.clear();
-        }
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        if (inferencePageListBuilder_ == null) {
-          inferencePageList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        } else {
-          inferencePageListBuilder_.clear();
-        }
-        isFinished_ = false;
-
-        parentQuestId_ = 0;
-
-        internalGetMutableTimeVarMap().clear();
         if (randomInfoBuilder_ == null) {
           randomInfo_ = null;
         } else {
           randomInfo_ = null;
           randomInfoBuilder_ = null;
         }
+        if (childQuestListBuilder_ == null) {
+          childQuestList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          childQuestListBuilder_.clear();
+        }
+        questVarSeq_ = 0;
+
+        parentQuestState_ = 0;
+
+        isRandom_ = false;
+
+        mGIJFMCBJKE_ = false;
+
+        acceptTime_ = 0;
+
+        if (inferencePageListBuilder_ == null) {
+          inferencePageList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          inferencePageListBuilder_.clear();
+        }
+        parentQuestId_ = 0;
+
+        cKJMKGOKNED_ = false;
+
+        isFinished_ = false;
+
+        internalGetMutableTimeVarMap().clear();
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        videoKey_ = 0L;
+
         return this;
       }
 
@@ -1116,11 +1188,11 @@ public final class ParentQuestOuterClass {
       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.videoKey_ = videoKey_;
-        result.parentQuestState_ = parentQuestState_;
-        result.questVarSeq_ = questVarSeq_;
-        result.isRandom_ = isRandom_;
-        result.acceptTime_ = acceptTime_;
+        if (randomInfoBuilder_ == null) {
+          result.randomInfo_ = randomInfo_;
+        } else {
+          result.randomInfo_ = randomInfoBuilder_.build();
+        }
         if (childQuestListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             childQuestList_ = java.util.Collections.unmodifiableList(childQuestList_);
@@ -1130,29 +1202,31 @@ public final class ParentQuestOuterClass {
         } else {
           result.childQuestList_ = childQuestListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000002) != 0)) {
-          questVar_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.questVar_ = questVar_;
+        result.questVarSeq_ = questVarSeq_;
+        result.parentQuestState_ = parentQuestState_;
+        result.isRandom_ = isRandom_;
+        result.mGIJFMCBJKE_ = mGIJFMCBJKE_;
+        result.acceptTime_ = acceptTime_;
         if (inferencePageListBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             inferencePageList_ = java.util.Collections.unmodifiableList(inferencePageList_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.inferencePageList_ = inferencePageList_;
         } else {
           result.inferencePageList_ = inferencePageListBuilder_.build();
         }
-        result.isFinished_ = isFinished_;
         result.parentQuestId_ = parentQuestId_;
+        result.cKJMKGOKNED_ = cKJMKGOKNED_;
+        result.isFinished_ = isFinished_;
         result.timeVarMap_ = internalGetTimeVarMap();
         result.timeVarMap_.makeImmutable();
-        if (randomInfoBuilder_ == null) {
-          result.randomInfo_ = randomInfo_;
-        } else {
-          result.randomInfo_ = randomInfoBuilder_.build();
+        if (((bitField0_ & 0x00000008) != 0)) {
+          questVar_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000008);
         }
+        result.questVar_ = questVar_;
+        result.videoKey_ = videoKey_;
         onBuilt();
         return result;
       }
@@ -1201,20 +1275,8 @@ public final class ParentQuestOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest other) {
         if (other == emu.grasscutter.net.proto.ParentQuestOuterClass.ParentQuest.getDefaultInstance()) return this;
-        if (other.getVideoKey() != 0L) {
-          setVideoKey(other.getVideoKey());
-        }
-        if (other.getParentQuestState() != 0) {
-          setParentQuestState(other.getParentQuestState());
-        }
-        if (other.getQuestVarSeq() != 0) {
-          setQuestVarSeq(other.getQuestVarSeq());
-        }
-        if (other.getIsRandom() != false) {
-          setIsRandom(other.getIsRandom());
-        }
-        if (other.getAcceptTime() != 0) {
-          setAcceptTime(other.getAcceptTime());
+        if (other.hasRandomInfo()) {
+          mergeRandomInfo(other.getRandomInfo());
         }
         if (childQuestListBuilder_ == null) {
           if (!other.childQuestList_.isEmpty()) {
@@ -1242,21 +1304,26 @@ public final class ParentQuestOuterClass {
             }
           }
         }
-        if (!other.questVar_.isEmpty()) {
-          if (questVar_.isEmpty()) {
-            questVar_ = other.questVar_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureQuestVarIsMutable();
-            questVar_.addAll(other.questVar_);
-          }
-          onChanged();
+        if (other.getQuestVarSeq() != 0) {
+          setQuestVarSeq(other.getQuestVarSeq());
+        }
+        if (other.getParentQuestState() != 0) {
+          setParentQuestState(other.getParentQuestState());
+        }
+        if (other.getIsRandom() != false) {
+          setIsRandom(other.getIsRandom());
+        }
+        if (other.getMGIJFMCBJKE() != false) {
+          setMGIJFMCBJKE(other.getMGIJFMCBJKE());
+        }
+        if (other.getAcceptTime() != 0) {
+          setAcceptTime(other.getAcceptTime());
         }
         if (inferencePageListBuilder_ == null) {
           if (!other.inferencePageList_.isEmpty()) {
             if (inferencePageList_.isEmpty()) {
               inferencePageList_ = other.inferencePageList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureInferencePageListIsMutable();
               inferencePageList_.addAll(other.inferencePageList_);
@@ -1269,7 +1336,7 @@ public final class ParentQuestOuterClass {
               inferencePageListBuilder_.dispose();
               inferencePageListBuilder_ = null;
               inferencePageList_ = other.inferencePageList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
+              bitField0_ = (bitField0_ & ~0x00000002);
               inferencePageListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getInferencePageListFieldBuilder() : null;
@@ -1278,16 +1345,29 @@ public final class ParentQuestOuterClass {
             }
           }
         }
-        if (other.getIsFinished() != false) {
-          setIsFinished(other.getIsFinished());
-        }
         if (other.getParentQuestId() != 0) {
           setParentQuestId(other.getParentQuestId());
         }
+        if (other.getCKJMKGOKNED() != false) {
+          setCKJMKGOKNED(other.getCKJMKGOKNED());
+        }
+        if (other.getIsFinished() != false) {
+          setIsFinished(other.getIsFinished());
+        }
         internalGetMutableTimeVarMap().mergeFrom(
             other.internalGetTimeVarMap());
-        if (other.hasRandomInfo()) {
-          mergeRandomInfo(other.getRandomInfo());
+        if (!other.questVar_.isEmpty()) {
+          if (questVar_.isEmpty()) {
+            questVar_ = other.questVar_;
+            bitField0_ = (bitField0_ & ~0x00000008);
+          } else {
+            ensureQuestVarIsMutable();
+            questVar_.addAll(other.questVar_);
+          }
+          onChanged();
+        }
+        if (other.getVideoKey() != 0L) {
+          setVideoKey(other.getVideoKey());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1319,159 +1399,123 @@ public final class ParentQuestOuterClass {
       }
       private int bitField0_;
 
-      private long videoKey_ ;
+      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>uint64 video_key = 4;</code>
-       * @return The videoKey.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * @return Whether the randomInfo field is set.
        */
-      @java.lang.Override
-      public long getVideoKey() {
-        return videoKey_;
+      public boolean hasRandomInfo() {
+        return randomInfoBuilder_ != null || randomInfo_ != null;
       }
       /**
-       * <code>uint64 video_key = 4;</code>
-       * @param value The videoKey to set.
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       * @return The randomInfo.
        */
-      public Builder setVideoKey(long value) {
-        
-        videoKey_ = 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>uint64 video_key = 4;</code>
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
        */
-      public Builder clearVideoKey() {
-        
-        videoKey_ = 0L;
-        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 = 8;</code>
-       * @return The parentQuestState.
-       */
-      @java.lang.Override
-      public int getParentQuestState() {
-        return parentQuestState_;
-      }
-      /**
-       * <code>uint32 parent_quest_state = 8;</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 = 8;</code>
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</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 int questVarSeq_ ;
-      /**
-       * <code>uint32 quest_var_seq = 15;</code>
-       * @return The questVarSeq.
-       */
-      @java.lang.Override
-      public int getQuestVarSeq() {
-        return questVarSeq_;
-      }
-      /**
-       * <code>uint32 quest_var_seq = 15;</code>
-       * @param value The questVarSeq to set.
-       * @return This builder for chaining.
-       */
-      public Builder setQuestVarSeq(int value) {
-        
-        questVarSeq_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>uint32 quest_var_seq = 15;</code>
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
        */
-      public Builder clearQuestVarSeq() {
-        
-        questVarSeq_ = 0;
-        onChanged();
-        return this;
-      }
+      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);
+        }
 
-      private boolean isRandom_ ;
-      /**
-       * <code>bool is_random = 11;</code>
-       * @return The isRandom.
-       */
-      @java.lang.Override
-      public boolean getIsRandom() {
-        return isRandom_;
-      }
-      /**
-       * <code>bool is_random = 11;</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 = 11;</code>
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
        */
-      public Builder clearIsRandom() {
-        
-        isRandom_ = false;
-        onChanged();
-        return this;
-      }
+      public Builder clearRandomInfo() {
+        if (randomInfoBuilder_ == null) {
+          randomInfo_ = null;
+          onChanged();
+        } else {
+          randomInfo_ = null;
+          randomInfoBuilder_ = null;
+        }
 
-      private int acceptTime_ ;
-      /**
-       * <code>uint32 accept_time = 3;</code>
-       * @return The acceptTime.
-       */
-      @java.lang.Override
-      public int getAcceptTime() {
-        return acceptTime_;
-      }
-      /**
-       * <code>uint32 accept_time = 3;</code>
-       * @param value The acceptTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAcceptTime(int value) {
-        
-        acceptTime_ = value;
-        onChanged();
         return this;
       }
       /**
-       * <code>uint32 accept_time = 3;</code>
-       * @return This builder for chaining.
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
        */
-      public Builder clearAcceptTime() {
+      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder getRandomInfoBuilder() {
         
-        acceptTime_ = 0;
         onChanged();
-        return this;
+        return getRandomInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.ParentQuestRandomInfo random_info = 1;</code>
+       */
+      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_;
+        }
+      }
+      /**
+       * <code>.ParentQuestRandomInfo random_info = 1;</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.ChildQuestOuterClass.ChildQuest> childQuestList_ =
@@ -1487,7 +1531,7 @@ public final class ParentQuestOuterClass {
           emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> childQuestListBuilder_;
 
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> getChildQuestListList() {
         if (childQuestListBuilder_ == null) {
@@ -1497,7 +1541,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public int getChildQuestListCount() {
         if (childQuestListBuilder_ == null) {
@@ -1507,7 +1551,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest getChildQuestList(int index) {
         if (childQuestListBuilder_ == null) {
@@ -1517,7 +1561,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder setChildQuestList(
           int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
@@ -1534,7 +1578,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder setChildQuestList(
           int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
@@ -1548,7 +1592,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder addChildQuestList(emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
         if (childQuestListBuilder_ == null) {
@@ -1564,7 +1608,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder addChildQuestList(
           int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest value) {
@@ -1581,7 +1625,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder addChildQuestList(
           emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
@@ -1595,7 +1639,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder addChildQuestList(
           int index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder builderForValue) {
@@ -1609,7 +1653,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder addAllChildQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest> values) {
@@ -1624,7 +1668,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder clearChildQuestList() {
         if (childQuestListBuilder_ == null) {
@@ -1637,7 +1681,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public Builder removeChildQuestList(int index) {
         if (childQuestListBuilder_ == null) {
@@ -1650,14 +1694,14 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder getChildQuestListBuilder(
           int index) {
         return getChildQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder getChildQuestListOrBuilder(
           int index) {
@@ -1667,7 +1711,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuestOrBuilder> 
            getChildQuestListOrBuilderList() {
@@ -1678,14 +1722,14 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder() {
         return getChildQuestListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder addChildQuestListBuilder(
           int index) {
@@ -1693,7 +1737,7 @@ public final class ParentQuestOuterClass {
             index, emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChildQuest child_quest_list = 1;</code>
+       * <code>repeated .ChildQuest child_quest_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChildQuestOuterClass.ChildQuest.Builder> 
            getChildQuestListBuilderList() {
@@ -1714,81 +1758,157 @@ public final class ParentQuestOuterClass {
         return childQuestListBuilder_;
       }
 
-      private com.google.protobuf.Internal.IntList questVar_ = emptyIntList();
-      private void ensureQuestVarIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          questVar_ = mutableCopy(questVar_);
-          bitField0_ |= 0x00000002;
-         }
-      }
+      private int questVarSeq_ ;
       /**
-       * <code>repeated int32 quest_var = 7;</code>
-       * @return A list containing the questVar.
+       * <code>uint32 quest_var_seq = 3;</code>
+       * @return The questVarSeq.
        */
-      public java.util.List<java.lang.Integer>
-          getQuestVarList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(questVar_) : questVar_;
+      @java.lang.Override
+      public int getQuestVarSeq() {
+        return questVarSeq_;
       }
       /**
-       * <code>repeated int32 quest_var = 7;</code>
-       * @return The count of questVar.
-       */
-      public int getQuestVarCount() {
-        return questVar_.size();
-      }
-      /**
-       * <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);
-      }
-      /**
-       * <code>repeated int32 quest_var = 7;</code>
-       * @param index The index to set the value at.
-       * @param value The questVar to set.
+       * <code>uint32 quest_var_seq = 3;</code>
+       * @param value The questVarSeq to set.
        * @return This builder for chaining.
        */
-      public Builder setQuestVar(
-          int index, int value) {
-        ensureQuestVarIsMutable();
-        questVar_.setInt(index, value);
+      public Builder setQuestVarSeq(int value) {
+        
+        questVarSeq_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 7;</code>
-       * @param value The questVar to add.
+       * <code>uint32 quest_var_seq = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder addQuestVar(int value) {
-        ensureQuestVarIsMutable();
-        questVar_.addInt(value);
+      public Builder clearQuestVarSeq() {
+        
+        questVarSeq_ = 0;
+        onChanged();
+        return this;
+      }
+
+      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>repeated int32 quest_var = 7;</code>
-       * @param values The questVar to add.
+       * <code>uint32 parent_quest_state = 4;</code>
        * @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 clearParentQuestState() {
+        
+        parentQuestState_ = 0;
+        onChanged();
+        return this;
+      }
+
+      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>repeated int32 quest_var = 7;</code>
+       * <code>bool is_random = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearQuestVar() {
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearIsRandom() {
+        
+        isRandom_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean mGIJFMCBJKE_ ;
+      /**
+       * <code>bool MGIJFMCBJKE = 6;</code>
+       * @return The mGIJFMCBJKE.
+       */
+      @java.lang.Override
+      public boolean getMGIJFMCBJKE() {
+        return mGIJFMCBJKE_;
+      }
+      /**
+       * <code>bool MGIJFMCBJKE = 6;</code>
+       * @param value The mGIJFMCBJKE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMGIJFMCBJKE(boolean value) {
+        
+        mGIJFMCBJKE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool MGIJFMCBJKE = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMGIJFMCBJKE() {
+        
+        mGIJFMCBJKE_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int acceptTime_ ;
+      /**
+       * <code>uint32 accept_time = 7;</code>
+       * @return The acceptTime.
+       */
+      @java.lang.Override
+      public int getAcceptTime() {
+        return acceptTime_;
+      }
+      /**
+       * <code>uint32 accept_time = 7;</code>
+       * @param value The acceptTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAcceptTime(int value) {
+        
+        acceptTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 accept_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAcceptTime() {
+        
+        acceptTime_ = 0;
         onChanged();
         return this;
       }
@@ -1796,9 +1916,9 @@ public final class ParentQuestOuterClass {
       private java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> inferencePageList_ =
         java.util.Collections.emptyList();
       private void ensureInferencePageListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           inferencePageList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo>(inferencePageList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -1806,7 +1926,7 @@ public final class ParentQuestOuterClass {
           emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> inferencePageListBuilder_;
 
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> getInferencePageListList() {
         if (inferencePageListBuilder_ == null) {
@@ -1816,7 +1936,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public int getInferencePageListCount() {
         if (inferencePageListBuilder_ == null) {
@@ -1826,7 +1946,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo getInferencePageList(int index) {
         if (inferencePageListBuilder_ == null) {
@@ -1836,7 +1956,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder setInferencePageList(
           int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
@@ -1853,7 +1973,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder setInferencePageList(
           int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
@@ -1867,7 +1987,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder addInferencePageList(emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
         if (inferencePageListBuilder_ == null) {
@@ -1883,7 +2003,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder addInferencePageList(
           int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo value) {
@@ -1900,7 +2020,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder addInferencePageList(
           emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
@@ -1914,7 +2034,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder addInferencePageList(
           int index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder builderForValue) {
@@ -1928,7 +2048,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder addAllInferencePageList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo> values) {
@@ -1943,12 +2063,12 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder clearInferencePageList() {
         if (inferencePageListBuilder_ == null) {
           inferencePageList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           inferencePageListBuilder_.clear();
@@ -1956,7 +2076,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public Builder removeInferencePageList(int index) {
         if (inferencePageListBuilder_ == null) {
@@ -1969,14 +2089,14 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder getInferencePageListBuilder(
           int index) {
         return getInferencePageListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder getInferencePageListOrBuilder(
           int index) {
@@ -1986,7 +2106,7 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfoOrBuilder> 
            getInferencePageListOrBuilderList() {
@@ -1997,14 +2117,14 @@ public final class ParentQuestOuterClass {
         }
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder() {
         return getInferencePageListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder addInferencePageListBuilder(
           int index) {
@@ -2012,7 +2132,7 @@ public final class ParentQuestOuterClass {
             index, emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .InferencePageInfo inference_page_list = 9;</code>
+       * <code>repeated .InferencePageInfo inference_page_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InferencePageInfoOuterClass.InferencePageInfo.Builder> 
            getInferencePageListBuilderList() {
@@ -2025,7 +2145,7 @@ public final class ParentQuestOuterClass {
           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),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           inferencePageList_ = null;
@@ -2033,40 +2153,9 @@ public final class ParentQuestOuterClass {
         return inferencePageListBuilder_;
       }
 
-      private boolean isFinished_ ;
-      /**
-       * <code>bool is_finished = 14;</code>
-       * @return The isFinished.
-       */
-      @java.lang.Override
-      public boolean getIsFinished() {
-        return isFinished_;
-      }
-      /**
-       * <code>bool is_finished = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFinished() {
-        
-        isFinished_ = false;
-        onChanged();
-        return this;
-      }
-
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 5;</code>
+       * <code>uint32 parent_quest_id = 9;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -2074,7 +2163,7 @@ public final class ParentQuestOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 5;</code>
+       * <code>uint32 parent_quest_id = 9;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -2085,7 +2174,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 5;</code>
+       * <code>uint32 parent_quest_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -2095,6 +2184,80 @@ public final class ParentQuestOuterClass {
         return this;
       }
 
+      private boolean cKJMKGOKNED_ ;
+      /**
+       * <code>bool CKJMKGOKNED = 10;</code>
+       * @return The cKJMKGOKNED.
+       */
+      @java.lang.Override
+      public boolean getCKJMKGOKNED() {
+        return cKJMKGOKNED_;
+      }
+      /**
+       * <code>bool CKJMKGOKNED = 10;</code>
+       * @param value The cKJMKGOKNED to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCKJMKGOKNED(boolean value) {
+        
+        cKJMKGOKNED_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool CKJMKGOKNED = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCKJMKGOKNED() {
+        
+        cKJMKGOKNED_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isFinished_ ;
+      /**
+       * <pre>
+       *repeated DJJEGLDMNAG AHHODEACDAL = 11;
+       * </pre>
+       *
+       * <code>bool is_finished = 12;</code>
+       * @return The isFinished.
+       */
+      @java.lang.Override
+      public boolean getIsFinished() {
+        return isFinished_;
+      }
+      /**
+       * <pre>
+       *repeated DJJEGLDMNAG AHHODEACDAL = 11;
+       * </pre>
+       *
+       * <code>bool is_finished = 12;</code>
+       * @param value The isFinished to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsFinished(boolean value) {
+        
+        isFinished_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *repeated DJJEGLDMNAG AHHODEACDAL = 11;
+       * </pre>
+       *
+       * <code>bool is_finished = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFinished() {
+        
+        isFinished_ = false;
+        onChanged();
+        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>
@@ -2122,7 +2285,7 @@ public final class ParentQuestOuterClass {
         return internalGetTimeVarMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
 
       @java.lang.Override
@@ -2140,7 +2303,7 @@ public final class ParentQuestOuterClass {
         return getTimeVarMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
       @java.lang.Override
 
@@ -2148,7 +2311,7 @@ public final class ParentQuestOuterClass {
         return internalGetTimeVarMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
       @java.lang.Override
 
@@ -2161,7 +2324,7 @@ public final class ParentQuestOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
       @java.lang.Override
 
@@ -2182,7 +2345,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
 
       public Builder removeTimeVarMap(
@@ -2201,7 +2364,7 @@ public final class ParentQuestOuterClass {
         return internalGetMutableTimeVarMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
       public Builder putTimeVarMap(
           int key,
@@ -2213,7 +2376,7 @@ public final class ParentQuestOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; time_var_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; time_var_map = 13;</code>
        */
 
       public Builder putAllTimeVarMap(
@@ -2223,123 +2386,114 @@ public final class ParentQuestOuterClass {
         return this;
       }
 
-      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>.ParentQuestRandomInfo random_info = 2;</code>
-       * @return Whether the randomInfo field is set.
-       */
-      public boolean hasRandomInfo() {
-        return randomInfoBuilder_ != null || randomInfo_ != null;
+      private com.google.protobuf.Internal.IntList questVar_ = emptyIntList();
+      private void ensureQuestVarIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          questVar_ = mutableCopy(questVar_);
+          bitField0_ |= 0x00000008;
+         }
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
-       * @return The randomInfo.
+       * <code>repeated int32 quest_var = 14;</code>
+       * @return A list containing the questVar.
        */
-      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();
-        }
+      public java.util.List<java.lang.Integer>
+          getQuestVarList() {
+        return ((bitField0_ & 0x00000008) != 0) ?
+                 java.util.Collections.unmodifiableList(questVar_) : questVar_;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
+       * <code>repeated int32 quest_var = 14;</code>
+       * @return The count of questVar.
        */
-      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);
-        }
-
-        return this;
+      public int getQuestVarCount() {
+        return questVar_.size();
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
+       * <code>repeated int32 quest_var = 14;</code>
+       * @param index The index of the element to return.
+       * @return The questVar at the given index.
        */
-      public Builder setRandomInfo(
-          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder builderForValue) {
-        if (randomInfoBuilder_ == null) {
-          randomInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          randomInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
+      public int getQuestVar(int index) {
+        return questVar_.getInt(index);
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
+       * <code>repeated int32 quest_var = 14;</code>
+       * @param index The index to set the value at.
+       * @param value The questVar to set.
+       * @return This builder for chaining.
        */
-      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;
-      }
-      /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
-       */
-      public Builder clearRandomInfo() {
-        if (randomInfoBuilder_ == null) {
-          randomInfo_ = null;
-          onChanged();
-        } else {
-          randomInfo_ = null;
-          randomInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
-       */
-      public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder getRandomInfoBuilder() {
-        
+      public Builder setQuestVar(
+          int index, int value) {
+        ensureQuestVarIsMutable();
+        questVar_.setInt(index, value);
         onChanged();
-        return getRandomInfoFieldBuilder().getBuilder();
+        return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
+       * <code>repeated int32 quest_var = 14;</code>
+       * @param value 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 addQuestVar(int value) {
+        ensureQuestVarIsMutable();
+        questVar_.addInt(value);
+        onChanged();
+        return this;
       }
       /**
-       * <code>.ParentQuestRandomInfo random_info = 2;</code>
+       * <code>repeated int32 quest_var = 14;</code>
+       * @param values The questVar to add.
+       * @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 addAllQuestVar(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureQuestVarIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, questVar_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 quest_var = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQuestVar() {
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000008);
+        onChanged();
+        return this;
+      }
+
+      private long videoKey_ ;
+      /**
+       * <code>uint64 video_key = 15;</code>
+       * @return The videoKey.
+       */
+      @java.lang.Override
+      public long getVideoKey() {
+        return videoKey_;
+      }
+      /**
+       * <code>uint64 video_key = 15;</code>
+       * @param value The videoKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVideoKey(long value) {
+        
+        videoKey_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 video_key = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVideoKey() {
+        
+        videoKey_ = 0L;
+        onChanged();
+        return this;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -2413,43 +2567,44 @@ public final class ParentQuestOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021ParentQuest.proto\032\020ChildQuest.proto\032\027I" +
-      "nferencePageInfo.proto\032\033ParentQuestRando" +
-      "mInfo.proto\"\250\003\n\013ParentQuest\022\021\n\tvideo_key" +
-      "\030\004 \001(\004\022\032\n\022parent_quest_state\030\010 \001(\r\022\025\n\rqu" +
-      "est_var_seq\030\017 \001(\r\022\021\n\tis_random\030\013 \001(\010\022\023\n\013" +
-      "accept_time\030\003 \001(\r\022%\n\020child_quest_list\030\001 " +
-      "\003(\0132\013.ChildQuest\022\021\n\tquest_var\030\007 \003(\005\022/\n\023i" +
-      "nference_page_list\030\t \003(\0132\022.InferencePage" +
-      "Info\022\023\n\013is_finished\030\016 \001(\010\022\027\n\017parent_ques" +
-      "t_id\030\005 \001(\r\0222\n\014time_var_map\030\n \003(\0132\034.Paren" +
-      "tQuest.TimeVarMapEntry\022+\n\013random_info\030\002 " +
-      "\001(\0132\026.ParentQuestRandomInfo\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"
+      "\n\021ParentQuest.proto\032\033ParentQuestRandomIn" +
+      "fo.proto\032\020ChildQuest.proto\032\027InferencePag" +
+      "eInfo.proto\"\322\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\013MGIJFMCBJKE\030\006 \001" +
+      "(\010\022\023\n\013accept_time\030\007 \001(\r\022/\n\023inference_pag" +
+      "e_list\030\010 \003(\0132\022.InferencePageInfo\022\027\n\017pare" +
+      "nt_quest_id\030\t \001(\r\022\023\n\013CKJMKGOKNED\030\n \001(\010\022\023" +
+      "\n\013is_finished\030\014 \001(\010\0222\n\014time_var_map\030\r \003(" +
+      "\0132\034.ParentQuest.TimeVarMapEntry\022\021\n\tquest" +
+      "_var\030\016 \003(\005\022\021\n\tvideo_key\030\017 \001(\004\0321\n\017TimeVar" +
+      "MapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ChildQuestOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.InferencePageInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.getDescriptor(),
         });
     internal_static_ParentQuest_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_ParentQuest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ParentQuest_descriptor,
-        new java.lang.String[] { "VideoKey", "ParentQuestState", "QuestVarSeq", "IsRandom", "AcceptTime", "ChildQuestList", "QuestVar", "InferencePageList", "IsFinished", "ParentQuestId", "TimeVarMap", "RandomInfo", });
+        new java.lang.String[] { "RandomInfo", "ChildQuestList", "QuestVarSeq", "ParentQuestState", "IsRandom", "MGIJFMCBJKE", "AcceptTime", "InferencePageList", "ParentQuestId", "CKJMKGOKNED", "IsFinished", "TimeVarMap", "QuestVar", "VideoKey", });
     internal_static_ParentQuest_TimeVarMapEntry_descriptor =
       internal_static_ParentQuest_descriptor.getNestedTypes().get(0);
     internal_static_ParentQuest_TimeVarMapEntry_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ParentQuest_TimeVarMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
+    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ChildQuestOuterClass.getDescriptor();
     emu.grasscutter.net.proto.InferencePageInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 9370377e5..b7fcfc6d4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ParentQuestRandomInfoOuterClass.java
@@ -19,39 +19,35 @@ public final class ParentQuestRandomInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 template_id = 10;</code>
-     * @return The templateId.
-     */
-    int getTemplateId();
-
-    /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @return A list containing the factorList.
      */
     java.util.List<java.lang.Integer> getFactorListList();
     /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @return The count of factorList.
      */
     int getFactorListCount();
     /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @param index The index of the element to return.
      * @return The factorList at the given index.
      */
     int getFactorList(int index);
 
     /**
-     * <code>uint32 entrance_id = 3;</code>
+     * <code>uint32 template_id = 11;</code>
+     * @return The templateId.
+     */
+    int getTemplateId();
+
+    /**
+     * <code>uint32 entrance_id = 15;</code>
      * @return The entranceId.
      */
     int getEntranceId();
   }
   /**
-   * <pre>
-   * Obf: NIGBJJFCAGF
-   * </pre>
-   *
    * Protobuf type {@code ParentQuestRandomInfo}
    */
   public static final class ParentQuestRandomInfo extends
@@ -99,11 +95,6 @@ public final class ParentQuestRandomInfoOuterClass {
               done = true;
               break;
             case 24: {
-
-              entranceId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 factorList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -111,7 +102,7 @@ public final class ParentQuestRandomInfoOuterClass {
               factorList_.addInt(input.readUInt32());
               break;
             }
-            case 74: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -124,11 +115,16 @@ public final class ParentQuestRandomInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 80: {
+            case 88: {
 
               templateId_ = input.readUInt32();
               break;
             }
+            case 120: {
+
+              entranceId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -164,21 +160,10 @@ public final class ParentQuestRandomInfoOuterClass {
               emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.class, emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.Builder.class);
     }
 
-    public static final int TEMPLATE_ID_FIELD_NUMBER = 10;
-    private int templateId_;
-    /**
-     * <code>uint32 template_id = 10;</code>
-     * @return The templateId.
-     */
-    @java.lang.Override
-    public int getTemplateId() {
-      return templateId_;
-    }
-
-    public static final int FACTOR_LIST_FIELD_NUMBER = 9;
+    public static final int FACTOR_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList factorList_;
     /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @return A list containing the factorList.
      */
     @java.lang.Override
@@ -187,14 +172,14 @@ public final class ParentQuestRandomInfoOuterClass {
       return factorList_;
     }
     /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @return The count of factorList.
      */
     public int getFactorListCount() {
       return factorList_.size();
     }
     /**
-     * <code>repeated uint32 factor_list = 9;</code>
+     * <code>repeated uint32 factor_list = 3;</code>
      * @param index The index of the element to return.
      * @return The factorList at the given index.
      */
@@ -203,10 +188,21 @@ public final class ParentQuestRandomInfoOuterClass {
     }
     private int factorListMemoizedSerializedSize = -1;
 
-    public static final int ENTRANCE_ID_FIELD_NUMBER = 3;
+    public static final int TEMPLATE_ID_FIELD_NUMBER = 11;
+    private int templateId_;
+    /**
+     * <code>uint32 template_id = 11;</code>
+     * @return The templateId.
+     */
+    @java.lang.Override
+    public int getTemplateId() {
+      return templateId_;
+    }
+
+    public static final int ENTRANCE_ID_FIELD_NUMBER = 15;
     private int entranceId_;
     /**
-     * <code>uint32 entrance_id = 3;</code>
+     * <code>uint32 entrance_id = 15;</code>
      * @return The entranceId.
      */
     @java.lang.Override
@@ -229,18 +225,18 @@ public final class ParentQuestRandomInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (entranceId_ != 0) {
-        output.writeUInt32(3, entranceId_);
-      }
       if (getFactorListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(factorListMemoizedSerializedSize);
       }
       for (int i = 0; i < factorList_.size(); i++) {
         output.writeUInt32NoTag(factorList_.getInt(i));
       }
       if (templateId_ != 0) {
-        output.writeUInt32(10, templateId_);
+        output.writeUInt32(11, templateId_);
+      }
+      if (entranceId_ != 0) {
+        output.writeUInt32(15, entranceId_);
       }
       unknownFields.writeTo(output);
     }
@@ -251,10 +247,6 @@ public final class ParentQuestRandomInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entranceId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, entranceId_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < factorList_.size(); i++) {
@@ -271,7 +263,11 @@ public final class ParentQuestRandomInfoOuterClass {
       }
       if (templateId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, templateId_);
+          .computeUInt32Size(11, templateId_);
+      }
+      if (entranceId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, entranceId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -288,10 +284,10 @@ public final class ParentQuestRandomInfoOuterClass {
       }
       emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other = (emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo) obj;
 
-      if (getTemplateId()
-          != other.getTemplateId()) return false;
       if (!getFactorListList()
           .equals(other.getFactorListList())) return false;
+      if (getTemplateId()
+          != other.getTemplateId()) return false;
       if (getEntranceId()
           != other.getEntranceId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -305,12 +301,12 @@ public final class ParentQuestRandomInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTemplateId();
       if (getFactorListCount() > 0) {
         hash = (37 * hash) + FACTOR_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFactorListList().hashCode();
       }
+      hash = (37 * hash) + TEMPLATE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTemplateId();
       hash = (37 * hash) + ENTRANCE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntranceId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -409,10 +405,6 @@ public final class ParentQuestRandomInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NIGBJJFCAGF
-     * </pre>
-     *
      * Protobuf type {@code ParentQuestRandomInfo}
      */
     public static final class Builder extends
@@ -450,10 +442,10 @@ public final class ParentQuestRandomInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        templateId_ = 0;
-
         factorList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        templateId_ = 0;
+
         entranceId_ = 0;
 
         return this;
@@ -483,12 +475,12 @@ public final class ParentQuestRandomInfoOuterClass {
       public emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo buildPartial() {
         emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo result = new emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo(this);
         int from_bitField0_ = bitField0_;
-        result.templateId_ = templateId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           factorList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.factorList_ = factorList_;
+        result.templateId_ = templateId_;
         result.entranceId_ = entranceId_;
         onBuilt();
         return result;
@@ -538,9 +530,6 @@ public final class ParentQuestRandomInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo other) {
         if (other == emu.grasscutter.net.proto.ParentQuestRandomInfoOuterClass.ParentQuestRandomInfo.getDefaultInstance()) return this;
-        if (other.getTemplateId() != 0) {
-          setTemplateId(other.getTemplateId());
-        }
         if (!other.factorList_.isEmpty()) {
           if (factorList_.isEmpty()) {
             factorList_ = other.factorList_;
@@ -551,6 +540,9 @@ public final class ParentQuestRandomInfoOuterClass {
           }
           onChanged();
         }
+        if (other.getTemplateId() != 0) {
+          setTemplateId(other.getTemplateId());
+        }
         if (other.getEntranceId() != 0) {
           setEntranceId(other.getEntranceId());
         }
@@ -584,37 +576,6 @@ public final class ParentQuestRandomInfoOuterClass {
       }
       private int bitField0_;
 
-      private int templateId_ ;
-      /**
-       * <code>uint32 template_id = 10;</code>
-       * @return The templateId.
-       */
-      @java.lang.Override
-      public int getTemplateId() {
-        return templateId_;
-      }
-      /**
-       * <code>uint32 template_id = 10;</code>
-       * @param value The templateId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTemplateId(int value) {
-        
-        templateId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 template_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTemplateId() {
-        
-        templateId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList factorList_ = emptyIntList();
       private void ensureFactorListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -623,7 +584,7 @@ public final class ParentQuestRandomInfoOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @return A list containing the factorList.
        */
       public java.util.List<java.lang.Integer>
@@ -632,14 +593,14 @@ public final class ParentQuestRandomInfoOuterClass {
                  java.util.Collections.unmodifiableList(factorList_) : factorList_;
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @return The count of factorList.
        */
       public int getFactorListCount() {
         return factorList_.size();
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @param index The index of the element to return.
        * @return The factorList at the given index.
        */
@@ -647,7 +608,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return factorList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The factorList to set.
        * @return This builder for chaining.
@@ -660,7 +621,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @param value The factorList to add.
        * @return This builder for chaining.
        */
@@ -671,7 +632,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @param values The factorList to add.
        * @return This builder for chaining.
        */
@@ -684,7 +645,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 factor_list = 9;</code>
+       * <code>repeated uint32 factor_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearFactorList() {
@@ -694,9 +655,40 @@ public final class ParentQuestRandomInfoOuterClass {
         return this;
       }
 
+      private int templateId_ ;
+      /**
+       * <code>uint32 template_id = 11;</code>
+       * @return The templateId.
+       */
+      @java.lang.Override
+      public int getTemplateId() {
+        return templateId_;
+      }
+      /**
+       * <code>uint32 template_id = 11;</code>
+       * @param value The templateId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTemplateId(int value) {
+        
+        templateId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 template_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTemplateId() {
+        
+        templateId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int entranceId_ ;
       /**
-       * <code>uint32 entrance_id = 3;</code>
+       * <code>uint32 entrance_id = 15;</code>
        * @return The entranceId.
        */
       @java.lang.Override
@@ -704,7 +696,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return entranceId_;
       }
       /**
-       * <code>uint32 entrance_id = 3;</code>
+       * <code>uint32 entrance_id = 15;</code>
        * @param value The entranceId to set.
        * @return This builder for chaining.
        */
@@ -715,7 +707,7 @@ public final class ParentQuestRandomInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entrance_id = 3;</code>
+       * <code>uint32 entrance_id = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntranceId() {
@@ -792,8 +784,8 @@ public final class ParentQuestRandomInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033ParentQuestRandomInfo.proto\"V\n\025ParentQ" +
-      "uestRandomInfo\022\023\n\013template_id\030\n \001(\r\022\023\n\013f" +
-      "actor_list\030\t \003(\r\022\023\n\013entrance_id\030\003 \001(\rB\033\n" +
+      "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" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -805,7 +797,7 @@ public final class ParentQuestRandomInfoOuterClass {
     internal_static_ParentQuestRandomInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ParentQuestRandomInfo_descriptor,
-        new java.lang.String[] { "TemplateId", "FactorList", "EntranceId", });
+        new java.lang.String[] { "FactorList", "TemplateId", "EntranceId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PathfindingEnterSceneReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PathfindingEnterSceneReqOuterClass.java
index 8872195b0..f5209eb10 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PathfindingEnterSceneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PathfindingEnterSceneReqOuterClass.java
@@ -18,24 +18,6 @@ public final class PathfindingEnterSceneReqOuterClass {
       // @@protoc_insertion_point(interface_extends:PathfindingEnterSceneReq)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>bool is_editor = 3;</code>
-     * @return The isEditor.
-     */
-    boolean getIsEditor();
-
-    /**
-     * <code>uint32 version = 4;</code>
-     * @return The version.
-     */
-    int getVersion();
-
-    /**
-     * <code>uint32 KJJLLFIJKNA = 2;</code>
-     * @return The kJJLLFIJKNA.
-     */
-    int getKJJLLFIJKNA();
-
     /**
      * <code>repeated .ObstacleInfo obstacles = 10;</code>
      */
@@ -61,23 +43,53 @@ public final class PathfindingEnterSceneReqOuterClass {
         int index);
 
     /**
-     * <code>uint32 GKFDHIPOHOE = 5;</code>
-     * @return The gKFDHIPOHOE.
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @return A list containing the hDFCDNCGBBH.
      */
-    int getGKFDHIPOHOE();
+    java.util.List<java.lang.Integer> getHDFCDNCGBBHList();
+    /**
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @return The count of hDFCDNCGBBH.
+     */
+    int getHDFCDNCGBBHCount();
+    /**
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @param index The index of the element to return.
+     * @return The hDFCDNCGBBH at the given index.
+     */
+    int getHDFCDNCGBBH(int index);
 
     /**
-     * <code>uint32 scene_id = 15;</code>
+     * <code>bool is_editor = 8;</code>
+     * @return The isEditor.
+     */
+    boolean getIsEditor();
+
+    /**
+     * <code>uint32 DKEOBFMAFPK = 13;</code>
+     * @return The dKEOBFMAFPK.
+     */
+    int getDKEOBFMAFPK();
+
+    /**
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     int getSceneId();
+
+    /**
+     * <code>uint32 version = 5;</code>
+     * @return The version.
+     */
+    int getVersion();
+
+    /**
+     * <code>uint32 CDDPHGDDCCN = 3;</code>
+     * @return The cDDPHGDDCCN.
+     */
+    int getCDDPHGDDCCN();
   }
   /**
-   * <pre>
-   * CmdId: 2347
-   * Obf: FPAOCKHOFJL
-   * </pre>
-   *
    * Protobuf type {@code PathfindingEnterSceneReq}
    */
   public static final class PathfindingEnterSceneReq extends
@@ -91,6 +103,7 @@ public final class PathfindingEnterSceneReqOuterClass {
     }
     private PathfindingEnterSceneReq() {
       obstacles_ = java.util.Collections.emptyList();
+      hDFCDNCGBBH_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -124,24 +137,40 @@ public final class PathfindingEnterSceneReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              kJJLLFIJKNA_ = input.readUInt32();
-              break;
-            }
             case 24: {
 
-              isEditor_ = input.readBool();
-              break;
-            }
-            case 32: {
-
-              version_ = input.readUInt32();
+              cDDPHGDDCCN_ = input.readUInt32();
               break;
             }
             case 40: {
 
-              gKFDHIPOHOE_ = input.readUInt32();
+              version_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              isEditor_ = input.readBool();
+              break;
+            }
+            case 72: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                hDFCDNCGBBH_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              hDFCDNCGBBH_.addInt(input.readInt32());
+              break;
+            }
+            case 74: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                hDFCDNCGBBH_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                hDFCDNCGBBH_.addInt(input.readInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             case 82: {
@@ -153,7 +182,12 @@ public final class PathfindingEnterSceneReqOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo.parser(), extensionRegistry));
               break;
             }
-            case 120: {
+            case 104: {
+
+              dKEOBFMAFPK_ = input.readUInt32();
+              break;
+            }
+            case 112: {
 
               sceneId_ = input.readUInt32();
               break;
@@ -173,6 +207,9 @@ public final class PathfindingEnterSceneReqOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          hDFCDNCGBBH_.makeImmutable(); // C
+        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           obstacles_ = java.util.Collections.unmodifiableList(obstacles_);
         }
@@ -193,39 +230,6 @@ public final class PathfindingEnterSceneReqOuterClass {
               emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq.class, emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq.Builder.class);
     }
 
-    public static final int IS_EDITOR_FIELD_NUMBER = 3;
-    private boolean isEditor_;
-    /**
-     * <code>bool is_editor = 3;</code>
-     * @return The isEditor.
-     */
-    @java.lang.Override
-    public boolean getIsEditor() {
-      return isEditor_;
-    }
-
-    public static final int VERSION_FIELD_NUMBER = 4;
-    private int version_;
-    /**
-     * <code>uint32 version = 4;</code>
-     * @return The version.
-     */
-    @java.lang.Override
-    public int getVersion() {
-      return version_;
-    }
-
-    public static final int KJJLLFIJKNA_FIELD_NUMBER = 2;
-    private int kJJLLFIJKNA_;
-    /**
-     * <code>uint32 KJJLLFIJKNA = 2;</code>
-     * @return The kJJLLFIJKNA.
-     */
-    @java.lang.Override
-    public int getKJJLLFIJKNA() {
-      return kJJLLFIJKNA_;
-    }
-
     public static final int OBSTACLES_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> obstacles_;
     /**
@@ -266,21 +270,60 @@ public final class PathfindingEnterSceneReqOuterClass {
       return obstacles_.get(index);
     }
 
-    public static final int GKFDHIPOHOE_FIELD_NUMBER = 5;
-    private int gKFDHIPOHOE_;
+    public static final int HDFCDNCGBBH_FIELD_NUMBER = 9;
+    private com.google.protobuf.Internal.IntList hDFCDNCGBBH_;
     /**
-     * <code>uint32 GKFDHIPOHOE = 5;</code>
-     * @return The gKFDHIPOHOE.
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @return A list containing the hDFCDNCGBBH.
      */
     @java.lang.Override
-    public int getGKFDHIPOHOE() {
-      return gKFDHIPOHOE_;
+    public java.util.List<java.lang.Integer>
+        getHDFCDNCGBBHList() {
+      return hDFCDNCGBBH_;
+    }
+    /**
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @return The count of hDFCDNCGBBH.
+     */
+    public int getHDFCDNCGBBHCount() {
+      return hDFCDNCGBBH_.size();
+    }
+    /**
+     * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+     * @param index The index of the element to return.
+     * @return The hDFCDNCGBBH at the given index.
+     */
+    public int getHDFCDNCGBBH(int index) {
+      return hDFCDNCGBBH_.getInt(index);
+    }
+    private int hDFCDNCGBBHMemoizedSerializedSize = -1;
+
+    public static final int IS_EDITOR_FIELD_NUMBER = 8;
+    private boolean isEditor_;
+    /**
+     * <code>bool is_editor = 8;</code>
+     * @return The isEditor.
+     */
+    @java.lang.Override
+    public boolean getIsEditor() {
+      return isEditor_;
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 15;
+    public static final int DKEOBFMAFPK_FIELD_NUMBER = 13;
+    private int dKEOBFMAFPK_;
+    /**
+     * <code>uint32 DKEOBFMAFPK = 13;</code>
+     * @return The dKEOBFMAFPK.
+     */
+    @java.lang.Override
+    public int getDKEOBFMAFPK() {
+      return dKEOBFMAFPK_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 14;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 15;</code>
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -288,6 +331,28 @@ public final class PathfindingEnterSceneReqOuterClass {
       return sceneId_;
     }
 
+    public static final int VERSION_FIELD_NUMBER = 5;
+    private int version_;
+    /**
+     * <code>uint32 version = 5;</code>
+     * @return The version.
+     */
+    @java.lang.Override
+    public int getVersion() {
+      return version_;
+    }
+
+    public static final int CDDPHGDDCCN_FIELD_NUMBER = 3;
+    private int cDDPHGDDCCN_;
+    /**
+     * <code>uint32 CDDPHGDDCCN = 3;</code>
+     * @return The cDDPHGDDCCN.
+     */
+    @java.lang.Override
+    public int getCDDPHGDDCCN() {
+      return cDDPHGDDCCN_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -302,23 +367,31 @@ public final class PathfindingEnterSceneReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (kJJLLFIJKNA_ != 0) {
-        output.writeUInt32(2, kJJLLFIJKNA_);
-      }
-      if (isEditor_ != false) {
-        output.writeBool(3, isEditor_);
+      getSerializedSize();
+      if (cDDPHGDDCCN_ != 0) {
+        output.writeUInt32(3, cDDPHGDDCCN_);
       }
       if (version_ != 0) {
-        output.writeUInt32(4, version_);
+        output.writeUInt32(5, version_);
       }
-      if (gKFDHIPOHOE_ != 0) {
-        output.writeUInt32(5, gKFDHIPOHOE_);
+      if (isEditor_ != false) {
+        output.writeBool(8, isEditor_);
+      }
+      if (getHDFCDNCGBBHList().size() > 0) {
+        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(hDFCDNCGBBHMemoizedSerializedSize);
+      }
+      for (int i = 0; i < hDFCDNCGBBH_.size(); i++) {
+        output.writeInt32NoTag(hDFCDNCGBBH_.getInt(i));
       }
       for (int i = 0; i < obstacles_.size(); i++) {
         output.writeMessage(10, obstacles_.get(i));
       }
+      if (dKEOBFMAFPK_ != 0) {
+        output.writeUInt32(13, dKEOBFMAFPK_);
+      }
       if (sceneId_ != 0) {
-        output.writeUInt32(15, sceneId_);
+        output.writeUInt32(14, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -329,29 +402,43 @@ public final class PathfindingEnterSceneReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (kJJLLFIJKNA_ != 0) {
+      if (cDDPHGDDCCN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, kJJLLFIJKNA_);
-      }
-      if (isEditor_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isEditor_);
+          .computeUInt32Size(3, cDDPHGDDCCN_);
       }
       if (version_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, version_);
+          .computeUInt32Size(5, version_);
       }
-      if (gKFDHIPOHOE_ != 0) {
+      if (isEditor_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, gKFDHIPOHOE_);
+          .computeBoolSize(8, isEditor_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < hDFCDNCGBBH_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeInt32SizeNoTag(hDFCDNCGBBH_.getInt(i));
+        }
+        size += dataSize;
+        if (!getHDFCDNCGBBHList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        hDFCDNCGBBHMemoizedSerializedSize = dataSize;
       }
       for (int i = 0; i < obstacles_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, obstacles_.get(i));
       }
+      if (dKEOBFMAFPK_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, dKEOBFMAFPK_);
+      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, sceneId_);
+          .computeUInt32Size(14, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -368,18 +455,20 @@ public final class PathfindingEnterSceneReqOuterClass {
       }
       emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq other = (emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq) obj;
 
-      if (getIsEditor()
-          != other.getIsEditor()) return false;
-      if (getVersion()
-          != other.getVersion()) return false;
-      if (getKJJLLFIJKNA()
-          != other.getKJJLLFIJKNA()) return false;
       if (!getObstaclesList()
           .equals(other.getObstaclesList())) return false;
-      if (getGKFDHIPOHOE()
-          != other.getGKFDHIPOHOE()) return false;
+      if (!getHDFCDNCGBBHList()
+          .equals(other.getHDFCDNCGBBHList())) return false;
+      if (getIsEditor()
+          != other.getIsEditor()) return false;
+      if (getDKEOBFMAFPK()
+          != other.getDKEOBFMAFPK()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getVersion()
+          != other.getVersion()) return false;
+      if (getCDDPHGDDCCN()
+          != other.getCDDPHGDDCCN()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -391,21 +480,25 @@ public final class PathfindingEnterSceneReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_EDITOR_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsEditor());
-      hash = (37 * hash) + VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getVersion();
-      hash = (37 * hash) + KJJLLFIJKNA_FIELD_NUMBER;
-      hash = (53 * hash) + getKJJLLFIJKNA();
       if (getObstaclesCount() > 0) {
         hash = (37 * hash) + OBSTACLES_FIELD_NUMBER;
         hash = (53 * hash) + getObstaclesList().hashCode();
       }
-      hash = (37 * hash) + GKFDHIPOHOE_FIELD_NUMBER;
-      hash = (53 * hash) + getGKFDHIPOHOE();
+      if (getHDFCDNCGBBHCount() > 0) {
+        hash = (37 * hash) + HDFCDNCGBBH_FIELD_NUMBER;
+        hash = (53 * hash) + getHDFCDNCGBBHList().hashCode();
+      }
+      hash = (37 * hash) + IS_EDITOR_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsEditor());
+      hash = (37 * hash) + DKEOBFMAFPK_FIELD_NUMBER;
+      hash = (53 * hash) + getDKEOBFMAFPK();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getVersion();
+      hash = (37 * hash) + CDDPHGDDCCN_FIELD_NUMBER;
+      hash = (53 * hash) + getCDDPHGDDCCN();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -502,11 +595,6 @@ public final class PathfindingEnterSceneReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2347
-     * Obf: FPAOCKHOFJL
-     * </pre>
-     *
      * Protobuf type {@code PathfindingEnterSceneReq}
      */
     public static final class Builder extends
@@ -545,22 +633,24 @@ public final class PathfindingEnterSceneReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isEditor_ = false;
-
-        version_ = 0;
-
-        kJJLLFIJKNA_ = 0;
-
         if (obstaclesBuilder_ == null) {
           obstacles_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           obstaclesBuilder_.clear();
         }
-        gKFDHIPOHOE_ = 0;
+        hDFCDNCGBBH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        isEditor_ = false;
+
+        dKEOBFMAFPK_ = 0;
 
         sceneId_ = 0;
 
+        version_ = 0;
+
+        cDDPHGDDCCN_ = 0;
+
         return this;
       }
 
@@ -588,9 +678,6 @@ public final class PathfindingEnterSceneReqOuterClass {
       public emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq buildPartial() {
         emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq result = new emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq(this);
         int from_bitField0_ = bitField0_;
-        result.isEditor_ = isEditor_;
-        result.version_ = version_;
-        result.kJJLLFIJKNA_ = kJJLLFIJKNA_;
         if (obstaclesBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             obstacles_ = java.util.Collections.unmodifiableList(obstacles_);
@@ -600,8 +687,16 @@ public final class PathfindingEnterSceneReqOuterClass {
         } else {
           result.obstacles_ = obstaclesBuilder_.build();
         }
-        result.gKFDHIPOHOE_ = gKFDHIPOHOE_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          hDFCDNCGBBH_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.hDFCDNCGBBH_ = hDFCDNCGBBH_;
+        result.isEditor_ = isEditor_;
+        result.dKEOBFMAFPK_ = dKEOBFMAFPK_;
         result.sceneId_ = sceneId_;
+        result.version_ = version_;
+        result.cDDPHGDDCCN_ = cDDPHGDDCCN_;
         onBuilt();
         return result;
       }
@@ -650,15 +745,6 @@ public final class PathfindingEnterSceneReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq other) {
         if (other == emu.grasscutter.net.proto.PathfindingEnterSceneReqOuterClass.PathfindingEnterSceneReq.getDefaultInstance()) return this;
-        if (other.getIsEditor() != false) {
-          setIsEditor(other.getIsEditor());
-        }
-        if (other.getVersion() != 0) {
-          setVersion(other.getVersion());
-        }
-        if (other.getKJJLLFIJKNA() != 0) {
-          setKJJLLFIJKNA(other.getKJJLLFIJKNA());
-        }
         if (obstaclesBuilder_ == null) {
           if (!other.obstacles_.isEmpty()) {
             if (obstacles_.isEmpty()) {
@@ -685,12 +771,31 @@ public final class PathfindingEnterSceneReqOuterClass {
             }
           }
         }
-        if (other.getGKFDHIPOHOE() != 0) {
-          setGKFDHIPOHOE(other.getGKFDHIPOHOE());
+        if (!other.hDFCDNCGBBH_.isEmpty()) {
+          if (hDFCDNCGBBH_.isEmpty()) {
+            hDFCDNCGBBH_ = other.hDFCDNCGBBH_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureHDFCDNCGBBHIsMutable();
+            hDFCDNCGBBH_.addAll(other.hDFCDNCGBBH_);
+          }
+          onChanged();
+        }
+        if (other.getIsEditor() != false) {
+          setIsEditor(other.getIsEditor());
+        }
+        if (other.getDKEOBFMAFPK() != 0) {
+          setDKEOBFMAFPK(other.getDKEOBFMAFPK());
         }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getVersion() != 0) {
+          setVersion(other.getVersion());
+        }
+        if (other.getCDDPHGDDCCN() != 0) {
+          setCDDPHGDDCCN(other.getCDDPHGDDCCN());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -721,99 +826,6 @@ public final class PathfindingEnterSceneReqOuterClass {
       }
       private int bitField0_;
 
-      private boolean isEditor_ ;
-      /**
-       * <code>bool is_editor = 3;</code>
-       * @return The isEditor.
-       */
-      @java.lang.Override
-      public boolean getIsEditor() {
-        return isEditor_;
-      }
-      /**
-       * <code>bool is_editor = 3;</code>
-       * @param value The isEditor to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsEditor(boolean value) {
-        
-        isEditor_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_editor = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsEditor() {
-        
-        isEditor_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int version_ ;
-      /**
-       * <code>uint32 version = 4;</code>
-       * @return The version.
-       */
-      @java.lang.Override
-      public int getVersion() {
-        return version_;
-      }
-      /**
-       * <code>uint32 version = 4;</code>
-       * @param value The version to set.
-       * @return This builder for chaining.
-       */
-      public Builder setVersion(int value) {
-        
-        version_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 version = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearVersion() {
-        
-        version_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int kJJLLFIJKNA_ ;
-      /**
-       * <code>uint32 KJJLLFIJKNA = 2;</code>
-       * @return The kJJLLFIJKNA.
-       */
-      @java.lang.Override
-      public int getKJJLLFIJKNA() {
-        return kJJLLFIJKNA_;
-      }
-      /**
-       * <code>uint32 KJJLLFIJKNA = 2;</code>
-       * @param value The kJJLLFIJKNA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKJJLLFIJKNA(int value) {
-        
-        kJJLLFIJKNA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KJJLLFIJKNA = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKJJLLFIJKNA() {
-        
-        kJJLLFIJKNA_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ObstacleInfoOuterClass.ObstacleInfo> obstacles_ =
         java.util.Collections.emptyList();
       private void ensureObstaclesIsMutable() {
@@ -1054,40 +1066,150 @@ public final class PathfindingEnterSceneReqOuterClass {
         return obstaclesBuilder_;
       }
 
-      private int gKFDHIPOHOE_ ;
-      /**
-       * <code>uint32 GKFDHIPOHOE = 5;</code>
-       * @return The gKFDHIPOHOE.
-       */
-      @java.lang.Override
-      public int getGKFDHIPOHOE() {
-        return gKFDHIPOHOE_;
+      private com.google.protobuf.Internal.IntList hDFCDNCGBBH_ = emptyIntList();
+      private void ensureHDFCDNCGBBHIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          hDFCDNCGBBH_ = mutableCopy(hDFCDNCGBBH_);
+          bitField0_ |= 0x00000002;
+         }
       }
       /**
-       * <code>uint32 GKFDHIPOHOE = 5;</code>
-       * @param value The gKFDHIPOHOE to set.
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @return A list containing the hDFCDNCGBBH.
+       */
+      public java.util.List<java.lang.Integer>
+          getHDFCDNCGBBHList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(hDFCDNCGBBH_) : hDFCDNCGBBH_;
+      }
+      /**
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @return The count of hDFCDNCGBBH.
+       */
+      public int getHDFCDNCGBBHCount() {
+        return hDFCDNCGBBH_.size();
+      }
+      /**
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @param index The index of the element to return.
+       * @return The hDFCDNCGBBH at the given index.
+       */
+      public int getHDFCDNCGBBH(int index) {
+        return hDFCDNCGBBH_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @param index The index to set the value at.
+       * @param value The hDFCDNCGBBH to set.
        * @return This builder for chaining.
        */
-      public Builder setGKFDHIPOHOE(int value) {
-        
-        gKFDHIPOHOE_ = value;
+      public Builder setHDFCDNCGBBH(
+          int index, int value) {
+        ensureHDFCDNCGBBHIsMutable();
+        hDFCDNCGBBH_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 GKFDHIPOHOE = 5;</code>
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @param value The hDFCDNCGBBH to add.
        * @return This builder for chaining.
        */
-      public Builder clearGKFDHIPOHOE() {
+      public Builder addHDFCDNCGBBH(int value) {
+        ensureHDFCDNCGBBHIsMutable();
+        hDFCDNCGBBH_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @param values The hDFCDNCGBBH to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllHDFCDNCGBBH(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureHDFCDNCGBBHIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, hDFCDNCGBBH_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 HDFCDNCGBBH = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHDFCDNCGBBH() {
+        hDFCDNCGBBH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private boolean isEditor_ ;
+      /**
+       * <code>bool is_editor = 8;</code>
+       * @return The isEditor.
+       */
+      @java.lang.Override
+      public boolean getIsEditor() {
+        return isEditor_;
+      }
+      /**
+       * <code>bool is_editor = 8;</code>
+       * @param value The isEditor to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsEditor(boolean value) {
         
-        gKFDHIPOHOE_ = 0;
+        isEditor_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_editor = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsEditor() {
+        
+        isEditor_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dKEOBFMAFPK_ ;
+      /**
+       * <code>uint32 DKEOBFMAFPK = 13;</code>
+       * @return The dKEOBFMAFPK.
+       */
+      @java.lang.Override
+      public int getDKEOBFMAFPK() {
+        return dKEOBFMAFPK_;
+      }
+      /**
+       * <code>uint32 DKEOBFMAFPK = 13;</code>
+       * @param value The dKEOBFMAFPK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDKEOBFMAFPK(int value) {
+        
+        dKEOBFMAFPK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DKEOBFMAFPK = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDKEOBFMAFPK() {
+        
+        dKEOBFMAFPK_ = 0;
         onChanged();
         return this;
       }
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 15;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -1095,7 +1217,7 @@ public final class PathfindingEnterSceneReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 15;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -1106,7 +1228,7 @@ public final class PathfindingEnterSceneReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 15;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -1115,6 +1237,68 @@ public final class PathfindingEnterSceneReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int version_ ;
+      /**
+       * <code>uint32 version = 5;</code>
+       * @return The version.
+       */
+      @java.lang.Override
+      public int getVersion() {
+        return version_;
+      }
+      /**
+       * <code>uint32 version = 5;</code>
+       * @param value The version to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVersion(int value) {
+        
+        version_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 version = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVersion() {
+        
+        version_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cDDPHGDDCCN_ ;
+      /**
+       * <code>uint32 CDDPHGDDCCN = 3;</code>
+       * @return The cDDPHGDDCCN.
+       */
+      @java.lang.Override
+      public int getCDDPHGDDCCN() {
+        return cDDPHGDDCCN_;
+      }
+      /**
+       * <code>uint32 CDDPHGDDCCN = 3;</code>
+       * @param value The cDDPHGDDCCN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCDDPHGDDCCN(int value) {
+        
+        cDDPHGDDCCN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 CDDPHGDDCCN = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCDDPHGDDCCN() {
+        
+        cDDPHGDDCCN_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1183,12 +1367,12 @@ public final class PathfindingEnterSceneReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036PathfindingEnterSceneReq.proto\032\022Obstac" +
-      "leInfo.proto\"\234\001\n\030PathfindingEnterSceneRe" +
-      "q\022\021\n\tis_editor\030\003 \001(\010\022\017\n\007version\030\004 \001(\r\022\023\n" +
-      "\013KJJLLFIJKNA\030\002 \001(\r\022 \n\tobstacles\030\n \003(\0132\r." +
-      "ObstacleInfo\022\023\n\013GKFDHIPOHOE\030\005 \001(\r\022\020\n\010sce" +
-      "ne_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.proto" +
-      "b\006proto3"
+      "leInfo.proto\"\261\001\n\030PathfindingEnterSceneRe" +
+      "q\022 \n\tobstacles\030\n \003(\0132\r.ObstacleInfo\022\023\n\013H" +
+      "DFCDNCGBBH\030\t \003(\005\022\021\n\tis_editor\030\010 \001(\010\022\023\n\013D" +
+      "KEOBFMAFPK\030\r \001(\r\022\020\n\010scene_id\030\016 \001(\r\022\017\n\007ve" +
+      "rsion\030\005 \001(\r\022\023\n\013CDDPHGDDCCN\030\003 \001(\rB\033\n\031emu." +
+      "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1200,7 +1384,7 @@ public final class PathfindingEnterSceneReqOuterClass {
     internal_static_PathfindingEnterSceneReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PathfindingEnterSceneReq_descriptor,
-        new java.lang.String[] { "IsEditor", "Version", "KJJLLFIJKNA", "Obstacles", "GKFDHIPOHOE", "SceneId", });
+        new java.lang.String[] { "Obstacles", "HDFCDNCGBBH", "IsEditor", "DKEOBFMAFPK", "SceneId", "Version", "CDDPHGDDCCN", });
     emu.grasscutter.net.proto.ObstacleInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataReqOuterClass.java
index 9f652eb6f..ca3d55555 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalLineAllDataReqOuterClass.java
@@ -19,11 +19,6 @@ public final class PersonalLineAllDataReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 9323
-   * Obf: BDPIKKGLOCD
-   * </pre>
-   *
    * Protobuf type {@code PersonalLineAllDataReq}
    */
   public static final class PersonalLineAllDataReq extends
@@ -245,11 +240,6 @@ public final class PersonalLineAllDataReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9323
-     * Obf: BDPIKKGLOCD
-     * </pre>
-     *
      * Protobuf type {@code PersonalLineAllDataReq}
      */
     public static final class Builder extends
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 122b33a3e..a8541e0c7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PersonalSceneJumpReqOuterClass.java
@@ -19,17 +19,12 @@ public final class PersonalSceneJumpReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 15;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 20938
-   * Obf: BEJBGBNMMMH
-   * </pre>
-   *
    * Protobuf type {@code PersonalSceneJumpReq}
    */
   public static final class PersonalSceneJumpReq extends
@@ -74,7 +69,7 @@ public final class PersonalSceneJumpReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 48: {
 
               pointId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class PersonalSceneJumpReqOuterClass {
               emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.class, emu.grasscutter.net.proto.PersonalSceneJumpReqOuterClass.PersonalSceneJumpReq.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 15;
+    public static final int POINT_ID_FIELD_NUMBER = 6;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 15;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class PersonalSceneJumpReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (pointId_ != 0) {
-        output.writeUInt32(15, pointId_);
+        output.writeUInt32(6, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class PersonalSceneJumpReqOuterClass {
       size = 0;
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, pointId_);
+          .computeUInt32Size(6, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class PersonalSceneJumpReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20938
-     * Obf: BEJBGBNMMMH
-     * </pre>
-     *
      * Protobuf type {@code PersonalSceneJumpReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class PersonalSceneJumpReqOuterClass {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class PersonalSceneJumpReqOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class PersonalSceneJumpReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -527,7 +517,7 @@ public final class PersonalSceneJumpReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PersonalSceneJumpReq.proto\"(\n\024Personal" +
-      "SceneJumpReq\022\020\n\010point_id\030\017 \001(\rB\033\n\031emu.gr" +
+      "SceneJumpReq\022\020\n\010point_id\030\006 \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 9061a6a8f..c3aa9656d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PingReqOuterClass.java
@@ -19,41 +19,54 @@ public final class PingReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>double total_tick_time = 8;</code>
+     * <code>bytes PDHFGJIBCLA = 13;</code>
+     * @return The pDHFGJIBCLA.
+     */
+    com.google.protobuf.ByteString getPDHFGJIBCLA();
+
+    /**
+     * <code>bytes IINPBFLAEEP = 2;</code>
+     * @return The iINPBFLAEEP.
+     */
+    com.google.protobuf.ByteString getIINPBFLAEEP();
+
+    /**
+     * <code>uint64 NHLLKPHMFGP = 3;</code>
+     * @return The nHLLKPHMFGP.
+     */
+    long getNHLLKPHMFGP();
+
+    /**
+     * <code>double total_tick_time = 7;</code>
      * @return The totalTickTime.
      */
     double getTotalTickTime();
 
     /**
-     * <code>uint32 client_time = 2;</code>
+     * <code>uint32 client_time = 4;</code>
      * @return The clientTime.
      */
     int getClientTime();
 
     /**
-     * <code>float ue_time = 12;</code>
+     * <code>float ue_time = 8;</code>
      * @return The ueTime.
      */
     float getUeTime();
 
     /**
-     * <code>bytes sc_data = 6;</code>
-     * @return The scData.
+     * <code>uint32 DFALBBBCFMO = 10;</code>
+     * @return The dFALBBBCFMO.
      */
-    com.google.protobuf.ByteString getScData();
+    int getDFALBBBCFMO();
 
     /**
-     * <code>uint32 seq = 10;</code>
+     * <code>uint32 seq = 15;</code>
      * @return The seq.
      */
     int getSeq();
   }
   /**
-   * <pre>
-   * CmdId: 5285
-   * Obf: EIMFFIJOBHL
-   * </pre>
-   *
    * Protobuf type {@code PingReq}
    */
   public static final class PingReq extends
@@ -66,7 +79,8 @@ public final class PingReqOuterClass {
       super(builder);
     }
     private PingReq() {
-      scData_ = com.google.protobuf.ByteString.EMPTY;
+      pDHFGJIBCLA_ = com.google.protobuf.ByteString.EMPTY;
+      iINPBFLAEEP_ = com.google.protobuf.ByteString.EMPTY;
     }
 
     @java.lang.Override
@@ -99,31 +113,46 @@ public final class PingReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 18: {
+
+              iINPBFLAEEP_ = input.readBytes();
+              break;
+            }
+            case 24: {
+
+              nHLLKPHMFGP_ = input.readUInt64();
+              break;
+            }
+            case 32: {
 
               clientTime_ = input.readUInt32();
               break;
             }
-            case 50: {
-
-              scData_ = input.readBytes();
-              break;
-            }
-            case 65: {
+            case 57: {
 
               totalTickTime_ = input.readDouble();
               break;
             }
-            case 80: {
-
-              seq_ = input.readUInt32();
-              break;
-            }
-            case 101: {
+            case 69: {
 
               ueTime_ = input.readFloat();
               break;
             }
+            case 80: {
+
+              dFALBBBCFMO_ = input.readUInt32();
+              break;
+            }
+            case 106: {
+
+              pDHFGJIBCLA_ = input.readBytes();
+              break;
+            }
+            case 120: {
+
+              seq_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -156,10 +185,43 @@ public final class PingReqOuterClass {
               emu.grasscutter.net.proto.PingReqOuterClass.PingReq.class, emu.grasscutter.net.proto.PingReqOuterClass.PingReq.Builder.class);
     }
 
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 8;
+    public static final int PDHFGJIBCLA_FIELD_NUMBER = 13;
+    private com.google.protobuf.ByteString pDHFGJIBCLA_;
+    /**
+     * <code>bytes PDHFGJIBCLA = 13;</code>
+     * @return The pDHFGJIBCLA.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getPDHFGJIBCLA() {
+      return pDHFGJIBCLA_;
+    }
+
+    public static final int IINPBFLAEEP_FIELD_NUMBER = 2;
+    private com.google.protobuf.ByteString iINPBFLAEEP_;
+    /**
+     * <code>bytes IINPBFLAEEP = 2;</code>
+     * @return The iINPBFLAEEP.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getIINPBFLAEEP() {
+      return iINPBFLAEEP_;
+    }
+
+    public static final int NHLLKPHMFGP_FIELD_NUMBER = 3;
+    private long nHLLKPHMFGP_;
+    /**
+     * <code>uint64 NHLLKPHMFGP = 3;</code>
+     * @return The nHLLKPHMFGP.
+     */
+    @java.lang.Override
+    public long getNHLLKPHMFGP() {
+      return nHLLKPHMFGP_;
+    }
+
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 7;
     private double totalTickTime_;
     /**
-     * <code>double total_tick_time = 8;</code>
+     * <code>double total_tick_time = 7;</code>
      * @return The totalTickTime.
      */
     @java.lang.Override
@@ -167,10 +229,10 @@ public final class PingReqOuterClass {
       return totalTickTime_;
     }
 
-    public static final int CLIENT_TIME_FIELD_NUMBER = 2;
+    public static final int CLIENT_TIME_FIELD_NUMBER = 4;
     private int clientTime_;
     /**
-     * <code>uint32 client_time = 2;</code>
+     * <code>uint32 client_time = 4;</code>
      * @return The clientTime.
      */
     @java.lang.Override
@@ -178,10 +240,10 @@ public final class PingReqOuterClass {
       return clientTime_;
     }
 
-    public static final int UE_TIME_FIELD_NUMBER = 12;
+    public static final int UE_TIME_FIELD_NUMBER = 8;
     private float ueTime_;
     /**
-     * <code>float ue_time = 12;</code>
+     * <code>float ue_time = 8;</code>
      * @return The ueTime.
      */
     @java.lang.Override
@@ -189,21 +251,21 @@ public final class PingReqOuterClass {
       return ueTime_;
     }
 
-    public static final int SC_DATA_FIELD_NUMBER = 6;
-    private com.google.protobuf.ByteString scData_;
+    public static final int DFALBBBCFMO_FIELD_NUMBER = 10;
+    private int dFALBBBCFMO_;
     /**
-     * <code>bytes sc_data = 6;</code>
-     * @return The scData.
+     * <code>uint32 DFALBBBCFMO = 10;</code>
+     * @return The dFALBBBCFMO.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString getScData() {
-      return scData_;
+    public int getDFALBBBCFMO() {
+      return dFALBBBCFMO_;
     }
 
-    public static final int SEQ_FIELD_NUMBER = 10;
+    public static final int SEQ_FIELD_NUMBER = 15;
     private int seq_;
     /**
-     * <code>uint32 seq = 10;</code>
+     * <code>uint32 seq = 15;</code>
      * @return The seq.
      */
     @java.lang.Override
@@ -225,20 +287,29 @@ public final class PingReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (clientTime_ != 0) {
-        output.writeUInt32(2, clientTime_);
+      if (!iINPBFLAEEP_.isEmpty()) {
+        output.writeBytes(2, iINPBFLAEEP_);
       }
-      if (!scData_.isEmpty()) {
-        output.writeBytes(6, scData_);
+      if (nHLLKPHMFGP_ != 0L) {
+        output.writeUInt64(3, nHLLKPHMFGP_);
+      }
+      if (clientTime_ != 0) {
+        output.writeUInt32(4, clientTime_);
       }
       if (totalTickTime_ != 0D) {
-        output.writeDouble(8, totalTickTime_);
-      }
-      if (seq_ != 0) {
-        output.writeUInt32(10, seq_);
+        output.writeDouble(7, totalTickTime_);
       }
       if (ueTime_ != 0F) {
-        output.writeFloat(12, ueTime_);
+        output.writeFloat(8, ueTime_);
+      }
+      if (dFALBBBCFMO_ != 0) {
+        output.writeUInt32(10, dFALBBBCFMO_);
+      }
+      if (!pDHFGJIBCLA_.isEmpty()) {
+        output.writeBytes(13, pDHFGJIBCLA_);
+      }
+      if (seq_ != 0) {
+        output.writeUInt32(15, seq_);
       }
       unknownFields.writeTo(output);
     }
@@ -249,25 +320,37 @@ public final class PingReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (!iINPBFLAEEP_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(2, iINPBFLAEEP_);
+      }
+      if (nHLLKPHMFGP_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(3, nHLLKPHMFGP_);
+      }
       if (clientTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, clientTime_);
-      }
-      if (!scData_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(6, scData_);
+          .computeUInt32Size(4, clientTime_);
       }
       if (totalTickTime_ != 0D) {
         size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(8, totalTickTime_);
-      }
-      if (seq_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, seq_);
+          .computeDoubleSize(7, totalTickTime_);
       }
       if (ueTime_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(12, ueTime_);
+          .computeFloatSize(8, ueTime_);
+      }
+      if (dFALBBBCFMO_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, dFALBBBCFMO_);
+      }
+      if (!pDHFGJIBCLA_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(13, pDHFGJIBCLA_);
+      }
+      if (seq_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, seq_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -284,6 +367,12 @@ public final class PingReqOuterClass {
       }
       emu.grasscutter.net.proto.PingReqOuterClass.PingReq other = (emu.grasscutter.net.proto.PingReqOuterClass.PingReq) obj;
 
+      if (!getPDHFGJIBCLA()
+          .equals(other.getPDHFGJIBCLA())) return false;
+      if (!getIINPBFLAEEP()
+          .equals(other.getIINPBFLAEEP())) return false;
+      if (getNHLLKPHMFGP()
+          != other.getNHLLKPHMFGP()) return false;
       if (java.lang.Double.doubleToLongBits(getTotalTickTime())
           != java.lang.Double.doubleToLongBits(
               other.getTotalTickTime())) return false;
@@ -292,8 +381,8 @@ public final class PingReqOuterClass {
       if (java.lang.Float.floatToIntBits(getUeTime())
           != java.lang.Float.floatToIntBits(
               other.getUeTime())) return false;
-      if (!getScData()
-          .equals(other.getScData())) return false;
+      if (getDFALBBBCFMO()
+          != other.getDFALBBBCFMO()) return false;
       if (getSeq()
           != other.getSeq()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -307,6 +396,13 @@ public final class PingReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PDHFGJIBCLA_FIELD_NUMBER;
+      hash = (53 * hash) + getPDHFGJIBCLA().hashCode();
+      hash = (37 * hash) + IINPBFLAEEP_FIELD_NUMBER;
+      hash = (53 * hash) + getIINPBFLAEEP().hashCode();
+      hash = (37 * hash) + NHLLKPHMFGP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getNHLLKPHMFGP());
       hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTotalTickTime()));
@@ -315,8 +411,8 @@ public final class PingReqOuterClass {
       hash = (37 * hash) + UE_TIME_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getUeTime());
-      hash = (37 * hash) + SC_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getScData().hashCode();
+      hash = (37 * hash) + DFALBBBCFMO_FIELD_NUMBER;
+      hash = (53 * hash) + getDFALBBBCFMO();
       hash = (37 * hash) + SEQ_FIELD_NUMBER;
       hash = (53 * hash) + getSeq();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -415,11 +511,6 @@ public final class PingReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5285
-     * Obf: EIMFFIJOBHL
-     * </pre>
-     *
      * Protobuf type {@code PingReq}
      */
     public static final class Builder extends
@@ -457,13 +548,19 @@ public final class PingReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        pDHFGJIBCLA_ = com.google.protobuf.ByteString.EMPTY;
+
+        iINPBFLAEEP_ = com.google.protobuf.ByteString.EMPTY;
+
+        nHLLKPHMFGP_ = 0L;
+
         totalTickTime_ = 0D;
 
         clientTime_ = 0;
 
         ueTime_ = 0F;
 
-        scData_ = com.google.protobuf.ByteString.EMPTY;
+        dFALBBBCFMO_ = 0;
 
         seq_ = 0;
 
@@ -493,10 +590,13 @@ public final class PingReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PingReqOuterClass.PingReq buildPartial() {
         emu.grasscutter.net.proto.PingReqOuterClass.PingReq result = new emu.grasscutter.net.proto.PingReqOuterClass.PingReq(this);
+        result.pDHFGJIBCLA_ = pDHFGJIBCLA_;
+        result.iINPBFLAEEP_ = iINPBFLAEEP_;
+        result.nHLLKPHMFGP_ = nHLLKPHMFGP_;
         result.totalTickTime_ = totalTickTime_;
         result.clientTime_ = clientTime_;
         result.ueTime_ = ueTime_;
-        result.scData_ = scData_;
+        result.dFALBBBCFMO_ = dFALBBBCFMO_;
         result.seq_ = seq_;
         onBuilt();
         return result;
@@ -546,6 +646,15 @@ public final class PingReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PingReqOuterClass.PingReq other) {
         if (other == emu.grasscutter.net.proto.PingReqOuterClass.PingReq.getDefaultInstance()) return this;
+        if (other.getPDHFGJIBCLA() != com.google.protobuf.ByteString.EMPTY) {
+          setPDHFGJIBCLA(other.getPDHFGJIBCLA());
+        }
+        if (other.getIINPBFLAEEP() != com.google.protobuf.ByteString.EMPTY) {
+          setIINPBFLAEEP(other.getIINPBFLAEEP());
+        }
+        if (other.getNHLLKPHMFGP() != 0L) {
+          setNHLLKPHMFGP(other.getNHLLKPHMFGP());
+        }
         if (other.getTotalTickTime() != 0D) {
           setTotalTickTime(other.getTotalTickTime());
         }
@@ -555,8 +664,8 @@ public final class PingReqOuterClass {
         if (other.getUeTime() != 0F) {
           setUeTime(other.getUeTime());
         }
-        if (other.getScData() != com.google.protobuf.ByteString.EMPTY) {
-          setScData(other.getScData());
+        if (other.getDFALBBBCFMO() != 0) {
+          setDFALBBBCFMO(other.getDFALBBBCFMO());
         }
         if (other.getSeq() != 0) {
           setSeq(other.getSeq());
@@ -590,9 +699,108 @@ public final class PingReqOuterClass {
         return this;
       }
 
+      private com.google.protobuf.ByteString pDHFGJIBCLA_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes PDHFGJIBCLA = 13;</code>
+       * @return The pDHFGJIBCLA.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getPDHFGJIBCLA() {
+        return pDHFGJIBCLA_;
+      }
+      /**
+       * <code>bytes PDHFGJIBCLA = 13;</code>
+       * @param value The pDHFGJIBCLA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPDHFGJIBCLA(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        pDHFGJIBCLA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes PDHFGJIBCLA = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPDHFGJIBCLA() {
+        
+        pDHFGJIBCLA_ = getDefaultInstance().getPDHFGJIBCLA();
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString iINPBFLAEEP_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes IINPBFLAEEP = 2;</code>
+       * @return The iINPBFLAEEP.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getIINPBFLAEEP() {
+        return iINPBFLAEEP_;
+      }
+      /**
+       * <code>bytes IINPBFLAEEP = 2;</code>
+       * @param value The iINPBFLAEEP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIINPBFLAEEP(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        iINPBFLAEEP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes IINPBFLAEEP = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIINPBFLAEEP() {
+        
+        iINPBFLAEEP_ = getDefaultInstance().getIINPBFLAEEP();
+        onChanged();
+        return this;
+      }
+
+      private long nHLLKPHMFGP_ ;
+      /**
+       * <code>uint64 NHLLKPHMFGP = 3;</code>
+       * @return The nHLLKPHMFGP.
+       */
+      @java.lang.Override
+      public long getNHLLKPHMFGP() {
+        return nHLLKPHMFGP_;
+      }
+      /**
+       * <code>uint64 NHLLKPHMFGP = 3;</code>
+       * @param value The nHLLKPHMFGP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNHLLKPHMFGP(long value) {
+        
+        nHLLKPHMFGP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 NHLLKPHMFGP = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNHLLKPHMFGP() {
+        
+        nHLLKPHMFGP_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private double totalTickTime_ ;
       /**
-       * <code>double total_tick_time = 8;</code>
+       * <code>double total_tick_time = 7;</code>
        * @return The totalTickTime.
        */
       @java.lang.Override
@@ -600,7 +808,7 @@ public final class PingReqOuterClass {
         return totalTickTime_;
       }
       /**
-       * <code>double total_tick_time = 8;</code>
+       * <code>double total_tick_time = 7;</code>
        * @param value The totalTickTime to set.
        * @return This builder for chaining.
        */
@@ -611,7 +819,7 @@ public final class PingReqOuterClass {
         return this;
       }
       /**
-       * <code>double total_tick_time = 8;</code>
+       * <code>double total_tick_time = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTotalTickTime() {
@@ -623,7 +831,7 @@ public final class PingReqOuterClass {
 
       private int clientTime_ ;
       /**
-       * <code>uint32 client_time = 2;</code>
+       * <code>uint32 client_time = 4;</code>
        * @return The clientTime.
        */
       @java.lang.Override
@@ -631,7 +839,7 @@ public final class PingReqOuterClass {
         return clientTime_;
       }
       /**
-       * <code>uint32 client_time = 2;</code>
+       * <code>uint32 client_time = 4;</code>
        * @param value The clientTime to set.
        * @return This builder for chaining.
        */
@@ -642,7 +850,7 @@ public final class PingReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 client_time = 2;</code>
+       * <code>uint32 client_time = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientTime() {
@@ -654,7 +862,7 @@ public final class PingReqOuterClass {
 
       private float ueTime_ ;
       /**
-       * <code>float ue_time = 12;</code>
+       * <code>float ue_time = 8;</code>
        * @return The ueTime.
        */
       @java.lang.Override
@@ -662,7 +870,7 @@ public final class PingReqOuterClass {
         return ueTime_;
       }
       /**
-       * <code>float ue_time = 12;</code>
+       * <code>float ue_time = 8;</code>
        * @param value The ueTime to set.
        * @return This builder for chaining.
        */
@@ -673,7 +881,7 @@ public final class PingReqOuterClass {
         return this;
       }
       /**
-       * <code>float ue_time = 12;</code>
+       * <code>float ue_time = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearUeTime() {
@@ -683,43 +891,40 @@ public final class PingReqOuterClass {
         return this;
       }
 
-      private com.google.protobuf.ByteString scData_ = com.google.protobuf.ByteString.EMPTY;
+      private int dFALBBBCFMO_ ;
       /**
-       * <code>bytes sc_data = 6;</code>
-       * @return The scData.
+       * <code>uint32 DFALBBBCFMO = 10;</code>
+       * @return The dFALBBBCFMO.
        */
       @java.lang.Override
-      public com.google.protobuf.ByteString getScData() {
-        return scData_;
+      public int getDFALBBBCFMO() {
+        return dFALBBBCFMO_;
       }
       /**
-       * <code>bytes sc_data = 6;</code>
-       * @param value The scData to set.
+       * <code>uint32 DFALBBBCFMO = 10;</code>
+       * @param value The dFALBBBCFMO to set.
        * @return This builder for chaining.
        */
-      public Builder setScData(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        scData_ = value;
+      public Builder setDFALBBBCFMO(int value) {
+        
+        dFALBBBCFMO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bytes sc_data = 6;</code>
+       * <code>uint32 DFALBBBCFMO = 10;</code>
        * @return This builder for chaining.
        */
-      public Builder clearScData() {
+      public Builder clearDFALBBBCFMO() {
         
-        scData_ = getDefaultInstance().getScData();
+        dFALBBBCFMO_ = 0;
         onChanged();
         return this;
       }
 
       private int seq_ ;
       /**
-       * <code>uint32 seq = 10;</code>
+       * <code>uint32 seq = 15;</code>
        * @return The seq.
        */
       @java.lang.Override
@@ -727,7 +932,7 @@ public final class PingReqOuterClass {
         return seq_;
       }
       /**
-       * <code>uint32 seq = 10;</code>
+       * <code>uint32 seq = 15;</code>
        * @param value The seq to set.
        * @return This builder for chaining.
        */
@@ -738,7 +943,7 @@ public final class PingReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 seq = 10;</code>
+       * <code>uint32 seq = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearSeq() {
@@ -814,10 +1019,12 @@ public final class PingReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rPingReq.proto\"f\n\007PingReq\022\027\n\017total_tick" +
-      "_time\030\010 \001(\001\022\023\n\013client_time\030\002 \001(\r\022\017\n\007ue_t" +
-      "ime\030\014 \001(\002\022\017\n\007sc_data\030\006 \001(\014\022\013\n\003seq\030\n \001(\rB" +
-      "\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\rPingReq.proto\"\251\001\n\007PingReq\022\023\n\013PDHFGJIBC" +
+      "LA\030\r \001(\014\022\023\n\013IINPBFLAEEP\030\002 \001(\014\022\023\n\013NHLLKPH" +
+      "MFGP\030\003 \001(\004\022\027\n\017total_tick_time\030\007 \001(\001\022\023\n\013c" +
+      "lient_time\030\004 \001(\r\022\017\n\007ue_time\030\010 \001(\002\022\023\n\013DFA" +
+      "LBBBCFMO\030\n \001(\r\022\013\n\003seq\030\017 \001(\rB\033\n\031emu.grass" +
+      "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -828,7 +1035,7 @@ public final class PingReqOuterClass {
     internal_static_PingReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PingReq_descriptor,
-        new java.lang.String[] { "TotalTickTime", "ClientTime", "UeTime", "ScData", "Seq", });
+        new java.lang.String[] { "PDHFGJIBCLA", "IINPBFLAEEP", "NHLLKPHMFGP", "TotalTickTime", "ClientTime", "UeTime", "DFALBBBCFMO", "Seq", });
   }
 
   // @@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 95c64a94b..46c255a50 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PingRspOuterClass.java
@@ -19,29 +19,24 @@ public final class PingRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 seq = 6;</code>
+     * <code>uint32 seq = 2;</code>
      * @return The seq.
      */
     int getSeq();
 
     /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 client_time = 12;</code>
+     * <code>uint32 client_time = 3;</code>
      * @return The clientTime.
      */
     int getClientTime();
+
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8231
-   * Obf: BLIJCEANDPM
-   * </pre>
-   *
    * Protobuf type {@code PingRsp}
    */
   public static final class PingRsp extends
@@ -88,19 +83,19 @@ public final class PingRspOuterClass {
               break;
             case 16: {
 
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 48: {
-
               seq_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 24: {
 
               clientTime_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class PingRspOuterClass {
               emu.grasscutter.net.proto.PingRspOuterClass.PingRsp.class, emu.grasscutter.net.proto.PingRspOuterClass.PingRsp.Builder.class);
     }
 
-    public static final int SEQ_FIELD_NUMBER = 6;
+    public static final int SEQ_FIELD_NUMBER = 2;
     private int seq_;
     /**
-     * <code>uint32 seq = 6;</code>
+     * <code>uint32 seq = 2;</code>
      * @return The seq.
      */
     @java.lang.Override
@@ -144,21 +139,10 @@ public final class PingRspOuterClass {
       return seq_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int CLIENT_TIME_FIELD_NUMBER = 12;
+    public static final int CLIENT_TIME_FIELD_NUMBER = 3;
     private int clientTime_;
     /**
-     * <code>uint32 client_time = 12;</code>
+     * <code>uint32 client_time = 3;</code>
      * @return The clientTime.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class PingRspOuterClass {
       return clientTime_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class PingRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
       if (seq_ != 0) {
-        output.writeUInt32(6, seq_);
+        output.writeUInt32(2, seq_);
       }
       if (clientTime_ != 0) {
-        output.writeUInt32(12, clientTime_);
+        output.writeUInt32(3, clientTime_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class PingRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
       if (seq_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, seq_);
+          .computeUInt32Size(2, seq_);
       }
       if (clientTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, clientTime_);
+          .computeUInt32Size(3, clientTime_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +222,10 @@ public final class PingRspOuterClass {
 
       if (getSeq()
           != other.getSeq()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getClientTime()
           != other.getClientTime()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +239,10 @@ public final class PingRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + SEQ_FIELD_NUMBER;
       hash = (53 * hash) + getSeq();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       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;
@@ -344,11 +339,6 @@ public final class PingRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8231
-     * Obf: BLIJCEANDPM
-     * </pre>
-     *
      * Protobuf type {@code PingRsp}
      */
     public static final class Builder extends
@@ -388,10 +378,10 @@ public final class PingRspOuterClass {
         super.clear();
         seq_ = 0;
 
-        retcode_ = 0;
-
         clientTime_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -419,8 +409,8 @@ public final class PingRspOuterClass {
       public emu.grasscutter.net.proto.PingRspOuterClass.PingRsp buildPartial() {
         emu.grasscutter.net.proto.PingRspOuterClass.PingRsp result = new emu.grasscutter.net.proto.PingRspOuterClass.PingRsp(this);
         result.seq_ = seq_;
-        result.retcode_ = retcode_;
         result.clientTime_ = clientTime_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -472,12 +462,12 @@ public final class PingRspOuterClass {
         if (other.getSeq() != 0) {
           setSeq(other.getSeq());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getClientTime() != 0) {
           setClientTime(other.getClientTime());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +499,7 @@ public final class PingRspOuterClass {
 
       private int seq_ ;
       /**
-       * <code>uint32 seq = 6;</code>
+       * <code>uint32 seq = 2;</code>
        * @return The seq.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class PingRspOuterClass {
         return seq_;
       }
       /**
-       * <code>uint32 seq = 6;</code>
+       * <code>uint32 seq = 2;</code>
        * @param value The seq to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class PingRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 seq = 6;</code>
+       * <code>uint32 seq = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearSeq() {
@@ -538,40 +528,9 @@ public final class PingRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 2;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int clientTime_ ;
       /**
-       * <code>uint32 client_time = 12;</code>
+       * <code>uint32 client_time = 3;</code>
        * @return The clientTime.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class PingRspOuterClass {
         return clientTime_;
       }
       /**
-       * <code>uint32 client_time = 12;</code>
+       * <code>uint32 client_time = 3;</code>
        * @param value The clientTime to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class PingRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 client_time = 12;</code>
+       * <code>uint32 client_time = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientTime() {
@@ -599,6 +558,37 @@ public final class PingRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</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) {
@@ -666,8 +656,8 @@ public final class PingRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rPingRsp.proto\"<\n\007PingRsp\022\013\n\003seq\030\006 \001(\r\022" +
-      "\017\n\007retcode\030\002 \001(\005\022\023\n\013client_time\030\014 \001(\rB\033\n" +
+      "\n\rPingRsp.proto\"<\n\007PingRsp\022\013\n\003seq\030\002 \001(\r\022" +
+      "\023\n\013client_time\030\003 \001(\r\022\017\n\007retcode\030\r \001(\005B\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -679,7 +669,7 @@ public final class PingRspOuterClass {
     internal_static_PingRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PingRsp_descriptor,
-        new java.lang.String[] { "Seq", "Retcode", "ClientTime", });
+        new java.lang.String[] { "Seq", "ClientTime", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlatformInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlatformInfoOuterClass.java
index 34daf11d3..20891bc2a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlatformInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlatformInfoOuterClass.java
@@ -153,10 +153,6 @@ public final class PlatformInfoOuterClass {
     int getPointId();
   }
   /**
-   * <pre>
-   * Obf: NEACNMDIMDL
-   * </pre>
-   *
    * Protobuf type {@code PlatformInfo}
    */
   public static final class PlatformInfo extends
@@ -907,10 +903,6 @@ public final class PlatformInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NEACNMDIMDL
-     * </pre>
-     *
      * Protobuf type {@code PlatformInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlatformTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlatformTypeOuterClass.java
index 5fc7fb9a3..3083f15e2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlatformTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlatformTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class PlatformTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: MLEBHNLEKAB
-   * </pre>
-   *
    * Protobuf enum {@code PlatformType}
    */
   public enum PlatformType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayTeamEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayTeamEntityInfoOuterClass.java
index c2179d737..e0f53b73d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayTeamEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayTeamEntityInfoOuterClass.java
@@ -58,10 +58,6 @@ public final class PlayTeamEntityInfoOuterClass {
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAbilityInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: EHPIOEOLPIA
-   * </pre>
-   *
    * Protobuf type {@code PlayTeamEntityInfo}
    */
   public static final class PlayTeamEntityInfo extends
@@ -446,10 +442,6 @@ public final class PlayTeamEntityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EHPIOEOLPIA
-     * </pre>
-     *
      * Protobuf type {@code PlayTeamEntityInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.java
index 5ca86943f..a9bd0c16b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.java
@@ -19,43 +19,38 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 matchserver_id = 15;</code>
+     * <code>uint32 matchserver_id = 3;</code>
      * @return The matchserverId.
      */
     int getMatchserverId();
 
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
-     * @return Whether the srcPlayerInfo field is set.
-     */
-    boolean hasSrcPlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
-     * @return The srcPlayerInfo.
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
-
-    /**
-     * <code>.MatchType match_type = 2;</code>
+     * <code>.MatchType match_type = 5;</code>
      * @return The enum numeric value on the wire for matchType.
      */
     int getMatchTypeValue();
     /**
-     * <code>.MatchType match_type = 2;</code>
+     * <code>.MatchType match_type = 5;</code>
      * @return The matchType.
      */
     emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType getMatchType();
+
+    /**
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
+     * @return Whether the srcPlayerInfo field is set.
+     */
+    boolean hasSrcPlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
+     * @return The srcPlayerInfo.
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 9475
-   * Obf: DHNJCDLKIOF
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpAfterMatchAgreedNotify}
    */
   public static final class PlayerApplyEnterMpAfterMatchAgreedNotify extends
@@ -101,13 +96,18 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
+
+              matchserverId_ = input.readUInt32();
+              break;
+            }
+            case 40: {
               int rawValue = input.readEnum();
 
               matchType_ = rawValue;
               break;
             }
-            case 114: {
+            case 106: {
               emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
               if (srcPlayerInfo_ != null) {
                 subBuilder = srcPlayerInfo_.toBuilder();
@@ -120,11 +120,6 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
 
               break;
             }
-            case 120: {
-
-              matchserverId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -157,10 +152,10 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.PlayerApplyEnterMpAfterMatchAgreedNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.PlayerApplyEnterMpAfterMatchAgreedNotify.Builder.class);
     }
 
-    public static final int MATCHSERVER_ID_FIELD_NUMBER = 15;
+    public static final int MATCHSERVER_ID_FIELD_NUMBER = 3;
     private int matchserverId_;
     /**
-     * <code>uint32 matchserver_id = 15;</code>
+     * <code>uint32 matchserver_id = 3;</code>
      * @return The matchserverId.
      */
     @java.lang.Override
@@ -168,10 +163,29 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       return matchserverId_;
     }
 
-    public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 14;
+    public static final int MATCH_TYPE_FIELD_NUMBER = 5;
+    private int matchType_;
+    /**
+     * <code>.MatchType match_type = 5;</code>
+     * @return The enum numeric value on the wire for matchType.
+     */
+    @java.lang.Override public int getMatchTypeValue() {
+      return matchType_;
+    }
+    /**
+     * <code>.MatchType match_type = 5;</code>
+     * @return The matchType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType getMatchType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType result = emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.valueOf(matchType_);
+      return result == null ? emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.UNRECOGNIZED : result;
+    }
+
+    public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return Whether the srcPlayerInfo field is set.
      */
     @java.lang.Override
@@ -179,7 +193,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       return srcPlayerInfo_ != null;
     }
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return The srcPlayerInfo.
      */
     @java.lang.Override
@@ -187,32 +201,13 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_;
     }
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
       return getSrcPlayerInfo();
     }
 
-    public static final int MATCH_TYPE_FIELD_NUMBER = 2;
-    private int matchType_;
-    /**
-     * <code>.MatchType match_type = 2;</code>
-     * @return The enum numeric value on the wire for matchType.
-     */
-    @java.lang.Override public int getMatchTypeValue() {
-      return matchType_;
-    }
-    /**
-     * <code>.MatchType match_type = 2;</code>
-     * @return The matchType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType getMatchType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType result = emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.valueOf(matchType_);
-      return result == null ? emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.UNRECOGNIZED : result;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -227,14 +222,14 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (matchserverId_ != 0) {
+        output.writeUInt32(3, matchserverId_);
+      }
       if (matchType_ != emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.MATCH_TYPE_NONE.getNumber()) {
-        output.writeEnum(2, matchType_);
+        output.writeEnum(5, matchType_);
       }
       if (srcPlayerInfo_ != null) {
-        output.writeMessage(14, getSrcPlayerInfo());
-      }
-      if (matchserverId_ != 0) {
-        output.writeUInt32(15, matchserverId_);
+        output.writeMessage(13, getSrcPlayerInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -245,17 +240,17 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (matchserverId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, matchserverId_);
+      }
       if (matchType_ != emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.MATCH_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, matchType_);
+          .computeEnumSize(5, matchType_);
       }
       if (srcPlayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSrcPlayerInfo());
-      }
-      if (matchserverId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, matchserverId_);
+          .computeMessageSize(13, getSrcPlayerInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -274,12 +269,12 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
 
       if (getMatchserverId()
           != other.getMatchserverId()) return false;
+      if (matchType_ != other.matchType_) return false;
       if (hasSrcPlayerInfo() != other.hasSrcPlayerInfo()) return false;
       if (hasSrcPlayerInfo()) {
         if (!getSrcPlayerInfo()
             .equals(other.getSrcPlayerInfo())) return false;
       }
-      if (matchType_ != other.matchType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -293,12 +288,12 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + MATCHSERVER_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMatchserverId();
+      hash = (37 * hash) + MATCH_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + matchType_;
       if (hasSrcPlayerInfo()) {
         hash = (37 * hash) + SRC_PLAYER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSrcPlayerInfo().hashCode();
       }
-      hash = (37 * hash) + MATCH_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + matchType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -395,11 +390,6 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9475
-     * Obf: DHNJCDLKIOF
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpAfterMatchAgreedNotify}
      */
     public static final class Builder extends
@@ -439,14 +429,14 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         super.clear();
         matchserverId_ = 0;
 
+        matchType_ = 0;
+
         if (srcPlayerInfoBuilder_ == null) {
           srcPlayerInfo_ = null;
         } else {
           srcPlayerInfo_ = null;
           srcPlayerInfoBuilder_ = null;
         }
-        matchType_ = 0;
-
         return this;
       }
 
@@ -474,12 +464,12 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.PlayerApplyEnterMpAfterMatchAgreedNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.PlayerApplyEnterMpAfterMatchAgreedNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass.PlayerApplyEnterMpAfterMatchAgreedNotify(this);
         result.matchserverId_ = matchserverId_;
+        result.matchType_ = matchType_;
         if (srcPlayerInfoBuilder_ == null) {
           result.srcPlayerInfo_ = srcPlayerInfo_;
         } else {
           result.srcPlayerInfo_ = srcPlayerInfoBuilder_.build();
         }
-        result.matchType_ = matchType_;
         onBuilt();
         return result;
       }
@@ -531,12 +521,12 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         if (other.getMatchserverId() != 0) {
           setMatchserverId(other.getMatchserverId());
         }
-        if (other.hasSrcPlayerInfo()) {
-          mergeSrcPlayerInfo(other.getSrcPlayerInfo());
-        }
         if (other.matchType_ != 0) {
           setMatchTypeValue(other.getMatchTypeValue());
         }
+        if (other.hasSrcPlayerInfo()) {
+          mergeSrcPlayerInfo(other.getSrcPlayerInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -568,7 +558,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
 
       private int matchserverId_ ;
       /**
-       * <code>uint32 matchserver_id = 15;</code>
+       * <code>uint32 matchserver_id = 3;</code>
        * @return The matchserverId.
        */
       @java.lang.Override
@@ -576,7 +566,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return matchserverId_;
       }
       /**
-       * <code>uint32 matchserver_id = 15;</code>
+       * <code>uint32 matchserver_id = 3;</code>
        * @param value The matchserverId to set.
        * @return This builder for chaining.
        */
@@ -587,7 +577,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 matchserver_id = 15;</code>
+       * <code>uint32 matchserver_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearMatchserverId() {
@@ -597,18 +587,72 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
 
+      private int matchType_ = 0;
+      /**
+       * <code>.MatchType match_type = 5;</code>
+       * @return The enum numeric value on the wire for matchType.
+       */
+      @java.lang.Override public int getMatchTypeValue() {
+        return matchType_;
+      }
+      /**
+       * <code>.MatchType match_type = 5;</code>
+       * @param value The enum numeric value on the wire for matchType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMatchTypeValue(int value) {
+        
+        matchType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.MatchType match_type = 5;</code>
+       * @return The matchType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType getMatchType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType result = emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.valueOf(matchType_);
+        return result == null ? emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.MatchType match_type = 5;</code>
+       * @param value The matchType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMatchType(emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        matchType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.MatchType match_type = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMatchType() {
+        
+        matchType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_;
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        * @return Whether the srcPlayerInfo field is set.
        */
       public boolean hasSrcPlayerInfo() {
         return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        * @return The srcPlayerInfo.
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() {
@@ -619,7 +663,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -635,7 +679,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder setSrcPlayerInfo(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -649,7 +693,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -667,7 +711,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder clearSrcPlayerInfo() {
         if (srcPlayerInfoBuilder_ == null) {
@@ -681,7 +725,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() {
         
@@ -689,7 +733,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         return getSrcPlayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
         if (srcPlayerInfoBuilder_ != null) {
@@ -700,7 +744,7 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -715,60 +759,6 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
         }
         return srcPlayerInfoBuilder_;
       }
-
-      private int matchType_ = 0;
-      /**
-       * <code>.MatchType match_type = 2;</code>
-       * @return The enum numeric value on the wire for matchType.
-       */
-      @java.lang.Override public int getMatchTypeValue() {
-        return matchType_;
-      }
-      /**
-       * <code>.MatchType match_type = 2;</code>
-       * @param value The enum numeric value on the wire for matchType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMatchTypeValue(int value) {
-        
-        matchType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.MatchType match_type = 2;</code>
-       * @return The matchType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType getMatchType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType result = emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.valueOf(matchType_);
-        return result == null ? emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.MatchType match_type = 2;</code>
-       * @param value The matchType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMatchType(emu.grasscutter.net.proto.MatchTypeOuterClass.MatchType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        matchType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.MatchType match_type = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMatchType() {
-        
-        matchType_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -837,27 +827,27 @@ public final class PlayerApplyEnterMpAfterMatchAgreedNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n.PlayerApplyEnterMpAfterMatchAgreedNoti" +
-      "fy.proto\032\026OnlinePlayerInfo.proto\032\017MatchT" +
-      "ype.proto\"\216\001\n(PlayerApplyEnterMpAfterMat" +
-      "chAgreedNotify\022\026\n\016matchserver_id\030\017 \001(\r\022*" +
-      "\n\017src_player_info\030\016 \001(\0132\021.OnlinePlayerIn" +
-      "fo\022\036\n\nmatch_type\030\002 \001(\0162\n.MatchTypeB\033\n\031em" +
+      "fy.proto\032\017MatchType.proto\032\026OnlinePlayerI" +
+      "nfo.proto\"\216\001\n(PlayerApplyEnterMpAfterMat" +
+      "chAgreedNotify\022\026\n\016matchserver_id\030\003 \001(\r\022\036" +
+      "\n\nmatch_type\030\005 \001(\0162\n.MatchType\022*\n\017src_pl" +
+      "ayer_info\030\r \001(\0132\021.OnlinePlayerInfoB\033\n\031em" +
       "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.MatchTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(),
         });
     internal_static_PlayerApplyEnterMpAfterMatchAgreedNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerApplyEnterMpAfterMatchAgreedNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpAfterMatchAgreedNotify_descriptor,
-        new java.lang.String[] { "MatchserverId", "SrcPlayerInfo", "MatchType", });
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "MatchserverId", "MatchType", "SrcPlayerInfo", });
     emu.grasscutter.net.proto.MatchTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
index bcd53766a..1edd6eef2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpNotifyOuterClass.java
@@ -19,38 +19,33 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 src_app_id = 5;</code>
+     * <code>uint32 src_app_id = 1;</code>
      * @return The srcAppId.
      */
     int getSrcAppId();
 
     /**
-     * <code>uint32 src_thread_index = 8;</code>
+     * <code>uint32 src_thread_index = 11;</code>
      * @return The srcThreadIndex.
      */
     int getSrcThreadIndex();
 
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return Whether the srcPlayerInfo field is set.
      */
     boolean hasSrcPlayerInfo();
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return The srcPlayerInfo.
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo();
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      */
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 5296
-   * Obf: DKNEOIPGLJP
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpNotify}
    */
   public static final class PlayerApplyEnterMpNotify extends
@@ -95,17 +90,17 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 8: {
 
               srcAppId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 88: {
 
               srcThreadIndex_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 106: {
               emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
               if (srcPlayerInfo_ != null) {
                 subBuilder = srcPlayerInfo_.toBuilder();
@@ -150,10 +145,10 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.class, emu.grasscutter.net.proto.PlayerApplyEnterMpNotifyOuterClass.PlayerApplyEnterMpNotify.Builder.class);
     }
 
-    public static final int SRC_APP_ID_FIELD_NUMBER = 5;
+    public static final int SRC_APP_ID_FIELD_NUMBER = 1;
     private int srcAppId_;
     /**
-     * <code>uint32 src_app_id = 5;</code>
+     * <code>uint32 src_app_id = 1;</code>
      * @return The srcAppId.
      */
     @java.lang.Override
@@ -161,10 +156,10 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcAppId_;
     }
 
-    public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 8;
+    public static final int SRC_THREAD_INDEX_FIELD_NUMBER = 11;
     private int srcThreadIndex_;
     /**
-     * <code>uint32 src_thread_index = 8;</code>
+     * <code>uint32 src_thread_index = 11;</code>
      * @return The srcThreadIndex.
      */
     @java.lang.Override
@@ -172,10 +167,10 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcThreadIndex_;
     }
 
-    public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 14;
+    public static final int SRC_PLAYER_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo srcPlayerInfo_;
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return Whether the srcPlayerInfo field is set.
      */
     @java.lang.Override
@@ -183,7 +178,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcPlayerInfo_ != null;
     }
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      * @return The srcPlayerInfo.
      */
     @java.lang.Override
@@ -191,7 +186,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return srcPlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : srcPlayerInfo_;
     }
     /**
-     * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+     * <code>.OnlinePlayerInfo src_player_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
@@ -213,13 +208,13 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (srcAppId_ != 0) {
-        output.writeUInt32(5, srcAppId_);
+        output.writeUInt32(1, srcAppId_);
       }
       if (srcThreadIndex_ != 0) {
-        output.writeUInt32(8, srcThreadIndex_);
+        output.writeUInt32(11, srcThreadIndex_);
       }
       if (srcPlayerInfo_ != null) {
-        output.writeMessage(14, getSrcPlayerInfo());
+        output.writeMessage(13, getSrcPlayerInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -232,15 +227,15 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       size = 0;
       if (srcAppId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, srcAppId_);
+          .computeUInt32Size(1, srcAppId_);
       }
       if (srcThreadIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, srcThreadIndex_);
+          .computeUInt32Size(11, srcThreadIndex_);
       }
       if (srcPlayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSrcPlayerInfo());
+          .computeMessageSize(13, getSrcPlayerInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -381,11 +376,6 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5296
-     * Obf: DKNEOIPGLJP
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpNotify}
      */
     public static final class Builder extends
@@ -554,7 +544,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
 
       private int srcAppId_ ;
       /**
-       * <code>uint32 src_app_id = 5;</code>
+       * <code>uint32 src_app_id = 1;</code>
        * @return The srcAppId.
        */
       @java.lang.Override
@@ -562,7 +552,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return srcAppId_;
       }
       /**
-       * <code>uint32 src_app_id = 5;</code>
+       * <code>uint32 src_app_id = 1;</code>
        * @param value The srcAppId to set.
        * @return This builder for chaining.
        */
@@ -573,7 +563,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 src_app_id = 5;</code>
+       * <code>uint32 src_app_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearSrcAppId() {
@@ -585,7 +575,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
 
       private int srcThreadIndex_ ;
       /**
-       * <code>uint32 src_thread_index = 8;</code>
+       * <code>uint32 src_thread_index = 11;</code>
        * @return The srcThreadIndex.
        */
       @java.lang.Override
@@ -593,7 +583,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return srcThreadIndex_;
       }
       /**
-       * <code>uint32 src_thread_index = 8;</code>
+       * <code>uint32 src_thread_index = 11;</code>
        * @param value The srcThreadIndex to set.
        * @return This builder for chaining.
        */
@@ -604,7 +594,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 src_thread_index = 8;</code>
+       * <code>uint32 src_thread_index = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearSrcThreadIndex() {
@@ -618,14 +608,14 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> srcPlayerInfoBuilder_;
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        * @return Whether the srcPlayerInfo field is set.
        */
       public boolean hasSrcPlayerInfo() {
         return srcPlayerInfoBuilder_ != null || srcPlayerInfo_ != null;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        * @return The srcPlayerInfo.
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getSrcPlayerInfo() {
@@ -636,7 +626,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder setSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -652,7 +642,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder setSrcPlayerInfo(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -666,7 +656,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder mergeSrcPlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (srcPlayerInfoBuilder_ == null) {
@@ -684,7 +674,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public Builder clearSrcPlayerInfo() {
         if (srcPlayerInfoBuilder_ == null) {
@@ -698,7 +688,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getSrcPlayerInfoBuilder() {
         
@@ -706,7 +696,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         return getSrcPlayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getSrcPlayerInfoOrBuilder() {
         if (srcPlayerInfoBuilder_ != null) {
@@ -717,7 +707,7 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo src_player_info = 14;</code>
+       * <code>.OnlinePlayerInfo src_player_info = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -801,8 +791,8 @@ public final class PlayerApplyEnterMpNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036PlayerApplyEnterMpNotify.proto\032\026Online" +
       "PlayerInfo.proto\"t\n\030PlayerApplyEnterMpNo" +
-      "tify\022\022\n\nsrc_app_id\030\005 \001(\r\022\030\n\020src_thread_i" +
-      "ndex\030\010 \001(\r\022*\n\017src_player_info\030\016 \001(\0132\021.On" +
+      "tify\022\022\n\nsrc_app_id\030\001 \001(\r\022\030\n\020src_thread_i" +
+      "ndex\030\013 \001(\r\022*\n\017src_player_info\030\r \001(\0132\021.On" +
       "linePlayerInfoB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
index a0b628eb0..3a44b5566 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpReqOuterClass.java
@@ -19,17 +19,12 @@ public final class PlayerApplyEnterMpReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 9629
-   * Obf: HLANGOHBOGO
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpReq}
    */
   public static final class PlayerApplyEnterMpReq extends
@@ -74,7 +69,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 56: {
 
               targetUid_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class PlayerApplyEnterMpReqOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnterMpReq.class, emu.grasscutter.net.proto.PlayerApplyEnterMpReqOuterClass.PlayerApplyEnterMpReq.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 4;
+    public static final int TARGET_UID_FIELD_NUMBER = 7;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(4, targetUid_);
+        output.writeUInt32(7, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, targetUid_);
+          .computeUInt32Size(7, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class PlayerApplyEnterMpReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9629
-     * Obf: HLANGOHBOGO
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -527,7 +517,7 @@ public final class PlayerApplyEnterMpReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033PlayerApplyEnterMpReq.proto\"+\n\025PlayerA" +
-      "pplyEnterMpReq\022\022\n\ntarget_uid\030\004 \001(\rB\033\n\031em" +
+      "pplyEnterMpReq\022\022\n\ntarget_uid\030\007 \001(\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/PlayerApplyEnterMpResultNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
index f18731396..c7976fe4c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultNotifyOuterClass.java
@@ -19,46 +19,41 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-     * @return The enum numeric value on the wire for reason.
+     * <code>uint32 target_uid = 6;</code>
+     * @return The targetUid.
      */
-    int getReasonValue();
-    /**
-     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-     * @return The reason.
-     */
-    emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason();
+    int getTargetUid();
 
     /**
-     * <code>string target_nickname = 14;</code>
+     * <code>string target_nickname = 7;</code>
      * @return The targetNickname.
      */
     java.lang.String getTargetNickname();
     /**
-     * <code>string target_nickname = 14;</code>
+     * <code>string target_nickname = 7;</code>
      * @return The bytes for targetNickname.
      */
     com.google.protobuf.ByteString
         getTargetNicknameBytes();
 
     /**
-     * <code>uint32 target_uid = 3;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
-    /**
-     * <code>bool is_agreed = 2;</code>
+     * <code>bool is_agreed = 9;</code>
      * @return The isAgreed.
      */
     boolean getIsAgreed();
+
+    /**
+     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+     * @return The enum numeric value on the wire for reason.
+     */
+    int getReasonValue();
+    /**
+     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+     * @return The reason.
+     */
+    emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason();
   }
   /**
-   * <pre>
-   * CmdId: 3467
-   * Obf: EIIOBJEBLEH
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpResultNotify}
    */
   public static final class PlayerApplyEnterMpResultNotify extends
@@ -71,8 +66,8 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       super(builder);
     }
     private PlayerApplyEnterMpResultNotify() {
-      reason_ = 0;
       targetNickname_ = "";
+      reason_ = 0;
     }
 
     @java.lang.Override
@@ -105,28 +100,28 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              isAgreed_ = input.readBool();
-              break;
-            }
-            case 24: {
+            case 48: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 80: {
-              int rawValue = input.readEnum();
-
-              reason_ = rawValue;
-              break;
-            }
-            case 114: {
+            case 58: {
               java.lang.String s = input.readStringRequireUtf8();
 
               targetNickname_ = s;
               break;
             }
+            case 72: {
+
+              isAgreed_ = input.readBool();
+              break;
+            }
+            case 112: {
+              int rawValue = input.readEnum();
+
+              reason_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -160,10 +155,6 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: DLBJOMOJCKD
-     * </pre>
-     *
      * Protobuf enum {@code PlayerApplyEnterMpResultNotify.Reason}
      */
     public enum Reason
@@ -379,29 +370,21 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:PlayerApplyEnterMpResultNotify.Reason)
     }
 
-    public static final int REASON_FIELD_NUMBER = 10;
-    private int reason_;
+    public static final int TARGET_UID_FIELD_NUMBER = 6;
+    private int targetUid_;
     /**
-     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-     * @return The enum numeric value on the wire for reason.
+     * <code>uint32 target_uid = 6;</code>
+     * @return The targetUid.
      */
-    @java.lang.Override public int getReasonValue() {
-      return reason_;
-    }
-    /**
-     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-     * @return The reason.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
-      return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+    @java.lang.Override
+    public int getTargetUid() {
+      return targetUid_;
     }
 
-    public static final int TARGET_NICKNAME_FIELD_NUMBER = 14;
+    public static final int TARGET_NICKNAME_FIELD_NUMBER = 7;
     private volatile java.lang.Object targetNickname_;
     /**
-     * <code>string target_nickname = 14;</code>
+     * <code>string target_nickname = 7;</code>
      * @return The targetNickname.
      */
     @java.lang.Override
@@ -418,7 +401,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       }
     }
     /**
-     * <code>string target_nickname = 14;</code>
+     * <code>string target_nickname = 7;</code>
      * @return The bytes for targetNickname.
      */
     @java.lang.Override
@@ -436,21 +419,10 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       }
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 3;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 3;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
-    public static final int IS_AGREED_FIELD_NUMBER = 2;
+    public static final int IS_AGREED_FIELD_NUMBER = 9;
     private boolean isAgreed_;
     /**
-     * <code>bool is_agreed = 2;</code>
+     * <code>bool is_agreed = 9;</code>
      * @return The isAgreed.
      */
     @java.lang.Override
@@ -458,6 +430,25 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       return isAgreed_;
     }
 
+    public static final int REASON_FIELD_NUMBER = 14;
+    private int reason_;
+    /**
+     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+     * @return The enum numeric value on the wire for reason.
+     */
+    @java.lang.Override public int getReasonValue() {
+      return reason_;
+    }
+    /**
+     * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+     * @return The reason.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
+      return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -472,17 +463,17 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isAgreed_ != false) {
-        output.writeBool(2, isAgreed_);
-      }
       if (targetUid_ != 0) {
-        output.writeUInt32(3, targetUid_);
-      }
-      if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
-        output.writeEnum(10, reason_);
+        output.writeUInt32(6, targetUid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, targetNickname_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, targetNickname_);
+      }
+      if (isAgreed_ != false) {
+        output.writeBool(9, isAgreed_);
+      }
+      if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
+        output.writeEnum(14, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -493,20 +484,20 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isAgreed_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isAgreed_);
-      }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, targetUid_);
+          .computeUInt32Size(6, targetUid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, targetNickname_);
+      }
+      if (isAgreed_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isAgreed_);
       }
       if (reason_ != emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.REASON_PLAYER_JUDGE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, reason_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(targetNickname_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, targetNickname_);
+          .computeEnumSize(14, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -523,13 +514,13 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify) obj;
 
-      if (reason_ != other.reason_) return false;
-      if (!getTargetNickname()
-          .equals(other.getTargetNickname())) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
+      if (!getTargetNickname()
+          .equals(other.getTargetNickname())) return false;
       if (getIsAgreed()
           != other.getIsAgreed()) return false;
+      if (reason_ != other.reason_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -541,15 +532,15 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
-      hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetNickname().hashCode();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + TARGET_NICKNAME_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetNickname().hashCode();
       hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsAgreed());
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + reason_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -646,11 +637,6 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3467
-     * Obf: EIIOBJEBLEH
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpResultNotify}
      */
     public static final class Builder extends
@@ -688,14 +674,14 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        reason_ = 0;
+        targetUid_ = 0;
 
         targetNickname_ = "";
 
-        targetUid_ = 0;
-
         isAgreed_ = false;
 
+        reason_ = 0;
+
         return this;
       }
 
@@ -722,10 +708,10 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify(this);
-        result.reason_ = reason_;
-        result.targetNickname_ = targetNickname_;
         result.targetUid_ = targetUid_;
+        result.targetNickname_ = targetNickname_;
         result.isAgreed_ = isAgreed_;
+        result.reason_ = reason_;
         onBuilt();
         return result;
       }
@@ -774,19 +760,19 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.getDefaultInstance()) return this;
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
         }
         if (!other.getTargetNickname().isEmpty()) {
           targetNickname_ = other.targetNickname_;
           onChanged();
         }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
         if (other.getIsAgreed() != false) {
           setIsAgreed(other.getIsAgreed());
         }
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -816,63 +802,40 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return this;
       }
 
-      private int reason_ = 0;
+      private int targetUid_ ;
       /**
-       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-       * @return The enum numeric value on the wire for reason.
-       */
-      @java.lang.Override public int getReasonValue() {
-        return reason_;
-      }
-      /**
-       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</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>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-       * @return The reason.
+       * <code>uint32 target_uid = 6;</code>
+       * @return The targetUid.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
-        return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+      public int getTargetUid() {
+        return targetUid_;
       }
       /**
-       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
-       * @param value The reason to set.
+       * <code>uint32 target_uid = 6;</code>
+       * @param value The targetUid to set.
        * @return This builder for chaining.
        */
-      public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+      public Builder setTargetUid(int value) {
         
-        reason_ = value.getNumber();
+        targetUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 10;</code>
+       * <code>uint32 target_uid = 6;</code>
        * @return This builder for chaining.
        */
-      public Builder clearReason() {
+      public Builder clearTargetUid() {
         
-        reason_ = 0;
+        targetUid_ = 0;
         onChanged();
         return this;
       }
 
       private java.lang.Object targetNickname_ = "";
       /**
-       * <code>string target_nickname = 14;</code>
+       * <code>string target_nickname = 7;</code>
        * @return The targetNickname.
        */
       public java.lang.String getTargetNickname() {
@@ -888,7 +851,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         }
       }
       /**
-       * <code>string target_nickname = 14;</code>
+       * <code>string target_nickname = 7;</code>
        * @return The bytes for targetNickname.
        */
       public com.google.protobuf.ByteString
@@ -905,7 +868,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         }
       }
       /**
-       * <code>string target_nickname = 14;</code>
+       * <code>string target_nickname = 7;</code>
        * @param value The targetNickname to set.
        * @return This builder for chaining.
        */
@@ -920,7 +883,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string target_nickname = 14;</code>
+       * <code>string target_nickname = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetNickname() {
@@ -930,7 +893,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string target_nickname = 14;</code>
+       * <code>string target_nickname = 7;</code>
        * @param value The bytes for targetNickname to set.
        * @return This builder for chaining.
        */
@@ -946,40 +909,9 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return this;
       }
 
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 3;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
-      /**
-       * <code>uint32 target_uid = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isAgreed_ ;
       /**
-       * <code>bool is_agreed = 2;</code>
+       * <code>bool is_agreed = 9;</code>
        * @return The isAgreed.
        */
       @java.lang.Override
@@ -987,7 +919,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return isAgreed_;
       }
       /**
-       * <code>bool is_agreed = 2;</code>
+       * <code>bool is_agreed = 9;</code>
        * @param value The isAgreed to set.
        * @return This builder for chaining.
        */
@@ -998,7 +930,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_agreed = 2;</code>
+       * <code>bool is_agreed = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAgreed() {
@@ -1007,6 +939,60 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int reason_ = 0;
+      /**
+       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+       * @return The enum numeric value on the wire for reason.
+       */
+      @java.lang.Override public int getReasonValue() {
+        return reason_;
+      }
+      /**
+       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</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>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+       * @return The reason.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason getReason() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason result = emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.valueOf(reason_);
+        return result == null ? emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(emu.grasscutter.net.proto.PlayerApplyEnterMpResultNotifyOuterClass.PlayerApplyEnterMpResultNotify.Reason value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        reason_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.PlayerApplyEnterMpResultNotify.Reason reason = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1075,10 +1061,10 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n$PlayerApplyEnterMpResultNotify.proto\"\355" +
-      "\004\n\036PlayerApplyEnterMpResultNotify\0226\n\006rea" +
-      "son\030\n \001(\0162&.PlayerApplyEnterMpResultNoti" +
-      "fy.Reason\022\027\n\017target_nickname\030\016 \001(\t\022\022\n\nta" +
-      "rget_uid\030\003 \001(\r\022\021\n\tis_agreed\030\002 \001(\010\"\322\003\n\006Re" +
+      "\004\n\036PlayerApplyEnterMpResultNotify\022\022\n\ntar" +
+      "get_uid\030\006 \001(\r\022\027\n\017target_nickname\030\007 \001(\t\022\021" +
+      "\n\tis_agreed\030\t \001(\010\0226\n\006reason\030\016 \001(\0162&.Play" +
+      "erApplyEnterMpResultNotify.Reason\"\322\003\n\006Re" +
       "ason\022\027\n\023REASON_PLAYER_JUDGE\020\000\022\035\n\031REASON_" +
       "SCENE_CANNOT_ENTER\020\001\022!\n\035REASON_PLAYER_CA" +
       "NNOT_ENTER_MP\020\002\022\027\n\023REASON_SYSTEM_JUDGE\020\003" +
@@ -1102,7 +1088,7 @@ public final class PlayerApplyEnterMpResultNotifyOuterClass {
     internal_static_PlayerApplyEnterMpResultNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpResultNotify_descriptor,
-        new java.lang.String[] { "Reason", "TargetNickname", "TargetUid", "IsAgreed", });
+        new java.lang.String[] { "TargetUid", "TargetNickname", "IsAgreed", "Reason", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
index 4597e2c1e..27ad0e1a7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultReqOuterClass.java
@@ -19,23 +19,18 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 apply_uid = 11;</code>
-     * @return The applyUid.
-     */
-    int getApplyUid();
-
-    /**
-     * <code>bool is_agreed = 12;</code>
+     * <code>bool is_agreed = 3;</code>
      * @return The isAgreed.
      */
     boolean getIsAgreed();
+
+    /**
+     * <code>uint32 apply_uid = 15;</code>
+     * @return The applyUid.
+     */
+    int getApplyUid();
   }
   /**
-   * <pre>
-   * CmdId: 24849
-   * Obf: DCHAHENHFKC
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpResultReq}
    */
   public static final class PlayerApplyEnterMpResultReq extends
@@ -80,16 +75,16 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
             case 0:
               done = true;
               break;
-            case 88: {
-
-              applyUid_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 24: {
 
               isAgreed_ = input.readBool();
               break;
             }
+            case 120: {
+
+              applyUid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.class, emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.Builder.class);
     }
 
-    public static final int APPLY_UID_FIELD_NUMBER = 11;
-    private int applyUid_;
-    /**
-     * <code>uint32 apply_uid = 11;</code>
-     * @return The applyUid.
-     */
-    @java.lang.Override
-    public int getApplyUid() {
-      return applyUid_;
-    }
-
-    public static final int IS_AGREED_FIELD_NUMBER = 12;
+    public static final int IS_AGREED_FIELD_NUMBER = 3;
     private boolean isAgreed_;
     /**
-     * <code>bool is_agreed = 12;</code>
+     * <code>bool is_agreed = 3;</code>
      * @return The isAgreed.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       return isAgreed_;
     }
 
+    public static final int APPLY_UID_FIELD_NUMBER = 15;
+    private int applyUid_;
+    /**
+     * <code>uint32 apply_uid = 15;</code>
+     * @return The applyUid.
+     */
+    @java.lang.Override
+    public int getApplyUid() {
+      return applyUid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (applyUid_ != 0) {
-        output.writeUInt32(11, applyUid_);
-      }
       if (isAgreed_ != false) {
-        output.writeBool(12, isAgreed_);
+        output.writeBool(3, isAgreed_);
+      }
+      if (applyUid_ != 0) {
+        output.writeUInt32(15, applyUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (applyUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, applyUid_);
-      }
       if (isAgreed_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isAgreed_);
+          .computeBoolSize(3, isAgreed_);
+      }
+      if (applyUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, applyUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       }
       emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq) obj;
 
-      if (getApplyUid()
-          != other.getApplyUid()) return false;
       if (getIsAgreed()
           != other.getIsAgreed()) return false;
+      if (getApplyUid()
+          != other.getApplyUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,11 +206,11 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getApplyUid();
       hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsAgreed());
+      hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getApplyUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -312,11 +307,6 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24849
-     * Obf: DCHAHENHFKC
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpResultReq}
      */
     public static final class Builder extends
@@ -354,10 +344,10 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        applyUid_ = 0;
-
         isAgreed_ = false;
 
+        applyUid_ = 0;
+
         return this;
       }
 
@@ -384,8 +374,8 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq(this);
-        result.applyUid_ = applyUid_;
         result.isAgreed_ = isAgreed_;
+        result.applyUid_ = applyUid_;
         onBuilt();
         return result;
       }
@@ -434,12 +424,12 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq other) {
         if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultReqOuterClass.PlayerApplyEnterMpResultReq.getDefaultInstance()) return this;
-        if (other.getApplyUid() != 0) {
-          setApplyUid(other.getApplyUid());
-        }
         if (other.getIsAgreed() != false) {
           setIsAgreed(other.getIsAgreed());
         }
+        if (other.getApplyUid() != 0) {
+          setApplyUid(other.getApplyUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -469,40 +459,9 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
         return this;
       }
 
-      private int applyUid_ ;
-      /**
-       * <code>uint32 apply_uid = 11;</code>
-       * @return The applyUid.
-       */
-      @java.lang.Override
-      public int getApplyUid() {
-        return applyUid_;
-      }
-      /**
-       * <code>uint32 apply_uid = 11;</code>
-       * @param value The applyUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setApplyUid(int value) {
-        
-        applyUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 apply_uid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearApplyUid() {
-        
-        applyUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isAgreed_ ;
       /**
-       * <code>bool is_agreed = 12;</code>
+       * <code>bool is_agreed = 3;</code>
        * @return The isAgreed.
        */
       @java.lang.Override
@@ -510,7 +469,7 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
         return isAgreed_;
       }
       /**
-       * <code>bool is_agreed = 12;</code>
+       * <code>bool is_agreed = 3;</code>
        * @param value The isAgreed to set.
        * @return This builder for chaining.
        */
@@ -521,7 +480,7 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_agreed = 12;</code>
+       * <code>bool is_agreed = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAgreed() {
@@ -530,6 +489,37 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int applyUid_ ;
+      /**
+       * <code>uint32 apply_uid = 15;</code>
+       * @return The applyUid.
+       */
+      @java.lang.Override
+      public int getApplyUid() {
+        return applyUid_;
+      }
+      /**
+       * <code>uint32 apply_uid = 15;</code>
+       * @param value The applyUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setApplyUid(int value) {
+        
+        applyUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 apply_uid = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearApplyUid() {
+        
+        applyUid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +588,8 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!PlayerApplyEnterMpResultReq.proto\"C\n\033P" +
-      "layerApplyEnterMpResultReq\022\021\n\tapply_uid\030" +
-      "\013 \001(\r\022\021\n\tis_agreed\030\014 \001(\010B\033\n\031emu.grasscut" +
+      "layerApplyEnterMpResultReq\022\021\n\tis_agreed\030" +
+      "\003 \001(\010\022\021\n\tapply_uid\030\017 \001(\rB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +601,7 @@ public final class PlayerApplyEnterMpResultReqOuterClass {
     internal_static_PlayerApplyEnterMpResultReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpResultReq_descriptor,
-        new java.lang.String[] { "ApplyUid", "IsAgreed", });
+        new java.lang.String[] { "IsAgreed", "ApplyUid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
index 088567ac4..b651c6fae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpResultRspOuterClass.java
@@ -19,35 +19,30 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 apply_uid = 3;</code>
-     * @return The applyUid.
-     */
-    int getApplyUid();
-
-    /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 param = 11;</code>
+     * <code>uint32 apply_uid = 7;</code>
+     * @return The applyUid.
+     */
+    int getApplyUid();
+
+    /**
+     * <code>uint32 param = 10;</code>
      * @return The param.
      */
     int getParam();
 
     /**
-     * <code>bool is_agreed = 7;</code>
+     * <code>bool is_agreed = 11;</code>
      * @return The isAgreed.
      */
     boolean getIsAgreed();
   }
   /**
-   * <pre>
-   * CmdId: 6395
-   * Obf: JGFCKHJPDFA
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpResultRsp}
    */
   public static final class PlayerApplyEnterMpResultRsp extends
@@ -92,24 +87,24 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 32: {
 
-              applyUid_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             case 56: {
 
-              isAgreed_ = input.readBool();
+              applyUid_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 80: {
 
               param_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
-              retcode_ = input.readInt32();
+              isAgreed_ = input.readBool();
               break;
             }
             default: {
@@ -144,21 +139,10 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.class, emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.Builder.class);
     }
 
-    public static final int APPLY_UID_FIELD_NUMBER = 3;
-    private int applyUid_;
-    /**
-     * <code>uint32 apply_uid = 3;</code>
-     * @return The applyUid.
-     */
-    @java.lang.Override
-    public int getApplyUid() {
-      return applyUid_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int RETCODE_FIELD_NUMBER = 4;
     private int retcode_;
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,10 +150,21 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       return retcode_;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 11;
+    public static final int APPLY_UID_FIELD_NUMBER = 7;
+    private int applyUid_;
+    /**
+     * <code>uint32 apply_uid = 7;</code>
+     * @return The applyUid.
+     */
+    @java.lang.Override
+    public int getApplyUid() {
+      return applyUid_;
+    }
+
+    public static final int PARAM_FIELD_NUMBER = 10;
     private int param_;
     /**
-     * <code>uint32 param = 11;</code>
+     * <code>uint32 param = 10;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -177,10 +172,10 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       return param_;
     }
 
-    public static final int IS_AGREED_FIELD_NUMBER = 7;
+    public static final int IS_AGREED_FIELD_NUMBER = 11;
     private boolean isAgreed_;
     /**
-     * <code>bool is_agreed = 7;</code>
+     * <code>bool is_agreed = 11;</code>
      * @return The isAgreed.
      */
     @java.lang.Override
@@ -202,17 +197,17 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (applyUid_ != 0) {
-        output.writeUInt32(3, applyUid_);
+      if (retcode_ != 0) {
+        output.writeInt32(4, retcode_);
       }
-      if (isAgreed_ != false) {
-        output.writeBool(7, isAgreed_);
+      if (applyUid_ != 0) {
+        output.writeUInt32(7, applyUid_);
       }
       if (param_ != 0) {
-        output.writeUInt32(11, param_);
+        output.writeUInt32(10, param_);
       }
-      if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+      if (isAgreed_ != false) {
+        output.writeBool(11, isAgreed_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(4, retcode_);
+      }
       if (applyUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, applyUid_);
-      }
-      if (isAgreed_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isAgreed_);
+          .computeUInt32Size(7, applyUid_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, param_);
+          .computeUInt32Size(10, param_);
       }
-      if (retcode_ != 0) {
+      if (isAgreed_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeBoolSize(11, isAgreed_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,10 +249,10 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       }
       emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp other = (emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp) obj;
 
-      if (getApplyUid()
-          != other.getApplyUid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getApplyUid()
+          != other.getApplyUid()) return false;
       if (getParam()
           != other.getParam()) return false;
       if (getIsAgreed()
@@ -273,10 +268,10 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getApplyUid();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + APPLY_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getApplyUid();
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
       hash = (37 * hash) + IS_AGREED_FIELD_NUMBER;
@@ -378,11 +373,6 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6395
-     * Obf: JGFCKHJPDFA
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpResultRsp}
      */
     public static final class Builder extends
@@ -420,10 +410,10 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        applyUid_ = 0;
-
         retcode_ = 0;
 
+        applyUid_ = 0;
+
         param_ = 0;
 
         isAgreed_ = false;
@@ -454,8 +444,8 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp result = new emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp(this);
-        result.applyUid_ = applyUid_;
         result.retcode_ = retcode_;
+        result.applyUid_ = applyUid_;
         result.param_ = param_;
         result.isAgreed_ = isAgreed_;
         onBuilt();
@@ -506,12 +496,12 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp other) {
         if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpResultRspOuterClass.PlayerApplyEnterMpResultRsp.getDefaultInstance()) return this;
-        if (other.getApplyUid() != 0) {
-          setApplyUid(other.getApplyUid());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getApplyUid() != 0) {
+          setApplyUid(other.getApplyUid());
+        }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
@@ -547,40 +537,9 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return this;
       }
 
-      private int applyUid_ ;
-      /**
-       * <code>uint32 apply_uid = 3;</code>
-       * @return The applyUid.
-       */
-      @java.lang.Override
-      public int getApplyUid() {
-        return applyUid_;
-      }
-      /**
-       * <code>uint32 apply_uid = 3;</code>
-       * @param value The applyUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setApplyUid(int value) {
-        
-        applyUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 apply_uid = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearApplyUid() {
-        
-        applyUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 4;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -588,7 +547,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 4;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -599,7 +558,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -609,9 +568,40 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return this;
       }
 
+      private int applyUid_ ;
+      /**
+       * <code>uint32 apply_uid = 7;</code>
+       * @return The applyUid.
+       */
+      @java.lang.Override
+      public int getApplyUid() {
+        return applyUid_;
+      }
+      /**
+       * <code>uint32 apply_uid = 7;</code>
+       * @param value The applyUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setApplyUid(int value) {
+        
+        applyUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 apply_uid = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearApplyUid() {
+        
+        applyUid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int param_ ;
       /**
-       * <code>uint32 param = 11;</code>
+       * <code>uint32 param = 10;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -619,7 +609,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 11;</code>
+       * <code>uint32 param = 10;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -630,7 +620,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 11;</code>
+       * <code>uint32 param = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -642,7 +632,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
 
       private boolean isAgreed_ ;
       /**
-       * <code>bool is_agreed = 7;</code>
+       * <code>bool is_agreed = 11;</code>
        * @return The isAgreed.
        */
       @java.lang.Override
@@ -650,7 +640,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return isAgreed_;
       }
       /**
-       * <code>bool is_agreed = 7;</code>
+       * <code>bool is_agreed = 11;</code>
        * @param value The isAgreed to set.
        * @return This builder for chaining.
        */
@@ -661,7 +651,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_agreed = 7;</code>
+       * <code>bool is_agreed = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAgreed() {
@@ -738,9 +728,9 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n!PlayerApplyEnterMpResultRsp.proto\"c\n\033P" +
-      "layerApplyEnterMpResultRsp\022\021\n\tapply_uid\030" +
-      "\003 \001(\r\022\017\n\007retcode\030\014 \001(\005\022\r\n\005param\030\013 \001(\r\022\021\n" +
-      "\tis_agreed\030\007 \001(\010B\033\n\031emu.grasscutter.net." +
+      "layerApplyEnterMpResultRsp\022\017\n\007retcode\030\004 " +
+      "\001(\005\022\021\n\tapply_uid\030\007 \001(\r\022\r\n\005param\030\n \001(\r\022\021\n" +
+      "\tis_agreed\030\013 \001(\010B\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class PlayerApplyEnterMpResultRspOuterClass {
     internal_static_PlayerApplyEnterMpResultRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpResultRsp_descriptor,
-        new java.lang.String[] { "ApplyUid", "Retcode", "Param", "IsAgreed", });
+        new java.lang.String[] { "Retcode", "ApplyUid", "Param", "IsAgreed", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
index 406d8f711..e62cf3874 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerApplyEnterMpRspOuterClass.java
@@ -19,29 +19,24 @@ public final class PlayerApplyEnterMpRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 param = 10;</code>
-     * @return The param.
+     * <code>uint32 target_uid = 9;</code>
+     * @return The targetUid.
      */
-    int getParam();
+    int getTargetUid();
 
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 target_uid = 11;</code>
-     * @return The targetUid.
+     * <code>uint32 param = 13;</code>
+     * @return The param.
      */
-    int getTargetUid();
+    int getParam();
   }
   /**
-   * <pre>
-   * CmdId: 20994
-   * Obf: IGEKDAHIAFB
-   * </pre>
-   *
    * Protobuf type {@code PlayerApplyEnterMpRsp}
    */
   public static final class PlayerApplyEnterMpRsp extends
@@ -86,19 +81,19 @@ public final class PlayerApplyEnterMpRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 72: {
 
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 80: {
-
-              param_ = input.readUInt32();
+              targetUid_ = input.readUInt32();
               break;
             }
             case 88: {
 
-              targetUid_ = input.readUInt32();
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 104: {
+
+              param_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,21 +128,21 @@ public final class PlayerApplyEnterMpRspOuterClass {
               emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.class, emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.Builder.class);
     }
 
-    public static final int PARAM_FIELD_NUMBER = 10;
-    private int param_;
+    public static final int TARGET_UID_FIELD_NUMBER = 9;
+    private int targetUid_;
     /**
-     * <code>uint32 param = 10;</code>
-     * @return The param.
+     * <code>uint32 target_uid = 9;</code>
+     * @return The targetUid.
      */
     @java.lang.Override
-    public int getParam() {
-      return param_;
+    public int getTargetUid() {
+      return targetUid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class PlayerApplyEnterMpRspOuterClass {
       return retcode_;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 11;
-    private int targetUid_;
+    public static final int PARAM_FIELD_NUMBER = 13;
+    private int param_;
     /**
-     * <code>uint32 target_uid = 11;</code>
-     * @return The targetUid.
+     * <code>uint32 param = 13;</code>
+     * @return The param.
      */
     @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
+    public int getParam() {
+      return param_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +175,14 @@ public final class PlayerApplyEnterMpRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (targetUid_ != 0) {
+        output.writeUInt32(9, targetUid_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+        output.writeInt32(11, retcode_);
       }
       if (param_ != 0) {
-        output.writeUInt32(10, param_);
-      }
-      if (targetUid_ != 0) {
-        output.writeUInt32(11, targetUid_);
+        output.writeUInt32(13, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class PlayerApplyEnterMpRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (targetUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, targetUid_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, param_);
-      }
-      if (targetUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, targetUid_);
+          .computeUInt32Size(13, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class PlayerApplyEnterMpRspOuterClass {
       }
       emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp other = (emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp) obj;
 
-      if (getParam()
-          != other.getParam()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getParam()
+          != other.getParam()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class PlayerApplyEnterMpRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PARAM_FIELD_NUMBER;
-      hash = (53 * hash) + getParam();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + PARAM_FIELD_NUMBER;
+      hash = (53 * hash) + getParam();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class PlayerApplyEnterMpRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20994
-     * Obf: IGEKDAHIAFB
-     * </pre>
-     *
      * Protobuf type {@code PlayerApplyEnterMpRsp}
      */
     public static final class Builder extends
@@ -386,11 +376,11 @@ public final class PlayerApplyEnterMpRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        param_ = 0;
+        targetUid_ = 0;
 
         retcode_ = 0;
 
-        targetUid_ = 0;
+        param_ = 0;
 
         return this;
       }
@@ -418,9 +408,9 @@ public final class PlayerApplyEnterMpRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp buildPartial() {
         emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp result = new emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp(this);
-        result.param_ = param_;
-        result.retcode_ = retcode_;
         result.targetUid_ = targetUid_;
+        result.retcode_ = retcode_;
+        result.param_ = param_;
         onBuilt();
         return result;
       }
@@ -469,14 +459,14 @@ public final class PlayerApplyEnterMpRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp other) {
         if (other == emu.grasscutter.net.proto.PlayerApplyEnterMpRspOuterClass.PlayerApplyEnterMpRsp.getDefaultInstance()) return this;
-        if (other.getParam() != 0) {
-          setParam(other.getParam());
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
+        if (other.getParam() != 0) {
+          setParam(other.getParam());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +497,9 @@ public final class PlayerApplyEnterMpRspOuterClass {
         return this;
       }
 
-      private int param_ ;
-      /**
-       * <code>uint32 param = 10;</code>
-       * @return The param.
-       */
-      @java.lang.Override
-      public int getParam() {
-        return param_;
-      }
-      /**
-       * <code>uint32 param = 10;</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 = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParam() {
-        
-        param_ = 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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 11;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -579,7 +507,7 @@ public final class PlayerApplyEnterMpRspOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 11;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -590,7 +518,7 @@ public final class PlayerApplyEnterMpRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 11;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -599,6 +527,68 @@ public final class PlayerApplyEnterMpRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int param_ ;
+      /**
+       * <code>uint32 param = 13;</code>
+       * @return The param.
+       */
+      @java.lang.Override
+      public int getParam() {
+        return param_;
+      }
+      /**
+       * <code>uint32 param = 13;</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 = 13;</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) {
@@ -667,8 +657,8 @@ public final class PlayerApplyEnterMpRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033PlayerApplyEnterMpRsp.proto\"K\n\025PlayerA" +
-      "pplyEnterMpRsp\022\r\n\005param\030\n \001(\r\022\017\n\007retcode" +
-      "\030\010 \001(\005\022\022\n\ntarget_uid\030\013 \001(\rB\033\n\031emu.grassc" +
+      "pplyEnterMpRsp\022\022\n\ntarget_uid\030\t \001(\r\022\017\n\007re" +
+      "tcode\030\013 \001(\005\022\r\n\005param\030\r \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class PlayerApplyEnterMpRspOuterClass {
     internal_static_PlayerApplyEnterMpRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerApplyEnterMpRsp_descriptor,
-        new java.lang.String[] { "Param", "Retcode", "TargetUid", });
+        new java.lang.String[] { "TargetUid", "Retcode", "Param", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatNotifyOuterClass.java
index bab815294..a0261fd66 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class PlayerChatNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>uint32 channel_id = 5;</code>
+     * @return The channelId.
+     */
+    int getChannelId();
+
+    /**
+     * <code>.ChatInfo chat_info = 13;</code>
      * @return Whether the chatInfo field is set.
      */
     boolean hasChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 13;</code>
      * @return The chatInfo.
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 13;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder();
-
-    /**
-     * <code>uint32 channel_id = 11;</code>
-     * @return The channelId.
-     */
-    int getChannelId();
   }
   /**
-   * <pre>
-   * CmdId: 9541
-   * Obf: PAHGJBLBNBM
-   * </pre>
-   *
    * Protobuf type {@code PlayerChatNotify}
    */
   public static final class PlayerChatNotify extends
@@ -89,7 +84,12 @@ public final class PlayerChatNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 40: {
+
+              channelId_ = input.readUInt32();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder subBuilder = null;
               if (chatInfo_ != null) {
                 subBuilder = chatInfo_.toBuilder();
@@ -102,11 +102,6 @@ public final class PlayerChatNotifyOuterClass {
 
               break;
             }
-            case 88: {
-
-              channelId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +134,21 @@ public final class PlayerChatNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify.class, emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify.Builder.class);
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 2;
+    public static final int CHANNEL_ID_FIELD_NUMBER = 5;
+    private int channelId_;
+    /**
+     * <code>uint32 channel_id = 5;</code>
+     * @return The channelId.
+     */
+    @java.lang.Override
+    public int getChannelId() {
+      return channelId_;
+    }
+
+    public static final int CHAT_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 13;</code>
      * @return Whether the chatInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +156,7 @@ public final class PlayerChatNotifyOuterClass {
       return chatInfo_ != null;
     }
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 13;</code>
      * @return The chatInfo.
      */
     @java.lang.Override
@@ -158,24 +164,13 @@ public final class PlayerChatNotifyOuterClass {
       return chatInfo_ == null ? emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance() : chatInfo_;
     }
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
       return getChatInfo();
     }
 
-    public static final int CHANNEL_ID_FIELD_NUMBER = 11;
-    private int channelId_;
-    /**
-     * <code>uint32 channel_id = 11;</code>
-     * @return The channelId.
-     */
-    @java.lang.Override
-    public int getChannelId() {
-      return channelId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +185,11 @@ public final class PlayerChatNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (chatInfo_ != null) {
-        output.writeMessage(2, getChatInfo());
-      }
       if (channelId_ != 0) {
-        output.writeUInt32(11, channelId_);
+        output.writeUInt32(5, channelId_);
+      }
+      if (chatInfo_ != null) {
+        output.writeMessage(13, getChatInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class PlayerChatNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (chatInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getChatInfo());
-      }
       if (channelId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, channelId_);
+          .computeUInt32Size(5, channelId_);
+      }
+      if (chatInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, getChatInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class PlayerChatNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify other = (emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify) obj;
 
+      if (getChannelId()
+          != other.getChannelId()) return false;
       if (hasChatInfo() != other.hasChatInfo()) return false;
       if (hasChatInfo()) {
         if (!getChatInfo()
             .equals(other.getChatInfo())) return false;
       }
-      if (getChannelId()
-          != other.getChannelId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class PlayerChatNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getChannelId();
       if (hasChatInfo()) {
         hash = (37 * hash) + CHAT_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getChatInfo().hashCode();
       }
-      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChannelId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class PlayerChatNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9541
-     * Obf: PAHGJBLBNBM
-     * </pre>
-     *
      * Protobuf type {@code PlayerChatNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class PlayerChatNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        channelId_ = 0;
+
         if (chatInfoBuilder_ == null) {
           chatInfo_ = null;
         } else {
           chatInfo_ = null;
           chatInfoBuilder_ = null;
         }
-        channelId_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class PlayerChatNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify result = new emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify(this);
+        result.channelId_ = channelId_;
         if (chatInfoBuilder_ == null) {
           result.chatInfo_ = chatInfo_;
         } else {
           result.chatInfo_ = chatInfoBuilder_.build();
         }
-        result.channelId_ = channelId_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class PlayerChatNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerChatNotifyOuterClass.PlayerChatNotify.getDefaultInstance()) return this;
-        if (other.hasChatInfo()) {
-          mergeChatInfo(other.getChatInfo());
-        }
         if (other.getChannelId() != 0) {
           setChannelId(other.getChannelId());
         }
+        if (other.hasChatInfo()) {
+          mergeChatInfo(other.getChatInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,18 +503,49 @@ public final class PlayerChatNotifyOuterClass {
         return this;
       }
 
+      private int channelId_ ;
+      /**
+       * <code>uint32 channel_id = 5;</code>
+       * @return The channelId.
+       */
+      @java.lang.Override
+      public int getChannelId() {
+        return channelId_;
+      }
+      /**
+       * <code>uint32 channel_id = 5;</code>
+       * @param value The channelId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setChannelId(int value) {
+        
+        channelId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 channel_id = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearChannelId() {
+        
+        channelId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
       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 = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        * @return Whether the chatInfo field is set.
        */
       public boolean hasChatInfo() {
         return chatInfoBuilder_ != null || chatInfo_ != null;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        * @return The chatInfo.
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
@@ -535,7 +556,7 @@ public final class PlayerChatNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -551,7 +572,7 @@ public final class PlayerChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public Builder setChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -565,7 +586,7 @@ public final class PlayerChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -583,7 +604,7 @@ public final class PlayerChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class PlayerChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder() {
         
@@ -605,7 +626,7 @@ public final class PlayerChatNotifyOuterClass {
         return getChatInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
         if (chatInfoBuilder_ != null) {
@@ -616,7 +637,7 @@ public final class PlayerChatNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 13;</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> 
@@ -631,37 +652,6 @@ public final class PlayerChatNotifyOuterClass {
         }
         return chatInfoBuilder_;
       }
-
-      private int channelId_ ;
-      /**
-       * <code>uint32 channel_id = 11;</code>
-       * @return The channelId.
-       */
-      @java.lang.Override
-      public int getChannelId() {
-        return channelId_;
-      }
-      /**
-       * <code>uint32 channel_id = 11;</code>
-       * @param value The channelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChannelId(int value) {
-        
-        channelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 channel_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChannelId() {
-        
-        channelId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -730,8 +720,8 @@ public final class PlayerChatNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerChatNotify.proto\032\016ChatInfo.proto" +
-      "\"D\n\020PlayerChatNotify\022\034\n\tchat_info\030\002 \001(\0132" +
-      "\t.ChatInfo\022\022\n\nchannel_id\030\013 \001(\rB\033\n\031emu.gr" +
+      "\"D\n\020PlayerChatNotify\022\022\n\nchannel_id\030\005 \001(\r" +
+      "\022\034\n\tchat_info\030\r \001(\0132\t.ChatInfoB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -744,7 +734,7 @@ public final class PlayerChatNotifyOuterClass {
     internal_static_PlayerChatNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerChatNotify_descriptor,
-        new java.lang.String[] { "ChatInfo", "ChannelId", });
+        new java.lang.String[] { "ChannelId", "ChatInfo", });
     emu.grasscutter.net.proto.ChatInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatReqOuterClass.java
index a4ec97ac6..1b3944d2a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerChatReqOuterClass.java
@@ -19,32 +19,27 @@ public final class PlayerChatReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      * @return Whether the chatInfo field is set.
      */
     boolean hasChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      * @return The chatInfo.
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder();
 
     /**
-     * <code>uint32 channel_id = 7;</code>
+     * <code>uint32 channel_id = 8;</code>
      * @return The channelId.
      */
     int getChannelId();
   }
   /**
-   * <pre>
-   * CmdId: 23230
-   * Obf: FHLPMNCNEIG
-   * </pre>
-   *
    * Protobuf type {@code PlayerChatReq}
    */
   public static final class PlayerChatReq extends
@@ -89,7 +84,7 @@ public final class PlayerChatReqOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 42: {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder subBuilder = null;
               if (chatInfo_ != null) {
                 subBuilder = chatInfo_.toBuilder();
@@ -102,7 +97,7 @@ public final class PlayerChatReqOuterClass {
 
               break;
             }
-            case 56: {
+            case 64: {
 
               channelId_ = input.readUInt32();
               break;
@@ -139,10 +134,10 @@ public final class PlayerChatReqOuterClass {
               emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq.class, emu.grasscutter.net.proto.PlayerChatReqOuterClass.PlayerChatReq.Builder.class);
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 2;
+    public static final int CHAT_INFO_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      * @return Whether the chatInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +145,7 @@ public final class PlayerChatReqOuterClass {
       return chatInfo_ != null;
     }
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      * @return The chatInfo.
      */
     @java.lang.Override
@@ -158,17 +153,17 @@ public final class PlayerChatReqOuterClass {
       return chatInfo_ == null ? emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance() : chatInfo_;
     }
     /**
-     * <code>.ChatInfo chat_info = 2;</code>
+     * <code>.ChatInfo chat_info = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
       return getChatInfo();
     }
 
-    public static final int CHANNEL_ID_FIELD_NUMBER = 7;
+    public static final int CHANNEL_ID_FIELD_NUMBER = 8;
     private int channelId_;
     /**
-     * <code>uint32 channel_id = 7;</code>
+     * <code>uint32 channel_id = 8;</code>
      * @return The channelId.
      */
     @java.lang.Override
@@ -191,10 +186,10 @@ public final class PlayerChatReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (chatInfo_ != null) {
-        output.writeMessage(2, getChatInfo());
+        output.writeMessage(5, getChatInfo());
       }
       if (channelId_ != 0) {
-        output.writeUInt32(7, channelId_);
+        output.writeUInt32(8, channelId_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class PlayerChatReqOuterClass {
       size = 0;
       if (chatInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getChatInfo());
+          .computeMessageSize(5, getChatInfo());
       }
       if (channelId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, channelId_);
+          .computeUInt32Size(8, channelId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class PlayerChatReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23230
-     * Obf: FHLPMNCNEIG
-     * </pre>
-     *
      * Protobuf type {@code PlayerChatReq}
      */
     public static final class Builder extends
@@ -517,14 +507,14 @@ public final class PlayerChatReqOuterClass {
       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 = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        * @return Whether the chatInfo field is set.
        */
       public boolean hasChatInfo() {
         return chatInfoBuilder_ != null || chatInfo_ != null;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        * @return The chatInfo.
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
@@ -535,7 +525,7 @@ public final class PlayerChatReqOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -551,7 +541,7 @@ public final class PlayerChatReqOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public Builder setChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -565,7 +555,7 @@ public final class PlayerChatReqOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -583,7 +573,7 @@ public final class PlayerChatReqOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -597,7 +587,7 @@ public final class PlayerChatReqOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder() {
         
@@ -605,7 +595,7 @@ public final class PlayerChatReqOuterClass {
         return getChatInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
         if (chatInfoBuilder_ != null) {
@@ -616,7 +606,7 @@ public final class PlayerChatReqOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 2;</code>
+       * <code>.ChatInfo chat_info = 5;</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> 
@@ -634,7 +624,7 @@ public final class PlayerChatReqOuterClass {
 
       private int channelId_ ;
       /**
-       * <code>uint32 channel_id = 7;</code>
+       * <code>uint32 channel_id = 8;</code>
        * @return The channelId.
        */
       @java.lang.Override
@@ -642,7 +632,7 @@ public final class PlayerChatReqOuterClass {
         return channelId_;
       }
       /**
-       * <code>uint32 channel_id = 7;</code>
+       * <code>uint32 channel_id = 8;</code>
        * @param value The channelId to set.
        * @return This builder for chaining.
        */
@@ -653,7 +643,7 @@ public final class PlayerChatReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 channel_id = 7;</code>
+       * <code>uint32 channel_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearChannelId() {
@@ -730,8 +720,8 @@ public final class PlayerChatReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023PlayerChatReq.proto\032\016ChatInfo.proto\"A\n" +
-      "\rPlayerChatReq\022\034\n\tchat_info\030\002 \001(\0132\t.Chat" +
-      "Info\022\022\n\nchannel_id\030\007 \001(\rB\033\n\031emu.grasscut" +
+      "\rPlayerChatReq\022\034\n\tchat_info\030\005 \001(\0132\t.Chat" +
+      "Info\022\022\n\nchannel_id\030\010 \001(\rB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 8b40fc892..f94d5ecb6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDataNotifyOuterClass.java
@@ -19,17 +19,35 @@ public final class PlayerDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 region_id = 15;</code>
+     * <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 = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     boolean containsPropMap(
         int key);
@@ -40,54 +58,31 @@ public final class PlayerDataNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMapMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</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 = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
         int key);
 
     /**
-     * <code>string nick_name = 7;</code>
-     * @return The nickName.
-     */
-    java.lang.String getNickName();
-    /**
-     * <code>string nick_name = 7;</code>
-     * @return The bytes for nickName.
-     */
-    com.google.protobuf.ByteString
-        getNickNameBytes();
-
-    /**
-     * <code>bool is_first_login_today = 12;</code>
-     * @return The isFirstLoginToday.
-     */
-    boolean getIsFirstLoginToday();
-
-    /**
-     * <code>uint64 server_time = 6;</code>
+     * <code>uint64 server_time = 11;</code>
      * @return The serverTime.
      */
     long getServerTime();
   }
   /**
-   * <pre>
-   * CmdId: 2051
-   * Obf: DMLJMNGGJAC
-   * </pre>
-   *
    * Protobuf type {@code PlayerDataNotify}
    */
   public static final class PlayerDataNotify extends
@@ -134,7 +129,23 @@ public final class PlayerDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nickName_ = s;
+              break;
+            }
+            case 16: {
+
+              isFirstLoginToday_ = input.readBool();
+              break;
+            }
+            case 40: {
+
+              regionId_ = input.readUInt32();
+              break;
+            }
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -147,27 +158,11 @@ public final class PlayerDataNotifyOuterClass {
                   propMap__.getKey(), propMap__.getValue());
               break;
             }
-            case 48: {
+            case 88: {
 
               serverTime_ = input.readUInt64();
               break;
             }
-            case 58: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              nickName_ = s;
-              break;
-            }
-            case 96: {
-
-              isFirstLoginToday_ = input.readBool();
-              break;
-            }
-            case 120: {
-
-              regionId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -197,7 +192,7 @@ public final class PlayerDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 3:
+        case 8:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -212,10 +207,59 @@ public final class PlayerDataNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.class, emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.Builder.class);
     }
 
-    public static final int REGION_ID_FIELD_NUMBER = 15;
+    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 = 15;</code>
+     * <code>uint32 region_id = 5;</code>
      * @return The regionId.
      */
     @java.lang.Override
@@ -223,7 +267,7 @@ public final class PlayerDataNotifyOuterClass {
       return regionId_;
     }
 
-    public static final int PROP_MAP_FIELD_NUMBER = 3;
+    public static final int PROP_MAP_FIELD_NUMBER = 8;
     private static final class PropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> defaultEntry =
@@ -250,7 +294,7 @@ public final class PlayerDataNotifyOuterClass {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
 
     @java.lang.Override
@@ -268,7 +312,7 @@ public final class PlayerDataNotifyOuterClass {
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     @java.lang.Override
 
@@ -276,7 +320,7 @@ public final class PlayerDataNotifyOuterClass {
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     @java.lang.Override
 
@@ -289,7 +333,7 @@ public final class PlayerDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
      */
     @java.lang.Override
 
@@ -304,59 +348,10 @@ public final class PlayerDataNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int NICK_NAME_FIELD_NUMBER = 7;
-    private volatile java.lang.Object nickName_;
-    /**
-     * <code>string nick_name = 7;</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 = 7;</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 = 12;
-    private boolean isFirstLoginToday_;
-    /**
-     * <code>bool is_first_login_today = 12;</code>
-     * @return The isFirstLoginToday.
-     */
-    @java.lang.Override
-    public boolean getIsFirstLoginToday() {
-      return isFirstLoginToday_;
-    }
-
-    public static final int SERVER_TIME_FIELD_NUMBER = 6;
+    public static final int SERVER_TIME_FIELD_NUMBER = 11;
     private long serverTime_;
     /**
-     * <code>uint64 server_time = 6;</code>
+     * <code>uint64 server_time = 11;</code>
      * @return The serverTime.
      */
     @java.lang.Override
@@ -378,23 +373,23 @@ public final class PlayerDataNotifyOuterClass {
     @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_);
+      }
+      if (regionId_ != 0) {
+        output.writeUInt32(5, regionId_);
+      }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          3);
+          8);
       if (serverTime_ != 0L) {
-        output.writeUInt64(6, serverTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, nickName_);
-      }
-      if (isFirstLoginToday_ != false) {
-        output.writeBool(12, isFirstLoginToday_);
-      }
-      if (regionId_ != 0) {
-        output.writeUInt32(15, regionId_);
+        output.writeUInt64(11, serverTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -405,6 +400,17 @@ public final class PlayerDataNotifyOuterClass {
       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_);
+      }
+      if (regionId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, regionId_);
+      }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> entry
            : internalGetPropMap().getMap().entrySet()) {
         com.google.protobuf.MapEntry<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
@@ -413,22 +419,11 @@ public final class PlayerDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(3, propMap__);
+            .computeMessageSize(8, propMap__);
       }
       if (serverTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, serverTime_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, nickName_);
-      }
-      if (isFirstLoginToday_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isFirstLoginToday_);
-      }
-      if (regionId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, regionId_);
+          .computeUInt64Size(11, serverTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -445,14 +440,14 @@ public final class PlayerDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify other = (emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify) obj;
 
-      if (getRegionId()
-          != other.getRegionId()) return false;
-      if (!internalGetPropMap().equals(
-          other.internalGetPropMap())) return false;
       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 (getServerTime()
           != other.getServerTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -466,17 +461,17 @@ public final class PlayerDataNotifyOuterClass {
       }
       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) + IS_FIRST_LOGIN_TODAY_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFirstLoginToday());
       hash = (37 * hash) + SERVER_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getServerTime());
@@ -576,11 +571,6 @@ public final class PlayerDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2051
-     * Obf: DMLJMNGGJAC
-     * </pre>
-     *
      * Protobuf type {@code PlayerDataNotify}
      */
     public static final class Builder extends
@@ -596,7 +586,7 @@ public final class PlayerDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 8:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -607,7 +597,7 @@ public final class PlayerDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 3:
+          case 8:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -640,13 +630,13 @@ public final class PlayerDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        regionId_ = 0;
-
-        internalGetMutablePropMap().clear();
         nickName_ = "";
 
         isFirstLoginToday_ = false;
 
+        regionId_ = 0;
+
+        internalGetMutablePropMap().clear();
         serverTime_ = 0L;
 
         return this;
@@ -676,11 +666,11 @@ public final class PlayerDataNotifyOuterClass {
       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.isFirstLoginToday_ = isFirstLoginToday_;
         result.serverTime_ = serverTime_;
         onBuilt();
         return result;
@@ -730,11 +720,6 @@ public final class PlayerDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerDataNotifyOuterClass.PlayerDataNotify.getDefaultInstance()) return this;
-        if (other.getRegionId() != 0) {
-          setRegionId(other.getRegionId());
-        }
-        internalGetMutablePropMap().mergeFrom(
-            other.internalGetPropMap());
         if (!other.getNickName().isEmpty()) {
           nickName_ = other.nickName_;
           onChanged();
@@ -742,6 +727,11 @@ public final class PlayerDataNotifyOuterClass {
         if (other.getIsFirstLoginToday() != false) {
           setIsFirstLoginToday(other.getIsFirstLoginToday());
         }
+        if (other.getRegionId() != 0) {
+          setRegionId(other.getRegionId());
+        }
+        internalGetMutablePropMap().mergeFrom(
+            other.internalGetPropMap());
         if (other.getServerTime() != 0L) {
           setServerTime(other.getServerTime());
         }
@@ -775,9 +765,116 @@ public final class PlayerDataNotifyOuterClass {
       }
       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 = 15;</code>
+       * <code>uint32 region_id = 5;</code>
        * @return The regionId.
        */
       @java.lang.Override
@@ -785,7 +882,7 @@ public final class PlayerDataNotifyOuterClass {
         return regionId_;
       }
       /**
-       * <code>uint32 region_id = 15;</code>
+       * <code>uint32 region_id = 5;</code>
        * @param value The regionId to set.
        * @return This builder for chaining.
        */
@@ -796,7 +893,7 @@ public final class PlayerDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 region_id = 15;</code>
+       * <code>uint32 region_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRegionId() {
@@ -833,7 +930,7 @@ public final class PlayerDataNotifyOuterClass {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
 
       @java.lang.Override
@@ -851,7 +948,7 @@ public final class PlayerDataNotifyOuterClass {
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
       @java.lang.Override
 
@@ -859,7 +956,7 @@ public final class PlayerDataNotifyOuterClass {
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
       @java.lang.Override
 
@@ -872,7 +969,7 @@ public final class PlayerDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
       @java.lang.Override
 
@@ -893,7 +990,7 @@ public final class PlayerDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
 
       public Builder removePropMap(
@@ -912,7 +1009,7 @@ public final class PlayerDataNotifyOuterClass {
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
       public Builder putPropMap(
           int key,
@@ -924,7 +1021,7 @@ public final class PlayerDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 3;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 8;</code>
        */
 
       public Builder putAllPropMap(
@@ -934,116 +1031,9 @@ public final class PlayerDataNotifyOuterClass {
         return this;
       }
 
-      private java.lang.Object nickName_ = "";
-      /**
-       * <code>string nick_name = 7;</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 = 7;</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 = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNickName() {
-        
-        nickName_ = getDefaultInstance().getNickName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string nick_name = 7;</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 = 12;</code>
-       * @return The isFirstLoginToday.
-       */
-      @java.lang.Override
-      public boolean getIsFirstLoginToday() {
-        return isFirstLoginToday_;
-      }
-      /**
-       * <code>bool is_first_login_today = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFirstLoginToday() {
-        
-        isFirstLoginToday_ = false;
-        onChanged();
-        return this;
-      }
-
       private long serverTime_ ;
       /**
-       * <code>uint64 server_time = 6;</code>
+       * <code>uint64 server_time = 11;</code>
        * @return The serverTime.
        */
       @java.lang.Override
@@ -1051,7 +1041,7 @@ public final class PlayerDataNotifyOuterClass {
         return serverTime_;
       }
       /**
-       * <code>uint64 server_time = 6;</code>
+       * <code>uint64 server_time = 11;</code>
        * @param value The serverTime to set.
        * @return This builder for chaining.
        */
@@ -1062,7 +1052,7 @@ public final class PlayerDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 server_time = 6;</code>
+       * <code>uint64 server_time = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerTime() {
@@ -1144,10 +1134,10 @@ public final class PlayerDataNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerDataNotify.proto\032\017PropValue.prot" +
-      "o\"\331\001\n\020PlayerDataNotify\022\021\n\tregion_id\030\017 \001(" +
-      "\r\0220\n\010prop_map\030\003 \003(\0132\036.PlayerDataNotify.P" +
-      "ropMapEntry\022\021\n\tnick_name\030\007 \001(\t\022\034\n\024is_fir" +
-      "st_login_today\030\014 \001(\010\022\023\n\013server_time\030\006 \001(" +
+      "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" +
       "\002 \001(\0132\n.PropValue:\0028\001B\033\n\031emu.grasscutter" +
       ".net.protob\006proto3"
@@ -1162,7 +1152,7 @@ public final class PlayerDataNotifyOuterClass {
     internal_static_PlayerDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerDataNotify_descriptor,
-        new java.lang.String[] { "RegionId", "PropMap", "NickName", "IsFirstLoginToday", "ServerTime", });
+        new java.lang.String[] { "NickName", "IsFirstLoginToday", "RegionId", "PropMap", "ServerTime", });
     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/PlayerDieOptionOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java
index d80b4caff..502ac0b49 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieOptionOuterClass.java
@@ -15,10 +15,6 @@ public final class PlayerDieOptionOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: FEBNBMEEDHK
-   * </pre>
-   *
    * Protobuf enum {@code PlayerDieOption}
    */
   public enum PlayerDieOption
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieTypeOuterClass.java
index adc896fcb..ed5c8d0f4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerDieTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class PlayerDieTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: NJLHPPKOGDB
-   * </pre>
-   *
    * Protobuf enum {@code PlayerDieType}
    */
   public enum PlayerDieType
@@ -59,6 +55,14 @@ public final class PlayerDieTypeOuterClass {
      * <code>PLAYER_DIE_TYPE_STORM_LIGHTING = 8;</code>
      */
     PLAYER_DIE_TYPE_STORM_LIGHTING(8),
+    /**
+     * <code>PLAYER_DIE_TYPE_DIRTY_WATER_EROSION = 9;</code>
+     */
+    PLAYER_DIE_TYPE_DIRTY_WATER_EROSION(9),
+    /**
+     * <code>PLAYER_DIE_TYPE_LIQUID_PHLOGISTON = 10;</code>
+     */
+    PLAYER_DIE_TYPE_LIQUID_PHLOGISTON(10),
     UNRECOGNIZED(-1),
     ;
 
@@ -98,6 +102,14 @@ public final class PlayerDieTypeOuterClass {
      * <code>PLAYER_DIE_TYPE_STORM_LIGHTING = 8;</code>
      */
     public static final int PLAYER_DIE_TYPE_STORM_LIGHTING_VALUE = 8;
+    /**
+     * <code>PLAYER_DIE_TYPE_DIRTY_WATER_EROSION = 9;</code>
+     */
+    public static final int PLAYER_DIE_TYPE_DIRTY_WATER_EROSION_VALUE = 9;
+    /**
+     * <code>PLAYER_DIE_TYPE_LIQUID_PHLOGISTON = 10;</code>
+     */
+    public static final int PLAYER_DIE_TYPE_LIQUID_PHLOGISTON_VALUE = 10;
 
 
     public final int getNumber() {
@@ -133,6 +145,8 @@ public final class PlayerDieTypeOuterClass {
         case 6: return PLAYER_DIE_TYPE_GM;
         case 7: return PLAYER_DIE_TYPE_CLIMATE_COLD;
         case 8: return PLAYER_DIE_TYPE_STORM_LIGHTING;
+        case 9: return PLAYER_DIE_TYPE_DIRTY_WATER_EROSION;
+        case 10: return PLAYER_DIE_TYPE_LIQUID_PHLOGISTON;
         default: return null;
       }
     }
@@ -198,14 +212,16 @@ public final class PlayerDieTypeOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\023PlayerDieType.proto*\236\002\n\rPlayerDieType\022" +
+      "\n\023PlayerDieType.proto*\356\002\n\rPlayerDieType\022" +
       "\030\n\024PLAYER_DIE_TYPE_NONE\020\000\022#\n\037PLAYER_DIE_" +
       "TYPE_KILL_BY_MONSTER\020\001\022 \n\034PLAYER_DIE_TYP" +
       "E_KILL_BY_GEAR\020\002\022\030\n\024PLAYER_DIE_TYPE_FALL" +
       "\020\003\022\031\n\025PLAYER_DIE_TYPE_DRAWN\020\004\022\031\n\025PLAYER_" +
       "DIE_TYPE_ABYSS\020\005\022\026\n\022PLAYER_DIE_TYPE_GM\020\006" +
       "\022 \n\034PLAYER_DIE_TYPE_CLIMATE_COLD\020\007\022\"\n\036PL" +
-      "AYER_DIE_TYPE_STORM_LIGHTING\020\010B\033\n\031emu.gr" +
+      "AYER_DIE_TYPE_STORM_LIGHTING\020\010\022\'\n#PLAYER" +
+      "_DIE_TYPE_DIRTY_WATER_EROSION\020\t\022%\n!PLAYE" +
+      "R_DIE_TYPE_LIQUID_PHLOGISTON\020\nB\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/PlayerEnterDungeonReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java
index 6fe5cbc9c..90154ae2f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonReqOuterClass.java
@@ -19,38 +19,39 @@ public final class PlayerEnterDungeonReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 dungeon_id = 11;</code>
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
+     * @return Whether the enterPosInfo field is set.
+     */
+    boolean hasEnterPosInfo();
+    /**
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
+     * @return The enterPosInfo.
+     */
+    emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo();
+    /**
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
+     */
+    emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder();
+
+    /**
+     * <code>bool LLCOCJHJBME = 10;</code>
+     * @return The lLCOCJHJBME.
+     */
+    boolean getLLCOCJHJBME();
+
+    /**
+     * <code>uint32 dungeon_id = 2;</code>
      * @return The dungeonId.
      */
     int getDungeonId();
 
     /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
-     * @return Whether the enterPosInfo field is set.
-     */
-    boolean hasEnterPosInfo();
-    /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
-     * @return The enterPosInfo.
-     */
-    emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo();
-    /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
-     */
-    emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder();
-
-    /**
-     * <code>uint32 point_id = 15;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 28791
-   * Obf: IPCFJHGFFPP
-   * </pre>
-   *
    * Protobuf type {@code PlayerEnterDungeonReq}
    */
   public static final class PlayerEnterDungeonReq extends
@@ -95,7 +96,22 @@ public final class PlayerEnterDungeonReqOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 16: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 48: {
+
+              pointId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              lLCOCJHJBME_ = input.readBool();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder subBuilder = null;
               if (enterPosInfo_ != null) {
                 subBuilder = enterPosInfo_.toBuilder();
@@ -108,16 +124,6 @@ public final class PlayerEnterDungeonReqOuterClass {
 
               break;
             }
-            case 88: {
-
-              dungeonId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              pointId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -150,21 +156,10 @@ public final class PlayerEnterDungeonReqOuterClass {
               emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.class, emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.Builder.class);
     }
 
-    public static final int DUNGEON_ID_FIELD_NUMBER = 11;
-    private int dungeonId_;
-    /**
-     * <code>uint32 dungeon_id = 11;</code>
-     * @return The dungeonId.
-     */
-    @java.lang.Override
-    public int getDungeonId() {
-      return dungeonId_;
-    }
-
-    public static final int ENTER_POS_INFO_FIELD_NUMBER = 3;
+    public static final int ENTER_POS_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_;
     /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
      * @return Whether the enterPosInfo field is set.
      */
     @java.lang.Override
@@ -172,7 +167,7 @@ public final class PlayerEnterDungeonReqOuterClass {
       return enterPosInfo_ != null;
     }
     /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
      * @return The enterPosInfo.
      */
     @java.lang.Override
@@ -180,17 +175,39 @@ public final class PlayerEnterDungeonReqOuterClass {
       return enterPosInfo_ == null ? emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.getDefaultInstance() : enterPosInfo_;
     }
     /**
-     * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+     * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() {
       return getEnterPosInfo();
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 15;
+    public static final int LLCOCJHJBME_FIELD_NUMBER = 10;
+    private boolean lLCOCJHJBME_;
+    /**
+     * <code>bool LLCOCJHJBME = 10;</code>
+     * @return The lLCOCJHJBME.
+     */
+    @java.lang.Override
+    public boolean getLLCOCJHJBME() {
+      return lLCOCJHJBME_;
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 2;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 2;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
+    public static final int POINT_ID_FIELD_NUMBER = 6;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 15;</code>
+     * <code>uint32 point_id = 6;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -212,14 +229,17 @@ public final class PlayerEnterDungeonReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (enterPosInfo_ != null) {
-        output.writeMessage(3, getEnterPosInfo());
-      }
       if (dungeonId_ != 0) {
-        output.writeUInt32(11, dungeonId_);
+        output.writeUInt32(2, dungeonId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(15, pointId_);
+        output.writeUInt32(6, pointId_);
+      }
+      if (lLCOCJHJBME_ != false) {
+        output.writeBool(10, lLCOCJHJBME_);
+      }
+      if (enterPosInfo_ != null) {
+        output.writeMessage(13, getEnterPosInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -230,17 +250,21 @@ public final class PlayerEnterDungeonReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (enterPosInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getEnterPosInfo());
-      }
       if (dungeonId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, dungeonId_);
+          .computeUInt32Size(2, dungeonId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, pointId_);
+          .computeUInt32Size(6, pointId_);
+      }
+      if (lLCOCJHJBME_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, lLCOCJHJBME_);
+      }
+      if (enterPosInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(13, getEnterPosInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,13 +281,15 @@ public final class PlayerEnterDungeonReqOuterClass {
       }
       emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other = (emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq) obj;
 
-      if (getDungeonId()
-          != other.getDungeonId()) return false;
       if (hasEnterPosInfo() != other.hasEnterPosInfo()) return false;
       if (hasEnterPosInfo()) {
         if (!getEnterPosInfo()
             .equals(other.getEnterPosInfo())) return false;
       }
+      if (getLLCOCJHJBME()
+          != other.getLLCOCJHJBME()) return false;
+      if (getDungeonId()
+          != other.getDungeonId()) return false;
       if (getPointId()
           != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -277,12 +303,15 @@ public final class PlayerEnterDungeonReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonId();
       if (hasEnterPosInfo()) {
         hash = (37 * hash) + ENTER_POS_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getEnterPosInfo().hashCode();
       }
+      hash = (37 * hash) + LLCOCJHJBME_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getLLCOCJHJBME());
+      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonId();
       hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -381,11 +410,6 @@ public final class PlayerEnterDungeonReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28791
-     * Obf: IPCFJHGFFPP
-     * </pre>
-     *
      * Protobuf type {@code PlayerEnterDungeonReq}
      */
     public static final class Builder extends
@@ -423,14 +447,16 @@ public final class PlayerEnterDungeonReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        dungeonId_ = 0;
-
         if (enterPosInfoBuilder_ == null) {
           enterPosInfo_ = null;
         } else {
           enterPosInfo_ = null;
           enterPosInfoBuilder_ = null;
         }
+        lLCOCJHJBME_ = false;
+
+        dungeonId_ = 0;
+
         pointId_ = 0;
 
         return this;
@@ -459,12 +485,13 @@ public final class PlayerEnterDungeonReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq buildPartial() {
         emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq result = new emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq(this);
-        result.dungeonId_ = dungeonId_;
         if (enterPosInfoBuilder_ == null) {
           result.enterPosInfo_ = enterPosInfo_;
         } else {
           result.enterPosInfo_ = enterPosInfoBuilder_.build();
         }
+        result.lLCOCJHJBME_ = lLCOCJHJBME_;
+        result.dungeonId_ = dungeonId_;
         result.pointId_ = pointId_;
         onBuilt();
         return result;
@@ -514,12 +541,15 @@ public final class PlayerEnterDungeonReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq other) {
         if (other == emu.grasscutter.net.proto.PlayerEnterDungeonReqOuterClass.PlayerEnterDungeonReq.getDefaultInstance()) return this;
-        if (other.getDungeonId() != 0) {
-          setDungeonId(other.getDungeonId());
-        }
         if (other.hasEnterPosInfo()) {
           mergeEnterPosInfo(other.getEnterPosInfo());
         }
+        if (other.getLLCOCJHJBME() != false) {
+          setLLCOCJHJBME(other.getLLCOCJHJBME());
+        }
+        if (other.getDungeonId() != 0) {
+          setDungeonId(other.getDungeonId());
+        }
         if (other.getPointId() != 0) {
           setPointId(other.getPointId());
         }
@@ -552,49 +582,18 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
 
-      private int dungeonId_ ;
-      /**
-       * <code>uint32 dungeon_id = 11;</code>
-       * @return The dungeonId.
-       */
-      @java.lang.Override
-      public int getDungeonId() {
-        return dungeonId_;
-      }
-      /**
-       * <code>uint32 dungeon_id = 11;</code>
-       * @param value The dungeonId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDungeonId(int value) {
-        
-        dungeonId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 dungeon_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDungeonId() {
-        
-        dungeonId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo enterPosInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder> enterPosInfoBuilder_;
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        * @return Whether the enterPosInfo field is set.
        */
       public boolean hasEnterPosInfo() {
         return enterPosInfoBuilder_ != null || enterPosInfo_ != null;
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        * @return The enterPosInfo.
        */
       public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo getEnterPosInfo() {
@@ -605,7 +604,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         }
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public Builder setEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) {
         if (enterPosInfoBuilder_ == null) {
@@ -621,7 +620,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public Builder setEnterPosInfo(
           emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder builderForValue) {
@@ -635,7 +634,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public Builder mergeEnterPosInfo(emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo value) {
         if (enterPosInfoBuilder_ == null) {
@@ -653,7 +652,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public Builder clearEnterPosInfo() {
         if (enterPosInfoBuilder_ == null) {
@@ -667,7 +666,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder getEnterPosInfoBuilder() {
         
@@ -675,7 +674,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return getEnterPosInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       public emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder getEnterPosInfoOrBuilder() {
         if (enterPosInfoBuilder_ != null) {
@@ -686,7 +685,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         }
       }
       /**
-       * <code>.DungeonEnterPosInfo enter_pos_info = 3;</code>
+       * <code>.DungeonEnterPosInfo enter_pos_info = 13;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfo.Builder, emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.DungeonEnterPosInfoOrBuilder> 
@@ -702,9 +701,71 @@ public final class PlayerEnterDungeonReqOuterClass {
         return enterPosInfoBuilder_;
       }
 
+      private boolean lLCOCJHJBME_ ;
+      /**
+       * <code>bool LLCOCJHJBME = 10;</code>
+       * @return The lLCOCJHJBME.
+       */
+      @java.lang.Override
+      public boolean getLLCOCJHJBME() {
+        return lLCOCJHJBME_;
+      }
+      /**
+       * <code>bool LLCOCJHJBME = 10;</code>
+       * @param value The lLCOCJHJBME to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLLCOCJHJBME(boolean value) {
+        
+        lLCOCJHJBME_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool LLCOCJHJBME = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLLCOCJHJBME() {
+        
+        lLCOCJHJBME_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dungeonId_ ;
+      /**
+       * <code>uint32 dungeon_id = 2;</code>
+       * @return The dungeonId.
+       */
+      @java.lang.Override
+      public int getDungeonId() {
+        return dungeonId_;
+      }
+      /**
+       * <code>uint32 dungeon_id = 2;</code>
+       * @param value The dungeonId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonId(int value) {
+        
+        dungeonId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonId() {
+        
+        dungeonId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -712,7 +773,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -723,7 +784,7 @@ public final class PlayerEnterDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 15;</code>
+       * <code>uint32 point_id = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -800,11 +861,11 @@ public final class PlayerEnterDungeonReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033PlayerEnterDungeonReq.proto\032\031DungeonEn" +
-      "terPosInfo.proto\"k\n\025PlayerEnterDungeonRe" +
-      "q\022\022\n\ndungeon_id\030\013 \001(\r\022,\n\016enter_pos_info\030" +
-      "\003 \001(\0132\024.DungeonEnterPosInfo\022\020\n\010point_id\030" +
-      "\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006prot" +
-      "o3"
+      "terPosInfo.proto\"\200\001\n\025PlayerEnterDungeonR" +
+      "eq\022,\n\016enter_pos_info\030\r \001(\0132\024.DungeonEnte" +
+      "rPosInfo\022\023\n\013LLCOCJHJBME\030\n \001(\010\022\022\n\ndungeon" +
+      "_id\030\002 \001(\r\022\020\n\010point_id\030\006 \001(\rB\033\n\031emu.grass" +
+      "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -816,7 +877,7 @@ public final class PlayerEnterDungeonReqOuterClass {
     internal_static_PlayerEnterDungeonReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterDungeonReq_descriptor,
-        new java.lang.String[] { "DungeonId", "EnterPosInfo", "PointId", });
+        new java.lang.String[] { "EnterPosInfo", "LLCOCJHJBME", "DungeonId", "PointId", });
     emu.grasscutter.net.proto.DungeonEnterPosInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java
index 0857e4490..f6724b280 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterDungeonRspOuterClass.java
@@ -18,12 +18,6 @@ public final class PlayerEnterDungeonRspOuterClass {
       // @@protoc_insertion_point(interface_extends:PlayerEnterDungeonRsp)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>uint32 point_id = 1;</code>
-     * @return The pointId.
-     */
-    int getPointId();
-
     /**
      * <code>uint32 dungeon_id = 10;</code>
      * @return The dungeonId.
@@ -31,17 +25,18 @@ public final class PlayerEnterDungeonRspOuterClass {
     int getDungeonId();
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 point_id = 13;</code>
+     * @return The pointId.
+     */
+    int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 24874
-   * Obf: IPGDOPKIBPO
-   * </pre>
-   *
    * Protobuf type {@code PlayerEnterDungeonRsp}
    */
   public static final class PlayerEnterDungeonRsp extends
@@ -86,19 +81,19 @@ public final class PlayerEnterDungeonRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 80: {
 
-              pointId_ = input.readUInt32();
+              dungeonId_ = input.readUInt32();
               break;
             }
-            case 16: {
+            case 96: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 104: {
 
-              dungeonId_ = input.readUInt32();
+              pointId_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,17 +128,6 @@ public final class PlayerEnterDungeonRspOuterClass {
               emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp.class, emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 1;
-    private int pointId_;
-    /**
-     * <code>uint32 point_id = 1;</code>
-     * @return The pointId.
-     */
-    @java.lang.Override
-    public int getPointId() {
-      return pointId_;
-    }
-
     public static final int DUNGEON_ID_FIELD_NUMBER = 10;
     private int dungeonId_;
     /**
@@ -155,10 +139,10 @@ public final class PlayerEnterDungeonRspOuterClass {
       return dungeonId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class PlayerEnterDungeonRspOuterClass {
       return retcode_;
     }
 
+    public static final int POINT_ID_FIELD_NUMBER = 13;
+    private int pointId_;
+    /**
+     * <code>uint32 point_id = 13;</code>
+     * @return The pointId.
+     */
+    @java.lang.Override
+    public int getPointId() {
+      return pointId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,15 +175,15 @@ public final class PlayerEnterDungeonRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pointId_ != 0) {
-        output.writeUInt32(1, pointId_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
       if (dungeonId_ != 0) {
         output.writeUInt32(10, dungeonId_);
       }
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
+      }
+      if (pointId_ != 0) {
+        output.writeUInt32(13, pointId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -198,18 +193,18 @@ public final class PlayerEnterDungeonRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pointId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, pointId_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
       if (dungeonId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(10, dungeonId_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, retcode_);
+      }
+      if (pointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, pointId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -225,12 +220,12 @@ public final class PlayerEnterDungeonRspOuterClass {
       }
       emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp other = (emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp) obj;
 
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getDungeonId()
           != other.getDungeonId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class PlayerEnterDungeonRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPointId();
       hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDungeonId();
       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,11 +339,6 @@ public final class PlayerEnterDungeonRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24874
-     * Obf: IPGDOPKIBPO
-     * </pre>
-     *
      * Protobuf type {@code PlayerEnterDungeonRsp}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class PlayerEnterDungeonRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pointId_ = 0;
-
         dungeonId_ = 0;
 
         retcode_ = 0;
 
+        pointId_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class PlayerEnterDungeonRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp buildPartial() {
         emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp result = new emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp(this);
-        result.pointId_ = pointId_;
         result.dungeonId_ = dungeonId_;
         result.retcode_ = retcode_;
+        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class PlayerEnterDungeonRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp other) {
         if (other == emu.grasscutter.net.proto.PlayerEnterDungeonRspOuterClass.PlayerEnterDungeonRsp.getDefaultInstance()) return this;
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,37 +497,6 @@ public final class PlayerEnterDungeonRspOuterClass {
         return this;
       }
 
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 1;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 1;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int dungeonId_ ;
       /**
        * <code>uint32 dungeon_id = 10;</code>
@@ -571,7 +530,7 @@ public final class PlayerEnterDungeonRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class PlayerEnterDungeonRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class PlayerEnterDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -599,6 +558,37 @@ public final class PlayerEnterDungeonRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class PlayerEnterDungeonRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033PlayerEnterDungeonRsp.proto\"N\n\025PlayerE" +
-      "nterDungeonRsp\022\020\n\010point_id\030\001 \001(\r\022\022\n\ndung" +
-      "eon_id\030\n \001(\r\022\017\n\007retcode\030\002 \001(\005B\033\n\031emu.gra" +
+      "nterDungeonRsp\022\022\n\ndungeon_id\030\n \001(\r\022\017\n\007re" +
+      "tcode\030\014 \001(\005\022\020\n\010point_id\030\r \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class PlayerEnterDungeonRspOuterClass {
     internal_static_PlayerEnterDungeonRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterDungeonRsp_descriptor,
-        new java.lang.String[] { "PointId", "DungeonId", "Retcode", });
+        new java.lang.String[] { "DungeonId", "Retcode", "PointId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 24430a974..f34f446bb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneInfoNotifyOuterClass.java
@@ -19,77 +19,72 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_avatar_entity_id = 14;</code>
-     * @return The curAvatarEntityId.
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
+     * @return Whether the teamEnterInfo field is set.
      */
-    int getCurAvatarEntityId();
+    boolean hasTeamEnterInfo();
+    /**
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
+     * @return The teamEnterInfo.
+     */
+    emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo();
+    /**
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
+     */
+    emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder();
 
     /**
-     * <code>uint32 enter_scene_token = 6;</code>
-     * @return The enterSceneToken.
-     */
-    int getEnterSceneToken();
-
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-     * @return Whether the mpLevelEntityInfo field is set.
-     */
-    boolean hasMpLevelEntityInfo();
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-     * @return The mpLevelEntityInfo.
-     */
-    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo();
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-     */
-    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder();
-
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> 
         getAvatarEnterInfoList();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index);
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
      */
     int getAvatarEnterInfoCount();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
         getAvatarEnterInfoOrBuilderList();
     /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
      */
     emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
         int index);
 
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
-     * @return Whether the teamEnterInfo field is set.
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
      */
-    boolean hasTeamEnterInfo();
+    int getEnterSceneToken();
+
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
-     * @return The teamEnterInfo.
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return Whether the mpLevelEntityInfo field is set.
      */
-    emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo();
+    boolean hasMpLevelEntityInfo();
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return The mpLevelEntityInfo.
      */
-    emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder();
+    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo();
+    /**
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     */
+    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder();
+
+    /**
+     * <code>uint32 cur_avatar_entity_id = 15;</code>
+     * @return The curAvatarEntityId.
+     */
+    int getCurAvatarEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 27063
-   * Obf: BMMOCCOFGEL
-   * </pre>
-   *
    * Protobuf type {@code PlayerEnterSceneInfoNotify}
    */
   public static final class PlayerEnterSceneInfoNotify extends
@@ -136,25 +131,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              enterSceneToken_ = input.readUInt32();
-              break;
-            }
-            case 66: {
-              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder subBuilder = null;
-              if (mpLevelEntityInfo_ != null) {
-                subBuilder = mpLevelEntityInfo_.toBuilder();
-              }
-              mpLevelEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(mpLevelEntityInfo_);
-                mpLevelEntityInfo_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 74: {
+            case 50: {
               emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder subBuilder = null;
               if (teamEnterInfo_ != null) {
                 subBuilder = teamEnterInfo_.toBuilder();
@@ -167,7 +144,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
 
               break;
             }
-            case 82: {
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarEnterInfo_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -176,7 +153,25 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.parser(), extensionRegistry));
               break;
             }
-            case 112: {
+            case 88: {
+
+              enterSceneToken_ = input.readUInt32();
+              break;
+            }
+            case 98: {
+              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder subBuilder = null;
+              if (mpLevelEntityInfo_ != null) {
+                subBuilder = mpLevelEntityInfo_.toBuilder();
+              }
+              mpLevelEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(mpLevelEntityInfo_);
+                mpLevelEntityInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 120: {
 
               curAvatarEntityId_ = input.readUInt32();
               break;
@@ -216,98 +211,10 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.class, emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.Builder.class);
     }
 
-    public static final int CUR_AVATAR_ENTITY_ID_FIELD_NUMBER = 14;
-    private int curAvatarEntityId_;
-    /**
-     * <code>uint32 cur_avatar_entity_id = 14;</code>
-     * @return The curAvatarEntityId.
-     */
-    @java.lang.Override
-    public int getCurAvatarEntityId() {
-      return curAvatarEntityId_;
-    }
-
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 6;
-    private int enterSceneToken_;
-    /**
-     * <code>uint32 enter_scene_token = 6;</code>
-     * @return The enterSceneToken.
-     */
-    @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
-    }
-
-    public static final int MP_LEVEL_ENTITY_INFO_FIELD_NUMBER = 8;
-    private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-     * @return Whether the mpLevelEntityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMpLevelEntityInfo() {
-      return mpLevelEntityInfo_ != null;
-    }
-    /**
-     * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</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 = 8;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
-      return getMpLevelEntityInfo();
-    }
-
-    public static final int AVATAR_ENTER_INFO_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> avatarEnterInfo_;
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> getAvatarEnterInfoList() {
-      return avatarEnterInfo_;
-    }
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
-        getAvatarEnterInfoOrBuilderList() {
-      return avatarEnterInfo_;
-    }
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
-     */
-    @java.lang.Override
-    public int getAvatarEnterInfoCount() {
-      return avatarEnterInfo_.size();
-    }
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index) {
-      return avatarEnterInfo_.get(index);
-    }
-    /**
-     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
-        int index) {
-      return avatarEnterInfo_.get(index);
-    }
-
-    public static final int TEAM_ENTER_INFO_FIELD_NUMBER = 9;
+    public static final int TEAM_ENTER_INFO_FIELD_NUMBER = 6;
     private emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo teamEnterInfo_;
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
      * @return Whether the teamEnterInfo field is set.
      */
     @java.lang.Override
@@ -315,7 +222,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       return teamEnterInfo_ != null;
     }
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
      * @return The teamEnterInfo.
      */
     @java.lang.Override
@@ -323,13 +230,101 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       return teamEnterInfo_ == null ? emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
     }
     /**
-     * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+     * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder() {
       return getTeamEnterInfo();
     }
 
+    public static final int AVATAR_ENTER_INFO_FIELD_NUMBER = 7;
+    private java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> avatarEnterInfo_;
+    /**
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> getAvatarEnterInfoList() {
+      return avatarEnterInfo_;
+    }
+    /**
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
+        getAvatarEnterInfoOrBuilderList() {
+      return avatarEnterInfo_;
+    }
+    /**
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
+     */
+    @java.lang.Override
+    public int getAvatarEnterInfoCount() {
+      return avatarEnterInfo_.size();
+    }
+    /**
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index) {
+      return avatarEnterInfo_.get(index);
+    }
+    /**
+     * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
+        int index) {
+      return avatarEnterInfo_.get(index);
+    }
+
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 11;
+    private int enterSceneToken_;
+    /**
+     * <code>uint32 enter_scene_token = 11;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
+    public static final int MP_LEVEL_ENTITY_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
+    /**
+     * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
+     * @return Whether the mpLevelEntityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasMpLevelEntityInfo() {
+      return mpLevelEntityInfo_ != null;
+    }
+    /**
+     * <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_;
+    }
+    /**
+     * <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 CUR_AVATAR_ENTITY_ID_FIELD_NUMBER = 15;
+    private int curAvatarEntityId_;
+    /**
+     * <code>uint32 cur_avatar_entity_id = 15;</code>
+     * @return The curAvatarEntityId.
+     */
+    @java.lang.Override
+    public int getCurAvatarEntityId() {
+      return curAvatarEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -344,20 +339,20 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (enterSceneToken_ != 0) {
-        output.writeUInt32(6, enterSceneToken_);
-      }
-      if (mpLevelEntityInfo_ != null) {
-        output.writeMessage(8, getMpLevelEntityInfo());
-      }
       if (teamEnterInfo_ != null) {
-        output.writeMessage(9, getTeamEnterInfo());
+        output.writeMessage(6, getTeamEnterInfo());
       }
       for (int i = 0; i < avatarEnterInfo_.size(); i++) {
-        output.writeMessage(10, avatarEnterInfo_.get(i));
+        output.writeMessage(7, avatarEnterInfo_.get(i));
+      }
+      if (enterSceneToken_ != 0) {
+        output.writeUInt32(11, enterSceneToken_);
+      }
+      if (mpLevelEntityInfo_ != null) {
+        output.writeMessage(12, getMpLevelEntityInfo());
       }
       if (curAvatarEntityId_ != 0) {
-        output.writeUInt32(14, curAvatarEntityId_);
+        output.writeUInt32(15, curAvatarEntityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -368,25 +363,25 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (enterSceneToken_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, enterSceneToken_);
-      }
-      if (mpLevelEntityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getMpLevelEntityInfo());
-      }
       if (teamEnterInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getTeamEnterInfo());
+          .computeMessageSize(6, getTeamEnterInfo());
       }
       for (int i = 0; i < avatarEnterInfo_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, avatarEnterInfo_.get(i));
+          .computeMessageSize(7, avatarEnterInfo_.get(i));
+      }
+      if (enterSceneToken_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, enterSceneToken_);
+      }
+      if (mpLevelEntityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, getMpLevelEntityInfo());
       }
       if (curAvatarEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, curAvatarEntityId_);
+          .computeUInt32Size(15, curAvatarEntityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -403,8 +398,13 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify other = (emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify) obj;
 
-      if (getCurAvatarEntityId()
-          != other.getCurAvatarEntityId()) return false;
+      if (hasTeamEnterInfo() != other.hasTeamEnterInfo()) return false;
+      if (hasTeamEnterInfo()) {
+        if (!getTeamEnterInfo()
+            .equals(other.getTeamEnterInfo())) return false;
+      }
+      if (!getAvatarEnterInfoList()
+          .equals(other.getAvatarEnterInfoList())) return false;
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
       if (hasMpLevelEntityInfo() != other.hasMpLevelEntityInfo()) return false;
@@ -412,13 +412,8 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         if (!getMpLevelEntityInfo()
             .equals(other.getMpLevelEntityInfo())) return false;
       }
-      if (!getAvatarEnterInfoList()
-          .equals(other.getAvatarEnterInfoList())) return false;
-      if (hasTeamEnterInfo() != other.hasTeamEnterInfo()) return false;
-      if (hasTeamEnterInfo()) {
-        if (!getTeamEnterInfo()
-            .equals(other.getTeamEnterInfo())) return false;
-      }
+      if (getCurAvatarEntityId()
+          != other.getCurAvatarEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -430,22 +425,22 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_AVATAR_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCurAvatarEntityId();
+      if (hasTeamEnterInfo()) {
+        hash = (37 * hash) + TEAM_ENTER_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getTeamEnterInfo().hashCode();
+      }
+      if (getAvatarEnterInfoCount() > 0) {
+        hash = (37 * hash) + AVATAR_ENTER_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarEnterInfoList().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();
       }
-      if (getAvatarEnterInfoCount() > 0) {
-        hash = (37 * hash) + AVATAR_ENTER_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarEnterInfoList().hashCode();
-      }
-      if (hasTeamEnterInfo()) {
-        hash = (37 * hash) + TEAM_ENTER_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getTeamEnterInfo().hashCode();
-      }
+      hash = (37 * hash) + CUR_AVATAR_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCurAvatarEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -542,11 +537,6 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27063
-     * Obf: BMMOCCOFGEL
-     * </pre>
-     *
      * Protobuf type {@code PlayerEnterSceneInfoNotify}
      */
     public static final class Builder extends
@@ -585,8 +575,18 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curAvatarEntityId_ = 0;
-
+        if (teamEnterInfoBuilder_ == null) {
+          teamEnterInfo_ = null;
+        } else {
+          teamEnterInfo_ = null;
+          teamEnterInfoBuilder_ = null;
+        }
+        if (avatarEnterInfoBuilder_ == null) {
+          avatarEnterInfo_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          avatarEnterInfoBuilder_.clear();
+        }
         enterSceneToken_ = 0;
 
         if (mpLevelEntityInfoBuilder_ == null) {
@@ -595,18 +595,8 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
           mpLevelEntityInfo_ = null;
           mpLevelEntityInfoBuilder_ = null;
         }
-        if (avatarEnterInfoBuilder_ == null) {
-          avatarEnterInfo_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          avatarEnterInfoBuilder_.clear();
-        }
-        if (teamEnterInfoBuilder_ == null) {
-          teamEnterInfo_ = null;
-        } else {
-          teamEnterInfo_ = null;
-          teamEnterInfoBuilder_ = null;
-        }
+        curAvatarEntityId_ = 0;
+
         return this;
       }
 
@@ -634,12 +624,10 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       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_;
-        result.curAvatarEntityId_ = curAvatarEntityId_;
-        result.enterSceneToken_ = enterSceneToken_;
-        if (mpLevelEntityInfoBuilder_ == null) {
-          result.mpLevelEntityInfo_ = mpLevelEntityInfo_;
+        if (teamEnterInfoBuilder_ == null) {
+          result.teamEnterInfo_ = teamEnterInfo_;
         } else {
-          result.mpLevelEntityInfo_ = mpLevelEntityInfoBuilder_.build();
+          result.teamEnterInfo_ = teamEnterInfoBuilder_.build();
         }
         if (avatarEnterInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -650,11 +638,13 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         } else {
           result.avatarEnterInfo_ = avatarEnterInfoBuilder_.build();
         }
-        if (teamEnterInfoBuilder_ == null) {
-          result.teamEnterInfo_ = teamEnterInfo_;
+        result.enterSceneToken_ = enterSceneToken_;
+        if (mpLevelEntityInfoBuilder_ == null) {
+          result.mpLevelEntityInfo_ = mpLevelEntityInfo_;
         } else {
-          result.teamEnterInfo_ = teamEnterInfoBuilder_.build();
+          result.mpLevelEntityInfo_ = mpLevelEntityInfoBuilder_.build();
         }
+        result.curAvatarEntityId_ = curAvatarEntityId_;
         onBuilt();
         return result;
       }
@@ -703,14 +693,8 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerEnterSceneInfoNotifyOuterClass.PlayerEnterSceneInfoNotify.getDefaultInstance()) return this;
-        if (other.getCurAvatarEntityId() != 0) {
-          setCurAvatarEntityId(other.getCurAvatarEntityId());
-        }
-        if (other.getEnterSceneToken() != 0) {
-          setEnterSceneToken(other.getEnterSceneToken());
-        }
-        if (other.hasMpLevelEntityInfo()) {
-          mergeMpLevelEntityInfo(other.getMpLevelEntityInfo());
+        if (other.hasTeamEnterInfo()) {
+          mergeTeamEnterInfo(other.getTeamEnterInfo());
         }
         if (avatarEnterInfoBuilder_ == null) {
           if (!other.avatarEnterInfo_.isEmpty()) {
@@ -738,8 +722,14 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
             }
           }
         }
-        if (other.hasTeamEnterInfo()) {
-          mergeTeamEnterInfo(other.getTeamEnterInfo());
+        if (other.getEnterSceneToken() != 0) {
+          setEnterSceneToken(other.getEnterSceneToken());
+        }
+        if (other.hasMpLevelEntityInfo()) {
+          mergeMpLevelEntityInfo(other.getMpLevelEntityInfo());
+        }
+        if (other.getCurAvatarEntityId() != 0) {
+          setCurAvatarEntityId(other.getCurAvatarEntityId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -771,185 +761,123 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int curAvatarEntityId_ ;
-      /**
-       * <code>uint32 cur_avatar_entity_id = 14;</code>
-       * @return The curAvatarEntityId.
-       */
-      @java.lang.Override
-      public int getCurAvatarEntityId() {
-        return curAvatarEntityId_;
-      }
-      /**
-       * <code>uint32 cur_avatar_entity_id = 14;</code>
-       * @param value The curAvatarEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurAvatarEntityId(int value) {
-        
-        curAvatarEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_avatar_entity_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurAvatarEntityId() {
-        
-        curAvatarEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int enterSceneToken_ ;
-      /**
-       * <code>uint32 enter_scene_token = 6;</code>
-       * @return The enterSceneToken.
-       */
-      @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 6;</code>
-       * @param value The enterSceneToken to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnterSceneToken(int value) {
-        
-        enterSceneToken_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnterSceneToken() {
-        
-        enterSceneToken_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo mpLevelEntityInfo_;
+      private emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo teamEnterInfo_;
       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_;
+          emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder> teamEnterInfoBuilder_;
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-       * @return Whether the mpLevelEntityInfo field is set.
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
+       * @return Whether the teamEnterInfo field is set.
        */
-      public boolean hasMpLevelEntityInfo() {
-        return mpLevelEntityInfoBuilder_ != null || mpLevelEntityInfo_ != null;
+      public boolean hasTeamEnterInfo() {
+        return teamEnterInfoBuilder_ != null || teamEnterInfo_ != null;
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
-       * @return The mpLevelEntityInfo.
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
+       * @return The teamEnterInfo.
        */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo getMpLevelEntityInfo() {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          return mpLevelEntityInfo_ == null ? emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
+      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo() {
+        if (teamEnterInfoBuilder_ == null) {
+          return teamEnterInfo_ == null ? emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
         } else {
-          return mpLevelEntityInfoBuilder_.getMessage();
+          return teamEnterInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
        */
-      public Builder setMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
-        if (mpLevelEntityInfoBuilder_ == null) {
+      public Builder setTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
+        if (teamEnterInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          mpLevelEntityInfo_ = value;
+          teamEnterInfo_ = value;
           onChanged();
         } else {
-          mpLevelEntityInfoBuilder_.setMessage(value);
+          teamEnterInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
        */
-      public Builder setMpLevelEntityInfo(
-          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder builderForValue) {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfo_ = builderForValue.build();
+      public Builder setTeamEnterInfo(
+          emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder builderForValue) {
+        if (teamEnterInfoBuilder_ == null) {
+          teamEnterInfo_ = builderForValue.build();
           onChanged();
         } else {
-          mpLevelEntityInfoBuilder_.setMessage(builderForValue.build());
+          teamEnterInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</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();
+      public Builder mergeTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
+        if (teamEnterInfoBuilder_ == null) {
+          if (teamEnterInfo_ != null) {
+            teamEnterInfo_ =
+              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.newBuilder(teamEnterInfo_).mergeFrom(value).buildPartial();
           } else {
-            mpLevelEntityInfo_ = value;
+            teamEnterInfo_ = value;
           }
           onChanged();
         } else {
-          mpLevelEntityInfoBuilder_.mergeFrom(value);
+          teamEnterInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
        */
-      public Builder clearMpLevelEntityInfo() {
-        if (mpLevelEntityInfoBuilder_ == null) {
-          mpLevelEntityInfo_ = null;
+      public Builder clearTeamEnterInfo() {
+        if (teamEnterInfoBuilder_ == null) {
+          teamEnterInfo_ = null;
           onChanged();
         } else {
-          mpLevelEntityInfo_ = null;
-          mpLevelEntityInfoBuilder_ = null;
+          teamEnterInfo_ = null;
+          teamEnterInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
        */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder getMpLevelEntityInfoBuilder() {
+      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder getTeamEnterInfoBuilder() {
         
         onChanged();
-        return getMpLevelEntityInfoFieldBuilder().getBuilder();
+        return getTeamEnterInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</code>
        */
-      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
-        if (mpLevelEntityInfoBuilder_ != null) {
-          return mpLevelEntityInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder() {
+        if (teamEnterInfoBuilder_ != null) {
+          return teamEnterInfoBuilder_.getMessageOrBuilder();
         } else {
-          return mpLevelEntityInfo_ == null ?
-              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
+          return teamEnterInfo_ == null ?
+              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
         }
       }
       /**
-       * <code>.MPLevelEntityInfo mp_level_entity_info = 8;</code>
+       * <code>.TeamEnterSceneInfo team_enter_info = 6;</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(),
+          emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder> 
+          getTeamEnterInfoFieldBuilder() {
+        if (teamEnterInfoBuilder_ == null) {
+          teamEnterInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder>(
+                  getTeamEnterInfo(),
                   getParentForChildren(),
                   isClean());
-          mpLevelEntityInfo_ = null;
+          teamEnterInfo_ = null;
         }
-        return mpLevelEntityInfoBuilder_;
+        return teamEnterInfoBuilder_;
       }
 
       private java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> avatarEnterInfo_ =
@@ -965,7 +893,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
           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 = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> getAvatarEnterInfoList() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -975,7 +903,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public int getAvatarEnterInfoCount() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -985,7 +913,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo getAvatarEnterInfo(int index) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -995,7 +923,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder setAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
@@ -1012,7 +940,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder setAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -1026,7 +954,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder addAvatarEnterInfo(emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -1042,7 +970,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder addAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo value) {
@@ -1059,7 +987,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder addAvatarEnterInfo(
           emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -1073,7 +1001,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder addAvatarEnterInfo(
           int index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder builderForValue) {
@@ -1087,7 +1015,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder addAllAvatarEnterInfo(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo> values) {
@@ -1102,7 +1030,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder clearAvatarEnterInfo() {
         if (avatarEnterInfoBuilder_ == null) {
@@ -1115,7 +1043,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public Builder removeAvatarEnterInfo(int index) {
         if (avatarEnterInfoBuilder_ == null) {
@@ -1128,14 +1056,14 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder getAvatarEnterInfoBuilder(
           int index) {
         return getAvatarEnterInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder getAvatarEnterInfoOrBuilder(
           int index) {
@@ -1145,7 +1073,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfoOrBuilder> 
            getAvatarEnterInfoOrBuilderList() {
@@ -1156,14 +1084,14 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</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 = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder addAvatarEnterInfoBuilder(
           int index) {
@@ -1171,7 +1099,7 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 10;</code>
+       * <code>repeated .AvatarEnterSceneInfo avatar_enter_info = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.AvatarEnterSceneInfo.Builder> 
            getAvatarEnterInfoBuilderList() {
@@ -1192,123 +1120,185 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
         return avatarEnterInfoBuilder_;
       }
 
-      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_;
+      private int enterSceneToken_ ;
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
-       * @return Whether the teamEnterInfo field is set.
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return The enterSceneToken.
        */
-      public boolean hasTeamEnterInfo() {
-        return teamEnterInfoBuilder_ != null || teamEnterInfo_ != null;
+      @java.lang.Override
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
-       * @return The teamEnterInfo.
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @param value The enterSceneToken to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo getTeamEnterInfo() {
-        if (teamEnterInfoBuilder_ == null) {
-          return teamEnterInfo_ == null ? emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
+      public Builder setEnterSceneToken(int value) {
+        
+        enterSceneToken_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 enter_scene_token = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEnterSceneToken() {
+        
+        enterSceneToken_ = 0;
+        onChanged();
+        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 = 12;</code>
+       * @return Whether the mpLevelEntityInfo field is set.
+       */
+      public boolean hasMpLevelEntityInfo() {
+        return mpLevelEntityInfoBuilder_ != null || mpLevelEntityInfo_ != null;
+      }
+      /**
+       * <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 teamEnterInfoBuilder_.getMessage();
+          return mpLevelEntityInfoBuilder_.getMessage();
         }
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public Builder setTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
-        if (teamEnterInfoBuilder_ == null) {
+      public Builder setMpLevelEntityInfo(emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo value) {
+        if (mpLevelEntityInfoBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          teamEnterInfo_ = value;
+          mpLevelEntityInfo_ = value;
           onChanged();
         } else {
-          teamEnterInfoBuilder_.setMessage(value);
+          mpLevelEntityInfoBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public Builder setTeamEnterInfo(
-          emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder builderForValue) {
-        if (teamEnterInfoBuilder_ == null) {
-          teamEnterInfo_ = builderForValue.build();
+      public Builder setMpLevelEntityInfo(
+          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder builderForValue) {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfo_ = builderForValue.build();
           onChanged();
         } else {
-          teamEnterInfoBuilder_.setMessage(builderForValue.build());
+          mpLevelEntityInfoBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public Builder mergeTeamEnterInfo(emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo value) {
-        if (teamEnterInfoBuilder_ == null) {
-          if (teamEnterInfo_ != null) {
-            teamEnterInfo_ =
-              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.newBuilder(teamEnterInfo_).mergeFrom(value).buildPartial();
+      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 {
-            teamEnterInfo_ = value;
+            mpLevelEntityInfo_ = value;
           }
           onChanged();
         } else {
-          teamEnterInfoBuilder_.mergeFrom(value);
+          mpLevelEntityInfoBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public Builder clearTeamEnterInfo() {
-        if (teamEnterInfoBuilder_ == null) {
-          teamEnterInfo_ = null;
+      public Builder clearMpLevelEntityInfo() {
+        if (mpLevelEntityInfoBuilder_ == null) {
+          mpLevelEntityInfo_ = null;
           onChanged();
         } else {
-          teamEnterInfo_ = null;
-          teamEnterInfoBuilder_ = null;
+          mpLevelEntityInfo_ = null;
+          mpLevelEntityInfoBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder getTeamEnterInfoBuilder() {
+      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.Builder getMpLevelEntityInfoBuilder() {
         
         onChanged();
-        return getTeamEnterInfoFieldBuilder().getBuilder();
+        return getMpLevelEntityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</code>
        */
-      public emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder getTeamEnterInfoOrBuilder() {
-        if (teamEnterInfoBuilder_ != null) {
-          return teamEnterInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfoOrBuilder getMpLevelEntityInfoOrBuilder() {
+        if (mpLevelEntityInfoBuilder_ != null) {
+          return mpLevelEntityInfoBuilder_.getMessageOrBuilder();
         } else {
-          return teamEnterInfo_ == null ?
-              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.getDefaultInstance() : teamEnterInfo_;
+          return mpLevelEntityInfo_ == null ?
+              emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.MPLevelEntityInfo.getDefaultInstance() : mpLevelEntityInfo_;
         }
       }
       /**
-       * <code>.TeamEnterSceneInfo team_enter_info = 9;</code>
+       * <code>.MPLevelEntityInfo mp_level_entity_info = 12;</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> 
-          getTeamEnterInfoFieldBuilder() {
-        if (teamEnterInfoBuilder_ == null) {
-          teamEnterInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfoOrBuilder>(
-                  getTeamEnterInfo(),
+          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());
-          teamEnterInfo_ = null;
+          mpLevelEntityInfo_ = null;
         }
-        return teamEnterInfoBuilder_;
+        return mpLevelEntityInfoBuilder_;
+      }
+
+      private int curAvatarEntityId_ ;
+      /**
+       * <code>uint32 cur_avatar_entity_id = 15;</code>
+       * @return The curAvatarEntityId.
+       */
+      @java.lang.Override
+      public int getCurAvatarEntityId() {
+        return curAvatarEntityId_;
+      }
+      /**
+       * <code>uint32 cur_avatar_entity_id = 15;</code>
+       * @param value The curAvatarEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurAvatarEntityId(int value) {
+        
+        curAvatarEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_avatar_entity_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurAvatarEntityId() {
+        
+        curAvatarEntityId_ = 0;
+        onChanged();
+        return this;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1377,33 +1367,33 @@ public final class PlayerEnterSceneInfoNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n PlayerEnterSceneInfoNotify.proto\032\027MPLe" +
-      "velEntityInfo.proto\032\032AvatarEnterSceneInf" +
-      "o.proto\032\030TeamEnterSceneInfo.proto\"\347\001\n\032Pl" +
-      "ayerEnterSceneInfoNotify\022\034\n\024cur_avatar_e" +
-      "ntity_id\030\016 \001(\r\022\031\n\021enter_scene_token\030\006 \001(" +
-      "\r\0220\n\024mp_level_entity_info\030\010 \001(\0132\022.MPLeve" +
-      "lEntityInfo\0220\n\021avatar_enter_info\030\n \003(\0132\025" +
-      ".AvatarEnterSceneInfo\022,\n\017team_enter_info" +
-      "\030\t \001(\0132\023.TeamEnterSceneInfoB\033\n\031emu.grass" +
+      "\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\006 \001(\0132\023.TeamEnterSceneInfo\0220\n\021avatar" +
+      "_enter_info\030\007 \003(\0132\025.AvatarEnterSceneInfo" +
+      "\022\031\n\021enter_scene_token\030\013 \001(\r\0220\n\024mp_level_" +
+      "entity_info\030\014 \001(\0132\022.MPLevelEntityInfo\022\034\n" +
+      "\024cur_avatar_entity_id\030\017 \001(\rB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.getDescriptor(),
         });
     internal_static_PlayerEnterSceneInfoNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerEnterSceneInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterSceneInfoNotify_descriptor,
-        new java.lang.String[] { "CurAvatarEntityId", "EnterSceneToken", "MpLevelEntityInfo", "AvatarEnterInfo", "TeamEnterInfo", });
-    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "TeamEnterInfo", "AvatarEnterInfo", "EnterSceneToken", "MpLevelEntityInfo", "CurAvatarEntityId", });
     emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AvatarEnterSceneInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.MPLevelEntityInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 6f2b06d45..b6bb1c282 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerEnterSceneNotifyOuterClass.java
@@ -19,132 +19,38 @@ public final class PlayerEnterSceneNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string scene_transaction = 1319;</code>
-     * @return The sceneTransaction.
+     * <code>bool JDNGEPMPFOH = 1;</code>
+     * @return The jDNGEPMPFOH.
      */
-    java.lang.String getSceneTransaction();
-    /**
-     * <code>string scene_transaction = 1319;</code>
-     * @return The bytes for sceneTransaction.
-     */
-    com.google.protobuf.ByteString
-        getSceneTransactionBytes();
+    boolean getJDNGEPMPFOH();
 
     /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return Whether the mapLayerInfo field is set.
+     * <code>.Vector MBFONBLMNBL = 2;</code>
+     * @return Whether the mBFONBLMNBL field is set.
      */
-    boolean hasMapLayerInfo();
+    boolean hasMBFONBLMNBL();
     /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return The mapLayerInfo.
+     * <code>.Vector MBFONBLMNBL = 2;</code>
+     * @return The mBFONBLMNBL.
      */
-    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getMBFONBLMNBL();
     /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
+     * <code>.Vector MBFONBLMNBL = 2;</code>
      */
-    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMBFONBLMNBLOrBuilder();
 
     /**
-     * <code>bool is_skip_ui = 3;</code>
-     * @return The isSkipUi.
+     * <code>uint32 world_level = 3;</code>
+     * @return The worldLevel.
      */
-    boolean getIsSkipUi();
+    int getWorldLevel();
 
     /**
-     * <code>uint32 prev_scene_id = 9;</code>
-     * @return The prevSceneId.
-     */
-    int getPrevSceneId();
-
-    /**
-     * <code>bool is_first_login_enter_scene = 164;</code>
-     * @return The isFirstLoginEnterScene.
-     */
-    boolean getIsFirstLoginEnterScene();
-
-    /**
-     * <code>uint32 target_uid = 1;</code>
+     * <code>uint32 target_uid = 4;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 13;</code>
-     * @return A list containing the sceneTagIdList.
-     */
-    java.util.List<java.lang.Integer> getSceneTagIdListList();
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 13;</code>
-     * @return The count of sceneTagIdList.
-     */
-    int getSceneTagIdListCount();
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 13;</code>
-     * @param index The index of the element to return.
-     * @return The sceneTagIdList at the given index.
-     */
-    int getSceneTagIdList(int index);
-
-    /**
-     * <code>.Vector prev_pos = 12;</code>
-     * @return Whether the prevPos field is set.
-     */
-    boolean hasPrevPos();
-    /**
-     * <code>.Vector prev_pos = 12;</code>
-     * @return The prevPos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos();
-    /**
-     * <code>.Vector prev_pos = 12;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder();
-
-    /**
-     * <code>uint32 enter_scene_token = 7;</code>
-     * @return The enterSceneToken.
-     */
-    int getEnterSceneToken();
-
-    /**
-     * <code>uint32 world_type = 1327;</code>
-     * @return The worldType.
-     */
-    int getWorldType();
-
-    /**
-     * <code>.EnterType type = 6;</code>
-     * @return The enum numeric value on the wire for type.
-     */
-    int getTypeValue();
-    /**
-     * <code>.EnterType type = 6;</code>
-     * @return The type.
-     */
-    emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType();
-
-    /**
-     * <code>uint32 enter_reason = 670;</code>
-     * @return The enterReason.
-     */
-    int getEnterReason();
-
-    /**
-     * <code>.Vector pos = 14;</code>
-     * @return Whether the pos field is set.
-     */
-    boolean hasPos();
-    /**
-     * <code>.Vector pos = 14;</code>
-     * @return The pos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
-    /**
-     * <code>.Vector pos = 14;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
-
     /**
      * <code>uint64 scene_begin_time = 5;</code>
      * @return The sceneBeginTime.
@@ -152,16 +58,27 @@ public final class PlayerEnterSceneNotifyOuterClass {
     long getSceneBeginTime();
 
     /**
-     * <code>uint32 LAJGLCIFKCP = 1820;</code>
-     * @return The lAJGLCIFKCP.
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
+     * @return A list containing the sceneTagIdList.
      */
-    int getLAJGLCIFKCP();
+    java.util.List<java.lang.Integer> getSceneTagIdListList();
+    /**
+     * <code>repeated uint32 scene_tag_id_list = 6;</code>
+     * @return The count of sceneTagIdList.
+     */
+    int getSceneTagIdListCount();
+    /**
+     * <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>uint32 world_level = 4;</code>
-     * @return The worldLevel.
+     * <code>uint32 enter_scene_token = 7;</code>
+     * @return The enterSceneToken.
      */
-    int getWorldLevel();
+    int getEnterSceneToken();
 
     /**
      * <code>uint32 dungeon_id = 11;</code>
@@ -170,23 +87,132 @@ public final class PlayerEnterSceneNotifyOuterClass {
     int getDungeonId();
 
     /**
-     * <code>uint32 scene_id = 10;</code>
+     * <code>uint32 GPJHAEEMCBK = 12;</code>
+     * @return The gPJHAEEMCBK.
+     */
+    int getGPJHAEEMCBK();
+
+    /**
+     * <code>.Vector pos = 13;</code>
+     * @return Whether the pos field is set.
+     */
+    boolean hasPos();
+    /**
+     * <code>.Vector pos = 13;</code>
+     * @return The pos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
+    /**
+     * <code>.Vector pos = 13;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+
+    /**
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>uint32 create_player_uid = 1748;</code>
-     * @return The createPlayerUid.
+     * <code>.EnterType type = 15;</code>
+     * @return The enum numeric value on the wire for type.
      */
-    int getCreatePlayerUid();
+    int getTypeValue();
+    /**
+     * <code>.EnterType type = 15;</code>
+     * @return The type.
+     */
+    emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType();
+
+    /**
+     * <pre>
+     *CGMAOKBGOHO DFNDKDAFEJO = 96;
+     * </pre>
+     *
+     * <code>uint32 ALJNJKPMOPB = 338;</code>
+     * @return The aLJNJKPMOPB.
+     */
+    int getALJNJKPMOPB();
+
+    /**
+     * <code>uint32 EKIBACGBHCJ = 358;</code>
+     * @return The eKIBACGBHCJ.
+     */
+    int getEKIBACGBHCJ();
+
+    /**
+     * <code>uint32 KDHNDLANKNI = 464;</code>
+     * @return The kDHNDLANKNI.
+     */
+    int getKDHNDLANKNI();
+
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     * @return Whether the kMDLMKGJIHH field is set.
+     */
+    boolean hasKMDLMKGJIHH();
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     * @return The kMDLMKGJIHH.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getKMDLMKGJIHH();
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKMDLMKGJIHHOrBuilder();
+
+    /**
+     * <code>bool GBHGABLFDME = 816;</code>
+     * @return The gBHGABLFDME.
+     */
+    boolean getGBHGABLFDME();
+
+    /**
+     * <code>uint32 DDGBKGDECME = 1148;</code>
+     * @return The dDGBKGDECME.
+     */
+    int getDDGBKGDECME();
+
+    /**
+     * <code>string scene_transaction = 1492;</code>
+     * @return The sceneTransaction.
+     */
+    java.lang.String getSceneTransaction();
+    /**
+     * <code>string scene_transaction = 1492;</code>
+     * @return The bytes for sceneTransaction.
+     */
+    com.google.protobuf.ByteString
+        getSceneTransactionBytes();
+
+    /**
+     * <code>uint32 KKLADMFLAOE = 1696;</code>
+     * @return The kKLADMFLAOE.
+     */
+    int getKKLADMFLAOE();
+
+    /**
+     * <code>uint32 OKCAGDNDEJN = 1870;</code>
+     * @return The oKCAGDNDEJN.
+     */
+    int getOKCAGDNDEJN();
   }
   /**
-   * <pre>
-   * CmdId: 2783
-   * Obf: PBJBDNIOMBF
-   * </pre>
-   *
    * Protobuf type {@code PlayerEnterSceneNotify}
    */
   public static final class PlayerEnterSceneNotify extends
@@ -199,9 +225,9 @@ public final class PlayerEnterSceneNotifyOuterClass {
       super(builder);
     }
     private PlayerEnterSceneNotify() {
-      sceneTransaction_ = "";
       sceneTagIdList_ = emptyIntList();
       type_ = 0;
+      sceneTransaction_ = "";
     }
 
     @java.lang.Override
@@ -237,17 +263,30 @@ public final class PlayerEnterSceneNotifyOuterClass {
               break;
             case 8: {
 
-              targetUid_ = input.readUInt32();
+              jDNGEPMPFOH_ = input.readBool();
+              break;
+            }
+            case 18: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (mBFONBLMNBL_ != null) {
+                subBuilder = mBFONBLMNBL_.toBuilder();
+              }
+              mBFONBLMNBL_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(mBFONBLMNBL_);
+                mBFONBLMNBL_ = subBuilder.buildPartial();
+              }
+
               break;
             }
             case 24: {
 
-              isSkipUi_ = input.readBool();
+              worldLevel_ = input.readUInt32();
               break;
             }
             case 32: {
 
-              worldLevel_ = input.readUInt32();
+              targetUid_ = input.readUInt32();
               break;
             }
             case 40: {
@@ -256,45 +295,6 @@ public final class PlayerEnterSceneNotifyOuterClass {
               break;
             }
             case 48: {
-              int rawValue = input.readEnum();
-
-              type_ = rawValue;
-              break;
-            }
-            case 56: {
-
-              enterSceneToken_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              prevSceneId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              dungeonId_ = input.readUInt32();
-              break;
-            }
-            case 98: {
-              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 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTagIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -302,7 +302,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
               sceneTagIdList_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -315,7 +315,22 @@ public final class PlayerEnterSceneNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 114: {
+            case 56: {
+
+              enterSceneToken_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              gPJHAEEMCBK_ = input.readUInt32();
+              break;
+            }
+            case 106: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -328,48 +343,69 @@ public final class PlayerEnterSceneNotifyOuterClass {
 
               break;
             }
-            case 1312: {
+            case 112: {
 
-              isFirstLoginEnterScene_ = input.readBool();
+              sceneId_ = input.readUInt32();
               break;
             }
-            case 5360: {
+            case 120: {
+              int rawValue = input.readEnum();
 
-              enterReason_ = input.readUInt32();
+              type_ = rawValue;
               break;
             }
-            case 7178: {
-              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
-              if (mapLayerInfo_ != null) {
-                subBuilder = mapLayerInfo_.toBuilder();
+            case 2704: {
+
+              aLJNJKPMOPB_ = input.readUInt32();
+              break;
+            }
+            case 2864: {
+
+              eKIBACGBHCJ_ = input.readUInt32();
+              break;
+            }
+            case 3712: {
+
+              kDHNDLANKNI_ = input.readUInt32();
+              break;
+            }
+            case 6210: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (kMDLMKGJIHH_ != null) {
+                subBuilder = kMDLMKGJIHH_.toBuilder();
               }
-              mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry);
+              kMDLMKGJIHH_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(mapLayerInfo_);
-                mapLayerInfo_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(kMDLMKGJIHH_);
+                kMDLMKGJIHH_ = subBuilder.buildPartial();
               }
 
               break;
             }
-            case 10554: {
+            case 6528: {
+
+              gBHGABLFDME_ = input.readBool();
+              break;
+            }
+            case 9184: {
+
+              dDGBKGDECME_ = input.readUInt32();
+              break;
+            }
+            case 11938: {
               java.lang.String s = input.readStringRequireUtf8();
 
               sceneTransaction_ = s;
               break;
             }
-            case 10616: {
+            case 13568: {
 
-              worldType_ = input.readUInt32();
+              kKLADMFLAOE_ = input.readUInt32();
               break;
             }
-            case 13984: {
+            case 14960: {
 
-              createPlayerUid_ = input.readUInt32();
-              break;
-            }
-            case 14560: {
-
-              lAJGLCIFKCP_ = input.readUInt32();
+              oKCAGDNDEJN_ = input.readUInt32();
               break;
             }
             default: {
@@ -407,10 +443,297 @@ public final class PlayerEnterSceneNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify.class, emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify.Builder.class);
     }
 
-    public static final int SCENE_TRANSACTION_FIELD_NUMBER = 1319;
+    public static final int JDNGEPMPFOH_FIELD_NUMBER = 1;
+    private boolean jDNGEPMPFOH_;
+    /**
+     * <code>bool JDNGEPMPFOH = 1;</code>
+     * @return The jDNGEPMPFOH.
+     */
+    @java.lang.Override
+    public boolean getJDNGEPMPFOH() {
+      return jDNGEPMPFOH_;
+    }
+
+    public static final int MBFONBLMNBL_FIELD_NUMBER = 2;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector mBFONBLMNBL_;
+    /**
+     * <code>.Vector MBFONBLMNBL = 2;</code>
+     * @return Whether the mBFONBLMNBL field is set.
+     */
+    @java.lang.Override
+    public boolean hasMBFONBLMNBL() {
+      return mBFONBLMNBL_ != null;
+    }
+    /**
+     * <code>.Vector MBFONBLMNBL = 2;</code>
+     * @return The mBFONBLMNBL.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getMBFONBLMNBL() {
+      return mBFONBLMNBL_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : mBFONBLMNBL_;
+    }
+    /**
+     * <code>.Vector MBFONBLMNBL = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMBFONBLMNBLOrBuilder() {
+      return getMBFONBLMNBL();
+    }
+
+    public static final int WORLD_LEVEL_FIELD_NUMBER = 3;
+    private int worldLevel_;
+    /**
+     * <code>uint32 world_level = 3;</code>
+     * @return The worldLevel.
+     */
+    @java.lang.Override
+    public int getWorldLevel() {
+      return worldLevel_;
+    }
+
+    public static final int TARGET_UID_FIELD_NUMBER = 4;
+    private int targetUid_;
+    /**
+     * <code>uint32 target_uid = 4;</code>
+     * @return The targetUid.
+     */
+    @java.lang.Override
+    public int getTargetUid() {
+      return targetUid_;
+    }
+
+    public static final int SCENE_BEGIN_TIME_FIELD_NUMBER = 5;
+    private long sceneBeginTime_;
+    /**
+     * <code>uint64 scene_begin_time = 5;</code>
+     * @return The sceneBeginTime.
+     */
+    @java.lang.Override
+    public long getSceneBeginTime() {
+      return sceneBeginTime_;
+    }
+
+    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 = 6;</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 = 6;</code>
+     * @return The count of sceneTagIdList.
+     */
+    public int getSceneTagIdListCount() {
+      return sceneTagIdList_.size();
+    }
+    /**
+     * <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.
+     */
+    public int getSceneTagIdList(int index) {
+      return sceneTagIdList_.getInt(index);
+    }
+    private int sceneTagIdListMemoizedSerializedSize = -1;
+
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
+    private int enterSceneToken_;
+    /**
+     * <code>uint32 enter_scene_token = 7;</code>
+     * @return The enterSceneToken.
+     */
+    @java.lang.Override
+    public int getEnterSceneToken() {
+      return enterSceneToken_;
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 11;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 11;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
+    public static final int GPJHAEEMCBK_FIELD_NUMBER = 12;
+    private int gPJHAEEMCBK_;
+    /**
+     * <code>uint32 GPJHAEEMCBK = 12;</code>
+     * @return The gPJHAEEMCBK.
+     */
+    @java.lang.Override
+    public int getGPJHAEEMCBK() {
+      return gPJHAEEMCBK_;
+    }
+
+    public static final int POS_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    /**
+     * <code>.Vector pos = 13;</code>
+     * @return Whether the pos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPos() {
+      return pos_ != null;
+    }
+    /**
+     * <code>.Vector pos = 13;</code>
+     * @return The pos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 14;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 14;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int TYPE_FIELD_NUMBER = 15;
+    private int type_;
+    /**
+     * <code>.EnterType type = 15;</code>
+     * @return The enum numeric value on the wire for type.
+     */
+    @java.lang.Override public int getTypeValue() {
+      return type_;
+    }
+    /**
+     * <code>.EnterType type = 15;</code>
+     * @return The type.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType result = emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.valueOf(type_);
+      return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
+    }
+
+    public static final int ALJNJKPMOPB_FIELD_NUMBER = 338;
+    private int aLJNJKPMOPB_;
+    /**
+     * <pre>
+     *CGMAOKBGOHO DFNDKDAFEJO = 96;
+     * </pre>
+     *
+     * <code>uint32 ALJNJKPMOPB = 338;</code>
+     * @return The aLJNJKPMOPB.
+     */
+    @java.lang.Override
+    public int getALJNJKPMOPB() {
+      return aLJNJKPMOPB_;
+    }
+
+    public static final int EKIBACGBHCJ_FIELD_NUMBER = 358;
+    private int eKIBACGBHCJ_;
+    /**
+     * <code>uint32 EKIBACGBHCJ = 358;</code>
+     * @return The eKIBACGBHCJ.
+     */
+    @java.lang.Override
+    public int getEKIBACGBHCJ() {
+      return eKIBACGBHCJ_;
+    }
+
+    public static final int KDHNDLANKNI_FIELD_NUMBER = 464;
+    private int kDHNDLANKNI_;
+    /**
+     * <code>uint32 KDHNDLANKNI = 464;</code>
+     * @return The kDHNDLANKNI.
+     */
+    @java.lang.Override
+    public int getKDHNDLANKNI() {
+      return kDHNDLANKNI_;
+    }
+
+    public static final int KMDLMKGJIHH_FIELD_NUMBER = 776;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector kMDLMKGJIHH_;
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     * @return Whether the kMDLMKGJIHH field is set.
+     */
+    @java.lang.Override
+    public boolean hasKMDLMKGJIHH() {
+      return kMDLMKGJIHH_ != null;
+    }
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     * @return The kMDLMKGJIHH.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getKMDLMKGJIHH() {
+      return kMDLMKGJIHH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kMDLMKGJIHH_;
+    }
+    /**
+     * <pre>
+     *GJNOBDELMLF BFPGBNDFGBO = 681;
+     *PHJGPIPOKAA GALJCIMKFCH = 740;
+     * </pre>
+     *
+     * <code>.Vector KMDLMKGJIHH = 776;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKMDLMKGJIHHOrBuilder() {
+      return getKMDLMKGJIHH();
+    }
+
+    public static final int GBHGABLFDME_FIELD_NUMBER = 816;
+    private boolean gBHGABLFDME_;
+    /**
+     * <code>bool GBHGABLFDME = 816;</code>
+     * @return The gBHGABLFDME.
+     */
+    @java.lang.Override
+    public boolean getGBHGABLFDME() {
+      return gBHGABLFDME_;
+    }
+
+    public static final int DDGBKGDECME_FIELD_NUMBER = 1148;
+    private int dDGBKGDECME_;
+    /**
+     * <code>uint32 DDGBKGDECME = 1148;</code>
+     * @return The dDGBKGDECME.
+     */
+    @java.lang.Override
+    public int getDDGBKGDECME() {
+      return dDGBKGDECME_;
+    }
+
+    public static final int SCENE_TRANSACTION_FIELD_NUMBER = 1492;
     private volatile java.lang.Object sceneTransaction_;
     /**
-     * <code>string scene_transaction = 1319;</code>
+     * <code>string scene_transaction = 1492;</code>
      * @return The sceneTransaction.
      */
     @java.lang.Override
@@ -427,7 +750,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
     }
     /**
-     * <code>string scene_transaction = 1319;</code>
+     * <code>string scene_transaction = 1492;</code>
      * @return The bytes for sceneTransaction.
      */
     @java.lang.Override
@@ -445,272 +768,26 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
     }
 
-    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 897;
-    private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
+    public static final int KKLADMFLAOE_FIELD_NUMBER = 1696;
+    private int kKLADMFLAOE_;
     /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return Whether the mapLayerInfo field is set.
+     * <code>uint32 KKLADMFLAOE = 1696;</code>
+     * @return The kKLADMFLAOE.
      */
     @java.lang.Override
-    public boolean hasMapLayerInfo() {
-      return mapLayerInfo_ != null;
-    }
-    /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     * @return The mapLayerInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-      return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
-    }
-    /**
-     * <code>.MapLayerInfo map_layer_info = 897;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-      return getMapLayerInfo();
+    public int getKKLADMFLAOE() {
+      return kKLADMFLAOE_;
     }
 
-    public static final int IS_SKIP_UI_FIELD_NUMBER = 3;
-    private boolean isSkipUi_;
+    public static final int OKCAGDNDEJN_FIELD_NUMBER = 1870;
+    private int oKCAGDNDEJN_;
     /**
-     * <code>bool is_skip_ui = 3;</code>
-     * @return The isSkipUi.
+     * <code>uint32 OKCAGDNDEJN = 1870;</code>
+     * @return The oKCAGDNDEJN.
      */
     @java.lang.Override
-    public boolean getIsSkipUi() {
-      return isSkipUi_;
-    }
-
-    public static final int PREV_SCENE_ID_FIELD_NUMBER = 9;
-    private int prevSceneId_;
-    /**
-     * <code>uint32 prev_scene_id = 9;</code>
-     * @return The prevSceneId.
-     */
-    @java.lang.Override
-    public int getPrevSceneId() {
-      return prevSceneId_;
-    }
-
-    public static final int IS_FIRST_LOGIN_ENTER_SCENE_FIELD_NUMBER = 164;
-    private boolean isFirstLoginEnterScene_;
-    /**
-     * <code>bool is_first_login_enter_scene = 164;</code>
-     * @return The isFirstLoginEnterScene.
-     */
-    @java.lang.Override
-    public boolean getIsFirstLoginEnterScene() {
-      return isFirstLoginEnterScene_;
-    }
-
-    public static final int TARGET_UID_FIELD_NUMBER = 1;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 1;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
-    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 13;
-    private com.google.protobuf.Internal.IntList sceneTagIdList_;
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 13;</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 = 13;</code>
-     * @return The count of sceneTagIdList.
-     */
-    public int getSceneTagIdListCount() {
-      return sceneTagIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 13;</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 PREV_POS_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector prevPos_;
-    /**
-     * <code>.Vector prev_pos = 12;</code>
-     * @return Whether the prevPos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPrevPos() {
-      return prevPos_ != null;
-    }
-    /**
-     * <code>.Vector prev_pos = 12;</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 = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder() {
-      return getPrevPos();
-    }
-
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 7;
-    private int enterSceneToken_;
-    /**
-     * <code>uint32 enter_scene_token = 7;</code>
-     * @return The enterSceneToken.
-     */
-    @java.lang.Override
-    public int getEnterSceneToken() {
-      return enterSceneToken_;
-    }
-
-    public static final int WORLD_TYPE_FIELD_NUMBER = 1327;
-    private int worldType_;
-    /**
-     * <code>uint32 world_type = 1327;</code>
-     * @return The worldType.
-     */
-    @java.lang.Override
-    public int getWorldType() {
-      return worldType_;
-    }
-
-    public static final int TYPE_FIELD_NUMBER = 6;
-    private int type_;
-    /**
-     * <code>.EnterType type = 6;</code>
-     * @return The enum numeric value on the wire for type.
-     */
-    @java.lang.Override public int getTypeValue() {
-      return type_;
-    }
-    /**
-     * <code>.EnterType type = 6;</code>
-     * @return The type.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType result = emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.valueOf(type_);
-      return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
-    }
-
-    public static final int ENTER_REASON_FIELD_NUMBER = 670;
-    private int enterReason_;
-    /**
-     * <code>uint32 enter_reason = 670;</code>
-     * @return The enterReason.
-     */
-    @java.lang.Override
-    public int getEnterReason() {
-      return enterReason_;
-    }
-
-    public static final int POS_FIELD_NUMBER = 14;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-    /**
-     * <code>.Vector pos = 14;</code>
-     * @return Whether the pos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPos() {
-      return pos_ != null;
-    }
-    /**
-     * <code>.Vector pos = 14;</code>
-     * @return The pos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
-    }
-
-    public static final int SCENE_BEGIN_TIME_FIELD_NUMBER = 5;
-    private long sceneBeginTime_;
-    /**
-     * <code>uint64 scene_begin_time = 5;</code>
-     * @return The sceneBeginTime.
-     */
-    @java.lang.Override
-    public long getSceneBeginTime() {
-      return sceneBeginTime_;
-    }
-
-    public static final int LAJGLCIFKCP_FIELD_NUMBER = 1820;
-    private int lAJGLCIFKCP_;
-    /**
-     * <code>uint32 LAJGLCIFKCP = 1820;</code>
-     * @return The lAJGLCIFKCP.
-     */
-    @java.lang.Override
-    public int getLAJGLCIFKCP() {
-      return lAJGLCIFKCP_;
-    }
-
-    public static final int WORLD_LEVEL_FIELD_NUMBER = 4;
-    private int worldLevel_;
-    /**
-     * <code>uint32 world_level = 4;</code>
-     * @return The worldLevel.
-     */
-    @java.lang.Override
-    public int getWorldLevel() {
-      return worldLevel_;
-    }
-
-    public static final int DUNGEON_ID_FIELD_NUMBER = 11;
-    private int dungeonId_;
-    /**
-     * <code>uint32 dungeon_id = 11;</code>
-     * @return The dungeonId.
-     */
-    @java.lang.Override
-    public int getDungeonId() {
-      return dungeonId_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 10;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 10;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
-    public static final int CREATE_PLAYER_UID_FIELD_NUMBER = 1748;
-    private int createPlayerUid_;
-    /**
-     * <code>uint32 create_player_uid = 1748;</code>
-     * @return The createPlayerUid.
-     */
-    @java.lang.Override
-    public int getCreatePlayerUid() {
-      return createPlayerUid_;
+    public int getOKCAGDNDEJN() {
+      return oKCAGDNDEJN_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -728,66 +805,72 @@ public final class PlayerEnterSceneNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (targetUid_ != 0) {
-        output.writeUInt32(1, targetUid_);
+      if (jDNGEPMPFOH_ != false) {
+        output.writeBool(1, jDNGEPMPFOH_);
       }
-      if (isSkipUi_ != false) {
-        output.writeBool(3, isSkipUi_);
+      if (mBFONBLMNBL_ != null) {
+        output.writeMessage(2, getMBFONBLMNBL());
       }
       if (worldLevel_ != 0) {
-        output.writeUInt32(4, worldLevel_);
+        output.writeUInt32(3, worldLevel_);
+      }
+      if (targetUid_ != 0) {
+        output.writeUInt32(4, targetUid_);
       }
       if (sceneBeginTime_ != 0L) {
         output.writeUInt64(5, sceneBeginTime_);
       }
-      if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
-        output.writeEnum(6, type_);
-      }
-      if (enterSceneToken_ != 0) {
-        output.writeUInt32(7, enterSceneToken_);
-      }
-      if (prevSceneId_ != 0) {
-        output.writeUInt32(9, prevSceneId_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(10, sceneId_);
-      }
-      if (dungeonId_ != 0) {
-        output.writeUInt32(11, dungeonId_);
-      }
-      if (prevPos_ != null) {
-        output.writeMessage(12, getPrevPos());
-      }
       if (getSceneTagIdListList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(sceneTagIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < sceneTagIdList_.size(); i++) {
         output.writeUInt32NoTag(sceneTagIdList_.getInt(i));
       }
+      if (enterSceneToken_ != 0) {
+        output.writeUInt32(7, enterSceneToken_);
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(11, dungeonId_);
+      }
+      if (gPJHAEEMCBK_ != 0) {
+        output.writeUInt32(12, gPJHAEEMCBK_);
+      }
       if (pos_ != null) {
-        output.writeMessage(14, getPos());
+        output.writeMessage(13, getPos());
       }
-      if (isFirstLoginEnterScene_ != false) {
-        output.writeBool(164, isFirstLoginEnterScene_);
+      if (sceneId_ != 0) {
+        output.writeUInt32(14, sceneId_);
       }
-      if (enterReason_ != 0) {
-        output.writeUInt32(670, enterReason_);
+      if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
+        output.writeEnum(15, type_);
       }
-      if (mapLayerInfo_ != null) {
-        output.writeMessage(897, getMapLayerInfo());
+      if (aLJNJKPMOPB_ != 0) {
+        output.writeUInt32(338, aLJNJKPMOPB_);
+      }
+      if (eKIBACGBHCJ_ != 0) {
+        output.writeUInt32(358, eKIBACGBHCJ_);
+      }
+      if (kDHNDLANKNI_ != 0) {
+        output.writeUInt32(464, kDHNDLANKNI_);
+      }
+      if (kMDLMKGJIHH_ != null) {
+        output.writeMessage(776, getKMDLMKGJIHH());
+      }
+      if (gBHGABLFDME_ != false) {
+        output.writeBool(816, gBHGABLFDME_);
+      }
+      if (dDGBKGDECME_ != 0) {
+        output.writeUInt32(1148, dDGBKGDECME_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1319, sceneTransaction_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1492, sceneTransaction_);
       }
-      if (worldType_ != 0) {
-        output.writeUInt32(1327, worldType_);
+      if (kKLADMFLAOE_ != 0) {
+        output.writeUInt32(1696, kKLADMFLAOE_);
       }
-      if (createPlayerUid_ != 0) {
-        output.writeUInt32(1748, createPlayerUid_);
-      }
-      if (lAJGLCIFKCP_ != 0) {
-        output.writeUInt32(1820, lAJGLCIFKCP_);
+      if (oKCAGDNDEJN_ != 0) {
+        output.writeUInt32(1870, oKCAGDNDEJN_);
       }
       unknownFields.writeTo(output);
     }
@@ -798,46 +881,26 @@ public final class PlayerEnterSceneNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetUid_ != 0) {
+      if (jDNGEPMPFOH_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, targetUid_);
+          .computeBoolSize(1, jDNGEPMPFOH_);
       }
-      if (isSkipUi_ != false) {
+      if (mBFONBLMNBL_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(3, isSkipUi_);
+          .computeMessageSize(2, getMBFONBLMNBL());
       }
       if (worldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, worldLevel_);
+          .computeUInt32Size(3, worldLevel_);
+      }
+      if (targetUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, targetUid_);
       }
       if (sceneBeginTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(5, sceneBeginTime_);
       }
-      if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, type_);
-      }
-      if (enterSceneToken_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, enterSceneToken_);
-      }
-      if (prevSceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, prevSceneId_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, sceneId_);
-      }
-      if (dungeonId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, dungeonId_);
-      }
-      if (prevPos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getPrevPos());
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < sceneTagIdList_.size(); i++) {
@@ -852,36 +915,64 @@ public final class PlayerEnterSceneNotifyOuterClass {
         }
         sceneTagIdListMemoizedSerializedSize = dataSize;
       }
+      if (enterSceneToken_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, enterSceneToken_);
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, dungeonId_);
+      }
+      if (gPJHAEEMCBK_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, gPJHAEEMCBK_);
+      }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getPos());
+          .computeMessageSize(13, getPos());
       }
-      if (isFirstLoginEnterScene_ != false) {
+      if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(164, isFirstLoginEnterScene_);
+          .computeUInt32Size(14, sceneId_);
       }
-      if (enterReason_ != 0) {
+      if (type_ != emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.ENTER_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(670, enterReason_);
+          .computeEnumSize(15, type_);
       }
-      if (mapLayerInfo_ != null) {
+      if (aLJNJKPMOPB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(897, getMapLayerInfo());
+          .computeUInt32Size(338, aLJNJKPMOPB_);
+      }
+      if (eKIBACGBHCJ_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(358, eKIBACGBHCJ_);
+      }
+      if (kDHNDLANKNI_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(464, kDHNDLANKNI_);
+      }
+      if (kMDLMKGJIHH_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(776, getKMDLMKGJIHH());
+      }
+      if (gBHGABLFDME_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(816, gBHGABLFDME_);
+      }
+      if (dDGBKGDECME_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1148, dDGBKGDECME_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sceneTransaction_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1319, sceneTransaction_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1492, sceneTransaction_);
       }
-      if (worldType_ != 0) {
+      if (kKLADMFLAOE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1327, worldType_);
+          .computeUInt32Size(1696, kKLADMFLAOE_);
       }
-      if (createPlayerUid_ != 0) {
+      if (oKCAGDNDEJN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1748, createPlayerUid_);
-      }
-      if (lAJGLCIFKCP_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1820, lAJGLCIFKCP_);
+          .computeUInt32Size(1870, oKCAGDNDEJN_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -898,52 +989,56 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify other = (emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify) obj;
 
-      if (!getSceneTransaction()
-          .equals(other.getSceneTransaction())) return false;
-      if (hasMapLayerInfo() != other.hasMapLayerInfo()) return false;
-      if (hasMapLayerInfo()) {
-        if (!getMapLayerInfo()
-            .equals(other.getMapLayerInfo())) return false;
+      if (getJDNGEPMPFOH()
+          != other.getJDNGEPMPFOH()) return false;
+      if (hasMBFONBLMNBL() != other.hasMBFONBLMNBL()) return false;
+      if (hasMBFONBLMNBL()) {
+        if (!getMBFONBLMNBL()
+            .equals(other.getMBFONBLMNBL())) return false;
       }
-      if (getIsSkipUi()
-          != other.getIsSkipUi()) return false;
-      if (getPrevSceneId()
-          != other.getPrevSceneId()) return false;
-      if (getIsFirstLoginEnterScene()
-          != other.getIsFirstLoginEnterScene()) return false;
+      if (getWorldLevel()
+          != other.getWorldLevel()) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
+      if (getSceneBeginTime()
+          != other.getSceneBeginTime()) return false;
       if (!getSceneTagIdListList()
           .equals(other.getSceneTagIdListList())) return false;
-      if (hasPrevPos() != other.hasPrevPos()) return false;
-      if (hasPrevPos()) {
-        if (!getPrevPos()
-            .equals(other.getPrevPos())) return false;
-      }
       if (getEnterSceneToken()
           != other.getEnterSceneToken()) return false;
-      if (getWorldType()
-          != other.getWorldType()) return false;
-      if (type_ != other.type_) return false;
-      if (getEnterReason()
-          != other.getEnterReason()) return false;
+      if (getDungeonId()
+          != other.getDungeonId()) return false;
+      if (getGPJHAEEMCBK()
+          != other.getGPJHAEEMCBK()) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
             .equals(other.getPos())) return false;
       }
-      if (getSceneBeginTime()
-          != other.getSceneBeginTime()) return false;
-      if (getLAJGLCIFKCP()
-          != other.getLAJGLCIFKCP()) return false;
-      if (getWorldLevel()
-          != other.getWorldLevel()) return false;
-      if (getDungeonId()
-          != other.getDungeonId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
-      if (getCreatePlayerUid()
-          != other.getCreatePlayerUid()) return false;
+      if (type_ != other.type_) return false;
+      if (getALJNJKPMOPB()
+          != other.getALJNJKPMOPB()) return false;
+      if (getEKIBACGBHCJ()
+          != other.getEKIBACGBHCJ()) return false;
+      if (getKDHNDLANKNI()
+          != other.getKDHNDLANKNI()) return false;
+      if (hasKMDLMKGJIHH() != other.hasKMDLMKGJIHH()) return false;
+      if (hasKMDLMKGJIHH()) {
+        if (!getKMDLMKGJIHH()
+            .equals(other.getKMDLMKGJIHH())) return false;
+      }
+      if (getGBHGABLFDME()
+          != other.getGBHGABLFDME()) return false;
+      if (getDDGBKGDECME()
+          != other.getDDGBKGDECME()) return false;
+      if (!getSceneTransaction()
+          .equals(other.getSceneTransaction())) return false;
+      if (getKKLADMFLAOE()
+          != other.getKKLADMFLAOE()) return false;
+      if (getOKCAGDNDEJN()
+          != other.getOKCAGDNDEJN()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -955,55 +1050,59 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCENE_TRANSACTION_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneTransaction().hashCode();
-      if (hasMapLayerInfo()) {
-        hash = (37 * hash) + MAP_LAYER_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getMapLayerInfo().hashCode();
+      hash = (37 * hash) + JDNGEPMPFOH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getJDNGEPMPFOH());
+      if (hasMBFONBLMNBL()) {
+        hash = (37 * hash) + MBFONBLMNBL_FIELD_NUMBER;
+        hash = (53 * hash) + getMBFONBLMNBL().hashCode();
       }
-      hash = (37 * hash) + IS_SKIP_UI_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSkipUi());
-      hash = (37 * hash) + PREV_SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPrevSceneId();
-      hash = (37 * hash) + IS_FIRST_LOGIN_ENTER_SCENE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsFirstLoginEnterScene());
+      hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getWorldLevel();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
+      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();
       }
-      if (hasPrevPos()) {
-        hash = (37 * hash) + PREV_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getPrevPos().hashCode();
-      }
       hash = (37 * hash) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
-      hash = (37 * hash) + WORLD_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getWorldType();
-      hash = (37 * hash) + TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + type_;
-      hash = (37 * hash) + ENTER_REASON_FIELD_NUMBER;
-      hash = (53 * hash) + getEnterReason();
+      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonId();
+      hash = (37 * hash) + GPJHAEEMCBK_FIELD_NUMBER;
+      hash = (53 * hash) + getGPJHAEEMCBK();
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
-      hash = (37 * hash) + SCENE_BEGIN_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getSceneBeginTime());
-      hash = (37 * hash) + LAJGLCIFKCP_FIELD_NUMBER;
-      hash = (53 * hash) + getLAJGLCIFKCP();
-      hash = (37 * hash) + WORLD_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getWorldLevel();
-      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDungeonId();
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
-      hash = (37 * hash) + CREATE_PLAYER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getCreatePlayerUid();
+      hash = (37 * hash) + TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + type_;
+      hash = (37 * hash) + ALJNJKPMOPB_FIELD_NUMBER;
+      hash = (53 * hash) + getALJNJKPMOPB();
+      hash = (37 * hash) + EKIBACGBHCJ_FIELD_NUMBER;
+      hash = (53 * hash) + getEKIBACGBHCJ();
+      hash = (37 * hash) + KDHNDLANKNI_FIELD_NUMBER;
+      hash = (53 * hash) + getKDHNDLANKNI();
+      if (hasKMDLMKGJIHH()) {
+        hash = (37 * hash) + KMDLMKGJIHH_FIELD_NUMBER;
+        hash = (53 * hash) + getKMDLMKGJIHH().hashCode();
+      }
+      hash = (37 * hash) + GBHGABLFDME_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getGBHGABLFDME());
+      hash = (37 * hash) + DDGBKGDECME_FIELD_NUMBER;
+      hash = (53 * hash) + getDDGBKGDECME();
+      hash = (37 * hash) + SCENE_TRANSACTION_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneTransaction().hashCode();
+      hash = (37 * hash) + KKLADMFLAOE_FIELD_NUMBER;
+      hash = (53 * hash) + getKKLADMFLAOE();
+      hash = (37 * hash) + OKCAGDNDEJN_FIELD_NUMBER;
+      hash = (53 * hash) + getOKCAGDNDEJN();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1100,11 +1199,6 @@ public final class PlayerEnterSceneNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2783
-     * Obf: PBJBDNIOMBF
-     * </pre>
-     *
      * Protobuf type {@code PlayerEnterSceneNotify}
      */
     public static final class Builder extends
@@ -1142,37 +1236,27 @@ public final class PlayerEnterSceneNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sceneTransaction_ = "";
+        jDNGEPMPFOH_ = false;
 
-        if (mapLayerInfoBuilder_ == null) {
-          mapLayerInfo_ = null;
+        if (mBFONBLMNBLBuilder_ == null) {
+          mBFONBLMNBL_ = null;
         } else {
-          mapLayerInfo_ = null;
-          mapLayerInfoBuilder_ = null;
+          mBFONBLMNBL_ = null;
+          mBFONBLMNBLBuilder_ = null;
         }
-        isSkipUi_ = false;
-
-        prevSceneId_ = 0;
-
-        isFirstLoginEnterScene_ = false;
+        worldLevel_ = 0;
 
         targetUid_ = 0;
 
+        sceneBeginTime_ = 0L;
+
         sceneTagIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        if (prevPosBuilder_ == null) {
-          prevPos_ = null;
-        } else {
-          prevPos_ = null;
-          prevPosBuilder_ = null;
-        }
         enterSceneToken_ = 0;
 
-        worldType_ = 0;
+        dungeonId_ = 0;
 
-        type_ = 0;
-
-        enterReason_ = 0;
+        gPJHAEEMCBK_ = 0;
 
         if (posBuilder_ == null) {
           pos_ = null;
@@ -1180,17 +1264,31 @@ public final class PlayerEnterSceneNotifyOuterClass {
           pos_ = null;
           posBuilder_ = null;
         }
-        sceneBeginTime_ = 0L;
-
-        lAJGLCIFKCP_ = 0;
-
-        worldLevel_ = 0;
-
-        dungeonId_ = 0;
-
         sceneId_ = 0;
 
-        createPlayerUid_ = 0;
+        type_ = 0;
+
+        aLJNJKPMOPB_ = 0;
+
+        eKIBACGBHCJ_ = 0;
+
+        kDHNDLANKNI_ = 0;
+
+        if (kMDLMKGJIHHBuilder_ == null) {
+          kMDLMKGJIHH_ = null;
+        } else {
+          kMDLMKGJIHH_ = null;
+          kMDLMKGJIHHBuilder_ = null;
+        }
+        gBHGABLFDME_ = false;
+
+        dDGBKGDECME_ = 0;
+
+        sceneTransaction_ = "";
+
+        kKLADMFLAOE_ = 0;
+
+        oKCAGDNDEJN_ = 0;
 
         return this;
       }
@@ -1219,41 +1317,43 @@ public final class PlayerEnterSceneNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify result = new emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify(this);
         int from_bitField0_ = bitField0_;
-        result.sceneTransaction_ = sceneTransaction_;
-        if (mapLayerInfoBuilder_ == null) {
-          result.mapLayerInfo_ = mapLayerInfo_;
+        result.jDNGEPMPFOH_ = jDNGEPMPFOH_;
+        if (mBFONBLMNBLBuilder_ == null) {
+          result.mBFONBLMNBL_ = mBFONBLMNBL_;
         } else {
-          result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
+          result.mBFONBLMNBL_ = mBFONBLMNBLBuilder_.build();
         }
-        result.isSkipUi_ = isSkipUi_;
-        result.prevSceneId_ = prevSceneId_;
-        result.isFirstLoginEnterScene_ = isFirstLoginEnterScene_;
+        result.worldLevel_ = worldLevel_;
         result.targetUid_ = targetUid_;
+        result.sceneBeginTime_ = sceneBeginTime_;
         if (((bitField0_ & 0x00000001) != 0)) {
           sceneTagIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.sceneTagIdList_ = sceneTagIdList_;
-        if (prevPosBuilder_ == null) {
-          result.prevPos_ = prevPos_;
-        } else {
-          result.prevPos_ = prevPosBuilder_.build();
-        }
         result.enterSceneToken_ = enterSceneToken_;
-        result.worldType_ = worldType_;
-        result.type_ = type_;
-        result.enterReason_ = enterReason_;
+        result.dungeonId_ = dungeonId_;
+        result.gPJHAEEMCBK_ = gPJHAEEMCBK_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
-        result.sceneBeginTime_ = sceneBeginTime_;
-        result.lAJGLCIFKCP_ = lAJGLCIFKCP_;
-        result.worldLevel_ = worldLevel_;
-        result.dungeonId_ = dungeonId_;
         result.sceneId_ = sceneId_;
-        result.createPlayerUid_ = createPlayerUid_;
+        result.type_ = type_;
+        result.aLJNJKPMOPB_ = aLJNJKPMOPB_;
+        result.eKIBACGBHCJ_ = eKIBACGBHCJ_;
+        result.kDHNDLANKNI_ = kDHNDLANKNI_;
+        if (kMDLMKGJIHHBuilder_ == null) {
+          result.kMDLMKGJIHH_ = kMDLMKGJIHH_;
+        } else {
+          result.kMDLMKGJIHH_ = kMDLMKGJIHHBuilder_.build();
+        }
+        result.gBHGABLFDME_ = gBHGABLFDME_;
+        result.dDGBKGDECME_ = dDGBKGDECME_;
+        result.sceneTransaction_ = sceneTransaction_;
+        result.kKLADMFLAOE_ = kKLADMFLAOE_;
+        result.oKCAGDNDEJN_ = oKCAGDNDEJN_;
         onBuilt();
         return result;
       }
@@ -1302,25 +1402,21 @@ public final class PlayerEnterSceneNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerEnterSceneNotifyOuterClass.PlayerEnterSceneNotify.getDefaultInstance()) return this;
-        if (!other.getSceneTransaction().isEmpty()) {
-          sceneTransaction_ = other.sceneTransaction_;
-          onChanged();
+        if (other.getJDNGEPMPFOH() != false) {
+          setJDNGEPMPFOH(other.getJDNGEPMPFOH());
         }
-        if (other.hasMapLayerInfo()) {
-          mergeMapLayerInfo(other.getMapLayerInfo());
+        if (other.hasMBFONBLMNBL()) {
+          mergeMBFONBLMNBL(other.getMBFONBLMNBL());
         }
-        if (other.getIsSkipUi() != false) {
-          setIsSkipUi(other.getIsSkipUi());
-        }
-        if (other.getPrevSceneId() != 0) {
-          setPrevSceneId(other.getPrevSceneId());
-        }
-        if (other.getIsFirstLoginEnterScene() != false) {
-          setIsFirstLoginEnterScene(other.getIsFirstLoginEnterScene());
+        if (other.getWorldLevel() != 0) {
+          setWorldLevel(other.getWorldLevel());
         }
         if (other.getTargetUid() != 0) {
           setTargetUid(other.getTargetUid());
         }
+        if (other.getSceneBeginTime() != 0L) {
+          setSceneBeginTime(other.getSceneBeginTime());
+        }
         if (!other.sceneTagIdList_.isEmpty()) {
           if (sceneTagIdList_.isEmpty()) {
             sceneTagIdList_ = other.sceneTagIdList_;
@@ -1331,41 +1427,51 @@ public final class PlayerEnterSceneNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.hasPrevPos()) {
-          mergePrevPos(other.getPrevPos());
-        }
         if (other.getEnterSceneToken() != 0) {
           setEnterSceneToken(other.getEnterSceneToken());
         }
-        if (other.getWorldType() != 0) {
-          setWorldType(other.getWorldType());
-        }
-        if (other.type_ != 0) {
-          setTypeValue(other.getTypeValue());
-        }
-        if (other.getEnterReason() != 0) {
-          setEnterReason(other.getEnterReason());
-        }
-        if (other.hasPos()) {
-          mergePos(other.getPos());
-        }
-        if (other.getSceneBeginTime() != 0L) {
-          setSceneBeginTime(other.getSceneBeginTime());
-        }
-        if (other.getLAJGLCIFKCP() != 0) {
-          setLAJGLCIFKCP(other.getLAJGLCIFKCP());
-        }
-        if (other.getWorldLevel() != 0) {
-          setWorldLevel(other.getWorldLevel());
-        }
         if (other.getDungeonId() != 0) {
           setDungeonId(other.getDungeonId());
         }
+        if (other.getGPJHAEEMCBK() != 0) {
+          setGPJHAEEMCBK(other.getGPJHAEEMCBK());
+        }
+        if (other.hasPos()) {
+          mergePos(other.getPos());
+        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
-        if (other.getCreatePlayerUid() != 0) {
-          setCreatePlayerUid(other.getCreatePlayerUid());
+        if (other.type_ != 0) {
+          setTypeValue(other.getTypeValue());
+        }
+        if (other.getALJNJKPMOPB() != 0) {
+          setALJNJKPMOPB(other.getALJNJKPMOPB());
+        }
+        if (other.getEKIBACGBHCJ() != 0) {
+          setEKIBACGBHCJ(other.getEKIBACGBHCJ());
+        }
+        if (other.getKDHNDLANKNI() != 0) {
+          setKDHNDLANKNI(other.getKDHNDLANKNI());
+        }
+        if (other.hasKMDLMKGJIHH()) {
+          mergeKMDLMKGJIHH(other.getKMDLMKGJIHH());
+        }
+        if (other.getGBHGABLFDME() != false) {
+          setGBHGABLFDME(other.getGBHGABLFDME());
+        }
+        if (other.getDDGBKGDECME() != 0) {
+          setDDGBKGDECME(other.getDDGBKGDECME());
+        }
+        if (!other.getSceneTransaction().isEmpty()) {
+          sceneTransaction_ = other.sceneTransaction_;
+          onChanged();
+        }
+        if (other.getKKLADMFLAOE() != 0) {
+          setKKLADMFLAOE(other.getKKLADMFLAOE());
+        }
+        if (other.getOKCAGDNDEJN() != 0) {
+          setOKCAGDNDEJN(other.getOKCAGDNDEJN());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1397,297 +1503,190 @@ public final class PlayerEnterSceneNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.lang.Object sceneTransaction_ = "";
+      private boolean jDNGEPMPFOH_ ;
       /**
-       * <code>string scene_transaction = 1319;</code>
-       * @return The sceneTransaction.
+       * <code>bool JDNGEPMPFOH = 1;</code>
+       * @return The jDNGEPMPFOH.
        */
-      public java.lang.String getSceneTransaction() {
-        java.lang.Object ref = sceneTransaction_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          sceneTransaction_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public boolean getJDNGEPMPFOH() {
+        return jDNGEPMPFOH_;
       }
       /**
-       * <code>string scene_transaction = 1319;</code>
-       * @return The bytes for sceneTransaction.
-       */
-      public com.google.protobuf.ByteString
-          getSceneTransactionBytes() {
-        java.lang.Object ref = sceneTransaction_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          sceneTransaction_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string scene_transaction = 1319;</code>
-       * @param value The sceneTransaction to set.
+       * <code>bool JDNGEPMPFOH = 1;</code>
+       * @param value The jDNGEPMPFOH to set.
        * @return This builder for chaining.
        */
-      public Builder setSceneTransaction(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        sceneTransaction_ = value;
+      public Builder setJDNGEPMPFOH(boolean value) {
+        
+        jDNGEPMPFOH_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string scene_transaction = 1319;</code>
+       * <code>bool JDNGEPMPFOH = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSceneTransaction() {
+      public Builder clearJDNGEPMPFOH() {
         
-        sceneTransaction_ = getDefaultInstance().getSceneTransaction();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string scene_transaction = 1319;</code>
-       * @param value The bytes for sceneTransaction to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSceneTransactionBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        sceneTransaction_ = value;
+        jDNGEPMPFOH_ = false;
         onChanged();
         return this;
       }
 
-      private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector mBFONBLMNBL_;
       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_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> mBFONBLMNBLBuilder_;
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
-       * @return Whether the mapLayerInfo field is set.
+       * <code>.Vector MBFONBLMNBL = 2;</code>
+       * @return Whether the mBFONBLMNBL field is set.
        */
-      public boolean hasMapLayerInfo() {
-        return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
+      public boolean hasMBFONBLMNBL() {
+        return mBFONBLMNBLBuilder_ != null || mBFONBLMNBL_ != null;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
-       * @return The mapLayerInfo.
+       * <code>.Vector MBFONBLMNBL = 2;</code>
+       * @return The mBFONBLMNBL.
        */
-      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-        if (mapLayerInfoBuilder_ == null) {
-          return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getMBFONBLMNBL() {
+        if (mBFONBLMNBLBuilder_ == null) {
+          return mBFONBLMNBL_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : mBFONBLMNBL_;
         } else {
-          return mapLayerInfoBuilder_.getMessage();
+          return mBFONBLMNBLBuilder_.getMessage();
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (mapLayerInfoBuilder_ == null) {
+      public Builder setMBFONBLMNBL(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (mBFONBLMNBLBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          mapLayerInfo_ = value;
+          mBFONBLMNBL_ = value;
           onChanged();
         } else {
-          mapLayerInfoBuilder_.setMessage(value);
+          mBFONBLMNBLBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public Builder setMapLayerInfo(
-          emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) {
-        if (mapLayerInfoBuilder_ == null) {
-          mapLayerInfo_ = builderForValue.build();
+      public Builder setMBFONBLMNBL(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (mBFONBLMNBLBuilder_ == null) {
+          mBFONBLMNBL_ = builderForValue.build();
           onChanged();
         } else {
-          mapLayerInfoBuilder_.setMessage(builderForValue.build());
+          mBFONBLMNBLBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
-        if (mapLayerInfoBuilder_ == null) {
-          if (mapLayerInfo_ != null) {
-            mapLayerInfo_ =
-              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.newBuilder(mapLayerInfo_).mergeFrom(value).buildPartial();
+      public Builder mergeMBFONBLMNBL(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (mBFONBLMNBLBuilder_ == null) {
+          if (mBFONBLMNBL_ != null) {
+            mBFONBLMNBL_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(mBFONBLMNBL_).mergeFrom(value).buildPartial();
           } else {
-            mapLayerInfo_ = value;
+            mBFONBLMNBL_ = value;
           }
           onChanged();
         } else {
-          mapLayerInfoBuilder_.mergeFrom(value);
+          mBFONBLMNBLBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public Builder clearMapLayerInfo() {
-        if (mapLayerInfoBuilder_ == null) {
-          mapLayerInfo_ = null;
+      public Builder clearMBFONBLMNBL() {
+        if (mBFONBLMNBLBuilder_ == null) {
+          mBFONBLMNBL_ = null;
           onChanged();
         } else {
-          mapLayerInfo_ = null;
-          mapLayerInfoBuilder_ = null;
+          mBFONBLMNBL_ = null;
+          mBFONBLMNBLBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getMBFONBLMNBLBuilder() {
         
         onChanged();
-        return getMapLayerInfoFieldBuilder().getBuilder();
+        return getMBFONBLMNBLFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</code>
        */
-      public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-        if (mapLayerInfoBuilder_ != null) {
-          return mapLayerInfoBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getMBFONBLMNBLOrBuilder() {
+        if (mBFONBLMNBLBuilder_ != null) {
+          return mBFONBLMNBLBuilder_.getMessageOrBuilder();
         } else {
-          return mapLayerInfo_ == null ?
-              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
+          return mBFONBLMNBL_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : mBFONBLMNBL_;
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 897;</code>
+       * <code>.Vector MBFONBLMNBL = 2;</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> 
-          getMapLayerInfoFieldBuilder() {
-        if (mapLayerInfoBuilder_ == null) {
-          mapLayerInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder, emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder>(
-                  getMapLayerInfo(),
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+          getMBFONBLMNBLFieldBuilder() {
+        if (mBFONBLMNBLBuilder_ == null) {
+          mBFONBLMNBLBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getMBFONBLMNBL(),
                   getParentForChildren(),
                   isClean());
-          mapLayerInfo_ = null;
+          mBFONBLMNBL_ = null;
         }
-        return mapLayerInfoBuilder_;
+        return mBFONBLMNBLBuilder_;
       }
 
-      private boolean isSkipUi_ ;
+      private int worldLevel_ ;
       /**
-       * <code>bool is_skip_ui = 3;</code>
-       * @return The isSkipUi.
+       * <code>uint32 world_level = 3;</code>
+       * @return The worldLevel.
        */
       @java.lang.Override
-      public boolean getIsSkipUi() {
-        return isSkipUi_;
+      public int getWorldLevel() {
+        return worldLevel_;
       }
       /**
-       * <code>bool is_skip_ui = 3;</code>
-       * @param value The isSkipUi to set.
+       * <code>uint32 world_level = 3;</code>
+       * @param value The worldLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setIsSkipUi(boolean value) {
+      public Builder setWorldLevel(int value) {
         
-        isSkipUi_ = value;
+        worldLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_skip_ui = 3;</code>
+       * <code>uint32 world_level = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsSkipUi() {
+      public Builder clearWorldLevel() {
         
-        isSkipUi_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int prevSceneId_ ;
-      /**
-       * <code>uint32 prev_scene_id = 9;</code>
-       * @return The prevSceneId.
-       */
-      @java.lang.Override
-      public int getPrevSceneId() {
-        return prevSceneId_;
-      }
-      /**
-       * <code>uint32 prev_scene_id = 9;</code>
-       * @param value The prevSceneId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPrevSceneId(int value) {
-        
-        prevSceneId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 prev_scene_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPrevSceneId() {
-        
-        prevSceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isFirstLoginEnterScene_ ;
-      /**
-       * <code>bool is_first_login_enter_scene = 164;</code>
-       * @return The isFirstLoginEnterScene.
-       */
-      @java.lang.Override
-      public boolean getIsFirstLoginEnterScene() {
-        return isFirstLoginEnterScene_;
-      }
-      /**
-       * <code>bool is_first_login_enter_scene = 164;</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 = 164;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFirstLoginEnterScene() {
-        
-        isFirstLoginEnterScene_ = false;
+        worldLevel_ = 0;
         onChanged();
         return this;
       }
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -1695,7 +1694,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -1706,7 +1705,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 1;</code>
+       * <code>uint32 target_uid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -1716,470 +1715,6 @@ public final class PlayerEnterSceneNotifyOuterClass {
         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 = 13;</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 = 13;</code>
-       * @return The count of sceneTagIdList.
-       */
-      public int getSceneTagIdListCount() {
-        return sceneTagIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 13;</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 = 13;</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 = 13;</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 = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneTagIdList() {
-        sceneTagIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        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 = 12;</code>
-       * @return Whether the prevPos field is set.
-       */
-      public boolean hasPrevPos() {
-        return prevPosBuilder_ != null || prevPos_ != null;
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       * @return The prevPos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPrevPos() {
-        if (prevPosBuilder_ == null) {
-          return prevPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : prevPos_;
-        } else {
-          return prevPosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public Builder setPrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (prevPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          prevPos_ = value;
-          onChanged();
-        } else {
-          prevPosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public Builder setPrevPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (prevPosBuilder_ == null) {
-          prevPos_ = builderForValue.build();
-          onChanged();
-        } else {
-          prevPosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public Builder mergePrevPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (prevPosBuilder_ == null) {
-          if (prevPos_ != null) {
-            prevPos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(prevPos_).mergeFrom(value).buildPartial();
-          } else {
-            prevPos_ = value;
-          }
-          onChanged();
-        } else {
-          prevPosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public Builder clearPrevPos() {
-        if (prevPosBuilder_ == null) {
-          prevPos_ = null;
-          onChanged();
-        } else {
-          prevPos_ = null;
-          prevPosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPrevPosBuilder() {
-        
-        onChanged();
-        return getPrevPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector prev_pos = 12;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPrevPosOrBuilder() {
-        if (prevPosBuilder_ != null) {
-          return prevPosBuilder_.getMessageOrBuilder();
-        } else {
-          return prevPos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : prevPos_;
-        }
-      }
-      /**
-       * <code>.Vector prev_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> 
-          getPrevPosFieldBuilder() {
-        if (prevPosBuilder_ == null) {
-          prevPosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getPrevPos(),
-                  getParentForChildren(),
-                  isClean());
-          prevPos_ = null;
-        }
-        return prevPosBuilder_;
-      }
-
-      private int enterSceneToken_ ;
-      /**
-       * <code>uint32 enter_scene_token = 7;</code>
-       * @return The enterSceneToken.
-       */
-      @java.lang.Override
-      public int getEnterSceneToken() {
-        return enterSceneToken_;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 7;</code>
-       * @param value The enterSceneToken to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnterSceneToken(int value) {
-        
-        enterSceneToken_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 enter_scene_token = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnterSceneToken() {
-        
-        enterSceneToken_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int worldType_ ;
-      /**
-       * <code>uint32 world_type = 1327;</code>
-       * @return The worldType.
-       */
-      @java.lang.Override
-      public int getWorldType() {
-        return worldType_;
-      }
-      /**
-       * <code>uint32 world_type = 1327;</code>
-       * @param value The worldType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWorldType(int value) {
-        
-        worldType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 world_type = 1327;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWorldType() {
-        
-        worldType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int type_ = 0;
-      /**
-       * <code>.EnterType type = 6;</code>
-       * @return The enum numeric value on the wire for type.
-       */
-      @java.lang.Override public int getTypeValue() {
-        return type_;
-      }
-      /**
-       * <code>.EnterType type = 6;</code>
-       * @param value The enum numeric value on the wire for type to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTypeValue(int value) {
-        
-        type_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.EnterType type = 6;</code>
-       * @return The type.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType result = emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.valueOf(type_);
-        return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.EnterType type = 6;</code>
-       * @param value The type to set.
-       * @return This builder for chaining.
-       */
-      public Builder setType(emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        type_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.EnterType type = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearType() {
-        
-        type_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int enterReason_ ;
-      /**
-       * <code>uint32 enter_reason = 670;</code>
-       * @return The enterReason.
-       */
-      @java.lang.Override
-      public int getEnterReason() {
-        return enterReason_;
-      }
-      /**
-       * <code>uint32 enter_reason = 670;</code>
-       * @param value The enterReason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnterReason(int value) {
-        
-        enterReason_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 enter_reason = 670;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnterReason() {
-        
-        enterReason_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-      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 = 14;</code>
-       * @return Whether the pos field is set.
-       */
-      public boolean hasPos() {
-        return posBuilder_ != null || pos_ != null;
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       * @return The pos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-        if (posBuilder_ == null) {
-          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        } else {
-          return posBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pos_ = value;
-          onChanged();
-        } else {
-          posBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public Builder setPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (posBuilder_ == null) {
-          pos_ = builderForValue.build();
-          onChanged();
-        } else {
-          posBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (pos_ != null) {
-            pos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
-          } else {
-            pos_ = value;
-          }
-          onChanged();
-        } else {
-          posBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public Builder clearPos() {
-        if (posBuilder_ == null) {
-          pos_ = null;
-          onChanged();
-        } else {
-          pos_ = null;
-          posBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
-        
-        onChanged();
-        return getPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector pos = 14;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-        if (posBuilder_ != null) {
-          return posBuilder_.getMessageOrBuilder();
-        } else {
-          return pos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        }
-      }
-      /**
-       * <code>.Vector pos = 14;</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> 
-          getPosFieldBuilder() {
-        if (posBuilder_ == null) {
-          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getPos(),
-                  getParentForChildren(),
-                  isClean());
-          pos_ = null;
-        }
-        return posBuilder_;
-      }
-
       private long sceneBeginTime_ ;
       /**
        * <code>uint64 scene_begin_time = 5;</code>
@@ -2211,64 +1746,112 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
 
-      private int lAJGLCIFKCP_ ;
-      /**
-       * <code>uint32 LAJGLCIFKCP = 1820;</code>
-       * @return The lAJGLCIFKCP.
-       */
-      @java.lang.Override
-      public int getLAJGLCIFKCP() {
-        return lAJGLCIFKCP_;
+      private com.google.protobuf.Internal.IntList sceneTagIdList_ = emptyIntList();
+      private void ensureSceneTagIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          sceneTagIdList_ = mutableCopy(sceneTagIdList_);
+          bitField0_ |= 0x00000001;
+         }
       }
       /**
-       * <code>uint32 LAJGLCIFKCP = 1820;</code>
-       * @param value The lAJGLCIFKCP to set.
+       * <code>repeated uint32 scene_tag_id_list = 6;</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 = 6;</code>
+       * @return The count of sceneTagIdList.
+       */
+      public int getSceneTagIdListCount() {
+        return sceneTagIdList_.size();
+      }
+      /**
+       * <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.
+       */
+      public int getSceneTagIdList(int index) {
+        return sceneTagIdList_.getInt(index);
+      }
+      /**
+       * <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.
        */
-      public Builder setLAJGLCIFKCP(int value) {
-        
-        lAJGLCIFKCP_ = value;
+      public Builder setSceneTagIdList(
+          int index, int value) {
+        ensureSceneTagIdListIsMutable();
+        sceneTagIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 LAJGLCIFKCP = 1820;</code>
+       * <code>repeated uint32 scene_tag_id_list = 6;</code>
+       * @param value The sceneTagIdList to add.
        * @return This builder for chaining.
        */
-      public Builder clearLAJGLCIFKCP() {
-        
-        lAJGLCIFKCP_ = 0;
+      public Builder addSceneTagIdList(int value) {
+        ensureSceneTagIdListIsMutable();
+        sceneTagIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 6;</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 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneTagIdList() {
+        sceneTagIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
-      private int worldLevel_ ;
+      private int enterSceneToken_ ;
       /**
-       * <code>uint32 world_level = 4;</code>
-       * @return The worldLevel.
+       * <code>uint32 enter_scene_token = 7;</code>
+       * @return The enterSceneToken.
        */
       @java.lang.Override
-      public int getWorldLevel() {
-        return worldLevel_;
+      public int getEnterSceneToken() {
+        return enterSceneToken_;
       }
       /**
-       * <code>uint32 world_level = 4;</code>
-       * @param value The worldLevel to set.
+       * <code>uint32 enter_scene_token = 7;</code>
+       * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
-      public Builder setWorldLevel(int value) {
+      public Builder setEnterSceneToken(int value) {
         
-        worldLevel_ = value;
+        enterSceneToken_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 world_level = 4;</code>
+       * <code>uint32 enter_scene_token = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearWorldLevel() {
+      public Builder clearEnterSceneToken() {
         
-        worldLevel_ = 0;
+        enterSceneToken_ = 0;
         onChanged();
         return this;
       }
@@ -2304,9 +1887,159 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
 
+      private int gPJHAEEMCBK_ ;
+      /**
+       * <code>uint32 GPJHAEEMCBK = 12;</code>
+       * @return The gPJHAEEMCBK.
+       */
+      @java.lang.Override
+      public int getGPJHAEEMCBK() {
+        return gPJHAEEMCBK_;
+      }
+      /**
+       * <code>uint32 GPJHAEEMCBK = 12;</code>
+       * @param value The gPJHAEEMCBK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGPJHAEEMCBK(int value) {
+        
+        gPJHAEEMCBK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GPJHAEEMCBK = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGPJHAEEMCBK() {
+        
+        gPJHAEEMCBK_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+      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 = 13;</code>
+       * @return Whether the pos field is set.
+       */
+      public boolean hasPos() {
+        return posBuilder_ != null || pos_ != null;
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       * @return The pos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+        if (posBuilder_ == null) {
+          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        } else {
+          return posBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          pos_ = value;
+          onChanged();
+        } else {
+          posBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public Builder setPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (posBuilder_ == null) {
+          pos_ = builderForValue.build();
+          onChanged();
+        } else {
+          posBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (pos_ != null) {
+            pos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
+          } else {
+            pos_ = value;
+          }
+          onChanged();
+        } else {
+          posBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public Builder clearPos() {
+        if (posBuilder_ == null) {
+          pos_ = null;
+          onChanged();
+        } else {
+          pos_ = null;
+          posBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
+        
+        onChanged();
+        return getPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector pos = 13;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+        if (posBuilder_ != null) {
+          return posBuilder_.getMessageOrBuilder();
+        } else {
+          return pos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        }
+      }
+      /**
+       * <code>.Vector pos = 13;</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> 
+          getPosFieldBuilder() {
+        if (posBuilder_ == null) {
+          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getPos(),
+                  getParentForChildren(),
+                  isClean());
+          pos_ = null;
+        }
+        return posBuilder_;
+      }
+
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 10;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -2314,7 +2047,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 10;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -2325,7 +2058,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 10;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -2335,33 +2068,525 @@ public final class PlayerEnterSceneNotifyOuterClass {
         return this;
       }
 
-      private int createPlayerUid_ ;
+      private int type_ = 0;
       /**
-       * <code>uint32 create_player_uid = 1748;</code>
-       * @return The createPlayerUid.
+       * <code>.EnterType type = 15;</code>
+       * @return The enum numeric value on the wire for type.
        */
-      @java.lang.Override
-      public int getCreatePlayerUid() {
-        return createPlayerUid_;
+      @java.lang.Override public int getTypeValue() {
+        return type_;
       }
       /**
-       * <code>uint32 create_player_uid = 1748;</code>
-       * @param value The createPlayerUid to set.
+       * <code>.EnterType type = 15;</code>
+       * @param value The enum numeric value on the wire for type to set.
        * @return This builder for chaining.
        */
-      public Builder setCreatePlayerUid(int value) {
+      public Builder setTypeValue(int value) {
         
-        createPlayerUid_ = value;
+        type_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 create_player_uid = 1748;</code>
+       * <code>.EnterType type = 15;</code>
+       * @return The type.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType getType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType result = emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.valueOf(type_);
+        return result == null ? emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.EnterType type = 15;</code>
+       * @param value The type to set.
        * @return This builder for chaining.
        */
-      public Builder clearCreatePlayerUid() {
+      public Builder setType(emu.grasscutter.net.proto.EnterTypeOuterClass.EnterType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
         
-        createPlayerUid_ = 0;
+        type_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.EnterType type = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearType() {
+        
+        type_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int aLJNJKPMOPB_ ;
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 96;
+       * </pre>
+       *
+       * <code>uint32 ALJNJKPMOPB = 338;</code>
+       * @return The aLJNJKPMOPB.
+       */
+      @java.lang.Override
+      public int getALJNJKPMOPB() {
+        return aLJNJKPMOPB_;
+      }
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 96;
+       * </pre>
+       *
+       * <code>uint32 ALJNJKPMOPB = 338;</code>
+       * @param value The aLJNJKPMOPB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setALJNJKPMOPB(int value) {
+        
+        aLJNJKPMOPB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 96;
+       * </pre>
+       *
+       * <code>uint32 ALJNJKPMOPB = 338;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearALJNJKPMOPB() {
+        
+        aLJNJKPMOPB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int eKIBACGBHCJ_ ;
+      /**
+       * <code>uint32 EKIBACGBHCJ = 358;</code>
+       * @return The eKIBACGBHCJ.
+       */
+      @java.lang.Override
+      public int getEKIBACGBHCJ() {
+        return eKIBACGBHCJ_;
+      }
+      /**
+       * <code>uint32 EKIBACGBHCJ = 358;</code>
+       * @param value The eKIBACGBHCJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEKIBACGBHCJ(int value) {
+        
+        eKIBACGBHCJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 EKIBACGBHCJ = 358;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEKIBACGBHCJ() {
+        
+        eKIBACGBHCJ_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kDHNDLANKNI_ ;
+      /**
+       * <code>uint32 KDHNDLANKNI = 464;</code>
+       * @return The kDHNDLANKNI.
+       */
+      @java.lang.Override
+      public int getKDHNDLANKNI() {
+        return kDHNDLANKNI_;
+      }
+      /**
+       * <code>uint32 KDHNDLANKNI = 464;</code>
+       * @param value The kDHNDLANKNI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKDHNDLANKNI(int value) {
+        
+        kDHNDLANKNI_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KDHNDLANKNI = 464;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKDHNDLANKNI() {
+        
+        kDHNDLANKNI_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector kMDLMKGJIHH_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> kMDLMKGJIHHBuilder_;
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       * @return Whether the kMDLMKGJIHH field is set.
+       */
+      public boolean hasKMDLMKGJIHH() {
+        return kMDLMKGJIHHBuilder_ != null || kMDLMKGJIHH_ != null;
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       * @return The kMDLMKGJIHH.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getKMDLMKGJIHH() {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          return kMDLMKGJIHH_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kMDLMKGJIHH_;
+        } else {
+          return kMDLMKGJIHHBuilder_.getMessage();
+        }
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public Builder setKMDLMKGJIHH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          kMDLMKGJIHH_ = value;
+          onChanged();
+        } else {
+          kMDLMKGJIHHBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public Builder setKMDLMKGJIHH(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          kMDLMKGJIHH_ = builderForValue.build();
+          onChanged();
+        } else {
+          kMDLMKGJIHHBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public Builder mergeKMDLMKGJIHH(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          if (kMDLMKGJIHH_ != null) {
+            kMDLMKGJIHH_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(kMDLMKGJIHH_).mergeFrom(value).buildPartial();
+          } else {
+            kMDLMKGJIHH_ = value;
+          }
+          onChanged();
+        } else {
+          kMDLMKGJIHHBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public Builder clearKMDLMKGJIHH() {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          kMDLMKGJIHH_ = null;
+          onChanged();
+        } else {
+          kMDLMKGJIHH_ = null;
+          kMDLMKGJIHHBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getKMDLMKGJIHHBuilder() {
+        
+        onChanged();
+        return getKMDLMKGJIHHFieldBuilder().getBuilder();
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKMDLMKGJIHHOrBuilder() {
+        if (kMDLMKGJIHHBuilder_ != null) {
+          return kMDLMKGJIHHBuilder_.getMessageOrBuilder();
+        } else {
+          return kMDLMKGJIHH_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kMDLMKGJIHH_;
+        }
+      }
+      /**
+       * <pre>
+       *GJNOBDELMLF BFPGBNDFGBO = 681;
+       *PHJGPIPOKAA GALJCIMKFCH = 740;
+       * </pre>
+       *
+       * <code>.Vector KMDLMKGJIHH = 776;</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> 
+          getKMDLMKGJIHHFieldBuilder() {
+        if (kMDLMKGJIHHBuilder_ == null) {
+          kMDLMKGJIHHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getKMDLMKGJIHH(),
+                  getParentForChildren(),
+                  isClean());
+          kMDLMKGJIHH_ = null;
+        }
+        return kMDLMKGJIHHBuilder_;
+      }
+
+      private boolean gBHGABLFDME_ ;
+      /**
+       * <code>bool GBHGABLFDME = 816;</code>
+       * @return The gBHGABLFDME.
+       */
+      @java.lang.Override
+      public boolean getGBHGABLFDME() {
+        return gBHGABLFDME_;
+      }
+      /**
+       * <code>bool GBHGABLFDME = 816;</code>
+       * @param value The gBHGABLFDME to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGBHGABLFDME(boolean value) {
+        
+        gBHGABLFDME_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool GBHGABLFDME = 816;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGBHGABLFDME() {
+        
+        gBHGABLFDME_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dDGBKGDECME_ ;
+      /**
+       * <code>uint32 DDGBKGDECME = 1148;</code>
+       * @return The dDGBKGDECME.
+       */
+      @java.lang.Override
+      public int getDDGBKGDECME() {
+        return dDGBKGDECME_;
+      }
+      /**
+       * <code>uint32 DDGBKGDECME = 1148;</code>
+       * @param value The dDGBKGDECME to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDDGBKGDECME(int value) {
+        
+        dDGBKGDECME_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DDGBKGDECME = 1148;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDDGBKGDECME() {
+        
+        dDGBKGDECME_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object sceneTransaction_ = "";
+      /**
+       * <code>string scene_transaction = 1492;</code>
+       * @return The sceneTransaction.
+       */
+      public java.lang.String getSceneTransaction() {
+        java.lang.Object ref = sceneTransaction_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          sceneTransaction_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string scene_transaction = 1492;</code>
+       * @return The bytes for sceneTransaction.
+       */
+      public com.google.protobuf.ByteString
+          getSceneTransactionBytes() {
+        java.lang.Object ref = sceneTransaction_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          sceneTransaction_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string scene_transaction = 1492;</code>
+       * @param value The sceneTransaction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneTransaction(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        sceneTransaction_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string scene_transaction = 1492;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneTransaction() {
+        
+        sceneTransaction_ = getDefaultInstance().getSceneTransaction();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string scene_transaction = 1492;</code>
+       * @param value The bytes for sceneTransaction to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSceneTransactionBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        sceneTransaction_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int kKLADMFLAOE_ ;
+      /**
+       * <code>uint32 KKLADMFLAOE = 1696;</code>
+       * @return The kKLADMFLAOE.
+       */
+      @java.lang.Override
+      public int getKKLADMFLAOE() {
+        return kKLADMFLAOE_;
+      }
+      /**
+       * <code>uint32 KKLADMFLAOE = 1696;</code>
+       * @param value The kKLADMFLAOE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKKLADMFLAOE(int value) {
+        
+        kKLADMFLAOE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KKLADMFLAOE = 1696;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKKLADMFLAOE() {
+        
+        kKLADMFLAOE_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oKCAGDNDEJN_ ;
+      /**
+       * <code>uint32 OKCAGDNDEJN = 1870;</code>
+       * @return The oKCAGDNDEJN.
+       */
+      @java.lang.Override
+      public int getOKCAGDNDEJN() {
+        return oKCAGDNDEJN_;
+      }
+      /**
+       * <code>uint32 OKCAGDNDEJN = 1870;</code>
+       * @param value The oKCAGDNDEJN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOKCAGDNDEJN(int value) {
+        
+        oKCAGDNDEJN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 OKCAGDNDEJN = 1870;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOKCAGDNDEJN() {
+        
+        oKCAGDNDEJN_ = 0;
         onChanged();
         return this;
       }
@@ -2432,27 +2657,26 @@ public final class PlayerEnterSceneNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034PlayerEnterSceneNotify.proto\032\022MapLayer" +
-      "Info.proto\032\014Vector.proto\032\017EnterType.prot" +
-      "o\"\364\003\n\026PlayerEnterSceneNotify\022\032\n\021scene_tr" +
-      "ansaction\030\247\n \001(\t\022&\n\016map_layer_info\030\201\007 \001(" +
-      "\0132\r.MapLayerInfo\022\022\n\nis_skip_ui\030\003 \001(\010\022\025\n\r" +
-      "prev_scene_id\030\t \001(\r\022#\n\032is_first_login_en" +
-      "ter_scene\030\244\001 \001(\010\022\022\n\ntarget_uid\030\001 \001(\r\022\031\n\021" +
-      "scene_tag_id_list\030\r \003(\r\022\031\n\010prev_pos\030\014 \001(" +
-      "\0132\007.Vector\022\031\n\021enter_scene_token\030\007 \001(\r\022\023\n" +
-      "\nworld_type\030\257\n \001(\r\022\030\n\004type\030\006 \001(\0162\n.Enter" +
-      "Type\022\025\n\014enter_reason\030\236\005 \001(\r\022\024\n\003pos\030\016 \001(\013" +
-      "2\007.Vector\022\030\n\020scene_begin_time\030\005 \001(\004\022\024\n\013L" +
-      "AJGLCIFKCP\030\234\016 \001(\r\022\023\n\013world_level\030\004 \001(\r\022\022" +
-      "\n\ndungeon_id\030\013 \001(\r\022\020\n\010scene_id\030\n \001(\r\022\032\n\021" +
-      "create_player_uid\030\324\r \001(\rB\033\n\031emu.grasscut" +
-      "ter.net.protob\006proto3"
+      "\n\034PlayerEnterSceneNotify.proto\032\014Vector.p" +
+      "roto\032\017EnterType.proto\"\204\004\n\026PlayerEnterSce" +
+      "neNotify\022\023\n\013JDNGEPMPFOH\030\001 \001(\010\022\034\n\013MBFONBL" +
+      "MNBL\030\002 \001(\0132\007.Vector\022\023\n\013world_level\030\003 \001(\r" +
+      "\022\022\n\ntarget_uid\030\004 \001(\r\022\030\n\020scene_begin_time" +
+      "\030\005 \001(\004\022\031\n\021scene_tag_id_list\030\006 \003(\r\022\031\n\021ent" +
+      "er_scene_token\030\007 \001(\r\022\022\n\ndungeon_id\030\013 \001(\r" +
+      "\022\023\n\013GPJHAEEMCBK\030\014 \001(\r\022\024\n\003pos\030\r \001(\0132\007.Vec" +
+      "tor\022\020\n\010scene_id\030\016 \001(\r\022\030\n\004type\030\017 \001(\0162\n.En" +
+      "terType\022\024\n\013ALJNJKPMOPB\030\322\002 \001(\r\022\024\n\013EKIBACG" +
+      "BHCJ\030\346\002 \001(\r\022\024\n\013KDHNDLANKNI\030\320\003 \001(\r\022\035\n\013KMD" +
+      "LMKGJIHH\030\210\006 \001(\0132\007.Vector\022\024\n\013GBHGABLFDME\030" +
+      "\260\006 \001(\010\022\024\n\013DDGBKGDECME\030\374\010 \001(\r\022\032\n\021scene_tr" +
+      "ansaction\030\324\013 \001(\t\022\024\n\013KKLADMFLAOE\030\240\r \001(\r\022\024" +
+      "\n\013OKCAGDNDEJN\030\316\016 \001(\rB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor(),
         });
@@ -2461,8 +2685,7 @@ public final class PlayerEnterSceneNotifyOuterClass {
     internal_static_PlayerEnterSceneNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerEnterSceneNotify_descriptor,
-        new java.lang.String[] { "SceneTransaction", "MapLayerInfo", "IsSkipUi", "PrevSceneId", "IsFirstLoginEnterScene", "TargetUid", "SceneTagIdList", "PrevPos", "EnterSceneToken", "WorldType", "Type", "EnterReason", "Pos", "SceneBeginTime", "LAJGLCIFKCP", "WorldLevel", "DungeonId", "SceneId", "CreatePlayerUid", });
-    emu.grasscutter.net.proto.MapLayerInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "JDNGEPMPFOH", "MBFONBLMNBL", "WorldLevel", "TargetUid", "SceneBeginTime", "SceneTagIdList", "EnterSceneToken", "DungeonId", "GPJHAEEMCBK", "Pos", "SceneId", "Type", "ALJNJKPMOPB", "EKIBACGBHCJ", "KDHNDLANKNI", "KMDLMKGJIHH", "GBHGABLFDME", "DDGBKGDECME", "SceneTransaction", "KKLADMFLAOE", "OKCAGDNDEJN", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EnterTypeOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerForceExitReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerForceExitReqOuterClass.java
index 6781df7bf..432c3d445 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerForceExitReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerForceExitReqOuterClass.java
@@ -19,11 +19,6 @@ public final class PlayerForceExitReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 1819
-   * Obf: EAJKGNFALHF
-   * </pre>
-   *
    * Protobuf type {@code PlayerForceExitReq}
    */
   public static final class PlayerForceExitReq extends
@@ -245,11 +240,6 @@ public final class PlayerForceExitReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1819
-     * Obf: EAJKGNFALHF
-     * </pre>
-     *
      * Protobuf type {@code PlayerForceExitReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeByLuaNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeByLuaNotifyOuterClass.java
index 1e9e7496b..4484eab99 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeByLuaNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeByLuaNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 sim_speed = 15;</code>
-     * @return The simSpeed.
-     */
-    int getSimSpeed();
-
-    /**
-     * <code>uint32 uid = 10;</code>
+     * <code>uint32 uid = 3;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>uint32 game_time = 4;</code>
+     * <code>uint32 game_time = 11;</code>
      * @return The gameTime.
      */
     int getGameTime();
+
+    /**
+     * <code>uint32 sim_speed = 13;</code>
+     * @return The simSpeed.
+     */
+    int getSimSpeed();
   }
   /**
-   * <pre>
-   * CmdId: 3419
-   * Obf: DDDJCPOFHBL
-   * </pre>
-   *
    * Protobuf type {@code PlayerGameTimeByLuaNotify}
    */
   public static final class PlayerGameTimeByLuaNotify extends
@@ -86,17 +81,17 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              gameTime_ = input.readUInt32();
-              break;
-            }
-            case 80: {
+            case 24: {
 
               uid_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 88: {
+
+              gameTime_ = input.readUInt32();
+              break;
+            }
+            case 104: {
 
               simSpeed_ = input.readUInt32();
               break;
@@ -133,21 +128,10 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify.class, emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify.Builder.class);
     }
 
-    public static final int SIM_SPEED_FIELD_NUMBER = 15;
-    private int simSpeed_;
-    /**
-     * <code>uint32 sim_speed = 15;</code>
-     * @return The simSpeed.
-     */
-    @java.lang.Override
-    public int getSimSpeed() {
-      return simSpeed_;
-    }
-
-    public static final int UID_FIELD_NUMBER = 10;
+    public static final int UID_FIELD_NUMBER = 3;
     private int uid_;
     /**
-     * <code>uint32 uid = 10;</code>
+     * <code>uint32 uid = 3;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       return uid_;
     }
 
-    public static final int GAME_TIME_FIELD_NUMBER = 4;
+    public static final int GAME_TIME_FIELD_NUMBER = 11;
     private int gameTime_;
     /**
-     * <code>uint32 game_time = 4;</code>
+     * <code>uint32 game_time = 11;</code>
      * @return The gameTime.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       return gameTime_;
     }
 
+    public static final int SIM_SPEED_FIELD_NUMBER = 13;
+    private int simSpeed_;
+    /**
+     * <code>uint32 sim_speed = 13;</code>
+     * @return The simSpeed.
+     */
+    @java.lang.Override
+    public int getSimSpeed() {
+      return simSpeed_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (gameTime_ != 0) {
-        output.writeUInt32(4, gameTime_);
-      }
       if (uid_ != 0) {
-        output.writeUInt32(10, uid_);
+        output.writeUInt32(3, uid_);
+      }
+      if (gameTime_ != 0) {
+        output.writeUInt32(11, gameTime_);
       }
       if (simSpeed_ != 0) {
-        output.writeUInt32(15, simSpeed_);
+        output.writeUInt32(13, simSpeed_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (gameTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, gameTime_);
-      }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, uid_);
+          .computeUInt32Size(3, uid_);
+      }
+      if (gameTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, gameTime_);
       }
       if (simSpeed_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, simSpeed_);
+          .computeUInt32Size(13, simSpeed_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify other = (emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify) obj;
 
-      if (getSimSpeed()
-          != other.getSimSpeed()) return false;
       if (getUid()
           != other.getUid()) return false;
       if (getGameTime()
           != other.getGameTime()) return false;
+      if (getSimSpeed()
+          != other.getSimSpeed()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SIM_SPEED_FIELD_NUMBER;
-      hash = (53 * hash) + getSimSpeed();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
       hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getGameTime();
+      hash = (37 * hash) + SIM_SPEED_FIELD_NUMBER;
+      hash = (53 * hash) + getSimSpeed();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3419
-     * Obf: DDDJCPOFHBL
-     * </pre>
-     *
      * Protobuf type {@code PlayerGameTimeByLuaNotify}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        simSpeed_ = 0;
-
         uid_ = 0;
 
         gameTime_ = 0;
 
+        simSpeed_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify result = new emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify(this);
-        result.simSpeed_ = simSpeed_;
         result.uid_ = uid_;
         result.gameTime_ = gameTime_;
+        result.simSpeed_ = simSpeed_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerGameTimeByLuaNotifyOuterClass.PlayerGameTimeByLuaNotify.getDefaultInstance()) return this;
-        if (other.getSimSpeed() != 0) {
-          setSimSpeed(other.getSimSpeed());
-        }
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
         if (other.getGameTime() != 0) {
           setGameTime(other.getGameTime());
         }
+        if (other.getSimSpeed() != 0) {
+          setSimSpeed(other.getSimSpeed());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +497,9 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         return this;
       }
 
-      private int simSpeed_ ;
-      /**
-       * <code>uint32 sim_speed = 15;</code>
-       * @return The simSpeed.
-       */
-      @java.lang.Override
-      public int getSimSpeed() {
-        return simSpeed_;
-      }
-      /**
-       * <code>uint32 sim_speed = 15;</code>
-       * @param value The simSpeed to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSimSpeed(int value) {
-        
-        simSpeed_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sim_speed = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSimSpeed() {
-        
-        simSpeed_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int uid_ ;
       /**
-       * <code>uint32 uid = 10;</code>
+       * <code>uint32 uid = 3;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -548,7 +507,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 10;</code>
+       * <code>uint32 uid = 3;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -559,7 +518,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 10;</code>
+       * <code>uint32 uid = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -571,7 +530,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
 
       private int gameTime_ ;
       /**
-       * <code>uint32 game_time = 4;</code>
+       * <code>uint32 game_time = 11;</code>
        * @return The gameTime.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         return gameTime_;
       }
       /**
-       * <code>uint32 game_time = 4;</code>
+       * <code>uint32 game_time = 11;</code>
        * @param value The gameTime to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 game_time = 4;</code>
+       * <code>uint32 game_time = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearGameTime() {
@@ -599,6 +558,37 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private int simSpeed_ ;
+      /**
+       * <code>uint32 sim_speed = 13;</code>
+       * @return The simSpeed.
+       */
+      @java.lang.Override
+      public int getSimSpeed() {
+        return simSpeed_;
+      }
+      /**
+       * <code>uint32 sim_speed = 13;</code>
+       * @param value The simSpeed to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSimSpeed(int value) {
+        
+        simSpeed_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 sim_speed = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSimSpeed() {
+        
+        simSpeed_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037PlayerGameTimeByLuaNotify.proto\"N\n\031Pla" +
-      "yerGameTimeByLuaNotify\022\021\n\tsim_speed\030\017 \001(" +
-      "\r\022\013\n\003uid\030\n \001(\r\022\021\n\tgame_time\030\004 \001(\rB\033\n\031emu" +
+      "yerGameTimeByLuaNotify\022\013\n\003uid\030\003 \001(\r\022\021\n\tg" +
+      "ame_time\030\013 \001(\r\022\021\n\tsim_speed\030\r \001(\rB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class PlayerGameTimeByLuaNotifyOuterClass {
     internal_static_PlayerGameTimeByLuaNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerGameTimeByLuaNotify_descriptor,
-        new java.lang.String[] { "SimSpeed", "Uid", "GameTime", });
+        new java.lang.String[] { "Uid", "GameTime", "SimSpeed", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 681781938..de6aa362c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGameTimeNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class PlayerGameTimeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 game_time = 6;</code>
+     * <code>uint32 game_time = 4;</code>
      * @return The gameTime.
      */
     int getGameTime();
 
     /**
-     * <code>bool is_home = 7;</code>
+     * <code>bool is_home = 9;</code>
      * @return The isHome.
      */
     boolean getIsHome();
 
     /**
-     * <code>uint32 uid = 11;</code>
+     * <code>uint32 uid = 15;</code>
      * @return The uid.
      */
     int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 22433
-   * Obf: OHHGGBKDLPI
-   * </pre>
-   *
    * Protobuf type {@code PlayerGameTimeNotify}
    */
   public static final class PlayerGameTimeNotify extends
@@ -86,17 +81,17 @@ public final class PlayerGameTimeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 32: {
 
               gameTime_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 72: {
 
               isHome_ = input.readBool();
               break;
             }
-            case 88: {
+            case 120: {
 
               uid_ = input.readUInt32();
               break;
@@ -133,10 +128,10 @@ public final class PlayerGameTimeNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.class, emu.grasscutter.net.proto.PlayerGameTimeNotifyOuterClass.PlayerGameTimeNotify.Builder.class);
     }
 
-    public static final int GAME_TIME_FIELD_NUMBER = 6;
+    public static final int GAME_TIME_FIELD_NUMBER = 4;
     private int gameTime_;
     /**
-     * <code>uint32 game_time = 6;</code>
+     * <code>uint32 game_time = 4;</code>
      * @return The gameTime.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class PlayerGameTimeNotifyOuterClass {
       return gameTime_;
     }
 
-    public static final int IS_HOME_FIELD_NUMBER = 7;
+    public static final int IS_HOME_FIELD_NUMBER = 9;
     private boolean isHome_;
     /**
-     * <code>bool is_home = 7;</code>
+     * <code>bool is_home = 9;</code>
      * @return The isHome.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class PlayerGameTimeNotifyOuterClass {
       return isHome_;
     }
 
-    public static final int UID_FIELD_NUMBER = 11;
+    public static final int UID_FIELD_NUMBER = 15;
     private int uid_;
     /**
-     * <code>uint32 uid = 11;</code>
+     * <code>uint32 uid = 15;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class PlayerGameTimeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (gameTime_ != 0) {
-        output.writeUInt32(6, gameTime_);
+        output.writeUInt32(4, gameTime_);
       }
       if (isHome_ != false) {
-        output.writeBool(7, isHome_);
+        output.writeBool(9, isHome_);
       }
       if (uid_ != 0) {
-        output.writeUInt32(11, uid_);
+        output.writeUInt32(15, uid_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class PlayerGameTimeNotifyOuterClass {
       size = 0;
       if (gameTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, gameTime_);
+          .computeUInt32Size(4, gameTime_);
       }
       if (isHome_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isHome_);
+          .computeBoolSize(9, isHome_);
       }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, uid_);
+          .computeUInt32Size(15, uid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class PlayerGameTimeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22433
-     * Obf: OHHGGBKDLPI
-     * </pre>
-     *
      * Protobuf type {@code PlayerGameTimeNotify}
      */
     public static final class Builder extends
@@ -510,7 +500,7 @@ public final class PlayerGameTimeNotifyOuterClass {
 
       private int gameTime_ ;
       /**
-       * <code>uint32 game_time = 6;</code>
+       * <code>uint32 game_time = 4;</code>
        * @return The gameTime.
        */
       @java.lang.Override
@@ -518,7 +508,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return gameTime_;
       }
       /**
-       * <code>uint32 game_time = 6;</code>
+       * <code>uint32 game_time = 4;</code>
        * @param value The gameTime to set.
        * @return This builder for chaining.
        */
@@ -529,7 +519,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 game_time = 6;</code>
+       * <code>uint32 game_time = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearGameTime() {
@@ -541,7 +531,7 @@ public final class PlayerGameTimeNotifyOuterClass {
 
       private boolean isHome_ ;
       /**
-       * <code>bool is_home = 7;</code>
+       * <code>bool is_home = 9;</code>
        * @return The isHome.
        */
       @java.lang.Override
@@ -549,7 +539,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return isHome_;
       }
       /**
-       * <code>bool is_home = 7;</code>
+       * <code>bool is_home = 9;</code>
        * @param value The isHome to set.
        * @return This builder for chaining.
        */
@@ -560,7 +550,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_home = 7;</code>
+       * <code>bool is_home = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsHome() {
@@ -572,7 +562,7 @@ public final class PlayerGameTimeNotifyOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 11;</code>
+       * <code>uint32 uid = 15;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 11;</code>
+       * <code>uint32 uid = 15;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class PlayerGameTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 11;</code>
+       * <code>uint32 uid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -668,8 +658,8 @@ public final class PlayerGameTimeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerGameTimeNotify.proto\"G\n\024PlayerGa" +
-      "meTimeNotify\022\021\n\tgame_time\030\006 \001(\r\022\017\n\007is_ho" +
-      "me\030\007 \001(\010\022\013\n\003uid\030\013 \001(\rB\033\n\031emu.grasscutter" +
+      "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" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
index e8c818c5e..d5ea0159e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerGetForceQuitBanInfoRspOuterClass.java
@@ -19,29 +19,24 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 match_id = 6;</code>
+     * <code>uint32 match_id = 2;</code>
      * @return The matchId.
      */
     int getMatchId();
 
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 expire_time = 3;</code>
+     * <code>uint32 expire_time = 14;</code>
      * @return The expireTime.
      */
     int getExpireTime();
   }
   /**
-   * <pre>
-   * CmdId: 8368
-   * Obf: CMGBPGFCJDL
-   * </pre>
-   *
    * Protobuf type {@code PlayerGetForceQuitBanInfoRsp}
    */
   public static final class PlayerGetForceQuitBanInfoRsp extends
@@ -86,21 +81,21 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              expireTime_ = input.readUInt32();
-              break;
-            }
-            case 48: {
+            case 16: {
 
               matchId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 112: {
+
+              expireTime_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
               emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp.class, emu.grasscutter.net.proto.PlayerGetForceQuitBanInfoRspOuterClass.PlayerGetForceQuitBanInfoRsp.Builder.class);
     }
 
-    public static final int MATCH_ID_FIELD_NUMBER = 6;
+    public static final int MATCH_ID_FIELD_NUMBER = 2;
     private int matchId_;
     /**
-     * <code>uint32 match_id = 6;</code>
+     * <code>uint32 match_id = 2;</code>
      * @return The matchId.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
       return matchId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int RETCODE_FIELD_NUMBER = 9;
     private int retcode_;
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
       return retcode_;
     }
 
-    public static final int EXPIRE_TIME_FIELD_NUMBER = 3;
+    public static final int EXPIRE_TIME_FIELD_NUMBER = 14;
     private int expireTime_;
     /**
-     * <code>uint32 expire_time = 3;</code>
+     * <code>uint32 expire_time = 14;</code>
      * @return The expireTime.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (expireTime_ != 0) {
-        output.writeUInt32(3, expireTime_);
-      }
       if (matchId_ != 0) {
-        output.writeUInt32(6, matchId_);
+        output.writeUInt32(2, matchId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(9, retcode_);
+      }
+      if (expireTime_ != 0) {
+        output.writeUInt32(14, expireTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (expireTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, expireTime_);
-      }
       if (matchId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, matchId_);
+          .computeUInt32Size(2, matchId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(9, retcode_);
+      }
+      if (expireTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, expireTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,11 +339,6 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8368
-     * Obf: CMGBPGFCJDL
-     * </pre>
-     *
      * Protobuf type {@code PlayerGetForceQuitBanInfoRsp}
      */
     public static final class Builder extends
@@ -509,7 +499,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
 
       private int matchId_ ;
       /**
-       * <code>uint32 match_id = 6;</code>
+       * <code>uint32 match_id = 2;</code>
        * @return The matchId.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return matchId_;
       }
       /**
-       * <code>uint32 match_id = 6;</code>
+       * <code>uint32 match_id = 2;</code>
        * @param value The matchId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 match_id = 6;</code>
+       * <code>uint32 match_id = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearMatchId() {
@@ -540,7 +530,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 9;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -548,7 +538,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 9;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -559,7 +549,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -571,7 +561,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
 
       private int expireTime_ ;
       /**
-       * <code>uint32 expire_time = 3;</code>
+       * <code>uint32 expire_time = 14;</code>
        * @return The expireTime.
        */
       @java.lang.Override
@@ -579,7 +569,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return expireTime_;
       }
       /**
-       * <code>uint32 expire_time = 3;</code>
+       * <code>uint32 expire_time = 14;</code>
        * @param value The expireTime to set.
        * @return This builder for chaining.
        */
@@ -590,7 +580,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 expire_time = 3;</code>
+       * <code>uint32 expire_time = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearExpireTime() {
@@ -668,7 +658,7 @@ public final class PlayerGetForceQuitBanInfoRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"PlayerGetForceQuitBanInfoRsp.proto\"V\n\034" +
       "PlayerGetForceQuitBanInfoRsp\022\020\n\010match_id" +
-      "\030\006 \001(\r\022\017\n\007retcode\030\014 \001(\005\022\023\n\013expire_time\030\003" +
+      "\030\002 \001(\r\022\017\n\007retcode\030\t \001(\005\022\023\n\013expire_time\030\016" +
       " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoNotifyOuterClass.java
index 88ab91829..326a52271 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      * @return Whether the compInfo field is set.
      */
     boolean hasCompInfo();
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      * @return The compInfo.
      */
     emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo getCompInfo();
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      */
     emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfoOrBuilder getCompInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 365
-   * Obf: JIGJFLJCOGP
-   * </pre>
-   *
    * Protobuf type {@code PlayerHomeCompInfoNotify}
    */
   public static final class PlayerHomeCompInfoNotify extends
@@ -83,7 +78,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 34: {
               emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder subBuilder = null;
               if (compInfo_ != null) {
                 subBuilder = compInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerHomeCompInfoNotifyOuterClass.PlayerHomeCompInfoNotify.class, emu.grasscutter.net.proto.PlayerHomeCompInfoNotifyOuterClass.PlayerHomeCompInfoNotify.Builder.class);
     }
 
-    public static final int COMP_INFO_FIELD_NUMBER = 2;
+    public static final int COMP_INFO_FIELD_NUMBER = 4;
     private emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo compInfo_;
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      * @return Whether the compInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       return compInfo_ != null;
     }
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      * @return The compInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       return compInfo_ == null ? emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.getDefaultInstance() : compInfo_;
     }
     /**
-     * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+     * <code>.PlayerHomeCompInfo comp_info = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfoOrBuilder getCompInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (compInfo_ != null) {
-        output.writeMessage(2, getCompInfo());
+        output.writeMessage(4, getCompInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       size = 0;
       if (compInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, getCompInfo());
+          .computeMessageSize(4, getCompInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 365
-     * Obf: JIGJFLJCOGP
-     * </pre>
-     *
      * Protobuf type {@code PlayerHomeCompInfoNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfoOrBuilder> compInfoBuilder_;
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        * @return Whether the compInfo field is set.
        */
       public boolean hasCompInfo() {
         return compInfoBuilder_ != null || compInfo_ != null;
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        * @return The compInfo.
        */
       public emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo getCompInfo() {
@@ -496,7 +486,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public Builder setCompInfo(emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo value) {
         if (compInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public Builder setCompInfo(
           emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public Builder mergeCompInfo(emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo value) {
         if (compInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public Builder clearCompInfo() {
         if (compInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder getCompInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         return getCompInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       public emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfoOrBuilder getCompInfoOrBuilder() {
         if (compInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>.PlayerHomeCompInfo comp_info = 2;</code>
+       * <code>.PlayerHomeCompInfo comp_info = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfoOrBuilder> 
@@ -661,7 +651,7 @@ public final class PlayerHomeCompInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036PlayerHomeCompInfoNotify.proto\032\030Player" +
       "HomeCompInfo.proto\"B\n\030PlayerHomeCompInfo" +
-      "Notify\022&\n\tcomp_info\030\002 \001(\0132\023.PlayerHomeCo" +
+      "Notify\022&\n\tcomp_info\030\004 \001(\0132\023.PlayerHomeCo" +
       "mpInfoB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
index 0cb83da39..6c7c80af4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerHomeCompInfoOuterClass.java
@@ -19,72 +19,68 @@ public final class PlayerHomeCompInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return A list containing the levelupRewardGotLevelList.
+     * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
+     * @return The enum numeric value on the wire for friendEnterHomeOption.
      */
-    java.util.List<java.lang.Integer> getLevelupRewardGotLevelListList();
+    int getFriendEnterHomeOptionValue();
     /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return The count of levelupRewardGotLevelList.
+     * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
+     * @return The friendEnterHomeOption.
      */
-    int getLevelupRewardGotLevelListCount();
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The levelupRewardGotLevelList at the given index.
-     */
-    int getLevelupRewardGotLevelList(int index);
+    emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getFriendEnterHomeOption();
 
     /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @return A list containing the unlockedModuleIdList.
-     */
-    java.util.List<java.lang.Integer> getUnlockedModuleIdListList();
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @return The count of unlockedModuleIdList.
-     */
-    int getUnlockedModuleIdListCount();
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedModuleIdList at the given index.
-     */
-    int getUnlockedModuleIdList(int index);
-
-    /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @return A list containing the seenModuleIdList.
      */
     java.util.List<java.lang.Integer> getSeenModuleIdListList();
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @return The count of seenModuleIdList.
      */
     int getSeenModuleIdListCount();
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
     int getSeenModuleIdList(int index);
 
     /**
-     * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
-     * @return The enum numeric value on the wire for friendEnterHomeOption.
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @return A list containing the unlockedModuleIdList.
      */
-    int getFriendEnterHomeOptionValue();
+    java.util.List<java.lang.Integer> getUnlockedModuleIdListList();
     /**
-     * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
-     * @return The friendEnterHomeOption.
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @return The count of unlockedModuleIdList.
      */
-    emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getFriendEnterHomeOption();
+    int getUnlockedModuleIdListCount();
+    /**
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedModuleIdList at the given index.
+     */
+    int getUnlockedModuleIdList(int index);
+
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @return A list containing the levelupRewardGotLevelList.
+     */
+    java.util.List<java.lang.Integer> getLevelupRewardGotLevelListList();
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @return The count of levelupRewardGotLevelList.
+     */
+    int getLevelupRewardGotLevelListCount();
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The levelupRewardGotLevelList at the given index.
+     */
+    int getLevelupRewardGotLevelList(int index);
   }
   /**
-   * <pre>
-   * Obf: GJLOEDNEKNN
-   * </pre>
-   *
    * Protobuf type {@code PlayerHomeCompInfo}
    */
   public static final class PlayerHomeCompInfo extends
@@ -97,10 +93,10 @@ public final class PlayerHomeCompInfoOuterClass {
       super(builder);
     }
     private PlayerHomeCompInfo() {
-      levelupRewardGotLevelList_ = emptyIntList();
-      unlockedModuleIdList_ = emptyIntList();
-      seenModuleIdList_ = emptyIntList();
       friendEnterHomeOption_ = 0;
+      seenModuleIdList_ = emptyIntList();
+      unlockedModuleIdList_ = emptyIntList();
+      levelupRewardGotLevelList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -134,41 +130,26 @@ public final class PlayerHomeCompInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                levelupRewardGotLevelList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              levelupRewardGotLevelList_.addInt(input.readUInt32());
-              break;
-            }
-            case 26: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                levelupRewardGotLevelList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                levelupRewardGotLevelList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
             case 64: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+              int rawValue = input.readEnum();
+
+              friendEnterHomeOption_ = rawValue;
+              break;
+            }
+            case 80: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 seenModuleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               seenModuleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 66: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
                 seenModuleIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 seenModuleIdList_.addInt(input.readUInt32());
@@ -176,7 +157,7 @@ public final class PlayerHomeCompInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 80: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 unlockedModuleIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -184,7 +165,7 @@ public final class PlayerHomeCompInfoOuterClass {
               unlockedModuleIdList_.addInt(input.readUInt32());
               break;
             }
-            case 82: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -197,10 +178,25 @@ public final class PlayerHomeCompInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
-              int rawValue = input.readEnum();
-
-              friendEnterHomeOption_ = rawValue;
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                levelupRewardGotLevelList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              levelupRewardGotLevelList_.addInt(input.readUInt32());
+              break;
+            }
+            case 98: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                levelupRewardGotLevelList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                levelupRewardGotLevelList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
               break;
             }
             default: {
@@ -219,14 +215,14 @@ public final class PlayerHomeCompInfoOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           seenModuleIdList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           unlockedModuleIdList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          levelupRewardGotLevelList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -244,66 +240,29 @@ public final class PlayerHomeCompInfoOuterClass {
               emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.class, emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.Builder.class);
     }
 
-    public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_;
+    public static final int FRIEND_ENTER_HOME_OPTION_FIELD_NUMBER = 8;
+    private int friendEnterHomeOption_;
     /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return A list containing the levelupRewardGotLevelList.
+     * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
+     * @return The enum numeric value on the wire for friendEnterHomeOption.
      */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getLevelupRewardGotLevelListList() {
-      return levelupRewardGotLevelList_;
+    @java.lang.Override public int getFriendEnterHomeOptionValue() {
+      return friendEnterHomeOption_;
     }
     /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @return The count of levelupRewardGotLevelList.
+     * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
+     * @return The friendEnterHomeOption.
      */
-    public int getLevelupRewardGotLevelListCount() {
-      return levelupRewardGotLevelList_.size();
+    @java.lang.Override public emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getFriendEnterHomeOption() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption result = emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.valueOf(friendEnterHomeOption_);
+      return result == null ? emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.UNRECOGNIZED : result;
     }
-    /**
-     * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The levelupRewardGotLevelList at the given index.
-     */
-    public int getLevelupRewardGotLevelList(int index) {
-      return levelupRewardGotLevelList_.getInt(index);
-    }
-    private int levelupRewardGotLevelListMemoizedSerializedSize = -1;
 
-    public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList unlockedModuleIdList_;
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @return A list containing the unlockedModuleIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getUnlockedModuleIdListList() {
-      return unlockedModuleIdList_;
-    }
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @return The count of unlockedModuleIdList.
-     */
-    public int getUnlockedModuleIdListCount() {
-      return unlockedModuleIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The unlockedModuleIdList at the given index.
-     */
-    public int getUnlockedModuleIdList(int index) {
-      return unlockedModuleIdList_.getInt(index);
-    }
-    private int unlockedModuleIdListMemoizedSerializedSize = -1;
-
-    public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 8;
+    public static final int SEEN_MODULE_ID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList seenModuleIdList_;
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @return A list containing the seenModuleIdList.
      */
     @java.lang.Override
@@ -312,14 +271,14 @@ public final class PlayerHomeCompInfoOuterClass {
       return seenModuleIdList_;
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @return The count of seenModuleIdList.
      */
     public int getSeenModuleIdListCount() {
       return seenModuleIdList_.size();
     }
     /**
-     * <code>repeated uint32 seen_module_id_list = 8;</code>
+     * <code>repeated uint32 seen_module_id_list = 10;</code>
      * @param index The index of the element to return.
      * @return The seenModuleIdList at the given index.
      */
@@ -328,24 +287,61 @@ public final class PlayerHomeCompInfoOuterClass {
     }
     private int seenModuleIdListMemoizedSerializedSize = -1;
 
-    public static final int FRIEND_ENTER_HOME_OPTION_FIELD_NUMBER = 15;
-    private int friendEnterHomeOption_;
+    public static final int UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.IntList unlockedModuleIdList_;
     /**
-     * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
-     * @return The enum numeric value on the wire for friendEnterHomeOption.
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @return A list containing the unlockedModuleIdList.
      */
-    @java.lang.Override public int getFriendEnterHomeOptionValue() {
-      return friendEnterHomeOption_;
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnlockedModuleIdListList() {
+      return unlockedModuleIdList_;
     }
     /**
-     * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
-     * @return The friendEnterHomeOption.
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @return The count of unlockedModuleIdList.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getFriendEnterHomeOption() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption result = emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.valueOf(friendEnterHomeOption_);
-      return result == null ? emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.UNRECOGNIZED : result;
+    public int getUnlockedModuleIdListCount() {
+      return unlockedModuleIdList_.size();
     }
+    /**
+     * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The unlockedModuleIdList at the given index.
+     */
+    public int getUnlockedModuleIdList(int index) {
+      return unlockedModuleIdList_.getInt(index);
+    }
+    private int unlockedModuleIdListMemoizedSerializedSize = -1;
+
+    public static final int LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_;
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @return A list containing the levelupRewardGotLevelList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLevelupRewardGotLevelListList() {
+      return levelupRewardGotLevelList_;
+    }
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @return The count of levelupRewardGotLevelList.
+     */
+    public int getLevelupRewardGotLevelListCount() {
+      return levelupRewardGotLevelList_.size();
+    }
+    /**
+     * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+     * @param index The index of the element to return.
+     * @return The levelupRewardGotLevelList at the given index.
+     */
+    public int getLevelupRewardGotLevelList(int index) {
+      return levelupRewardGotLevelList_.getInt(index);
+    }
+    private int levelupRewardGotLevelListMemoizedSerializedSize = -1;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -362,29 +358,29 @@ public final class PlayerHomeCompInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (getLevelupRewardGotLevelListList().size() > 0) {
-        output.writeUInt32NoTag(26);
-        output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
-        output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i));
+      if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
+        output.writeEnum(8, friendEnterHomeOption_);
       }
       if (getSeenModuleIdListList().size() > 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(seenModuleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < seenModuleIdList_.size(); i++) {
         output.writeUInt32NoTag(seenModuleIdList_.getInt(i));
       }
       if (getUnlockedModuleIdListList().size() > 0) {
-        output.writeUInt32NoTag(82);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(unlockedModuleIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < unlockedModuleIdList_.size(); i++) {
         output.writeUInt32NoTag(unlockedModuleIdList_.getInt(i));
       }
-      if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
-        output.writeEnum(15, friendEnterHomeOption_);
+      if (getLevelupRewardGotLevelListList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(levelupRewardGotLevelListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
+        output.writeUInt32NoTag(levelupRewardGotLevelList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -395,19 +391,9 @@ public final class PlayerHomeCompInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      {
-        int dataSize = 0;
-        for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getLevelupRewardGotLevelListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        levelupRewardGotLevelListMemoizedSerializedSize = dataSize;
+      if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(8, friendEnterHomeOption_);
       }
       {
         int dataSize = 0;
@@ -437,9 +423,19 @@ public final class PlayerHomeCompInfoOuterClass {
         }
         unlockedModuleIdListMemoizedSerializedSize = dataSize;
       }
-      if (friendEnterHomeOption_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, friendEnterHomeOption_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < levelupRewardGotLevelList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(levelupRewardGotLevelList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getLevelupRewardGotLevelListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        levelupRewardGotLevelListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -456,13 +452,13 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other = (emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo) obj;
 
-      if (!getLevelupRewardGotLevelListList()
-          .equals(other.getLevelupRewardGotLevelListList())) return false;
-      if (!getUnlockedModuleIdListList()
-          .equals(other.getUnlockedModuleIdListList())) return false;
+      if (friendEnterHomeOption_ != other.friendEnterHomeOption_) return false;
       if (!getSeenModuleIdListList()
           .equals(other.getSeenModuleIdListList())) return false;
-      if (friendEnterHomeOption_ != other.friendEnterHomeOption_) return false;
+      if (!getUnlockedModuleIdListList()
+          .equals(other.getUnlockedModuleIdListList())) return false;
+      if (!getLevelupRewardGotLevelListList()
+          .equals(other.getLevelupRewardGotLevelListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -474,20 +470,20 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getLevelupRewardGotLevelListCount() > 0) {
-        hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode();
+      hash = (37 * hash) + FRIEND_ENTER_HOME_OPTION_FIELD_NUMBER;
+      hash = (53 * hash) + friendEnterHomeOption_;
+      if (getSeenModuleIdListCount() > 0) {
+        hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getSeenModuleIdListList().hashCode();
       }
       if (getUnlockedModuleIdListCount() > 0) {
         hash = (37 * hash) + UNLOCKED_MODULE_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUnlockedModuleIdListList().hashCode();
       }
-      if (getSeenModuleIdListCount() > 0) {
-        hash = (37 * hash) + SEEN_MODULE_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getSeenModuleIdListList().hashCode();
+      if (getLevelupRewardGotLevelListCount() > 0) {
+        hash = (37 * hash) + LEVELUP_REWARD_GOT_LEVEL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getLevelupRewardGotLevelListList().hashCode();
       }
-      hash = (37 * hash) + FRIEND_ENTER_HOME_OPTION_FIELD_NUMBER;
-      hash = (53 * hash) + friendEnterHomeOption_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -584,10 +580,6 @@ public final class PlayerHomeCompInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: GJLOEDNEKNN
-     * </pre>
-     *
      * Protobuf type {@code PlayerHomeCompInfo}
      */
     public static final class Builder extends
@@ -625,14 +617,14 @@ public final class PlayerHomeCompInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        levelupRewardGotLevelList_ = emptyIntList();
+        friendEnterHomeOption_ = 0;
+
+        seenModuleIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         unlockedModuleIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
-        seenModuleIdList_ = emptyIntList();
+        levelupRewardGotLevelList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        friendEnterHomeOption_ = 0;
-
         return this;
       }
 
@@ -660,22 +652,22 @@ public final class PlayerHomeCompInfoOuterClass {
       public emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo buildPartial() {
         emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo result = new emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo(this);
         int from_bitField0_ = bitField0_;
+        result.friendEnterHomeOption_ = friendEnterHomeOption_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_.makeImmutable();
+          seenModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_;
+        result.seenModuleIdList_ = seenModuleIdList_;
         if (((bitField0_ & 0x00000002) != 0)) {
           unlockedModuleIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.unlockedModuleIdList_ = unlockedModuleIdList_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          seenModuleIdList_.makeImmutable();
+          levelupRewardGotLevelList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.seenModuleIdList_ = seenModuleIdList_;
-        result.friendEnterHomeOption_ = friendEnterHomeOption_;
+        result.levelupRewardGotLevelList_ = levelupRewardGotLevelList_;
         onBuilt();
         return result;
       }
@@ -724,13 +716,16 @@ public final class PlayerHomeCompInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo other) {
         if (other == emu.grasscutter.net.proto.PlayerHomeCompInfoOuterClass.PlayerHomeCompInfo.getDefaultInstance()) return this;
-        if (!other.levelupRewardGotLevelList_.isEmpty()) {
-          if (levelupRewardGotLevelList_.isEmpty()) {
-            levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_;
+        if (other.friendEnterHomeOption_ != 0) {
+          setFriendEnterHomeOptionValue(other.getFriendEnterHomeOptionValue());
+        }
+        if (!other.seenModuleIdList_.isEmpty()) {
+          if (seenModuleIdList_.isEmpty()) {
+            seenModuleIdList_ = other.seenModuleIdList_;
             bitField0_ = (bitField0_ & ~0x00000001);
           } else {
-            ensureLevelupRewardGotLevelListIsMutable();
-            levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_);
+            ensureSeenModuleIdListIsMutable();
+            seenModuleIdList_.addAll(other.seenModuleIdList_);
           }
           onChanged();
         }
@@ -744,19 +739,16 @@ public final class PlayerHomeCompInfoOuterClass {
           }
           onChanged();
         }
-        if (!other.seenModuleIdList_.isEmpty()) {
-          if (seenModuleIdList_.isEmpty()) {
-            seenModuleIdList_ = other.seenModuleIdList_;
+        if (!other.levelupRewardGotLevelList_.isEmpty()) {
+          if (levelupRewardGotLevelList_.isEmpty()) {
+            levelupRewardGotLevelList_ = other.levelupRewardGotLevelList_;
             bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureSeenModuleIdListIsMutable();
-            seenModuleIdList_.addAll(other.seenModuleIdList_);
+            ensureLevelupRewardGotLevelListIsMutable();
+            levelupRewardGotLevelList_.addAll(other.levelupRewardGotLevelList_);
           }
           onChanged();
         }
-        if (other.friendEnterHomeOption_ != 0) {
-          setFriendEnterHomeOptionValue(other.getFriendEnterHomeOptionValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -787,253 +779,16 @@ public final class PlayerHomeCompInfoOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList();
-      private void ensureLevelupRewardGotLevelListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @return A list containing the levelupRewardGotLevelList.
-       */
-      public java.util.List<java.lang.Integer>
-          getLevelupRewardGotLevelListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @return The count of levelupRewardGotLevelList.
-       */
-      public int getLevelupRewardGotLevelListCount() {
-        return levelupRewardGotLevelList_.size();
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The levelupRewardGotLevelList at the given index.
-       */
-      public int getLevelupRewardGotLevelList(int index) {
-        return levelupRewardGotLevelList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The levelupRewardGotLevelList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLevelupRewardGotLevelList(
-          int index, int value) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        levelupRewardGotLevelList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param value The levelupRewardGotLevelList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addLevelupRewardGotLevelList(int value) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        levelupRewardGotLevelList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @param values The levelupRewardGotLevelList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLevelupRewardGotLevelList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLevelupRewardGotLevelListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, levelupRewardGotLevelList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 levelup_reward_got_level_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLevelupRewardGotLevelList() {
-        levelupRewardGotLevelList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList();
-      private void ensureUnlockedModuleIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @return A list containing the unlockedModuleIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getUnlockedModuleIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(unlockedModuleIdList_) : unlockedModuleIdList_;
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @return The count of unlockedModuleIdList.
-       */
-      public int getUnlockedModuleIdListCount() {
-        return unlockedModuleIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @param index The index of the element to return.
-       * @return The unlockedModuleIdList at the given index.
-       */
-      public int getUnlockedModuleIdList(int index) {
-        return unlockedModuleIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The unlockedModuleIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUnlockedModuleIdList(
-          int index, int value) {
-        ensureUnlockedModuleIdListIsMutable();
-        unlockedModuleIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @param value The unlockedModuleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addUnlockedModuleIdList(int value) {
-        ensureUnlockedModuleIdListIsMutable();
-        unlockedModuleIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @param values The unlockedModuleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllUnlockedModuleIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureUnlockedModuleIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, unlockedModuleIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 unlocked_module_id_list = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUnlockedModuleIdList() {
-        unlockedModuleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList seenModuleIdList_ = emptyIntList();
-      private void ensureSeenModuleIdListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          seenModuleIdList_ = mutableCopy(seenModuleIdList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @return A list containing the seenModuleIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getSeenModuleIdListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(seenModuleIdList_) : seenModuleIdList_;
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @return The count of seenModuleIdList.
-       */
-      public int getSeenModuleIdListCount() {
-        return seenModuleIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @param index The index of the element to return.
-       * @return The seenModuleIdList at the given index.
-       */
-      public int getSeenModuleIdList(int index) {
-        return seenModuleIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @param index The index to set the value at.
-       * @param value The seenModuleIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSeenModuleIdList(
-          int index, int value) {
-        ensureSeenModuleIdListIsMutable();
-        seenModuleIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @param value The seenModuleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addSeenModuleIdList(int value) {
-        ensureSeenModuleIdListIsMutable();
-        seenModuleIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @param values The seenModuleIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllSeenModuleIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureSeenModuleIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, seenModuleIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 seen_module_id_list = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSeenModuleIdList() {
-        seenModuleIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
       private int friendEnterHomeOption_ = 0;
       /**
-       * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
+       * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
        * @return The enum numeric value on the wire for friendEnterHomeOption.
        */
       @java.lang.Override public int getFriendEnterHomeOptionValue() {
         return friendEnterHomeOption_;
       }
       /**
-       * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
+       * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
        * @param value The enum numeric value on the wire for friendEnterHomeOption to set.
        * @return This builder for chaining.
        */
@@ -1044,7 +799,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return this;
       }
       /**
-       * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
+       * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
        * @return The friendEnterHomeOption.
        */
       @java.lang.Override
@@ -1054,7 +809,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return result == null ? emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.UNRECOGNIZED : result;
       }
       /**
-       * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
+       * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
        * @param value The friendEnterHomeOption to set.
        * @return This builder for chaining.
        */
@@ -1068,7 +823,7 @@ public final class PlayerHomeCompInfoOuterClass {
         return this;
       }
       /**
-       * <code>.FriendEnterHomeOption friend_enter_home_option = 15;</code>
+       * <code>.FriendEnterHomeOption friend_enter_home_option = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearFriendEnterHomeOption() {
@@ -1077,6 +832,243 @@ public final class PlayerHomeCompInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList seenModuleIdList_ = emptyIntList();
+      private void ensureSeenModuleIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          seenModuleIdList_ = mutableCopy(seenModuleIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @return A list containing the seenModuleIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getSeenModuleIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(seenModuleIdList_) : seenModuleIdList_;
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @return The count of seenModuleIdList.
+       */
+      public int getSeenModuleIdListCount() {
+        return seenModuleIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @param index The index of the element to return.
+       * @return The seenModuleIdList at the given index.
+       */
+      public int getSeenModuleIdList(int index) {
+        return seenModuleIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @param index The index to set the value at.
+       * @param value The seenModuleIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSeenModuleIdList(
+          int index, int value) {
+        ensureSeenModuleIdListIsMutable();
+        seenModuleIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @param value The seenModuleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addSeenModuleIdList(int value) {
+        ensureSeenModuleIdListIsMutable();
+        seenModuleIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @param values The seenModuleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllSeenModuleIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureSeenModuleIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, seenModuleIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 seen_module_id_list = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSeenModuleIdList() {
+        seenModuleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList unlockedModuleIdList_ = emptyIntList();
+      private void ensureUnlockedModuleIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          unlockedModuleIdList_ = mutableCopy(unlockedModuleIdList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @return A list containing the unlockedModuleIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnlockedModuleIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(unlockedModuleIdList_) : unlockedModuleIdList_;
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @return The count of unlockedModuleIdList.
+       */
+      public int getUnlockedModuleIdListCount() {
+        return unlockedModuleIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @param index The index of the element to return.
+       * @return The unlockedModuleIdList at the given index.
+       */
+      public int getUnlockedModuleIdList(int index) {
+        return unlockedModuleIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The unlockedModuleIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUnlockedModuleIdList(
+          int index, int value) {
+        ensureUnlockedModuleIdListIsMutable();
+        unlockedModuleIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @param value The unlockedModuleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnlockedModuleIdList(int value) {
+        ensureUnlockedModuleIdListIsMutable();
+        unlockedModuleIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @param values The unlockedModuleIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllUnlockedModuleIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureUnlockedModuleIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, unlockedModuleIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unlocked_module_id_list = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnlockedModuleIdList() {
+        unlockedModuleIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList levelupRewardGotLevelList_ = emptyIntList();
+      private void ensureLevelupRewardGotLevelListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          levelupRewardGotLevelList_ = mutableCopy(levelupRewardGotLevelList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @return A list containing the levelupRewardGotLevelList.
+       */
+      public java.util.List<java.lang.Integer>
+          getLevelupRewardGotLevelListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(levelupRewardGotLevelList_) : levelupRewardGotLevelList_;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @return The count of levelupRewardGotLevelList.
+       */
+      public int getLevelupRewardGotLevelListCount() {
+        return levelupRewardGotLevelList_.size();
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @param index The index of the element to return.
+       * @return The levelupRewardGotLevelList at the given index.
+       */
+      public int getLevelupRewardGotLevelList(int index) {
+        return levelupRewardGotLevelList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The levelupRewardGotLevelList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevelupRewardGotLevelList(
+          int index, int value) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @param value The levelupRewardGotLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLevelupRewardGotLevelList(int value) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        levelupRewardGotLevelList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @param values The levelupRewardGotLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLevelupRewardGotLevelList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLevelupRewardGotLevelListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, levelupRewardGotLevelList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 levelup_reward_got_level_list = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevelupRewardGotLevelList() {
+        levelupRewardGotLevelList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1145,11 +1137,11 @@ public final class PlayerHomeCompInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PlayerHomeCompInfo.proto\032\033FriendEnterH" +
-      "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\022%" +
-      "\n\035levelup_reward_got_level_list\030\003 \003(\r\022\037\n" +
-      "\027unlocked_module_id_list\030\n \003(\r\022\033\n\023seen_m" +
-      "odule_id_list\030\010 \003(\r\0228\n\030friend_enter_home" +
-      "_option\030\017 \001(\0162\026.FriendEnterHomeOptionB\033\n" +
+      "omeOption.proto\"\263\001\n\022PlayerHomeCompInfo\0228" +
+      "\n\030friend_enter_home_option\030\010 \001(\0162\026.Frien" +
+      "dEnterHomeOption\022\033\n\023seen_module_id_list\030" +
+      "\n \003(\r\022\037\n\027unlocked_module_id_list\030\013 \003(\r\022%" +
+      "\n\035levelup_reward_got_level_list\030\014 \003(\rB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1162,7 +1154,7 @@ public final class PlayerHomeCompInfoOuterClass {
     internal_static_PlayerHomeCompInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerHomeCompInfo_descriptor,
-        new java.lang.String[] { "LevelupRewardGotLevelList", "UnlockedModuleIdList", "SeenModuleIdList", "FriendEnterHomeOption", });
+        new java.lang.String[] { "FriendEnterHomeOption", "SeenModuleIdList", "UnlockedModuleIdList", "LevelupRewardGotLevelList", });
     emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationAllInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationAllInfoNotifyOuterClass.java
index ccd9919e5..4cba13e40 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationAllInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationAllInfoNotifyOuterClass.java
@@ -19,59 +19,54 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> 
-        getInvestigationListList();
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index);
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    int getInvestigationListCount();
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
-        getInvestigationListOrBuilderList();
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> 
         getInvestigationTargetListList();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index);
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     int getInvestigationTargetListCount();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
         getInvestigationTargetListOrBuilderList();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
         int index);
+
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> 
+        getInvestigationListList();
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index);
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    int getInvestigationListCount();
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
+        getInvestigationListOrBuilderList();
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * CmdId: 23777
-   * Obf: AOFKNKKENHJ
-   * </pre>
-   *
    * Protobuf type {@code PlayerInvestigationAllInfoNotify}
    */
   public static final class PlayerInvestigationAllInfoNotify extends
@@ -84,8 +79,8 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       super(builder);
     }
     private PlayerInvestigationAllInfoNotify() {
-      investigationList_ = java.util.Collections.emptyList();
       investigationTargetList_ = java.util.Collections.emptyList();
+      investigationList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -119,24 +114,24 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              investigationList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.parser(), extensionRegistry));
-              break;
-            }
-            case 114: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 investigationTargetList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               investigationTargetList_.add(
                   input.readMessage(emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.parser(), extensionRegistry));
               break;
             }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              investigationList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -153,10 +148,10 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          investigationList_ = java.util.Collections.unmodifiableList(investigationList_);
+          investigationTargetList_ = java.util.Collections.unmodifiableList(investigationTargetList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          investigationTargetList_ = java.util.Collections.unmodifiableList(investigationTargetList_);
+          investigationList_ = java.util.Collections.unmodifiableList(investigationList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -175,57 +170,17 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify.class, emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify.Builder.class);
     }
 
-    public static final int INVESTIGATION_LIST_FIELD_NUMBER = 5;
-    private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_;
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
-      return investigationList_;
-    }
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
-        getInvestigationListOrBuilderList() {
-      return investigationList_;
-    }
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    @java.lang.Override
-    public int getInvestigationListCount() {
-      return investigationList_.size();
-    }
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
-      return investigationList_.get(index);
-    }
-    /**
-     * <code>repeated .Investigation investigation_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
-        int index) {
-      return investigationList_.get(index);
-    }
-
-    public static final int INVESTIGATION_TARGET_LIST_FIELD_NUMBER = 14;
+    public static final int INVESTIGATION_TARGET_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> investigationTargetList_;
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> getInvestigationTargetListList() {
       return investigationTargetList_;
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
@@ -233,21 +188,21 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       return investigationTargetList_;
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     @java.lang.Override
     public int getInvestigationTargetListCount() {
       return investigationTargetList_.size();
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index) {
       return investigationTargetList_.get(index);
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
@@ -255,6 +210,46 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       return investigationTargetList_.get(index);
     }
 
+    public static final int INVESTIGATION_LIST_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_;
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
+      return investigationList_;
+    }
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
+        getInvestigationListOrBuilderList() {
+      return investigationList_;
+    }
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    @java.lang.Override
+    public int getInvestigationListCount() {
+      return investigationList_.size();
+    }
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
+      return investigationList_.get(index);
+    }
+    /**
+     * <code>repeated .Investigation investigation_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
+        int index) {
+      return investigationList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -269,11 +264,11 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < investigationList_.size(); i++) {
-        output.writeMessage(5, investigationList_.get(i));
-      }
       for (int i = 0; i < investigationTargetList_.size(); i++) {
-        output.writeMessage(14, investigationTargetList_.get(i));
+        output.writeMessage(8, investigationTargetList_.get(i));
+      }
+      for (int i = 0; i < investigationList_.size(); i++) {
+        output.writeMessage(9, investigationList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -284,13 +279,13 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < investigationList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, investigationList_.get(i));
-      }
       for (int i = 0; i < investigationTargetList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, investigationTargetList_.get(i));
+          .computeMessageSize(8, investigationTargetList_.get(i));
+      }
+      for (int i = 0; i < investigationList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, investigationList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -307,10 +302,10 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify other = (emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify) obj;
 
-      if (!getInvestigationListList()
-          .equals(other.getInvestigationListList())) return false;
       if (!getInvestigationTargetListList()
           .equals(other.getInvestigationTargetListList())) return false;
+      if (!getInvestigationListList()
+          .equals(other.getInvestigationListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,14 +317,14 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getInvestigationListCount() > 0) {
-        hash = (37 * hash) + INVESTIGATION_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getInvestigationListList().hashCode();
-      }
       if (getInvestigationTargetListCount() > 0) {
         hash = (37 * hash) + INVESTIGATION_TARGET_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getInvestigationTargetListList().hashCode();
       }
+      if (getInvestigationListCount() > 0) {
+        hash = (37 * hash) + INVESTIGATION_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getInvestigationListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -426,11 +421,6 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23777
-     * Obf: AOFKNKKENHJ
-     * </pre>
-     *
      * Protobuf type {@code PlayerInvestigationAllInfoNotify}
      */
     public static final class Builder extends
@@ -463,25 +453,25 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getInvestigationListFieldBuilder();
           getInvestigationTargetListFieldBuilder();
+          getInvestigationListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (investigationListBuilder_ == null) {
-          investigationList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          investigationListBuilder_.clear();
-        }
         if (investigationTargetListBuilder_ == null) {
           investigationTargetList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           investigationTargetListBuilder_.clear();
         }
+        if (investigationListBuilder_ == null) {
+          investigationList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          investigationListBuilder_.clear();
+        }
         return this;
       }
 
@@ -509,24 +499,24 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify result = new emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify(this);
         int from_bitField0_ = bitField0_;
-        if (investigationListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            investigationList_ = java.util.Collections.unmodifiableList(investigationList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.investigationList_ = investigationList_;
-        } else {
-          result.investigationList_ = investigationListBuilder_.build();
-        }
         if (investigationTargetListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             investigationTargetList_ = java.util.Collections.unmodifiableList(investigationTargetList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.investigationTargetList_ = investigationTargetList_;
         } else {
           result.investigationTargetList_ = investigationTargetListBuilder_.build();
         }
+        if (investigationListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            investigationList_ = java.util.Collections.unmodifiableList(investigationList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.investigationList_ = investigationList_;
+        } else {
+          result.investigationList_ = investigationListBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -575,37 +565,11 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerInvestigationAllInfoNotifyOuterClass.PlayerInvestigationAllInfoNotify.getDefaultInstance()) return this;
-        if (investigationListBuilder_ == null) {
-          if (!other.investigationList_.isEmpty()) {
-            if (investigationList_.isEmpty()) {
-              investigationList_ = other.investigationList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureInvestigationListIsMutable();
-              investigationList_.addAll(other.investigationList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.investigationList_.isEmpty()) {
-            if (investigationListBuilder_.isEmpty()) {
-              investigationListBuilder_.dispose();
-              investigationListBuilder_ = null;
-              investigationList_ = other.investigationList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              investigationListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getInvestigationListFieldBuilder() : null;
-            } else {
-              investigationListBuilder_.addAllMessages(other.investigationList_);
-            }
-          }
-        }
         if (investigationTargetListBuilder_ == null) {
           if (!other.investigationTargetList_.isEmpty()) {
             if (investigationTargetList_.isEmpty()) {
               investigationTargetList_ = other.investigationTargetList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureInvestigationTargetListIsMutable();
               investigationTargetList_.addAll(other.investigationTargetList_);
@@ -618,7 +582,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
               investigationTargetListBuilder_.dispose();
               investigationTargetListBuilder_ = null;
               investigationTargetList_ = other.investigationTargetList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               investigationTargetListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getInvestigationTargetListFieldBuilder() : null;
@@ -627,6 +591,32 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
             }
           }
         }
+        if (investigationListBuilder_ == null) {
+          if (!other.investigationList_.isEmpty()) {
+            if (investigationList_.isEmpty()) {
+              investigationList_ = other.investigationList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureInvestigationListIsMutable();
+              investigationList_.addAll(other.investigationList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.investigationList_.isEmpty()) {
+            if (investigationListBuilder_.isEmpty()) {
+              investigationListBuilder_.dispose();
+              investigationListBuilder_ = null;
+              investigationList_ = other.investigationList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              investigationListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getInvestigationListFieldBuilder() : null;
+            } else {
+              investigationListBuilder_.addAllMessages(other.investigationList_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -657,252 +647,12 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_ =
-        java.util.Collections.emptyList();
-      private void ensureInvestigationListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>(investigationList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> investigationListBuilder_;
-
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
-        if (investigationListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(investigationList_);
-        } else {
-          return investigationListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public int getInvestigationListCount() {
-        if (investigationListBuilder_ == null) {
-          return investigationList_.size();
-        } else {
-          return investigationListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
-        if (investigationListBuilder_ == null) {
-          return investigationList_.get(index);
-        } else {
-          return investigationListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder setInvestigationList(
-          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
-        if (investigationListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInvestigationListIsMutable();
-          investigationList_.set(index, value);
-          onChanged();
-        } else {
-          investigationListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder setInvestigationList(
-          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
-        if (investigationListBuilder_ == null) {
-          ensureInvestigationListIsMutable();
-          investigationList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          investigationListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder addInvestigationList(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
-        if (investigationListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInvestigationListIsMutable();
-          investigationList_.add(value);
-          onChanged();
-        } else {
-          investigationListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder addInvestigationList(
-          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
-        if (investigationListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureInvestigationListIsMutable();
-          investigationList_.add(index, value);
-          onChanged();
-        } else {
-          investigationListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder addInvestigationList(
-          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
-        if (investigationListBuilder_ == null) {
-          ensureInvestigationListIsMutable();
-          investigationList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          investigationListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder addInvestigationList(
-          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
-        if (investigationListBuilder_ == null) {
-          ensureInvestigationListIsMutable();
-          investigationList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          investigationListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder addAllInvestigationList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> values) {
-        if (investigationListBuilder_ == null) {
-          ensureInvestigationListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, investigationList_);
-          onChanged();
-        } else {
-          investigationListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder clearInvestigationList() {
-        if (investigationListBuilder_ == null) {
-          investigationList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          investigationListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public Builder removeInvestigationList(int index) {
-        if (investigationListBuilder_ == null) {
-          ensureInvestigationListIsMutable();
-          investigationList_.remove(index);
-          onChanged();
-        } else {
-          investigationListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder getInvestigationListBuilder(
-          int index) {
-        return getInvestigationListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
-          int index) {
-        if (investigationListBuilder_ == null) {
-          return investigationList_.get(index);  } else {
-          return investigationListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
-           getInvestigationListOrBuilderList() {
-        if (investigationListBuilder_ != null) {
-          return investigationListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(investigationList_);
-        }
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder() {
-        return getInvestigationListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder(
-          int index) {
-        return getInvestigationListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Investigation investigation_list = 5;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder> 
-           getInvestigationListBuilderList() {
-        return getInvestigationListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
-          getInvestigationListFieldBuilder() {
-        if (investigationListBuilder_ == null) {
-          investigationListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder>(
-                  investigationList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          investigationList_ = null;
-        }
-        return investigationListBuilder_;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> investigationTargetList_ =
         java.util.Collections.emptyList();
       private void ensureInvestigationTargetListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           investigationTargetList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget>(investigationTargetList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -910,7 +660,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
           emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> investigationTargetListBuilder_;
 
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> getInvestigationTargetListList() {
         if (investigationTargetListBuilder_ == null) {
@@ -920,7 +670,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public int getInvestigationTargetListCount() {
         if (investigationTargetListBuilder_ == null) {
@@ -930,7 +680,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index) {
         if (investigationTargetListBuilder_ == null) {
@@ -940,7 +690,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder setInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
@@ -957,7 +707,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder setInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -971,7 +721,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder addInvestigationTargetList(emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
         if (investigationTargetListBuilder_ == null) {
@@ -987,7 +737,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder addInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
@@ -1004,7 +754,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder addInvestigationTargetList(
           emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -1018,7 +768,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder addInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -1032,7 +782,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder addAllInvestigationTargetList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> values) {
@@ -1047,12 +797,12 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder clearInvestigationTargetList() {
         if (investigationTargetListBuilder_ == null) {
           investigationTargetList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           investigationTargetListBuilder_.clear();
@@ -1060,7 +810,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public Builder removeInvestigationTargetList(int index) {
         if (investigationTargetListBuilder_ == null) {
@@ -1073,14 +823,14 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder getInvestigationTargetListBuilder(
           int index) {
         return getInvestigationTargetListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
           int index) {
@@ -1090,7 +840,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
            getInvestigationTargetListOrBuilderList() {
@@ -1101,14 +851,14 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder addInvestigationTargetListBuilder() {
         return getInvestigationTargetListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder addInvestigationTargetListBuilder(
           int index) {
@@ -1116,7 +866,7 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder> 
            getInvestigationTargetListBuilderList() {
@@ -1129,13 +879,253 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
           investigationTargetListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder>(
                   investigationTargetList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           investigationTargetList_ = null;
         }
         return investigationTargetListBuilder_;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_ =
+        java.util.Collections.emptyList();
+      private void ensureInvestigationListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>(investigationList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> investigationListBuilder_;
+
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
+        if (investigationListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(investigationList_);
+        } else {
+          return investigationListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public int getInvestigationListCount() {
+        if (investigationListBuilder_ == null) {
+          return investigationList_.size();
+        } else {
+          return investigationListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
+        if (investigationListBuilder_ == null) {
+          return investigationList_.get(index);
+        } else {
+          return investigationListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder setInvestigationList(
+          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
+        if (investigationListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureInvestigationListIsMutable();
+          investigationList_.set(index, value);
+          onChanged();
+        } else {
+          investigationListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder setInvestigationList(
+          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
+        if (investigationListBuilder_ == null) {
+          ensureInvestigationListIsMutable();
+          investigationList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          investigationListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder addInvestigationList(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
+        if (investigationListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureInvestigationListIsMutable();
+          investigationList_.add(value);
+          onChanged();
+        } else {
+          investigationListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder addInvestigationList(
+          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
+        if (investigationListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureInvestigationListIsMutable();
+          investigationList_.add(index, value);
+          onChanged();
+        } else {
+          investigationListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder addInvestigationList(
+          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
+        if (investigationListBuilder_ == null) {
+          ensureInvestigationListIsMutable();
+          investigationList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          investigationListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder addInvestigationList(
+          int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
+        if (investigationListBuilder_ == null) {
+          ensureInvestigationListIsMutable();
+          investigationList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          investigationListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder addAllInvestigationList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> values) {
+        if (investigationListBuilder_ == null) {
+          ensureInvestigationListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, investigationList_);
+          onChanged();
+        } else {
+          investigationListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder clearInvestigationList() {
+        if (investigationListBuilder_ == null) {
+          investigationList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          investigationListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public Builder removeInvestigationList(int index) {
+        if (investigationListBuilder_ == null) {
+          ensureInvestigationListIsMutable();
+          investigationList_.remove(index);
+          onChanged();
+        } else {
+          investigationListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder getInvestigationListBuilder(
+          int index) {
+        return getInvestigationListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
+          int index) {
+        if (investigationListBuilder_ == null) {
+          return investigationList_.get(index);  } else {
+          return investigationListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
+           getInvestigationListOrBuilderList() {
+        if (investigationListBuilder_ != null) {
+          return investigationListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(investigationList_);
+        }
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder() {
+        return getInvestigationListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder(
+          int index) {
+        return getInvestigationListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Investigation investigation_list = 9;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder> 
+           getInvestigationListBuilderList() {
+        return getInvestigationListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
+          getInvestigationListFieldBuilder() {
+        if (investigationListBuilder_ == null) {
+          investigationListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder>(
+                  investigationList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          investigationList_ = null;
+        }
+        return investigationListBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1204,27 +1194,27 @@ public final class PlayerInvestigationAllInfoNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n&PlayerInvestigationAllInfoNotify.proto" +
-      "\032\023Investigation.proto\032\031InvestigationTarg" +
-      "et.proto\"\207\001\n PlayerInvestigationAllInfoN" +
-      "otify\022*\n\022investigation_list\030\005 \003(\0132\016.Inve" +
-      "stigation\0227\n\031investigation_target_list\030\016" +
-      " \003(\0132\024.InvestigationTargetB\033\n\031emu.grassc" +
+      "\032\031InvestigationTarget.proto\032\023Investigati" +
+      "on.proto\"\207\001\n PlayerInvestigationAllInfoN" +
+      "otify\0227\n\031investigation_target_list\030\010 \003(\013" +
+      "2\024.InvestigationTarget\022*\n\022investigation_" +
+      "list\030\t \003(\0132\016.InvestigationB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.InvestigationOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.InvestigationTargetOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.InvestigationOuterClass.getDescriptor(),
         });
     internal_static_PlayerInvestigationAllInfoNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerInvestigationAllInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerInvestigationAllInfoNotify_descriptor,
-        new java.lang.String[] { "InvestigationList", "InvestigationTargetList", });
-    emu.grasscutter.net.proto.InvestigationOuterClass.getDescriptor();
+        new java.lang.String[] { "InvestigationTargetList", "InvestigationList", });
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.InvestigationOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationNotifyOuterClass.java
index 02551be6d..9312b3cf8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class PlayerInvestigationNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> 
         getInvestigationListList();
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index);
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     int getInvestigationListCount();
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
         getInvestigationListOrBuilderList();
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 22886
-   * Obf: ALOLADCMDPF
-   * </pre>
-   *
    * Protobuf type {@code PlayerInvestigationNotify}
    */
   public static final class PlayerInvestigationNotify extends
@@ -94,7 +89,7 @@ public final class PlayerInvestigationNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 investigationList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class PlayerInvestigationNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerInvestigationNotifyOuterClass.PlayerInvestigationNotify.class, emu.grasscutter.net.proto.PlayerInvestigationNotifyOuterClass.PlayerInvestigationNotify.Builder.class);
     }
 
-    public static final int INVESTIGATION_LIST_FIELD_NUMBER = 7;
+    public static final int INVESTIGATION_LIST_FIELD_NUMBER = 4;
     private java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> investigationList_;
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
       return investigationList_;
     }
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
@@ -156,21 +151,21 @@ public final class PlayerInvestigationNotifyOuterClass {
       return investigationList_;
     }
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     @java.lang.Override
     public int getInvestigationListCount() {
       return investigationList_.size();
     }
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
       return investigationList_.get(index);
     }
     /**
-     * <code>repeated .Investigation investigation_list = 7;</code>
+     * <code>repeated .Investigation investigation_list = 4;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
@@ -193,7 +188,7 @@ public final class PlayerInvestigationNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < investigationList_.size(); i++) {
-        output.writeMessage(7, investigationList_.get(i));
+        output.writeMessage(4, investigationList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class PlayerInvestigationNotifyOuterClass {
       size = 0;
       for (int i = 0; i < investigationList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, investigationList_.get(i));
+          .computeMessageSize(4, investigationList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class PlayerInvestigationNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22886
-     * Obf: ALOLADCMDPF
-     * </pre>
-     *
      * Protobuf type {@code PlayerInvestigationNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class PlayerInvestigationNotifyOuterClass {
           emu.grasscutter.net.proto.InvestigationOuterClass.Investigation, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder, emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> investigationListBuilder_;
 
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> getInvestigationListList() {
         if (investigationListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public int getInvestigationListCount() {
         if (investigationListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation getInvestigationList(int index) {
         if (investigationListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder setInvestigationList(
           int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
@@ -585,7 +575,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder setInvestigationList(
           int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder addInvestigationList(emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
         if (investigationListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder addInvestigationList(
           int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation value) {
@@ -632,7 +622,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder addInvestigationList(
           emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder addInvestigationList(
           int index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder addAllInvestigationList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationOuterClass.Investigation> values) {
@@ -675,7 +665,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder clearInvestigationList() {
         if (investigationListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public Builder removeInvestigationList(int index) {
         if (investigationListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class PlayerInvestigationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder getInvestigationListBuilder(
           int index) {
         return getInvestigationListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder getInvestigationListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class PlayerInvestigationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InvestigationOuterClass.InvestigationOrBuilder> 
            getInvestigationListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class PlayerInvestigationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder() {
         return getInvestigationListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder addInvestigationListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class PlayerInvestigationNotifyOuterClass {
             index, emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.getDefaultInstance());
       }
       /**
-       * <code>repeated .Investigation investigation_list = 7;</code>
+       * <code>repeated .Investigation investigation_list = 4;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationOuterClass.Investigation.Builder> 
            getInvestigationListBuilderList() {
@@ -833,7 +823,7 @@ public final class PlayerInvestigationNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037PlayerInvestigationNotify.proto\032\023Inves" +
       "tigation.proto\"G\n\031PlayerInvestigationNot" +
-      "ify\022*\n\022investigation_list\030\007 \003(\0132\016.Invest" +
+      "ify\022*\n\022investigation_list\030\004 \003(\0132\016.Invest" +
       "igationB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationTargetNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationTargetNotifyOuterClass.java
index 7d7739860..23c85dd17 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationTargetNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerInvestigationTargetNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> 
         getInvestigationTargetListList();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index);
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     int getInvestigationTargetListCount();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
         getInvestigationTargetListOrBuilderList();
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 1218
-   * Obf: MCKLNIEGCOK
-   * </pre>
-   *
    * Protobuf type {@code PlayerInvestigationTargetNotify}
    */
   public static final class PlayerInvestigationTargetNotify extends
@@ -94,7 +89,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 114: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 investigationTargetList_ = new java.util.ArrayList<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerInvestigationTargetNotifyOuterClass.PlayerInvestigationTargetNotify.class, emu.grasscutter.net.proto.PlayerInvestigationTargetNotifyOuterClass.PlayerInvestigationTargetNotify.Builder.class);
     }
 
-    public static final int INVESTIGATION_TARGET_LIST_FIELD_NUMBER = 14;
+    public static final int INVESTIGATION_TARGET_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> investigationTargetList_;
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> getInvestigationTargetListList() {
       return investigationTargetList_;
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
@@ -156,21 +151,21 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
       return investigationTargetList_;
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     @java.lang.Override
     public int getInvestigationTargetListCount() {
       return investigationTargetList_.size();
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index) {
       return investigationTargetList_.get(index);
     }
     /**
-     * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+     * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
@@ -193,7 +188,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < investigationTargetList_.size(); i++) {
-        output.writeMessage(14, investigationTargetList_.get(i));
+        output.writeMessage(15, investigationTargetList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
       size = 0;
       for (int i = 0; i < investigationTargetList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, investigationTargetList_.get(i));
+          .computeMessageSize(15, investigationTargetList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1218
-     * Obf: MCKLNIEGCOK
-     * </pre>
-     *
      * Protobuf type {@code PlayerInvestigationTargetNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
           emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> investigationTargetListBuilder_;
 
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> getInvestigationTargetListList() {
         if (investigationTargetListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public int getInvestigationTargetListCount() {
         if (investigationTargetListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget getInvestigationTargetList(int index) {
         if (investigationTargetListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder setInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
@@ -585,7 +575,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder setInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder addInvestigationTargetList(emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
         if (investigationTargetListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder addInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget value) {
@@ -632,7 +622,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder addInvestigationTargetList(
           emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder addInvestigationTargetList(
           int index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder addAllInvestigationTargetList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget> values) {
@@ -675,7 +665,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder clearInvestigationTargetList() {
         if (investigationTargetListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public Builder removeInvestigationTargetList(int index) {
         if (investigationTargetListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder getInvestigationTargetListBuilder(
           int index) {
         return getInvestigationTargetListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder getInvestigationTargetListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTargetOrBuilder> 
            getInvestigationTargetListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder addInvestigationTargetListBuilder() {
         return getInvestigationTargetListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder addInvestigationTargetListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
             index, emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.getDefaultInstance());
       }
       /**
-       * <code>repeated .InvestigationTarget investigation_target_list = 14;</code>
+       * <code>repeated .InvestigationTarget investigation_target_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.InvestigationTargetOuterClass.InvestigationTarget.Builder> 
            getInvestigationTargetListBuilderList() {
@@ -834,7 +824,7 @@ public final class PlayerInvestigationTargetNotifyOuterClass {
       "\n%PlayerInvestigationTargetNotify.proto\032" +
       "\031InvestigationTarget.proto\"Z\n\037PlayerInve" +
       "stigationTargetNotify\0227\n\031investigation_t" +
-      "arget_list\030\016 \003(\0132\024.InvestigationTargetB\033" +
+      "arget_list\030\017 \003(\0132\024.InvestigationTargetB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java
index 6e4cf2bed..89b906a4e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLocationInfoOuterClass.java
@@ -19,46 +19,59 @@ public final class PlayerLocationInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
     /**
-     * <code>uint32 uid = 4;</code>
+     * <code>uint32 uid = 5;</code>
      * @return The uid.
      */
     int getUid();
 
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      * @return Whether the rot field is set.
      */
     boolean hasRot();
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      * @return The rot.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
+
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @return A list containing the kJAEPLIIAIH.
+     */
+    java.util.List<java.lang.Integer> getKJAEPLIIAIHList();
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @return The count of kJAEPLIIAIH.
+     */
+    int getKJAEPLIIAIHCount();
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @param index The index of the element to return.
+     * @return The kJAEPLIIAIH at the given index.
+     */
+    int getKJAEPLIIAIH(int index);
   }
   /**
-   * <pre>
-   * Obf: KPGGJJGHJOP
-   * </pre>
-   *
    * Protobuf type {@code PlayerLocationInfo}
    */
   public static final class PlayerLocationInfo extends
@@ -71,6 +84,7 @@ public final class PlayerLocationInfoOuterClass {
       super(builder);
     }
     private PlayerLocationInfo() {
+      kJAEPLIIAIH_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -93,6 +107,7 @@ public final class PlayerLocationInfoOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
+      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -104,6 +119,24 @@ public final class PlayerLocationInfoOuterClass {
               done = true;
               break;
             case 10: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (pos_ != null) {
+                subBuilder = pos_.toBuilder();
+              }
+              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(pos_);
+                pos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 40: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
+            case 82: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
                 subBuilder = rot_.toBuilder();
@@ -116,22 +149,25 @@ public final class PlayerLocationInfoOuterClass {
 
               break;
             }
-            case 32: {
-
-              uid_ = input.readUInt32();
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                kJAEPLIIAIH_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              kJAEPLIIAIH_.addInt(input.readUInt32());
               break;
             }
-            case 106: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (pos_ != null) {
-                subBuilder = pos_.toBuilder();
+            case 98: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                kJAEPLIIAIH_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
               }
-              pos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pos_);
-                pos_ = subBuilder.buildPartial();
+              while (input.getBytesUntilLimit() > 0) {
+                kJAEPLIIAIH_.addInt(input.readUInt32());
               }
-
+              input.popLimit(limit);
               break;
             }
             default: {
@@ -149,6 +185,9 @@ public final class PlayerLocationInfoOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          kJAEPLIIAIH_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -166,10 +205,10 @@ public final class PlayerLocationInfoOuterClass {
               emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.class, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder.class);
     }
 
-    public static final int POS_FIELD_NUMBER = 13;
+    public static final int POS_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -177,7 +216,7 @@ public final class PlayerLocationInfoOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -185,17 +224,17 @@ public final class PlayerLocationInfoOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 13;</code>
+     * <code>.Vector pos = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
       return getPos();
     }
 
-    public static final int UID_FIELD_NUMBER = 4;
+    public static final int UID_FIELD_NUMBER = 5;
     private int uid_;
     /**
-     * <code>uint32 uid = 4;</code>
+     * <code>uint32 uid = 5;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -203,10 +242,10 @@ public final class PlayerLocationInfoOuterClass {
       return uid_;
     }
 
-    public static final int ROT_FIELD_NUMBER = 1;
+    public static final int ROT_FIELD_NUMBER = 10;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -214,7 +253,7 @@ public final class PlayerLocationInfoOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -222,13 +261,41 @@ public final class PlayerLocationInfoOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
       return getRot();
     }
 
+    public static final int KJAEPLIIAIH_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList kJAEPLIIAIH_;
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @return A list containing the kJAEPLIIAIH.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getKJAEPLIIAIHList() {
+      return kJAEPLIIAIH_;
+    }
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @return The count of kJAEPLIIAIH.
+     */
+    public int getKJAEPLIIAIHCount() {
+      return kJAEPLIIAIH_.size();
+    }
+    /**
+     * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+     * @param index The index of the element to return.
+     * @return The kJAEPLIIAIH at the given index.
+     */
+    public int getKJAEPLIIAIH(int index) {
+      return kJAEPLIIAIH_.getInt(index);
+    }
+    private int kJAEPLIIAIHMemoizedSerializedSize = -1;
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -243,14 +310,22 @@ public final class PlayerLocationInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (rot_ != null) {
-        output.writeMessage(1, getRot());
+      getSerializedSize();
+      if (pos_ != null) {
+        output.writeMessage(1, getPos());
       }
       if (uid_ != 0) {
-        output.writeUInt32(4, uid_);
+        output.writeUInt32(5, uid_);
       }
-      if (pos_ != null) {
-        output.writeMessage(13, getPos());
+      if (rot_ != null) {
+        output.writeMessage(10, getRot());
+      }
+      if (getKJAEPLIIAIHList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(kJAEPLIIAIHMemoizedSerializedSize);
+      }
+      for (int i = 0; i < kJAEPLIIAIH_.size(); i++) {
+        output.writeUInt32NoTag(kJAEPLIIAIH_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -261,17 +336,31 @@ public final class PlayerLocationInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (rot_ != null) {
+      if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getRot());
+          .computeMessageSize(1, getPos());
       }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, uid_);
+          .computeUInt32Size(5, uid_);
       }
-      if (pos_ != null) {
+      if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getPos());
+          .computeMessageSize(10, getRot());
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < kJAEPLIIAIH_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(kJAEPLIIAIH_.getInt(i));
+        }
+        size += dataSize;
+        if (!getKJAEPLIIAIHList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        kJAEPLIIAIHMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -300,6 +389,8 @@ public final class PlayerLocationInfoOuterClass {
         if (!getRot()
             .equals(other.getRot())) return false;
       }
+      if (!getKJAEPLIIAIHList()
+          .equals(other.getKJAEPLIIAIHList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -321,6 +412,10 @@ public final class PlayerLocationInfoOuterClass {
         hash = (37 * hash) + ROT_FIELD_NUMBER;
         hash = (53 * hash) + getRot().hashCode();
       }
+      if (getKJAEPLIIAIHCount() > 0) {
+        hash = (37 * hash) + KJAEPLIIAIH_FIELD_NUMBER;
+        hash = (53 * hash) + getKJAEPLIIAIHList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -417,10 +512,6 @@ public final class PlayerLocationInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KPGGJJGHJOP
-     * </pre>
-     *
      * Protobuf type {@code PlayerLocationInfo}
      */
     public static final class Builder extends
@@ -472,6 +563,8 @@ public final class PlayerLocationInfoOuterClass {
           rot_ = null;
           rotBuilder_ = null;
         }
+        kJAEPLIIAIH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -498,6 +591,7 @@ public final class PlayerLocationInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo buildPartial() {
         emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo result = new emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo(this);
+        int from_bitField0_ = bitField0_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
@@ -509,6 +603,11 @@ public final class PlayerLocationInfoOuterClass {
         } else {
           result.rot_ = rotBuilder_.build();
         }
+        if (((bitField0_ & 0x00000001) != 0)) {
+          kJAEPLIIAIH_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.kJAEPLIIAIH_ = kJAEPLIIAIH_;
         onBuilt();
         return result;
       }
@@ -566,6 +665,16 @@ public final class PlayerLocationInfoOuterClass {
         if (other.hasRot()) {
           mergeRot(other.getRot());
         }
+        if (!other.kJAEPLIIAIH_.isEmpty()) {
+          if (kJAEPLIIAIH_.isEmpty()) {
+            kJAEPLIIAIH_ = other.kJAEPLIIAIH_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureKJAEPLIIAIHIsMutable();
+            kJAEPLIIAIH_.addAll(other.kJAEPLIIAIH_);
+          }
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -594,19 +703,20 @@ public final class PlayerLocationInfoOuterClass {
         }
         return this;
       }
+      private int bitField0_;
 
       private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
       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 = 13;</code>
+       * <code>.Vector pos = 1;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -617,7 +727,7 @@ public final class PlayerLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -633,7 +743,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -647,7 +757,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -665,7 +775,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -679,7 +789,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -687,7 +797,7 @@ public final class PlayerLocationInfoOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -698,7 +808,7 @@ public final class PlayerLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 13;</code>
+       * <code>.Vector pos = 1;</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> 
@@ -716,7 +826,7 @@ public final class PlayerLocationInfoOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 5;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -724,7 +834,7 @@ public final class PlayerLocationInfoOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 5;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -735,7 +845,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 4;</code>
+       * <code>uint32 uid = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -749,14 +859,14 @@ public final class PlayerLocationInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -767,7 +877,7 @@ public final class PlayerLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -783,7 +893,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -797,7 +907,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -815,7 +925,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -829,7 +939,7 @@ public final class PlayerLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -837,7 +947,7 @@ public final class PlayerLocationInfoOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -848,7 +958,7 @@ public final class PlayerLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 10;</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> 
@@ -863,6 +973,85 @@ public final class PlayerLocationInfoOuterClass {
         }
         return rotBuilder_;
       }
+
+      private com.google.protobuf.Internal.IntList kJAEPLIIAIH_ = emptyIntList();
+      private void ensureKJAEPLIIAIHIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          kJAEPLIIAIH_ = mutableCopy(kJAEPLIIAIH_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @return A list containing the kJAEPLIIAIH.
+       */
+      public java.util.List<java.lang.Integer>
+          getKJAEPLIIAIHList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(kJAEPLIIAIH_) : kJAEPLIIAIH_;
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @return The count of kJAEPLIIAIH.
+       */
+      public int getKJAEPLIIAIHCount() {
+        return kJAEPLIIAIH_.size();
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @param index The index of the element to return.
+       * @return The kJAEPLIIAIH at the given index.
+       */
+      public int getKJAEPLIIAIH(int index) {
+        return kJAEPLIIAIH_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The kJAEPLIIAIH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKJAEPLIIAIH(
+          int index, int value) {
+        ensureKJAEPLIIAIHIsMutable();
+        kJAEPLIIAIH_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @param value The kJAEPLIIAIH to add.
+       * @return This builder for chaining.
+       */
+      public Builder addKJAEPLIIAIH(int value) {
+        ensureKJAEPLIIAIHIsMutable();
+        kJAEPLIIAIH_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @param values The kJAEPLIIAIH to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllKJAEPLIIAIH(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureKJAEPLIIAIHIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, kJAEPLIIAIH_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 KJAEPLIIAIH = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKJAEPLIIAIH() {
+        kJAEPLIIAIH_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -931,9 +1120,10 @@ public final class PlayerLocationInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PlayerLocationInfo.proto\032\014Vector.proto" +
-      "\"M\n\022PlayerLocationInfo\022\024\n\003pos\030\r \001(\0132\007.Ve" +
-      "ctor\022\013\n\003uid\030\004 \001(\r\022\024\n\003rot\030\001 \001(\0132\007.VectorB" +
-      "\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\"b\n\022PlayerLocationInfo\022\024\n\003pos\030\001 \001(\0132\007.Ve" +
+      "ctor\022\013\n\003uid\030\005 \001(\r\022\024\n\003rot\030\n \001(\0132\007.Vector\022" +
+      "\023\n\013KJAEPLIIAIH\030\014 \003(\rB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -945,7 +1135,7 @@ public final class PlayerLocationInfoOuterClass {
     internal_static_PlayerLocationInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLocationInfo_descriptor,
-        new java.lang.String[] { "Pos", "Uid", "Rot", });
+        new java.lang.String[] { "Pos", "Uid", "Rot", "KJAEPLIIAIH", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
   }
 
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 ac444c5f1..cbd5cb6f5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginReqOuterClass.java
@@ -18,282 +18,6 @@ public final class PlayerLoginReqOuterClass {
       // @@protoc_insertion_point(interface_extends:PlayerLoginReq)
       com.google.protobuf.MessageOrBuilder {
 
-    /**
-     * <code>bytes security_cmd_reply = 1651;</code>
-     * @return The securityCmdReply.
-     */
-    com.google.protobuf.ByteString getSecurityCmdReply();
-
-    /**
-     * <code>uint32 DEBLDPOHPOL = 1820;</code>
-     * @return The dEBLDPOHPOL.
-     */
-    int getDEBLDPOHPOL();
-
-    /**
-     * <code>bytes environment_error_code = 1141;</code>
-     * @return The environmentErrorCode.
-     */
-    com.google.protobuf.ByteString getEnvironmentErrorCode();
-
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     * @return Whether the trackingIoInfo field is set.
-     */
-    boolean hasTrackingIoInfo();
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     * @return The trackingIoInfo.
-     */
-    emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo getTrackingIoInfo();
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     */
-    emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder getTrackingIoInfoOrBuilder();
-
-    /**
-     * <code>string country_code = 1930;</code>
-     * @return The countryCode.
-     */
-    java.lang.String getCountryCode();
-    /**
-     * <code>string country_code = 1930;</code>
-     * @return The bytes for countryCode.
-     */
-    com.google.protobuf.ByteString
-        getCountryCodeBytes();
-
-    /**
-     * <code>string device_info = 5;</code>
-     * @return The deviceInfo.
-     */
-    java.lang.String getDeviceInfo();
-    /**
-     * <code>string device_info = 5;</code>
-     * @return The bytes for deviceInfo.
-     */
-    com.google.protobuf.ByteString
-        getDeviceInfoBytes();
-
-    /**
-     * <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>string HIPFGBLGPMJ = 45;</code>
-     * @return The hIPFGBLGPMJ.
-     */
-    java.lang.String getHIPFGBLGPMJ();
-    /**
-     * <code>string HIPFGBLGPMJ = 45;</code>
-     * @return The bytes for hIPFGBLGPMJ.
-     */
-    com.google.protobuf.ByteString
-        getHIPFGBLGPMJBytes();
-
-    /**
-     * <code>string psn_id = 1266;</code>
-     * @return The psnId.
-     */
-    java.lang.String getPsnId();
-    /**
-     * <code>string psn_id = 1266;</code>
-     * @return The bytes for psnId.
-     */
-    com.google.protobuf.ByteString
-        getPsnIdBytes();
-
-    /**
-     * <code>uint32 EMFDHANIAHH = 912;</code>
-     * @return The eMFDHANIAHH.
-     */
-    int getEMFDHANIAHH();
-
-    /**
-     * <code>uint32 target_uid = 12;</code>
-     * @return The targetUid.
-     */
-    int getTargetUid();
-
-    /**
-     * <code>string checksum_client_version = 1594;</code>
-     * @return The checksumClientVersion.
-     */
-    java.lang.String getChecksumClientVersion();
-    /**
-     * <code>string checksum_client_version = 1594;</code>
-     * @return The bytes for checksumClientVersion.
-     */
-    com.google.protobuf.ByteString
-        getChecksumClientVersionBytes();
-
-    /**
-     * <code>uint32 DHOLEDCICPB = 675;</code>
-     * @return The dHOLEDCICPB.
-     */
-    int getDHOLEDCICPB();
-
-    /**
-     * <code>string FOHJKJCKFFA = 458;</code>
-     * @return The fOHJKJCKFFA.
-     */
-    java.lang.String getFOHJKJCKFFA();
-    /**
-     * <code>string FOHJKJCKFFA = 458;</code>
-     * @return The bytes for fOHJKJCKFFA.
-     */
-    com.google.protobuf.ByteString
-        getFOHJKJCKFFABytes();
-
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     * @return Whether the adjustTrackingInfo field is set.
-     */
-    boolean hasAdjustTrackingInfo();
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     * @return The adjustTrackingInfo.
-     */
-    emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo getAdjustTrackingInfo();
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     */
-    emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder getAdjustTrackingInfoOrBuilder();
-
-    /**
-     * <code>bool is_guest = 1;</code>
-     * @return The isGuest.
-     */
-    boolean getIsGuest();
-
-    /**
-     * <code>uint32 tag = 188;</code>
-     * @return The tag.
-     */
-    int getTag();
-
-    /**
-     * <code>uint32 target_home_owner_uid = 1671;</code>
-     * @return The targetHomeOwnerUid.
-     */
-    int getTargetHomeOwnerUid();
-
-    /**
-     * <code>uint32 platform_type = 4;</code>
-     * @return The platformType.
-     */
-    int getPlatformType();
-
-    /**
-     * <code>string CFMBEIOBIEG = 812;</code>
-     * @return The cFMBEIOBIEG.
-     */
-    java.lang.String getCFMBEIOBIEG();
-    /**
-     * <code>string CFMBEIOBIEG = 812;</code>
-     * @return The bytes for cFMBEIOBIEG.
-     */
-    com.google.protobuf.ByteString
-        getCFMBEIOBIEGBytes();
-
-    /**
-     * <code>uint32 channel_id = 1816;</code>
-     * @return The channelId.
-     */
-    int getChannelId();
-
-    /**
-     * <code>bool is_transfer = 787;</code>
-     * @return The isTransfer.
-     */
-    boolean getIsTransfer();
-
-    /**
-     * <code>string online_id = 1270;</code>
-     * @return The onlineId.
-     */
-    java.lang.String getOnlineId();
-    /**
-     * <code>string online_id = 1270;</code>
-     * @return The bytes for onlineId.
-     */
-    com.google.protobuf.ByteString
-        getOnlineIdBytes();
-
-    /**
-     * <code>uint32 client_data_version = 2004;</code>
-     * @return The clientDataVersion.
-     */
-    int getClientDataVersion();
-
-    /**
-     * <code>string birthday = 190;</code>
-     * @return The birthday.
-     */
-    java.lang.String getBirthday();
-    /**
-     * <code>string birthday = 190;</code>
-     * @return The bytes for birthday.
-     */
-    com.google.protobuf.ByteString
-        getBirthdayBytes();
-
-    /**
-     * <code>string client_version = 13;</code>
-     * @return The clientVersion.
-     */
-    java.lang.String getClientVersion();
-    /**
-     * <code>string client_version = 13;</code>
-     * @return The bytes for clientVersion.
-     */
-    com.google.protobuf.ByteString
-        getClientVersionBytes();
-
-    /**
-     * <code>string checksum = 1796;</code>
-     * @return The checksum.
-     */
-    java.lang.String getChecksum();
-    /**
-     * <code>string checksum = 1796;</code>
-     * @return The bytes for checksum.
-     */
-    com.google.protobuf.ByteString
-        getChecksumBytes();
-
-    /**
-     * <code>uint32 FCPDNLHOBNK = 706;</code>
-     * @return The fCPDNLHOBNK.
-     */
-    int getFCPDNLHOBNK();
-
-    /**
-     * <code>uint32 KCFIGJAPNIB = 435;</code>
-     * @return The kCFIGJAPNIB.
-     */
-    int getKCFIGJAPNIB();
-
-    /**
-     * <code>bytes extra_bin_data = 74;</code>
-     * @return The extraBinData.
-     */
-    com.google.protobuf.ByteString getExtraBinData();
-
-    /**
-     * <code>uint64 login_rand = 6;</code>
-     * @return The loginRand.
-     */
-    long getLoginRand();
-
     /**
      * <code>string platform = 14;</code>
      * @return The platform.
@@ -307,119 +31,420 @@ public final class PlayerLoginReqOuterClass {
         getPlatformBytes();
 
     /**
-     * <code>uint32 sub_channel_id = 7;</code>
-     * @return The subChannelId.
+     * <code>string FBKHEDNNFIF = 1669;</code>
+     * @return The fBKHEDNNFIF.
      */
-    int getSubChannelId();
-
+    java.lang.String getFBKHEDNNFIF();
     /**
-     * <code>uint32 KKKHJACICJO = 1228;</code>
-     * @return The kKKHJACICJO.
-     */
-    int getKKKHJACICJO();
-
-    /**
-     * <code>string device_uuid = 10;</code>
-     * @return The deviceUuid.
-     */
-    java.lang.String getDeviceUuid();
-    /**
-     * <code>string device_uuid = 10;</code>
-     * @return The bytes for deviceUuid.
+     * <code>string FBKHEDNNFIF = 1669;</code>
+     * @return The bytes for fBKHEDNNFIF.
      */
     com.google.protobuf.ByteString
-        getDeviceUuidBytes();
+        getFBKHEDNNFIFBytes();
 
     /**
-     * <code>string token = 2;</code>
+     * <code>string JIPHKNNHBIE = 924;</code>
+     * @return The jIPHKNNHBIE.
+     */
+    java.lang.String getJIPHKNNHBIE();
+    /**
+     * <code>string JIPHKNNHBIE = 924;</code>
+     * @return The bytes for jIPHKNNHBIE.
+     */
+    com.google.protobuf.ByteString
+        getJIPHKNNHBIEBytes();
+
+    /**
+     * <code>string CBIEHLMFBHI = 1433;</code>
+     * @return The cBIEHLMFBHI.
+     */
+    java.lang.String getCBIEHLMFBHI();
+    /**
+     * <code>string CBIEHLMFBHI = 1433;</code>
+     * @return The bytes for cBIEHLMFBHI.
+     */
+    com.google.protobuf.ByteString
+        getCBIEHLMFBHIBytes();
+
+    /**
+     * <code>string IMACIIGIOGC = 10;</code>
+     * @return The iMACIIGIOGC.
+     */
+    java.lang.String getIMACIIGIOGC();
+    /**
+     * <code>string IMACIIGIOGC = 10;</code>
+     * @return The bytes for iMACIIGIOGC.
+     */
+    com.google.protobuf.ByteString
+        getIMACIIGIOGCBytes();
+
+    /**
+     * <code>string JJIOHIJNGFP = 3;</code>
+     * @return The jJIOHIJNGFP.
+     */
+    java.lang.String getJJIOHIJNGFP();
+    /**
+     * <code>string JJIOHIJNGFP = 3;</code>
+     * @return The bytes for jJIOHIJNGFP.
+     */
+    com.google.protobuf.ByteString
+        getJJIOHIJNGFPBytes();
+
+    /**
+     * <code>string token = 7;</code>
      * @return The token.
      */
     java.lang.String getToken();
     /**
-     * <code>string token = 2;</code>
+     * <code>string token = 7;</code>
      * @return The bytes for token.
      */
     com.google.protobuf.ByteString
         getTokenBytes();
 
     /**
-     * <code>string device_name = 11;</code>
-     * @return The deviceName.
+     * <code>bytes extra_bin_data = 1183;</code>
+     * @return The extraBinData.
      */
-    java.lang.String getDeviceName();
+    com.google.protobuf.ByteString getExtraBinData();
+
     /**
-     * <code>string device_name = 11;</code>
-     * @return The bytes for deviceName.
+     * <code>string LPFPAJBHJMH = 46;</code>
+     * @return The lPFPAJBHJMH.
+     */
+    java.lang.String getLPFPAJBHJMH();
+    /**
+     * <code>string LPFPAJBHJMH = 46;</code>
+     * @return The bytes for lPFPAJBHJMH.
      */
     com.google.protobuf.ByteString
-        getDeviceNameBytes();
+        getLPFPAJBHJMHBytes();
 
     /**
-     * <code>string system_version = 3;</code>
-     * @return The systemVersion.
+     * <pre>
+     *LHACJNELJMN KOFGDJGJPLH = 1939;
+     * </pre>
+     *
+     * <code>bytes OFMIHDNGFNM = 265;</code>
+     * @return The oFMIHDNGFNM.
      */
-    java.lang.String getSystemVersion();
+    com.google.protobuf.ByteString getOFMIHDNGFNM();
+
     /**
-     * <code>string system_version = 3;</code>
-     * @return The bytes for systemVersion.
+     * <code>string online_id = 376;</code>
+     * @return The onlineId.
+     */
+    java.lang.String getOnlineId();
+    /**
+     * <code>string online_id = 376;</code>
+     * @return The bytes for onlineId.
      */
     com.google.protobuf.ByteString
-        getSystemVersionBytes();
+        getOnlineIdBytes();
 
     /**
-     * <code>string client_verison_hash = 869;</code>
-     * @return The clientVerisonHash.
+     * <code>string KEODMFOKNGH = 5;</code>
+     * @return The kEODMFOKNGH.
      */
-    java.lang.String getClientVerisonHash();
+    java.lang.String getKEODMFOKNGH();
     /**
-     * <code>string client_verison_hash = 869;</code>
-     * @return The bytes for clientVerisonHash.
+     * <code>string KEODMFOKNGH = 5;</code>
+     * @return The bytes for kEODMFOKNGH.
      */
     com.google.protobuf.ByteString
-        getClientVerisonHashBytes();
+        getKEODMFOKNGHBytes();
 
     /**
-     * <code>bool is_editor = 15;</code>
-     * @return The isEditor.
+     * <code>string MEEGOICDEFG = 525;</code>
+     * @return The mEEGOICDEFG.
      */
-    boolean getIsEditor();
-
+    java.lang.String getMEEGOICDEFG();
     /**
-     * <code>uint32 language_type = 9;</code>
-     * @return The languageType.
+     * <code>string MEEGOICDEFG = 525;</code>
+     * @return The bytes for mEEGOICDEFG.
      */
-    int getLanguageType();
+    com.google.protobuf.ByteString
+        getMEEGOICDEFGBytes();
 
     /**
-     * <code>uint32 LJFBMKFHNJM = 1153;</code>
-     * @return The lJFBMKFHNJM.
+     * <code>string MDIKIHJHHJJ = 4;</code>
+     * @return The mDIKIHJHHJJ.
      */
-    int getLJFBMKFHNJM();
+    java.lang.String getMDIKIHJHHJJ();
+    /**
+     * <code>string MDIKIHJHHJJ = 4;</code>
+     * @return The bytes for mDIKIHJHHJJ.
+     */
+    com.google.protobuf.ByteString
+        getMDIKIHJHHJJBytes();
 
     /**
-     * <code>uint32 account_type = 834;</code>
+     * <code>string HCJGLLHFCMA = 1548;</code>
+     * @return The hCJGLLHFCMA.
+     */
+    java.lang.String getHCJGLLHFCMA();
+    /**
+     * <code>string HCJGLLHFCMA = 1548;</code>
+     * @return The bytes for hCJGLLHFCMA.
+     */
+    com.google.protobuf.ByteString
+        getHCJGLLHFCMABytes();
+
+    /**
+     * <code>string LLIMBPCEABN = 86;</code>
+     * @return The lLIMBPCEABN.
+     */
+    java.lang.String getLLIMBPCEABN();
+    /**
+     * <code>string LLIMBPCEABN = 86;</code>
+     * @return The bytes for lLIMBPCEABN.
+     */
+    com.google.protobuf.ByteString
+        getLLIMBPCEABNBytes();
+
+    /**
+     * <pre>
+     *CNIFDNMIKIF FDNODKOBNFH = 1420;
+     * </pre>
+     *
+     * <code>string country_code = 1774;</code>
+     * @return The countryCode.
+     */
+    java.lang.String getCountryCode();
+    /**
+     * <pre>
+     *CNIFDNMIKIF FDNODKOBNFH = 1420;
+     * </pre>
+     *
+     * <code>string country_code = 1774;</code>
+     * @return The bytes for countryCode.
+     */
+    com.google.protobuf.ByteString
+        getCountryCodeBytes();
+
+    /**
+     * <code>bytes PFDFHPKIHMO = 197;</code>
+     * @return The pFDFHPKIHMO.
+     */
+    com.google.protobuf.ByteString getPFDFHPKIHMO();
+
+    /**
+     * <code>string IMCMLAGLODL = 1146;</code>
+     * @return The iMCMLAGLODL.
+     */
+    java.lang.String getIMCMLAGLODL();
+    /**
+     * <code>string IMCMLAGLODL = 1146;</code>
+     * @return The bytes for iMCMLAGLODL.
+     */
+    com.google.protobuf.ByteString
+        getIMCMLAGLODLBytes();
+
+    /**
+     * <code>string NNBGJPGDGCP = 13;</code>
+     * @return The nNBGJPGDGCP.
+     */
+    java.lang.String getNNBGJPGDGCP();
+    /**
+     * <code>string NNBGJPGDGCP = 13;</code>
+     * @return The bytes for nNBGJPGDGCP.
+     */
+    com.google.protobuf.ByteString
+        getNNBGJPGDGCPBytes();
+
+    /**
+     * <code>string CDDBBPKKOPM = 921;</code>
+     * @return The cDDBBPKKOPM.
+     */
+    java.lang.String getCDDBBPKKOPM();
+    /**
+     * <code>string CDDBBPKKOPM = 921;</code>
+     * @return The bytes for cDDBBPKKOPM.
+     */
+    com.google.protobuf.ByteString
+        getCDDBBPKKOPMBytes();
+
+    /**
+     * <code>string psn_id = 1762;</code>
+     * @return The psnId.
+     */
+    java.lang.String getPsnId();
+    /**
+     * <code>string psn_id = 1762;</code>
+     * @return The bytes for psnId.
+     */
+    com.google.protobuf.ByteString
+        getPsnIdBytes();
+
+    /**
+     * <code>string birthday = 1179;</code>
+     * @return The birthday.
+     */
+    java.lang.String getBirthday();
+    /**
+     * <code>string birthday = 1179;</code>
+     * @return The bytes for birthday.
+     */
+    com.google.protobuf.ByteString
+        getBirthdayBytes();
+
+    /**
+     * <code>string PECPGFPBJEB = 216;</code>
+     * @return The pECPGFPBJEB.
+     */
+    java.lang.String getPECPGFPBJEB();
+    /**
+     * <code>string PECPGFPBJEB = 216;</code>
+     * @return The bytes for pECPGFPBJEB.
+     */
+    com.google.protobuf.ByteString
+        getPECPGFPBJEBBytes();
+
+    /**
+     * <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.
      */
     int getAccountType();
 
     /**
-     * <code>string FPOFDDAGKAG = 255;</code>
-     * @return The fPOFDDAGKAG.
+     * <code>uint32 FNPPPMBIBEM = 345;</code>
+     * @return The fNPPPMBIBEM.
      */
-    java.lang.String getFPOFDDAGKAG();
+    int getFNPPPMBIBEM();
+
     /**
-     * <code>string FPOFDDAGKAG = 255;</code>
-     * @return The bytes for fPOFDDAGKAG.
+     * <code>uint32 PLNNJPFPPAM = 2029;</code>
+     * @return The pLNNJPFPPAM.
      */
-    com.google.protobuf.ByteString
-        getFPOFDDAGKAGBytes();
+    int getPLNNJPFPPAM();
+
+    /**
+     * <code>uint32 target_home_owner_uid = 226;</code>
+     * @return The targetHomeOwnerUid.
+     */
+    int getTargetHomeOwnerUid();
+
+    /**
+     * <code>bool is_guest = 6;</code>
+     * @return The isGuest.
+     */
+    boolean getIsGuest();
+
+    /**
+     * <code>bool HAAGGONEHCH = 1;</code>
+     * @return The hAAGGONEHCH.
+     */
+    boolean getHAAGGONEHCH();
+
+    /**
+     * <code>bool JAGELBDJFJH = 1641;</code>
+     * @return The jAGELBDJFJH.
+     */
+    boolean getJAGELBDJFJH();
+
+    /**
+     * <code>uint64 login_rand = 12;</code>
+     * @return The loginRand.
+     */
+    long getLoginRand();
+
+    /**
+     * <code>uint32 OCINFHOJCEA = 725;</code>
+     * @return The oCINFHOJCEA.
+     */
+    int getOCINFHOJCEA();
+
+    /**
+     * <code>uint32 tag = 1158;</code>
+     * @return The tag.
+     */
+    int getTag();
+
+    /**
+     * <code>uint32 KPCGBPCHBMJ = 507;</code>
+     * @return The kPCGBPCHBMJ.
+     */
+    int getKPCGBPCHBMJ();
+
+    /**
+     * <code>uint32 client_data_version = 420;</code>
+     * @return The clientDataVersion.
+     */
+    int getClientDataVersion();
+
+    /**
+     * <code>uint32 NCNKMDBAFEH = 1370;</code>
+     * @return The nCNKMDBAFEH.
+     */
+    int getNCNKMDBAFEH();
+
+    /**
+     * <code>uint32 EPAGBFLKJBN = 1691;</code>
+     * @return The ePAGBFLKJBN.
+     */
+    int getEPAGBFLKJBN();
+
+    /**
+     * <code>uint32 gm_uid = 689;</code>
+     * @return The gmUid.
+     */
+    int getGmUid();
+
+    /**
+     * <code>uint32 BFPJPDCLFNM = 15;</code>
+     * @return The bFPJPDCLFNM.
+     */
+    int getBFPJPDCLFNM();
+
+    /**
+     * <code>uint32 IKKKLHICPMF = 1977;</code>
+     * @return The iKKKLHICPMF.
+     */
+    int getIKKKLHICPMF();
+
+    /**
+     * <code>uint32 MCKEONLBAOA = 1521;</code>
+     * @return The mCKEONLBAOA.
+     */
+    int getMCKEONLBAOA();
+
+    /**
+     * <code>uint32 platform_type = 2;</code>
+     * @return The platformType.
+     */
+    int getPlatformType();
+
+    /**
+     * <code>uint32 KEKHAKAPMIN = 256;</code>
+     * @return The kEKHAKAPMIN.
+     */
+    int getKEKHAKAPMIN();
+
+    /**
+     * <code>uint32 target_uid = 8;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
+
+    /**
+     * <code>uint32 DKGAONKKOHA = 1280;</code>
+     * @return The dKGAONKKOHA.
+     */
+    int getDKGAONKKOHA();
   }
   /**
-   * <pre>
-   * CmdId: 25842
-   * Obf: GJIMLGLMKJF
-   * </pre>
-   *
    * Protobuf type {@code PlayerLoginReq}
    */
   public static final class PlayerLoginReq extends
@@ -432,28 +457,31 @@ public final class PlayerLoginReqOuterClass {
       super(builder);
     }
     private PlayerLoginReq() {
-      securityCmdReply_ = com.google.protobuf.ByteString.EMPTY;
-      environmentErrorCode_ = com.google.protobuf.ByteString.EMPTY;
-      countryCode_ = "";
-      deviceInfo_ = "";
-      accountUid_ = "";
-      hIPFGBLGPMJ_ = "";
-      psnId_ = "";
-      checksumClientVersion_ = "";
-      fOHJKJCKFFA_ = "";
-      cFMBEIOBIEG_ = "";
-      onlineId_ = "";
-      birthday_ = "";
-      clientVersion_ = "";
-      checksum_ = "";
-      extraBinData_ = com.google.protobuf.ByteString.EMPTY;
       platform_ = "";
-      deviceUuid_ = "";
+      fBKHEDNNFIF_ = "";
+      jIPHKNNHBIE_ = "";
+      cBIEHLMFBHI_ = "";
+      iMACIIGIOGC_ = "";
+      jJIOHIJNGFP_ = "";
       token_ = "";
-      deviceName_ = "";
-      systemVersion_ = "";
-      clientVerisonHash_ = "";
-      fPOFDDAGKAG_ = "";
+      extraBinData_ = com.google.protobuf.ByteString.EMPTY;
+      lPFPAJBHJMH_ = "";
+      oFMIHDNGFNM_ = com.google.protobuf.ByteString.EMPTY;
+      onlineId_ = "";
+      kEODMFOKNGH_ = "";
+      mEEGOICDEFG_ = "";
+      mDIKIHJHHJJ_ = "";
+      hCJGLLHFCMA_ = "";
+      lLIMBPCEABN_ = "";
+      countryCode_ = "";
+      pFDFHPKIHMO_ = com.google.protobuf.ByteString.EMPTY;
+      iMCMLAGLODL_ = "";
+      nNBGJPGDGCP_ = "";
+      cDDBBPKKOPM_ = "";
+      psnId_ = "";
+      birthday_ = "";
+      pECPGFPBJEB_ = "";
+      accountUid_ = "";
     }
 
     @java.lang.Override
@@ -488,74 +516,74 @@ public final class PlayerLoginReqOuterClass {
               break;
             case 8: {
 
-              isGuest_ = input.readBool();
+              hAAGGONEHCH_ = input.readBool();
               break;
             }
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 16: {
 
-              token_ = s;
+              platformType_ = input.readUInt32();
               break;
             }
             case 26: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              systemVersion_ = s;
+              jJIOHIJNGFP_ = s;
               break;
             }
-            case 32: {
+            case 34: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              platformType_ = input.readUInt32();
+              mDIKIHJHHJJ_ = s;
               break;
             }
             case 42: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              deviceInfo_ = s;
+              kEODMFOKNGH_ = s;
               break;
             }
             case 48: {
 
-              loginRand_ = input.readUInt64();
+              isGuest_ = input.readBool();
               break;
             }
-            case 56: {
-
-              subChannelId_ = input.readUInt32();
-              break;
-            }
-            case 66: {
+            case 58: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              accountUid_ = s;
+              token_ = s;
+              break;
+            }
+            case 64: {
+
+              targetUid_ = input.readUInt32();
               break;
             }
             case 72: {
 
-              languageType_ = input.readUInt32();
+              accountType_ = input.readUInt32();
               break;
             }
             case 82: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              deviceUuid_ = s;
+              iMACIIGIOGC_ = s;
               break;
             }
             case 90: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              deviceName_ = s;
+              accountUid_ = s;
               break;
             }
             case 96: {
 
-              targetUid_ = input.readUInt32();
+              loginRand_ = input.readUInt64();
               break;
             }
             case 106: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              clientVersion_ = s;
+              nNBGJPGDGCP_ = s;
               break;
             }
             case 114: {
@@ -566,179 +594,181 @@ public final class PlayerLoginReqOuterClass {
             }
             case 120: {
 
-              isEditor_ = input.readBool();
+              bFPJPDCLFNM_ = input.readUInt32();
               break;
             }
-            case 362: {
+            case 370: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              hIPFGBLGPMJ_ = s;
+              lPFPAJBHJMH_ = s;
               break;
             }
-            case 594: {
-
-              extraBinData_ = input.readBytes();
-              break;
-            }
-            case 1504: {
-
-              tag_ = input.readUInt32();
-              break;
-            }
-            case 1522: {
+            case 690: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              birthday_ = s;
+              lLIMBPCEABN_ = s;
               break;
             }
-            case 2042: {
+            case 1578: {
+
+              pFDFHPKIHMO_ = input.readBytes();
+              break;
+            }
+            case 1730: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              fPOFDDAGKAG_ = s;
+              pECPGFPBJEB_ = s;
               break;
             }
-            case 3480: {
+            case 1808: {
 
-              kCFIGJAPNIB_ = input.readUInt32();
+              targetHomeOwnerUid_ = input.readUInt32();
               break;
             }
-            case 3490: {
-              emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder subBuilder = null;
-              if (trackingIoInfo_ != null) {
-                subBuilder = trackingIoInfo_.toBuilder();
-              }
-              trackingIoInfo_ = input.readMessage(emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(trackingIoInfo_);
-                trackingIoInfo_ = subBuilder.buildPartial();
-              }
+            case 2048: {
 
+              kEKHAKAPMIN_ = input.readUInt32();
               break;
             }
-            case 3666: {
-              java.lang.String s = input.readStringRequireUtf8();
+            case 2122: {
 
-              fOHJKJCKFFA_ = s;
+              oFMIHDNGFNM_ = input.readBytes();
               break;
             }
-            case 5400: {
+            case 2760: {
 
-              dHOLEDCICPB_ = input.readUInt32();
+              fNPPPMBIBEM_ = input.readUInt32();
               break;
             }
-            case 5648: {
-
-              fCPDNLHOBNK_ = input.readUInt32();
-              break;
-            }
-            case 6296: {
-
-              isTransfer_ = input.readBool();
-              break;
-            }
-            case 6498: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              cFMBEIOBIEG_ = s;
-              break;
-            }
-            case 6672: {
-
-              accountType_ = input.readUInt32();
-              break;
-            }
-            case 6954: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientVerisonHash_ = s;
-              break;
-            }
-            case 7296: {
-
-              eMFDHANIAHH_ = input.readUInt32();
-              break;
-            }
-            case 9130: {
-
-              environmentErrorCode_ = input.readBytes();
-              break;
-            }
-            case 9224: {
-
-              lJFBMKFHNJM_ = input.readUInt32();
-              break;
-            }
-            case 9824: {
-
-              kKKHJACICJO_ = input.readUInt32();
-              break;
-            }
-            case 10130: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              psnId_ = s;
-              break;
-            }
-            case 10162: {
+            case 3010: {
               java.lang.String s = input.readStringRequireUtf8();
 
               onlineId_ = s;
               break;
             }
-            case 12754: {
+            case 3360: {
+
+              clientDataVersion_ = input.readUInt32();
+              break;
+            }
+            case 4056: {
+
+              kPCGBPCHBMJ_ = input.readUInt32();
+              break;
+            }
+            case 4202: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              checksumClientVersion_ = s;
+              mEEGOICDEFG_ = s;
               break;
             }
-            case 13210: {
+            case 5512: {
 
-              securityCmdReply_ = input.readBytes();
+              gmUid_ = input.readUInt32();
               break;
             }
-            case 13368: {
+            case 5800: {
 
-              targetHomeOwnerUid_ = input.readUInt32();
+              oCINFHOJCEA_ = input.readUInt32();
               break;
             }
-            case 14370: {
+            case 7370: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              checksum_ = s;
+              cDDBBPKKOPM_ = s;
               break;
             }
-            case 14528: {
+            case 7394: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              channelId_ = input.readUInt32();
+              jIPHKNNHBIE_ = s;
               break;
             }
-            case 14560: {
+            case 9170: {
+              java.lang.String s = input.readStringRequireUtf8();
 
-              dEBLDPOHPOL_ = input.readUInt32();
+              iMCMLAGLODL_ = s;
               break;
             }
-            case 15442: {
+            case 9264: {
+
+              tag_ = input.readUInt32();
+              break;
+            }
+            case 9434: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              birthday_ = s;
+              break;
+            }
+            case 9466: {
+
+              extraBinData_ = input.readBytes();
+              break;
+            }
+            case 10240: {
+
+              dKGAONKKOHA_ = input.readUInt32();
+              break;
+            }
+            case 10960: {
+
+              nCNKMDBAFEH_ = input.readUInt32();
+              break;
+            }
+            case 11466: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              cBIEHLMFBHI_ = s;
+              break;
+            }
+            case 12168: {
+
+              mCKEONLBAOA_ = input.readUInt32();
+              break;
+            }
+            case 12386: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              hCJGLLHFCMA_ = s;
+              break;
+            }
+            case 13128: {
+
+              jAGELBDJFJH_ = input.readBool();
+              break;
+            }
+            case 13354: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              fBKHEDNNFIF_ = s;
+              break;
+            }
+            case 13528: {
+
+              ePAGBFLKJBN_ = input.readUInt32();
+              break;
+            }
+            case 14098: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              psnId_ = s;
+              break;
+            }
+            case 14194: {
               java.lang.String s = input.readStringRequireUtf8();
 
               countryCode_ = s;
               break;
             }
-            case 15586: {
-              emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder subBuilder = null;
-              if (adjustTrackingInfo_ != null) {
-                subBuilder = adjustTrackingInfo_.toBuilder();
-              }
-              adjustTrackingInfo_ = input.readMessage(emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(adjustTrackingInfo_);
-                adjustTrackingInfo_ = subBuilder.buildPartial();
-              }
+            case 15816: {
 
+              iKKKLHICPMF_ = input.readUInt32();
               break;
             }
-            case 16032: {
+            case 16232: {
 
-              clientDataVersion_ = input.readUInt32();
+              pLNNJPFPPAM_ = input.readUInt32();
               break;
             }
             default: {
@@ -773,701 +803,6 @@ public final class PlayerLoginReqOuterClass {
               emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq.class, emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq.Builder.class);
     }
 
-    public static final int SECURITY_CMD_REPLY_FIELD_NUMBER = 1651;
-    private com.google.protobuf.ByteString securityCmdReply_;
-    /**
-     * <code>bytes security_cmd_reply = 1651;</code>
-     * @return The securityCmdReply.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getSecurityCmdReply() {
-      return securityCmdReply_;
-    }
-
-    public static final int DEBLDPOHPOL_FIELD_NUMBER = 1820;
-    private int dEBLDPOHPOL_;
-    /**
-     * <code>uint32 DEBLDPOHPOL = 1820;</code>
-     * @return The dEBLDPOHPOL.
-     */
-    @java.lang.Override
-    public int getDEBLDPOHPOL() {
-      return dEBLDPOHPOL_;
-    }
-
-    public static final int ENVIRONMENT_ERROR_CODE_FIELD_NUMBER = 1141;
-    private com.google.protobuf.ByteString environmentErrorCode_;
-    /**
-     * <code>bytes environment_error_code = 1141;</code>
-     * @return The environmentErrorCode.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getEnvironmentErrorCode() {
-      return environmentErrorCode_;
-    }
-
-    public static final int TRACKING_IO_INFO_FIELD_NUMBER = 436;
-    private emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo trackingIoInfo_;
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     * @return Whether the trackingIoInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasTrackingIoInfo() {
-      return trackingIoInfo_ != null;
-    }
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     * @return The trackingIoInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo getTrackingIoInfo() {
-      return trackingIoInfo_ == null ? emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.getDefaultInstance() : trackingIoInfo_;
-    }
-    /**
-     * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder getTrackingIoInfoOrBuilder() {
-      return getTrackingIoInfo();
-    }
-
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 1930;
-    private volatile java.lang.Object countryCode_;
-    /**
-     * <code>string country_code = 1930;</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();
-        countryCode_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string country_code = 1930;</code>
-     * @return The bytes for countryCode.
-     */
-    @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 static final int DEVICE_INFO_FIELD_NUMBER = 5;
-    private volatile java.lang.Object deviceInfo_;
-    /**
-     * <code>string device_info = 5;</code>
-     * @return The deviceInfo.
-     */
-    @java.lang.Override
-    public java.lang.String getDeviceInfo() {
-      java.lang.Object ref = deviceInfo_;
-      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();
-        deviceInfo_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string device_info = 5;</code>
-     * @return The bytes for deviceInfo.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getDeviceInfoBytes() {
-      java.lang.Object ref = deviceInfo_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        deviceInfo_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ACCOUNT_UID_FIELD_NUMBER = 8;
-    private volatile java.lang.Object accountUid_;
-    /**
-     * <code>string account_uid = 8;</code>
-     * @return The accountUid.
-     */
-    @java.lang.Override
-    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();
-        accountUid_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string account_uid = 8;</code>
-     * @return The bytes for accountUid.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        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);
-        accountUid_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int HIPFGBLGPMJ_FIELD_NUMBER = 45;
-    private volatile java.lang.Object hIPFGBLGPMJ_;
-    /**
-     * <code>string HIPFGBLGPMJ = 45;</code>
-     * @return The hIPFGBLGPMJ.
-     */
-    @java.lang.Override
-    public java.lang.String getHIPFGBLGPMJ() {
-      java.lang.Object ref = hIPFGBLGPMJ_;
-      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();
-        hIPFGBLGPMJ_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string HIPFGBLGPMJ = 45;</code>
-     * @return The bytes for hIPFGBLGPMJ.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getHIPFGBLGPMJBytes() {
-      java.lang.Object ref = hIPFGBLGPMJ_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        hIPFGBLGPMJ_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int PSN_ID_FIELD_NUMBER = 1266;
-    private volatile java.lang.Object psnId_;
-    /**
-     * <code>string psn_id = 1266;</code>
-     * @return The psnId.
-     */
-    @java.lang.Override
-    public java.lang.String getPsnId() {
-      java.lang.Object ref = psnId_;
-      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();
-        psnId_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string psn_id = 1266;</code>
-     * @return The bytes for psnId.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getPsnIdBytes() {
-      java.lang.Object ref = psnId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        psnId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int EMFDHANIAHH_FIELD_NUMBER = 912;
-    private int eMFDHANIAHH_;
-    /**
-     * <code>uint32 EMFDHANIAHH = 912;</code>
-     * @return The eMFDHANIAHH.
-     */
-    @java.lang.Override
-    public int getEMFDHANIAHH() {
-      return eMFDHANIAHH_;
-    }
-
-    public static final int TARGET_UID_FIELD_NUMBER = 12;
-    private int targetUid_;
-    /**
-     * <code>uint32 target_uid = 12;</code>
-     * @return The targetUid.
-     */
-    @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
-    }
-
-    public static final int CHECKSUM_CLIENT_VERSION_FIELD_NUMBER = 1594;
-    private volatile java.lang.Object checksumClientVersion_;
-    /**
-     * <code>string checksum_client_version = 1594;</code>
-     * @return The checksumClientVersion.
-     */
-    @java.lang.Override
-    public java.lang.String getChecksumClientVersion() {
-      java.lang.Object ref = checksumClientVersion_;
-      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();
-        checksumClientVersion_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string checksum_client_version = 1594;</code>
-     * @return The bytes for checksumClientVersion.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getChecksumClientVersionBytes() {
-      java.lang.Object ref = checksumClientVersion_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        checksumClientVersion_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int DHOLEDCICPB_FIELD_NUMBER = 675;
-    private int dHOLEDCICPB_;
-    /**
-     * <code>uint32 DHOLEDCICPB = 675;</code>
-     * @return The dHOLEDCICPB.
-     */
-    @java.lang.Override
-    public int getDHOLEDCICPB() {
-      return dHOLEDCICPB_;
-    }
-
-    public static final int FOHJKJCKFFA_FIELD_NUMBER = 458;
-    private volatile java.lang.Object fOHJKJCKFFA_;
-    /**
-     * <code>string FOHJKJCKFFA = 458;</code>
-     * @return The fOHJKJCKFFA.
-     */
-    @java.lang.Override
-    public java.lang.String getFOHJKJCKFFA() {
-      java.lang.Object ref = fOHJKJCKFFA_;
-      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();
-        fOHJKJCKFFA_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string FOHJKJCKFFA = 458;</code>
-     * @return The bytes for fOHJKJCKFFA.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getFOHJKJCKFFABytes() {
-      java.lang.Object ref = fOHJKJCKFFA_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        fOHJKJCKFFA_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ADJUST_TRACKING_INFO_FIELD_NUMBER = 1948;
-    private emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo adjustTrackingInfo_;
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     * @return Whether the adjustTrackingInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAdjustTrackingInfo() {
-      return adjustTrackingInfo_ != null;
-    }
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     * @return The adjustTrackingInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo getAdjustTrackingInfo() {
-      return adjustTrackingInfo_ == null ? emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.getDefaultInstance() : adjustTrackingInfo_;
-    }
-    /**
-     * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder getAdjustTrackingInfoOrBuilder() {
-      return getAdjustTrackingInfo();
-    }
-
-    public static final int IS_GUEST_FIELD_NUMBER = 1;
-    private boolean isGuest_;
-    /**
-     * <code>bool is_guest = 1;</code>
-     * @return The isGuest.
-     */
-    @java.lang.Override
-    public boolean getIsGuest() {
-      return isGuest_;
-    }
-
-    public static final int TAG_FIELD_NUMBER = 188;
-    private int tag_;
-    /**
-     * <code>uint32 tag = 188;</code>
-     * @return The tag.
-     */
-    @java.lang.Override
-    public int getTag() {
-      return tag_;
-    }
-
-    public static final int TARGET_HOME_OWNER_UID_FIELD_NUMBER = 1671;
-    private int targetHomeOwnerUid_;
-    /**
-     * <code>uint32 target_home_owner_uid = 1671;</code>
-     * @return The targetHomeOwnerUid.
-     */
-    @java.lang.Override
-    public int getTargetHomeOwnerUid() {
-      return targetHomeOwnerUid_;
-    }
-
-    public static final int PLATFORM_TYPE_FIELD_NUMBER = 4;
-    private int platformType_;
-    /**
-     * <code>uint32 platform_type = 4;</code>
-     * @return The platformType.
-     */
-    @java.lang.Override
-    public int getPlatformType() {
-      return platformType_;
-    }
-
-    public static final int CFMBEIOBIEG_FIELD_NUMBER = 812;
-    private volatile java.lang.Object cFMBEIOBIEG_;
-    /**
-     * <code>string CFMBEIOBIEG = 812;</code>
-     * @return The cFMBEIOBIEG.
-     */
-    @java.lang.Override
-    public java.lang.String getCFMBEIOBIEG() {
-      java.lang.Object ref = cFMBEIOBIEG_;
-      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();
-        cFMBEIOBIEG_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string CFMBEIOBIEG = 812;</code>
-     * @return The bytes for cFMBEIOBIEG.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getCFMBEIOBIEGBytes() {
-      java.lang.Object ref = cFMBEIOBIEG_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        cFMBEIOBIEG_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int CHANNEL_ID_FIELD_NUMBER = 1816;
-    private int channelId_;
-    /**
-     * <code>uint32 channel_id = 1816;</code>
-     * @return The channelId.
-     */
-    @java.lang.Override
-    public int getChannelId() {
-      return channelId_;
-    }
-
-    public static final int IS_TRANSFER_FIELD_NUMBER = 787;
-    private boolean isTransfer_;
-    /**
-     * <code>bool is_transfer = 787;</code>
-     * @return The isTransfer.
-     */
-    @java.lang.Override
-    public boolean getIsTransfer() {
-      return isTransfer_;
-    }
-
-    public static final int ONLINE_ID_FIELD_NUMBER = 1270;
-    private volatile java.lang.Object onlineId_;
-    /**
-     * <code>string online_id = 1270;</code>
-     * @return The onlineId.
-     */
-    @java.lang.Override
-    public java.lang.String getOnlineId() {
-      java.lang.Object ref = onlineId_;
-      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();
-        onlineId_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string online_id = 1270;</code>
-     * @return The bytes for onlineId.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getOnlineIdBytes() {
-      java.lang.Object ref = onlineId_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        onlineId_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 2004;
-    private int clientDataVersion_;
-    /**
-     * <code>uint32 client_data_version = 2004;</code>
-     * @return The clientDataVersion.
-     */
-    @java.lang.Override
-    public int getClientDataVersion() {
-      return clientDataVersion_;
-    }
-
-    public static final int BIRTHDAY_FIELD_NUMBER = 190;
-    private volatile java.lang.Object birthday_;
-    /**
-     * <code>string birthday = 190;</code>
-     * @return The birthday.
-     */
-    @java.lang.Override
-    public java.lang.String getBirthday() {
-      java.lang.Object ref = birthday_;
-      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();
-        birthday_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string birthday = 190;</code>
-     * @return The bytes for birthday.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getBirthdayBytes() {
-      java.lang.Object ref = birthday_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        birthday_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int CLIENT_VERSION_FIELD_NUMBER = 13;
-    private volatile java.lang.Object clientVersion_;
-    /**
-     * <code>string client_version = 13;</code>
-     * @return The clientVersion.
-     */
-    @java.lang.Override
-    public java.lang.String getClientVersion() {
-      java.lang.Object ref = clientVersion_;
-      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();
-        clientVersion_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_version = 13;</code>
-     * @return The bytes for clientVersion.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientVersionBytes() {
-      java.lang.Object ref = clientVersion_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientVersion_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int CHECKSUM_FIELD_NUMBER = 1796;
-    private volatile java.lang.Object checksum_;
-    /**
-     * <code>string checksum = 1796;</code>
-     * @return The checksum.
-     */
-    @java.lang.Override
-    public java.lang.String getChecksum() {
-      java.lang.Object ref = checksum_;
-      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();
-        checksum_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string checksum = 1796;</code>
-     * @return The bytes for checksum.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getChecksumBytes() {
-      java.lang.Object ref = checksum_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        checksum_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int FCPDNLHOBNK_FIELD_NUMBER = 706;
-    private int fCPDNLHOBNK_;
-    /**
-     * <code>uint32 FCPDNLHOBNK = 706;</code>
-     * @return The fCPDNLHOBNK.
-     */
-    @java.lang.Override
-    public int getFCPDNLHOBNK() {
-      return fCPDNLHOBNK_;
-    }
-
-    public static final int KCFIGJAPNIB_FIELD_NUMBER = 435;
-    private int kCFIGJAPNIB_;
-    /**
-     * <code>uint32 KCFIGJAPNIB = 435;</code>
-     * @return The kCFIGJAPNIB.
-     */
-    @java.lang.Override
-    public int getKCFIGJAPNIB() {
-      return kCFIGJAPNIB_;
-    }
-
-    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 74;
-    private com.google.protobuf.ByteString extraBinData_;
-    /**
-     * <code>bytes extra_bin_data = 74;</code>
-     * @return The extraBinData.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getExtraBinData() {
-      return extraBinData_;
-    }
-
-    public static final int LOGIN_RAND_FIELD_NUMBER = 6;
-    private long loginRand_;
-    /**
-     * <code>uint64 login_rand = 6;</code>
-     * @return The loginRand.
-     */
-    @java.lang.Override
-    public long getLoginRand() {
-      return loginRand_;
-    }
-
     public static final int PLATFORM_FIELD_NUMBER = 14;
     private volatile java.lang.Object platform_;
     /**
@@ -1506,70 +841,200 @@ public final class PlayerLoginReqOuterClass {
       }
     }
 
-    public static final int SUB_CHANNEL_ID_FIELD_NUMBER = 7;
-    private int subChannelId_;
+    public static final int FBKHEDNNFIF_FIELD_NUMBER = 1669;
+    private volatile java.lang.Object fBKHEDNNFIF_;
     /**
-     * <code>uint32 sub_channel_id = 7;</code>
-     * @return The subChannelId.
+     * <code>string FBKHEDNNFIF = 1669;</code>
+     * @return The fBKHEDNNFIF.
      */
     @java.lang.Override
-    public int getSubChannelId() {
-      return subChannelId_;
-    }
-
-    public static final int KKKHJACICJO_FIELD_NUMBER = 1228;
-    private int kKKHJACICJO_;
-    /**
-     * <code>uint32 KKKHJACICJO = 1228;</code>
-     * @return The kKKHJACICJO.
-     */
-    @java.lang.Override
-    public int getKKKHJACICJO() {
-      return kKKHJACICJO_;
-    }
-
-    public static final int DEVICE_UUID_FIELD_NUMBER = 10;
-    private volatile java.lang.Object deviceUuid_;
-    /**
-     * <code>string device_uuid = 10;</code>
-     * @return The deviceUuid.
-     */
-    @java.lang.Override
-    public java.lang.String getDeviceUuid() {
-      java.lang.Object ref = deviceUuid_;
+    public java.lang.String getFBKHEDNNFIF() {
+      java.lang.Object ref = fBKHEDNNFIF_;
       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();
-        deviceUuid_ = s;
+        fBKHEDNNFIF_ = s;
         return s;
       }
     }
     /**
-     * <code>string device_uuid = 10;</code>
-     * @return The bytes for deviceUuid.
+     * <code>string FBKHEDNNFIF = 1669;</code>
+     * @return The bytes for fBKHEDNNFIF.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getDeviceUuidBytes() {
-      java.lang.Object ref = deviceUuid_;
+        getFBKHEDNNFIFBytes() {
+      java.lang.Object ref = fBKHEDNNFIF_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        deviceUuid_ = b;
+        fBKHEDNNFIF_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int TOKEN_FIELD_NUMBER = 2;
+    public static final int JIPHKNNHBIE_FIELD_NUMBER = 924;
+    private volatile java.lang.Object jIPHKNNHBIE_;
+    /**
+     * <code>string JIPHKNNHBIE = 924;</code>
+     * @return The jIPHKNNHBIE.
+     */
+    @java.lang.Override
+    public java.lang.String getJIPHKNNHBIE() {
+      java.lang.Object ref = jIPHKNNHBIE_;
+      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();
+        jIPHKNNHBIE_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string JIPHKNNHBIE = 924;</code>
+     * @return The bytes for jIPHKNNHBIE.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getJIPHKNNHBIEBytes() {
+      java.lang.Object ref = jIPHKNNHBIE_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        jIPHKNNHBIE_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int CBIEHLMFBHI_FIELD_NUMBER = 1433;
+    private volatile java.lang.Object cBIEHLMFBHI_;
+    /**
+     * <code>string CBIEHLMFBHI = 1433;</code>
+     * @return The cBIEHLMFBHI.
+     */
+    @java.lang.Override
+    public java.lang.String getCBIEHLMFBHI() {
+      java.lang.Object ref = cBIEHLMFBHI_;
+      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();
+        cBIEHLMFBHI_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string CBIEHLMFBHI = 1433;</code>
+     * @return The bytes for cBIEHLMFBHI.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getCBIEHLMFBHIBytes() {
+      java.lang.Object ref = cBIEHLMFBHI_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        cBIEHLMFBHI_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int IMACIIGIOGC_FIELD_NUMBER = 10;
+    private volatile java.lang.Object iMACIIGIOGC_;
+    /**
+     * <code>string IMACIIGIOGC = 10;</code>
+     * @return The iMACIIGIOGC.
+     */
+    @java.lang.Override
+    public java.lang.String getIMACIIGIOGC() {
+      java.lang.Object ref = iMACIIGIOGC_;
+      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();
+        iMACIIGIOGC_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string IMACIIGIOGC = 10;</code>
+     * @return The bytes for iMACIIGIOGC.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getIMACIIGIOGCBytes() {
+      java.lang.Object ref = iMACIIGIOGC_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        iMACIIGIOGC_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int JJIOHIJNGFP_FIELD_NUMBER = 3;
+    private volatile java.lang.Object jJIOHIJNGFP_;
+    /**
+     * <code>string JJIOHIJNGFP = 3;</code>
+     * @return The jJIOHIJNGFP.
+     */
+    @java.lang.Override
+    public java.lang.String getJJIOHIJNGFP() {
+      java.lang.Object ref = jJIOHIJNGFP_;
+      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();
+        jJIOHIJNGFP_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string JJIOHIJNGFP = 3;</code>
+     * @return The bytes for jJIOHIJNGFP.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getJJIOHIJNGFPBytes() {
+      java.lang.Object ref = jJIOHIJNGFP_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        jJIOHIJNGFP_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int TOKEN_FIELD_NUMBER = 7;
     private volatile java.lang.Object token_;
     /**
-     * <code>string token = 2;</code>
+     * <code>string token = 7;</code>
      * @return The token.
      */
     @java.lang.Override
@@ -1586,7 +1051,7 @@ public final class PlayerLoginReqOuterClass {
       }
     }
     /**
-     * <code>string token = 2;</code>
+     * <code>string token = 7;</code>
      * @return The bytes for token.
      */
     @java.lang.Override
@@ -1604,157 +1069,625 @@ public final class PlayerLoginReqOuterClass {
       }
     }
 
-    public static final int DEVICE_NAME_FIELD_NUMBER = 11;
-    private volatile java.lang.Object deviceName_;
+    public static final int EXTRA_BIN_DATA_FIELD_NUMBER = 1183;
+    private com.google.protobuf.ByteString extraBinData_;
     /**
-     * <code>string device_name = 11;</code>
-     * @return The deviceName.
+     * <code>bytes extra_bin_data = 1183;</code>
+     * @return The extraBinData.
      */
     @java.lang.Override
-    public java.lang.String getDeviceName() {
-      java.lang.Object ref = deviceName_;
+    public com.google.protobuf.ByteString getExtraBinData() {
+      return extraBinData_;
+    }
+
+    public static final int LPFPAJBHJMH_FIELD_NUMBER = 46;
+    private volatile java.lang.Object lPFPAJBHJMH_;
+    /**
+     * <code>string LPFPAJBHJMH = 46;</code>
+     * @return The lPFPAJBHJMH.
+     */
+    @java.lang.Override
+    public java.lang.String getLPFPAJBHJMH() {
+      java.lang.Object ref = lPFPAJBHJMH_;
       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();
-        deviceName_ = s;
+        lPFPAJBHJMH_ = s;
         return s;
       }
     }
     /**
-     * <code>string device_name = 11;</code>
-     * @return The bytes for deviceName.
+     * <code>string LPFPAJBHJMH = 46;</code>
+     * @return The bytes for lPFPAJBHJMH.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getDeviceNameBytes() {
-      java.lang.Object ref = deviceName_;
+        getLPFPAJBHJMHBytes() {
+      java.lang.Object ref = lPFPAJBHJMH_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        deviceName_ = b;
+        lPFPAJBHJMH_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int SYSTEM_VERSION_FIELD_NUMBER = 3;
-    private volatile java.lang.Object systemVersion_;
+    public static final int OFMIHDNGFNM_FIELD_NUMBER = 265;
+    private com.google.protobuf.ByteString oFMIHDNGFNM_;
     /**
-     * <code>string system_version = 3;</code>
-     * @return The systemVersion.
+     * <pre>
+     *LHACJNELJMN KOFGDJGJPLH = 1939;
+     * </pre>
+     *
+     * <code>bytes OFMIHDNGFNM = 265;</code>
+     * @return The oFMIHDNGFNM.
      */
     @java.lang.Override
-    public java.lang.String getSystemVersion() {
-      java.lang.Object ref = systemVersion_;
+    public com.google.protobuf.ByteString getOFMIHDNGFNM() {
+      return oFMIHDNGFNM_;
+    }
+
+    public static final int ONLINE_ID_FIELD_NUMBER = 376;
+    private volatile java.lang.Object onlineId_;
+    /**
+     * <code>string online_id = 376;</code>
+     * @return The onlineId.
+     */
+    @java.lang.Override
+    public java.lang.String getOnlineId() {
+      java.lang.Object ref = onlineId_;
       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();
-        systemVersion_ = s;
+        onlineId_ = s;
         return s;
       }
     }
     /**
-     * <code>string system_version = 3;</code>
-     * @return The bytes for systemVersion.
+     * <code>string online_id = 376;</code>
+     * @return The bytes for onlineId.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getSystemVersionBytes() {
-      java.lang.Object ref = systemVersion_;
+        getOnlineIdBytes() {
+      java.lang.Object ref = onlineId_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        systemVersion_ = b;
+        onlineId_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int CLIENT_VERISON_HASH_FIELD_NUMBER = 869;
-    private volatile java.lang.Object clientVerisonHash_;
+    public static final int KEODMFOKNGH_FIELD_NUMBER = 5;
+    private volatile java.lang.Object kEODMFOKNGH_;
     /**
-     * <code>string client_verison_hash = 869;</code>
-     * @return The clientVerisonHash.
+     * <code>string KEODMFOKNGH = 5;</code>
+     * @return The kEODMFOKNGH.
      */
     @java.lang.Override
-    public java.lang.String getClientVerisonHash() {
-      java.lang.Object ref = clientVerisonHash_;
+    public java.lang.String getKEODMFOKNGH() {
+      java.lang.Object ref = kEODMFOKNGH_;
       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();
-        clientVerisonHash_ = s;
+        kEODMFOKNGH_ = s;
         return s;
       }
     }
     /**
-     * <code>string client_verison_hash = 869;</code>
-     * @return The bytes for clientVerisonHash.
+     * <code>string KEODMFOKNGH = 5;</code>
+     * @return The bytes for kEODMFOKNGH.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getClientVerisonHashBytes() {
-      java.lang.Object ref = clientVerisonHash_;
+        getKEODMFOKNGHBytes() {
+      java.lang.Object ref = kEODMFOKNGH_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        clientVerisonHash_ = b;
+        kEODMFOKNGH_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int IS_EDITOR_FIELD_NUMBER = 15;
-    private boolean isEditor_;
+    public static final int MEEGOICDEFG_FIELD_NUMBER = 525;
+    private volatile java.lang.Object mEEGOICDEFG_;
     /**
-     * <code>bool is_editor = 15;</code>
-     * @return The isEditor.
+     * <code>string MEEGOICDEFG = 525;</code>
+     * @return The mEEGOICDEFG.
      */
     @java.lang.Override
-    public boolean getIsEditor() {
-      return isEditor_;
+    public java.lang.String getMEEGOICDEFG() {
+      java.lang.Object ref = mEEGOICDEFG_;
+      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();
+        mEEGOICDEFG_ = s;
+        return s;
+      }
     }
-
-    public static final int LANGUAGE_TYPE_FIELD_NUMBER = 9;
-    private int languageType_;
     /**
-     * <code>uint32 language_type = 9;</code>
-     * @return The languageType.
+     * <code>string MEEGOICDEFG = 525;</code>
+     * @return The bytes for mEEGOICDEFG.
      */
     @java.lang.Override
-    public int getLanguageType() {
-      return languageType_;
+    public com.google.protobuf.ByteString
+        getMEEGOICDEFGBytes() {
+      java.lang.Object ref = mEEGOICDEFG_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        mEEGOICDEFG_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int LJFBMKFHNJM_FIELD_NUMBER = 1153;
-    private int lJFBMKFHNJM_;
+    public static final int MDIKIHJHHJJ_FIELD_NUMBER = 4;
+    private volatile java.lang.Object mDIKIHJHHJJ_;
     /**
-     * <code>uint32 LJFBMKFHNJM = 1153;</code>
-     * @return The lJFBMKFHNJM.
+     * <code>string MDIKIHJHHJJ = 4;</code>
+     * @return The mDIKIHJHHJJ.
      */
     @java.lang.Override
-    public int getLJFBMKFHNJM() {
-      return lJFBMKFHNJM_;
+    public java.lang.String getMDIKIHJHHJJ() {
+      java.lang.Object ref = mDIKIHJHHJJ_;
+      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();
+        mDIKIHJHHJJ_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string MDIKIHJHHJJ = 4;</code>
+     * @return The bytes for mDIKIHJHHJJ.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getMDIKIHJHHJJBytes() {
+      java.lang.Object ref = mDIKIHJHHJJ_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        mDIKIHJHHJJ_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
     }
 
-    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 834;
+    public static final int HCJGLLHFCMA_FIELD_NUMBER = 1548;
+    private volatile java.lang.Object hCJGLLHFCMA_;
+    /**
+     * <code>string HCJGLLHFCMA = 1548;</code>
+     * @return The hCJGLLHFCMA.
+     */
+    @java.lang.Override
+    public java.lang.String getHCJGLLHFCMA() {
+      java.lang.Object ref = hCJGLLHFCMA_;
+      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();
+        hCJGLLHFCMA_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string HCJGLLHFCMA = 1548;</code>
+     * @return The bytes for hCJGLLHFCMA.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getHCJGLLHFCMABytes() {
+      java.lang.Object ref = hCJGLLHFCMA_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        hCJGLLHFCMA_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int LLIMBPCEABN_FIELD_NUMBER = 86;
+    private volatile java.lang.Object lLIMBPCEABN_;
+    /**
+     * <code>string LLIMBPCEABN = 86;</code>
+     * @return The lLIMBPCEABN.
+     */
+    @java.lang.Override
+    public java.lang.String getLLIMBPCEABN() {
+      java.lang.Object ref = lLIMBPCEABN_;
+      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();
+        lLIMBPCEABN_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string LLIMBPCEABN = 86;</code>
+     * @return The bytes for lLIMBPCEABN.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getLLIMBPCEABNBytes() {
+      java.lang.Object ref = lLIMBPCEABN_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        lLIMBPCEABN_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1774;
+    private volatile java.lang.Object countryCode_;
+    /**
+     * <pre>
+     *CNIFDNMIKIF FDNODKOBNFH = 1420;
+     * </pre>
+     *
+     * <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();
+        countryCode_ = s;
+        return s;
+      }
+    }
+    /**
+     * <pre>
+     *CNIFDNMIKIF FDNODKOBNFH = 1420;
+     * </pre>
+     *
+     * <code>string country_code = 1774;</code>
+     * @return The bytes for countryCode.
+     */
+    @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 static final int PFDFHPKIHMO_FIELD_NUMBER = 197;
+    private com.google.protobuf.ByteString pFDFHPKIHMO_;
+    /**
+     * <code>bytes PFDFHPKIHMO = 197;</code>
+     * @return The pFDFHPKIHMO.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getPFDFHPKIHMO() {
+      return pFDFHPKIHMO_;
+    }
+
+    public static final int IMCMLAGLODL_FIELD_NUMBER = 1146;
+    private volatile java.lang.Object iMCMLAGLODL_;
+    /**
+     * <code>string IMCMLAGLODL = 1146;</code>
+     * @return The iMCMLAGLODL.
+     */
+    @java.lang.Override
+    public java.lang.String getIMCMLAGLODL() {
+      java.lang.Object ref = iMCMLAGLODL_;
+      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();
+        iMCMLAGLODL_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string IMCMLAGLODL = 1146;</code>
+     * @return The bytes for iMCMLAGLODL.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getIMCMLAGLODLBytes() {
+      java.lang.Object ref = iMCMLAGLODL_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        iMCMLAGLODL_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int NNBGJPGDGCP_FIELD_NUMBER = 13;
+    private volatile java.lang.Object nNBGJPGDGCP_;
+    /**
+     * <code>string NNBGJPGDGCP = 13;</code>
+     * @return The nNBGJPGDGCP.
+     */
+    @java.lang.Override
+    public java.lang.String getNNBGJPGDGCP() {
+      java.lang.Object ref = nNBGJPGDGCP_;
+      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();
+        nNBGJPGDGCP_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string NNBGJPGDGCP = 13;</code>
+     * @return The bytes for nNBGJPGDGCP.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getNNBGJPGDGCPBytes() {
+      java.lang.Object ref = nNBGJPGDGCP_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nNBGJPGDGCP_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int CDDBBPKKOPM_FIELD_NUMBER = 921;
+    private volatile java.lang.Object cDDBBPKKOPM_;
+    /**
+     * <code>string CDDBBPKKOPM = 921;</code>
+     * @return The cDDBBPKKOPM.
+     */
+    @java.lang.Override
+    public java.lang.String getCDDBBPKKOPM() {
+      java.lang.Object ref = cDDBBPKKOPM_;
+      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();
+        cDDBBPKKOPM_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string CDDBBPKKOPM = 921;</code>
+     * @return The bytes for cDDBBPKKOPM.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getCDDBBPKKOPMBytes() {
+      java.lang.Object ref = cDDBBPKKOPM_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        cDDBBPKKOPM_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int PSN_ID_FIELD_NUMBER = 1762;
+    private volatile java.lang.Object psnId_;
+    /**
+     * <code>string psn_id = 1762;</code>
+     * @return The psnId.
+     */
+    @java.lang.Override
+    public java.lang.String getPsnId() {
+      java.lang.Object ref = psnId_;
+      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();
+        psnId_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string psn_id = 1762;</code>
+     * @return The bytes for psnId.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getPsnIdBytes() {
+      java.lang.Object ref = psnId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        psnId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int BIRTHDAY_FIELD_NUMBER = 1179;
+    private volatile java.lang.Object birthday_;
+    /**
+     * <code>string birthday = 1179;</code>
+     * @return The birthday.
+     */
+    @java.lang.Override
+    public java.lang.String getBirthday() {
+      java.lang.Object ref = birthday_;
+      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();
+        birthday_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string birthday = 1179;</code>
+     * @return The bytes for birthday.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getBirthdayBytes() {
+      java.lang.Object ref = birthday_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        birthday_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int PECPGFPBJEB_FIELD_NUMBER = 216;
+    private volatile java.lang.Object pECPGFPBJEB_;
+    /**
+     * <code>string PECPGFPBJEB = 216;</code>
+     * @return The pECPGFPBJEB.
+     */
+    @java.lang.Override
+    public java.lang.String getPECPGFPBJEB() {
+      java.lang.Object ref = pECPGFPBJEB_;
+      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();
+        pECPGFPBJEB_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string PECPGFPBJEB = 216;</code>
+     * @return The bytes for pECPGFPBJEB.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getPECPGFPBJEBBytes() {
+      java.lang.Object ref = pECPGFPBJEB_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pECPGFPBJEB_ = 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_;
+    /**
+     * <code>string account_uid = 11;</code>
+     * @return The accountUid.
+     */
+    @java.lang.Override
+    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();
+        accountUid_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string account_uid = 11;</code>
+     * @return The bytes for accountUid.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        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);
+        accountUid_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int ACCOUNT_TYPE_FIELD_NUMBER = 9;
     private int accountType_;
     /**
-     * <code>uint32 account_type = 834;</code>
+     * <code>uint32 account_type = 9;</code>
      * @return The accountType.
      */
     @java.lang.Override
@@ -1762,42 +1695,235 @@ public final class PlayerLoginReqOuterClass {
       return accountType_;
     }
 
-    public static final int FPOFDDAGKAG_FIELD_NUMBER = 255;
-    private volatile java.lang.Object fPOFDDAGKAG_;
+    public static final int FNPPPMBIBEM_FIELD_NUMBER = 345;
+    private int fNPPPMBIBEM_;
     /**
-     * <code>string FPOFDDAGKAG = 255;</code>
-     * @return The fPOFDDAGKAG.
+     * <code>uint32 FNPPPMBIBEM = 345;</code>
+     * @return The fNPPPMBIBEM.
      */
     @java.lang.Override
-    public java.lang.String getFPOFDDAGKAG() {
-      java.lang.Object ref = fPOFDDAGKAG_;
-      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();
-        fPOFDDAGKAG_ = s;
-        return s;
-      }
+    public int getFNPPPMBIBEM() {
+      return fNPPPMBIBEM_;
     }
+
+    public static final int PLNNJPFPPAM_FIELD_NUMBER = 2029;
+    private int pLNNJPFPPAM_;
     /**
-     * <code>string FPOFDDAGKAG = 255;</code>
-     * @return The bytes for fPOFDDAGKAG.
+     * <code>uint32 PLNNJPFPPAM = 2029;</code>
+     * @return The pLNNJPFPPAM.
      */
     @java.lang.Override
-    public com.google.protobuf.ByteString
-        getFPOFDDAGKAGBytes() {
-      java.lang.Object ref = fPOFDDAGKAG_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        fPOFDDAGKAG_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
+    public int getPLNNJPFPPAM() {
+      return pLNNJPFPPAM_;
+    }
+
+    public static final int TARGET_HOME_OWNER_UID_FIELD_NUMBER = 226;
+    private int targetHomeOwnerUid_;
+    /**
+     * <code>uint32 target_home_owner_uid = 226;</code>
+     * @return The targetHomeOwnerUid.
+     */
+    @java.lang.Override
+    public int getTargetHomeOwnerUid() {
+      return targetHomeOwnerUid_;
+    }
+
+    public static final int IS_GUEST_FIELD_NUMBER = 6;
+    private boolean isGuest_;
+    /**
+     * <code>bool is_guest = 6;</code>
+     * @return The isGuest.
+     */
+    @java.lang.Override
+    public boolean getIsGuest() {
+      return isGuest_;
+    }
+
+    public static final int HAAGGONEHCH_FIELD_NUMBER = 1;
+    private boolean hAAGGONEHCH_;
+    /**
+     * <code>bool HAAGGONEHCH = 1;</code>
+     * @return The hAAGGONEHCH.
+     */
+    @java.lang.Override
+    public boolean getHAAGGONEHCH() {
+      return hAAGGONEHCH_;
+    }
+
+    public static final int JAGELBDJFJH_FIELD_NUMBER = 1641;
+    private boolean jAGELBDJFJH_;
+    /**
+     * <code>bool JAGELBDJFJH = 1641;</code>
+     * @return The jAGELBDJFJH.
+     */
+    @java.lang.Override
+    public boolean getJAGELBDJFJH() {
+      return jAGELBDJFJH_;
+    }
+
+    public static final int LOGIN_RAND_FIELD_NUMBER = 12;
+    private long loginRand_;
+    /**
+     * <code>uint64 login_rand = 12;</code>
+     * @return The loginRand.
+     */
+    @java.lang.Override
+    public long getLoginRand() {
+      return loginRand_;
+    }
+
+    public static final int OCINFHOJCEA_FIELD_NUMBER = 725;
+    private int oCINFHOJCEA_;
+    /**
+     * <code>uint32 OCINFHOJCEA = 725;</code>
+     * @return The oCINFHOJCEA.
+     */
+    @java.lang.Override
+    public int getOCINFHOJCEA() {
+      return oCINFHOJCEA_;
+    }
+
+    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 KPCGBPCHBMJ_FIELD_NUMBER = 507;
+    private int kPCGBPCHBMJ_;
+    /**
+     * <code>uint32 KPCGBPCHBMJ = 507;</code>
+     * @return The kPCGBPCHBMJ.
+     */
+    @java.lang.Override
+    public int getKPCGBPCHBMJ() {
+      return kPCGBPCHBMJ_;
+    }
+
+    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 420;
+    private int clientDataVersion_;
+    /**
+     * <code>uint32 client_data_version = 420;</code>
+     * @return The clientDataVersion.
+     */
+    @java.lang.Override
+    public int getClientDataVersion() {
+      return clientDataVersion_;
+    }
+
+    public static final int NCNKMDBAFEH_FIELD_NUMBER = 1370;
+    private int nCNKMDBAFEH_;
+    /**
+     * <code>uint32 NCNKMDBAFEH = 1370;</code>
+     * @return The nCNKMDBAFEH.
+     */
+    @java.lang.Override
+    public int getNCNKMDBAFEH() {
+      return nCNKMDBAFEH_;
+    }
+
+    public static final int EPAGBFLKJBN_FIELD_NUMBER = 1691;
+    private int ePAGBFLKJBN_;
+    /**
+     * <code>uint32 EPAGBFLKJBN = 1691;</code>
+     * @return The ePAGBFLKJBN.
+     */
+    @java.lang.Override
+    public int getEPAGBFLKJBN() {
+      return ePAGBFLKJBN_;
+    }
+
+    public static final int GM_UID_FIELD_NUMBER = 689;
+    private int gmUid_;
+    /**
+     * <code>uint32 gm_uid = 689;</code>
+     * @return The gmUid.
+     */
+    @java.lang.Override
+    public int getGmUid() {
+      return gmUid_;
+    }
+
+    public static final int BFPJPDCLFNM_FIELD_NUMBER = 15;
+    private int bFPJPDCLFNM_;
+    /**
+     * <code>uint32 BFPJPDCLFNM = 15;</code>
+     * @return The bFPJPDCLFNM.
+     */
+    @java.lang.Override
+    public int getBFPJPDCLFNM() {
+      return bFPJPDCLFNM_;
+    }
+
+    public static final int IKKKLHICPMF_FIELD_NUMBER = 1977;
+    private int iKKKLHICPMF_;
+    /**
+     * <code>uint32 IKKKLHICPMF = 1977;</code>
+     * @return The iKKKLHICPMF.
+     */
+    @java.lang.Override
+    public int getIKKKLHICPMF() {
+      return iKKKLHICPMF_;
+    }
+
+    public static final int MCKEONLBAOA_FIELD_NUMBER = 1521;
+    private int mCKEONLBAOA_;
+    /**
+     * <code>uint32 MCKEONLBAOA = 1521;</code>
+     * @return The mCKEONLBAOA.
+     */
+    @java.lang.Override
+    public int getMCKEONLBAOA() {
+      return mCKEONLBAOA_;
+    }
+
+    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 KEKHAKAPMIN_FIELD_NUMBER = 256;
+    private int kEKHAKAPMIN_;
+    /**
+     * <code>uint32 KEKHAKAPMIN = 256;</code>
+     * @return The kEKHAKAPMIN.
+     */
+    @java.lang.Override
+    public int getKEKHAKAPMIN() {
+      return kEKHAKAPMIN_;
+    }
+
+    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_;
+    }
+
+    public static final int DKGAONKKOHA_FIELD_NUMBER = 1280;
+    private int dKGAONKKOHA_;
+    /**
+     * <code>uint32 DKGAONKKOHA = 1280;</code>
+     * @return The dKGAONKKOHA.
+     */
+    @java.lang.Override
+    public int getDKGAONKKOHA() {
+      return dKGAONKKOHA_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1814,137 +1940,146 @@ public final class PlayerLoginReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isGuest_ != false) {
-        output.writeBool(1, isGuest_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, token_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(systemVersion_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, systemVersion_);
+      if (hAAGGONEHCH_ != false) {
+        output.writeBool(1, hAAGGONEHCH_);
       }
       if (platformType_ != 0) {
-        output.writeUInt32(4, platformType_);
+        output.writeUInt32(2, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceInfo_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, deviceInfo_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jJIOHIJNGFP_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, jJIOHIJNGFP_);
       }
-      if (loginRand_ != 0L) {
-        output.writeUInt64(6, loginRand_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mDIKIHJHHJJ_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, mDIKIHJHHJJ_);
       }
-      if (subChannelId_ != 0) {
-        output.writeUInt32(7, subChannelId_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kEODMFOKNGH_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 5, kEODMFOKNGH_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, accountUid_);
+      if (isGuest_ != false) {
+        output.writeBool(6, isGuest_);
       }
-      if (languageType_ != 0) {
-        output.writeUInt32(9, languageType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceUuid_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, deviceUuid_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, deviceName_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, token_);
       }
       if (targetUid_ != 0) {
-        output.writeUInt32(12, targetUid_);
+        output.writeUInt32(8, targetUid_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersion_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, clientVersion_);
+      if (accountType_ != 0) {
+        output.writeUInt32(9, accountType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iMACIIGIOGC_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, iMACIIGIOGC_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, accountUid_);
+      }
+      if (loginRand_ != 0L) {
+        output.writeUInt64(12, loginRand_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nNBGJPGDGCP_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, nNBGJPGDGCP_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(platform_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 14, platform_);
       }
-      if (isEditor_ != false) {
-        output.writeBool(15, isEditor_);
+      if (bFPJPDCLFNM_ != 0) {
+        output.writeUInt32(15, bFPJPDCLFNM_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hIPFGBLGPMJ_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 45, hIPFGBLGPMJ_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lPFPAJBHJMH_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 46, lPFPAJBHJMH_);
       }
-      if (!extraBinData_.isEmpty()) {
-        output.writeBytes(74, extraBinData_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lLIMBPCEABN_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 86, lLIMBPCEABN_);
       }
-      if (tag_ != 0) {
-        output.writeUInt32(188, tag_);
+      if (!pFDFHPKIHMO_.isEmpty()) {
+        output.writeBytes(197, pFDFHPKIHMO_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 190, birthday_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fPOFDDAGKAG_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 255, fPOFDDAGKAG_);
-      }
-      if (kCFIGJAPNIB_ != 0) {
-        output.writeUInt32(435, kCFIGJAPNIB_);
-      }
-      if (trackingIoInfo_ != null) {
-        output.writeMessage(436, getTrackingIoInfo());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fOHJKJCKFFA_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 458, fOHJKJCKFFA_);
-      }
-      if (dHOLEDCICPB_ != 0) {
-        output.writeUInt32(675, dHOLEDCICPB_);
-      }
-      if (fCPDNLHOBNK_ != 0) {
-        output.writeUInt32(706, fCPDNLHOBNK_);
-      }
-      if (isTransfer_ != false) {
-        output.writeBool(787, isTransfer_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cFMBEIOBIEG_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 812, cFMBEIOBIEG_);
-      }
-      if (accountType_ != 0) {
-        output.writeUInt32(834, accountType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVerisonHash_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 869, clientVerisonHash_);
-      }
-      if (eMFDHANIAHH_ != 0) {
-        output.writeUInt32(912, eMFDHANIAHH_);
-      }
-      if (!environmentErrorCode_.isEmpty()) {
-        output.writeBytes(1141, environmentErrorCode_);
-      }
-      if (lJFBMKFHNJM_ != 0) {
-        output.writeUInt32(1153, lJFBMKFHNJM_);
-      }
-      if (kKKHJACICJO_ != 0) {
-        output.writeUInt32(1228, kKKHJACICJO_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1266, psnId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1270, onlineId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(checksumClientVersion_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1594, checksumClientVersion_);
-      }
-      if (!securityCmdReply_.isEmpty()) {
-        output.writeBytes(1651, securityCmdReply_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pECPGFPBJEB_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 216, pECPGFPBJEB_);
       }
       if (targetHomeOwnerUid_ != 0) {
-        output.writeUInt32(1671, targetHomeOwnerUid_);
+        output.writeUInt32(226, targetHomeOwnerUid_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(checksum_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1796, checksum_);
+      if (kEKHAKAPMIN_ != 0) {
+        output.writeUInt32(256, kEKHAKAPMIN_);
       }
-      if (channelId_ != 0) {
-        output.writeUInt32(1816, channelId_);
+      if (!oFMIHDNGFNM_.isEmpty()) {
+        output.writeBytes(265, oFMIHDNGFNM_);
       }
-      if (dEBLDPOHPOL_ != 0) {
-        output.writeUInt32(1820, dEBLDPOHPOL_);
+      if (fNPPPMBIBEM_ != 0) {
+        output.writeUInt32(345, fNPPPMBIBEM_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1930, countryCode_);
-      }
-      if (adjustTrackingInfo_ != null) {
-        output.writeMessage(1948, getAdjustTrackingInfo());
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 376, onlineId_);
       }
       if (clientDataVersion_ != 0) {
-        output.writeUInt32(2004, clientDataVersion_);
+        output.writeUInt32(420, clientDataVersion_);
+      }
+      if (kPCGBPCHBMJ_ != 0) {
+        output.writeUInt32(507, kPCGBPCHBMJ_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mEEGOICDEFG_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 525, mEEGOICDEFG_);
+      }
+      if (gmUid_ != 0) {
+        output.writeUInt32(689, gmUid_);
+      }
+      if (oCINFHOJCEA_ != 0) {
+        output.writeUInt32(725, oCINFHOJCEA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cDDBBPKKOPM_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 921, cDDBBPKKOPM_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jIPHKNNHBIE_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 924, jIPHKNNHBIE_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iMCMLAGLODL_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1146, iMCMLAGLODL_);
+      }
+      if (tag_ != 0) {
+        output.writeUInt32(1158, tag_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1179, birthday_);
+      }
+      if (!extraBinData_.isEmpty()) {
+        output.writeBytes(1183, extraBinData_);
+      }
+      if (dKGAONKKOHA_ != 0) {
+        output.writeUInt32(1280, dKGAONKKOHA_);
+      }
+      if (nCNKMDBAFEH_ != 0) {
+        output.writeUInt32(1370, nCNKMDBAFEH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cBIEHLMFBHI_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1433, cBIEHLMFBHI_);
+      }
+      if (mCKEONLBAOA_ != 0) {
+        output.writeUInt32(1521, mCKEONLBAOA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hCJGLLHFCMA_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1548, hCJGLLHFCMA_);
+      }
+      if (jAGELBDJFJH_ != false) {
+        output.writeBool(1641, jAGELBDJFJH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fBKHEDNNFIF_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1669, fBKHEDNNFIF_);
+      }
+      if (ePAGBFLKJBN_ != 0) {
+        output.writeUInt32(1691, ePAGBFLKJBN_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1762, psnId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1774, countryCode_);
+      }
+      if (iKKKLHICPMF_ != 0) {
+        output.writeUInt32(1977, iKKKLHICPMF_);
+      }
+      if (pLNNJPFPPAM_ != 0) {
+        output.writeUInt32(2029, pLNNJPFPPAM_);
       }
       unknownFields.writeTo(output);
     }
@@ -1955,162 +2090,171 @@ public final class PlayerLoginReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isGuest_ != false) {
+      if (hAAGGONEHCH_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isGuest_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, token_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(systemVersion_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, systemVersion_);
+          .computeBoolSize(1, hAAGGONEHCH_);
       }
       if (platformType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, platformType_);
+          .computeUInt32Size(2, platformType_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceInfo_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, deviceInfo_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jJIOHIJNGFP_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, jJIOHIJNGFP_);
       }
-      if (loginRand_ != 0L) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mDIKIHJHHJJ_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, mDIKIHJHHJJ_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kEODMFOKNGH_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, kEODMFOKNGH_);
+      }
+      if (isGuest_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(6, loginRand_);
+          .computeBoolSize(6, isGuest_);
       }
-      if (subChannelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, subChannelId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, accountUid_);
-      }
-      if (languageType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, languageType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceUuid_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, deviceUuid_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(deviceName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, deviceName_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(token_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, token_);
       }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, targetUid_);
+          .computeUInt32Size(8, targetUid_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersion_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, clientVersion_);
+      if (accountType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, accountType_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iMACIIGIOGC_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, iMACIIGIOGC_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(accountUid_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, accountUid_);
+      }
+      if (loginRand_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(12, loginRand_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nNBGJPGDGCP_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, nNBGJPGDGCP_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(platform_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, platform_);
       }
-      if (isEditor_ != false) {
+      if (bFPJPDCLFNM_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isEditor_);
+          .computeUInt32Size(15, bFPJPDCLFNM_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hIPFGBLGPMJ_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(45, hIPFGBLGPMJ_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lPFPAJBHJMH_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(46, lPFPAJBHJMH_);
       }
-      if (!extraBinData_.isEmpty()) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lLIMBPCEABN_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(86, lLIMBPCEABN_);
+      }
+      if (!pFDFHPKIHMO_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(74, extraBinData_);
+          .computeBytesSize(197, pFDFHPKIHMO_);
       }
-      if (tag_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(188, tag_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(190, birthday_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fPOFDDAGKAG_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(255, fPOFDDAGKAG_);
-      }
-      if (kCFIGJAPNIB_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(435, kCFIGJAPNIB_);
-      }
-      if (trackingIoInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(436, getTrackingIoInfo());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fOHJKJCKFFA_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(458, fOHJKJCKFFA_);
-      }
-      if (dHOLEDCICPB_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(675, dHOLEDCICPB_);
-      }
-      if (fCPDNLHOBNK_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(706, fCPDNLHOBNK_);
-      }
-      if (isTransfer_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(787, isTransfer_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cFMBEIOBIEG_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(812, cFMBEIOBIEG_);
-      }
-      if (accountType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(834, accountType_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVerisonHash_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(869, clientVerisonHash_);
-      }
-      if (eMFDHANIAHH_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(912, eMFDHANIAHH_);
-      }
-      if (!environmentErrorCode_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1141, environmentErrorCode_);
-      }
-      if (lJFBMKFHNJM_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1153, lJFBMKFHNJM_);
-      }
-      if (kKKHJACICJO_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1228, kKKHJACICJO_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1266, psnId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1270, onlineId_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(checksumClientVersion_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1594, checksumClientVersion_);
-      }
-      if (!securityCmdReply_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(1651, securityCmdReply_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pECPGFPBJEB_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(216, pECPGFPBJEB_);
       }
       if (targetHomeOwnerUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1671, targetHomeOwnerUid_);
+          .computeUInt32Size(226, targetHomeOwnerUid_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(checksum_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1796, checksum_);
-      }
-      if (channelId_ != 0) {
+      if (kEKHAKAPMIN_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1816, channelId_);
+          .computeUInt32Size(256, kEKHAKAPMIN_);
       }
-      if (dEBLDPOHPOL_ != 0) {
+      if (!oFMIHDNGFNM_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1820, dEBLDPOHPOL_);
+          .computeBytesSize(265, oFMIHDNGFNM_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1930, countryCode_);
-      }
-      if (adjustTrackingInfo_ != null) {
+      if (fNPPPMBIBEM_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1948, getAdjustTrackingInfo());
+          .computeUInt32Size(345, fNPPPMBIBEM_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(onlineId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(376, onlineId_);
       }
       if (clientDataVersion_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2004, clientDataVersion_);
+          .computeUInt32Size(420, clientDataVersion_);
+      }
+      if (kPCGBPCHBMJ_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(507, kPCGBPCHBMJ_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(mEEGOICDEFG_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(525, mEEGOICDEFG_);
+      }
+      if (gmUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(689, gmUid_);
+      }
+      if (oCINFHOJCEA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(725, oCINFHOJCEA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cDDBBPKKOPM_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(921, cDDBBPKKOPM_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jIPHKNNHBIE_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(924, jIPHKNNHBIE_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(iMCMLAGLODL_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1146, iMCMLAGLODL_);
+      }
+      if (tag_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1158, tag_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1179, birthday_);
+      }
+      if (!extraBinData_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(1183, extraBinData_);
+      }
+      if (dKGAONKKOHA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1280, dKGAONKKOHA_);
+      }
+      if (nCNKMDBAFEH_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1370, nCNKMDBAFEH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(cBIEHLMFBHI_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1433, cBIEHLMFBHI_);
+      }
+      if (mCKEONLBAOA_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1521, mCKEONLBAOA_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(hCJGLLHFCMA_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1548, hCJGLLHFCMA_);
+      }
+      if (jAGELBDJFJH_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1641, jAGELBDJFJH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(fBKHEDNNFIF_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1669, fBKHEDNNFIF_);
+      }
+      if (ePAGBFLKJBN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1691, ePAGBFLKJBN_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(psnId_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1762, psnId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1774, countryCode_);
+      }
+      if (iKKKLHICPMF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1977, iKKKLHICPMF_);
+      }
+      if (pLNNJPFPPAM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2029, pLNNJPFPPAM_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2127,100 +2271,100 @@ public final class PlayerLoginReqOuterClass {
       }
       emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq other = (emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq) obj;
 
-      if (!getSecurityCmdReply()
-          .equals(other.getSecurityCmdReply())) return false;
-      if (getDEBLDPOHPOL()
-          != other.getDEBLDPOHPOL()) return false;
-      if (!getEnvironmentErrorCode()
-          .equals(other.getEnvironmentErrorCode())) return false;
-      if (hasTrackingIoInfo() != other.hasTrackingIoInfo()) return false;
-      if (hasTrackingIoInfo()) {
-        if (!getTrackingIoInfo()
-            .equals(other.getTrackingIoInfo())) return false;
-      }
-      if (!getCountryCode()
-          .equals(other.getCountryCode())) return false;
-      if (!getDeviceInfo()
-          .equals(other.getDeviceInfo())) return false;
-      if (!getAccountUid()
-          .equals(other.getAccountUid())) return false;
-      if (!getHIPFGBLGPMJ()
-          .equals(other.getHIPFGBLGPMJ())) return false;
-      if (!getPsnId()
-          .equals(other.getPsnId())) return false;
-      if (getEMFDHANIAHH()
-          != other.getEMFDHANIAHH()) return false;
-      if (getTargetUid()
-          != other.getTargetUid()) return false;
-      if (!getChecksumClientVersion()
-          .equals(other.getChecksumClientVersion())) return false;
-      if (getDHOLEDCICPB()
-          != other.getDHOLEDCICPB()) return false;
-      if (!getFOHJKJCKFFA()
-          .equals(other.getFOHJKJCKFFA())) return false;
-      if (hasAdjustTrackingInfo() != other.hasAdjustTrackingInfo()) return false;
-      if (hasAdjustTrackingInfo()) {
-        if (!getAdjustTrackingInfo()
-            .equals(other.getAdjustTrackingInfo())) return false;
-      }
-      if (getIsGuest()
-          != other.getIsGuest()) return false;
-      if (getTag()
-          != other.getTag()) return false;
-      if (getTargetHomeOwnerUid()
-          != other.getTargetHomeOwnerUid()) return false;
-      if (getPlatformType()
-          != other.getPlatformType()) return false;
-      if (!getCFMBEIOBIEG()
-          .equals(other.getCFMBEIOBIEG())) return false;
-      if (getChannelId()
-          != other.getChannelId()) return false;
-      if (getIsTransfer()
-          != other.getIsTransfer()) return false;
-      if (!getOnlineId()
-          .equals(other.getOnlineId())) return false;
-      if (getClientDataVersion()
-          != other.getClientDataVersion()) return false;
-      if (!getBirthday()
-          .equals(other.getBirthday())) return false;
-      if (!getClientVersion()
-          .equals(other.getClientVersion())) return false;
-      if (!getChecksum()
-          .equals(other.getChecksum())) return false;
-      if (getFCPDNLHOBNK()
-          != other.getFCPDNLHOBNK()) return false;
-      if (getKCFIGJAPNIB()
-          != other.getKCFIGJAPNIB()) return false;
-      if (!getExtraBinData()
-          .equals(other.getExtraBinData())) return false;
-      if (getLoginRand()
-          != other.getLoginRand()) return false;
       if (!getPlatform()
           .equals(other.getPlatform())) return false;
-      if (getSubChannelId()
-          != other.getSubChannelId()) return false;
-      if (getKKKHJACICJO()
-          != other.getKKKHJACICJO()) return false;
-      if (!getDeviceUuid()
-          .equals(other.getDeviceUuid())) return false;
+      if (!getFBKHEDNNFIF()
+          .equals(other.getFBKHEDNNFIF())) return false;
+      if (!getJIPHKNNHBIE()
+          .equals(other.getJIPHKNNHBIE())) return false;
+      if (!getCBIEHLMFBHI()
+          .equals(other.getCBIEHLMFBHI())) return false;
+      if (!getIMACIIGIOGC()
+          .equals(other.getIMACIIGIOGC())) return false;
+      if (!getJJIOHIJNGFP()
+          .equals(other.getJJIOHIJNGFP())) return false;
       if (!getToken()
           .equals(other.getToken())) return false;
-      if (!getDeviceName()
-          .equals(other.getDeviceName())) return false;
-      if (!getSystemVersion()
-          .equals(other.getSystemVersion())) return false;
-      if (!getClientVerisonHash()
-          .equals(other.getClientVerisonHash())) return false;
-      if (getIsEditor()
-          != other.getIsEditor()) return false;
-      if (getLanguageType()
-          != other.getLanguageType()) return false;
-      if (getLJFBMKFHNJM()
-          != other.getLJFBMKFHNJM()) return false;
+      if (!getExtraBinData()
+          .equals(other.getExtraBinData())) return false;
+      if (!getLPFPAJBHJMH()
+          .equals(other.getLPFPAJBHJMH())) return false;
+      if (!getOFMIHDNGFNM()
+          .equals(other.getOFMIHDNGFNM())) return false;
+      if (!getOnlineId()
+          .equals(other.getOnlineId())) return false;
+      if (!getKEODMFOKNGH()
+          .equals(other.getKEODMFOKNGH())) return false;
+      if (!getMEEGOICDEFG()
+          .equals(other.getMEEGOICDEFG())) return false;
+      if (!getMDIKIHJHHJJ()
+          .equals(other.getMDIKIHJHHJJ())) return false;
+      if (!getHCJGLLHFCMA()
+          .equals(other.getHCJGLLHFCMA())) return false;
+      if (!getLLIMBPCEABN()
+          .equals(other.getLLIMBPCEABN())) return false;
+      if (!getCountryCode()
+          .equals(other.getCountryCode())) return false;
+      if (!getPFDFHPKIHMO()
+          .equals(other.getPFDFHPKIHMO())) return false;
+      if (!getIMCMLAGLODL()
+          .equals(other.getIMCMLAGLODL())) return false;
+      if (!getNNBGJPGDGCP()
+          .equals(other.getNNBGJPGDGCP())) return false;
+      if (!getCDDBBPKKOPM()
+          .equals(other.getCDDBBPKKOPM())) return false;
+      if (!getPsnId()
+          .equals(other.getPsnId())) return false;
+      if (!getBirthday()
+          .equals(other.getBirthday())) return false;
+      if (!getPECPGFPBJEB()
+          .equals(other.getPECPGFPBJEB())) return false;
+      if (!getAccountUid()
+          .equals(other.getAccountUid())) return false;
       if (getAccountType()
           != other.getAccountType()) return false;
-      if (!getFPOFDDAGKAG()
-          .equals(other.getFPOFDDAGKAG())) return false;
+      if (getFNPPPMBIBEM()
+          != other.getFNPPPMBIBEM()) return false;
+      if (getPLNNJPFPPAM()
+          != other.getPLNNJPFPPAM()) return false;
+      if (getTargetHomeOwnerUid()
+          != other.getTargetHomeOwnerUid()) return false;
+      if (getIsGuest()
+          != other.getIsGuest()) return false;
+      if (getHAAGGONEHCH()
+          != other.getHAAGGONEHCH()) return false;
+      if (getJAGELBDJFJH()
+          != other.getJAGELBDJFJH()) return false;
+      if (getLoginRand()
+          != other.getLoginRand()) return false;
+      if (getOCINFHOJCEA()
+          != other.getOCINFHOJCEA()) return false;
+      if (getTag()
+          != other.getTag()) return false;
+      if (getKPCGBPCHBMJ()
+          != other.getKPCGBPCHBMJ()) return false;
+      if (getClientDataVersion()
+          != other.getClientDataVersion()) return false;
+      if (getNCNKMDBAFEH()
+          != other.getNCNKMDBAFEH()) return false;
+      if (getEPAGBFLKJBN()
+          != other.getEPAGBFLKJBN()) return false;
+      if (getGmUid()
+          != other.getGmUid()) return false;
+      if (getBFPJPDCLFNM()
+          != other.getBFPJPDCLFNM()) return false;
+      if (getIKKKLHICPMF()
+          != other.getIKKKLHICPMF()) return false;
+      if (getMCKEONLBAOA()
+          != other.getMCKEONLBAOA()) return false;
+      if (getPlatformType()
+          != other.getPlatformType()) return false;
+      if (getKEKHAKAPMIN()
+          != other.getKEKHAKAPMIN()) return false;
+      if (getTargetUid()
+          != other.getTargetUid()) return false;
+      if (getDKGAONKKOHA()
+          != other.getDKGAONKKOHA()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -2232,102 +2376,104 @@ public final class PlayerLoginReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SECURITY_CMD_REPLY_FIELD_NUMBER;
-      hash = (53 * hash) + getSecurityCmdReply().hashCode();
-      hash = (37 * hash) + DEBLDPOHPOL_FIELD_NUMBER;
-      hash = (53 * hash) + getDEBLDPOHPOL();
-      hash = (37 * hash) + ENVIRONMENT_ERROR_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getEnvironmentErrorCode().hashCode();
-      if (hasTrackingIoInfo()) {
-        hash = (37 * hash) + TRACKING_IO_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getTrackingIoInfo().hashCode();
-      }
+      hash = (37 * hash) + PLATFORM_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatform().hashCode();
+      hash = (37 * hash) + FBKHEDNNFIF_FIELD_NUMBER;
+      hash = (53 * hash) + getFBKHEDNNFIF().hashCode();
+      hash = (37 * hash) + JIPHKNNHBIE_FIELD_NUMBER;
+      hash = (53 * hash) + getJIPHKNNHBIE().hashCode();
+      hash = (37 * hash) + CBIEHLMFBHI_FIELD_NUMBER;
+      hash = (53 * hash) + getCBIEHLMFBHI().hashCode();
+      hash = (37 * hash) + IMACIIGIOGC_FIELD_NUMBER;
+      hash = (53 * hash) + getIMACIIGIOGC().hashCode();
+      hash = (37 * hash) + JJIOHIJNGFP_FIELD_NUMBER;
+      hash = (53 * hash) + getJJIOHIJNGFP().hashCode();
+      hash = (37 * hash) + TOKEN_FIELD_NUMBER;
+      hash = (53 * hash) + getToken().hashCode();
+      hash = (37 * hash) + EXTRA_BIN_DATA_FIELD_NUMBER;
+      hash = (53 * hash) + getExtraBinData().hashCode();
+      hash = (37 * hash) + LPFPAJBHJMH_FIELD_NUMBER;
+      hash = (53 * hash) + getLPFPAJBHJMH().hashCode();
+      hash = (37 * hash) + OFMIHDNGFNM_FIELD_NUMBER;
+      hash = (53 * hash) + getOFMIHDNGFNM().hashCode();
+      hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getOnlineId().hashCode();
+      hash = (37 * hash) + KEODMFOKNGH_FIELD_NUMBER;
+      hash = (53 * hash) + getKEODMFOKNGH().hashCode();
+      hash = (37 * hash) + MEEGOICDEFG_FIELD_NUMBER;
+      hash = (53 * hash) + getMEEGOICDEFG().hashCode();
+      hash = (37 * hash) + MDIKIHJHHJJ_FIELD_NUMBER;
+      hash = (53 * hash) + getMDIKIHJHHJJ().hashCode();
+      hash = (37 * hash) + HCJGLLHFCMA_FIELD_NUMBER;
+      hash = (53 * hash) + getHCJGLLHFCMA().hashCode();
+      hash = (37 * hash) + LLIMBPCEABN_FIELD_NUMBER;
+      hash = (53 * hash) + getLLIMBPCEABN().hashCode();
       hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCountryCode().hashCode();
-      hash = (37 * hash) + DEVICE_INFO_FIELD_NUMBER;
-      hash = (53 * hash) + getDeviceInfo().hashCode();
-      hash = (37 * hash) + ACCOUNT_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountUid().hashCode();
-      hash = (37 * hash) + HIPFGBLGPMJ_FIELD_NUMBER;
-      hash = (53 * hash) + getHIPFGBLGPMJ().hashCode();
+      hash = (37 * hash) + PFDFHPKIHMO_FIELD_NUMBER;
+      hash = (53 * hash) + getPFDFHPKIHMO().hashCode();
+      hash = (37 * hash) + IMCMLAGLODL_FIELD_NUMBER;
+      hash = (53 * hash) + getIMCMLAGLODL().hashCode();
+      hash = (37 * hash) + NNBGJPGDGCP_FIELD_NUMBER;
+      hash = (53 * hash) + getNNBGJPGDGCP().hashCode();
+      hash = (37 * hash) + CDDBBPKKOPM_FIELD_NUMBER;
+      hash = (53 * hash) + getCDDBBPKKOPM().hashCode();
       hash = (37 * hash) + PSN_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPsnId().hashCode();
-      hash = (37 * hash) + EMFDHANIAHH_FIELD_NUMBER;
-      hash = (53 * hash) + getEMFDHANIAHH();
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
-      hash = (37 * hash) + CHECKSUM_CLIENT_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getChecksumClientVersion().hashCode();
-      hash = (37 * hash) + DHOLEDCICPB_FIELD_NUMBER;
-      hash = (53 * hash) + getDHOLEDCICPB();
-      hash = (37 * hash) + FOHJKJCKFFA_FIELD_NUMBER;
-      hash = (53 * hash) + getFOHJKJCKFFA().hashCode();
-      if (hasAdjustTrackingInfo()) {
-        hash = (37 * hash) + ADJUST_TRACKING_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getAdjustTrackingInfo().hashCode();
-      }
+      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
+      hash = (53 * hash) + getBirthday().hashCode();
+      hash = (37 * hash) + PECPGFPBJEB_FIELD_NUMBER;
+      hash = (53 * hash) + getPECPGFPBJEB().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) + FNPPPMBIBEM_FIELD_NUMBER;
+      hash = (53 * hash) + getFNPPPMBIBEM();
+      hash = (37 * hash) + PLNNJPFPPAM_FIELD_NUMBER;
+      hash = (53 * hash) + getPLNNJPFPPAM();
+      hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetHomeOwnerUid();
       hash = (37 * hash) + IS_GUEST_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsGuest());
-      hash = (37 * hash) + TAG_FIELD_NUMBER;
-      hash = (53 * hash) + getTag();
-      hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetHomeOwnerUid();
-      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatformType();
-      hash = (37 * hash) + CFMBEIOBIEG_FIELD_NUMBER;
-      hash = (53 * hash) + getCFMBEIOBIEG().hashCode();
-      hash = (37 * hash) + CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getChannelId();
-      hash = (37 * hash) + IS_TRANSFER_FIELD_NUMBER;
+      hash = (37 * hash) + HAAGGONEHCH_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsTransfer());
-      hash = (37 * hash) + ONLINE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getOnlineId().hashCode();
-      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientDataVersion();
-      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
-      hash = (53 * hash) + getBirthday().hashCode();
-      hash = (37 * hash) + CLIENT_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientVersion().hashCode();
-      hash = (37 * hash) + CHECKSUM_FIELD_NUMBER;
-      hash = (53 * hash) + getChecksum().hashCode();
-      hash = (37 * hash) + FCPDNLHOBNK_FIELD_NUMBER;
-      hash = (53 * hash) + getFCPDNLHOBNK();
-      hash = (37 * hash) + KCFIGJAPNIB_FIELD_NUMBER;
-      hash = (53 * hash) + getKCFIGJAPNIB();
-      hash = (37 * hash) + EXTRA_BIN_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getExtraBinData().hashCode();
+          getHAAGGONEHCH());
+      hash = (37 * hash) + JAGELBDJFJH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getJAGELBDJFJH());
       hash = (37 * hash) + LOGIN_RAND_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getLoginRand());
-      hash = (37 * hash) + PLATFORM_FIELD_NUMBER;
-      hash = (53 * hash) + getPlatform().hashCode();
-      hash = (37 * hash) + SUB_CHANNEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSubChannelId();
-      hash = (37 * hash) + KKKHJACICJO_FIELD_NUMBER;
-      hash = (53 * hash) + getKKKHJACICJO();
-      hash = (37 * hash) + DEVICE_UUID_FIELD_NUMBER;
-      hash = (53 * hash) + getDeviceUuid().hashCode();
-      hash = (37 * hash) + TOKEN_FIELD_NUMBER;
-      hash = (53 * hash) + getToken().hashCode();
-      hash = (37 * hash) + DEVICE_NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getDeviceName().hashCode();
-      hash = (37 * hash) + SYSTEM_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getSystemVersion().hashCode();
-      hash = (37 * hash) + CLIENT_VERISON_HASH_FIELD_NUMBER;
-      hash = (53 * hash) + getClientVerisonHash().hashCode();
-      hash = (37 * hash) + IS_EDITOR_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsEditor());
-      hash = (37 * hash) + LANGUAGE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getLanguageType();
-      hash = (37 * hash) + LJFBMKFHNJM_FIELD_NUMBER;
-      hash = (53 * hash) + getLJFBMKFHNJM();
-      hash = (37 * hash) + ACCOUNT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getAccountType();
-      hash = (37 * hash) + FPOFDDAGKAG_FIELD_NUMBER;
-      hash = (53 * hash) + getFPOFDDAGKAG().hashCode();
+      hash = (37 * hash) + OCINFHOJCEA_FIELD_NUMBER;
+      hash = (53 * hash) + getOCINFHOJCEA();
+      hash = (37 * hash) + TAG_FIELD_NUMBER;
+      hash = (53 * hash) + getTag();
+      hash = (37 * hash) + KPCGBPCHBMJ_FIELD_NUMBER;
+      hash = (53 * hash) + getKPCGBPCHBMJ();
+      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getClientDataVersion();
+      hash = (37 * hash) + NCNKMDBAFEH_FIELD_NUMBER;
+      hash = (53 * hash) + getNCNKMDBAFEH();
+      hash = (37 * hash) + EPAGBFLKJBN_FIELD_NUMBER;
+      hash = (53 * hash) + getEPAGBFLKJBN();
+      hash = (37 * hash) + GM_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getGmUid();
+      hash = (37 * hash) + BFPJPDCLFNM_FIELD_NUMBER;
+      hash = (53 * hash) + getBFPJPDCLFNM();
+      hash = (37 * hash) + IKKKLHICPMF_FIELD_NUMBER;
+      hash = (53 * hash) + getIKKKLHICPMF();
+      hash = (37 * hash) + MCKEONLBAOA_FIELD_NUMBER;
+      hash = (53 * hash) + getMCKEONLBAOA();
+      hash = (37 * hash) + PLATFORM_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getPlatformType();
+      hash = (37 * hash) + KEKHAKAPMIN_FIELD_NUMBER;
+      hash = (53 * hash) + getKEKHAKAPMIN();
+      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + DKGAONKKOHA_FIELD_NUMBER;
+      hash = (53 * hash) + getDKGAONKKOHA();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2424,11 +2570,6 @@ public final class PlayerLoginReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25842
-     * Obf: GJIMLGLMKJF
-     * </pre>
-     *
      * Protobuf type {@code PlayerLoginReq}
      */
     public static final class Builder extends
@@ -2466,101 +2607,99 @@ public final class PlayerLoginReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        securityCmdReply_ = com.google.protobuf.ByteString.EMPTY;
-
-        dEBLDPOHPOL_ = 0;
-
-        environmentErrorCode_ = com.google.protobuf.ByteString.EMPTY;
-
-        if (trackingIoInfoBuilder_ == null) {
-          trackingIoInfo_ = null;
-        } else {
-          trackingIoInfo_ = null;
-          trackingIoInfoBuilder_ = null;
-        }
-        countryCode_ = "";
-
-        deviceInfo_ = "";
-
-        accountUid_ = "";
-
-        hIPFGBLGPMJ_ = "";
-
-        psnId_ = "";
-
-        eMFDHANIAHH_ = 0;
-
-        targetUid_ = 0;
-
-        checksumClientVersion_ = "";
-
-        dHOLEDCICPB_ = 0;
-
-        fOHJKJCKFFA_ = "";
-
-        if (adjustTrackingInfoBuilder_ == null) {
-          adjustTrackingInfo_ = null;
-        } else {
-          adjustTrackingInfo_ = null;
-          adjustTrackingInfoBuilder_ = null;
-        }
-        isGuest_ = false;
-
-        tag_ = 0;
-
-        targetHomeOwnerUid_ = 0;
-
-        platformType_ = 0;
-
-        cFMBEIOBIEG_ = "";
-
-        channelId_ = 0;
-
-        isTransfer_ = false;
-
-        onlineId_ = "";
-
-        clientDataVersion_ = 0;
-
-        birthday_ = "";
-
-        clientVersion_ = "";
-
-        checksum_ = "";
-
-        fCPDNLHOBNK_ = 0;
-
-        kCFIGJAPNIB_ = 0;
-
-        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-
-        loginRand_ = 0L;
-
         platform_ = "";
 
-        subChannelId_ = 0;
+        fBKHEDNNFIF_ = "";
 
-        kKKHJACICJO_ = 0;
+        jIPHKNNHBIE_ = "";
 
-        deviceUuid_ = "";
+        cBIEHLMFBHI_ = "";
+
+        iMACIIGIOGC_ = "";
+
+        jJIOHIJNGFP_ = "";
 
         token_ = "";
 
-        deviceName_ = "";
+        extraBinData_ = com.google.protobuf.ByteString.EMPTY;
 
-        systemVersion_ = "";
+        lPFPAJBHJMH_ = "";
 
-        clientVerisonHash_ = "";
+        oFMIHDNGFNM_ = com.google.protobuf.ByteString.EMPTY;
 
-        isEditor_ = false;
+        onlineId_ = "";
 
-        languageType_ = 0;
+        kEODMFOKNGH_ = "";
 
-        lJFBMKFHNJM_ = 0;
+        mEEGOICDEFG_ = "";
+
+        mDIKIHJHHJJ_ = "";
+
+        hCJGLLHFCMA_ = "";
+
+        lLIMBPCEABN_ = "";
+
+        countryCode_ = "";
+
+        pFDFHPKIHMO_ = com.google.protobuf.ByteString.EMPTY;
+
+        iMCMLAGLODL_ = "";
+
+        nNBGJPGDGCP_ = "";
+
+        cDDBBPKKOPM_ = "";
+
+        psnId_ = "";
+
+        birthday_ = "";
+
+        pECPGFPBJEB_ = "";
+
+        accountUid_ = "";
 
         accountType_ = 0;
 
-        fPOFDDAGKAG_ = "";
+        fNPPPMBIBEM_ = 0;
+
+        pLNNJPFPPAM_ = 0;
+
+        targetHomeOwnerUid_ = 0;
+
+        isGuest_ = false;
+
+        hAAGGONEHCH_ = false;
+
+        jAGELBDJFJH_ = false;
+
+        loginRand_ = 0L;
+
+        oCINFHOJCEA_ = 0;
+
+        tag_ = 0;
+
+        kPCGBPCHBMJ_ = 0;
+
+        clientDataVersion_ = 0;
+
+        nCNKMDBAFEH_ = 0;
+
+        ePAGBFLKJBN_ = 0;
+
+        gmUid_ = 0;
+
+        bFPJPDCLFNM_ = 0;
+
+        iKKKLHICPMF_ = 0;
+
+        mCKEONLBAOA_ = 0;
+
+        platformType_ = 0;
+
+        kEKHAKAPMIN_ = 0;
+
+        targetUid_ = 0;
+
+        dKGAONKKOHA_ = 0;
 
         return this;
       }
@@ -2588,58 +2727,53 @@ public final class PlayerLoginReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq buildPartial() {
         emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq result = new emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq(this);
-        result.securityCmdReply_ = securityCmdReply_;
-        result.dEBLDPOHPOL_ = dEBLDPOHPOL_;
-        result.environmentErrorCode_ = environmentErrorCode_;
-        if (trackingIoInfoBuilder_ == null) {
-          result.trackingIoInfo_ = trackingIoInfo_;
-        } else {
-          result.trackingIoInfo_ = trackingIoInfoBuilder_.build();
-        }
-        result.countryCode_ = countryCode_;
-        result.deviceInfo_ = deviceInfo_;
-        result.accountUid_ = accountUid_;
-        result.hIPFGBLGPMJ_ = hIPFGBLGPMJ_;
-        result.psnId_ = psnId_;
-        result.eMFDHANIAHH_ = eMFDHANIAHH_;
-        result.targetUid_ = targetUid_;
-        result.checksumClientVersion_ = checksumClientVersion_;
-        result.dHOLEDCICPB_ = dHOLEDCICPB_;
-        result.fOHJKJCKFFA_ = fOHJKJCKFFA_;
-        if (adjustTrackingInfoBuilder_ == null) {
-          result.adjustTrackingInfo_ = adjustTrackingInfo_;
-        } else {
-          result.adjustTrackingInfo_ = adjustTrackingInfoBuilder_.build();
-        }
-        result.isGuest_ = isGuest_;
-        result.tag_ = tag_;
-        result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
-        result.platformType_ = platformType_;
-        result.cFMBEIOBIEG_ = cFMBEIOBIEG_;
-        result.channelId_ = channelId_;
-        result.isTransfer_ = isTransfer_;
-        result.onlineId_ = onlineId_;
-        result.clientDataVersion_ = clientDataVersion_;
-        result.birthday_ = birthday_;
-        result.clientVersion_ = clientVersion_;
-        result.checksum_ = checksum_;
-        result.fCPDNLHOBNK_ = fCPDNLHOBNK_;
-        result.kCFIGJAPNIB_ = kCFIGJAPNIB_;
-        result.extraBinData_ = extraBinData_;
-        result.loginRand_ = loginRand_;
         result.platform_ = platform_;
-        result.subChannelId_ = subChannelId_;
-        result.kKKHJACICJO_ = kKKHJACICJO_;
-        result.deviceUuid_ = deviceUuid_;
+        result.fBKHEDNNFIF_ = fBKHEDNNFIF_;
+        result.jIPHKNNHBIE_ = jIPHKNNHBIE_;
+        result.cBIEHLMFBHI_ = cBIEHLMFBHI_;
+        result.iMACIIGIOGC_ = iMACIIGIOGC_;
+        result.jJIOHIJNGFP_ = jJIOHIJNGFP_;
         result.token_ = token_;
-        result.deviceName_ = deviceName_;
-        result.systemVersion_ = systemVersion_;
-        result.clientVerisonHash_ = clientVerisonHash_;
-        result.isEditor_ = isEditor_;
-        result.languageType_ = languageType_;
-        result.lJFBMKFHNJM_ = lJFBMKFHNJM_;
+        result.extraBinData_ = extraBinData_;
+        result.lPFPAJBHJMH_ = lPFPAJBHJMH_;
+        result.oFMIHDNGFNM_ = oFMIHDNGFNM_;
+        result.onlineId_ = onlineId_;
+        result.kEODMFOKNGH_ = kEODMFOKNGH_;
+        result.mEEGOICDEFG_ = mEEGOICDEFG_;
+        result.mDIKIHJHHJJ_ = mDIKIHJHHJJ_;
+        result.hCJGLLHFCMA_ = hCJGLLHFCMA_;
+        result.lLIMBPCEABN_ = lLIMBPCEABN_;
+        result.countryCode_ = countryCode_;
+        result.pFDFHPKIHMO_ = pFDFHPKIHMO_;
+        result.iMCMLAGLODL_ = iMCMLAGLODL_;
+        result.nNBGJPGDGCP_ = nNBGJPGDGCP_;
+        result.cDDBBPKKOPM_ = cDDBBPKKOPM_;
+        result.psnId_ = psnId_;
+        result.birthday_ = birthday_;
+        result.pECPGFPBJEB_ = pECPGFPBJEB_;
+        result.accountUid_ = accountUid_;
         result.accountType_ = accountType_;
-        result.fPOFDDAGKAG_ = fPOFDDAGKAG_;
+        result.fNPPPMBIBEM_ = fNPPPMBIBEM_;
+        result.pLNNJPFPPAM_ = pLNNJPFPPAM_;
+        result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
+        result.isGuest_ = isGuest_;
+        result.hAAGGONEHCH_ = hAAGGONEHCH_;
+        result.jAGELBDJFJH_ = jAGELBDJFJH_;
+        result.loginRand_ = loginRand_;
+        result.oCINFHOJCEA_ = oCINFHOJCEA_;
+        result.tag_ = tag_;
+        result.kPCGBPCHBMJ_ = kPCGBPCHBMJ_;
+        result.clientDataVersion_ = clientDataVersion_;
+        result.nCNKMDBAFEH_ = nCNKMDBAFEH_;
+        result.ePAGBFLKJBN_ = ePAGBFLKJBN_;
+        result.gmUid_ = gmUid_;
+        result.bFPJPDCLFNM_ = bFPJPDCLFNM_;
+        result.iKKKLHICPMF_ = iKKKLHICPMF_;
+        result.mCKEONLBAOA_ = mCKEONLBAOA_;
+        result.platformType_ = platformType_;
+        result.kEKHAKAPMIN_ = kEKHAKAPMIN_;
+        result.targetUid_ = targetUid_;
+        result.dKGAONKKOHA_ = dKGAONKKOHA_;
         onBuilt();
         return result;
       }
@@ -2688,156 +2822,168 @@ public final class PlayerLoginReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq other) {
         if (other == emu.grasscutter.net.proto.PlayerLoginReqOuterClass.PlayerLoginReq.getDefaultInstance()) return this;
-        if (other.getSecurityCmdReply() != com.google.protobuf.ByteString.EMPTY) {
-          setSecurityCmdReply(other.getSecurityCmdReply());
-        }
-        if (other.getDEBLDPOHPOL() != 0) {
-          setDEBLDPOHPOL(other.getDEBLDPOHPOL());
-        }
-        if (other.getEnvironmentErrorCode() != com.google.protobuf.ByteString.EMPTY) {
-          setEnvironmentErrorCode(other.getEnvironmentErrorCode());
-        }
-        if (other.hasTrackingIoInfo()) {
-          mergeTrackingIoInfo(other.getTrackingIoInfo());
-        }
-        if (!other.getCountryCode().isEmpty()) {
-          countryCode_ = other.countryCode_;
-          onChanged();
-        }
-        if (!other.getDeviceInfo().isEmpty()) {
-          deviceInfo_ = other.deviceInfo_;
-          onChanged();
-        }
-        if (!other.getAccountUid().isEmpty()) {
-          accountUid_ = other.accountUid_;
-          onChanged();
-        }
-        if (!other.getHIPFGBLGPMJ().isEmpty()) {
-          hIPFGBLGPMJ_ = other.hIPFGBLGPMJ_;
-          onChanged();
-        }
-        if (!other.getPsnId().isEmpty()) {
-          psnId_ = other.psnId_;
-          onChanged();
-        }
-        if (other.getEMFDHANIAHH() != 0) {
-          setEMFDHANIAHH(other.getEMFDHANIAHH());
-        }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
-        if (!other.getChecksumClientVersion().isEmpty()) {
-          checksumClientVersion_ = other.checksumClientVersion_;
-          onChanged();
-        }
-        if (other.getDHOLEDCICPB() != 0) {
-          setDHOLEDCICPB(other.getDHOLEDCICPB());
-        }
-        if (!other.getFOHJKJCKFFA().isEmpty()) {
-          fOHJKJCKFFA_ = other.fOHJKJCKFFA_;
-          onChanged();
-        }
-        if (other.hasAdjustTrackingInfo()) {
-          mergeAdjustTrackingInfo(other.getAdjustTrackingInfo());
-        }
-        if (other.getIsGuest() != false) {
-          setIsGuest(other.getIsGuest());
-        }
-        if (other.getTag() != 0) {
-          setTag(other.getTag());
-        }
-        if (other.getTargetHomeOwnerUid() != 0) {
-          setTargetHomeOwnerUid(other.getTargetHomeOwnerUid());
-        }
-        if (other.getPlatformType() != 0) {
-          setPlatformType(other.getPlatformType());
-        }
-        if (!other.getCFMBEIOBIEG().isEmpty()) {
-          cFMBEIOBIEG_ = other.cFMBEIOBIEG_;
-          onChanged();
-        }
-        if (other.getChannelId() != 0) {
-          setChannelId(other.getChannelId());
-        }
-        if (other.getIsTransfer() != false) {
-          setIsTransfer(other.getIsTransfer());
-        }
-        if (!other.getOnlineId().isEmpty()) {
-          onlineId_ = other.onlineId_;
-          onChanged();
-        }
-        if (other.getClientDataVersion() != 0) {
-          setClientDataVersion(other.getClientDataVersion());
-        }
-        if (!other.getBirthday().isEmpty()) {
-          birthday_ = other.birthday_;
-          onChanged();
-        }
-        if (!other.getClientVersion().isEmpty()) {
-          clientVersion_ = other.clientVersion_;
-          onChanged();
-        }
-        if (!other.getChecksum().isEmpty()) {
-          checksum_ = other.checksum_;
-          onChanged();
-        }
-        if (other.getFCPDNLHOBNK() != 0) {
-          setFCPDNLHOBNK(other.getFCPDNLHOBNK());
-        }
-        if (other.getKCFIGJAPNIB() != 0) {
-          setKCFIGJAPNIB(other.getKCFIGJAPNIB());
-        }
-        if (other.getExtraBinData() != com.google.protobuf.ByteString.EMPTY) {
-          setExtraBinData(other.getExtraBinData());
-        }
-        if (other.getLoginRand() != 0L) {
-          setLoginRand(other.getLoginRand());
-        }
         if (!other.getPlatform().isEmpty()) {
           platform_ = other.platform_;
           onChanged();
         }
-        if (other.getSubChannelId() != 0) {
-          setSubChannelId(other.getSubChannelId());
+        if (!other.getFBKHEDNNFIF().isEmpty()) {
+          fBKHEDNNFIF_ = other.fBKHEDNNFIF_;
+          onChanged();
         }
-        if (other.getKKKHJACICJO() != 0) {
-          setKKKHJACICJO(other.getKKKHJACICJO());
+        if (!other.getJIPHKNNHBIE().isEmpty()) {
+          jIPHKNNHBIE_ = other.jIPHKNNHBIE_;
+          onChanged();
         }
-        if (!other.getDeviceUuid().isEmpty()) {
-          deviceUuid_ = other.deviceUuid_;
+        if (!other.getCBIEHLMFBHI().isEmpty()) {
+          cBIEHLMFBHI_ = other.cBIEHLMFBHI_;
+          onChanged();
+        }
+        if (!other.getIMACIIGIOGC().isEmpty()) {
+          iMACIIGIOGC_ = other.iMACIIGIOGC_;
+          onChanged();
+        }
+        if (!other.getJJIOHIJNGFP().isEmpty()) {
+          jJIOHIJNGFP_ = other.jJIOHIJNGFP_;
           onChanged();
         }
         if (!other.getToken().isEmpty()) {
           token_ = other.token_;
           onChanged();
         }
-        if (!other.getDeviceName().isEmpty()) {
-          deviceName_ = other.deviceName_;
+        if (other.getExtraBinData() != com.google.protobuf.ByteString.EMPTY) {
+          setExtraBinData(other.getExtraBinData());
+        }
+        if (!other.getLPFPAJBHJMH().isEmpty()) {
+          lPFPAJBHJMH_ = other.lPFPAJBHJMH_;
           onChanged();
         }
-        if (!other.getSystemVersion().isEmpty()) {
-          systemVersion_ = other.systemVersion_;
+        if (other.getOFMIHDNGFNM() != com.google.protobuf.ByteString.EMPTY) {
+          setOFMIHDNGFNM(other.getOFMIHDNGFNM());
+        }
+        if (!other.getOnlineId().isEmpty()) {
+          onlineId_ = other.onlineId_;
           onChanged();
         }
-        if (!other.getClientVerisonHash().isEmpty()) {
-          clientVerisonHash_ = other.clientVerisonHash_;
+        if (!other.getKEODMFOKNGH().isEmpty()) {
+          kEODMFOKNGH_ = other.kEODMFOKNGH_;
           onChanged();
         }
-        if (other.getIsEditor() != false) {
-          setIsEditor(other.getIsEditor());
+        if (!other.getMEEGOICDEFG().isEmpty()) {
+          mEEGOICDEFG_ = other.mEEGOICDEFG_;
+          onChanged();
         }
-        if (other.getLanguageType() != 0) {
-          setLanguageType(other.getLanguageType());
+        if (!other.getMDIKIHJHHJJ().isEmpty()) {
+          mDIKIHJHHJJ_ = other.mDIKIHJHHJJ_;
+          onChanged();
         }
-        if (other.getLJFBMKFHNJM() != 0) {
-          setLJFBMKFHNJM(other.getLJFBMKFHNJM());
+        if (!other.getHCJGLLHFCMA().isEmpty()) {
+          hCJGLLHFCMA_ = other.hCJGLLHFCMA_;
+          onChanged();
+        }
+        if (!other.getLLIMBPCEABN().isEmpty()) {
+          lLIMBPCEABN_ = other.lLIMBPCEABN_;
+          onChanged();
+        }
+        if (!other.getCountryCode().isEmpty()) {
+          countryCode_ = other.countryCode_;
+          onChanged();
+        }
+        if (other.getPFDFHPKIHMO() != com.google.protobuf.ByteString.EMPTY) {
+          setPFDFHPKIHMO(other.getPFDFHPKIHMO());
+        }
+        if (!other.getIMCMLAGLODL().isEmpty()) {
+          iMCMLAGLODL_ = other.iMCMLAGLODL_;
+          onChanged();
+        }
+        if (!other.getNNBGJPGDGCP().isEmpty()) {
+          nNBGJPGDGCP_ = other.nNBGJPGDGCP_;
+          onChanged();
+        }
+        if (!other.getCDDBBPKKOPM().isEmpty()) {
+          cDDBBPKKOPM_ = other.cDDBBPKKOPM_;
+          onChanged();
+        }
+        if (!other.getPsnId().isEmpty()) {
+          psnId_ = other.psnId_;
+          onChanged();
+        }
+        if (!other.getBirthday().isEmpty()) {
+          birthday_ = other.birthday_;
+          onChanged();
+        }
+        if (!other.getPECPGFPBJEB().isEmpty()) {
+          pECPGFPBJEB_ = other.pECPGFPBJEB_;
+          onChanged();
+        }
+        if (!other.getAccountUid().isEmpty()) {
+          accountUid_ = other.accountUid_;
+          onChanged();
         }
         if (other.getAccountType() != 0) {
           setAccountType(other.getAccountType());
         }
-        if (!other.getFPOFDDAGKAG().isEmpty()) {
-          fPOFDDAGKAG_ = other.fPOFDDAGKAG_;
-          onChanged();
+        if (other.getFNPPPMBIBEM() != 0) {
+          setFNPPPMBIBEM(other.getFNPPPMBIBEM());
+        }
+        if (other.getPLNNJPFPPAM() != 0) {
+          setPLNNJPFPPAM(other.getPLNNJPFPPAM());
+        }
+        if (other.getTargetHomeOwnerUid() != 0) {
+          setTargetHomeOwnerUid(other.getTargetHomeOwnerUid());
+        }
+        if (other.getIsGuest() != false) {
+          setIsGuest(other.getIsGuest());
+        }
+        if (other.getHAAGGONEHCH() != false) {
+          setHAAGGONEHCH(other.getHAAGGONEHCH());
+        }
+        if (other.getJAGELBDJFJH() != false) {
+          setJAGELBDJFJH(other.getJAGELBDJFJH());
+        }
+        if (other.getLoginRand() != 0L) {
+          setLoginRand(other.getLoginRand());
+        }
+        if (other.getOCINFHOJCEA() != 0) {
+          setOCINFHOJCEA(other.getOCINFHOJCEA());
+        }
+        if (other.getTag() != 0) {
+          setTag(other.getTag());
+        }
+        if (other.getKPCGBPCHBMJ() != 0) {
+          setKPCGBPCHBMJ(other.getKPCGBPCHBMJ());
+        }
+        if (other.getClientDataVersion() != 0) {
+          setClientDataVersion(other.getClientDataVersion());
+        }
+        if (other.getNCNKMDBAFEH() != 0) {
+          setNCNKMDBAFEH(other.getNCNKMDBAFEH());
+        }
+        if (other.getEPAGBFLKJBN() != 0) {
+          setEPAGBFLKJBN(other.getEPAGBFLKJBN());
+        }
+        if (other.getGmUid() != 0) {
+          setGmUid(other.getGmUid());
+        }
+        if (other.getBFPJPDCLFNM() != 0) {
+          setBFPJPDCLFNM(other.getBFPJPDCLFNM());
+        }
+        if (other.getIKKKLHICPMF() != 0) {
+          setIKKKLHICPMF(other.getIKKKLHICPMF());
+        }
+        if (other.getMCKEONLBAOA() != 0) {
+          setMCKEONLBAOA(other.getMCKEONLBAOA());
+        }
+        if (other.getPlatformType() != 0) {
+          setPlatformType(other.getPlatformType());
+        }
+        if (other.getKEKHAKAPMIN() != 0) {
+          setKEKHAKAPMIN(other.getKEKHAKAPMIN());
+        }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
+        if (other.getDKGAONKKOHA() != 0) {
+          setDKGAONKKOHA(other.getDKGAONKKOHA());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -2868,1692 +3014,6 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
 
-      private com.google.protobuf.ByteString securityCmdReply_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes security_cmd_reply = 1651;</code>
-       * @return The securityCmdReply.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getSecurityCmdReply() {
-        return securityCmdReply_;
-      }
-      /**
-       * <code>bytes security_cmd_reply = 1651;</code>
-       * @param value The securityCmdReply to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSecurityCmdReply(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        securityCmdReply_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes security_cmd_reply = 1651;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSecurityCmdReply() {
-        
-        securityCmdReply_ = getDefaultInstance().getSecurityCmdReply();
-        onChanged();
-        return this;
-      }
-
-      private int dEBLDPOHPOL_ ;
-      /**
-       * <code>uint32 DEBLDPOHPOL = 1820;</code>
-       * @return The dEBLDPOHPOL.
-       */
-      @java.lang.Override
-      public int getDEBLDPOHPOL() {
-        return dEBLDPOHPOL_;
-      }
-      /**
-       * <code>uint32 DEBLDPOHPOL = 1820;</code>
-       * @param value The dEBLDPOHPOL to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDEBLDPOHPOL(int value) {
-        
-        dEBLDPOHPOL_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 DEBLDPOHPOL = 1820;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDEBLDPOHPOL() {
-        
-        dEBLDPOHPOL_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString environmentErrorCode_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes environment_error_code = 1141;</code>
-       * @return The environmentErrorCode.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getEnvironmentErrorCode() {
-        return environmentErrorCode_;
-      }
-      /**
-       * <code>bytes environment_error_code = 1141;</code>
-       * @param value The environmentErrorCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEnvironmentErrorCode(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        environmentErrorCode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes environment_error_code = 1141;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEnvironmentErrorCode() {
-        
-        environmentErrorCode_ = getDefaultInstance().getEnvironmentErrorCode();
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo trackingIoInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder> trackingIoInfoBuilder_;
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       * @return Whether the trackingIoInfo field is set.
-       */
-      public boolean hasTrackingIoInfo() {
-        return trackingIoInfoBuilder_ != null || trackingIoInfo_ != null;
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       * @return The trackingIoInfo.
-       */
-      public emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo getTrackingIoInfo() {
-        if (trackingIoInfoBuilder_ == null) {
-          return trackingIoInfo_ == null ? emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.getDefaultInstance() : trackingIoInfo_;
-        } else {
-          return trackingIoInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public Builder setTrackingIoInfo(emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo value) {
-        if (trackingIoInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          trackingIoInfo_ = value;
-          onChanged();
-        } else {
-          trackingIoInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public Builder setTrackingIoInfo(
-          emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder builderForValue) {
-        if (trackingIoInfoBuilder_ == null) {
-          trackingIoInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          trackingIoInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public Builder mergeTrackingIoInfo(emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo value) {
-        if (trackingIoInfoBuilder_ == null) {
-          if (trackingIoInfo_ != null) {
-            trackingIoInfo_ =
-              emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.newBuilder(trackingIoInfo_).mergeFrom(value).buildPartial();
-          } else {
-            trackingIoInfo_ = value;
-          }
-          onChanged();
-        } else {
-          trackingIoInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public Builder clearTrackingIoInfo() {
-        if (trackingIoInfoBuilder_ == null) {
-          trackingIoInfo_ = null;
-          onChanged();
-        } else {
-          trackingIoInfo_ = null;
-          trackingIoInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder getTrackingIoInfoBuilder() {
-        
-        onChanged();
-        return getTrackingIoInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      public emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder getTrackingIoInfoOrBuilder() {
-        if (trackingIoInfoBuilder_ != null) {
-          return trackingIoInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return trackingIoInfo_ == null ?
-              emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.getDefaultInstance() : trackingIoInfo_;
-        }
-      }
-      /**
-       * <code>.TrackingIOInfo tracking_io_info = 436;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder> 
-          getTrackingIoInfoFieldBuilder() {
-        if (trackingIoInfoBuilder_ == null) {
-          trackingIoInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfo.Builder, emu.grasscutter.net.proto.TrackingIOInfoOuterClass.TrackingIOInfoOrBuilder>(
-                  getTrackingIoInfo(),
-                  getParentForChildren(),
-                  isClean());
-          trackingIoInfo_ = null;
-        }
-        return trackingIoInfoBuilder_;
-      }
-
-      private java.lang.Object countryCode_ = "";
-      /**
-       * <code>string country_code = 1930;</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();
-          countryCode_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string country_code = 1930;</code>
-       * @return The bytes for countryCode.
-       */
-      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>string country_code = 1930;</code>
-       * @param value The countryCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountryCode(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        countryCode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string country_code = 1930;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCountryCode() {
-        
-        countryCode_ = getDefaultInstance().getCountryCode();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string country_code = 1930;</code>
-       * @param value The bytes for countryCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCountryCodeBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        countryCode_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object deviceInfo_ = "";
-      /**
-       * <code>string device_info = 5;</code>
-       * @return The deviceInfo.
-       */
-      public java.lang.String getDeviceInfo() {
-        java.lang.Object ref = deviceInfo_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          deviceInfo_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string device_info = 5;</code>
-       * @return The bytes for deviceInfo.
-       */
-      public com.google.protobuf.ByteString
-          getDeviceInfoBytes() {
-        java.lang.Object ref = deviceInfo_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          deviceInfo_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string device_info = 5;</code>
-       * @param value The deviceInfo to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDeviceInfo(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        deviceInfo_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string device_info = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDeviceInfo() {
-        
-        deviceInfo_ = getDefaultInstance().getDeviceInfo();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string device_info = 5;</code>
-       * @param value The bytes for deviceInfo to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDeviceInfoBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        deviceInfo_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object accountUid_ = "";
-      /**
-       * <code>string account_uid = 8;</code>
-       * @return The accountUid.
-       */
-      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();
-          accountUid_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string account_uid = 8;</code>
-       * @return The bytes for accountUid.
-       */
-      public com.google.protobuf.ByteString
-          getAccountUidBytes() {
-        java.lang.Object ref = accountUid_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          accountUid_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string account_uid = 8;</code>
-       * @param value The accountUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAccountUid(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        accountUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string account_uid = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAccountUid() {
-        
-        accountUid_ = getDefaultInstance().getAccountUid();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string account_uid = 8;</code>
-       * @param value The bytes for accountUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAccountUidBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        accountUid_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object hIPFGBLGPMJ_ = "";
-      /**
-       * <code>string HIPFGBLGPMJ = 45;</code>
-       * @return The hIPFGBLGPMJ.
-       */
-      public java.lang.String getHIPFGBLGPMJ() {
-        java.lang.Object ref = hIPFGBLGPMJ_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          hIPFGBLGPMJ_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string HIPFGBLGPMJ = 45;</code>
-       * @return The bytes for hIPFGBLGPMJ.
-       */
-      public com.google.protobuf.ByteString
-          getHIPFGBLGPMJBytes() {
-        java.lang.Object ref = hIPFGBLGPMJ_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          hIPFGBLGPMJ_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string HIPFGBLGPMJ = 45;</code>
-       * @param value The hIPFGBLGPMJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHIPFGBLGPMJ(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        hIPFGBLGPMJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string HIPFGBLGPMJ = 45;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHIPFGBLGPMJ() {
-        
-        hIPFGBLGPMJ_ = getDefaultInstance().getHIPFGBLGPMJ();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string HIPFGBLGPMJ = 45;</code>
-       * @param value The bytes for hIPFGBLGPMJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHIPFGBLGPMJBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        hIPFGBLGPMJ_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object psnId_ = "";
-      /**
-       * <code>string psn_id = 1266;</code>
-       * @return The psnId.
-       */
-      public java.lang.String getPsnId() {
-        java.lang.Object ref = psnId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          psnId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string psn_id = 1266;</code>
-       * @return The bytes for psnId.
-       */
-      public com.google.protobuf.ByteString
-          getPsnIdBytes() {
-        java.lang.Object ref = psnId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          psnId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string psn_id = 1266;</code>
-       * @param value The psnId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPsnId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        psnId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string psn_id = 1266;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPsnId() {
-        
-        psnId_ = getDefaultInstance().getPsnId();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string psn_id = 1266;</code>
-       * @param value The bytes for psnId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPsnIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        psnId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int eMFDHANIAHH_ ;
-      /**
-       * <code>uint32 EMFDHANIAHH = 912;</code>
-       * @return The eMFDHANIAHH.
-       */
-      @java.lang.Override
-      public int getEMFDHANIAHH() {
-        return eMFDHANIAHH_;
-      }
-      /**
-       * <code>uint32 EMFDHANIAHH = 912;</code>
-       * @param value The eMFDHANIAHH to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEMFDHANIAHH(int value) {
-        
-        eMFDHANIAHH_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 EMFDHANIAHH = 912;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEMFDHANIAHH() {
-        
-        eMFDHANIAHH_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int targetUid_ ;
-      /**
-       * <code>uint32 target_uid = 12;</code>
-       * @return The targetUid.
-       */
-      @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
-      }
-      /**
-       * <code>uint32 target_uid = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetUid() {
-        
-        targetUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object checksumClientVersion_ = "";
-      /**
-       * <code>string checksum_client_version = 1594;</code>
-       * @return The checksumClientVersion.
-       */
-      public java.lang.String getChecksumClientVersion() {
-        java.lang.Object ref = checksumClientVersion_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          checksumClientVersion_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string checksum_client_version = 1594;</code>
-       * @return The bytes for checksumClientVersion.
-       */
-      public com.google.protobuf.ByteString
-          getChecksumClientVersionBytes() {
-        java.lang.Object ref = checksumClientVersion_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          checksumClientVersion_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string checksum_client_version = 1594;</code>
-       * @param value The checksumClientVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChecksumClientVersion(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        checksumClientVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string checksum_client_version = 1594;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChecksumClientVersion() {
-        
-        checksumClientVersion_ = getDefaultInstance().getChecksumClientVersion();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string checksum_client_version = 1594;</code>
-       * @param value The bytes for checksumClientVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChecksumClientVersionBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        checksumClientVersion_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int dHOLEDCICPB_ ;
-      /**
-       * <code>uint32 DHOLEDCICPB = 675;</code>
-       * @return The dHOLEDCICPB.
-       */
-      @java.lang.Override
-      public int getDHOLEDCICPB() {
-        return dHOLEDCICPB_;
-      }
-      /**
-       * <code>uint32 DHOLEDCICPB = 675;</code>
-       * @param value The dHOLEDCICPB to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDHOLEDCICPB(int value) {
-        
-        dHOLEDCICPB_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 DHOLEDCICPB = 675;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDHOLEDCICPB() {
-        
-        dHOLEDCICPB_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object fOHJKJCKFFA_ = "";
-      /**
-       * <code>string FOHJKJCKFFA = 458;</code>
-       * @return The fOHJKJCKFFA.
-       */
-      public java.lang.String getFOHJKJCKFFA() {
-        java.lang.Object ref = fOHJKJCKFFA_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          fOHJKJCKFFA_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string FOHJKJCKFFA = 458;</code>
-       * @return The bytes for fOHJKJCKFFA.
-       */
-      public com.google.protobuf.ByteString
-          getFOHJKJCKFFABytes() {
-        java.lang.Object ref = fOHJKJCKFFA_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          fOHJKJCKFFA_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string FOHJKJCKFFA = 458;</code>
-       * @param value The fOHJKJCKFFA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFOHJKJCKFFA(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        fOHJKJCKFFA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string FOHJKJCKFFA = 458;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFOHJKJCKFFA() {
-        
-        fOHJKJCKFFA_ = getDefaultInstance().getFOHJKJCKFFA();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string FOHJKJCKFFA = 458;</code>
-       * @param value The bytes for fOHJKJCKFFA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFOHJKJCKFFABytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        fOHJKJCKFFA_ = value;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo adjustTrackingInfo_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder> adjustTrackingInfoBuilder_;
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       * @return Whether the adjustTrackingInfo field is set.
-       */
-      public boolean hasAdjustTrackingInfo() {
-        return adjustTrackingInfoBuilder_ != null || adjustTrackingInfo_ != null;
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       * @return The adjustTrackingInfo.
-       */
-      public emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo getAdjustTrackingInfo() {
-        if (adjustTrackingInfoBuilder_ == null) {
-          return adjustTrackingInfo_ == null ? emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.getDefaultInstance() : adjustTrackingInfo_;
-        } else {
-          return adjustTrackingInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public Builder setAdjustTrackingInfo(emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo value) {
-        if (adjustTrackingInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          adjustTrackingInfo_ = value;
-          onChanged();
-        } else {
-          adjustTrackingInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public Builder setAdjustTrackingInfo(
-          emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder builderForValue) {
-        if (adjustTrackingInfoBuilder_ == null) {
-          adjustTrackingInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          adjustTrackingInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public Builder mergeAdjustTrackingInfo(emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo value) {
-        if (adjustTrackingInfoBuilder_ == null) {
-          if (adjustTrackingInfo_ != null) {
-            adjustTrackingInfo_ =
-              emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.newBuilder(adjustTrackingInfo_).mergeFrom(value).buildPartial();
-          } else {
-            adjustTrackingInfo_ = value;
-          }
-          onChanged();
-        } else {
-          adjustTrackingInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public Builder clearAdjustTrackingInfo() {
-        if (adjustTrackingInfoBuilder_ == null) {
-          adjustTrackingInfo_ = null;
-          onChanged();
-        } else {
-          adjustTrackingInfo_ = null;
-          adjustTrackingInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder getAdjustTrackingInfoBuilder() {
-        
-        onChanged();
-        return getAdjustTrackingInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      public emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder getAdjustTrackingInfoOrBuilder() {
-        if (adjustTrackingInfoBuilder_ != null) {
-          return adjustTrackingInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return adjustTrackingInfo_ == null ?
-              emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.getDefaultInstance() : adjustTrackingInfo_;
-        }
-      }
-      /**
-       * <code>.AdjustTrackingInfo adjust_tracking_info = 1948;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder> 
-          getAdjustTrackingInfoFieldBuilder() {
-        if (adjustTrackingInfoBuilder_ == null) {
-          adjustTrackingInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfo.Builder, emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.AdjustTrackingInfoOrBuilder>(
-                  getAdjustTrackingInfo(),
-                  getParentForChildren(),
-                  isClean());
-          adjustTrackingInfo_ = null;
-        }
-        return adjustTrackingInfoBuilder_;
-      }
-
-      private boolean isGuest_ ;
-      /**
-       * <code>bool is_guest = 1;</code>
-       * @return The isGuest.
-       */
-      @java.lang.Override
-      public boolean getIsGuest() {
-        return isGuest_;
-      }
-      /**
-       * <code>bool is_guest = 1;</code>
-       * @param value The isGuest to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsGuest(boolean value) {
-        
-        isGuest_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_guest = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsGuest() {
-        
-        isGuest_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int tag_ ;
-      /**
-       * <code>uint32 tag = 188;</code>
-       * @return The tag.
-       */
-      @java.lang.Override
-      public int getTag() {
-        return tag_;
-      }
-      /**
-       * <code>uint32 tag = 188;</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 = 188;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTag() {
-        
-        tag_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int targetHomeOwnerUid_ ;
-      /**
-       * <code>uint32 target_home_owner_uid = 1671;</code>
-       * @return The targetHomeOwnerUid.
-       */
-      @java.lang.Override
-      public int getTargetHomeOwnerUid() {
-        return targetHomeOwnerUid_;
-      }
-      /**
-       * <code>uint32 target_home_owner_uid = 1671;</code>
-       * @param value The targetHomeOwnerUid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetHomeOwnerUid(int value) {
-        
-        targetHomeOwnerUid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 target_home_owner_uid = 1671;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetHomeOwnerUid() {
-        
-        targetHomeOwnerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int platformType_ ;
-      /**
-       * <code>uint32 platform_type = 4;</code>
-       * @return The platformType.
-       */
-      @java.lang.Override
-      public int getPlatformType() {
-        return platformType_;
-      }
-      /**
-       * <code>uint32 platform_type = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlatformType() {
-        
-        platformType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object cFMBEIOBIEG_ = "";
-      /**
-       * <code>string CFMBEIOBIEG = 812;</code>
-       * @return The cFMBEIOBIEG.
-       */
-      public java.lang.String getCFMBEIOBIEG() {
-        java.lang.Object ref = cFMBEIOBIEG_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          cFMBEIOBIEG_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string CFMBEIOBIEG = 812;</code>
-       * @return The bytes for cFMBEIOBIEG.
-       */
-      public com.google.protobuf.ByteString
-          getCFMBEIOBIEGBytes() {
-        java.lang.Object ref = cFMBEIOBIEG_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          cFMBEIOBIEG_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string CFMBEIOBIEG = 812;</code>
-       * @param value The cFMBEIOBIEG to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCFMBEIOBIEG(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        cFMBEIOBIEG_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string CFMBEIOBIEG = 812;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCFMBEIOBIEG() {
-        
-        cFMBEIOBIEG_ = getDefaultInstance().getCFMBEIOBIEG();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string CFMBEIOBIEG = 812;</code>
-       * @param value The bytes for cFMBEIOBIEG to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCFMBEIOBIEGBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        cFMBEIOBIEG_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int channelId_ ;
-      /**
-       * <code>uint32 channel_id = 1816;</code>
-       * @return The channelId.
-       */
-      @java.lang.Override
-      public int getChannelId() {
-        return channelId_;
-      }
-      /**
-       * <code>uint32 channel_id = 1816;</code>
-       * @param value The channelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChannelId(int value) {
-        
-        channelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 channel_id = 1816;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChannelId() {
-        
-        channelId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isTransfer_ ;
-      /**
-       * <code>bool is_transfer = 787;</code>
-       * @return The isTransfer.
-       */
-      @java.lang.Override
-      public boolean getIsTransfer() {
-        return isTransfer_;
-      }
-      /**
-       * <code>bool is_transfer = 787;</code>
-       * @param value The isTransfer to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTransfer(boolean value) {
-        
-        isTransfer_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_transfer = 787;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTransfer() {
-        
-        isTransfer_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object onlineId_ = "";
-      /**
-       * <code>string online_id = 1270;</code>
-       * @return The onlineId.
-       */
-      public java.lang.String getOnlineId() {
-        java.lang.Object ref = onlineId_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          onlineId_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string online_id = 1270;</code>
-       * @return The bytes for onlineId.
-       */
-      public com.google.protobuf.ByteString
-          getOnlineIdBytes() {
-        java.lang.Object ref = onlineId_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          onlineId_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string online_id = 1270;</code>
-       * @param value The onlineId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOnlineId(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        onlineId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string online_id = 1270;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOnlineId() {
-        
-        onlineId_ = getDefaultInstance().getOnlineId();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string online_id = 1270;</code>
-       * @param value The bytes for onlineId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOnlineIdBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        onlineId_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int clientDataVersion_ ;
-      /**
-       * <code>uint32 client_data_version = 2004;</code>
-       * @return The clientDataVersion.
-       */
-      @java.lang.Override
-      public int getClientDataVersion() {
-        return clientDataVersion_;
-      }
-      /**
-       * <code>uint32 client_data_version = 2004;</code>
-       * @param value The clientDataVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientDataVersion(int value) {
-        
-        clientDataVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 client_data_version = 2004;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientDataVersion() {
-        
-        clientDataVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object birthday_ = "";
-      /**
-       * <code>string birthday = 190;</code>
-       * @return The birthday.
-       */
-      public java.lang.String getBirthday() {
-        java.lang.Object ref = birthday_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          birthday_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 190;</code>
-       * @return The bytes for birthday.
-       */
-      public com.google.protobuf.ByteString
-          getBirthdayBytes() {
-        java.lang.Object ref = birthday_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          birthday_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string birthday = 190;</code>
-       * @param value The birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthday(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 190;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBirthday() {
-        
-        birthday_ = getDefaultInstance().getBirthday();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string birthday = 190;</code>
-       * @param value The bytes for birthday to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBirthdayBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        birthday_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientVersion_ = "";
-      /**
-       * <code>string client_version = 13;</code>
-       * @return The clientVersion.
-       */
-      public java.lang.String getClientVersion() {
-        java.lang.Object ref = clientVersion_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientVersion_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_version = 13;</code>
-       * @return The bytes for clientVersion.
-       */
-      public com.google.protobuf.ByteString
-          getClientVersionBytes() {
-        java.lang.Object ref = clientVersion_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientVersion_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_version = 13;</code>
-       * @param value The clientVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientVersion(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_version = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientVersion() {
-        
-        clientVersion_ = getDefaultInstance().getClientVersion();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_version = 13;</code>
-       * @param value The bytes for clientVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientVersionBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientVersion_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object checksum_ = "";
-      /**
-       * <code>string checksum = 1796;</code>
-       * @return The checksum.
-       */
-      public java.lang.String getChecksum() {
-        java.lang.Object ref = checksum_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          checksum_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string checksum = 1796;</code>
-       * @return The bytes for checksum.
-       */
-      public com.google.protobuf.ByteString
-          getChecksumBytes() {
-        java.lang.Object ref = checksum_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          checksum_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string checksum = 1796;</code>
-       * @param value The checksum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChecksum(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        checksum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string checksum = 1796;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearChecksum() {
-        
-        checksum_ = getDefaultInstance().getChecksum();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string checksum = 1796;</code>
-       * @param value The bytes for checksum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setChecksumBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        checksum_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int fCPDNLHOBNK_ ;
-      /**
-       * <code>uint32 FCPDNLHOBNK = 706;</code>
-       * @return The fCPDNLHOBNK.
-       */
-      @java.lang.Override
-      public int getFCPDNLHOBNK() {
-        return fCPDNLHOBNK_;
-      }
-      /**
-       * <code>uint32 FCPDNLHOBNK = 706;</code>
-       * @param value The fCPDNLHOBNK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFCPDNLHOBNK(int value) {
-        
-        fCPDNLHOBNK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 FCPDNLHOBNK = 706;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFCPDNLHOBNK() {
-        
-        fCPDNLHOBNK_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int kCFIGJAPNIB_ ;
-      /**
-       * <code>uint32 KCFIGJAPNIB = 435;</code>
-       * @return The kCFIGJAPNIB.
-       */
-      @java.lang.Override
-      public int getKCFIGJAPNIB() {
-        return kCFIGJAPNIB_;
-      }
-      /**
-       * <code>uint32 KCFIGJAPNIB = 435;</code>
-       * @param value The kCFIGJAPNIB to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKCFIGJAPNIB(int value) {
-        
-        kCFIGJAPNIB_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KCFIGJAPNIB = 435;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKCFIGJAPNIB() {
-        
-        kCFIGJAPNIB_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes extra_bin_data = 74;</code>
-       * @return The extraBinData.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getExtraBinData() {
-        return extraBinData_;
-      }
-      /**
-       * <code>bytes extra_bin_data = 74;</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 = 74;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearExtraBinData() {
-        
-        extraBinData_ = getDefaultInstance().getExtraBinData();
-        onChanged();
-        return this;
-      }
-
-      private long loginRand_ ;
-      /**
-       * <code>uint64 login_rand = 6;</code>
-       * @return The loginRand.
-       */
-      @java.lang.Override
-      public long getLoginRand() {
-        return loginRand_;
-      }
-      /**
-       * <code>uint64 login_rand = 6;</code>
-       * @param value The loginRand to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLoginRand(long value) {
-        
-        loginRand_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 login_rand = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLoginRand() {
-        
-        loginRand_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object platform_ = "";
       /**
        * <code>string platform = 14;</code>
@@ -4630,147 +3090,389 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
 
-      private int subChannelId_ ;
+      private java.lang.Object fBKHEDNNFIF_ = "";
       /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @return The subChannelId.
+       * <code>string FBKHEDNNFIF = 1669;</code>
+       * @return The fBKHEDNNFIF.
        */
-      @java.lang.Override
-      public int getSubChannelId() {
-        return subChannelId_;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @param value The subChannelId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSubChannelId(int value) {
-        
-        subChannelId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 sub_channel_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSubChannelId() {
-        
-        subChannelId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int kKKHJACICJO_ ;
-      /**
-       * <code>uint32 KKKHJACICJO = 1228;</code>
-       * @return The kKKHJACICJO.
-       */
-      @java.lang.Override
-      public int getKKKHJACICJO() {
-        return kKKHJACICJO_;
-      }
-      /**
-       * <code>uint32 KKKHJACICJO = 1228;</code>
-       * @param value The kKKHJACICJO to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKKKHJACICJO(int value) {
-        
-        kKKHJACICJO_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KKKHJACICJO = 1228;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKKKHJACICJO() {
-        
-        kKKHJACICJO_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object deviceUuid_ = "";
-      /**
-       * <code>string device_uuid = 10;</code>
-       * @return The deviceUuid.
-       */
-      public java.lang.String getDeviceUuid() {
-        java.lang.Object ref = deviceUuid_;
+      public java.lang.String getFBKHEDNNFIF() {
+        java.lang.Object ref = fBKHEDNNFIF_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          deviceUuid_ = s;
+          fBKHEDNNFIF_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string device_uuid = 10;</code>
-       * @return The bytes for deviceUuid.
+       * <code>string FBKHEDNNFIF = 1669;</code>
+       * @return The bytes for fBKHEDNNFIF.
        */
       public com.google.protobuf.ByteString
-          getDeviceUuidBytes() {
-        java.lang.Object ref = deviceUuid_;
+          getFBKHEDNNFIFBytes() {
+        java.lang.Object ref = fBKHEDNNFIF_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          deviceUuid_ = b;
+          fBKHEDNNFIF_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string device_uuid = 10;</code>
-       * @param value The deviceUuid to set.
+       * <code>string FBKHEDNNFIF = 1669;</code>
+       * @param value The fBKHEDNNFIF to set.
        * @return This builder for chaining.
        */
-      public Builder setDeviceUuid(
+      public Builder setFBKHEDNNFIF(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        deviceUuid_ = value;
+        fBKHEDNNFIF_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string device_uuid = 10;</code>
+       * <code>string FBKHEDNNFIF = 1669;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDeviceUuid() {
+      public Builder clearFBKHEDNNFIF() {
         
-        deviceUuid_ = getDefaultInstance().getDeviceUuid();
+        fBKHEDNNFIF_ = getDefaultInstance().getFBKHEDNNFIF();
         onChanged();
         return this;
       }
       /**
-       * <code>string device_uuid = 10;</code>
-       * @param value The bytes for deviceUuid to set.
+       * <code>string FBKHEDNNFIF = 1669;</code>
+       * @param value The bytes for fBKHEDNNFIF to set.
        * @return This builder for chaining.
        */
-      public Builder setDeviceUuidBytes(
+      public Builder setFBKHEDNNFIFBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        deviceUuid_ = value;
+        fBKHEDNNFIF_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object jIPHKNNHBIE_ = "";
+      /**
+       * <code>string JIPHKNNHBIE = 924;</code>
+       * @return The jIPHKNNHBIE.
+       */
+      public java.lang.String getJIPHKNNHBIE() {
+        java.lang.Object ref = jIPHKNNHBIE_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          jIPHKNNHBIE_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string JIPHKNNHBIE = 924;</code>
+       * @return The bytes for jIPHKNNHBIE.
+       */
+      public com.google.protobuf.ByteString
+          getJIPHKNNHBIEBytes() {
+        java.lang.Object ref = jIPHKNNHBIE_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          jIPHKNNHBIE_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string JIPHKNNHBIE = 924;</code>
+       * @param value The jIPHKNNHBIE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJIPHKNNHBIE(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        jIPHKNNHBIE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JIPHKNNHBIE = 924;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJIPHKNNHBIE() {
+        
+        jIPHKNNHBIE_ = getDefaultInstance().getJIPHKNNHBIE();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JIPHKNNHBIE = 924;</code>
+       * @param value The bytes for jIPHKNNHBIE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJIPHKNNHBIEBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        jIPHKNNHBIE_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object cBIEHLMFBHI_ = "";
+      /**
+       * <code>string CBIEHLMFBHI = 1433;</code>
+       * @return The cBIEHLMFBHI.
+       */
+      public java.lang.String getCBIEHLMFBHI() {
+        java.lang.Object ref = cBIEHLMFBHI_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          cBIEHLMFBHI_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string CBIEHLMFBHI = 1433;</code>
+       * @return The bytes for cBIEHLMFBHI.
+       */
+      public com.google.protobuf.ByteString
+          getCBIEHLMFBHIBytes() {
+        java.lang.Object ref = cBIEHLMFBHI_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          cBIEHLMFBHI_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string CBIEHLMFBHI = 1433;</code>
+       * @param value The cBIEHLMFBHI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCBIEHLMFBHI(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        cBIEHLMFBHI_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string CBIEHLMFBHI = 1433;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCBIEHLMFBHI() {
+        
+        cBIEHLMFBHI_ = getDefaultInstance().getCBIEHLMFBHI();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string CBIEHLMFBHI = 1433;</code>
+       * @param value The bytes for cBIEHLMFBHI to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCBIEHLMFBHIBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        cBIEHLMFBHI_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object iMACIIGIOGC_ = "";
+      /**
+       * <code>string IMACIIGIOGC = 10;</code>
+       * @return The iMACIIGIOGC.
+       */
+      public java.lang.String getIMACIIGIOGC() {
+        java.lang.Object ref = iMACIIGIOGC_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          iMACIIGIOGC_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string IMACIIGIOGC = 10;</code>
+       * @return The bytes for iMACIIGIOGC.
+       */
+      public com.google.protobuf.ByteString
+          getIMACIIGIOGCBytes() {
+        java.lang.Object ref = iMACIIGIOGC_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          iMACIIGIOGC_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string IMACIIGIOGC = 10;</code>
+       * @param value The iMACIIGIOGC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIMACIIGIOGC(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        iMACIIGIOGC_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string IMACIIGIOGC = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIMACIIGIOGC() {
+        
+        iMACIIGIOGC_ = getDefaultInstance().getIMACIIGIOGC();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string IMACIIGIOGC = 10;</code>
+       * @param value The bytes for iMACIIGIOGC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIMACIIGIOGCBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        iMACIIGIOGC_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object jJIOHIJNGFP_ = "";
+      /**
+       * <code>string JJIOHIJNGFP = 3;</code>
+       * @return The jJIOHIJNGFP.
+       */
+      public java.lang.String getJJIOHIJNGFP() {
+        java.lang.Object ref = jJIOHIJNGFP_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          jJIOHIJNGFP_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string JJIOHIJNGFP = 3;</code>
+       * @return The bytes for jJIOHIJNGFP.
+       */
+      public com.google.protobuf.ByteString
+          getJJIOHIJNGFPBytes() {
+        java.lang.Object ref = jJIOHIJNGFP_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          jJIOHIJNGFP_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string JJIOHIJNGFP = 3;</code>
+       * @param value The jJIOHIJNGFP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJJIOHIJNGFP(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        jJIOHIJNGFP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JJIOHIJNGFP = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJJIOHIJNGFP() {
+        
+        jJIOHIJNGFP_ = getDefaultInstance().getJJIOHIJNGFP();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string JJIOHIJNGFP = 3;</code>
+       * @param value The bytes for jJIOHIJNGFP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJJIOHIJNGFPBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        jJIOHIJNGFP_ = value;
         onChanged();
         return this;
       }
 
       private java.lang.Object token_ = "";
       /**
-       * <code>string token = 2;</code>
+       * <code>string token = 7;</code>
        * @return The token.
        */
       public java.lang.String getToken() {
@@ -4786,7 +3488,7 @@ public final class PlayerLoginReqOuterClass {
         }
       }
       /**
-       * <code>string token = 2;</code>
+       * <code>string token = 7;</code>
        * @return The bytes for token.
        */
       public com.google.protobuf.ByteString
@@ -4803,7 +3505,7 @@ public final class PlayerLoginReqOuterClass {
         }
       }
       /**
-       * <code>string token = 2;</code>
+       * <code>string token = 7;</code>
        * @param value The token to set.
        * @return This builder for chaining.
        */
@@ -4818,7 +3520,7 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
       /**
-       * <code>string token = 2;</code>
+       * <code>string token = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearToken() {
@@ -4828,7 +3530,7 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
       /**
-       * <code>string token = 2;</code>
+       * <code>string token = 7;</code>
        * @param value The bytes for token to set.
        * @return This builder for chaining.
        */
@@ -4844,330 +3546,1283 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
 
-      private java.lang.Object deviceName_ = "";
+      private com.google.protobuf.ByteString extraBinData_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string device_name = 11;</code>
-       * @return The deviceName.
+       * <code>bytes extra_bin_data = 1183;</code>
+       * @return The extraBinData.
        */
-      public java.lang.String getDeviceName() {
-        java.lang.Object ref = deviceName_;
+      @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 lPFPAJBHJMH_ = "";
+      /**
+       * <code>string LPFPAJBHJMH = 46;</code>
+       * @return The lPFPAJBHJMH.
+       */
+      public java.lang.String getLPFPAJBHJMH() {
+        java.lang.Object ref = lPFPAJBHJMH_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          deviceName_ = s;
+          lPFPAJBHJMH_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string device_name = 11;</code>
-       * @return The bytes for deviceName.
+       * <code>string LPFPAJBHJMH = 46;</code>
+       * @return The bytes for lPFPAJBHJMH.
        */
       public com.google.protobuf.ByteString
-          getDeviceNameBytes() {
-        java.lang.Object ref = deviceName_;
+          getLPFPAJBHJMHBytes() {
+        java.lang.Object ref = lPFPAJBHJMH_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          deviceName_ = b;
+          lPFPAJBHJMH_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string device_name = 11;</code>
-       * @param value The deviceName to set.
+       * <code>string LPFPAJBHJMH = 46;</code>
+       * @param value The lPFPAJBHJMH to set.
        * @return This builder for chaining.
        */
-      public Builder setDeviceName(
+      public Builder setLPFPAJBHJMH(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        deviceName_ = value;
+        lPFPAJBHJMH_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string device_name = 11;</code>
+       * <code>string LPFPAJBHJMH = 46;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDeviceName() {
+      public Builder clearLPFPAJBHJMH() {
         
-        deviceName_ = getDefaultInstance().getDeviceName();
+        lPFPAJBHJMH_ = getDefaultInstance().getLPFPAJBHJMH();
         onChanged();
         return this;
       }
       /**
-       * <code>string device_name = 11;</code>
-       * @param value The bytes for deviceName to set.
+       * <code>string LPFPAJBHJMH = 46;</code>
+       * @param value The bytes for lPFPAJBHJMH to set.
        * @return This builder for chaining.
        */
-      public Builder setDeviceNameBytes(
+      public Builder setLPFPAJBHJMHBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        deviceName_ = value;
+        lPFPAJBHJMH_ = value;
         onChanged();
         return this;
       }
 
-      private java.lang.Object systemVersion_ = "";
+      private com.google.protobuf.ByteString oFMIHDNGFNM_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>string system_version = 3;</code>
-       * @return The systemVersion.
+       * <pre>
+       *LHACJNELJMN KOFGDJGJPLH = 1939;
+       * </pre>
+       *
+       * <code>bytes OFMIHDNGFNM = 265;</code>
+       * @return The oFMIHDNGFNM.
        */
-      public java.lang.String getSystemVersion() {
-        java.lang.Object ref = systemVersion_;
+      @java.lang.Override
+      public com.google.protobuf.ByteString getOFMIHDNGFNM() {
+        return oFMIHDNGFNM_;
+      }
+      /**
+       * <pre>
+       *LHACJNELJMN KOFGDJGJPLH = 1939;
+       * </pre>
+       *
+       * <code>bytes OFMIHDNGFNM = 265;</code>
+       * @param value The oFMIHDNGFNM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOFMIHDNGFNM(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        oFMIHDNGFNM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *LHACJNELJMN KOFGDJGJPLH = 1939;
+       * </pre>
+       *
+       * <code>bytes OFMIHDNGFNM = 265;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOFMIHDNGFNM() {
+        
+        oFMIHDNGFNM_ = getDefaultInstance().getOFMIHDNGFNM();
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object onlineId_ = "";
+      /**
+       * <code>string online_id = 376;</code>
+       * @return The onlineId.
+       */
+      public java.lang.String getOnlineId() {
+        java.lang.Object ref = onlineId_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          systemVersion_ = s;
+          onlineId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string system_version = 3;</code>
-       * @return The bytes for systemVersion.
+       * <code>string online_id = 376;</code>
+       * @return The bytes for onlineId.
        */
       public com.google.protobuf.ByteString
-          getSystemVersionBytes() {
-        java.lang.Object ref = systemVersion_;
+          getOnlineIdBytes() {
+        java.lang.Object ref = onlineId_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          systemVersion_ = b;
+          onlineId_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string system_version = 3;</code>
-       * @param value The systemVersion to set.
+       * <code>string online_id = 376;</code>
+       * @param value The onlineId to set.
        * @return This builder for chaining.
        */
-      public Builder setSystemVersion(
+      public Builder setOnlineId(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        systemVersion_ = value;
+        onlineId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string system_version = 3;</code>
+       * <code>string online_id = 376;</code>
        * @return This builder for chaining.
        */
-      public Builder clearSystemVersion() {
+      public Builder clearOnlineId() {
         
-        systemVersion_ = getDefaultInstance().getSystemVersion();
+        onlineId_ = getDefaultInstance().getOnlineId();
         onChanged();
         return this;
       }
       /**
-       * <code>string system_version = 3;</code>
-       * @param value The bytes for systemVersion to set.
+       * <code>string online_id = 376;</code>
+       * @param value The bytes for onlineId to set.
        * @return This builder for chaining.
        */
-      public Builder setSystemVersionBytes(
+      public Builder setOnlineIdBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        systemVersion_ = value;
+        onlineId_ = value;
         onChanged();
         return this;
       }
 
-      private java.lang.Object clientVerisonHash_ = "";
+      private java.lang.Object kEODMFOKNGH_ = "";
       /**
-       * <code>string client_verison_hash = 869;</code>
-       * @return The clientVerisonHash.
+       * <code>string KEODMFOKNGH = 5;</code>
+       * @return The kEODMFOKNGH.
        */
-      public java.lang.String getClientVerisonHash() {
-        java.lang.Object ref = clientVerisonHash_;
+      public java.lang.String getKEODMFOKNGH() {
+        java.lang.Object ref = kEODMFOKNGH_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          clientVerisonHash_ = s;
+          kEODMFOKNGH_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string client_verison_hash = 869;</code>
-       * @return The bytes for clientVerisonHash.
+       * <code>string KEODMFOKNGH = 5;</code>
+       * @return The bytes for kEODMFOKNGH.
        */
       public com.google.protobuf.ByteString
-          getClientVerisonHashBytes() {
-        java.lang.Object ref = clientVerisonHash_;
+          getKEODMFOKNGHBytes() {
+        java.lang.Object ref = kEODMFOKNGH_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          clientVerisonHash_ = b;
+          kEODMFOKNGH_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string client_verison_hash = 869;</code>
-       * @param value The clientVerisonHash to set.
+       * <code>string KEODMFOKNGH = 5;</code>
+       * @param value The kEODMFOKNGH to set.
        * @return This builder for chaining.
        */
-      public Builder setClientVerisonHash(
+      public Builder setKEODMFOKNGH(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        clientVerisonHash_ = value;
+        kEODMFOKNGH_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string client_verison_hash = 869;</code>
+       * <code>string KEODMFOKNGH = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientVerisonHash() {
+      public Builder clearKEODMFOKNGH() {
         
-        clientVerisonHash_ = getDefaultInstance().getClientVerisonHash();
+        kEODMFOKNGH_ = getDefaultInstance().getKEODMFOKNGH();
         onChanged();
         return this;
       }
       /**
-       * <code>string client_verison_hash = 869;</code>
-       * @param value The bytes for clientVerisonHash to set.
+       * <code>string KEODMFOKNGH = 5;</code>
+       * @param value The bytes for kEODMFOKNGH to set.
        * @return This builder for chaining.
        */
-      public Builder setClientVerisonHashBytes(
+      public Builder setKEODMFOKNGHBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        clientVerisonHash_ = value;
+        kEODMFOKNGH_ = value;
         onChanged();
         return this;
       }
 
-      private boolean isEditor_ ;
+      private java.lang.Object mEEGOICDEFG_ = "";
       /**
-       * <code>bool is_editor = 15;</code>
-       * @return The isEditor.
+       * <code>string MEEGOICDEFG = 525;</code>
+       * @return The mEEGOICDEFG.
        */
-      @java.lang.Override
-      public boolean getIsEditor() {
-        return isEditor_;
+      public java.lang.String getMEEGOICDEFG() {
+        java.lang.Object ref = mEEGOICDEFG_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          mEEGOICDEFG_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>bool is_editor = 15;</code>
-       * @param value The isEditor to set.
+       * <code>string MEEGOICDEFG = 525;</code>
+       * @return The bytes for mEEGOICDEFG.
+       */
+      public com.google.protobuf.ByteString
+          getMEEGOICDEFGBytes() {
+        java.lang.Object ref = mEEGOICDEFG_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          mEEGOICDEFG_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string MEEGOICDEFG = 525;</code>
+       * @param value The mEEGOICDEFG to set.
        * @return This builder for chaining.
        */
-      public Builder setIsEditor(boolean value) {
-        
-        isEditor_ = value;
+      public Builder setMEEGOICDEFG(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        mEEGOICDEFG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_editor = 15;</code>
+       * <code>string MEEGOICDEFG = 525;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsEditor() {
+      public Builder clearMEEGOICDEFG() {
         
-        isEditor_ = false;
+        mEEGOICDEFG_ = getDefaultInstance().getMEEGOICDEFG();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string MEEGOICDEFG = 525;</code>
+       * @param value The bytes for mEEGOICDEFG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMEEGOICDEFGBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        mEEGOICDEFG_ = value;
         onChanged();
         return this;
       }
 
-      private int languageType_ ;
+      private java.lang.Object mDIKIHJHHJJ_ = "";
       /**
-       * <code>uint32 language_type = 9;</code>
-       * @return The languageType.
+       * <code>string MDIKIHJHHJJ = 4;</code>
+       * @return The mDIKIHJHHJJ.
        */
-      @java.lang.Override
-      public int getLanguageType() {
-        return languageType_;
+      public java.lang.String getMDIKIHJHHJJ() {
+        java.lang.Object ref = mDIKIHJHHJJ_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          mDIKIHJHHJJ_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 language_type = 9;</code>
-       * @param value The languageType to set.
+       * <code>string MDIKIHJHHJJ = 4;</code>
+       * @return The bytes for mDIKIHJHHJJ.
+       */
+      public com.google.protobuf.ByteString
+          getMDIKIHJHHJJBytes() {
+        java.lang.Object ref = mDIKIHJHHJJ_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          mDIKIHJHHJJ_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string MDIKIHJHHJJ = 4;</code>
+       * @param value The mDIKIHJHHJJ to set.
        * @return This builder for chaining.
        */
-      public Builder setLanguageType(int value) {
-        
-        languageType_ = value;
+      public Builder setMDIKIHJHHJJ(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        mDIKIHJHHJJ_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 language_type = 9;</code>
+       * <code>string MDIKIHJHHJJ = 4;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLanguageType() {
+      public Builder clearMDIKIHJHHJJ() {
         
-        languageType_ = 0;
+        mDIKIHJHHJJ_ = getDefaultInstance().getMDIKIHJHHJJ();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string MDIKIHJHHJJ = 4;</code>
+       * @param value The bytes for mDIKIHJHHJJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMDIKIHJHHJJBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        mDIKIHJHHJJ_ = value;
         onChanged();
         return this;
       }
 
-      private int lJFBMKFHNJM_ ;
+      private java.lang.Object hCJGLLHFCMA_ = "";
       /**
-       * <code>uint32 LJFBMKFHNJM = 1153;</code>
-       * @return The lJFBMKFHNJM.
+       * <code>string HCJGLLHFCMA = 1548;</code>
+       * @return The hCJGLLHFCMA.
        */
-      @java.lang.Override
-      public int getLJFBMKFHNJM() {
-        return lJFBMKFHNJM_;
+      public java.lang.String getHCJGLLHFCMA() {
+        java.lang.Object ref = hCJGLLHFCMA_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          hCJGLLHFCMA_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
       }
       /**
-       * <code>uint32 LJFBMKFHNJM = 1153;</code>
-       * @param value The lJFBMKFHNJM to set.
+       * <code>string HCJGLLHFCMA = 1548;</code>
+       * @return The bytes for hCJGLLHFCMA.
+       */
+      public com.google.protobuf.ByteString
+          getHCJGLLHFCMABytes() {
+        java.lang.Object ref = hCJGLLHFCMA_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          hCJGLLHFCMA_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string HCJGLLHFCMA = 1548;</code>
+       * @param value The hCJGLLHFCMA to set.
        * @return This builder for chaining.
        */
-      public Builder setLJFBMKFHNJM(int value) {
-        
-        lJFBMKFHNJM_ = value;
+      public Builder setHCJGLLHFCMA(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        hCJGLLHFCMA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 LJFBMKFHNJM = 1153;</code>
+       * <code>string HCJGLLHFCMA = 1548;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLJFBMKFHNJM() {
+      public Builder clearHCJGLLHFCMA() {
         
-        lJFBMKFHNJM_ = 0;
+        hCJGLLHFCMA_ = getDefaultInstance().getHCJGLLHFCMA();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string HCJGLLHFCMA = 1548;</code>
+       * @param value The bytes for hCJGLLHFCMA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHCJGLLHFCMABytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        hCJGLLHFCMA_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object lLIMBPCEABN_ = "";
+      /**
+       * <code>string LLIMBPCEABN = 86;</code>
+       * @return The lLIMBPCEABN.
+       */
+      public java.lang.String getLLIMBPCEABN() {
+        java.lang.Object ref = lLIMBPCEABN_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          lLIMBPCEABN_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string LLIMBPCEABN = 86;</code>
+       * @return The bytes for lLIMBPCEABN.
+       */
+      public com.google.protobuf.ByteString
+          getLLIMBPCEABNBytes() {
+        java.lang.Object ref = lLIMBPCEABN_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          lLIMBPCEABN_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string LLIMBPCEABN = 86;</code>
+       * @param value The lLIMBPCEABN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLLIMBPCEABN(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        lLIMBPCEABN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string LLIMBPCEABN = 86;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLLIMBPCEABN() {
+        
+        lLIMBPCEABN_ = getDefaultInstance().getLLIMBPCEABN();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string LLIMBPCEABN = 86;</code>
+       * @param value The bytes for lLIMBPCEABN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLLIMBPCEABNBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        lLIMBPCEABN_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object countryCode_ = "";
+      /**
+       * <pre>
+       *CNIFDNMIKIF FDNODKOBNFH = 1420;
+       * </pre>
+       *
+       * <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();
+          countryCode_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <pre>
+       *CNIFDNMIKIF FDNODKOBNFH = 1420;
+       * </pre>
+       *
+       * <code>string country_code = 1774;</code>
+       * @return The bytes for countryCode.
+       */
+      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;
+        }
+      }
+      /**
+       * <pre>
+       *CNIFDNMIKIF FDNODKOBNFH = 1420;
+       * </pre>
+       *
+       * <code>string country_code = 1774;</code>
+       * @param value The countryCode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountryCode(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        countryCode_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *CNIFDNMIKIF FDNODKOBNFH = 1420;
+       * </pre>
+       *
+       * <code>string country_code = 1774;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCountryCode() {
+        
+        countryCode_ = getDefaultInstance().getCountryCode();
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *CNIFDNMIKIF FDNODKOBNFH = 1420;
+       * </pre>
+       *
+       * <code>string country_code = 1774;</code>
+       * @param value The bytes for countryCode to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCountryCodeBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        countryCode_ = value;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString pFDFHPKIHMO_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes PFDFHPKIHMO = 197;</code>
+       * @return The pFDFHPKIHMO.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getPFDFHPKIHMO() {
+        return pFDFHPKIHMO_;
+      }
+      /**
+       * <code>bytes PFDFHPKIHMO = 197;</code>
+       * @param value The pFDFHPKIHMO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPFDFHPKIHMO(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        pFDFHPKIHMO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes PFDFHPKIHMO = 197;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPFDFHPKIHMO() {
+        
+        pFDFHPKIHMO_ = getDefaultInstance().getPFDFHPKIHMO();
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object iMCMLAGLODL_ = "";
+      /**
+       * <code>string IMCMLAGLODL = 1146;</code>
+       * @return The iMCMLAGLODL.
+       */
+      public java.lang.String getIMCMLAGLODL() {
+        java.lang.Object ref = iMCMLAGLODL_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          iMCMLAGLODL_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string IMCMLAGLODL = 1146;</code>
+       * @return The bytes for iMCMLAGLODL.
+       */
+      public com.google.protobuf.ByteString
+          getIMCMLAGLODLBytes() {
+        java.lang.Object ref = iMCMLAGLODL_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          iMCMLAGLODL_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string IMCMLAGLODL = 1146;</code>
+       * @param value The iMCMLAGLODL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIMCMLAGLODL(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        iMCMLAGLODL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string IMCMLAGLODL = 1146;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIMCMLAGLODL() {
+        
+        iMCMLAGLODL_ = getDefaultInstance().getIMCMLAGLODL();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string IMCMLAGLODL = 1146;</code>
+       * @param value The bytes for iMCMLAGLODL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIMCMLAGLODLBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        iMCMLAGLODL_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object nNBGJPGDGCP_ = "";
+      /**
+       * <code>string NNBGJPGDGCP = 13;</code>
+       * @return The nNBGJPGDGCP.
+       */
+      public java.lang.String getNNBGJPGDGCP() {
+        java.lang.Object ref = nNBGJPGDGCP_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          nNBGJPGDGCP_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string NNBGJPGDGCP = 13;</code>
+       * @return The bytes for nNBGJPGDGCP.
+       */
+      public com.google.protobuf.ByteString
+          getNNBGJPGDGCPBytes() {
+        java.lang.Object ref = nNBGJPGDGCP_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          nNBGJPGDGCP_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string NNBGJPGDGCP = 13;</code>
+       * @param value The nNBGJPGDGCP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNNBGJPGDGCP(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        nNBGJPGDGCP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string NNBGJPGDGCP = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNNBGJPGDGCP() {
+        
+        nNBGJPGDGCP_ = getDefaultInstance().getNNBGJPGDGCP();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string NNBGJPGDGCP = 13;</code>
+       * @param value The bytes for nNBGJPGDGCP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNNBGJPGDGCPBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        nNBGJPGDGCP_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object cDDBBPKKOPM_ = "";
+      /**
+       * <code>string CDDBBPKKOPM = 921;</code>
+       * @return The cDDBBPKKOPM.
+       */
+      public java.lang.String getCDDBBPKKOPM() {
+        java.lang.Object ref = cDDBBPKKOPM_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          cDDBBPKKOPM_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string CDDBBPKKOPM = 921;</code>
+       * @return The bytes for cDDBBPKKOPM.
+       */
+      public com.google.protobuf.ByteString
+          getCDDBBPKKOPMBytes() {
+        java.lang.Object ref = cDDBBPKKOPM_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          cDDBBPKKOPM_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string CDDBBPKKOPM = 921;</code>
+       * @param value The cDDBBPKKOPM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCDDBBPKKOPM(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        cDDBBPKKOPM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string CDDBBPKKOPM = 921;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCDDBBPKKOPM() {
+        
+        cDDBBPKKOPM_ = getDefaultInstance().getCDDBBPKKOPM();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string CDDBBPKKOPM = 921;</code>
+       * @param value The bytes for cDDBBPKKOPM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCDDBBPKKOPMBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        cDDBBPKKOPM_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object psnId_ = "";
+      /**
+       * <code>string psn_id = 1762;</code>
+       * @return The psnId.
+       */
+      public java.lang.String getPsnId() {
+        java.lang.Object ref = psnId_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          psnId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string psn_id = 1762;</code>
+       * @return The bytes for psnId.
+       */
+      public com.google.protobuf.ByteString
+          getPsnIdBytes() {
+        java.lang.Object ref = psnId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          psnId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string psn_id = 1762;</code>
+       * @param value The psnId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPsnId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        psnId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string psn_id = 1762;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPsnId() {
+        
+        psnId_ = getDefaultInstance().getPsnId();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string psn_id = 1762;</code>
+       * @param value The bytes for psnId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPsnIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        psnId_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object birthday_ = "";
+      /**
+       * <code>string birthday = 1179;</code>
+       * @return The birthday.
+       */
+      public java.lang.String getBirthday() {
+        java.lang.Object ref = birthday_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          birthday_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 1179;</code>
+       * @return The bytes for birthday.
+       */
+      public com.google.protobuf.ByteString
+          getBirthdayBytes() {
+        java.lang.Object ref = birthday_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          birthday_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string birthday = 1179;</code>
+       * @param value The birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthday(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 1179;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBirthday() {
+        
+        birthday_ = getDefaultInstance().getBirthday();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string birthday = 1179;</code>
+       * @param value The bytes for birthday to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBirthdayBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        birthday_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object pECPGFPBJEB_ = "";
+      /**
+       * <code>string PECPGFPBJEB = 216;</code>
+       * @return The pECPGFPBJEB.
+       */
+      public java.lang.String getPECPGFPBJEB() {
+        java.lang.Object ref = pECPGFPBJEB_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          pECPGFPBJEB_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string PECPGFPBJEB = 216;</code>
+       * @return The bytes for pECPGFPBJEB.
+       */
+      public com.google.protobuf.ByteString
+          getPECPGFPBJEBBytes() {
+        java.lang.Object ref = pECPGFPBJEB_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          pECPGFPBJEB_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string PECPGFPBJEB = 216;</code>
+       * @param value The pECPGFPBJEB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPECPGFPBJEB(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        pECPGFPBJEB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PECPGFPBJEB = 216;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPECPGFPBJEB() {
+        
+        pECPGFPBJEB_ = getDefaultInstance().getPECPGFPBJEB();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PECPGFPBJEB = 216;</code>
+       * @param value The bytes for pECPGFPBJEB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPECPGFPBJEBBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        pECPGFPBJEB_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object accountUid_ = "";
+      /**
+       * <code>string account_uid = 11;</code>
+       * @return The accountUid.
+       */
+      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();
+          accountUid_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string account_uid = 11;</code>
+       * @return The bytes for accountUid.
+       */
+      public com.google.protobuf.ByteString
+          getAccountUidBytes() {
+        java.lang.Object ref = accountUid_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          accountUid_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string account_uid = 11;</code>
+       * @param value The accountUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountUid(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        accountUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string account_uid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAccountUid() {
+        
+        accountUid_ = getDefaultInstance().getAccountUid();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string account_uid = 11;</code>
+       * @param value The bytes for accountUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAccountUidBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        accountUid_ = value;
         onChanged();
         return this;
       }
 
       private int accountType_ ;
       /**
-       * <code>uint32 account_type = 834;</code>
+       * <code>uint32 account_type = 9;</code>
        * @return The accountType.
        */
       @java.lang.Override
@@ -5175,7 +4830,7 @@ public final class PlayerLoginReqOuterClass {
         return accountType_;
       }
       /**
-       * <code>uint32 account_type = 834;</code>
+       * <code>uint32 account_type = 9;</code>
        * @param value The accountType to set.
        * @return This builder for chaining.
        */
@@ -5186,7 +4841,7 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 account_type = 834;</code>
+       * <code>uint32 account_type = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAccountType() {
@@ -5196,78 +4851,653 @@ public final class PlayerLoginReqOuterClass {
         return this;
       }
 
-      private java.lang.Object fPOFDDAGKAG_ = "";
+      private int fNPPPMBIBEM_ ;
       /**
-       * <code>string FPOFDDAGKAG = 255;</code>
-       * @return The fPOFDDAGKAG.
+       * <code>uint32 FNPPPMBIBEM = 345;</code>
+       * @return The fNPPPMBIBEM.
        */
-      public java.lang.String getFPOFDDAGKAG() {
-        java.lang.Object ref = fPOFDDAGKAG_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          fPOFDDAGKAG_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
+      @java.lang.Override
+      public int getFNPPPMBIBEM() {
+        return fNPPPMBIBEM_;
       }
       /**
-       * <code>string FPOFDDAGKAG = 255;</code>
-       * @return The bytes for fPOFDDAGKAG.
-       */
-      public com.google.protobuf.ByteString
-          getFPOFDDAGKAGBytes() {
-        java.lang.Object ref = fPOFDDAGKAG_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          fPOFDDAGKAG_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string FPOFDDAGKAG = 255;</code>
-       * @param value The fPOFDDAGKAG to set.
+       * <code>uint32 FNPPPMBIBEM = 345;</code>
+       * @param value The fNPPPMBIBEM to set.
        * @return This builder for chaining.
        */
-      public Builder setFPOFDDAGKAG(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        fPOFDDAGKAG_ = value;
+      public Builder setFNPPPMBIBEM(int value) {
+        
+        fNPPPMBIBEM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string FPOFDDAGKAG = 255;</code>
+       * <code>uint32 FNPPPMBIBEM = 345;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFPOFDDAGKAG() {
+      public Builder clearFNPPPMBIBEM() {
         
-        fPOFDDAGKAG_ = getDefaultInstance().getFPOFDDAGKAG();
+        fNPPPMBIBEM_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int pLNNJPFPPAM_ ;
+      /**
+       * <code>uint32 PLNNJPFPPAM = 2029;</code>
+       * @return The pLNNJPFPPAM.
+       */
+      @java.lang.Override
+      public int getPLNNJPFPPAM() {
+        return pLNNJPFPPAM_;
+      }
+      /**
+       * <code>uint32 PLNNJPFPPAM = 2029;</code>
+       * @param value The pLNNJPFPPAM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPLNNJPFPPAM(int value) {
+        
+        pLNNJPFPPAM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string FPOFDDAGKAG = 255;</code>
-       * @param value The bytes for fPOFDDAGKAG to set.
+       * <code>uint32 PLNNJPFPPAM = 2029;</code>
        * @return This builder for chaining.
        */
-      public Builder setFPOFDDAGKAGBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
+      public Builder clearPLNNJPFPPAM() {
         
-        fPOFDDAGKAG_ = value;
+        pLNNJPFPPAM_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int targetHomeOwnerUid_ ;
+      /**
+       * <code>uint32 target_home_owner_uid = 226;</code>
+       * @return The targetHomeOwnerUid.
+       */
+      @java.lang.Override
+      public int getTargetHomeOwnerUid() {
+        return targetHomeOwnerUid_;
+      }
+      /**
+       * <code>uint32 target_home_owner_uid = 226;</code>
+       * @param value The targetHomeOwnerUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetHomeOwnerUid(int value) {
+        
+        targetHomeOwnerUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_home_owner_uid = 226;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetHomeOwnerUid() {
+        
+        targetHomeOwnerUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isGuest_ ;
+      /**
+       * <code>bool is_guest = 6;</code>
+       * @return The isGuest.
+       */
+      @java.lang.Override
+      public boolean getIsGuest() {
+        return isGuest_;
+      }
+      /**
+       * <code>bool is_guest = 6;</code>
+       * @param value The isGuest to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsGuest(boolean value) {
+        
+        isGuest_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_guest = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsGuest() {
+        
+        isGuest_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean hAAGGONEHCH_ ;
+      /**
+       * <code>bool HAAGGONEHCH = 1;</code>
+       * @return The hAAGGONEHCH.
+       */
+      @java.lang.Override
+      public boolean getHAAGGONEHCH() {
+        return hAAGGONEHCH_;
+      }
+      /**
+       * <code>bool HAAGGONEHCH = 1;</code>
+       * @param value The hAAGGONEHCH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHAAGGONEHCH(boolean value) {
+        
+        hAAGGONEHCH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HAAGGONEHCH = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHAAGGONEHCH() {
+        
+        hAAGGONEHCH_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean jAGELBDJFJH_ ;
+      /**
+       * <code>bool JAGELBDJFJH = 1641;</code>
+       * @return The jAGELBDJFJH.
+       */
+      @java.lang.Override
+      public boolean getJAGELBDJFJH() {
+        return jAGELBDJFJH_;
+      }
+      /**
+       * <code>bool JAGELBDJFJH = 1641;</code>
+       * @param value The jAGELBDJFJH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJAGELBDJFJH(boolean value) {
+        
+        jAGELBDJFJH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool JAGELBDJFJH = 1641;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJAGELBDJFJH() {
+        
+        jAGELBDJFJH_ = false;
+        onChanged();
+        return this;
+      }
+
+      private long loginRand_ ;
+      /**
+       * <code>uint64 login_rand = 12;</code>
+       * @return The loginRand.
+       */
+      @java.lang.Override
+      public long getLoginRand() {
+        return loginRand_;
+      }
+      /**
+       * <code>uint64 login_rand = 12;</code>
+       * @param value The loginRand to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLoginRand(long value) {
+        
+        loginRand_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 login_rand = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLoginRand() {
+        
+        loginRand_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int oCINFHOJCEA_ ;
+      /**
+       * <code>uint32 OCINFHOJCEA = 725;</code>
+       * @return The oCINFHOJCEA.
+       */
+      @java.lang.Override
+      public int getOCINFHOJCEA() {
+        return oCINFHOJCEA_;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 725;</code>
+       * @param value The oCINFHOJCEA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOCINFHOJCEA(int value) {
+        
+        oCINFHOJCEA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 OCINFHOJCEA = 725;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOCINFHOJCEA() {
+        
+        oCINFHOJCEA_ = 0;
+        onChanged();
+        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 kPCGBPCHBMJ_ ;
+      /**
+       * <code>uint32 KPCGBPCHBMJ = 507;</code>
+       * @return The kPCGBPCHBMJ.
+       */
+      @java.lang.Override
+      public int getKPCGBPCHBMJ() {
+        return kPCGBPCHBMJ_;
+      }
+      /**
+       * <code>uint32 KPCGBPCHBMJ = 507;</code>
+       * @param value The kPCGBPCHBMJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKPCGBPCHBMJ(int value) {
+        
+        kPCGBPCHBMJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KPCGBPCHBMJ = 507;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKPCGBPCHBMJ() {
+        
+        kPCGBPCHBMJ_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int clientDataVersion_ ;
+      /**
+       * <code>uint32 client_data_version = 420;</code>
+       * @return The clientDataVersion.
+       */
+      @java.lang.Override
+      public int getClientDataVersion() {
+        return clientDataVersion_;
+      }
+      /**
+       * <code>uint32 client_data_version = 420;</code>
+       * @param value The clientDataVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientDataVersion(int value) {
+        
+        clientDataVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 client_data_version = 420;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientDataVersion() {
+        
+        clientDataVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nCNKMDBAFEH_ ;
+      /**
+       * <code>uint32 NCNKMDBAFEH = 1370;</code>
+       * @return The nCNKMDBAFEH.
+       */
+      @java.lang.Override
+      public int getNCNKMDBAFEH() {
+        return nCNKMDBAFEH_;
+      }
+      /**
+       * <code>uint32 NCNKMDBAFEH = 1370;</code>
+       * @param value The nCNKMDBAFEH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNCNKMDBAFEH(int value) {
+        
+        nCNKMDBAFEH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 NCNKMDBAFEH = 1370;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNCNKMDBAFEH() {
+        
+        nCNKMDBAFEH_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int ePAGBFLKJBN_ ;
+      /**
+       * <code>uint32 EPAGBFLKJBN = 1691;</code>
+       * @return The ePAGBFLKJBN.
+       */
+      @java.lang.Override
+      public int getEPAGBFLKJBN() {
+        return ePAGBFLKJBN_;
+      }
+      /**
+       * <code>uint32 EPAGBFLKJBN = 1691;</code>
+       * @param value The ePAGBFLKJBN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEPAGBFLKJBN(int value) {
+        
+        ePAGBFLKJBN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 EPAGBFLKJBN = 1691;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEPAGBFLKJBN() {
+        
+        ePAGBFLKJBN_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gmUid_ ;
+      /**
+       * <code>uint32 gm_uid = 689;</code>
+       * @return The gmUid.
+       */
+      @java.lang.Override
+      public int getGmUid() {
+        return gmUid_;
+      }
+      /**
+       * <code>uint32 gm_uid = 689;</code>
+       * @param value The gmUid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGmUid(int value) {
+        
+        gmUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gm_uid = 689;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGmUid() {
+        
+        gmUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int bFPJPDCLFNM_ ;
+      /**
+       * <code>uint32 BFPJPDCLFNM = 15;</code>
+       * @return The bFPJPDCLFNM.
+       */
+      @java.lang.Override
+      public int getBFPJPDCLFNM() {
+        return bFPJPDCLFNM_;
+      }
+      /**
+       * <code>uint32 BFPJPDCLFNM = 15;</code>
+       * @param value The bFPJPDCLFNM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBFPJPDCLFNM(int value) {
+        
+        bFPJPDCLFNM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 BFPJPDCLFNM = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBFPJPDCLFNM() {
+        
+        bFPJPDCLFNM_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int iKKKLHICPMF_ ;
+      /**
+       * <code>uint32 IKKKLHICPMF = 1977;</code>
+       * @return The iKKKLHICPMF.
+       */
+      @java.lang.Override
+      public int getIKKKLHICPMF() {
+        return iKKKLHICPMF_;
+      }
+      /**
+       * <code>uint32 IKKKLHICPMF = 1977;</code>
+       * @param value The iKKKLHICPMF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIKKKLHICPMF(int value) {
+        
+        iKKKLHICPMF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IKKKLHICPMF = 1977;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIKKKLHICPMF() {
+        
+        iKKKLHICPMF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mCKEONLBAOA_ ;
+      /**
+       * <code>uint32 MCKEONLBAOA = 1521;</code>
+       * @return The mCKEONLBAOA.
+       */
+      @java.lang.Override
+      public int getMCKEONLBAOA() {
+        return mCKEONLBAOA_;
+      }
+      /**
+       * <code>uint32 MCKEONLBAOA = 1521;</code>
+       * @param value The mCKEONLBAOA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMCKEONLBAOA(int value) {
+        
+        mCKEONLBAOA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MCKEONLBAOA = 1521;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMCKEONLBAOA() {
+        
+        mCKEONLBAOA_ = 0;
+        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 kEKHAKAPMIN_ ;
+      /**
+       * <code>uint32 KEKHAKAPMIN = 256;</code>
+       * @return The kEKHAKAPMIN.
+       */
+      @java.lang.Override
+      public int getKEKHAKAPMIN() {
+        return kEKHAKAPMIN_;
+      }
+      /**
+       * <code>uint32 KEKHAKAPMIN = 256;</code>
+       * @param value The kEKHAKAPMIN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKEKHAKAPMIN(int value) {
+        
+        kEKHAKAPMIN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KEKHAKAPMIN = 256;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKEKHAKAPMIN() {
+        
+        kEKHAKAPMIN_ = 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;
+      }
+
+      private int dKGAONKKOHA_ ;
+      /**
+       * <code>uint32 DKGAONKKOHA = 1280;</code>
+       * @return The dKGAONKKOHA.
+       */
+      @java.lang.Override
+      public int getDKGAONKKOHA() {
+        return dKGAONKKOHA_;
+      }
+      /**
+       * <code>uint32 DKGAONKKOHA = 1280;</code>
+       * @param value The dKGAONKKOHA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDKGAONKKOHA(int value) {
+        
+        dKGAONKKOHA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DKGAONKKOHA = 1280;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDKGAONKKOHA() {
+        
+        dKGAONKKOHA_ = 0;
         onChanged();
         return this;
       }
@@ -5338,51 +5568,45 @@ public final class PlayerLoginReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024PlayerLoginReq.proto\032\024TrackingIOInfo.p" +
-      "roto\032\030AdjustTrackingInfo.proto\"\237\010\n\016Playe" +
-      "rLoginReq\022\033\n\022security_cmd_reply\030\363\014 \001(\014\022\024" +
-      "\n\013DEBLDPOHPOL\030\234\016 \001(\r\022\037\n\026environment_erro" +
-      "r_code\030\365\010 \001(\014\022*\n\020tracking_io_info\030\264\003 \001(\013" +
-      "2\017.TrackingIOInfo\022\025\n\014country_code\030\212\017 \001(\t" +
-      "\022\023\n\013device_info\030\005 \001(\t\022\023\n\013account_uid\030\010 \001" +
-      "(\t\022\023\n\013HIPFGBLGPMJ\030- \001(\t\022\017\n\006psn_id\030\362\t \001(\t" +
-      "\022\024\n\013EMFDHANIAHH\030\220\007 \001(\r\022\022\n\ntarget_uid\030\014 \001" +
-      "(\r\022 \n\027checksum_client_version\030\272\014 \001(\t\022\024\n\013" +
-      "DHOLEDCICPB\030\243\005 \001(\r\022\024\n\013FOHJKJCKFFA\030\312\003 \001(\t" +
-      "\0222\n\024adjust_tracking_info\030\234\017 \001(\0132\023.Adjust" +
-      "TrackingInfo\022\020\n\010is_guest\030\001 \001(\010\022\014\n\003tag\030\274\001" +
-      " \001(\r\022\036\n\025target_home_owner_uid\030\207\r \001(\r\022\025\n\r" +
-      "platform_type\030\004 \001(\r\022\024\n\013CFMBEIOBIEG\030\254\006 \001(" +
-      "\t\022\023\n\nchannel_id\030\230\016 \001(\r\022\024\n\013is_transfer\030\223\006" +
-      " \001(\010\022\022\n\tonline_id\030\366\t \001(\t\022\034\n\023client_data_" +
-      "version\030\324\017 \001(\r\022\021\n\010birthday\030\276\001 \001(\t\022\026\n\016cli" +
-      "ent_version\030\r \001(\t\022\021\n\010checksum\030\204\016 \001(\t\022\024\n\013" +
-      "FCPDNLHOBNK\030\302\005 \001(\r\022\024\n\013KCFIGJAPNIB\030\263\003 \001(\r" +
-      "\022\026\n\016extra_bin_data\030J \001(\014\022\022\n\nlogin_rand\030\006" +
-      " \001(\004\022\020\n\010platform\030\016 \001(\t\022\026\n\016sub_channel_id" +
-      "\030\007 \001(\r\022\024\n\013KKKHJACICJO\030\314\t \001(\r\022\023\n\013device_u" +
-      "uid\030\n \001(\t\022\r\n\005token\030\002 \001(\t\022\023\n\013device_name\030" +
-      "\013 \001(\t\022\026\n\016system_version\030\003 \001(\t\022\034\n\023client_" +
-      "verison_hash\030\345\006 \001(\t\022\021\n\tis_editor\030\017 \001(\010\022\025" +
-      "\n\rlanguage_type\030\t \001(\r\022\024\n\013LJFBMKFHNJM\030\201\t " +
-      "\001(\r\022\025\n\014account_type\030\302\006 \001(\r\022\024\n\013FPOFDDAGKA" +
-      "G\030\377\001 \001(\tB\033\n\031emu.grasscutter.net.protob\006p" +
-      "roto3"
+      "\n\024PlayerLoginReq.proto\"\375\007\n\016PlayerLoginRe" +
+      "q\022\020\n\010platform\030\016 \001(\t\022\024\n\013FBKHEDNNFIF\030\205\r \001(" +
+      "\t\022\024\n\013JIPHKNNHBIE\030\234\007 \001(\t\022\024\n\013CBIEHLMFBHI\030\231" +
+      "\013 \001(\t\022\023\n\013IMACIIGIOGC\030\n \001(\t\022\023\n\013JJIOHIJNGF" +
+      "P\030\003 \001(\t\022\r\n\005token\030\007 \001(\t\022\027\n\016extra_bin_data" +
+      "\030\237\t \001(\014\022\023\n\013LPFPAJBHJMH\030. \001(\t\022\024\n\013OFMIHDNG" +
+      "FNM\030\211\002 \001(\014\022\022\n\tonline_id\030\370\002 \001(\t\022\023\n\013KEODMF" +
+      "OKNGH\030\005 \001(\t\022\024\n\013MEEGOICDEFG\030\215\004 \001(\t\022\023\n\013MDI" +
+      "KIHJHHJJ\030\004 \001(\t\022\024\n\013HCJGLLHFCMA\030\214\014 \001(\t\022\023\n\013" +
+      "LLIMBPCEABN\030V \001(\t\022\025\n\014country_code\030\356\r \001(\t" +
+      "\022\024\n\013PFDFHPKIHMO\030\305\001 \001(\014\022\024\n\013IMCMLAGLODL\030\372\010" +
+      " \001(\t\022\023\n\013NNBGJPGDGCP\030\r \001(\t\022\024\n\013CDDBBPKKOPM" +
+      "\030\231\007 \001(\t\022\017\n\006psn_id\030\342\r \001(\t\022\021\n\010birthday\030\233\t " +
+      "\001(\t\022\024\n\013PECPGFPBJEB\030\330\001 \001(\t\022\023\n\013account_uid" +
+      "\030\013 \001(\t\022\024\n\014account_type\030\t \001(\r\022\024\n\013FNPPPMBI" +
+      "BEM\030\331\002 \001(\r\022\024\n\013PLNNJPFPPAM\030\355\017 \001(\r\022\036\n\025targ" +
+      "et_home_owner_uid\030\342\001 \001(\r\022\020\n\010is_guest\030\006 \001" +
+      "(\010\022\023\n\013HAAGGONEHCH\030\001 \001(\010\022\024\n\013JAGELBDJFJH\030\351" +
+      "\014 \001(\010\022\022\n\nlogin_rand\030\014 \001(\004\022\024\n\013OCINFHOJCEA" +
+      "\030\325\005 \001(\r\022\014\n\003tag\030\206\t \001(\r\022\024\n\013KPCGBPCHBMJ\030\373\003 " +
+      "\001(\r\022\034\n\023client_data_version\030\244\003 \001(\r\022\024\n\013NCN" +
+      "KMDBAFEH\030\332\n \001(\r\022\024\n\013EPAGBFLKJBN\030\233\r \001(\r\022\017\n" +
+      "\006gm_uid\030\261\005 \001(\r\022\023\n\013BFPJPDCLFNM\030\017 \001(\r\022\024\n\013I" +
+      "KKKLHICPMF\030\271\017 \001(\r\022\024\n\013MCKEONLBAOA\030\361\013 \001(\r\022" +
+      "\025\n\rplatform_type\030\002 \001(\r\022\024\n\013KEKHAKAPMIN\030\200\002" +
+      " \001(\r\022\022\n\ntarget_uid\030\010 \001(\r\022\024\n\013DKGAONKKOHA\030" +
+      "\200\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.TrackingIOInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.getDescriptor(),
         });
     internal_static_PlayerLoginReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerLoginReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLoginReq_descriptor,
-        new java.lang.String[] { "SecurityCmdReply", "DEBLDPOHPOL", "EnvironmentErrorCode", "TrackingIoInfo", "CountryCode", "DeviceInfo", "AccountUid", "HIPFGBLGPMJ", "PsnId", "EMFDHANIAHH", "TargetUid", "ChecksumClientVersion", "DHOLEDCICPB", "FOHJKJCKFFA", "AdjustTrackingInfo", "IsGuest", "Tag", "TargetHomeOwnerUid", "PlatformType", "CFMBEIOBIEG", "ChannelId", "IsTransfer", "OnlineId", "ClientDataVersion", "Birthday", "ClientVersion", "Checksum", "FCPDNLHOBNK", "KCFIGJAPNIB", "ExtraBinData", "LoginRand", "Platform", "SubChannelId", "KKKHJACICJO", "DeviceUuid", "Token", "DeviceName", "SystemVersion", "ClientVerisonHash", "IsEditor", "LanguageType", "LJFBMKFHNJM", "AccountType", "FPOFDDAGKAG", });
-    emu.grasscutter.net.proto.TrackingIOInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AdjustTrackingInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "Platform", "FBKHEDNNFIF", "JIPHKNNHBIE", "CBIEHLMFBHI", "IMACIIGIOGC", "JJIOHIJNGFP", "Token", "ExtraBinData", "LPFPAJBHJMH", "OFMIHDNGFNM", "OnlineId", "KEODMFOKNGH", "MEEGOICDEFG", "MDIKIHJHHJJ", "HCJGLLHFCMA", "LLIMBPCEABN", "CountryCode", "PFDFHPKIHMO", "IMCMLAGLODL", "NNBGJPGDGCP", "CDDBBPKKOPM", "PsnId", "Birthday", "PECPGFPBJEB", "AccountUid", "AccountType", "FNPPPMBIBEM", "PLNNJPFPPAM", "TargetHomeOwnerUid", "IsGuest", "HAAGGONEHCH", "JAGELBDJFJH", "LoginRand", "OCINFHOJCEA", "Tag", "KPCGBPCHBMJ", "ClientDataVersion", "NCNKMDBAFEH", "EPAGBFLKJBN", "GmUid", "BFPJPDCLFNM", "IKKKLHICPMF", "MCKEONLBAOA", "PlatformType", "KEKHAKAPMIN", "TargetUid", "DKGAONKKOHA", });
   }
 
   // @@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 dd3bb8ffd..9e1ceacea 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLoginRspOuterClass.java
@@ -19,23 +19,83 @@ public final class PlayerLoginRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string client_version_suffix = 1991;</code>
-     * @return The clientVersionSuffix.
+     * <code>bool is_new_player = 1;</code>
+     * @return The isNewPlayer.
      */
-    java.lang.String getClientVersionSuffix();
-    /**
-     * <code>string client_version_suffix = 1991;</code>
-     * @return The bytes for clientVersionSuffix.
-     */
-    com.google.protobuf.ByteString
-        getClientVersionSuffixBytes();
+    boolean getIsNewPlayer();
 
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>string game_biz = 2;</code>
+     * @return The gameBiz.
+     */
+    java.lang.String getGameBiz();
+    /**
+     * <code>string game_biz = 2;</code>
+     * @return The bytes for gameBiz.
+     */
+    com.google.protobuf.ByteString
+        getGameBizBytes();
+
+    /**
+     * <code>bool OAMCACIICJJ = 3;</code>
+     * @return The oAMCACIICJJ.
+     */
+    boolean getOAMCACIICJJ();
+
+    /**
+     * <code>bytes player_data = 4;</code>
+     * @return The playerData.
+     */
+    com.google.protobuf.ByteString getPlayerData();
+
+    /**
+     * <code>uint32 target_uid = 5;</code>
+     * @return The targetUid.
+     */
+    int getTargetUid();
+
+    /**
+     * <code>bool PCNBCFNBPGF = 6;</code>
+     * @return The pCNBCFNBPGF.
+     */
+    boolean getPCNBCFNBPGF();
+
+    /**
+     * <code>int32 ability_hash_code = 8;</code>
+     * @return The abilityHashCode.
+     */
+    int getAbilityHashCode();
+
+    /**
+     * <code>uint64 login_rand = 9;</code>
+     * @return The loginRand.
+     */
+    long getLoginRand();
+
+    /**
+     * <code>uint32 player_data_version = 10;</code>
+     * @return The playerDataVersion.
+     */
+    int getPlayerDataVersion();
+
+    /**
+     * <code>uint32 client_silence_data_version = 11;</code>
+     * @return The clientSilenceDataVersion.
+     */
+    int getClientSilenceDataVersion();
+
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     int getAbilityHashMapCount();
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     boolean containsAbilityHashMap(
         java.lang.String key);
@@ -46,210 +106,234 @@ public final class PlayerLoginRspOuterClass {
     java.util.Map<java.lang.String, java.lang.Integer>
     getAbilityHashMap();
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     java.util.Map<java.lang.String, java.lang.Integer>
     getAbilityHashMapMap();
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
 
     int getAbilityHashMapOrDefault(
         java.lang.String key,
         int defaultValue);
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
 
     int getAbilityHashMapOrThrow(
         java.lang.String key);
 
     /**
-     * <code>bool is_transfer = 1988;</code>
-     * @return The isTransfer.
+     * <code>uint32 client_data_version = 15;</code>
+     * @return The clientDataVersion.
      */
-    boolean getIsTransfer();
+    int getClientDataVersion();
 
     /**
-     * <code>uint32 target_home_owner_uid = 816;</code>
-     * @return The targetHomeOwnerUid.
+     * <code>bool POPJGOJFOKA = 67;</code>
+     * @return The pOPJGOJFOKA.
      */
-    int getTargetHomeOwnerUid();
+    boolean getPOPJGOJFOKA();
 
     /**
-     * <code>bool is_data_need_relogin = 1993;</code>
-     * @return The isDataNeedRelogin.
-     */
-    boolean getIsDataNeedRelogin();
-
-    /**
-     * <code>string game_biz = 4;</code>
-     * @return The gameBiz.
-     */
-    java.lang.String getGameBiz();
-    /**
-     * <code>string game_biz = 4;</code>
-     * @return The bytes for gameBiz.
-     */
-    com.google.protobuf.ByteString
-        getGameBizBytes();
-
-    /**
-     * <code>int32 ability_hash_code = 5;</code>
-     * @return The abilityHashCode.
-     */
-    int getAbilityHashCode();
-
-    /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair> 
         getShortAbilityHashMapList();
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair getShortAbilityHashMap(int index);
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     int getShortAbilityHashMapCount();
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder> 
         getShortAbilityHashMapOrBuilderList();
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder getShortAbilityHashMapOrBuilder(
         int index);
 
     /**
-     * <code>bool FBFJPEPMAOF = 15;</code>
-     * @return The fBFJPEPMAOF.
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     * @return Whether the resVersionConfig field is set.
      */
-    boolean getFBFJPEPMAOF();
+    boolean hasResVersionConfig();
+    /**
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     * @return The resVersionConfig.
+     */
+    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig();
+    /**
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     */
+    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder();
 
     /**
-     * <code>bool is_use_ability_hash = 14;</code>
-     * @return The isUseAbilityHash.
+     * <code>bool KLLPFNOLBHO = 179;</code>
+     * @return The kLLPFNOLBHO.
      */
-    boolean getIsUseAbilityHash();
+    boolean getKLLPFNOLBHO();
 
     /**
-     * <code>bool is_audit = 335;</code>
-     * @return The isAudit.
+     * <code>string KECGLOKOIDC = 249;</code>
+     * @return The kECGLOKOIDC.
      */
-    boolean getIsAudit();
-
+    java.lang.String getKECGLOKOIDC();
     /**
-     * <code>string client_silence_md5 = 784;</code>
-     * @return The clientSilenceMd5.
-     */
-    java.lang.String getClientSilenceMd5();
-    /**
-     * <code>string client_silence_md5 = 784;</code>
-     * @return The bytes for clientSilenceMd5.
+     * <code>string KECGLOKOIDC = 249;</code>
+     * @return The bytes for kECGLOKOIDC.
      */
     com.google.protobuf.ByteString
-        getClientSilenceMd5Bytes();
+        getKECGLOKOIDCBytes();
 
     /**
-     * <code>string msg = 43;</code>
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> 
+        getFeatureBlockInfoListList();
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo getFeatureBlockInfoList(int index);
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    int getFeatureBlockInfoListCount();
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> 
+        getFeatureBlockInfoListOrBuilderList();
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder getFeatureBlockInfoListOrBuilder(
+        int index);
+
+    /**
+     * <code>bool EFPHHJIKPJG = 451;</code>
+     * @return The eFPHHJIKPJG.
+     */
+    boolean getEFPHHJIKPJG();
+
+    /**
+     * <code>bytes sc_info = 793;</code>
+     * @return The scInfo.
+     */
+    com.google.protobuf.ByteString getScInfo();
+
+    /**
+     * <code>string client_silence_version_suffix = 1096;</code>
+     * @return The clientSilenceVersionSuffix.
+     */
+    java.lang.String getClientSilenceVersionSuffix();
+    /**
+     * <code>string client_silence_version_suffix = 1096;</code>
+     * @return The bytes for clientSilenceVersionSuffix.
+     */
+    com.google.protobuf.ByteString
+        getClientSilenceVersionSuffixBytes();
+
+    /**
+     * <code>uint32 target_home_owner_uid = 1147;</code>
+     * @return The targetHomeOwnerUid.
+     */
+    int getTargetHomeOwnerUid();
+
+    /**
+     * <code>bool JAGELBDJFJH = 1189;</code>
+     * @return The jAGELBDJFJH.
+     */
+    boolean getJAGELBDJFJH();
+
+    /**
+     * <code>string msg = 1207;</code>
      * @return The msg.
      */
     java.lang.String getMsg();
     /**
-     * <code>string msg = 43;</code>
+     * <code>string msg = 1207;</code>
      * @return The bytes for msg.
      */
     com.google.protobuf.ByteString
         getMsgBytes();
 
     /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+     * <code>bool CLJBEGINENC = 1298;</code>
+     * @return The cLJBEGINENC.
      */
-    java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> 
-        getFeatureBlockInfoListList();
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo getFeatureBlockInfoList(int index);
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    int getFeatureBlockInfoListCount();
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> 
-        getFeatureBlockInfoListOrBuilderList();
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder getFeatureBlockInfoListOrBuilder(
-        int index);
+    boolean getCLJBEGINENC();
 
     /**
-     * <code>bool DNHHIMENOLD = 1371;</code>
-     * @return The dNHHIMENOLD.
+     * <code>double total_tick_time = 1456;</code>
+     * @return The totalTickTime.
      */
-    boolean getDNHHIMENOLD();
+    double getTotalTickTime();
 
     /**
-     * <code>uint32 client_silence_data_version = 6;</code>
-     * @return The clientSilenceDataVersion.
+     * <code>string client_version_suffix = 1490;</code>
+     * @return The clientVersionSuffix.
      */
-    int getClientSilenceDataVersion();
-
+    java.lang.String getClientVersionSuffix();
     /**
-     * <code>bool PKKKINOCFMJ = 2;</code>
-     * @return The pKKKINOCFMJ.
-     */
-    boolean getPKKKINOCFMJ();
-
-    /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 client_data_version = 12;</code>
-     * @return The clientDataVersion.
-     */
-    int getClientDataVersion();
-
-    /**
-     * <code>string birthday = 1688;</code>
-     * @return The birthday.
-     */
-    java.lang.String getBirthday();
-    /**
-     * <code>string birthday = 1688;</code>
-     * @return The bytes for birthday.
+     * <code>string client_version_suffix = 1490;</code>
+     * @return The bytes for clientVersionSuffix.
      */
     com.google.protobuf.ByteString
-        getBirthdayBytes();
+        getClientVersionSuffixBytes();
 
     /**
-     * <code>bool BOKKNHEOKPD = 620;</code>
-     * @return The bOKKNHEOKPD.
+     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
+     * @return Whether the aBPMACCDDJH field is set.
      */
-    boolean getBOKKNHEOKPD();
-
+    boolean hasABPMACCDDJH();
     /**
-     * <code>uint32 target_uid = 9;</code>
-     * @return The targetUid.
+     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
+     * @return The aBPMACCDDJH.
      */
-    int getTargetUid();
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getABPMACCDDJH();
+    /**
+     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getABPMACCDDJHOrBuilder();
 
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>string next_resource_url = 1549;</code>
+     * @return The nextResourceUrl.
+     */
+    java.lang.String getNextResourceUrl();
+    /**
+     * <code>string next_resource_url = 1549;</code>
+     * @return The bytes for nextResourceUrl.
+     */
+    com.google.protobuf.ByteString
+        getNextResourceUrlBytes();
+
+    /**
+     * <code>string PKEKLEEOLJL = 1594;</code>
+     * @return The pKEKLEEOLJL.
+     */
+    java.lang.String getPKEKLEEOLJL();
+    /**
+     * <code>string PKEKLEEOLJL = 1594;</code>
+     * @return The bytes for pKEKLEEOLJL.
+     */
+    com.google.protobuf.ByteString
+        getPKEKLEEOLJLBytes();
+
+    /**
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     int getBlockInfoMapCount();
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     boolean containsBlockInfoMap(
         int key);
@@ -260,171 +344,82 @@ public final class PlayerLoginRspOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo>
     getBlockInfoMap();
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo>
     getBlockInfoMapMap();
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
 
     emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo getBlockInfoMapOrDefault(
         int key,
         emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo defaultValue);
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
 
     emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo getBlockInfoMapOrThrow(
         int key);
 
     /**
-     * <code>bool GOFGOCDJDND = 281;</code>
-     * @return The gOFGOCDJDND.
+     * <code>string birthday = 1689;</code>
+     * @return The birthday.
      */
-    boolean getGOFGOCDJDND();
-
+    java.lang.String getBirthday();
     /**
-     * <code>string next_resource_url = 986;</code>
-     * @return The nextResourceUrl.
-     */
-    java.lang.String getNextResourceUrl();
-    /**
-     * <code>string next_resource_url = 986;</code>
-     * @return The bytes for nextResourceUrl.
+     * <code>string birthday = 1689;</code>
+     * @return The bytes for birthday.
      */
     com.google.protobuf.ByteString
-        getNextResourceUrlBytes();
+        getBirthdayBytes();
 
     /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     * @return Whether the resVersionConfig field is set.
+     * <code>string JKANELMFGEP = 1728;</code>
+     * @return The jKANELMFGEP.
      */
-    boolean hasResVersionConfig();
+    java.lang.String getJKANELMFGEP();
     /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     * @return The resVersionConfig.
-     */
-    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig();
-    /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     */
-    emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder();
-
-    /**
-     * <code>double total_tick_time = 262;</code>
-     * @return The totalTickTime.
-     */
-    double getTotalTickTime();
-
-    /**
-     * <code>bytes player_data = 13;</code>
-     * @return The playerData.
-     */
-    com.google.protobuf.ByteString getPlayerData();
-
-    /**
-     * <code>bytes sc_info = 416;</code>
-     * @return The scInfo.
-     */
-    com.google.protobuf.ByteString getScInfo();
-
-    /**
-     * <code>uint64 login_rand = 3;</code>
-     * @return The loginRand.
-     */
-    long getLoginRand();
-
-    /**
-     * <code>string ENNOCBNIHIK = 1258;</code>
-     * @return The eNNOCBNIHIK.
-     */
-    java.lang.String getENNOCBNIHIK();
-    /**
-     * <code>string ENNOCBNIHIK = 1258;</code>
-     * @return The bytes for eNNOCBNIHIK.
+     * <code>string JKANELMFGEP = 1728;</code>
+     * @return The bytes for jKANELMFGEP.
      */
     com.google.protobuf.ByteString
-        getENNOCBNIHIKBytes();
+        getJKANELMFGEPBytes();
 
     /**
-     * <code>string country_code = 452;</code>
+     * <code>bool FGFIHNBMJMK = 1869;</code>
+     * @return The fGFIHNBMJMK.
+     */
+    boolean getFGFIHNBMJMK();
+
+    /**
+     * <code>string country_code = 1898;</code>
      * @return The countryCode.
      */
     java.lang.String getCountryCode();
     /**
-     * <code>string country_code = 452;</code>
+     * <code>string country_code = 1898;</code>
      * @return The bytes for countryCode.
      */
     com.google.protobuf.ByteString
         getCountryCodeBytes();
 
     /**
-     * <code>uint32 player_data_version = 11;</code>
-     * @return The playerDataVersion.
-     */
-    int getPlayerDataVersion();
-
-    /**
-     * <code>string client_silence_version_suffix = 211;</code>
-     * @return The clientSilenceVersionSuffix.
-     */
-    java.lang.String getClientSilenceVersionSuffix();
-    /**
-     * <code>string client_silence_version_suffix = 211;</code>
-     * @return The bytes for clientSilenceVersionSuffix.
-     */
-    com.google.protobuf.ByteString
-        getClientSilenceVersionSuffixBytes();
-
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     * @return Whether the eCKNMCACJKG field is set.
-     */
-    boolean hasECKNMCACJKG();
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     * @return The eCKNMCACJKG.
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getECKNMCACJKG();
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getECKNMCACJKGOrBuilder();
-
-    /**
-     * <code>string client_md5 = 535;</code>
-     * @return The clientMd5.
-     */
-    java.lang.String getClientMd5();
-    /**
-     * <code>string client_md5 = 535;</code>
-     * @return The bytes for clientMd5.
-     */
-    com.google.protobuf.ByteString
-        getClientMd5Bytes();
-
-    /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      * @return Whether the nextResVersionConfig field is set.
      */
     boolean hasNextResVersionConfig();
     /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      * @return The nextResVersionConfig.
      */
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getNextResVersionConfig();
     /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      */
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getNextResVersionConfigOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 29665
-   * Obf: NIDDAJCLAEC
-   * </pre>
-   *
    * Protobuf type {@code PlayerLoginRsp}
    */
   public static final class PlayerLoginRsp extends
@@ -437,20 +432,20 @@ public final class PlayerLoginRspOuterClass {
       super(builder);
     }
     private PlayerLoginRsp() {
-      clientVersionSuffix_ = "";
       gameBiz_ = "";
-      shortAbilityHashMap_ = java.util.Collections.emptyList();
-      clientSilenceMd5_ = "";
-      msg_ = "";
-      featureBlockInfoList_ = java.util.Collections.emptyList();
-      birthday_ = "";
-      nextResourceUrl_ = "";
       playerData_ = com.google.protobuf.ByteString.EMPTY;
+      shortAbilityHashMap_ = java.util.Collections.emptyList();
+      kECGLOKOIDC_ = "";
+      featureBlockInfoList_ = java.util.Collections.emptyList();
       scInfo_ = com.google.protobuf.ByteString.EMPTY;
-      eNNOCBNIHIK_ = "";
-      countryCode_ = "";
       clientSilenceVersionSuffix_ = "";
-      clientMd5_ = "";
+      msg_ = "";
+      clientVersionSuffix_ = "";
+      nextResourceUrl_ = "";
+      pKEKLEEOLJL_ = "";
+      birthday_ = "";
+      jKANELMFGEP_ = "";
+      countryCode_ = "";
     }
 
     @java.lang.Override
@@ -484,43 +479,63 @@ public final class PlayerLoginRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
-              pKKKINOCFMJ_ = input.readBool();
+              isNewPlayer_ = input.readBool();
               break;
             }
-            case 24: {
-
-              loginRand_ = input.readUInt64();
-              break;
-            }
-            case 34: {
+            case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
               gameBiz_ = s;
               break;
             }
+            case 24: {
+
+              oAMCACIICJJ_ = input.readBool();
+              break;
+            }
+            case 34: {
+
+              playerData_ = input.readBytes();
+              break;
+            }
             case 40: {
 
-              abilityHashCode_ = input.readInt32();
-              break;
-            }
-            case 48: {
-
-              clientSilenceDataVersion_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 72: {
-
               targetUid_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 48: {
+
+              pCNBCFNBPGF_ = input.readBool();
+              break;
+            }
+            case 64: {
+
+              abilityHashCode_ = input.readInt32();
+              break;
+            }
+            case 72: {
+
+              loginRand_ = input.readUInt64();
+              break;
+            }
+            case 80: {
+
+              playerDataVersion_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              clientSilenceDataVersion_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 abilityHashMap_ = com.google.protobuf.MapField.newMapField(
                     AbilityHashMapDefaultEntryHolder.defaultEntry);
@@ -533,59 +548,26 @@ public final class PlayerLoginRspOuterClass {
                   abilityHashMap__.getKey(), abilityHashMap__.getValue());
               break;
             }
-            case 88: {
-
-              playerDataVersion_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 120: {
 
               clientDataVersion_ = input.readUInt32();
               break;
             }
-            case 106: {
+            case 536: {
 
-              playerData_ = input.readBytes();
+              pOPJGOJFOKA_ = input.readBool();
               break;
             }
-            case 112: {
-
-              isUseAbilityHash_ = input.readBool();
+            case 722: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                shortAbilityHashMap_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              shortAbilityHashMap_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.parser(), extensionRegistry));
               break;
             }
-            case 120: {
-
-              fBFJPEPMAOF_ = input.readBool();
-              break;
-            }
-            case 346: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              msg_ = s;
-              break;
-            }
-            case 1690: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientSilenceVersionSuffix_ = s;
-              break;
-            }
-            case 2097: {
-
-              totalTickTime_ = input.readDouble();
-              break;
-            }
-            case 2248: {
-
-              gOFGOCDJDND_ = input.readBool();
-              break;
-            }
-            case 2680: {
-
-              isAudit_ = input.readBool();
-              break;
-            }
-            case 3306: {
+            case 906: {
               emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
               if (resVersionConfig_ != null) {
                 subBuilder = resVersionConfig_.toBuilder();
@@ -598,79 +580,18 @@ public final class PlayerLoginRspOuterClass {
 
               break;
             }
-            case 3330: {
+            case 1432: {
 
-              scInfo_ = input.readBytes();
+              kLLPFNOLBHO_ = input.readBool();
               break;
             }
-            case 3618: {
+            case 1994: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              countryCode_ = s;
+              kECGLOKOIDC_ = s;
               break;
             }
-            case 4282: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientMd5_ = s;
-              break;
-            }
-            case 4960: {
-
-              bOKKNHEOKPD_ = input.readBool();
-              break;
-            }
-            case 6274: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              clientSilenceMd5_ = s;
-              break;
-            }
-            case 6528: {
-
-              targetHomeOwnerUid_ = input.readUInt32();
-              break;
-            }
-            case 7890: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              nextResourceUrl_ = s;
-              break;
-            }
-            case 9058: {
-              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
-              if (nextResVersionConfig_ != null) {
-                subBuilder = nextResVersionConfig_.toBuilder();
-              }
-              nextResVersionConfig_ = input.readMessage(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(nextResVersionConfig_);
-                nextResVersionConfig_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 10066: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              eNNOCBNIHIK_ = s;
-              break;
-            }
-            case 10968: {
-
-              dNHHIMENOLD_ = input.readBool();
-              break;
-            }
-            case 10986: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                shortAbilityHashMap_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              shortAbilityHashMap_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.parser(), extensionRegistry));
-              break;
-            }
-            case 13018: {
+            case 2690: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 featureBlockInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo>();
                 mutable_bitField0_ |= 0x00000004;
@@ -679,29 +600,80 @@ public final class PlayerLoginRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.parser(), extensionRegistry));
               break;
             }
-            case 13506: {
+            case 3608: {
+
+              eFPHHJIKPJG_ = input.readBool();
+              break;
+            }
+            case 6346: {
+
+              scInfo_ = input.readBytes();
+              break;
+            }
+            case 8770: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              birthday_ = s;
+              clientSilenceVersionSuffix_ = s;
               break;
             }
-            case 15904: {
+            case 9176: {
 
-              isTransfer_ = input.readBool();
+              targetHomeOwnerUid_ = input.readUInt32();
               break;
             }
-            case 15930: {
+            case 9512: {
+
+              jAGELBDJFJH_ = input.readBool();
+              break;
+            }
+            case 9658: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              msg_ = s;
+              break;
+            }
+            case 10384: {
+
+              cLJBEGINENC_ = input.readBool();
+              break;
+            }
+            case 11649: {
+
+              totalTickTime_ = input.readDouble();
+              break;
+            }
+            case 11922: {
               java.lang.String s = input.readStringRequireUtf8();
 
               clientVersionSuffix_ = s;
               break;
             }
-            case 15944: {
+            case 12242: {
+              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder subBuilder = null;
+              if (aBPMACCDDJH_ != null) {
+                subBuilder = aBPMACCDDJH_.toBuilder();
+              }
+              aBPMACCDDJH_ = input.readMessage(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(aBPMACCDDJH_);
+                aBPMACCDDJH_ = subBuilder.buildPartial();
+              }
 
-              isDataNeedRelogin_ = input.readBool();
               break;
             }
-            case 16058: {
+            case 12394: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              nextResourceUrl_ = s;
+              break;
+            }
+            case 12754: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              pKEKLEEOLJL_ = s;
+              break;
+            }
+            case 12770: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
                 blockInfoMap_ = com.google.protobuf.MapField.newMapField(
                     BlockInfoMapDefaultEntryHolder.defaultEntry);
@@ -714,15 +686,38 @@ public final class PlayerLoginRspOuterClass {
                   blockInfoMap__.getKey(), blockInfoMap__.getValue());
               break;
             }
-            case 16170: {
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder subBuilder = null;
-              if (eCKNMCACJKG_ != null) {
-                subBuilder = eCKNMCACJKG_.toBuilder();
+            case 13514: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              birthday_ = s;
+              break;
+            }
+            case 13826: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              jKANELMFGEP_ = s;
+              break;
+            }
+            case 14952: {
+
+              fGFIHNBMJMK_ = input.readBool();
+              break;
+            }
+            case 15186: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              countryCode_ = s;
+              break;
+            }
+            case 15802: {
+              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder subBuilder = null;
+              if (nextResVersionConfig_ != null) {
+                subBuilder = nextResVersionConfig_.toBuilder();
               }
-              eCKNMCACJKG_ = input.readMessage(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.parser(), extensionRegistry);
+              nextResVersionConfig_ = input.readMessage(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(eCKNMCACJKG_);
-                eCKNMCACJKG_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom(nextResVersionConfig_);
+                nextResVersionConfig_ = subBuilder.buildPartial();
               }
 
               break;
@@ -762,9 +757,9 @@ public final class PlayerLoginRspOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 10:
+        case 14:
           return internalGetAbilityHashMap();
-        case 2007:
+        case 1596:
           return internalGetBlockInfoMap();
         default:
           throw new RuntimeException(
@@ -779,45 +774,155 @@ public final class PlayerLoginRspOuterClass {
               emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp.class, emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp.Builder.class);
     }
 
-    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 1991;
-    private volatile java.lang.Object clientVersionSuffix_;
+    public static final int IS_NEW_PLAYER_FIELD_NUMBER = 1;
+    private boolean isNewPlayer_;
     /**
-     * <code>string client_version_suffix = 1991;</code>
-     * @return The clientVersionSuffix.
+     * <code>bool is_new_player = 1;</code>
+     * @return The isNewPlayer.
      */
     @java.lang.Override
-    public java.lang.String getClientVersionSuffix() {
-      java.lang.Object ref = clientVersionSuffix_;
+    public boolean getIsNewPlayer() {
+      return isNewPlayer_;
+    }
+
+    public static final int GAME_BIZ_FIELD_NUMBER = 2;
+    private volatile java.lang.Object gameBiz_;
+    /**
+     * <code>string game_biz = 2;</code>
+     * @return The gameBiz.
+     */
+    @java.lang.Override
+    public java.lang.String getGameBiz() {
+      java.lang.Object ref = gameBiz_;
       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();
-        clientVersionSuffix_ = s;
+        gameBiz_ = s;
         return s;
       }
     }
     /**
-     * <code>string client_version_suffix = 1991;</code>
-     * @return The bytes for clientVersionSuffix.
+     * <code>string game_biz = 2;</code>
+     * @return The bytes for gameBiz.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getClientVersionSuffixBytes() {
-      java.lang.Object ref = clientVersionSuffix_;
+        getGameBizBytes() {
+      java.lang.Object ref = gameBiz_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        clientVersionSuffix_ = b;
+        gameBiz_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int ABILITY_HASH_MAP_FIELD_NUMBER = 10;
+    public static final int OAMCACIICJJ_FIELD_NUMBER = 3;
+    private boolean oAMCACIICJJ_;
+    /**
+     * <code>bool OAMCACIICJJ = 3;</code>
+     * @return The oAMCACIICJJ.
+     */
+    @java.lang.Override
+    public boolean getOAMCACIICJJ() {
+      return oAMCACIICJJ_;
+    }
+
+    public static final int PLAYER_DATA_FIELD_NUMBER = 4;
+    private com.google.protobuf.ByteString playerData_;
+    /**
+     * <code>bytes player_data = 4;</code>
+     * @return The playerData.
+     */
+    @java.lang.Override
+    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 PCNBCFNBPGF_FIELD_NUMBER = 6;
+    private boolean pCNBCFNBPGF_;
+    /**
+     * <code>bool PCNBCFNBPGF = 6;</code>
+     * @return The pCNBCFNBPGF.
+     */
+    @java.lang.Override
+    public boolean getPCNBCFNBPGF() {
+      return pCNBCFNBPGF_;
+    }
+
+    public static final int ABILITY_HASH_CODE_FIELD_NUMBER = 8;
+    private int abilityHashCode_;
+    /**
+     * <code>int32 ability_hash_code = 8;</code>
+     * @return The abilityHashCode.
+     */
+    @java.lang.Override
+    public int getAbilityHashCode() {
+      return abilityHashCode_;
+    }
+
+    public static final int LOGIN_RAND_FIELD_NUMBER = 9;
+    private long loginRand_;
+    /**
+     * <code>uint64 login_rand = 9;</code>
+     * @return The loginRand.
+     */
+    @java.lang.Override
+    public long getLoginRand() {
+      return loginRand_;
+    }
+
+    public static final int PLAYER_DATA_VERSION_FIELD_NUMBER = 10;
+    private int playerDataVersion_;
+    /**
+     * <code>uint32 player_data_version = 10;</code>
+     * @return The playerDataVersion.
+     */
+    @java.lang.Override
+    public int getPlayerDataVersion() {
+      return playerDataVersion_;
+    }
+
+    public static final int CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER = 11;
+    private int clientSilenceDataVersion_;
+    /**
+     * <code>uint32 client_silence_data_version = 11;</code>
+     * @return The clientSilenceDataVersion.
+     */
+    @java.lang.Override
+    public int getClientSilenceDataVersion() {
+      return clientSilenceDataVersion_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 12;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 12;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int ABILITY_HASH_MAP_FIELD_NUMBER = 14;
     private static final class AbilityHashMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.String, java.lang.Integer> defaultEntry =
@@ -844,7 +949,7 @@ public final class PlayerLoginRspOuterClass {
       return internalGetAbilityHashMap().getMap().size();
     }
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
 
     @java.lang.Override
@@ -862,7 +967,7 @@ public final class PlayerLoginRspOuterClass {
       return getAbilityHashMapMap();
     }
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     @java.lang.Override
 
@@ -870,7 +975,7 @@ public final class PlayerLoginRspOuterClass {
       return internalGetAbilityHashMap().getMap();
     }
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     @java.lang.Override
 
@@ -883,7 +988,7 @@ public final class PlayerLoginRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+     * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
      */
     @java.lang.Override
 
@@ -898,99 +1003,39 @@ public final class PlayerLoginRspOuterClass {
       return map.get(key);
     }
 
-    public static final int IS_TRANSFER_FIELD_NUMBER = 1988;
-    private boolean isTransfer_;
+    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 15;
+    private int clientDataVersion_;
     /**
-     * <code>bool is_transfer = 1988;</code>
-     * @return The isTransfer.
+     * <code>uint32 client_data_version = 15;</code>
+     * @return The clientDataVersion.
      */
     @java.lang.Override
-    public boolean getIsTransfer() {
-      return isTransfer_;
+    public int getClientDataVersion() {
+      return clientDataVersion_;
     }
 
-    public static final int TARGET_HOME_OWNER_UID_FIELD_NUMBER = 816;
-    private int targetHomeOwnerUid_;
+    public static final int POPJGOJFOKA_FIELD_NUMBER = 67;
+    private boolean pOPJGOJFOKA_;
     /**
-     * <code>uint32 target_home_owner_uid = 816;</code>
-     * @return The targetHomeOwnerUid.
+     * <code>bool POPJGOJFOKA = 67;</code>
+     * @return The pOPJGOJFOKA.
      */
     @java.lang.Override
-    public int getTargetHomeOwnerUid() {
-      return targetHomeOwnerUid_;
+    public boolean getPOPJGOJFOKA() {
+      return pOPJGOJFOKA_;
     }
 
-    public static final int IS_DATA_NEED_RELOGIN_FIELD_NUMBER = 1993;
-    private boolean isDataNeedRelogin_;
-    /**
-     * <code>bool is_data_need_relogin = 1993;</code>
-     * @return The isDataNeedRelogin.
-     */
-    @java.lang.Override
-    public boolean getIsDataNeedRelogin() {
-      return isDataNeedRelogin_;
-    }
-
-    public static final int GAME_BIZ_FIELD_NUMBER = 4;
-    private volatile java.lang.Object gameBiz_;
-    /**
-     * <code>string game_biz = 4;</code>
-     * @return The gameBiz.
-     */
-    @java.lang.Override
-    public java.lang.String getGameBiz() {
-      java.lang.Object ref = gameBiz_;
-      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();
-        gameBiz_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string game_biz = 4;</code>
-     * @return The bytes for gameBiz.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getGameBizBytes() {
-      java.lang.Object ref = gameBiz_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        gameBiz_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ABILITY_HASH_CODE_FIELD_NUMBER = 5;
-    private int abilityHashCode_;
-    /**
-     * <code>int32 ability_hash_code = 5;</code>
-     * @return The abilityHashCode.
-     */
-    @java.lang.Override
-    public int getAbilityHashCode() {
-      return abilityHashCode_;
-    }
-
-    public static final int SHORT_ABILITY_HASH_MAP_FIELD_NUMBER = 1373;
+    public static final int SHORT_ABILITY_HASH_MAP_FIELD_NUMBER = 90;
     private java.util.List<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair> shortAbilityHashMap_;
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair> getShortAbilityHashMapList() {
       return shortAbilityHashMap_;
     }
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder> 
@@ -998,21 +1043,21 @@ public final class PlayerLoginRspOuterClass {
       return shortAbilityHashMap_;
     }
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     @java.lang.Override
     public int getShortAbilityHashMapCount() {
       return shortAbilityHashMap_.size();
     }
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair getShortAbilityHashMap(int index) {
       return shortAbilityHashMap_.get(index);
     }
     /**
-     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+     * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder getShortAbilityHashMapOrBuilder(
@@ -1020,81 +1065,207 @@ public final class PlayerLoginRspOuterClass {
       return shortAbilityHashMap_.get(index);
     }
 
-    public static final int FBFJPEPMAOF_FIELD_NUMBER = 15;
-    private boolean fBFJPEPMAOF_;
+    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 113;
+    private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
     /**
-     * <code>bool FBFJPEPMAOF = 15;</code>
-     * @return The fBFJPEPMAOF.
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     * @return Whether the resVersionConfig field is set.
      */
     @java.lang.Override
-    public boolean getFBFJPEPMAOF() {
-      return fBFJPEPMAOF_;
+    public boolean hasResVersionConfig() {
+      return resVersionConfig_ != null;
+    }
+    /**
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     * @return The resVersionConfig.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
+      return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
+    }
+    /**
+     * <code>.ResVersionConfig res_version_config = 113;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
+      return getResVersionConfig();
     }
 
-    public static final int IS_USE_ABILITY_HASH_FIELD_NUMBER = 14;
-    private boolean isUseAbilityHash_;
+    public static final int KLLPFNOLBHO_FIELD_NUMBER = 179;
+    private boolean kLLPFNOLBHO_;
     /**
-     * <code>bool is_use_ability_hash = 14;</code>
-     * @return The isUseAbilityHash.
+     * <code>bool KLLPFNOLBHO = 179;</code>
+     * @return The kLLPFNOLBHO.
      */
     @java.lang.Override
-    public boolean getIsUseAbilityHash() {
-      return isUseAbilityHash_;
+    public boolean getKLLPFNOLBHO() {
+      return kLLPFNOLBHO_;
     }
 
-    public static final int IS_AUDIT_FIELD_NUMBER = 335;
-    private boolean isAudit_;
+    public static final int KECGLOKOIDC_FIELD_NUMBER = 249;
+    private volatile java.lang.Object kECGLOKOIDC_;
     /**
-     * <code>bool is_audit = 335;</code>
-     * @return The isAudit.
+     * <code>string KECGLOKOIDC = 249;</code>
+     * @return The kECGLOKOIDC.
      */
     @java.lang.Override
-    public boolean getIsAudit() {
-      return isAudit_;
-    }
-
-    public static final int CLIENT_SILENCE_MD5_FIELD_NUMBER = 784;
-    private volatile java.lang.Object clientSilenceMd5_;
-    /**
-     * <code>string client_silence_md5 = 784;</code>
-     * @return The clientSilenceMd5.
-     */
-    @java.lang.Override
-    public java.lang.String getClientSilenceMd5() {
-      java.lang.Object ref = clientSilenceMd5_;
+    public java.lang.String getKECGLOKOIDC() {
+      java.lang.Object ref = kECGLOKOIDC_;
       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();
-        clientSilenceMd5_ = s;
+        kECGLOKOIDC_ = s;
         return s;
       }
     }
     /**
-     * <code>string client_silence_md5 = 784;</code>
-     * @return The bytes for clientSilenceMd5.
+     * <code>string KECGLOKOIDC = 249;</code>
+     * @return The bytes for kECGLOKOIDC.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getClientSilenceMd5Bytes() {
-      java.lang.Object ref = clientSilenceMd5_;
+        getKECGLOKOIDCBytes() {
+      java.lang.Object ref = kECGLOKOIDC_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        clientSilenceMd5_ = b;
+        kECGLOKOIDC_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int MSG_FIELD_NUMBER = 43;
+    public static final int FEATURE_BLOCK_INFO_LIST_FIELD_NUMBER = 336;
+    private java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> featureBlockInfoList_;
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> getFeatureBlockInfoListList() {
+      return featureBlockInfoList_;
+    }
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> 
+        getFeatureBlockInfoListOrBuilderList() {
+      return featureBlockInfoList_;
+    }
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    @java.lang.Override
+    public int getFeatureBlockInfoListCount() {
+      return featureBlockInfoList_.size();
+    }
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo getFeatureBlockInfoList(int index) {
+      return featureBlockInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder getFeatureBlockInfoListOrBuilder(
+        int index) {
+      return featureBlockInfoList_.get(index);
+    }
+
+    public static final int EFPHHJIKPJG_FIELD_NUMBER = 451;
+    private boolean eFPHHJIKPJG_;
+    /**
+     * <code>bool EFPHHJIKPJG = 451;</code>
+     * @return The eFPHHJIKPJG.
+     */
+    @java.lang.Override
+    public boolean getEFPHHJIKPJG() {
+      return eFPHHJIKPJG_;
+    }
+
+    public static final int SC_INFO_FIELD_NUMBER = 793;
+    private com.google.protobuf.ByteString scInfo_;
+    /**
+     * <code>bytes sc_info = 793;</code>
+     * @return The scInfo.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getScInfo() {
+      return scInfo_;
+    }
+
+    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 1096;
+    private volatile java.lang.Object clientSilenceVersionSuffix_;
+    /**
+     * <code>string client_silence_version_suffix = 1096;</code>
+     * @return The clientSilenceVersionSuffix.
+     */
+    @java.lang.Override
+    public java.lang.String getClientSilenceVersionSuffix() {
+      java.lang.Object ref = clientSilenceVersionSuffix_;
+      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();
+        clientSilenceVersionSuffix_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string client_silence_version_suffix = 1096;</code>
+     * @return The bytes for clientSilenceVersionSuffix.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getClientSilenceVersionSuffixBytes() {
+      java.lang.Object ref = clientSilenceVersionSuffix_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        clientSilenceVersionSuffix_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int TARGET_HOME_OWNER_UID_FIELD_NUMBER = 1147;
+    private int targetHomeOwnerUid_;
+    /**
+     * <code>uint32 target_home_owner_uid = 1147;</code>
+     * @return The targetHomeOwnerUid.
+     */
+    @java.lang.Override
+    public int getTargetHomeOwnerUid() {
+      return targetHomeOwnerUid_;
+    }
+
+    public static final int JAGELBDJFJH_FIELD_NUMBER = 1189;
+    private boolean jAGELBDJFJH_;
+    /**
+     * <code>bool JAGELBDJFJH = 1189;</code>
+     * @return The jAGELBDJFJH.
+     */
+    @java.lang.Override
+    public boolean getJAGELBDJFJH() {
+      return jAGELBDJFJH_;
+    }
+
+    public static final int MSG_FIELD_NUMBER = 1207;
     private volatile java.lang.Object msg_;
     /**
-     * <code>string msg = 43;</code>
+     * <code>string msg = 1207;</code>
      * @return The msg.
      */
     @java.lang.Override
@@ -1111,7 +1282,7 @@ public final class PlayerLoginRspOuterClass {
       }
     }
     /**
-     * <code>string msg = 43;</code>
+     * <code>string msg = 1207;</code>
      * @return The bytes for msg.
      */
     @java.lang.Override
@@ -1129,162 +1300,169 @@ public final class PlayerLoginRspOuterClass {
       }
     }
 
-    public static final int FEATURE_BLOCK_INFO_LIST_FIELD_NUMBER = 1627;
-    private java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> featureBlockInfoList_;
+    public static final int CLJBEGINENC_FIELD_NUMBER = 1298;
+    private boolean cLJBEGINENC_;
     /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+     * <code>bool CLJBEGINENC = 1298;</code>
+     * @return The cLJBEGINENC.
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> getFeatureBlockInfoListList() {
-      return featureBlockInfoList_;
-    }
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> 
-        getFeatureBlockInfoListOrBuilderList() {
-      return featureBlockInfoList_;
-    }
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    @java.lang.Override
-    public int getFeatureBlockInfoListCount() {
-      return featureBlockInfoList_.size();
-    }
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo getFeatureBlockInfoList(int index) {
-      return featureBlockInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder getFeatureBlockInfoListOrBuilder(
-        int index) {
-      return featureBlockInfoList_.get(index);
+    public boolean getCLJBEGINENC() {
+      return cLJBEGINENC_;
     }
 
-    public static final int DNHHIMENOLD_FIELD_NUMBER = 1371;
-    private boolean dNHHIMENOLD_;
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 1456;
+    private double totalTickTime_;
     /**
-     * <code>bool DNHHIMENOLD = 1371;</code>
-     * @return The dNHHIMENOLD.
+     * <code>double total_tick_time = 1456;</code>
+     * @return The totalTickTime.
      */
     @java.lang.Override
-    public boolean getDNHHIMENOLD() {
-      return dNHHIMENOLD_;
+    public double getTotalTickTime() {
+      return totalTickTime_;
     }
 
-    public static final int CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER = 6;
-    private int clientSilenceDataVersion_;
+    public static final int CLIENT_VERSION_SUFFIX_FIELD_NUMBER = 1490;
+    private volatile java.lang.Object clientVersionSuffix_;
     /**
-     * <code>uint32 client_silence_data_version = 6;</code>
-     * @return The clientSilenceDataVersion.
+     * <code>string client_version_suffix = 1490;</code>
+     * @return The clientVersionSuffix.
      */
     @java.lang.Override
-    public int getClientSilenceDataVersion() {
-      return clientSilenceDataVersion_;
-    }
-
-    public static final int PKKKINOCFMJ_FIELD_NUMBER = 2;
-    private boolean pKKKINOCFMJ_;
-    /**
-     * <code>bool PKKKINOCFMJ = 2;</code>
-     * @return The pKKKINOCFMJ.
-     */
-    @java.lang.Override
-    public boolean getPKKKINOCFMJ() {
-      return pKKKINOCFMJ_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 8;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int CLIENT_DATA_VERSION_FIELD_NUMBER = 12;
-    private int clientDataVersion_;
-    /**
-     * <code>uint32 client_data_version = 12;</code>
-     * @return The clientDataVersion.
-     */
-    @java.lang.Override
-    public int getClientDataVersion() {
-      return clientDataVersion_;
-    }
-
-    public static final int BIRTHDAY_FIELD_NUMBER = 1688;
-    private volatile java.lang.Object birthday_;
-    /**
-     * <code>string birthday = 1688;</code>
-     * @return The birthday.
-     */
-    @java.lang.Override
-    public java.lang.String getBirthday() {
-      java.lang.Object ref = birthday_;
+    public java.lang.String getClientVersionSuffix() {
+      java.lang.Object ref = clientVersionSuffix_;
       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();
-        birthday_ = s;
+        clientVersionSuffix_ = s;
         return s;
       }
     }
     /**
-     * <code>string birthday = 1688;</code>
-     * @return The bytes for birthday.
+     * <code>string client_version_suffix = 1490;</code>
+     * @return The bytes for clientVersionSuffix.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getBirthdayBytes() {
-      java.lang.Object ref = birthday_;
+        getClientVersionSuffixBytes() {
+      java.lang.Object ref = clientVersionSuffix_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        birthday_ = b;
+        clientVersionSuffix_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int BOKKNHEOKPD_FIELD_NUMBER = 620;
-    private boolean bOKKNHEOKPD_;
+    public static final int ABPMACCDDJH_FIELD_NUMBER = 1530;
+    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo aBPMACCDDJH_;
     /**
-     * <code>bool BOKKNHEOKPD = 620;</code>
-     * @return The bOKKNHEOKPD.
+     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
+     * @return Whether the aBPMACCDDJH field is set.
      */
     @java.lang.Override
-    public boolean getBOKKNHEOKPD() {
-      return bOKKNHEOKPD_;
+    public boolean hasABPMACCDDJH() {
+      return aBPMACCDDJH_ != null;
     }
-
-    public static final int TARGET_UID_FIELD_NUMBER = 9;
-    private int targetUid_;
     /**
-     * <code>uint32 target_uid = 9;</code>
-     * @return The targetUid.
+     * <code>.StopServerInfo ABPMACCDDJH = 1530;</code>
+     * @return The aBPMACCDDJH.
      */
     @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
+    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 BLOCK_INFO_MAP_FIELD_NUMBER = 2007;
+    public static final int NEXT_RESOURCE_URL_FIELD_NUMBER = 1549;
+    private volatile java.lang.Object nextResourceUrl_;
+    /**
+     * <code>string next_resource_url = 1549;</code>
+     * @return The nextResourceUrl.
+     */
+    @java.lang.Override
+    public java.lang.String getNextResourceUrl() {
+      java.lang.Object ref = nextResourceUrl_;
+      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();
+        nextResourceUrl_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string next_resource_url = 1549;</code>
+     * @return The bytes for nextResourceUrl.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getNextResourceUrlBytes() {
+      java.lang.Object ref = nextResourceUrl_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        nextResourceUrl_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int PKEKLEEOLJL_FIELD_NUMBER = 1594;
+    private volatile java.lang.Object pKEKLEEOLJL_;
+    /**
+     * <code>string PKEKLEEOLJL = 1594;</code>
+     * @return The pKEKLEEOLJL.
+     */
+    @java.lang.Override
+    public java.lang.String getPKEKLEEOLJL() {
+      java.lang.Object ref = pKEKLEEOLJL_;
+      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();
+        pKEKLEEOLJL_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string PKEKLEEOLJL = 1594;</code>
+     * @return The bytes for pKEKLEEOLJL.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getPKEKLEEOLJLBytes() {
+      java.lang.Object ref = pKEKLEEOLJL_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pKEKLEEOLJL_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int BLOCK_INFO_MAP_FIELD_NUMBER = 1596;
     private static final class BlockInfoMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo> defaultEntry =
@@ -1311,7 +1489,7 @@ public final class PlayerLoginRspOuterClass {
       return internalGetBlockInfoMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
 
     @java.lang.Override
@@ -1329,7 +1507,7 @@ public final class PlayerLoginRspOuterClass {
       return getBlockInfoMapMap();
     }
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     @java.lang.Override
 
@@ -1337,7 +1515,7 @@ public final class PlayerLoginRspOuterClass {
       return internalGetBlockInfoMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     @java.lang.Override
 
@@ -1350,7 +1528,7 @@ public final class PlayerLoginRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+     * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
      */
     @java.lang.Override
 
@@ -1365,167 +1543,97 @@ public final class PlayerLoginRspOuterClass {
       return map.get(key);
     }
 
-    public static final int GOFGOCDJDND_FIELD_NUMBER = 281;
-    private boolean gOFGOCDJDND_;
+    public static final int BIRTHDAY_FIELD_NUMBER = 1689;
+    private volatile java.lang.Object birthday_;
     /**
-     * <code>bool GOFGOCDJDND = 281;</code>
-     * @return The gOFGOCDJDND.
+     * <code>string birthday = 1689;</code>
+     * @return The birthday.
      */
     @java.lang.Override
-    public boolean getGOFGOCDJDND() {
-      return gOFGOCDJDND_;
-    }
-
-    public static final int NEXT_RESOURCE_URL_FIELD_NUMBER = 986;
-    private volatile java.lang.Object nextResourceUrl_;
-    /**
-     * <code>string next_resource_url = 986;</code>
-     * @return The nextResourceUrl.
-     */
-    @java.lang.Override
-    public java.lang.String getNextResourceUrl() {
-      java.lang.Object ref = nextResourceUrl_;
+    public java.lang.String getBirthday() {
+      java.lang.Object ref = birthday_;
       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();
-        nextResourceUrl_ = s;
+        birthday_ = s;
         return s;
       }
     }
     /**
-     * <code>string next_resource_url = 986;</code>
-     * @return The bytes for nextResourceUrl.
+     * <code>string birthday = 1689;</code>
+     * @return The bytes for birthday.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getNextResourceUrlBytes() {
-      java.lang.Object ref = nextResourceUrl_;
+        getBirthdayBytes() {
+      java.lang.Object ref = birthday_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        nextResourceUrl_ = b;
+        birthday_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int RES_VERSION_CONFIG_FIELD_NUMBER = 413;
-    private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
+    public static final int JKANELMFGEP_FIELD_NUMBER = 1728;
+    private volatile java.lang.Object jKANELMFGEP_;
     /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     * @return Whether the resVersionConfig field is set.
+     * <code>string JKANELMFGEP = 1728;</code>
+     * @return The jKANELMFGEP.
      */
     @java.lang.Override
-    public boolean hasResVersionConfig() {
-      return resVersionConfig_ != null;
-    }
-    /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     * @return The resVersionConfig.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
-      return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
-    }
-    /**
-     * <code>.ResVersionConfig res_version_config = 413;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
-      return getResVersionConfig();
-    }
-
-    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 262;
-    private double totalTickTime_;
-    /**
-     * <code>double total_tick_time = 262;</code>
-     * @return The totalTickTime.
-     */
-    @java.lang.Override
-    public double getTotalTickTime() {
-      return totalTickTime_;
-    }
-
-    public static final int PLAYER_DATA_FIELD_NUMBER = 13;
-    private com.google.protobuf.ByteString playerData_;
-    /**
-     * <code>bytes player_data = 13;</code>
-     * @return The playerData.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getPlayerData() {
-      return playerData_;
-    }
-
-    public static final int SC_INFO_FIELD_NUMBER = 416;
-    private com.google.protobuf.ByteString scInfo_;
-    /**
-     * <code>bytes sc_info = 416;</code>
-     * @return The scInfo.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getScInfo() {
-      return scInfo_;
-    }
-
-    public static final int LOGIN_RAND_FIELD_NUMBER = 3;
-    private long loginRand_;
-    /**
-     * <code>uint64 login_rand = 3;</code>
-     * @return The loginRand.
-     */
-    @java.lang.Override
-    public long getLoginRand() {
-      return loginRand_;
-    }
-
-    public static final int ENNOCBNIHIK_FIELD_NUMBER = 1258;
-    private volatile java.lang.Object eNNOCBNIHIK_;
-    /**
-     * <code>string ENNOCBNIHIK = 1258;</code>
-     * @return The eNNOCBNIHIK.
-     */
-    @java.lang.Override
-    public java.lang.String getENNOCBNIHIK() {
-      java.lang.Object ref = eNNOCBNIHIK_;
+    public java.lang.String getJKANELMFGEP() {
+      java.lang.Object ref = jKANELMFGEP_;
       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();
-        eNNOCBNIHIK_ = s;
+        jKANELMFGEP_ = s;
         return s;
       }
     }
     /**
-     * <code>string ENNOCBNIHIK = 1258;</code>
-     * @return The bytes for eNNOCBNIHIK.
+     * <code>string JKANELMFGEP = 1728;</code>
+     * @return The bytes for jKANELMFGEP.
      */
     @java.lang.Override
     public com.google.protobuf.ByteString
-        getENNOCBNIHIKBytes() {
-      java.lang.Object ref = eNNOCBNIHIK_;
+        getJKANELMFGEPBytes() {
+      java.lang.Object ref = jKANELMFGEP_;
       if (ref instanceof java.lang.String) {
         com.google.protobuf.ByteString b = 
             com.google.protobuf.ByteString.copyFromUtf8(
                 (java.lang.String) ref);
-        eNNOCBNIHIK_ = b;
+        jKANELMFGEP_ = b;
         return b;
       } else {
         return (com.google.protobuf.ByteString) ref;
       }
     }
 
-    public static final int COUNTRY_CODE_FIELD_NUMBER = 452;
+    public static final int FGFIHNBMJMK_FIELD_NUMBER = 1869;
+    private boolean fGFIHNBMJMK_;
+    /**
+     * <code>bool FGFIHNBMJMK = 1869;</code>
+     * @return The fGFIHNBMJMK.
+     */
+    @java.lang.Override
+    public boolean getFGFIHNBMJMK() {
+      return fGFIHNBMJMK_;
+    }
+
+    public static final int COUNTRY_CODE_FIELD_NUMBER = 1898;
     private volatile java.lang.Object countryCode_;
     /**
-     * <code>string country_code = 452;</code>
+     * <code>string country_code = 1898;</code>
      * @return The countryCode.
      */
     @java.lang.Override
@@ -1542,7 +1650,7 @@ public final class PlayerLoginRspOuterClass {
       }
     }
     /**
-     * <code>string country_code = 452;</code>
+     * <code>string country_code = 1898;</code>
      * @return The bytes for countryCode.
      */
     @java.lang.Override
@@ -1560,123 +1668,10 @@ public final class PlayerLoginRspOuterClass {
       }
     }
 
-    public static final int PLAYER_DATA_VERSION_FIELD_NUMBER = 11;
-    private int playerDataVersion_;
-    /**
-     * <code>uint32 player_data_version = 11;</code>
-     * @return The playerDataVersion.
-     */
-    @java.lang.Override
-    public int getPlayerDataVersion() {
-      return playerDataVersion_;
-    }
-
-    public static final int CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER = 211;
-    private volatile java.lang.Object clientSilenceVersionSuffix_;
-    /**
-     * <code>string client_silence_version_suffix = 211;</code>
-     * @return The clientSilenceVersionSuffix.
-     */
-    @java.lang.Override
-    public java.lang.String getClientSilenceVersionSuffix() {
-      java.lang.Object ref = clientSilenceVersionSuffix_;
-      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();
-        clientSilenceVersionSuffix_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_silence_version_suffix = 211;</code>
-     * @return The bytes for clientSilenceVersionSuffix.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientSilenceVersionSuffixBytes() {
-      java.lang.Object ref = clientSilenceVersionSuffix_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientSilenceVersionSuffix_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int ECKNMCACJKG_FIELD_NUMBER = 2021;
-    private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo eCKNMCACJKG_;
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     * @return Whether the eCKNMCACJKG field is set.
-     */
-    @java.lang.Override
-    public boolean hasECKNMCACJKG() {
-      return eCKNMCACJKG_ != null;
-    }
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     * @return The eCKNMCACJKG.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getECKNMCACJKG() {
-      return eCKNMCACJKG_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : eCKNMCACJKG_;
-    }
-    /**
-     * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getECKNMCACJKGOrBuilder() {
-      return getECKNMCACJKG();
-    }
-
-    public static final int CLIENT_MD5_FIELD_NUMBER = 535;
-    private volatile java.lang.Object clientMd5_;
-    /**
-     * <code>string client_md5 = 535;</code>
-     * @return The clientMd5.
-     */
-    @java.lang.Override
-    public java.lang.String getClientMd5() {
-      java.lang.Object ref = clientMd5_;
-      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();
-        clientMd5_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string client_md5 = 535;</code>
-     * @return The bytes for clientMd5.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getClientMd5Bytes() {
-      java.lang.Object ref = clientMd5_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        clientMd5_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
-    public static final int NEXT_RES_VERSION_CONFIG_FIELD_NUMBER = 1132;
+    public static final int NEXT_RES_VERSION_CONFIG_FIELD_NUMBER = 1975;
     private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig nextResVersionConfig_;
     /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      * @return Whether the nextResVersionConfig field is set.
      */
     @java.lang.Override
@@ -1684,7 +1679,7 @@ public final class PlayerLoginRspOuterClass {
       return nextResVersionConfig_ != null;
     }
     /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      * @return The nextResVersionConfig.
      */
     @java.lang.Override
@@ -1692,7 +1687,7 @@ public final class PlayerLoginRspOuterClass {
       return nextResVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : nextResVersionConfig_;
     }
     /**
-     * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+     * <code>.ResVersionConfig next_res_version_config = 1975;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getNextResVersionConfigOrBuilder() {
@@ -1713,122 +1708,122 @@ public final class PlayerLoginRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pKKKINOCFMJ_ != false) {
-        output.writeBool(2, pKKKINOCFMJ_);
-      }
-      if (loginRand_ != 0L) {
-        output.writeUInt64(3, loginRand_);
+      if (isNewPlayer_ != false) {
+        output.writeBool(1, isNewPlayer_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, gameBiz_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, gameBiz_);
       }
-      if (abilityHashCode_ != 0) {
-        output.writeInt32(5, abilityHashCode_);
+      if (oAMCACIICJJ_ != false) {
+        output.writeBool(3, oAMCACIICJJ_);
       }
-      if (clientSilenceDataVersion_ != 0) {
-        output.writeUInt32(6, clientSilenceDataVersion_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+      if (!playerData_.isEmpty()) {
+        output.writeBytes(4, playerData_);
       }
       if (targetUid_ != 0) {
-        output.writeUInt32(9, targetUid_);
+        output.writeUInt32(5, targetUid_);
+      }
+      if (pCNBCFNBPGF_ != false) {
+        output.writeBool(6, pCNBCFNBPGF_);
+      }
+      if (abilityHashCode_ != 0) {
+        output.writeInt32(8, abilityHashCode_);
+      }
+      if (loginRand_ != 0L) {
+        output.writeUInt64(9, loginRand_);
+      }
+      if (playerDataVersion_ != 0) {
+        output.writeUInt32(10, playerDataVersion_);
+      }
+      if (clientSilenceDataVersion_ != 0) {
+        output.writeUInt32(11, clientSilenceDataVersion_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeStringMapTo(
           output,
           internalGetAbilityHashMap(),
           AbilityHashMapDefaultEntryHolder.defaultEntry,
-          10);
-      if (playerDataVersion_ != 0) {
-        output.writeUInt32(11, playerDataVersion_);
-      }
+          14);
       if (clientDataVersion_ != 0) {
-        output.writeUInt32(12, clientDataVersion_);
+        output.writeUInt32(15, clientDataVersion_);
       }
-      if (!playerData_.isEmpty()) {
-        output.writeBytes(13, playerData_);
-      }
-      if (isUseAbilityHash_ != false) {
-        output.writeBool(14, isUseAbilityHash_);
-      }
-      if (fBFJPEPMAOF_ != false) {
-        output.writeBool(15, fBFJPEPMAOF_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 43, msg_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 211, clientSilenceVersionSuffix_);
-      }
-      if (totalTickTime_ != 0D) {
-        output.writeDouble(262, totalTickTime_);
-      }
-      if (gOFGOCDJDND_ != false) {
-        output.writeBool(281, gOFGOCDJDND_);
-      }
-      if (isAudit_ != false) {
-        output.writeBool(335, isAudit_);
-      }
-      if (resVersionConfig_ != null) {
-        output.writeMessage(413, getResVersionConfig());
-      }
-      if (!scInfo_.isEmpty()) {
-        output.writeBytes(416, scInfo_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 452, countryCode_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 535, clientMd5_);
-      }
-      if (bOKKNHEOKPD_ != false) {
-        output.writeBool(620, bOKKNHEOKPD_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 784, clientSilenceMd5_);
-      }
-      if (targetHomeOwnerUid_ != 0) {
-        output.writeUInt32(816, targetHomeOwnerUid_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 986, nextResourceUrl_);
-      }
-      if (nextResVersionConfig_ != null) {
-        output.writeMessage(1132, getNextResVersionConfig());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eNNOCBNIHIK_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1258, eNNOCBNIHIK_);
-      }
-      if (dNHHIMENOLD_ != false) {
-        output.writeBool(1371, dNHHIMENOLD_);
+      if (pOPJGOJFOKA_ != false) {
+        output.writeBool(67, pOPJGOJFOKA_);
       }
       for (int i = 0; i < shortAbilityHashMap_.size(); i++) {
-        output.writeMessage(1373, shortAbilityHashMap_.get(i));
+        output.writeMessage(90, shortAbilityHashMap_.get(i));
+      }
+      if (resVersionConfig_ != null) {
+        output.writeMessage(113, getResVersionConfig());
+      }
+      if (kLLPFNOLBHO_ != false) {
+        output.writeBool(179, kLLPFNOLBHO_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kECGLOKOIDC_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 249, kECGLOKOIDC_);
       }
       for (int i = 0; i < featureBlockInfoList_.size(); i++) {
-        output.writeMessage(1627, featureBlockInfoList_.get(i));
+        output.writeMessage(336, featureBlockInfoList_.get(i));
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1688, birthday_);
+      if (eFPHHJIKPJG_ != false) {
+        output.writeBool(451, eFPHHJIKPJG_);
       }
-      if (isTransfer_ != false) {
-        output.writeBool(1988, isTransfer_);
+      if (!scInfo_.isEmpty()) {
+        output.writeBytes(793, scInfo_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1096, clientSilenceVersionSuffix_);
+      }
+      if (targetHomeOwnerUid_ != 0) {
+        output.writeUInt32(1147, targetHomeOwnerUid_);
+      }
+      if (jAGELBDJFJH_ != false) {
+        output.writeBool(1189, jAGELBDJFJH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1207, msg_);
+      }
+      if (cLJBEGINENC_ != false) {
+        output.writeBool(1298, cLJBEGINENC_);
+      }
+      if (totalTickTime_ != 0D) {
+        output.writeDouble(1456, totalTickTime_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 1991, clientVersionSuffix_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1490, clientVersionSuffix_);
       }
-      if (isDataNeedRelogin_ != false) {
-        output.writeBool(1993, isDataNeedRelogin_);
+      if (aBPMACCDDJH_ != null) {
+        output.writeMessage(1530, getABPMACCDDJH());
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1549, nextResourceUrl_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pKEKLEEOLJL_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1594, pKEKLEEOLJL_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetBlockInfoMap(),
           BlockInfoMapDefaultEntryHolder.defaultEntry,
-          2007);
-      if (eCKNMCACJKG_ != null) {
-        output.writeMessage(2021, getECKNMCACJKG());
+          1596);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1689, birthday_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jKANELMFGEP_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1728, jKANELMFGEP_);
+      }
+      if (fGFIHNBMJMK_ != false) {
+        output.writeBool(1869, fGFIHNBMJMK_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 1898, countryCode_);
+      }
+      if (nextResVersionConfig_ != null) {
+        output.writeMessage(1975, getNextResVersionConfig());
       }
       unknownFields.writeTo(output);
     }
@@ -1839,32 +1834,48 @@ public final class PlayerLoginRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pKKKINOCFMJ_ != false) {
+      if (isNewPlayer_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, pKKKINOCFMJ_);
-      }
-      if (loginRand_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, loginRand_);
+          .computeBoolSize(1, isNewPlayer_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, gameBiz_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, gameBiz_);
       }
-      if (abilityHashCode_ != 0) {
+      if (oAMCACIICJJ_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, abilityHashCode_);
+          .computeBoolSize(3, oAMCACIICJJ_);
       }
-      if (clientSilenceDataVersion_ != 0) {
+      if (!playerData_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, clientSilenceDataVersion_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeBytesSize(4, playerData_);
       }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, targetUid_);
+          .computeUInt32Size(5, targetUid_);
+      }
+      if (pCNBCFNBPGF_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(6, pCNBCFNBPGF_);
+      }
+      if (abilityHashCode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, abilityHashCode_);
+      }
+      if (loginRand_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(9, loginRand_);
+      }
+      if (playerDataVersion_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, playerDataVersion_);
+      }
+      if (clientSilenceDataVersion_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, clientSilenceDataVersion_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, retcode_);
       }
       for (java.util.Map.Entry<java.lang.String, java.lang.Integer> entry
            : internalGetAbilityHashMap().getMap().entrySet()) {
@@ -1874,106 +1885,77 @@ public final class PlayerLoginRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(10, abilityHashMap__);
-      }
-      if (playerDataVersion_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, playerDataVersion_);
+            .computeMessageSize(14, abilityHashMap__);
       }
       if (clientDataVersion_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, clientDataVersion_);
+          .computeUInt32Size(15, clientDataVersion_);
       }
-      if (!playerData_.isEmpty()) {
+      if (pOPJGOJFOKA_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(13, playerData_);
-      }
-      if (isUseAbilityHash_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isUseAbilityHash_);
-      }
-      if (fBFJPEPMAOF_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, fBFJPEPMAOF_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(43, msg_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(211, clientSilenceVersionSuffix_);
-      }
-      if (totalTickTime_ != 0D) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeDoubleSize(262, totalTickTime_);
-      }
-      if (gOFGOCDJDND_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(281, gOFGOCDJDND_);
-      }
-      if (isAudit_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(335, isAudit_);
-      }
-      if (resVersionConfig_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(413, getResVersionConfig());
-      }
-      if (!scInfo_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(416, scInfo_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(452, countryCode_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(535, clientMd5_);
-      }
-      if (bOKKNHEOKPD_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(620, bOKKNHEOKPD_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceMd5_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(784, clientSilenceMd5_);
-      }
-      if (targetHomeOwnerUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(816, targetHomeOwnerUid_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(986, nextResourceUrl_);
-      }
-      if (nextResVersionConfig_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1132, getNextResVersionConfig());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eNNOCBNIHIK_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1258, eNNOCBNIHIK_);
-      }
-      if (dNHHIMENOLD_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1371, dNHHIMENOLD_);
+          .computeBoolSize(67, pOPJGOJFOKA_);
       }
       for (int i = 0; i < shortAbilityHashMap_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1373, shortAbilityHashMap_.get(i));
+          .computeMessageSize(90, shortAbilityHashMap_.get(i));
+      }
+      if (resVersionConfig_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(113, getResVersionConfig());
+      }
+      if (kLLPFNOLBHO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(179, kLLPFNOLBHO_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(kECGLOKOIDC_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(249, kECGLOKOIDC_);
       }
       for (int i = 0; i < featureBlockInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1627, featureBlockInfoList_.get(i));
+          .computeMessageSize(336, featureBlockInfoList_.get(i));
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1688, birthday_);
-      }
-      if (isTransfer_ != false) {
+      if (eFPHHJIKPJG_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1988, isTransfer_);
+          .computeBoolSize(451, eFPHHJIKPJG_);
+      }
+      if (!scInfo_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(793, scInfo_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientSilenceVersionSuffix_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1096, clientSilenceVersionSuffix_);
+      }
+      if (targetHomeOwnerUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1147, targetHomeOwnerUid_);
+      }
+      if (jAGELBDJFJH_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1189, jAGELBDJFJH_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(msg_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1207, msg_);
+      }
+      if (cLJBEGINENC_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1298, cLJBEGINENC_);
+      }
+      if (totalTickTime_ != 0D) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(1456, totalTickTime_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(clientVersionSuffix_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1991, clientVersionSuffix_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1490, clientVersionSuffix_);
       }
-      if (isDataNeedRelogin_ != false) {
+      if (aBPMACCDDJH_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1993, isDataNeedRelogin_);
+          .computeMessageSize(1530, getABPMACCDDJH());
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nextResourceUrl_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1549, nextResourceUrl_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(pKEKLEEOLJL_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1594, pKEKLEEOLJL_);
       }
       for (java.util.Map.Entry<java.lang.Integer, emu.grasscutter.net.proto.BlockInfoOuterClass.BlockInfo> entry
            : internalGetBlockInfoMap().getMap().entrySet()) {
@@ -1983,11 +1965,24 @@ public final class PlayerLoginRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2007, blockInfoMap__);
+            .computeMessageSize(1596, blockInfoMap__);
       }
-      if (eCKNMCACJKG_ != null) {
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(birthday_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1689, birthday_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(jKANELMFGEP_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1728, jKANELMFGEP_);
+      }
+      if (fGFIHNBMJMK_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2021, getECKNMCACJKG());
+          .computeBoolSize(1869, fGFIHNBMJMK_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(countryCode_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1898, countryCode_);
+      }
+      if (nextResVersionConfig_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1975, getNextResVersionConfig());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -2004,85 +1999,85 @@ public final class PlayerLoginRspOuterClass {
       }
       emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp other = (emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp) obj;
 
-      if (!getClientVersionSuffix()
-          .equals(other.getClientVersionSuffix())) return false;
-      if (!internalGetAbilityHashMap().equals(
-          other.internalGetAbilityHashMap())) return false;
-      if (getIsTransfer()
-          != other.getIsTransfer()) return false;
-      if (getTargetHomeOwnerUid()
-          != other.getTargetHomeOwnerUid()) return false;
-      if (getIsDataNeedRelogin()
-          != other.getIsDataNeedRelogin()) return false;
+      if (getIsNewPlayer()
+          != other.getIsNewPlayer()) return false;
       if (!getGameBiz()
           .equals(other.getGameBiz())) return false;
-      if (getAbilityHashCode()
-          != other.getAbilityHashCode()) return false;
-      if (!getShortAbilityHashMapList()
-          .equals(other.getShortAbilityHashMapList())) return false;
-      if (getFBFJPEPMAOF()
-          != other.getFBFJPEPMAOF()) return false;
-      if (getIsUseAbilityHash()
-          != other.getIsUseAbilityHash()) return false;
-      if (getIsAudit()
-          != other.getIsAudit()) return false;
-      if (!getClientSilenceMd5()
-          .equals(other.getClientSilenceMd5())) return false;
-      if (!getMsg()
-          .equals(other.getMsg())) return false;
-      if (!getFeatureBlockInfoListList()
-          .equals(other.getFeatureBlockInfoListList())) return false;
-      if (getDNHHIMENOLD()
-          != other.getDNHHIMENOLD()) return false;
-      if (getClientSilenceDataVersion()
-          != other.getClientSilenceDataVersion()) return false;
-      if (getPKKKINOCFMJ()
-          != other.getPKKKINOCFMJ()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getClientDataVersion()
-          != other.getClientDataVersion()) return false;
-      if (!getBirthday()
-          .equals(other.getBirthday())) return false;
-      if (getBOKKNHEOKPD()
-          != other.getBOKKNHEOKPD()) return false;
+      if (getOAMCACIICJJ()
+          != other.getOAMCACIICJJ()) return false;
+      if (!getPlayerData()
+          .equals(other.getPlayerData())) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
-      if (!internalGetBlockInfoMap().equals(
-          other.internalGetBlockInfoMap())) return false;
-      if (getGOFGOCDJDND()
-          != other.getGOFGOCDJDND()) return false;
-      if (!getNextResourceUrl()
-          .equals(other.getNextResourceUrl())) return false;
+      if (getPCNBCFNBPGF()
+          != other.getPCNBCFNBPGF()) return false;
+      if (getAbilityHashCode()
+          != other.getAbilityHashCode()) return false;
+      if (getLoginRand()
+          != other.getLoginRand()) return false;
+      if (getPlayerDataVersion()
+          != other.getPlayerDataVersion()) return false;
+      if (getClientSilenceDataVersion()
+          != other.getClientSilenceDataVersion()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!internalGetAbilityHashMap().equals(
+          other.internalGetAbilityHashMap())) return false;
+      if (getClientDataVersion()
+          != other.getClientDataVersion()) return false;
+      if (getPOPJGOJFOKA()
+          != other.getPOPJGOJFOKA()) return false;
+      if (!getShortAbilityHashMapList()
+          .equals(other.getShortAbilityHashMapList())) return false;
       if (hasResVersionConfig() != other.hasResVersionConfig()) return false;
       if (hasResVersionConfig()) {
         if (!getResVersionConfig()
             .equals(other.getResVersionConfig())) return false;
       }
+      if (getKLLPFNOLBHO()
+          != other.getKLLPFNOLBHO()) return false;
+      if (!getKECGLOKOIDC()
+          .equals(other.getKECGLOKOIDC())) return false;
+      if (!getFeatureBlockInfoListList()
+          .equals(other.getFeatureBlockInfoListList())) return false;
+      if (getEFPHHJIKPJG()
+          != other.getEFPHHJIKPJG()) return false;
+      if (!getScInfo()
+          .equals(other.getScInfo())) return false;
+      if (!getClientSilenceVersionSuffix()
+          .equals(other.getClientSilenceVersionSuffix())) return false;
+      if (getTargetHomeOwnerUid()
+          != other.getTargetHomeOwnerUid()) return false;
+      if (getJAGELBDJFJH()
+          != other.getJAGELBDJFJH()) return false;
+      if (!getMsg()
+          .equals(other.getMsg())) return false;
+      if (getCLJBEGINENC()
+          != other.getCLJBEGINENC()) return false;
       if (java.lang.Double.doubleToLongBits(getTotalTickTime())
           != java.lang.Double.doubleToLongBits(
               other.getTotalTickTime())) return false;
-      if (!getPlayerData()
-          .equals(other.getPlayerData())) return false;
-      if (!getScInfo()
-          .equals(other.getScInfo())) return false;
-      if (getLoginRand()
-          != other.getLoginRand()) return false;
-      if (!getENNOCBNIHIK()
-          .equals(other.getENNOCBNIHIK())) return false;
+      if (!getClientVersionSuffix()
+          .equals(other.getClientVersionSuffix())) 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 (!getPKEKLEEOLJL()
+          .equals(other.getPKEKLEEOLJL())) return false;
+      if (!internalGetBlockInfoMap().equals(
+          other.internalGetBlockInfoMap())) return false;
+      if (!getBirthday()
+          .equals(other.getBirthday())) return false;
+      if (!getJKANELMFGEP()
+          .equals(other.getJKANELMFGEP())) return false;
+      if (getFGFIHNBMJMK()
+          != other.getFGFIHNBMJMK()) return false;
       if (!getCountryCode()
           .equals(other.getCountryCode())) return false;
-      if (getPlayerDataVersion()
-          != other.getPlayerDataVersion()) return false;
-      if (!getClientSilenceVersionSuffix()
-          .equals(other.getClientSilenceVersionSuffix())) return false;
-      if (hasECKNMCACJKG() != other.hasECKNMCACJKG()) return false;
-      if (hasECKNMCACJKG()) {
-        if (!getECKNMCACJKG()
-            .equals(other.getECKNMCACJKG())) return false;
-      }
-      if (!getClientMd5()
-          .equals(other.getClientMd5())) return false;
       if (hasNextResVersionConfig() != other.hasNextResVersionConfig()) return false;
       if (hasNextResVersionConfig()) {
         if (!getNextResVersionConfig()
@@ -2099,101 +2094,101 @@ public final class PlayerLoginRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CLIENT_VERSION_SUFFIX_FIELD_NUMBER;
-      hash = (53 * hash) + getClientVersionSuffix().hashCode();
+      hash = (37 * hash) + IS_NEW_PLAYER_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsNewPlayer());
+      hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER;
+      hash = (53 * hash) + getGameBiz().hashCode();
+      hash = (37 * hash) + OAMCACIICJJ_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getOAMCACIICJJ());
+      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) + PCNBCFNBPGF_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getPCNBCFNBPGF());
+      hash = (37 * hash) + ABILITY_HASH_CODE_FIELD_NUMBER;
+      hash = (53 * hash) + getAbilityHashCode();
+      hash = (37 * hash) + LOGIN_RAND_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getLoginRand());
+      hash = (37 * hash) + PLAYER_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getPlayerDataVersion();
+      hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getClientSilenceDataVersion();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (!internalGetAbilityHashMap().getMap().isEmpty()) {
         hash = (37 * hash) + ABILITY_HASH_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetAbilityHashMap().hashCode();
       }
-      hash = (37 * hash) + IS_TRANSFER_FIELD_NUMBER;
+      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
+      hash = (53 * hash) + getClientDataVersion();
+      hash = (37 * hash) + POPJGOJFOKA_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsTransfer());
-      hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetHomeOwnerUid();
-      hash = (37 * hash) + IS_DATA_NEED_RELOGIN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsDataNeedRelogin());
-      hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER;
-      hash = (53 * hash) + getGameBiz().hashCode();
-      hash = (37 * hash) + ABILITY_HASH_CODE_FIELD_NUMBER;
-      hash = (53 * hash) + getAbilityHashCode();
+          getPOPJGOJFOKA());
       if (getShortAbilityHashMapCount() > 0) {
         hash = (37 * hash) + SHORT_ABILITY_HASH_MAP_FIELD_NUMBER;
         hash = (53 * hash) + getShortAbilityHashMapList().hashCode();
       }
-      hash = (37 * hash) + FBFJPEPMAOF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getFBFJPEPMAOF());
-      hash = (37 * hash) + IS_USE_ABILITY_HASH_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsUseAbilityHash());
-      hash = (37 * hash) + IS_AUDIT_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsAudit());
-      hash = (37 * hash) + CLIENT_SILENCE_MD5_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceMd5().hashCode();
-      hash = (37 * hash) + MSG_FIELD_NUMBER;
-      hash = (53 * hash) + getMsg().hashCode();
-      if (getFeatureBlockInfoListCount() > 0) {
-        hash = (37 * hash) + FEATURE_BLOCK_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFeatureBlockInfoListList().hashCode();
-      }
-      hash = (37 * hash) + DNHHIMENOLD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getDNHHIMENOLD());
-      hash = (37 * hash) + CLIENT_SILENCE_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceDataVersion();
-      hash = (37 * hash) + PKKKINOCFMJ_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getPKKKINOCFMJ());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + CLIENT_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getClientDataVersion();
-      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
-      hash = (53 * hash) + getBirthday().hashCode();
-      hash = (37 * hash) + BOKKNHEOKPD_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getBOKKNHEOKPD());
-      hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetUid();
-      if (!internalGetBlockInfoMap().getMap().isEmpty()) {
-        hash = (37 * hash) + BLOCK_INFO_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetBlockInfoMap().hashCode();
-      }
-      hash = (37 * hash) + GOFGOCDJDND_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getGOFGOCDJDND());
-      hash = (37 * hash) + NEXT_RESOURCE_URL_FIELD_NUMBER;
-      hash = (53 * hash) + getNextResourceUrl().hashCode();
       if (hasResVersionConfig()) {
         hash = (37 * hash) + RES_VERSION_CONFIG_FIELD_NUMBER;
         hash = (53 * hash) + getResVersionConfig().hashCode();
       }
+      hash = (37 * hash) + KLLPFNOLBHO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getKLLPFNOLBHO());
+      hash = (37 * hash) + KECGLOKOIDC_FIELD_NUMBER;
+      hash = (53 * hash) + getKECGLOKOIDC().hashCode();
+      if (getFeatureBlockInfoListCount() > 0) {
+        hash = (37 * hash) + FEATURE_BLOCK_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFeatureBlockInfoListList().hashCode();
+      }
+      hash = (37 * hash) + EFPHHJIKPJG_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getEFPHHJIKPJG());
+      hash = (37 * hash) + SC_INFO_FIELD_NUMBER;
+      hash = (53 * hash) + getScInfo().hashCode();
+      hash = (37 * hash) + CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER;
+      hash = (53 * hash) + getClientSilenceVersionSuffix().hashCode();
+      hash = (37 * hash) + TARGET_HOME_OWNER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetHomeOwnerUid();
+      hash = (37 * hash) + JAGELBDJFJH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getJAGELBDJFJH());
+      hash = (37 * hash) + MSG_FIELD_NUMBER;
+      hash = (53 * hash) + getMsg().hashCode();
+      hash = (37 * hash) + CLJBEGINENC_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getCLJBEGINENC());
       hash = (37 * hash) + TOTAL_TICK_TIME_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           java.lang.Double.doubleToLongBits(getTotalTickTime()));
-      hash = (37 * hash) + PLAYER_DATA_FIELD_NUMBER;
-      hash = (53 * hash) + getPlayerData().hashCode();
-      hash = (37 * hash) + SC_INFO_FIELD_NUMBER;
-      hash = (53 * hash) + getScInfo().hashCode();
-      hash = (37 * hash) + LOGIN_RAND_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getLoginRand());
-      hash = (37 * hash) + ENNOCBNIHIK_FIELD_NUMBER;
-      hash = (53 * hash) + getENNOCBNIHIK().hashCode();
+      hash = (37 * hash) + CLIENT_VERSION_SUFFIX_FIELD_NUMBER;
+      hash = (53 * hash) + getClientVersionSuffix().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();
+      hash = (37 * hash) + PKEKLEEOLJL_FIELD_NUMBER;
+      hash = (53 * hash) + getPKEKLEEOLJL().hashCode();
+      if (!internalGetBlockInfoMap().getMap().isEmpty()) {
+        hash = (37 * hash) + BLOCK_INFO_MAP_FIELD_NUMBER;
+        hash = (53 * hash) + internalGetBlockInfoMap().hashCode();
+      }
+      hash = (37 * hash) + BIRTHDAY_FIELD_NUMBER;
+      hash = (53 * hash) + getBirthday().hashCode();
+      hash = (37 * hash) + JKANELMFGEP_FIELD_NUMBER;
+      hash = (53 * hash) + getJKANELMFGEP().hashCode();
+      hash = (37 * hash) + FGFIHNBMJMK_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getFGFIHNBMJMK());
       hash = (37 * hash) + COUNTRY_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getCountryCode().hashCode();
-      hash = (37 * hash) + PLAYER_DATA_VERSION_FIELD_NUMBER;
-      hash = (53 * hash) + getPlayerDataVersion();
-      hash = (37 * hash) + CLIENT_SILENCE_VERSION_SUFFIX_FIELD_NUMBER;
-      hash = (53 * hash) + getClientSilenceVersionSuffix().hashCode();
-      if (hasECKNMCACJKG()) {
-        hash = (37 * hash) + ECKNMCACJKG_FIELD_NUMBER;
-        hash = (53 * hash) + getECKNMCACJKG().hashCode();
-      }
-      hash = (37 * hash) + CLIENT_MD5_FIELD_NUMBER;
-      hash = (53 * hash) + getClientMd5().hashCode();
       if (hasNextResVersionConfig()) {
         hash = (37 * hash) + NEXT_RES_VERSION_CONFIG_FIELD_NUMBER;
         hash = (53 * hash) + getNextResVersionConfig().hashCode();
@@ -2294,11 +2289,6 @@ public final class PlayerLoginRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29665
-     * Obf: NIDDAJCLAEC
-     * </pre>
-     *
      * Protobuf type {@code PlayerLoginRsp}
      */
     public static final class Builder extends
@@ -2314,9 +2304,9 @@ public final class PlayerLoginRspOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 14:
             return internalGetAbilityHashMap();
-          case 2007:
+          case 1596:
             return internalGetBlockInfoMap();
           default:
             throw new RuntimeException(
@@ -2327,9 +2317,9 @@ public final class PlayerLoginRspOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 10:
+          case 14:
             return internalGetMutableAbilityHashMap();
-          case 2007:
+          case 1596:
             return internalGetMutableBlockInfoMap();
           default:
             throw new RuntimeException(
@@ -2364,34 +2354,48 @@ public final class PlayerLoginRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        clientVersionSuffix_ = "";
-
-        internalGetMutableAbilityHashMap().clear();
-        isTransfer_ = false;
-
-        targetHomeOwnerUid_ = 0;
-
-        isDataNeedRelogin_ = false;
+        isNewPlayer_ = false;
 
         gameBiz_ = "";
 
+        oAMCACIICJJ_ = false;
+
+        playerData_ = com.google.protobuf.ByteString.EMPTY;
+
+        targetUid_ = 0;
+
+        pCNBCFNBPGF_ = false;
+
         abilityHashCode_ = 0;
 
+        loginRand_ = 0L;
+
+        playerDataVersion_ = 0;
+
+        clientSilenceDataVersion_ = 0;
+
+        retcode_ = 0;
+
+        internalGetMutableAbilityHashMap().clear();
+        clientDataVersion_ = 0;
+
+        pOPJGOJFOKA_ = false;
+
         if (shortAbilityHashMapBuilder_ == null) {
           shortAbilityHashMap_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           shortAbilityHashMapBuilder_.clear();
         }
-        fBFJPEPMAOF_ = false;
+        if (resVersionConfigBuilder_ == null) {
+          resVersionConfig_ = null;
+        } else {
+          resVersionConfig_ = null;
+          resVersionConfigBuilder_ = null;
+        }
+        kLLPFNOLBHO_ = false;
 
-        isUseAbilityHash_ = false;
-
-        isAudit_ = false;
-
-        clientSilenceMd5_ = "";
-
-        msg_ = "";
+        kECGLOKOIDC_ = "";
 
         if (featureBlockInfoListBuilder_ == null) {
           featureBlockInfoList_ = java.util.Collections.emptyList();
@@ -2399,56 +2403,42 @@ public final class PlayerLoginRspOuterClass {
         } else {
           featureBlockInfoListBuilder_.clear();
         }
-        dNHHIMENOLD_ = false;
-
-        clientSilenceDataVersion_ = 0;
-
-        pKKKINOCFMJ_ = false;
-
-        retcode_ = 0;
-
-        clientDataVersion_ = 0;
-
-        birthday_ = "";
-
-        bOKKNHEOKPD_ = false;
-
-        targetUid_ = 0;
-
-        internalGetMutableBlockInfoMap().clear();
-        gOFGOCDJDND_ = false;
-
-        nextResourceUrl_ = "";
-
-        if (resVersionConfigBuilder_ == null) {
-          resVersionConfig_ = null;
-        } else {
-          resVersionConfig_ = null;
-          resVersionConfigBuilder_ = null;
-        }
-        totalTickTime_ = 0D;
-
-        playerData_ = com.google.protobuf.ByteString.EMPTY;
+        eFPHHJIKPJG_ = false;
 
         scInfo_ = com.google.protobuf.ByteString.EMPTY;
 
-        loginRand_ = 0L;
-
-        eNNOCBNIHIK_ = "";
-
-        countryCode_ = "";
-
-        playerDataVersion_ = 0;
-
         clientSilenceVersionSuffix_ = "";
 
-        if (eCKNMCACJKGBuilder_ == null) {
-          eCKNMCACJKG_ = null;
+        targetHomeOwnerUid_ = 0;
+
+        jAGELBDJFJH_ = false;
+
+        msg_ = "";
+
+        cLJBEGINENC_ = false;
+
+        totalTickTime_ = 0D;
+
+        clientVersionSuffix_ = "";
+
+        if (aBPMACCDDJHBuilder_ == null) {
+          aBPMACCDDJH_ = null;
         } else {
-          eCKNMCACJKG_ = null;
-          eCKNMCACJKGBuilder_ = null;
+          aBPMACCDDJH_ = null;
+          aBPMACCDDJHBuilder_ = null;
         }
-        clientMd5_ = "";
+        nextResourceUrl_ = "";
+
+        pKEKLEEOLJL_ = "";
+
+        internalGetMutableBlockInfoMap().clear();
+        birthday_ = "";
+
+        jKANELMFGEP_ = "";
+
+        fGFIHNBMJMK_ = false;
+
+        countryCode_ = "";
 
         if (nextResVersionConfigBuilder_ == null) {
           nextResVersionConfig_ = null;
@@ -2483,14 +2473,21 @@ public final class PlayerLoginRspOuterClass {
       public emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp buildPartial() {
         emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp result = new emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp(this);
         int from_bitField0_ = bitField0_;
-        result.clientVersionSuffix_ = clientVersionSuffix_;
+        result.isNewPlayer_ = isNewPlayer_;
+        result.gameBiz_ = gameBiz_;
+        result.oAMCACIICJJ_ = oAMCACIICJJ_;
+        result.playerData_ = playerData_;
+        result.targetUid_ = targetUid_;
+        result.pCNBCFNBPGF_ = pCNBCFNBPGF_;
+        result.abilityHashCode_ = abilityHashCode_;
+        result.loginRand_ = loginRand_;
+        result.playerDataVersion_ = playerDataVersion_;
+        result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
+        result.retcode_ = retcode_;
         result.abilityHashMap_ = internalGetAbilityHashMap();
         result.abilityHashMap_.makeImmutable();
-        result.isTransfer_ = isTransfer_;
-        result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
-        result.isDataNeedRelogin_ = isDataNeedRelogin_;
-        result.gameBiz_ = gameBiz_;
-        result.abilityHashCode_ = abilityHashCode_;
+        result.clientDataVersion_ = clientDataVersion_;
+        result.pOPJGOJFOKA_ = pOPJGOJFOKA_;
         if (shortAbilityHashMapBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             shortAbilityHashMap_ = java.util.Collections.unmodifiableList(shortAbilityHashMap_);
@@ -2500,11 +2497,13 @@ public final class PlayerLoginRspOuterClass {
         } else {
           result.shortAbilityHashMap_ = shortAbilityHashMapBuilder_.build();
         }
-        result.fBFJPEPMAOF_ = fBFJPEPMAOF_;
-        result.isUseAbilityHash_ = isUseAbilityHash_;
-        result.isAudit_ = isAudit_;
-        result.clientSilenceMd5_ = clientSilenceMd5_;
-        result.msg_ = msg_;
+        if (resVersionConfigBuilder_ == null) {
+          result.resVersionConfig_ = resVersionConfig_;
+        } else {
+          result.resVersionConfig_ = resVersionConfigBuilder_.build();
+        }
+        result.kLLPFNOLBHO_ = kLLPFNOLBHO_;
+        result.kECGLOKOIDC_ = kECGLOKOIDC_;
         if (featureBlockInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000004) != 0)) {
             featureBlockInfoList_ = java.util.Collections.unmodifiableList(featureBlockInfoList_);
@@ -2514,37 +2513,28 @@ public final class PlayerLoginRspOuterClass {
         } else {
           result.featureBlockInfoList_ = featureBlockInfoListBuilder_.build();
         }
-        result.dNHHIMENOLD_ = dNHHIMENOLD_;
-        result.clientSilenceDataVersion_ = clientSilenceDataVersion_;
-        result.pKKKINOCFMJ_ = pKKKINOCFMJ_;
-        result.retcode_ = retcode_;
-        result.clientDataVersion_ = clientDataVersion_;
-        result.birthday_ = birthday_;
-        result.bOKKNHEOKPD_ = bOKKNHEOKPD_;
-        result.targetUid_ = targetUid_;
+        result.eFPHHJIKPJG_ = eFPHHJIKPJG_;
+        result.scInfo_ = scInfo_;
+        result.clientSilenceVersionSuffix_ = clientSilenceVersionSuffix_;
+        result.targetHomeOwnerUid_ = targetHomeOwnerUid_;
+        result.jAGELBDJFJH_ = jAGELBDJFJH_;
+        result.msg_ = msg_;
+        result.cLJBEGINENC_ = cLJBEGINENC_;
+        result.totalTickTime_ = totalTickTime_;
+        result.clientVersionSuffix_ = clientVersionSuffix_;
+        if (aBPMACCDDJHBuilder_ == null) {
+          result.aBPMACCDDJH_ = aBPMACCDDJH_;
+        } else {
+          result.aBPMACCDDJH_ = aBPMACCDDJHBuilder_.build();
+        }
+        result.nextResourceUrl_ = nextResourceUrl_;
+        result.pKEKLEEOLJL_ = pKEKLEEOLJL_;
         result.blockInfoMap_ = internalGetBlockInfoMap();
         result.blockInfoMap_.makeImmutable();
-        result.gOFGOCDJDND_ = gOFGOCDJDND_;
-        result.nextResourceUrl_ = nextResourceUrl_;
-        if (resVersionConfigBuilder_ == null) {
-          result.resVersionConfig_ = resVersionConfig_;
-        } else {
-          result.resVersionConfig_ = resVersionConfigBuilder_.build();
-        }
-        result.totalTickTime_ = totalTickTime_;
-        result.playerData_ = playerData_;
-        result.scInfo_ = scInfo_;
-        result.loginRand_ = loginRand_;
-        result.eNNOCBNIHIK_ = eNNOCBNIHIK_;
+        result.birthday_ = birthday_;
+        result.jKANELMFGEP_ = jKANELMFGEP_;
+        result.fGFIHNBMJMK_ = fGFIHNBMJMK_;
         result.countryCode_ = countryCode_;
-        result.playerDataVersion_ = playerDataVersion_;
-        result.clientSilenceVersionSuffix_ = clientSilenceVersionSuffix_;
-        if (eCKNMCACJKGBuilder_ == null) {
-          result.eCKNMCACJKG_ = eCKNMCACJKG_;
-        } else {
-          result.eCKNMCACJKG_ = eCKNMCACJKGBuilder_.build();
-        }
-        result.clientMd5_ = clientMd5_;
         if (nextResVersionConfigBuilder_ == null) {
           result.nextResVersionConfig_ = nextResVersionConfig_;
         } else {
@@ -2598,28 +2588,48 @@ public final class PlayerLoginRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp other) {
         if (other == emu.grasscutter.net.proto.PlayerLoginRspOuterClass.PlayerLoginRsp.getDefaultInstance()) return this;
-        if (!other.getClientVersionSuffix().isEmpty()) {
-          clientVersionSuffix_ = other.clientVersionSuffix_;
-          onChanged();
-        }
-        internalGetMutableAbilityHashMap().mergeFrom(
-            other.internalGetAbilityHashMap());
-        if (other.getIsTransfer() != false) {
-          setIsTransfer(other.getIsTransfer());
-        }
-        if (other.getTargetHomeOwnerUid() != 0) {
-          setTargetHomeOwnerUid(other.getTargetHomeOwnerUid());
-        }
-        if (other.getIsDataNeedRelogin() != false) {
-          setIsDataNeedRelogin(other.getIsDataNeedRelogin());
+        if (other.getIsNewPlayer() != false) {
+          setIsNewPlayer(other.getIsNewPlayer());
         }
         if (!other.getGameBiz().isEmpty()) {
           gameBiz_ = other.gameBiz_;
           onChanged();
         }
+        if (other.getOAMCACIICJJ() != false) {
+          setOAMCACIICJJ(other.getOAMCACIICJJ());
+        }
+        if (other.getPlayerData() != com.google.protobuf.ByteString.EMPTY) {
+          setPlayerData(other.getPlayerData());
+        }
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
+        }
+        if (other.getPCNBCFNBPGF() != false) {
+          setPCNBCFNBPGF(other.getPCNBCFNBPGF());
+        }
         if (other.getAbilityHashCode() != 0) {
           setAbilityHashCode(other.getAbilityHashCode());
         }
+        if (other.getLoginRand() != 0L) {
+          setLoginRand(other.getLoginRand());
+        }
+        if (other.getPlayerDataVersion() != 0) {
+          setPlayerDataVersion(other.getPlayerDataVersion());
+        }
+        if (other.getClientSilenceDataVersion() != 0) {
+          setClientSilenceDataVersion(other.getClientSilenceDataVersion());
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        internalGetMutableAbilityHashMap().mergeFrom(
+            other.internalGetAbilityHashMap());
+        if (other.getClientDataVersion() != 0) {
+          setClientDataVersion(other.getClientDataVersion());
+        }
+        if (other.getPOPJGOJFOKA() != false) {
+          setPOPJGOJFOKA(other.getPOPJGOJFOKA());
+        }
         if (shortAbilityHashMapBuilder_ == null) {
           if (!other.shortAbilityHashMap_.isEmpty()) {
             if (shortAbilityHashMap_.isEmpty()) {
@@ -2646,21 +2656,14 @@ public final class PlayerLoginRspOuterClass {
             }
           }
         }
-        if (other.getFBFJPEPMAOF() != false) {
-          setFBFJPEPMAOF(other.getFBFJPEPMAOF());
+        if (other.hasResVersionConfig()) {
+          mergeResVersionConfig(other.getResVersionConfig());
         }
-        if (other.getIsUseAbilityHash() != false) {
-          setIsUseAbilityHash(other.getIsUseAbilityHash());
+        if (other.getKLLPFNOLBHO() != false) {
+          setKLLPFNOLBHO(other.getKLLPFNOLBHO());
         }
-        if (other.getIsAudit() != false) {
-          setIsAudit(other.getIsAudit());
-        }
-        if (!other.getClientSilenceMd5().isEmpty()) {
-          clientSilenceMd5_ = other.clientSilenceMd5_;
-          onChanged();
-        }
-        if (!other.getMsg().isEmpty()) {
-          msg_ = other.msg_;
+        if (!other.getKECGLOKOIDC().isEmpty()) {
+          kECGLOKOIDC_ = other.kECGLOKOIDC_;
           onChanged();
         }
         if (featureBlockInfoListBuilder_ == null) {
@@ -2689,75 +2692,62 @@ public final class PlayerLoginRspOuterClass {
             }
           }
         }
-        if (other.getDNHHIMENOLD() != false) {
-          setDNHHIMENOLD(other.getDNHHIMENOLD());
-        }
-        if (other.getClientSilenceDataVersion() != 0) {
-          setClientSilenceDataVersion(other.getClientSilenceDataVersion());
-        }
-        if (other.getPKKKINOCFMJ() != false) {
-          setPKKKINOCFMJ(other.getPKKKINOCFMJ());
-        }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.getClientDataVersion() != 0) {
-          setClientDataVersion(other.getClientDataVersion());
-        }
-        if (!other.getBirthday().isEmpty()) {
-          birthday_ = other.birthday_;
-          onChanged();
-        }
-        if (other.getBOKKNHEOKPD() != false) {
-          setBOKKNHEOKPD(other.getBOKKNHEOKPD());
-        }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
-        }
-        internalGetMutableBlockInfoMap().mergeFrom(
-            other.internalGetBlockInfoMap());
-        if (other.getGOFGOCDJDND() != false) {
-          setGOFGOCDJDND(other.getGOFGOCDJDND());
-        }
-        if (!other.getNextResourceUrl().isEmpty()) {
-          nextResourceUrl_ = other.nextResourceUrl_;
-          onChanged();
-        }
-        if (other.hasResVersionConfig()) {
-          mergeResVersionConfig(other.getResVersionConfig());
-        }
-        if (other.getTotalTickTime() != 0D) {
-          setTotalTickTime(other.getTotalTickTime());
-        }
-        if (other.getPlayerData() != com.google.protobuf.ByteString.EMPTY) {
-          setPlayerData(other.getPlayerData());
+        if (other.getEFPHHJIKPJG() != false) {
+          setEFPHHJIKPJG(other.getEFPHHJIKPJG());
         }
         if (other.getScInfo() != com.google.protobuf.ByteString.EMPTY) {
           setScInfo(other.getScInfo());
         }
-        if (other.getLoginRand() != 0L) {
-          setLoginRand(other.getLoginRand());
-        }
-        if (!other.getENNOCBNIHIK().isEmpty()) {
-          eNNOCBNIHIK_ = other.eNNOCBNIHIK_;
-          onChanged();
-        }
-        if (!other.getCountryCode().isEmpty()) {
-          countryCode_ = other.countryCode_;
-          onChanged();
-        }
-        if (other.getPlayerDataVersion() != 0) {
-          setPlayerDataVersion(other.getPlayerDataVersion());
-        }
         if (!other.getClientSilenceVersionSuffix().isEmpty()) {
           clientSilenceVersionSuffix_ = other.clientSilenceVersionSuffix_;
           onChanged();
         }
-        if (other.hasECKNMCACJKG()) {
-          mergeECKNMCACJKG(other.getECKNMCACJKG());
+        if (other.getTargetHomeOwnerUid() != 0) {
+          setTargetHomeOwnerUid(other.getTargetHomeOwnerUid());
         }
-        if (!other.getClientMd5().isEmpty()) {
-          clientMd5_ = other.clientMd5_;
+        if (other.getJAGELBDJFJH() != false) {
+          setJAGELBDJFJH(other.getJAGELBDJFJH());
+        }
+        if (!other.getMsg().isEmpty()) {
+          msg_ = other.msg_;
+          onChanged();
+        }
+        if (other.getCLJBEGINENC() != false) {
+          setCLJBEGINENC(other.getCLJBEGINENC());
+        }
+        if (other.getTotalTickTime() != 0D) {
+          setTotalTickTime(other.getTotalTickTime());
+        }
+        if (!other.getClientVersionSuffix().isEmpty()) {
+          clientVersionSuffix_ = other.clientVersionSuffix_;
+          onChanged();
+        }
+        if (other.hasABPMACCDDJH()) {
+          mergeABPMACCDDJH(other.getABPMACCDDJH());
+        }
+        if (!other.getNextResourceUrl().isEmpty()) {
+          nextResourceUrl_ = other.nextResourceUrl_;
+          onChanged();
+        }
+        if (!other.getPKEKLEEOLJL().isEmpty()) {
+          pKEKLEEOLJL_ = other.pKEKLEEOLJL_;
+          onChanged();
+        }
+        internalGetMutableBlockInfoMap().mergeFrom(
+            other.internalGetBlockInfoMap());
+        if (!other.getBirthday().isEmpty()) {
+          birthday_ = other.birthday_;
+          onChanged();
+        }
+        if (!other.getJKANELMFGEP().isEmpty()) {
+          jKANELMFGEP_ = other.jKANELMFGEP_;
+          onChanged();
+        }
+        if (other.getFGFIHNBMJMK() != false) {
+          setFGFIHNBMJMK(other.getFGFIHNBMJMK());
+        }
+        if (!other.getCountryCode().isEmpty()) {
+          countryCode_ = other.countryCode_;
           onChanged();
         }
         if (other.hasNextResVersionConfig()) {
@@ -2793,78 +2783,391 @@ public final class PlayerLoginRspOuterClass {
       }
       private int bitField0_;
 
-      private java.lang.Object clientVersionSuffix_ = "";
+      private boolean isNewPlayer_ ;
       /**
-       * <code>string client_version_suffix = 1991;</code>
-       * @return The clientVersionSuffix.
+       * <code>bool is_new_player = 1;</code>
+       * @return The isNewPlayer.
        */
-      public java.lang.String getClientVersionSuffix() {
-        java.lang.Object ref = clientVersionSuffix_;
+      @java.lang.Override
+      public boolean getIsNewPlayer() {
+        return isNewPlayer_;
+      }
+      /**
+       * <code>bool is_new_player = 1;</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 = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsNewPlayer() {
+        
+        isNewPlayer_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gameBiz_ = "";
+      /**
+       * <code>string game_biz = 2;</code>
+       * @return The gameBiz.
+       */
+      public java.lang.String getGameBiz() {
+        java.lang.Object ref = gameBiz_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          clientVersionSuffix_ = s;
+          gameBiz_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string client_version_suffix = 1991;</code>
-       * @return The bytes for clientVersionSuffix.
+       * <code>string game_biz = 2;</code>
+       * @return The bytes for gameBiz.
        */
       public com.google.protobuf.ByteString
-          getClientVersionSuffixBytes() {
-        java.lang.Object ref = clientVersionSuffix_;
+          getGameBizBytes() {
+        java.lang.Object ref = gameBiz_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          clientVersionSuffix_ = b;
+          gameBiz_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string client_version_suffix = 1991;</code>
-       * @param value The clientVersionSuffix to set.
+       * <code>string game_biz = 2;</code>
+       * @param value The gameBiz to set.
        * @return This builder for chaining.
        */
-      public Builder setClientVersionSuffix(
+      public Builder setGameBiz(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        clientVersionSuffix_ = value;
+        gameBiz_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string client_version_suffix = 1991;</code>
+       * <code>string game_biz = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientVersionSuffix() {
+      public Builder clearGameBiz() {
         
-        clientVersionSuffix_ = getDefaultInstance().getClientVersionSuffix();
+        gameBiz_ = getDefaultInstance().getGameBiz();
         onChanged();
         return this;
       }
       /**
-       * <code>string client_version_suffix = 1991;</code>
-       * @param value The bytes for clientVersionSuffix to set.
+       * <code>string game_biz = 2;</code>
+       * @param value The bytes for gameBiz to set.
        * @return This builder for chaining.
        */
-      public Builder setClientVersionSuffixBytes(
+      public Builder setGameBizBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        clientVersionSuffix_ = value;
+        gameBiz_ = value;
+        onChanged();
+        return this;
+      }
+
+      private boolean oAMCACIICJJ_ ;
+      /**
+       * <code>bool OAMCACIICJJ = 3;</code>
+       * @return The oAMCACIICJJ.
+       */
+      @java.lang.Override
+      public boolean getOAMCACIICJJ() {
+        return oAMCACIICJJ_;
+      }
+      /**
+       * <code>bool OAMCACIICJJ = 3;</code>
+       * @param value The oAMCACIICJJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOAMCACIICJJ(boolean value) {
+        
+        oAMCACIICJJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool OAMCACIICJJ = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOAMCACIICJJ() {
+        
+        oAMCACIICJJ_ = 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 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.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetUid(int value) {
+        
+        targetUid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_uid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetUid() {
+        
+        targetUid_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean pCNBCFNBPGF_ ;
+      /**
+       * <code>bool PCNBCFNBPGF = 6;</code>
+       * @return The pCNBCFNBPGF.
+       */
+      @java.lang.Override
+      public boolean getPCNBCFNBPGF() {
+        return pCNBCFNBPGF_;
+      }
+      /**
+       * <code>bool PCNBCFNBPGF = 6;</code>
+       * @param value The pCNBCFNBPGF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPCNBCFNBPGF(boolean value) {
+        
+        pCNBCFNBPGF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool PCNBCFNBPGF = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPCNBCFNBPGF() {
+        
+        pCNBCFNBPGF_ = false;
+        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;
+      }
+      /**
+       * <code>int32 ability_hash_code = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAbilityHashCode() {
+        
+        abilityHashCode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long loginRand_ ;
+      /**
+       * <code>uint64 login_rand = 9;</code>
+       * @return The loginRand.
+       */
+      @java.lang.Override
+      public long getLoginRand() {
+        return loginRand_;
+      }
+      /**
+       * <code>uint64 login_rand = 9;</code>
+       * @param value The loginRand to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLoginRand(long value) {
+        
+        loginRand_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 login_rand = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLoginRand() {
+        
+        loginRand_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int playerDataVersion_ ;
+      /**
+       * <code>uint32 player_data_version = 10;</code>
+       * @return The playerDataVersion.
+       */
+      @java.lang.Override
+      public int getPlayerDataVersion() {
+        return playerDataVersion_;
+      }
+      /**
+       * <code>uint32 player_data_version = 10;</code>
+       * @param value The playerDataVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlayerDataVersion(int value) {
+        
+        playerDataVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 player_data_version = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlayerDataVersion() {
+        
+        playerDataVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int clientSilenceDataVersion_ ;
+      /**
+       * <code>uint32 client_silence_data_version = 11;</code>
+       * @return The clientSilenceDataVersion.
+       */
+      @java.lang.Override
+      public int getClientSilenceDataVersion() {
+        return clientSilenceDataVersion_;
+      }
+      /**
+       * <code>uint32 client_silence_data_version = 11;</code>
+       * @param value The clientSilenceDataVersion to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientSilenceDataVersion(int value) {
+        
+        clientSilenceDataVersion_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 client_silence_data_version = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientSilenceDataVersion() {
+        
+        clientSilenceDataVersion_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 12;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 12;</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 = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
         onChanged();
         return this;
       }
@@ -2896,7 +3199,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetAbilityHashMap().getMap().size();
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
 
       @java.lang.Override
@@ -2914,7 +3217,7 @@ public final class PlayerLoginRspOuterClass {
         return getAbilityHashMapMap();
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
       @java.lang.Override
 
@@ -2922,7 +3225,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetAbilityHashMap().getMap();
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
       @java.lang.Override
 
@@ -2935,7 +3238,7 @@ public final class PlayerLoginRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
       @java.lang.Override
 
@@ -2956,7 +3259,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
 
       public Builder removeAbilityHashMap(
@@ -2975,7 +3278,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetMutableAbilityHashMap().getMutableMap();
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
       public Builder putAbilityHashMap(
           java.lang.String key,
@@ -2987,7 +3290,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;string, int32&gt; ability_hash_map = 10;</code>
+       * <code>map&lt;string, int32&gt; ability_hash_map = 14;</code>
        */
 
       public Builder putAllAbilityHashMap(
@@ -2997,202 +3300,64 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private boolean isTransfer_ ;
+      private int clientDataVersion_ ;
       /**
-       * <code>bool is_transfer = 1988;</code>
-       * @return The isTransfer.
+       * <code>uint32 client_data_version = 15;</code>
+       * @return The clientDataVersion.
        */
       @java.lang.Override
-      public boolean getIsTransfer() {
-        return isTransfer_;
+      public int getClientDataVersion() {
+        return clientDataVersion_;
       }
       /**
-       * <code>bool is_transfer = 1988;</code>
-       * @param value The isTransfer to set.
+       * <code>uint32 client_data_version = 15;</code>
+       * @param value The clientDataVersion to set.
        * @return This builder for chaining.
        */
-      public Builder setIsTransfer(boolean value) {
+      public Builder setClientDataVersion(int value) {
         
-        isTransfer_ = value;
+        clientDataVersion_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool is_transfer = 1988;</code>
+       * <code>uint32 client_data_version = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearIsTransfer() {
+      public Builder clearClientDataVersion() {
         
-        isTransfer_ = false;
+        clientDataVersion_ = 0;
         onChanged();
         return this;
       }
 
-      private int targetHomeOwnerUid_ ;
+      private boolean pOPJGOJFOKA_ ;
       /**
-       * <code>uint32 target_home_owner_uid = 816;</code>
-       * @return The targetHomeOwnerUid.
+       * <code>bool POPJGOJFOKA = 67;</code>
+       * @return The pOPJGOJFOKA.
        */
       @java.lang.Override
-      public int getTargetHomeOwnerUid() {
-        return targetHomeOwnerUid_;
+      public boolean getPOPJGOJFOKA() {
+        return pOPJGOJFOKA_;
       }
       /**
-       * <code>uint32 target_home_owner_uid = 816;</code>
-       * @param value The targetHomeOwnerUid to set.
+       * <code>bool POPJGOJFOKA = 67;</code>
+       * @param value The pOPJGOJFOKA to set.
        * @return This builder for chaining.
        */
-      public Builder setTargetHomeOwnerUid(int value) {
+      public Builder setPOPJGOJFOKA(boolean value) {
         
-        targetHomeOwnerUid_ = value;
+        pOPJGOJFOKA_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 target_home_owner_uid = 816;</code>
+       * <code>bool POPJGOJFOKA = 67;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTargetHomeOwnerUid() {
+      public Builder clearPOPJGOJFOKA() {
         
-        targetHomeOwnerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isDataNeedRelogin_ ;
-      /**
-       * <code>bool is_data_need_relogin = 1993;</code>
-       * @return The isDataNeedRelogin.
-       */
-      @java.lang.Override
-      public boolean getIsDataNeedRelogin() {
-        return isDataNeedRelogin_;
-      }
-      /**
-       * <code>bool is_data_need_relogin = 1993;</code>
-       * @param value The isDataNeedRelogin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsDataNeedRelogin(boolean value) {
-        
-        isDataNeedRelogin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_data_need_relogin = 1993;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsDataNeedRelogin() {
-        
-        isDataNeedRelogin_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object gameBiz_ = "";
-      /**
-       * <code>string game_biz = 4;</code>
-       * @return The gameBiz.
-       */
-      public java.lang.String getGameBiz() {
-        java.lang.Object ref = gameBiz_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          gameBiz_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string game_biz = 4;</code>
-       * @return The bytes for gameBiz.
-       */
-      public com.google.protobuf.ByteString
-          getGameBizBytes() {
-        java.lang.Object ref = gameBiz_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          gameBiz_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string game_biz = 4;</code>
-       * @param value The gameBiz to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGameBiz(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        gameBiz_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string game_biz = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGameBiz() {
-        
-        gameBiz_ = getDefaultInstance().getGameBiz();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string game_biz = 4;</code>
-       * @param value The bytes for gameBiz to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGameBizBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        gameBiz_ = value;
-        onChanged();
-        return this;
-      }
-
-      private int abilityHashCode_ ;
-      /**
-       * <code>int32 ability_hash_code = 5;</code>
-       * @return The abilityHashCode.
-       */
-      @java.lang.Override
-      public int getAbilityHashCode() {
-        return abilityHashCode_;
-      }
-      /**
-       * <code>int32 ability_hash_code = 5;</code>
-       * @param value The abilityHashCode to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAbilityHashCode(int value) {
-        
-        abilityHashCode_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 ability_hash_code = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAbilityHashCode() {
-        
-        abilityHashCode_ = 0;
+        pOPJGOJFOKA_ = false;
         onChanged();
         return this;
       }
@@ -3210,7 +3375,7 @@ public final class PlayerLoginRspOuterClass {
           emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder> shortAbilityHashMapBuilder_;
 
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair> getShortAbilityHashMapList() {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3220,7 +3385,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public int getShortAbilityHashMapCount() {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3230,7 +3395,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair getShortAbilityHashMap(int index) {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3240,7 +3405,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder setShortAbilityHashMap(
           int index, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair value) {
@@ -3257,7 +3422,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder setShortAbilityHashMap(
           int index, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder builderForValue) {
@@ -3271,7 +3436,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder addShortAbilityHashMap(emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair value) {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3287,7 +3452,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder addShortAbilityHashMap(
           int index, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair value) {
@@ -3304,7 +3469,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder addShortAbilityHashMap(
           emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder builderForValue) {
@@ -3318,7 +3483,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder addShortAbilityHashMap(
           int index, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder builderForValue) {
@@ -3332,7 +3497,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder addAllShortAbilityHashMap(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair> values) {
@@ -3347,7 +3512,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder clearShortAbilityHashMap() {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3360,7 +3525,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public Builder removeShortAbilityHashMap(int index) {
         if (shortAbilityHashMapBuilder_ == null) {
@@ -3373,14 +3538,14 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder getShortAbilityHashMapBuilder(
           int index) {
         return getShortAbilityHashMapFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder getShortAbilityHashMapOrBuilder(
           int index) {
@@ -3390,7 +3555,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPairOrBuilder> 
            getShortAbilityHashMapOrBuilderList() {
@@ -3401,14 +3566,14 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder addShortAbilityHashMapBuilder() {
         return getShortAbilityHashMapFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder addShortAbilityHashMapBuilder(
           int index) {
@@ -3416,7 +3581,7 @@ public final class PlayerLoginRspOuterClass {
             index, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 1373;</code>
+       * <code>repeated .ShortAbilityHashPair short_ability_hash_map = 90;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder> 
            getShortAbilityHashMapBuilderList() {
@@ -3437,247 +3602,228 @@ public final class PlayerLoginRspOuterClass {
         return shortAbilityHashMapBuilder_;
       }
 
-      private boolean fBFJPEPMAOF_ ;
+      private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
+      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>bool FBFJPEPMAOF = 15;</code>
-       * @return The fBFJPEPMAOF.
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       * @return Whether the resVersionConfig field is set.
        */
-      @java.lang.Override
-      public boolean getFBFJPEPMAOF() {
-        return fBFJPEPMAOF_;
+      public boolean hasResVersionConfig() {
+        return resVersionConfigBuilder_ != null || resVersionConfig_ != null;
       }
       /**
-       * <code>bool FBFJPEPMAOF = 15;</code>
-       * @param value The fBFJPEPMAOF to set.
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       * @return The resVersionConfig.
+       */
+      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
+        if (resVersionConfigBuilder_ == null) {
+          return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
+        } else {
+          return resVersionConfigBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public Builder setResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
+        if (resVersionConfigBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          resVersionConfig_ = value;
+          onChanged();
+        } else {
+          resVersionConfigBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public Builder setResVersionConfig(
+          emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder builderForValue) {
+        if (resVersionConfigBuilder_ == null) {
+          resVersionConfig_ = builderForValue.build();
+          onChanged();
+        } else {
+          resVersionConfigBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public Builder mergeResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
+        if (resVersionConfigBuilder_ == null) {
+          if (resVersionConfig_ != null) {
+            resVersionConfig_ =
+              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.newBuilder(resVersionConfig_).mergeFrom(value).buildPartial();
+          } else {
+            resVersionConfig_ = value;
+          }
+          onChanged();
+        } else {
+          resVersionConfigBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public Builder clearResVersionConfig() {
+        if (resVersionConfigBuilder_ == null) {
+          resVersionConfig_ = null;
+          onChanged();
+        } else {
+          resVersionConfig_ = null;
+          resVersionConfigBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder getResVersionConfigBuilder() {
+        
+        onChanged();
+        return getResVersionConfigFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</code>
+       */
+      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
+        if (resVersionConfigBuilder_ != null) {
+          return resVersionConfigBuilder_.getMessageOrBuilder();
+        } else {
+          return resVersionConfig_ == null ?
+              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
+        }
+      }
+      /**
+       * <code>.ResVersionConfig res_version_config = 113;</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> 
+          getResVersionConfigFieldBuilder() {
+        if (resVersionConfigBuilder_ == null) {
+          resVersionConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder>(
+                  getResVersionConfig(),
+                  getParentForChildren(),
+                  isClean());
+          resVersionConfig_ = null;
+        }
+        return resVersionConfigBuilder_;
+      }
+
+      private boolean kLLPFNOLBHO_ ;
+      /**
+       * <code>bool KLLPFNOLBHO = 179;</code>
+       * @return The kLLPFNOLBHO.
+       */
+      @java.lang.Override
+      public boolean getKLLPFNOLBHO() {
+        return kLLPFNOLBHO_;
+      }
+      /**
+       * <code>bool KLLPFNOLBHO = 179;</code>
+       * @param value The kLLPFNOLBHO to set.
        * @return This builder for chaining.
        */
-      public Builder setFBFJPEPMAOF(boolean value) {
+      public Builder setKLLPFNOLBHO(boolean value) {
         
-        fBFJPEPMAOF_ = value;
+        kLLPFNOLBHO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool FBFJPEPMAOF = 15;</code>
+       * <code>bool KLLPFNOLBHO = 179;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFBFJPEPMAOF() {
+      public Builder clearKLLPFNOLBHO() {
         
-        fBFJPEPMAOF_ = false;
+        kLLPFNOLBHO_ = false;
         onChanged();
         return this;
       }
 
-      private boolean isUseAbilityHash_ ;
+      private java.lang.Object kECGLOKOIDC_ = "";
       /**
-       * <code>bool is_use_ability_hash = 14;</code>
-       * @return The isUseAbilityHash.
+       * <code>string KECGLOKOIDC = 249;</code>
+       * @return The kECGLOKOIDC.
        */
-      @java.lang.Override
-      public boolean getIsUseAbilityHash() {
-        return isUseAbilityHash_;
-      }
-      /**
-       * <code>bool is_use_ability_hash = 14;</code>
-       * @param value The isUseAbilityHash to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsUseAbilityHash(boolean value) {
-        
-        isUseAbilityHash_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_use_ability_hash = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsUseAbilityHash() {
-        
-        isUseAbilityHash_ = false;
-        onChanged();
-        return this;
-      }
-
-      private boolean isAudit_ ;
-      /**
-       * <code>bool is_audit = 335;</code>
-       * @return The isAudit.
-       */
-      @java.lang.Override
-      public boolean getIsAudit() {
-        return isAudit_;
-      }
-      /**
-       * <code>bool is_audit = 335;</code>
-       * @param value The isAudit to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsAudit(boolean value) {
-        
-        isAudit_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_audit = 335;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsAudit() {
-        
-        isAudit_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientSilenceMd5_ = "";
-      /**
-       * <code>string client_silence_md5 = 784;</code>
-       * @return The clientSilenceMd5.
-       */
-      public java.lang.String getClientSilenceMd5() {
-        java.lang.Object ref = clientSilenceMd5_;
+      public java.lang.String getKECGLOKOIDC() {
+        java.lang.Object ref = kECGLOKOIDC_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          clientSilenceMd5_ = s;
+          kECGLOKOIDC_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string client_silence_md5 = 784;</code>
-       * @return The bytes for clientSilenceMd5.
+       * <code>string KECGLOKOIDC = 249;</code>
+       * @return The bytes for kECGLOKOIDC.
        */
       public com.google.protobuf.ByteString
-          getClientSilenceMd5Bytes() {
-        java.lang.Object ref = clientSilenceMd5_;
+          getKECGLOKOIDCBytes() {
+        java.lang.Object ref = kECGLOKOIDC_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          clientSilenceMd5_ = b;
+          kECGLOKOIDC_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string client_silence_md5 = 784;</code>
-       * @param value The clientSilenceMd5 to set.
+       * <code>string KECGLOKOIDC = 249;</code>
+       * @param value The kECGLOKOIDC to set.
        * @return This builder for chaining.
        */
-      public Builder setClientSilenceMd5(
+      public Builder setKECGLOKOIDC(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        clientSilenceMd5_ = value;
+        kECGLOKOIDC_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string client_silence_md5 = 784;</code>
+       * <code>string KECGLOKOIDC = 249;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientSilenceMd5() {
+      public Builder clearKECGLOKOIDC() {
         
-        clientSilenceMd5_ = getDefaultInstance().getClientSilenceMd5();
+        kECGLOKOIDC_ = getDefaultInstance().getKECGLOKOIDC();
         onChanged();
         return this;
       }
       /**
-       * <code>string client_silence_md5 = 784;</code>
-       * @param value The bytes for clientSilenceMd5 to set.
+       * <code>string KECGLOKOIDC = 249;</code>
+       * @param value The bytes for kECGLOKOIDC to set.
        * @return This builder for chaining.
        */
-      public Builder setClientSilenceMd5Bytes(
+      public Builder setKECGLOKOIDCBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        clientSilenceMd5_ = value;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object msg_ = "";
-      /**
-       * <code>string msg = 43;</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 = 43;</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 = 43;</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 = 43;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMsg() {
-        
-        msg_ = getDefaultInstance().getMsg();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string msg = 43;</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;
+        kECGLOKOIDC_ = value;
         onChanged();
         return this;
       }
@@ -3695,7 +3841,7 @@ public final class PlayerLoginRspOuterClass {
           emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> featureBlockInfoListBuilder_;
 
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> getFeatureBlockInfoListList() {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3705,7 +3851,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public int getFeatureBlockInfoListCount() {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3715,7 +3861,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo getFeatureBlockInfoList(int index) {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3725,7 +3871,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder setFeatureBlockInfoList(
           int index, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo value) {
@@ -3742,7 +3888,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder setFeatureBlockInfoList(
           int index, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder builderForValue) {
@@ -3756,7 +3902,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder addFeatureBlockInfoList(emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo value) {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3772,7 +3918,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder addFeatureBlockInfoList(
           int index, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo value) {
@@ -3789,7 +3935,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder addFeatureBlockInfoList(
           emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder builderForValue) {
@@ -3803,7 +3949,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder addFeatureBlockInfoList(
           int index, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder builderForValue) {
@@ -3817,7 +3963,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder addAllFeatureBlockInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo> values) {
@@ -3832,7 +3978,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder clearFeatureBlockInfoList() {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3845,7 +3991,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public Builder removeFeatureBlockInfoList(int index) {
         if (featureBlockInfoListBuilder_ == null) {
@@ -3858,14 +4004,14 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder getFeatureBlockInfoListBuilder(
           int index) {
         return getFeatureBlockInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder getFeatureBlockInfoListOrBuilder(
           int index) {
@@ -3875,7 +4021,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfoOrBuilder> 
            getFeatureBlockInfoListOrBuilderList() {
@@ -3886,14 +4032,14 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder addFeatureBlockInfoListBuilder() {
         return getFeatureBlockInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder addFeatureBlockInfoListBuilder(
           int index) {
@@ -3901,7 +4047,7 @@ public final class PlayerLoginRspOuterClass {
             index, emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .FeatureBlockInfo feature_block_info_list = 1627;</code>
+       * <code>repeated .FeatureBlockInfo feature_block_info_list = 336;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.FeatureBlockInfo.Builder> 
            getFeatureBlockInfoListBuilderList() {
@@ -3922,295 +4068,690 @@ public final class PlayerLoginRspOuterClass {
         return featureBlockInfoListBuilder_;
       }
 
-      private boolean dNHHIMENOLD_ ;
+      private boolean eFPHHJIKPJG_ ;
       /**
-       * <code>bool DNHHIMENOLD = 1371;</code>
-       * @return The dNHHIMENOLD.
+       * <code>bool EFPHHJIKPJG = 451;</code>
+       * @return The eFPHHJIKPJG.
        */
       @java.lang.Override
-      public boolean getDNHHIMENOLD() {
-        return dNHHIMENOLD_;
+      public boolean getEFPHHJIKPJG() {
+        return eFPHHJIKPJG_;
       }
       /**
-       * <code>bool DNHHIMENOLD = 1371;</code>
-       * @param value The dNHHIMENOLD to set.
+       * <code>bool EFPHHJIKPJG = 451;</code>
+       * @param value The eFPHHJIKPJG to set.
        * @return This builder for chaining.
        */
-      public Builder setDNHHIMENOLD(boolean value) {
+      public Builder setEFPHHJIKPJG(boolean value) {
         
-        dNHHIMENOLD_ = value;
+        eFPHHJIKPJG_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool DNHHIMENOLD = 1371;</code>
+       * <code>bool EFPHHJIKPJG = 451;</code>
        * @return This builder for chaining.
        */
-      public Builder clearDNHHIMENOLD() {
+      public Builder clearEFPHHJIKPJG() {
         
-        dNHHIMENOLD_ = false;
+        eFPHHJIKPJG_ = false;
         onChanged();
         return this;
       }
 
-      private int clientSilenceDataVersion_ ;
+      private com.google.protobuf.ByteString scInfo_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>uint32 client_silence_data_version = 6;</code>
-       * @return The clientSilenceDataVersion.
+       * <code>bytes sc_info = 793;</code>
+       * @return The scInfo.
        */
       @java.lang.Override
-      public int getClientSilenceDataVersion() {
-        return clientSilenceDataVersion_;
+      public com.google.protobuf.ByteString getScInfo() {
+        return scInfo_;
       }
       /**
-       * <code>uint32 client_silence_data_version = 6;</code>
-       * @param value The clientSilenceDataVersion to set.
+       * <code>bytes sc_info = 793;</code>
+       * @param value The scInfo to set.
        * @return This builder for chaining.
        */
-      public Builder setClientSilenceDataVersion(int value) {
-        
-        clientSilenceDataVersion_ = value;
+      public Builder setScInfo(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        scInfo_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 client_silence_data_version = 6;</code>
+       * <code>bytes sc_info = 793;</code>
        * @return This builder for chaining.
        */
-      public Builder clearClientSilenceDataVersion() {
+      public Builder clearScInfo() {
         
-        clientSilenceDataVersion_ = 0;
+        scInfo_ = getDefaultInstance().getScInfo();
         onChanged();
         return this;
       }
 
-      private boolean pKKKINOCFMJ_ ;
+      private java.lang.Object clientSilenceVersionSuffix_ = "";
       /**
-       * <code>bool PKKKINOCFMJ = 2;</code>
-       * @return The pKKKINOCFMJ.
+       * <code>string client_silence_version_suffix = 1096;</code>
+       * @return The clientSilenceVersionSuffix.
        */
-      @java.lang.Override
-      public boolean getPKKKINOCFMJ() {
-        return pKKKINOCFMJ_;
-      }
-      /**
-       * <code>bool PKKKINOCFMJ = 2;</code>
-       * @param value The pKKKINOCFMJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPKKKINOCFMJ(boolean value) {
-        
-        pKKKINOCFMJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool PKKKINOCFMJ = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPKKKINOCFMJ() {
-        
-        pKKKINOCFMJ_ = false;
-        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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int clientDataVersion_ ;
-      /**
-       * <code>uint32 client_data_version = 12;</code>
-       * @return The clientDataVersion.
-       */
-      @java.lang.Override
-      public int getClientDataVersion() {
-        return clientDataVersion_;
-      }
-      /**
-       * <code>uint32 client_data_version = 12;</code>
-       * @param value The clientDataVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientDataVersion(int value) {
-        
-        clientDataVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 client_data_version = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientDataVersion() {
-        
-        clientDataVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object birthday_ = "";
-      /**
-       * <code>string birthday = 1688;</code>
-       * @return The birthday.
-       */
-      public java.lang.String getBirthday() {
-        java.lang.Object ref = birthday_;
+      public java.lang.String getClientSilenceVersionSuffix() {
+        java.lang.Object ref = clientSilenceVersionSuffix_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          birthday_ = s;
+          clientSilenceVersionSuffix_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string birthday = 1688;</code>
-       * @return The bytes for birthday.
+       * <code>string client_silence_version_suffix = 1096;</code>
+       * @return The bytes for clientSilenceVersionSuffix.
        */
       public com.google.protobuf.ByteString
-          getBirthdayBytes() {
-        java.lang.Object ref = birthday_;
+          getClientSilenceVersionSuffixBytes() {
+        java.lang.Object ref = clientSilenceVersionSuffix_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          birthday_ = b;
+          clientSilenceVersionSuffix_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string birthday = 1688;</code>
-       * @param value The birthday to set.
+       * <code>string client_silence_version_suffix = 1096;</code>
+       * @param value The clientSilenceVersionSuffix to set.
        * @return This builder for chaining.
        */
-      public Builder setBirthday(
+      public Builder setClientSilenceVersionSuffix(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        birthday_ = value;
+        clientSilenceVersionSuffix_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string birthday = 1688;</code>
+       * <code>string client_silence_version_suffix = 1096;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBirthday() {
+      public Builder clearClientSilenceVersionSuffix() {
         
-        birthday_ = getDefaultInstance().getBirthday();
+        clientSilenceVersionSuffix_ = getDefaultInstance().getClientSilenceVersionSuffix();
         onChanged();
         return this;
       }
       /**
-       * <code>string birthday = 1688;</code>
-       * @param value The bytes for birthday to set.
+       * <code>string client_silence_version_suffix = 1096;</code>
+       * @param value The bytes for clientSilenceVersionSuffix to set.
        * @return This builder for chaining.
        */
-      public Builder setBirthdayBytes(
+      public Builder setClientSilenceVersionSuffixBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        birthday_ = value;
+        clientSilenceVersionSuffix_ = value;
         onChanged();
         return this;
       }
 
-      private boolean bOKKNHEOKPD_ ;
+      private int targetHomeOwnerUid_ ;
       /**
-       * <code>bool BOKKNHEOKPD = 620;</code>
-       * @return The bOKKNHEOKPD.
+       * <code>uint32 target_home_owner_uid = 1147;</code>
+       * @return The targetHomeOwnerUid.
        */
       @java.lang.Override
-      public boolean getBOKKNHEOKPD() {
-        return bOKKNHEOKPD_;
+      public int getTargetHomeOwnerUid() {
+        return targetHomeOwnerUid_;
       }
       /**
-       * <code>bool BOKKNHEOKPD = 620;</code>
-       * @param value The bOKKNHEOKPD to set.
+       * <code>uint32 target_home_owner_uid = 1147;</code>
+       * @param value The targetHomeOwnerUid to set.
        * @return This builder for chaining.
        */
-      public Builder setBOKKNHEOKPD(boolean value) {
+      public Builder setTargetHomeOwnerUid(int value) {
         
-        bOKKNHEOKPD_ = value;
+        targetHomeOwnerUid_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool BOKKNHEOKPD = 620;</code>
+       * <code>uint32 target_home_owner_uid = 1147;</code>
        * @return This builder for chaining.
        */
-      public Builder clearBOKKNHEOKPD() {
+      public Builder clearTargetHomeOwnerUid() {
         
-        bOKKNHEOKPD_ = false;
+        targetHomeOwnerUid_ = 0;
         onChanged();
         return this;
       }
 
-      private int targetUid_ ;
+      private boolean jAGELBDJFJH_ ;
       /**
-       * <code>uint32 target_uid = 9;</code>
-       * @return The targetUid.
+       * <code>bool JAGELBDJFJH = 1189;</code>
+       * @return The jAGELBDJFJH.
        */
       @java.lang.Override
-      public int getTargetUid() {
-        return targetUid_;
+      public boolean getJAGELBDJFJH() {
+        return jAGELBDJFJH_;
       }
       /**
-       * <code>uint32 target_uid = 9;</code>
-       * @param value The targetUid to set.
+       * <code>bool JAGELBDJFJH = 1189;</code>
+       * @param value The jAGELBDJFJH to set.
        * @return This builder for chaining.
        */
-      public Builder setTargetUid(int value) {
+      public Builder setJAGELBDJFJH(boolean value) {
         
-        targetUid_ = value;
+        jAGELBDJFJH_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 target_uid = 9;</code>
+       * <code>bool JAGELBDJFJH = 1189;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTargetUid() {
+      public Builder clearJAGELBDJFJH() {
         
-        targetUid_ = 0;
+        jAGELBDJFJH_ = false;
+        onChanged();
+        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 boolean cLJBEGINENC_ ;
+      /**
+       * <code>bool CLJBEGINENC = 1298;</code>
+       * @return The cLJBEGINENC.
+       */
+      @java.lang.Override
+      public boolean getCLJBEGINENC() {
+        return cLJBEGINENC_;
+      }
+      /**
+       * <code>bool CLJBEGINENC = 1298;</code>
+       * @param value The cLJBEGINENC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCLJBEGINENC(boolean value) {
+        
+        cLJBEGINENC_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool CLJBEGINENC = 1298;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCLJBEGINENC() {
+        
+        cLJBEGINENC_ = false;
+        onChanged();
+        return this;
+      }
+
+      private double totalTickTime_ ;
+      /**
+       * <code>double total_tick_time = 1456;</code>
+       * @return The totalTickTime.
+       */
+      @java.lang.Override
+      public double getTotalTickTime() {
+        return totalTickTime_;
+      }
+      /**
+       * <code>double total_tick_time = 1456;</code>
+       * @param value The totalTickTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTotalTickTime(double value) {
+        
+        totalTickTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double total_tick_time = 1456;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalTickTime() {
+        
+        totalTickTime_ = 0D;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object clientVersionSuffix_ = "";
+      /**
+       * <code>string client_version_suffix = 1490;</code>
+       * @return The clientVersionSuffix.
+       */
+      public java.lang.String getClientVersionSuffix() {
+        java.lang.Object ref = clientVersionSuffix_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          clientVersionSuffix_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string client_version_suffix = 1490;</code>
+       * @return The bytes for clientVersionSuffix.
+       */
+      public com.google.protobuf.ByteString
+          getClientVersionSuffixBytes() {
+        java.lang.Object ref = clientVersionSuffix_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          clientVersionSuffix_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string client_version_suffix = 1490;</code>
+       * @param value The clientVersionSuffix to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientVersionSuffix(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientVersionSuffix_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_version_suffix = 1490;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientVersionSuffix() {
+        
+        clientVersionSuffix_ = getDefaultInstance().getClientVersionSuffix();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string client_version_suffix = 1490;</code>
+       * @param value The bytes for clientVersionSuffix to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientVersionSuffixBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        clientVersionSuffix_ = 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>
+       * @return The nextResourceUrl.
+       */
+      public java.lang.String getNextResourceUrl() {
+        java.lang.Object ref = nextResourceUrl_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          nextResourceUrl_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string next_resource_url = 1549;</code>
+       * @return The bytes for nextResourceUrl.
+       */
+      public com.google.protobuf.ByteString
+          getNextResourceUrlBytes() {
+        java.lang.Object ref = nextResourceUrl_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          nextResourceUrl_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string next_resource_url = 1549;</code>
+       * @param value The nextResourceUrl to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextResourceUrl(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        nextResourceUrl_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string next_resource_url = 1549;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextResourceUrl() {
+        
+        nextResourceUrl_ = getDefaultInstance().getNextResourceUrl();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string next_resource_url = 1549;</code>
+       * @param value The bytes for nextResourceUrl to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextResourceUrlBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        nextResourceUrl_ = value;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object pKEKLEEOLJL_ = "";
+      /**
+       * <code>string PKEKLEEOLJL = 1594;</code>
+       * @return The pKEKLEEOLJL.
+       */
+      public java.lang.String getPKEKLEEOLJL() {
+        java.lang.Object ref = pKEKLEEOLJL_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          pKEKLEEOLJL_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 1594;</code>
+       * @return The bytes for pKEKLEEOLJL.
+       */
+      public com.google.protobuf.ByteString
+          getPKEKLEEOLJLBytes() {
+        java.lang.Object ref = pKEKLEEOLJL_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          pKEKLEEOLJL_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 1594;</code>
+       * @param value The pKEKLEEOLJL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPKEKLEEOLJL(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        pKEKLEEOLJL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 1594;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPKEKLEEOLJL() {
+        
+        pKEKLEEOLJL_ = getDefaultInstance().getPKEKLEEOLJL();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string PKEKLEEOLJL = 1594;</code>
+       * @param value The bytes for pKEKLEEOLJL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPKEKLEEOLJLBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        pKEKLEEOLJL_ = value;
         onChanged();
         return this;
       }
@@ -4242,7 +4783,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetBlockInfoMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
 
       @java.lang.Override
@@ -4260,7 +4801,7 @@ public final class PlayerLoginRspOuterClass {
         return getBlockInfoMapMap();
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
       @java.lang.Override
 
@@ -4268,7 +4809,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetBlockInfoMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
       @java.lang.Override
 
@@ -4281,7 +4822,7 @@ public final class PlayerLoginRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
       @java.lang.Override
 
@@ -4302,7 +4843,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
 
       public Builder removeBlockInfoMap(
@@ -4321,7 +4862,7 @@ public final class PlayerLoginRspOuterClass {
         return internalGetMutableBlockInfoMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
       public Builder putBlockInfoMap(
           int key,
@@ -4333,7 +4874,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 2007;</code>
+       * <code>map&lt;uint32, .BlockInfo&gt; block_info_map = 1596;</code>
        */
 
       public Builder putAllBlockInfoMap(
@@ -4343,441 +4884,192 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private boolean gOFGOCDJDND_ ;
+      private java.lang.Object birthday_ = "";
       /**
-       * <code>bool GOFGOCDJDND = 281;</code>
-       * @return The gOFGOCDJDND.
+       * <code>string birthday = 1689;</code>
+       * @return The birthday.
        */
-      @java.lang.Override
-      public boolean getGOFGOCDJDND() {
-        return gOFGOCDJDND_;
-      }
-      /**
-       * <code>bool GOFGOCDJDND = 281;</code>
-       * @param value The gOFGOCDJDND to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGOFGOCDJDND(boolean value) {
-        
-        gOFGOCDJDND_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool GOFGOCDJDND = 281;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGOFGOCDJDND() {
-        
-        gOFGOCDJDND_ = false;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object nextResourceUrl_ = "";
-      /**
-       * <code>string next_resource_url = 986;</code>
-       * @return The nextResourceUrl.
-       */
-      public java.lang.String getNextResourceUrl() {
-        java.lang.Object ref = nextResourceUrl_;
+      public java.lang.String getBirthday() {
+        java.lang.Object ref = birthday_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          nextResourceUrl_ = s;
+          birthday_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string next_resource_url = 986;</code>
-       * @return The bytes for nextResourceUrl.
+       * <code>string birthday = 1689;</code>
+       * @return The bytes for birthday.
        */
       public com.google.protobuf.ByteString
-          getNextResourceUrlBytes() {
-        java.lang.Object ref = nextResourceUrl_;
+          getBirthdayBytes() {
+        java.lang.Object ref = birthday_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          nextResourceUrl_ = b;
+          birthday_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string next_resource_url = 986;</code>
-       * @param value The nextResourceUrl to set.
+       * <code>string birthday = 1689;</code>
+       * @param value The birthday to set.
        * @return This builder for chaining.
        */
-      public Builder setNextResourceUrl(
+      public Builder setBirthday(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        nextResourceUrl_ = value;
+        birthday_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string next_resource_url = 986;</code>
+       * <code>string birthday = 1689;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNextResourceUrl() {
+      public Builder clearBirthday() {
         
-        nextResourceUrl_ = getDefaultInstance().getNextResourceUrl();
+        birthday_ = getDefaultInstance().getBirthday();
         onChanged();
         return this;
       }
       /**
-       * <code>string next_resource_url = 986;</code>
-       * @param value The bytes for nextResourceUrl to set.
+       * <code>string birthday = 1689;</code>
+       * @param value The bytes for birthday to set.
        * @return This builder for chaining.
        */
-      public Builder setNextResourceUrlBytes(
+      public Builder setBirthdayBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        nextResourceUrl_ = value;
+        birthday_ = value;
         onChanged();
         return this;
       }
 
-      private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig resVersionConfig_;
-      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_;
+      private java.lang.Object jKANELMFGEP_ = "";
       /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       * @return Whether the resVersionConfig field is set.
+       * <code>string JKANELMFGEP = 1728;</code>
+       * @return The jKANELMFGEP.
        */
-      public boolean hasResVersionConfig() {
-        return resVersionConfigBuilder_ != null || resVersionConfig_ != null;
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       * @return The resVersionConfig.
-       */
-      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getResVersionConfig() {
-        if (resVersionConfigBuilder_ == null) {
-          return resVersionConfig_ == null ? emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
-        } else {
-          return resVersionConfigBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public Builder setResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
-        if (resVersionConfigBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          resVersionConfig_ = value;
-          onChanged();
-        } else {
-          resVersionConfigBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public Builder setResVersionConfig(
-          emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder builderForValue) {
-        if (resVersionConfigBuilder_ == null) {
-          resVersionConfig_ = builderForValue.build();
-          onChanged();
-        } else {
-          resVersionConfigBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public Builder mergeResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
-        if (resVersionConfigBuilder_ == null) {
-          if (resVersionConfig_ != null) {
-            resVersionConfig_ =
-              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.newBuilder(resVersionConfig_).mergeFrom(value).buildPartial();
-          } else {
-            resVersionConfig_ = value;
-          }
-          onChanged();
-        } else {
-          resVersionConfigBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public Builder clearResVersionConfig() {
-        if (resVersionConfigBuilder_ == null) {
-          resVersionConfig_ = null;
-          onChanged();
-        } else {
-          resVersionConfig_ = null;
-          resVersionConfigBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder getResVersionConfigBuilder() {
-        
-        onChanged();
-        return getResVersionConfigFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</code>
-       */
-      public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getResVersionConfigOrBuilder() {
-        if (resVersionConfigBuilder_ != null) {
-          return resVersionConfigBuilder_.getMessageOrBuilder();
-        } else {
-          return resVersionConfig_ == null ?
-              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.getDefaultInstance() : resVersionConfig_;
-        }
-      }
-      /**
-       * <code>.ResVersionConfig res_version_config = 413;</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> 
-          getResVersionConfigFieldBuilder() {
-        if (resVersionConfigBuilder_ == null) {
-          resVersionConfigBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder>(
-                  getResVersionConfig(),
-                  getParentForChildren(),
-                  isClean());
-          resVersionConfig_ = null;
-        }
-        return resVersionConfigBuilder_;
-      }
-
-      private double totalTickTime_ ;
-      /**
-       * <code>double total_tick_time = 262;</code>
-       * @return The totalTickTime.
-       */
-      @java.lang.Override
-      public double getTotalTickTime() {
-        return totalTickTime_;
-      }
-      /**
-       * <code>double total_tick_time = 262;</code>
-       * @param value The totalTickTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTotalTickTime(double value) {
-        
-        totalTickTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>double total_tick_time = 262;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTotalTickTime() {
-        
-        totalTickTime_ = 0D;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString playerData_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes player_data = 13;</code>
-       * @return The playerData.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getPlayerData() {
-        return playerData_;
-      }
-      /**
-       * <code>bytes player_data = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlayerData() {
-        
-        playerData_ = getDefaultInstance().getPlayerData();
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString scInfo_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes sc_info = 416;</code>
-       * @return The scInfo.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getScInfo() {
-        return scInfo_;
-      }
-      /**
-       * <code>bytes sc_info = 416;</code>
-       * @param value The scInfo to set.
-       * @return This builder for chaining.
-       */
-      public Builder setScInfo(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        scInfo_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes sc_info = 416;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScInfo() {
-        
-        scInfo_ = getDefaultInstance().getScInfo();
-        onChanged();
-        return this;
-      }
-
-      private long loginRand_ ;
-      /**
-       * <code>uint64 login_rand = 3;</code>
-       * @return The loginRand.
-       */
-      @java.lang.Override
-      public long getLoginRand() {
-        return loginRand_;
-      }
-      /**
-       * <code>uint64 login_rand = 3;</code>
-       * @param value The loginRand to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLoginRand(long value) {
-        
-        loginRand_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 login_rand = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLoginRand() {
-        
-        loginRand_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object eNNOCBNIHIK_ = "";
-      /**
-       * <code>string ENNOCBNIHIK = 1258;</code>
-       * @return The eNNOCBNIHIK.
-       */
-      public java.lang.String getENNOCBNIHIK() {
-        java.lang.Object ref = eNNOCBNIHIK_;
+      public java.lang.String getJKANELMFGEP() {
+        java.lang.Object ref = jKANELMFGEP_;
         if (!(ref instanceof java.lang.String)) {
           com.google.protobuf.ByteString bs =
               (com.google.protobuf.ByteString) ref;
           java.lang.String s = bs.toStringUtf8();
-          eNNOCBNIHIK_ = s;
+          jKANELMFGEP_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>string ENNOCBNIHIK = 1258;</code>
-       * @return The bytes for eNNOCBNIHIK.
+       * <code>string JKANELMFGEP = 1728;</code>
+       * @return The bytes for jKANELMFGEP.
        */
       public com.google.protobuf.ByteString
-          getENNOCBNIHIKBytes() {
-        java.lang.Object ref = eNNOCBNIHIK_;
+          getJKANELMFGEPBytes() {
+        java.lang.Object ref = jKANELMFGEP_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          eNNOCBNIHIK_ = b;
+          jKANELMFGEP_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>string ENNOCBNIHIK = 1258;</code>
-       * @param value The eNNOCBNIHIK to set.
+       * <code>string JKANELMFGEP = 1728;</code>
+       * @param value The jKANELMFGEP to set.
        * @return This builder for chaining.
        */
-      public Builder setENNOCBNIHIK(
+      public Builder setJKANELMFGEP(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
   
-        eNNOCBNIHIK_ = value;
+        jKANELMFGEP_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>string ENNOCBNIHIK = 1258;</code>
+       * <code>string JKANELMFGEP = 1728;</code>
        * @return This builder for chaining.
        */
-      public Builder clearENNOCBNIHIK() {
+      public Builder clearJKANELMFGEP() {
         
-        eNNOCBNIHIK_ = getDefaultInstance().getENNOCBNIHIK();
+        jKANELMFGEP_ = getDefaultInstance().getJKANELMFGEP();
         onChanged();
         return this;
       }
       /**
-       * <code>string ENNOCBNIHIK = 1258;</code>
-       * @param value The bytes for eNNOCBNIHIK to set.
+       * <code>string JKANELMFGEP = 1728;</code>
+       * @param value The bytes for jKANELMFGEP to set.
        * @return This builder for chaining.
        */
-      public Builder setENNOCBNIHIKBytes(
+      public Builder setJKANELMFGEPBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
   checkByteStringIsUtf8(value);
         
-        eNNOCBNIHIK_ = value;
+        jKANELMFGEP_ = value;
+        onChanged();
+        return this;
+      }
+
+      private boolean fGFIHNBMJMK_ ;
+      /**
+       * <code>bool FGFIHNBMJMK = 1869;</code>
+       * @return The fGFIHNBMJMK.
+       */
+      @java.lang.Override
+      public boolean getFGFIHNBMJMK() {
+        return fGFIHNBMJMK_;
+      }
+      /**
+       * <code>bool FGFIHNBMJMK = 1869;</code>
+       * @param value The fGFIHNBMJMK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFGFIHNBMJMK(boolean value) {
+        
+        fGFIHNBMJMK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool FGFIHNBMJMK = 1869;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFGFIHNBMJMK() {
+        
+        fGFIHNBMJMK_ = false;
         onChanged();
         return this;
       }
 
       private java.lang.Object countryCode_ = "";
       /**
-       * <code>string country_code = 452;</code>
+       * <code>string country_code = 1898;</code>
        * @return The countryCode.
        */
       public java.lang.String getCountryCode() {
@@ -4793,7 +5085,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>string country_code = 452;</code>
+       * <code>string country_code = 1898;</code>
        * @return The bytes for countryCode.
        */
       public com.google.protobuf.ByteString
@@ -4810,7 +5102,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>string country_code = 452;</code>
+       * <code>string country_code = 1898;</code>
        * @param value The countryCode to set.
        * @return This builder for chaining.
        */
@@ -4825,7 +5117,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>string country_code = 452;</code>
+       * <code>string country_code = 1898;</code>
        * @return This builder for chaining.
        */
       public Builder clearCountryCode() {
@@ -4835,7 +5127,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>string country_code = 452;</code>
+       * <code>string country_code = 1898;</code>
        * @param value The bytes for countryCode to set.
        * @return This builder for chaining.
        */
@@ -4851,320 +5143,18 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
 
-      private int playerDataVersion_ ;
-      /**
-       * <code>uint32 player_data_version = 11;</code>
-       * @return The playerDataVersion.
-       */
-      @java.lang.Override
-      public int getPlayerDataVersion() {
-        return playerDataVersion_;
-      }
-      /**
-       * <code>uint32 player_data_version = 11;</code>
-       * @param value The playerDataVersion to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPlayerDataVersion(int value) {
-        
-        playerDataVersion_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 player_data_version = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlayerDataVersion() {
-        
-        playerDataVersion_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object clientSilenceVersionSuffix_ = "";
-      /**
-       * <code>string client_silence_version_suffix = 211;</code>
-       * @return The clientSilenceVersionSuffix.
-       */
-      public java.lang.String getClientSilenceVersionSuffix() {
-        java.lang.Object ref = clientSilenceVersionSuffix_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientSilenceVersionSuffix_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_version_suffix = 211;</code>
-       * @return The bytes for clientSilenceVersionSuffix.
-       */
-      public com.google.protobuf.ByteString
-          getClientSilenceVersionSuffixBytes() {
-        java.lang.Object ref = clientSilenceVersionSuffix_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientSilenceVersionSuffix_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_silence_version_suffix = 211;</code>
-       * @param value The clientSilenceVersionSuffix to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceVersionSuffix(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientSilenceVersionSuffix_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_version_suffix = 211;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientSilenceVersionSuffix() {
-        
-        clientSilenceVersionSuffix_ = getDefaultInstance().getClientSilenceVersionSuffix();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_silence_version_suffix = 211;</code>
-       * @param value The bytes for clientSilenceVersionSuffix to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSilenceVersionSuffixBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientSilenceVersionSuffix_ = value;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo eCKNMCACJKG_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder> eCKNMCACJKGBuilder_;
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       * @return Whether the eCKNMCACJKG field is set.
-       */
-      public boolean hasECKNMCACJKG() {
-        return eCKNMCACJKGBuilder_ != null || eCKNMCACJKG_ != null;
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       * @return The eCKNMCACJKG.
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getECKNMCACJKG() {
-        if (eCKNMCACJKGBuilder_ == null) {
-          return eCKNMCACJKG_ == null ? emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : eCKNMCACJKG_;
-        } else {
-          return eCKNMCACJKGBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public Builder setECKNMCACJKG(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
-        if (eCKNMCACJKGBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          eCKNMCACJKG_ = value;
-          onChanged();
-        } else {
-          eCKNMCACJKGBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public Builder setECKNMCACJKG(
-          emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder builderForValue) {
-        if (eCKNMCACJKGBuilder_ == null) {
-          eCKNMCACJKG_ = builderForValue.build();
-          onChanged();
-        } else {
-          eCKNMCACJKGBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public Builder mergeECKNMCACJKG(emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo value) {
-        if (eCKNMCACJKGBuilder_ == null) {
-          if (eCKNMCACJKG_ != null) {
-            eCKNMCACJKG_ =
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.newBuilder(eCKNMCACJKG_).mergeFrom(value).buildPartial();
-          } else {
-            eCKNMCACJKG_ = value;
-          }
-          onChanged();
-        } else {
-          eCKNMCACJKGBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public Builder clearECKNMCACJKG() {
-        if (eCKNMCACJKGBuilder_ == null) {
-          eCKNMCACJKG_ = null;
-          onChanged();
-        } else {
-          eCKNMCACJKG_ = null;
-          eCKNMCACJKGBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder getECKNMCACJKGBuilder() {
-        
-        onChanged();
-        return getECKNMCACJKGFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</code>
-       */
-      public emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getECKNMCACJKGOrBuilder() {
-        if (eCKNMCACJKGBuilder_ != null) {
-          return eCKNMCACJKGBuilder_.getMessageOrBuilder();
-        } else {
-          return eCKNMCACJKG_ == null ?
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance() : eCKNMCACJKG_;
-        }
-      }
-      /**
-       * <code>.StopServerInfo ECKNMCACJKG = 2021;</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> 
-          getECKNMCACJKGFieldBuilder() {
-        if (eCKNMCACJKGBuilder_ == null) {
-          eCKNMCACJKGBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.Builder, emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder>(
-                  getECKNMCACJKG(),
-                  getParentForChildren(),
-                  isClean());
-          eCKNMCACJKG_ = null;
-        }
-        return eCKNMCACJKGBuilder_;
-      }
-
-      private java.lang.Object clientMd5_ = "";
-      /**
-       * <code>string client_md5 = 535;</code>
-       * @return The clientMd5.
-       */
-      public java.lang.String getClientMd5() {
-        java.lang.Object ref = clientMd5_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          clientMd5_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string client_md5 = 535;</code>
-       * @return The bytes for clientMd5.
-       */
-      public com.google.protobuf.ByteString
-          getClientMd5Bytes() {
-        java.lang.Object ref = clientMd5_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          clientMd5_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string client_md5 = 535;</code>
-       * @param value The clientMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientMd5(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientMd5_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_md5 = 535;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientMd5() {
-        
-        clientMd5_ = getDefaultInstance().getClientMd5();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string client_md5 = 535;</code>
-       * @param value The bytes for clientMd5 to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientMd5Bytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        clientMd5_ = value;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig nextResVersionConfig_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder, emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder> nextResVersionConfigBuilder_;
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        * @return Whether the nextResVersionConfig field is set.
        */
       public boolean hasNextResVersionConfig() {
         return nextResVersionConfigBuilder_ != null || nextResVersionConfig_ != null;
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        * @return The nextResVersionConfig.
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig getNextResVersionConfig() {
@@ -5175,7 +5165,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public Builder setNextResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (nextResVersionConfigBuilder_ == null) {
@@ -5191,7 +5181,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public Builder setNextResVersionConfig(
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder builderForValue) {
@@ -5205,7 +5195,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public Builder mergeNextResVersionConfig(emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig value) {
         if (nextResVersionConfigBuilder_ == null) {
@@ -5223,7 +5213,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public Builder clearNextResVersionConfig() {
         if (nextResVersionConfigBuilder_ == null) {
@@ -5237,7 +5227,7 @@ public final class PlayerLoginRspOuterClass {
         return this;
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfig.Builder getNextResVersionConfigBuilder() {
         
@@ -5245,7 +5235,7 @@ public final class PlayerLoginRspOuterClass {
         return getNextResVersionConfigFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</code>
        */
       public emu.grasscutter.net.proto.ResVersionConfigOuterClass.ResVersionConfigOrBuilder getNextResVersionConfigOrBuilder() {
         if (nextResVersionConfigBuilder_ != null) {
@@ -5256,7 +5246,7 @@ public final class PlayerLoginRspOuterClass {
         }
       }
       /**
-       * <code>.ResVersionConfig next_res_version_config = 1132;</code>
+       * <code>.ResVersionConfig next_res_version_config = 1975;</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> 
@@ -5349,57 +5339,56 @@ public final class PlayerLoginRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024PlayerLoginRsp.proto\032\032ShortAbilityHash" +
-      "Pair.proto\032\026FeatureBlockInfo.proto\032\017Bloc" +
-      "kInfo.proto\032\026ResVersionConfig.proto\032\024Sto" +
-      "pServerInfo.proto\"\326\t\n\016PlayerLoginRsp\022\036\n\025" +
-      "client_version_suffix\030\307\017 \001(\t\022=\n\020ability_" +
-      "hash_map\030\n \003(\0132#.PlayerLoginRsp.AbilityH" +
-      "ashMapEntry\022\024\n\013is_transfer\030\304\017 \001(\010\022\036\n\025tar" +
-      "get_home_owner_uid\030\260\006 \001(\r\022\035\n\024is_data_nee" +
-      "d_relogin\030\311\017 \001(\010\022\020\n\010game_biz\030\004 \001(\t\022\031\n\021ab" +
-      "ility_hash_code\030\005 \001(\005\0226\n\026short_ability_h" +
-      "ash_map\030\335\n \003(\0132\025.ShortAbilityHashPair\022\023\n" +
-      "\013FBFJPEPMAOF\030\017 \001(\010\022\033\n\023is_use_ability_has" +
-      "h\030\016 \001(\010\022\021\n\010is_audit\030\317\002 \001(\010\022\033\n\022client_sil" +
-      "ence_md5\030\220\006 \001(\t\022\013\n\003msg\030+ \001(\t\0223\n\027feature_" +
-      "block_info_list\030\333\014 \003(\0132\021.FeatureBlockInf" +
-      "o\022\024\n\013DNHHIMENOLD\030\333\n \001(\010\022#\n\033client_silenc" +
-      "e_data_version\030\006 \001(\r\022\023\n\013PKKKINOCFMJ\030\002 \001(" +
-      "\010\022\017\n\007retcode\030\010 \001(\005\022\033\n\023client_data_versio" +
-      "n\030\014 \001(\r\022\021\n\010birthday\030\230\r \001(\t\022\024\n\013BOKKNHEOKP" +
-      "D\030\354\004 \001(\010\022\022\n\ntarget_uid\030\t \001(\r\022:\n\016block_in" +
-      "fo_map\030\327\017 \003(\0132!.PlayerLoginRsp.BlockInfo" +
-      "MapEntry\022\024\n\013GOFGOCDJDND\030\231\002 \001(\010\022\032\n\021next_r" +
-      "esource_url\030\332\007 \001(\t\022.\n\022res_version_config" +
-      "\030\235\003 \001(\0132\021.ResVersionConfig\022\030\n\017total_tick" +
-      "_time\030\206\002 \001(\001\022\023\n\013player_data\030\r \001(\014\022\020\n\007sc_" +
-      "info\030\240\003 \001(\014\022\022\n\nlogin_rand\030\003 \001(\004\022\024\n\013ENNOC" +
-      "BNIHIK\030\352\t \001(\t\022\025\n\014country_code\030\304\003 \001(\t\022\033\n\023" +
-      "player_data_version\030\013 \001(\r\022&\n\035client_sile" +
-      "nce_version_suffix\030\323\001 \001(\t\022%\n\013ECKNMCACJKG" +
-      "\030\345\017 \001(\0132\017.StopServerInfo\022\023\n\nclient_md5\030\227" +
-      "\004 \001(\t\0223\n\027next_res_version_config\030\354\010 \001(\0132" +
-      "\021.ResVersionConfig\0325\n\023AbilityHashMapEntr" +
-      "y\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\005:\0028\001\032?\n\021Blo" +
-      "ckInfoMapEntry\022\013\n\003key\030\001 \001(\r\022\031\n\005value\030\002 \001" +
-      "(\0132\n.BlockInfo:\0028\001B\033\n\031emu.grasscutter.ne" +
-      "t.protob\006proto3"
+      "Pair.proto\032\026ResVersionConfig.proto\032\026Feat" +
+      "ureBlockInfo.proto\032\024StopServerInfo.proto" +
+      "\032\017BlockInfo.proto\"\302\t\n\016PlayerLoginRsp\022\025\n\r" +
+      "is_new_player\030\001 \001(\010\022\020\n\010game_biz\030\002 \001(\t\022\023\n" +
+      "\013OAMCACIICJJ\030\003 \001(\010\022\023\n\013player_data\030\004 \001(\014\022" +
+      "\022\n\ntarget_uid\030\005 \001(\r\022\023\n\013PCNBCFNBPGF\030\006 \001(\010" +
+      "\022\031\n\021ability_hash_code\030\010 \001(\005\022\022\n\nlogin_ran" +
+      "d\030\t \001(\004\022\033\n\023player_data_version\030\n \001(\r\022#\n\033" +
+      "client_silence_data_version\030\013 \001(\r\022\017\n\007ret" +
+      "code\030\014 \001(\005\022=\n\020ability_hash_map\030\016 \003(\0132#.P" +
+      "layerLoginRsp.AbilityHashMapEntry\022\033\n\023cli" +
+      "ent_data_version\030\017 \001(\r\022\023\n\013POPJGOJFOKA\030C " +
+      "\001(\010\0225\n\026short_ability_hash_map\030Z \003(\0132\025.Sh" +
+      "ortAbilityHashPair\022-\n\022res_version_config" +
+      "\030q \001(\0132\021.ResVersionConfig\022\024\n\013KLLPFNOLBHO" +
+      "\030\263\001 \001(\010\022\024\n\013KECGLOKOIDC\030\371\001 \001(\t\0223\n\027feature" +
+      "_block_info_list\030\320\002 \003(\0132\021.FeatureBlockIn" +
+      "fo\022\024\n\013EFPHHJIKPJG\030\303\003 \001(\010\022\020\n\007sc_info\030\231\006 \001" +
+      "(\014\022&\n\035client_silence_version_suffix\030\310\010 \001" +
+      "(\t\022\036\n\025target_home_owner_uid\030\373\010 \001(\r\022\024\n\013JA" +
+      "GELBDJFJH\030\245\t \001(\010\022\014\n\003msg\030\267\t \001(\t\022\024\n\013CLJBEG" +
+      "INENC\030\222\n \001(\010\022\030\n\017total_tick_time\030\260\013 \001(\001\022\036" +
+      "\n\025client_version_suffix\030\322\013 \001(\t\022%\n\013ABPMAC" +
+      "CDDJH\030\372\013 \001(\0132\017.StopServerInfo\022\032\n\021next_re" +
+      "source_url\030\215\014 \001(\t\022\024\n\013PKEKLEEOLJL\030\272\014 \001(\t\022" +
+      ":\n\016block_info_map\030\274\014 \003(\0132!.PlayerLoginRs" +
+      "p.BlockInfoMapEntry\022\021\n\010birthday\030\231\r \001(\t\022\024" +
+      "\n\013JKANELMFGEP\030\300\r \001(\t\022\024\n\013FGFIHNBMJMK\030\315\016 \001" +
+      "(\010\022\025\n\014country_code\030\352\016 \001(\t\0223\n\027next_res_ve" +
+      "rsion_config\030\267\017 \001(\0132\021.ResVersionConfig\0325" +
+      "\n\023AbilityHashMapEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
+      "lue\030\002 \001(\005:\0028\001\032?\n\021BlockInfoMapEntry\022\013\n\003ke" +
+      "y\030\001 \001(\r\022\031\n\005value\030\002 \001(\0132\n.BlockInfo:\0028\001B\033" +
+      "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BlockInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ResVersionConfigOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.BlockInfoOuterClass.getDescriptor(),
         });
     internal_static_PlayerLoginRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerLoginRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLoginRsp_descriptor,
-        new java.lang.String[] { "ClientVersionSuffix", "AbilityHashMap", "IsTransfer", "TargetHomeOwnerUid", "IsDataNeedRelogin", "GameBiz", "AbilityHashCode", "ShortAbilityHashMap", "FBFJPEPMAOF", "IsUseAbilityHash", "IsAudit", "ClientSilenceMd5", "Msg", "FeatureBlockInfoList", "DNHHIMENOLD", "ClientSilenceDataVersion", "PKKKINOCFMJ", "Retcode", "ClientDataVersion", "Birthday", "BOKKNHEOKPD", "TargetUid", "BlockInfoMap", "GOFGOCDJDND", "NextResourceUrl", "ResVersionConfig", "TotalTickTime", "PlayerData", "ScInfo", "LoginRand", "ENNOCBNIHIK", "CountryCode", "PlayerDataVersion", "ClientSilenceVersionSuffix", "ECKNMCACJKG", "ClientMd5", "NextResVersionConfig", });
+        new java.lang.String[] { "IsNewPlayer", "GameBiz", "OAMCACIICJJ", "PlayerData", "TargetUid", "PCNBCFNBPGF", "AbilityHashCode", "LoginRand", "PlayerDataVersion", "ClientSilenceDataVersion", "Retcode", "AbilityHashMap", "ClientDataVersion", "POPJGOJFOKA", "ShortAbilityHashMap", "ResVersionConfig", "KLLPFNOLBHO", "KECGLOKOIDC", "FeatureBlockInfoList", "EFPHHJIKPJG", "ScInfo", "ClientSilenceVersionSuffix", "TargetHomeOwnerUid", "JAGELBDJFJH", "Msg", "CLJBEGINENC", "TotalTickTime", "ClientVersionSuffix", "ABPMACCDDJH", "NextResourceUrl", "PKEKLEEOLJL", "BlockInfoMap", "Birthday", "JKANELMFGEP", "FGFIHNBMJMK", "CountryCode", "NextResVersionConfig", });
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_descriptor =
       internal_static_PlayerLoginRsp_descriptor.getNestedTypes().get(0);
     internal_static_PlayerLoginRsp_AbilityHashMapEntry_fieldAccessorTable = new
@@ -5413,10 +5402,10 @@ public final class PlayerLoginRspOuterClass {
         internal_static_PlayerLoginRsp_BlockInfoMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
     emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BlockInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.FeatureBlockInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.BlockInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReasonOuterClass.java
new file mode 100644
index 000000000..fdc3ec335
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReasonOuterClass.java
@@ -0,0 +1,212 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: PlayerLogoutReason.proto
+
+package emu.grasscutter.net.proto;
+
+public final class PlayerLogoutReasonOuterClass {
+  private PlayerLogoutReasonOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code PlayerLogoutReason}
+   */
+  public enum PlayerLogoutReason
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>DISCONNECT = 0;</code>
+     */
+    DISCONNECT(0),
+    /**
+     * <code>CLIENT_REQ = 1;</code>
+     */
+    CLIENT_REQ(1),
+    /**
+     * <code>TIMEOUT = 2;</code>
+     */
+    TIMEOUT(2),
+    /**
+     * <code>ADMIN_REQ = 3;</code>
+     */
+    ADMIN_REQ(3),
+    /**
+     * <code>SERVER_CLOSE = 4;</code>
+     */
+    SERVER_CLOSE(4),
+    /**
+     * <code>GM_CLEAR = 5;</code>
+     */
+    GM_CLEAR(5),
+    /**
+     * <code>PLAYER_TRANSFER = 6;</code>
+     */
+    PLAYER_TRANSFER(6),
+    /**
+     * <code>CLIENT_CHECKSUM_INVALID = 7;</code>
+     */
+    CLIENT_CHECKSUM_INVALID(7),
+    /**
+     * <code>MUIP_MOVE_SAVE_WAIT = 8;</code>
+     */
+    MUIP_MOVE_SAVE_WAIT(8),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>DISCONNECT = 0;</code>
+     */
+    public static final int DISCONNECT_VALUE = 0;
+    /**
+     * <code>CLIENT_REQ = 1;</code>
+     */
+    public static final int CLIENT_REQ_VALUE = 1;
+    /**
+     * <code>TIMEOUT = 2;</code>
+     */
+    public static final int TIMEOUT_VALUE = 2;
+    /**
+     * <code>ADMIN_REQ = 3;</code>
+     */
+    public static final int ADMIN_REQ_VALUE = 3;
+    /**
+     * <code>SERVER_CLOSE = 4;</code>
+     */
+    public static final int SERVER_CLOSE_VALUE = 4;
+    /**
+     * <code>GM_CLEAR = 5;</code>
+     */
+    public static final int GM_CLEAR_VALUE = 5;
+    /**
+     * <code>PLAYER_TRANSFER = 6;</code>
+     */
+    public static final int PLAYER_TRANSFER_VALUE = 6;
+    /**
+     * <code>CLIENT_CHECKSUM_INVALID = 7;</code>
+     */
+    public static final int CLIENT_CHECKSUM_INVALID_VALUE = 7;
+    /**
+     * <code>MUIP_MOVE_SAVE_WAIT = 8;</code>
+     */
+    public static final int MUIP_MOVE_SAVE_WAIT_VALUE = 8;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static PlayerLogoutReason valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static PlayerLogoutReason forNumber(int value) {
+      switch (value) {
+        case 0: return DISCONNECT;
+        case 1: return CLIENT_REQ;
+        case 2: return TIMEOUT;
+        case 3: return ADMIN_REQ;
+        case 4: return SERVER_CLOSE;
+        case 5: return GM_CLEAR;
+        case 6: return PLAYER_TRANSFER;
+        case 7: return CLIENT_CHECKSUM_INVALID;
+        case 8: return MUIP_MOVE_SAVE_WAIT;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<PlayerLogoutReason>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        PlayerLogoutReason> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<PlayerLogoutReason>() {
+            public PlayerLogoutReason findValueByNumber(int number) {
+              return PlayerLogoutReason.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final PlayerLogoutReason[] VALUES = values();
+
+    public static PlayerLogoutReason valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private PlayerLogoutReason(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:PlayerLogoutReason)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\030PlayerLogoutReason.proto*\273\001\n\022PlayerLog" +
+      "outReason\022\016\n\nDISCONNECT\020\000\022\016\n\nCLIENT_REQ\020" +
+      "\001\022\013\n\007TIMEOUT\020\002\022\r\n\tADMIN_REQ\020\003\022\020\n\014SERVER_" +
+      "CLOSE\020\004\022\014\n\010GM_CLEAR\020\005\022\023\n\017PLAYER_TRANSFER" +
+      "\020\006\022\033\n\027CLIENT_CHECKSUM_INVALID\020\007\022\027\n\023MUIP_" +
+      "MOVE_SAVE_WAIT\020\010B\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReqOuterClass.java
index 34da671d6..c3fcfaad6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLogoutReqOuterClass.java
@@ -19,22 +19,17 @@ public final class PlayerLogoutReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+     * <code>.PlayerLogoutReason reason = 11;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+     * <code>.PlayerLogoutReason reason = 11;</code>
      * @return The reason.
      */
-    emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason getReason();
+    emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason getReason();
   }
   /**
-   * <pre>
-   * CmdId: 5347
-   * Obf: JLDKOJCCCAM
-   * </pre>
-   *
    * Protobuf type {@code PlayerLogoutReq}
    */
   public static final class PlayerLogoutReq extends
@@ -80,7 +75,7 @@ public final class PlayerLogoutReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 88: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
@@ -118,198 +113,23 @@ public final class PlayerLogoutReqOuterClass {
               emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.class, emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Builder.class);
     }
 
-    /**
-     * <pre>
-     * Obf: HGHJNAABBAM
-     * </pre>
-     *
-     * Protobuf enum {@code PlayerLogoutReq.Reason}
-     */
-    public enum Reason
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>DISCONNECT = 0;</code>
-       */
-      DISCONNECT(0),
-      /**
-       * <code>CLIENT_REQ = 1;</code>
-       */
-      CLIENT_REQ(1),
-      /**
-       * <code>TIMEOUT = 2;</code>
-       */
-      TIMEOUT(2),
-      /**
-       * <code>ADMIN_REQ = 3;</code>
-       */
-      ADMIN_REQ(3),
-      /**
-       * <code>SERVER_CLOSE = 4;</code>
-       */
-      SERVER_CLOSE(4),
-      /**
-       * <code>GM_CLEAR = 5;</code>
-       */
-      GM_CLEAR(5),
-      /**
-       * <code>PLAYER_TRANSFER = 6;</code>
-       */
-      PLAYER_TRANSFER(6),
-      /**
-       * <code>CLIENT_CHECKSUM_INVALID = 7;</code>
-       */
-      CLIENT_CHECKSUM_INVALID(7),
-      /**
-       * <code>REASON_MUIP_MOVE_SAVE_WAIT = 8;</code>
-       */
-      REASON_MUIP_MOVE_SAVE_WAIT(8),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>DISCONNECT = 0;</code>
-       */
-      public static final int DISCONNECT_VALUE = 0;
-      /**
-       * <code>CLIENT_REQ = 1;</code>
-       */
-      public static final int CLIENT_REQ_VALUE = 1;
-      /**
-       * <code>TIMEOUT = 2;</code>
-       */
-      public static final int TIMEOUT_VALUE = 2;
-      /**
-       * <code>ADMIN_REQ = 3;</code>
-       */
-      public static final int ADMIN_REQ_VALUE = 3;
-      /**
-       * <code>SERVER_CLOSE = 4;</code>
-       */
-      public static final int SERVER_CLOSE_VALUE = 4;
-      /**
-       * <code>GM_CLEAR = 5;</code>
-       */
-      public static final int GM_CLEAR_VALUE = 5;
-      /**
-       * <code>PLAYER_TRANSFER = 6;</code>
-       */
-      public static final int PLAYER_TRANSFER_VALUE = 6;
-      /**
-       * <code>CLIENT_CHECKSUM_INVALID = 7;</code>
-       */
-      public static final int CLIENT_CHECKSUM_INVALID_VALUE = 7;
-      /**
-       * <code>REASON_MUIP_MOVE_SAVE_WAIT = 8;</code>
-       */
-      public static final int REASON_MUIP_MOVE_SAVE_WAIT_VALUE = 8;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static Reason valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static Reason forNumber(int value) {
-        switch (value) {
-          case 0: return DISCONNECT;
-          case 1: return CLIENT_REQ;
-          case 2: return TIMEOUT;
-          case 3: return ADMIN_REQ;
-          case 4: return SERVER_CLOSE;
-          case 5: return GM_CLEAR;
-          case 6: return PLAYER_TRANSFER;
-          case 7: return CLIENT_CHECKSUM_INVALID;
-          case 8: return REASON_MUIP_MOVE_SAVE_WAIT;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<Reason>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          Reason> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<Reason>() {
-              public Reason findValueByNumber(int number) {
-                return Reason.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final Reason[] VALUES = values();
-
-      public static Reason valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private Reason(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:PlayerLogoutReq.Reason)
-    }
-
-    public static final int REASON_FIELD_NUMBER = 14;
+    public static final int REASON_FIELD_NUMBER = 11;
     private int reason_;
     /**
-     * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+     * <code>.PlayerLogoutReason reason = 11;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+     * <code>.PlayerLogoutReason reason = 11;</code>
      * @return The reason.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason getReason() {
+    @java.lang.Override public emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason getReason() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason result = emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.valueOf(reason_);
-      return result == null ? emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.UNRECOGNIZED : result;
+      emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason result = emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.valueOf(reason_);
+      return result == null ? emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -326,8 +146,8 @@ public final class PlayerLogoutReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reason_ != emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.DISCONNECT.getNumber()) {
-        output.writeEnum(14, reason_);
+      if (reason_ != emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.DISCONNECT.getNumber()) {
+        output.writeEnum(11, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -338,9 +158,9 @@ public final class PlayerLogoutReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (reason_ != emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.DISCONNECT.getNumber()) {
+      if (reason_ != emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.DISCONNECT.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, reason_);
+          .computeEnumSize(11, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -467,11 +287,6 @@ public final class PlayerLogoutReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5347
-     * Obf: JLDKOJCCCAM
-     * </pre>
-     *
      * Protobuf type {@code PlayerLogoutReq}
      */
     public static final class Builder extends
@@ -620,14 +435,14 @@ public final class PlayerLogoutReqOuterClass {
 
       private int reason_ = 0;
       /**
-       * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+       * <code>.PlayerLogoutReason reason = 11;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+       * <code>.PlayerLogoutReason reason = 11;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -638,21 +453,21 @@ public final class PlayerLogoutReqOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+       * <code>.PlayerLogoutReason reason = 11;</code>
        * @return The reason.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason getReason() {
+      public emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason getReason() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason result = emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.valueOf(reason_);
-        return result == null ? emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason result = emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.valueOf(reason_);
+        return result == null ? emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+       * <code>.PlayerLogoutReason reason = 11;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
-      public Builder setReason(emu.grasscutter.net.proto.PlayerLogoutReqOuterClass.PlayerLogoutReq.Reason value) {
+      public Builder setReason(emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.PlayerLogoutReason value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -662,7 +477,7 @@ public final class PlayerLogoutReqOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLogoutReq.Reason reason = 14;</code>
+       * <code>.PlayerLogoutReason reason = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -738,18 +553,15 @@ public final class PlayerLogoutReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025PlayerLogoutReq.proto\"\363\001\n\017PlayerLogout" +
-      "Req\022\'\n\006reason\030\016 \001(\0162\027.PlayerLogoutReq.Re" +
-      "ason\"\266\001\n\006Reason\022\016\n\nDISCONNECT\020\000\022\016\n\nCLIEN" +
-      "T_REQ\020\001\022\013\n\007TIMEOUT\020\002\022\r\n\tADMIN_REQ\020\003\022\020\n\014S" +
-      "ERVER_CLOSE\020\004\022\014\n\010GM_CLEAR\020\005\022\023\n\017PLAYER_TR" +
-      "ANSFER\020\006\022\033\n\027CLIENT_CHECKSUM_INVALID\020\007\022\036\n" +
-      "\032REASON_MUIP_MOVE_SAVE_WAIT\020\010B\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\n\025PlayerLogoutReq.proto\032\030PlayerLogoutRea" +
+      "son.proto\"6\n\017PlayerLogoutReq\022#\n\006reason\030\013" +
+      " \001(\0162\023.PlayerLogoutReasonB\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.getDescriptor(),
         });
     internal_static_PlayerLogoutReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -757,6 +569,7 @@ public final class PlayerLogoutReqOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLogoutReq_descriptor,
         new java.lang.String[] { "Reason", });
+    emu.grasscutter.net.proto.PlayerLogoutReasonOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLuaShellNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLuaShellNotifyOuterClass.java
index 2597b5f13..ce99d7cd7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerLuaShellNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerLuaShellNotifyOuterClass.java
@@ -19,40 +19,35 @@ public final class PlayerLuaShellNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 id = 10;</code>
+     * <code>uint32 id = 3;</code>
      * @return The id.
      */
     int getId();
 
     /**
-     * <code>bytes lua_shell = 14;</code>
-     * @return The luaShell.
-     */
-    com.google.protobuf.ByteString getLuaShell();
-
-    /**
-     * <code>uint32 use_type = 13;</code>
+     * <code>uint32 use_type = 9;</code>
      * @return The useType.
      */
     int getUseType();
 
     /**
-     * <code>.LuaShellType shell_type = 9;</code>
+     * <code>bytes lua_shell = 10;</code>
+     * @return The luaShell.
+     */
+    com.google.protobuf.ByteString getLuaShell();
+
+    /**
+     * <code>.LuaShellType shell_type = 11;</code>
      * @return The enum numeric value on the wire for shellType.
      */
     int getShellTypeValue();
     /**
-     * <code>.LuaShellType shell_type = 9;</code>
+     * <code>.LuaShellType shell_type = 11;</code>
      * @return The shellType.
      */
     emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType getShellType();
   }
   /**
-   * <pre>
-   * CmdId: 29883
-   * Obf: BGBMONILFCK
-   * </pre>
-   *
    * Protobuf type {@code PlayerLuaShellNotify}
    */
   public static final class PlayerLuaShellNotify extends
@@ -99,27 +94,27 @@ public final class PlayerLuaShellNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
-              int rawValue = input.readEnum();
-
-              shellType_ = rawValue;
-              break;
-            }
-            case 80: {
+            case 24: {
 
               id_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 72: {
 
               useType_ = input.readUInt32();
               break;
             }
-            case 114: {
+            case 82: {
 
               luaShell_ = input.readBytes();
               break;
             }
+            case 88: {
+              int rawValue = input.readEnum();
+
+              shellType_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -152,10 +147,10 @@ public final class PlayerLuaShellNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerLuaShellNotifyOuterClass.PlayerLuaShellNotify.class, emu.grasscutter.net.proto.PlayerLuaShellNotifyOuterClass.PlayerLuaShellNotify.Builder.class);
     }
 
-    public static final int ID_FIELD_NUMBER = 10;
+    public static final int ID_FIELD_NUMBER = 3;
     private int id_;
     /**
-     * <code>uint32 id = 10;</code>
+     * <code>uint32 id = 3;</code>
      * @return The id.
      */
     @java.lang.Override
@@ -163,21 +158,10 @@ public final class PlayerLuaShellNotifyOuterClass {
       return id_;
     }
 
-    public static final int LUA_SHELL_FIELD_NUMBER = 14;
-    private com.google.protobuf.ByteString luaShell_;
-    /**
-     * <code>bytes lua_shell = 14;</code>
-     * @return The luaShell.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getLuaShell() {
-      return luaShell_;
-    }
-
-    public static final int USE_TYPE_FIELD_NUMBER = 13;
+    public static final int USE_TYPE_FIELD_NUMBER = 9;
     private int useType_;
     /**
-     * <code>uint32 use_type = 13;</code>
+     * <code>uint32 use_type = 9;</code>
      * @return The useType.
      */
     @java.lang.Override
@@ -185,17 +169,28 @@ public final class PlayerLuaShellNotifyOuterClass {
       return useType_;
     }
 
-    public static final int SHELL_TYPE_FIELD_NUMBER = 9;
+    public static final int LUA_SHELL_FIELD_NUMBER = 10;
+    private com.google.protobuf.ByteString luaShell_;
+    /**
+     * <code>bytes lua_shell = 10;</code>
+     * @return The luaShell.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getLuaShell() {
+      return luaShell_;
+    }
+
+    public static final int SHELL_TYPE_FIELD_NUMBER = 11;
     private int shellType_;
     /**
-     * <code>.LuaShellType shell_type = 9;</code>
+     * <code>.LuaShellType shell_type = 11;</code>
      * @return The enum numeric value on the wire for shellType.
      */
     @java.lang.Override public int getShellTypeValue() {
       return shellType_;
     }
     /**
-     * <code>.LuaShellType shell_type = 9;</code>
+     * <code>.LuaShellType shell_type = 11;</code>
      * @return The shellType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType getShellType() {
@@ -218,17 +213,17 @@ public final class PlayerLuaShellNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (shellType_ != emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType.LUASHELL_NONE.getNumber()) {
-        output.writeEnum(9, shellType_);
-      }
       if (id_ != 0) {
-        output.writeUInt32(10, id_);
+        output.writeUInt32(3, id_);
       }
       if (useType_ != 0) {
-        output.writeUInt32(13, useType_);
+        output.writeUInt32(9, useType_);
       }
       if (!luaShell_.isEmpty()) {
-        output.writeBytes(14, luaShell_);
+        output.writeBytes(10, luaShell_);
+      }
+      if (shellType_ != emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType.LUASHELL_NONE.getNumber()) {
+        output.writeEnum(11, shellType_);
       }
       unknownFields.writeTo(output);
     }
@@ -239,21 +234,21 @@ public final class PlayerLuaShellNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (shellType_ != emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType.LUASHELL_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, shellType_);
-      }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, id_);
+          .computeUInt32Size(3, id_);
       }
       if (useType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, useType_);
+          .computeUInt32Size(9, useType_);
       }
       if (!luaShell_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(14, luaShell_);
+          .computeBytesSize(10, luaShell_);
+      }
+      if (shellType_ != emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType.LUASHELL_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(11, shellType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -272,10 +267,10 @@ public final class PlayerLuaShellNotifyOuterClass {
 
       if (getId()
           != other.getId()) return false;
-      if (!getLuaShell()
-          .equals(other.getLuaShell())) return false;
       if (getUseType()
           != other.getUseType()) return false;
+      if (!getLuaShell()
+          .equals(other.getLuaShell())) return false;
       if (shellType_ != other.shellType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -290,10 +285,10 @@ public final class PlayerLuaShellNotifyOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + ID_FIELD_NUMBER;
       hash = (53 * hash) + getId();
-      hash = (37 * hash) + LUA_SHELL_FIELD_NUMBER;
-      hash = (53 * hash) + getLuaShell().hashCode();
       hash = (37 * hash) + USE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getUseType();
+      hash = (37 * hash) + LUA_SHELL_FIELD_NUMBER;
+      hash = (53 * hash) + getLuaShell().hashCode();
       hash = (37 * hash) + SHELL_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + shellType_;
       hash = (29 * hash) + unknownFields.hashCode();
@@ -392,11 +387,6 @@ public final class PlayerLuaShellNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29883
-     * Obf: BGBMONILFCK
-     * </pre>
-     *
      * Protobuf type {@code PlayerLuaShellNotify}
      */
     public static final class Builder extends
@@ -436,10 +426,10 @@ public final class PlayerLuaShellNotifyOuterClass {
         super.clear();
         id_ = 0;
 
-        luaShell_ = com.google.protobuf.ByteString.EMPTY;
-
         useType_ = 0;
 
+        luaShell_ = com.google.protobuf.ByteString.EMPTY;
+
         shellType_ = 0;
 
         return this;
@@ -469,8 +459,8 @@ public final class PlayerLuaShellNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerLuaShellNotifyOuterClass.PlayerLuaShellNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerLuaShellNotifyOuterClass.PlayerLuaShellNotify result = new emu.grasscutter.net.proto.PlayerLuaShellNotifyOuterClass.PlayerLuaShellNotify(this);
         result.id_ = id_;
-        result.luaShell_ = luaShell_;
         result.useType_ = useType_;
+        result.luaShell_ = luaShell_;
         result.shellType_ = shellType_;
         onBuilt();
         return result;
@@ -523,12 +513,12 @@ public final class PlayerLuaShellNotifyOuterClass {
         if (other.getId() != 0) {
           setId(other.getId());
         }
-        if (other.getLuaShell() != com.google.protobuf.ByteString.EMPTY) {
-          setLuaShell(other.getLuaShell());
-        }
         if (other.getUseType() != 0) {
           setUseType(other.getUseType());
         }
+        if (other.getLuaShell() != com.google.protobuf.ByteString.EMPTY) {
+          setLuaShell(other.getLuaShell());
+        }
         if (other.shellType_ != 0) {
           setShellTypeValue(other.getShellTypeValue());
         }
@@ -563,7 +553,7 @@ public final class PlayerLuaShellNotifyOuterClass {
 
       private int id_ ;
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 3;</code>
        * @return The id.
        */
       @java.lang.Override
@@ -571,7 +561,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return id_;
       }
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 3;</code>
        * @param value The id to set.
        * @return This builder for chaining.
        */
@@ -582,7 +572,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 id = 10;</code>
+       * <code>uint32 id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearId() {
@@ -592,9 +582,40 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
 
+      private int useType_ ;
+      /**
+       * <code>uint32 use_type = 9;</code>
+       * @return The useType.
+       */
+      @java.lang.Override
+      public int getUseType() {
+        return useType_;
+      }
+      /**
+       * <code>uint32 use_type = 9;</code>
+       * @param value The useType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUseType(int value) {
+        
+        useType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 use_type = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUseType() {
+        
+        useType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.ByteString luaShell_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes lua_shell = 14;</code>
+       * <code>bytes lua_shell = 10;</code>
        * @return The luaShell.
        */
       @java.lang.Override
@@ -602,7 +623,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return luaShell_;
       }
       /**
-       * <code>bytes lua_shell = 14;</code>
+       * <code>bytes lua_shell = 10;</code>
        * @param value The luaShell to set.
        * @return This builder for chaining.
        */
@@ -616,7 +637,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bytes lua_shell = 14;</code>
+       * <code>bytes lua_shell = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearLuaShell() {
@@ -626,47 +647,16 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
 
-      private int useType_ ;
-      /**
-       * <code>uint32 use_type = 13;</code>
-       * @return The useType.
-       */
-      @java.lang.Override
-      public int getUseType() {
-        return useType_;
-      }
-      /**
-       * <code>uint32 use_type = 13;</code>
-       * @param value The useType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUseType(int value) {
-        
-        useType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 use_type = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUseType() {
-        
-        useType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int shellType_ = 0;
       /**
-       * <code>.LuaShellType shell_type = 9;</code>
+       * <code>.LuaShellType shell_type = 11;</code>
        * @return The enum numeric value on the wire for shellType.
        */
       @java.lang.Override public int getShellTypeValue() {
         return shellType_;
       }
       /**
-       * <code>.LuaShellType shell_type = 9;</code>
+       * <code>.LuaShellType shell_type = 11;</code>
        * @param value The enum numeric value on the wire for shellType to set.
        * @return This builder for chaining.
        */
@@ -677,7 +667,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.LuaShellType shell_type = 9;</code>
+       * <code>.LuaShellType shell_type = 11;</code>
        * @return The shellType.
        */
       @java.lang.Override
@@ -687,7 +677,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.LuaShellTypeOuterClass.LuaShellType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.LuaShellType shell_type = 9;</code>
+       * <code>.LuaShellType shell_type = 11;</code>
        * @param value The shellType to set.
        * @return This builder for chaining.
        */
@@ -701,7 +691,7 @@ public final class PlayerLuaShellNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.LuaShellType shell_type = 9;</code>
+       * <code>.LuaShellType shell_type = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearShellType() {
@@ -778,9 +768,9 @@ public final class PlayerLuaShellNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerLuaShellNotify.proto\032\022LuaShellTy" +
-      "pe.proto\"j\n\024PlayerLuaShellNotify\022\n\n\002id\030\n" +
-      " \001(\r\022\021\n\tlua_shell\030\016 \001(\014\022\020\n\010use_type\030\r \001(" +
-      "\r\022!\n\nshell_type\030\t \001(\0162\r.LuaShellTypeB\033\n\031" +
+      "pe.proto\"j\n\024PlayerLuaShellNotify\022\n\n\002id\030\003" +
+      " \001(\r\022\020\n\010use_type\030\t \001(\r\022\021\n\tlua_shell\030\n \001(" +
+      "\014\022!\n\nshell_type\030\013 \001(\0162\r.LuaShellTypeB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -793,7 +783,7 @@ public final class PlayerLuaShellNotifyOuterClass {
     internal_static_PlayerLuaShellNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerLuaShellNotify_descriptor,
-        new java.lang.String[] { "Id", "LuaShell", "UseType", "ShellType", });
+        new java.lang.String[] { "Id", "UseType", "LuaShell", "ShellType", });
     emu.grasscutter.net.proto.LuaShellTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
index 8122e960e..a0b80af08 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPreEnterMpNotifyOuterClass.java
@@ -19,40 +19,35 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+     * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
      * @return The enum numeric value on the wire for state.
      */
     int getStateValue();
     /**
-     * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+     * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
      * @return The state.
      */
     emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State getState();
 
     /**
-     * <code>string nickname = 10;</code>
+     * <code>uint32 uid = 3;</code>
+     * @return The uid.
+     */
+    int getUid();
+
+    /**
+     * <code>string nickname = 12;</code>
      * @return The nickname.
      */
     java.lang.String getNickname();
     /**
-     * <code>string nickname = 10;</code>
+     * <code>string nickname = 12;</code>
      * @return The bytes for nickname.
      */
     com.google.protobuf.ByteString
         getNicknameBytes();
-
-    /**
-     * <code>uint32 uid = 5;</code>
-     * @return The uid.
-     */
-    int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 23905
-   * Obf: ONELCJDDCIP
-   * </pre>
-   *
    * Protobuf type {@code PlayerPreEnterMpNotify}
    */
   public static final class PlayerPreEnterMpNotify extends
@@ -99,23 +94,23 @@ public final class PlayerPreEnterMpNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 8: {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
+              break;
+            }
+            case 24: {
 
               uid_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 98: {
               java.lang.String s = input.readStringRequireUtf8();
 
               nickname_ = s;
               break;
             }
-            case 88: {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +144,6 @@ public final class PlayerPreEnterMpNotifyOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: CIAEAJLPCDG
-     * </pre>
-     *
      * Protobuf enum {@code PlayerPreEnterMpNotify.State}
      */
     public enum State
@@ -269,17 +260,17 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:PlayerPreEnterMpNotify.State)
     }
 
-    public static final int STATE_FIELD_NUMBER = 11;
+    public static final int STATE_FIELD_NUMBER = 1;
     private int state_;
     /**
-     * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+     * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
      * @return The enum numeric value on the wire for state.
      */
     @java.lang.Override public int getStateValue() {
       return state_;
     }
     /**
-     * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+     * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
      * @return The state.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State getState() {
@@ -288,10 +279,21 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.UNRECOGNIZED : result;
     }
 
-    public static final int NICKNAME_FIELD_NUMBER = 10;
+    public static final int UID_FIELD_NUMBER = 3;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 3;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
+    public static final int NICKNAME_FIELD_NUMBER = 12;
     private volatile java.lang.Object nickname_;
     /**
-     * <code>string nickname = 10;</code>
+     * <code>string nickname = 12;</code>
      * @return The nickname.
      */
     @java.lang.Override
@@ -308,7 +310,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       }
     }
     /**
-     * <code>string nickname = 10;</code>
+     * <code>string nickname = 12;</code>
      * @return The bytes for nickname.
      */
     @java.lang.Override
@@ -326,17 +328,6 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       }
     }
 
-    public static final int UID_FIELD_NUMBER = 5;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 5;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -351,14 +342,14 @@ public final class PlayerPreEnterMpNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
+        output.writeEnum(1, state_);
+      }
       if (uid_ != 0) {
-        output.writeUInt32(5, uid_);
+        output.writeUInt32(3, uid_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, nickname_);
-      }
-      if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
-        output.writeEnum(11, state_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, nickname_);
       }
       unknownFields.writeTo(output);
     }
@@ -369,16 +360,16 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, uid_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, nickname_);
-      }
       if (state_ != emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, state_);
+          .computeEnumSize(1, state_);
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, uid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickname_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, nickname_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -396,10 +387,10 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify other = (emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify) obj;
 
       if (state_ != other.state_) return false;
-      if (!getNickname()
-          .equals(other.getNickname())) return false;
       if (getUid()
           != other.getUid()) return false;
+      if (!getNickname()
+          .equals(other.getNickname())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -413,10 +404,10 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + STATE_FIELD_NUMBER;
       hash = (53 * hash) + state_;
-      hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
-      hash = (53 * hash) + getNickname().hashCode();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
+      hash = (37 * hash) + NICKNAME_FIELD_NUMBER;
+      hash = (53 * hash) + getNickname().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -513,11 +504,6 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23905
-     * Obf: ONELCJDDCIP
-     * </pre>
-     *
      * Protobuf type {@code PlayerPreEnterMpNotify}
      */
     public static final class Builder extends
@@ -557,10 +543,10 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         super.clear();
         state_ = 0;
 
-        nickname_ = "";
-
         uid_ = 0;
 
+        nickname_ = "";
+
         return this;
       }
 
@@ -588,8 +574,8 @@ public final class PlayerPreEnterMpNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify result = new emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify(this);
         result.state_ = state_;
-        result.nickname_ = nickname_;
         result.uid_ = uid_;
+        result.nickname_ = nickname_;
         onBuilt();
         return result;
       }
@@ -641,13 +627,13 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         if (other.state_ != 0) {
           setStateValue(other.getStateValue());
         }
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         if (!other.getNickname().isEmpty()) {
           nickname_ = other.nickname_;
           onChanged();
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -679,14 +665,14 @@ public final class PlayerPreEnterMpNotifyOuterClass {
 
       private int state_ = 0;
       /**
-       * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+       * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+       * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -697,7 +683,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+       * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -707,7 +693,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerPreEnterMpNotifyOuterClass.PlayerPreEnterMpNotify.State.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+       * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -721,7 +707,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerPreEnterMpNotify.State state = 11;</code>
+       * <code>.PlayerPreEnterMpNotify.State state = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -731,9 +717,40 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return this;
       }
 
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 3;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 3;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object nickname_ = "";
       /**
-       * <code>string nickname = 10;</code>
+       * <code>string nickname = 12;</code>
        * @return The nickname.
        */
       public java.lang.String getNickname() {
@@ -749,7 +766,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>string nickname = 10;</code>
+       * <code>string nickname = 12;</code>
        * @return The bytes for nickname.
        */
       public com.google.protobuf.ByteString
@@ -766,7 +783,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         }
       }
       /**
-       * <code>string nickname = 10;</code>
+       * <code>string nickname = 12;</code>
        * @param value The nickname to set.
        * @return This builder for chaining.
        */
@@ -781,7 +798,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string nickname = 10;</code>
+       * <code>string nickname = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearNickname() {
@@ -791,7 +808,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         return this;
       }
       /**
-       * <code>string nickname = 10;</code>
+       * <code>string nickname = 12;</code>
        * @param value The bytes for nickname to set.
        * @return This builder for chaining.
        */
@@ -806,37 +823,6 @@ public final class PlayerPreEnterMpNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 5;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 5;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -905,9 +891,9 @@ public final class PlayerPreEnterMpNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034PlayerPreEnterMpNotify.proto\"\223\001\n\026Playe" +
-      "rPreEnterMpNotify\022,\n\005state\030\013 \001(\0162\035.Playe" +
-      "rPreEnterMpNotify.State\022\020\n\010nickname\030\n \001(" +
-      "\t\022\013\n\003uid\030\005 \001(\r\",\n\005State\022\013\n\007INVALID\020\000\022\t\n\005" +
+      "rPreEnterMpNotify\022,\n\005state\030\001 \001(\0162\035.Playe" +
+      "rPreEnterMpNotify.State\022\013\n\003uid\030\003 \001(\r\022\020\n\010" +
+      "nickname\030\014 \001(\t\",\n\005State\022\013\n\007INVALID\020\000\022\t\n\005" +
       "START\020\001\022\013\n\007TIMEOUT\020\002B\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
@@ -920,7 +906,7 @@ public final class PlayerPreEnterMpNotifyOuterClass {
     internal_static_PlayerPreEnterMpNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerPreEnterMpNotify_descriptor,
-        new java.lang.String[] { "State", "Nickname", "Uid", });
+        new java.lang.String[] { "State", "Uid", "Nickname", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 44b159a85..5ad8e3f33 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class PlayerPropChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 prop_delta = 4;</code>
+     * <code>uint32 prop_delta = 7;</code>
      * @return The propDelta.
      */
     int getPropDelta();
 
     /**
-     * <code>uint32 prop_type = 6;</code>
+     * <code>uint32 prop_type = 13;</code>
      * @return The propType.
      */
     int getPropType();
   }
   /**
-   * <pre>
-   * CmdId: 24729
-   * Obf: JMOMPLEOGLD
-   * </pre>
-   *
    * Protobuf type {@code PlayerPropChangeNotify}
    */
   public static final class PlayerPropChangeNotify extends
@@ -80,12 +75,12 @@ public final class PlayerPropChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 56: {
 
               propDelta_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 104: {
 
               propType_ = input.readUInt32();
               break;
@@ -122,10 +117,10 @@ public final class PlayerPropChangeNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.class, emu.grasscutter.net.proto.PlayerPropChangeNotifyOuterClass.PlayerPropChangeNotify.Builder.class);
     }
 
-    public static final int PROP_DELTA_FIELD_NUMBER = 4;
+    public static final int PROP_DELTA_FIELD_NUMBER = 7;
     private int propDelta_;
     /**
-     * <code>uint32 prop_delta = 4;</code>
+     * <code>uint32 prop_delta = 7;</code>
      * @return The propDelta.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class PlayerPropChangeNotifyOuterClass {
       return propDelta_;
     }
 
-    public static final int PROP_TYPE_FIELD_NUMBER = 6;
+    public static final int PROP_TYPE_FIELD_NUMBER = 13;
     private int propType_;
     /**
-     * <code>uint32 prop_type = 6;</code>
+     * <code>uint32 prop_type = 13;</code>
      * @return The propType.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class PlayerPropChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (propDelta_ != 0) {
-        output.writeUInt32(4, propDelta_);
+        output.writeUInt32(7, propDelta_);
       }
       if (propType_ != 0) {
-        output.writeUInt32(6, propType_);
+        output.writeUInt32(13, propType_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class PlayerPropChangeNotifyOuterClass {
       size = 0;
       if (propDelta_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, propDelta_);
+          .computeUInt32Size(7, propDelta_);
       }
       if (propType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, propType_);
+          .computeUInt32Size(13, propType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class PlayerPropChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24729
-     * Obf: JMOMPLEOGLD
-     * </pre>
-     *
      * Protobuf type {@code PlayerPropChangeNotify}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class PlayerPropChangeNotifyOuterClass {
 
       private int propDelta_ ;
       /**
-       * <code>uint32 prop_delta = 4;</code>
+       * <code>uint32 prop_delta = 7;</code>
        * @return The propDelta.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class PlayerPropChangeNotifyOuterClass {
         return propDelta_;
       }
       /**
-       * <code>uint32 prop_delta = 4;</code>
+       * <code>uint32 prop_delta = 7;</code>
        * @param value The propDelta to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class PlayerPropChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 prop_delta = 4;</code>
+       * <code>uint32 prop_delta = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearPropDelta() {
@@ -501,7 +491,7 @@ public final class PlayerPropChangeNotifyOuterClass {
 
       private int propType_ ;
       /**
-       * <code>uint32 prop_type = 6;</code>
+       * <code>uint32 prop_type = 13;</code>
        * @return The propType.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class PlayerPropChangeNotifyOuterClass {
         return propType_;
       }
       /**
-       * <code>uint32 prop_type = 6;</code>
+       * <code>uint32 prop_type = 13;</code>
        * @param value The propType to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class PlayerPropChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 prop_type = 6;</code>
+       * <code>uint32 prop_type = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearPropType() {
@@ -597,8 +587,8 @@ public final class PlayerPropChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034PlayerPropChangeNotify.proto\"?\n\026Player" +
-      "PropChangeNotify\022\022\n\nprop_delta\030\004 \001(\r\022\021\n\t" +
-      "prop_type\030\006 \001(\rB\033\n\031emu.grasscutter.net.p" +
+      "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" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 b8fd79ec2..71a5c0796 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerPropChangeReasonNotifyOuterClass.java
@@ -19,40 +19,35 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PropChangeReason reason = 11;</code>
-     * @return The enum numeric value on the wire for reason.
-     */
-    int getReasonValue();
-    /**
-     * <code>.PropChangeReason reason = 11;</code>
-     * @return The reason.
-     */
-    emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason();
-
-    /**
-     * <code>float old_value = 15;</code>
-     * @return The oldValue.
-     */
-    float getOldValue();
-
-    /**
-     * <code>float cur_value = 10;</code>
+     * <code>float cur_value = 1;</code>
      * @return The curValue.
      */
     float getCurValue();
 
     /**
-     * <code>uint32 prop_type = 8;</code>
+     * <code>.PropChangeReason reason = 10;</code>
+     * @return The enum numeric value on the wire for reason.
+     */
+    int getReasonValue();
+    /**
+     * <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: 28241
-   * Obf: PEAMCBGHMPI
-   * </pre>
-   *
    * Protobuf type {@code PlayerPropChangeReasonNotify}
    */
   public static final class PlayerPropChangeReasonNotify extends
@@ -98,23 +93,23 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              propType_ = input.readUInt32();
-              break;
-            }
-            case 85: {
+            case 13: {
 
               curValue_ = input.readFloat();
               break;
             }
-            case 88: {
+            case 80: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
               break;
             }
-            case 125: {
+            case 88: {
+
+              propType_ = input.readUInt32();
+              break;
+            }
+            case 109: {
 
               oldValue_ = input.readFloat();
               break;
@@ -151,17 +146,28 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.class, emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.Builder.class);
     }
 
-    public static final int REASON_FIELD_NUMBER = 11;
+    public static final int CUR_VALUE_FIELD_NUMBER = 1;
+    private float curValue_;
+    /**
+     * <code>float cur_value = 1;</code>
+     * @return The curValue.
+     */
+    @java.lang.Override
+    public float getCurValue() {
+      return curValue_;
+    }
+
+    public static final int REASON_FIELD_NUMBER = 10;
     private int reason_;
     /**
-     * <code>.PropChangeReason reason = 11;</code>
+     * <code>.PropChangeReason reason = 10;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.PropChangeReason reason = 11;</code>
+     * <code>.PropChangeReason reason = 10;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason getReason() {
@@ -170,32 +176,10 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
     }
 
-    public static final int OLD_VALUE_FIELD_NUMBER = 15;
-    private float oldValue_;
-    /**
-     * <code>float old_value = 15;</code>
-     * @return The oldValue.
-     */
-    @java.lang.Override
-    public float getOldValue() {
-      return oldValue_;
-    }
-
-    public static final int CUR_VALUE_FIELD_NUMBER = 10;
-    private float curValue_;
-    /**
-     * <code>float cur_value = 10;</code>
-     * @return The curValue.
-     */
-    @java.lang.Override
-    public float getCurValue() {
-      return curValue_;
-    }
-
-    public static final int PROP_TYPE_FIELD_NUMBER = 8;
+    public static final int PROP_TYPE_FIELD_NUMBER = 11;
     private int propType_;
     /**
-     * <code>uint32 prop_type = 8;</code>
+     * <code>uint32 prop_type = 11;</code>
      * @return The propType.
      */
     @java.lang.Override
@@ -203,6 +187,17 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       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,17 +212,17 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (propType_ != 0) {
-        output.writeUInt32(8, propType_);
-      }
       if (curValue_ != 0F) {
-        output.writeFloat(10, curValue_);
+        output.writeFloat(1, curValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
-        output.writeEnum(11, reason_);
+        output.writeEnum(10, reason_);
+      }
+      if (propType_ != 0) {
+        output.writeUInt32(11, propType_);
       }
       if (oldValue_ != 0F) {
-        output.writeFloat(15, oldValue_);
+        output.writeFloat(13, oldValue_);
       }
       unknownFields.writeTo(output);
     }
@@ -238,21 +233,21 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (propType_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, propType_);
-      }
       if (curValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(10, curValue_);
+          .computeFloatSize(1, curValue_);
       }
       if (reason_ != emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.PROP_CHANGE_REASON_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, reason_);
+          .computeEnumSize(10, reason_);
+      }
+      if (propType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, propType_);
       }
       if (oldValue_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(15, oldValue_);
+          .computeFloatSize(13, oldValue_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -269,15 +264,15 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify other = (emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify) obj;
 
-      if (reason_ != other.reason_) return false;
-      if (java.lang.Float.floatToIntBits(getOldValue())
-          != java.lang.Float.floatToIntBits(
-              other.getOldValue())) 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 (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -289,16 +284,16 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
-      hash = (37 * hash) + OLD_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getOldValue());
       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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -395,11 +390,6 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28241
-     * Obf: PEAMCBGHMPI
-     * </pre>
-     *
      * Protobuf type {@code PlayerPropChangeReasonNotify}
      */
     public static final class Builder extends
@@ -437,14 +427,14 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        reason_ = 0;
-
-        oldValue_ = 0F;
-
         curValue_ = 0F;
 
+        reason_ = 0;
+
         propType_ = 0;
 
+        oldValue_ = 0F;
+
         return this;
       }
 
@@ -471,10 +461,10 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
       @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.reason_ = reason_;
-        result.oldValue_ = oldValue_;
         result.curValue_ = curValue_;
+        result.reason_ = reason_;
         result.propType_ = propType_;
+        result.oldValue_ = oldValue_;
         onBuilt();
         return result;
       }
@@ -523,18 +513,18 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerPropChangeReasonNotifyOuterClass.PlayerPropChangeReasonNotify.getDefaultInstance()) return this;
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
-        }
-        if (other.getOldValue() != 0F) {
-          setOldValue(other.getOldValue());
-        }
         if (other.getCurValue() != 0F) {
           setCurValue(other.getCurValue());
         }
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
+        }
         if (other.getPropType() != 0) {
           setPropType(other.getPropType());
         }
+        if (other.getOldValue() != 0F) {
+          setOldValue(other.getOldValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,16 +554,47 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return this;
       }
 
+      private float curValue_ ;
+      /**
+       * <code>float cur_value = 1;</code>
+       * @return The curValue.
+       */
+      @java.lang.Override
+      public float getCurValue() {
+        return curValue_;
+      }
+      /**
+       * <code>float cur_value = 1;</code>
+       * @param value The curValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurValue(float value) {
+        
+        curValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float cur_value = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurValue() {
+        
+        curValue_ = 0F;
+        onChanged();
+        return this;
+      }
+
       private int reason_ = 0;
       /**
-       * <code>.PropChangeReason reason = 11;</code>
+       * <code>.PropChangeReason reason = 10;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.PropChangeReason reason = 11;</code>
+       * <code>.PropChangeReason reason = 10;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -584,7 +605,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 11;</code>
+       * <code>.PropChangeReason reason = 10;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -594,7 +615,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PropChangeReasonOuterClass.PropChangeReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PropChangeReason reason = 11;</code>
+       * <code>.PropChangeReason reason = 10;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -608,7 +629,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PropChangeReason reason = 11;</code>
+       * <code>.PropChangeReason reason = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -618,71 +639,9 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return this;
       }
 
-      private float oldValue_ ;
-      /**
-       * <code>float old_value = 15;</code>
-       * @return The oldValue.
-       */
-      @java.lang.Override
-      public float getOldValue() {
-        return oldValue_;
-      }
-      /**
-       * <code>float old_value = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldValue() {
-        
-        oldValue_ = 0F;
-        onChanged();
-        return this;
-      }
-
-      private float curValue_ ;
-      /**
-       * <code>float cur_value = 10;</code>
-       * @return The curValue.
-       */
-      @java.lang.Override
-      public float getCurValue() {
-        return curValue_;
-      }
-      /**
-       * <code>float cur_value = 10;</code>
-       * @param value The curValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurValue(float value) {
-        
-        curValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float cur_value = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurValue() {
-        
-        curValue_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private int propType_ ;
       /**
-       * <code>uint32 prop_type = 8;</code>
+       * <code>uint32 prop_type = 11;</code>
        * @return The propType.
        */
       @java.lang.Override
@@ -690,7 +649,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return propType_;
       }
       /**
-       * <code>uint32 prop_type = 8;</code>
+       * <code>uint32 prop_type = 11;</code>
        * @param value The propType to set.
        * @return This builder for chaining.
        */
@@ -701,7 +660,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 prop_type = 8;</code>
+       * <code>uint32 prop_type = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearPropType() {
@@ -710,6 +669,37 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
         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) {
@@ -779,9 +769,9 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\"PlayerPropChangeReasonNotify.proto\032\026Pr" +
       "opChangeReason.proto\"z\n\034PlayerPropChange" +
-      "ReasonNotify\022!\n\006reason\030\013 \001(\0162\021.PropChang" +
-      "eReason\022\021\n\told_value\030\017 \001(\002\022\021\n\tcur_value\030" +
-      "\n \001(\002\022\021\n\tprop_type\030\010 \001(\rB\033\n\031emu.grasscut" +
+      "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" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -794,7 +784,7 @@ public final class PlayerPropChangeReasonNotifyOuterClass {
     internal_static_PlayerPropChangeReasonNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerPropChangeReasonNotify_descriptor,
-        new java.lang.String[] { "Reason", "OldValue", "CurValue", "PropType", });
+        new java.lang.String[] { "CurValue", "Reason", "PropType", "OldValue", });
     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 73d7a244e..93161bacf 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,11 @@ public final class PlayerPropNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     int getPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     boolean containsPropMap(
         int key);
@@ -34,30 +34,25 @@ public final class PlayerPropNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <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 = 14;</code>
+     * <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 = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getPropMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 7058
-   * Obf: LFMCGGCLACB
-   * </pre>
-   *
    * Protobuf type {@code PlayerPropNotify}
    */
   public static final class PlayerPropNotify extends
@@ -103,7 +98,7 @@ public final class PlayerPropNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 114: {
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 propMap_ = com.google.protobuf.MapField.newMapField(
                     PropMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class PlayerPropNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 14:
+        case 12:
           return internalGetPropMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class PlayerPropNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify.class, emu.grasscutter.net.proto.PlayerPropNotifyOuterClass.PlayerPropNotify.Builder.class);
     }
 
-    public static final int PROP_MAP_FIELD_NUMBER = 14;
+    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 =
@@ -187,7 +182,7 @@ public final class PlayerPropNotifyOuterClass {
       return internalGetPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class PlayerPropNotifyOuterClass {
       return getPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class PlayerPropNotifyOuterClass {
       return internalGetPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class PlayerPropNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+     * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class PlayerPropNotifyOuterClass {
           output,
           internalGetPropMap(),
           PropMapDefaultEntryHolder.defaultEntry,
-          14);
+          12);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class PlayerPropNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(14, propMap__);
+            .computeMessageSize(12, propMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class PlayerPropNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7058
-     * Obf: LFMCGGCLACB
-     * </pre>
-     *
      * Protobuf type {@code PlayerPropNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class PlayerPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 14:
+          case 12:
             return internalGetPropMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class PlayerPropNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 14:
+          case 12:
             return internalGetMutablePropMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class PlayerPropNotifyOuterClass {
         return internalGetPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class PlayerPropNotifyOuterClass {
         return getPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class PlayerPropNotifyOuterClass {
         return internalGetPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class PlayerPropNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class PlayerPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder removePropMap(
@@ -688,7 +678,7 @@ public final class PlayerPropNotifyOuterClass {
         return internalGetMutablePropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
       public Builder putPropMap(
           int key,
@@ -700,7 +690,7 @@ public final class PlayerPropNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; prop_map = 14;</code>
+       * <code>map&lt;uint32, .PropValue&gt; prop_map = 12;</code>
        */
 
       public Builder putAllPropMap(
@@ -782,7 +772,7 @@ public final class PlayerPropNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerPropNotify.proto\032\017PropValue.prot" +
-      "o\"\200\001\n\020PlayerPropNotify\0220\n\010prop_map\030\016 \003(\013" +
+      "o\"\200\001\n\020PlayerPropNotify\0220\n\010prop_map\030\014 \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/PlayerQuitDungeonReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java
index 337ff7a6b..17ad5bf04 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonReqOuterClass.java
@@ -19,23 +19,18 @@ public final class PlayerQuitDungeonReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 10;</code>
      * @return The pointId.
      */
     int getPointId();
 
     /**
-     * <code>bool is_quit_immediately = 13;</code>
+     * <code>bool is_quit_immediately = 1;</code>
      * @return The isQuitImmediately.
      */
     boolean getIsQuitImmediately();
   }
   /**
-   * <pre>
-   * CmdId: 20980
-   * Obf: CCMGMAFLDCH
-   * </pre>
-   *
    * Protobuf type {@code PlayerQuitDungeonReq}
    */
   public static final class PlayerQuitDungeonReq extends
@@ -80,16 +75,16 @@ public final class PlayerQuitDungeonReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              pointId_ = input.readUInt32();
-              break;
-            }
-            case 104: {
+            case 8: {
 
               isQuitImmediately_ = input.readBool();
               break;
             }
+            case 80: {
+
+              pointId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class PlayerQuitDungeonReqOuterClass {
               emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.class, emu.grasscutter.net.proto.PlayerQuitDungeonReqOuterClass.PlayerQuitDungeonReq.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 5;
+    public static final int POINT_ID_FIELD_NUMBER = 10;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 10;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class PlayerQuitDungeonReqOuterClass {
       return pointId_;
     }
 
-    public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 13;
+    public static final int IS_QUIT_IMMEDIATELY_FIELD_NUMBER = 1;
     private boolean isQuitImmediately_;
     /**
-     * <code>bool is_quit_immediately = 13;</code>
+     * <code>bool is_quit_immediately = 1;</code>
      * @return The isQuitImmediately.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class PlayerQuitDungeonReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pointId_ != 0) {
-        output.writeUInt32(5, pointId_);
-      }
       if (isQuitImmediately_ != false) {
-        output.writeBool(13, isQuitImmediately_);
+        output.writeBool(1, isQuitImmediately_);
+      }
+      if (pointId_ != 0) {
+        output.writeUInt32(10, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class PlayerQuitDungeonReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pointId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, pointId_);
-      }
       if (isQuitImmediately_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isQuitImmediately_);
+          .computeBoolSize(1, isQuitImmediately_);
+      }
+      if (pointId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class PlayerQuitDungeonReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20980
-     * Obf: CCMGMAFLDCH
-     * </pre>
-     *
      * Protobuf type {@code PlayerQuitDungeonReq}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class PlayerQuitDungeonReqOuterClass {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 10;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class PlayerQuitDungeonReqOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 10;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class PlayerQuitDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -502,7 +492,7 @@ public final class PlayerQuitDungeonReqOuterClass {
 
       private boolean isQuitImmediately_ ;
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 1;</code>
        * @return The isQuitImmediately.
        */
       @java.lang.Override
@@ -510,7 +500,7 @@ public final class PlayerQuitDungeonReqOuterClass {
         return isQuitImmediately_;
       }
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 1;</code>
        * @param value The isQuitImmediately to set.
        * @return This builder for chaining.
        */
@@ -521,7 +511,7 @@ public final class PlayerQuitDungeonReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_quit_immediately = 13;</code>
+       * <code>bool is_quit_immediately = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsQuitImmediately() {
@@ -598,8 +588,8 @@ public final class PlayerQuitDungeonReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerQuitDungeonReq.proto\"E\n\024PlayerQu" +
-      "itDungeonReq\022\020\n\010point_id\030\005 \001(\r\022\033\n\023is_qui" +
-      "t_immediately\030\r \001(\010B\033\n\031emu.grasscutter.n" +
+      "itDungeonReq\022\020\n\010point_id\030\n \001(\r\022\033\n\023is_qui" +
+      "t_immediately\030\001 \001(\010B\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/PlayerQuitDungeonRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonRspOuterClass.java
index 456e89c07..303b016f2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitDungeonRspOuterClass.java
@@ -19,23 +19,18 @@ public final class PlayerQuitDungeonRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 point_id = 13;</code>
+     * <code>uint32 point_id = 3;</code>
      * @return The pointId.
      */
     int getPointId();
+
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 4431
-   * Obf: KHKEMHFADOL
-   * </pre>
-   *
    * Protobuf type {@code PlayerQuitDungeonRsp}
    */
   public static final class PlayerQuitDungeonRsp extends
@@ -80,16 +75,16 @@ public final class PlayerQuitDungeonRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 104: {
+            case 24: {
 
               pointId_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class PlayerQuitDungeonRspOuterClass {
               emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp.class, emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    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>
+     * <code>uint32 point_id = 3;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class PlayerQuitDungeonRspOuterClass {
       return pointId_;
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class PlayerQuitDungeonRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
-      }
       if (pointId_ != 0) {
-        output.writeUInt32(13, pointId_);
+        output.writeUInt32(3, pointId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class PlayerQuitDungeonRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
-      }
       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_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class PlayerQuitDungeonRspOuterClass {
       }
       emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp other = (emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getPointId()
           != other.getPointId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class PlayerQuitDungeonRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getPointId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class PlayerQuitDungeonRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4431
-     * Obf: KHKEMHFADOL
-     * </pre>
-     *
      * Protobuf type {@code PlayerQuitDungeonRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class PlayerQuitDungeonRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         pointId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class PlayerQuitDungeonRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp buildPartial() {
         emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp result = new emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp(this);
-        result.retcode_ = retcode_;
         result.pointId_ = pointId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class PlayerQuitDungeonRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp other) {
         if (other == emu.grasscutter.net.proto.PlayerQuitDungeonRspOuterClass.PlayerQuitDungeonRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getPointId() != 0) {
           setPointId(other.getPointId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class PlayerQuitDungeonRspOuterClass {
         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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <code>uint32 point_id = 3;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class PlayerQuitDungeonRspOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <code>uint32 point_id = 3;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class PlayerQuitDungeonRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 13;</code>
+       * <code>uint32 point_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -529,6 +488,37 @@ public final class PlayerQuitDungeonRspOuterClass {
         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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class PlayerQuitDungeonRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerQuitDungeonRsp.proto\"9\n\024PlayerQu" +
-      "itDungeonRsp\022\017\n\007retcode\030\010 \001(\005\022\020\n\010point_i" +
-      "d\030\r \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "itDungeonRsp\022\020\n\010point_id\030\003 \001(\r\022\017\n\007retcod" +
+      "e\030\016 \001(\005B\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class PlayerQuitDungeonRspOuterClass {
     internal_static_PlayerQuitDungeonRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerQuitDungeonRsp_descriptor,
-        new java.lang.String[] { "Retcode", "PointId", });
+        new java.lang.String[] { "PointId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitFromHomeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitFromHomeNotifyOuterClass.java
index 34944d56c..6f5985dc9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitFromHomeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerQuitFromHomeNotifyOuterClass.java
@@ -19,22 +19,17 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.PlayerQuitFromHomeNotifyOuterClass.PlayerQuitFromHomeNotify.QuitReason getReason();
   }
   /**
-   * <pre>
-   * CmdId: 27102
-   * Obf: CAIIHFNBIMA
-   * </pre>
-   *
    * Protobuf type {@code PlayerQuitFromHomeNotify}
    */
   public static final class PlayerQuitFromHomeNotify extends
@@ -80,7 +75,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 120: {
               int rawValue = input.readEnum();
 
               reason_ = rawValue;
@@ -119,10 +114,6 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: ALCHPFAKDCI
-     * </pre>
-     *
      * Protobuf enum {@code PlayerQuitFromHomeNotify.QuitReason}
      */
     public enum QuitReason
@@ -275,17 +266,17 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:PlayerQuitFromHomeNotify.QuitReason)
     }
 
-    public static final int REASON_FIELD_NUMBER = 14;
+    public static final int REASON_FIELD_NUMBER = 15;
     private int reason_;
     /**
-     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+     * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerQuitFromHomeNotifyOuterClass.PlayerQuitFromHomeNotify.QuitReason getReason() {
@@ -309,7 +300,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (reason_ != emu.grasscutter.net.proto.PlayerQuitFromHomeNotifyOuterClass.PlayerQuitFromHomeNotify.QuitReason.INVALID.getNumber()) {
-        output.writeEnum(14, reason_);
+        output.writeEnum(15, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -322,7 +313,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
       size = 0;
       if (reason_ != emu.grasscutter.net.proto.PlayerQuitFromHomeNotifyOuterClass.PlayerQuitFromHomeNotify.QuitReason.INVALID.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(14, reason_);
+          .computeEnumSize(15, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -449,11 +440,6 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27102
-     * Obf: CAIIHFNBIMA
-     * </pre>
-     *
      * Protobuf type {@code PlayerQuitFromHomeNotify}
      */
     public static final class Builder extends
@@ -602,14 +588,14 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
 
       private int reason_ = 0;
       /**
-       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -620,7 +606,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -630,7 +616,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerQuitFromHomeNotifyOuterClass.PlayerQuitFromHomeNotify.QuitReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -644,7 +630,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 14;</code>
+       * <code>.PlayerQuitFromHomeNotify.QuitReason reason = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -721,7 +707,7 @@ public final class PlayerQuitFromHomeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036PlayerQuitFromHomeNotify.proto\"\341\001\n\030Pla" +
-      "yerQuitFromHomeNotify\0224\n\006reason\030\016 \001(\0162$." +
+      "yerQuitFromHomeNotify\0224\n\006reason\030\017 \001(\0162$." +
       "PlayerQuitFromHomeNotify.QuitReason\"\216\001\n\n" +
       "QuitReason\022\013\n\007INVALID\020\000\022\020\n\014KICK_BY_HOST\020" +
       "\001\022\024\n\020BACK_TO_MY_WORLD\020\002\022\020\n\014HOME_BLOCKED\020" +
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
index fcabf55d0..64b710ec3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerRTTInfoOuterClass.java
@@ -25,16 +25,12 @@ public final class PlayerRTTInfoOuterClass {
     int getRtt();
 
     /**
-     * <code>uint32 uid = 1;</code>
+     * <code>uint32 uid = 11;</code>
      * @return The uid.
      */
     int getUid();
   }
   /**
-   * <pre>
-   * Obf: MCDPPKMOEJJ
-   * </pre>
-   *
    * Protobuf type {@code PlayerRTTInfo}
    */
   public static final class PlayerRTTInfo extends
@@ -79,16 +75,16 @@ public final class PlayerRTTInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
             case 16: {
 
               rtt_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -132,10 +128,10 @@ public final class PlayerRTTInfoOuterClass {
       return rtt_;
     }
 
-    public static final int UID_FIELD_NUMBER = 1;
+    public static final int UID_FIELD_NUMBER = 11;
     private int uid_;
     /**
-     * <code>uint32 uid = 1;</code>
+     * <code>uint32 uid = 11;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -157,12 +153,12 @@ public final class PlayerRTTInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (uid_ != 0) {
-        output.writeUInt32(1, uid_);
-      }
       if (rtt_ != 0) {
         output.writeUInt32(2, rtt_);
       }
+      if (uid_ != 0) {
+        output.writeUInt32(11, uid_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -172,14 +168,14 @@ public final class PlayerRTTInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, uid_);
-      }
       if (rtt_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, rtt_);
       }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, uid_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -310,10 +306,6 @@ public final class PlayerRTTInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MCDPPKMOEJJ
-     * </pre>
-     *
      * Protobuf type {@code PlayerRTTInfo}
      */
     public static final class Builder extends
@@ -499,7 +491,7 @@ public final class PlayerRTTInfoOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 11;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -507,7 +499,7 @@ public final class PlayerRTTInfoOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 11;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -518,7 +510,7 @@ public final class PlayerRTTInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 1;</code>
+       * <code>uint32 uid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -595,7 +587,7 @@ public final class PlayerRTTInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\023PlayerRTTInfo.proto\")\n\rPlayerRTTInfo\022\013" +
-      "\n\003rtt\030\002 \001(\r\022\013\n\003uid\030\001 \001(\rB\033\n\031emu.grasscut" +
+      "\n\003rtt\030\002 \001(\r\022\013\n\003uid\030\013 \001(\rB\033\n\031emu.grasscut" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 fcb3b1815..67d37fe97 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseReqOuterClass.java
@@ -19,17 +19,12 @@ public final class PlayerSetPauseReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_paused = 11;</code>
+     * <code>bool is_paused = 9;</code>
      * @return The isPaused.
      */
     boolean getIsPaused();
   }
   /**
-   * <pre>
-   * CmdId: 4448
-   * Obf: LHFKJLJJEBC
-   * </pre>
-   *
    * Protobuf type {@code PlayerSetPauseReq}
    */
   public static final class PlayerSetPauseReq extends
@@ -74,7 +69,7 @@ public final class PlayerSetPauseReqOuterClass {
             case 0:
               done = true;
               break;
-            case 88: {
+            case 72: {
 
               isPaused_ = input.readBool();
               break;
@@ -111,10 +106,10 @@ public final class PlayerSetPauseReqOuterClass {
               emu.grasscutter.net.proto.PlayerSetPauseReqOuterClass.PlayerSetPauseReq.class, emu.grasscutter.net.proto.PlayerSetPauseReqOuterClass.PlayerSetPauseReq.Builder.class);
     }
 
-    public static final int IS_PAUSED_FIELD_NUMBER = 11;
+    public static final int IS_PAUSED_FIELD_NUMBER = 9;
     private boolean isPaused_;
     /**
-     * <code>bool is_paused = 11;</code>
+     * <code>bool is_paused = 9;</code>
      * @return The isPaused.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class PlayerSetPauseReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isPaused_ != false) {
-        output.writeBool(11, isPaused_);
+        output.writeBool(9, isPaused_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class PlayerSetPauseReqOuterClass {
       size = 0;
       if (isPaused_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(11, isPaused_);
+          .computeBoolSize(9, isPaused_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class PlayerSetPauseReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4448
-     * Obf: LHFKJLJJEBC
-     * </pre>
-     *
      * Protobuf type {@code PlayerSetPauseReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class PlayerSetPauseReqOuterClass {
 
       private boolean isPaused_ ;
       /**
-       * <code>bool is_paused = 11;</code>
+       * <code>bool is_paused = 9;</code>
        * @return The isPaused.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class PlayerSetPauseReqOuterClass {
         return isPaused_;
       }
       /**
-       * <code>bool is_paused = 11;</code>
+       * <code>bool is_paused = 9;</code>
        * @param value The isPaused to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class PlayerSetPauseReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_paused = 11;</code>
+       * <code>bool is_paused = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPaused() {
@@ -528,7 +518,7 @@ public final class PlayerSetPauseReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PlayerSetPauseReq.proto\"&\n\021PlayerSetPa" +
-      "useReq\022\021\n\tis_paused\030\013 \001(\010B\033\n\031emu.grasscu" +
+      "useReq\022\021\n\tis_paused\030\t \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/PlayerSetPauseRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
index f98edc2f3..58f0325ed 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerSetPauseRspOuterClass.java
@@ -19,17 +19,12 @@ public final class PlayerSetPauseRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 1771
-   * Obf: DJHGLEGIDAC
-   * </pre>
-   *
    * Protobuf type {@code PlayerSetPauseRsp}
    */
   public static final class PlayerSetPauseRsp extends
@@ -74,7 +69,7 @@ public final class PlayerSetPauseRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class PlayerSetPauseRspOuterClass {
               emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.class, emu.grasscutter.net.proto.PlayerSetPauseRspOuterClass.PlayerSetPauseRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class PlayerSetPauseRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class PlayerSetPauseRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class PlayerSetPauseRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1771
-     * Obf: DJHGLEGIDAC
-     * </pre>
-     *
      * Protobuf type {@code PlayerSetPauseRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class PlayerSetPauseRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 15;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class PlayerSetPauseRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 15;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class PlayerSetPauseRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class PlayerSetPauseRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PlayerSetPauseRsp.proto\"$\n\021PlayerSetPa" +
-      "useRsp\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscutt" +
+      "useRsp\022\017\n\007retcode\030\017 \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 c419fe271..597a16e9b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerStoreNotifyOuterClass.java
@@ -19,52 +19,47 @@ public final class PlayerStoreNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> 
+        getItemListList();
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index);
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    int getItemListCount();
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
+        getItemListOrBuilderList();
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>.StoreType store_type = 5;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 5;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
 
     /**
-     * <code>uint32 weight_limit = 5;</code>
+     * <code>uint32 weight_limit = 8;</code>
      * @return The weightLimit.
      */
     int getWeightLimit();
-
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> 
-        getItemListList();
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index);
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    int getItemListCount();
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
-        getItemListOrBuilderList();
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
-        int index);
   }
   /**
-   * <pre>
-   * CmdId: 4667
-   * Obf: HMFIJAJOPNN
-   * </pre>
-   *
    * Protobuf type {@code PlayerStoreNotify}
    */
   public static final class PlayerStoreNotify extends
@@ -77,8 +72,8 @@ public final class PlayerStoreNotifyOuterClass {
       super(builder);
     }
     private PlayerStoreNotify() {
-      storeType_ = 0;
       itemList_ = java.util.Collections.emptyList();
+      storeType_ = 0;
     }
 
     @java.lang.Override
@@ -112,12 +107,7 @@ public final class PlayerStoreNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              weightLimit_ = input.readUInt32();
-              break;
-            }
-            case 50: {
+            case 10: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemOuterClass.Item>();
                 mutable_bitField0_ |= 0x00000001;
@@ -126,12 +116,17 @@ public final class PlayerStoreNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemOuterClass.Item.parser(), extensionRegistry));
               break;
             }
-            case 64: {
+            case 40: {
               int rawValue = input.readEnum();
 
               storeType_ = rawValue;
               break;
             }
+            case 64: {
+
+              weightLimit_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -167,17 +162,57 @@ public final class PlayerStoreNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify.class, emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify.Builder.class);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 8;
+    public static final int ITEM_LIST_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_;
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
+      return itemList_;
+    }
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
+        getItemListOrBuilderList() {
+      return itemList_;
+    }
+    /**
+     * <code>repeated .Item item_list = 1;</code>
+     */
+    @java.lang.Override
+    public int getItemListCount() {
+      return itemList_.size();
+    }
+    /**
+     * <code>repeated .Item item_list = 1;</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>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
+        int index) {
+      return itemList_.get(index);
+    }
+
+    public static final int STORE_TYPE_FIELD_NUMBER = 5;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 5;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 8;</code>
+     * <code>.StoreType store_type = 5;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -186,10 +221,10 @@ public final class PlayerStoreNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
     }
 
-    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 5;
+    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 8;
     private int weightLimit_;
     /**
-     * <code>uint32 weight_limit = 5;</code>
+     * <code>uint32 weight_limit = 8;</code>
      * @return The weightLimit.
      */
     @java.lang.Override
@@ -197,46 +232,6 @@ public final class PlayerStoreNotifyOuterClass {
       return weightLimit_;
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 6;
-    private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_;
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
-      return itemList_;
-    }
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
-        getItemListOrBuilderList() {
-      return itemList_;
-    }
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    @java.lang.Override
-    public int getItemListCount() {
-      return itemList_.size();
-    }
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
-      return itemList_.get(index);
-    }
-    /**
-     * <code>repeated .Item item_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
-        int index) {
-      return itemList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -251,14 +246,14 @@ public final class PlayerStoreNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (weightLimit_ != 0) {
-        output.writeUInt32(5, weightLimit_);
-      }
       for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(6, itemList_.get(i));
+        output.writeMessage(1, itemList_.get(i));
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(8, storeType_);
+        output.writeEnum(5, storeType_);
+      }
+      if (weightLimit_ != 0) {
+        output.writeUInt32(8, weightLimit_);
       }
       unknownFields.writeTo(output);
     }
@@ -269,17 +264,17 @@ public final class PlayerStoreNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (weightLimit_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, weightLimit_);
-      }
       for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, itemList_.get(i));
+          .computeMessageSize(1, itemList_.get(i));
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(8, storeType_);
+          .computeEnumSize(5, storeType_);
+      }
+      if (weightLimit_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, weightLimit_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -296,11 +291,11 @@ public final class PlayerStoreNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify other = (emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify) obj;
 
+      if (!getItemListList()
+          .equals(other.getItemListList())) return false;
       if (storeType_ != other.storeType_) return false;
       if (getWeightLimit()
           != other.getWeightLimit()) return false;
-      if (!getItemListList()
-          .equals(other.getItemListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -312,14 +307,14 @@ public final class PlayerStoreNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + storeType_;
-      hash = (37 * hash) + WEIGHT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getWeightLimit();
       if (getItemListCount() > 0) {
         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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -416,11 +411,6 @@ public final class PlayerStoreNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4667
-     * Obf: HMFIJAJOPNN
-     * </pre>
-     *
      * Protobuf type {@code PlayerStoreNotify}
      */
     public static final class Builder extends
@@ -459,16 +449,16 @@ public final class PlayerStoreNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        storeType_ = 0;
-
-        weightLimit_ = 0;
-
         if (itemListBuilder_ == null) {
           itemList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           itemListBuilder_.clear();
         }
+        storeType_ = 0;
+
+        weightLimit_ = 0;
+
         return this;
       }
 
@@ -496,8 +486,6 @@ public final class PlayerStoreNotifyOuterClass {
       public emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify buildPartial() {
         emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify result = new emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify(this);
         int from_bitField0_ = bitField0_;
-        result.storeType_ = storeType_;
-        result.weightLimit_ = weightLimit_;
         if (itemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             itemList_ = java.util.Collections.unmodifiableList(itemList_);
@@ -507,6 +495,8 @@ public final class PlayerStoreNotifyOuterClass {
         } else {
           result.itemList_ = itemListBuilder_.build();
         }
+        result.storeType_ = storeType_;
+        result.weightLimit_ = weightLimit_;
         onBuilt();
         return result;
       }
@@ -555,12 +545,6 @@ public final class PlayerStoreNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerStoreNotifyOuterClass.PlayerStoreNotify.getDefaultInstance()) return this;
-        if (other.storeType_ != 0) {
-          setStoreTypeValue(other.getStoreTypeValue());
-        }
-        if (other.getWeightLimit() != 0) {
-          setWeightLimit(other.getWeightLimit());
-        }
         if (itemListBuilder_ == null) {
           if (!other.itemList_.isEmpty()) {
             if (itemList_.isEmpty()) {
@@ -587,6 +571,12 @@ public final class PlayerStoreNotifyOuterClass {
             }
           }
         }
+        if (other.storeType_ != 0) {
+          setStoreTypeValue(other.getStoreTypeValue());
+        }
+        if (other.getWeightLimit() != 0) {
+          setWeightLimit(other.getWeightLimit());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -617,91 +607,6 @@ public final class PlayerStoreNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int storeType_ = 0;
-      /**
-       * <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 = 8;</code>
-       * @param value The enum numeric value on the wire for storeType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStoreTypeValue(int value) {
-        
-        storeType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @return The storeType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
-        return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @param value The storeType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        storeType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.StoreType store_type = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearStoreType() {
-        
-        storeType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int weightLimit_ ;
-      /**
-       * <code>uint32 weight_limit = 5;</code>
-       * @return The weightLimit.
-       */
-      @java.lang.Override
-      public int getWeightLimit() {
-        return weightLimit_;
-      }
-      /**
-       * <code>uint32 weight_limit = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeightLimit() {
-        
-        weightLimit_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_ =
         java.util.Collections.emptyList();
       private void ensureItemListIsMutable() {
@@ -715,7 +620,7 @@ public final class PlayerStoreNotifyOuterClass {
           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 = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -725,7 +630,7 @@ public final class PlayerStoreNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -735,7 +640,7 @@ public final class PlayerStoreNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -745,7 +650,7 @@ public final class PlayerStoreNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -762,7 +667,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -776,7 +681,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value) {
         if (itemListBuilder_ == null) {
@@ -792,7 +697,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -809,7 +714,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -823,7 +728,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -837,7 +742,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemOuterClass.Item> values) {
@@ -852,7 +757,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -865,7 +770,7 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -878,14 +783,14 @@ public final class PlayerStoreNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
           int index) {
@@ -895,7 +800,7 @@ public final class PlayerStoreNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
            getItemListOrBuilderList() {
@@ -906,14 +811,14 @@ public final class PlayerStoreNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</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 = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
           int index) {
@@ -921,7 +826,7 @@ public final class PlayerStoreNotifyOuterClass {
             index, emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 6;</code>
+       * <code>repeated .Item item_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item.Builder> 
            getItemListBuilderList() {
@@ -941,6 +846,91 @@ public final class PlayerStoreNotifyOuterClass {
         }
         return itemListBuilder_;
       }
+
+      private int storeType_ = 0;
+      /**
+       * <code>.StoreType store_type = 5;</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>
+       * @param value The enum numeric value on the wire for storeType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStoreTypeValue(int value) {
+        
+        storeType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.StoreType store_type = 5;</code>
+       * @return The storeType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
+        return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.StoreType store_type = 5;</code>
+       * @param value The storeType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setStoreType(emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        storeType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.StoreType store_type = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearStoreType() {
+        
+        storeType_ = 0;
+        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,26 +998,26 @@ public final class PlayerStoreNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027PlayerStoreNotify.proto\032\017StoreType.pro" +
-      "to\032\nItem.proto\"c\n\021PlayerStoreNotify\022\036\n\ns" +
-      "tore_type\030\010 \001(\0162\n.StoreType\022\024\n\014weight_li" +
-      "mit\030\005 \001(\r\022\030\n\titem_list\030\006 \003(\0132\005.ItemB\033\n\031e" +
+      "\n\027PlayerStoreNotify.proto\032\nItem.proto\032\017S" +
+      "toreType.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" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ItemOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor(),
         });
     internal_static_PlayerStoreNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_PlayerStoreNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerStoreNotify_descriptor,
-        new java.lang.String[] { "StoreType", "WeightLimit", "ItemList", });
-    emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "ItemList", "StoreType", "WeightLimit", });
     emu.grasscutter.net.proto.ItemOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 4566e20aa..a5c8d6eec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerTimeNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class PlayerTimeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 player_time = 9;</code>
-     * @return The playerTime.
+     * <code>bool is_paused = 3;</code>
+     * @return The isPaused.
      */
-    long getPlayerTime();
+    boolean getIsPaused();
 
     /**
-     * <code>uint64 server_time = 12;</code>
+     * <code>uint64 server_time = 7;</code>
      * @return The serverTime.
      */
     long getServerTime();
 
     /**
-     * <code>bool is_paused = 15;</code>
-     * @return The isPaused.
+     * <code>uint64 player_time = 8;</code>
+     * @return The playerTime.
      */
-    boolean getIsPaused();
+    long getPlayerTime();
   }
   /**
-   * <pre>
-   * CmdId: 9057
-   * Obf: FFDLNGLDKCG
-   * </pre>
-   *
    * Protobuf type {@code PlayerTimeNotify}
    */
   public static final class PlayerTimeNotify extends
@@ -86,19 +81,19 @@ public final class PlayerTimeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 24: {
 
-              playerTime_ = input.readUInt64();
+              isPaused_ = input.readBool();
               break;
             }
-            case 96: {
+            case 56: {
 
               serverTime_ = input.readUInt64();
               break;
             }
-            case 120: {
+            case 64: {
 
-              isPaused_ = input.readBool();
+              playerTime_ = input.readUInt64();
               break;
             }
             default: {
@@ -133,21 +128,21 @@ public final class PlayerTimeNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.class, emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.Builder.class);
     }
 
-    public static final int PLAYER_TIME_FIELD_NUMBER = 9;
-    private long playerTime_;
+    public static final int IS_PAUSED_FIELD_NUMBER = 3;
+    private boolean isPaused_;
     /**
-     * <code>uint64 player_time = 9;</code>
-     * @return The playerTime.
+     * <code>bool is_paused = 3;</code>
+     * @return The isPaused.
      */
     @java.lang.Override
-    public long getPlayerTime() {
-      return playerTime_;
+    public boolean getIsPaused() {
+      return isPaused_;
     }
 
-    public static final int SERVER_TIME_FIELD_NUMBER = 12;
+    public static final int SERVER_TIME_FIELD_NUMBER = 7;
     private long serverTime_;
     /**
-     * <code>uint64 server_time = 12;</code>
+     * <code>uint64 server_time = 7;</code>
      * @return The serverTime.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class PlayerTimeNotifyOuterClass {
       return serverTime_;
     }
 
-    public static final int IS_PAUSED_FIELD_NUMBER = 15;
-    private boolean isPaused_;
+    public static final int PLAYER_TIME_FIELD_NUMBER = 8;
+    private long playerTime_;
     /**
-     * <code>bool is_paused = 15;</code>
-     * @return The isPaused.
+     * <code>uint64 player_time = 8;</code>
+     * @return The playerTime.
      */
     @java.lang.Override
-    public boolean getIsPaused() {
-      return isPaused_;
+    public long getPlayerTime() {
+      return playerTime_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +175,14 @@ public final class PlayerTimeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (playerTime_ != 0L) {
-        output.writeUInt64(9, playerTime_);
+      if (isPaused_ != false) {
+        output.writeBool(3, isPaused_);
       }
       if (serverTime_ != 0L) {
-        output.writeUInt64(12, serverTime_);
+        output.writeUInt64(7, serverTime_);
       }
-      if (isPaused_ != false) {
-        output.writeBool(15, isPaused_);
+      if (playerTime_ != 0L) {
+        output.writeUInt64(8, playerTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class PlayerTimeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (playerTime_ != 0L) {
+      if (isPaused_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, playerTime_);
+          .computeBoolSize(3, isPaused_);
       }
       if (serverTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, serverTime_);
+          .computeUInt64Size(7, serverTime_);
       }
-      if (isPaused_ != false) {
+      if (playerTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isPaused_);
+          .computeUInt64Size(8, playerTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class PlayerTimeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify other = (emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify) obj;
 
-      if (getPlayerTime()
-          != other.getPlayerTime()) return false;
-      if (getServerTime()
-          != other.getServerTime()) return false;
       if (getIsPaused()
           != other.getIsPaused()) return false;
+      if (getServerTime()
+          != other.getServerTime()) return false;
+      if (getPlayerTime()
+          != other.getPlayerTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,15 +237,15 @@ public final class PlayerTimeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      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 = (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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -347,11 +342,6 @@ public final class PlayerTimeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9057
-     * Obf: FFDLNGLDKCG
-     * </pre>
-     *
      * Protobuf type {@code PlayerTimeNotify}
      */
     public static final class Builder extends
@@ -389,11 +379,11 @@ public final class PlayerTimeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        playerTime_ = 0L;
+        isPaused_ = false;
 
         serverTime_ = 0L;
 
-        isPaused_ = false;
+        playerTime_ = 0L;
 
         return this;
       }
@@ -421,9 +411,9 @@ public final class PlayerTimeNotifyOuterClass {
       @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.playerTime_ = playerTime_;
-        result.serverTime_ = serverTime_;
         result.isPaused_ = isPaused_;
+        result.serverTime_ = serverTime_;
+        result.playerTime_ = playerTime_;
         onBuilt();
         return result;
       }
@@ -472,14 +462,14 @@ public final class PlayerTimeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify other) {
         if (other == emu.grasscutter.net.proto.PlayerTimeNotifyOuterClass.PlayerTimeNotify.getDefaultInstance()) return this;
-        if (other.getPlayerTime() != 0L) {
-          setPlayerTime(other.getPlayerTime());
+        if (other.getIsPaused() != false) {
+          setIsPaused(other.getIsPaused());
         }
         if (other.getServerTime() != 0L) {
           setServerTime(other.getServerTime());
         }
-        if (other.getIsPaused() != false) {
-          setIsPaused(other.getIsPaused());
+        if (other.getPlayerTime() != 0L) {
+          setPlayerTime(other.getPlayerTime());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -510,71 +500,9 @@ public final class PlayerTimeNotifyOuterClass {
         return this;
       }
 
-      private long playerTime_ ;
-      /**
-       * <code>uint64 player_time = 9;</code>
-       * @return The playerTime.
-       */
-      @java.lang.Override
-      public long getPlayerTime() {
-        return playerTime_;
-      }
-      /**
-       * <code>uint64 player_time = 9;</code>
-       * @param value The playerTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPlayerTime(long value) {
-        
-        playerTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 player_time = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlayerTime() {
-        
-        playerTime_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private long serverTime_ ;
-      /**
-       * <code>uint64 server_time = 12;</code>
-       * @return The serverTime.
-       */
-      @java.lang.Override
-      public long getServerTime() {
-        return serverTime_;
-      }
-      /**
-       * <code>uint64 server_time = 12;</code>
-       * @param value The serverTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setServerTime(long value) {
-        
-        serverTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 server_time = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearServerTime() {
-        
-        serverTime_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private boolean isPaused_ ;
       /**
-       * <code>bool is_paused = 15;</code>
+       * <code>bool is_paused = 3;</code>
        * @return The isPaused.
        */
       @java.lang.Override
@@ -582,7 +510,7 @@ public final class PlayerTimeNotifyOuterClass {
         return isPaused_;
       }
       /**
-       * <code>bool is_paused = 15;</code>
+       * <code>bool is_paused = 3;</code>
        * @param value The isPaused to set.
        * @return This builder for chaining.
        */
@@ -593,7 +521,7 @@ public final class PlayerTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_paused = 15;</code>
+       * <code>bool is_paused = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPaused() {
@@ -602,6 +530,68 @@ public final class PlayerTimeNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private long serverTime_ ;
+      /**
+       * <code>uint64 server_time = 7;</code>
+       * @return The serverTime.
+       */
+      @java.lang.Override
+      public long getServerTime() {
+        return serverTime_;
+      }
+      /**
+       * <code>uint64 server_time = 7;</code>
+       * @param value The serverTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setServerTime(long value) {
+        
+        serverTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 server_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearServerTime() {
+        
+        serverTime_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private long playerTime_ ;
+      /**
+       * <code>uint64 player_time = 8;</code>
+       * @return The playerTime.
+       */
+      @java.lang.Override
+      public long getPlayerTime() {
+        return playerTime_;
+      }
+      /**
+       * <code>uint64 player_time = 8;</code>
+       * @param value The playerTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPlayerTime(long value) {
+        
+        playerTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 player_time = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlayerTime() {
+        
+        playerTime_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -670,8 +660,8 @@ public final class PlayerTimeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026PlayerTimeNotify.proto\"O\n\020PlayerTimeNo" +
-      "tify\022\023\n\013player_time\030\t \001(\004\022\023\n\013server_time" +
-      "\030\014 \001(\004\022\021\n\tis_paused\030\017 \001(\010B\033\n\031emu.grasscu" +
+      "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" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -683,7 +673,7 @@ public final class PlayerTimeNotifyOuterClass {
     internal_static_PlayerTimeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerTimeNotify_descriptor,
-        new java.lang.String[] { "PlayerTime", "ServerTime", "IsPaused", });
+        new java.lang.String[] { "IsPaused", "ServerTime", "PlayerTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWidgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWidgetInfoOuterClass.java
index 11b23720c..355514b28 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWidgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWidgetInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class PlayerWidgetInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> 
         getSlotListList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index);
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     int getSlotListCount();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
         getSlotListOrBuilderList();
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 uid = 6;</code>
+     * <code>uint32 uid = 10;</code>
      * @return The uid.
      */
     int getUid();
   }
   /**
-   * <pre>
-   * Obf: IEIPNDOKJIG
-   * </pre>
-   *
    * Protobuf type {@code PlayerWidgetInfo}
    */
   public static final class PlayerWidgetInfo extends
@@ -99,12 +95,7 @@ public final class PlayerWidgetInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
-            case 122: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 slotList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,6 +104,11 @@ public final class PlayerWidgetInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.parser(), extensionRegistry));
               break;
             }
+            case 80: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -148,17 +144,17 @@ public final class PlayerWidgetInfoOuterClass {
               emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.class, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder.class);
     }
 
-    public static final int SLOT_LIST_FIELD_NUMBER = 15;
+    public static final int SLOT_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> slotList_;
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
@@ -166,21 +162,21 @@ public final class PlayerWidgetInfoOuterClass {
       return slotList_;
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     @java.lang.Override
     public int getSlotListCount() {
       return slotList_.size();
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
       return slotList_.get(index);
     }
     /**
-     * <code>repeated .WidgetSlotData slot_list = 15;</code>
+     * <code>repeated .WidgetSlotData slot_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
@@ -188,10 +184,10 @@ public final class PlayerWidgetInfoOuterClass {
       return slotList_.get(index);
     }
 
-    public static final int UID_FIELD_NUMBER = 6;
+    public static final int UID_FIELD_NUMBER = 10;
     private int uid_;
     /**
-     * <code>uint32 uid = 6;</code>
+     * <code>uint32 uid = 10;</code>
      * @return The uid.
      */
     @java.lang.Override
@@ -213,11 +209,11 @@ public final class PlayerWidgetInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (uid_ != 0) {
-        output.writeUInt32(6, uid_);
-      }
       for (int i = 0; i < slotList_.size(); i++) {
-        output.writeMessage(15, slotList_.get(i));
+        output.writeMessage(6, slotList_.get(i));
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(10, uid_);
       }
       unknownFields.writeTo(output);
     }
@@ -228,13 +224,13 @@ public final class PlayerWidgetInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, uid_);
-      }
       for (int i = 0; i < slotList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, slotList_.get(i));
+          .computeMessageSize(6, slotList_.get(i));
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, uid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -368,10 +364,6 @@ public final class PlayerWidgetInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IEIPNDOKJIG
-     * </pre>
-     *
      * Protobuf type {@code PlayerWidgetInfo}
      */
     public static final class Builder extends
@@ -575,7 +567,7 @@ public final class PlayerWidgetInfoOuterClass {
           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 = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> getSlotListList() {
         if (slotListBuilder_ == null) {
@@ -585,7 +577,7 @@ public final class PlayerWidgetInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public int getSlotListCount() {
         if (slotListBuilder_ == null) {
@@ -595,7 +587,7 @@ public final class PlayerWidgetInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -605,7 +597,7 @@ public final class PlayerWidgetInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -622,7 +614,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder setSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -636,7 +628,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder addSlotList(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
         if (slotListBuilder_ == null) {
@@ -652,7 +644,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
@@ -669,7 +661,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder addSlotList(
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -683,7 +675,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder addSlotList(
           int index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -697,7 +689,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder addAllSlotList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData> values) {
@@ -712,7 +704,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder clearSlotList() {
         if (slotListBuilder_ == null) {
@@ -725,7 +717,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public Builder removeSlotList(int index) {
         if (slotListBuilder_ == null) {
@@ -738,14 +730,14 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotListBuilder(
           int index) {
         return getSlotListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotListOrBuilder(
           int index) {
@@ -755,7 +747,7 @@ public final class PlayerWidgetInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
            getSlotListOrBuilderList() {
@@ -766,14 +758,14 @@ public final class PlayerWidgetInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</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 = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder addSlotListBuilder(
           int index) {
@@ -781,7 +773,7 @@ public final class PlayerWidgetInfoOuterClass {
             index, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetSlotData slot_list = 15;</code>
+       * <code>repeated .WidgetSlotData slot_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder> 
            getSlotListBuilderList() {
@@ -804,7 +796,7 @@ public final class PlayerWidgetInfoOuterClass {
 
       private int uid_ ;
       /**
-       * <code>uint32 uid = 6;</code>
+       * <code>uint32 uid = 10;</code>
        * @return The uid.
        */
       @java.lang.Override
@@ -812,7 +804,7 @@ public final class PlayerWidgetInfoOuterClass {
         return uid_;
       }
       /**
-       * <code>uint32 uid = 6;</code>
+       * <code>uint32 uid = 10;</code>
        * @param value The uid to set.
        * @return This builder for chaining.
        */
@@ -823,7 +815,7 @@ public final class PlayerWidgetInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 uid = 6;</code>
+       * <code>uint32 uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearUid() {
@@ -901,7 +893,7 @@ public final class PlayerWidgetInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\026PlayerWidgetInfo.proto\032\024WidgetSlotData" +
       ".proto\"C\n\020PlayerWidgetInfo\022\"\n\tslot_list\030" +
-      "\017 \003(\0132\017.WidgetSlotData\022\013\n\003uid\030\006 \001(\rB\033\n\031e" +
+      "\006 \003(\0132\017.WidgetSlotData\022\013\n\003uid\030\n \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/PlayerWorldLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
index 229114845..94642c830 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldLocationInfoOuterClass.java
@@ -19,31 +19,27 @@ public final class PlayerWorldLocationInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 5;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      * @return Whether the playerLoc field is set.
      */
     boolean hasPlayerLoc();
     /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      * @return The playerLoc.
      */
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLoc();
     /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      */
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder();
+
+    /**
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
   }
   /**
-   * <pre>
-   * Obf: JNPBJHGCCOP
-   * </pre>
-   *
    * Protobuf type {@code PlayerWorldLocationInfo}
    */
   public static final class PlayerWorldLocationInfo extends
@@ -88,12 +84,7 @@ public final class PlayerWorldLocationInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 98: {
+            case 58: {
               emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder subBuilder = null;
               if (playerLoc_ != null) {
                 subBuilder = playerLoc_.toBuilder();
@@ -106,6 +97,11 @@ public final class PlayerWorldLocationInfoOuterClass {
 
               break;
             }
+            case 96: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -138,21 +134,10 @@ public final class PlayerWorldLocationInfoOuterClass {
               emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.class, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 5;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 5;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
-    public static final int PLAYER_LOC_FIELD_NUMBER = 12;
+    public static final int PLAYER_LOC_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo playerLoc_;
     /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      * @return Whether the playerLoc field is set.
      */
     @java.lang.Override
@@ -160,7 +145,7 @@ public final class PlayerWorldLocationInfoOuterClass {
       return playerLoc_ != null;
     }
     /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      * @return The playerLoc.
      */
     @java.lang.Override
@@ -168,13 +153,24 @@ public final class PlayerWorldLocationInfoOuterClass {
       return playerLoc_ == null ? emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance() : playerLoc_;
     }
     /**
-     * <code>.PlayerLocationInfo player_loc = 12;</code>
+     * <code>.PlayerLocationInfo player_loc = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder() {
       return getPlayerLoc();
     }
 
+    public static final int SCENE_ID_FIELD_NUMBER = 12;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 12;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -189,11 +185,11 @@ public final class PlayerWorldLocationInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneId_ != 0) {
-        output.writeUInt32(5, sceneId_);
-      }
       if (playerLoc_ != null) {
-        output.writeMessage(12, getPlayerLoc());
+        output.writeMessage(7, getPlayerLoc());
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(12, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -204,13 +200,13 @@ public final class PlayerWorldLocationInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, sceneId_);
-      }
       if (playerLoc_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getPlayerLoc());
+          .computeMessageSize(7, getPlayerLoc());
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,13 +223,13 @@ public final class PlayerWorldLocationInfoOuterClass {
       }
       emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo other = (emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo) obj;
 
-      if (getSceneId()
-          != other.getSceneId()) return false;
       if (hasPlayerLoc() != other.hasPlayerLoc()) return false;
       if (hasPlayerLoc()) {
         if (!getPlayerLoc()
             .equals(other.getPlayerLoc())) return false;
       }
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,12 +241,12 @@ public final class PlayerWorldLocationInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       if (hasPlayerLoc()) {
         hash = (37 * hash) + PLAYER_LOC_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerLoc().hashCode();
       }
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -347,10 +343,6 @@ public final class PlayerWorldLocationInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JNPBJHGCCOP
-     * </pre>
-     *
      * Protobuf type {@code PlayerWorldLocationInfo}
      */
     public static final class Builder extends
@@ -388,14 +380,14 @@ public final class PlayerWorldLocationInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        sceneId_ = 0;
-
         if (playerLocBuilder_ == null) {
           playerLoc_ = null;
         } else {
           playerLoc_ = null;
           playerLocBuilder_ = null;
         }
+        sceneId_ = 0;
+
         return this;
       }
 
@@ -422,12 +414,12 @@ public final class PlayerWorldLocationInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo buildPartial() {
         emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo result = new emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo(this);
-        result.sceneId_ = sceneId_;
         if (playerLocBuilder_ == null) {
           result.playerLoc_ = playerLoc_;
         } else {
           result.playerLoc_ = playerLocBuilder_.build();
         }
+        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -476,12 +468,12 @@ public final class PlayerWorldLocationInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo other) {
         if (other == emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance()) return this;
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         if (other.hasPlayerLoc()) {
           mergePlayerLoc(other.getPlayerLoc());
         }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -511,49 +503,18 @@ public final class PlayerWorldLocationInfoOuterClass {
         return this;
       }
 
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 5;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo playerLoc_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocBuilder_;
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        * @return Whether the playerLoc field is set.
        */
       public boolean hasPlayerLoc() {
         return playerLocBuilder_ != null || playerLoc_ != null;
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        * @return The playerLoc.
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLoc() {
@@ -564,7 +525,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public Builder setPlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
         if (playerLocBuilder_ == null) {
@@ -580,7 +541,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public Builder setPlayerLoc(
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
@@ -594,7 +555,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public Builder mergePlayerLoc(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
         if (playerLocBuilder_ == null) {
@@ -612,7 +573,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public Builder clearPlayerLoc() {
         if (playerLocBuilder_ == null) {
@@ -626,7 +587,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocBuilder() {
         
@@ -634,7 +595,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         return getPlayerLocFieldBuilder().getBuilder();
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocOrBuilder() {
         if (playerLocBuilder_ != null) {
@@ -645,7 +606,7 @@ public final class PlayerWorldLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.PlayerLocationInfo player_loc = 12;</code>
+       * <code>.PlayerLocationInfo player_loc = 7;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> 
@@ -660,6 +621,37 @@ public final class PlayerWorldLocationInfoOuterClass {
         }
         return playerLocBuilder_;
       }
+
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 12;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>uint32 scene_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -729,8 +721,8 @@ public final class PlayerWorldLocationInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035PlayerWorldLocationInfo.proto\032\030PlayerL" +
       "ocationInfo.proto\"T\n\027PlayerWorldLocation" +
-      "Info\022\020\n\010scene_id\030\005 \001(\r\022\'\n\nplayer_loc\030\014 \001" +
-      "(\0132\023.PlayerLocationInfoB\033\n\031emu.grasscutt" +
+      "Info\022\'\n\nplayer_loc\030\007 \001(\0132\023.PlayerLocatio" +
+      "nInfo\022\020\n\010scene_id\030\014 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -743,7 +735,7 @@ public final class PlayerWorldLocationInfoOuterClass {
     internal_static_PlayerWorldLocationInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldLocationInfo_descriptor,
-        new java.lang.String[] { "SceneId", "PlayerLoc", });
+        new java.lang.String[] { "PlayerLoc", "SceneId", });
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor();
   }
 
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 427815afb..6bd994a5f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoListNotifyOuterClass.java
@@ -19,35 +19,47 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> 
         getInfoListList();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index);
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     int getInfoListCount();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
         getInfoListOrBuilderList();
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</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: 7017
-   * Obf: GGOIKEGFFAA
-   * </pre>
-   *
    * Protobuf type {@code PlayerWorldSceneInfoListNotify}
    */
   public static final class PlayerWorldSceneInfoListNotify extends
@@ -61,6 +73,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
     }
     private PlayerWorldSceneInfoListNotify() {
       infoList_ = java.util.Collections.emptyList();
+      kNFOKJBGBEI_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -94,7 +107,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 106: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 infoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -103,6 +116,27 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.parser(), extensionRegistry));
               break;
             }
+            case 8440: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                kNFOKJBGBEI_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              kNFOKJBGBEI_.addInt(input.readUInt32());
+              break;
+            }
+            case 8442: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                kNFOKJBGBEI_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                kNFOKJBGBEI_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -121,6 +155,9 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           infoList_ = java.util.Collections.unmodifiableList(infoList_);
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          kNFOKJBGBEI_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -138,17 +175,17 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
               emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoListNotifyOuterClass.PlayerWorldSceneInfoListNotify.Builder.class);
     }
 
-    public static final int INFO_LIST_FIELD_NUMBER = 15;
+    public static final int INFO_LIST_FIELD_NUMBER = 13;
     private java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> infoList_;
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> getInfoListList() {
       return infoList_;
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
@@ -156,21 +193,21 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
       return infoList_;
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     @java.lang.Override
     public int getInfoListCount() {
       return infoList_.size();
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index) {
       return infoList_.get(index);
     }
     /**
-     * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+     * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder getInfoListOrBuilder(
@@ -178,6 +215,34 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
       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() {
@@ -192,8 +257,16 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      getSerializedSize();
       for (int i = 0; i < infoList_.size(); i++) {
-        output.writeMessage(15, infoList_.get(i));
+        output.writeMessage(13, infoList_.get(i));
+      }
+      if (getKNFOKJBGBEIList().size() > 0) {
+        output.writeUInt32NoTag(8442);
+        output.writeUInt32NoTag(kNFOKJBGBEIMemoizedSerializedSize);
+      }
+      for (int i = 0; i < kNFOKJBGBEI_.size(); i++) {
+        output.writeUInt32NoTag(kNFOKJBGBEI_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +279,21 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
       size = 0;
       for (int i = 0; i < infoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, infoList_.get(i));
+          .computeMessageSize(13, infoList_.get(i));
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < kNFOKJBGBEI_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(kNFOKJBGBEI_.getInt(i));
+        }
+        size += dataSize;
+        if (!getKNFOKJBGBEIList().isEmpty()) {
+          size += 2;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        kNFOKJBGBEIMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,6 +312,8 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
 
       if (!getInfoListList()
           .equals(other.getInfoListList())) return false;
+      if (!getKNFOKJBGBEIList()
+          .equals(other.getKNFOKJBGBEIList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -240,6 +329,10 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         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;
@@ -336,11 +429,6 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7017
-     * Obf: GGOIKEGFFAA
-     * </pre>
-     *
      * Protobuf type {@code PlayerWorldSceneInfoListNotify}
      */
     public static final class Builder extends
@@ -385,6 +473,8 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         } else {
           infoListBuilder_.clear();
         }
+        kNFOKJBGBEI_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -421,6 +511,11 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         } else {
           result.infoList_ = infoListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          kNFOKJBGBEI_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.kNFOKJBGBEI_ = kNFOKJBGBEI_;
         onBuilt();
         return result;
       }
@@ -495,6 +590,16 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
             }
           }
         }
+        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;
@@ -538,7 +643,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
           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 = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> getInfoListList() {
         if (infoListBuilder_ == null) {
@@ -548,7 +653,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public int getInfoListCount() {
         if (infoListBuilder_ == null) {
@@ -558,7 +663,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo getInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -568,7 +673,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
@@ -585,7 +690,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -599,7 +704,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder addInfoList(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
         if (infoListBuilder_ == null) {
@@ -615,7 +720,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo value) {
@@ -632,7 +737,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder addInfoList(
           emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -646,7 +751,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder builderForValue) {
@@ -660,7 +765,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder addAllInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo> values) {
@@ -675,7 +780,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder clearInfoList() {
         if (infoListBuilder_ == null) {
@@ -688,7 +793,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public Builder removeInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -701,14 +806,14 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder getInfoListBuilder(
           int index) {
         return getInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder getInfoListOrBuilder(
           int index) {
@@ -718,7 +823,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfoOrBuilder> 
            getInfoListOrBuilderList() {
@@ -729,14 +834,14 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</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 = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder addInfoListBuilder(
           int index) {
@@ -744,7 +849,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWorldSceneInfo info_list = 15;</code>
+       * <code>repeated .PlayerWorldSceneInfo info_list = 13;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder> 
            getInfoListBuilderList() {
@@ -764,6 +869,85 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
         }
         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) {
@@ -832,10 +1016,11 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n$PlayerWorldSceneInfoListNotify.proto\032\032" +
-      "PlayerWorldSceneInfo.proto\"J\n\036PlayerWorl" +
-      "dSceneInfoListNotify\022(\n\tinfo_list\030\017 \003(\0132" +
-      "\025.PlayerWorldSceneInfoB\033\n\031emu.grasscutte" +
-      "r.net.protob\006proto3"
+      "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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -847,7 +1032,7 @@ public final class PlayerWorldSceneInfoListNotifyOuterClass {
     internal_static_PlayerWorldSceneInfoListNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldSceneInfoListNotify_descriptor,
-        new java.lang.String[] { "InfoList", });
+        new java.lang.String[] { "InfoList", "KNFOKJBGBEI", });
     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 5ac6c07a2..b73def58a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PlayerWorldSceneInfoOuterClass.java
@@ -19,54 +19,54 @@ public final class PlayerWorldSceneInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return Whether the mapLayerInfo field is set.
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * @return A list containing the sceneTagIdList.
      */
-    boolean hasMapLayerInfo();
+    java.util.List<java.lang.Integer> getSceneTagIdListList();
     /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return The mapLayerInfo.
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * @return The count of sceneTagIdList.
      */
-    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
+    int getSceneTagIdListCount();
     /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The sceneTagIdList at the given index.
      */
-    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
+    int getSceneTagIdList(int index);
 
     /**
-     * <code>uint32 scene_id = 12;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
-
-    /**
-     * <code>bool is_locked = 2;</code>
+     * <pre>
+     *CGMAOKBGOHO DFNDKDAFEJO = 7;
+     * </pre>
+     *
+     * <code>bool is_locked = 10;</code>
      * @return The isLocked.
      */
     boolean getIsLocked();
 
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
-     * @return A list containing the sceneTagIdList.
+     * <code>uint32 scene_id = 11;</code>
+     * @return The sceneId.
      */
-    java.util.List<java.lang.Integer> getSceneTagIdListList();
+    int getSceneId();
+
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
-     * @return The count of sceneTagIdList.
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     * @return Whether the mapLayerInfo field is set.
      */
-    int getSceneTagIdListCount();
+    boolean hasMapLayerInfo();
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
-     * @param index The index of the element to return.
-     * @return The sceneTagIdList at the given index.
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     * @return The mapLayerInfo.
      */
-    int getSceneTagIdList(int index);
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo();
+    /**
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     */
+    emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: FCGGGBEOFIJ
-   * </pre>
-   *
    * Protobuf type {@code PlayerWorldSceneInfo}
    */
   public static final class PlayerWorldSceneInfo extends
@@ -113,25 +113,7 @@ public final class PlayerWorldSceneInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
-              if (mapLayerInfo_ != null) {
-                subBuilder = mapLayerInfo_.toBuilder();
-              }
-              mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(mapLayerInfo_);
-                mapLayerInfo_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 16: {
-
-              isLocked_ = input.readBool();
-              break;
-            }
-            case 56: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTagIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -139,7 +121,7 @@ public final class PlayerWorldSceneInfoOuterClass {
               sceneTagIdList_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -152,11 +134,29 @@ public final class PlayerWorldSceneInfoOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 96: {
+            case 80: {
+
+              isLocked_ = input.readBool();
+              break;
+            }
+            case 88: {
 
               sceneId_ = input.readUInt32();
               break;
             }
+            case 114: {
+              emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder subBuilder = null;
+              if (mapLayerInfo_ != null) {
+                subBuilder = mapLayerInfo_.toBuilder();
+              }
+              mapLayerInfo_ = input.readMessage(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(mapLayerInfo_);
+                mapLayerInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -192,58 +192,10 @@ public final class PlayerWorldSceneInfoOuterClass {
               emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.class, emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.Builder.class);
     }
 
-    public static final int MAP_LAYER_INFO_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo mapLayerInfo_;
-    /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return Whether the mapLayerInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasMapLayerInfo() {
-      return mapLayerInfo_ != null;
-    }
-    /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     * @return The mapLayerInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
-      return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
-    }
-    /**
-     * <code>.MapLayerInfo map_layer_info = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
-      return getMapLayerInfo();
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 12;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 12;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
-    public static final int IS_LOCKED_FIELD_NUMBER = 2;
-    private boolean isLocked_;
-    /**
-     * <code>bool is_locked = 2;</code>
-     * @return The isLocked.
-     */
-    @java.lang.Override
-    public boolean getIsLocked() {
-      return isLocked_;
-    }
-
-    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 7;
+    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList sceneTagIdList_;
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return A list containing the sceneTagIdList.
      */
     @java.lang.Override
@@ -252,14 +204,14 @@ public final class PlayerWorldSceneInfoOuterClass {
       return sceneTagIdList_;
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return The count of sceneTagIdList.
      */
     public int getSceneTagIdListCount() {
       return sceneTagIdList_.size();
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 7;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The sceneTagIdList at the given index.
      */
@@ -268,6 +220,58 @@ public final class PlayerWorldSceneInfoOuterClass {
     }
     private int sceneTagIdListMemoizedSerializedSize = -1;
 
+    public static final int IS_LOCKED_FIELD_NUMBER = 10;
+    private boolean isLocked_;
+    /**
+     * <pre>
+     *CGMAOKBGOHO DFNDKDAFEJO = 7;
+     * </pre>
+     *
+     * <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_;
+    /**
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     * @return Whether the mapLayerInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasMapLayerInfo() {
+      return mapLayerInfo_ != null;
+    }
+    /**
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     * @return The mapLayerInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
+      return mapLayerInfo_ == null ? emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.getDefaultInstance() : mapLayerInfo_;
+    }
+    /**
+     * <code>.MapLayerInfo map_layer_info = 14;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
+      return getMapLayerInfo();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -283,21 +287,21 @@ public final class PlayerWorldSceneInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (mapLayerInfo_ != null) {
-        output.writeMessage(1, getMapLayerInfo());
-      }
-      if (isLocked_ != false) {
-        output.writeBool(2, isLocked_);
-      }
       if (getSceneTagIdListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(42);
         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(12, sceneId_);
+        output.writeUInt32(11, sceneId_);
+      }
+      if (mapLayerInfo_ != null) {
+        output.writeMessage(14, getMapLayerInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -308,14 +312,6 @@ public final class PlayerWorldSceneInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (mapLayerInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getMapLayerInfo());
-      }
-      if (isLocked_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isLocked_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < sceneTagIdList_.size(); i++) {
@@ -330,9 +326,17 @@ public final class PlayerWorldSceneInfoOuterClass {
         }
         sceneTagIdListMemoizedSerializedSize = dataSize;
       }
+      if (isLocked_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isLocked_);
+      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, sceneId_);
+          .computeUInt32Size(11, sceneId_);
+      }
+      if (mapLayerInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getMapLayerInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -349,17 +353,17 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other = (emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo) 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 (!getSceneTagIdListList()
-          .equals(other.getSceneTagIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -371,19 +375,19 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      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());
       if (getSceneTagIdListCount() > 0) {
         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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -480,10 +484,6 @@ public final class PlayerWorldSceneInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FCGGGBEOFIJ
-     * </pre>
-     *
      * Protobuf type {@code PlayerWorldSceneInfo}
      */
     public static final class Builder extends
@@ -521,18 +521,18 @@ public final class PlayerWorldSceneInfoOuterClass {
       @java.lang.Override
       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;
-
-        sceneTagIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -560,18 +560,18 @@ public final class PlayerWorldSceneInfoOuterClass {
       public emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo buildPartial() {
         emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo result = new emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo(this);
         int from_bitField0_ = bitField0_;
-        if (mapLayerInfoBuilder_ == null) {
-          result.mapLayerInfo_ = mapLayerInfo_;
-        } else {
-          result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
-        }
-        result.sceneId_ = sceneId_;
-        result.isLocked_ = isLocked_;
         if (((bitField0_ & 0x00000001) != 0)) {
           sceneTagIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.sceneTagIdList_ = sceneTagIdList_;
+        result.isLocked_ = isLocked_;
+        result.sceneId_ = sceneId_;
+        if (mapLayerInfoBuilder_ == null) {
+          result.mapLayerInfo_ = mapLayerInfo_;
+        } else {
+          result.mapLayerInfo_ = mapLayerInfoBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -620,15 +620,6 @@ public final class PlayerWorldSceneInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo other) {
         if (other == emu.grasscutter.net.proto.PlayerWorldSceneInfoOuterClass.PlayerWorldSceneInfo.getDefaultInstance()) return this;
-        if (other.hasMapLayerInfo()) {
-          mergeMapLayerInfo(other.getMapLayerInfo());
-        }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
-        if (other.getIsLocked() != false) {
-          setIsLocked(other.getIsLocked());
-        }
         if (!other.sceneTagIdList_.isEmpty()) {
           if (sceneTagIdList_.isEmpty()) {
             sceneTagIdList_ = other.sceneTagIdList_;
@@ -639,6 +630,15 @@ public final class PlayerWorldSceneInfoOuterClass {
           }
           onChanged();
         }
+        if (other.getIsLocked() != false) {
+          setIsLocked(other.getIsLocked());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
+        if (other.hasMapLayerInfo()) {
+          mergeMapLayerInfo(other.getMapLayerInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -669,18 +669,171 @@ public final class PlayerWorldSceneInfoOuterClass {
       }
       private int bitField0_;
 
+      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 = 5;</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 = 5;</code>
+       * @return The count of sceneTagIdList.
+       */
+      public int getSceneTagIdListCount() {
+        return sceneTagIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 scene_tag_id_list = 5;</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 = 5;</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 = 5;</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 = 5;</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 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneTagIdList() {
+        sceneTagIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private boolean isLocked_ ;
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 7;
+       * </pre>
+       *
+       * <code>bool is_locked = 10;</code>
+       * @return The isLocked.
+       */
+      @java.lang.Override
+      public boolean getIsLocked() {
+        return isLocked_;
+      }
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 7;
+       * </pre>
+       *
+       * <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;
+      }
+      /**
+       * <pre>
+       *CGMAOKBGOHO DFNDKDAFEJO = 7;
+       * </pre>
+       *
+       * <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_;
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        * @return Whether the mapLayerInfo field is set.
        */
       public boolean hasMapLayerInfo() {
         return mapLayerInfoBuilder_ != null || mapLayerInfo_ != null;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        * @return The mapLayerInfo.
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo getMapLayerInfo() {
@@ -691,7 +844,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder setMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
         if (mapLayerInfoBuilder_ == null) {
@@ -707,7 +860,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder setMapLayerInfo(
           emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder builderForValue) {
@@ -721,7 +874,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder mergeMapLayerInfo(emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo value) {
         if (mapLayerInfoBuilder_ == null) {
@@ -739,7 +892,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public Builder clearMapLayerInfo() {
         if (mapLayerInfoBuilder_ == null) {
@@ -753,7 +906,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfo.Builder getMapLayerInfoBuilder() {
         
@@ -761,7 +914,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         return getMapLayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</code>
        */
       public emu.grasscutter.net.proto.MapLayerInfoOuterClass.MapLayerInfoOrBuilder getMapLayerInfoOrBuilder() {
         if (mapLayerInfoBuilder_ != null) {
@@ -772,7 +925,7 @@ public final class PlayerWorldSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.MapLayerInfo map_layer_info = 1;</code>
+       * <code>.MapLayerInfo map_layer_info = 14;</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> 
@@ -787,147 +940,6 @@ public final class PlayerWorldSceneInfoOuterClass {
         }
         return mapLayerInfoBuilder_;
       }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 12;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 scene_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isLocked_ ;
-      /**
-       * <code>bool is_locked = 2;</code>
-       * @return The isLocked.
-       */
-      @java.lang.Override
-      public boolean getIsLocked() {
-        return isLocked_;
-      }
-      /**
-       * <code>bool is_locked = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsLocked() {
-        
-        isLocked_ = false;
-        onChanged();
-        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 = 7;</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 = 7;</code>
-       * @return The count of sceneTagIdList.
-       */
-      public int getSceneTagIdListCount() {
-        return sceneTagIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 scene_tag_id_list = 7;</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 = 7;</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 = 7;</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 = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneTagIdList() {
-        sceneTagIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -996,10 +1008,10 @@ public final class PlayerWorldSceneInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032PlayerWorldSceneInfo.proto\032\022MapLayerIn" +
-      "fo.proto\"}\n\024PlayerWorldSceneInfo\022%\n\016map_" +
-      "layer_info\030\001 \001(\0132\r.MapLayerInfo\022\020\n\010scene" +
-      "_id\030\014 \001(\r\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021scene_ta" +
-      "g_id_list\030\007 \003(\rB\033\n\031emu.grasscutter.net.p" +
+      "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" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1012,7 +1024,7 @@ public final class PlayerWorldSceneInfoOuterClass {
     internal_static_PlayerWorldSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PlayerWorldSceneInfo_descriptor,
-        new java.lang.String[] { "MapLayerInfo", "SceneId", "IsLocked", "SceneTagIdList", });
+        new java.lang.String[] { "SceneTagIdList", "IsLocked", "SceneId", "MapLayerInfo", });
     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 0f604ec9d..197c5015e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneReqOuterClass.java
@@ -19,17 +19,18 @@ public final class PostEnterSceneReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 8;</code>
+     * <code>double total_tick_time = 8;</code>
+     * @return The totalTickTime.
+     */
+    double getTotalTickTime();
+
+    /**
+     * <code>uint32 enter_scene_token = 13;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 5606
-   * Obf: KAJDPNBPFJF
-   * </pre>
-   *
    * Protobuf type {@code PostEnterSceneReq}
    */
   public static final class PostEnterSceneReq extends
@@ -74,7 +75,12 @@ public final class PostEnterSceneReqOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 65: {
+
+              totalTickTime_ = input.readDouble();
+              break;
+            }
+            case 104: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -111,10 +117,21 @@ public final class PostEnterSceneReqOuterClass {
               emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq.class, emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 8;
+    public static final int TOTAL_TICK_TIME_FIELD_NUMBER = 8;
+    private double totalTickTime_;
+    /**
+     * <code>double total_tick_time = 8;</code>
+     * @return The totalTickTime.
+     */
+    @java.lang.Override
+    public double getTotalTickTime() {
+      return totalTickTime_;
+    }
+
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 13;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 8;</code>
+     * <code>uint32 enter_scene_token = 13;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -136,8 +153,11 @@ public final class PostEnterSceneReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (totalTickTime_ != 0D) {
+        output.writeDouble(8, totalTickTime_);
+      }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(8, enterSceneToken_);
+        output.writeUInt32(13, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -148,9 +168,13 @@ public final class PostEnterSceneReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (totalTickTime_ != 0D) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeDoubleSize(8, totalTickTime_);
+      }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, enterSceneToken_);
+          .computeUInt32Size(13, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -167,6 +191,9 @@ public final class PostEnterSceneReqOuterClass {
       }
       emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq other = (emu.grasscutter.net.proto.PostEnterSceneReqOuterClass.PostEnterSceneReq) obj;
 
+      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;
@@ -180,6 +207,9 @@ public final class PostEnterSceneReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().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) + ENTER_SCENE_TOKEN_FIELD_NUMBER;
       hash = (53 * hash) + getEnterSceneToken();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -278,11 +308,6 @@ public final class PostEnterSceneReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5606
-     * Obf: KAJDPNBPFJF
-     * </pre>
-     *
      * Protobuf type {@code PostEnterSceneReq}
      */
     public static final class Builder extends
@@ -320,6 +345,8 @@ public final class PostEnterSceneReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        totalTickTime_ = 0D;
+
         enterSceneToken_ = 0;
 
         return this;
@@ -348,6 +375,7 @@ public final class PostEnterSceneReqOuterClass {
       @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_;
         onBuilt();
         return result;
@@ -397,6 +425,9 @@ public final class PostEnterSceneReqOuterClass {
 
       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());
         }
@@ -429,9 +460,40 @@ public final class PostEnterSceneReqOuterClass {
         return this;
       }
 
+      private double totalTickTime_ ;
+      /**
+       * <code>double total_tick_time = 8;</code>
+       * @return The totalTickTime.
+       */
+      @java.lang.Override
+      public double getTotalTickTime() {
+        return totalTickTime_;
+      }
+      /**
+       * <code>double total_tick_time = 8;</code>
+       * @param value The totalTickTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTotalTickTime(double value) {
+        
+        totalTickTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>double total_tick_time = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTotalTickTime() {
+        
+        totalTickTime_ = 0D;
+        onChanged();
+        return this;
+      }
+
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
+       * <code>uint32 enter_scene_token = 13;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -439,7 +501,7 @@ public final class PostEnterSceneReqOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
+       * <code>uint32 enter_scene_token = 13;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -450,7 +512,7 @@ public final class PostEnterSceneReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 8;</code>
+       * <code>uint32 enter_scene_token = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -526,9 +588,10 @@ public final class PostEnterSceneReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027PostEnterSceneReq.proto\".\n\021PostEnterSc" +
-      "eneReq\022\031\n\021enter_scene_token\030\010 \001(\rB\033\n\031emu" +
-      ".grasscutter.net.protob\006proto3"
+      "\n\027PostEnterSceneReq.proto\"G\n\021PostEnterSc" +
+      "eneReq\022\027\n\017total_tick_time\030\010 \001(\001\022\031\n\021enter" +
+      "_scene_token\030\r \001(\rB\033\n\031emu.grasscutter.ne" +
+      "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -539,7 +602,7 @@ public final class PostEnterSceneReqOuterClass {
     internal_static_PostEnterSceneReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PostEnterSceneReq_descriptor,
-        new java.lang.String[] { "EnterSceneToken", });
+        new java.lang.String[] { "TotalTickTime", "EnterSceneToken", });
   }
 
   // @@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 4489782c4..efb88e0a5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PostEnterSceneRspOuterClass.java
@@ -19,23 +19,18 @@ public final class PostEnterSceneRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 enter_scene_token = 9;</code>
+     * <code>uint32 enter_scene_token = 8;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
+
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 7880
-   * Obf: AAGPOLGIIGK
-   * </pre>
-   *
    * Protobuf type {@code PostEnterSceneRsp}
    */
   public static final class PostEnterSceneRsp extends
@@ -80,12 +75,12 @@ public final class PostEnterSceneRspOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 64: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -122,21 +117,10 @@ public final class PostEnterSceneRspOuterClass {
               emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.class, emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 15;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 15;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 9;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 8;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 9;</code>
+     * <code>uint32 enter_scene_token = 8;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class PostEnterSceneRspOuterClass {
       return enterSceneToken_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class PostEnterSceneRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(9, enterSceneToken_);
+        output.writeUInt32(8, enterSceneToken_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class PostEnterSceneRspOuterClass {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, enterSceneToken_);
+          .computeUInt32Size(8, enterSceneToken_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class PostEnterSceneRspOuterClass {
       }
       emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp other = (emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp) 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;
     }
@@ -211,10 +206,10 @@ public final class PostEnterSceneRspOuterClass {
       }
       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;
@@ -311,11 +306,6 @@ public final class PostEnterSceneRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7880
-     * Obf: AAGPOLGIIGK
-     * </pre>
-     *
      * Protobuf type {@code PostEnterSceneRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class PostEnterSceneRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         enterSceneToken_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class PostEnterSceneRspOuterClass {
       @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.retcode_ = retcode_;
         result.enterSceneToken_ = enterSceneToken_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class PostEnterSceneRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp other) {
         if (other == emu.grasscutter.net.proto.PostEnterSceneRspOuterClass.PostEnterSceneRsp.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;
@@ -468,40 +458,9 @@ public final class PostEnterSceneRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 15;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class PostEnterSceneRspOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class PostEnterSceneRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 9;</code>
+       * <code>uint32 enter_scene_token = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -529,6 +488,37 @@ public final class PostEnterSceneRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</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) {
@@ -597,8 +587,8 @@ public final class PostEnterSceneRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PostEnterSceneRsp.proto\"?\n\021PostEnterSc" +
-      "eneRsp\022\017\n\007retcode\030\017 \001(\005\022\031\n\021enter_scene_t" +
-      "oken\030\t \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "eneRsp\022\031\n\021enter_scene_token\030\010 \001(\r\022\017\n\007ret" +
+      "code\030\r \001(\005B\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class PostEnterSceneRspOuterClass {
     internal_static_PostEnterSceneRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PostEnterSceneRsp_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/PotionDungeonResultInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PotionDungeonResultInfoOuterClass.java
index e816d4ae6..d66f97fa1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PotionDungeonResultInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PotionDungeonResultInfoOuterClass.java
@@ -19,46 +19,42 @@ public final class PotionDungeonResultInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 level_id = 10;</code>
-     * @return The levelId.
+     * <code>uint32 PJJAOILBFBN = 3;</code>
+     * @return The pJJAOILBFBN.
      */
-    int getLevelId();
+    int getPJJAOILBFBN();
 
     /**
-     * <code>uint32 stage_id = 2;</code>
-     * @return The stageId.
+     * <code>uint32 LJEJEBELKMJ = 5;</code>
+     * @return The lJEJEBELKMJ.
      */
-    int getStageId();
+    int getLJEJEBELKMJ();
 
     /**
-     * <code>uint32 mode_id = 9;</code>
-     * @return The modeId.
+     * <code>uint32 LJFAFDHIKJD = 7;</code>
+     * @return The lJFAFDHIKJD.
      */
-    int getModeId();
+    int getLJFAFDHIKJD();
 
     /**
-     * <code>uint32 final_score = 1;</code>
+     * <code>uint32 MEMPKCGNNMF = 9;</code>
+     * @return The mEMPKCGNNMF.
+     */
+    int getMEMPKCGNNMF();
+
+    /**
+     * <code>uint32 KDPLCBJGBAF = 12;</code>
+     * @return The kDPLCBJGBAF.
+     */
+    int getKDPLCBJGBAF();
+
+    /**
+     * <code>uint32 final_score = 15;</code>
      * @return The finalScore.
      */
     int getFinalScore();
-
-    /**
-     * <code>uint32 difficulty_level = 15;</code>
-     * @return The difficultyLevel.
-     */
-    int getDifficultyLevel();
-
-    /**
-     * <code>uint32 left_time = 11;</code>
-     * @return The leftTime.
-     */
-    int getLeftTime();
   }
   /**
-   * <pre>
-   * Obf: IFLFOABLCJB
-   * </pre>
-   *
    * Protobuf type {@code PotionDungeonResultInfo}
    */
   public static final class PotionDungeonResultInfo extends
@@ -103,34 +99,34 @@ public final class PotionDungeonResultInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
 
-              finalScore_ = input.readUInt32();
+              pJJAOILBFBN_ = input.readUInt32();
               break;
             }
-            case 16: {
+            case 40: {
 
-              stageId_ = input.readUInt32();
+              lJEJEBELKMJ_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              lJFAFDHIKJD_ = input.readUInt32();
               break;
             }
             case 72: {
 
-              modeId_ = input.readUInt32();
+              mEMPKCGNNMF_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 96: {
 
-              levelId_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              leftTime_ = input.readUInt32();
+              kDPLCBJGBAF_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              difficultyLevel_ = input.readUInt32();
+              finalScore_ = input.readUInt32();
               break;
             }
             default: {
@@ -165,43 +161,65 @@ public final class PotionDungeonResultInfoOuterClass {
               emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.class, emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.Builder.class);
     }
 
-    public static final int LEVEL_ID_FIELD_NUMBER = 10;
-    private int levelId_;
+    public static final int PJJAOILBFBN_FIELD_NUMBER = 3;
+    private int pJJAOILBFBN_;
     /**
-     * <code>uint32 level_id = 10;</code>
-     * @return The levelId.
+     * <code>uint32 PJJAOILBFBN = 3;</code>
+     * @return The pJJAOILBFBN.
      */
     @java.lang.Override
-    public int getLevelId() {
-      return levelId_;
+    public int getPJJAOILBFBN() {
+      return pJJAOILBFBN_;
     }
 
-    public static final int STAGE_ID_FIELD_NUMBER = 2;
-    private int stageId_;
+    public static final int LJEJEBELKMJ_FIELD_NUMBER = 5;
+    private int lJEJEBELKMJ_;
     /**
-     * <code>uint32 stage_id = 2;</code>
-     * @return The stageId.
+     * <code>uint32 LJEJEBELKMJ = 5;</code>
+     * @return The lJEJEBELKMJ.
      */
     @java.lang.Override
-    public int getStageId() {
-      return stageId_;
+    public int getLJEJEBELKMJ() {
+      return lJEJEBELKMJ_;
     }
 
-    public static final int MODE_ID_FIELD_NUMBER = 9;
-    private int modeId_;
+    public static final int LJFAFDHIKJD_FIELD_NUMBER = 7;
+    private int lJFAFDHIKJD_;
     /**
-     * <code>uint32 mode_id = 9;</code>
-     * @return The modeId.
+     * <code>uint32 LJFAFDHIKJD = 7;</code>
+     * @return The lJFAFDHIKJD.
      */
     @java.lang.Override
-    public int getModeId() {
-      return modeId_;
+    public int getLJFAFDHIKJD() {
+      return lJFAFDHIKJD_;
     }
 
-    public static final int FINAL_SCORE_FIELD_NUMBER = 1;
+    public static final int MEMPKCGNNMF_FIELD_NUMBER = 9;
+    private int mEMPKCGNNMF_;
+    /**
+     * <code>uint32 MEMPKCGNNMF = 9;</code>
+     * @return The mEMPKCGNNMF.
+     */
+    @java.lang.Override
+    public int getMEMPKCGNNMF() {
+      return mEMPKCGNNMF_;
+    }
+
+    public static final int KDPLCBJGBAF_FIELD_NUMBER = 12;
+    private int kDPLCBJGBAF_;
+    /**
+     * <code>uint32 KDPLCBJGBAF = 12;</code>
+     * @return The kDPLCBJGBAF.
+     */
+    @java.lang.Override
+    public int getKDPLCBJGBAF() {
+      return kDPLCBJGBAF_;
+    }
+
+    public static final int FINAL_SCORE_FIELD_NUMBER = 15;
     private int finalScore_;
     /**
-     * <code>uint32 final_score = 1;</code>
+     * <code>uint32 final_score = 15;</code>
      * @return The finalScore.
      */
     @java.lang.Override
@@ -209,28 +227,6 @@ public final class PotionDungeonResultInfoOuterClass {
       return finalScore_;
     }
 
-    public static final int DIFFICULTY_LEVEL_FIELD_NUMBER = 15;
-    private int difficultyLevel_;
-    /**
-     * <code>uint32 difficulty_level = 15;</code>
-     * @return The difficultyLevel.
-     */
-    @java.lang.Override
-    public int getDifficultyLevel() {
-      return difficultyLevel_;
-    }
-
-    public static final int LEFT_TIME_FIELD_NUMBER = 11;
-    private int leftTime_;
-    /**
-     * <code>uint32 left_time = 11;</code>
-     * @return The leftTime.
-     */
-    @java.lang.Override
-    public int getLeftTime() {
-      return leftTime_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -245,23 +241,23 @@ public final class PotionDungeonResultInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (pJJAOILBFBN_ != 0) {
+        output.writeUInt32(3, pJJAOILBFBN_);
+      }
+      if (lJEJEBELKMJ_ != 0) {
+        output.writeUInt32(5, lJEJEBELKMJ_);
+      }
+      if (lJFAFDHIKJD_ != 0) {
+        output.writeUInt32(7, lJFAFDHIKJD_);
+      }
+      if (mEMPKCGNNMF_ != 0) {
+        output.writeUInt32(9, mEMPKCGNNMF_);
+      }
+      if (kDPLCBJGBAF_ != 0) {
+        output.writeUInt32(12, kDPLCBJGBAF_);
+      }
       if (finalScore_ != 0) {
-        output.writeUInt32(1, finalScore_);
-      }
-      if (stageId_ != 0) {
-        output.writeUInt32(2, stageId_);
-      }
-      if (modeId_ != 0) {
-        output.writeUInt32(9, modeId_);
-      }
-      if (levelId_ != 0) {
-        output.writeUInt32(10, levelId_);
-      }
-      if (leftTime_ != 0) {
-        output.writeUInt32(11, leftTime_);
-      }
-      if (difficultyLevel_ != 0) {
-        output.writeUInt32(15, difficultyLevel_);
+        output.writeUInt32(15, finalScore_);
       }
       unknownFields.writeTo(output);
     }
@@ -272,29 +268,29 @@ public final class PotionDungeonResultInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (pJJAOILBFBN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, pJJAOILBFBN_);
+      }
+      if (lJEJEBELKMJ_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, lJEJEBELKMJ_);
+      }
+      if (lJFAFDHIKJD_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, lJFAFDHIKJD_);
+      }
+      if (mEMPKCGNNMF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, mEMPKCGNNMF_);
+      }
+      if (kDPLCBJGBAF_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, kDPLCBJGBAF_);
+      }
       if (finalScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, finalScore_);
-      }
-      if (stageId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, stageId_);
-      }
-      if (modeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, modeId_);
-      }
-      if (levelId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, levelId_);
-      }
-      if (leftTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, leftTime_);
-      }
-      if (difficultyLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, difficultyLevel_);
+          .computeUInt32Size(15, finalScore_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,18 +307,18 @@ public final class PotionDungeonResultInfoOuterClass {
       }
       emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo other = (emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo) obj;
 
-      if (getLevelId()
-          != other.getLevelId()) return false;
-      if (getStageId()
-          != other.getStageId()) return false;
-      if (getModeId()
-          != other.getModeId()) return false;
+      if (getPJJAOILBFBN()
+          != other.getPJJAOILBFBN()) return false;
+      if (getLJEJEBELKMJ()
+          != other.getLJEJEBELKMJ()) return false;
+      if (getLJFAFDHIKJD()
+          != other.getLJFAFDHIKJD()) return false;
+      if (getMEMPKCGNNMF()
+          != other.getMEMPKCGNNMF()) return false;
+      if (getKDPLCBJGBAF()
+          != other.getKDPLCBJGBAF()) return false;
       if (getFinalScore()
           != other.getFinalScore()) return false;
-      if (getDifficultyLevel()
-          != other.getDifficultyLevel()) return false;
-      if (getLeftTime()
-          != other.getLeftTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -334,18 +330,18 @@ public final class PotionDungeonResultInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + LEVEL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getLevelId();
-      hash = (37 * hash) + STAGE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getStageId();
-      hash = (37 * hash) + MODE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getModeId();
+      hash = (37 * hash) + PJJAOILBFBN_FIELD_NUMBER;
+      hash = (53 * hash) + getPJJAOILBFBN();
+      hash = (37 * hash) + LJEJEBELKMJ_FIELD_NUMBER;
+      hash = (53 * hash) + getLJEJEBELKMJ();
+      hash = (37 * hash) + LJFAFDHIKJD_FIELD_NUMBER;
+      hash = (53 * hash) + getLJFAFDHIKJD();
+      hash = (37 * hash) + MEMPKCGNNMF_FIELD_NUMBER;
+      hash = (53 * hash) + getMEMPKCGNNMF();
+      hash = (37 * hash) + KDPLCBJGBAF_FIELD_NUMBER;
+      hash = (53 * hash) + getKDPLCBJGBAF();
       hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER;
       hash = (53 * hash) + getFinalScore();
-      hash = (37 * hash) + DIFFICULTY_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getDifficultyLevel();
-      hash = (37 * hash) + LEFT_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getLeftTime();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -442,10 +438,6 @@ public final class PotionDungeonResultInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: IFLFOABLCJB
-     * </pre>
-     *
      * Protobuf type {@code PotionDungeonResultInfo}
      */
     public static final class Builder extends
@@ -483,18 +475,18 @@ public final class PotionDungeonResultInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        levelId_ = 0;
+        pJJAOILBFBN_ = 0;
 
-        stageId_ = 0;
+        lJEJEBELKMJ_ = 0;
 
-        modeId_ = 0;
+        lJFAFDHIKJD_ = 0;
+
+        mEMPKCGNNMF_ = 0;
+
+        kDPLCBJGBAF_ = 0;
 
         finalScore_ = 0;
 
-        difficultyLevel_ = 0;
-
-        leftTime_ = 0;
-
         return this;
       }
 
@@ -521,12 +513,12 @@ public final class PotionDungeonResultInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo buildPartial() {
         emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo result = new emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo(this);
-        result.levelId_ = levelId_;
-        result.stageId_ = stageId_;
-        result.modeId_ = modeId_;
+        result.pJJAOILBFBN_ = pJJAOILBFBN_;
+        result.lJEJEBELKMJ_ = lJEJEBELKMJ_;
+        result.lJFAFDHIKJD_ = lJFAFDHIKJD_;
+        result.mEMPKCGNNMF_ = mEMPKCGNNMF_;
+        result.kDPLCBJGBAF_ = kDPLCBJGBAF_;
         result.finalScore_ = finalScore_;
-        result.difficultyLevel_ = difficultyLevel_;
-        result.leftTime_ = leftTime_;
         onBuilt();
         return result;
       }
@@ -575,24 +567,24 @@ public final class PotionDungeonResultInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo other) {
         if (other == emu.grasscutter.net.proto.PotionDungeonResultInfoOuterClass.PotionDungeonResultInfo.getDefaultInstance()) return this;
-        if (other.getLevelId() != 0) {
-          setLevelId(other.getLevelId());
+        if (other.getPJJAOILBFBN() != 0) {
+          setPJJAOILBFBN(other.getPJJAOILBFBN());
         }
-        if (other.getStageId() != 0) {
-          setStageId(other.getStageId());
+        if (other.getLJEJEBELKMJ() != 0) {
+          setLJEJEBELKMJ(other.getLJEJEBELKMJ());
         }
-        if (other.getModeId() != 0) {
-          setModeId(other.getModeId());
+        if (other.getLJFAFDHIKJD() != 0) {
+          setLJFAFDHIKJD(other.getLJFAFDHIKJD());
+        }
+        if (other.getMEMPKCGNNMF() != 0) {
+          setMEMPKCGNNMF(other.getMEMPKCGNNMF());
+        }
+        if (other.getKDPLCBJGBAF() != 0) {
+          setKDPLCBJGBAF(other.getKDPLCBJGBAF());
         }
         if (other.getFinalScore() != 0) {
           setFinalScore(other.getFinalScore());
         }
-        if (other.getDifficultyLevel() != 0) {
-          setDifficultyLevel(other.getDifficultyLevel());
-        }
-        if (other.getLeftTime() != 0) {
-          setLeftTime(other.getLeftTime());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -622,102 +614,164 @@ public final class PotionDungeonResultInfoOuterClass {
         return this;
       }
 
-      private int levelId_ ;
+      private int pJJAOILBFBN_ ;
       /**
-       * <code>uint32 level_id = 10;</code>
-       * @return The levelId.
+       * <code>uint32 PJJAOILBFBN = 3;</code>
+       * @return The pJJAOILBFBN.
        */
       @java.lang.Override
-      public int getLevelId() {
-        return levelId_;
+      public int getPJJAOILBFBN() {
+        return pJJAOILBFBN_;
       }
       /**
-       * <code>uint32 level_id = 10;</code>
-       * @param value The levelId to set.
+       * <code>uint32 PJJAOILBFBN = 3;</code>
+       * @param value The pJJAOILBFBN to set.
        * @return This builder for chaining.
        */
-      public Builder setLevelId(int value) {
+      public Builder setPJJAOILBFBN(int value) {
         
-        levelId_ = value;
+        pJJAOILBFBN_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 level_id = 10;</code>
+       * <code>uint32 PJJAOILBFBN = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearLevelId() {
+      public Builder clearPJJAOILBFBN() {
         
-        levelId_ = 0;
+        pJJAOILBFBN_ = 0;
         onChanged();
         return this;
       }
 
-      private int stageId_ ;
+      private int lJEJEBELKMJ_ ;
       /**
-       * <code>uint32 stage_id = 2;</code>
-       * @return The stageId.
+       * <code>uint32 LJEJEBELKMJ = 5;</code>
+       * @return The lJEJEBELKMJ.
        */
       @java.lang.Override
-      public int getStageId() {
-        return stageId_;
+      public int getLJEJEBELKMJ() {
+        return lJEJEBELKMJ_;
       }
       /**
-       * <code>uint32 stage_id = 2;</code>
-       * @param value The stageId to set.
+       * <code>uint32 LJEJEBELKMJ = 5;</code>
+       * @param value The lJEJEBELKMJ to set.
        * @return This builder for chaining.
        */
-      public Builder setStageId(int value) {
+      public Builder setLJEJEBELKMJ(int value) {
         
-        stageId_ = value;
+        lJEJEBELKMJ_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 stage_id = 2;</code>
+       * <code>uint32 LJEJEBELKMJ = 5;</code>
        * @return This builder for chaining.
        */
-      public Builder clearStageId() {
+      public Builder clearLJEJEBELKMJ() {
         
-        stageId_ = 0;
+        lJEJEBELKMJ_ = 0;
         onChanged();
         return this;
       }
 
-      private int modeId_ ;
+      private int lJFAFDHIKJD_ ;
       /**
-       * <code>uint32 mode_id = 9;</code>
-       * @return The modeId.
+       * <code>uint32 LJFAFDHIKJD = 7;</code>
+       * @return The lJFAFDHIKJD.
        */
       @java.lang.Override
-      public int getModeId() {
-        return modeId_;
+      public int getLJFAFDHIKJD() {
+        return lJFAFDHIKJD_;
       }
       /**
-       * <code>uint32 mode_id = 9;</code>
-       * @param value The modeId to set.
+       * <code>uint32 LJFAFDHIKJD = 7;</code>
+       * @param value The lJFAFDHIKJD to set.
        * @return This builder for chaining.
        */
-      public Builder setModeId(int value) {
+      public Builder setLJFAFDHIKJD(int value) {
         
-        modeId_ = value;
+        lJFAFDHIKJD_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 mode_id = 9;</code>
+       * <code>uint32 LJFAFDHIKJD = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearModeId() {
+      public Builder clearLJFAFDHIKJD() {
         
-        modeId_ = 0;
+        lJFAFDHIKJD_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mEMPKCGNNMF_ ;
+      /**
+       * <code>uint32 MEMPKCGNNMF = 9;</code>
+       * @return The mEMPKCGNNMF.
+       */
+      @java.lang.Override
+      public int getMEMPKCGNNMF() {
+        return mEMPKCGNNMF_;
+      }
+      /**
+       * <code>uint32 MEMPKCGNNMF = 9;</code>
+       * @param value The mEMPKCGNNMF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMEMPKCGNNMF(int value) {
+        
+        mEMPKCGNNMF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MEMPKCGNNMF = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMEMPKCGNNMF() {
+        
+        mEMPKCGNNMF_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kDPLCBJGBAF_ ;
+      /**
+       * <code>uint32 KDPLCBJGBAF = 12;</code>
+       * @return The kDPLCBJGBAF.
+       */
+      @java.lang.Override
+      public int getKDPLCBJGBAF() {
+        return kDPLCBJGBAF_;
+      }
+      /**
+       * <code>uint32 KDPLCBJGBAF = 12;</code>
+       * @param value The kDPLCBJGBAF to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKDPLCBJGBAF(int value) {
+        
+        kDPLCBJGBAF_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KDPLCBJGBAF = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKDPLCBJGBAF() {
+        
+        kDPLCBJGBAF_ = 0;
         onChanged();
         return this;
       }
 
       private int finalScore_ ;
       /**
-       * <code>uint32 final_score = 1;</code>
+       * <code>uint32 final_score = 15;</code>
        * @return The finalScore.
        */
       @java.lang.Override
@@ -725,7 +779,7 @@ public final class PotionDungeonResultInfoOuterClass {
         return finalScore_;
       }
       /**
-       * <code>uint32 final_score = 1;</code>
+       * <code>uint32 final_score = 15;</code>
        * @param value The finalScore to set.
        * @return This builder for chaining.
        */
@@ -736,7 +790,7 @@ public final class PotionDungeonResultInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 final_score = 1;</code>
+       * <code>uint32 final_score = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinalScore() {
@@ -745,68 +799,6 @@ public final class PotionDungeonResultInfoOuterClass {
         onChanged();
         return this;
       }
-
-      private int difficultyLevel_ ;
-      /**
-       * <code>uint32 difficulty_level = 15;</code>
-       * @return The difficultyLevel.
-       */
-      @java.lang.Override
-      public int getDifficultyLevel() {
-        return difficultyLevel_;
-      }
-      /**
-       * <code>uint32 difficulty_level = 15;</code>
-       * @param value The difficultyLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDifficultyLevel(int value) {
-        
-        difficultyLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 difficulty_level = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDifficultyLevel() {
-        
-        difficultyLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int leftTime_ ;
-      /**
-       * <code>uint32 left_time = 11;</code>
-       * @return The leftTime.
-       */
-      @java.lang.Override
-      public int getLeftTime() {
-        return leftTime_;
-      }
-      /**
-       * <code>uint32 left_time = 11;</code>
-       * @param value The leftTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLeftTime(int value) {
-        
-        leftTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 left_time = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLeftTime() {
-        
-        leftTime_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -874,12 +866,12 @@ public final class PotionDungeonResultInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\035PotionDungeonResultInfo.proto\"\220\001\n\027Poti" +
-      "onDungeonResultInfo\022\020\n\010level_id\030\n \001(\r\022\020\n" +
-      "\010stage_id\030\002 \001(\r\022\017\n\007mode_id\030\t \001(\r\022\023\n\013fina" +
-      "l_score\030\001 \001(\r\022\030\n\020difficulty_level\030\017 \001(\r\022" +
-      "\021\n\tleft_time\030\013 \001(\rB\033\n\031emu.grasscutter.ne" +
-      "t.protob\006proto3"
+      "\n\035PotionDungeonResultInfo.proto\"\227\001\n\027Poti" +
+      "onDungeonResultInfo\022\023\n\013PJJAOILBFBN\030\003 \001(\r" +
+      "\022\023\n\013LJEJEBELKMJ\030\005 \001(\r\022\023\n\013LJFAFDHIKJD\030\007 \001" +
+      "(\r\022\023\n\013MEMPKCGNNMF\030\t \001(\r\022\023\n\013KDPLCBJGBAF\030\014" +
+      " \001(\r\022\023\n\013final_score\030\017 \001(\rB\033\n\031emu.grasscu" +
+      "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -890,7 +882,7 @@ public final class PotionDungeonResultInfoOuterClass {
     internal_static_PotionDungeonResultInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PotionDungeonResultInfo_descriptor,
-        new java.lang.String[] { "LevelId", "StageId", "ModeId", "FinalScore", "DifficultyLevel", "LeftTime", });
+        new java.lang.String[] { "PJJAOILBFBN", "LJEJEBELKMJ", "LJFAFDHIKJD", "MEMPKCGNNMF", "KDPLCBJGBAF", "FinalScore", });
   }
 
   // @@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 63c3575df..f7cd0e1cc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class PrivateChatNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      * @return Whether the chatInfo field is set.
      */
     boolean hasChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      * @return The chatInfo.
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo();
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 29471
-   * Obf: ANNGLMINMGK
-   * </pre>
-   *
    * Protobuf type {@code PrivateChatNotify}
    */
   public static final class PrivateChatNotify extends
@@ -83,7 +78,7 @@ public final class PrivateChatNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 58: {
               emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder subBuilder = null;
               if (chatInfo_ != null) {
                 subBuilder = chatInfo_.toBuilder();
@@ -128,10 +123,10 @@ public final class PrivateChatNotifyOuterClass {
               emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify.class, emu.grasscutter.net.proto.PrivateChatNotifyOuterClass.PrivateChatNotify.Builder.class);
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 5;
+    public static final int CHAT_INFO_FIELD_NUMBER = 7;
     private emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo chatInfo_;
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      * @return Whether the chatInfo field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class PrivateChatNotifyOuterClass {
       return chatInfo_ != null;
     }
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      * @return The chatInfo.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class PrivateChatNotifyOuterClass {
       return chatInfo_ == null ? emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance() : chatInfo_;
     }
     /**
-     * <code>.ChatInfo chat_info = 5;</code>
+     * <code>.ChatInfo chat_info = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
@@ -169,7 +164,7 @@ public final class PrivateChatNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (chatInfo_ != null) {
-        output.writeMessage(5, getChatInfo());
+        output.writeMessage(7, getChatInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class PrivateChatNotifyOuterClass {
       size = 0;
       if (chatInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getChatInfo());
+          .computeMessageSize(7, getChatInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class PrivateChatNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29471
-     * Obf: ANNGLMINMGK
-     * </pre>
-     *
      * Protobuf type {@code PrivateChatNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class PrivateChatNotifyOuterClass {
       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 = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        * @return Whether the chatInfo field is set.
        */
       public boolean hasChatInfo() {
         return chatInfoBuilder_ != null || chatInfo_ != null;
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        * @return The chatInfo.
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo() {
@@ -496,7 +486,7 @@ public final class PrivateChatNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public Builder setChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class PrivateChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public Builder setChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class PrivateChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public Builder mergeChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class PrivateChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class PrivateChatNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder() {
         
@@ -566,7 +556,7 @@ public final class PrivateChatNotifyOuterClass {
         return getChatInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder() {
         if (chatInfoBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class PrivateChatNotifyOuterClass {
         }
       }
       /**
-       * <code>.ChatInfo chat_info = 5;</code>
+       * <code>.ChatInfo chat_info = 7;</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> 
@@ -660,7 +650,7 @@ public final class PrivateChatNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PrivateChatNotify.proto\032\016ChatInfo.prot" +
-      "o\"1\n\021PrivateChatNotify\022\034\n\tchat_info\030\005 \001(" +
+      "o\"1\n\021PrivateChatNotify\022\034\n\tchat_info\030\007 \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 25a6e3d4e..1c4c2571c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PrivateChatReqOuterClass.java
@@ -19,28 +19,11 @@ public final class PrivateChatReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 5;</code>
+     * <code>uint32 target_uid = 8;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
-    /**
-     * <code>string text = 12;</code>
-     * @return Whether the text field is set.
-     */
-    boolean hasText();
-    /**
-     * <code>string text = 12;</code>
-     * @return The text.
-     */
-    java.lang.String getText();
-    /**
-     * <code>string text = 12;</code>
-     * @return The bytes for text.
-     */
-    com.google.protobuf.ByteString
-        getTextBytes();
-
     /**
      * <code>uint32 icon = 11;</code>
      * @return Whether the icon field is set.
@@ -52,14 +35,26 @@ public final class PrivateChatReqOuterClass {
      */
     int getIcon();
 
+    /**
+     * <code>string text = 9;</code>
+     * @return Whether the text field is set.
+     */
+    boolean hasText();
+    /**
+     * <code>string text = 9;</code>
+     * @return The text.
+     */
+    java.lang.String getText();
+    /**
+     * <code>string text = 9;</code>
+     * @return The bytes for text.
+     */
+    com.google.protobuf.ByteString
+        getTextBytes();
+
     public emu.grasscutter.net.proto.PrivateChatReqOuterClass.PrivateChatReq.ContentCase getContentCase();
   }
   /**
-   * <pre>
-   * CmdId: 8163
-   * Obf: LOHLOJMOCAG
-   * </pre>
-   *
    * Protobuf type {@code PrivateChatReq}
    */
   public static final class PrivateChatReq extends
@@ -104,22 +99,22 @@ public final class PrivateChatReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 64: {
 
               targetUid_ = input.readUInt32();
               break;
             }
+            case 74: {
+              java.lang.String s = input.readStringRequireUtf8();
+              contentCase_ = 9;
+              content_ = s;
+              break;
+            }
             case 88: {
               contentCase_ = 11;
               content_ = input.readUInt32();
               break;
             }
-            case 98: {
-              java.lang.String s = input.readStringRequireUtf8();
-              contentCase_ = 12;
-              content_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -157,8 +152,8 @@ public final class PrivateChatReqOuterClass {
     public enum ContentCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      TEXT(12),
       ICON(11),
+      TEXT(9),
       CONTENT_NOT_SET(0);
       private final int value;
       private ContentCase(int value) {
@@ -176,8 +171,8 @@ public final class PrivateChatReqOuterClass {
 
       public static ContentCase forNumber(int value) {
         switch (value) {
-          case 12: return TEXT;
           case 11: return ICON;
+          case 9: return TEXT;
           case 0: return CONTENT_NOT_SET;
           default: return null;
         }
@@ -193,10 +188,10 @@ public final class PrivateChatReqOuterClass {
           contentCase_);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 5;
+    public static final int TARGET_UID_FIELD_NUMBER = 8;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 5;</code>
+     * <code>uint32 target_uid = 8;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -204,58 +199,6 @@ public final class PrivateChatReqOuterClass {
       return targetUid_;
     }
 
-    public static final int TEXT_FIELD_NUMBER = 12;
-    /**
-     * <code>string text = 12;</code>
-     * @return Whether the text field is set.
-     */
-    public boolean hasText() {
-      return contentCase_ == 12;
-    }
-    /**
-     * <code>string text = 12;</code>
-     * @return The text.
-     */
-    public java.lang.String getText() {
-      java.lang.Object ref = "";
-      if (contentCase_ == 12) {
-        ref = content_;
-      }
-      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();
-        if (contentCase_ == 12) {
-          content_ = s;
-        }
-        return s;
-      }
-    }
-    /**
-     * <code>string text = 12;</code>
-     * @return The bytes for text.
-     */
-    public com.google.protobuf.ByteString
-        getTextBytes() {
-      java.lang.Object ref = "";
-      if (contentCase_ == 12) {
-        ref = content_;
-      }
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        if (contentCase_ == 12) {
-          content_ = b;
-        }
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
     public static final int ICON_FIELD_NUMBER = 11;
     /**
      * <code>uint32 icon = 11;</code>
@@ -277,6 +220,58 @@ public final class PrivateChatReqOuterClass {
       return 0;
     }
 
+    public static final int TEXT_FIELD_NUMBER = 9;
+    /**
+     * <code>string text = 9;</code>
+     * @return Whether the text field is set.
+     */
+    public boolean hasText() {
+      return contentCase_ == 9;
+    }
+    /**
+     * <code>string text = 9;</code>
+     * @return The text.
+     */
+    public java.lang.String getText() {
+      java.lang.Object ref = "";
+      if (contentCase_ == 9) {
+        ref = content_;
+      }
+      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();
+        if (contentCase_ == 9) {
+          content_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>string text = 9;</code>
+     * @return The bytes for text.
+     */
+    public com.google.protobuf.ByteString
+        getTextBytes() {
+      java.lang.Object ref = "";
+      if (contentCase_ == 9) {
+        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) {
+          content_ = b;
+        }
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -292,15 +287,15 @@ public final class PrivateChatReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetUid_ != 0) {
-        output.writeUInt32(5, targetUid_);
+        output.writeUInt32(8, targetUid_);
+      }
+      if (contentCase_ == 9) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, content_);
       }
       if (contentCase_ == 11) {
         output.writeUInt32(
             11, (int)((java.lang.Integer) content_));
       }
-      if (contentCase_ == 12) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, content_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -312,16 +307,16 @@ public final class PrivateChatReqOuterClass {
       size = 0;
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, targetUid_);
+          .computeUInt32Size(8, targetUid_);
+      }
+      if (contentCase_ == 9) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, content_);
       }
       if (contentCase_ == 11) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(
               11, (int)((java.lang.Integer) content_));
       }
-      if (contentCase_ == 12) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, content_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -341,14 +336,14 @@ public final class PrivateChatReqOuterClass {
           != other.getTargetUid()) return false;
       if (!getContentCase().equals(other.getContentCase())) return false;
       switch (contentCase_) {
-        case 12:
-          if (!getText()
-              .equals(other.getText())) return false;
-          break;
         case 11:
           if (getIcon()
               != other.getIcon()) return false;
           break;
+        case 9:
+          if (!getText()
+              .equals(other.getText())) return false;
+          break;
         case 0:
         default:
       }
@@ -366,14 +361,14 @@ public final class PrivateChatReqOuterClass {
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
       switch (contentCase_) {
-        case 12:
-          hash = (37 * hash) + TEXT_FIELD_NUMBER;
-          hash = (53 * hash) + getText().hashCode();
-          break;
         case 11:
           hash = (37 * hash) + ICON_FIELD_NUMBER;
           hash = (53 * hash) + getIcon();
           break;
+        case 9:
+          hash = (37 * hash) + TEXT_FIELD_NUMBER;
+          hash = (53 * hash) + getText().hashCode();
+          break;
         case 0:
         default:
       }
@@ -473,11 +468,6 @@ public final class PrivateChatReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8163
-     * Obf: LOHLOJMOCAG
-     * </pre>
-     *
      * Protobuf type {@code PrivateChatReq}
      */
     public static final class Builder extends
@@ -546,10 +536,10 @@ public final class PrivateChatReqOuterClass {
       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_ == 12) {
+        if (contentCase_ == 11) {
           result.content_ = content_;
         }
-        if (contentCase_ == 11) {
+        if (contentCase_ == 9) {
           result.content_ = content_;
         }
         result.contentCase_ = contentCase_;
@@ -605,16 +595,16 @@ public final class PrivateChatReqOuterClass {
           setTargetUid(other.getTargetUid());
         }
         switch (other.getContentCase()) {
-          case TEXT: {
-            contentCase_ = 12;
-            content_ = other.content_;
-            onChanged();
-            break;
-          }
           case ICON: {
             setIcon(other.getIcon());
             break;
           }
+          case TEXT: {
+            contentCase_ = 9;
+            content_ = other.content_;
+            onChanged();
+            break;
+          }
           case CONTENT_NOT_SET: {
             break;
           }
@@ -665,7 +655,7 @@ public final class PrivateChatReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 5;</code>
+       * <code>uint32 target_uid = 8;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -673,7 +663,7 @@ public final class PrivateChatReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 5;</code>
+       * <code>uint32 target_uid = 8;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -684,7 +674,7 @@ public final class PrivateChatReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 5;</code>
+       * <code>uint32 target_uid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -694,103 +684,6 @@ public final class PrivateChatReqOuterClass {
         return this;
       }
 
-      /**
-       * <code>string text = 12;</code>
-       * @return Whether the text field is set.
-       */
-      @java.lang.Override
-      public boolean hasText() {
-        return contentCase_ == 12;
-      }
-      /**
-       * <code>string text = 12;</code>
-       * @return The text.
-       */
-      @java.lang.Override
-      public java.lang.String getText() {
-        java.lang.Object ref = "";
-        if (contentCase_ == 12) {
-          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_ == 12) {
-            content_ = s;
-          }
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string text = 12;</code>
-       * @return The bytes for text.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString
-          getTextBytes() {
-        java.lang.Object ref = "";
-        if (contentCase_ == 12) {
-          ref = content_;
-        }
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          if (contentCase_ == 12) {
-            content_ = b;
-          }
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string text = 12;</code>
-       * @param value The text to set.
-       * @return This builder for chaining.
-       */
-      public Builder setText(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  contentCase_ = 12;
-        content_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string text = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearText() {
-        if (contentCase_ == 12) {
-          contentCase_ = 0;
-          content_ = null;
-          onChanged();
-        }
-        return this;
-      }
-      /**
-       * <code>string text = 12;</code>
-       * @param value The bytes for text to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTextBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        contentCase_ = 12;
-        content_ = value;
-        onChanged();
-        return this;
-      }
-
       /**
        * <code>uint32 icon = 11;</code>
        * @return Whether the icon field is set.
@@ -831,6 +724,103 @@ public final class PrivateChatReqOuterClass {
         }
         return this;
       }
+
+      /**
+       * <code>string text = 9;</code>
+       * @return Whether the text field is set.
+       */
+      @java.lang.Override
+      public boolean hasText() {
+        return contentCase_ == 9;
+      }
+      /**
+       * <code>string text = 9;</code>
+       * @return The text.
+       */
+      @java.lang.Override
+      public java.lang.String getText() {
+        java.lang.Object ref = "";
+        if (contentCase_ == 9) {
+          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) {
+            content_ = s;
+          }
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string text = 9;</code>
+       * @return The bytes for text.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString
+          getTextBytes() {
+        java.lang.Object ref = "";
+        if (contentCase_ == 9) {
+          ref = content_;
+        }
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          if (contentCase_ == 9) {
+            content_ = b;
+          }
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string text = 9;</code>
+       * @param value The text to set.
+       * @return This builder for chaining.
+       */
+      public Builder setText(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  contentCase_ = 9;
+        content_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string text = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearText() {
+        if (contentCase_ == 9) {
+          contentCase_ = 0;
+          content_ = null;
+          onChanged();
+        }
+        return this;
+      }
+      /**
+       * <code>string text = 9;</code>
+       * @param value The bytes for text to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTextBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        contentCase_ = 9;
+        content_ = value;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -899,8 +889,8 @@ public final class PrivateChatReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024PrivateChatReq.proto\"O\n\016PrivateChatReq" +
-      "\022\022\n\ntarget_uid\030\005 \001(\r\022\016\n\004text\030\014 \001(\tH\000\022\016\n\004" +
-      "icon\030\013 \001(\rH\000B\t\n\007contentB\033\n\031emu.grasscutt" +
+      "\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" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -912,7 +902,7 @@ public final class PrivateChatReqOuterClass {
     internal_static_PrivateChatReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PrivateChatReq_descriptor,
-        new java.lang.String[] { "TargetUid", "Text", "Icon", "Content", });
+        new java.lang.String[] { "TargetUid", "Icon", "Text", "Content", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java
index 4d0b6ecd5..7e04f0e39 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureOuterClass.java
@@ -29,12 +29,14 @@ public final class ProfilePictureOuterClass {
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>uint32 head_image_id = 3;</code>
+     * @return The headImageId.
+     */
+    int getHeadImageId();
   }
   /**
-   * <pre>
-   * Obf: FEKJLPEAOJI
-   * </pre>
-   *
    * Protobuf type {@code ProfilePicture}
    */
   public static final class ProfilePicture extends
@@ -89,6 +91,11 @@ public final class ProfilePictureOuterClass {
               costumeId_ = input.readUInt32();
               break;
             }
+            case 24: {
+
+              headImageId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -143,6 +150,17 @@ public final class ProfilePictureOuterClass {
       return costumeId_;
     }
 
+    public static final int HEAD_IMAGE_ID_FIELD_NUMBER = 3;
+    private int headImageId_;
+    /**
+     * <code>uint32 head_image_id = 3;</code>
+     * @return The headImageId.
+     */
+    @java.lang.Override
+    public int getHeadImageId() {
+      return headImageId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -163,6 +181,9 @@ public final class ProfilePictureOuterClass {
       if (costumeId_ != 0) {
         output.writeUInt32(2, costumeId_);
       }
+      if (headImageId_ != 0) {
+        output.writeUInt32(3, headImageId_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -180,6 +201,10 @@ public final class ProfilePictureOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, costumeId_);
       }
+      if (headImageId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, headImageId_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -199,6 +224,8 @@ public final class ProfilePictureOuterClass {
           != other.getAvatarId()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getHeadImageId()
+          != other.getHeadImageId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -214,6 +241,8 @@ public final class ProfilePictureOuterClass {
       hash = (53 * hash) + getAvatarId();
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
+      hash = (37 * hash) + HEAD_IMAGE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getHeadImageId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -310,10 +339,6 @@ public final class ProfilePictureOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FEKJLPEAOJI
-     * </pre>
-     *
      * Protobuf type {@code ProfilePicture}
      */
     public static final class Builder extends
@@ -355,6 +380,8 @@ public final class ProfilePictureOuterClass {
 
         costumeId_ = 0;
 
+        headImageId_ = 0;
+
         return this;
       }
 
@@ -383,6 +410,7 @@ public final class ProfilePictureOuterClass {
         emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture result = new emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture(this);
         result.avatarId_ = avatarId_;
         result.costumeId_ = costumeId_;
+        result.headImageId_ = headImageId_;
         onBuilt();
         return result;
       }
@@ -437,6 +465,9 @@ public final class ProfilePictureOuterClass {
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getHeadImageId() != 0) {
+          setHeadImageId(other.getHeadImageId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -527,6 +558,37 @@ public final class ProfilePictureOuterClass {
         onChanged();
         return this;
       }
+
+      private int headImageId_ ;
+      /**
+       * <code>uint32 head_image_id = 3;</code>
+       * @return The headImageId.
+       */
+      @java.lang.Override
+      public int getHeadImageId() {
+        return headImageId_;
+      }
+      /**
+       * <code>uint32 head_image_id = 3;</code>
+       * @param value The headImageId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHeadImageId(int value) {
+        
+        headImageId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 head_image_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHeadImageId() {
+        
+        headImageId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -594,9 +656,10 @@ public final class ProfilePictureOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024ProfilePicture.proto\"7\n\016ProfilePicture" +
-      "\022\021\n\tavatar_id\030\001 \001(\r\022\022\n\ncostume_id\030\002 \001(\rB" +
-      "\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\n\024ProfilePicture.proto\"N\n\016ProfilePicture" +
+      "\022\021\n\tavatar_id\030\001 \001(\r\022\022\n\ncostume_id\030\002 \001(\r\022" +
+      "\025\n\rhead_image_id\030\003 \001(\rB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -607,7 +670,7 @@ public final class ProfilePictureOuterClass {
     internal_static_ProfilePicture_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ProfilePicture_descriptor,
-        new java.lang.String[] { "AvatarId", "CostumeId", });
+        new java.lang.String[] { "AvatarId", "CostumeId", "HeadImageId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureUpdateNotifyOuterClass.java
new file mode 100644
index 000000000..4af555f4a
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ProfilePictureUpdateNotifyOuterClass.java
@@ -0,0 +1,664 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ProfilePictureUpdateNotify.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ProfilePictureUpdateNotifyOuterClass {
+  private ProfilePictureUpdateNotifyOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface ProfilePictureUpdateNotifyOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:ProfilePictureUpdateNotify)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @return A list containing the specialProfilePictureList.
+     */
+    java.util.List<java.lang.Integer> getSpecialProfilePictureListList();
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @return The count of specialProfilePictureList.
+     */
+    int getSpecialProfilePictureListCount();
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The specialProfilePictureList at the given index.
+     */
+    int getSpecialProfilePictureList(int index);
+  }
+  /**
+   * Protobuf type {@code ProfilePictureUpdateNotify}
+   */
+  public static final class ProfilePictureUpdateNotify extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:ProfilePictureUpdateNotify)
+      ProfilePictureUpdateNotifyOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use ProfilePictureUpdateNotify.newBuilder() to construct.
+    private ProfilePictureUpdateNotify(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private ProfilePictureUpdateNotify() {
+      specialProfilePictureList_ = emptyIntList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new ProfilePictureUpdateNotify();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ProfilePictureUpdateNotify(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                specialProfilePictureList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              specialProfilePictureList_.addInt(input.readUInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                specialProfilePictureList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                specialProfilePictureList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.internal_static_ProfilePictureUpdateNotify_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.internal_static_ProfilePictureUpdateNotify_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.class, emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.Builder.class);
+    }
+
+    public static final int SPECIAL_PROFILE_PICTURE_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList specialProfilePictureList_;
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @return A list containing the specialProfilePictureList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getSpecialProfilePictureListList() {
+      return specialProfilePictureList_;
+    }
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @return The count of specialProfilePictureList.
+     */
+    public int getSpecialProfilePictureListCount() {
+      return specialProfilePictureList_.size();
+    }
+    /**
+     * <code>repeated uint32 special_profile_picture_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The specialProfilePictureList at the given index.
+     */
+    public int getSpecialProfilePictureList(int index) {
+      return specialProfilePictureList_.getInt(index);
+    }
+    private int specialProfilePictureListMemoizedSerializedSize = -1;
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (getSpecialProfilePictureListList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(specialProfilePictureListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < specialProfilePictureList_.size(); i++) {
+        output.writeUInt32NoTag(specialProfilePictureList_.getInt(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < specialProfilePictureList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(specialProfilePictureList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getSpecialProfilePictureListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        specialProfilePictureListMemoizedSerializedSize = dataSize;
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify other = (emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify) obj;
+
+      if (!getSpecialProfilePictureListList()
+          .equals(other.getSpecialProfilePictureListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getSpecialProfilePictureListCount() > 0) {
+        hash = (37 * hash) + SPECIAL_PROFILE_PICTURE_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getSpecialProfilePictureListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code ProfilePictureUpdateNotify}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:ProfilePictureUpdateNotify)
+        emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotifyOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.internal_static_ProfilePictureUpdateNotify_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.internal_static_ProfilePictureUpdateNotify_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.class, emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        specialProfilePictureList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.internal_static_ProfilePictureUpdateNotify_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify build() {
+        emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify buildPartial() {
+        emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify result = new emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify(this);
+        int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.specialProfilePictureList_ = specialProfilePictureList_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify) {
+          return mergeFrom((emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify other) {
+        if (other == emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify.getDefaultInstance()) return this;
+        if (!other.specialProfilePictureList_.isEmpty()) {
+          if (specialProfilePictureList_.isEmpty()) {
+            specialProfilePictureList_ = other.specialProfilePictureList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureSpecialProfilePictureListIsMutable();
+            specialProfilePictureList_.addAll(other.specialProfilePictureList_);
+          }
+          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.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private com.google.protobuf.Internal.IntList specialProfilePictureList_ = emptyIntList();
+      private void ensureSpecialProfilePictureListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          specialProfilePictureList_ = mutableCopy(specialProfilePictureList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @return A list containing the specialProfilePictureList.
+       */
+      public java.util.List<java.lang.Integer>
+          getSpecialProfilePictureListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(specialProfilePictureList_) : specialProfilePictureList_;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @return The count of specialProfilePictureList.
+       */
+      public int getSpecialProfilePictureListCount() {
+        return specialProfilePictureList_.size();
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @param index The index of the element to return.
+       * @return The specialProfilePictureList at the given index.
+       */
+      public int getSpecialProfilePictureList(int index) {
+        return specialProfilePictureList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The specialProfilePictureList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSpecialProfilePictureList(
+          int index, int value) {
+        ensureSpecialProfilePictureListIsMutable();
+        specialProfilePictureList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @param value The specialProfilePictureList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addSpecialProfilePictureList(int value) {
+        ensureSpecialProfilePictureListIsMutable();
+        specialProfilePictureList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @param values The specialProfilePictureList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllSpecialProfilePictureList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureSpecialProfilePictureListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, specialProfilePictureList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 special_profile_picture_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSpecialProfilePictureList() {
+        specialProfilePictureList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:ProfilePictureUpdateNotify)
+    }
+
+    // @@protoc_insertion_point(class_scope:ProfilePictureUpdateNotify)
+    private static final emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify();
+    }
+
+    public static emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<ProfilePictureUpdateNotify>
+        PARSER = new com.google.protobuf.AbstractParser<ProfilePictureUpdateNotify>() {
+      @java.lang.Override
+      public ProfilePictureUpdateNotify parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ProfilePictureUpdateNotify(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ProfilePictureUpdateNotify> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ProfilePictureUpdateNotify> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ProfilePictureUpdateNotifyOuterClass.ProfilePictureUpdateNotify getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_ProfilePictureUpdateNotify_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_ProfilePictureUpdateNotify_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n ProfilePictureUpdateNotify.proto\"B\n\032Pr" +
+      "ofilePictureUpdateNotify\022$\n\034special_prof" +
+      "ile_picture_list\030\004 \003(\rB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_ProfilePictureUpdateNotify_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_ProfilePictureUpdateNotify_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_ProfilePictureUpdateNotify_descriptor,
+        new java.lang.String[] { "SpecialProfilePictureList", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PropChangeReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PropChangeReasonOuterClass.java
index 86ccac405..014615598 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PropChangeReasonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PropChangeReasonOuterClass.java
@@ -15,10 +15,6 @@ public final class PropChangeReasonOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: OGLAIMNKFEK
-   * </pre>
-   *
    * Protobuf enum {@code PropChangeReason}
    */
   public enum PropChangeReason
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PropPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PropPairOuterClass.java
index 407483822..e1f49da33 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PropPairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PropPairOuterClass.java
@@ -40,10 +40,6 @@ public final class PropPairOuterClass {
     emu.grasscutter.net.proto.PropValueOuterClass.PropValueOrBuilder getPropValueOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: OIKHOKIPKDK
-   * </pre>
-   *
    * Protobuf type {@code PropPair}
    */
   public static final class PropPair extends
@@ -347,10 +343,6 @@ public final class PropPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OIKHOKIPKDK
-     * </pre>
-     *
      * Protobuf type {@code PropPair}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PropValueOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PropValueOuterClass.java
index 70bec778d..4ad2fd896 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PropValueOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PropValueOuterClass.java
@@ -24,6 +24,12 @@ public final class PropValueOuterClass {
      */
     int getType();
 
+    /**
+     * <code>int64 val = 4;</code>
+     * @return The val.
+     */
+    long getVal();
+
     /**
      * <code>int64 ival = 2;</code>
      * @return Whether the ival field is set.
@@ -46,19 +52,9 @@ public final class PropValueOuterClass {
      */
     float getFval();
 
-    /**
-     * <code>int64 val = 4;</code>
-     * @return The val.
-     */
-    long getVal();
-
     public emu.grasscutter.net.proto.PropValueOuterClass.PropValue.ValueCase getValueCase();
   }
   /**
-   * <pre>
-   * Obf: CCOIIHFAKMA
-   * </pre>
-   *
    * Protobuf type {@code PropValue}
    */
   public static final class PropValue extends
@@ -207,6 +203,17 @@ public final class PropValueOuterClass {
       return type_;
     }
 
+    public static final int VAL_FIELD_NUMBER = 4;
+    private long val_;
+    /**
+     * <code>int64 val = 4;</code>
+     * @return The val.
+     */
+    @java.lang.Override
+    public long getVal() {
+      return val_;
+    }
+
     public static final int IVAL_FIELD_NUMBER = 2;
     /**
      * <code>int64 ival = 2;</code>
@@ -249,17 +256,6 @@ public final class PropValueOuterClass {
       return 0F;
     }
 
-    public static final int VAL_FIELD_NUMBER = 4;
-    private long val_;
-    /**
-     * <code>int64 val = 4;</code>
-     * @return The val.
-     */
-    @java.lang.Override
-    public long getVal() {
-      return val_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -474,10 +470,6 @@ public final class PropValueOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CCOIIHFAKMA
-     * </pre>
-     *
      * Protobuf type {@code PropValue}
      */
     public static final class Builder extends
@@ -548,13 +540,13 @@ public final class PropValueOuterClass {
       public emu.grasscutter.net.proto.PropValueOuterClass.PropValue buildPartial() {
         emu.grasscutter.net.proto.PropValueOuterClass.PropValue result = new emu.grasscutter.net.proto.PropValueOuterClass.PropValue(this);
         result.type_ = type_;
+        result.val_ = val_;
         if (valueCase_ == 2) {
           result.value_ = value_;
         }
         if (valueCase_ == 3) {
           result.value_ = value_;
         }
-        result.val_ = val_;
         result.valueCase_ = valueCase_;
         onBuilt();
         return result;
@@ -698,6 +690,37 @@ public final class PropValueOuterClass {
         return this;
       }
 
+      private long val_ ;
+      /**
+       * <code>int64 val = 4;</code>
+       * @return The val.
+       */
+      @java.lang.Override
+      public long getVal() {
+        return val_;
+      }
+      /**
+       * <code>int64 val = 4;</code>
+       * @param value The val to set.
+       * @return This builder for chaining.
+       */
+      public Builder setVal(long value) {
+        
+        val_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int64 val = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearVal() {
+        
+        val_ = 0L;
+        onChanged();
+        return this;
+      }
+
       /**
        * <code>int64 ival = 2;</code>
        * @return Whether the ival field is set.
@@ -779,37 +802,6 @@ public final class PropValueOuterClass {
         }
         return this;
       }
-
-      private long val_ ;
-      /**
-       * <code>int64 val = 4;</code>
-       * @return The val.
-       */
-      @java.lang.Override
-      public long getVal() {
-        return val_;
-      }
-      /**
-       * <code>int64 val = 4;</code>
-       * @param value The val to set.
-       * @return This builder for chaining.
-       */
-      public Builder setVal(long value) {
-        
-        val_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int64 val = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearVal() {
-        
-        val_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -878,8 +870,8 @@ public final class PropValueOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\017PropValue.proto\"O\n\tPropValue\022\014\n\004type\030\001" +
-      " \001(\r\022\016\n\004ival\030\002 \001(\003H\000\022\016\n\004fval\030\003 \001(\002H\000\022\013\n\003" +
-      "val\030\004 \001(\003B\007\n\005valueB\033\n\031emu.grasscutter.ne" +
+      " \001(\r\022\013\n\003val\030\004 \001(\003\022\016\n\004ival\030\002 \001(\003H\000\022\016\n\004fva" +
+      "l\030\003 \001(\002H\000B\007\n\005ValueB\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -891,7 +883,7 @@ public final class PropValueOuterClass {
     internal_static_PropValue_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PropValue_descriptor,
-        new java.lang.String[] { "Type", "Ival", "Fval", "Val", "Value", });
+        new java.lang.String[] { "Type", "Val", "Ival", "Fval", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProtEntityTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProtEntityTypeOuterClass.java
index d3198b255..f0191561a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ProtEntityTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ProtEntityTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class ProtEntityTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: HFCNMMNOEDA
-   * </pre>
-   *
    * Protobuf enum {@code ProtEntityType}
    */
   public enum ProtEntityType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java
index d25bade62..1a71d5ed6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillChangeNotifyOuterClass.java
@@ -19,46 +19,41 @@ public final class ProudSkillChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 4;</code>
+     * <code>uint32 skill_depot_id = 3;</code>
+     * @return The skillDepotId.
+     */
+    int getSkillDepotId();
+
+    /**
+     * <code>uint32 entity_id = 12;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @return A list containing the proudSkillList.
      */
     java.util.List<java.lang.Integer> getProudSkillListList();
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @return The count of proudSkillList.
      */
     int getProudSkillListCount();
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @param index The index of the element to return.
      * @return The proudSkillList at the given index.
      */
     int getProudSkillList(int index);
 
     /**
-     * <code>uint32 skill_depot_id = 11;</code>
-     * @return The skillDepotId.
-     */
-    int getSkillDepotId();
-
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23429
-   * Obf: GALAIBFEIIG
-   * </pre>
-   *
    * Protobuf type {@code ProudSkillChangeNotify}
    */
   public static final class ProudSkillChangeNotify extends
@@ -106,6 +101,16 @@ public final class ProudSkillChangeNotifyOuterClass {
               done = true;
               break;
             case 24: {
+
+              skillDepotId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 proudSkillList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,7 +118,7 @@ public final class ProudSkillChangeNotifyOuterClass {
               proudSkillList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -126,21 +131,11 @@ public final class ProudSkillChangeNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 32: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 120: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 88: {
-
-              skillDepotId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -176,10 +171,21 @@ public final class ProudSkillChangeNotifyOuterClass {
               emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify.class, emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 4;
+    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 3;
+    private int skillDepotId_;
+    /**
+     * <code>uint32 skill_depot_id = 3;</code>
+     * @return The skillDepotId.
+     */
+    @java.lang.Override
+    public int getSkillDepotId() {
+      return skillDepotId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 12;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 4;</code>
+     * <code>uint32 entity_id = 12;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -187,10 +193,10 @@ public final class ProudSkillChangeNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 3;
+    public static final int PROUD_SKILL_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList proudSkillList_;
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @return A list containing the proudSkillList.
      */
     @java.lang.Override
@@ -199,14 +205,14 @@ public final class ProudSkillChangeNotifyOuterClass {
       return proudSkillList_;
     }
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @return The count of proudSkillList.
      */
     public int getProudSkillListCount() {
       return proudSkillList_.size();
     }
     /**
-     * <code>repeated uint32 proud_skill_list = 3;</code>
+     * <code>repeated uint32 proud_skill_list = 14;</code>
      * @param index The index of the element to return.
      * @return The proudSkillList at the given index.
      */
@@ -215,21 +221,10 @@ public final class ProudSkillChangeNotifyOuterClass {
     }
     private int proudSkillListMemoizedSerializedSize = -1;
 
-    public static final int SKILL_DEPOT_ID_FIELD_NUMBER = 11;
-    private int skillDepotId_;
-    /**
-     * <code>uint32 skill_depot_id = 11;</code>
-     * @return The skillDepotId.
-     */
-    @java.lang.Override
-    public int getSkillDepotId() {
-      return skillDepotId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 9;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 9;</code>
+     * <code>uint64 avatar_guid = 15;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -252,21 +247,21 @@ public final class ProudSkillChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (skillDepotId_ != 0) {
+        output.writeUInt32(3, skillDepotId_);
+      }
+      if (entityId_ != 0) {
+        output.writeUInt32(12, entityId_);
+      }
       if (getProudSkillListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(proudSkillListMemoizedSerializedSize);
       }
       for (int i = 0; i < proudSkillList_.size(); i++) {
         output.writeUInt32NoTag(proudSkillList_.getInt(i));
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(4, entityId_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
-      }
-      if (skillDepotId_ != 0) {
-        output.writeUInt32(11, skillDepotId_);
+        output.writeUInt64(15, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -277,6 +272,14 @@ public final class ProudSkillChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (skillDepotId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, skillDepotId_);
+      }
+      if (entityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, entityId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < proudSkillList_.size(); i++) {
@@ -291,17 +294,9 @@ public final class ProudSkillChangeNotifyOuterClass {
         }
         proudSkillListMemoizedSerializedSize = dataSize;
       }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, entityId_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
-      }
-      if (skillDepotId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, skillDepotId_);
+          .computeUInt64Size(15, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -318,12 +313,12 @@ public final class ProudSkillChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify other = (emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify) obj;
 
+      if (getSkillDepotId()
+          != other.getSkillDepotId()) return false;
       if (getEntityId()
           != other.getEntityId()) return false;
       if (!getProudSkillListList()
           .equals(other.getProudSkillListList())) return false;
-      if (getSkillDepotId()
-          != other.getSkillDepotId()) return false;
       if (getAvatarGuid()
           != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -337,14 +332,14 @@ public final class ProudSkillChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
       if (getProudSkillListCount() > 0) {
         hash = (37 * hash) + PROUD_SKILL_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getProudSkillListList().hashCode();
       }
-      hash = (37 * hash) + SKILL_DEPOT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSkillDepotId();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
@@ -444,11 +439,6 @@ public final class ProudSkillChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23429
-     * Obf: GALAIBFEIIG
-     * </pre>
-     *
      * Protobuf type {@code ProudSkillChangeNotify}
      */
     public static final class Builder extends
@@ -486,12 +476,12 @@ public final class ProudSkillChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        skillDepotId_ = 0;
+
         entityId_ = 0;
 
         proudSkillList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        skillDepotId_ = 0;
-
         avatarGuid_ = 0L;
 
         return this;
@@ -521,13 +511,13 @@ public final class ProudSkillChangeNotifyOuterClass {
       public emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify buildPartial() {
         emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify result = new emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify(this);
         int from_bitField0_ = bitField0_;
+        result.skillDepotId_ = skillDepotId_;
         result.entityId_ = entityId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           proudSkillList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.proudSkillList_ = proudSkillList_;
-        result.skillDepotId_ = skillDepotId_;
         result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
@@ -577,6 +567,9 @@ public final class ProudSkillChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ProudSkillChangeNotifyOuterClass.ProudSkillChangeNotify.getDefaultInstance()) return this;
+        if (other.getSkillDepotId() != 0) {
+          setSkillDepotId(other.getSkillDepotId());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
@@ -590,9 +583,6 @@ public final class ProudSkillChangeNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.getSkillDepotId() != 0) {
-          setSkillDepotId(other.getSkillDepotId());
-        }
         if (other.getAvatarGuid() != 0L) {
           setAvatarGuid(other.getAvatarGuid());
         }
@@ -626,9 +616,40 @@ public final class ProudSkillChangeNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int skillDepotId_ ;
+      /**
+       * <code>uint32 skill_depot_id = 3;</code>
+       * @return The skillDepotId.
+       */
+      @java.lang.Override
+      public int getSkillDepotId() {
+        return skillDepotId_;
+      }
+      /**
+       * <code>uint32 skill_depot_id = 3;</code>
+       * @param value The skillDepotId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setSkillDepotId(int value) {
+        
+        skillDepotId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 skill_depot_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSkillDepotId() {
+        
+        skillDepotId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 4;</code>
+       * <code>uint32 entity_id = 12;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -636,7 +657,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 4;</code>
+       * <code>uint32 entity_id = 12;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -647,7 +668,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 4;</code>
+       * <code>uint32 entity_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -665,7 +686,7 @@ public final class ProudSkillChangeNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @return A list containing the proudSkillList.
        */
       public java.util.List<java.lang.Integer>
@@ -674,14 +695,14 @@ public final class ProudSkillChangeNotifyOuterClass {
                  java.util.Collections.unmodifiableList(proudSkillList_) : proudSkillList_;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @return The count of proudSkillList.
        */
       public int getProudSkillListCount() {
         return proudSkillList_.size();
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @param index The index of the element to return.
        * @return The proudSkillList at the given index.
        */
@@ -689,7 +710,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return proudSkillList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The proudSkillList to set.
        * @return This builder for chaining.
@@ -702,7 +723,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @param value The proudSkillList to add.
        * @return This builder for chaining.
        */
@@ -713,7 +734,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @param values The proudSkillList to add.
        * @return This builder for chaining.
        */
@@ -726,7 +747,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 proud_skill_list = 3;</code>
+       * <code>repeated uint32 proud_skill_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearProudSkillList() {
@@ -736,40 +757,9 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
 
-      private int skillDepotId_ ;
-      /**
-       * <code>uint32 skill_depot_id = 11;</code>
-       * @return The skillDepotId.
-       */
-      @java.lang.Override
-      public int getSkillDepotId() {
-        return skillDepotId_;
-      }
-      /**
-       * <code>uint32 skill_depot_id = 11;</code>
-       * @param value The skillDepotId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setSkillDepotId(int value) {
-        
-        skillDepotId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 skill_depot_id = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSkillDepotId() {
-        
-        skillDepotId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -777,7 +767,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -788,7 +778,7 @@ public final class ProudSkillChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 9;</code>
+       * <code>uint64 avatar_guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -865,9 +855,9 @@ public final class ProudSkillChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034ProudSkillChangeNotify.proto\"r\n\026ProudS" +
-      "killChangeNotify\022\021\n\tentity_id\030\004 \001(\r\022\030\n\020p" +
-      "roud_skill_list\030\003 \003(\r\022\026\n\016skill_depot_id\030" +
-      "\013 \001(\r\022\023\n\013avatar_guid\030\t \001(\004B\033\n\031emu.grassc" +
+      "killChangeNotify\022\026\n\016skill_depot_id\030\003 \001(\r" +
+      "\022\021\n\tentity_id\030\014 \001(\r\022\030\n\020proud_skill_list\030" +
+      "\016 \003(\r\022\023\n\013avatar_guid\030\017 \001(\004B\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -879,7 +869,7 @@ public final class ProudSkillChangeNotifyOuterClass {
     internal_static_ProudSkillChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ProudSkillChangeNotify_descriptor,
-        new java.lang.String[] { "EntityId", "ProudSkillList", "SkillDepotId", "AvatarGuid", });
+        new java.lang.String[] { "SkillDepotId", "EntityId", "ProudSkillList", "AvatarGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java
index e9f0905c4..eab40fd88 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ProudSkillExtraLevelNotifyOuterClass.java
@@ -18,6 +18,12 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:ProudSkillExtraLevelNotify)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>uint32 talent_index = 3;</code>
+     * @return The talentIndex.
+     */
+    int getTalentIndex();
+
     /**
      * <code>uint64 avatar_guid = 4;</code>
      * @return The avatarGuid.
@@ -25,29 +31,18 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
     long getAvatarGuid();
 
     /**
-     * <code>uint32 talent_index = 9;</code>
-     * @return The talentIndex.
-     */
-    int getTalentIndex();
-
-    /**
-     * <code>uint32 extra_level = 8;</code>
+     * <code>uint32 extra_level = 13;</code>
      * @return The extraLevel.
      */
     int getExtraLevel();
 
     /**
-     * <code>uint32 talent_type = 2;</code>
+     * <code>uint32 talent_type = 15;</code>
      * @return The talentType.
      */
     int getTalentType();
   }
   /**
-   * <pre>
-   * CmdId: 5863
-   * Obf: CADAKBCNNHN
-   * </pre>
-   *
    * Protobuf type {@code ProudSkillExtraLevelNotify}
    */
   public static final class ProudSkillExtraLevelNotify extends
@@ -92,9 +87,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
-              talentType_ = input.readUInt32();
+              talentIndex_ = input.readUInt32();
               break;
             }
             case 32: {
@@ -102,14 +97,14 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 64: {
+            case 104: {
 
               extraLevel_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 120: {
 
-              talentIndex_ = input.readUInt32();
+              talentType_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,6 +139,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
               emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.class, emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.Builder.class);
     }
 
+    public static final int TALENT_INDEX_FIELD_NUMBER = 3;
+    private int talentIndex_;
+    /**
+     * <code>uint32 talent_index = 3;</code>
+     * @return The talentIndex.
+     */
+    @java.lang.Override
+    public int getTalentIndex() {
+      return talentIndex_;
+    }
+
     public static final int AVATAR_GUID_FIELD_NUMBER = 4;
     private long avatarGuid_;
     /**
@@ -155,21 +161,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       return avatarGuid_;
     }
 
-    public static final int TALENT_INDEX_FIELD_NUMBER = 9;
-    private int talentIndex_;
-    /**
-     * <code>uint32 talent_index = 9;</code>
-     * @return The talentIndex.
-     */
-    @java.lang.Override
-    public int getTalentIndex() {
-      return talentIndex_;
-    }
-
-    public static final int EXTRA_LEVEL_FIELD_NUMBER = 8;
+    public static final int EXTRA_LEVEL_FIELD_NUMBER = 13;
     private int extraLevel_;
     /**
-     * <code>uint32 extra_level = 8;</code>
+     * <code>uint32 extra_level = 13;</code>
      * @return The extraLevel.
      */
     @java.lang.Override
@@ -177,10 +172,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       return extraLevel_;
     }
 
-    public static final int TALENT_TYPE_FIELD_NUMBER = 2;
+    public static final int TALENT_TYPE_FIELD_NUMBER = 15;
     private int talentType_;
     /**
-     * <code>uint32 talent_type = 2;</code>
+     * <code>uint32 talent_type = 15;</code>
      * @return The talentType.
      */
     @java.lang.Override
@@ -202,17 +197,17 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (talentType_ != 0) {
-        output.writeUInt32(2, talentType_);
+      if (talentIndex_ != 0) {
+        output.writeUInt32(3, talentIndex_);
       }
       if (avatarGuid_ != 0L) {
         output.writeUInt64(4, avatarGuid_);
       }
       if (extraLevel_ != 0) {
-        output.writeUInt32(8, extraLevel_);
+        output.writeUInt32(13, extraLevel_);
       }
-      if (talentIndex_ != 0) {
-        output.writeUInt32(9, talentIndex_);
+      if (talentType_ != 0) {
+        output.writeUInt32(15, talentType_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,9 +218,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (talentType_ != 0) {
+      if (talentIndex_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, talentType_);
+          .computeUInt32Size(3, talentIndex_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
@@ -233,11 +228,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       }
       if (extraLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, extraLevel_);
+          .computeUInt32Size(13, extraLevel_);
       }
-      if (talentIndex_ != 0) {
+      if (talentType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, talentIndex_);
+          .computeUInt32Size(15, talentType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,10 +249,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other = (emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify) obj;
 
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (getTalentIndex()
           != other.getTalentIndex()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getExtraLevel()
           != other.getExtraLevel()) return false;
       if (getTalentType()
@@ -273,11 +268,11 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
+      hash = (53 * hash) + getTalentIndex();
       hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getAvatarGuid());
-      hash = (37 * hash) + TALENT_INDEX_FIELD_NUMBER;
-      hash = (53 * hash) + getTalentIndex();
       hash = (37 * hash) + EXTRA_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getExtraLevel();
       hash = (37 * hash) + TALENT_TYPE_FIELD_NUMBER;
@@ -378,11 +373,6 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5863
-     * Obf: CADAKBCNNHN
-     * </pre>
-     *
      * Protobuf type {@code ProudSkillExtraLevelNotify}
      */
     public static final class Builder extends
@@ -420,10 +410,10 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        avatarGuid_ = 0L;
-
         talentIndex_ = 0;
 
+        avatarGuid_ = 0L;
+
         extraLevel_ = 0;
 
         talentType_ = 0;
@@ -454,8 +444,8 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify buildPartial() {
         emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify result = new emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify(this);
-        result.avatarGuid_ = avatarGuid_;
         result.talentIndex_ = talentIndex_;
+        result.avatarGuid_ = avatarGuid_;
         result.extraLevel_ = extraLevel_;
         result.talentType_ = talentType_;
         onBuilt();
@@ -506,12 +496,12 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify other) {
         if (other == emu.grasscutter.net.proto.ProudSkillExtraLevelNotifyOuterClass.ProudSkillExtraLevelNotify.getDefaultInstance()) return this;
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         if (other.getTalentIndex() != 0) {
           setTalentIndex(other.getTalentIndex());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getExtraLevel() != 0) {
           setExtraLevel(other.getExtraLevel());
         }
@@ -547,6 +537,37 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return this;
       }
 
+      private int talentIndex_ ;
+      /**
+       * <code>uint32 talent_index = 3;</code>
+       * @return The talentIndex.
+       */
+      @java.lang.Override
+      public int getTalentIndex() {
+        return talentIndex_;
+      }
+      /**
+       * <code>uint32 talent_index = 3;</code>
+       * @param value The talentIndex to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTalentIndex(int value) {
+        
+        talentIndex_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 talent_index = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTalentIndex() {
+        
+        talentIndex_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long avatarGuid_ ;
       /**
        * <code>uint64 avatar_guid = 4;</code>
@@ -578,40 +599,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return this;
       }
 
-      private int talentIndex_ ;
-      /**
-       * <code>uint32 talent_index = 9;</code>
-       * @return The talentIndex.
-       */
-      @java.lang.Override
-      public int getTalentIndex() {
-        return talentIndex_;
-      }
-      /**
-       * <code>uint32 talent_index = 9;</code>
-       * @param value The talentIndex to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTalentIndex(int value) {
-        
-        talentIndex_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 talent_index = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTalentIndex() {
-        
-        talentIndex_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int extraLevel_ ;
       /**
-       * <code>uint32 extra_level = 8;</code>
+       * <code>uint32 extra_level = 13;</code>
        * @return The extraLevel.
        */
       @java.lang.Override
@@ -619,7 +609,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return extraLevel_;
       }
       /**
-       * <code>uint32 extra_level = 8;</code>
+       * <code>uint32 extra_level = 13;</code>
        * @param value The extraLevel to set.
        * @return This builder for chaining.
        */
@@ -630,7 +620,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 extra_level = 8;</code>
+       * <code>uint32 extra_level = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearExtraLevel() {
@@ -642,7 +632,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
 
       private int talentType_ ;
       /**
-       * <code>uint32 talent_type = 2;</code>
+       * <code>uint32 talent_type = 15;</code>
        * @return The talentType.
        */
       @java.lang.Override
@@ -650,7 +640,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return talentType_;
       }
       /**
-       * <code>uint32 talent_type = 2;</code>
+       * <code>uint32 talent_type = 15;</code>
        * @param value The talentType to set.
        * @return This builder for chaining.
        */
@@ -661,7 +651,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 talent_type = 2;</code>
+       * <code>uint32 talent_type = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearTalentType() {
@@ -738,9 +728,9 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n ProudSkillExtraLevelNotify.proto\"q\n\032Pr" +
-      "oudSkillExtraLevelNotify\022\023\n\013avatar_guid\030" +
-      "\004 \001(\004\022\024\n\014talent_index\030\t \001(\r\022\023\n\013extra_lev" +
-      "el\030\010 \001(\r\022\023\n\013talent_type\030\002 \001(\rB\033\n\031emu.gra" +
+      "oudSkillExtraLevelNotify\022\024\n\014talent_index" +
+      "\030\003 \001(\r\022\023\n\013avatar_guid\030\004 \001(\004\022\023\n\013extra_lev" +
+      "el\030\r \001(\r\022\023\n\013talent_type\030\017 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class ProudSkillExtraLevelNotifyOuterClass {
     internal_static_ProudSkillExtraLevelNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ProudSkillExtraLevelNotify_descriptor,
-        new java.lang.String[] { "AvatarGuid", "TalentIndex", "ExtraLevel", "TalentType", });
+        new java.lang.String[] { "TalentIndex", "AvatarGuid", "ExtraLevel", "TalentType", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatReqOuterClass.java
index 8b60e8ab9..0d7e056a9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatReqOuterClass.java
@@ -19,29 +19,24 @@ public final class PullPrivateChatReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 from_sequence = 6;</code>
-     * @return The fromSequence.
+     * <code>uint32 target_uid = 9;</code>
+     * @return The targetUid.
      */
-    int getFromSequence();
+    int getTargetUid();
 
     /**
-     * <code>uint32 pull_num = 12;</code>
+     * <code>uint32 pull_num = 11;</code>
      * @return The pullNum.
      */
     int getPullNum();
 
     /**
-     * <code>uint32 target_uid = 14;</code>
-     * @return The targetUid.
+     * <code>uint32 from_sequence = 4;</code>
+     * @return The fromSequence.
      */
-    int getTargetUid();
+    int getFromSequence();
   }
   /**
-   * <pre>
-   * CmdId: 22346
-   * Obf: CDBDGACCDJI
-   * </pre>
-   *
    * Protobuf type {@code PullPrivateChatReq}
    */
   public static final class PullPrivateChatReq extends
@@ -86,21 +81,21 @@ public final class PullPrivateChatReqOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 32: {
 
               fromSequence_ = input.readUInt32();
               break;
             }
-            case 96: {
-
-              pullNum_ = input.readUInt32();
-              break;
-            }
-            case 112: {
+            case 72: {
 
               targetUid_ = input.readUInt32();
               break;
             }
+            case 88: {
+
+              pullNum_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,21 @@ public final class PullPrivateChatReqOuterClass {
               emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.class, emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.Builder.class);
     }
 
-    public static final int FROM_SEQUENCE_FIELD_NUMBER = 6;
-    private int fromSequence_;
+    public static final int TARGET_UID_FIELD_NUMBER = 9;
+    private int targetUid_;
     /**
-     * <code>uint32 from_sequence = 6;</code>
-     * @return The fromSequence.
+     * <code>uint32 target_uid = 9;</code>
+     * @return The targetUid.
      */
     @java.lang.Override
-    public int getFromSequence() {
-      return fromSequence_;
+    public int getTargetUid() {
+      return targetUid_;
     }
 
-    public static final int PULL_NUM_FIELD_NUMBER = 12;
+    public static final int PULL_NUM_FIELD_NUMBER = 11;
     private int pullNum_;
     /**
-     * <code>uint32 pull_num = 12;</code>
+     * <code>uint32 pull_num = 11;</code>
      * @return The pullNum.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class PullPrivateChatReqOuterClass {
       return pullNum_;
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 14;
-    private int targetUid_;
+    public static final int FROM_SEQUENCE_FIELD_NUMBER = 4;
+    private int fromSequence_;
     /**
-     * <code>uint32 target_uid = 14;</code>
-     * @return The targetUid.
+     * <code>uint32 from_sequence = 4;</code>
+     * @return The fromSequence.
      */
     @java.lang.Override
-    public int getTargetUid() {
-      return targetUid_;
+    public int getFromSequence() {
+      return fromSequence_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -181,13 +176,13 @@ public final class PullPrivateChatReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (fromSequence_ != 0) {
-        output.writeUInt32(6, fromSequence_);
-      }
-      if (pullNum_ != 0) {
-        output.writeUInt32(12, pullNum_);
+        output.writeUInt32(4, fromSequence_);
       }
       if (targetUid_ != 0) {
-        output.writeUInt32(14, targetUid_);
+        output.writeUInt32(9, targetUid_);
+      }
+      if (pullNum_ != 0) {
+        output.writeUInt32(11, pullNum_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class PullPrivateChatReqOuterClass {
       size = 0;
       if (fromSequence_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, fromSequence_);
-      }
-      if (pullNum_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, pullNum_);
+          .computeUInt32Size(4, fromSequence_);
       }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, targetUid_);
+          .computeUInt32Size(9, targetUid_);
+      }
+      if (pullNum_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, pullNum_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class PullPrivateChatReqOuterClass {
       }
       emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq other = (emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq) obj;
 
-      if (getFromSequence()
-          != other.getFromSequence()) return false;
-      if (getPullNum()
-          != other.getPullNum()) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
+      if (getPullNum()
+          != other.getPullNum()) return false;
+      if (getFromSequence()
+          != other.getFromSequence()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class PullPrivateChatReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FROM_SEQUENCE_FIELD_NUMBER;
-      hash = (53 * hash) + getFromSequence();
-      hash = (37 * hash) + PULL_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getPullNum();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + PULL_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getPullNum();
+      hash = (37 * hash) + FROM_SEQUENCE_FIELD_NUMBER;
+      hash = (53 * hash) + getFromSequence();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class PullPrivateChatReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22346
-     * Obf: CDBDGACCDJI
-     * </pre>
-     *
      * Protobuf type {@code PullPrivateChatReq}
      */
     public static final class Builder extends
@@ -386,11 +376,11 @@ public final class PullPrivateChatReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        fromSequence_ = 0;
+        targetUid_ = 0;
 
         pullNum_ = 0;
 
-        targetUid_ = 0;
+        fromSequence_ = 0;
 
         return this;
       }
@@ -418,9 +408,9 @@ public final class PullPrivateChatReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq buildPartial() {
         emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq result = new emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq(this);
-        result.fromSequence_ = fromSequence_;
-        result.pullNum_ = pullNum_;
         result.targetUid_ = targetUid_;
+        result.pullNum_ = pullNum_;
+        result.fromSequence_ = fromSequence_;
         onBuilt();
         return result;
       }
@@ -469,14 +459,14 @@ public final class PullPrivateChatReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq other) {
         if (other == emu.grasscutter.net.proto.PullPrivateChatReqOuterClass.PullPrivateChatReq.getDefaultInstance()) return this;
-        if (other.getFromSequence() != 0) {
-          setFromSequence(other.getFromSequence());
+        if (other.getTargetUid() != 0) {
+          setTargetUid(other.getTargetUid());
         }
         if (other.getPullNum() != 0) {
           setPullNum(other.getPullNum());
         }
-        if (other.getTargetUid() != 0) {
-          setTargetUid(other.getTargetUid());
+        if (other.getFromSequence() != 0) {
+          setFromSequence(other.getFromSequence());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +497,9 @@ public final class PullPrivateChatReqOuterClass {
         return this;
       }
 
-      private int fromSequence_ ;
-      /**
-       * <code>uint32 from_sequence = 6;</code>
-       * @return The fromSequence.
-       */
-      @java.lang.Override
-      public int getFromSequence() {
-        return fromSequence_;
-      }
-      /**
-       * <code>uint32 from_sequence = 6;</code>
-       * @param value The fromSequence to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFromSequence(int value) {
-        
-        fromSequence_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 from_sequence = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFromSequence() {
-        
-        fromSequence_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int pullNum_ ;
-      /**
-       * <code>uint32 pull_num = 12;</code>
-       * @return The pullNum.
-       */
-      @java.lang.Override
-      public int getPullNum() {
-        return pullNum_;
-      }
-      /**
-       * <code>uint32 pull_num = 12;</code>
-       * @param value The pullNum to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPullNum(int value) {
-        
-        pullNum_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 pull_num = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPullNum() {
-        
-        pullNum_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 14;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -579,7 +507,7 @@ public final class PullPrivateChatReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 14;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -590,7 +518,7 @@ public final class PullPrivateChatReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 14;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -599,6 +527,68 @@ public final class PullPrivateChatReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int pullNum_ ;
+      /**
+       * <code>uint32 pull_num = 11;</code>
+       * @return The pullNum.
+       */
+      @java.lang.Override
+      public int getPullNum() {
+        return pullNum_;
+      }
+      /**
+       * <code>uint32 pull_num = 11;</code>
+       * @param value The pullNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPullNum(int value) {
+        
+        pullNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 pull_num = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPullNum() {
+        
+        pullNum_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int fromSequence_ ;
+      /**
+       * <code>uint32 from_sequence = 4;</code>
+       * @return The fromSequence.
+       */
+      @java.lang.Override
+      public int getFromSequence() {
+        return fromSequence_;
+      }
+      /**
+       * <code>uint32 from_sequence = 4;</code>
+       * @param value The fromSequence to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFromSequence(int value) {
+        
+        fromSequence_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 from_sequence = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFromSequence() {
+        
+        fromSequence_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class PullPrivateChatReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PullPrivateChatReq.proto\"Q\n\022PullPrivat" +
-      "eChatReq\022\025\n\rfrom_sequence\030\006 \001(\r\022\020\n\010pull_" +
-      "num\030\014 \001(\r\022\022\n\ntarget_uid\030\016 \001(\rB\033\n\031emu.gra" +
+      "eChatReq\022\022\n\ntarget_uid\030\t \001(\r\022\020\n\010pull_num" +
+      "\030\013 \001(\r\022\025\n\rfrom_sequence\030\004 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class PullPrivateChatReqOuterClass {
     internal_static_PullPrivateChatReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PullPrivateChatReq_descriptor,
-        new java.lang.String[] { "FromSequence", "PullNum", "TargetUid", });
+        new java.lang.String[] { "TargetUid", "PullNum", "FromSequence", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatRspOuterClass.java
index 0e62cc5a2..290a6420f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PullPrivateChatRspOuterClass.java
@@ -19,41 +19,36 @@ public final class PullPrivateChatRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> 
         getChatInfoList();
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index);
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     int getChatInfoCount();
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
         getChatInfoOrBuilderList();
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 4681
-   * Obf: GAFCFLJEJKF
-   * </pre>
-   *
    * Protobuf type {@code PullPrivateChatRsp}
    */
   public static final class PullPrivateChatRsp extends
@@ -100,7 +95,12 @@ public final class PullPrivateChatRspOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 chatInfo_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class PullPrivateChatRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +144,10 @@ public final class PullPrivateChatRspOuterClass {
               emu.grasscutter.net.proto.PullPrivateChatRspOuterClass.PullPrivateChatRsp.class, emu.grasscutter.net.proto.PullPrivateChatRspOuterClass.PullPrivateChatRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -160,17 +155,17 @@ public final class PullPrivateChatRspOuterClass {
       return retcode_;
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 2;
+    public static final int CHAT_INFO_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> chatInfo_;
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> getChatInfoList() {
       return chatInfo_;
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
@@ -178,21 +173,21 @@ public final class PullPrivateChatRspOuterClass {
       return chatInfo_;
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     @java.lang.Override
     public int getChatInfoCount() {
       return chatInfo_.size();
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index) {
       return chatInfo_.get(index);
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 2;</code>
+     * <code>repeated .ChatInfo chat_info = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
@@ -214,11 +209,11 @@ public final class PullPrivateChatRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < chatInfo_.size(); i++) {
-        output.writeMessage(2, chatInfo_.get(i));
-      }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      for (int i = 0; i < chatInfo_.size(); i++) {
+        output.writeMessage(14, chatInfo_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class PullPrivateChatRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < chatInfo_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, chatInfo_.get(i));
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(5, retcode_);
+      }
+      for (int i = 0; i < chatInfo_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, chatInfo_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -369,11 +364,6 @@ public final class PullPrivateChatRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4681
-     * Obf: GAFCFLJEJKF
-     * </pre>
-     *
      * Protobuf type {@code PullPrivateChatRsp}
      */
     public static final class Builder extends
@@ -566,7 +556,7 @@ public final class PullPrivateChatRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -574,7 +564,7 @@ public final class PullPrivateChatRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -585,7 +575,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -608,7 +598,7 @@ public final class PullPrivateChatRspOuterClass {
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> chatInfoBuilder_;
 
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> getChatInfoList() {
         if (chatInfoBuilder_ == null) {
@@ -618,7 +608,7 @@ public final class PullPrivateChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public int getChatInfoCount() {
         if (chatInfoBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class PullPrivateChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index) {
         if (chatInfoBuilder_ == null) {
@@ -638,7 +628,7 @@ public final class PullPrivateChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder setChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
@@ -655,7 +645,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder setChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -669,7 +659,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder addChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -685,7 +675,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder addChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
@@ -702,7 +692,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder addChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -716,7 +706,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder addChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -730,7 +720,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder addAllChatInfo(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> values) {
@@ -745,7 +735,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -758,7 +748,7 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public Builder removeChatInfo(int index) {
         if (chatInfoBuilder_ == null) {
@@ -771,14 +761,14 @@ public final class PullPrivateChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder(
           int index) {
         return getChatInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
           int index) {
@@ -788,7 +778,7 @@ public final class PullPrivateChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
            getChatInfoOrBuilderList() {
@@ -799,14 +789,14 @@ public final class PullPrivateChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder addChatInfoBuilder() {
         return getChatInfoFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder addChatInfoBuilder(
           int index) {
@@ -814,7 +804,7 @@ public final class PullPrivateChatRspOuterClass {
             index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 2;</code>
+       * <code>repeated .ChatInfo chat_info = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder> 
            getChatInfoBuilderList() {
@@ -902,8 +892,8 @@ public final class PullPrivateChatRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030PullPrivateChatRsp.proto\032\016ChatInfo.pro" +
-      "to\"C\n\022PullPrivateChatRsp\022\017\n\007retcode\030\016 \001(" +
-      "\005\022\034\n\tchat_info\030\002 \003(\0132\t.ChatInfoB\033\n\031emu.g" +
+      "to\"C\n\022PullPrivateChatRsp\022\017\n\007retcode\030\005 \001(" +
+      "\005\022\034\n\tchat_info\030\016 \003(\0132\t.ChatInfoB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatReqOuterClass.java
index 7f99eb222..9591b2594 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatReqOuterClass.java
@@ -19,23 +19,18 @@ public final class PullRecentChatReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 begin_sequence = 11;</code>
+     * <code>uint32 begin_sequence = 15;</code>
      * @return The beginSequence.
      */
     int getBeginSequence();
 
     /**
-     * <code>uint32 pull_num = 2;</code>
+     * <code>uint32 pull_num = 14;</code>
      * @return The pullNum.
      */
     int getPullNum();
   }
   /**
-   * <pre>
-   * CmdId: 23337
-   * Obf: DLAJEHFIMNF
-   * </pre>
-   *
    * Protobuf type {@code PullRecentChatReq}
    */
   public static final class PullRecentChatReq extends
@@ -80,12 +75,12 @@ public final class PullRecentChatReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 112: {
 
               pullNum_ = input.readUInt32();
               break;
             }
-            case 88: {
+            case 120: {
 
               beginSequence_ = input.readUInt32();
               break;
@@ -122,10 +117,10 @@ public final class PullRecentChatReqOuterClass {
               emu.grasscutter.net.proto.PullRecentChatReqOuterClass.PullRecentChatReq.class, emu.grasscutter.net.proto.PullRecentChatReqOuterClass.PullRecentChatReq.Builder.class);
     }
 
-    public static final int BEGIN_SEQUENCE_FIELD_NUMBER = 11;
+    public static final int BEGIN_SEQUENCE_FIELD_NUMBER = 15;
     private int beginSequence_;
     /**
-     * <code>uint32 begin_sequence = 11;</code>
+     * <code>uint32 begin_sequence = 15;</code>
      * @return The beginSequence.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class PullRecentChatReqOuterClass {
       return beginSequence_;
     }
 
-    public static final int PULL_NUM_FIELD_NUMBER = 2;
+    public static final int PULL_NUM_FIELD_NUMBER = 14;
     private int pullNum_;
     /**
-     * <code>uint32 pull_num = 2;</code>
+     * <code>uint32 pull_num = 14;</code>
      * @return The pullNum.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class PullRecentChatReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (pullNum_ != 0) {
-        output.writeUInt32(2, pullNum_);
+        output.writeUInt32(14, pullNum_);
       }
       if (beginSequence_ != 0) {
-        output.writeUInt32(11, beginSequence_);
+        output.writeUInt32(15, beginSequence_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class PullRecentChatReqOuterClass {
       size = 0;
       if (pullNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, pullNum_);
+          .computeUInt32Size(14, pullNum_);
       }
       if (beginSequence_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, beginSequence_);
+          .computeUInt32Size(15, beginSequence_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class PullRecentChatReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23337
-     * Obf: DLAJEHFIMNF
-     * </pre>
-     *
      * Protobuf type {@code PullRecentChatReq}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class PullRecentChatReqOuterClass {
 
       private int beginSequence_ ;
       /**
-       * <code>uint32 begin_sequence = 11;</code>
+       * <code>uint32 begin_sequence = 15;</code>
        * @return The beginSequence.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class PullRecentChatReqOuterClass {
         return beginSequence_;
       }
       /**
-       * <code>uint32 begin_sequence = 11;</code>
+       * <code>uint32 begin_sequence = 15;</code>
        * @param value The beginSequence to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class PullRecentChatReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 begin_sequence = 11;</code>
+       * <code>uint32 begin_sequence = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearBeginSequence() {
@@ -501,7 +491,7 @@ public final class PullRecentChatReqOuterClass {
 
       private int pullNum_ ;
       /**
-       * <code>uint32 pull_num = 2;</code>
+       * <code>uint32 pull_num = 14;</code>
        * @return The pullNum.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class PullRecentChatReqOuterClass {
         return pullNum_;
       }
       /**
-       * <code>uint32 pull_num = 2;</code>
+       * <code>uint32 pull_num = 14;</code>
        * @param value The pullNum to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class PullRecentChatReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 pull_num = 2;</code>
+       * <code>uint32 pull_num = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearPullNum() {
@@ -597,8 +587,8 @@ public final class PullRecentChatReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PullRecentChatReq.proto\"=\n\021PullRecentC" +
-      "hatReq\022\026\n\016begin_sequence\030\013 \001(\r\022\020\n\010pull_n" +
-      "um\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "hatReq\022\026\n\016begin_sequence\030\017 \001(\r\022\020\n\010pull_n" +
+      "um\030\016 \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/PullRecentChatRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatRspOuterClass.java
index ff4a6284a..56735903e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/PullRecentChatRspOuterClass.java
@@ -19,41 +19,36 @@ public final class PullRecentChatRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>int32 retcode = 2;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> 
         getChatInfoList();
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index);
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     int getChatInfoCount();
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
         getChatInfoOrBuilderList();
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
         int index);
-
-    /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 308
-   * Obf: LOLOHADFKJG
-   * </pre>
-   *
    * Protobuf type {@code PullRecentChatRsp}
    */
   public static final class PullRecentChatRsp extends
@@ -100,12 +95,12 @@ public final class PullRecentChatRspOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 16: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 90: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 chatInfo_ = new java.util.ArrayList<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -149,17 +144,28 @@ public final class PullRecentChatRspOuterClass {
               emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp.class, emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp.Builder.class);
     }
 
-    public static final int CHAT_INFO_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 2;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 2;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int CHAT_INFO_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> chatInfo_;
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> getChatInfoList() {
       return chatInfo_;
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class PullRecentChatRspOuterClass {
       return chatInfo_;
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     @java.lang.Override
     public int getChatInfoCount() {
       return chatInfo_.size();
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index) {
       return chatInfo_.get(index);
     }
     /**
-     * <code>repeated .ChatInfo chat_info = 11;</code>
+     * <code>repeated .ChatInfo chat_info = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
@@ -189,17 +195,6 @@ public final class PullRecentChatRspOuterClass {
       return chatInfo_.get(index);
     }
 
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -215,10 +210,10 @@ public final class PullRecentChatRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(2, retcode_);
       }
       for (int i = 0; i < chatInfo_.size(); i++) {
-        output.writeMessage(11, chatInfo_.get(i));
+        output.writeMessage(6, chatInfo_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -231,11 +226,11 @@ public final class PullRecentChatRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(2, retcode_);
       }
       for (int i = 0; i < chatInfo_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, chatInfo_.get(i));
+          .computeMessageSize(6, chatInfo_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class PullRecentChatRspOuterClass {
       }
       emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp other = (emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp) obj;
 
-      if (!getChatInfoList()
-          .equals(other.getChatInfoList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getChatInfoList()
+          .equals(other.getChatInfoList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class PullRecentChatRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getChatInfoCount() > 0) {
         hash = (37 * hash) + CHAT_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getChatInfoList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class PullRecentChatRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 308
-     * Obf: LOLOHADFKJG
-     * </pre>
-     *
      * Protobuf type {@code PullRecentChatRsp}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class PullRecentChatRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        retcode_ = 0;
+
         if (chatInfoBuilder_ == null) {
           chatInfo_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           chatInfoBuilder_.clear();
         }
-        retcode_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class PullRecentChatRspOuterClass {
       public emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp buildPartial() {
         emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp result = new emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (chatInfoBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             chatInfo_ = java.util.Collections.unmodifiableList(chatInfo_);
@@ -456,7 +447,6 @@ public final class PullRecentChatRspOuterClass {
         } else {
           result.chatInfo_ = chatInfoBuilder_.build();
         }
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class PullRecentChatRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp other) {
         if (other == emu.grasscutter.net.proto.PullRecentChatRspOuterClass.PullRecentChatRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (chatInfoBuilder_ == null) {
           if (!other.chatInfo_.isEmpty()) {
             if (chatInfo_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class PullRecentChatRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class PullRecentChatRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 2;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 2;</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 = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> chatInfo_ =
         java.util.Collections.emptyList();
       private void ensureChatInfoIsMutable() {
@@ -577,7 +598,7 @@ public final class PullRecentChatRspOuterClass {
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> chatInfoBuilder_;
 
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> getChatInfoList() {
         if (chatInfoBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class PullRecentChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public int getChatInfoCount() {
         if (chatInfoBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class PullRecentChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo getChatInfo(int index) {
         if (chatInfoBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class PullRecentChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder setChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
@@ -624,7 +645,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder setChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder addChatInfo(emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
         if (chatInfoBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder addChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo value) {
@@ -671,7 +692,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder addChatInfo(
           emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder addChatInfo(
           int index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder addAllChatInfo(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo> values) {
@@ -714,7 +735,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder clearChatInfo() {
         if (chatInfoBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public Builder removeChatInfo(int index) {
         if (chatInfoBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class PullRecentChatRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder getChatInfoBuilder(
           int index) {
         return getChatInfoFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder getChatInfoOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class PullRecentChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfoOrBuilder> 
            getChatInfoOrBuilderList() {
@@ -768,14 +789,14 @@ public final class PullRecentChatRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder addChatInfoBuilder() {
         return getChatInfoFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder addChatInfoBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class PullRecentChatRspOuterClass {
             index, emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ChatInfo chat_info = 11;</code>
+       * <code>repeated .ChatInfo chat_info = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ChatInfoOuterClass.ChatInfo.Builder> 
            getChatInfoBuilderList() {
@@ -803,37 +824,6 @@ public final class PullRecentChatRspOuterClass {
         }
         return chatInfoBuilder_;
       }
-
-      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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -902,8 +892,8 @@ public final class PullRecentChatRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027PullRecentChatRsp.proto\032\016ChatInfo.prot" +
-      "o\"B\n\021PullRecentChatRsp\022\034\n\tchat_info\030\013 \003(" +
-      "\0132\t.ChatInfo\022\017\n\007retcode\030\t \001(\005B\033\n\031emu.gra" +
+      "o\"B\n\021PullRecentChatRsp\022\017\n\007retcode\030\002 \001(\005\022" +
+      "\034\n\tchat_info\030\006 \003(\0132\t.ChatInfoB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -916,7 +906,7 @@ public final class PullRecentChatRspOuterClass {
     internal_static_PullRecentChatRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_PullRecentChatRsp_descriptor,
-        new java.lang.String[] { "ChatInfo", "Retcode", });
+        new java.lang.String[] { "Retcode", "ChatInfo", });
     emu.grasscutter.net.proto.ChatInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryCurrRegionHttpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryCurrRegionHttpRspOuterClass.java
index 093a4dd4c..bba5aa11b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryCurrRegionHttpRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryCurrRegionHttpRspOuterClass.java
@@ -51,36 +51,6 @@ public final class QueryCurrRegionHttpRspOuterClass {
      */
     emu.grasscutter.net.proto.RegionInfoOuterClass.RegionInfoOrBuilder getRegionInfoOrBuilder();
 
-    /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
-     * @return Whether the forceUpdate field is set.
-     */
-    boolean hasForceUpdate();
-    /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
-     * @return The forceUpdate.
-     */
-    emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUpdate();
-    /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
-     */
-    emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUpdateOrBuilder();
-
-    /**
-     * <code>.StopServerInfo stop_server = 5;</code>
-     * @return Whether the stopServer field is set.
-     */
-    boolean hasStopServer();
-    /**
-     * <code>.StopServerInfo stop_server = 5;</code>
-     * @return The stopServer.
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer();
-    /**
-     * <code>.StopServerInfo stop_server = 5;</code>
-     */
-    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder();
-
     /**
      * <code>bytes client_secret_key = 11;</code>
      * @return The clientSecretKey.
@@ -100,24 +70,50 @@ public final class QueryCurrRegionHttpRspOuterClass {
     com.google.protobuf.ByteString getClientRegionCustomConfigEncrypted();
 
     /**
-     * <code>string LDOHCJJALDK = 14;</code>
-     * @return The lDOHCJJALDK.
+     * <code>string gate_ticket = 14;</code>
+     * @return The gateTicket.
      */
-    java.lang.String getLDOHCJJALDK();
+    java.lang.String getGateTicket();
     /**
-     * <code>string LDOHCJJALDK = 14;</code>
-     * @return The bytes for lDOHCJJALDK.
+     * <code>string gate_ticket = 14;</code>
+     * @return The bytes for gateTicket.
      */
     com.google.protobuf.ByteString
-        getLDOHCJJALDKBytes();
+        getGateTicketBytes();
+
+    /**
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
+     * @return Whether the forceUdpate field is set.
+     */
+    boolean hasForceUdpate();
+    /**
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
+     * @return The forceUdpate.
+     */
+    emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUdpate();
+    /**
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
+     */
+    emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUdpateOrBuilder();
+
+    /**
+     * <code>.StopServerInfo stop_server = 5;</code>
+     * @return Whether the stopServer field is set.
+     */
+    boolean hasStopServer();
+    /**
+     * <code>.StopServerInfo stop_server = 5;</code>
+     * @return The stopServer.
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo getStopServer();
+    /**
+     * <code>.StopServerInfo stop_server = 5;</code>
+     */
+    emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfoOrBuilder getStopServerOrBuilder();
 
     public emu.grasscutter.net.proto.QueryCurrRegionHttpRspOuterClass.QueryCurrRegionHttpRsp.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * Obf: LMDOBCJAKIH
-   * </pre>
-   *
    * Protobuf type {@code QueryCurrRegionHttpRsp}
    */
   public static final class QueryCurrRegionHttpRsp extends
@@ -134,7 +130,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
       clientSecretKey_ = com.google.protobuf.ByteString.EMPTY;
       regionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
       clientRegionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
-      lDOHCJJALDK_ = "";
+      gateTicket_ = "";
     }
 
     @java.lang.Override
@@ -237,7 +233,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
             case 114: {
               java.lang.String s = input.readStringRequireUtf8();
 
-              lDOHCJJALDK_ = s;
+              gateTicket_ = s;
               break;
             }
             default: {
@@ -277,7 +273,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
     public enum DetailCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      FORCE_UPDATE(4),
+      FORCE_UDPATE(4),
       STOP_SERVER(5),
       DETAIL_NOT_SET(0);
       private final int value;
@@ -296,7 +292,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
 
       public static DetailCase forNumber(int value) {
         switch (value) {
-          case 4: return FORCE_UPDATE;
+          case 4: return FORCE_UDPATE;
           case 5: return STOP_SERVER;
           case 0: return DETAIL_NOT_SET;
           default: return null;
@@ -388,31 +384,102 @@ public final class QueryCurrRegionHttpRspOuterClass {
       return getRegionInfo();
     }
 
-    public static final int FORCE_UPDATE_FIELD_NUMBER = 4;
+    public static final int CLIENT_SECRET_KEY_FIELD_NUMBER = 11;
+    private com.google.protobuf.ByteString clientSecretKey_;
     /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
-     * @return Whether the forceUpdate field is set.
+     * <code>bytes client_secret_key = 11;</code>
+     * @return The clientSecretKey.
      */
     @java.lang.Override
-    public boolean hasForceUpdate() {
+    public com.google.protobuf.ByteString getClientSecretKey() {
+      return clientSecretKey_;
+    }
+
+    public static final int REGION_CUSTOM_CONFIG_ENCRYPTED_FIELD_NUMBER = 12;
+    private com.google.protobuf.ByteString regionCustomConfigEncrypted_;
+    /**
+     * <code>bytes region_custom_config_encrypted = 12;</code>
+     * @return The regionCustomConfigEncrypted.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getRegionCustomConfigEncrypted() {
+      return regionCustomConfigEncrypted_;
+    }
+
+    public static final int CLIENT_REGION_CUSTOM_CONFIG_ENCRYPTED_FIELD_NUMBER = 13;
+    private com.google.protobuf.ByteString clientRegionCustomConfigEncrypted_;
+    /**
+     * <code>bytes client_region_custom_config_encrypted = 13;</code>
+     * @return The clientRegionCustomConfigEncrypted.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getClientRegionCustomConfigEncrypted() {
+      return clientRegionCustomConfigEncrypted_;
+    }
+
+    public static final int GATE_TICKET_FIELD_NUMBER = 14;
+    private volatile java.lang.Object gateTicket_;
+    /**
+     * <code>string gate_ticket = 14;</code>
+     * @return The gateTicket.
+     */
+    @java.lang.Override
+    public java.lang.String getGateTicket() {
+      java.lang.Object ref = gateTicket_;
+      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();
+        gateTicket_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string gate_ticket = 14;</code>
+     * @return The bytes for gateTicket.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGateTicketBytes() {
+      java.lang.Object ref = gateTicket_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gateTicket_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int FORCE_UDPATE_FIELD_NUMBER = 4;
+    /**
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
+     * @return Whether the forceUdpate field is set.
+     */
+    @java.lang.Override
+    public boolean hasForceUdpate() {
       return detailCase_ == 4;
     }
     /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
-     * @return The forceUpdate.
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
+     * @return The forceUdpate.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUpdate() {
+    public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUdpate() {
       if (detailCase_ == 4) {
          return (emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_;
       }
       return emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.getDefaultInstance();
     }
     /**
-     * <code>.ForceUpdateInfo force_update = 4;</code>
+     * <code>.ForceUpdateInfo force_udpate = 4;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUpdateOrBuilder() {
+    public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUdpateOrBuilder() {
       if (detailCase_ == 4) {
          return (emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_;
       }
@@ -450,77 +517,6 @@ public final class QueryCurrRegionHttpRspOuterClass {
       return emu.grasscutter.net.proto.StopServerInfoOuterClass.StopServerInfo.getDefaultInstance();
     }
 
-    public static final int CLIENT_SECRET_KEY_FIELD_NUMBER = 11;
-    private com.google.protobuf.ByteString clientSecretKey_;
-    /**
-     * <code>bytes client_secret_key = 11;</code>
-     * @return The clientSecretKey.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getClientSecretKey() {
-      return clientSecretKey_;
-    }
-
-    public static final int REGION_CUSTOM_CONFIG_ENCRYPTED_FIELD_NUMBER = 12;
-    private com.google.protobuf.ByteString regionCustomConfigEncrypted_;
-    /**
-     * <code>bytes region_custom_config_encrypted = 12;</code>
-     * @return The regionCustomConfigEncrypted.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getRegionCustomConfigEncrypted() {
-      return regionCustomConfigEncrypted_;
-    }
-
-    public static final int CLIENT_REGION_CUSTOM_CONFIG_ENCRYPTED_FIELD_NUMBER = 13;
-    private com.google.protobuf.ByteString clientRegionCustomConfigEncrypted_;
-    /**
-     * <code>bytes client_region_custom_config_encrypted = 13;</code>
-     * @return The clientRegionCustomConfigEncrypted.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getClientRegionCustomConfigEncrypted() {
-      return clientRegionCustomConfigEncrypted_;
-    }
-
-    public static final int LDOHCJJALDK_FIELD_NUMBER = 14;
-    private volatile java.lang.Object lDOHCJJALDK_;
-    /**
-     * <code>string LDOHCJJALDK = 14;</code>
-     * @return The lDOHCJJALDK.
-     */
-    @java.lang.Override
-    public java.lang.String getLDOHCJJALDK() {
-      java.lang.Object ref = lDOHCJJALDK_;
-      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();
-        lDOHCJJALDK_ = s;
-        return s;
-      }
-    }
-    /**
-     * <code>string LDOHCJJALDK = 14;</code>
-     * @return The bytes for lDOHCJJALDK.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString
-        getLDOHCJJALDKBytes() {
-      java.lang.Object ref = lDOHCJJALDK_;
-      if (ref instanceof java.lang.String) {
-        com.google.protobuf.ByteString b = 
-            com.google.protobuf.ByteString.copyFromUtf8(
-                (java.lang.String) ref);
-        lDOHCJJALDK_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -559,8 +555,8 @@ public final class QueryCurrRegionHttpRspOuterClass {
       if (!clientRegionCustomConfigEncrypted_.isEmpty()) {
         output.writeBytes(13, clientRegionCustomConfigEncrypted_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lDOHCJJALDK_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, lDOHCJJALDK_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, gateTicket_);
       }
       unknownFields.writeTo(output);
     }
@@ -602,8 +598,8 @@ public final class QueryCurrRegionHttpRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(13, clientRegionCustomConfigEncrypted_);
       }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(lDOHCJJALDK_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, lDOHCJJALDK_);
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateTicket_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, gateTicket_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -635,13 +631,13 @@ public final class QueryCurrRegionHttpRspOuterClass {
           .equals(other.getRegionCustomConfigEncrypted())) return false;
       if (!getClientRegionCustomConfigEncrypted()
           .equals(other.getClientRegionCustomConfigEncrypted())) return false;
-      if (!getLDOHCJJALDK()
-          .equals(other.getLDOHCJJALDK())) return false;
+      if (!getGateTicket()
+          .equals(other.getGateTicket())) return false;
       if (!getDetailCase().equals(other.getDetailCase())) return false;
       switch (detailCase_) {
         case 4:
-          if (!getForceUpdate()
-              .equals(other.getForceUpdate())) return false;
+          if (!getForceUdpate()
+              .equals(other.getForceUdpate())) return false;
           break;
         case 5:
           if (!getStopServer()
@@ -675,12 +671,12 @@ public final class QueryCurrRegionHttpRspOuterClass {
       hash = (53 * hash) + getRegionCustomConfigEncrypted().hashCode();
       hash = (37 * hash) + CLIENT_REGION_CUSTOM_CONFIG_ENCRYPTED_FIELD_NUMBER;
       hash = (53 * hash) + getClientRegionCustomConfigEncrypted().hashCode();
-      hash = (37 * hash) + LDOHCJJALDK_FIELD_NUMBER;
-      hash = (53 * hash) + getLDOHCJJALDK().hashCode();
+      hash = (37 * hash) + GATE_TICKET_FIELD_NUMBER;
+      hash = (53 * hash) + getGateTicket().hashCode();
       switch (detailCase_) {
         case 4:
-          hash = (37 * hash) + FORCE_UPDATE_FIELD_NUMBER;
-          hash = (53 * hash) + getForceUpdate().hashCode();
+          hash = (37 * hash) + FORCE_UDPATE_FIELD_NUMBER;
+          hash = (53 * hash) + getForceUdpate().hashCode();
           break;
         case 5:
           hash = (37 * hash) + STOP_SERVER_FIELD_NUMBER;
@@ -785,10 +781,6 @@ public final class QueryCurrRegionHttpRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LMDOBCJAKIH
-     * </pre>
-     *
      * Protobuf type {@code QueryCurrRegionHttpRsp}
      */
     public static final class Builder extends
@@ -842,7 +834,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
 
         clientRegionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
 
-        lDOHCJJALDK_ = "";
+        gateTicket_ = "";
 
         detailCase_ = 0;
         detail_ = null;
@@ -879,11 +871,15 @@ public final class QueryCurrRegionHttpRspOuterClass {
         } else {
           result.regionInfo_ = regionInfoBuilder_.build();
         }
+        result.clientSecretKey_ = clientSecretKey_;
+        result.regionCustomConfigEncrypted_ = regionCustomConfigEncrypted_;
+        result.clientRegionCustomConfigEncrypted_ = clientRegionCustomConfigEncrypted_;
+        result.gateTicket_ = gateTicket_;
         if (detailCase_ == 4) {
-          if (forceUpdateBuilder_ == null) {
+          if (forceUdpateBuilder_ == null) {
             result.detail_ = detail_;
           } else {
-            result.detail_ = forceUpdateBuilder_.build();
+            result.detail_ = forceUdpateBuilder_.build();
           }
         }
         if (detailCase_ == 5) {
@@ -893,10 +889,6 @@ public final class QueryCurrRegionHttpRspOuterClass {
             result.detail_ = stopServerBuilder_.build();
           }
         }
-        result.clientSecretKey_ = clientSecretKey_;
-        result.regionCustomConfigEncrypted_ = regionCustomConfigEncrypted_;
-        result.clientRegionCustomConfigEncrypted_ = clientRegionCustomConfigEncrypted_;
-        result.lDOHCJJALDK_ = lDOHCJJALDK_;
         result.detailCase_ = detailCase_;
         onBuilt();
         return result;
@@ -965,13 +957,13 @@ public final class QueryCurrRegionHttpRspOuterClass {
         if (other.getClientRegionCustomConfigEncrypted() != com.google.protobuf.ByteString.EMPTY) {
           setClientRegionCustomConfigEncrypted(other.getClientRegionCustomConfigEncrypted());
         }
-        if (!other.getLDOHCJJALDK().isEmpty()) {
-          lDOHCJJALDK_ = other.lDOHCJJALDK_;
+        if (!other.getGateTicket().isEmpty()) {
+          gateTicket_ = other.gateTicket_;
           onChanged();
         }
         switch (other.getDetailCase()) {
-          case FORCE_UPDATE: {
-            mergeForceUpdate(other.getForceUpdate());
+          case FORCE_UDPATE: {
+            mergeForceUdpate(other.getForceUdpate());
             break;
           }
           case STOP_SERVER: {
@@ -1252,69 +1244,247 @@ public final class QueryCurrRegionHttpRspOuterClass {
         return regionInfoBuilder_;
       }
 
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder> forceUpdateBuilder_;
+      private com.google.protobuf.ByteString clientSecretKey_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
-       * @return Whether the forceUpdate field is set.
+       * <code>bytes client_secret_key = 11;</code>
+       * @return The clientSecretKey.
        */
       @java.lang.Override
-      public boolean hasForceUpdate() {
+      public com.google.protobuf.ByteString getClientSecretKey() {
+        return clientSecretKey_;
+      }
+      /**
+       * <code>bytes client_secret_key = 11;</code>
+       * @param value The clientSecretKey to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientSecretKey(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientSecretKey_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes client_secret_key = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientSecretKey() {
+        
+        clientSecretKey_ = getDefaultInstance().getClientSecretKey();
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString regionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes region_custom_config_encrypted = 12;</code>
+       * @return The regionCustomConfigEncrypted.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getRegionCustomConfigEncrypted() {
+        return regionCustomConfigEncrypted_;
+      }
+      /**
+       * <code>bytes region_custom_config_encrypted = 12;</code>
+       * @param value The regionCustomConfigEncrypted to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRegionCustomConfigEncrypted(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        regionCustomConfigEncrypted_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes region_custom_config_encrypted = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRegionCustomConfigEncrypted() {
+        
+        regionCustomConfigEncrypted_ = getDefaultInstance().getRegionCustomConfigEncrypted();
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.ByteString clientRegionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
+      /**
+       * <code>bytes client_region_custom_config_encrypted = 13;</code>
+       * @return The clientRegionCustomConfigEncrypted.
+       */
+      @java.lang.Override
+      public com.google.protobuf.ByteString getClientRegionCustomConfigEncrypted() {
+        return clientRegionCustomConfigEncrypted_;
+      }
+      /**
+       * <code>bytes client_region_custom_config_encrypted = 13;</code>
+       * @param value The clientRegionCustomConfigEncrypted to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientRegionCustomConfigEncrypted(com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        clientRegionCustomConfigEncrypted_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bytes client_region_custom_config_encrypted = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientRegionCustomConfigEncrypted() {
+        
+        clientRegionCustomConfigEncrypted_ = getDefaultInstance().getClientRegionCustomConfigEncrypted();
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object gateTicket_ = "";
+      /**
+       * <code>string gate_ticket = 14;</code>
+       * @return The gateTicket.
+       */
+      public java.lang.String getGateTicket() {
+        java.lang.Object ref = gateTicket_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gateTicket_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string gate_ticket = 14;</code>
+       * @return The bytes for gateTicket.
+       */
+      public com.google.protobuf.ByteString
+          getGateTicketBytes() {
+        java.lang.Object ref = gateTicket_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gateTicket_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string gate_ticket = 14;</code>
+       * @param value The gateTicket to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGateTicket(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gateTicket_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gate_ticket = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGateTicket() {
+        
+        gateTicket_ = getDefaultInstance().getGateTicket();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gate_ticket = 14;</code>
+       * @param value The bytes for gateTicket to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGateTicketBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gateTicket_ = value;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder> forceUdpateBuilder_;
+      /**
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
+       * @return Whether the forceUdpate field is set.
+       */
+      @java.lang.Override
+      public boolean hasForceUdpate() {
         return detailCase_ == 4;
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
-       * @return The forceUpdate.
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
+       * @return The forceUdpate.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUpdate() {
-        if (forceUpdateBuilder_ == null) {
+      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo getForceUdpate() {
+        if (forceUdpateBuilder_ == null) {
           if (detailCase_ == 4) {
             return (emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_;
           }
           return emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.getDefaultInstance();
         } else {
           if (detailCase_ == 4) {
-            return forceUpdateBuilder_.getMessage();
+            return forceUdpateBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
-      public Builder setForceUpdate(emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo value) {
-        if (forceUpdateBuilder_ == null) {
+      public Builder setForceUdpate(emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo value) {
+        if (forceUdpateBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
           detail_ = value;
           onChanged();
         } else {
-          forceUpdateBuilder_.setMessage(value);
+          forceUdpateBuilder_.setMessage(value);
         }
         detailCase_ = 4;
         return this;
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
-      public Builder setForceUpdate(
+      public Builder setForceUdpate(
           emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder builderForValue) {
-        if (forceUpdateBuilder_ == null) {
+        if (forceUdpateBuilder_ == null) {
           detail_ = builderForValue.build();
           onChanged();
         } else {
-          forceUpdateBuilder_.setMessage(builderForValue.build());
+          forceUdpateBuilder_.setMessage(builderForValue.build());
         }
         detailCase_ = 4;
         return this;
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
-      public Builder mergeForceUpdate(emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo value) {
-        if (forceUpdateBuilder_ == null) {
+      public Builder mergeForceUdpate(emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo value) {
+        if (forceUdpateBuilder_ == null) {
           if (detailCase_ == 4 &&
               detail_ != emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.getDefaultInstance()) {
             detail_ = emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.newBuilder((emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_)
@@ -1325,18 +1495,18 @@ public final class QueryCurrRegionHttpRspOuterClass {
           onChanged();
         } else {
           if (detailCase_ == 4) {
-            forceUpdateBuilder_.mergeFrom(value);
+            forceUdpateBuilder_.mergeFrom(value);
           }
-          forceUpdateBuilder_.setMessage(value);
+          forceUdpateBuilder_.setMessage(value);
         }
         detailCase_ = 4;
         return this;
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
-      public Builder clearForceUpdate() {
-        if (forceUpdateBuilder_ == null) {
+      public Builder clearForceUdpate() {
+        if (forceUdpateBuilder_ == null) {
           if (detailCase_ == 4) {
             detailCase_ = 0;
             detail_ = null;
@@ -1347,23 +1517,23 @@ public final class QueryCurrRegionHttpRspOuterClass {
             detailCase_ = 0;
             detail_ = null;
           }
-          forceUpdateBuilder_.clear();
+          forceUdpateBuilder_.clear();
         }
         return this;
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
-      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder getForceUpdateBuilder() {
-        return getForceUpdateFieldBuilder().getBuilder();
+      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder getForceUdpateBuilder() {
+        return getForceUdpateFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUpdateOrBuilder() {
-        if ((detailCase_ == 4) && (forceUpdateBuilder_ != null)) {
-          return forceUpdateBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder getForceUdpateOrBuilder() {
+        if ((detailCase_ == 4) && (forceUdpateBuilder_ != null)) {
+          return forceUdpateBuilder_.getMessageOrBuilder();
         } else {
           if (detailCase_ == 4) {
             return (emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_;
@@ -1372,16 +1542,16 @@ public final class QueryCurrRegionHttpRspOuterClass {
         }
       }
       /**
-       * <code>.ForceUpdateInfo force_update = 4;</code>
+       * <code>.ForceUpdateInfo force_udpate = 4;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder> 
-          getForceUpdateFieldBuilder() {
-        if (forceUpdateBuilder_ == null) {
+          getForceUdpateFieldBuilder() {
+        if (forceUdpateBuilder_ == null) {
           if (!(detailCase_ == 4)) {
             detail_ = emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.getDefaultInstance();
           }
-          forceUpdateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          forceUdpateBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo.Builder, emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfoOrBuilder>(
                   (emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.ForceUpdateInfo) detail_,
                   getParentForChildren(),
@@ -1390,7 +1560,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
         }
         detailCase_ = 4;
         onChanged();;
-        return forceUpdateBuilder_;
+        return forceUdpateBuilder_;
       }
 
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -1533,184 +1703,6 @@ public final class QueryCurrRegionHttpRspOuterClass {
         onChanged();;
         return stopServerBuilder_;
       }
-
-      private com.google.protobuf.ByteString clientSecretKey_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes client_secret_key = 11;</code>
-       * @return The clientSecretKey.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getClientSecretKey() {
-        return clientSecretKey_;
-      }
-      /**
-       * <code>bytes client_secret_key = 11;</code>
-       * @param value The clientSecretKey to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientSecretKey(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientSecretKey_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes client_secret_key = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientSecretKey() {
-        
-        clientSecretKey_ = getDefaultInstance().getClientSecretKey();
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString regionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes region_custom_config_encrypted = 12;</code>
-       * @return The regionCustomConfigEncrypted.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getRegionCustomConfigEncrypted() {
-        return regionCustomConfigEncrypted_;
-      }
-      /**
-       * <code>bytes region_custom_config_encrypted = 12;</code>
-       * @param value The regionCustomConfigEncrypted to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRegionCustomConfigEncrypted(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        regionCustomConfigEncrypted_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes region_custom_config_encrypted = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRegionCustomConfigEncrypted() {
-        
-        regionCustomConfigEncrypted_ = getDefaultInstance().getRegionCustomConfigEncrypted();
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.ByteString clientRegionCustomConfigEncrypted_ = com.google.protobuf.ByteString.EMPTY;
-      /**
-       * <code>bytes client_region_custom_config_encrypted = 13;</code>
-       * @return The clientRegionCustomConfigEncrypted.
-       */
-      @java.lang.Override
-      public com.google.protobuf.ByteString getClientRegionCustomConfigEncrypted() {
-        return clientRegionCustomConfigEncrypted_;
-      }
-      /**
-       * <code>bytes client_region_custom_config_encrypted = 13;</code>
-       * @param value The clientRegionCustomConfigEncrypted to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientRegionCustomConfigEncrypted(com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        clientRegionCustomConfigEncrypted_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bytes client_region_custom_config_encrypted = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientRegionCustomConfigEncrypted() {
-        
-        clientRegionCustomConfigEncrypted_ = getDefaultInstance().getClientRegionCustomConfigEncrypted();
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object lDOHCJJALDK_ = "";
-      /**
-       * <code>string LDOHCJJALDK = 14;</code>
-       * @return The lDOHCJJALDK.
-       */
-      public java.lang.String getLDOHCJJALDK() {
-        java.lang.Object ref = lDOHCJJALDK_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          lDOHCJJALDK_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string LDOHCJJALDK = 14;</code>
-       * @return The bytes for lDOHCJJALDK.
-       */
-      public com.google.protobuf.ByteString
-          getLDOHCJJALDKBytes() {
-        java.lang.Object ref = lDOHCJJALDK_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          lDOHCJJALDK_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string LDOHCJJALDK = 14;</code>
-       * @param value The lDOHCJJALDK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLDOHCJJALDK(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        lDOHCJJALDK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string LDOHCJJALDK = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLDOHCJJALDK() {
-        
-        lDOHCJJALDK_ = getDefaultInstance().getLDOHCJJALDK();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string LDOHCJJALDK = 14;</code>
-       * @param value The bytes for lDOHCJJALDK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLDOHCJJALDKBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        lDOHCJJALDK_ = value;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1782,13 +1774,13 @@ public final class QueryCurrRegionHttpRspOuterClass {
       "fo.proto\032\025ForceUpdateInfo.proto\032\024StopSer" +
       "verInfo.proto\"\273\002\n\026QueryCurrRegionHttpRsp" +
       "\022\017\n\007retcode\030\001 \001(\005\022\013\n\003msg\030\002 \001(\t\022 \n\013region" +
-      "_info\030\003 \001(\0132\013.RegionInfo\022(\n\014force_update" +
-      "\030\004 \001(\0132\020.ForceUpdateInfoH\000\022&\n\013stop_serve" +
-      "r\030\005 \001(\0132\017.StopServerInfoH\000\022\031\n\021client_sec" +
-      "ret_key\030\013 \001(\014\022&\n\036region_custom_config_en" +
-      "crypted\030\014 \001(\014\022-\n%client_region_custom_co" +
-      "nfig_encrypted\030\r \001(\014\022\023\n\013LDOHCJJALDK\030\016 \001(" +
-      "\tB\010\n\006detailB\033\n\031emu.grasscutter.net.proto" +
+      "_info\030\003 \001(\0132\013.RegionInfo\022\031\n\021client_secre" +
+      "t_key\030\013 \001(\014\022&\n\036region_custom_config_encr" +
+      "ypted\030\014 \001(\014\022-\n%client_region_custom_conf" +
+      "ig_encrypted\030\r \001(\014\022\023\n\013gate_ticket\030\016 \001(\t\022" +
+      "(\n\014force_udpate\030\004 \001(\0132\020.ForceUpdateInfoH" +
+      "\000\022&\n\013stop_server\030\005 \001(\0132\017.StopServerInfoH" +
+      "\000B\010\n\006DetailB\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1803,7 +1795,7 @@ public final class QueryCurrRegionHttpRspOuterClass {
     internal_static_QueryCurrRegionHttpRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryCurrRegionHttpRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Msg", "RegionInfo", "ForceUpdate", "StopServer", "ClientSecretKey", "RegionCustomConfigEncrypted", "ClientRegionCustomConfigEncrypted", "LDOHCJJALDK", "Detail", });
+        new java.lang.String[] { "Retcode", "Msg", "RegionInfo", "ClientSecretKey", "RegionCustomConfigEncrypted", "ClientRegionCustomConfigEncrypted", "GateTicket", "ForceUdpate", "StopServer", "Detail", });
     emu.grasscutter.net.proto.RegionInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ForceUpdateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.StopServerInfoOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java
index 0221fa255..70e830a92 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryFilterOuterClass.java
@@ -19,22 +19,18 @@ public final class QueryFilterOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 JKLHOJOCLJD = 10;</code>
-     * @return The jKLHOJOCLJD.
+     * <code>int32 MJEFLBPJBKM = 7;</code>
+     * @return The mJEFLBPJBKM.
      */
-    int getJKLHOJOCLJD();
+    int getMJEFLBPJBKM();
 
     /**
-     * <code>int32 JOJGNGIGNDB = 6;</code>
-     * @return The jOJGNGIGNDB.
+     * <code>int32 NOLJBNBNLML = 9;</code>
+     * @return The nOLJBNBNLML.
      */
-    int getJOJGNGIGNDB();
+    int getNOLJBNBNLML();
   }
   /**
-   * <pre>
-   * Obf: JGKDEPOMBFP
-   * </pre>
-   *
    * Protobuf type {@code QueryFilter}
    */
   public static final class QueryFilter extends
@@ -79,14 +75,14 @@ public final class QueryFilterOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 56: {
 
-              jOJGNGIGNDB_ = input.readInt32();
+              mJEFLBPJBKM_ = input.readInt32();
               break;
             }
-            case 80: {
+            case 72: {
 
-              jKLHOJOCLJD_ = input.readInt32();
+              nOLJBNBNLML_ = input.readInt32();
               break;
             }
             default: {
@@ -121,26 +117,26 @@ public final class QueryFilterOuterClass {
               emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.class, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder.class);
     }
 
-    public static final int JKLHOJOCLJD_FIELD_NUMBER = 10;
-    private int jKLHOJOCLJD_;
+    public static final int MJEFLBPJBKM_FIELD_NUMBER = 7;
+    private int mJEFLBPJBKM_;
     /**
-     * <code>int32 JKLHOJOCLJD = 10;</code>
-     * @return The jKLHOJOCLJD.
+     * <code>int32 MJEFLBPJBKM = 7;</code>
+     * @return The mJEFLBPJBKM.
      */
     @java.lang.Override
-    public int getJKLHOJOCLJD() {
-      return jKLHOJOCLJD_;
+    public int getMJEFLBPJBKM() {
+      return mJEFLBPJBKM_;
     }
 
-    public static final int JOJGNGIGNDB_FIELD_NUMBER = 6;
-    private int jOJGNGIGNDB_;
+    public static final int NOLJBNBNLML_FIELD_NUMBER = 9;
+    private int nOLJBNBNLML_;
     /**
-     * <code>int32 JOJGNGIGNDB = 6;</code>
-     * @return The jOJGNGIGNDB.
+     * <code>int32 NOLJBNBNLML = 9;</code>
+     * @return The nOLJBNBNLML.
      */
     @java.lang.Override
-    public int getJOJGNGIGNDB() {
-      return jOJGNGIGNDB_;
+    public int getNOLJBNBNLML() {
+      return nOLJBNBNLML_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -157,11 +153,11 @@ public final class QueryFilterOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (jOJGNGIGNDB_ != 0) {
-        output.writeInt32(6, jOJGNGIGNDB_);
+      if (mJEFLBPJBKM_ != 0) {
+        output.writeInt32(7, mJEFLBPJBKM_);
       }
-      if (jKLHOJOCLJD_ != 0) {
-        output.writeInt32(10, jKLHOJOCLJD_);
+      if (nOLJBNBNLML_ != 0) {
+        output.writeInt32(9, nOLJBNBNLML_);
       }
       unknownFields.writeTo(output);
     }
@@ -172,13 +168,13 @@ public final class QueryFilterOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (jOJGNGIGNDB_ != 0) {
+      if (mJEFLBPJBKM_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, jOJGNGIGNDB_);
+          .computeInt32Size(7, mJEFLBPJBKM_);
       }
-      if (jKLHOJOCLJD_ != 0) {
+      if (nOLJBNBNLML_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(10, jKLHOJOCLJD_);
+          .computeInt32Size(9, nOLJBNBNLML_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +191,10 @@ public final class QueryFilterOuterClass {
       }
       emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter other = (emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter) obj;
 
-      if (getJKLHOJOCLJD()
-          != other.getJKLHOJOCLJD()) return false;
-      if (getJOJGNGIGNDB()
-          != other.getJOJGNGIGNDB()) return false;
+      if (getMJEFLBPJBKM()
+          != other.getMJEFLBPJBKM()) return false;
+      if (getNOLJBNBNLML()
+          != other.getNOLJBNBNLML()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +206,10 @@ public final class QueryFilterOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + JKLHOJOCLJD_FIELD_NUMBER;
-      hash = (53 * hash) + getJKLHOJOCLJD();
-      hash = (37 * hash) + JOJGNGIGNDB_FIELD_NUMBER;
-      hash = (53 * hash) + getJOJGNGIGNDB();
+      hash = (37 * hash) + MJEFLBPJBKM_FIELD_NUMBER;
+      hash = (53 * hash) + getMJEFLBPJBKM();
+      hash = (37 * hash) + NOLJBNBNLML_FIELD_NUMBER;
+      hash = (53 * hash) + getNOLJBNBNLML();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -310,10 +306,6 @@ public final class QueryFilterOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JGKDEPOMBFP
-     * </pre>
-     *
      * Protobuf type {@code QueryFilter}
      */
     public static final class Builder extends
@@ -351,9 +343,9 @@ public final class QueryFilterOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        jKLHOJOCLJD_ = 0;
+        mJEFLBPJBKM_ = 0;
 
-        jOJGNGIGNDB_ = 0;
+        nOLJBNBNLML_ = 0;
 
         return this;
       }
@@ -381,8 +373,8 @@ public final class QueryFilterOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter buildPartial() {
         emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter result = new emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter(this);
-        result.jKLHOJOCLJD_ = jKLHOJOCLJD_;
-        result.jOJGNGIGNDB_ = jOJGNGIGNDB_;
+        result.mJEFLBPJBKM_ = mJEFLBPJBKM_;
+        result.nOLJBNBNLML_ = nOLJBNBNLML_;
         onBuilt();
         return result;
       }
@@ -431,11 +423,11 @@ public final class QueryFilterOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter other) {
         if (other == emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance()) return this;
-        if (other.getJKLHOJOCLJD() != 0) {
-          setJKLHOJOCLJD(other.getJKLHOJOCLJD());
+        if (other.getMJEFLBPJBKM() != 0) {
+          setMJEFLBPJBKM(other.getMJEFLBPJBKM());
         }
-        if (other.getJOJGNGIGNDB() != 0) {
-          setJOJGNGIGNDB(other.getJOJGNGIGNDB());
+        if (other.getNOLJBNBNLML() != 0) {
+          setNOLJBNBNLML(other.getNOLJBNBNLML());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -466,64 +458,64 @@ public final class QueryFilterOuterClass {
         return this;
       }
 
-      private int jKLHOJOCLJD_ ;
+      private int mJEFLBPJBKM_ ;
       /**
-       * <code>int32 JKLHOJOCLJD = 10;</code>
-       * @return The jKLHOJOCLJD.
+       * <code>int32 MJEFLBPJBKM = 7;</code>
+       * @return The mJEFLBPJBKM.
        */
       @java.lang.Override
-      public int getJKLHOJOCLJD() {
-        return jKLHOJOCLJD_;
+      public int getMJEFLBPJBKM() {
+        return mJEFLBPJBKM_;
       }
       /**
-       * <code>int32 JKLHOJOCLJD = 10;</code>
-       * @param value The jKLHOJOCLJD to set.
+       * <code>int32 MJEFLBPJBKM = 7;</code>
+       * @param value The mJEFLBPJBKM to set.
        * @return This builder for chaining.
        */
-      public Builder setJKLHOJOCLJD(int value) {
+      public Builder setMJEFLBPJBKM(int value) {
         
-        jKLHOJOCLJD_ = value;
+        mJEFLBPJBKM_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 JKLHOJOCLJD = 10;</code>
+       * <code>int32 MJEFLBPJBKM = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearJKLHOJOCLJD() {
+      public Builder clearMJEFLBPJBKM() {
         
-        jKLHOJOCLJD_ = 0;
+        mJEFLBPJBKM_ = 0;
         onChanged();
         return this;
       }
 
-      private int jOJGNGIGNDB_ ;
+      private int nOLJBNBNLML_ ;
       /**
-       * <code>int32 JOJGNGIGNDB = 6;</code>
-       * @return The jOJGNGIGNDB.
+       * <code>int32 NOLJBNBNLML = 9;</code>
+       * @return The nOLJBNBNLML.
        */
       @java.lang.Override
-      public int getJOJGNGIGNDB() {
-        return jOJGNGIGNDB_;
+      public int getNOLJBNBNLML() {
+        return nOLJBNBNLML_;
       }
       /**
-       * <code>int32 JOJGNGIGNDB = 6;</code>
-       * @param value The jOJGNGIGNDB to set.
+       * <code>int32 NOLJBNBNLML = 9;</code>
+       * @param value The nOLJBNBNLML to set.
        * @return This builder for chaining.
        */
-      public Builder setJOJGNGIGNDB(int value) {
+      public Builder setNOLJBNBNLML(int value) {
         
-        jOJGNGIGNDB_ = value;
+        nOLJBNBNLML_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>int32 JOJGNGIGNDB = 6;</code>
+       * <code>int32 NOLJBNBNLML = 9;</code>
        * @return This builder for chaining.
        */
-      public Builder clearJOJGNGIGNDB() {
+      public Builder clearNOLJBNBNLML() {
         
-        jOJGNGIGNDB_ = 0;
+        nOLJBNBNLML_ = 0;
         onChanged();
         return this;
       }
@@ -594,8 +586,8 @@ public final class QueryFilterOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\021QueryFilter.proto\"7\n\013QueryFilter\022\023\n\013JK" +
-      "LHOJOCLJD\030\n \001(\005\022\023\n\013JOJGNGIGNDB\030\006 \001(\005B\033\n\031" +
+      "\n\021QueryFilter.proto\"7\n\013QueryFilter\022\023\n\013MJ" +
+      "EFLBPJBKM\030\007 \001(\005\022\023\n\013NOLJBNBNLML\030\t \001(\005B\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -607,7 +599,7 @@ public final class QueryFilterOuterClass {
     internal_static_QueryFilter_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryFilter_descriptor,
-        new java.lang.String[] { "JKLHOJOCLJD", "JOJGNGIGNDB", });
+        new java.lang.String[] { "MJEFLBPJBKM", "NOLJBNBNLML", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java
index 99a67fe0b..403985c70 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathReqOuterClass.java
@@ -19,35 +19,89 @@ public final class QueryPathReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     * @return Whether the aNOOBDOFLPG field is set.
-     */
-    boolean hasANOOBDOFLPG();
-    /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     * @return The aNOOBDOFLPG.
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANOOBDOFLPG();
-    /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANOOBDOFLPGOrBuilder();
-
-    /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      * @return Whether the filter field is set.
      */
     boolean hasFilter();
     /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      * @return The filter.
      */
     emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter();
     /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      */
     emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder();
 
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
+        getDestinationPosList();
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index);
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    int getDestinationPosCount();
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getDestinationPosOrBuilderList();
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
+        int index);
+
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     * @return Whether the dNFDJPHIOBD field is set.
+     */
+    boolean hasDNFDJPHIOBD();
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     * @return The dNFDJPHIOBD.
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD();
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder();
+
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     * @return Whether the oDFIFCKDODJ field is set.
+     */
+    boolean hasODFIFCKDODJ();
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     * @return The oDFIFCKDODJ.
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ();
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     */
+    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder();
+
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     * @return Whether the sourcePos field is set.
+     */
+    boolean hasSourcePos();
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     * @return The sourcePos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos();
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder();
+
     /**
      * <code>int32 query_id = 3;</code>
      * @return The queryId.
@@ -55,82 +109,23 @@ public final class QueryPathReqOuterClass {
     int getQueryId();
 
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <code>uint32 scene_id = 13;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>.Vector source_pos = 15;</code>
-     * @return Whether the sourcePos field is set.
-     */
-    boolean hasSourcePos();
-    /**
-     * <code>.Vector source_pos = 15;</code>
-     * @return The sourcePos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos();
-    /**
-     * <code>.Vector source_pos = 15;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder();
-
-    /**
-     * <code>.QueryPathReq.OptionType query_type = 9;</code>
+     * <code>.OptionType query_type = 7;</code>
      * @return The enum numeric value on the wire for queryType.
      */
     int getQueryTypeValue();
     /**
-     * <code>.QueryPathReq.OptionType query_type = 9;</code>
+     * <code>.OptionType query_type = 7;</code>
      * @return The queryType.
      */
-    emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType();
-
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     * @return Whether the lAOKIPAJIGN field is set.
-     */
-    boolean hasLAOKIPAJIGN();
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     * @return The lAOKIPAJIGN.
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getLAOKIPAJIGN();
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     */
-    emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getLAOKIPAJIGNOrBuilder();
-
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
-        getDestinationPosList();
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index);
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    int getDestinationPosCount();
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getDestinationPosOrBuilderList();
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
-        int index);
+    emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType getQueryType();
   }
   /**
-   * <pre>
-   * CmdId: 2359
-   * Obf: GOKDPGJBHEM
-   * </pre>
-   *
    * Protobuf type {@code QueryPathReq}
    */
   public static final class QueryPathReq extends
@@ -143,8 +138,8 @@ public final class QueryPathReqOuterClass {
       super(builder);
     }
     private QueryPathReq() {
-      queryType_ = 0;
       destinationPos_ = java.util.Collections.emptyList();
+      queryType_ = 0;
     }
 
     @java.lang.Override
@@ -183,57 +178,7 @@ public final class QueryPathReqOuterClass {
               queryId_ = input.readInt32();
               break;
             }
-            case 42: {
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null;
-              if (lAOKIPAJIGN_ != null) {
-                subBuilder = lAOKIPAJIGN_.toBuilder();
-              }
-              lAOKIPAJIGN_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(lAOKIPAJIGN_);
-                lAOKIPAJIGN_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 50: {
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null;
-              if (aNOOBDOFLPG_ != null) {
-                subBuilder = aNOOBDOFLPG_.toBuilder();
-              }
-              aNOOBDOFLPG_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(aNOOBDOFLPG_);
-                aNOOBDOFLPG_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 56: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-              int rawValue = input.readEnum();
-
-              queryType_ = rawValue;
-              break;
-            }
-            case 98: {
-              emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder subBuilder = null;
-              if (filter_ != null) {
-                subBuilder = filter_.toBuilder();
-              }
-              filter_ = input.readMessage(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(filter_);
-                filter_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 106: {
+            case 34: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 destinationPos_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>();
                 mutable_bitField0_ |= 0x00000001;
@@ -242,7 +187,39 @@ public final class QueryPathReqOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry));
               break;
             }
-            case 122: {
+            case 42: {
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null;
+              if (oDFIFCKDODJ_ != null) {
+                subBuilder = oDFIFCKDODJ_.toBuilder();
+              }
+              oDFIFCKDODJ_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(oDFIFCKDODJ_);
+                oDFIFCKDODJ_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 56: {
+              int rawValue = input.readEnum();
+
+              queryType_ = rawValue;
+              break;
+            }
+            case 74: {
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder subBuilder = null;
+              if (dNFDJPHIOBD_ != null) {
+                subBuilder = dNFDJPHIOBD_.toBuilder();
+              }
+              dNFDJPHIOBD_ = input.readMessage(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(dNFDJPHIOBD_);
+                dNFDJPHIOBD_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 98: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (sourcePos_ != null) {
                 subBuilder = sourcePos_.toBuilder();
@@ -255,6 +232,24 @@ public final class QueryPathReqOuterClass {
 
               break;
             }
+            case 104: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 114: {
+              emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder subBuilder = null;
+              if (filter_ != null) {
+                subBuilder = filter_.toBuilder();
+              }
+              filter_ = input.readMessage(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(filter_);
+                filter_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -290,157 +285,10 @@ public final class QueryPathReqOuterClass {
               emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.class, emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.Builder.class);
     }
 
-    /**
-     * <pre>
-     * Obf: MFMCBMBEPJD
-     * </pre>
-     *
-     * Protobuf enum {@code QueryPathReq.OptionType}
-     */
-    public enum OptionType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>OPTION_NONE = 0;</code>
-       */
-      OPTION_NONE(0),
-      /**
-       * <code>OPTION_NORMAL = 1;</code>
-       */
-      OPTION_NORMAL(1),
-      /**
-       * <code>OPTION_FIRST_CAN_GO = 2;</code>
-       */
-      OPTION_FIRST_CAN_GO(2),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>OPTION_NONE = 0;</code>
-       */
-      public static final int OPTION_NONE_VALUE = 0;
-      /**
-       * <code>OPTION_NORMAL = 1;</code>
-       */
-      public static final int OPTION_NORMAL_VALUE = 1;
-      /**
-       * <code>OPTION_FIRST_CAN_GO = 2;</code>
-       */
-      public static final int OPTION_FIRST_CAN_GO_VALUE = 2;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static OptionType valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static OptionType forNumber(int value) {
-        switch (value) {
-          case 0: return OPTION_NONE;
-          case 1: return OPTION_NORMAL;
-          case 2: return OPTION_FIRST_CAN_GO;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<OptionType>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          OptionType> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<OptionType>() {
-              public OptionType findValueByNumber(int number) {
-                return OptionType.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final OptionType[] VALUES = values();
-
-      public static OptionType valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private OptionType(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:QueryPathReq.OptionType)
-    }
-
-    public static final int ANOOBDOFLPG_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int aNOOBDOFLPG_;
-    /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     * @return Whether the aNOOBDOFLPG field is set.
-     */
-    @java.lang.Override
-    public boolean hasANOOBDOFLPG() {
-      return aNOOBDOFLPG_ != null;
-    }
-    /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     * @return The aNOOBDOFLPG.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANOOBDOFLPG() {
-      return aNOOBDOFLPG_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNOOBDOFLPG_;
-    }
-    /**
-     * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANOOBDOFLPGOrBuilder() {
-      return getANOOBDOFLPG();
-    }
-
-    public static final int FILTER_FIELD_NUMBER = 12;
+    public static final int FILTER_FIELD_NUMBER = 14;
     private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_;
     /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      * @return Whether the filter field is set.
      */
     @java.lang.Override
@@ -448,7 +296,7 @@ public final class QueryPathReqOuterClass {
       return filter_ != null;
     }
     /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      * @return The filter.
      */
     @java.lang.Override
@@ -456,13 +304,131 @@ public final class QueryPathReqOuterClass {
       return filter_ == null ? emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.getDefaultInstance() : filter_;
     }
     /**
-     * <code>.QueryFilter filter = 12;</code>
+     * <code>.QueryFilter filter = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() {
       return getFilter();
     }
 
+    public static final int DESTINATION_POS_FIELD_NUMBER = 4;
+    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> destinationPos_;
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getDestinationPosList() {
+      return destinationPos_;
+    }
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getDestinationPosOrBuilderList() {
+      return destinationPos_;
+    }
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    @java.lang.Override
+    public int getDestinationPosCount() {
+      return destinationPos_.size();
+    }
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) {
+      return destinationPos_.get(index);
+    }
+    /**
+     * <code>repeated .Vector destination_pos = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
+        int index) {
+      return destinationPos_.get(index);
+    }
+
+    public static final int DNFDJPHIOBD_FIELD_NUMBER = 9;
+    private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int dNFDJPHIOBD_;
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     * @return Whether the dNFDJPHIOBD field is set.
+     */
+    @java.lang.Override
+    public boolean hasDNFDJPHIOBD() {
+      return dNFDJPHIOBD_ != null;
+    }
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     * @return The dNFDJPHIOBD.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD() {
+      return dNFDJPHIOBD_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_;
+    }
+    /**
+     * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder() {
+      return getDNFDJPHIOBD();
+    }
+
+    public static final int ODFIFCKDODJ_FIELD_NUMBER = 5;
+    private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int oDFIFCKDODJ_;
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     * @return Whether the oDFIFCKDODJ field is set.
+     */
+    @java.lang.Override
+    public boolean hasODFIFCKDODJ() {
+      return oDFIFCKDODJ_ != null;
+    }
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     * @return The oDFIFCKDODJ.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ() {
+      return oDFIFCKDODJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_;
+    }
+    /**
+     * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder() {
+      return getODFIFCKDODJ();
+    }
+
+    public static final int SOURCE_POS_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_;
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     * @return Whether the sourcePos field is set.
+     */
+    @java.lang.Override
+    public boolean hasSourcePos() {
+      return sourcePos_ != null;
+    }
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     * @return The sourcePos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() {
+      return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
+    }
+    /**
+     * <code>.Vector source_pos = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() {
+      return getSourcePos();
+    }
+
     public static final int QUERY_ID_FIELD_NUMBER = 3;
     private int queryId_;
     /**
@@ -474,10 +440,10 @@ public final class QueryPathReqOuterClass {
       return queryId_;
     }
 
-    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>
+     * <code>uint32 scene_id = 13;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -485,115 +451,23 @@ public final class QueryPathReqOuterClass {
       return sceneId_;
     }
 
-    public static final int SOURCE_POS_FIELD_NUMBER = 15;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_;
-    /**
-     * <code>.Vector source_pos = 15;</code>
-     * @return Whether the sourcePos field is set.
-     */
-    @java.lang.Override
-    public boolean hasSourcePos() {
-      return sourcePos_ != null;
-    }
-    /**
-     * <code>.Vector source_pos = 15;</code>
-     * @return The sourcePos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() {
-      return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
-    }
-    /**
-     * <code>.Vector source_pos = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() {
-      return getSourcePos();
-    }
-
-    public static final int QUERY_TYPE_FIELD_NUMBER = 9;
+    public static final int QUERY_TYPE_FIELD_NUMBER = 7;
     private int queryType_;
     /**
-     * <code>.QueryPathReq.OptionType query_type = 9;</code>
+     * <code>.OptionType query_type = 7;</code>
      * @return The enum numeric value on the wire for queryType.
      */
     @java.lang.Override public int getQueryTypeValue() {
       return queryType_;
     }
     /**
-     * <code>.QueryPathReq.OptionType query_type = 9;</code>
+     * <code>.OptionType query_type = 7;</code>
      * @return The queryType.
      */
-    @java.lang.Override public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() {
+    @java.lang.Override public emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType getQueryType() {
       @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_);
-      return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result;
-    }
-
-    public static final int LAOKIPAJIGN_FIELD_NUMBER = 5;
-    private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int lAOKIPAJIGN_;
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     * @return Whether the lAOKIPAJIGN field is set.
-     */
-    @java.lang.Override
-    public boolean hasLAOKIPAJIGN() {
-      return lAOKIPAJIGN_ != null;
-    }
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     * @return The lAOKIPAJIGN.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getLAOKIPAJIGN() {
-      return lAOKIPAJIGN_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : lAOKIPAJIGN_;
-    }
-    /**
-     * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getLAOKIPAJIGNOrBuilder() {
-      return getLAOKIPAJIGN();
-    }
-
-    public static final int DESTINATION_POS_FIELD_NUMBER = 13;
-    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> destinationPos_;
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getDestinationPosList() {
-      return destinationPos_;
-    }
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getDestinationPosOrBuilderList() {
-      return destinationPos_;
-    }
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    @java.lang.Override
-    public int getDestinationPosCount() {
-      return destinationPos_.size();
-    }
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) {
-      return destinationPos_.get(index);
-    }
-    /**
-     * <code>repeated .Vector destination_pos = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
-        int index) {
-      return destinationPos_.get(index);
+      emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType result = emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.valueOf(queryType_);
+      return result == null ? emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -613,26 +487,26 @@ public final class QueryPathReqOuterClass {
       if (queryId_ != 0) {
         output.writeInt32(3, queryId_);
       }
-      if (lAOKIPAJIGN_ != null) {
-        output.writeMessage(5, getLAOKIPAJIGN());
-      }
-      if (aNOOBDOFLPG_ != null) {
-        output.writeMessage(6, getANOOBDOFLPG());
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
-      }
-      if (queryType_ != emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.OPTION_NONE.getNumber()) {
-        output.writeEnum(9, queryType_);
-      }
-      if (filter_ != null) {
-        output.writeMessage(12, getFilter());
-      }
       for (int i = 0; i < destinationPos_.size(); i++) {
-        output.writeMessage(13, destinationPos_.get(i));
+        output.writeMessage(4, destinationPos_.get(i));
+      }
+      if (oDFIFCKDODJ_ != null) {
+        output.writeMessage(5, getODFIFCKDODJ());
+      }
+      if (queryType_ != emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.OPTION_NONE.getNumber()) {
+        output.writeEnum(7, queryType_);
+      }
+      if (dNFDJPHIOBD_ != null) {
+        output.writeMessage(9, getDNFDJPHIOBD());
       }
       if (sourcePos_ != null) {
-        output.writeMessage(15, getSourcePos());
+        output.writeMessage(12, getSourcePos());
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(13, sceneId_);
+      }
+      if (filter_ != null) {
+        output.writeMessage(14, getFilter());
       }
       unknownFields.writeTo(output);
     }
@@ -647,33 +521,33 @@ public final class QueryPathReqOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(3, queryId_);
       }
-      if (lAOKIPAJIGN_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getLAOKIPAJIGN());
-      }
-      if (aNOOBDOFLPG_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getANOOBDOFLPG());
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
-      }
-      if (queryType_ != emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.OPTION_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, queryType_);
-      }
-      if (filter_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getFilter());
-      }
       for (int i = 0; i < destinationPos_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, destinationPos_.get(i));
+          .computeMessageSize(4, destinationPos_.get(i));
+      }
+      if (oDFIFCKDODJ_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(5, getODFIFCKDODJ());
+      }
+      if (queryType_ != emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.OPTION_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(7, queryType_);
+      }
+      if (dNFDJPHIOBD_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, getDNFDJPHIOBD());
       }
       if (sourcePos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getSourcePos());
+          .computeMessageSize(12, getSourcePos());
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, sceneId_);
+      }
+      if (filter_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getFilter());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -690,33 +564,33 @@ public final class QueryPathReqOuterClass {
       }
       emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq other = (emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq) obj;
 
-      if (hasANOOBDOFLPG() != other.hasANOOBDOFLPG()) return false;
-      if (hasANOOBDOFLPG()) {
-        if (!getANOOBDOFLPG()
-            .equals(other.getANOOBDOFLPG())) return false;
-      }
       if (hasFilter() != other.hasFilter()) return false;
       if (hasFilter()) {
         if (!getFilter()
             .equals(other.getFilter())) return false;
       }
-      if (getQueryId()
-          != other.getQueryId()) return false;
-      if (getSceneId()
-          != other.getSceneId()) return false;
+      if (!getDestinationPosList()
+          .equals(other.getDestinationPosList())) return false;
+      if (hasDNFDJPHIOBD() != other.hasDNFDJPHIOBD()) return false;
+      if (hasDNFDJPHIOBD()) {
+        if (!getDNFDJPHIOBD()
+            .equals(other.getDNFDJPHIOBD())) return false;
+      }
+      if (hasODFIFCKDODJ() != other.hasODFIFCKDODJ()) return false;
+      if (hasODFIFCKDODJ()) {
+        if (!getODFIFCKDODJ()
+            .equals(other.getODFIFCKDODJ())) return false;
+      }
       if (hasSourcePos() != other.hasSourcePos()) return false;
       if (hasSourcePos()) {
         if (!getSourcePos()
             .equals(other.getSourcePos())) return false;
       }
+      if (getQueryId()
+          != other.getQueryId()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
       if (queryType_ != other.queryType_) return false;
-      if (hasLAOKIPAJIGN() != other.hasLAOKIPAJIGN()) return false;
-      if (hasLAOKIPAJIGN()) {
-        if (!getLAOKIPAJIGN()
-            .equals(other.getLAOKIPAJIGN())) return false;
-      }
-      if (!getDestinationPosList()
-          .equals(other.getDestinationPosList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -728,32 +602,32 @@ public final class QueryPathReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasANOOBDOFLPG()) {
-        hash = (37 * hash) + ANOOBDOFLPG_FIELD_NUMBER;
-        hash = (53 * hash) + getANOOBDOFLPG().hashCode();
-      }
       if (hasFilter()) {
         hash = (37 * hash) + FILTER_FIELD_NUMBER;
         hash = (53 * hash) + getFilter().hashCode();
       }
-      hash = (37 * hash) + QUERY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQueryId();
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
-      if (hasSourcePos()) {
-        hash = (37 * hash) + SOURCE_POS_FIELD_NUMBER;
-        hash = (53 * hash) + getSourcePos().hashCode();
-      }
-      hash = (37 * hash) + QUERY_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + queryType_;
-      if (hasLAOKIPAJIGN()) {
-        hash = (37 * hash) + LAOKIPAJIGN_FIELD_NUMBER;
-        hash = (53 * hash) + getLAOKIPAJIGN().hashCode();
-      }
       if (getDestinationPosCount() > 0) {
         hash = (37 * hash) + DESTINATION_POS_FIELD_NUMBER;
         hash = (53 * hash) + getDestinationPosList().hashCode();
       }
+      if (hasDNFDJPHIOBD()) {
+        hash = (37 * hash) + DNFDJPHIOBD_FIELD_NUMBER;
+        hash = (53 * hash) + getDNFDJPHIOBD().hashCode();
+      }
+      if (hasODFIFCKDODJ()) {
+        hash = (37 * hash) + ODFIFCKDODJ_FIELD_NUMBER;
+        hash = (53 * hash) + getODFIFCKDODJ().hashCode();
+      }
+      if (hasSourcePos()) {
+        hash = (37 * hash) + SOURCE_POS_FIELD_NUMBER;
+        hash = (53 * hash) + getSourcePos().hashCode();
+      }
+      hash = (37 * hash) + QUERY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQueryId();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + QUERY_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + queryType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -850,11 +724,6 @@ public final class QueryPathReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2359
-     * Obf: GOKDPGJBHEM
-     * </pre>
-     *
      * Protobuf type {@code QueryPathReq}
      */
     public static final class Builder extends
@@ -893,42 +762,42 @@ public final class QueryPathReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (aNOOBDOFLPGBuilder_ == null) {
-          aNOOBDOFLPG_ = null;
-        } else {
-          aNOOBDOFLPG_ = null;
-          aNOOBDOFLPGBuilder_ = null;
-        }
         if (filterBuilder_ == null) {
           filter_ = null;
         } else {
           filter_ = null;
           filterBuilder_ = null;
         }
-        queryId_ = 0;
-
-        sceneId_ = 0;
-
-        if (sourcePosBuilder_ == null) {
-          sourcePos_ = null;
-        } else {
-          sourcePos_ = null;
-          sourcePosBuilder_ = null;
-        }
-        queryType_ = 0;
-
-        if (lAOKIPAJIGNBuilder_ == null) {
-          lAOKIPAJIGN_ = null;
-        } else {
-          lAOKIPAJIGN_ = null;
-          lAOKIPAJIGNBuilder_ = null;
-        }
         if (destinationPosBuilder_ == null) {
           destinationPos_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           destinationPosBuilder_.clear();
         }
+        if (dNFDJPHIOBDBuilder_ == null) {
+          dNFDJPHIOBD_ = null;
+        } else {
+          dNFDJPHIOBD_ = null;
+          dNFDJPHIOBDBuilder_ = null;
+        }
+        if (oDFIFCKDODJBuilder_ == null) {
+          oDFIFCKDODJ_ = null;
+        } else {
+          oDFIFCKDODJ_ = null;
+          oDFIFCKDODJBuilder_ = null;
+        }
+        if (sourcePosBuilder_ == null) {
+          sourcePos_ = null;
+        } else {
+          sourcePos_ = null;
+          sourcePosBuilder_ = null;
+        }
+        queryId_ = 0;
+
+        sceneId_ = 0;
+
+        queryType_ = 0;
+
         return this;
       }
 
@@ -956,29 +825,11 @@ public final class QueryPathReqOuterClass {
       public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq buildPartial() {
         emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq result = new emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq(this);
         int from_bitField0_ = bitField0_;
-        if (aNOOBDOFLPGBuilder_ == null) {
-          result.aNOOBDOFLPG_ = aNOOBDOFLPG_;
-        } else {
-          result.aNOOBDOFLPG_ = aNOOBDOFLPGBuilder_.build();
-        }
         if (filterBuilder_ == null) {
           result.filter_ = filter_;
         } else {
           result.filter_ = filterBuilder_.build();
         }
-        result.queryId_ = queryId_;
-        result.sceneId_ = sceneId_;
-        if (sourcePosBuilder_ == null) {
-          result.sourcePos_ = sourcePos_;
-        } else {
-          result.sourcePos_ = sourcePosBuilder_.build();
-        }
-        result.queryType_ = queryType_;
-        if (lAOKIPAJIGNBuilder_ == null) {
-          result.lAOKIPAJIGN_ = lAOKIPAJIGN_;
-        } else {
-          result.lAOKIPAJIGN_ = lAOKIPAJIGNBuilder_.build();
-        }
         if (destinationPosBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             destinationPos_ = java.util.Collections.unmodifiableList(destinationPos_);
@@ -988,6 +839,24 @@ public final class QueryPathReqOuterClass {
         } else {
           result.destinationPos_ = destinationPosBuilder_.build();
         }
+        if (dNFDJPHIOBDBuilder_ == null) {
+          result.dNFDJPHIOBD_ = dNFDJPHIOBD_;
+        } else {
+          result.dNFDJPHIOBD_ = dNFDJPHIOBDBuilder_.build();
+        }
+        if (oDFIFCKDODJBuilder_ == null) {
+          result.oDFIFCKDODJ_ = oDFIFCKDODJ_;
+        } else {
+          result.oDFIFCKDODJ_ = oDFIFCKDODJBuilder_.build();
+        }
+        if (sourcePosBuilder_ == null) {
+          result.sourcePos_ = sourcePos_;
+        } else {
+          result.sourcePos_ = sourcePosBuilder_.build();
+        }
+        result.queryId_ = queryId_;
+        result.sceneId_ = sceneId_;
+        result.queryType_ = queryType_;
         onBuilt();
         return result;
       }
@@ -1036,27 +905,9 @@ public final class QueryPathReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq other) {
         if (other == emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.getDefaultInstance()) return this;
-        if (other.hasANOOBDOFLPG()) {
-          mergeANOOBDOFLPG(other.getANOOBDOFLPG());
-        }
         if (other.hasFilter()) {
           mergeFilter(other.getFilter());
         }
-        if (other.getQueryId() != 0) {
-          setQueryId(other.getQueryId());
-        }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
-        if (other.hasSourcePos()) {
-          mergeSourcePos(other.getSourcePos());
-        }
-        if (other.queryType_ != 0) {
-          setQueryTypeValue(other.getQueryTypeValue());
-        }
-        if (other.hasLAOKIPAJIGN()) {
-          mergeLAOKIPAJIGN(other.getLAOKIPAJIGN());
-        }
         if (destinationPosBuilder_ == null) {
           if (!other.destinationPos_.isEmpty()) {
             if (destinationPos_.isEmpty()) {
@@ -1083,6 +934,24 @@ public final class QueryPathReqOuterClass {
             }
           }
         }
+        if (other.hasDNFDJPHIOBD()) {
+          mergeDNFDJPHIOBD(other.getDNFDJPHIOBD());
+        }
+        if (other.hasODFIFCKDODJ()) {
+          mergeODFIFCKDODJ(other.getODFIFCKDODJ());
+        }
+        if (other.hasSourcePos()) {
+          mergeSourcePos(other.getSourcePos());
+        }
+        if (other.getQueryId() != 0) {
+          setQueryId(other.getQueryId());
+        }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
+        if (other.queryType_ != 0) {
+          setQueryTypeValue(other.getQueryTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1113,137 +982,18 @@ public final class QueryPathReqOuterClass {
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int aNOOBDOFLPG_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> aNOOBDOFLPGBuilder_;
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       * @return Whether the aNOOBDOFLPG field is set.
-       */
-      public boolean hasANOOBDOFLPG() {
-        return aNOOBDOFLPGBuilder_ != null || aNOOBDOFLPG_ != null;
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       * @return The aNOOBDOFLPG.
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getANOOBDOFLPG() {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          return aNOOBDOFLPG_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNOOBDOFLPG_;
-        } else {
-          return aNOOBDOFLPGBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public Builder setANOOBDOFLPG(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          aNOOBDOFLPG_ = value;
-          onChanged();
-        } else {
-          aNOOBDOFLPGBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public Builder setANOOBDOFLPG(
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          aNOOBDOFLPG_ = builderForValue.build();
-          onChanged();
-        } else {
-          aNOOBDOFLPGBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public Builder mergeANOOBDOFLPG(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          if (aNOOBDOFLPG_ != null) {
-            aNOOBDOFLPG_ =
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(aNOOBDOFLPG_).mergeFrom(value).buildPartial();
-          } else {
-            aNOOBDOFLPG_ = value;
-          }
-          onChanged();
-        } else {
-          aNOOBDOFLPGBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public Builder clearANOOBDOFLPG() {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          aNOOBDOFLPG_ = null;
-          onChanged();
-        } else {
-          aNOOBDOFLPG_ = null;
-          aNOOBDOFLPGBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getANOOBDOFLPGBuilder() {
-        
-        onChanged();
-        return getANOOBDOFLPGFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getANOOBDOFLPGOrBuilder() {
-        if (aNOOBDOFLPGBuilder_ != null) {
-          return aNOOBDOFLPGBuilder_.getMessageOrBuilder();
-        } else {
-          return aNOOBDOFLPG_ == null ?
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : aNOOBDOFLPG_;
-        }
-      }
-      /**
-       * <code>.Vector3Int ANOOBDOFLPG = 6;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> 
-          getANOOBDOFLPGFieldBuilder() {
-        if (aNOOBDOFLPGBuilder_ == null) {
-          aNOOBDOFLPGBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>(
-                  getANOOBDOFLPG(),
-                  getParentForChildren(),
-                  isClean());
-          aNOOBDOFLPG_ = null;
-        }
-        return aNOOBDOFLPGBuilder_;
-      }
-
       private emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter filter_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> filterBuilder_;
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        * @return Whether the filter field is set.
        */
       public boolean hasFilter() {
         return filterBuilder_ != null || filter_ != null;
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        * @return The filter.
        */
       public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter getFilter() {
@@ -1254,7 +1004,7 @@ public final class QueryPathReqOuterClass {
         }
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public Builder setFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) {
         if (filterBuilder_ == null) {
@@ -1270,7 +1020,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public Builder setFilter(
           emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder builderForValue) {
@@ -1284,7 +1034,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public Builder mergeFilter(emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter value) {
         if (filterBuilder_ == null) {
@@ -1302,7 +1052,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public Builder clearFilter() {
         if (filterBuilder_ == null) {
@@ -1316,7 +1066,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder getFilterBuilder() {
         
@@ -1324,7 +1074,7 @@ public final class QueryPathReqOuterClass {
         return getFilterFieldBuilder().getBuilder();
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       public emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder getFilterOrBuilder() {
         if (filterBuilder_ != null) {
@@ -1335,7 +1085,7 @@ public final class QueryPathReqOuterClass {
         }
       }
       /**
-       * <code>.QueryFilter filter = 12;</code>
+       * <code>.QueryFilter filter = 14;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilter.Builder, emu.grasscutter.net.proto.QueryFilterOuterClass.QueryFilterOrBuilder> 
@@ -1351,6 +1101,603 @@ public final class QueryPathReqOuterClass {
         return filterBuilder_;
       }
 
+      private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> destinationPos_ =
+        java.util.Collections.emptyList();
+      private void ensureDestinationPosIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          destinationPos_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>(destinationPos_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> destinationPosBuilder_;
+
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getDestinationPosList() {
+        if (destinationPosBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(destinationPos_);
+        } else {
+          return destinationPosBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public int getDestinationPosCount() {
+        if (destinationPosBuilder_ == null) {
+          return destinationPos_.size();
+        } else {
+          return destinationPosBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) {
+        if (destinationPosBuilder_ == null) {
+          return destinationPos_.get(index);
+        } else {
+          return destinationPosBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder setDestinationPos(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (destinationPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDestinationPosIsMutable();
+          destinationPos_.set(index, value);
+          onChanged();
+        } else {
+          destinationPosBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder setDestinationPos(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (destinationPosBuilder_ == null) {
+          ensureDestinationPosIsMutable();
+          destinationPos_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          destinationPosBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder addDestinationPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (destinationPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDestinationPosIsMutable();
+          destinationPos_.add(value);
+          onChanged();
+        } else {
+          destinationPosBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder addDestinationPos(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (destinationPosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureDestinationPosIsMutable();
+          destinationPos_.add(index, value);
+          onChanged();
+        } else {
+          destinationPosBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder addDestinationPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (destinationPosBuilder_ == null) {
+          ensureDestinationPosIsMutable();
+          destinationPos_.add(builderForValue.build());
+          onChanged();
+        } else {
+          destinationPosBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder addDestinationPos(
+          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (destinationPosBuilder_ == null) {
+          ensureDestinationPosIsMutable();
+          destinationPos_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          destinationPosBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder addAllDestinationPos(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
+        if (destinationPosBuilder_ == null) {
+          ensureDestinationPosIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, destinationPos_);
+          onChanged();
+        } else {
+          destinationPosBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder clearDestinationPos() {
+        if (destinationPosBuilder_ == null) {
+          destinationPos_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          destinationPosBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public Builder removeDestinationPos(int index) {
+        if (destinationPosBuilder_ == null) {
+          ensureDestinationPosIsMutable();
+          destinationPos_.remove(index);
+          onChanged();
+        } else {
+          destinationPosBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDestinationPosBuilder(
+          int index) {
+        return getDestinationPosFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
+          int index) {
+        if (destinationPosBuilder_ == null) {
+          return destinationPos_.get(index);  } else {
+          return destinationPosBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+           getDestinationPosOrBuilderList() {
+        if (destinationPosBuilder_ != null) {
+          return destinationPosBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(destinationPos_);
+        }
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder() {
+        return getDestinationPosFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder(
+          int index) {
+        return getDestinationPosFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .Vector destination_pos = 4;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
+           getDestinationPosBuilderList() {
+        return getDestinationPosFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+          getDestinationPosFieldBuilder() {
+        if (destinationPosBuilder_ == null) {
+          destinationPosBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  destinationPos_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          destinationPos_ = null;
+        }
+        return destinationPosBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int dNFDJPHIOBD_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> dNFDJPHIOBDBuilder_;
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       * @return Whether the dNFDJPHIOBD field is set.
+       */
+      public boolean hasDNFDJPHIOBD() {
+        return dNFDJPHIOBDBuilder_ != null || dNFDJPHIOBD_ != null;
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       * @return The dNFDJPHIOBD.
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getDNFDJPHIOBD() {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          return dNFDJPHIOBD_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_;
+        } else {
+          return dNFDJPHIOBDBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public Builder setDNFDJPHIOBD(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          dNFDJPHIOBD_ = value;
+          onChanged();
+        } else {
+          dNFDJPHIOBDBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public Builder setDNFDJPHIOBD(
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          dNFDJPHIOBD_ = builderForValue.build();
+          onChanged();
+        } else {
+          dNFDJPHIOBDBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public Builder mergeDNFDJPHIOBD(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          if (dNFDJPHIOBD_ != null) {
+            dNFDJPHIOBD_ =
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(dNFDJPHIOBD_).mergeFrom(value).buildPartial();
+          } else {
+            dNFDJPHIOBD_ = value;
+          }
+          onChanged();
+        } else {
+          dNFDJPHIOBDBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public Builder clearDNFDJPHIOBD() {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          dNFDJPHIOBD_ = null;
+          onChanged();
+        } else {
+          dNFDJPHIOBD_ = null;
+          dNFDJPHIOBDBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getDNFDJPHIOBDBuilder() {
+        
+        onChanged();
+        return getDNFDJPHIOBDFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getDNFDJPHIOBDOrBuilder() {
+        if (dNFDJPHIOBDBuilder_ != null) {
+          return dNFDJPHIOBDBuilder_.getMessageOrBuilder();
+        } else {
+          return dNFDJPHIOBD_ == null ?
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : dNFDJPHIOBD_;
+        }
+      }
+      /**
+       * <code>.Vector3Int DNFDJPHIOBD = 9;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> 
+          getDNFDJPHIOBDFieldBuilder() {
+        if (dNFDJPHIOBDBuilder_ == null) {
+          dNFDJPHIOBDBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>(
+                  getDNFDJPHIOBD(),
+                  getParentForChildren(),
+                  isClean());
+          dNFDJPHIOBD_ = null;
+        }
+        return dNFDJPHIOBDBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int oDFIFCKDODJ_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> oDFIFCKDODJBuilder_;
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       * @return Whether the oDFIFCKDODJ field is set.
+       */
+      public boolean hasODFIFCKDODJ() {
+        return oDFIFCKDODJBuilder_ != null || oDFIFCKDODJ_ != null;
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       * @return The oDFIFCKDODJ.
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getODFIFCKDODJ() {
+        if (oDFIFCKDODJBuilder_ == null) {
+          return oDFIFCKDODJ_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_;
+        } else {
+          return oDFIFCKDODJBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public Builder setODFIFCKDODJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
+        if (oDFIFCKDODJBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          oDFIFCKDODJ_ = value;
+          onChanged();
+        } else {
+          oDFIFCKDODJBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public Builder setODFIFCKDODJ(
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) {
+        if (oDFIFCKDODJBuilder_ == null) {
+          oDFIFCKDODJ_ = builderForValue.build();
+          onChanged();
+        } else {
+          oDFIFCKDODJBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public Builder mergeODFIFCKDODJ(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
+        if (oDFIFCKDODJBuilder_ == null) {
+          if (oDFIFCKDODJ_ != null) {
+            oDFIFCKDODJ_ =
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(oDFIFCKDODJ_).mergeFrom(value).buildPartial();
+          } else {
+            oDFIFCKDODJ_ = value;
+          }
+          onChanged();
+        } else {
+          oDFIFCKDODJBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public Builder clearODFIFCKDODJ() {
+        if (oDFIFCKDODJBuilder_ == null) {
+          oDFIFCKDODJ_ = null;
+          onChanged();
+        } else {
+          oDFIFCKDODJ_ = null;
+          oDFIFCKDODJBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getODFIFCKDODJBuilder() {
+        
+        onChanged();
+        return getODFIFCKDODJFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getODFIFCKDODJOrBuilder() {
+        if (oDFIFCKDODJBuilder_ != null) {
+          return oDFIFCKDODJBuilder_.getMessageOrBuilder();
+        } else {
+          return oDFIFCKDODJ_ == null ?
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : oDFIFCKDODJ_;
+        }
+      }
+      /**
+       * <code>.Vector3Int ODFIFCKDODJ = 5;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> 
+          getODFIFCKDODJFieldBuilder() {
+        if (oDFIFCKDODJBuilder_ == null) {
+          oDFIFCKDODJBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>(
+                  getODFIFCKDODJ(),
+                  getParentForChildren(),
+                  isClean());
+          oDFIFCKDODJ_ = null;
+        }
+        return oDFIFCKDODJBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> sourcePosBuilder_;
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       * @return Whether the sourcePos field is set.
+       */
+      public boolean hasSourcePos() {
+        return sourcePosBuilder_ != null || sourcePos_ != null;
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       * @return The sourcePos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() {
+        if (sourcePosBuilder_ == null) {
+          return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
+        } else {
+          return sourcePosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public Builder setSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (sourcePosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          sourcePos_ = value;
+          onChanged();
+        } else {
+          sourcePosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public Builder setSourcePos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (sourcePosBuilder_ == null) {
+          sourcePos_ = builderForValue.build();
+          onChanged();
+        } else {
+          sourcePosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public Builder mergeSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (sourcePosBuilder_ == null) {
+          if (sourcePos_ != null) {
+            sourcePos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(sourcePos_).mergeFrom(value).buildPartial();
+          } else {
+            sourcePos_ = value;
+          }
+          onChanged();
+        } else {
+          sourcePosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public Builder clearSourcePos() {
+        if (sourcePosBuilder_ == null) {
+          sourcePos_ = null;
+          onChanged();
+        } else {
+          sourcePos_ = null;
+          sourcePosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSourcePosBuilder() {
+        
+        onChanged();
+        return getSourcePosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector source_pos = 12;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() {
+        if (sourcePosBuilder_ != null) {
+          return sourcePosBuilder_.getMessageOrBuilder();
+        } else {
+          return sourcePos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
+        }
+      }
+      /**
+       * <code>.Vector source_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> 
+          getSourcePosFieldBuilder() {
+        if (sourcePosBuilder_ == null) {
+          sourcePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getSourcePos(),
+                  getParentForChildren(),
+                  isClean());
+          sourcePos_ = null;
+        }
+        return sourcePosBuilder_;
+      }
+
       private int queryId_ ;
       /**
        * <code>int32 query_id = 3;</code>
@@ -1384,7 +1731,7 @@ public final class QueryPathReqOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 13;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -1392,7 +1739,7 @@ public final class QueryPathReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 13;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -1403,7 +1750,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -1413,135 +1760,16 @@ public final class QueryPathReqOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector sourcePos_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> sourcePosBuilder_;
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       * @return Whether the sourcePos field is set.
-       */
-      public boolean hasSourcePos() {
-        return sourcePosBuilder_ != null || sourcePos_ != null;
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       * @return The sourcePos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getSourcePos() {
-        if (sourcePosBuilder_ == null) {
-          return sourcePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
-        } else {
-          return sourcePosBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public Builder setSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (sourcePosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          sourcePos_ = value;
-          onChanged();
-        } else {
-          sourcePosBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public Builder setSourcePos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (sourcePosBuilder_ == null) {
-          sourcePos_ = builderForValue.build();
-          onChanged();
-        } else {
-          sourcePosBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public Builder mergeSourcePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (sourcePosBuilder_ == null) {
-          if (sourcePos_ != null) {
-            sourcePos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(sourcePos_).mergeFrom(value).buildPartial();
-          } else {
-            sourcePos_ = value;
-          }
-          onChanged();
-        } else {
-          sourcePosBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public Builder clearSourcePos() {
-        if (sourcePosBuilder_ == null) {
-          sourcePos_ = null;
-          onChanged();
-        } else {
-          sourcePos_ = null;
-          sourcePosBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getSourcePosBuilder() {
-        
-        onChanged();
-        return getSourcePosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector source_pos = 15;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getSourcePosOrBuilder() {
-        if (sourcePosBuilder_ != null) {
-          return sourcePosBuilder_.getMessageOrBuilder();
-        } else {
-          return sourcePos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : sourcePos_;
-        }
-      }
-      /**
-       * <code>.Vector source_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> 
-          getSourcePosFieldBuilder() {
-        if (sourcePosBuilder_ == null) {
-          sourcePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getSourcePos(),
-                  getParentForChildren(),
-                  isClean());
-          sourcePos_ = null;
-        }
-        return sourcePosBuilder_;
-      }
-
       private int queryType_ = 0;
       /**
-       * <code>.QueryPathReq.OptionType query_type = 9;</code>
+       * <code>.OptionType query_type = 7;</code>
        * @return The enum numeric value on the wire for queryType.
        */
       @java.lang.Override public int getQueryTypeValue() {
         return queryType_;
       }
       /**
-       * <code>.QueryPathReq.OptionType query_type = 9;</code>
+       * <code>.OptionType query_type = 7;</code>
        * @param value The enum numeric value on the wire for queryType to set.
        * @return This builder for chaining.
        */
@@ -1552,21 +1780,21 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryPathReq.OptionType query_type = 9;</code>
+       * <code>.OptionType query_type = 7;</code>
        * @return The queryType.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType getQueryType() {
+      public emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType getQueryType() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType result = emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.valueOf(queryType_);
-        return result == null ? emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType result = emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.valueOf(queryType_);
+        return result == null ? emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.QueryPathReq.OptionType query_type = 9;</code>
+       * <code>.OptionType query_type = 7;</code>
        * @param value The queryType to set.
        * @return This builder for chaining.
        */
-      public Builder setQueryType(emu.grasscutter.net.proto.QueryPathReqOuterClass.QueryPathReq.OptionType value) {
+      public Builder setQueryType(emu.grasscutter.net.proto.OptionTypeOuterClass.OptionType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1576,7 +1804,7 @@ public final class QueryPathReqOuterClass {
         return this;
       }
       /**
-       * <code>.QueryPathReq.OptionType query_type = 9;</code>
+       * <code>.OptionType query_type = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearQueryType() {
@@ -1585,365 +1813,6 @@ public final class QueryPathReqOuterClass {
         onChanged();
         return this;
       }
-
-      private emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int lAOKIPAJIGN_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> lAOKIPAJIGNBuilder_;
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       * @return Whether the lAOKIPAJIGN field is set.
-       */
-      public boolean hasLAOKIPAJIGN() {
-        return lAOKIPAJIGNBuilder_ != null || lAOKIPAJIGN_ != null;
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       * @return The lAOKIPAJIGN.
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int getLAOKIPAJIGN() {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          return lAOKIPAJIGN_ == null ? emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : lAOKIPAJIGN_;
-        } else {
-          return lAOKIPAJIGNBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public Builder setLAOKIPAJIGN(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          lAOKIPAJIGN_ = value;
-          onChanged();
-        } else {
-          lAOKIPAJIGNBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public Builder setLAOKIPAJIGN(
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder builderForValue) {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          lAOKIPAJIGN_ = builderForValue.build();
-          onChanged();
-        } else {
-          lAOKIPAJIGNBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public Builder mergeLAOKIPAJIGN(emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int value) {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          if (lAOKIPAJIGN_ != null) {
-            lAOKIPAJIGN_ =
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.newBuilder(lAOKIPAJIGN_).mergeFrom(value).buildPartial();
-          } else {
-            lAOKIPAJIGN_ = value;
-          }
-          onChanged();
-        } else {
-          lAOKIPAJIGNBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public Builder clearLAOKIPAJIGN() {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          lAOKIPAJIGN_ = null;
-          onChanged();
-        } else {
-          lAOKIPAJIGN_ = null;
-          lAOKIPAJIGNBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder getLAOKIPAJIGNBuilder() {
-        
-        onChanged();
-        return getLAOKIPAJIGNFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      public emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder getLAOKIPAJIGNOrBuilder() {
-        if (lAOKIPAJIGNBuilder_ != null) {
-          return lAOKIPAJIGNBuilder_.getMessageOrBuilder();
-        } else {
-          return lAOKIPAJIGN_ == null ?
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.getDefaultInstance() : lAOKIPAJIGN_;
-        }
-      }
-      /**
-       * <code>.Vector3Int LAOKIPAJIGN = 5;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder> 
-          getLAOKIPAJIGNFieldBuilder() {
-        if (lAOKIPAJIGNBuilder_ == null) {
-          lAOKIPAJIGNBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3Int.Builder, emu.grasscutter.net.proto.Vector3IntOuterClass.Vector3IntOrBuilder>(
-                  getLAOKIPAJIGN(),
-                  getParentForChildren(),
-                  isClean());
-          lAOKIPAJIGN_ = null;
-        }
-        return lAOKIPAJIGNBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> destinationPos_ =
-        java.util.Collections.emptyList();
-      private void ensureDestinationPosIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          destinationPos_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>(destinationPos_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> destinationPosBuilder_;
-
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getDestinationPosList() {
-        if (destinationPosBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(destinationPos_);
-        } else {
-          return destinationPosBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public int getDestinationPosCount() {
-        if (destinationPosBuilder_ == null) {
-          return destinationPos_.size();
-        } else {
-          return destinationPosBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getDestinationPos(int index) {
-        if (destinationPosBuilder_ == null) {
-          return destinationPos_.get(index);
-        } else {
-          return destinationPosBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder setDestinationPos(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (destinationPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDestinationPosIsMutable();
-          destinationPos_.set(index, value);
-          onChanged();
-        } else {
-          destinationPosBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder setDestinationPos(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (destinationPosBuilder_ == null) {
-          ensureDestinationPosIsMutable();
-          destinationPos_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          destinationPosBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder addDestinationPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (destinationPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDestinationPosIsMutable();
-          destinationPos_.add(value);
-          onChanged();
-        } else {
-          destinationPosBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder addDestinationPos(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (destinationPosBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureDestinationPosIsMutable();
-          destinationPos_.add(index, value);
-          onChanged();
-        } else {
-          destinationPosBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder addDestinationPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (destinationPosBuilder_ == null) {
-          ensureDestinationPosIsMutable();
-          destinationPos_.add(builderForValue.build());
-          onChanged();
-        } else {
-          destinationPosBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder addDestinationPos(
-          int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (destinationPosBuilder_ == null) {
-          ensureDestinationPosIsMutable();
-          destinationPos_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          destinationPosBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder addAllDestinationPos(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
-        if (destinationPosBuilder_ == null) {
-          ensureDestinationPosIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, destinationPos_);
-          onChanged();
-        } else {
-          destinationPosBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder clearDestinationPos() {
-        if (destinationPosBuilder_ == null) {
-          destinationPos_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          destinationPosBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public Builder removeDestinationPos(int index) {
-        if (destinationPosBuilder_ == null) {
-          ensureDestinationPosIsMutable();
-          destinationPos_.remove(index);
-          onChanged();
-        } else {
-          destinationPosBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getDestinationPosBuilder(
-          int index) {
-        return getDestinationPosFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getDestinationPosOrBuilder(
-          int index) {
-        if (destinationPosBuilder_ == null) {
-          return destinationPos_.get(index);  } else {
-          return destinationPosBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-           getDestinationPosOrBuilderList() {
-        if (destinationPosBuilder_ != null) {
-          return destinationPosBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(destinationPos_);
-        }
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder() {
-        return getDestinationPosFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addDestinationPosBuilder(
-          int index) {
-        return getDestinationPosFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .Vector destination_pos = 13;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
-           getDestinationPosBuilderList() {
-        return getDestinationPosFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getDestinationPosFieldBuilder() {
-        if (destinationPosBuilder_ == null) {
-          destinationPosBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  destinationPos_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          destinationPos_ = null;
-        }
-        return destinationPosBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -2011,35 +1880,35 @@ public final class QueryPathReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022QueryPathReq.proto\032\020Vector3Int.proto\032\021" +
-      "QueryFilter.proto\032\014Vector.proto\"\314\002\n\014Quer" +
-      "yPathReq\022 \n\013ANOOBDOFLPG\030\006 \001(\0132\013.Vector3I" +
-      "nt\022\034\n\006filter\030\014 \001(\0132\014.QueryFilter\022\020\n\010quer" +
-      "y_id\030\003 \001(\005\022\020\n\010scene_id\030\007 \001(\r\022\033\n\nsource_p" +
-      "os\030\017 \001(\0132\007.Vector\022,\n\nquery_type\030\t \001(\0162\030." +
-      "QueryPathReq.OptionType\022 \n\013LAOKIPAJIGN\030\005" +
-      " \001(\0132\013.Vector3Int\022 \n\017destination_pos\030\r \003" +
-      "(\0132\007.Vector\"I\n\nOptionType\022\017\n\013OPTION_NONE" +
-      "\020\000\022\021\n\rOPTION_NORMAL\020\001\022\027\n\023OPTION_FIRST_CA" +
-      "N_GO\020\002B\033\n\031emu.grasscutter.net.protob\006pro" +
-      "to3"
+      "\n\022QueryPathReq.proto\032\021QueryFilter.proto\032" +
+      "\014Vector.proto\032\020Vector3Int.proto\032\020OptionT" +
+      "ype.proto\"\364\001\n\014QueryPathReq\022\034\n\006filter\030\016 \001" +
+      "(\0132\014.QueryFilter\022 \n\017destination_pos\030\004 \003(" +
+      "\0132\007.Vector\022 \n\013DNFDJPHIOBD\030\t \001(\0132\013.Vector" +
+      "3Int\022 \n\013ODFIFCKDODJ\030\005 \001(\0132\013.Vector3Int\022\033" +
+      "\n\nsource_pos\030\014 \001(\0132\007.Vector\022\020\n\010query_id\030" +
+      "\003 \001(\005\022\020\n\010scene_id\030\r \001(\r\022\037\n\nquery_type\030\007 " +
+      "\001(\0162\013.OptionTypeB\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.QueryFilterOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.OptionTypeOuterClass.getDescriptor(),
         });
     internal_static_QueryPathReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_QueryPathReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryPathReq_descriptor,
-        new java.lang.String[] { "ANOOBDOFLPG", "Filter", "QueryId", "SceneId", "SourcePos", "QueryType", "LAOKIPAJIGN", "DestinationPos", });
-    emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor();
+        new java.lang.String[] { "Filter", "DestinationPos", "DNFDJPHIOBD", "ODFIFCKDODJ", "SourcePos", "QueryId", "SceneId", "QueryType", });
     emu.grasscutter.net.proto.QueryFilterOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.Vector3IntOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.OptionTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
index 8d0c101ca..fc9cb6880 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryPathRspOuterClass.java
@@ -19,66 +19,53 @@ public final class QueryPathRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 query_id = 6;</code>
+     * <code>.PathStatusType query_status = 8;</code>
+     * @return The enum numeric value on the wire for queryStatus.
+     */
+    int getQueryStatusValue();
+    /**
+     * <code>.PathStatusType query_status = 8;</code>
+     * @return The queryStatus.
+     */
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus();
+
+    /**
+     * <code>int32 query_id = 9;</code>
      * @return The queryId.
      */
     int getQueryId();
 
     /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
-        getCornersList();
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index);
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    int getCornersCount();
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getCornersOrBuilderList();
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
-        int index);
-
-    /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
-     * <code>.PathStatusType query_status = 15;</code>
-     * @return The enum numeric value on the wire for queryStatus.
+     * <code>repeated .Vector corners = 15;</code>
      */
-    int getQueryStatusValue();
+    java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
+        getCornersList();
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
-     * <code>.PathStatusType query_status = 15;</code>
-     * @return The queryStatus.
+     * <code>repeated .Vector corners = 15;</code>
      */
-    emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus();
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index);
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    int getCornersCount();
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getCornersOrBuilderList();
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * CmdId: 2319
-   * Obf: EDKMFDJCIHL
-   * </pre>
-   *
    * Protobuf type {@code QueryPathRsp}
    */
   public static final class QueryPathRsp extends
@@ -91,8 +78,8 @@ public final class QueryPathRspOuterClass {
       super(builder);
     }
     private QueryPathRsp() {
-      corners_ = java.util.Collections.emptyList();
       queryStatus_ = 0;
+      corners_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -126,7 +113,23 @@ public final class QueryPathRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 64: {
+              int rawValue = input.readEnum();
+
+              queryStatus_ = rawValue;
+              break;
+            }
+            case 72: {
+
+              queryId_ = input.readInt32();
+              break;
+            }
+            case 88: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 corners_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>();
                 mutable_bitField0_ |= 0x00000001;
@@ -135,22 +138,6 @@ public final class QueryPathRspOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry));
               break;
             }
-            case 48: {
-
-              queryId_ = input.readInt32();
-              break;
-            }
-            case 64: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 120: {
-              int rawValue = input.readEnum();
-
-              queryStatus_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -186,10 +173,29 @@ public final class QueryPathRspOuterClass {
               emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.class, emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.Builder.class);
     }
 
-    public static final int QUERY_ID_FIELD_NUMBER = 6;
+    public static final int QUERY_STATUS_FIELD_NUMBER = 8;
+    private int queryStatus_;
+    /**
+     * <code>.PathStatusType query_status = 8;</code>
+     * @return The enum numeric value on the wire for queryStatus.
+     */
+    @java.lang.Override public int getQueryStatusValue() {
+      return queryStatus_;
+    }
+    /**
+     * <code>.PathStatusType query_status = 8;</code>
+     * @return The queryStatus.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+      return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
+    }
+
+    public static final int QUERY_ID_FIELD_NUMBER = 9;
     private int queryId_;
     /**
-     * <code>int32 query_id = 6;</code>
+     * <code>int32 query_id = 9;</code>
      * @return The queryId.
      */
     @java.lang.Override
@@ -197,50 +203,10 @@ public final class QueryPathRspOuterClass {
       return queryId_;
     }
 
-    public static final int CORNERS_FIELD_NUMBER = 1;
-    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_;
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
-      return corners_;
-    }
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getCornersOrBuilderList() {
-      return corners_;
-    }
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    @java.lang.Override
-    public int getCornersCount() {
-      return corners_.size();
-    }
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
-      return corners_.get(index);
-    }
-    /**
-     * <code>repeated .Vector corners = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
-        int index) {
-      return corners_.get(index);
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -248,31 +214,44 @@ public final class QueryPathRspOuterClass {
       return retcode_;
     }
 
-    public static final int QUERY_STATUS_FIELD_NUMBER = 15;
-    private int queryStatus_;
+    public static final int CORNERS_FIELD_NUMBER = 15;
+    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_;
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
-     * <code>.PathStatusType query_status = 15;</code>
-     * @return The enum numeric value on the wire for queryStatus.
+     * <code>repeated .Vector corners = 15;</code>
      */
-    @java.lang.Override public int getQueryStatusValue() {
-      return queryStatus_;
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
+      return corners_;
     }
     /**
-     * <pre>
-     * Obf: LFJGAFPHNNE
-     * </pre>
-     *
-     * <code>.PathStatusType query_status = 15;</code>
-     * @return The queryStatus.
+     * <code>repeated .Vector corners = 15;</code>
      */
-    @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
-      return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getCornersOrBuilderList() {
+      return corners_;
+    }
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    @java.lang.Override
+    public int getCornersCount() {
+      return corners_.size();
+    }
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
+      return corners_.get(index);
+    }
+    /**
+     * <code>repeated .Vector corners = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
+        int index) {
+      return corners_.get(index);
     }
 
     private byte memoizedIsInitialized = -1;
@@ -289,17 +268,17 @@ public final class QueryPathRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < corners_.size(); i++) {
-        output.writeMessage(1, corners_.get(i));
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
+        output.writeEnum(8, queryStatus_);
       }
       if (queryId_ != 0) {
-        output.writeInt32(6, queryId_);
+        output.writeInt32(9, queryId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+        output.writeInt32(11, retcode_);
       }
-      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
-        output.writeEnum(15, queryStatus_);
+      for (int i = 0; i < corners_.size(); i++) {
+        output.writeMessage(15, corners_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -310,21 +289,21 @@ public final class QueryPathRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < corners_.size(); i++) {
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, corners_.get(i));
+          .computeEnumSize(8, queryStatus_);
       }
       if (queryId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, queryId_);
+          .computeInt32Size(9, queryId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeInt32Size(11, retcode_);
       }
-      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
+      for (int i = 0; i < corners_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, queryStatus_);
+          .computeMessageSize(15, corners_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -341,13 +320,13 @@ public final class QueryPathRspOuterClass {
       }
       emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp other = (emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp) obj;
 
+      if (queryStatus_ != other.queryStatus_) return false;
       if (getQueryId()
           != other.getQueryId()) return false;
-      if (!getCornersList()
-          .equals(other.getCornersList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (queryStatus_ != other.queryStatus_) return false;
+      if (!getCornersList()
+          .equals(other.getCornersList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -359,16 +338,16 @@ public final class QueryPathRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + queryStatus_;
       hash = (37 * hash) + QUERY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getQueryId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getCornersCount() > 0) {
         hash = (37 * hash) + CORNERS_FIELD_NUMBER;
         hash = (53 * hash) + getCornersList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + queryStatus_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -465,11 +444,6 @@ public final class QueryPathRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2319
-     * Obf: EDKMFDJCIHL
-     * </pre>
-     *
      * Protobuf type {@code QueryPathRsp}
      */
     public static final class Builder extends
@@ -508,18 +482,18 @@ public final class QueryPathRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        queryStatus_ = 0;
+
         queryId_ = 0;
 
+        retcode_ = 0;
+
         if (cornersBuilder_ == null) {
           corners_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           cornersBuilder_.clear();
         }
-        retcode_ = 0;
-
-        queryStatus_ = 0;
-
         return this;
       }
 
@@ -547,7 +521,9 @@ public final class QueryPathRspOuterClass {
       public emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp buildPartial() {
         emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp result = new emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp(this);
         int from_bitField0_ = bitField0_;
+        result.queryStatus_ = queryStatus_;
         result.queryId_ = queryId_;
+        result.retcode_ = retcode_;
         if (cornersBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             corners_ = java.util.Collections.unmodifiableList(corners_);
@@ -557,8 +533,6 @@ public final class QueryPathRspOuterClass {
         } else {
           result.corners_ = cornersBuilder_.build();
         }
-        result.retcode_ = retcode_;
-        result.queryStatus_ = queryStatus_;
         onBuilt();
         return result;
       }
@@ -607,9 +581,15 @@ public final class QueryPathRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp other) {
         if (other == emu.grasscutter.net.proto.QueryPathRspOuterClass.QueryPathRsp.getDefaultInstance()) return this;
+        if (other.queryStatus_ != 0) {
+          setQueryStatusValue(other.getQueryStatusValue());
+        }
         if (other.getQueryId() != 0) {
           setQueryId(other.getQueryId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (cornersBuilder_ == null) {
           if (!other.corners_.isEmpty()) {
             if (corners_.isEmpty()) {
@@ -636,12 +616,6 @@ public final class QueryPathRspOuterClass {
             }
           }
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.queryStatus_ != 0) {
-          setQueryStatusValue(other.getQueryStatusValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -672,9 +646,63 @@ public final class QueryPathRspOuterClass {
       }
       private int bitField0_;
 
+      private int queryStatus_ = 0;
+      /**
+       * <code>.PathStatusType query_status = 8;</code>
+       * @return The enum numeric value on the wire for queryStatus.
+       */
+      @java.lang.Override public int getQueryStatusValue() {
+        return queryStatus_;
+      }
+      /**
+       * <code>.PathStatusType query_status = 8;</code>
+       * @param value The enum numeric value on the wire for queryStatus to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQueryStatusValue(int value) {
+        
+        queryStatus_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.PathStatusType query_status = 8;</code>
+       * @return The queryStatus.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+        return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.PathStatusType query_status = 8;</code>
+       * @param value The queryStatus to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        queryStatus_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.PathStatusType query_status = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQueryStatus() {
+        
+        queryStatus_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int queryId_ ;
       /**
-       * <code>int32 query_id = 6;</code>
+       * <code>int32 query_id = 9;</code>
        * @return The queryId.
        */
       @java.lang.Override
@@ -682,7 +710,7 @@ public final class QueryPathRspOuterClass {
         return queryId_;
       }
       /**
-       * <code>int32 query_id = 6;</code>
+       * <code>int32 query_id = 9;</code>
        * @param value The queryId to set.
        * @return This builder for chaining.
        */
@@ -693,7 +721,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 query_id = 6;</code>
+       * <code>int32 query_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearQueryId() {
@@ -703,6 +731,37 @@ public final class QueryPathRspOuterClass {
         return this;
       }
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_ =
         java.util.Collections.emptyList();
       private void ensureCornersIsMutable() {
@@ -716,7 +775,7 @@ public final class QueryPathRspOuterClass {
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> cornersBuilder_;
 
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
         if (cornersBuilder_ == null) {
@@ -726,7 +785,7 @@ public final class QueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public int getCornersCount() {
         if (cornersBuilder_ == null) {
@@ -736,7 +795,7 @@ public final class QueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
         if (cornersBuilder_ == null) {
@@ -746,7 +805,7 @@ public final class QueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder setCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -763,7 +822,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder setCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -777,7 +836,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder addCorners(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (cornersBuilder_ == null) {
@@ -793,7 +852,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder addCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -810,7 +869,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder addCorners(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -824,7 +883,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder addCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -838,7 +897,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder addAllCorners(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
@@ -853,7 +912,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder clearCorners() {
         if (cornersBuilder_ == null) {
@@ -866,7 +925,7 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public Builder removeCorners(int index) {
         if (cornersBuilder_ == null) {
@@ -879,14 +938,14 @@ public final class QueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getCornersBuilder(
           int index) {
         return getCornersFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
           int index) {
@@ -896,7 +955,7 @@ public final class QueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
            getCornersOrBuilderList() {
@@ -907,14 +966,14 @@ public final class QueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder() {
         return getCornersFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder(
           int index) {
@@ -922,7 +981,7 @@ public final class QueryPathRspOuterClass {
             index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
       }
       /**
-       * <code>repeated .Vector corners = 1;</code>
+       * <code>repeated .Vector corners = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
            getCornersBuilderList() {
@@ -942,111 +1001,6 @@ public final class QueryPathRspOuterClass {
         }
         return cornersBuilder_;
       }
-
-      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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int queryStatus_ = 0;
-      /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
-       * <code>.PathStatusType query_status = 15;</code>
-       * @return The enum numeric value on the wire for queryStatus.
-       */
-      @java.lang.Override public int getQueryStatusValue() {
-        return queryStatus_;
-      }
-      /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
-       * <code>.PathStatusType query_status = 15;</code>
-       * @param value The enum numeric value on the wire for queryStatus to set.
-       * @return This builder for chaining.
-       */
-      public Builder setQueryStatusValue(int value) {
-        
-        queryStatus_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
-       * <code>.PathStatusType query_status = 15;</code>
-       * @return The queryStatus.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
-        return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
-      }
-      /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
-       * <code>.PathStatusType query_status = 15;</code>
-       * @param value The queryStatus to set.
-       * @return This builder for chaining.
-       */
-      public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        queryStatus_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * Obf: LFJGAFPHNNE
-       * </pre>
-       *
-       * <code>.PathStatusType query_status = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearQueryStatus() {
-        
-        queryStatus_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1114,27 +1068,27 @@ public final class QueryPathRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\022QueryPathRsp.proto\032\024PathStatusType.pro" +
-      "to\032\014Vector.proto\"r\n\014QueryPathRsp\022\020\n\010quer" +
-      "y_id\030\006 \001(\005\022\030\n\007corners\030\001 \003(\0132\007.Vector\022\017\n\007" +
-      "retcode\030\010 \001(\005\022%\n\014query_status\030\017 \001(\0162\017.Pa" +
-      "thStatusTypeB\033\n\031emu.grasscutter.net.prot" +
+      "\n\022QueryPathRsp.proto\032\014Vector.proto\032\024Path" +
+      "StatusType.proto\"r\n\014QueryPathRsp\022%\n\014quer" +
+      "y_status\030\010 \001(\0162\017.PathStatusType\022\020\n\010query" +
+      "_id\030\t \001(\005\022\017\n\007retcode\030\013 \001(\005\022\030\n\007corners\030\017 " +
+      "\003(\0132\007.VectorB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(),
         });
     internal_static_QueryPathRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_QueryPathRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QueryPathRsp_descriptor,
-        new java.lang.String[] { "QueryId", "Corners", "Retcode", "QueryStatus", });
-    emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "QueryStatus", "QueryId", "Retcode", "Corners", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/QueryRegionListHttpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QueryRegionListHttpRspOuterClass.java
index ce878ee59..e18c3b5eb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QueryRegionListHttpRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QueryRegionListHttpRspOuterClass.java
@@ -67,10 +67,6 @@ public final class QueryRegionListHttpRspOuterClass {
     boolean getEnableLoginPc();
   }
   /**
-   * <pre>
-   * Obf: BFDHIPNAGPP
-   * </pre>
-   *
    * Protobuf type {@code QueryRegionListHttpRsp}
    */
   public static final class QueryRegionListHttpRsp extends
@@ -470,10 +466,6 @@ public final class QueryRegionListHttpRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BFDHIPNAGPP
-     * </pre>
-     *
      * Protobuf type {@code QueryRegionListHttpRsp}
      */
     public static final class Builder extends
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 f1dd9e1b6..5f9187060 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcReqOuterClass.java
@@ -19,23 +19,18 @@ public final class QuestDestroyNpcReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 npc_id = 14;</code>
+     * <code>uint32 npc_id = 4;</code>
      * @return The npcId.
      */
     int getNpcId();
 
     /**
-     * <code>uint32 parent_quest_id = 15;</code>
+     * <code>uint32 parent_quest_id = 12;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
   }
   /**
-   * <pre>
-   * CmdId: 26568
-   * Obf: GLNOOFDFGEC
-   * </pre>
-   *
    * Protobuf type {@code QuestDestroyNpcReq}
    */
   public static final class QuestDestroyNpcReq extends
@@ -80,12 +75,12 @@ public final class QuestDestroyNpcReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 32: {
 
               npcId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 96: {
 
               parentQuestId_ = input.readUInt32();
               break;
@@ -122,10 +117,10 @@ public final class QuestDestroyNpcReqOuterClass {
               emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq.class, emu.grasscutter.net.proto.QuestDestroyNpcReqOuterClass.QuestDestroyNpcReq.Builder.class);
     }
 
-    public static final int NPC_ID_FIELD_NUMBER = 14;
+    public static final int NPC_ID_FIELD_NUMBER = 4;
     private int npcId_;
     /**
-     * <code>uint32 npc_id = 14;</code>
+     * <code>uint32 npc_id = 4;</code>
      * @return The npcId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class QuestDestroyNpcReqOuterClass {
       return npcId_;
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 15;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 12;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 15;</code>
+     * <code>uint32 parent_quest_id = 12;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -159,10 +154,10 @@ public final class QuestDestroyNpcReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (npcId_ != 0) {
-        output.writeUInt32(14, npcId_);
+        output.writeUInt32(4, npcId_);
       }
       if (parentQuestId_ != 0) {
-        output.writeUInt32(15, parentQuestId_);
+        output.writeUInt32(12, parentQuestId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class QuestDestroyNpcReqOuterClass {
       size = 0;
       if (npcId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, npcId_);
+          .computeUInt32Size(4, npcId_);
       }
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, parentQuestId_);
+          .computeUInt32Size(12, parentQuestId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class QuestDestroyNpcReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26568
-     * Obf: GLNOOFDFGEC
-     * </pre>
-     *
      * Protobuf type {@code QuestDestroyNpcReq}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class QuestDestroyNpcReqOuterClass {
 
       private int npcId_ ;
       /**
-       * <code>uint32 npc_id = 14;</code>
+       * <code>uint32 npc_id = 4;</code>
        * @return The npcId.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class QuestDestroyNpcReqOuterClass {
         return npcId_;
       }
       /**
-       * <code>uint32 npc_id = 14;</code>
+       * <code>uint32 npc_id = 4;</code>
        * @param value The npcId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class QuestDestroyNpcReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 npc_id = 14;</code>
+       * <code>uint32 npc_id = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearNpcId() {
@@ -501,7 +491,7 @@ public final class QuestDestroyNpcReqOuterClass {
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 15;</code>
+       * <code>uint32 parent_quest_id = 12;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class QuestDestroyNpcReqOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 15;</code>
+       * <code>uint32 parent_quest_id = 12;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class QuestDestroyNpcReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 15;</code>
+       * <code>uint32 parent_quest_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -597,8 +587,8 @@ public final class QuestDestroyNpcReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030QuestDestroyNpcReq.proto\"=\n\022QuestDestr" +
-      "oyNpcReq\022\016\n\006npc_id\030\016 \001(\r\022\027\n\017parent_quest" +
-      "_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "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" +
       "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 21ee60e2f..dc9471807 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestDestroyNpcRspOuterClass.java
@@ -19,29 +19,24 @@ public final class QuestDestroyNpcRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 13;</code>
+     * <code>uint32 parent_quest_id = 1;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>uint32 npc_id = 4;</code>
-     * @return The npcId.
-     */
-    int getNpcId();
-
-    /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 npc_id = 8;</code>
+     * @return The npcId.
+     */
+    int getNpcId();
   }
   /**
-   * <pre>
-   * CmdId: 607
-   * Obf: PCNAEIAPMGE
-   * </pre>
-   *
    * Protobuf type {@code QuestDestroyNpcRsp}
    */
   public static final class QuestDestroyNpcRsp extends
@@ -86,19 +81,19 @@ public final class QuestDestroyNpcRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
-              npcId_ = input.readUInt32();
+              parentQuestId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 32: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 104: {
+            case 64: {
 
-              parentQuestId_ = input.readUInt32();
+              npcId_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,10 +128,10 @@ public final class QuestDestroyNpcRspOuterClass {
               emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.class, emu.grasscutter.net.proto.QuestDestroyNpcRspOuterClass.QuestDestroyNpcRsp.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 13;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 1;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 13;</code>
+     * <code>uint32 parent_quest_id = 1;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -144,21 +139,10 @@ public final class QuestDestroyNpcRspOuterClass {
       return parentQuestId_;
     }
 
-    public static final int NPC_ID_FIELD_NUMBER = 4;
-    private int npcId_;
-    /**
-     * <code>uint32 npc_id = 4;</code>
-     * @return The npcId.
-     */
-    @java.lang.Override
-    public int getNpcId() {
-      return npcId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 4;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 4;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class QuestDestroyNpcRspOuterClass {
       return retcode_;
     }
 
+    public static final int NPC_ID_FIELD_NUMBER = 8;
+    private int npcId_;
+    /**
+     * <code>uint32 npc_id = 8;</code>
+     * @return The npcId.
+     */
+    @java.lang.Override
+    public int getNpcId() {
+      return npcId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class QuestDestroyNpcRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (npcId_ != 0) {
-        output.writeUInt32(4, npcId_);
+      if (parentQuestId_ != 0) {
+        output.writeUInt32(1, parentQuestId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(4, retcode_);
       }
-      if (parentQuestId_ != 0) {
-        output.writeUInt32(13, parentQuestId_);
+      if (npcId_ != 0) {
+        output.writeUInt32(8, npcId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class QuestDestroyNpcRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (npcId_ != 0) {
+      if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, npcId_);
+          .computeUInt32Size(1, parentQuestId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(4, retcode_);
       }
-      if (parentQuestId_ != 0) {
+      if (npcId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, parentQuestId_);
+          .computeUInt32Size(8, npcId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +222,10 @@ public final class QuestDestroyNpcRspOuterClass {
 
       if (getParentQuestId()
           != other.getParentQuestId()) return false;
-      if (getNpcId()
-          != other.getNpcId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getNpcId()
+          != other.getNpcId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +239,10 @@ public final class QuestDestroyNpcRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + PARENT_QUEST_ID_FIELD_NUMBER;
       hash = (53 * hash) + getParentQuestId();
-      hash = (37 * hash) + NPC_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNpcId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + NPC_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getNpcId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class QuestDestroyNpcRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 607
-     * Obf: PCNAEIAPMGE
-     * </pre>
-     *
      * Protobuf type {@code QuestDestroyNpcRsp}
      */
     public static final class Builder extends
@@ -388,10 +378,10 @@ public final class QuestDestroyNpcRspOuterClass {
         super.clear();
         parentQuestId_ = 0;
 
-        npcId_ = 0;
-
         retcode_ = 0;
 
+        npcId_ = 0;
+
         return this;
       }
 
@@ -419,8 +409,8 @@ public final class QuestDestroyNpcRspOuterClass {
       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.npcId_ = npcId_;
         result.retcode_ = retcode_;
+        result.npcId_ = npcId_;
         onBuilt();
         return result;
       }
@@ -472,12 +462,12 @@ public final class QuestDestroyNpcRspOuterClass {
         if (other.getParentQuestId() != 0) {
           setParentQuestId(other.getParentQuestId());
         }
-        if (other.getNpcId() != 0) {
-          setNpcId(other.getNpcId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getNpcId() != 0) {
+          setNpcId(other.getNpcId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +499,7 @@ public final class QuestDestroyNpcRspOuterClass {
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 13;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 13;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 13;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -538,40 +528,9 @@ public final class QuestDestroyNpcRspOuterClass {
         return this;
       }
 
-      private int npcId_ ;
-      /**
-       * <code>uint32 npc_id = 4;</code>
-       * @return The npcId.
-       */
-      @java.lang.Override
-      public int getNpcId() {
-        return npcId_;
-      }
-      /**
-       * <code>uint32 npc_id = 4;</code>
-       * @param value The npcId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNpcId(int value) {
-        
-        npcId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 npc_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNpcId() {
-        
-        npcId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 4;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 4;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class QuestDestroyNpcRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -599,6 +558,37 @@ public final class QuestDestroyNpcRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int npcId_ ;
+      /**
+       * <code>uint32 npc_id = 8;</code>
+       * @return The npcId.
+       */
+      @java.lang.Override
+      public int getNpcId() {
+        return npcId_;
+      }
+      /**
+       * <code>uint32 npc_id = 8;</code>
+       * @param value The npcId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNpcId(int value) {
+        
+        npcId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 npc_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNpcId() {
+        
+        npcId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class QuestDestroyNpcRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030QuestDestroyNpcRsp.proto\"N\n\022QuestDestr" +
-      "oyNpcRsp\022\027\n\017parent_quest_id\030\r \001(\r\022\016\n\006npc" +
-      "_id\030\004 \001(\r\022\017\n\007retcode\030\t \001(\005B\033\n\031emu.grassc" +
+      "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" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class QuestDestroyNpcRspOuterClass {
     internal_static_QuestDestroyNpcRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestDestroyNpcRsp_descriptor,
-        new java.lang.String[] { "ParentQuestId", "NpcId", "Retcode", });
+        new java.lang.String[] { "ParentQuestId", "Retcode", "NpcId", });
   }
 
   // @@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 0f8503191..a93592000 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestListNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class QuestListNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> 
         getQuestListList();
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index);
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     int getQuestListCount();
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
         getQuestListOrBuilderList();
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 29451
-   * Obf: LNKCGCNLKDP
-   * </pre>
-   *
    * Protobuf type {@code QuestListNotify}
    */
   public static final class QuestListNotify extends
@@ -94,7 +89,7 @@ public final class QuestListNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 106: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questList_ = new java.util.ArrayList<emu.grasscutter.net.proto.QuestOuterClass.Quest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class QuestListNotifyOuterClass {
               emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify.class, emu.grasscutter.net.proto.QuestListNotifyOuterClass.QuestListNotify.Builder.class);
     }
 
-    public static final int QUEST_LIST_FIELD_NUMBER = 13;
+    public static final int QUEST_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> questList_;
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
@@ -156,21 +151,21 @@ public final class QuestListNotifyOuterClass {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     @java.lang.Override
     public int getQuestListCount() {
       return questList_.size();
     }
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
       return questList_.get(index);
     }
     /**
-     * <code>repeated .Quest quest_list = 13;</code>
+     * <code>repeated .Quest quest_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
@@ -193,7 +188,7 @@ public final class QuestListNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < questList_.size(); i++) {
-        output.writeMessage(13, questList_.get(i));
+        output.writeMessage(15, questList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class QuestListNotifyOuterClass {
       size = 0;
       for (int i = 0; i < questList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, questList_.get(i));
+          .computeMessageSize(15, questList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class QuestListNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29451
-     * Obf: LNKCGCNLKDP
-     * </pre>
-     *
      * Protobuf type {@code QuestListNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class QuestListNotifyOuterClass {
           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 = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
         if (questListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class QuestListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public int getQuestListCount() {
         if (questListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class QuestListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class QuestListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -585,7 +575,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
         if (questListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -632,7 +622,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder addQuestList(
           emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder addAllQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.QuestOuterClass.Quest> values) {
@@ -675,7 +665,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder clearQuestList() {
         if (questListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public Builder removeQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class QuestListNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder getQuestListBuilder(
           int index) {
         return getQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class QuestListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
            getQuestListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class QuestListNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</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 = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class QuestListNotifyOuterClass {
             index, emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 13;</code>
+       * <code>repeated .Quest quest_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder> 
            getQuestListBuilderList() {
@@ -832,7 +822,7 @@ public final class QuestListNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025QuestListNotify.proto\032\013Quest.proto\"-\n\017" +
-      "QuestListNotify\022\032\n\nquest_list\030\r \003(\0132\006.Qu" +
+      "QuestListNotify\022\032\n\nquest_list\030\017 \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 fde2fd950..b334cc2c3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestListUpdateNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class QuestListUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> 
         getQuestListList();
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index);
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     int getQuestListCount();
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
         getQuestListOrBuilderList();
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 22114
-   * Obf: NCEKGFIOHJG
-   * </pre>
-   *
    * Protobuf type {@code QuestListUpdateNotify}
    */
   public static final class QuestListUpdateNotify extends
@@ -94,7 +89,7 @@ public final class QuestListUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questList_ = new java.util.ArrayList<emu.grasscutter.net.proto.QuestOuterClass.Quest>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class QuestListUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify.class, emu.grasscutter.net.proto.QuestListUpdateNotifyOuterClass.QuestListUpdateNotify.Builder.class);
     }
 
-    public static final int QUEST_LIST_FIELD_NUMBER = 1;
+    public static final int QUEST_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> questList_;
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
@@ -156,21 +151,21 @@ public final class QuestListUpdateNotifyOuterClass {
       return questList_;
     }
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     @java.lang.Override
     public int getQuestListCount() {
       return questList_.size();
     }
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
       return questList_.get(index);
     }
     /**
-     * <code>repeated .Quest quest_list = 1;</code>
+     * <code>repeated .Quest quest_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
@@ -193,7 +188,7 @@ public final class QuestListUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < questList_.size(); i++) {
-        output.writeMessage(1, questList_.get(i));
+        output.writeMessage(3, questList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class QuestListUpdateNotifyOuterClass {
       size = 0;
       for (int i = 0; i < questList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, questList_.get(i));
+          .computeMessageSize(3, questList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class QuestListUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22114
-     * Obf: NCEKGFIOHJG
-     * </pre>
-     *
      * Protobuf type {@code QuestListUpdateNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class QuestListUpdateNotifyOuterClass {
           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 = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest> getQuestListList() {
         if (questListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class QuestListUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public int getQuestListCount() {
         if (questListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class QuestListUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest getQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class QuestListUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -585,7 +575,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder setQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder addQuestList(emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
         if (questListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest value) {
@@ -632,7 +622,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder addQuestList(
           emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder addQuestList(
           int index, emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder addAllQuestList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.QuestOuterClass.Quest> values) {
@@ -675,7 +665,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder clearQuestList() {
         if (questListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public Builder removeQuestList(int index) {
         if (questListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class QuestListUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder getQuestListBuilder(
           int index) {
         return getQuestListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder getQuestListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class QuestListUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.QuestOuterClass.QuestOrBuilder> 
            getQuestListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class QuestListUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</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 = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder addQuestListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class QuestListUpdateNotifyOuterClass {
             index, emu.grasscutter.net.proto.QuestOuterClass.Quest.getDefaultInstance());
       }
       /**
-       * <code>repeated .Quest quest_list = 1;</code>
+       * <code>repeated .Quest quest_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.QuestOuterClass.Quest.Builder> 
            getQuestListBuilderList() {
@@ -833,7 +823,7 @@ public final class QuestListUpdateNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033QuestListUpdateNotify.proto\032\013Quest.pro" +
       "to\"3\n\025QuestListUpdateNotify\022\032\n\nquest_lis" +
-      "t\030\001 \003(\0132\006.QuestB\033\n\031emu.grasscutter.net.p" +
+      "t\030\003 \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/QuestOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/QuestOuterClass.java
index ec1f1793c..692d818f1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestOuterClass.java
@@ -67,146 +67,72 @@ public final class QuestOuterClass {
     int getAcceptTime();
 
     /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @return A list containing the lackedNpcList.
-     */
-    java.util.List<java.lang.Integer> getLackedNpcListList();
-    /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @return The count of lackedNpcList.
-     */
-    int getLackedNpcListCount();
-    /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The lackedNpcList at the given index.
-     */
-    int getLackedNpcList(int index);
-
-    /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @return A list containing the finishProgressList.
      */
     java.util.List<java.lang.Integer> getFinishProgressListList();
     /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @return The count of finishProgressList.
      */
     int getFinishProgressListCount();
     /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @param index The index of the element to return.
      * @return The finishProgressList at the given index.
      */
     int getFinishProgressList(int index);
 
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @return A list containing the failProgressList.
      */
     java.util.List<java.lang.Integer> getFailProgressListList();
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @return The count of failProgressList.
      */
     int getFailProgressListCount();
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @param index The index of the element to return.
      * @return The failProgressList at the given index.
      */
     int getFailProgressList(int index);
 
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+     * @return A list containing the mLHFBAFCKIP.
      */
-    int getLackedNpcMapCount();
+    java.util.List<java.lang.Integer> getMLHFBAFCKIPList();
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+     * @return The count of mLHFBAFCKIP.
      */
-    boolean containsLackedNpcMap(
-        int key);
+    int getMLHFBAFCKIPCount();
     /**
-     * Use {@link #getLackedNpcMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedNpcMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedNpcMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-
-    int getLackedNpcMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-
-    int getLackedNpcMapOrThrow(
-        int key);
-
-    /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
-     * @return A list containing the lackedPlaceList.
-     */
-    java.util.List<java.lang.Integer> getLackedPlaceListList();
-    /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
-     * @return The count of lackedPlaceList.
-     */
-    int getLackedPlaceListCount();
-    /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
      * @param index The index of the element to return.
-     * @return The lackedPlaceList at the given index.
+     * @return The mLHFBAFCKIP at the given index.
      */
-    int getLackedPlaceList(int index);
+    int getMLHFBAFCKIP(int index);
 
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+     * @return Whether the lackingResourcesInfo field is set.
      */
-    int getLackedPlaceMapCount();
+    boolean hasLackingResourcesInfo();
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+     * @return The lackingResourcesInfo.
      */
-    boolean containsLackedPlaceMap(
-        int key);
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo();
     /**
-     * Use {@link #getLackedPlaceMapMap()} instead.
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
      */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedPlaceMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getLackedPlaceMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-     */
-
-    int getLackedPlaceMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-     */
-
-    int getLackedPlaceMapOrThrow(
-        int key);
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: BLFINGECHDB
-   * </pre>
-   *
    * Protobuf type {@code Quest}
    */
   public static final class Quest extends
@@ -219,10 +145,9 @@ public final class QuestOuterClass {
       super(builder);
     }
     private Quest() {
-      lackedNpcList_ = emptyIntList();
       finishProgressList_ = emptyIntList();
       failProgressList_ = emptyIntList();
-      lackedPlaceList_ = emptyIntList();
+      mLHFBAFCKIP_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -298,60 +223,39 @@ public final class QuestOuterClass {
             }
             case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                lackedNpcList_ = newIntList();
+                finishProgressList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              lackedNpcList_.addInt(input.readUInt32());
+              finishProgressList_.addInt(input.readUInt32());
               break;
             }
             case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                lackedNpcList_ = newIntList();
+                finishProgressList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              while (input.getBytesUntilLimit() > 0) {
-                lackedNpcList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 88: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                finishProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              finishProgressList_.addInt(input.readUInt32());
-              break;
-            }
-            case 90: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                finishProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
               while (input.getBytesUntilLimit() > 0) {
                 finishProgressList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 96: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               failProgressList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 failProgressList_.addInt(input.readUInt32());
@@ -359,51 +263,38 @@ public final class QuestOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                lackedNpcMap_ = com.google.protobuf.MapField.newMapField(
-                    LackedNpcMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000008;
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                mLHFBAFCKIP_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              lackedNpcMap__ = input.readMessage(
-                  LackedNpcMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              lackedNpcMap_.getMutableMap().put(
-                  lackedNpcMap__.getKey(), lackedNpcMap__.getValue());
+              mLHFBAFCKIP_.addInt(input.readUInt32());
               break;
             }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000010) != 0)) {
-                lackedPlaceList_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
-              }
-              lackedPlaceList_.addInt(input.readUInt32());
-              break;
-            }
-            case 114: {
+            case 98: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000010) != 0) && input.getBytesUntilLimit() > 0) {
-                lackedPlaceList_ = newIntList();
-                mutable_bitField0_ |= 0x00000010;
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                mLHFBAFCKIP_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                lackedPlaceList_.addInt(input.readUInt32());
+                mLHFBAFCKIP_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000020) != 0)) {
-                lackedPlaceMap_ = com.google.protobuf.MapField.newMapField(
-                    LackedPlaceMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000020;
+            case 106: {
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder subBuilder = null;
+              if (lackingResourcesInfo_ != null) {
+                subBuilder = lackingResourcesInfo_.toBuilder();
               }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              lackedPlaceMap__ = input.readMessage(
-                  LackedPlaceMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              lackedPlaceMap_.getMutableMap().put(
-                  lackedPlaceMap__.getKey(), lackedPlaceMap__.getValue());
+              lackingResourcesInfo_ = input.readMessage(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(lackingResourcesInfo_);
+                lackingResourcesInfo_ = subBuilder.buildPartial();
+              }
+
               break;
             }
             default: {
@@ -422,16 +313,13 @@ public final class QuestOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           finishProgressList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           failProgressList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000010) != 0)) {
-          lackedPlaceList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          mLHFBAFCKIP_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -442,20 +330,6 @@ public final class QuestOuterClass {
       return emu.grasscutter.net.proto.QuestOuterClass.internal_static_Quest_descriptor;
     }
 
-    @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
-      switch (number) {
-        case 13:
-          return internalGetLackedNpcMap();
-        case 15:
-          return internalGetLackedPlaceMap();
-        default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
-      }
-    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -552,38 +426,10 @@ public final class QuestOuterClass {
       return acceptTime_;
     }
 
-    public static final int LACKED_NPC_LIST_FIELD_NUMBER = 10;
-    private com.google.protobuf.Internal.IntList lackedNpcList_;
-    /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @return A list containing the lackedNpcList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getLackedNpcListList() {
-      return lackedNpcList_;
-    }
-    /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @return The count of lackedNpcList.
-     */
-    public int getLackedNpcListCount() {
-      return lackedNpcList_.size();
-    }
-    /**
-     * <code>repeated uint32 lacked_npc_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The lackedNpcList at the given index.
-     */
-    public int getLackedNpcList(int index) {
-      return lackedNpcList_.getInt(index);
-    }
-    private int lackedNpcListMemoizedSerializedSize = -1;
-
-    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 11;
+    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList finishProgressList_;
     /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @return A list containing the finishProgressList.
      */
     @java.lang.Override
@@ -592,14 +438,14 @@ public final class QuestOuterClass {
       return finishProgressList_;
     }
     /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @return The count of finishProgressList.
      */
     public int getFinishProgressListCount() {
       return finishProgressList_.size();
     }
     /**
-     * <code>repeated uint32 finish_progress_list = 11;</code>
+     * <code>repeated uint32 finish_progress_list = 10;</code>
      * @param index The index of the element to return.
      * @return The finishProgressList at the given index.
      */
@@ -608,10 +454,10 @@ public final class QuestOuterClass {
     }
     private int finishProgressListMemoizedSerializedSize = -1;
 
-    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 12;
+    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList failProgressList_;
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @return A list containing the failProgressList.
      */
     @java.lang.Override
@@ -620,14 +466,14 @@ public final class QuestOuterClass {
       return failProgressList_;
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @return The count of failProgressList.
      */
     public int getFailProgressListCount() {
       return failProgressList_.size();
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * <code>repeated uint32 fail_progress_list = 11;</code>
      * @param index The index of the element to return.
      * @return The failProgressList at the given index.
      */
@@ -636,194 +482,58 @@ public final class QuestOuterClass {
     }
     private int failProgressListMemoizedSerializedSize = -1;
 
-    public static final int LACKED_NPC_MAP_FIELD_NUMBER = 13;
-    private static final class LackedNpcMapDefaultEntryHolder {
-      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.QuestOuterClass.internal_static_Quest_LackedNpcMapEntry_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> lackedNpcMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetLackedNpcMap() {
-      if (lackedNpcMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            LackedNpcMapDefaultEntryHolder.defaultEntry);
-      }
-      return lackedNpcMap_;
-    }
-
-    public int getLackedNpcMapCount() {
-      return internalGetLackedNpcMap().getMap().size();
-    }
+    public static final int MLHFBAFCKIP_FIELD_NUMBER = 12;
+    private com.google.protobuf.Internal.IntList mLHFBAFCKIP_;
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsLackedNpcMap(
-        int key) {
-      
-      return internalGetLackedNpcMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getLackedNpcMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMap() {
-      return getLackedNpcMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMapMap() {
-      return internalGetLackedNpcMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedNpcMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedNpcMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedNpcMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedNpcMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int LACKED_PLACE_LIST_FIELD_NUMBER = 14;
-    private com.google.protobuf.Internal.IntList lackedPlaceList_;
-    /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
-     * @return A list containing the lackedPlaceList.
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+     * @return A list containing the mLHFBAFCKIP.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getLackedPlaceListList() {
-      return lackedPlaceList_;
+        getMLHFBAFCKIPList() {
+      return mLHFBAFCKIP_;
     }
     /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
-     * @return The count of lackedPlaceList.
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+     * @return The count of mLHFBAFCKIP.
      */
-    public int getLackedPlaceListCount() {
-      return lackedPlaceList_.size();
+    public int getMLHFBAFCKIPCount() {
+      return mLHFBAFCKIP_.size();
     }
     /**
-     * <code>repeated uint32 lacked_place_list = 14;</code>
+     * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
      * @param index The index of the element to return.
-     * @return The lackedPlaceList at the given index.
+     * @return The mLHFBAFCKIP at the given index.
      */
-    public int getLackedPlaceList(int index) {
-      return lackedPlaceList_.getInt(index);
+    public int getMLHFBAFCKIP(int index) {
+      return mLHFBAFCKIP_.getInt(index);
     }
-    private int lackedPlaceListMemoizedSerializedSize = -1;
+    private int mLHFBAFCKIPMemoizedSerializedSize = -1;
 
-    public static final int LACKED_PLACE_MAP_FIELD_NUMBER = 15;
-    private static final class LackedPlaceMapDefaultEntryHolder {
-      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.QuestOuterClass.internal_static_Quest_LackedPlaceMapEntry_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> lackedPlaceMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetLackedPlaceMap() {
-      if (lackedPlaceMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            LackedPlaceMapDefaultEntryHolder.defaultEntry);
-      }
-      return lackedPlaceMap_;
-    }
-
-    public int getLackedPlaceMapCount() {
-      return internalGetLackedPlaceMap().getMap().size();
-    }
+    public static final int LACKING_RESOURCES_INFO_FIELD_NUMBER = 13;
+    private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_;
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsLackedPlaceMap(
-        int key) {
-      
-      return internalGetLackedPlaceMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getLackedPlaceMapMap()} instead.
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+     * @return Whether the lackingResourcesInfo field is set.
      */
     @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMap() {
-      return getLackedPlaceMapMap();
+    public boolean hasLackingResourcesInfo() {
+      return lackingResourcesInfo_ != null;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+     * @return The lackingResourcesInfo.
      */
     @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMapMap() {
-      return internalGetLackedPlaceMap().getMap();
+    public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() {
+      return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
+     * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
      */
     @java.lang.Override
-
-    public int getLackedPlaceMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedPlaceMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-     */
-    @java.lang.Override
-
-    public int getLackedPlaceMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetLackedPlaceMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
+    public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() {
+      return getLackingResourcesInfo();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -865,46 +575,30 @@ public final class QuestOuterClass {
       if (acceptTime_ != 0) {
         output.writeUInt32(9, acceptTime_);
       }
-      if (getLackedNpcListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(lackedNpcListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < lackedNpcList_.size(); i++) {
-        output.writeUInt32NoTag(lackedNpcList_.getInt(i));
-      }
       if (getFinishProgressListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(finishProgressListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishProgressList_.size(); i++) {
         output.writeUInt32NoTag(finishProgressList_.getInt(i));
       }
       if (getFailProgressListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(failProgressListMemoizedSerializedSize);
       }
       for (int i = 0; i < failProgressList_.size(); i++) {
         output.writeUInt32NoTag(failProgressList_.getInt(i));
       }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetLackedNpcMap(),
-          LackedNpcMapDefaultEntryHolder.defaultEntry,
-          13);
-      if (getLackedPlaceListList().size() > 0) {
-        output.writeUInt32NoTag(114);
-        output.writeUInt32NoTag(lackedPlaceListMemoizedSerializedSize);
+      if (getMLHFBAFCKIPList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(mLHFBAFCKIPMemoizedSerializedSize);
       }
-      for (int i = 0; i < lackedPlaceList_.size(); i++) {
-        output.writeUInt32NoTag(lackedPlaceList_.getInt(i));
+      for (int i = 0; i < mLHFBAFCKIP_.size(); i++) {
+        output.writeUInt32NoTag(mLHFBAFCKIP_.getInt(i));
+      }
+      if (lackingResourcesInfo_ != null) {
+        output.writeMessage(13, getLackingResourcesInfo());
       }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetLackedPlaceMap(),
-          LackedPlaceMapDefaultEntryHolder.defaultEntry,
-          15);
       unknownFields.writeTo(output);
     }
 
@@ -946,20 +640,6 @@ public final class QuestOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, acceptTime_);
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < lackedNpcList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lackedNpcList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getLackedNpcListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        lackedNpcListMemoizedSerializedSize = dataSize;
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < finishProgressList_.size(); i++) {
@@ -988,39 +668,23 @@ public final class QuestOuterClass {
         }
         failProgressListMemoizedSerializedSize = dataSize;
       }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetLackedNpcMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        lackedNpcMap__ = LackedNpcMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, lackedNpcMap__);
-      }
       {
         int dataSize = 0;
-        for (int i = 0; i < lackedPlaceList_.size(); i++) {
+        for (int i = 0; i < mLHFBAFCKIP_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(lackedPlaceList_.getInt(i));
+            .computeUInt32SizeNoTag(mLHFBAFCKIP_.getInt(i));
         }
         size += dataSize;
-        if (!getLackedPlaceListList().isEmpty()) {
+        if (!getMLHFBAFCKIPList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        lackedPlaceListMemoizedSerializedSize = dataSize;
+        mLHFBAFCKIPMemoizedSerializedSize = dataSize;
       }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetLackedPlaceMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        lackedPlaceMap__ = LackedPlaceMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
+      if (lackingResourcesInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(15, lackedPlaceMap__);
+          .computeMessageSize(13, getLackingResourcesInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1053,18 +717,17 @@ public final class QuestOuterClass {
           != other.getStartGameTime()) return false;
       if (getAcceptTime()
           != other.getAcceptTime()) return false;
-      if (!getLackedNpcListList()
-          .equals(other.getLackedNpcListList())) return false;
       if (!getFinishProgressListList()
           .equals(other.getFinishProgressListList())) return false;
       if (!getFailProgressListList()
           .equals(other.getFailProgressListList())) return false;
-      if (!internalGetLackedNpcMap().equals(
-          other.internalGetLackedNpcMap())) return false;
-      if (!getLackedPlaceListList()
-          .equals(other.getLackedPlaceListList())) return false;
-      if (!internalGetLackedPlaceMap().equals(
-          other.internalGetLackedPlaceMap())) return false;
+      if (!getMLHFBAFCKIPList()
+          .equals(other.getMLHFBAFCKIPList())) return false;
+      if (hasLackingResourcesInfo() != other.hasLackingResourcesInfo()) return false;
+      if (hasLackingResourcesInfo()) {
+        if (!getLackingResourcesInfo()
+            .equals(other.getLackingResourcesInfo())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1093,10 +756,6 @@ public final class QuestOuterClass {
       hash = (53 * hash) + getStartGameTime();
       hash = (37 * hash) + ACCEPT_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getAcceptTime();
-      if (getLackedNpcListCount() > 0) {
-        hash = (37 * hash) + LACKED_NPC_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLackedNpcListList().hashCode();
-      }
       if (getFinishProgressListCount() > 0) {
         hash = (37 * hash) + FINISH_PROGRESS_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFinishProgressListList().hashCode();
@@ -1105,17 +764,13 @@ public final class QuestOuterClass {
         hash = (37 * hash) + FAIL_PROGRESS_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFailProgressListList().hashCode();
       }
-      if (!internalGetLackedNpcMap().getMap().isEmpty()) {
-        hash = (37 * hash) + LACKED_NPC_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetLackedNpcMap().hashCode();
+      if (getMLHFBAFCKIPCount() > 0) {
+        hash = (37 * hash) + MLHFBAFCKIP_FIELD_NUMBER;
+        hash = (53 * hash) + getMLHFBAFCKIPList().hashCode();
       }
-      if (getLackedPlaceListCount() > 0) {
-        hash = (37 * hash) + LACKED_PLACE_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getLackedPlaceListList().hashCode();
-      }
-      if (!internalGetLackedPlaceMap().getMap().isEmpty()) {
-        hash = (37 * hash) + LACKED_PLACE_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetLackedPlaceMap().hashCode();
+      if (hasLackingResourcesInfo()) {
+        hash = (37 * hash) + LACKING_RESOURCES_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getLackingResourcesInfo().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -1213,10 +868,6 @@ public final class QuestOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BLFINGECHDB
-     * </pre>
-     *
      * Protobuf type {@code Quest}
      */
     public static final class Builder extends
@@ -1228,32 +879,6 @@ public final class QuestOuterClass {
         return emu.grasscutter.net.proto.QuestOuterClass.internal_static_Quest_descriptor;
       }
 
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMapField(
-          int number) {
-        switch (number) {
-          case 13:
-            return internalGetLackedNpcMap();
-          case 15:
-            return internalGetLackedPlaceMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMutableMapField(
-          int number) {
-        switch (number) {
-          case 13:
-            return internalGetMutableLackedNpcMap();
-          case 15:
-            return internalGetMutableLackedPlaceMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
@@ -1296,16 +921,18 @@ public final class QuestOuterClass {
 
         acceptTime_ = 0;
 
-        lackedNpcList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         finishProgressList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         failProgressList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        mLHFBAFCKIP_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        internalGetMutableLackedNpcMap().clear();
-        lackedPlaceList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        internalGetMutableLackedPlaceMap().clear();
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = null;
+        } else {
+          lackingResourcesInfo_ = null;
+          lackingResourcesInfoBuilder_ = null;
+        }
         return this;
       }
 
@@ -1342,29 +969,25 @@ public final class QuestOuterClass {
         result.startGameTime_ = startGameTime_;
         result.acceptTime_ = acceptTime_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_.makeImmutable();
+          finishProgressList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.lackedNpcList_ = lackedNpcList_;
+        result.finishProgressList_ = finishProgressList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          finishProgressList_.makeImmutable();
+          failProgressList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.finishProgressList_ = finishProgressList_;
+        result.failProgressList_ = failProgressList_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          failProgressList_.makeImmutable();
+          mLHFBAFCKIP_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.failProgressList_ = failProgressList_;
-        result.lackedNpcMap_ = internalGetLackedNpcMap();
-        result.lackedNpcMap_.makeImmutable();
-        if (((bitField0_ & 0x00000010) != 0)) {
-          lackedPlaceList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000010);
+        result.mLHFBAFCKIP_ = mLHFBAFCKIP_;
+        if (lackingResourcesInfoBuilder_ == null) {
+          result.lackingResourcesInfo_ = lackingResourcesInfo_;
+        } else {
+          result.lackingResourcesInfo_ = lackingResourcesInfoBuilder_.build();
         }
-        result.lackedPlaceList_ = lackedPlaceList_;
-        result.lackedPlaceMap_ = internalGetLackedPlaceMap();
-        result.lackedPlaceMap_.makeImmutable();
         onBuilt();
         return result;
       }
@@ -1437,20 +1060,10 @@ public final class QuestOuterClass {
         if (other.getAcceptTime() != 0) {
           setAcceptTime(other.getAcceptTime());
         }
-        if (!other.lackedNpcList_.isEmpty()) {
-          if (lackedNpcList_.isEmpty()) {
-            lackedNpcList_ = other.lackedNpcList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureLackedNpcListIsMutable();
-            lackedNpcList_.addAll(other.lackedNpcList_);
-          }
-          onChanged();
-        }
         if (!other.finishProgressList_.isEmpty()) {
           if (finishProgressList_.isEmpty()) {
             finishProgressList_ = other.finishProgressList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           } else {
             ensureFinishProgressListIsMutable();
             finishProgressList_.addAll(other.finishProgressList_);
@@ -1460,27 +1073,26 @@ public final class QuestOuterClass {
         if (!other.failProgressList_.isEmpty()) {
           if (failProgressList_.isEmpty()) {
             failProgressList_ = other.failProgressList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureFailProgressListIsMutable();
             failProgressList_.addAll(other.failProgressList_);
           }
           onChanged();
         }
-        internalGetMutableLackedNpcMap().mergeFrom(
-            other.internalGetLackedNpcMap());
-        if (!other.lackedPlaceList_.isEmpty()) {
-          if (lackedPlaceList_.isEmpty()) {
-            lackedPlaceList_ = other.lackedPlaceList_;
-            bitField0_ = (bitField0_ & ~0x00000010);
+        if (!other.mLHFBAFCKIP_.isEmpty()) {
+          if (mLHFBAFCKIP_.isEmpty()) {
+            mLHFBAFCKIP_ = other.mLHFBAFCKIP_;
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
-            ensureLackedPlaceListIsMutable();
-            lackedPlaceList_.addAll(other.lackedPlaceList_);
+            ensureMLHFBAFCKIPIsMutable();
+            mLHFBAFCKIP_.addAll(other.mLHFBAFCKIP_);
           }
           onChanged();
         }
-        internalGetMutableLackedPlaceMap().mergeFrom(
-            other.internalGetLackedPlaceMap());
+        if (other.hasLackingResourcesInfo()) {
+          mergeLackingResourcesInfo(other.getLackingResourcesInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1759,110 +1371,31 @@ public final class QuestOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList lackedNpcList_ = emptyIntList();
-      private void ensureLackedNpcListIsMutable() {
+      private com.google.protobuf.Internal.IntList finishProgressList_ = emptyIntList();
+      private void ensureFinishProgressListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          lackedNpcList_ = mutableCopy(lackedNpcList_);
+          finishProgressList_ = mutableCopy(finishProgressList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @return A list containing the lackedNpcList.
-       */
-      public java.util.List<java.lang.Integer>
-          getLackedNpcListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(lackedNpcList_) : lackedNpcList_;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @return The count of lackedNpcList.
-       */
-      public int getLackedNpcListCount() {
-        return lackedNpcList_.size();
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @param index The index of the element to return.
-       * @return The lackedNpcList at the given index.
-       */
-      public int getLackedNpcList(int index) {
-        return lackedNpcList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @param index The index to set the value at.
-       * @param value The lackedNpcList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLackedNpcList(
-          int index, int value) {
-        ensureLackedNpcListIsMutable();
-        lackedNpcList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @param value The lackedNpcList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addLackedNpcList(int value) {
-        ensureLackedNpcListIsMutable();
-        lackedNpcList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @param values The lackedNpcList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLackedNpcList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLackedNpcListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lackedNpcList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_npc_list = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLackedNpcList() {
-        lackedNpcList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList finishProgressList_ = emptyIntList();
-      private void ensureFinishProgressListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          finishProgressList_ = mutableCopy(finishProgressList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @return A list containing the finishProgressList.
        */
       public java.util.List<java.lang.Integer>
           getFinishProgressListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(finishProgressList_) : finishProgressList_;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @return The count of finishProgressList.
        */
       public int getFinishProgressListCount() {
         return finishProgressList_.size();
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @param index The index of the element to return.
        * @return The finishProgressList at the given index.
        */
@@ -1870,7 +1403,7 @@ public final class QuestOuterClass {
         return finishProgressList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The finishProgressList to set.
        * @return This builder for chaining.
@@ -1883,7 +1416,7 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @param value The finishProgressList to add.
        * @return This builder for chaining.
        */
@@ -1894,7 +1427,7 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @param values The finishProgressList to add.
        * @return This builder for chaining.
        */
@@ -1907,41 +1440,41 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 11;</code>
+       * <code>repeated uint32 finish_progress_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishProgressList() {
         finishProgressList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000001);
         onChanged();
         return this;
       }
 
       private com.google.protobuf.Internal.IntList failProgressList_ = emptyIntList();
       private void ensureFailProgressListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           failProgressList_ = mutableCopy(failProgressList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @return A list containing the failProgressList.
        */
       public java.util.List<java.lang.Integer>
           getFailProgressListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000002) != 0) ?
                  java.util.Collections.unmodifiableList(failProgressList_) : failProgressList_;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @return The count of failProgressList.
        */
       public int getFailProgressListCount() {
         return failProgressList_.size();
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @param index The index of the element to return.
        * @return The failProgressList at the given index.
        */
@@ -1949,7 +1482,7 @@ public final class QuestOuterClass {
         return failProgressList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The failProgressList to set.
        * @return This builder for chaining.
@@ -1962,7 +1495,7 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @param value The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -1973,7 +1506,7 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @param values The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -1986,349 +1519,212 @@ public final class QuestOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 12;</code>
+       * <code>repeated uint32 fail_progress_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearFailProgressList() {
         failProgressList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList mLHFBAFCKIP_ = emptyIntList();
+      private void ensureMLHFBAFCKIPIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          mLHFBAFCKIP_ = mutableCopy(mLHFBAFCKIP_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @return A list containing the mLHFBAFCKIP.
+       */
+      public java.util.List<java.lang.Integer>
+          getMLHFBAFCKIPList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(mLHFBAFCKIP_) : mLHFBAFCKIP_;
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @return The count of mLHFBAFCKIP.
+       */
+      public int getMLHFBAFCKIPCount() {
+        return mLHFBAFCKIP_.size();
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @param index The index of the element to return.
+       * @return The mLHFBAFCKIP at the given index.
+       */
+      public int getMLHFBAFCKIP(int index) {
+        return mLHFBAFCKIP_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @param index The index to set the value at.
+       * @param value The mLHFBAFCKIP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMLHFBAFCKIP(
+          int index, int value) {
+        ensureMLHFBAFCKIPIsMutable();
+        mLHFBAFCKIP_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @param value The mLHFBAFCKIP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addMLHFBAFCKIP(int value) {
+        ensureMLHFBAFCKIPIsMutable();
+        mLHFBAFCKIP_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @param values The mLHFBAFCKIP to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllMLHFBAFCKIP(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMLHFBAFCKIPIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, mLHFBAFCKIP_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 MLHFBAFCKIP = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMLHFBAFCKIP() {
+        mLHFBAFCKIP_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> lackedNpcMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetLackedNpcMap() {
-        if (lackedNpcMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              LackedNpcMapDefaultEntryHolder.defaultEntry);
+      private emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo lackingResourcesInfo_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> lackingResourcesInfoBuilder_;
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+       * @return Whether the lackingResourcesInfo field is set.
+       */
+      public boolean hasLackingResourcesInfo() {
+        return lackingResourcesInfoBuilder_ != null || lackingResourcesInfo_ != null;
+      }
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+       * @return The lackingResourcesInfo.
+       */
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo getLackingResourcesInfo() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          return lackingResourcesInfo_ == null ? emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
+        } else {
+          return lackingResourcesInfoBuilder_.getMessage();
         }
-        return lackedNpcMap_;
       }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableLackedNpcMap() {
-        onChanged();;
-        if (lackedNpcMap_ == null) {
-          lackedNpcMap_ = com.google.protobuf.MapField.newMapField(
-              LackedNpcMapDefaultEntryHolder.defaultEntry);
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+       */
+      public Builder setLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          lackingResourcesInfo_ = value;
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.setMessage(value);
         }
-        if (!lackedNpcMap_.isMutable()) {
-          lackedNpcMap_ = lackedNpcMap_.copy();
-        }
-        return lackedNpcMap_;
-      }
 
-      public int getLackedNpcMapCount() {
-        return internalGetLackedNpcMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsLackedNpcMap(
-          int key) {
-        
-        return internalGetLackedNpcMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getLackedNpcMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMap() {
-        return getLackedNpcMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedNpcMapMap() {
-        return internalGetLackedNpcMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedNpcMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedNpcMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedNpcMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedNpcMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearLackedNpcMap() {
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .clear();
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
        */
+      public Builder setLackingResourcesInfo(
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder builderForValue) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.setMessage(builderForValue.build());
+        }
 
-      public Builder removeLackedNpcMap(
-          int key) {
-        
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .remove(key);
         return this;
       }
       /**
-       * Use alternate mutation accessors instead.
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
        */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableLackedNpcMap() {
-        return internalGetMutableLackedNpcMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
-       */
-      public Builder putLackedNpcMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .put(key, value);
+      public Builder mergeLackingResourcesInfo(emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo value) {
+        if (lackingResourcesInfoBuilder_ == null) {
+          if (lackingResourcesInfo_ != null) {
+            lackingResourcesInfo_ =
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.newBuilder(lackingResourcesInfo_).mergeFrom(value).buildPartial();
+          } else {
+            lackingResourcesInfo_ = value;
+          }
+          onChanged();
+        } else {
+          lackingResourcesInfoBuilder_.mergeFrom(value);
+        }
+
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; lacked_npc_map = 13;</code>
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
        */
+      public Builder clearLackingResourcesInfo() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfo_ = null;
+          onChanged();
+        } else {
+          lackingResourcesInfo_ = null;
+          lackingResourcesInfoBuilder_ = null;
+        }
 
-      public Builder putAllLackedNpcMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableLackedNpcMap().getMutableMap()
-            .putAll(values);
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList lackedPlaceList_ = emptyIntList();
-      private void ensureLackedPlaceListIsMutable() {
-        if (!((bitField0_ & 0x00000010) != 0)) {
-          lackedPlaceList_ = mutableCopy(lackedPlaceList_);
-          bitField0_ |= 0x00000010;
-         }
-      }
       /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @return A list containing the lackedPlaceList.
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
        */
-      public java.util.List<java.lang.Integer>
-          getLackedPlaceListList() {
-        return ((bitField0_ & 0x00000010) != 0) ?
-                 java.util.Collections.unmodifiableList(lackedPlaceList_) : lackedPlaceList_;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @return The count of lackedPlaceList.
-       */
-      public int getLackedPlaceListCount() {
-        return lackedPlaceList_.size();
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @param index The index of the element to return.
-       * @return The lackedPlaceList at the given index.
-       */
-      public int getLackedPlaceList(int index) {
-        return lackedPlaceList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The lackedPlaceList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setLackedPlaceList(
-          int index, int value) {
-        ensureLackedPlaceListIsMutable();
-        lackedPlaceList_.setInt(index, value);
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder getLackingResourcesInfoBuilder() {
+        
         onChanged();
-        return this;
+        return getLackingResourcesInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @param value The lackedPlaceList to add.
-       * @return This builder for chaining.
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
        */
-      public Builder addLackedPlaceList(int value) {
-        ensureLackedPlaceListIsMutable();
-        lackedPlaceList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @param values The lackedPlaceList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLackedPlaceList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLackedPlaceListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, lackedPlaceList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 lacked_place_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLackedPlaceList() {
-        lackedPlaceList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000010);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> lackedPlaceMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetLackedPlaceMap() {
-        if (lackedPlaceMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              LackedPlaceMapDefaultEntryHolder.defaultEntry);
+      public emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder getLackingResourcesInfoOrBuilder() {
+        if (lackingResourcesInfoBuilder_ != null) {
+          return lackingResourcesInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return lackingResourcesInfo_ == null ?
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.getDefaultInstance() : lackingResourcesInfo_;
         }
-        return lackedPlaceMap_;
       }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableLackedPlaceMap() {
-        onChanged();;
-        if (lackedPlaceMap_ == null) {
-          lackedPlaceMap_ = com.google.protobuf.MapField.newMapField(
-              LackedPlaceMapDefaultEntryHolder.defaultEntry);
+      /**
+       * <code>.LackingResourceInfo lacking_resources_info = 13;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder> 
+          getLackingResourcesInfoFieldBuilder() {
+        if (lackingResourcesInfoBuilder_ == null) {
+          lackingResourcesInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfo.Builder, emu.grasscutter.net.proto.LackingResourceInfoOuterClass.LackingResourceInfoOrBuilder>(
+                  getLackingResourcesInfo(),
+                  getParentForChildren(),
+                  isClean());
+          lackingResourcesInfo_ = null;
         }
-        if (!lackedPlaceMap_.isMutable()) {
-          lackedPlaceMap_ = lackedPlaceMap_.copy();
-        }
-        return lackedPlaceMap_;
-      }
-
-      public int getLackedPlaceMapCount() {
-        return internalGetLackedPlaceMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsLackedPlaceMap(
-          int key) {
-        
-        return internalGetLackedPlaceMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getLackedPlaceMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMap() {
-        return getLackedPlaceMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getLackedPlaceMapMap() {
-        return internalGetLackedPlaceMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedPlaceMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedPlaceMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-      @java.lang.Override
-
-      public int getLackedPlaceMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetLackedPlaceMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearLackedPlaceMap() {
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-
-      public Builder removeLackedPlaceMap(
-          int key) {
-        
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableLackedPlaceMap() {
-        return internalGetMutableLackedPlaceMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-      public Builder putLackedPlaceMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; lacked_place_map = 15;</code>
-       */
-
-      public Builder putAllLackedPlaceMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableLackedPlaceMap().getMutableMap()
-            .putAll(values);
-        return this;
+        return lackingResourcesInfoBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -2388,16 +1784,6 @@ public final class QuestOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_Quest_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Quest_LackedNpcMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Quest_LackedNpcMapEntry_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_Quest_LackedPlaceMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_Quest_LackedPlaceMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2407,43 +1793,29 @@ public final class QuestOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\013Quest.proto\"\361\003\n\005Quest\022\020\n\010quest_id\030\001 \001(" +
-      "\r\022\r\n\005state\030\002 \001(\r\022\022\n\nstart_time\030\004 \001(\r\022\021\n\t" +
-      "is_random\030\005 \001(\010\022\027\n\017parent_quest_id\030\006 \001(\r" +
-      "\022\027\n\017quest_config_id\030\007 \001(\r\022\027\n\017start_game_" +
-      "time\030\010 \001(\r\022\023\n\013accept_time\030\t \001(\r\022\027\n\017lacke" +
-      "d_npc_list\030\n \003(\r\022\034\n\024finish_progress_list" +
-      "\030\013 \003(\r\022\032\n\022fail_progress_list\030\014 \003(\r\0220\n\016la" +
-      "cked_npc_map\030\r \003(\0132\030.Quest.LackedNpcMapE" +
-      "ntry\022\031\n\021lacked_place_list\030\016 \003(\r\0224\n\020lacke" +
-      "d_place_map\030\017 \003(\0132\032.Quest.LackedPlaceMap" +
-      "Entry\0323\n\021LackedNpcMapEntry\022\013\n\003key\030\001 \001(\r\022" +
-      "\r\n\005value\030\002 \001(\r:\0028\001\0325\n\023LackedPlaceMapEntr" +
-      "y\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"
+      "\n\013Quest.proto\032\031LackingResourceInfo.proto" +
+      "\"\264\002\n\005Quest\022\020\n\010quest_id\030\001 \001(\r\022\r\n\005state\030\002 " +
+      "\001(\r\022\022\n\nstart_time\030\004 \001(\r\022\021\n\tis_random\030\005 \001" +
+      "(\010\022\027\n\017parent_quest_id\030\006 \001(\r\022\027\n\017quest_con" +
+      "fig_id\030\007 \001(\r\022\027\n\017start_game_time\030\010 \001(\r\022\023\n" +
+      "\013accept_time\030\t \001(\r\022\034\n\024finish_progress_li" +
+      "st\030\n \003(\r\022\032\n\022fail_progress_list\030\013 \003(\r\022\023\n\013" +
+      "MLHFBAFCKIP\030\014 \003(\r\0224\n\026lacking_resources_i" +
+      "nfo\030\r \001(\0132\024.LackingResourceInfoB\033\n\031emu.g" +
+      "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.LackingResourceInfoOuterClass.getDescriptor(),
         });
     internal_static_Quest_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Quest_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Quest_descriptor,
-        new java.lang.String[] { "QuestId", "State", "StartTime", "IsRandom", "ParentQuestId", "QuestConfigId", "StartGameTime", "AcceptTime", "LackedNpcList", "FinishProgressList", "FailProgressList", "LackedNpcMap", "LackedPlaceList", "LackedPlaceMap", });
-    internal_static_Quest_LackedNpcMapEntry_descriptor =
-      internal_static_Quest_descriptor.getNestedTypes().get(0);
-    internal_static_Quest_LackedNpcMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Quest_LackedNpcMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
-    internal_static_Quest_LackedPlaceMapEntry_descriptor =
-      internal_static_Quest_descriptor.getNestedTypes().get(1);
-    internal_static_Quest_LackedPlaceMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_Quest_LackedPlaceMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "QuestId", "State", "StartTime", "IsRandom", "ParentQuestId", "QuestConfigId", "StartGameTime", "AcceptTime", "FinishProgressList", "FailProgressList", "MLHFBAFCKIP", "LackingResourcesInfo", });
+    emu.grasscutter.net.proto.LackingResourceInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 4e08ed8eb..29933a341 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestProgressUpdateNotifyOuterClass.java
@@ -19,51 +19,46 @@ public final class QuestProgressUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 quest_id = 1;</code>
-     * @return The questId.
+     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * @return A list containing the failProgressList.
      */
-    int getQuestId();
+    java.util.List<java.lang.Integer> getFailProgressListList();
+    /**
+     * <code>repeated uint32 fail_progress_list = 12;</code>
+     * @return The count of failProgressList.
+     */
+    int getFailProgressListCount();
+    /**
+     * <code>repeated uint32 fail_progress_list = 12;</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 = 3;</code>
+     * <code>repeated uint32 finish_progress_list = 13;</code>
      * @return A list containing the finishProgressList.
      */
     java.util.List<java.lang.Integer> getFinishProgressListList();
     /**
-     * <code>repeated uint32 finish_progress_list = 3;</code>
+     * <code>repeated uint32 finish_progress_list = 13;</code>
      * @return The count of finishProgressList.
      */
     int getFinishProgressListCount();
     /**
-     * <code>repeated uint32 finish_progress_list = 3;</code>
+     * <code>repeated uint32 finish_progress_list = 13;</code>
      * @param index The index of the element to return.
      * @return The finishProgressList at the given index.
      */
     int getFinishProgressList(int index);
 
     /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
-     * @return A list containing the failProgressList.
+     * <code>uint32 quest_id = 14;</code>
+     * @return The questId.
      */
-    java.util.List<java.lang.Integer> getFailProgressListList();
-    /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
-     * @return The count of failProgressList.
-     */
-    int getFailProgressListCount();
-    /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
-     * @param index The index of the element to return.
-     * @return The failProgressList at the given index.
-     */
-    int getFailProgressList(int index);
+    int getQuestId();
   }
   /**
-   * <pre>
-   * CmdId: 5388
-   * Obf: DEOLGKMMGHH
-   * </pre>
-   *
    * Protobuf type {@code QuestProgressUpdateNotify}
    */
   public static final class QuestProgressUpdateNotify extends
@@ -76,8 +71,8 @@ public final class QuestProgressUpdateNotifyOuterClass {
       super(builder);
     }
     private QuestProgressUpdateNotify() {
-      finishProgressList_ = emptyIntList();
       failProgressList_ = emptyIntList();
+      finishProgressList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -111,25 +106,41 @@ public final class QuestProgressUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              questId_ = input.readUInt32();
+            case 96: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                failProgressList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              failProgressList_.addInt(input.readUInt32());
               break;
             }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                finishProgressList_ = newIntList();
+            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);
+              break;
+            }
+            case 104: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                finishProgressList_ = newIntList();
+                mutable_bitField0_ |= 0x00000002;
+              }
               finishProgressList_.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) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 finishProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 finishProgressList_.addInt(input.readUInt32());
@@ -137,25 +148,9 @@ public final class QuestProgressUpdateNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 80: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              failProgressList_.addInt(input.readUInt32());
-              break;
-            }
-            case 82: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                failProgressList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                failProgressList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
+            case 112: {
+
+              questId_ = input.readUInt32();
               break;
             }
             default: {
@@ -174,10 +169,10 @@ public final class QuestProgressUpdateNotifyOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          finishProgressList_.makeImmutable(); // C
+          failProgressList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          failProgressList_.makeImmutable(); // C
+          finishProgressList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -196,49 +191,10 @@ public final class QuestProgressUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify.class, emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify.Builder.class);
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 1;
-    private int questId_;
-    /**
-     * <code>uint32 quest_id = 1;</code>
-     * @return The questId.
-     */
-    @java.lang.Override
-    public int getQuestId() {
-      return questId_;
-    }
-
-    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList finishProgressList_;
-    /**
-     * <code>repeated uint32 finish_progress_list = 3;</code>
-     * @return A list containing the finishProgressList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getFinishProgressListList() {
-      return finishProgressList_;
-    }
-    /**
-     * <code>repeated uint32 finish_progress_list = 3;</code>
-     * @return The count of finishProgressList.
-     */
-    public int getFinishProgressListCount() {
-      return finishProgressList_.size();
-    }
-    /**
-     * <code>repeated uint32 finish_progress_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The finishProgressList at the given index.
-     */
-    public int getFinishProgressList(int index) {
-      return finishProgressList_.getInt(index);
-    }
-    private int finishProgressListMemoizedSerializedSize = -1;
-
-    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 10;
+    public static final int FAIL_PROGRESS_LIST_FIELD_NUMBER = 12;
     private com.google.protobuf.Internal.IntList failProgressList_;
     /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
+     * <code>repeated uint32 fail_progress_list = 12;</code>
      * @return A list containing the failProgressList.
      */
     @java.lang.Override
@@ -247,14 +203,14 @@ public final class QuestProgressUpdateNotifyOuterClass {
       return failProgressList_;
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
+     * <code>repeated uint32 fail_progress_list = 12;</code>
      * @return The count of failProgressList.
      */
     public int getFailProgressListCount() {
       return failProgressList_.size();
     }
     /**
-     * <code>repeated uint32 fail_progress_list = 10;</code>
+     * <code>repeated uint32 fail_progress_list = 12;</code>
      * @param index The index of the element to return.
      * @return The failProgressList at the given index.
      */
@@ -263,6 +219,45 @@ public final class QuestProgressUpdateNotifyOuterClass {
     }
     private int failProgressListMemoizedSerializedSize = -1;
 
+    public static final int FINISH_PROGRESS_LIST_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList finishProgressList_;
+    /**
+     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * @return A list containing the finishProgressList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getFinishProgressListList() {
+      return finishProgressList_;
+    }
+    /**
+     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * @return The count of finishProgressList.
+     */
+    public int getFinishProgressListCount() {
+      return finishProgressList_.size();
+    }
+    /**
+     * <code>repeated uint32 finish_progress_list = 13;</code>
+     * @param index The index of the element to return.
+     * @return The finishProgressList at the given index.
+     */
+    public int getFinishProgressList(int index) {
+      return finishProgressList_.getInt(index);
+    }
+    private int finishProgressListMemoizedSerializedSize = -1;
+
+    public static final int QUEST_ID_FIELD_NUMBER = 14;
+    private int questId_;
+    /**
+     * <code>uint32 quest_id = 14;</code>
+     * @return The questId.
+     */
+    @java.lang.Override
+    public int getQuestId() {
+      return questId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -278,22 +273,22 @@ public final class QuestProgressUpdateNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (questId_ != 0) {
-        output.writeUInt32(1, questId_);
+      if (getFailProgressListList().size() > 0) {
+        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(failProgressListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < failProgressList_.size(); i++) {
+        output.writeUInt32NoTag(failProgressList_.getInt(i));
       }
       if (getFinishProgressListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(finishProgressListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishProgressList_.size(); i++) {
         output.writeUInt32NoTag(finishProgressList_.getInt(i));
       }
-      if (getFailProgressListList().size() > 0) {
-        output.writeUInt32NoTag(82);
-        output.writeUInt32NoTag(failProgressListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < failProgressList_.size(); i++) {
-        output.writeUInt32NoTag(failProgressList_.getInt(i));
+      if (questId_ != 0) {
+        output.writeUInt32(14, questId_);
       }
       unknownFields.writeTo(output);
     }
@@ -304,9 +299,19 @@ public final class QuestProgressUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (questId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, questId_);
+      {
+        int dataSize = 0;
+        for (int i = 0; i < failProgressList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(failProgressList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getFailProgressListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        failProgressListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
@@ -322,19 +327,9 @@ public final class QuestProgressUpdateNotifyOuterClass {
         }
         finishProgressListMemoizedSerializedSize = dataSize;
       }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < failProgressList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(failProgressList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getFailProgressListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        failProgressListMemoizedSerializedSize = dataSize;
+      if (questId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, questId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -351,12 +346,12 @@ public final class QuestProgressUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify other = (emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify) obj;
 
-      if (getQuestId()
-          != other.getQuestId()) return false;
-      if (!getFinishProgressListList()
-          .equals(other.getFinishProgressListList())) return false;
       if (!getFailProgressListList()
           .equals(other.getFailProgressListList())) return false;
+      if (!getFinishProgressListList()
+          .equals(other.getFinishProgressListList())) return false;
+      if (getQuestId()
+          != other.getQuestId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -368,16 +363,16 @@ public final class QuestProgressUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQuestId();
-      if (getFinishProgressListCount() > 0) {
-        hash = (37 * hash) + FINISH_PROGRESS_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFinishProgressListList().hashCode();
-      }
       if (getFailProgressListCount() > 0) {
         hash = (37 * hash) + FAIL_PROGRESS_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getFailProgressListList().hashCode();
       }
+      if (getFinishProgressListCount() > 0) {
+        hash = (37 * hash) + FINISH_PROGRESS_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFinishProgressListList().hashCode();
+      }
+      hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQuestId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -474,11 +469,6 @@ public final class QuestProgressUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5388
-     * Obf: DEOLGKMMGHH
-     * </pre>
-     *
      * Protobuf type {@code QuestProgressUpdateNotify}
      */
     public static final class Builder extends
@@ -516,12 +506,12 @@ public final class QuestProgressUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        failProgressList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        finishProgressList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         questId_ = 0;
 
-        finishProgressList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        failProgressList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -549,17 +539,17 @@ public final class QuestProgressUpdateNotifyOuterClass {
       public emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify result = new emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify(this);
         int from_bitField0_ = bitField0_;
-        result.questId_ = questId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          finishProgressList_.makeImmutable();
+          failProgressList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.finishProgressList_ = finishProgressList_;
+        result.failProgressList_ = failProgressList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          failProgressList_.makeImmutable();
+          finishProgressList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.failProgressList_ = failProgressList_;
+        result.finishProgressList_ = finishProgressList_;
+        result.questId_ = questId_;
         onBuilt();
         return result;
       }
@@ -608,28 +598,28 @@ public final class QuestProgressUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.QuestProgressUpdateNotifyOuterClass.QuestProgressUpdateNotify.getDefaultInstance()) return this;
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
+        if (!other.failProgressList_.isEmpty()) {
+          if (failProgressList_.isEmpty()) {
+            failProgressList_ = other.failProgressList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureFailProgressListIsMutable();
+            failProgressList_.addAll(other.failProgressList_);
+          }
+          onChanged();
         }
         if (!other.finishProgressList_.isEmpty()) {
           if (finishProgressList_.isEmpty()) {
             finishProgressList_ = other.finishProgressList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureFinishProgressListIsMutable();
             finishProgressList_.addAll(other.finishProgressList_);
           }
           onChanged();
         }
-        if (!other.failProgressList_.isEmpty()) {
-          if (failProgressList_.isEmpty()) {
-            failProgressList_ = other.failProgressList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureFailProgressListIsMutable();
-            failProgressList_.addAll(other.failProgressList_);
-          }
-          onChanged();
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -661,141 +651,31 @@ public final class QuestProgressUpdateNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int questId_ ;
-      /**
-       * <code>uint32 quest_id = 1;</code>
-       * @return The questId.
-       */
-      @java.lang.Override
-      public int getQuestId() {
-        return questId_;
-      }
-      /**
-       * <code>uint32 quest_id = 1;</code>
-       * @param value The questId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setQuestId(int value) {
-        
-        questId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 quest_id = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearQuestId() {
-        
-        questId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList finishProgressList_ = emptyIntList();
-      private void ensureFinishProgressListIsMutable() {
+      private com.google.protobuf.Internal.IntList failProgressList_ = emptyIntList();
+      private void ensureFailProgressListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
-          finishProgressList_ = mutableCopy(finishProgressList_);
+          failProgressList_ = mutableCopy(failProgressList_);
           bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @return A list containing the finishProgressList.
-       */
-      public java.util.List<java.lang.Integer>
-          getFinishProgressListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(finishProgressList_) : finishProgressList_;
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @return The count of finishProgressList.
-       */
-      public int getFinishProgressListCount() {
-        return finishProgressList_.size();
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The finishProgressList at the given index.
-       */
-      public int getFinishProgressList(int index) {
-        return finishProgressList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The finishProgressList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishProgressList(
-          int index, int value) {
-        ensureFinishProgressListIsMutable();
-        finishProgressList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @param value The finishProgressList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFinishProgressList(int value) {
-        ensureFinishProgressListIsMutable();
-        finishProgressList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @param values The finishProgressList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFinishProgressList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFinishProgressListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, finishProgressList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finish_progress_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinishProgressList() {
-        finishProgressList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList failProgressList_ = emptyIntList();
-      private void ensureFailProgressListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          failProgressList_ = mutableCopy(failProgressList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @return A list containing the failProgressList.
        */
       public java.util.List<java.lang.Integer>
           getFailProgressListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(failProgressList_) : failProgressList_;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @return The count of failProgressList.
        */
       public int getFailProgressListCount() {
         return failProgressList_.size();
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @param index The index of the element to return.
        * @return The failProgressList at the given index.
        */
@@ -803,7 +683,7 @@ public final class QuestProgressUpdateNotifyOuterClass {
         return failProgressList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @param index The index to set the value at.
        * @param value The failProgressList to set.
        * @return This builder for chaining.
@@ -816,7 +696,7 @@ public final class QuestProgressUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @param value The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -827,7 +707,7 @@ public final class QuestProgressUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @param values The failProgressList to add.
        * @return This builder for chaining.
        */
@@ -840,15 +720,125 @@ public final class QuestProgressUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 fail_progress_list = 10;</code>
+       * <code>repeated uint32 fail_progress_list = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearFailProgressList() {
         failProgressList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList finishProgressList_ = emptyIntList();
+      private void ensureFinishProgressListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          finishProgressList_ = mutableCopy(finishProgressList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @return A list containing the finishProgressList.
+       */
+      public java.util.List<java.lang.Integer>
+          getFinishProgressListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(finishProgressList_) : finishProgressList_;
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @return The count of finishProgressList.
+       */
+      public int getFinishProgressListCount() {
+        return finishProgressList_.size();
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @param index The index of the element to return.
+       * @return The finishProgressList at the given index.
+       */
+      public int getFinishProgressList(int index) {
+        return finishProgressList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The finishProgressList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishProgressList(
+          int index, int value) {
+        ensureFinishProgressListIsMutable();
+        finishProgressList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @param value The finishProgressList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFinishProgressList(int value) {
+        ensureFinishProgressListIsMutable();
+        finishProgressList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @param values The finishProgressList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFinishProgressList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFinishProgressListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, finishProgressList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finish_progress_list = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinishProgressList() {
+        finishProgressList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
+
+      private int questId_ ;
+      /**
+       * <code>uint32 quest_id = 14;</code>
+       * @return The questId.
+       */
+      @java.lang.Override
+      public int getQuestId() {
+        return questId_;
+      }
+      /**
+       * <code>uint32 quest_id = 14;</code>
+       * @param value The questId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setQuestId(int value) {
+        
+        questId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 quest_id = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearQuestId() {
+        
+        questId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -917,9 +907,9 @@ public final class QuestProgressUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\037QuestProgressUpdateNotify.proto\"g\n\031Que" +
-      "stProgressUpdateNotify\022\020\n\010quest_id\030\001 \001(\r" +
-      "\022\034\n\024finish_progress_list\030\003 \003(\r\022\032\n\022fail_p" +
-      "rogress_list\030\n \003(\rB\033\n\031emu.grasscutter.ne" +
+      "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" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -931,7 +921,7 @@ public final class QuestProgressUpdateNotifyOuterClass {
     internal_static_QuestProgressUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestProgressUpdateNotify_descriptor,
-        new java.lang.String[] { "QuestId", "FinishProgressList", "FailProgressList", });
+        new java.lang.String[] { "FailProgressList", "FinishProgressList", "QuestId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 32c6b8940..dffdca5b8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestTransmitRspOuterClass.java
@@ -19,29 +19,24 @@ public final class QuestTransmitRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <code>uint32 quest_id = 12;</code>
+     * @return The questId.
      */
-    int getRetcode();
+    int getQuestId();
 
     /**
-     * <code>uint32 point_id = 9;</code>
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     int getPointId();
 
     /**
-     * <code>uint32 quest_id = 14;</code>
-     * @return The questId.
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
      */
-    int getQuestId();
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 20137
-   * Obf: EFHMAODMGJJ
-   * </pre>
-   *
    * Protobuf type {@code QuestTransmitRsp}
    */
   public static final class QuestTransmitRsp extends
@@ -86,19 +81,19 @@ public final class QuestTransmitRspOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 96: {
 
-              retcode_ = input.readInt32();
+              questId_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 104: {
 
               pointId_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              questId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -133,21 +128,21 @@ public final class QuestTransmitRspOuterClass {
               emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp.class, emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
-    private int retcode_;
+    public static final int QUEST_ID_FIELD_NUMBER = 12;
+    private int questId_;
     /**
-     * <code>int32 retcode = 5;</code>
-     * @return The retcode.
+     * <code>uint32 quest_id = 12;</code>
+     * @return The questId.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public int getQuestId() {
+      return questId_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 9;
+    public static final int POINT_ID_FIELD_NUMBER = 13;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 9;</code>
+     * <code>uint32 point_id = 13;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -155,15 +150,15 @@ public final class QuestTransmitRspOuterClass {
       return pointId_;
     }
 
-    public static final int QUEST_ID_FIELD_NUMBER = 14;
-    private int questId_;
+    public static final int RETCODE_FIELD_NUMBER = 14;
+    private int retcode_;
     /**
-     * <code>uint32 quest_id = 14;</code>
-     * @return The questId.
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
      */
     @java.lang.Override
-    public int getQuestId() {
-      return questId_;
+    public int getRetcode() {
+      return retcode_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -180,14 +175,14 @@ public final class QuestTransmitRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
+      if (questId_ != 0) {
+        output.writeUInt32(12, questId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(9, pointId_);
+        output.writeUInt32(13, pointId_);
       }
-      if (questId_ != 0) {
-        output.writeUInt32(14, questId_);
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class QuestTransmitRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (questId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
+          .computeUInt32Size(12, questId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, pointId_);
+          .computeUInt32Size(13, pointId_);
       }
-      if (questId_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, questId_);
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class QuestTransmitRspOuterClass {
       }
       emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp other = (emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getQuestId()
           != other.getQuestId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class QuestTransmitRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPointId();
       hash = (37 * hash) + QUEST_ID_FIELD_NUMBER;
       hash = (53 * hash) + getQuestId();
+      hash = (37 * hash) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class QuestTransmitRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20137
-     * Obf: EFHMAODMGJJ
-     * </pre>
-     *
      * Protobuf type {@code QuestTransmitRsp}
      */
     public static final class Builder extends
@@ -386,11 +376,11 @@ public final class QuestTransmitRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
+        questId_ = 0;
 
         pointId_ = 0;
 
-        questId_ = 0;
+        retcode_ = 0;
 
         return this;
       }
@@ -418,9 +408,9 @@ public final class QuestTransmitRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp buildPartial() {
         emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp result = new emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp(this);
-        result.retcode_ = retcode_;
-        result.pointId_ = pointId_;
         result.questId_ = questId_;
+        result.pointId_ = pointId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -469,14 +459,14 @@ public final class QuestTransmitRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp other) {
         if (other == emu.grasscutter.net.proto.QuestTransmitRspOuterClass.QuestTransmitRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getQuestId() != 0) {
+          setQuestId(other.getQuestId());
         }
         if (other.getPointId() != 0) {
           setPointId(other.getPointId());
         }
-        if (other.getQuestId() != 0) {
-          setQuestId(other.getQuestId());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -507,71 +497,9 @@ public final class QuestTransmitRspOuterClass {
         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 pointId_ ;
-      /**
-       * <code>uint32 point_id = 9;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 9;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int questId_ ;
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <code>uint32 quest_id = 12;</code>
        * @return The questId.
        */
       @java.lang.Override
@@ -579,7 +507,7 @@ public final class QuestTransmitRspOuterClass {
         return questId_;
       }
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <code>uint32 quest_id = 12;</code>
        * @param value The questId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +518,7 @@ public final class QuestTransmitRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 quest_id = 14;</code>
+       * <code>uint32 quest_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestId() {
@@ -599,6 +527,68 @@ public final class QuestTransmitRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class QuestTransmitRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026QuestTransmitRsp.proto\"G\n\020QuestTransmi" +
-      "tRsp\022\017\n\007retcode\030\005 \001(\005\022\020\n\010point_id\030\t \001(\r\022" +
-      "\020\n\010quest_id\030\016 \001(\rB\033\n\031emu.grasscutter.net" +
+      "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" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class QuestTransmitRspOuterClass {
     internal_static_QuestTransmitRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestTransmitRsp_descriptor,
-        new java.lang.String[] { "Retcode", "PointId", "QuestId", });
+        new java.lang.String[] { "QuestId", "PointId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 45d8eb9d6..c4db998f4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/QuestUpdateQuestVarNotifyOuterClass.java
@@ -19,40 +19,35 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 parent_quest_id = 3;</code>
+     * <code>uint32 parent_quest_id = 1;</code>
      * @return The parentQuestId.
      */
     int getParentQuestId();
 
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>uint32 parent_quest_var_seq = 4;</code>
+     * @return The parentQuestVarSeq.
+     */
+    int getParentQuestVarSeq();
+
+    /**
+     * <code>repeated int32 quest_var = 14;</code>
      * @return A list containing the questVar.
      */
     java.util.List<java.lang.Integer> getQuestVarList();
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>repeated int32 quest_var = 14;</code>
      * @return The count of questVar.
      */
     int getQuestVarCount();
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>repeated int32 quest_var = 14;</code>
      * @param index The index of the element to return.
      * @return The questVar at the given index.
      */
     int getQuestVar(int index);
-
-    /**
-     * <code>uint32 parent_quest_var_seq = 9;</code>
-     * @return The parentQuestVarSeq.
-     */
-    int getParentQuestVarSeq();
   }
   /**
-   * <pre>
-   * CmdId: 1753
-   * Obf: OEEFAJLMMNF
-   * </pre>
-   *
    * Protobuf type {@code QuestUpdateQuestVarNotify}
    */
   public static final class QuestUpdateQuestVarNotify extends
@@ -99,12 +94,17 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
               parentQuestId_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 32: {
+
+              parentQuestVarSeq_ = input.readUInt32();
+              break;
+            }
+            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 questVar_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -112,7 +112,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
               questVar_.addInt(input.readInt32());
               break;
             }
-            case 50: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -125,11 +125,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
-
-              parentQuestVarSeq_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +160,10 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
               emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify.class, emu.grasscutter.net.proto.QuestUpdateQuestVarNotifyOuterClass.QuestUpdateQuestVarNotify.Builder.class);
     }
 
-    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 3;
+    public static final int PARENT_QUEST_ID_FIELD_NUMBER = 1;
     private int parentQuestId_;
     /**
-     * <code>uint32 parent_quest_id = 3;</code>
+     * <code>uint32 parent_quest_id = 1;</code>
      * @return The parentQuestId.
      */
     @java.lang.Override
@@ -176,10 +171,21 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       return parentQuestId_;
     }
 
-    public static final int QUEST_VAR_FIELD_NUMBER = 6;
+    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;
     private com.google.protobuf.Internal.IntList questVar_;
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>repeated int32 quest_var = 14;</code>
      * @return A list containing the questVar.
      */
     @java.lang.Override
@@ -188,14 +194,14 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       return questVar_;
     }
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>repeated int32 quest_var = 14;</code>
      * @return The count of questVar.
      */
     public int getQuestVarCount() {
       return questVar_.size();
     }
     /**
-     * <code>repeated int32 quest_var = 6;</code>
+     * <code>repeated int32 quest_var = 14;</code>
      * @param index The index of the element to return.
      * @return The questVar at the given index.
      */
@@ -204,17 +210,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
     }
     private int questVarMemoizedSerializedSize = -1;
 
-    public static final int PARENT_QUEST_VAR_SEQ_FIELD_NUMBER = 9;
-    private int parentQuestVarSeq_;
-    /**
-     * <code>uint32 parent_quest_var_seq = 9;</code>
-     * @return The parentQuestVarSeq.
-     */
-    @java.lang.Override
-    public int getParentQuestVarSeq() {
-      return parentQuestVarSeq_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -231,18 +226,18 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (parentQuestId_ != 0) {
-        output.writeUInt32(3, parentQuestId_);
+        output.writeUInt32(1, parentQuestId_);
+      }
+      if (parentQuestVarSeq_ != 0) {
+        output.writeUInt32(4, parentQuestVarSeq_);
       }
       if (getQuestVarList().size() > 0) {
-        output.writeUInt32NoTag(50);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(questVarMemoizedSerializedSize);
       }
       for (int i = 0; i < questVar_.size(); i++) {
         output.writeInt32NoTag(questVar_.getInt(i));
       }
-      if (parentQuestVarSeq_ != 0) {
-        output.writeUInt32(9, parentQuestVarSeq_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -254,7 +249,11 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       size = 0;
       if (parentQuestId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, parentQuestId_);
+          .computeUInt32Size(1, parentQuestId_);
+      }
+      if (parentQuestVarSeq_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, parentQuestVarSeq_);
       }
       {
         int dataSize = 0;
@@ -270,10 +269,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         }
         questVarMemoizedSerializedSize = dataSize;
       }
-      if (parentQuestVarSeq_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, parentQuestVarSeq_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -291,10 +286,10 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
 
       if (getParentQuestId()
           != other.getParentQuestId()) return false;
-      if (!getQuestVarList()
-          .equals(other.getQuestVarList())) return false;
       if (getParentQuestVarSeq()
           != other.getParentQuestVarSeq()) return false;
+      if (!getQuestVarList()
+          .equals(other.getQuestVarList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -308,12 +303,12 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       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_VAR_SEQ_FIELD_NUMBER;
-      hash = (53 * hash) + getParentQuestVarSeq();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -410,11 +405,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1753
-     * Obf: OEEFAJLMMNF
-     * </pre>
-     *
      * Protobuf type {@code QuestUpdateQuestVarNotify}
      */
     public static final class Builder extends
@@ -454,10 +444,10 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         super.clear();
         parentQuestId_ = 0;
 
-        questVar_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         parentQuestVarSeq_ = 0;
 
+        questVar_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -486,12 +476,12 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         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.parentQuestVarSeq_ = parentQuestVarSeq_;
         onBuilt();
         return result;
       }
@@ -543,6 +533,9 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         if (other.getParentQuestId() != 0) {
           setParentQuestId(other.getParentQuestId());
         }
+        if (other.getParentQuestVarSeq() != 0) {
+          setParentQuestVarSeq(other.getParentQuestVarSeq());
+        }
         if (!other.questVar_.isEmpty()) {
           if (questVar_.isEmpty()) {
             questVar_ = other.questVar_;
@@ -553,9 +546,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.getParentQuestVarSeq() != 0) {
-          setParentQuestVarSeq(other.getParentQuestVarSeq());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -588,7 +578,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
 
       private int parentQuestId_ ;
       /**
-       * <code>uint32 parent_quest_id = 3;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @return The parentQuestId.
        */
       @java.lang.Override
@@ -596,7 +586,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return parentQuestId_;
       }
       /**
-       * <code>uint32 parent_quest_id = 3;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @param value The parentQuestId to set.
        * @return This builder for chaining.
        */
@@ -607,7 +597,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 parent_quest_id = 3;</code>
+       * <code>uint32 parent_quest_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestId() {
@@ -617,6 +607,37 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         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)) {
@@ -625,7 +646,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @return A list containing the questVar.
        */
       public java.util.List<java.lang.Integer>
@@ -634,14 +655,14 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
                  java.util.Collections.unmodifiableList(questVar_) : questVar_;
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @return The count of questVar.
        */
       public int getQuestVarCount() {
         return questVar_.size();
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @param index The index of the element to return.
        * @return The questVar at the given index.
        */
@@ -649,7 +670,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return questVar_.getInt(index);
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @param index The index to set the value at.
        * @param value The questVar to set.
        * @return This builder for chaining.
@@ -662,7 +683,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @param value The questVar to add.
        * @return This builder for chaining.
        */
@@ -673,7 +694,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @param values The questVar to add.
        * @return This builder for chaining.
        */
@@ -686,7 +707,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 quest_var = 6;</code>
+       * <code>repeated int32 quest_var = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearQuestVar() {
@@ -695,37 +716,6 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int parentQuestVarSeq_ ;
-      /**
-       * <code>uint32 parent_quest_var_seq = 9;</code>
-       * @return The parentQuestVarSeq.
-       */
-      @java.lang.Override
-      public int getParentQuestVarSeq() {
-        return parentQuestVarSeq_;
-      }
-      /**
-       * <code>uint32 parent_quest_var_seq = 9;</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 = 9;</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) {
@@ -795,8 +785,8 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037QuestUpdateQuestVarNotify.proto\"e\n\031Que" +
       "stUpdateQuestVarNotify\022\027\n\017parent_quest_i" +
-      "d\030\003 \001(\r\022\021\n\tquest_var\030\006 \003(\005\022\034\n\024parent_que" +
-      "st_var_seq\030\t \001(\rB\033\n\031emu.grasscutter.net." +
+      "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." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -808,7 +798,7 @@ public final class QuestUpdateQuestVarNotifyOuterClass {
     internal_static_QuestUpdateQuestVarNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_QuestUpdateQuestVarNotify_descriptor,
-        new java.lang.String[] { "ParentQuestId", "QuestVar", "ParentQuestVarSeq", });
+        new java.lang.String[] { "ParentQuestId", "ParentQuestVarSeq", "QuestVar", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReadMailNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReadMailNotifyOuterClass.java
index 77ccdc858..41181c207 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ReadMailNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ReadMailNotifyOuterClass.java
@@ -19,28 +19,23 @@ public final class ReadMailNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @return A list containing the mailIdList.
      */
     java.util.List<java.lang.Integer> getMailIdListList();
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @return The count of mailIdList.
      */
     int getMailIdListCount();
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
     int getMailIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 6739
-   * Obf: EHONJGBBFEG
-   * </pre>
-   *
    * Protobuf type {@code ReadMailNotify}
    */
   public static final class ReadMailNotify extends
@@ -87,7 +82,7 @@ public final class ReadMailNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mailIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class ReadMailNotifyOuterClass {
               mailIdList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class ReadMailNotifyOuterClass {
               emu.grasscutter.net.proto.ReadMailNotifyOuterClass.ReadMailNotify.class, emu.grasscutter.net.proto.ReadMailNotifyOuterClass.ReadMailNotify.Builder.class);
     }
 
-    public static final int MAIL_ID_LIST_FIELD_NUMBER = 2;
+    public static final int MAIL_ID_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList mailIdList_;
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @return A list containing the mailIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class ReadMailNotifyOuterClass {
       return mailIdList_;
     }
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @return The count of mailIdList.
      */
     public int getMailIdListCount() {
       return mailIdList_.size();
     }
     /**
-     * <code>repeated uint32 mail_id_list = 2;</code>
+     * <code>repeated uint32 mail_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The mailIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class ReadMailNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getMailIdListList().size() > 0) {
-        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(mailIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < mailIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class ReadMailNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6739
-     * Obf: EHONJGBBFEG
-     * </pre>
-     *
      * Protobuf type {@code ReadMailNotify}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class ReadMailNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @return A list containing the mailIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class ReadMailNotifyOuterClass {
                  java.util.Collections.unmodifiableList(mailIdList_) : mailIdList_;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @return The count of mailIdList.
        */
       public int getMailIdListCount() {
         return mailIdList_.size();
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @param index The index of the element to return.
        * @return The mailIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class ReadMailNotifyOuterClass {
         return mailIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The mailIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class ReadMailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @param value The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class ReadMailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @param values The mailIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class ReadMailNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 mail_id_list = 2;</code>
+       * <code>repeated uint32 mail_id_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearMailIdList() {
@@ -654,7 +644,7 @@ public final class ReadMailNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024ReadMailNotify.proto\"&\n\016ReadMailNotify" +
-      "\022\024\n\014mail_id_list\030\002 \003(\rB\033\n\031emu.grasscutte" +
+      "\022\024\n\014mail_id_list\030\003 \003(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RedeemLegendaryKeyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RedeemLegendaryKeyRspOuterClass.java
index 93a10a984..8549b7774 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RedeemLegendaryKeyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RedeemLegendaryKeyRspOuterClass.java
@@ -19,23 +19,18 @@ public final class RedeemLegendaryKeyRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 15;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 legendary_key_count = 2;</code>
+     * <code>uint32 legendary_key_count = 12;</code>
      * @return The legendaryKeyCount.
      */
     int getLegendaryKeyCount();
   }
   /**
-   * <pre>
-   * CmdId: 7270
-   * Obf: DDNNDBFNHKE
-   * </pre>
-   *
    * Protobuf type {@code RedeemLegendaryKeyRsp}
    */
   public static final class RedeemLegendaryKeyRsp extends
@@ -80,16 +75,16 @@ public final class RedeemLegendaryKeyRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              legendaryKeyCount_ = input.readUInt32();
-              break;
-            }
-            case 120: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 96: {
+
+              legendaryKeyCount_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class RedeemLegendaryKeyRspOuterClass {
               emu.grasscutter.net.proto.RedeemLegendaryKeyRspOuterClass.RedeemLegendaryKeyRsp.class, emu.grasscutter.net.proto.RedeemLegendaryKeyRspOuterClass.RedeemLegendaryKeyRsp.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>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class RedeemLegendaryKeyRspOuterClass {
       return retcode_;
     }
 
-    public static final int LEGENDARY_KEY_COUNT_FIELD_NUMBER = 2;
+    public static final int LEGENDARY_KEY_COUNT_FIELD_NUMBER = 12;
     private int legendaryKeyCount_;
     /**
-     * <code>uint32 legendary_key_count = 2;</code>
+     * <code>uint32 legendary_key_count = 12;</code>
      * @return The legendaryKeyCount.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class RedeemLegendaryKeyRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (legendaryKeyCount_ != 0) {
-        output.writeUInt32(2, legendaryKeyCount_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(15, retcode_);
+        output.writeInt32(11, retcode_);
+      }
+      if (legendaryKeyCount_ != 0) {
+        output.writeUInt32(12, legendaryKeyCount_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class RedeemLegendaryKeyRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (legendaryKeyCount_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, legendaryKeyCount_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(15, retcode_);
+          .computeInt32Size(11, retcode_);
+      }
+      if (legendaryKeyCount_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(12, legendaryKeyCount_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -311,11 +306,6 @@ public final class RedeemLegendaryKeyRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7270
-     * Obf: DDNNDBFNHKE
-     * </pre>
-     *
      * Protobuf type {@code RedeemLegendaryKeyRsp}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 15;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -501,7 +491,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
 
       private int legendaryKeyCount_ ;
       /**
-       * <code>uint32 legendary_key_count = 2;</code>
+       * <code>uint32 legendary_key_count = 12;</code>
        * @return The legendaryKeyCount.
        */
       @java.lang.Override
@@ -509,7 +499,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
         return legendaryKeyCount_;
       }
       /**
-       * <code>uint32 legendary_key_count = 2;</code>
+       * <code>uint32 legendary_key_count = 12;</code>
        * @param value The legendaryKeyCount to set.
        * @return This builder for chaining.
        */
@@ -520,7 +510,7 @@ public final class RedeemLegendaryKeyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 legendary_key_count = 2;</code>
+       * <code>uint32 legendary_key_count = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearLegendaryKeyCount() {
@@ -597,8 +587,8 @@ public final class RedeemLegendaryKeyRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033RedeemLegendaryKeyRsp.proto\"E\n\025RedeemL" +
-      "egendaryKeyRsp\022\017\n\007retcode\030\017 \001(\005\022\033\n\023legen" +
-      "dary_key_count\030\002 \001(\rB\033\n\031emu.grasscutter." +
+      "egendaryKeyRsp\022\017\n\007retcode\030\013 \001(\005\022\033\n\023legen" +
+      "dary_key_count\030\014 \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/RegionInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionInfoOuterClass.java
index 316d3c38a..2b80443ae 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionInfoOuterClass.java
@@ -341,12 +341,20 @@ public final class RegionInfoOuterClass {
      */
     com.google.protobuf.ByteString
         getGameBizBytes();
+
+    /**
+     * <code>string gateserver_ipv6_ip = 37;</code>
+     * @return The gateserverIpv6Ip.
+     */
+    java.lang.String getGateserverIpv6Ip();
+    /**
+     * <code>string gateserver_ipv6_ip = 37;</code>
+     * @return The bytes for gateserverIpv6Ip.
+     */
+    com.google.protobuf.ByteString
+        getGateserverIpv6IpBytes();
   }
   /**
-   * <pre>
-   * Obf: FHNLCIOBJDG
-   * </pre>
-   *
    * Protobuf type {@code RegionInfo}
    */
   public static final class RegionInfo extends
@@ -382,6 +390,7 @@ public final class RegionInfoOuterClass {
       privacyPolicyUrl_ = "";
       nextResourceUrl_ = "";
       gameBiz_ = "";
+      gateserverIpv6Ip_ = "";
     }
 
     @java.lang.Override
@@ -597,6 +606,12 @@ public final class RegionInfoOuterClass {
               gameBiz_ = s;
               break;
             }
+            case 298: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              gateserverIpv6Ip_ = s;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1572,6 +1587,44 @@ public final class RegionInfoOuterClass {
       }
     }
 
+    public static final int GATESERVER_IPV6_IP_FIELD_NUMBER = 37;
+    private volatile java.lang.Object gateserverIpv6Ip_;
+    /**
+     * <code>string gateserver_ipv6_ip = 37;</code>
+     * @return The gateserverIpv6Ip.
+     */
+    @java.lang.Override
+    public java.lang.String getGateserverIpv6Ip() {
+      java.lang.Object ref = gateserverIpv6Ip_;
+      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();
+        gateserverIpv6Ip_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string gateserver_ipv6_ip = 37;</code>
+     * @return The bytes for gateserverIpv6Ip.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getGateserverIpv6IpBytes() {
+      java.lang.Object ref = gateserverIpv6Ip_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        gateserverIpv6Ip_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1673,6 +1726,9 @@ public final class RegionInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 36, gameBiz_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateserverIpv6Ip_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 37, gateserverIpv6Ip_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1776,6 +1832,9 @@ public final class RegionInfoOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gameBiz_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(36, gameBiz_);
       }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(gateserverIpv6Ip_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(37, gateserverIpv6Ip_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1855,6 +1914,8 @@ public final class RegionInfoOuterClass {
       }
       if (!getGameBiz()
           .equals(other.getGameBiz())) return false;
+      if (!getGateserverIpv6Ip()
+          .equals(other.getGateserverIpv6Ip())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1929,6 +1990,8 @@ public final class RegionInfoOuterClass {
       }
       hash = (37 * hash) + GAME_BIZ_FIELD_NUMBER;
       hash = (53 * hash) + getGameBiz().hashCode();
+      hash = (37 * hash) + GATESERVER_IPV6_IP_FIELD_NUMBER;
+      hash = (53 * hash) + getGateserverIpv6Ip().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -2025,10 +2088,6 @@ public final class RegionInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FHNLCIOBJDG
-     * </pre>
-     *
      * Protobuf type {@code RegionInfo}
      */
     public static final class Builder extends
@@ -2132,6 +2191,8 @@ public final class RegionInfoOuterClass {
         }
         gameBiz_ = "";
 
+        gateserverIpv6Ip_ = "";
+
         return this;
       }
 
@@ -2195,6 +2256,7 @@ public final class RegionInfoOuterClass {
           result.nextResVersionConfig_ = nextResVersionConfigBuilder_.build();
         }
         result.gameBiz_ = gameBiz_;
+        result.gateserverIpv6Ip_ = gateserverIpv6Ip_;
         onBuilt();
         return result;
       }
@@ -2352,6 +2414,10 @@ public final class RegionInfoOuterClass {
           gameBiz_ = other.gameBiz_;
           onChanged();
         }
+        if (!other.getGateserverIpv6Ip().isEmpty()) {
+          gateserverIpv6Ip_ = other.gateserverIpv6Ip_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -4448,6 +4514,82 @@ public final class RegionInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object gateserverIpv6Ip_ = "";
+      /**
+       * <code>string gateserver_ipv6_ip = 37;</code>
+       * @return The gateserverIpv6Ip.
+       */
+      public java.lang.String getGateserverIpv6Ip() {
+        java.lang.Object ref = gateserverIpv6Ip_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          gateserverIpv6Ip_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string gateserver_ipv6_ip = 37;</code>
+       * @return The bytes for gateserverIpv6Ip.
+       */
+      public com.google.protobuf.ByteString
+          getGateserverIpv6IpBytes() {
+        java.lang.Object ref = gateserverIpv6Ip_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          gateserverIpv6Ip_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string gateserver_ipv6_ip = 37;</code>
+       * @param value The gateserverIpv6Ip to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGateserverIpv6Ip(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        gateserverIpv6Ip_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gateserver_ipv6_ip = 37;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGateserverIpv6Ip() {
+        
+        gateserverIpv6Ip_ = getDefaultInstance().getGateserverIpv6Ip();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string gateserver_ipv6_ip = 37;</code>
+       * @param value The bytes for gateserverIpv6Ip to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGateserverIpv6IpBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        gateserverIpv6Ip_ = value;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4516,7 +4658,7 @@ public final class RegionInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020RegionInfo.proto\032\026ResVersionConfig.pro" +
-      "to\"\257\006\n\nRegionInfo\022\025\n\rgateserver_ip\030\001 \001(\t" +
+      "to\"\313\006\n\nRegionInfo\022\025\n\rgateserver_ip\030\001 \001(\t" +
       "\022\027\n\017gateserver_port\030\002 \001(\r\022\030\n\020pay_callbac" +
       "k_url\030\003 \001(\t\022\021\n\tarea_type\030\007 \001(\t\022\024\n\014resour" +
       "ce_url\030\010 \001(\t\022\020\n\010data_url\030\t \001(\t\022\024\n\014feedba" +
@@ -4536,8 +4678,9 @@ public final class RegionInfoOuterClass {
       "cdkey_url\030  \001(\t\022\032\n\022privacy_policy_url\030! " +
       "\001(\t\022\031\n\021next_resource_url\030\" \001(\t\0222\n\027next_r" +
       "es_version_config\030# \001(\0132\021.ResVersionConf" +
-      "ig\022\020\n\010game_biz\030$ \001(\tB\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "ig\022\020\n\010game_biz\030$ \001(\t\022\032\n\022gateserver_ipv6_" +
+      "ip\030% \001(\tB\033\n\031emu.grasscutter.net.protob\006p" +
+      "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -4549,7 +4692,7 @@ public final class RegionInfoOuterClass {
     internal_static_RegionInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RegionInfo_descriptor,
-        new java.lang.String[] { "GateserverIp", "GateserverPort", "PayCallbackUrl", "AreaType", "ResourceUrl", "DataUrl", "FeedbackUrl", "BulletinUrl", "ResourceUrlBak", "DataUrlBak", "ClientDataVersion", "HandbookUrl", "ClientSilenceDataVersion", "ClientDataMd5", "ClientSilenceDataMd5", "ResVersionConfig", "SecretKey", "OfficialCommunityUrl", "ClientVersionSuffix", "ClientSilenceVersionSuffix", "UseGateserverDomainName", "GateserverDomainName", "UserCenterUrl", "AccountBindUrl", "CdkeyUrl", "PrivacyPolicyUrl", "NextResourceUrl", "NextResVersionConfig", "GameBiz", });
+        new java.lang.String[] { "GateserverIp", "GateserverPort", "PayCallbackUrl", "AreaType", "ResourceUrl", "DataUrl", "FeedbackUrl", "BulletinUrl", "ResourceUrlBak", "DataUrlBak", "ClientDataVersion", "HandbookUrl", "ClientSilenceDataVersion", "ClientDataMd5", "ClientSilenceDataMd5", "ResVersionConfig", "SecretKey", "OfficialCommunityUrl", "ClientVersionSuffix", "ClientSilenceVersionSuffix", "UseGateserverDomainName", "GateserverDomainName", "UserCenterUrl", "AccountBindUrl", "CdkeyUrl", "PrivacyPolicyUrl", "NextResourceUrl", "NextResVersionConfig", "GameBiz", "GateserverIpv6Ip", });
     emu.grasscutter.net.proto.ResVersionConfigOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchInfoOuterClass.java
index 2a423b0ad..6ef3d2e53 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchInfoOuterClass.java
@@ -19,46 +19,42 @@ public final class RegionSearchInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 id = 10;</code>
-     * @return The id.
-     */
-    int getId();
-
-    /**
-     * <code>bool is_entered = 2;</code>
+     * <code>bool is_entered = 4;</code>
      * @return The isEntered.
      */
     boolean getIsEntered();
 
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     java.util.List<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch> 
         getRegionSearchListList();
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch getRegionSearchList(int index);
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     int getRegionSearchListCount();
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder> 
         getRegionSearchListOrBuilderList();
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder getRegionSearchListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 id = 11;</code>
+     * @return The id.
+     */
+    int getId();
   }
   /**
-   * <pre>
-   * Obf: DHHDMABOCLM
-   * </pre>
-   *
    * Protobuf type {@code RegionSearchInfo}
    */
   public static final class RegionSearchInfo extends
@@ -105,12 +101,12 @@ public final class RegionSearchInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 32: {
 
               isEntered_ = input.readBool();
               break;
             }
-            case 74: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 regionSearchList_ = new java.util.ArrayList<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch>();
                 mutable_bitField0_ |= 0x00000001;
@@ -119,7 +115,7 @@ public final class RegionSearchInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.parser(), extensionRegistry));
               break;
             }
-            case 80: {
+            case 88: {
 
               id_ = input.readUInt32();
               break;
@@ -159,21 +155,10 @@ public final class RegionSearchInfoOuterClass {
               emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo.class, emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo.Builder.class);
     }
 
-    public static final int ID_FIELD_NUMBER = 10;
-    private int id_;
-    /**
-     * <code>uint32 id = 10;</code>
-     * @return The id.
-     */
-    @java.lang.Override
-    public int getId() {
-      return id_;
-    }
-
-    public static final int IS_ENTERED_FIELD_NUMBER = 2;
+    public static final int IS_ENTERED_FIELD_NUMBER = 4;
     private boolean isEntered_;
     /**
-     * <code>bool is_entered = 2;</code>
+     * <code>bool is_entered = 4;</code>
      * @return The isEntered.
      */
     @java.lang.Override
@@ -181,17 +166,17 @@ public final class RegionSearchInfoOuterClass {
       return isEntered_;
     }
 
-    public static final int REGION_SEARCH_LIST_FIELD_NUMBER = 9;
+    public static final int REGION_SEARCH_LIST_FIELD_NUMBER = 8;
     private java.util.List<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch> regionSearchList_;
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch> getRegionSearchListList() {
       return regionSearchList_;
     }
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder> 
@@ -199,21 +184,21 @@ public final class RegionSearchInfoOuterClass {
       return regionSearchList_;
     }
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     @java.lang.Override
     public int getRegionSearchListCount() {
       return regionSearchList_.size();
     }
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch getRegionSearchList(int index) {
       return regionSearchList_.get(index);
     }
     /**
-     * <code>repeated .RegionSearch region_search_list = 9;</code>
+     * <code>repeated .RegionSearch region_search_list = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder getRegionSearchListOrBuilder(
@@ -221,6 +206,17 @@ public final class RegionSearchInfoOuterClass {
       return regionSearchList_.get(index);
     }
 
+    public static final int ID_FIELD_NUMBER = 11;
+    private int id_;
+    /**
+     * <code>uint32 id = 11;</code>
+     * @return The id.
+     */
+    @java.lang.Override
+    public int getId() {
+      return id_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -236,13 +232,13 @@ public final class RegionSearchInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isEntered_ != false) {
-        output.writeBool(2, isEntered_);
+        output.writeBool(4, isEntered_);
       }
       for (int i = 0; i < regionSearchList_.size(); i++) {
-        output.writeMessage(9, regionSearchList_.get(i));
+        output.writeMessage(8, regionSearchList_.get(i));
       }
       if (id_ != 0) {
-        output.writeUInt32(10, id_);
+        output.writeUInt32(11, id_);
       }
       unknownFields.writeTo(output);
     }
@@ -255,15 +251,15 @@ public final class RegionSearchInfoOuterClass {
       size = 0;
       if (isEntered_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isEntered_);
+          .computeBoolSize(4, isEntered_);
       }
       for (int i = 0; i < regionSearchList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, regionSearchList_.get(i));
+          .computeMessageSize(8, regionSearchList_.get(i));
       }
       if (id_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, id_);
+          .computeUInt32Size(11, id_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -280,12 +276,12 @@ public final class RegionSearchInfoOuterClass {
       }
       emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo other = (emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo) obj;
 
-      if (getId()
-          != other.getId()) return false;
       if (getIsEntered()
           != other.getIsEntered()) return false;
       if (!getRegionSearchListList()
           .equals(other.getRegionSearchListList())) return false;
+      if (getId()
+          != other.getId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -297,8 +293,6 @@ public final class RegionSearchInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ID_FIELD_NUMBER;
-      hash = (53 * hash) + getId();
       hash = (37 * hash) + IS_ENTERED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEntered());
@@ -306,6 +300,8 @@ public final class RegionSearchInfoOuterClass {
         hash = (37 * hash) + REGION_SEARCH_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getRegionSearchListList().hashCode();
       }
+      hash = (37 * hash) + ID_FIELD_NUMBER;
+      hash = (53 * hash) + getId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -402,10 +398,6 @@ public final class RegionSearchInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DHHDMABOCLM
-     * </pre>
-     *
      * Protobuf type {@code RegionSearchInfo}
      */
     public static final class Builder extends
@@ -444,8 +436,6 @@ public final class RegionSearchInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        id_ = 0;
-
         isEntered_ = false;
 
         if (regionSearchListBuilder_ == null) {
@@ -454,6 +444,8 @@ public final class RegionSearchInfoOuterClass {
         } else {
           regionSearchListBuilder_.clear();
         }
+        id_ = 0;
+
         return this;
       }
 
@@ -481,7 +473,6 @@ public final class RegionSearchInfoOuterClass {
       public emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo buildPartial() {
         emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo result = new emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo(this);
         int from_bitField0_ = bitField0_;
-        result.id_ = id_;
         result.isEntered_ = isEntered_;
         if (regionSearchListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
@@ -492,6 +483,7 @@ public final class RegionSearchInfoOuterClass {
         } else {
           result.regionSearchList_ = regionSearchListBuilder_.build();
         }
+        result.id_ = id_;
         onBuilt();
         return result;
       }
@@ -540,9 +532,6 @@ public final class RegionSearchInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo other) {
         if (other == emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo.getDefaultInstance()) return this;
-        if (other.getId() != 0) {
-          setId(other.getId());
-        }
         if (other.getIsEntered() != false) {
           setIsEntered(other.getIsEntered());
         }
@@ -572,6 +561,9 @@ public final class RegionSearchInfoOuterClass {
             }
           }
         }
+        if (other.getId() != 0) {
+          setId(other.getId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -602,40 +594,9 @@ public final class RegionSearchInfoOuterClass {
       }
       private int bitField0_;
 
-      private int id_ ;
-      /**
-       * <code>uint32 id = 10;</code>
-       * @return The id.
-       */
-      @java.lang.Override
-      public int getId() {
-        return id_;
-      }
-      /**
-       * <code>uint32 id = 10;</code>
-       * @param value The id to set.
-       * @return This builder for chaining.
-       */
-      public Builder setId(int value) {
-        
-        id_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearId() {
-        
-        id_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isEntered_ ;
       /**
-       * <code>bool is_entered = 2;</code>
+       * <code>bool is_entered = 4;</code>
        * @return The isEntered.
        */
       @java.lang.Override
@@ -643,7 +604,7 @@ public final class RegionSearchInfoOuterClass {
         return isEntered_;
       }
       /**
-       * <code>bool is_entered = 2;</code>
+       * <code>bool is_entered = 4;</code>
        * @param value The isEntered to set.
        * @return This builder for chaining.
        */
@@ -654,7 +615,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>bool is_entered = 2;</code>
+       * <code>bool is_entered = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsEntered() {
@@ -677,7 +638,7 @@ public final class RegionSearchInfoOuterClass {
           emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder> regionSearchListBuilder_;
 
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch> getRegionSearchListList() {
         if (regionSearchListBuilder_ == null) {
@@ -687,7 +648,7 @@ public final class RegionSearchInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public int getRegionSearchListCount() {
         if (regionSearchListBuilder_ == null) {
@@ -697,7 +658,7 @@ public final class RegionSearchInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch getRegionSearchList(int index) {
         if (regionSearchListBuilder_ == null) {
@@ -707,7 +668,7 @@ public final class RegionSearchInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder setRegionSearchList(
           int index, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch value) {
@@ -724,7 +685,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder setRegionSearchList(
           int index, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder builderForValue) {
@@ -738,7 +699,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder addRegionSearchList(emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch value) {
         if (regionSearchListBuilder_ == null) {
@@ -754,7 +715,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder addRegionSearchList(
           int index, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch value) {
@@ -771,7 +732,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder addRegionSearchList(
           emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder builderForValue) {
@@ -785,7 +746,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder addRegionSearchList(
           int index, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder builderForValue) {
@@ -799,7 +760,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder addAllRegionSearchList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch> values) {
@@ -814,7 +775,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder clearRegionSearchList() {
         if (regionSearchListBuilder_ == null) {
@@ -827,7 +788,7 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public Builder removeRegionSearchList(int index) {
         if (regionSearchListBuilder_ == null) {
@@ -840,14 +801,14 @@ public final class RegionSearchInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder getRegionSearchListBuilder(
           int index) {
         return getRegionSearchListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder getRegionSearchListOrBuilder(
           int index) {
@@ -857,7 +818,7 @@ public final class RegionSearchInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearchOrBuilder> 
            getRegionSearchListOrBuilderList() {
@@ -868,14 +829,14 @@ public final class RegionSearchInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder addRegionSearchListBuilder() {
         return getRegionSearchListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.getDefaultInstance());
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder addRegionSearchListBuilder(
           int index) {
@@ -883,7 +844,7 @@ public final class RegionSearchInfoOuterClass {
             index, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.getDefaultInstance());
       }
       /**
-       * <code>repeated .RegionSearch region_search_list = 9;</code>
+       * <code>repeated .RegionSearch region_search_list = 8;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder> 
            getRegionSearchListBuilderList() {
@@ -903,6 +864,37 @@ public final class RegionSearchInfoOuterClass {
         }
         return regionSearchListBuilder_;
       }
+
+      private int id_ ;
+      /**
+       * <code>uint32 id = 11;</code>
+       * @return The id.
+       */
+      @java.lang.Override
+      public int getId() {
+        return id_;
+      }
+      /**
+       * <code>uint32 id = 11;</code>
+       * @param value The id to set.
+       * @return This builder for chaining.
+       */
+      public Builder setId(int value) {
+        
+        id_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearId() {
+        
+        id_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -971,9 +963,9 @@ public final class RegionSearchInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026RegionSearchInfo.proto\032\022RegionSearch.p" +
-      "roto\"]\n\020RegionSearchInfo\022\n\n\002id\030\n \001(\r\022\022\n\n" +
-      "is_entered\030\002 \001(\010\022)\n\022region_search_list\030\t" +
-      " \003(\0132\r.RegionSearchB\033\n\031emu.grasscutter.n" +
+      "roto\"]\n\020RegionSearchInfo\022\022\n\nis_entered\030\004" +
+      " \001(\010\022)\n\022region_search_list\030\010 \003(\0132\r.Regio" +
+      "nSearch\022\n\n\002id\030\013 \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -986,7 +978,7 @@ public final class RegionSearchInfoOuterClass {
     internal_static_RegionSearchInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RegionSearchInfo_descriptor,
-        new java.lang.String[] { "Id", "IsEntered", "RegionSearchList", });
+        new java.lang.String[] { "IsEntered", "RegionSearchList", "Id", });
     emu.grasscutter.net.proto.RegionSearchOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchNotifyOuterClass.java
index dd764b9d9..d86544458 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchNotifyOuterClass.java
@@ -18,6 +18,12 @@ public final class RegionSearchNotifyOuterClass {
       // @@protoc_insertion_point(interface_extends:RegionSearchNotify)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>uint32 uid = 5;</code>
+     * @return The uid.
+     */
+    int getUid();
+
     /**
      * <code>repeated .RegionSearchInfo region_search_list = 14;</code>
      */
@@ -41,19 +47,8 @@ public final class RegionSearchNotifyOuterClass {
      */
     emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfoOrBuilder getRegionSearchListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 uid = 12;</code>
-     * @return The uid.
-     */
-    int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 26579
-   * Obf: HMHCLDNPMJI
-   * </pre>
-   *
    * Protobuf type {@code RegionSearchNotify}
    */
   public static final class RegionSearchNotify extends
@@ -100,7 +95,7 @@ public final class RegionSearchNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 40: {
 
               uid_ = input.readUInt32();
               break;
@@ -149,6 +144,17 @@ public final class RegionSearchNotifyOuterClass {
               emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify.class, emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify.Builder.class);
     }
 
+    public static final int UID_FIELD_NUMBER = 5;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 5;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
     public static final int REGION_SEARCH_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo> regionSearchList_;
     /**
@@ -189,17 +195,6 @@ public final class RegionSearchNotifyOuterClass {
       return regionSearchList_.get(index);
     }
 
-    public static final int UID_FIELD_NUMBER = 12;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 12;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -215,7 +210,7 @@ public final class RegionSearchNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (uid_ != 0) {
-        output.writeUInt32(12, uid_);
+        output.writeUInt32(5, uid_);
       }
       for (int i = 0; i < regionSearchList_.size(); i++) {
         output.writeMessage(14, regionSearchList_.get(i));
@@ -231,7 +226,7 @@ public final class RegionSearchNotifyOuterClass {
       size = 0;
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, uid_);
+          .computeUInt32Size(5, uid_);
       }
       for (int i = 0; i < regionSearchList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
@@ -252,10 +247,10 @@ public final class RegionSearchNotifyOuterClass {
       }
       emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify other = (emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify) obj;
 
-      if (!getRegionSearchListList()
-          .equals(other.getRegionSearchListList())) return false;
       if (getUid()
           != other.getUid()) return false;
+      if (!getRegionSearchListList()
+          .equals(other.getRegionSearchListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class RegionSearchNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       if (getRegionSearchListCount() > 0) {
         hash = (37 * hash) + REGION_SEARCH_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getRegionSearchListList().hashCode();
       }
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class RegionSearchNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26579
-     * Obf: HMHCLDNPMJI
-     * </pre>
-     *
      * Protobuf type {@code RegionSearchNotify}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class RegionSearchNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        uid_ = 0;
+
         if (regionSearchListBuilder_ == null) {
           regionSearchList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           regionSearchListBuilder_.clear();
         }
-        uid_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class RegionSearchNotifyOuterClass {
       public emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify buildPartial() {
         emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify result = new emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify(this);
         int from_bitField0_ = bitField0_;
+        result.uid_ = uid_;
         if (regionSearchListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             regionSearchList_ = java.util.Collections.unmodifiableList(regionSearchList_);
@@ -456,7 +447,6 @@ public final class RegionSearchNotifyOuterClass {
         } else {
           result.regionSearchList_ = regionSearchListBuilder_.build();
         }
-        result.uid_ = uid_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class RegionSearchNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify other) {
         if (other == emu.grasscutter.net.proto.RegionSearchNotifyOuterClass.RegionSearchNotify.getDefaultInstance()) return this;
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         if (regionSearchListBuilder_ == null) {
           if (!other.regionSearchList_.isEmpty()) {
             if (regionSearchList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class RegionSearchNotifyOuterClass {
             }
           }
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class RegionSearchNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.RegionSearchInfoOuterClass.RegionSearchInfo> regionSearchList_ =
         java.util.Collections.emptyList();
       private void ensureRegionSearchListIsMutable() {
@@ -803,37 +824,6 @@ public final class RegionSearchNotifyOuterClass {
         }
         return regionSearchListBuilder_;
       }
-
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 12;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 12;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -902,9 +892,9 @@ public final class RegionSearchNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030RegionSearchNotify.proto\032\026RegionSearch" +
-      "Info.proto\"P\n\022RegionSearchNotify\022-\n\022regi" +
-      "on_search_list\030\016 \003(\0132\021.RegionSearchInfo\022" +
-      "\013\n\003uid\030\014 \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "Info.proto\"P\n\022RegionSearchNotify\022\013\n\003uid\030" +
+      "\005 \001(\r\022-\n\022region_search_list\030\016 \003(\0132\021.Regi" +
+      "onSearchInfoB\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -917,7 +907,7 @@ public final class RegionSearchNotifyOuterClass {
     internal_static_RegionSearchNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RegionSearchNotify_descriptor,
-        new java.lang.String[] { "RegionSearchList", "Uid", });
+        new java.lang.String[] { "Uid", "RegionSearchList", });
     emu.grasscutter.net.proto.RegionSearchInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchOuterClass.java
index 99c58135d..ee7e636f7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchOuterClass.java
@@ -19,39 +19,35 @@ public final class RegionSearchOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 progress = 4;</code>
-     * @return The progress.
-     */
-    int getProgress();
-
-    /**
-     * <code>.RegionSearchState state = 5;</code>
-     * @return The enum numeric value on the wire for state.
-     */
-    int getStateValue();
-    /**
-     * <code>.RegionSearchState state = 5;</code>
-     * @return The state.
-     */
-    emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState getState();
-
-    /**
-     * <code>bool is_entered = 13;</code>
+     * <code>bool is_entered = 1;</code>
      * @return The isEntered.
      */
     boolean getIsEntered();
 
     /**
-     * <code>uint32 region_search_id = 7;</code>
+     * <code>uint32 region_search_id = 6;</code>
      * @return The regionSearchId.
      */
     int getRegionSearchId();
+
+    /**
+     * <code>uint32 progress = 13;</code>
+     * @return The progress.
+     */
+    int getProgress();
+
+    /**
+     * <code>.RegionSearchState state = 14;</code>
+     * @return The enum numeric value on the wire for state.
+     */
+    int getStateValue();
+    /**
+     * <code>.RegionSearchState state = 14;</code>
+     * @return The state.
+     */
+    emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState getState();
   }
   /**
-   * <pre>
-   * Obf: HFKBIABFDBJ
-   * </pre>
-   *
    * Protobuf type {@code RegionSearch}
    */
   public static final class RegionSearch extends
@@ -97,25 +93,25 @@ public final class RegionSearchOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
-              progress_ = input.readUInt32();
+              isEntered_ = input.readBool();
               break;
             }
-            case 40: {
-              int rawValue = input.readEnum();
-
-              state_ = rawValue;
-              break;
-            }
-            case 56: {
+            case 48: {
 
               regionSearchId_ = input.readUInt32();
               break;
             }
             case 104: {
 
-              isEntered_ = input.readBool();
+              progress_ = input.readUInt32();
+              break;
+            }
+            case 112: {
+              int rawValue = input.readEnum();
+
+              state_ = rawValue;
               break;
             }
             default: {
@@ -150,40 +146,10 @@ public final class RegionSearchOuterClass {
               emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.class, emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.Builder.class);
     }
 
-    public static final int PROGRESS_FIELD_NUMBER = 4;
-    private int progress_;
-    /**
-     * <code>uint32 progress = 4;</code>
-     * @return The progress.
-     */
-    @java.lang.Override
-    public int getProgress() {
-      return progress_;
-    }
-
-    public static final int STATE_FIELD_NUMBER = 5;
-    private int state_;
-    /**
-     * <code>.RegionSearchState state = 5;</code>
-     * @return The enum numeric value on the wire for state.
-     */
-    @java.lang.Override public int getStateValue() {
-      return state_;
-    }
-    /**
-     * <code>.RegionSearchState state = 5;</code>
-     * @return The state.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState getState() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState result = emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.valueOf(state_);
-      return result == null ? emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.UNRECOGNIZED : result;
-    }
-
-    public static final int IS_ENTERED_FIELD_NUMBER = 13;
+    public static final int IS_ENTERED_FIELD_NUMBER = 1;
     private boolean isEntered_;
     /**
-     * <code>bool is_entered = 13;</code>
+     * <code>bool is_entered = 1;</code>
      * @return The isEntered.
      */
     @java.lang.Override
@@ -191,10 +157,10 @@ public final class RegionSearchOuterClass {
       return isEntered_;
     }
 
-    public static final int REGION_SEARCH_ID_FIELD_NUMBER = 7;
+    public static final int REGION_SEARCH_ID_FIELD_NUMBER = 6;
     private int regionSearchId_;
     /**
-     * <code>uint32 region_search_id = 7;</code>
+     * <code>uint32 region_search_id = 6;</code>
      * @return The regionSearchId.
      */
     @java.lang.Override
@@ -202,6 +168,36 @@ public final class RegionSearchOuterClass {
       return regionSearchId_;
     }
 
+    public static final int PROGRESS_FIELD_NUMBER = 13;
+    private int progress_;
+    /**
+     * <code>uint32 progress = 13;</code>
+     * @return The progress.
+     */
+    @java.lang.Override
+    public int getProgress() {
+      return progress_;
+    }
+
+    public static final int STATE_FIELD_NUMBER = 14;
+    private int state_;
+    /**
+     * <code>.RegionSearchState state = 14;</code>
+     * @return The enum numeric value on the wire for state.
+     */
+    @java.lang.Override public int getStateValue() {
+      return state_;
+    }
+    /**
+     * <code>.RegionSearchState state = 14;</code>
+     * @return The state.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState getState() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState result = emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.valueOf(state_);
+      return result == null ? emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -216,17 +212,17 @@ public final class RegionSearchOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (progress_ != 0) {
-        output.writeUInt32(4, progress_);
-      }
-      if (state_ != emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.REGION_SEARCH_NONE.getNumber()) {
-        output.writeEnum(5, state_);
+      if (isEntered_ != false) {
+        output.writeBool(1, isEntered_);
       }
       if (regionSearchId_ != 0) {
-        output.writeUInt32(7, regionSearchId_);
+        output.writeUInt32(6, regionSearchId_);
       }
-      if (isEntered_ != false) {
-        output.writeBool(13, isEntered_);
+      if (progress_ != 0) {
+        output.writeUInt32(13, progress_);
+      }
+      if (state_ != emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.REGION_SEARCH_NONE.getNumber()) {
+        output.writeEnum(14, state_);
       }
       unknownFields.writeTo(output);
     }
@@ -237,21 +233,21 @@ public final class RegionSearchOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (progress_ != 0) {
+      if (isEntered_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, progress_);
-      }
-      if (state_ != emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.REGION_SEARCH_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, state_);
+          .computeBoolSize(1, isEntered_);
       }
       if (regionSearchId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, regionSearchId_);
+          .computeUInt32Size(6, regionSearchId_);
       }
-      if (isEntered_ != false) {
+      if (progress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isEntered_);
+          .computeUInt32Size(13, progress_);
+      }
+      if (state_ != emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.REGION_SEARCH_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(14, state_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -268,13 +264,13 @@ public final class RegionSearchOuterClass {
       }
       emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch other = (emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch) obj;
 
-      if (getProgress()
-          != other.getProgress()) return false;
-      if (state_ != other.state_) return false;
       if (getIsEntered()
           != other.getIsEntered()) return false;
       if (getRegionSearchId()
           != other.getRegionSearchId()) return false;
+      if (getProgress()
+          != other.getProgress()) return false;
+      if (state_ != other.state_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -286,15 +282,15 @@ public final class RegionSearchOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getProgress();
-      hash = (37 * hash) + STATE_FIELD_NUMBER;
-      hash = (53 * hash) + state_;
       hash = (37 * hash) + IS_ENTERED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEntered());
       hash = (37 * hash) + REGION_SEARCH_ID_FIELD_NUMBER;
       hash = (53 * hash) + getRegionSearchId();
+      hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getProgress();
+      hash = (37 * hash) + STATE_FIELD_NUMBER;
+      hash = (53 * hash) + state_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -391,10 +387,6 @@ public final class RegionSearchOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HFKBIABFDBJ
-     * </pre>
-     *
      * Protobuf type {@code RegionSearch}
      */
     public static final class Builder extends
@@ -432,14 +424,14 @@ public final class RegionSearchOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        progress_ = 0;
-
-        state_ = 0;
-
         isEntered_ = false;
 
         regionSearchId_ = 0;
 
+        progress_ = 0;
+
+        state_ = 0;
+
         return this;
       }
 
@@ -466,10 +458,10 @@ public final class RegionSearchOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch buildPartial() {
         emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch result = new emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch(this);
-        result.progress_ = progress_;
-        result.state_ = state_;
         result.isEntered_ = isEntered_;
         result.regionSearchId_ = regionSearchId_;
+        result.progress_ = progress_;
+        result.state_ = state_;
         onBuilt();
         return result;
       }
@@ -518,18 +510,18 @@ public final class RegionSearchOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch other) {
         if (other == emu.grasscutter.net.proto.RegionSearchOuterClass.RegionSearch.getDefaultInstance()) return this;
-        if (other.getProgress() != 0) {
-          setProgress(other.getProgress());
-        }
-        if (other.state_ != 0) {
-          setStateValue(other.getStateValue());
-        }
         if (other.getIsEntered() != false) {
           setIsEntered(other.getIsEntered());
         }
         if (other.getRegionSearchId() != 0) {
           setRegionSearchId(other.getRegionSearchId());
         }
+        if (other.getProgress() != 0) {
+          setProgress(other.getProgress());
+        }
+        if (other.state_ != 0) {
+          setStateValue(other.getStateValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -559,9 +551,71 @@ public final class RegionSearchOuterClass {
         return this;
       }
 
+      private boolean isEntered_ ;
+      /**
+       * <code>bool is_entered = 1;</code>
+       * @return The isEntered.
+       */
+      @java.lang.Override
+      public boolean getIsEntered() {
+        return isEntered_;
+      }
+      /**
+       * <code>bool is_entered = 1;</code>
+       * @param value The isEntered to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsEntered(boolean value) {
+        
+        isEntered_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_entered = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsEntered() {
+        
+        isEntered_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int regionSearchId_ ;
+      /**
+       * <code>uint32 region_search_id = 6;</code>
+       * @return The regionSearchId.
+       */
+      @java.lang.Override
+      public int getRegionSearchId() {
+        return regionSearchId_;
+      }
+      /**
+       * <code>uint32 region_search_id = 6;</code>
+       * @param value The regionSearchId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRegionSearchId(int value) {
+        
+        regionSearchId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 region_search_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRegionSearchId() {
+        
+        regionSearchId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int progress_ ;
       /**
-       * <code>uint32 progress = 4;</code>
+       * <code>uint32 progress = 13;</code>
        * @return The progress.
        */
       @java.lang.Override
@@ -569,7 +623,7 @@ public final class RegionSearchOuterClass {
         return progress_;
       }
       /**
-       * <code>uint32 progress = 4;</code>
+       * <code>uint32 progress = 13;</code>
        * @param value The progress to set.
        * @return This builder for chaining.
        */
@@ -580,7 +634,7 @@ public final class RegionSearchOuterClass {
         return this;
       }
       /**
-       * <code>uint32 progress = 4;</code>
+       * <code>uint32 progress = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearProgress() {
@@ -592,14 +646,14 @@ public final class RegionSearchOuterClass {
 
       private int state_ = 0;
       /**
-       * <code>.RegionSearchState state = 5;</code>
+       * <code>.RegionSearchState state = 14;</code>
        * @return The enum numeric value on the wire for state.
        */
       @java.lang.Override public int getStateValue() {
         return state_;
       }
       /**
-       * <code>.RegionSearchState state = 5;</code>
+       * <code>.RegionSearchState state = 14;</code>
        * @param value The enum numeric value on the wire for state to set.
        * @return This builder for chaining.
        */
@@ -610,7 +664,7 @@ public final class RegionSearchOuterClass {
         return this;
       }
       /**
-       * <code>.RegionSearchState state = 5;</code>
+       * <code>.RegionSearchState state = 14;</code>
        * @return The state.
        */
       @java.lang.Override
@@ -620,7 +674,7 @@ public final class RegionSearchOuterClass {
         return result == null ? emu.grasscutter.net.proto.RegionSearchStateOuterClass.RegionSearchState.UNRECOGNIZED : result;
       }
       /**
-       * <code>.RegionSearchState state = 5;</code>
+       * <code>.RegionSearchState state = 14;</code>
        * @param value The state to set.
        * @return This builder for chaining.
        */
@@ -634,7 +688,7 @@ public final class RegionSearchOuterClass {
         return this;
       }
       /**
-       * <code>.RegionSearchState state = 5;</code>
+       * <code>.RegionSearchState state = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearState() {
@@ -643,68 +697,6 @@ public final class RegionSearchOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean isEntered_ ;
-      /**
-       * <code>bool is_entered = 13;</code>
-       * @return The isEntered.
-       */
-      @java.lang.Override
-      public boolean getIsEntered() {
-        return isEntered_;
-      }
-      /**
-       * <code>bool is_entered = 13;</code>
-       * @param value The isEntered to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsEntered(boolean value) {
-        
-        isEntered_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_entered = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsEntered() {
-        
-        isEntered_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int regionSearchId_ ;
-      /**
-       * <code>uint32 region_search_id = 7;</code>
-       * @return The regionSearchId.
-       */
-      @java.lang.Override
-      public int getRegionSearchId() {
-        return regionSearchId_;
-      }
-      /**
-       * <code>uint32 region_search_id = 7;</code>
-       * @param value The regionSearchId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRegionSearchId(int value) {
-        
-        regionSearchId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 region_search_id = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRegionSearchId() {
-        
-        regionSearchId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -773,9 +765,9 @@ public final class RegionSearchOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022RegionSearch.proto\032\027RegionSearchState." +
-      "proto\"q\n\014RegionSearch\022\020\n\010progress\030\004 \001(\r\022" +
-      "!\n\005state\030\005 \001(\0162\022.RegionSearchState\022\022\n\nis" +
-      "_entered\030\r \001(\010\022\030\n\020region_search_id\030\007 \001(\r" +
+      "proto\"q\n\014RegionSearch\022\022\n\nis_entered\030\001 \001(" +
+      "\010\022\030\n\020region_search_id\030\006 \001(\r\022\020\n\010progress\030" +
+      "\r \001(\r\022!\n\005state\030\016 \001(\0162\022.RegionSearchState" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -788,7 +780,7 @@ public final class RegionSearchOuterClass {
     internal_static_RegionSearch_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_RegionSearch_descriptor,
-        new java.lang.String[] { "Progress", "State", "IsEntered", "RegionSearchId", });
+        new java.lang.String[] { "IsEntered", "RegionSearchId", "Progress", "State", });
     emu.grasscutter.net.proto.RegionSearchStateOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchStateOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchStateOuterClass.java
index dcab576ed..505c17df0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchStateOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionSearchStateOuterClass.java
@@ -15,10 +15,6 @@ public final class RegionSearchStateOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: PNAKDNOMNOP
-   * </pre>
-   *
    * Protobuf enum {@code RegionSearchState}
    */
   public enum RegionSearchState
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RegionSimpleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RegionSimpleInfoOuterClass.java
index ba7fc50b6..2b2fc9b90 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RegionSimpleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RegionSimpleInfoOuterClass.java
@@ -67,10 +67,6 @@ public final class RegionSimpleInfoOuterClass {
         getDispatchUrlBytes();
   }
   /**
-   * <pre>
-   * Obf: KHPGILKGEPP
-   * </pre>
-   *
    * Protobuf type {@code RegionSimpleInfo}
    */
   public static final class RegionSimpleInfo extends
@@ -512,10 +508,6 @@ public final class RegionSimpleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KHPGILKGEPP
-     * </pre>
-     *
      * Protobuf type {@code RegionSimpleInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryOuterClass.java
index a39076a0d..79e91ce89 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ReliquaryOuterClass.java
@@ -60,10 +60,6 @@ public final class ReliquaryOuterClass {
     int getAppendPropIdList(int index);
   }
   /**
-   * <pre>
-   * Obf: EGIJNLNKCFH
-   * </pre>
-   *
    * Protobuf type {@code Reliquary}
    */
   public static final class Reliquary extends
@@ -475,10 +471,6 @@ public final class ReliquaryOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EGIJNLNKCFH
-     * </pre>
-     *
      * Protobuf type {@code Reliquary}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RemotePlayerWidgetNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RemotePlayerWidgetNotifyOuterClass.java
index 97cd10849..7f552055e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RemotePlayerWidgetNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RemotePlayerWidgetNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class RemotePlayerWidgetNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> 
         getPlayerWidgetInfoListList();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index);
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     int getPlayerWidgetInfoListCount();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
         getPlayerWidgetInfoListOrBuilderList();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 20779
-   * Obf: AFCIEABPDJE
-   * </pre>
-   *
    * Protobuf type {@code RemotePlayerWidgetNotify}
    */
   public static final class RemotePlayerWidgetNotify extends
@@ -94,7 +89,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerWidgetInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class RemotePlayerWidgetNotifyOuterClass {
               emu.grasscutter.net.proto.RemotePlayerWidgetNotifyOuterClass.RemotePlayerWidgetNotify.class, emu.grasscutter.net.proto.RemotePlayerWidgetNotifyOuterClass.RemotePlayerWidgetNotify.Builder.class);
     }
 
-    public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 4;
+    public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> playerWidgetInfoList_;
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> getPlayerWidgetInfoListList() {
       return playerWidgetInfoList_;
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class RemotePlayerWidgetNotifyOuterClass {
       return playerWidgetInfoList_;
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     @java.lang.Override
     public int getPlayerWidgetInfoListCount() {
       return playerWidgetInfoList_.size();
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
       return playerWidgetInfoList_.get(index);
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
-        output.writeMessage(4, playerWidgetInfoList_.get(i));
+        output.writeMessage(9, playerWidgetInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
       size = 0;
       for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, playerWidgetInfoList_.get(i));
+          .computeMessageSize(9, playerWidgetInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class RemotePlayerWidgetNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20779
-     * Obf: AFCIEABPDJE
-     * </pre>
-     *
      * Protobuf type {@code RemotePlayerWidgetNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
           emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> playerWidgetInfoListBuilder_;
 
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> getPlayerWidgetInfoListList() {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public int getPlayerWidgetInfoListCount() {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder setPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -585,7 +575,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder setPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder addPlayerWidgetInfoList(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder addPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -632,7 +622,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder addPlayerWidgetInfoList(
           emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder addPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder addAllPlayerWidgetInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> values) {
@@ -675,7 +665,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder clearPlayerWidgetInfoList() {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public Builder removePlayerWidgetInfoList(int index) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder getPlayerWidgetInfoListBuilder(
           int index) {
         return getPlayerWidgetInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
            getPlayerWidgetInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class RemotePlayerWidgetNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder() {
         return getPlayerWidgetInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 4;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder> 
            getPlayerWidgetInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class RemotePlayerWidgetNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036RemotePlayerWidgetNotify.proto\032\026Player" +
       "WidgetInfo.proto\"N\n\030RemotePlayerWidgetNo" +
-      "tify\0222\n\027player_widget_info_list\030\004 \003(\0132\021." +
+      "tify\0222\n\027player_widget_info_list\030\t \003(\0132\021." +
       "PlayerWidgetInfoB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ResVersionConfigOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ResVersionConfigOuterClass.java
index 24b7ba19e..b30bacab2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ResVersionConfigOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ResVersionConfigOuterClass.java
@@ -91,10 +91,6 @@ public final class ResVersionConfigOuterClass {
         getNextScriptVersionBytes();
   }
   /**
-   * <pre>
-   * Obf: DPBFMJOKIMN
-   * </pre>
-   *
    * Protobuf type {@code ResVersionConfig}
    */
   public static final class ResVersionConfig extends
@@ -646,10 +642,6 @@ public final class ResVersionConfigOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DPBFMJOKIMN
-     * </pre>
-     *
      * Protobuf type {@code ResVersionConfig}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ResinCardOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ResinCardOuterClass.java
new file mode 100644
index 000000000..e469b6eec
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ResinCardOuterClass.java
@@ -0,0 +1,1216 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ResinCard.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ResinCardOuterClass {
+  private ResinCardOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface ResinCardOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:ResinCard)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getBaseItemListList();
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index);
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    int getBaseItemListCount();
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getBaseItemListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getPerDayItemListList();
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index);
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    int getPerDayItemListCount();
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getPerDayItemListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
+        int index);
+  }
+  /**
+   * Protobuf type {@code ResinCard}
+   */
+  public static final class ResinCard extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:ResinCard)
+      ResinCardOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use ResinCard.newBuilder() to construct.
+    private ResinCard(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private ResinCard() {
+      baseItemList_ = java.util.Collections.emptyList();
+      perDayItemList_ = java.util.Collections.emptyList();
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new ResinCard();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private ResinCard(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                baseItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              baseItemList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                perDayItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              perDayItemList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          baseItemList_ = java.util.Collections.unmodifiableList(baseItemList_);
+        }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          perDayItemList_ = java.util.Collections.unmodifiableList(perDayItemList_);
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ResinCardOuterClass.internal_static_ResinCard_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.ResinCardOuterClass.internal_static_ResinCard_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.class, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder.class);
+    }
+
+    public static final int BASE_ITEM_LIST_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> baseItemList_;
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getBaseItemListList() {
+      return baseItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getBaseItemListOrBuilderList() {
+      return baseItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public int getBaseItemListCount() {
+      return baseItemList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index) {
+      return baseItemList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam base_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
+        int index) {
+      return baseItemList_.get(index);
+    }
+
+    public static final int PER_DAY_ITEM_LIST_FIELD_NUMBER = 2;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> perDayItemList_;
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getPerDayItemListList() {
+      return perDayItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getPerDayItemListOrBuilderList() {
+      return perDayItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    @java.lang.Override
+    public int getPerDayItemListCount() {
+      return perDayItemList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index) {
+      return perDayItemList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam per_day_item_list = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
+        int index) {
+      return perDayItemList_.get(index);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      for (int i = 0; i < baseItemList_.size(); i++) {
+        output.writeMessage(1, baseItemList_.get(i));
+      }
+      for (int i = 0; i < perDayItemList_.size(); i++) {
+        output.writeMessage(2, perDayItemList_.get(i));
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      for (int i = 0; i < baseItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(1, baseItemList_.get(i));
+      }
+      for (int i = 0; i < perDayItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, perDayItemList_.get(i));
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard other = (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) obj;
+
+      if (!getBaseItemListList()
+          .equals(other.getBaseItemListList())) return false;
+      if (!getPerDayItemListList()
+          .equals(other.getPerDayItemListList())) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      if (getBaseItemListCount() > 0) {
+        hash = (37 * hash) + BASE_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getBaseItemListList().hashCode();
+      }
+      if (getPerDayItemListCount() > 0) {
+        hash = (37 * hash) + PER_DAY_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPerDayItemListList().hashCode();
+      }
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code ResinCard}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:ResinCard)
+        emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.ResinCardOuterClass.internal_static_ResinCard_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.ResinCardOuterClass.internal_static_ResinCard_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.class, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+          getBaseItemListFieldBuilder();
+          getPerDayItemListFieldBuilder();
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        if (baseItemListBuilder_ == null) {
+          baseItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          baseItemListBuilder_.clear();
+        }
+        if (perDayItemListBuilder_ == null) {
+          perDayItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          perDayItemListBuilder_.clear();
+        }
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.ResinCardOuterClass.internal_static_ResinCard_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard build() {
+        emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard buildPartial() {
+        emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard result = new emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard(this);
+        int from_bitField0_ = bitField0_;
+        if (baseItemListBuilder_ == null) {
+          if (((bitField0_ & 0x00000001) != 0)) {
+            baseItemList_ = java.util.Collections.unmodifiableList(baseItemList_);
+            bitField0_ = (bitField0_ & ~0x00000001);
+          }
+          result.baseItemList_ = baseItemList_;
+        } else {
+          result.baseItemList_ = baseItemListBuilder_.build();
+        }
+        if (perDayItemListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            perDayItemList_ = java.util.Collections.unmodifiableList(perDayItemList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.perDayItemList_ = perDayItemList_;
+        } else {
+          result.perDayItemList_ = perDayItemListBuilder_.build();
+        }
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) {
+          return mergeFrom((emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard other) {
+        if (other == emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance()) return this;
+        if (baseItemListBuilder_ == null) {
+          if (!other.baseItemList_.isEmpty()) {
+            if (baseItemList_.isEmpty()) {
+              baseItemList_ = other.baseItemList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+            } else {
+              ensureBaseItemListIsMutable();
+              baseItemList_.addAll(other.baseItemList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.baseItemList_.isEmpty()) {
+            if (baseItemListBuilder_.isEmpty()) {
+              baseItemListBuilder_.dispose();
+              baseItemListBuilder_ = null;
+              baseItemList_ = other.baseItemList_;
+              bitField0_ = (bitField0_ & ~0x00000001);
+              baseItemListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getBaseItemListFieldBuilder() : null;
+            } else {
+              baseItemListBuilder_.addAllMessages(other.baseItemList_);
+            }
+          }
+        }
+        if (perDayItemListBuilder_ == null) {
+          if (!other.perDayItemList_.isEmpty()) {
+            if (perDayItemList_.isEmpty()) {
+              perDayItemList_ = other.perDayItemList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensurePerDayItemListIsMutable();
+              perDayItemList_.addAll(other.perDayItemList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.perDayItemList_.isEmpty()) {
+            if (perDayItemListBuilder_.isEmpty()) {
+              perDayItemListBuilder_.dispose();
+              perDayItemListBuilder_ = null;
+              perDayItemList_ = other.perDayItemList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              perDayItemListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getPerDayItemListFieldBuilder() : null;
+            } else {
+              perDayItemListBuilder_.addAllMessages(other.perDayItemList_);
+            }
+          }
+        }
+        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.ResinCardOuterClass.ResinCard parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> baseItemList_ =
+        java.util.Collections.emptyList();
+      private void ensureBaseItemListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          baseItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(baseItemList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> baseItemListBuilder_;
+
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getBaseItemListList() {
+        if (baseItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(baseItemList_);
+        } else {
+          return baseItemListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public int getBaseItemListCount() {
+        if (baseItemListBuilder_ == null) {
+          return baseItemList_.size();
+        } else {
+          return baseItemListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index) {
+        if (baseItemListBuilder_ == null) {
+          return baseItemList_.get(index);
+        } else {
+          return baseItemListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder setBaseItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (baseItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBaseItemListIsMutable();
+          baseItemList_.set(index, value);
+          onChanged();
+        } else {
+          baseItemListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder setBaseItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (baseItemListBuilder_ == null) {
+          ensureBaseItemListIsMutable();
+          baseItemList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          baseItemListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder addBaseItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (baseItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBaseItemListIsMutable();
+          baseItemList_.add(value);
+          onChanged();
+        } else {
+          baseItemListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder addBaseItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (baseItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureBaseItemListIsMutable();
+          baseItemList_.add(index, value);
+          onChanged();
+        } else {
+          baseItemListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder addBaseItemList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (baseItemListBuilder_ == null) {
+          ensureBaseItemListIsMutable();
+          baseItemList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          baseItemListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder addBaseItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (baseItemListBuilder_ == null) {
+          ensureBaseItemListIsMutable();
+          baseItemList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          baseItemListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder addAllBaseItemList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (baseItemListBuilder_ == null) {
+          ensureBaseItemListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, baseItemList_);
+          onChanged();
+        } else {
+          baseItemListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder clearBaseItemList() {
+        if (baseItemListBuilder_ == null) {
+          baseItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          baseItemListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public Builder removeBaseItemList(int index) {
+        if (baseItemListBuilder_ == null) {
+          ensureBaseItemListIsMutable();
+          baseItemList_.remove(index);
+          onChanged();
+        } else {
+          baseItemListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getBaseItemListBuilder(
+          int index) {
+        return getBaseItemListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
+          int index) {
+        if (baseItemListBuilder_ == null) {
+          return baseItemList_.get(index);  } else {
+          return baseItemListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getBaseItemListOrBuilderList() {
+        if (baseItemListBuilder_ != null) {
+          return baseItemListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(baseItemList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addBaseItemListBuilder() {
+        return getBaseItemListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addBaseItemListBuilder(
+          int index) {
+        return getBaseItemListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam base_item_list = 1;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getBaseItemListBuilderList() {
+        return getBaseItemListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getBaseItemListFieldBuilder() {
+        if (baseItemListBuilder_ == null) {
+          baseItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  baseItemList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          baseItemList_ = null;
+        }
+        return baseItemListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> perDayItemList_ =
+        java.util.Collections.emptyList();
+      private void ensurePerDayItemListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          perDayItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(perDayItemList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> perDayItemListBuilder_;
+
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getPerDayItemListList() {
+        if (perDayItemListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(perDayItemList_);
+        } else {
+          return perDayItemListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public int getPerDayItemListCount() {
+        if (perDayItemListBuilder_ == null) {
+          return perDayItemList_.size();
+        } else {
+          return perDayItemListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index) {
+        if (perDayItemListBuilder_ == null) {
+          return perDayItemList_.get(index);
+        } else {
+          return perDayItemListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder setPerDayItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (perDayItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.set(index, value);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder setPerDayItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (perDayItemListBuilder_ == null) {
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          perDayItemListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder addPerDayItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (perDayItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.add(value);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder addPerDayItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (perDayItemListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.add(index, value);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder addPerDayItemList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (perDayItemListBuilder_ == null) {
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          perDayItemListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder addPerDayItemList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (perDayItemListBuilder_ == null) {
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          perDayItemListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder addAllPerDayItemList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (perDayItemListBuilder_ == null) {
+          ensurePerDayItemListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, perDayItemList_);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder clearPerDayItemList() {
+        if (perDayItemListBuilder_ == null) {
+          perDayItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public Builder removePerDayItemList(int index) {
+        if (perDayItemListBuilder_ == null) {
+          ensurePerDayItemListIsMutable();
+          perDayItemList_.remove(index);
+          onChanged();
+        } else {
+          perDayItemListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getPerDayItemListBuilder(
+          int index) {
+        return getPerDayItemListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
+          int index) {
+        if (perDayItemListBuilder_ == null) {
+          return perDayItemList_.get(index);  } else {
+          return perDayItemListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getPerDayItemListOrBuilderList() {
+        if (perDayItemListBuilder_ != null) {
+          return perDayItemListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(perDayItemList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addPerDayItemListBuilder() {
+        return getPerDayItemListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addPerDayItemListBuilder(
+          int index) {
+        return getPerDayItemListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam per_day_item_list = 2;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getPerDayItemListBuilderList() {
+        return getPerDayItemListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getPerDayItemListFieldBuilder() {
+        if (perDayItemListBuilder_ == null) {
+          perDayItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  perDayItemList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          perDayItemList_ = null;
+        }
+        return perDayItemListBuilder_;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:ResinCard)
+    }
+
+    // @@protoc_insertion_point(class_scope:ResinCard)
+    private static final emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard();
+    }
+
+    public static emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<ResinCard>
+        PARSER = new com.google.protobuf.AbstractParser<ResinCard>() {
+      @java.lang.Override
+      public ResinCard parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new ResinCard(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<ResinCard> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<ResinCard> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_ResinCard_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_ResinCard_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\017ResinCard.proto\032\017ItemParam.proto\"V\n\tRe" +
+      "sinCard\022\"\n\016base_item_list\030\001 \003(\0132\n.ItemPa" +
+      "ram\022%\n\021per_day_item_list\030\002 \003(\0132\n.ItemPar" +
+      "amB\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(),
+        });
+    internal_static_ResinCard_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_ResinCard_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_ResinCard_descriptor,
+        new java.lang.String[] { "BaseItemList", "PerDayItemList", });
+    emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
index 4fa0ef94b..11c1ad90e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ResinChangeNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class ResinChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_buy_count = 3;</code>
+     * <code>uint32 cur_value = 3;</code>
+     * @return The curValue.
+     */
+    int getCurValue();
+
+    /**
+     * <code>uint32 cur_buy_count = 4;</code>
      * @return The curBuyCount.
      */
     int getCurBuyCount();
 
     /**
-     * <code>uint32 next_add_timestamp = 6;</code>
+     * <code>uint32 next_add_timestamp = 7;</code>
      * @return The nextAddTimestamp.
      */
     int getNextAddTimestamp();
-
-    /**
-     * <code>uint32 cur_value = 7;</code>
-     * @return The curValue.
-     */
-    int getCurValue();
   }
   /**
-   * <pre>
-   * CmdId: 21937
-   * Obf: POKGPJBGPLM
-   * </pre>
-   *
    * Protobuf type {@code ResinChangeNotify}
    */
   public static final class ResinChangeNotify extends
@@ -88,17 +83,17 @@ public final class ResinChangeNotifyOuterClass {
               break;
             case 24: {
 
-              curBuyCount_ = input.readUInt32();
+              curValue_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 32: {
 
-              nextAddTimestamp_ = input.readUInt32();
+              curBuyCount_ = input.readUInt32();
               break;
             }
             case 56: {
 
-              curValue_ = input.readUInt32();
+              nextAddTimestamp_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,10 +128,21 @@ public final class ResinChangeNotifyOuterClass {
               emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.class, emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.Builder.class);
     }
 
-    public static final int CUR_BUY_COUNT_FIELD_NUMBER = 3;
+    public static final int CUR_VALUE_FIELD_NUMBER = 3;
+    private int curValue_;
+    /**
+     * <code>uint32 cur_value = 3;</code>
+     * @return The curValue.
+     */
+    @java.lang.Override
+    public int getCurValue() {
+      return curValue_;
+    }
+
+    public static final int CUR_BUY_COUNT_FIELD_NUMBER = 4;
     private int curBuyCount_;
     /**
-     * <code>uint32 cur_buy_count = 3;</code>
+     * <code>uint32 cur_buy_count = 4;</code>
      * @return The curBuyCount.
      */
     @java.lang.Override
@@ -144,10 +150,10 @@ public final class ResinChangeNotifyOuterClass {
       return curBuyCount_;
     }
 
-    public static final int NEXT_ADD_TIMESTAMP_FIELD_NUMBER = 6;
+    public static final int NEXT_ADD_TIMESTAMP_FIELD_NUMBER = 7;
     private int nextAddTimestamp_;
     /**
-     * <code>uint32 next_add_timestamp = 6;</code>
+     * <code>uint32 next_add_timestamp = 7;</code>
      * @return The nextAddTimestamp.
      */
     @java.lang.Override
@@ -155,17 +161,6 @@ public final class ResinChangeNotifyOuterClass {
       return nextAddTimestamp_;
     }
 
-    public static final int CUR_VALUE_FIELD_NUMBER = 7;
-    private int curValue_;
-    /**
-     * <code>uint32 cur_value = 7;</code>
-     * @return The curValue.
-     */
-    @java.lang.Override
-    public int getCurValue() {
-      return curValue_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class ResinChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (curValue_ != 0) {
+        output.writeUInt32(3, curValue_);
+      }
       if (curBuyCount_ != 0) {
-        output.writeUInt32(3, curBuyCount_);
+        output.writeUInt32(4, curBuyCount_);
       }
       if (nextAddTimestamp_ != 0) {
-        output.writeUInt32(6, nextAddTimestamp_);
-      }
-      if (curValue_ != 0) {
-        output.writeUInt32(7, curValue_);
+        output.writeUInt32(7, nextAddTimestamp_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class ResinChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (curValue_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, curValue_);
+      }
       if (curBuyCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, curBuyCount_);
+          .computeUInt32Size(4, curBuyCount_);
       }
       if (nextAddTimestamp_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, nextAddTimestamp_);
-      }
-      if (curValue_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, curValue_);
+          .computeUInt32Size(7, nextAddTimestamp_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class ResinChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify other = (emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify) obj;
 
+      if (getCurValue()
+          != other.getCurValue()) return false;
       if (getCurBuyCount()
           != other.getCurBuyCount()) return false;
       if (getNextAddTimestamp()
           != other.getNextAddTimestamp()) return false;
-      if (getCurValue()
-          != other.getCurValue()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class ResinChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getCurValue();
       hash = (37 * hash) + CUR_BUY_COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getCurBuyCount();
       hash = (37 * hash) + NEXT_ADD_TIMESTAMP_FIELD_NUMBER;
       hash = (53 * hash) + getNextAddTimestamp();
-      hash = (37 * hash) + CUR_VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getCurValue();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class ResinChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21937
-     * Obf: POKGPJBGPLM
-     * </pre>
-     *
      * Protobuf type {@code ResinChangeNotify}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class ResinChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        curValue_ = 0;
+
         curBuyCount_ = 0;
 
         nextAddTimestamp_ = 0;
 
-        curValue_ = 0;
-
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class ResinChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify buildPartial() {
         emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify result = new emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify(this);
+        result.curValue_ = curValue_;
         result.curBuyCount_ = curBuyCount_;
         result.nextAddTimestamp_ = nextAddTimestamp_;
-        result.curValue_ = curValue_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class ResinChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ResinChangeNotifyOuterClass.ResinChangeNotify.getDefaultInstance()) return this;
+        if (other.getCurValue() != 0) {
+          setCurValue(other.getCurValue());
+        }
         if (other.getCurBuyCount() != 0) {
           setCurBuyCount(other.getCurBuyCount());
         }
         if (other.getNextAddTimestamp() != 0) {
           setNextAddTimestamp(other.getNextAddTimestamp());
         }
-        if (other.getCurValue() != 0) {
-          setCurValue(other.getCurValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,9 +497,40 @@ public final class ResinChangeNotifyOuterClass {
         return this;
       }
 
+      private int curValue_ ;
+      /**
+       * <code>uint32 cur_value = 3;</code>
+       * @return The curValue.
+       */
+      @java.lang.Override
+      public int getCurValue() {
+        return curValue_;
+      }
+      /**
+       * <code>uint32 cur_value = 3;</code>
+       * @param value The curValue to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurValue(int value) {
+        
+        curValue_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_value = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurValue() {
+        
+        curValue_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int curBuyCount_ ;
       /**
-       * <code>uint32 cur_buy_count = 3;</code>
+       * <code>uint32 cur_buy_count = 4;</code>
        * @return The curBuyCount.
        */
       @java.lang.Override
@@ -517,7 +538,7 @@ public final class ResinChangeNotifyOuterClass {
         return curBuyCount_;
       }
       /**
-       * <code>uint32 cur_buy_count = 3;</code>
+       * <code>uint32 cur_buy_count = 4;</code>
        * @param value The curBuyCount to set.
        * @return This builder for chaining.
        */
@@ -528,7 +549,7 @@ public final class ResinChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cur_buy_count = 3;</code>
+       * <code>uint32 cur_buy_count = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurBuyCount() {
@@ -540,7 +561,7 @@ public final class ResinChangeNotifyOuterClass {
 
       private int nextAddTimestamp_ ;
       /**
-       * <code>uint32 next_add_timestamp = 6;</code>
+       * <code>uint32 next_add_timestamp = 7;</code>
        * @return The nextAddTimestamp.
        */
       @java.lang.Override
@@ -548,7 +569,7 @@ public final class ResinChangeNotifyOuterClass {
         return nextAddTimestamp_;
       }
       /**
-       * <code>uint32 next_add_timestamp = 6;</code>
+       * <code>uint32 next_add_timestamp = 7;</code>
        * @param value The nextAddTimestamp to set.
        * @return This builder for chaining.
        */
@@ -559,7 +580,7 @@ public final class ResinChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 next_add_timestamp = 6;</code>
+       * <code>uint32 next_add_timestamp = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearNextAddTimestamp() {
@@ -568,37 +589,6 @@ public final class ResinChangeNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int curValue_ ;
-      /**
-       * <code>uint32 cur_value = 7;</code>
-       * @return The curValue.
-       */
-      @java.lang.Override
-      public int getCurValue() {
-        return curValue_;
-      }
-      /**
-       * <code>uint32 cur_value = 7;</code>
-       * @param value The curValue to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurValue(int value) {
-        
-        curValue_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_value = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurValue() {
-        
-        curValue_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class ResinChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\027ResinChangeNotify.proto\"Y\n\021ResinChange" +
-      "Notify\022\025\n\rcur_buy_count\030\003 \001(\r\022\032\n\022next_ad" +
-      "d_timestamp\030\006 \001(\r\022\021\n\tcur_value\030\007 \001(\rB\033\n\031" +
+      "Notify\022\021\n\tcur_value\030\003 \001(\r\022\025\n\rcur_buy_cou" +
+      "nt\030\004 \001(\r\022\032\n\022next_add_timestamp\030\007 \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class ResinChangeNotifyOuterClass {
     internal_static_ResinChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ResinChangeNotify_descriptor,
-        new java.lang.String[] { "CurBuyCount", "NextAddTimestamp", "CurValue", });
+        new java.lang.String[] { "CurValue", "CurBuyCount", "NextAddTimestamp", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ResinCostTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ResinCostTypeOuterClass.java
index ed337ca3d..83ffae3bc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ResinCostTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ResinCostTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class ResinCostTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: CJJHKGNDKMK
-   * </pre>
-   *
    * Protobuf enum {@code ResinCostType}
    */
   public enum ResinCostType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RetcodeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RetcodeOuterClass.java
index 776650d68..1daf71e5e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RetcodeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RetcodeOuterClass.java
@@ -15,10 +15,6 @@ public final class RetcodeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: GLEKAPIGAJE
-   * </pre>
-   *
    * Protobuf enum {@code Retcode}
    */
   public enum Retcode
@@ -203,6 +199,10 @@ public final class RetcodeOuterClass {
      * <code>RET_PROTO_MIX_VERSION_NOT_MATCH = 44;</code>
      */
     RET_PROTO_MIX_VERSION_NOT_MATCH(44),
+    /**
+     * <code>RET_ACCOUNT_TYPE_STOP_REGISTER = 45;</code>
+     */
+    RET_ACCOUNT_TYPE_STOP_REGISTER(45),
     /**
      * <code>RET_AVATAR_IN_CD = 101;</code>
      */
@@ -316,9 +316,13 @@ public final class RetcodeOuterClass {
      */
     RET_AVATAR_IN_COMBAT(128),
     /**
-     * <code>RET_NICKNAME_UTF8_ERROR = 130;</code>
+     * <code>RET_PLAYER_TIME_LOCKED = 129;</code>
      */
-    RET_NICKNAME_UTF8_ERROR(130),
+    RET_PLAYER_TIME_LOCKED(129),
+    /**
+     * <code>RET_NICKNAME_UTF_8_ERROR = 130;</code>
+     */
+    RET_NICKNAME_UTF_8_ERROR(130),
     /**
      * <code>RET_NICKNAME_TOO_LONG = 131;</code>
      */
@@ -467,6 +471,34 @@ public final class RetcodeOuterClass {
      * <code>RET_PLAYER_HAS_TRIAL_AVATAR = 179;</code>
      */
     RET_PLAYER_HAS_TRIAL_AVATAR(179),
+    /**
+     * <code>RET_AVATAR_EXPEDITION_SLOT_NOT_ENOUGH = 180;</code>
+     */
+    RET_AVATAR_EXPEDITION_SLOT_NOT_ENOUGH(180),
+    /**
+     * <code>RET_AVATAR_EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD = 181;</code>
+     */
+    RET_AVATAR_EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD(181),
+    /**
+     * <code>RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW = 182;</code>
+     */
+    RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW(182),
+    /**
+     * <code>RET_ASYNC_WORD_FILTER_IN_CD = 183;</code>
+     */
+    RET_ASYNC_WORD_FILTER_IN_CD(183),
+    /**
+     * <code>RET_NOT_HAS_TRACE_EFFECT = 184;</code>
+     */
+    RET_NOT_HAS_TRACE_EFFECT(184),
+    /**
+     * <code>RET_TRACE_EFFECT_AVATAR_ERROR = 185;</code>
+     */
+    RET_TRACE_EFFECT_AVATAR_ERROR(185),
+    /**
+     * <code>RET_PLAYER_TIME_LOCKED_BY_QUEST = 186;</code>
+     */
+    RET_PLAYER_TIME_LOCKED_BY_QUEST(186),
     /**
      * <code>RET_FLOAT_ERROR = 201;</code>
      */
@@ -523,6 +555,50 @@ public final class RetcodeOuterClass {
      * <code>RET_SUBMIT_QUEST_EVENTS_NOT_RIGHT = 408;</code>
      */
     RET_SUBMIT_QUEST_EVENTS_NOT_RIGHT(408),
+    /**
+     * <code>RET_CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILED = 409;</code>
+     */
+    RET_CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILED(409),
+    /**
+     * <code>RET_CONFIRM_CONTINUE_MUTUAL_OCCUPIED_FAILED = 410;</code>
+     */
+    RET_CONFIRM_CONTINUE_MUTUAL_OCCUPIED_FAILED(410),
+    /**
+     * <code>RET_QUEST_FOCUS_MODE_IN_CD = 416;</code>
+     */
+    RET_QUEST_FOCUS_MODE_IN_CD(416),
+    /**
+     * <code>RET_QUEST_IN_FOCUS_MODE = 417;</code>
+     */
+    RET_QUEST_IN_FOCUS_MODE(417),
+    /**
+     * <code>RET_QUEST_NOT_IN_FOCUS_MODE = 418;</code>
+     */
+    RET_QUEST_NOT_IN_FOCUS_MODE(418),
+    /**
+     * <code>RET_PARENT_QUEST_CANNOT_START_FOCUS = 419;</code>
+     */
+    RET_PARENT_QUEST_CANNOT_START_FOCUS(419),
+    /**
+     * <code>RET_PARENT_QUEST_NOT_EXIST = 420;</code>
+     */
+    RET_PARENT_QUEST_NOT_EXIST(420),
+    /**
+     * <code>RET_BAN_OPEARATE_FOCUS = 421;</code>
+     */
+    RET_BAN_OPEARATE_FOCUS(421),
+    /**
+     * <code>RET_QUEST_FOCUS_ANY_GALLERY_STARTED = 422;</code>
+     */
+    RET_QUEST_FOCUS_ANY_GALLERY_STARTED(422),
+    /**
+     * <code>RET_QUEST_FOCUS_USING_INFORMAL_AVATAR = 423;</code>
+     */
+    RET_QUEST_FOCUS_USING_INFORMAL_AVATAR(423),
+    /**
+     * <code>RET_QUEST_FOCUS_OPENSTATE_OFF = 424;</code>
+     */
+    RET_QUEST_FOCUS_OPENSTATE_OFF(424),
     /**
      * <code>RET_POINT_NOT_UNLOCKED = 501;</code>
      */
@@ -723,6 +799,18 @@ public final class RetcodeOuterClass {
      * <code>RET_INVALID_MAP_LAYER = 569;</code>
      */
     RET_INVALID_MAP_LAYER(569),
+    /**
+     * <code>RET_GALLERY_REPEAT_START = 570;</code>
+     */
+    RET_GALLERY_REPEAT_START(570),
+    /**
+     * <code>RET_NOT_IN_PLAYER_SCENE = 571;</code>
+     */
+    RET_NOT_IN_PLAYER_SCENE(571),
+    /**
+     * <code>RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON = 572;</code>
+     */
+    RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON(572),
     /**
      * <code>RET_ITEM_NOT_EXIST = 601;</code>
      */
@@ -947,6 +1035,10 @@ public final class RetcodeOuterClass {
      * <code>RET_MCOIN_EXCEED_LIMIT = 656;</code>
      */
     RET_MCOIN_EXCEED_LIMIT(656),
+    /**
+     * <code>RET_BATCH_SET_EQUIP_LOCK_STATE_CD = 657;</code>
+     */
+    RET_BATCH_SET_EQUIP_LOCK_STATE_CD(657),
     /**
      * <code>RET_RESIN_NOT_ENOUGH = 660;</code>
      */
@@ -1147,6 +1239,10 @@ public final class RetcodeOuterClass {
      * <code>RET_SHOP_BATCH_BUY_COUNT_LIMIT = 709;</code>
      */
     RET_SHOP_BATCH_BUY_COUNT_LIMIT(709),
+    /**
+     * <code>RET_GOODS_PRECONDITION_NOT_SATISFIED = 710;</code>
+     */
+    RET_GOODS_PRECONDITION_NOT_SATISFIED(710),
     /**
      * <code>RET_CHAT_FORBIDDEN = 798;</code>
      */
@@ -1303,6 +1399,14 @@ public final class RetcodeOuterClass {
      * <code>RET_VEHICLE_SORUSH_STATE_NOT_MATCH = 836;</code>
      */
     RET_VEHICLE_SORUSH_STATE_NOT_MATCH(836),
+    /**
+     * <code>RET_GIVING_NOT_IN_MY_WORLD = 837;</code>
+     */
+    RET_GIVING_NOT_IN_MY_WORLD(837),
+    /**
+     * <code>RET_GIVING_IS_FROZEN = 838;</code>
+     */
+    RET_GIVING_IS_FROZEN(838),
     /**
      * <code>RET_ACTIVITY_CLOSE = 860;</code>
      */
@@ -1607,6 +1711,26 @@ public final class RetcodeOuterClass {
      * <code>RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM = 1128;</code>
      */
     RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM(1128),
+    /**
+     * <code>RET_DUNGEON_ENTERED_BY_CANDIDATE_TEAM = 1129;</code>
+     */
+    RET_DUNGEON_ENTERED_BY_CANDIDATE_TEAM(1129),
+    /**
+     * <code>RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY = 1130;</code>
+     */
+    RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY(1130),
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_INTERNAL_ERROR = 1131;</code>
+     */
+    RET_DUNGEON_ENTER_TEAM_INTERNAL_ERROR(1131),
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_SOMEONE_LEVEL_LIMIT = 1132;</code>
+     */
+    RET_DUNGEON_ENTER_TEAM_SOMEONE_LEVEL_LIMIT(1132),
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_SOMEONE_NOT_IN_SCENE_TEAM = 1133;</code>
+     */
+    RET_DUNGEON_ENTER_TEAM_SOMEONE_NOT_IN_SCENE_TEAM(1133),
     /**
      * <code>RET_MP_NOT_IN_MY_WORLD = 1201;</code>
      */
@@ -1812,9 +1936,9 @@ public final class RetcodeOuterClass {
      */
     RET_MP_CANNOT_EXEC_GIVING_IN_SINGLE_MODE_QUEST(1252),
     /**
-     * <code>RET_MP_EFFIGY_CHALLENGE_V4_IN_PREPARE = 1253;</code>
+     * <code>RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE = 1253;</code>
      */
-    RET_MP_EFFIGY_CHALLENGE_V4_IN_PREPARE(1253),
+    RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE(1253),
     /**
      * <code>RET_MP_SHUFFLE_BOARD_ONGOING = 1254;</code>
      */
@@ -1827,6 +1951,18 @@ public final class RetcodeOuterClass {
      * <code>RET_MP_TOY_BATTLE_QTE_ONGOING = 1256;</code>
      */
     RET_MP_TOY_BATTLE_QTE_ONGOING(1256),
+    /**
+     * <code>RET_MP_PAINTING_REPAIR_ONGOING = 1257;</code>
+     */
+    RET_MP_PAINTING_REPAIR_ONGOING(1257),
+    /**
+     * <code>RET_MP_FISHBLASTER_ONGOING = 1258;</code>
+     */
+    RET_MP_FISHBLASTER_ONGOING(1258),
+    /**
+     * <code>RET_MP_GUEST_MATCH_COND_NOT_MEET = 1259;</code>
+     */
+    RET_MP_GUEST_MATCH_COND_NOT_MEET(1259),
     /**
      * <code>RET_MAIL_PARA_ERR = 1301;</code>
      */
@@ -1915,6 +2051,22 @@ public final class RetcodeOuterClass {
      * <code>RET_MAIL_COLLECTION_IS_FULL = 1322;</code>
      */
     RET_MAIL_COLLECTION_IS_FULL(1322),
+    /**
+     * <code>RET_MAIL_TITLE_CHARACTER_LEN_EXCEED = 1323;</code>
+     */
+    RET_MAIL_TITLE_CHARACTER_LEN_EXCEED(1323),
+    /**
+     * <code>RET_MAIL_TITLE_EMPTY = 1324;</code>
+     */
+    RET_MAIL_TITLE_EMPTY(1324),
+    /**
+     * <code>RET_MAIL_CONTENT_EMPTY = 1325;</code>
+     */
+    RET_MAIL_CONTENT_EMPTY(1325),
+    /**
+     * <code>RET_MAIL_SENDER_EMPTY = 1326;</code>
+     */
+    RET_MAIL_SENDER_EMPTY(1326),
     /**
      * <code>RET_DAILY_TASK_NOT_FINISH = 1330;</code>
      */
@@ -1931,6 +2083,14 @@ public final class RetcodeOuterClass {
      * <code>RET_DAILY_TASK_FILTER_CITY_NOT_OPEN = 1333;</code>
      */
     RET_DAILY_TASK_FILTER_CITY_NOT_OPEN(1333),
+    /**
+     * <code>RET_DAILY_ATTENDANCE_NOT_OPEN = 1334;</code>
+     */
+    RET_DAILY_ATTENDANCE_NOT_OPEN(1334),
+    /**
+     * <code>RET_DAILY_ATTENDANCE_REWARD_MAX = 1335;</code>
+     */
+    RET_DAILY_ATTENDANCE_REWARD_MAX(1335),
     /**
      * <code>RET_GACHA_INAVAILABLE = 1401;</code>
      */
@@ -1971,6 +2131,10 @@ public final class RetcodeOuterClass {
      * <code>RET_GACHA_GENERAL_TIMES_LIMIT = 1410;</code>
      */
     RET_GACHA_GENERAL_TIMES_LIMIT(1410),
+    /**
+     * <code>RET_GACHA_WISH_IS_NEEDED_BEFORE_GACHA = 1411;</code>
+     */
+    RET_GACHA_WISH_IS_NEEDED_BEFORE_GACHA(1411),
     /**
      * <code>RET_INVESTIGAITON_NOT_IN_PROGRESS = 1501;</code>
      */
@@ -2179,6 +2343,74 @@ public final class RetcodeOuterClass {
      * <code>RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PANEL = 1600;</code>
      */
     RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PANEL(1600),
+    /**
+     * <code>RET_ROLE_COMBAT_NOT_RECORD = 1601;</code>
+     */
+    RET_ROLE_COMBAT_NOT_RECORD(1601),
+    /**
+     * <code>RET_ROLE_COMBAT_COIN_EXCEED_LIMIT = 1602;</code>
+     */
+    RET_ROLE_COMBAT_COIN_EXCEED_LIMIT(1602),
+    /**
+     * <code>RET_ROLE_COMBAT_COIN_NOT_ENOUGH = 1603;</code>
+     */
+    RET_ROLE_COMBAT_COIN_NOT_ENOUGH(1603),
+    /**
+     * <code>RET_ROLE_COMBAT_LEVEL_NOT_MEET = 1604;</code>
+     */
+    RET_ROLE_COMBAT_LEVEL_NOT_MEET(1604),
+    /**
+     * <code>RET_ROLE_COMBAT_TOWER_NOT_MEET = 1605;</code>
+     */
+    RET_ROLE_COMBAT_TOWER_NOT_MEET(1605),
+    /**
+     * <code>RET_ROLE_COMBAT_SCHEDULE_NOT_MEET = 1606;</code>
+     */
+    RET_ROLE_COMBAT_SCHEDULE_NOT_MEET(1606),
+    /**
+     * <code>RET_ROLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUENTLY = 1617;</code>
+     */
+    RET_ROLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUENTLY(1617),
+    /**
+     * <code>RET_ROLE_COMBAT_REQ_TRIAL_AVATAR_FREQUENTLY = 1618;</code>
+     */
+    RET_ROLE_COMBAT_REQ_TRIAL_AVATAR_FREQUENTLY(1618),
+    /**
+     * <code>RET_ROLE_COMBAT_REFRESH_COUNT_NOT_ENOUGH = 1619;</code>
+     */
+    RET_ROLE_COMBAT_REFRESH_COUNT_NOT_ENOUGH(1619),
+    /**
+     * <code>RET_ROLE_COMBAT_QUEST_NOT_MEET = 1620;</code>
+     */
+    RET_ROLE_COMBAT_QUEST_NOT_MEET(1620),
+    /**
+     * <code>RET_IN_ROLE_COMBAT_DUNGEON = 1621;</code>
+     */
+    RET_IN_ROLE_COMBAT_DUNGEON(1621),
+    /**
+     * <code>RET_IN_ROLE_COMBAT_DUNGEON_BY_USE_ITEM = 1622;</code>
+     */
+    RET_IN_ROLE_COMBAT_DUNGEON_BY_USE_ITEM(1622),
+    /**
+     * <code>RET_ROLE_COMBAT_RENT_AVATAR_NOT_FOUND = 1623;</code>
+     */
+    RET_ROLE_COMBAT_RENT_AVATAR_NOT_FOUND(1623),
+    /**
+     * <code>RET_ROLE_COMBAT_CARD_HAS_BLOCKED = 1624;</code>
+     */
+    RET_ROLE_COMBAT_CARD_HAS_BLOCKED(1624),
+    /**
+     * <code>RET_CHAR_MASTER_KEY_EXCEED_LIMIT = 1631;</code>
+     */
+    RET_CHAR_MASTER_KEY_EXCEED_LIMIT(1631),
+    /**
+     * <code>RET_CHAR_MASTER_KEY_NOT_ENOUGH = 1632;</code>
+     */
+    RET_CHAR_MASTER_KEY_NOT_ENOUGH(1632),
+    /**
+     * <code>RET_CHAR_MASTER_PREVIEW_IN_CD = 1633;</code>
+     */
+    RET_CHAR_MASTER_PREVIEW_IN_CD(1633),
     /**
      * <code>RET_UID_NOT_EXIST = 2001;</code>
      */
@@ -2392,9 +2624,9 @@ public final class RetcodeOuterClass {
      */
     RET_REMARK_TOO_LONG(7029),
     /**
-     * <code>RET_REMARK_UTF8_ERROR = 7030;</code>
+     * <code>RET_REMARK_UTF_8_ERROR = 7030;</code>
      */
-    RET_REMARK_UTF8_ERROR(7030),
+    RET_REMARK_UTF_8_ERROR(7030),
     /**
      * <code>RET_REMARK_IS_EMPTY = 7031;</code>
      */
@@ -2447,6 +2679,10 @@ public final class RetcodeOuterClass {
      * <code>RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL = 7043;</code>
      */
     RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL(7043),
+    /**
+     * <code>RET_PROFILE_PICTURE_NOT_UNLOCKED = 7044;</code>
+     */
+    RET_PROFILE_PICTURE_NOT_UNLOCKED(7044),
     /**
      * <code>RET_OFFERING_NOT_OPEN = 7081;</code>
      */
@@ -2479,6 +2715,10 @@ public final class RetcodeOuterClass {
      * <code>RET_OFFERING_PARI_SEARCH_ALL_FINISH = 7088;</code>
      */
     RET_OFFERING_PARI_SEARCH_ALL_FINISH(7088),
+    /**
+     * <code>RET_OFFERING_PARI_NO_FINISH_REWARD = 7089;</code>
+     */
+    RET_OFFERING_PARI_NO_FINISH_REWARD(7089),
     /**
      * <code>RET_CITY_REPUTATION_NOT_OPEN = 7101;</code>
      */
@@ -2535,6 +2775,66 @@ public final class RetcodeOuterClass {
      * <code>RET_CITY_REPUTATION_EXPLORE_NOT_REACH = 7114;</code>
      */
     RET_CITY_REPUTATION_EXPLORE_NOT_REACH(7114),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_NOT_OPEN = 7115;</code>
+     */
+    RET_TRIBAL_REPUTATION_NOT_OPEN(7115),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_TAKEN = 7116;</code>
+     */
+    RET_TRIBAL_REPUTATION_LEVEL_TAKEN(7116),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_NOT_REACH = 7117;</code>
+     */
+    RET_TRIBAL_REPUTATION_LEVEL_NOT_REACH(7117),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_TAKEN_EXPLORE_REWARD = 7118;</code>
+     */
+    RET_TRIBAL_REPUTATION_TAKEN_EXPLORE_REWARD(7118),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_EXPLORE_NOT_REACH = 7119;</code>
+     */
+    RET_TRIBAL_REPUTATION_EXPLORE_NOT_REACH(7119),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_PARENT_QUEST_TAKEN = 7201;</code>
+     */
+    RET_TRIBAL_REPUTATION_PARENT_QUEST_TAKEN(7201),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINISH = 7202;</code>
+     */
+    RET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINISH(7202),
+    /**
+     * <code>RET_CITY_REPUTATION_NOT_OPEN_TRIBAL = 7203;</code>
+     */
+    RET_CITY_REPUTATION_NOT_OPEN_TRIBAL(7203),
+    /**
+     * <code>RET_CITY_REPUTATION_NO_THE_DONATION = 7204;</code>
+     */
+    RET_CITY_REPUTATION_NO_THE_DONATION(7204),
+    /**
+     * <code>RET_CITY_REPUTATION_DONATION_FINISHED = 7205;</code>
+     */
+    RET_CITY_REPUTATION_DONATION_FINISHED(7205),
+    /**
+     * <code>RET_CITY_REPUTATION_DONATION_LIMIT = 7206;</code>
+     */
+    RET_CITY_REPUTATION_DONATION_LIMIT(7206),
+    /**
+     * <code>RET_CITY_REPUTATION_TOTAL_REWARD_TAKEN = 7207;</code>
+     */
+    RET_CITY_REPUTATION_TOTAL_REWARD_TAKEN(7207),
+    /**
+     * <code>RET_CITY_REPUTATION_TOTAL_REWARD_NOT_REACH = 7208;</code>
+     */
+    RET_CITY_REPUTATION_TOTAL_REWARD_NOT_REACH(7208),
+    /**
+     * <code>RET_CITY_REPUTATION_LEVEL_FULL = 7209;</code>
+     */
+    RET_CITY_REPUTATION_LEVEL_FULL(7209),
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_FULL = 7210;</code>
+     */
+    RET_TRIBAL_REPUTATION_LEVEL_FULL(7210),
     /**
      * <code>RET_MECHANICUS_NOT_OPEN = 7120;</code>
      */
@@ -2851,6 +3151,14 @@ public final class RetcodeOuterClass {
      * <code>RET_REGION_SEARCH_STATE_ERROR = 9123;</code>
      */
     RET_REGION_SEARCH_STATE_ERROR(9123),
+    /**
+     * <code>RET_BLESSING_GIVE_NUM_INVALID = 9124;</code>
+     */
+    RET_BLESSING_GIVE_NUM_INVALID(9124),
+    /**
+     * <code>RET_BLESSING_NO_GROUP_OR_OWNER = 9125;</code>
+     */
+    RET_BLESSING_NO_GROUP_OR_OWNER(9125),
     /**
      * <code>RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN = 9130;</code>
      */
@@ -4020,21 +4328,21 @@ public final class RetcodeOuterClass {
      */
     RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT(10316),
     /**
-     * <code>RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT = 10317;</code>
+     * <code>RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT = 10317;</code>
      */
-    RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT(10317),
+    RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT(10317),
     /**
-     * <code>RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH = 10318;</code>
+     * <code>RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH = 10318;</code>
      */
-    RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH(10318),
+    RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH(10318),
     /**
-     * <code>RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN = 10319;</code>
+     * <code>RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN = 10319;</code>
      */
-    RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN(10319),
+    RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN(10319),
     /**
-     * <code>RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE = 10320;</code>
+     * <code>RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE = 10320;</code>
      */
-    RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE(10320),
+    RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE(10320),
     /**
      * <code>RET_ROGUE_DIARY_AVATAR_DEATH = 10350;</code>
      */
@@ -4152,13 +4460,13 @@ public final class RetcodeOuterClass {
      */
     RET_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPEN(10414),
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH = 10427;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH = 10427;</code>
      */
-    RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH(10427),
+    RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH(10427),
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT = 10428;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT = 10428;</code>
      */
-    RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT(10428),
+    RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT(10428),
     /**
      * <code>RET_CHAR_AMUSEMENT_STAGE_NOT_OPEN = 10436;</code>
      */
@@ -4224,33 +4532,33 @@ public final class RetcodeOuterClass {
      */
     RET_TEAMCHAIN_WORLD_IN_MP_MODE(10466),
     /**
-     * <code>RET_LAN_V3_BOAT_PLAYER_NUM_NOT_VALID = 10481;</code>
+     * <code>RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID = 10481;</code>
      */
-    RET_LAN_V3_BOAT_PLAYER_NUM_NOT_VALID(10481),
+    RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID(10481),
     /**
-     * <code>RET_LAN_V3_BOAT_PLAY_NOT_OPEN = 10482;</code>
+     * <code>RET_LAN_V_3_BOAT_PLAY_NOT_OPEN = 10482;</code>
      */
-    RET_LAN_V3_BOAT_PLAY_NOT_OPEN(10482),
+    RET_LAN_V_3_BOAT_PLAY_NOT_OPEN(10482),
     /**
-     * <code>RET_LAN_V3_BOAT_NOT_IN_WORLD_SCENE = 10483;</code>
+     * <code>RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE = 10483;</code>
      */
-    RET_LAN_V3_BOAT_NOT_IN_WORLD_SCENE(10483),
+    RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE(10483),
     /**
-     * <code>RET_FLEUR_FAIR_V2_PACMAN_PLAY_NOT_OPEN = 10500;</code>
+     * <code>RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN = 10500;</code>
      */
-    RET_FLEUR_FAIR_V2_PACMAN_PLAY_NOT_OPEN(10500),
+    RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN(10500),
     /**
-     * <code>RET_FLEUR_FAIR_V2_PACMAN_PLAYER_NUM_INCORRECT = 10501;</code>
+     * <code>RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT = 10501;</code>
      */
-    RET_FLEUR_FAIR_V2_PACMAN_PLAYER_NUM_INCORRECT(10501),
+    RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT(10501),
     /**
-     * <code>RET_FLEUR_FAIR_V2_COIN_NOT_ENOUGH = 10502;</code>
+     * <code>RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH = 10502;</code>
      */
-    RET_FLEUR_FAIR_V2_COIN_NOT_ENOUGH(10502),
+    RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH(10502),
     /**
-     * <code>RET_FLEUR_FAIR_V2_COIN_EXCEED_LIMIT = 10503;</code>
+     * <code>RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT = 10503;</code>
      */
-    RET_FLEUR_FAIR_V2_COIN_EXCEED_LIMIT(10503),
+    RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT(10503),
     /**
      * <code>RET_AKA_FES_RHYTHM_LEVEL_NOT_OPEN = 10521;</code>
      */
@@ -4276,17 +4584,17 @@ public final class RetcodeOuterClass {
      */
     RET_AKA_FES_ASTROLABE_PRE_LEVEL_NOT_FINISH(10542),
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_LEVEL_NOT_OPEN = 10551;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN = 10551;</code>
      */
-    RET_EFFIGY_CHALLENGE_V4_LEVEL_NOT_OPEN(10551),
+    RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN(10551),
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_GUEST_NOT_READY = 10552;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY = 10552;</code>
      */
-    RET_EFFIGY_CHALLENGE_V4_GUEST_NOT_READY(10552),
+    RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY(10552),
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_DUPLICATE_AVATAR = 10553;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR = 10553;</code>
      */
-    RET_EFFIGY_CHALLENGE_V4_DUPLICATE_AVATAR(10553),
+    RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR(10553),
     /**
      * <code>RET_JOURNEY_ACTIVITY_PICK_PARAM_ERROR = 10561;</code>
      */
@@ -4303,10 +4611,66 @@ public final class RetcodeOuterClass {
      * <code>RET_JOURNEY_ACTIVITY_COIN_EXCEED_LIMIT = 10564;</code>
      */
     RET_JOURNEY_ACTIVITY_COIN_EXCEED_LIMIT(10564),
+    /**
+     * <code>RET_POETRY_FES_PITCH_POT_STAGE_NOT_OPEN = 10571;</code>
+     */
+    RET_POETRY_FES_PITCH_POT_STAGE_NOT_OPEN(10571),
+    /**
+     * <code>RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH = 10591;</code>
+     */
+    RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH(10591),
+    /**
+     * <code>RET_MP_FILMFEST_SHOOTING_ONGOING = 10592;</code>
+     */
+    RET_MP_FILMFEST_SHOOTING_ONGOING(10592),
+    /**
+     * <code>RET_FILMFES_BALL_GAME_IS_LOCKED = 10593;</code>
+     */
+    RET_FILMFES_BALL_GAME_IS_LOCKED(10593),
+    /**
+     * <code>RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH = 10611;</code>
+     */
+    RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH(10611),
+    /**
+     * <code>RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT = 10612;</code>
+     */
+    RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT(10612),
+    /**
+     * <code>RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN = 10631;</code>
+     */
+    RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN(10631),
+    /**
+     * <code>RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN = 10632;</code>
+     */
+    RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN(10632),
+    /**
+     * <code>RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH = 10641;</code>
+     */
+    RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH(10641),
+    /**
+     * <code>RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN = 10642;</code>
+     */
+    RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN(10642),
     /**
      * <code>RET_ACTIVITY_CONTENT_CLOSED = 10901;</code>
      */
     RET_ACTIVITY_CONTENT_CLOSED(10901),
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_BAN_MP = 10902;</code>
+     */
+    RET_ACTIVITY_CLIENT_PLAY_BAN_MP(10902),
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR = 10903;</code>
+     */
+    RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR(10903),
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING = 10904;</code>
+     */
+    RET_ACTIVITY_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING(10904),
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_START = 10905;</code>
+     */
+    RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_START(10905),
     /**
      * <code>RET_NOT_IN_FISHING = 11001;</code>
      */
@@ -4567,6 +4931,54 @@ public final class RetcodeOuterClass {
      * <code>RET_UGC_MUSIC_SAVE_TOO_FREQUENT = 11161;</code>
      */
     RET_UGC_MUSIC_SAVE_TOO_FREQUENT(11161),
+    /**
+     * <code>RET_UGC_MUSIC_STORE_FULL = 11162;</code>
+     */
+    RET_UGC_MUSIC_STORE_FULL(11162),
+    /**
+     * <code>RET_UGC_MUSIC_STORE_REPEAT = 11163;</code>
+     */
+    RET_UGC_MUSIC_STORE_REPEAT(11163),
+    /**
+     * <code>RET_UGC_MUSIC_STORE_TOO_FREQUENT = 11164;</code>
+     */
+    RET_UGC_MUSIC_STORE_TOO_FREQUENT(11164),
+    /**
+     * <code>RET_UGC_MUSIC_SEARCH_NOT_FOUND = 11165;</code>
+     */
+    RET_UGC_MUSIC_SEARCH_NOT_FOUND(11165),
+    /**
+     * <code>RET_UGC_MUSIC_LIKE_TOO_FREQUENT = 11166;</code>
+     */
+    RET_UGC_MUSIC_LIKE_TOO_FREQUENT(11166),
+    /**
+     * <code>RET_UGC_MUSIC_RECOMMEND_TOO_FREQUENT = 11167;</code>
+     */
+    RET_UGC_MUSIC_RECOMMEND_TOO_FREQUENT(11167),
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_NOT_ALLOW = 11168;</code>
+     */
+    RET_UGC_MUSIC_IMPORT_NOT_ALLOW(11168),
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_NOT_FOUND = 11169;</code>
+     */
+    RET_UGC_MUSIC_IMPORT_NOT_FOUND(11169),
+    /**
+     * <code>RET_UGC_MUSIC_SET_OPTION_TOO_FREQUENT = 11170;</code>
+     */
+    RET_UGC_MUSIC_SET_OPTION_TOO_FREQUENT(11170),
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_TOO_FREQUENT = 11171;</code>
+     */
+    RET_UGC_MUSIC_IMPORT_TOO_FREQUENT(11171),
+    /**
+     * <code>RET_UGC_MUSIC_GEN_SHARE_CODE_FAIL = 11172;</code>
+     */
+    RET_UGC_MUSIC_GEN_SHARE_CODE_FAIL(11172),
+    /**
+     * <code>RET_UGC_MUSIC_CANCEL_STORE_REPEAT = 11173;</code>
+     */
+    RET_UGC_MUSIC_CANCEL_STORE_REPEAT(11173),
     /**
      * <code>RET_COMPOUND_BOOST_ITEM_NOT_EXIST = 11201;</code>
      */
@@ -4579,6 +4991,14 @@ public final class RetcodeOuterClass {
      * <code>RET_QUICK_HIT_TREE_EMPTY_TREES = 11211;</code>
      */
     RET_QUICK_HIT_TREE_EMPTY_TREES(11211),
+    /**
+     * <code>RET_COMPOUND_NO_FINISH_CAN_TAKE = 11221;</code>
+     */
+    RET_COMPOUND_NO_FINISH_CAN_TAKE(11221),
+    /**
+     * <code>RET_FORGE_NO_FINISH_CAN_TAKE = 11226;</code>
+     */
+    RET_FORGE_NO_FINISH_CAN_TAKE(11226),
     /**
      * <code>RET_GCG_FIND_GAME_MODE_FAIL = 12000;</code>
      */
@@ -4747,6 +5167,18 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_WATCH_CLIENT_DATA_VERSOIN_FORBID = 12041;</code>
      */
     RET_GCG_WATCH_CLIENT_DATA_VERSOIN_FORBID(12041),
+    /**
+     * <code>RET_GCG_SKILL_NOT_VEHICLE_SKILL = 12042;</code>
+     */
+    RET_GCG_SKILL_NOT_VEHICLE_SKILL(12042),
+    /**
+     * <code>RET_GCG_SKILL_CHECK_CONDITION_FAIL = 12043;</code>
+     */
+    RET_GCG_SKILL_CHECK_CONDITION_FAIL(12043),
+    /**
+     * <code>RET_GCG_VEHICLE_SKILL_CHECK_CONDITION_FAIL = 12044;</code>
+     */
+    RET_GCG_VEHICLE_SKILL_CHECK_CONDITION_FAIL(12044),
     /**
      * <code>RET_GCG_COIN_EXCEED_LIMIT = 12101;</code>
      */
@@ -4963,6 +5395,14 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_BACK_DUEL_OTHER_TO_PS = 12154;</code>
      */
     RET_GCG_BACK_DUEL_OTHER_TO_PS(12154),
+    /**
+     * <code>RET_GCG_WEEK_REWARD_LIMIT = 12155;</code>
+     */
+    RET_GCG_WEEK_REWARD_LIMIT(12155),
+    /**
+     * <code>RET_GCG_FESTIVAL_MODE_IN_PICK = 12156;</code>
+     */
+    RET_GCG_FESTIVAL_MODE_IN_PICK(12156),
     /**
      * <code>RET_GCG_DS_DECK_LOCKED = 12201;</code>
      */
@@ -5051,6 +5491,14 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_DS_AT_LEAST_ONE_DECK = 12223;</code>
      */
     RET_GCG_DS_AT_LEAST_ONE_DECK(12223),
+    /**
+     * <code>RET_GCG_DS_DECK_CODE_ILLEGAL = 12224;</code>
+     */
+    RET_GCG_DS_DECK_CODE_ILLEGAL(12224),
+    /**
+     * <code>RET_GCG_DS_DECK_CODE_CD = 12225;</code>
+     */
+    RET_GCG_DS_DECK_CODE_CD(12225),
     /**
      * <code>RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL = 12251;</code>
      */
@@ -5515,6 +5963,310 @@ public final class RetcodeOuterClass {
      * <code>RET_FONTAINE_GATHER_INVALID_MONSTER_TRACKING = 13262;</code>
      */
     RET_FONTAINE_GATHER_INVALID_MONSTER_TRACKING(13262),
+    /**
+     * <code>RET_FISHBLASTER_LEVEL_NOT_OPEN = 13271;</code>
+     */
+    RET_FISHBLASTER_LEVEL_NOT_OPEN(13271),
+    /**
+     * <code>RET_FISHBLASTER_NOT_IN_RIGHT_SCENE = 13272;</code>
+     */
+    RET_FISHBLASTER_NOT_IN_RIGHT_SCENE(13272),
+    /**
+     * <code>RET_FISHBLASTER_LEVEL_MISMATCH = 13273;</code>
+     */
+    RET_FISHBLASTER_LEVEL_MISMATCH(13273),
+    /**
+     * <code>RET_FISHBLASTER_ALREADY_PLAYING = 13274;</code>
+     */
+    RET_FISHBLASTER_ALREADY_PLAYING(13274),
+    /**
+     * <code>RET_GOAL_CHALLENGE_STAGE_NOT_OPEN = 13281;</code>
+     */
+    RET_GOAL_CHALLENGE_STAGE_NOT_OPEN(13281),
+    /**
+     * <code>RET_GOAL_CHALLENGE_INVALID_TEAM = 13282;</code>
+     */
+    RET_GOAL_CHALLENGE_INVALID_TEAM(13282),
+    /**
+     * <code>RET_ALCHEMY_SIM_COIN_NOT_ENOUGH = 13291;</code>
+     */
+    RET_ALCHEMY_SIM_COIN_NOT_ENOUGH(13291),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_EXCEED_LIMIT = 13292;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_EXCEED_LIMIT(13292),
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_SAME_CROP = 13293;</code>
+     */
+    RET_ALCHEMY_SIM_FARMLAND_SAME_CROP(13293),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NO_HARVESTABLE_LAND = 13294;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_NO_HARVESTABLE_LAND(13294),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NOT_ENOUGH = 13295;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_NOT_ENOUGH(13295),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NOT_UNLOCKED = 13296;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_NOT_UNLOCKED(13296),
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_NOT_READY = 13297;</code>
+     */
+    RET_ALCHEMY_SIM_FARMLAND_NOT_READY(13297),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_RANK_MAX = 13298;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_RANK_MAX(13298),
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_IS_NOT_HARVESTED = 13299;</code>
+     */
+    RET_ALCHEMY_SIM_FARMLAND_IS_NOT_HARVESTED(13299),
+    /**
+     * <code>RET_ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED = 13300;</code>
+     */
+    RET_ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED(13300),
+    /**
+     * <code>RET_ALCHEMY_SIM_POTION_NOT_EXIST = 13301;</code>
+     */
+    RET_ALCHEMY_SIM_POTION_NOT_EXIST(13301),
+    /**
+     * <code>RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM = 13302;</code>
+     */
+    RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM(13302),
+    /**
+     * <code>RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT_OVER = 13303;</code>
+     */
+    RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT_OVER(13303),
+    /**
+     * <code>RET_ALCHEMY_SIM_INTERNAL_LOGIC_ERROR = 13304;</code>
+     */
+    RET_ALCHEMY_SIM_INTERNAL_LOGIC_ERROR(13304),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_ON_FORBIDDEN_POS = 13305;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_ON_FORBIDDEN_POS(13305),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_OVERLAP_OVER_LIMIT = 13306;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_OVERLAP_OVER_LIMIT(13306),
+    /**
+     * <code>RET_ALCHEMY_SIM_PUZZLE_RATE_NOT_ENOUGH = 13307;</code>
+     */
+    RET_ALCHEMY_SIM_PUZZLE_RATE_NOT_ENOUGH(13307),
+    /**
+     * <code>RET_ALCHEMY_SIM_POTION_CANT_UPGRADE = 13308;</code>
+     */
+    RET_ALCHEMY_SIM_POTION_CANT_UPGRADE(13308),
+    /**
+     * <code>RET_ALCHEMY_SIM_EXAM_COUNT_NOT_ENOUGH = 13309;</code>
+     */
+    RET_ALCHEMY_SIM_EXAM_COUNT_NOT_ENOUGH(13309),
+    /**
+     * <code>RET_ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED = 13310;</code>
+     */
+    RET_ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED(13310),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND = 13311;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND(13311),
+    /**
+     * <code>RET_ALCHEMY_SIM_UNFINISH_QUEST = 13312;</code>
+     */
+    RET_ALCHEMY_SIM_UNFINISH_QUEST(13312),
+    /**
+     * <code>RET_ALCHEMY_SIM_INVALID_ROUND_STATE = 13313;</code>
+     */
+    RET_ALCHEMY_SIM_INVALID_ROUND_STATE(13313),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLOW = 13314;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLOW(13314),
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_UPGRADE_NOT_UNLOCKED = 13315;</code>
+     */
+    RET_ALCHEMY_SIM_CROP_UPGRADE_NOT_UNLOCKED(13315),
+    /**
+     * <code>RET_ALCHEMY_SIM_FINISH_ROUND_FREQUENCY = 13316;</code>
+     */
+    RET_ALCHEMY_SIM_FINISH_ROUND_FREQUENCY(13316),
+    /**
+     * <code>RET_ALCHEMY_SIM_TEMPLATE_ALCHEMY_NOT_UNLOCKED = 13317;</code>
+     */
+    RET_ALCHEMY_SIM_TEMPLATE_ALCHEMY_NOT_UNLOCKED(13317),
+    /**
+     * <code>RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT = 13351;</code>
+     */
+    RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT(13351),
+    /**
+     * <code>RET_CATCAFE_LAYOUT_NOT_RIGHT = 13352;</code>
+     */
+    RET_CATCAFE_LAYOUT_NOT_RIGHT(13352),
+    /**
+     * <code>RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON = 13371;</code>
+     */
+    RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON(13371),
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN = 13381;</code>
+     */
+    RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN(13381),
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT = 13382;</code>
+     */
+    RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT(13382),
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM = 13383;</code>
+     */
+    RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM(13383),
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT = 13384;</code>
+     */
+    RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT(13384),
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE = 13385;</code>
+     */
+    RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE(13385),
+    /**
+     * <code>RET_BLUEPRINT_SLOT_NOT_FOUND = 13401;</code>
+     */
+    RET_BLUEPRINT_SLOT_NOT_FOUND(13401),
+    /**
+     * <code>RET_FURNITURE_SUITE_ID_INVALID = 13402;</code>
+     */
+    RET_FURNITURE_SUITE_ID_INVALID(13402),
+    /**
+     * <code>RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT = 13403;</code>
+     */
+    RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT(13403),
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN = 13411;</code>
+     */
+    RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN(13411),
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN = 13412;</code>
+     */
+    RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN(13412),
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH = 13413;</code>
+     */
+    RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH(13413),
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN = 13414;</code>
+     */
+    RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN(13414),
+    /**
+     * <code>RET_WATERGUN_LEVEL_NOT_OPEN = 13431;</code>
+     */
+    RET_WATERGUN_LEVEL_NOT_OPEN(13431),
+    /**
+     * <code>RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN = 13441;</code>
+     */
+    RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN(13441),
+    /**
+     * <code>RET_ACROBATICS_BATTLE_INVALID_TEAM = 13442;</code>
+     */
+    RET_ACROBATICS_BATTLE_INVALID_TEAM(13442),
+    /**
+     * <code>RET_MONSTER_VS_MONSTER_LEVEL_NOT_OPEN = 13451;</code>
+     */
+    RET_MONSTER_VS_MONSTER_LEVEL_NOT_OPEN(13451),
+    /**
+     * <code>RET_RECHARGE_DISK_LEVEL_NOT_OPEN = 13471;</code>
+     */
+    RET_RECHARGE_DISK_LEVEL_NOT_OPEN(13471),
+    /**
+     * <code>RET_RECHARGE_DISK_INVALID_LEVEL_BUILD = 13472;</code>
+     */
+    RET_RECHARGE_DISK_INVALID_LEVEL_BUILD(13472),
+    /**
+     * <code>RET_RECHARGE_DISK_CUR_SCENE_INVALID = 13473;</code>
+     */
+    RET_RECHARGE_DISK_CUR_SCENE_INVALID(13473),
+    /**
+     * <code>RET_ACTIVITY_PREVIEW_TRIAL_IN_CD = 13478;</code>
+     */
+    RET_ACTIVITY_PREVIEW_TRIAL_IN_CD(13478),
+    /**
+     * <code>RET_BIRD_BALL_MP_LEVEL_NOT_OPEN = 13481;</code>
+     */
+    RET_BIRD_BALL_MP_LEVEL_NOT_OPEN(13481),
+    /**
+     * <code>RET_BIRD_BALL_DRAFT_PLAYER_NUM_INVALID = 13482;</code>
+     */
+    RET_BIRD_BALL_DRAFT_PLAYER_NUM_INVALID(13482),
+    /**
+     * <code>RET_FAIRY_TALES_LOTTER_AREA_IS_NOT_OPEN = 13491;</code>
+     */
+    RET_FAIRY_TALES_LOTTER_AREA_IS_NOT_OPEN(13491),
+    /**
+     * <code>RET_FAIRY_TALES_LOTTER_LEFT_CNT_NOT_ENOUGH = 13492;</code>
+     */
+    RET_FAIRY_TALES_LOTTER_LEFT_CNT_NOT_ENOUGH(13492),
+    /**
+     * <code>RET_FAIRY_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH = 13493;</code>
+     */
+    RET_FAIRY_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH(13493),
+    /**
+     * <code>RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_LIMIT = 13494;</code>
+     */
+    RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_LIMIT(13494),
+    /**
+     * <code>RET_FAIRY_TALES_TOY_CUSTOM_GADGET_CONTENT_INVALID = 13495;</code>
+     */
+    RET_FAIRY_TALES_TOY_CUSTOM_GADGET_CONTENT_INVALID(13495),
+    /**
+     * <code>RET_FAIRY_TALES_COMBAT_LEVEL_NOT_OPEN = 13496;</code>
+     */
+    RET_FAIRY_TALES_COMBAT_LEVEL_NOT_OPEN(13496),
+    /**
+     * <code>RET_FAIRY_TALES_TICKET_PREREQUISITE_NOT_MET = 13497;</code>
+     */
+    RET_FAIRY_TALES_TICKET_PREREQUISITE_NOT_MET(13497),
+    /**
+     * <code>RET_FAIRY_TALES_TICKET_NOT_ENOUGH = 13498;</code>
+     */
+    RET_FAIRY_TALES_TICKET_NOT_ENOUGH(13498),
+    /**
+     * <code>RET_ACTIVITY_TEAM_INVALID_SIZE = 13551;</code>
+     */
+    RET_ACTIVITY_TEAM_INVALID_SIZE(13551),
+    /**
+     * <code>RET_ACTIVITY_INVALID_TRIAL_AVATAR = 13552;</code>
+     */
+    RET_ACTIVITY_INVALID_TRIAL_AVATAR(13552),
+    /**
+     * <code>RET_ACTIVITY_FORBIDDEN_TRIAL_AVATAR = 13553;</code>
+     */
+    RET_ACTIVITY_FORBIDDEN_TRIAL_AVATAR(13553),
+    /**
+     * <code>RET_RENAME_INVALID_QUEST_STATE = 13571;</code>
+     */
+    RET_RENAME_INVALID_QUEST_STATE(13571),
+    /**
+     * <code>RET_RENAME_CONFLICTED = 13572;</code>
+     */
+    RET_RENAME_CONFLICTED(13572),
+    /**
+     * <code>RET_RELIQUARY_OFFER_PURCHASE_VERSION_IDX_ERROR = 13591;</code>
+     */
+    RET_RELIQUARY_OFFER_PURCHASE_VERSION_IDX_ERROR(13591),
+    /**
+     * <code>RET_RELIQUARY_OFFER_VERSION_TIMES_LIMIT = 13592;</code>
+     */
+    RET_RELIQUARY_OFFER_VERSION_TIMES_LIMIT(13592),
+    /**
+     * <code>RET_RELIQUARY_OFFER_PROGRESS_NOT_ENOUGH = 13593;</code>
+     */
+    RET_RELIQUARY_OFFER_PROGRESS_NOT_ENOUGH(13593),
+    /**
+     * <code>RET_RELIQUARY_OFFER_PROGRESS_OVER_LIMIT = 13594;</code>
+     */
+    RET_RELIQUARY_OFFER_PROGRESS_OVER_LIMIT(13594),
+    /**
+     * <code>RET_RELIQUARY_PURCHASE_SUITE_TIMES_OVER_LIMIT = 13595;</code>
+     */
+    RET_RELIQUARY_PURCHASE_SUITE_TIMES_OVER_LIMIT(13595),
     UNRECOGNIZED(-1),
     ;
 
@@ -5698,6 +6450,10 @@ public final class RetcodeOuterClass {
      * <code>RET_PROTO_MIX_VERSION_NOT_MATCH = 44;</code>
      */
     public static final int RET_PROTO_MIX_VERSION_NOT_MATCH_VALUE = 44;
+    /**
+     * <code>RET_ACCOUNT_TYPE_STOP_REGISTER = 45;</code>
+     */
+    public static final int RET_ACCOUNT_TYPE_STOP_REGISTER_VALUE = 45;
     /**
      * <code>RET_AVATAR_IN_CD = 101;</code>
      */
@@ -5811,9 +6567,13 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_AVATAR_IN_COMBAT_VALUE = 128;
     /**
-     * <code>RET_NICKNAME_UTF8_ERROR = 130;</code>
+     * <code>RET_PLAYER_TIME_LOCKED = 129;</code>
      */
-    public static final int RET_NICKNAME_UTF8_ERROR_VALUE = 130;
+    public static final int RET_PLAYER_TIME_LOCKED_VALUE = 129;
+    /**
+     * <code>RET_NICKNAME_UTF_8_ERROR = 130;</code>
+     */
+    public static final int RET_NICKNAME_UTF_8_ERROR_VALUE = 130;
     /**
      * <code>RET_NICKNAME_TOO_LONG = 131;</code>
      */
@@ -5962,6 +6722,34 @@ public final class RetcodeOuterClass {
      * <code>RET_PLAYER_HAS_TRIAL_AVATAR = 179;</code>
      */
     public static final int RET_PLAYER_HAS_TRIAL_AVATAR_VALUE = 179;
+    /**
+     * <code>RET_AVATAR_EXPEDITION_SLOT_NOT_ENOUGH = 180;</code>
+     */
+    public static final int RET_AVATAR_EXPEDITION_SLOT_NOT_ENOUGH_VALUE = 180;
+    /**
+     * <code>RET_AVATAR_EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD = 181;</code>
+     */
+    public static final int RET_AVATAR_EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD_VALUE = 181;
+    /**
+     * <code>RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW = 182;</code>
+     */
+    public static final int RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW_VALUE = 182;
+    /**
+     * <code>RET_ASYNC_WORD_FILTER_IN_CD = 183;</code>
+     */
+    public static final int RET_ASYNC_WORD_FILTER_IN_CD_VALUE = 183;
+    /**
+     * <code>RET_NOT_HAS_TRACE_EFFECT = 184;</code>
+     */
+    public static final int RET_NOT_HAS_TRACE_EFFECT_VALUE = 184;
+    /**
+     * <code>RET_TRACE_EFFECT_AVATAR_ERROR = 185;</code>
+     */
+    public static final int RET_TRACE_EFFECT_AVATAR_ERROR_VALUE = 185;
+    /**
+     * <code>RET_PLAYER_TIME_LOCKED_BY_QUEST = 186;</code>
+     */
+    public static final int RET_PLAYER_TIME_LOCKED_BY_QUEST_VALUE = 186;
     /**
      * <code>RET_FLOAT_ERROR = 201;</code>
      */
@@ -6018,6 +6806,50 @@ public final class RetcodeOuterClass {
      * <code>RET_SUBMIT_QUEST_EVENTS_NOT_RIGHT = 408;</code>
      */
     public static final int RET_SUBMIT_QUEST_EVENTS_NOT_RIGHT_VALUE = 408;
+    /**
+     * <code>RET_CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILED = 409;</code>
+     */
+    public static final int RET_CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILED_VALUE = 409;
+    /**
+     * <code>RET_CONFIRM_CONTINUE_MUTUAL_OCCUPIED_FAILED = 410;</code>
+     */
+    public static final int RET_CONFIRM_CONTINUE_MUTUAL_OCCUPIED_FAILED_VALUE = 410;
+    /**
+     * <code>RET_QUEST_FOCUS_MODE_IN_CD = 416;</code>
+     */
+    public static final int RET_QUEST_FOCUS_MODE_IN_CD_VALUE = 416;
+    /**
+     * <code>RET_QUEST_IN_FOCUS_MODE = 417;</code>
+     */
+    public static final int RET_QUEST_IN_FOCUS_MODE_VALUE = 417;
+    /**
+     * <code>RET_QUEST_NOT_IN_FOCUS_MODE = 418;</code>
+     */
+    public static final int RET_QUEST_NOT_IN_FOCUS_MODE_VALUE = 418;
+    /**
+     * <code>RET_PARENT_QUEST_CANNOT_START_FOCUS = 419;</code>
+     */
+    public static final int RET_PARENT_QUEST_CANNOT_START_FOCUS_VALUE = 419;
+    /**
+     * <code>RET_PARENT_QUEST_NOT_EXIST = 420;</code>
+     */
+    public static final int RET_PARENT_QUEST_NOT_EXIST_VALUE = 420;
+    /**
+     * <code>RET_BAN_OPEARATE_FOCUS = 421;</code>
+     */
+    public static final int RET_BAN_OPEARATE_FOCUS_VALUE = 421;
+    /**
+     * <code>RET_QUEST_FOCUS_ANY_GALLERY_STARTED = 422;</code>
+     */
+    public static final int RET_QUEST_FOCUS_ANY_GALLERY_STARTED_VALUE = 422;
+    /**
+     * <code>RET_QUEST_FOCUS_USING_INFORMAL_AVATAR = 423;</code>
+     */
+    public static final int RET_QUEST_FOCUS_USING_INFORMAL_AVATAR_VALUE = 423;
+    /**
+     * <code>RET_QUEST_FOCUS_OPENSTATE_OFF = 424;</code>
+     */
+    public static final int RET_QUEST_FOCUS_OPENSTATE_OFF_VALUE = 424;
     /**
      * <code>RET_POINT_NOT_UNLOCKED = 501;</code>
      */
@@ -6218,6 +7050,18 @@ public final class RetcodeOuterClass {
      * <code>RET_INVALID_MAP_LAYER = 569;</code>
      */
     public static final int RET_INVALID_MAP_LAYER_VALUE = 569;
+    /**
+     * <code>RET_GALLERY_REPEAT_START = 570;</code>
+     */
+    public static final int RET_GALLERY_REPEAT_START_VALUE = 570;
+    /**
+     * <code>RET_NOT_IN_PLAYER_SCENE = 571;</code>
+     */
+    public static final int RET_NOT_IN_PLAYER_SCENE_VALUE = 571;
+    /**
+     * <code>RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON = 572;</code>
+     */
+    public static final int RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON_VALUE = 572;
     /**
      * <code>RET_ITEM_NOT_EXIST = 601;</code>
      */
@@ -6442,6 +7286,10 @@ public final class RetcodeOuterClass {
      * <code>RET_MCOIN_EXCEED_LIMIT = 656;</code>
      */
     public static final int RET_MCOIN_EXCEED_LIMIT_VALUE = 656;
+    /**
+     * <code>RET_BATCH_SET_EQUIP_LOCK_STATE_CD = 657;</code>
+     */
+    public static final int RET_BATCH_SET_EQUIP_LOCK_STATE_CD_VALUE = 657;
     /**
      * <code>RET_RESIN_NOT_ENOUGH = 660;</code>
      */
@@ -6642,6 +7490,10 @@ public final class RetcodeOuterClass {
      * <code>RET_SHOP_BATCH_BUY_COUNT_LIMIT = 709;</code>
      */
     public static final int RET_SHOP_BATCH_BUY_COUNT_LIMIT_VALUE = 709;
+    /**
+     * <code>RET_GOODS_PRECONDITION_NOT_SATISFIED = 710;</code>
+     */
+    public static final int RET_GOODS_PRECONDITION_NOT_SATISFIED_VALUE = 710;
     /**
      * <code>RET_CHAT_FORBIDDEN = 798;</code>
      */
@@ -6798,6 +7650,14 @@ public final class RetcodeOuterClass {
      * <code>RET_VEHICLE_SORUSH_STATE_NOT_MATCH = 836;</code>
      */
     public static final int RET_VEHICLE_SORUSH_STATE_NOT_MATCH_VALUE = 836;
+    /**
+     * <code>RET_GIVING_NOT_IN_MY_WORLD = 837;</code>
+     */
+    public static final int RET_GIVING_NOT_IN_MY_WORLD_VALUE = 837;
+    /**
+     * <code>RET_GIVING_IS_FROZEN = 838;</code>
+     */
+    public static final int RET_GIVING_IS_FROZEN_VALUE = 838;
     /**
      * <code>RET_ACTIVITY_CLOSE = 860;</code>
      */
@@ -7102,6 +7962,26 @@ public final class RetcodeOuterClass {
      * <code>RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM = 1128;</code>
      */
     public static final int RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM_VALUE = 1128;
+    /**
+     * <code>RET_DUNGEON_ENTERED_BY_CANDIDATE_TEAM = 1129;</code>
+     */
+    public static final int RET_DUNGEON_ENTERED_BY_CANDIDATE_TEAM_VALUE = 1129;
+    /**
+     * <code>RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY = 1130;</code>
+     */
+    public static final int RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY_VALUE = 1130;
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_INTERNAL_ERROR = 1131;</code>
+     */
+    public static final int RET_DUNGEON_ENTER_TEAM_INTERNAL_ERROR_VALUE = 1131;
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_SOMEONE_LEVEL_LIMIT = 1132;</code>
+     */
+    public static final int RET_DUNGEON_ENTER_TEAM_SOMEONE_LEVEL_LIMIT_VALUE = 1132;
+    /**
+     * <code>RET_DUNGEON_ENTER_TEAM_SOMEONE_NOT_IN_SCENE_TEAM = 1133;</code>
+     */
+    public static final int RET_DUNGEON_ENTER_TEAM_SOMEONE_NOT_IN_SCENE_TEAM_VALUE = 1133;
     /**
      * <code>RET_MP_NOT_IN_MY_WORLD = 1201;</code>
      */
@@ -7307,9 +8187,9 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_MP_CANNOT_EXEC_GIVING_IN_SINGLE_MODE_QUEST_VALUE = 1252;
     /**
-     * <code>RET_MP_EFFIGY_CHALLENGE_V4_IN_PREPARE = 1253;</code>
+     * <code>RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE = 1253;</code>
      */
-    public static final int RET_MP_EFFIGY_CHALLENGE_V4_IN_PREPARE_VALUE = 1253;
+    public static final int RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE_VALUE = 1253;
     /**
      * <code>RET_MP_SHUFFLE_BOARD_ONGOING = 1254;</code>
      */
@@ -7322,6 +8202,18 @@ public final class RetcodeOuterClass {
      * <code>RET_MP_TOY_BATTLE_QTE_ONGOING = 1256;</code>
      */
     public static final int RET_MP_TOY_BATTLE_QTE_ONGOING_VALUE = 1256;
+    /**
+     * <code>RET_MP_PAINTING_REPAIR_ONGOING = 1257;</code>
+     */
+    public static final int RET_MP_PAINTING_REPAIR_ONGOING_VALUE = 1257;
+    /**
+     * <code>RET_MP_FISHBLASTER_ONGOING = 1258;</code>
+     */
+    public static final int RET_MP_FISHBLASTER_ONGOING_VALUE = 1258;
+    /**
+     * <code>RET_MP_GUEST_MATCH_COND_NOT_MEET = 1259;</code>
+     */
+    public static final int RET_MP_GUEST_MATCH_COND_NOT_MEET_VALUE = 1259;
     /**
      * <code>RET_MAIL_PARA_ERR = 1301;</code>
      */
@@ -7410,6 +8302,22 @@ public final class RetcodeOuterClass {
      * <code>RET_MAIL_COLLECTION_IS_FULL = 1322;</code>
      */
     public static final int RET_MAIL_COLLECTION_IS_FULL_VALUE = 1322;
+    /**
+     * <code>RET_MAIL_TITLE_CHARACTER_LEN_EXCEED = 1323;</code>
+     */
+    public static final int RET_MAIL_TITLE_CHARACTER_LEN_EXCEED_VALUE = 1323;
+    /**
+     * <code>RET_MAIL_TITLE_EMPTY = 1324;</code>
+     */
+    public static final int RET_MAIL_TITLE_EMPTY_VALUE = 1324;
+    /**
+     * <code>RET_MAIL_CONTENT_EMPTY = 1325;</code>
+     */
+    public static final int RET_MAIL_CONTENT_EMPTY_VALUE = 1325;
+    /**
+     * <code>RET_MAIL_SENDER_EMPTY = 1326;</code>
+     */
+    public static final int RET_MAIL_SENDER_EMPTY_VALUE = 1326;
     /**
      * <code>RET_DAILY_TASK_NOT_FINISH = 1330;</code>
      */
@@ -7426,6 +8334,14 @@ public final class RetcodeOuterClass {
      * <code>RET_DAILY_TASK_FILTER_CITY_NOT_OPEN = 1333;</code>
      */
     public static final int RET_DAILY_TASK_FILTER_CITY_NOT_OPEN_VALUE = 1333;
+    /**
+     * <code>RET_DAILY_ATTENDANCE_NOT_OPEN = 1334;</code>
+     */
+    public static final int RET_DAILY_ATTENDANCE_NOT_OPEN_VALUE = 1334;
+    /**
+     * <code>RET_DAILY_ATTENDANCE_REWARD_MAX = 1335;</code>
+     */
+    public static final int RET_DAILY_ATTENDANCE_REWARD_MAX_VALUE = 1335;
     /**
      * <code>RET_GACHA_INAVAILABLE = 1401;</code>
      */
@@ -7466,6 +8382,10 @@ public final class RetcodeOuterClass {
      * <code>RET_GACHA_GENERAL_TIMES_LIMIT = 1410;</code>
      */
     public static final int RET_GACHA_GENERAL_TIMES_LIMIT_VALUE = 1410;
+    /**
+     * <code>RET_GACHA_WISH_IS_NEEDED_BEFORE_GACHA = 1411;</code>
+     */
+    public static final int RET_GACHA_WISH_IS_NEEDED_BEFORE_GACHA_VALUE = 1411;
     /**
      * <code>RET_INVESTIGAITON_NOT_IN_PROGRESS = 1501;</code>
      */
@@ -7674,6 +8594,74 @@ public final class RetcodeOuterClass {
      * <code>RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PANEL = 1600;</code>
      */
     public static final int RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PANEL_VALUE = 1600;
+    /**
+     * <code>RET_ROLE_COMBAT_NOT_RECORD = 1601;</code>
+     */
+    public static final int RET_ROLE_COMBAT_NOT_RECORD_VALUE = 1601;
+    /**
+     * <code>RET_ROLE_COMBAT_COIN_EXCEED_LIMIT = 1602;</code>
+     */
+    public static final int RET_ROLE_COMBAT_COIN_EXCEED_LIMIT_VALUE = 1602;
+    /**
+     * <code>RET_ROLE_COMBAT_COIN_NOT_ENOUGH = 1603;</code>
+     */
+    public static final int RET_ROLE_COMBAT_COIN_NOT_ENOUGH_VALUE = 1603;
+    /**
+     * <code>RET_ROLE_COMBAT_LEVEL_NOT_MEET = 1604;</code>
+     */
+    public static final int RET_ROLE_COMBAT_LEVEL_NOT_MEET_VALUE = 1604;
+    /**
+     * <code>RET_ROLE_COMBAT_TOWER_NOT_MEET = 1605;</code>
+     */
+    public static final int RET_ROLE_COMBAT_TOWER_NOT_MEET_VALUE = 1605;
+    /**
+     * <code>RET_ROLE_COMBAT_SCHEDULE_NOT_MEET = 1606;</code>
+     */
+    public static final int RET_ROLE_COMBAT_SCHEDULE_NOT_MEET_VALUE = 1606;
+    /**
+     * <code>RET_ROLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUENTLY = 1617;</code>
+     */
+    public static final int RET_ROLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUENTLY_VALUE = 1617;
+    /**
+     * <code>RET_ROLE_COMBAT_REQ_TRIAL_AVATAR_FREQUENTLY = 1618;</code>
+     */
+    public static final int RET_ROLE_COMBAT_REQ_TRIAL_AVATAR_FREQUENTLY_VALUE = 1618;
+    /**
+     * <code>RET_ROLE_COMBAT_REFRESH_COUNT_NOT_ENOUGH = 1619;</code>
+     */
+    public static final int RET_ROLE_COMBAT_REFRESH_COUNT_NOT_ENOUGH_VALUE = 1619;
+    /**
+     * <code>RET_ROLE_COMBAT_QUEST_NOT_MEET = 1620;</code>
+     */
+    public static final int RET_ROLE_COMBAT_QUEST_NOT_MEET_VALUE = 1620;
+    /**
+     * <code>RET_IN_ROLE_COMBAT_DUNGEON = 1621;</code>
+     */
+    public static final int RET_IN_ROLE_COMBAT_DUNGEON_VALUE = 1621;
+    /**
+     * <code>RET_IN_ROLE_COMBAT_DUNGEON_BY_USE_ITEM = 1622;</code>
+     */
+    public static final int RET_IN_ROLE_COMBAT_DUNGEON_BY_USE_ITEM_VALUE = 1622;
+    /**
+     * <code>RET_ROLE_COMBAT_RENT_AVATAR_NOT_FOUND = 1623;</code>
+     */
+    public static final int RET_ROLE_COMBAT_RENT_AVATAR_NOT_FOUND_VALUE = 1623;
+    /**
+     * <code>RET_ROLE_COMBAT_CARD_HAS_BLOCKED = 1624;</code>
+     */
+    public static final int RET_ROLE_COMBAT_CARD_HAS_BLOCKED_VALUE = 1624;
+    /**
+     * <code>RET_CHAR_MASTER_KEY_EXCEED_LIMIT = 1631;</code>
+     */
+    public static final int RET_CHAR_MASTER_KEY_EXCEED_LIMIT_VALUE = 1631;
+    /**
+     * <code>RET_CHAR_MASTER_KEY_NOT_ENOUGH = 1632;</code>
+     */
+    public static final int RET_CHAR_MASTER_KEY_NOT_ENOUGH_VALUE = 1632;
+    /**
+     * <code>RET_CHAR_MASTER_PREVIEW_IN_CD = 1633;</code>
+     */
+    public static final int RET_CHAR_MASTER_PREVIEW_IN_CD_VALUE = 1633;
     /**
      * <code>RET_UID_NOT_EXIST = 2001;</code>
      */
@@ -7887,9 +8875,9 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_REMARK_TOO_LONG_VALUE = 7029;
     /**
-     * <code>RET_REMARK_UTF8_ERROR = 7030;</code>
+     * <code>RET_REMARK_UTF_8_ERROR = 7030;</code>
      */
-    public static final int RET_REMARK_UTF8_ERROR_VALUE = 7030;
+    public static final int RET_REMARK_UTF_8_ERROR_VALUE = 7030;
     /**
      * <code>RET_REMARK_IS_EMPTY = 7031;</code>
      */
@@ -7942,6 +8930,10 @@ public final class RetcodeOuterClass {
      * <code>RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL = 7043;</code>
      */
     public static final int RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL_VALUE = 7043;
+    /**
+     * <code>RET_PROFILE_PICTURE_NOT_UNLOCKED = 7044;</code>
+     */
+    public static final int RET_PROFILE_PICTURE_NOT_UNLOCKED_VALUE = 7044;
     /**
      * <code>RET_OFFERING_NOT_OPEN = 7081;</code>
      */
@@ -7974,6 +8966,10 @@ public final class RetcodeOuterClass {
      * <code>RET_OFFERING_PARI_SEARCH_ALL_FINISH = 7088;</code>
      */
     public static final int RET_OFFERING_PARI_SEARCH_ALL_FINISH_VALUE = 7088;
+    /**
+     * <code>RET_OFFERING_PARI_NO_FINISH_REWARD = 7089;</code>
+     */
+    public static final int RET_OFFERING_PARI_NO_FINISH_REWARD_VALUE = 7089;
     /**
      * <code>RET_CITY_REPUTATION_NOT_OPEN = 7101;</code>
      */
@@ -8030,6 +9026,66 @@ public final class RetcodeOuterClass {
      * <code>RET_CITY_REPUTATION_EXPLORE_NOT_REACH = 7114;</code>
      */
     public static final int RET_CITY_REPUTATION_EXPLORE_NOT_REACH_VALUE = 7114;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_NOT_OPEN = 7115;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_NOT_OPEN_VALUE = 7115;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_TAKEN = 7116;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_LEVEL_TAKEN_VALUE = 7116;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_NOT_REACH = 7117;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_LEVEL_NOT_REACH_VALUE = 7117;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_TAKEN_EXPLORE_REWARD = 7118;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_TAKEN_EXPLORE_REWARD_VALUE = 7118;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_EXPLORE_NOT_REACH = 7119;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_EXPLORE_NOT_REACH_VALUE = 7119;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_PARENT_QUEST_TAKEN = 7201;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_PARENT_QUEST_TAKEN_VALUE = 7201;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINISH = 7202;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINISH_VALUE = 7202;
+    /**
+     * <code>RET_CITY_REPUTATION_NOT_OPEN_TRIBAL = 7203;</code>
+     */
+    public static final int RET_CITY_REPUTATION_NOT_OPEN_TRIBAL_VALUE = 7203;
+    /**
+     * <code>RET_CITY_REPUTATION_NO_THE_DONATION = 7204;</code>
+     */
+    public static final int RET_CITY_REPUTATION_NO_THE_DONATION_VALUE = 7204;
+    /**
+     * <code>RET_CITY_REPUTATION_DONATION_FINISHED = 7205;</code>
+     */
+    public static final int RET_CITY_REPUTATION_DONATION_FINISHED_VALUE = 7205;
+    /**
+     * <code>RET_CITY_REPUTATION_DONATION_LIMIT = 7206;</code>
+     */
+    public static final int RET_CITY_REPUTATION_DONATION_LIMIT_VALUE = 7206;
+    /**
+     * <code>RET_CITY_REPUTATION_TOTAL_REWARD_TAKEN = 7207;</code>
+     */
+    public static final int RET_CITY_REPUTATION_TOTAL_REWARD_TAKEN_VALUE = 7207;
+    /**
+     * <code>RET_CITY_REPUTATION_TOTAL_REWARD_NOT_REACH = 7208;</code>
+     */
+    public static final int RET_CITY_REPUTATION_TOTAL_REWARD_NOT_REACH_VALUE = 7208;
+    /**
+     * <code>RET_CITY_REPUTATION_LEVEL_FULL = 7209;</code>
+     */
+    public static final int RET_CITY_REPUTATION_LEVEL_FULL_VALUE = 7209;
+    /**
+     * <code>RET_TRIBAL_REPUTATION_LEVEL_FULL = 7210;</code>
+     */
+    public static final int RET_TRIBAL_REPUTATION_LEVEL_FULL_VALUE = 7210;
     /**
      * <code>RET_MECHANICUS_NOT_OPEN = 7120;</code>
      */
@@ -8346,6 +9402,14 @@ public final class RetcodeOuterClass {
      * <code>RET_REGION_SEARCH_STATE_ERROR = 9123;</code>
      */
     public static final int RET_REGION_SEARCH_STATE_ERROR_VALUE = 9123;
+    /**
+     * <code>RET_BLESSING_GIVE_NUM_INVALID = 9124;</code>
+     */
+    public static final int RET_BLESSING_GIVE_NUM_INVALID_VALUE = 9124;
+    /**
+     * <code>RET_BLESSING_NO_GROUP_OR_OWNER = 9125;</code>
+     */
+    public static final int RET_BLESSING_NO_GROUP_OR_OWNER_VALUE = 9125;
     /**
      * <code>RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN = 9130;</code>
      */
@@ -9515,21 +10579,21 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT_VALUE = 10316;
     /**
-     * <code>RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT = 10317;</code>
+     * <code>RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT = 10317;</code>
      */
-    public static final int RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT_VALUE = 10317;
+    public static final int RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT_VALUE = 10317;
     /**
-     * <code>RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH = 10318;</code>
+     * <code>RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH = 10318;</code>
      */
-    public static final int RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH_VALUE = 10318;
+    public static final int RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH_VALUE = 10318;
     /**
-     * <code>RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN = 10319;</code>
+     * <code>RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN = 10319;</code>
      */
-    public static final int RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN_VALUE = 10319;
+    public static final int RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN_VALUE = 10319;
     /**
-     * <code>RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE = 10320;</code>
+     * <code>RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE = 10320;</code>
      */
-    public static final int RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE_VALUE = 10320;
+    public static final int RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE_VALUE = 10320;
     /**
      * <code>RET_ROGUE_DIARY_AVATAR_DEATH = 10350;</code>
      */
@@ -9647,13 +10711,13 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPEN_VALUE = 10414;
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH = 10427;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH = 10427;</code>
      */
-    public static final int RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH_VALUE = 10427;
+    public static final int RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH_VALUE = 10427;
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT = 10428;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT = 10428;</code>
      */
-    public static final int RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT_VALUE = 10428;
+    public static final int RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT_VALUE = 10428;
     /**
      * <code>RET_CHAR_AMUSEMENT_STAGE_NOT_OPEN = 10436;</code>
      */
@@ -9719,33 +10783,33 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_TEAMCHAIN_WORLD_IN_MP_MODE_VALUE = 10466;
     /**
-     * <code>RET_LAN_V3_BOAT_PLAYER_NUM_NOT_VALID = 10481;</code>
+     * <code>RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID = 10481;</code>
      */
-    public static final int RET_LAN_V3_BOAT_PLAYER_NUM_NOT_VALID_VALUE = 10481;
+    public static final int RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID_VALUE = 10481;
     /**
-     * <code>RET_LAN_V3_BOAT_PLAY_NOT_OPEN = 10482;</code>
+     * <code>RET_LAN_V_3_BOAT_PLAY_NOT_OPEN = 10482;</code>
      */
-    public static final int RET_LAN_V3_BOAT_PLAY_NOT_OPEN_VALUE = 10482;
+    public static final int RET_LAN_V_3_BOAT_PLAY_NOT_OPEN_VALUE = 10482;
     /**
-     * <code>RET_LAN_V3_BOAT_NOT_IN_WORLD_SCENE = 10483;</code>
+     * <code>RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE = 10483;</code>
      */
-    public static final int RET_LAN_V3_BOAT_NOT_IN_WORLD_SCENE_VALUE = 10483;
+    public static final int RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE_VALUE = 10483;
     /**
-     * <code>RET_FLEUR_FAIR_V2_PACMAN_PLAY_NOT_OPEN = 10500;</code>
+     * <code>RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN = 10500;</code>
      */
-    public static final int RET_FLEUR_FAIR_V2_PACMAN_PLAY_NOT_OPEN_VALUE = 10500;
+    public static final int RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN_VALUE = 10500;
     /**
-     * <code>RET_FLEUR_FAIR_V2_PACMAN_PLAYER_NUM_INCORRECT = 10501;</code>
+     * <code>RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT = 10501;</code>
      */
-    public static final int RET_FLEUR_FAIR_V2_PACMAN_PLAYER_NUM_INCORRECT_VALUE = 10501;
+    public static final int RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT_VALUE = 10501;
     /**
-     * <code>RET_FLEUR_FAIR_V2_COIN_NOT_ENOUGH = 10502;</code>
+     * <code>RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH = 10502;</code>
      */
-    public static final int RET_FLEUR_FAIR_V2_COIN_NOT_ENOUGH_VALUE = 10502;
+    public static final int RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH_VALUE = 10502;
     /**
-     * <code>RET_FLEUR_FAIR_V2_COIN_EXCEED_LIMIT = 10503;</code>
+     * <code>RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT = 10503;</code>
      */
-    public static final int RET_FLEUR_FAIR_V2_COIN_EXCEED_LIMIT_VALUE = 10503;
+    public static final int RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT_VALUE = 10503;
     /**
      * <code>RET_AKA_FES_RHYTHM_LEVEL_NOT_OPEN = 10521;</code>
      */
@@ -9771,17 +10835,17 @@ public final class RetcodeOuterClass {
      */
     public static final int RET_AKA_FES_ASTROLABE_PRE_LEVEL_NOT_FINISH_VALUE = 10542;
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_LEVEL_NOT_OPEN = 10551;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN = 10551;</code>
      */
-    public static final int RET_EFFIGY_CHALLENGE_V4_LEVEL_NOT_OPEN_VALUE = 10551;
+    public static final int RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN_VALUE = 10551;
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_GUEST_NOT_READY = 10552;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY = 10552;</code>
      */
-    public static final int RET_EFFIGY_CHALLENGE_V4_GUEST_NOT_READY_VALUE = 10552;
+    public static final int RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY_VALUE = 10552;
     /**
-     * <code>RET_EFFIGY_CHALLENGE_V4_DUPLICATE_AVATAR = 10553;</code>
+     * <code>RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR = 10553;</code>
      */
-    public static final int RET_EFFIGY_CHALLENGE_V4_DUPLICATE_AVATAR_VALUE = 10553;
+    public static final int RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR_VALUE = 10553;
     /**
      * <code>RET_JOURNEY_ACTIVITY_PICK_PARAM_ERROR = 10561;</code>
      */
@@ -9798,10 +10862,66 @@ public final class RetcodeOuterClass {
      * <code>RET_JOURNEY_ACTIVITY_COIN_EXCEED_LIMIT = 10564;</code>
      */
     public static final int RET_JOURNEY_ACTIVITY_COIN_EXCEED_LIMIT_VALUE = 10564;
+    /**
+     * <code>RET_POETRY_FES_PITCH_POT_STAGE_NOT_OPEN = 10571;</code>
+     */
+    public static final int RET_POETRY_FES_PITCH_POT_STAGE_NOT_OPEN_VALUE = 10571;
+    /**
+     * <code>RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH = 10591;</code>
+     */
+    public static final int RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH_VALUE = 10591;
+    /**
+     * <code>RET_MP_FILMFEST_SHOOTING_ONGOING = 10592;</code>
+     */
+    public static final int RET_MP_FILMFEST_SHOOTING_ONGOING_VALUE = 10592;
+    /**
+     * <code>RET_FILMFES_BALL_GAME_IS_LOCKED = 10593;</code>
+     */
+    public static final int RET_FILMFES_BALL_GAME_IS_LOCKED_VALUE = 10593;
+    /**
+     * <code>RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH = 10611;</code>
+     */
+    public static final int RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH_VALUE = 10611;
+    /**
+     * <code>RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT = 10612;</code>
+     */
+    public static final int RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT_VALUE = 10612;
+    /**
+     * <code>RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN = 10631;</code>
+     */
+    public static final int RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN_VALUE = 10631;
+    /**
+     * <code>RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN = 10632;</code>
+     */
+    public static final int RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN_VALUE = 10632;
+    /**
+     * <code>RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH = 10641;</code>
+     */
+    public static final int RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH_VALUE = 10641;
+    /**
+     * <code>RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN = 10642;</code>
+     */
+    public static final int RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN_VALUE = 10642;
     /**
      * <code>RET_ACTIVITY_CONTENT_CLOSED = 10901;</code>
      */
     public static final int RET_ACTIVITY_CONTENT_CLOSED_VALUE = 10901;
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_BAN_MP = 10902;</code>
+     */
+    public static final int RET_ACTIVITY_CLIENT_PLAY_BAN_MP_VALUE = 10902;
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR = 10903;</code>
+     */
+    public static final int RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR_VALUE = 10903;
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING = 10904;</code>
+     */
+    public static final int RET_ACTIVITY_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING_VALUE = 10904;
+    /**
+     * <code>RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_START = 10905;</code>
+     */
+    public static final int RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_START_VALUE = 10905;
     /**
      * <code>RET_NOT_IN_FISHING = 11001;</code>
      */
@@ -10062,6 +11182,54 @@ public final class RetcodeOuterClass {
      * <code>RET_UGC_MUSIC_SAVE_TOO_FREQUENT = 11161;</code>
      */
     public static final int RET_UGC_MUSIC_SAVE_TOO_FREQUENT_VALUE = 11161;
+    /**
+     * <code>RET_UGC_MUSIC_STORE_FULL = 11162;</code>
+     */
+    public static final int RET_UGC_MUSIC_STORE_FULL_VALUE = 11162;
+    /**
+     * <code>RET_UGC_MUSIC_STORE_REPEAT = 11163;</code>
+     */
+    public static final int RET_UGC_MUSIC_STORE_REPEAT_VALUE = 11163;
+    /**
+     * <code>RET_UGC_MUSIC_STORE_TOO_FREQUENT = 11164;</code>
+     */
+    public static final int RET_UGC_MUSIC_STORE_TOO_FREQUENT_VALUE = 11164;
+    /**
+     * <code>RET_UGC_MUSIC_SEARCH_NOT_FOUND = 11165;</code>
+     */
+    public static final int RET_UGC_MUSIC_SEARCH_NOT_FOUND_VALUE = 11165;
+    /**
+     * <code>RET_UGC_MUSIC_LIKE_TOO_FREQUENT = 11166;</code>
+     */
+    public static final int RET_UGC_MUSIC_LIKE_TOO_FREQUENT_VALUE = 11166;
+    /**
+     * <code>RET_UGC_MUSIC_RECOMMEND_TOO_FREQUENT = 11167;</code>
+     */
+    public static final int RET_UGC_MUSIC_RECOMMEND_TOO_FREQUENT_VALUE = 11167;
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_NOT_ALLOW = 11168;</code>
+     */
+    public static final int RET_UGC_MUSIC_IMPORT_NOT_ALLOW_VALUE = 11168;
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_NOT_FOUND = 11169;</code>
+     */
+    public static final int RET_UGC_MUSIC_IMPORT_NOT_FOUND_VALUE = 11169;
+    /**
+     * <code>RET_UGC_MUSIC_SET_OPTION_TOO_FREQUENT = 11170;</code>
+     */
+    public static final int RET_UGC_MUSIC_SET_OPTION_TOO_FREQUENT_VALUE = 11170;
+    /**
+     * <code>RET_UGC_MUSIC_IMPORT_TOO_FREQUENT = 11171;</code>
+     */
+    public static final int RET_UGC_MUSIC_IMPORT_TOO_FREQUENT_VALUE = 11171;
+    /**
+     * <code>RET_UGC_MUSIC_GEN_SHARE_CODE_FAIL = 11172;</code>
+     */
+    public static final int RET_UGC_MUSIC_GEN_SHARE_CODE_FAIL_VALUE = 11172;
+    /**
+     * <code>RET_UGC_MUSIC_CANCEL_STORE_REPEAT = 11173;</code>
+     */
+    public static final int RET_UGC_MUSIC_CANCEL_STORE_REPEAT_VALUE = 11173;
     /**
      * <code>RET_COMPOUND_BOOST_ITEM_NOT_EXIST = 11201;</code>
      */
@@ -10074,6 +11242,14 @@ public final class RetcodeOuterClass {
      * <code>RET_QUICK_HIT_TREE_EMPTY_TREES = 11211;</code>
      */
     public static final int RET_QUICK_HIT_TREE_EMPTY_TREES_VALUE = 11211;
+    /**
+     * <code>RET_COMPOUND_NO_FINISH_CAN_TAKE = 11221;</code>
+     */
+    public static final int RET_COMPOUND_NO_FINISH_CAN_TAKE_VALUE = 11221;
+    /**
+     * <code>RET_FORGE_NO_FINISH_CAN_TAKE = 11226;</code>
+     */
+    public static final int RET_FORGE_NO_FINISH_CAN_TAKE_VALUE = 11226;
     /**
      * <code>RET_GCG_FIND_GAME_MODE_FAIL = 12000;</code>
      */
@@ -10242,6 +11418,18 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_WATCH_CLIENT_DATA_VERSOIN_FORBID = 12041;</code>
      */
     public static final int RET_GCG_WATCH_CLIENT_DATA_VERSOIN_FORBID_VALUE = 12041;
+    /**
+     * <code>RET_GCG_SKILL_NOT_VEHICLE_SKILL = 12042;</code>
+     */
+    public static final int RET_GCG_SKILL_NOT_VEHICLE_SKILL_VALUE = 12042;
+    /**
+     * <code>RET_GCG_SKILL_CHECK_CONDITION_FAIL = 12043;</code>
+     */
+    public static final int RET_GCG_SKILL_CHECK_CONDITION_FAIL_VALUE = 12043;
+    /**
+     * <code>RET_GCG_VEHICLE_SKILL_CHECK_CONDITION_FAIL = 12044;</code>
+     */
+    public static final int RET_GCG_VEHICLE_SKILL_CHECK_CONDITION_FAIL_VALUE = 12044;
     /**
      * <code>RET_GCG_COIN_EXCEED_LIMIT = 12101;</code>
      */
@@ -10458,6 +11646,14 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_BACK_DUEL_OTHER_TO_PS = 12154;</code>
      */
     public static final int RET_GCG_BACK_DUEL_OTHER_TO_PS_VALUE = 12154;
+    /**
+     * <code>RET_GCG_WEEK_REWARD_LIMIT = 12155;</code>
+     */
+    public static final int RET_GCG_WEEK_REWARD_LIMIT_VALUE = 12155;
+    /**
+     * <code>RET_GCG_FESTIVAL_MODE_IN_PICK = 12156;</code>
+     */
+    public static final int RET_GCG_FESTIVAL_MODE_IN_PICK_VALUE = 12156;
     /**
      * <code>RET_GCG_DS_DECK_LOCKED = 12201;</code>
      */
@@ -10546,6 +11742,14 @@ public final class RetcodeOuterClass {
      * <code>RET_GCG_DS_AT_LEAST_ONE_DECK = 12223;</code>
      */
     public static final int RET_GCG_DS_AT_LEAST_ONE_DECK_VALUE = 12223;
+    /**
+     * <code>RET_GCG_DS_DECK_CODE_ILLEGAL = 12224;</code>
+     */
+    public static final int RET_GCG_DS_DECK_CODE_ILLEGAL_VALUE = 12224;
+    /**
+     * <code>RET_GCG_DS_DECK_CODE_CD = 12225;</code>
+     */
+    public static final int RET_GCG_DS_DECK_CODE_CD_VALUE = 12225;
     /**
      * <code>RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL = 12251;</code>
      */
@@ -11010,6 +12214,310 @@ public final class RetcodeOuterClass {
      * <code>RET_FONTAINE_GATHER_INVALID_MONSTER_TRACKING = 13262;</code>
      */
     public static final int RET_FONTAINE_GATHER_INVALID_MONSTER_TRACKING_VALUE = 13262;
+    /**
+     * <code>RET_FISHBLASTER_LEVEL_NOT_OPEN = 13271;</code>
+     */
+    public static final int RET_FISHBLASTER_LEVEL_NOT_OPEN_VALUE = 13271;
+    /**
+     * <code>RET_FISHBLASTER_NOT_IN_RIGHT_SCENE = 13272;</code>
+     */
+    public static final int RET_FISHBLASTER_NOT_IN_RIGHT_SCENE_VALUE = 13272;
+    /**
+     * <code>RET_FISHBLASTER_LEVEL_MISMATCH = 13273;</code>
+     */
+    public static final int RET_FISHBLASTER_LEVEL_MISMATCH_VALUE = 13273;
+    /**
+     * <code>RET_FISHBLASTER_ALREADY_PLAYING = 13274;</code>
+     */
+    public static final int RET_FISHBLASTER_ALREADY_PLAYING_VALUE = 13274;
+    /**
+     * <code>RET_GOAL_CHALLENGE_STAGE_NOT_OPEN = 13281;</code>
+     */
+    public static final int RET_GOAL_CHALLENGE_STAGE_NOT_OPEN_VALUE = 13281;
+    /**
+     * <code>RET_GOAL_CHALLENGE_INVALID_TEAM = 13282;</code>
+     */
+    public static final int RET_GOAL_CHALLENGE_INVALID_TEAM_VALUE = 13282;
+    /**
+     * <code>RET_ALCHEMY_SIM_COIN_NOT_ENOUGH = 13291;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_COIN_NOT_ENOUGH_VALUE = 13291;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_EXCEED_LIMIT = 13292;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_EXCEED_LIMIT_VALUE = 13292;
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_SAME_CROP = 13293;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_FARMLAND_SAME_CROP_VALUE = 13293;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NO_HARVESTABLE_LAND = 13294;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_NO_HARVESTABLE_LAND_VALUE = 13294;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NOT_ENOUGH = 13295;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_NOT_ENOUGH_VALUE = 13295;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NOT_UNLOCKED = 13296;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_NOT_UNLOCKED_VALUE = 13296;
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_NOT_READY = 13297;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_FARMLAND_NOT_READY_VALUE = 13297;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_RANK_MAX = 13298;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_RANK_MAX_VALUE = 13298;
+    /**
+     * <code>RET_ALCHEMY_SIM_FARMLAND_IS_NOT_HARVESTED = 13299;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_FARMLAND_IS_NOT_HARVESTED_VALUE = 13299;
+    /**
+     * <code>RET_ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED = 13300;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED_VALUE = 13300;
+    /**
+     * <code>RET_ALCHEMY_SIM_POTION_NOT_EXIST = 13301;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_POTION_NOT_EXIST_VALUE = 13301;
+    /**
+     * <code>RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM = 13302;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM_VALUE = 13302;
+    /**
+     * <code>RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT_OVER = 13303;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT_OVER_VALUE = 13303;
+    /**
+     * <code>RET_ALCHEMY_SIM_INTERNAL_LOGIC_ERROR = 13304;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_INTERNAL_LOGIC_ERROR_VALUE = 13304;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_ON_FORBIDDEN_POS = 13305;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_ON_FORBIDDEN_POS_VALUE = 13305;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_OVERLAP_OVER_LIMIT = 13306;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_OVERLAP_OVER_LIMIT_VALUE = 13306;
+    /**
+     * <code>RET_ALCHEMY_SIM_PUZZLE_RATE_NOT_ENOUGH = 13307;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_PUZZLE_RATE_NOT_ENOUGH_VALUE = 13307;
+    /**
+     * <code>RET_ALCHEMY_SIM_POTION_CANT_UPGRADE = 13308;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_POTION_CANT_UPGRADE_VALUE = 13308;
+    /**
+     * <code>RET_ALCHEMY_SIM_EXAM_COUNT_NOT_ENOUGH = 13309;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_EXAM_COUNT_NOT_ENOUGH_VALUE = 13309;
+    /**
+     * <code>RET_ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED = 13310;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED_VALUE = 13310;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND = 13311;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND_VALUE = 13311;
+    /**
+     * <code>RET_ALCHEMY_SIM_UNFINISH_QUEST = 13312;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_UNFINISH_QUEST_VALUE = 13312;
+    /**
+     * <code>RET_ALCHEMY_SIM_INVALID_ROUND_STATE = 13313;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_INVALID_ROUND_STATE_VALUE = 13313;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLOW = 13314;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLOW_VALUE = 13314;
+    /**
+     * <code>RET_ALCHEMY_SIM_CROP_UPGRADE_NOT_UNLOCKED = 13315;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_CROP_UPGRADE_NOT_UNLOCKED_VALUE = 13315;
+    /**
+     * <code>RET_ALCHEMY_SIM_FINISH_ROUND_FREQUENCY = 13316;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_FINISH_ROUND_FREQUENCY_VALUE = 13316;
+    /**
+     * <code>RET_ALCHEMY_SIM_TEMPLATE_ALCHEMY_NOT_UNLOCKED = 13317;</code>
+     */
+    public static final int RET_ALCHEMY_SIM_TEMPLATE_ALCHEMY_NOT_UNLOCKED_VALUE = 13317;
+    /**
+     * <code>RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT = 13351;</code>
+     */
+    public static final int RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT_VALUE = 13351;
+    /**
+     * <code>RET_CATCAFE_LAYOUT_NOT_RIGHT = 13352;</code>
+     */
+    public static final int RET_CATCAFE_LAYOUT_NOT_RIGHT_VALUE = 13352;
+    /**
+     * <code>RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON = 13371;</code>
+     */
+    public static final int RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON_VALUE = 13371;
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN = 13381;</code>
+     */
+    public static final int RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN_VALUE = 13381;
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT = 13382;</code>
+     */
+    public static final int RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT_VALUE = 13382;
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM = 13383;</code>
+     */
+    public static final int RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM_VALUE = 13383;
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT = 13384;</code>
+     */
+    public static final int RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT_VALUE = 13384;
+    /**
+     * <code>RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE = 13385;</code>
+     */
+    public static final int RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE_VALUE = 13385;
+    /**
+     * <code>RET_BLUEPRINT_SLOT_NOT_FOUND = 13401;</code>
+     */
+    public static final int RET_BLUEPRINT_SLOT_NOT_FOUND_VALUE = 13401;
+    /**
+     * <code>RET_FURNITURE_SUITE_ID_INVALID = 13402;</code>
+     */
+    public static final int RET_FURNITURE_SUITE_ID_INVALID_VALUE = 13402;
+    /**
+     * <code>RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT = 13403;</code>
+     */
+    public static final int RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT_VALUE = 13403;
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN = 13411;</code>
+     */
+    public static final int RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN_VALUE = 13411;
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN = 13412;</code>
+     */
+    public static final int RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN_VALUE = 13412;
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH = 13413;</code>
+     */
+    public static final int RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH_VALUE = 13413;
+    /**
+     * <code>RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN = 13414;</code>
+     */
+    public static final int RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN_VALUE = 13414;
+    /**
+     * <code>RET_WATERGUN_LEVEL_NOT_OPEN = 13431;</code>
+     */
+    public static final int RET_WATERGUN_LEVEL_NOT_OPEN_VALUE = 13431;
+    /**
+     * <code>RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN = 13441;</code>
+     */
+    public static final int RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN_VALUE = 13441;
+    /**
+     * <code>RET_ACROBATICS_BATTLE_INVALID_TEAM = 13442;</code>
+     */
+    public static final int RET_ACROBATICS_BATTLE_INVALID_TEAM_VALUE = 13442;
+    /**
+     * <code>RET_MONSTER_VS_MONSTER_LEVEL_NOT_OPEN = 13451;</code>
+     */
+    public static final int RET_MONSTER_VS_MONSTER_LEVEL_NOT_OPEN_VALUE = 13451;
+    /**
+     * <code>RET_RECHARGE_DISK_LEVEL_NOT_OPEN = 13471;</code>
+     */
+    public static final int RET_RECHARGE_DISK_LEVEL_NOT_OPEN_VALUE = 13471;
+    /**
+     * <code>RET_RECHARGE_DISK_INVALID_LEVEL_BUILD = 13472;</code>
+     */
+    public static final int RET_RECHARGE_DISK_INVALID_LEVEL_BUILD_VALUE = 13472;
+    /**
+     * <code>RET_RECHARGE_DISK_CUR_SCENE_INVALID = 13473;</code>
+     */
+    public static final int RET_RECHARGE_DISK_CUR_SCENE_INVALID_VALUE = 13473;
+    /**
+     * <code>RET_ACTIVITY_PREVIEW_TRIAL_IN_CD = 13478;</code>
+     */
+    public static final int RET_ACTIVITY_PREVIEW_TRIAL_IN_CD_VALUE = 13478;
+    /**
+     * <code>RET_BIRD_BALL_MP_LEVEL_NOT_OPEN = 13481;</code>
+     */
+    public static final int RET_BIRD_BALL_MP_LEVEL_NOT_OPEN_VALUE = 13481;
+    /**
+     * <code>RET_BIRD_BALL_DRAFT_PLAYER_NUM_INVALID = 13482;</code>
+     */
+    public static final int RET_BIRD_BALL_DRAFT_PLAYER_NUM_INVALID_VALUE = 13482;
+    /**
+     * <code>RET_FAIRY_TALES_LOTTER_AREA_IS_NOT_OPEN = 13491;</code>
+     */
+    public static final int RET_FAIRY_TALES_LOTTER_AREA_IS_NOT_OPEN_VALUE = 13491;
+    /**
+     * <code>RET_FAIRY_TALES_LOTTER_LEFT_CNT_NOT_ENOUGH = 13492;</code>
+     */
+    public static final int RET_FAIRY_TALES_LOTTER_LEFT_CNT_NOT_ENOUGH_VALUE = 13492;
+    /**
+     * <code>RET_FAIRY_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH = 13493;</code>
+     */
+    public static final int RET_FAIRY_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH_VALUE = 13493;
+    /**
+     * <code>RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_LIMIT = 13494;</code>
+     */
+    public static final int RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_LIMIT_VALUE = 13494;
+    /**
+     * <code>RET_FAIRY_TALES_TOY_CUSTOM_GADGET_CONTENT_INVALID = 13495;</code>
+     */
+    public static final int RET_FAIRY_TALES_TOY_CUSTOM_GADGET_CONTENT_INVALID_VALUE = 13495;
+    /**
+     * <code>RET_FAIRY_TALES_COMBAT_LEVEL_NOT_OPEN = 13496;</code>
+     */
+    public static final int RET_FAIRY_TALES_COMBAT_LEVEL_NOT_OPEN_VALUE = 13496;
+    /**
+     * <code>RET_FAIRY_TALES_TICKET_PREREQUISITE_NOT_MET = 13497;</code>
+     */
+    public static final int RET_FAIRY_TALES_TICKET_PREREQUISITE_NOT_MET_VALUE = 13497;
+    /**
+     * <code>RET_FAIRY_TALES_TICKET_NOT_ENOUGH = 13498;</code>
+     */
+    public static final int RET_FAIRY_TALES_TICKET_NOT_ENOUGH_VALUE = 13498;
+    /**
+     * <code>RET_ACTIVITY_TEAM_INVALID_SIZE = 13551;</code>
+     */
+    public static final int RET_ACTIVITY_TEAM_INVALID_SIZE_VALUE = 13551;
+    /**
+     * <code>RET_ACTIVITY_INVALID_TRIAL_AVATAR = 13552;</code>
+     */
+    public static final int RET_ACTIVITY_INVALID_TRIAL_AVATAR_VALUE = 13552;
+    /**
+     * <code>RET_ACTIVITY_FORBIDDEN_TRIAL_AVATAR = 13553;</code>
+     */
+    public static final int RET_ACTIVITY_FORBIDDEN_TRIAL_AVATAR_VALUE = 13553;
+    /**
+     * <code>RET_RENAME_INVALID_QUEST_STATE = 13571;</code>
+     */
+    public static final int RET_RENAME_INVALID_QUEST_STATE_VALUE = 13571;
+    /**
+     * <code>RET_RENAME_CONFLICTED = 13572;</code>
+     */
+    public static final int RET_RENAME_CONFLICTED_VALUE = 13572;
+    /**
+     * <code>RET_RELIQUARY_OFFER_PURCHASE_VERSION_IDX_ERROR = 13591;</code>
+     */
+    public static final int RET_RELIQUARY_OFFER_PURCHASE_VERSION_IDX_ERROR_VALUE = 13591;
+    /**
+     * <code>RET_RELIQUARY_OFFER_VERSION_TIMES_LIMIT = 13592;</code>
+     */
+    public static final int RET_RELIQUARY_OFFER_VERSION_TIMES_LIMIT_VALUE = 13592;
+    /**
+     * <code>RET_RELIQUARY_OFFER_PROGRESS_NOT_ENOUGH = 13593;</code>
+     */
+    public static final int RET_RELIQUARY_OFFER_PROGRESS_NOT_ENOUGH_VALUE = 13593;
+    /**
+     * <code>RET_RELIQUARY_OFFER_PROGRESS_OVER_LIMIT = 13594;</code>
+     */
+    public static final int RET_RELIQUARY_OFFER_PROGRESS_OVER_LIMIT_VALUE = 13594;
+    /**
+     * <code>RET_RELIQUARY_PURCHASE_SUITE_TIMES_OVER_LIMIT = 13595;</code>
+     */
+    public static final int RET_RELIQUARY_PURCHASE_SUITE_TIMES_OVER_LIMIT_VALUE = 13595;
 
 
     public final int getNumber() {
@@ -11081,6 +12589,7 @@ public final class RetcodeOuterClass {
         case 42: return RET_SECURITY_LIBRARY_ERROR;
         case 43: return RET_GATE_TICKET_CHECK_ERROR;
         case 44: return RET_PROTO_MIX_VERSION_NOT_MATCH;
+        case 45: return RET_ACCOUNT_TYPE_STOP_REGISTER;
         case 101: return RET_AVATAR_IN_CD;
         case 102: return RET_AVATAR_NOT_ALIVE;
         case 103: return RET_AVATAR_NOT_ON_SCENE;
@@ -11109,7 +12618,8 @@ public final class RetcodeOuterClass {
         case 126: return RET_TEAM_AVATAR_IN_EXPEDITION;
         case 127: return RET_TEAM_CAN_NOT_CHOSE_REPLACE_USE;
         case 128: return RET_AVATAR_IN_COMBAT;
-        case 130: return RET_NICKNAME_UTF8_ERROR;
+        case 129: return RET_PLAYER_TIME_LOCKED;
+        case 130: return RET_NICKNAME_UTF_8_ERROR;
         case 131: return RET_NICKNAME_TOO_LONG;
         case 132: return RET_NICKNAME_WORD_ILLEGAL;
         case 133: return RET_NICKNAME_TOO_MANY_DIGITS;
@@ -11147,6 +12657,13 @@ public final class RetcodeOuterClass {
         case 177: return RET_AVATAR_RENAME_IN_IP_BLACK_LIST;
         case 178: return RET_TEAM_AVATAR_IS_LOCKED;
         case 179: return RET_PLAYER_HAS_TRIAL_AVATAR;
+        case 180: return RET_AVATAR_EXPEDITION_SLOT_NOT_ENOUGH;
+        case 181: return RET_AVATAR_EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD;
+        case 182: return RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW;
+        case 183: return RET_ASYNC_WORD_FILTER_IN_CD;
+        case 184: return RET_NOT_HAS_TRACE_EFFECT;
+        case 185: return RET_TRACE_EFFECT_AVATAR_ERROR;
+        case 186: return RET_PLAYER_TIME_LOCKED_BY_QUEST;
         case 201: return RET_FLOAT_ERROR;
         case 301: return RET_NPC_NOT_EXIST;
         case 302: return RET_NPC_TOO_FAR;
@@ -11161,6 +12678,17 @@ public final class RetcodeOuterClass {
         case 406: return RET_INFERENCE_ASSOCIATE_WORD_ERROR;
         case 407: return RET_INFERENCE_SUBMIT_WORD_NO_CONCLUSION;
         case 408: return RET_SUBMIT_QUEST_EVENTS_NOT_RIGHT;
+        case 409: return RET_CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILED;
+        case 410: return RET_CONFIRM_CONTINUE_MUTUAL_OCCUPIED_FAILED;
+        case 416: return RET_QUEST_FOCUS_MODE_IN_CD;
+        case 417: return RET_QUEST_IN_FOCUS_MODE;
+        case 418: return RET_QUEST_NOT_IN_FOCUS_MODE;
+        case 419: return RET_PARENT_QUEST_CANNOT_START_FOCUS;
+        case 420: return RET_PARENT_QUEST_NOT_EXIST;
+        case 421: return RET_BAN_OPEARATE_FOCUS;
+        case 422: return RET_QUEST_FOCUS_ANY_GALLERY_STARTED;
+        case 423: return RET_QUEST_FOCUS_USING_INFORMAL_AVATAR;
+        case 424: return RET_QUEST_FOCUS_OPENSTATE_OFF;
         case 501: return RET_POINT_NOT_UNLOCKED;
         case 502: return RET_POINT_TOO_FAR;
         case 503: return RET_POINT_ALREAY_UNLOCKED;
@@ -11211,6 +12739,9 @@ public final class RetcodeOuterClass {
         case 567: return RET_NOT_IN_PLAYER_WORLD;
         case 568: return RET_MAP_LAYER_GROUP_ALREADY_SHOWN;
         case 569: return RET_INVALID_MAP_LAYER;
+        case 570: return RET_GALLERY_REPEAT_START;
+        case 571: return RET_NOT_IN_PLAYER_SCENE;
+        case 572: return RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON;
         case 601: return RET_ITEM_NOT_EXIST;
         case 602: return RET_PACK_EXCEED_MAX_WEIGHT;
         case 603: return RET_ITEM_NOT_DROPABLE;
@@ -11267,6 +12798,7 @@ public final class RetcodeOuterClass {
         case 654: return RET_AWAKEN_LEVEL_MAX;
         case 655: return RET_MCOIN_NOT_ENOUGH;
         case 656: return RET_MCOIN_EXCEED_LIMIT;
+        case 657: return RET_BATCH_SET_EQUIP_LOCK_STATE_CD;
         case 660: return RET_RESIN_NOT_ENOUGH;
         case 661: return RET_RESIN_EXCEED_LIMIT;
         case 662: return RET_RESIN_OPENSTATE_OFF;
@@ -11317,6 +12849,7 @@ public final class RetcodeOuterClass {
         case 707: return RET_SHOP_CONTENT_NOT_MATCH;
         case 708: return RET_SHOP_BATCH_BUY_SHOP_LIMIT;
         case 709: return RET_SHOP_BATCH_BUY_COUNT_LIMIT;
+        case 710: return RET_GOODS_PRECONDITION_NOT_SATISFIED;
         case 798: return RET_CHAT_FORBIDDEN;
         case 799: return RET_CHAT_CD;
         case 800: return RET_CHAT_FREQUENTLY;
@@ -11356,6 +12889,8 @@ public final class RetcodeOuterClass {
         case 834: return RET_VEHICLE_SORUSH_NOT_REPLACE;
         case 835: return RET_VEHICLE_SORUSH_NOT_UNLOAD;
         case 836: return RET_VEHICLE_SORUSH_STATE_NOT_MATCH;
+        case 837: return RET_GIVING_NOT_IN_MY_WORLD;
+        case 838: return RET_GIVING_IS_FROZEN;
         case 860: return RET_ACTIVITY_CLOSE;
         case 861: return RET_ACTIVITY_ITEM_ERROR;
         case 862: return RET_ACTIVITY_CONTRIBUTION_NOT_ENOUGH;
@@ -11432,6 +12967,11 @@ public final class RetcodeOuterClass {
         case 1126: return RET_CUR_DUNGEON_SETTLED;
         case 1127: return RET_CUR_DUNGEON_NOT_PLOT;
         case 1128: return RET_CUR_DUNGEON_NOT_ALLOW_SWITCH_TEAM;
+        case 1129: return RET_DUNGEON_ENTERED_BY_CANDIDATE_TEAM;
+        case 1130: return RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY;
+        case 1131: return RET_DUNGEON_ENTER_TEAM_INTERNAL_ERROR;
+        case 1132: return RET_DUNGEON_ENTER_TEAM_SOMEONE_LEVEL_LIMIT;
+        case 1133: return RET_DUNGEON_ENTER_TEAM_SOMEONE_NOT_IN_SCENE_TEAM;
         case 1201: return RET_MP_NOT_IN_MY_WORLD;
         case 1202: return RET_MP_IN_MP_MODE;
         case 1203: return RET_MP_SCENE_IS_FULL;
@@ -11483,10 +13023,13 @@ public final class RetcodeOuterClass {
         case 1250: return RET_MP_REPLY_NO_VALID_AVATAR;
         case 1251: return RET_MP_IS_NOT_IN_TRANSFER_GUARD;
         case 1252: return RET_MP_CANNOT_EXEC_GIVING_IN_SINGLE_MODE_QUEST;
-        case 1253: return RET_MP_EFFIGY_CHALLENGE_V4_IN_PREPARE;
+        case 1253: return RET_MP_EFFIGY_CHALLENGE_V_4_IN_PREPARE;
         case 1254: return RET_MP_SHUFFLE_BOARD_ONGOING;
         case 1255: return RET_MP_FLIGHT_GEAR_ONGOING;
         case 1256: return RET_MP_TOY_BATTLE_QTE_ONGOING;
+        case 1257: return RET_MP_PAINTING_REPAIR_ONGOING;
+        case 1258: return RET_MP_FISHBLASTER_ONGOING;
+        case 1259: return RET_MP_GUEST_MATCH_COND_NOT_MEET;
         case 1301: return RET_MAIL_PARA_ERR;
         case 1302: return RET_MAIL_MAX_NUM;
         case 1303: return RET_MAIL_ITEM_NUM_EXCEED;
@@ -11509,10 +13052,16 @@ public final class RetcodeOuterClass {
         case 1320: return RET_MAIL_TRANSACTION_IS_EMPTY;
         case 1321: return RET_MAIL_DELETE_COLLECTED;
         case 1322: return RET_MAIL_COLLECTION_IS_FULL;
+        case 1323: return RET_MAIL_TITLE_CHARACTER_LEN_EXCEED;
+        case 1324: return RET_MAIL_TITLE_EMPTY;
+        case 1325: return RET_MAIL_CONTENT_EMPTY;
+        case 1326: return RET_MAIL_SENDER_EMPTY;
         case 1330: return RET_DAILY_TASK_NOT_FINISH;
         case 1331: return RET_DAILY_TAKS_HAS_TAKEN;
         case 1332: return RET_SOCIAL_OFFLINE_MSG_NUM_EXCEED;
         case 1333: return RET_DAILY_TASK_FILTER_CITY_NOT_OPEN;
+        case 1334: return RET_DAILY_ATTENDANCE_NOT_OPEN;
+        case 1335: return RET_DAILY_ATTENDANCE_REWARD_MAX;
         case 1401: return RET_GACHA_INAVAILABLE;
         case 1402: return RET_GACHA_RANDOM_NOT_MATCH;
         case 1403: return RET_GACHA_SCHEDULE_NOT_MATCH;
@@ -11523,6 +13072,7 @@ public final class RetcodeOuterClass {
         case 1408: return RET_GACHA_WISH_INVALID_ITEM;
         case 1409: return RET_GACHA_MINORS_TIMES_LIMIT;
         case 1410: return RET_GACHA_GENERAL_TIMES_LIMIT;
+        case 1411: return RET_GACHA_WISH_IS_NEEDED_BEFORE_GACHA;
         case 1501: return RET_INVESTIGAITON_NOT_IN_PROGRESS;
         case 1502: return RET_INVESTIGAITON_UNCOMPLETE;
         case 1503: return RET_INVESTIGAITON_REWARD_TAKEN;
@@ -11575,6 +13125,23 @@ public final class RetcodeOuterClass {
         case 1598: return RET_WIDGET_TOY_CRYSTAL_ENERGY_NOT_ENOUGH;
         case 1599: return RET_WIDGET_LIGHT_STONE_LEVEL_NOT_ENOUGH;
         case 1600: return RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PANEL;
+        case 1601: return RET_ROLE_COMBAT_NOT_RECORD;
+        case 1602: return RET_ROLE_COMBAT_COIN_EXCEED_LIMIT;
+        case 1603: return RET_ROLE_COMBAT_COIN_NOT_ENOUGH;
+        case 1604: return RET_ROLE_COMBAT_LEVEL_NOT_MEET;
+        case 1605: return RET_ROLE_COMBAT_TOWER_NOT_MEET;
+        case 1606: return RET_ROLE_COMBAT_SCHEDULE_NOT_MEET;
+        case 1617: return RET_ROLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUENTLY;
+        case 1618: return RET_ROLE_COMBAT_REQ_TRIAL_AVATAR_FREQUENTLY;
+        case 1619: return RET_ROLE_COMBAT_REFRESH_COUNT_NOT_ENOUGH;
+        case 1620: return RET_ROLE_COMBAT_QUEST_NOT_MEET;
+        case 1621: return RET_IN_ROLE_COMBAT_DUNGEON;
+        case 1622: return RET_IN_ROLE_COMBAT_DUNGEON_BY_USE_ITEM;
+        case 1623: return RET_ROLE_COMBAT_RENT_AVATAR_NOT_FOUND;
+        case 1624: return RET_ROLE_COMBAT_CARD_HAS_BLOCKED;
+        case 1631: return RET_CHAR_MASTER_KEY_EXCEED_LIMIT;
+        case 1632: return RET_CHAR_MASTER_KEY_NOT_ENOUGH;
+        case 1633: return RET_CHAR_MASTER_PREVIEW_IN_CD;
         case 2001: return RET_UID_NOT_EXIST;
         case 2002: return RET_PARSE_BIN_ERROR;
         case 2003: return RET_ACCOUNT_INFO_NOT_EXIST;
@@ -11628,7 +13195,7 @@ public final class RetcodeOuterClass {
         case 7027: return RET_REPORT_CONTENT_ILLEGAL;
         case 7028: return RET_REMARK_WORD_ILLEGAL;
         case 7029: return RET_REMARK_TOO_LONG;
-        case 7030: return RET_REMARK_UTF8_ERROR;
+        case 7030: return RET_REMARK_UTF_8_ERROR;
         case 7031: return RET_REMARK_IS_EMPTY;
         case 7032: return RET_ASK_ADD_FRIEND_CD;
         case 7033: return RET_SHOW_AVATAR_INFO_NOT_EXIST;
@@ -11642,6 +13209,7 @@ public final class RetcodeOuterClass {
         case 7041: return RET_SIGNATURE_MONTHLY_LIMIT;
         case 7042: return RET_REQ_FRIEND_AVATAR_FREQUENTLY;
         case 7043: return RET_PSN_GET_PLAYER_SOCIAL_DETAIL_FAIL;
+        case 7044: return RET_PROFILE_PICTURE_NOT_UNLOCKED;
         case 7081: return RET_OFFERING_NOT_OPEN;
         case 7082: return RET_OFFERING_LEVEL_LIMIT;
         case 7083: return RET_OFFERING_LEVEL_NOT_REACH;
@@ -11650,6 +13218,7 @@ public final class RetcodeOuterClass {
         case 7086: return RET_OFFERING_PARI_NOT_FINISH;
         case 7087: return RET_OFFERING_PARI_FINISH_REWARD_HAS_TAKEN;
         case 7088: return RET_OFFERING_PARI_SEARCH_ALL_FINISH;
+        case 7089: return RET_OFFERING_PARI_NO_FINISH_REWARD;
         case 7101: return RET_CITY_REPUTATION_NOT_OPEN;
         case 7102: return RET_CITY_REPUTATION_LEVEL_TAKEN;
         case 7103: return RET_CITY_REPUTATION_LEVEL_NOT_REACH;
@@ -11664,6 +13233,21 @@ public final class RetcodeOuterClass {
         case 7112: return RET_CITY_REPUTATION_ENTRACE_SWITCH_CLOSE;
         case 7113: return RET_CITY_REPUTATION_TAKEN_EXPLORE_REWARD;
         case 7114: return RET_CITY_REPUTATION_EXPLORE_NOT_REACH;
+        case 7115: return RET_TRIBAL_REPUTATION_NOT_OPEN;
+        case 7116: return RET_TRIBAL_REPUTATION_LEVEL_TAKEN;
+        case 7117: return RET_TRIBAL_REPUTATION_LEVEL_NOT_REACH;
+        case 7118: return RET_TRIBAL_REPUTATION_TAKEN_EXPLORE_REWARD;
+        case 7119: return RET_TRIBAL_REPUTATION_EXPLORE_NOT_REACH;
+        case 7201: return RET_TRIBAL_REPUTATION_PARENT_QUEST_TAKEN;
+        case 7202: return RET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINISH;
+        case 7203: return RET_CITY_REPUTATION_NOT_OPEN_TRIBAL;
+        case 7204: return RET_CITY_REPUTATION_NO_THE_DONATION;
+        case 7205: return RET_CITY_REPUTATION_DONATION_FINISHED;
+        case 7206: return RET_CITY_REPUTATION_DONATION_LIMIT;
+        case 7207: return RET_CITY_REPUTATION_TOTAL_REWARD_TAKEN;
+        case 7208: return RET_CITY_REPUTATION_TOTAL_REWARD_NOT_REACH;
+        case 7209: return RET_CITY_REPUTATION_LEVEL_FULL;
+        case 7210: return RET_TRIBAL_REPUTATION_LEVEL_FULL;
         case 7120: return RET_MECHANICUS_NOT_OPEN;
         case 7121: return RET_MECHANICUS_GEAR_UNLOCK;
         case 7122: return RET_MECHANICUS_GEAR_LOCK;
@@ -11743,6 +13327,8 @@ public final class RetcodeOuterClass {
         case 9121: return RET_WATER_SPIRIT_COIN_NOT_ENOUGH;
         case 9122: return RET_REGION_SEARCH_NO_SEARCH;
         case 9123: return RET_REGION_SEARCH_STATE_ERROR;
+        case 9124: return RET_BLESSING_GIVE_NUM_INVALID;
+        case 9125: return RET_BLESSING_NO_GROUP_OR_OWNER;
         case 9130: return RET_CHANNELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN;
         case 9131: return RET_CHANNELLER_SLAB_LOOP_DUNGEON_NOT_OPEN;
         case 9132: return RET_CHANNELLER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD_HAS_TAKEN;
@@ -12035,10 +13621,10 @@ public final class RetcodeOuterClass {
         case 10310: return RET_ACTIVITY_FRIEND_HAVE_GIFT_LIMIT;
         case 10315: return RET_GACHA_ACTIVITY_HAVE_REWARD_LIMIT;
         case 10316: return RET_GACHA_ACTIVITY_HAVE_ROBOT_LIMIT;
-        case 10317: return RET_SUMMER_TIME_V2_COIN_EXCEED_LIMIT;
-        case 10318: return RET_SUMMER_TIME_V2_COIN_NOT_ENOUGH;
-        case 10319: return RET_SUMMER_TIME_V2_DUNGEON_STAGE_NOT_OPEN;
-        case 10320: return RET_SUMMER_TIME_V2_PREV_DUNGEON_NOT_COMPLETE;
+        case 10317: return RET_SUMMER_TIME_V_2_COIN_EXCEED_LIMIT;
+        case 10318: return RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH;
+        case 10319: return RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_OPEN;
+        case 10320: return RET_SUMMER_TIME_V_2_PREV_DUNGEON_NOT_COMPLETE;
         case 10350: return RET_ROGUE_DIARY_AVATAR_DEATH;
         case 10351: return RET_ROGUE_DIARY_AVATAR_TIRED;
         case 10352: return RET_ROGUE_DIARY_AVATAR_DUPLICATED;
@@ -12068,8 +13654,8 @@ public final class RetcodeOuterClass {
         case 10412: return RET_FUNGUS_FIGHTER_FUNGUS_ID_CONFIG_NOT_VALID;
         case 10413: return RET_FUNGUS_FIGHTER_FUNGUS_NOT_CULTIVATED;
         case 10414: return RET_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPEN;
-        case 10427: return RET_EFFIGY_CHALLENGE_V2_COIN_NOT_ENOUGH;
-        case 10428: return RET_EFFIGY_CHALLENGE_V2_COIN_EXCEED_LIMIT;
+        case 10427: return RET_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH;
+        case 10428: return RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED_LIMIT;
         case 10436: return RET_CHAR_AMUSEMENT_STAGE_NOT_OPEN;
         case 10446: return RET_COIN_COLLECT_LEVEL_NOT_OPEN;
         case 10447: return RET_COIN_COLLECT_NOT_EQUIP_WIDGET;
@@ -12086,27 +13672,41 @@ public final class RetcodeOuterClass {
         case 10463: return RET_BRICK_BREAKER_COIN_NOT_ENOUGH;
         case 10464: return RET_BRICK_BREAKER_COIN_EXCEED_LIMIT;
         case 10466: return RET_TEAMCHAIN_WORLD_IN_MP_MODE;
-        case 10481: return RET_LAN_V3_BOAT_PLAYER_NUM_NOT_VALID;
-        case 10482: return RET_LAN_V3_BOAT_PLAY_NOT_OPEN;
-        case 10483: return RET_LAN_V3_BOAT_NOT_IN_WORLD_SCENE;
-        case 10500: return RET_FLEUR_FAIR_V2_PACMAN_PLAY_NOT_OPEN;
-        case 10501: return RET_FLEUR_FAIR_V2_PACMAN_PLAYER_NUM_INCORRECT;
-        case 10502: return RET_FLEUR_FAIR_V2_COIN_NOT_ENOUGH;
-        case 10503: return RET_FLEUR_FAIR_V2_COIN_EXCEED_LIMIT;
+        case 10481: return RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VALID;
+        case 10482: return RET_LAN_V_3_BOAT_PLAY_NOT_OPEN;
+        case 10483: return RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCENE;
+        case 10500: return RET_FLEUR_FAIR_V_2_PACMAN_PLAY_NOT_OPEN;
+        case 10501: return RET_FLEUR_FAIR_V_2_PACMAN_PLAYER_NUM_INCORRECT;
+        case 10502: return RET_FLEUR_FAIR_V_2_COIN_NOT_ENOUGH;
+        case 10503: return RET_FLEUR_FAIR_V_2_COIN_EXCEED_LIMIT;
         case 10521: return RET_AKA_FES_RHYTHM_LEVEL_NOT_OPEN;
         case 10522: return RET_AKA_FES_RHYTHM_GALLERY_INIT_FAIL;
         case 10533: return RET_AKA_FES_RHYTHM_NOT_IN_EXPECTED_DUNGEON;
         case 10531: return RET_AKA_FES_REASONING_LEVEL_NOT_OPEN;
         case 10541: return RET_AKA_FES_ASTROLABE_LEVEL_NOT_OPEN;
         case 10542: return RET_AKA_FES_ASTROLABE_PRE_LEVEL_NOT_FINISH;
-        case 10551: return RET_EFFIGY_CHALLENGE_V4_LEVEL_NOT_OPEN;
-        case 10552: return RET_EFFIGY_CHALLENGE_V4_GUEST_NOT_READY;
-        case 10553: return RET_EFFIGY_CHALLENGE_V4_DUPLICATE_AVATAR;
+        case 10551: return RET_EFFIGY_CHALLENGE_V_4_LEVEL_NOT_OPEN;
+        case 10552: return RET_EFFIGY_CHALLENGE_V_4_GUEST_NOT_READY;
+        case 10553: return RET_EFFIGY_CHALLENGE_V_4_DUPLICATE_AVATAR;
         case 10561: return RET_JOURNEY_ACTIVITY_PICK_PARAM_ERROR;
         case 10562: return RET_JOURNEY_ACTIVITY_PICK_COND_NOT_MEET;
         case 10563: return RET_JOURNEY_ACTIVITY_COIN_NOT_ENOUGH;
         case 10564: return RET_JOURNEY_ACTIVITY_COIN_EXCEED_LIMIT;
+        case 10571: return RET_POETRY_FES_PITCH_POT_STAGE_NOT_OPEN;
+        case 10591: return RET_FILMFES_BALL_GAME_PLAYER_COUNT_NOT_ENOUGH;
+        case 10592: return RET_MP_FILMFEST_SHOOTING_ONGOING;
+        case 10593: return RET_FILMFES_BALL_GAME_IS_LOCKED;
+        case 10611: return RET_TREASURE_HUNT_V_4_COIN_NOT_ENOUGH;
+        case 10612: return RET_TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT;
+        case 10631: return RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPEN;
+        case 10632: return RET_LOST_SAMACHURL_BOSS_LEVEL_NOT_OPEN;
+        case 10641: return RET_LAN_V_4_PARTY_LION_PLAYER_COUNT_NOT_ENOUGH;
+        case 10642: return RET_LAN_V_4_PARTY_LION_LEVEL_NOT_OPEN;
         case 10901: return RET_ACTIVITY_CONTENT_CLOSED;
+        case 10902: return RET_ACTIVITY_CLIENT_PLAY_BAN_MP;
+        case 10903: return RET_ACTIVITY_CLIENT_PLAY_FREQUENCY_ERROR;
+        case 10904: return RET_ACTIVITY_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING;
+        case 10905: return RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_START;
         case 11001: return RET_NOT_IN_FISHING;
         case 11002: return RET_FISH_STATE_ERROR;
         case 11003: return RET_FISH_BAIT_LIMIT;
@@ -12172,9 +13772,23 @@ public final class RetcodeOuterClass {
         case 11159: return RET_UGC_BAN_PUBLISH;
         case 11160: return RET_UGC_MUSIC_EXCEED_LIMIT;
         case 11161: return RET_UGC_MUSIC_SAVE_TOO_FREQUENT;
+        case 11162: return RET_UGC_MUSIC_STORE_FULL;
+        case 11163: return RET_UGC_MUSIC_STORE_REPEAT;
+        case 11164: return RET_UGC_MUSIC_STORE_TOO_FREQUENT;
+        case 11165: return RET_UGC_MUSIC_SEARCH_NOT_FOUND;
+        case 11166: return RET_UGC_MUSIC_LIKE_TOO_FREQUENT;
+        case 11167: return RET_UGC_MUSIC_RECOMMEND_TOO_FREQUENT;
+        case 11168: return RET_UGC_MUSIC_IMPORT_NOT_ALLOW;
+        case 11169: return RET_UGC_MUSIC_IMPORT_NOT_FOUND;
+        case 11170: return RET_UGC_MUSIC_SET_OPTION_TOO_FREQUENT;
+        case 11171: return RET_UGC_MUSIC_IMPORT_TOO_FREQUENT;
+        case 11172: return RET_UGC_MUSIC_GEN_SHARE_CODE_FAIL;
+        case 11173: return RET_UGC_MUSIC_CANCEL_STORE_REPEAT;
         case 11201: return RET_COMPOUND_BOOST_ITEM_NOT_EXIST;
         case 11202: return RET_COMPOUND_BOOST_TARGET_NOT_EXIST;
         case 11211: return RET_QUICK_HIT_TREE_EMPTY_TREES;
+        case 11221: return RET_COMPOUND_NO_FINISH_CAN_TAKE;
+        case 11226: return RET_FORGE_NO_FINISH_CAN_TAKE;
         case 12000: return RET_GCG_FIND_GAME_MODE_FAIL;
         case 12001: return RET_GCG_OPERATION_PARAM_ERROR;
         case 12002: return RET_GCG_GAME_NOT_RUNNING;
@@ -12217,6 +13831,9 @@ public final class RetcodeOuterClass {
         case 12039: return RET_GCG_WATCH_NOT_SPECTATOR;
         case 12040: return RET_GCG_WATCH_ALREADY_IN_DUEL;
         case 12041: return RET_GCG_WATCH_CLIENT_DATA_VERSOIN_FORBID;
+        case 12042: return RET_GCG_SKILL_NOT_VEHICLE_SKILL;
+        case 12043: return RET_GCG_SKILL_CHECK_CONDITION_FAIL;
+        case 12044: return RET_GCG_VEHICLE_SKILL_CHECK_CONDITION_FAIL;
         case 12101: return RET_GCG_COIN_EXCEED_LIMIT;
         case 12102: return RET_GCG_COIN_NOT_ENOUGH;
         case 12103: return RET_GCG_NOT_IN_SELF_WORLD;
@@ -12271,6 +13888,8 @@ public final class RetcodeOuterClass {
         case 12152: return RET_GCG_TARGET_FESTIVAL_MODE_NOT_OPEN;
         case 12153: return RET_GCG_BACK_DUEL_PS_TO_OTHER;
         case 12154: return RET_GCG_BACK_DUEL_OTHER_TO_PS;
+        case 12155: return RET_GCG_WEEK_REWARD_LIMIT;
+        case 12156: return RET_GCG_FESTIVAL_MODE_IN_PICK;
         case 12201: return RET_GCG_DS_DECK_LOCKED;
         case 12202: return RET_GCG_DS_DECK_NAME_INVALID;
         case 12204: return RET_GCG_DS_DECK_CHAR_CARD_NUM_INVALID;
@@ -12293,6 +13912,8 @@ public final class RetcodeOuterClass {
         case 12221: return RET_GCG_MATCH_DECK_INVALID;
         case 12222: return RET_GCG_DS_DECK_ALREADY_UNLOCKED;
         case 12223: return RET_GCG_DS_AT_LEAST_ONE_DECK;
+        case 12224: return RET_GCG_DS_DECK_CODE_ILLEGAL;
+        case 12225: return RET_GCG_DS_DECK_CODE_CD;
         case 12251: return RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL;
         case 12252: return RET_GCG_TC_MUST_IN_SELF_WORLD;
         case 12253: return RET_GCG_TC_MUST_IN_TAVERN;
@@ -12409,6 +14030,82 @@ public final class RetcodeOuterClass {
         case 13252: return RET_TOY_BATTLE_CURRENT_NOT_PLAYING;
         case 13261: return RET_FONTAINE_GATHER_INVALID_GATHER_TRACKING;
         case 13262: return RET_FONTAINE_GATHER_INVALID_MONSTER_TRACKING;
+        case 13271: return RET_FISHBLASTER_LEVEL_NOT_OPEN;
+        case 13272: return RET_FISHBLASTER_NOT_IN_RIGHT_SCENE;
+        case 13273: return RET_FISHBLASTER_LEVEL_MISMATCH;
+        case 13274: return RET_FISHBLASTER_ALREADY_PLAYING;
+        case 13281: return RET_GOAL_CHALLENGE_STAGE_NOT_OPEN;
+        case 13282: return RET_GOAL_CHALLENGE_INVALID_TEAM;
+        case 13291: return RET_ALCHEMY_SIM_COIN_NOT_ENOUGH;
+        case 13292: return RET_ALCHEMY_SIM_CROP_EXCEED_LIMIT;
+        case 13293: return RET_ALCHEMY_SIM_FARMLAND_SAME_CROP;
+        case 13294: return RET_ALCHEMY_SIM_CROP_NO_HARVESTABLE_LAND;
+        case 13295: return RET_ALCHEMY_SIM_CROP_NOT_ENOUGH;
+        case 13296: return RET_ALCHEMY_SIM_CROP_NOT_UNLOCKED;
+        case 13297: return RET_ALCHEMY_SIM_FARMLAND_NOT_READY;
+        case 13298: return RET_ALCHEMY_SIM_CROP_RANK_MAX;
+        case 13299: return RET_ALCHEMY_SIM_FARMLAND_IS_NOT_HARVESTED;
+        case 13300: return RET_ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED;
+        case 13301: return RET_ALCHEMY_SIM_POTION_NOT_EXIST;
+        case 13302: return RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM;
+        case 13303: return RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT_OVER;
+        case 13304: return RET_ALCHEMY_SIM_INTERNAL_LOGIC_ERROR;
+        case 13305: return RET_ALCHEMY_SIM_CROP_ON_FORBIDDEN_POS;
+        case 13306: return RET_ALCHEMY_SIM_CROP_OVERLAP_OVER_LIMIT;
+        case 13307: return RET_ALCHEMY_SIM_PUZZLE_RATE_NOT_ENOUGH;
+        case 13308: return RET_ALCHEMY_SIM_POTION_CANT_UPGRADE;
+        case 13309: return RET_ALCHEMY_SIM_EXAM_COUNT_NOT_ENOUGH;
+        case 13310: return RET_ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED;
+        case 13311: return RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND;
+        case 13312: return RET_ALCHEMY_SIM_UNFINISH_QUEST;
+        case 13313: return RET_ALCHEMY_SIM_INVALID_ROUND_STATE;
+        case 13314: return RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLOW;
+        case 13315: return RET_ALCHEMY_SIM_CROP_UPGRADE_NOT_UNLOCKED;
+        case 13316: return RET_ALCHEMY_SIM_FINISH_ROUND_FREQUENCY;
+        case 13317: return RET_ALCHEMY_SIM_TEMPLATE_ALCHEMY_NOT_UNLOCKED;
+        case 13351: return RET_CATCAFE_LAYOUT_STAGE_NOT_RIGHT;
+        case 13352: return RET_CATCAFE_LAYOUT_NOT_RIGHT;
+        case 13371: return RET_STAMINA_FIGHT_IS_IN_OTHER_DUNGEON;
+        case 13381: return RET_EFFIGY_CHALLENGE_V_5_LEVEL_NOT_OPEN;
+        case 13382: return RET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT;
+        case 13383: return RET_EFFIGY_CHALLENGE_V_5_INVALID_PLAYER_NUM;
+        case 13384: return RET_EFFIGY_CHALLENGE_V_5_IN_COMBAT;
+        case 13385: return RET_EFFIGY_CHALLENGE_V_5_INVALID_SCENE;
+        case 13401: return RET_BLUEPRINT_SLOT_NOT_FOUND;
+        case 13402: return RET_FURNITURE_SUITE_ID_INVALID;
+        case 13403: return RET_WISHLIST_BATCH_OPERATE_OUT_OF_LIMIT;
+        case 13411: return RET_HIDE_AND_SEEK_V_4_GAME_NOT_OPEN;
+        case 13412: return RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_CHOSEN;
+        case 13413: return RET_HIDE_AND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH;
+        case 13414: return RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPEN;
+        case 13431: return RET_WATERGUN_LEVEL_NOT_OPEN;
+        case 13441: return RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN;
+        case 13442: return RET_ACROBATICS_BATTLE_INVALID_TEAM;
+        case 13451: return RET_MONSTER_VS_MONSTER_LEVEL_NOT_OPEN;
+        case 13471: return RET_RECHARGE_DISK_LEVEL_NOT_OPEN;
+        case 13472: return RET_RECHARGE_DISK_INVALID_LEVEL_BUILD;
+        case 13473: return RET_RECHARGE_DISK_CUR_SCENE_INVALID;
+        case 13478: return RET_ACTIVITY_PREVIEW_TRIAL_IN_CD;
+        case 13481: return RET_BIRD_BALL_MP_LEVEL_NOT_OPEN;
+        case 13482: return RET_BIRD_BALL_DRAFT_PLAYER_NUM_INVALID;
+        case 13491: return RET_FAIRY_TALES_LOTTER_AREA_IS_NOT_OPEN;
+        case 13492: return RET_FAIRY_TALES_LOTTER_LEFT_CNT_NOT_ENOUGH;
+        case 13493: return RET_FAIRY_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH;
+        case 13494: return RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_LIMIT;
+        case 13495: return RET_FAIRY_TALES_TOY_CUSTOM_GADGET_CONTENT_INVALID;
+        case 13496: return RET_FAIRY_TALES_COMBAT_LEVEL_NOT_OPEN;
+        case 13497: return RET_FAIRY_TALES_TICKET_PREREQUISITE_NOT_MET;
+        case 13498: return RET_FAIRY_TALES_TICKET_NOT_ENOUGH;
+        case 13551: return RET_ACTIVITY_TEAM_INVALID_SIZE;
+        case 13552: return RET_ACTIVITY_INVALID_TRIAL_AVATAR;
+        case 13553: return RET_ACTIVITY_FORBIDDEN_TRIAL_AVATAR;
+        case 13571: return RET_RENAME_INVALID_QUEST_STATE;
+        case 13572: return RET_RENAME_CONFLICTED;
+        case 13591: return RET_RELIQUARY_OFFER_PURCHASE_VERSION_IDX_ERROR;
+        case 13592: return RET_RELIQUARY_OFFER_VERSION_TIMES_LIMIT;
+        case 13593: return RET_RELIQUARY_OFFER_PROGRESS_NOT_ENOUGH;
+        case 13594: return RET_RELIQUARY_OFFER_PROGRESS_OVER_LIMIT;
+        case 13595: return RET_RELIQUARY_PURCHASE_SUITE_TIMES_OVER_LIMIT;
         default: return null;
       }
     }
@@ -12474,7 +14171,7 @@ public final class RetcodeOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\rRetcode.proto*\265\214\003\n\007Retcode\022\014\n\010RET_SUCC" +
+      "\n\rRetcode.proto*\305\311\003\n\007Retcode\022\014\n\010RET_SUCC" +
       "\020\000\022\025\n\010RET_FAIL\020\377\377\377\377\377\377\377\377\377\001\022\021\n\rRET_SVR_ERR" +
       "OR\020\001\022\025\n\021RET_UNKNOWN_ERROR\020\002\022\020\n\014RET_FREQU" +
       "ENT\020\003\022\032\n\026RET_NODE_FORWARD_ERROR\020\004\022\030\n\024RET" +
@@ -12503,194 +14200,218 @@ public final class RetcodeOuterClass {
       "VERSION_HASH_FAIL\020(\022\037\n\033RET_MINOR_REGISTE" +
       "R_FOBIDDEN\020)\022\036\n\032RET_SECURITY_LIBRARY_ERR" +
       "OR\020*\022\037\n\033RET_GATE_TICKET_CHECK_ERROR\020+\022#\n" +
-      "\037RET_PROTO_MIX_VERSION_NOT_MATCH\020,\022\024\n\020RE" +
-      "T_AVATAR_IN_CD\020e\022\030\n\024RET_AVATAR_NOT_ALIVE" +
-      "\020f\022\033\n\027RET_AVATAR_NOT_ON_SCENE\020g\022\033\n\027RET_C" +
-      "AN_NOT_FIND_AVATAR\020h\022\036\n\032RET_CAN_NOT_DEL_" +
-      "CUR_AVATAR\020i\022\030\n\024RET_DUPLICATE_AVATAR\020j\022\032" +
-      "\n\026RET_AVATAR_IS_SAME_ONE\020k\022\036\n\032RET_AVATAR" +
-      "_LEVEL_LESS_THAN\020l\022%\n!RET_AVATAR_CAN_NOT" +
-      "_CHANGE_ELEMENT\020m\022$\n RET_AVATAR_BREAK_LE" +
-      "VEL_LESS_THAN\020n\022!\n\035RET_AVATAR_ON_MAX_BRE" +
-      "AK_LEVEL\020o\022\037\n\033RET_AVATAR_ID_ALREADY_EXIS" +
-      "T\020p\022\027\n\023RET_AVATAR_NOT_DEAD\020q\022\032\n\026RET_AVAT" +
-      "AR_IS_REVIVING\020r\022\027\n\023RET_AVATAR_ID_ERROR\020" +
-      "s\022#\n\037RET_REPEAT_SET_PLAYER_BORN_DATA\020t\022\036" +
-      "\n\032RET_PLAYER_LEVEL_LESS_THAN\020u\022 \n\034RET_AV" +
-      "ATAR_LIMIT_LEVEL_ERROR\020v\022\034\n\030RET_CUR_AVAT" +
-      "AR_NOT_ALIVE\020w\022\031\n\025RET_CAN_NOT_FIND_TEAM\020" +
-      "x\022\035\n\031RET_CAN_NOT_FIND_CUR_TEAM\020y\022 \n\034RET_" +
-      "AVATAR_NOT_EXIST_IN_TEAM\020z\022+\n\'RET_CAN_NO" +
-      "T_REMOVE_CUR_AVATAR_FROM_TEAM\020{\022.\n*RET_C" +
-      "AN_NOT_USE_REVIVE_ITEM_FOR_CUR_AVATAR\020|\022" +
-      "\036\n\032RET_TEAM_COST_EXCEED_LIMIT\020}\022!\n\035RET_T" +
-      "EAM_AVATAR_IN_EXPEDITION\020~\022&\n\"RET_TEAM_C" +
-      "AN_NOT_CHOSE_REPLACE_USE\020\177\022\031\n\024RET_AVATAR" +
-      "_IN_COMBAT\020\200\001\022\034\n\027RET_NICKNAME_UTF8_ERROR" +
-      "\020\202\001\022\032\n\025RET_NICKNAME_TOO_LONG\020\203\001\022\036\n\031RET_N" +
-      "ICKNAME_WORD_ILLEGAL\020\204\001\022!\n\034RET_NICKNAME_" +
-      "TOO_MANY_DIGITS\020\205\001\022\032\n\025RET_NICKNAME_IS_EM" +
-      "PTY\020\206\001\022\037\n\032RET_NICKNAME_MONTHLY_LIMIT\020\207\001\022" +
-      "\035\n\030RET_NICKNAME_NOT_CHANGED\020\210\001\022\032\n\025RET_PL" +
-      "AYER_NOT_ONLINE\020\214\001\022\034\n\027RET_OPEN_STATE_NOT" +
-      "_OPEN\020\215\001\022\027\n\022RET_FEATURE_CLOSED\020\216\001\022%\n RET" +
-      "_AVATAR_EXPEDITION_AVATAR_DIE\020\230\001\022&\n!RET_" +
-      "AVATAR_EXPEDITION_COUNT_LIMIT\020\231\001\022&\n!RET_" +
-      "AVATAR_EXPEDITION_MAIN_FORBID\020\232\001\022\'\n\"RET_" +
-      "AVATAR_EXPEDITION_TRIAL_FORBID\020\233\001\022\032\n\025RET" +
-      "_TEAM_NAME_ILLEGAL\020\234\001\022\032\n\025RET_IS_NOT_IN_S" +
-      "TANDBY\020\235\001\022\026\n\021RET_IS_IN_DUNGEON\020\236\001\022 \n\033RET" +
-      "_IS_IN_LOCK_AVATAR_QUEST\020\237\001\022\036\n\031RET_IS_US" +
-      "ING_TRIAL_AVATAR\020\240\001\022\035\n\030RET_IS_USING_TEMP" +
-      "_AVATAR\020\241\001\022\031\n\024RET_NOT_HAS_FLYCLOAK\020\242\001\022\"\n" +
-      "\035RET_FETTER_REWARD_ALREADY_GOT\020\243\001\022\'\n\"RET" +
-      "_FETTER_REWARD_LEVEL_NOT_ENOUGH\020\244\001\022%\n RE" +
-      "T_WORLD_LEVEL_ADJUST_MIN_LEVEL\020\245\001\022\036\n\031RET" +
-      "_WORLD_LEVEL_ADJUST_CD\020\246\001\022\030\n\023RET_NOT_HAS" +
-      "_COSTUME\020\247\001\022\035\n\030RET_COSTUME_AVATAR_ERROR\020" +
-      "\250\001\022#\n\036RET_FLYCLOAK_PLATFORM_TYPE_ERR\020\251\001\022" +
-      "\024\n\017RET_IN_TRANSFER\020\252\001\022\032\n\025RET_IS_IN_LOCK_" +
-      "AVATAR\020\253\001\022\031\n\024RET_FULL_BACKUP_TEAM\020\254\001\022!\n\034" +
-      "RET_BACKUP_TEAM_ID_NOT_VALID\020\255\001\022 \n\033RET_B" +
-      "ACKUP_TEAM_IS_CUR_TEAM\020\256\001\022\034\n\027RET_AVATAR_" +
-      "RENAME_IN_CD\020\257\001\022\037\n\032RET_AVATAR_RENAME_IN_" +
-      "AUDIT\020\260\001\022\'\n\"RET_AVATAR_RENAME_IN_IP_BLAC" +
-      "K_LIST\020\261\001\022\036\n\031RET_TEAM_AVATAR_IS_LOCKED\020\262" +
-      "\001\022 \n\033RET_PLAYER_HAS_TRIAL_AVATAR\020\263\001\022\024\n\017R" +
-      "ET_FLOAT_ERROR\020\311\001\022\026\n\021RET_NPC_NOT_EXIST\020\255" +
-      "\002\022\024\n\017RET_NPC_TOO_FAR\020\256\002\022\031\n\024RET_NOT_CURRE" +
-      "NT_TALK\020\257\002\022\030\n\023RET_NPC_CREATE_FAIL\020\260\002\022\026\n\021" +
-      "RET_NPC_MOVE_FAIL\020\261\002\022\030\n\023RET_QUEST_NOT_EX" +
-      "IST\020\221\003\022\026\n\021RET_QUEST_IS_FAIL\020\222\003\022\034\n\027RET_QU" +
-      "EST_CONTENT_ERROR\020\223\003\022\036\n\031RET_BARGAIN_NOT_" +
-      "ACTIVATED\020\224\003\022\031\n\024RET_BARGAIN_FINISHED\020\225\003\022" +
-      "\'\n\"RET_INFERENCE_ASSOCIATE_WORD_ERROR\020\226\003" +
-      "\022,\n\'RET_INFERENCE_SUBMIT_WORD_NO_CONCLUS" +
-      "ION\020\227\003\022&\n!RET_SUBMIT_QUEST_EVENTS_NOT_RI" +
-      "GHT\020\230\003\022\033\n\026RET_POINT_NOT_UNLOCKED\020\365\003\022\026\n\021R" +
-      "ET_POINT_TOO_FAR\020\366\003\022\036\n\031RET_POINT_ALREAY_" +
-      "UNLOCKED\020\367\003\022\031\n\024RET_ENTITY_NOT_EXIST\020\370\003\022\031" +
-      "\n\024RET_ENTER_SCENE_FAIL\020\371\003\022\036\n\031RET_PLAYER_" +
-      "IS_ENTER_SCENE\020\372\003\022\027\n\022RET_CITY_MAX_LEVEL\020" +
-      "\373\003\022\024\n\017RET_AREA_LOCKED\020\374\003\022\030\n\023RET_JOIN_OTH" +
-      "ER_WAIT\020\375\003\022\037\n\032RET_WEATHER_AREA_NOT_FOUND" +
-      "\020\376\003\022\032\n\025RET_WEATHER_IS_LOCKED\020\377\003\022\032\n\025RET_N" +
-      "OT_IN_SELF_SCENE\020\200\004\022\030\n\023RET_GROUP_NOT_EXI" +
-      "ST\020\201\004\022\032\n\025RET_MARK_NAME_ILLEGAL\020\202\004\022\034\n\027RET" +
-      "_MARK_ALREADY_EXISTS\020\203\004\022\026\n\021RET_MARK_OVER" +
-      "FLOW\020\204\004\022\030\n\023RET_MARK_NOT_EXISTS\020\205\004\022\032\n\025RET" +
-      "_MARK_UNKNOWN_TYPE\020\206\004\022\033\n\026RET_MARK_NAME_T" +
-      "OO_LONG\020\207\004\022\026\n\021RET_DISTANCE_LONG\020\210\004\022\"\n\035RE" +
-      "T_ENTER_SCENE_TOKEN_INVALID\020\211\004\022\033\n\026RET_NO" +
-      "T_IN_WORLD_SCENE\020\212\004\022\034\n\027RET_ANY_GALLERY_S" +
-      "TARTED\020\213\004\022\032\n\025RET_GALLERY_NOT_START\020\214\004\022.\n" +
-      ")RET_GALLERY_INTERRUPT_ONLY_ON_SINGLE_MO" +
-      "DE\020\215\004\022!\n\034RET_GALLERY_CANNOT_INTERRUPT\020\216\004" +
-      "\022\037\n\032RET_GALLERY_WORLD_NOT_MEET\020\217\004\022\037\n\032RET" +
-      "_GALLERY_SCENE_NOT_MEET\020\220\004\022!\n\034RET_CUR_PL" +
-      "AY_CANNOT_TRANSFER\020\221\004\022&\n!RET_CANT_USE_WI" +
-      "DGET_IN_HOME_SCENE\020\222\004\022\036\n\031RET_SCENE_GROUP" +
-      "_NOT_MATCH\020\223\004\022\030\n\023RET_POS_ROT_INVALID\020\247\004\022" +
-      "\036\n\031RET_MARK_INVALID_SCENE_ID\020\250\004\022*\n%RET_I" +
-      "NVALID_SCENE_TO_USE_ANCHOR_POINT\020\251\004\022\036\n\031R" +
-      "ET_ENTER_HOME_SCENE_FAIL\020\252\004\022\032\n\025RET_CUR_S" +
-      "CENE_IS_NULL\020\253\004\022\027\n\022RET_GROUP_ID_ERROR\020\254\004" +
-      "\022$\n\037RET_GALLERY_INTERRUPT_NOT_OWNER\020\255\004\022\032" +
-      "\n\025RET_NO_SPRING_IN_AREA\020\256\004\022\032\n\025RET_AREA_N" +
-      "OT_IN_SCENE\020\257\004\022\030\n\023RET_INVALID_CITY_ID\020\260\004" +
-      "\022\031\n\024RET_INVALID_SCENE_ID\020\261\004\022 \n\033RET_DEST_" +
-      "SCENE_IS_NOT_ALLOW\020\262\004\022\037\n\032RET_LEVEL_TAG_S" +
-      "WITCH_IN_CD\020\263\004\022 \n\033RET_LEVEL_TAG_ALREADY_" +
-      "EXIST\020\264\004\022\030\n\023RET_INVALID_AREA_ID\020\265\004\022\037\n\032RE" +
-      "T_GALLERY_ONGOING_FORBID\020\266\004\022\034\n\027RET_NOT_I" +
-      "N_PLAYER_WORLD\020\267\004\022&\n!RET_MAP_LAYER_GROUP" +
-      "_ALREADY_SHOWN\020\270\004\022\032\n\025RET_INVALID_MAP_LAY" +
-      "ER\020\271\004\022\027\n\022RET_ITEM_NOT_EXIST\020\331\004\022\037\n\032RET_PA" +
-      "CK_EXCEED_MAX_WEIGHT\020\332\004\022\032\n\025RET_ITEM_NOT_" +
-      "DROPABLE\020\333\004\022\030\n\023RET_ITEM_NOT_USABLE\020\334\004\022\037\n" +
-      "\032RET_ITEM_INVALID_USE_COUNT\020\335\004\022 \n\033RET_IT" +
-      "EM_INVALID_DROP_COUNT\020\336\004\022\033\n\026RET_ITEM_ALR" +
-      "EADY_EXIST\020\337\004\022\031\n\024RET_ITEM_IN_COOLDOWN\020\340\004" +
-      "\022\036\n\031RET_ITEM_COUNT_NOT_ENOUGH\020\341\004\022\034\n\027RET_" +
-      "ITEM_INVALID_TARGET\020\342\004\022\031\n\024RET_RECIPE_NOT" +
-      "_EXIST\020\343\004\022\026\n\021RET_RECIPE_LOCKED\020\344\004\022\030\n\023RET" +
-      "_RECIPE_UNLOCKED\020\345\004\022\034\n\027RET_COMPOUND_QUEU" +
-      "E_FULL\020\346\004\022\034\n\027RET_COMPOUND_NOT_FINISH\020\347\004\022" +
-      "\032\n\025RET_MAIL_ITEM_NOT_GET\020\350\004\022\032\n\025RET_ITEM_" +
-      "EXCEED_LIMIT\020\351\004\022\033\n\026RET_AVATAR_CAN_NOT_US" +
-      "E\020\352\004\022\037\n\032RET_ITEM_NEED_PLAYER_LEVEL\020\353\004\022\034\n" +
-      "\027RET_RECIPE_NOT_AUTO_QTE\020\354\004\022\034\n\027RET_COMPO" +
-      "UND_BUSY_QUEUE\020\355\004\022\030\n\023RET_NEED_MORE_SCOIN" +
-      "\020\356\004\022\036\n\031RET_SKILL_DEPOT_NOT_FOUND\020\357\004\022\031\n\024R" +
-      "ET_HCOIN_NOT_ENOUGH\020\360\004\022\031\n\024RET_SCOIN_NOT_" +
-      "ENOUGH\020\361\004\022\033\n\026RET_HCOIN_EXCEED_LIMIT\020\362\004\022\033" +
-      "\n\026RET_SCOIN_EXCEED_LIMIT\020\363\004\022\025\n\020RET_MAIL_" +
-      "EXPIRED\020\364\004\022\031\n\024RET_REWARD_HAS_TAKEN\020\365\004\022 \n" +
-      "\033RET_COMBINE_COUNT_TOO_LARGE\020\366\004\022\032\n\025RET_G" +
-      "IVING_ITEM_WRONG\020\367\004\022\033\n\026RET_GIVING_IS_FIN" +
-      "ISHED\020\370\004\022\033\n\026RET_GIVING_NOT_ACTIVED\020\371\004\022\031\n" +
-      "\024RET_FORGE_QUEUE_FULL\020\372\004\022\035\n\030RET_FORGE_QU" +
-      "EUE_CAPACITY\020\373\004\022\036\n\031RET_FORGE_QUEUE_NOT_F" +
-      "OUND\020\374\004\022\032\n\025RET_FORGE_QUEUE_EMPTY\020\375\004\022\031\n\024R" +
-      "ET_NOT_SUPPORT_ITEM\020\376\004\022\023\n\016RET_ITEM_EMPTY" +
-      "\020\377\004\022\035\n\030RET_VIRTUAL_EXCEED_LIMIT\020\200\005\022\036\n\031RE" +
-      "T_MATERIAL_EXCEED_LIMIT\020\201\005\022\033\n\026RET_EQUIP_" +
-      "EXCEED_LIMIT\020\202\005\022\"\n\035RET_ITEM_SHOULD_HAVE_" +
-      "NO_LEVEL\020\203\005\022*\n%RET_WEAPON_PROMOTE_LEVEL_" +
-      "EXCEED_LIMIT\020\204\005\022\035\n\030RET_WEAPON_LEVEL_INVA" +
-      "LID\020\205\005\022\031\n\024RET_UNKNOW_ITEM_TYPE\020\206\005\022\033\n\026RET" +
-      "_ITEM_COUNT_IS_ZERO\020\207\005\022\030\n\023RET_ITEM_IS_EX" +
-      "PIRED\020\210\005\022!\n\034RET_ITEM_EXCEED_OUTPUT_LIMIT" +
-      "\020\211\005\022\033\n\026RET_EQUIP_LEVEL_HIGHER\020\212\005\022&\n!RET_" +
-      "EQUIP_CAN_NOT_WAKE_OFF_WEAPON\020\213\005\022\036\n\031RET_" +
-      "EQUIP_HAS_BEEN_WEARED\020\214\005\022!\n\034RET_EQUIP_WE" +
-      "ARED_CANNOT_DROP\020\215\005\022\031\n\024RET_AWAKEN_LEVEL_" +
-      "MAX\020\216\005\022\031\n\024RET_MCOIN_NOT_ENOUGH\020\217\005\022\033\n\026RET" +
-      "_MCOIN_EXCEED_LIMIT\020\220\005\022\031\n\024RET_RESIN_NOT_" +
-      "ENOUGH\020\224\005\022\033\n\026RET_RESIN_EXCEED_LIMIT\020\225\005\022\034" +
-      "\n\027RET_RESIN_OPENSTATE_OFF\020\226\005\022$\n\037RET_RESI" +
-      "N_BOUGHT_COUNT_EXCEEDED\020\227\005\022*\n%RET_RESIN_" +
-      "CARD_DAILY_REWARD_HAS_TAKEN\020\230\005\022\033\n\026RET_RE" +
-      "SIN_CARD_EXPIRED\020\231\005\022\034\n\027RET_AVATAR_CAN_NO" +
-      "T_COOK\020\232\005\022\031\n\024RET_ATTACH_AVATAR_CD\020\233\005\022#\n\036" +
-      "RET_AUTO_RECOVER_OPENSTATE_OFF\020\234\005\022+\n&RET" +
-      "_AUTO_RECOVER_BOUGHT_COUNT_EXCEEDED\020\235\005\022\032" +
-      "\n\025RET_RESIN_GAIN_FAILED\020\236\005\022$\n\037RET_WIDGET" +
-      "_ORNAMENTS_TYPE_ERROR\020\237\005\022\"\n\035RET_ALL_TARG" +
-      "ET_SATIATION_FULL\020\240\005\022$\n\037RET_FORGE_WORLD_" +
-      "LEVEL_NOT_MATCH\020\241\005\022\037\n\032RET_FORGE_POINT_NO" +
-      "T_ENOUGH\020\242\005\022!\n\034RET_WIDGET_ANCHOR_POINT_F" +
-      "ULL\020\243\005\022&\n!RET_WIDGET_ANCHOR_POINT_NOT_FO" +
-      "UND\020\244\005\022%\n RET_ALL_BONFIRE_EXCEED_MAX_COU" +
-      "NT\020\245\005\022!\n\034RET_BONFIRE_EXCEED_MAX_COUNT\020\246\005" +
-      "\022\035\n\030RET_LUNCH_BOX_DATA_ERROR\020\247\005\022!\n\034RET_I" +
-      "NVALID_QUICK_USE_WIDGET\020\250\005\022$\n\037RET_INVALI" +
-      "D_REPLACE_RESIN_COUNT\020\251\005\022\'\n\"RET_PREV_DET" +
-      "ECTED_GATHER_NOT_FOUND\020\252\005\022\036\n\031RET_GOT_ALL" +
-      "_ONEOFF_GAHTER\020\253\005\022#\n\036RET_INVALID_WIDGET_" +
-      "MATERIAL_ID\020\254\005\022)\n$RET_WIDGET_DETECTOR_NO" +
-      "_HINT_TO_CLEAR\020\255\005\022,\n\'RET_WIDGET_ALREADY_" +
-      "WITHIN_NEARBY_RADIUS\020\256\005\022,\n\'RET_WIDGET_CL" +
-      "IENT_COLLECTOR_NEED_POINTS\020\257\005\022\031\n\024RET_WID" +
-      "GET_IN_COMBAT\020\260\005\022!\n\034RET_WIDGET_NOT_SET_Q" +
-      "UICK_USE\020\261\005\022\036\n\031RET_ALREADY_ATTACH_WIDGET" +
-      "\020\262\005\022\030\n\023RET_EQUIP_IS_LOCKED\020\263\005\022\030\n\023RET_FOR" +
-      "GE_IS_LOCKED\020\264\005\022\032\n\025RET_COMBINE_IS_LOCKED" +
-      "\020\265\005\022!\n\034RET_FORGE_OUTPUT_STACK_LIMIT\020\266\005\022\037" +
-      "\n\032RET_ALREADY_DETTACH_WIDGET\020\267\005\022(\n#RET_G" +
-      "ADGET_BUILDER_EXCEED_MAX_COUNT\020\270\005\022/\n*RET" +
-      "_REUNION_PRIVILEGE_RESIN_TYPE_IS_NORMAL\020" +
-      "\271\005\022(\n#RET_BONUS_COUNT_EXCEED_DOUBLE_LIMI" +
-      "T\020\272\005\022(\n#RET_RELIQUARY_DECOMPOSE_PARAM_ER" +
-      "ROR\020\273\005\022&\n!RET_ITEM_COMBINE_COUNT_NOT_ENO" +
-      "UGH\020\274\005\022\030\n\023RET_GOODS_NOT_EXIST\020\275\005\022\"\n\035RET_" +
-      "GOODS_MATERIAL_NOT_ENOUGH\020\276\005\022\032\n\025RET_GOOD" +
-      "S_NOT_IN_TIME\020\277\005\022!\n\034RET_GOODS_BUY_NUM_NO" +
-      "T_ENOUGH\020\300\005\022\034\n\027RET_GOODS_BUY_NUM_ERROR\020\301" +
-      "\005\022\026\n\021RET_SHOP_NOT_OPEN\020\302\005\022\037\n\032RET_SHOP_CO" +
-      "NTENT_NOT_MATCH\020\303\005\022\"\n\035RET_SHOP_BATCH_BUY" +
-      "_SHOP_LIMIT\020\304\005\022#\n\036RET_SHOP_BATCH_BUY_COU" +
-      "NT_LIMIT\020\305\005\022\027\n\022RET_CHAT_FORBIDDEN\020\236\006\022\020\n\013" +
+      "\037RET_PROTO_MIX_VERSION_NOT_MATCH\020,\022\"\n\036RE" +
+      "T_ACCOUNT_TYPE_STOP_REGISTER\020-\022\024\n\020RET_AV" +
+      "ATAR_IN_CD\020e\022\030\n\024RET_AVATAR_NOT_ALIVE\020f\022\033" +
+      "\n\027RET_AVATAR_NOT_ON_SCENE\020g\022\033\n\027RET_CAN_N" +
+      "OT_FIND_AVATAR\020h\022\036\n\032RET_CAN_NOT_DEL_CUR_" +
+      "AVATAR\020i\022\030\n\024RET_DUPLICATE_AVATAR\020j\022\032\n\026RE" +
+      "T_AVATAR_IS_SAME_ONE\020k\022\036\n\032RET_AVATAR_LEV" +
+      "EL_LESS_THAN\020l\022%\n!RET_AVATAR_CAN_NOT_CHA" +
+      "NGE_ELEMENT\020m\022$\n RET_AVATAR_BREAK_LEVEL_" +
+      "LESS_THAN\020n\022!\n\035RET_AVATAR_ON_MAX_BREAK_L" +
+      "EVEL\020o\022\037\n\033RET_AVATAR_ID_ALREADY_EXIST\020p\022" +
+      "\027\n\023RET_AVATAR_NOT_DEAD\020q\022\032\n\026RET_AVATAR_I" +
+      "S_REVIVING\020r\022\027\n\023RET_AVATAR_ID_ERROR\020s\022#\n" +
+      "\037RET_REPEAT_SET_PLAYER_BORN_DATA\020t\022\036\n\032RE" +
+      "T_PLAYER_LEVEL_LESS_THAN\020u\022 \n\034RET_AVATAR" +
+      "_LIMIT_LEVEL_ERROR\020v\022\034\n\030RET_CUR_AVATAR_N" +
+      "OT_ALIVE\020w\022\031\n\025RET_CAN_NOT_FIND_TEAM\020x\022\035\n" +
+      "\031RET_CAN_NOT_FIND_CUR_TEAM\020y\022 \n\034RET_AVAT" +
+      "AR_NOT_EXIST_IN_TEAM\020z\022+\n\'RET_CAN_NOT_RE" +
+      "MOVE_CUR_AVATAR_FROM_TEAM\020{\022.\n*RET_CAN_N" +
+      "OT_USE_REVIVE_ITEM_FOR_CUR_AVATAR\020|\022\036\n\032R" +
+      "ET_TEAM_COST_EXCEED_LIMIT\020}\022!\n\035RET_TEAM_" +
+      "AVATAR_IN_EXPEDITION\020~\022&\n\"RET_TEAM_CAN_N" +
+      "OT_CHOSE_REPLACE_USE\020\177\022\031\n\024RET_AVATAR_IN_" +
+      "COMBAT\020\200\001\022\033\n\026RET_PLAYER_TIME_LOCKED\020\201\001\022\035" +
+      "\n\030RET_NICKNAME_UTF_8_ERROR\020\202\001\022\032\n\025RET_NIC" +
+      "KNAME_TOO_LONG\020\203\001\022\036\n\031RET_NICKNAME_WORD_I" +
+      "LLEGAL\020\204\001\022!\n\034RET_NICKNAME_TOO_MANY_DIGIT" +
+      "S\020\205\001\022\032\n\025RET_NICKNAME_IS_EMPTY\020\206\001\022\037\n\032RET_" +
+      "NICKNAME_MONTHLY_LIMIT\020\207\001\022\035\n\030RET_NICKNAM" +
+      "E_NOT_CHANGED\020\210\001\022\032\n\025RET_PLAYER_NOT_ONLIN" +
+      "E\020\214\001\022\034\n\027RET_OPEN_STATE_NOT_OPEN\020\215\001\022\027\n\022RE" +
+      "T_FEATURE_CLOSED\020\216\001\022%\n RET_AVATAR_EXPEDI" +
+      "TION_AVATAR_DIE\020\230\001\022&\n!RET_AVATAR_EXPEDIT" +
+      "ION_COUNT_LIMIT\020\231\001\022&\n!RET_AVATAR_EXPEDIT" +
+      "ION_MAIN_FORBID\020\232\001\022\'\n\"RET_AVATAR_EXPEDIT" +
+      "ION_TRIAL_FORBID\020\233\001\022\032\n\025RET_TEAM_NAME_ILL" +
+      "EGAL\020\234\001\022\032\n\025RET_IS_NOT_IN_STANDBY\020\235\001\022\026\n\021R" +
+      "ET_IS_IN_DUNGEON\020\236\001\022 \n\033RET_IS_IN_LOCK_AV" +
+      "ATAR_QUEST\020\237\001\022\036\n\031RET_IS_USING_TRIAL_AVAT" +
+      "AR\020\240\001\022\035\n\030RET_IS_USING_TEMP_AVATAR\020\241\001\022\031\n\024" +
+      "RET_NOT_HAS_FLYCLOAK\020\242\001\022\"\n\035RET_FETTER_RE" +
+      "WARD_ALREADY_GOT\020\243\001\022\'\n\"RET_FETTER_REWARD" +
+      "_LEVEL_NOT_ENOUGH\020\244\001\022%\n RET_WORLD_LEVEL_" +
+      "ADJUST_MIN_LEVEL\020\245\001\022\036\n\031RET_WORLD_LEVEL_A" +
+      "DJUST_CD\020\246\001\022\030\n\023RET_NOT_HAS_COSTUME\020\247\001\022\035\n" +
+      "\030RET_COSTUME_AVATAR_ERROR\020\250\001\022#\n\036RET_FLYC" +
+      "LOAK_PLATFORM_TYPE_ERR\020\251\001\022\024\n\017RET_IN_TRAN" +
+      "SFER\020\252\001\022\032\n\025RET_IS_IN_LOCK_AVATAR\020\253\001\022\031\n\024R" +
+      "ET_FULL_BACKUP_TEAM\020\254\001\022!\n\034RET_BACKUP_TEA" +
+      "M_ID_NOT_VALID\020\255\001\022 \n\033RET_BACKUP_TEAM_IS_" +
+      "CUR_TEAM\020\256\001\022\034\n\027RET_AVATAR_RENAME_IN_CD\020\257" +
+      "\001\022\037\n\032RET_AVATAR_RENAME_IN_AUDIT\020\260\001\022\'\n\"RE" +
+      "T_AVATAR_RENAME_IN_IP_BLACK_LIST\020\261\001\022\036\n\031R" +
+      "ET_TEAM_AVATAR_IS_LOCKED\020\262\001\022 \n\033RET_PLAYE" +
+      "R_HAS_TRIAL_AVATAR\020\263\001\022*\n%RET_AVATAR_EXPE" +
+      "DITION_SLOT_NOT_ENOUGH\020\264\001\0224\n/RET_AVATAR_" +
+      "EXPEDITION_NO_AVATAR_CAN_TAKE_REWARD\020\265\001\022" +
+      ")\n$RET_AVATAR_UPGRADE_ITEM_EXP_OVERFLOW\020" +
+      "\266\001\022 \n\033RET_ASYNC_WORD_FILTER_IN_CD\020\267\001\022\035\n\030" +
+      "RET_NOT_HAS_TRACE_EFFECT\020\270\001\022\"\n\035RET_TRACE" +
+      "_EFFECT_AVATAR_ERROR\020\271\001\022$\n\037RET_PLAYER_TI" +
+      "ME_LOCKED_BY_QUEST\020\272\001\022\024\n\017RET_FLOAT_ERROR" +
+      "\020\311\001\022\026\n\021RET_NPC_NOT_EXIST\020\255\002\022\024\n\017RET_NPC_T" +
+      "OO_FAR\020\256\002\022\031\n\024RET_NOT_CURRENT_TALK\020\257\002\022\030\n\023" +
+      "RET_NPC_CREATE_FAIL\020\260\002\022\026\n\021RET_NPC_MOVE_F" +
+      "AIL\020\261\002\022\030\n\023RET_QUEST_NOT_EXIST\020\221\003\022\026\n\021RET_" +
+      "QUEST_IS_FAIL\020\222\003\022\034\n\027RET_QUEST_CONTENT_ER" +
+      "ROR\020\223\003\022\036\n\031RET_BARGAIN_NOT_ACTIVATED\020\224\003\022\031" +
+      "\n\024RET_BARGAIN_FINISHED\020\225\003\022\'\n\"RET_INFEREN" +
+      "CE_ASSOCIATE_WORD_ERROR\020\226\003\022,\n\'RET_INFERE" +
+      "NCE_SUBMIT_WORD_NO_CONCLUSION\020\227\003\022&\n!RET_" +
+      "SUBMIT_QUEST_EVENTS_NOT_RIGHT\020\230\003\0222\n-RET_" +
+      "CONFIRM_CONTINUE_MUTUAL_QUEST_COND_FAILE" +
+      "D\020\231\003\0220\n+RET_CONFIRM_CONTINUE_MUTUAL_OCCU" +
+      "PIED_FAILED\020\232\003\022\037\n\032RET_QUEST_FOCUS_MODE_I" +
+      "N_CD\020\240\003\022\034\n\027RET_QUEST_IN_FOCUS_MODE\020\241\003\022 \n" +
+      "\033RET_QUEST_NOT_IN_FOCUS_MODE\020\242\003\022(\n#RET_P" +
+      "ARENT_QUEST_CANNOT_START_FOCUS\020\243\003\022\037\n\032RET" +
+      "_PARENT_QUEST_NOT_EXIST\020\244\003\022\033\n\026RET_BAN_OP" +
+      "EARATE_FOCUS\020\245\003\022(\n#RET_QUEST_FOCUS_ANY_G" +
+      "ALLERY_STARTED\020\246\003\022*\n%RET_QUEST_FOCUS_USI" +
+      "NG_INFORMAL_AVATAR\020\247\003\022\"\n\035RET_QUEST_FOCUS" +
+      "_OPENSTATE_OFF\020\250\003\022\033\n\026RET_POINT_NOT_UNLOC" +
+      "KED\020\365\003\022\026\n\021RET_POINT_TOO_FAR\020\366\003\022\036\n\031RET_PO" +
+      "INT_ALREAY_UNLOCKED\020\367\003\022\031\n\024RET_ENTITY_NOT" +
+      "_EXIST\020\370\003\022\031\n\024RET_ENTER_SCENE_FAIL\020\371\003\022\036\n\031" +
+      "RET_PLAYER_IS_ENTER_SCENE\020\372\003\022\027\n\022RET_CITY" +
+      "_MAX_LEVEL\020\373\003\022\024\n\017RET_AREA_LOCKED\020\374\003\022\030\n\023R" +
+      "ET_JOIN_OTHER_WAIT\020\375\003\022\037\n\032RET_WEATHER_ARE" +
+      "A_NOT_FOUND\020\376\003\022\032\n\025RET_WEATHER_IS_LOCKED\020" +
+      "\377\003\022\032\n\025RET_NOT_IN_SELF_SCENE\020\200\004\022\030\n\023RET_GR" +
+      "OUP_NOT_EXIST\020\201\004\022\032\n\025RET_MARK_NAME_ILLEGA" +
+      "L\020\202\004\022\034\n\027RET_MARK_ALREADY_EXISTS\020\203\004\022\026\n\021RE" +
+      "T_MARK_OVERFLOW\020\204\004\022\030\n\023RET_MARK_NOT_EXIST" +
+      "S\020\205\004\022\032\n\025RET_MARK_UNKNOWN_TYPE\020\206\004\022\033\n\026RET_" +
+      "MARK_NAME_TOO_LONG\020\207\004\022\026\n\021RET_DISTANCE_LO" +
+      "NG\020\210\004\022\"\n\035RET_ENTER_SCENE_TOKEN_INVALID\020\211" +
+      "\004\022\033\n\026RET_NOT_IN_WORLD_SCENE\020\212\004\022\034\n\027RET_AN" +
+      "Y_GALLERY_STARTED\020\213\004\022\032\n\025RET_GALLERY_NOT_" +
+      "START\020\214\004\022.\n)RET_GALLERY_INTERRUPT_ONLY_O" +
+      "N_SINGLE_MODE\020\215\004\022!\n\034RET_GALLERY_CANNOT_I" +
+      "NTERRUPT\020\216\004\022\037\n\032RET_GALLERY_WORLD_NOT_MEE" +
+      "T\020\217\004\022\037\n\032RET_GALLERY_SCENE_NOT_MEET\020\220\004\022!\n" +
+      "\034RET_CUR_PLAY_CANNOT_TRANSFER\020\221\004\022&\n!RET_" +
+      "CANT_USE_WIDGET_IN_HOME_SCENE\020\222\004\022\036\n\031RET_" +
+      "SCENE_GROUP_NOT_MATCH\020\223\004\022\030\n\023RET_POS_ROT_" +
+      "INVALID\020\247\004\022\036\n\031RET_MARK_INVALID_SCENE_ID\020" +
+      "\250\004\022*\n%RET_INVALID_SCENE_TO_USE_ANCHOR_PO" +
+      "INT\020\251\004\022\036\n\031RET_ENTER_HOME_SCENE_FAIL\020\252\004\022\032" +
+      "\n\025RET_CUR_SCENE_IS_NULL\020\253\004\022\027\n\022RET_GROUP_" +
+      "ID_ERROR\020\254\004\022$\n\037RET_GALLERY_INTERRUPT_NOT" +
+      "_OWNER\020\255\004\022\032\n\025RET_NO_SPRING_IN_AREA\020\256\004\022\032\n" +
+      "\025RET_AREA_NOT_IN_SCENE\020\257\004\022\030\n\023RET_INVALID" +
+      "_CITY_ID\020\260\004\022\031\n\024RET_INVALID_SCENE_ID\020\261\004\022 " +
+      "\n\033RET_DEST_SCENE_IS_NOT_ALLOW\020\262\004\022\037\n\032RET_" +
+      "LEVEL_TAG_SWITCH_IN_CD\020\263\004\022 \n\033RET_LEVEL_T" +
+      "AG_ALREADY_EXIST\020\264\004\022\030\n\023RET_INVALID_AREA_" +
+      "ID\020\265\004\022\037\n\032RET_GALLERY_ONGOING_FORBID\020\266\004\022\034" +
+      "\n\027RET_NOT_IN_PLAYER_WORLD\020\267\004\022&\n!RET_MAP_" +
+      "LAYER_GROUP_ALREADY_SHOWN\020\270\004\022\032\n\025RET_INVA" +
+      "LID_MAP_LAYER\020\271\004\022\035\n\030RET_GALLERY_REPEAT_S" +
+      "TART\020\272\004\022\034\n\027RET_NOT_IN_PLAYER_SCENE\020\273\004\022+\n" +
+      "&RET_ENTER_DUNGEON_NOT_IN_VALID_DUNGEON\020" +
+      "\274\004\022\027\n\022RET_ITEM_NOT_EXIST\020\331\004\022\037\n\032RET_PACK_" +
+      "EXCEED_MAX_WEIGHT\020\332\004\022\032\n\025RET_ITEM_NOT_DRO" +
+      "PABLE\020\333\004\022\030\n\023RET_ITEM_NOT_USABLE\020\334\004\022\037\n\032RE" +
+      "T_ITEM_INVALID_USE_COUNT\020\335\004\022 \n\033RET_ITEM_" +
+      "INVALID_DROP_COUNT\020\336\004\022\033\n\026RET_ITEM_ALREAD" +
+      "Y_EXIST\020\337\004\022\031\n\024RET_ITEM_IN_COOLDOWN\020\340\004\022\036\n" +
+      "\031RET_ITEM_COUNT_NOT_ENOUGH\020\341\004\022\034\n\027RET_ITE" +
+      "M_INVALID_TARGET\020\342\004\022\031\n\024RET_RECIPE_NOT_EX" +
+      "IST\020\343\004\022\026\n\021RET_RECIPE_LOCKED\020\344\004\022\030\n\023RET_RE" +
+      "CIPE_UNLOCKED\020\345\004\022\034\n\027RET_COMPOUND_QUEUE_F" +
+      "ULL\020\346\004\022\034\n\027RET_COMPOUND_NOT_FINISH\020\347\004\022\032\n\025" +
+      "RET_MAIL_ITEM_NOT_GET\020\350\004\022\032\n\025RET_ITEM_EXC" +
+      "EED_LIMIT\020\351\004\022\033\n\026RET_AVATAR_CAN_NOT_USE\020\352" +
+      "\004\022\037\n\032RET_ITEM_NEED_PLAYER_LEVEL\020\353\004\022\034\n\027RE" +
+      "T_RECIPE_NOT_AUTO_QTE\020\354\004\022\034\n\027RET_COMPOUND" +
+      "_BUSY_QUEUE\020\355\004\022\030\n\023RET_NEED_MORE_SCOIN\020\356\004" +
+      "\022\036\n\031RET_SKILL_DEPOT_NOT_FOUND\020\357\004\022\031\n\024RET_" +
+      "HCOIN_NOT_ENOUGH\020\360\004\022\031\n\024RET_SCOIN_NOT_ENO" +
+      "UGH\020\361\004\022\033\n\026RET_HCOIN_EXCEED_LIMIT\020\362\004\022\033\n\026R" +
+      "ET_SCOIN_EXCEED_LIMIT\020\363\004\022\025\n\020RET_MAIL_EXP" +
+      "IRED\020\364\004\022\031\n\024RET_REWARD_HAS_TAKEN\020\365\004\022 \n\033RE" +
+      "T_COMBINE_COUNT_TOO_LARGE\020\366\004\022\032\n\025RET_GIVI" +
+      "NG_ITEM_WRONG\020\367\004\022\033\n\026RET_GIVING_IS_FINISH" +
+      "ED\020\370\004\022\033\n\026RET_GIVING_NOT_ACTIVED\020\371\004\022\031\n\024RE" +
+      "T_FORGE_QUEUE_FULL\020\372\004\022\035\n\030RET_FORGE_QUEUE" +
+      "_CAPACITY\020\373\004\022\036\n\031RET_FORGE_QUEUE_NOT_FOUN" +
+      "D\020\374\004\022\032\n\025RET_FORGE_QUEUE_EMPTY\020\375\004\022\031\n\024RET_" +
+      "NOT_SUPPORT_ITEM\020\376\004\022\023\n\016RET_ITEM_EMPTY\020\377\004" +
+      "\022\035\n\030RET_VIRTUAL_EXCEED_LIMIT\020\200\005\022\036\n\031RET_M" +
+      "ATERIAL_EXCEED_LIMIT\020\201\005\022\033\n\026RET_EQUIP_EXC" +
+      "EED_LIMIT\020\202\005\022\"\n\035RET_ITEM_SHOULD_HAVE_NO_" +
+      "LEVEL\020\203\005\022*\n%RET_WEAPON_PROMOTE_LEVEL_EXC" +
+      "EED_LIMIT\020\204\005\022\035\n\030RET_WEAPON_LEVEL_INVALID" +
+      "\020\205\005\022\031\n\024RET_UNKNOW_ITEM_TYPE\020\206\005\022\033\n\026RET_IT" +
+      "EM_COUNT_IS_ZERO\020\207\005\022\030\n\023RET_ITEM_IS_EXPIR" +
+      "ED\020\210\005\022!\n\034RET_ITEM_EXCEED_OUTPUT_LIMIT\020\211\005" +
+      "\022\033\n\026RET_EQUIP_LEVEL_HIGHER\020\212\005\022&\n!RET_EQU" +
+      "IP_CAN_NOT_WAKE_OFF_WEAPON\020\213\005\022\036\n\031RET_EQU" +
+      "IP_HAS_BEEN_WEARED\020\214\005\022!\n\034RET_EQUIP_WEARE" +
+      "D_CANNOT_DROP\020\215\005\022\031\n\024RET_AWAKEN_LEVEL_MAX" +
+      "\020\216\005\022\031\n\024RET_MCOIN_NOT_ENOUGH\020\217\005\022\033\n\026RET_MC" +
+      "OIN_EXCEED_LIMIT\020\220\005\022&\n!RET_BATCH_SET_EQU" +
+      "IP_LOCK_STATE_CD\020\221\005\022\031\n\024RET_RESIN_NOT_ENO" +
+      "UGH\020\224\005\022\033\n\026RET_RESIN_EXCEED_LIMIT\020\225\005\022\034\n\027R" +
+      "ET_RESIN_OPENSTATE_OFF\020\226\005\022$\n\037RET_RESIN_B" +
+      "OUGHT_COUNT_EXCEEDED\020\227\005\022*\n%RET_RESIN_CAR" +
+      "D_DAILY_REWARD_HAS_TAKEN\020\230\005\022\033\n\026RET_RESIN" +
+      "_CARD_EXPIRED\020\231\005\022\034\n\027RET_AVATAR_CAN_NOT_C" +
+      "OOK\020\232\005\022\031\n\024RET_ATTACH_AVATAR_CD\020\233\005\022#\n\036RET" +
+      "_AUTO_RECOVER_OPENSTATE_OFF\020\234\005\022+\n&RET_AU" +
+      "TO_RECOVER_BOUGHT_COUNT_EXCEEDED\020\235\005\022\032\n\025R" +
+      "ET_RESIN_GAIN_FAILED\020\236\005\022$\n\037RET_WIDGET_OR" +
+      "NAMENTS_TYPE_ERROR\020\237\005\022\"\n\035RET_ALL_TARGET_" +
+      "SATIATION_FULL\020\240\005\022$\n\037RET_FORGE_WORLD_LEV" +
+      "EL_NOT_MATCH\020\241\005\022\037\n\032RET_FORGE_POINT_NOT_E" +
+      "NOUGH\020\242\005\022!\n\034RET_WIDGET_ANCHOR_POINT_FULL" +
+      "\020\243\005\022&\n!RET_WIDGET_ANCHOR_POINT_NOT_FOUND" +
+      "\020\244\005\022%\n RET_ALL_BONFIRE_EXCEED_MAX_COUNT\020" +
+      "\245\005\022!\n\034RET_BONFIRE_EXCEED_MAX_COUNT\020\246\005\022\035\n" +
+      "\030RET_LUNCH_BOX_DATA_ERROR\020\247\005\022!\n\034RET_INVA" +
+      "LID_QUICK_USE_WIDGET\020\250\005\022$\n\037RET_INVALID_R" +
+      "EPLACE_RESIN_COUNT\020\251\005\022\'\n\"RET_PREV_DETECT" +
+      "ED_GATHER_NOT_FOUND\020\252\005\022\036\n\031RET_GOT_ALL_ON" +
+      "EOFF_GAHTER\020\253\005\022#\n\036RET_INVALID_WIDGET_MAT" +
+      "ERIAL_ID\020\254\005\022)\n$RET_WIDGET_DETECTOR_NO_HI" +
+      "NT_TO_CLEAR\020\255\005\022,\n\'RET_WIDGET_ALREADY_WIT" +
+      "HIN_NEARBY_RADIUS\020\256\005\022,\n\'RET_WIDGET_CLIEN" +
+      "T_COLLECTOR_NEED_POINTS\020\257\005\022\031\n\024RET_WIDGET" +
+      "_IN_COMBAT\020\260\005\022!\n\034RET_WIDGET_NOT_SET_QUIC" +
+      "K_USE\020\261\005\022\036\n\031RET_ALREADY_ATTACH_WIDGET\020\262\005" +
+      "\022\030\n\023RET_EQUIP_IS_LOCKED\020\263\005\022\030\n\023RET_FORGE_" +
+      "IS_LOCKED\020\264\005\022\032\n\025RET_COMBINE_IS_LOCKED\020\265\005" +
+      "\022!\n\034RET_FORGE_OUTPUT_STACK_LIMIT\020\266\005\022\037\n\032R" +
+      "ET_ALREADY_DETTACH_WIDGET\020\267\005\022(\n#RET_GADG" +
+      "ET_BUILDER_EXCEED_MAX_COUNT\020\270\005\022/\n*RET_RE" +
+      "UNION_PRIVILEGE_RESIN_TYPE_IS_NORMAL\020\271\005\022" +
+      "(\n#RET_BONUS_COUNT_EXCEED_DOUBLE_LIMIT\020\272" +
+      "\005\022(\n#RET_RELIQUARY_DECOMPOSE_PARAM_ERROR" +
+      "\020\273\005\022&\n!RET_ITEM_COMBINE_COUNT_NOT_ENOUGH" +
+      "\020\274\005\022\030\n\023RET_GOODS_NOT_EXIST\020\275\005\022\"\n\035RET_GOO" +
+      "DS_MATERIAL_NOT_ENOUGH\020\276\005\022\032\n\025RET_GOODS_N" +
+      "OT_IN_TIME\020\277\005\022!\n\034RET_GOODS_BUY_NUM_NOT_E" +
+      "NOUGH\020\300\005\022\034\n\027RET_GOODS_BUY_NUM_ERROR\020\301\005\022\026" +
+      "\n\021RET_SHOP_NOT_OPEN\020\302\005\022\037\n\032RET_SHOP_CONTE" +
+      "NT_NOT_MATCH\020\303\005\022\"\n\035RET_SHOP_BATCH_BUY_SH" +
+      "OP_LIMIT\020\304\005\022#\n\036RET_SHOP_BATCH_BUY_COUNT_" +
+      "LIMIT\020\305\005\022)\n$RET_GOODS_PRECONDITION_NOT_S" +
+      "ATISFIED\020\306\005\022\027\n\022RET_CHAT_FORBIDDEN\020\236\006\022\020\n\013" +
       "RET_CHAT_CD\020\237\006\022\030\n\023RET_CHAT_FREQUENTLY\020\240\006" +
       "\022\031\n\024RET_GADGET_NOT_EXIST\020\241\006\022\037\n\032RET_GADGE" +
       "T_NOT_INTERACTIVE\020\242\006\022\036\n\031RET_GADGET_NOT_G" +
@@ -12724,1026 +14445,1198 @@ public final class RetcodeOuterClass {
       "_AVAIL_CHEST\020\301\006\022#\n\036RET_VEHICLE_SORUSH_NO" +
       "T_REPLACE\020\302\006\022\"\n\035RET_VEHICLE_SORUSH_NOT_U" +
       "NLOAD\020\303\006\022\'\n\"RET_VEHICLE_SORUSH_STATE_NOT" +
-      "_MATCH\020\304\006\022\027\n\022RET_ACTIVITY_CLOSE\020\334\006\022\034\n\027RE" +
-      "T_ACTIVITY_ITEM_ERROR\020\335\006\022)\n$RET_ACTIVITY" +
-      "_CONTRIBUTION_NOT_ENOUGH\020\336\006\022\"\n\035RET_SEA_L" +
-      "AMP_PHASE_NOT_FINISH\020\337\006\022\037\n\032RET_SEA_LAMP_" +
-      "FLY_NUM_LIMIT\020\340\006\022\'\n\"RET_SEA_LAMP_FLY_LAM" +
-      "P_WORD_ILLEGAL\020\341\006\022&\n!RET_ACTIVITY_WATCHE" +
-      "R_REWARD_TAKEN\020\342\006\022-\n(RET_ACTIVITY_WATCHE" +
-      "R_REWARD_NOT_FINISHED\020\343\006\022#\n\036RET_SALESMAN" +
-      "_ALREADY_DELIVERED\020\344\006\022)\n$RET_SALESMAN_RE" +
-      "WARD_COUNT_NOT_ENOUGH\020\345\006\022\"\n\035RET_SALESMAN" +
-      "_POSITION_INVALID\020\346\006\022%\n RET_DELIVER_NOT_" +
-      "FINISH_ALL_QUEST\020\347\006\022*\n%RET_DELIVER_ALREA" +
-      "DY_TAKE_DAILY_REWARD\020\350\006\022$\n\037RET_ASTER_PRO" +
-      "GRESS_EXCEED_LIMIT\020\351\006\022\"\n\035RET_ASTER_CREDI" +
-      "T_EXCEED_LIMIT\020\352\006\022!\n\034RET_ASTER_TOKEN_EXC" +
-      "EED_LIMIT\020\353\006\022 \n\033RET_ASTER_CREDIT_NOT_ENO" +
-      "UGH\020\354\006\022\037\n\032RET_ASTER_TOKEN_NOT_ENOUGH\020\355\006\022" +
-      "\'\n\"RET_ASTER_SPECIAL_REWARD_HAS_TAKEN\020\356\006" +
-      "\022*\n%RET_FLIGHT_GROUP_ACTIVITY_NOT_STARTE" +
-      "D\020\357\006\022/\n*RET_ASTER_MID_PREVIOUS_BATTLE_NO" +
-      "T_FINISHED\020\360\006\0225\n0RET_DRAGON_SPINE_SHIMME" +
-      "RING_ESSENCE_EXCEED_LIMIT\020\361\006\022/\n*RET_DRAG" +
-      "ON_SPINE_WARM_ESSENCE_EXCEED_LIMIT\020\362\006\0223\n" +
-      ".RET_DRAGON_SPINE_WONDROUS_ESSENCE_EXCEE" +
-      "D_LIMIT\020\363\006\0223\n.RET_DRAGON_SPINE_SHIMMERIN" +
-      "G_ESSENCE_NOT_ENOUGH\020\364\006\022-\n(RET_DRAGON_SP" +
-      "INE_WARM_ESSENCE_NOT_ENOUGH\020\365\006\0221\n,RET_DR" +
-      "AGON_SPINE_WONDROUS_ESSENCE_NOT_ENOUGH\020\366" +
-      "\006\022+\n&RET_EFFIGY_FIRST_PASS_REWARD_HAS_TA" +
-      "KEN\020\373\006\022 \n\033RET_EFFIGY_REWARD_HAS_TAKEN\020\374\006" +
-      "\022,\n\'RET_TREASURE_MAP_ADD_TOKEN_EXCEED_LI" +
-      "MIT\020\375\006\022\'\n\"RET_TREASURE_MAP_TOKEN_NOT_ENO" +
-      "UGHT\020\376\006\022#\n\036RET_SEA_LAMP_COIN_EXCEED_LIMI" +
-      "T\020\377\006\022!\n\034RET_SEA_LAMP_COIN_NOT_ENOUGH\020\200\007\022" +
-      ")\n$RET_SEA_LAMP_POPULARITY_EXCEED_LIMIT\020" +
-      "\201\007\022(\n#RET_ACTIVITY_AVATAR_REWARD_NOT_OPE" +
-      "N\020\202\007\022)\n$RET_ACTIVITY_AVATAR_REWARD_HAS_T" +
-      "AKEN\020\203\007\022\'\n\"RET_ARENA_ACTIVITY_ALREADY_ST" +
-      "ARTED\020\204\007\022\037\n\032RET_TALENT_ALREAY_UNLOCKED\020\205" +
-      "\007\022!\n\034RET_PREV_TALENT_NOT_UNLOCKED\020\206\007\022$\n\037" +
-      "RET_BIG_TALENT_POINT_NOT_ENOUGH\020\207\007\022&\n!RE" +
-      "T_SMALL_TALENT_POINT_NOT_ENOUGH\020\210\007\022 \n\033RE" +
-      "T_PROUD_SKILL_ALREADY_GOT\020\211\007\022!\n\034RET_PREV" +
-      "_PROUD_SKILL_NOT_GET\020\212\007\022\036\n\031RET_PROUD_SKI" +
-      "LL_MAX_LEVEL\020\213\007\022*\n%RET_CANDIDATE_SKILL_D" +
-      "EPOT_ID_NOT_FIND\020\216\007\022 \n\033RET_SKILL_DEPOT_I" +
-      "S_THE_SAME\020\217\007\022\032\n\025RET_MONSTER_NOT_EXIST\020\351" +
-      "\007\022\034\n\027RET_MONSTER_CREATE_FAIL\020\352\007\022\033\n\026RET_D" +
-      "UNGEON_ENTER_FAIL\020\315\010\022\032\n\025RET_DUNGEON_QUIT" +
-      "_FAIL\020\316\010\022\'\n\"RET_DUNGEON_ENTER_EXCEED_DAY" +
-      "_COUNT\020\317\010\022(\n#RET_DUNGEON_REVIVE_EXCEED_M" +
-      "AX_COUNT\020\320\010\022\034\n\027RET_DUNGEON_REVIVE_FAIL\020\321" +
-      "\010\022\034\n\027RET_DUNGEON_NOT_SUCCEED\020\322\010\022\037\n\032RET_D" +
-      "UNGEON_CAN_NOT_CANCEL\020\323\010\022\035\n\030RET_DEST_DUN" +
-      "GEON_SETTLED\020\324\010\022\'\n\"RET_DUNGEON_CANDIDATE" +
-      "_TEAM_IS_FULL\020\325\010\022*\n%RET_DUNGEON_CANDIDAT" +
-      "E_TEAM_IS_DISMISS\020\326\010\022-\n(RET_DUNGEON_CAND" +
-      "IDATE_TEAM_NOT_ALL_READY\020\327\010\0221\n,RET_DUNGE" +
-      "ON_CANDIDATE_TEAM_HAS_REPEAT_AVATAR\020\330\010\022*" +
-      "\n%RET_DUNGEON_CANDIDATE_NOT_SINGEL_PASS\020" +
-      "\331\010\022+\n&RET_DUNGEON_REPLAY_NEED_ALL_PLAYER" +
-      "_DIE\020\332\010\022(\n#RET_DUNGEON_REPLAY_HAS_REVIVE" +
-      "_COUNT\020\333\010\022\035\n\030RET_DUNGEON_OTHERS_LEAVE\020\334\010" +
-      "\022\"\n\035RET_DUNGEON_ENTER_LEVEL_LIMIT\020\335\010\022(\n#" +
-      "RET_DUNGEON_CANNOT_ENTER_PLOT_IN_MP\020\336\010\022$" +
-      "\n\037RET_DUNGEON_DROP_SUBFIELD_LIMIT\020\337\010\0220\n+" +
-      "RET_DUNGEON_BE_INVITE_PLAYER_AVATAR_ALL_" +
-      "DIE\020\340\010\022\034\n\027RET_DUNGEON_CANNOT_KICK\020\341\010\0223\n." +
-      "RET_DUNGEON_CANDIDATE_TEAM_SOMEONE_LEVEL" +
-      "_LIMIT\020\342\010\022\036\n\031RET_DUNGEON_IN_FORCE_QUIT\020\343" +
-      "\010\022#\n\036RET_DUNGEON_GUEST_QUIT_DUNGEON\020\344\010\022\034" +
-      "\n\027RET_DUNGEON_TICKET_FAIL\020\345\010\022\034\n\027RET_CUR_" +
-      "DUNGEON_SETTLED\020\346\010\022\035\n\030RET_CUR_DUNGEON_NO" +
-      "T_PLOT\020\347\010\022*\n%RET_CUR_DUNGEON_NOT_ALLOW_S" +
-      "WITCH_TEAM\020\350\010\022\033\n\026RET_MP_NOT_IN_MY_WORLD\020" +
-      "\261\t\022\026\n\021RET_MP_IN_MP_MODE\020\262\t\022\031\n\024RET_MP_SCE" +
-      "NE_IS_FULL\020\263\t\022\036\n\031RET_MP_MODE_NOT_AVAILAB" +
-      "LE\020\264\t\022 \n\033RET_MP_PLAYER_NOT_ENTERABLE\020\265\t\022" +
-      "\032\n\025RET_MP_QUEST_BLOCK_MP\020\266\t\022\031\n\024RET_MP_IN" +
-      "_ROOM_SCENE\020\267\t\022\031\n\024RET_MP_WORLD_IS_FULL\020\270" +
-      "\t\022\"\n\035RET_MP_PLAYER_NOT_ALLOW_ENTER\020\271\t\022\037\n" +
-      "\032RET_MP_PLAYER_DISCONNECTED\020\272\t\022\032\n\025RET_MP" +
-      "_NOT_IN_MP_MODE\020\273\t\022\033\n\026RET_MP_OWNER_NOT_E" +
-      "NTER\020\274\t\022#\n\036RET_MP_ALLOW_ENTER_PLAYER_FUL" +
-      "L\020\275\t\022%\n RET_MP_TARGET_PLAYER_IN_TRANSFER" +
-      "\020\276\t\022!\n\034RET_MP_TARGET_ENTERING_OTHER\020\277\t\022\032" +
-      "\n\025RET_MP_OTHER_ENTERING\020\300\t\022%\n RET_MP_ENT" +
-      "ER_MAIN_PLAYER_IN_PLOT\020\301\t\022\031\n\024RET_MP_NOT_" +
-      "PS_PLAYER\020\302\t\022\033\n\026RET_MP_PLAY_NOT_ACTIVE\020\303" +
-      "\t\022\037\n\032RET_MP_PLAY_REMAIN_REWARDS\020\304\t\022\032\n\025RE" +
-      "T_MP_PLAY_NO_REWARD\020\305\t\022\033\n\026RET_MP_OPEN_ST" +
-      "ATE_FAIL\020\307\t\022\037\n\032RET_MP_PLAYER_IN_BLACKLIS" +
-      "T\020\310\t\022\031\n\024RET_MP_REPLY_TIMEOUT\020\311\t\022\024\n\017RET_M" +
-      "P_IS_BLOCK\020\312\t\022(\n#RET_MP_ENTER_MAIN_PLAYE" +
-      "R_IN_MP_PLAY\020\313\t\022\035\n\030RET_MP_IN_MP_PLAY_BAT" +
-      "TLE\020\314\t\022%\n RET_MP_GUEST_HAS_REWARD_REMAIN" +
-      "ED\020\315\t\022\033\n\026RET_MP_QUIT_MP_INVALID\020\316\t\022)\n$RE" +
-      "T_MP_OTHER_DATA_VERSION_NOT_LATEST\020\317\t\022#\n" +
-      "\036RET_MP_DATA_VERSION_NOT_LATEST\020\320\t\022#\n\036RE" +
-      "T_MP_CUR_WORLD_NOT_ENTERABLE\020\321\t\022\037\n\032RET_M" +
-      "P_ANY_GALLERY_STARTED\020\322\t\022\034\n\027RET_MP_HAS_A" +
-      "CTIVE_DRAFT\020\323\t\022\035\n\030RET_MP_PLAYER_IN_DUNGE" +
-      "ON\020\324\t\022\026\n\021RET_MP_MATCH_FULL\020\325\t\022\027\n\022RET_MP_" +
-      "MATCH_LIMIT\020\326\t\022\033\n\026RET_MP_MATCH_IN_PUNISH" +
-      "\020\327\t\022\034\n\027RET_MP_IS_IN_MULTISTAGE\020\330\t\022\037\n\032RET" +
-      "_MP_MATCH_PLAY_NOT_OPEN\020\331\t\022\"\n\035RET_MP_ONL" +
-      "Y_MP_WITH_PS_PLAYER\020\332\t\022%\n RET_MP_GUEST_L" +
-      "OADING_FIRST_ENTER\020\333\t\022+\n&RET_MP_SUMMER_T" +
-      "IME_SPRINT_BOAT_ONGOING\020\334\t\0220\n+RET_MP_BLI" +
-      "TZ_RUSH_PARKOUR_CHALLENGE_ONGOING\020\335\t\022\036\n\031" +
-      "RET_MP_MUSIC_GAME_ONGOING\020\336\t\022\031\n\024RET_MP_I" +
-      "N_MPING_MODE\020\337\t\022!\n\034RET_MP_OWNER_IN_SINGL" +
-      "E_SCENE\020\340\t\022\033\n\026RET_MP_IN_SINGLE_SCENE\020\341\t\022" +
-      "!\n\034RET_MP_REPLY_NO_VALID_AVATAR\020\342\t\022$\n\037RE" +
-      "T_MP_IS_NOT_IN_TRANSFER_GUARD\020\343\t\0223\n.RET_" +
-      "MP_CANNOT_EXEC_GIVING_IN_SINGLE_MODE_QUE" +
-      "ST\020\344\t\022*\n%RET_MP_EFFIGY_CHALLENGE_V4_IN_P" +
-      "REPARE\020\345\t\022!\n\034RET_MP_SHUFFLE_BOARD_ONGOIN" +
-      "G\020\346\t\022\037\n\032RET_MP_FLIGHT_GEAR_ONGOING\020\347\t\022\"\n" +
-      "\035RET_MP_TOY_BATTLE_QTE_ONGOING\020\350\t\022\026\n\021RET" +
-      "_MAIL_PARA_ERR\020\225\n\022\025\n\020RET_MAIL_MAX_NUM\020\226\n" +
-      "\022\035\n\030RET_MAIL_ITEM_NUM_EXCEED\020\227\n\022\036\n\031RET_M" +
-      "AIL_TITLE_LEN_EXCEED\020\230\n\022 \n\033RET_MAIL_CONT" +
-      "ENT_LEN_EXCEED\020\231\n\022\037\n\032RET_MAIL_SENDER_LEN" +
-      "_EXCEED\020\232\n\022\037\n\032RET_MAIL_PARSE_PACKET_FAIL" +
-      "\020\233\n\022\034\n\027RET_OFFLINE_MSG_MAX_NUM\020\234\n\022 \n\033RET" +
-      "_OFFLINE_MSG_SAME_TICKET\020\235\n\022#\n\036RET_MAIL_" +
-      "EXCEL_MAIL_TYPE_ERROR\020\236\n\022\037\n\032RET_MAIL_CAN" +
-      "NOT_SEND_MCOIN\020\237\n\022 \n\033RET_MAIL_HCOIN_EXCE" +
-      "ED_LIMIT\020\240\n\022 \n\033RET_MAIL_SCOIN_EXCEED_LIM" +
-      "IT\020\241\n\022!\n\034RET_MAIL_MATERIAL_ID_INVALID\020\242\n" +
-      "\022!\n\034RET_MAIL_AVATAR_EXCEED_LIMIT\020\243\n\022+\n&R" +
-      "ET_MAIL_GACHA_TICKET_ETC_EXCEED_LIMIT\020\244\n" +
-      "\022%\n RET_MAIL_ITEM_EXCEED_CEHUA_LIMIT\020\245\n\022" +
-      "*\n%RET_MAIL_SPACE_OR_REST_NUM_NOT_ENOUGH" +
-      "\020\246\n\022\035\n\030RET_MAIL_TICKET_IS_EMPTY\020\247\n\022\"\n\035RE" +
-      "T_MAIL_TRANSACTION_IS_EMPTY\020\250\n\022\036\n\031RET_MA" +
-      "IL_DELETE_COLLECTED\020\251\n\022 \n\033RET_MAIL_COLLE" +
-      "CTION_IS_FULL\020\252\n\022\036\n\031RET_DAILY_TASK_NOT_F" +
-      "INISH\020\262\n\022\035\n\030RET_DAILY_TAKS_HAS_TAKEN\020\263\n\022" +
-      "&\n!RET_SOCIAL_OFFLINE_MSG_NUM_EXCEED\020\264\n\022" +
-      "(\n#RET_DAILY_TASK_FILTER_CITY_NOT_OPEN\020\265" +
-      "\n\022\032\n\025RET_GACHA_INAVAILABLE\020\371\n\022\037\n\032RET_GAC" +
-      "HA_RANDOM_NOT_MATCH\020\372\n\022!\n\034RET_GACHA_SCHE" +
-      "DULE_NOT_MATCH\020\373\n\022\034\n\027RET_GACHA_INVALID_T" +
-      "IMES\020\374\n\022#\n\036RET_GACHA_COST_ITEM_NOT_ENOUG" +
-      "H\020\375\n\022\032\n\025RET_GACHA_TIMES_LIMIT\020\376\n\022\035\n\030RET_" +
-      "GACHA_WISH_SAME_ITEM\020\377\n\022 \n\033RET_GACHA_WIS" +
-      "H_INVALID_ITEM\020\200\013\022!\n\034RET_GACHA_MINORS_TI" +
-      "MES_LIMIT\020\201\013\022\"\n\035RET_GACHA_GENERAL_TIMES_",
-      "LIMIT\020\202\013\022&\n!RET_INVESTIGAITON_NOT_IN_PRO" +
-      "GRESS\020\335\013\022!\n\034RET_INVESTIGAITON_UNCOMPLETE" +
-      "\020\336\013\022#\n\036RET_INVESTIGAITON_REWARD_TAKEN\020\337\013" +
-      "\022)\n$RET_INVESTIGAITON_TARGET_STATE_ERROR" +
-      "\020\340\013\022\034\n\027RET_PUSH_TIPS_NOT_FOUND\020\341\013\022!\n\034RET" +
-      "_SIGN_IN_RECORD_NOT_FOUND\020\342\013\022\037\n\032RET_ALRE" +
-      "ADY_HAVE_SIGNED_IN\020\343\013\022#\n\036RET_SIGN_IN_CON" +
-      "D_NOT_SATISFIED\020\344\013\022&\n!RET_BONUS_ACTIVITY" +
-      "_NOT_UNREWARDED\020\345\013\022\031\n\024RET_SIGN_IN_REWARD" +
-      "ED\020\346\013\022\027\n\022RET_TOWER_NOT_OPEN\020\361\013\022 \n\033RET_TO" +
-      "WER_HAVE_DAILY_RECORD\020\362\013\022\031\n\024RET_TOWER_NO" +
-      "T_RECORD\020\363\013\022\032\n\025RET_TOWER_HAVE_RECORD\020\364\013\022" +
-      "\035\n\030RET_TOWER_TEAM_NUM_ERROR\020\365\013\022\035\n\030RET_TO" +
-      "WER_FLOOR_NOT_OPEN\020\366\013\022#\n\036RET_TOWER_NO_FL" +
-      "OOR_STAR_RECORD\020\367\013\022\037\n\032RET_ALREADY_HAS_TO" +
-      "WER_BUFF\020\370\013\022\036\n\031RET_DUPLICATE_ENTER_LEVEL" +
-      "\020\371\013\022\033\n\026RET_NOT_IN_TOWER_LEVEL\020\372\013\022\027\n\022RET_" +
-      "IN_TOWER_LEVEL\020\373\013\022$\n\037RET_TOWER_PREV_FLOO" +
-      "R_NOT_FINISH\020\374\013\022\036\n\031RET_TOWER_STAR_NOT_EN" +
-      "OUGH\020\375\013\022 \n\033RET_BATTLE_PASS_NO_SCHEDULE\020\205" +
-      "\014\022\036\n\031RET_BATTLE_PASS_HAS_BUYED\020\206\014\022#\n\036RET" +
-      "_BATTLE_PASS_LEVEL_OVERFLOW\020\207\014\022$\n\037RET_BA" +
-      "TTLE_PASS_PRODUCT_EXPIRED\020\210\014\022\030\n\023RET_MATC" +
-      "H_HOST_QUIT\020\231\014\022\037\n\032RET_MATCH_ALREADY_IN_M" +
-      "ATCH\020\232\014\022\033\n\026RET_MATCH_NOT_IN_MATCH\020\233\014\022 \n\033" +
-      "RET_MATCH_APPLYING_ENTER_MP\020\234\014\022\036\n\031RET_MA" +
-      "TCH_INCORRECT_SCENE\020\235\014\022\'\n\"RET_WIDGET_TRE" +
-      "ASURE_SPOT_NOT_FOUND\020\255\014\022&\n!RET_WIDGET_TR" +
-      "EASURE_ENTITY_EXISTS\020\256\014\022&\n!RET_WIDGET_TR" +
-      "EASURE_SPOT_FAR_AWAY\020\257\014\022\'\n\"RET_WIDGET_TR" +
-      "EASURE_FINISHED_TODAY\020\260\014\022)\n$RET_WIDGET_Q" +
-      "UICK_USE_REQ_PARAM_ERROR\020\261\014\022$\n\037RET_WIDGE" +
-      "T_CAMERA_SCAN_ID_ERROR\020\262\014\022\032\n\025RET_WIDGET_" +
-      "NOT_ACTIVE\020\263\014\022\"\n\035RET_WIDGET_FEATHER_NOT_" +
-      "ACTIVE\020\264\014\022+\n&RET_WIDGET_FEATHER_GADGET_T" +
-      "OO_FAR_AWAY\020\265\014\022(\n#RET_WIDGET_CAPTURE_ANI" +
-      "MAL_NOT_EXIST\020\266\014\022-\n(RET_WIDGET_CAPTURE_A" +
-      "NIMAL_DROP_BAG_LIMIT\020\267\014\022.\n)RET_WIDGET_CA" +
-      "PTURE_ANIMAL_CAN_NOT_CAPTURE\020\270\014\022)\n$RET_W" +
-      "IDGET_SKY_CRYSTAL_ALL_COLLECTED\020\271\014\022.\n)RE" +
-      "T_WIDGET_SKY_CRYSTAL_HINT_ALREADY_EXIST\020" +
-      "\272\014\022%\n RET_WIDGET_SKY_CRYSTAL_NOT_FOUND\020\273" +
-      "\014\022,\n\'RET_WIDGET_SKY_CRYSTAL_NO_HINT_TO_C" +
-      "LEAR\020\274\014\022-\n(RET_WIDGET_LIGHT_STONE_ENERGY" +
-      "_NOT_ENOUGH\020\275\014\022-\n(RET_WIDGET_TOY_CRYSTAL" +
-      "_ENERGY_NOT_ENOUGH\020\276\014\022,\n\'RET_WIDGET_LIGH" +
-      "T_STONE_LEVEL_NOT_ENOUGH\020\277\014\022.\n)RET_WIDGE" +
-      "T_QUICK_SLOT_NOT_IN_WIDGET_PANEL\020\300\014\022\026\n\021R" +
-      "ET_UID_NOT_EXIST\020\321\017\022\030\n\023RET_PARSE_BIN_ERR" +
-      "OR\020\322\017\022\037\n\032RET_ACCOUNT_INFO_NOT_EXIST\020\323\017\022\035" +
-      "\n\030RET_ORDER_INFO_NOT_EXIST\020\324\017\022\035\n\030RET_SNA" +
-      "PSHOT_INDEX_ERROR\020\325\017\022\033\n\026RET_MAIL_HAS_BEE" +
-      "N_SENT\020\326\017\022\032\n\025RET_PRODUCT_NOT_EXIST\020\327\017\022\027\n" +
-      "\022RET_UNFINISH_ORDER\020\330\017\022\025\n\020RET_ID_NOT_EXI" +
-      "ST\020\331\017\022\032\n\025RET_ORDER_TRADE_EARLY\020\332\017\022\027\n\022RET" +
-      "_ORDER_FINISHED\020\333\017\022!\n\034RET_GAMESERVER_VER" +
-      "SION_WRONG\020\334\017\022\037\n\032RET_OFFLINE_OP_FULL_LEN" +
-      "GTH\020\335\017\022%\n RET_CONCERT_PRODUCT_OBTAIN_LIM" +
-      "IT\020\336\017\022*\n%RET_CONCERT_PRODUCT_TICKET_DUPL" +
-      "ICATED\020\337\017\022%\n RET_CONCERT_PRODUCT_TICKET_" +
-      "EMPTY\020\340\017\022\027\n\022RET_REDIS_MODIFIED\020\211\'\022\034\n\027RET" +
-      "_REDIS_UID_NOT_EXIST\020\212\'\022#\n\036RET_PATHFINDI" +
-      "NG_DATA_NOT_EXIST\020\361.\022*\n%RET_PATHFINDING_" +
-      "DESTINATION_NOT_EXIST\020\362.\022 \n\033RET_PATHFIND" +
-      "ING_ERROR_SCENE\020\363.\022\'\n\"RET_PATHFINDING_SC" +
-      "ENE_DATA_LOADING\020\364.\022\036\n\031RET_TOTHEMOON_ERR" +
-      "OR_SCENE\020\2351\022#\n\036RET_TOTHEMOON_PLAYER_NOT_" +
-      "EXIST\020\2361\022\036\n\031RET_FRIEND_COUNT_EXCEEDED\020\3316" +
-      "\022\031\n\024RET_PLAYER_NOT_EXIST\020\3326\022!\n\034RET_ALREA" +
-      "DY_SENT_ADD_REQUEST\020\3336\022\035\n\030RET_ASK_FRIEND" +
-      "_LIST_FULL\020\3346\022!\n\034RET_PLAYER_ALREADY_IS_F" +
-      "RIEND\020\3356\022\036\n\031RET_PLAYER_NOT_ASK_FRIEND\020\3366" +
-      "\022#\n\036RET_TARGET_FRIEND_COUNT_EXCEED\020\3376\022\023\n" +
-      "\016RET_NOT_FRIEND\020\3406\022%\n RET_BIRTHDAY_CANNO" +
-      "T_BE_SET_TWICE\020\3416\022\037\n\032RET_CANNOT_ADD_SELF" +
-      "_FRIEND\020\3426\022\032\n\025RET_SIGNATURE_ILLEGAL\020\3436\022%" +
-      "\n RET_PS_PLAYER_CANNOT_ADD_FRIENDS\020\3446\022(\n" +
-      "#RET_PS_PLAYER_CANNOT_REMOVE_FRIENDS\020\3456\022" +
-      "\037\n\032RET_NAME_CARD_NOT_UNLOCKED\020\3466\022\035\n\030RET_" +
-      "ALREADY_IN_BLACKLIST\020\3476\022(\n#RET_PS_PALEYR" +
-      "S_CANNOT_ADD_BLACKLIST\020\3506\022\036\n\031RET_PLAYER_" +
-      "BLACKLIST_FULL\020\3516\022 \n\033RET_PLAYER_NOT_IN_B" +
-      "LACKLIST\020\3526\022+\n&RET_BLACKLIST_PLAYER_CANN" +
-      "OT_ADD_FRIEND\020\3536\022\034\n\027RET_IN_TARGET_BLACKL" +
-      "IST\020\3546\022!\n\034RET_CANNOT_ADD_TARGET_FRIEND\020\355" +
-      "6\022\036\n\031RET_BIRTHDAY_FORMAT_ERROR\020\3566\022\035\n\030RET" +
-      "_ONLINE_ID_NOT_EXISTS\020\3576\022%\n RET_FIRST_SH" +
-      "ARE_REWARD_HAS_TAKEN\020\3606\022*\n%RET_PS_PLAYER" +
-      "_CANNOT_REMOVE_BLACKLIST\020\3616\022\022\n\rRET_REPOR" +
-      "T_CD\020\3626\022\037\n\032RET_REPORT_CONTENT_ILLEGAL\020\3636" +
-      "\022\034\n\027RET_REMARK_WORD_ILLEGAL\020\3646\022\030\n\023RET_RE" +
-      "MARK_TOO_LONG\020\3656\022\032\n\025RET_REMARK_UTF8_ERRO" +
-      "R\020\3666\022\030\n\023RET_REMARK_IS_EMPTY\020\3676\022\032\n\025RET_AS" +
-      "K_ADD_FRIEND_CD\020\3706\022#\n\036RET_SHOW_AVATAR_IN" +
-      "FO_NOT_EXIST\020\3716\022\037\n\032RET_PLAYER_NOT_SHOW_A" +
-      "VATAR\020\3726\022*\n%RET_SOCIAL_UPDATE_SHOW_LIST_" +
-      "REPEAT_ID\020\3736\022\031\n\024RET_PSN_ID_NOT_FOUND\020\3746\022" +
-      "*\n%RET_EMOJI_COLLECTION_NUM_EXCEED_LIMIT" +
-      "\020\3756\022\025\n\020RET_REMARK_EMPTY\020\3766\022 \n\033RET_IN_TAR" +
-      "GET_PSN_BLACKLIST\020\3776\022\036\n\031RET_SIGNATURE_NO" +
-      "T_CHANGED\020\2007\022 \n\033RET_SIGNATURE_MONTHLY_LI" +
-      "MIT\020\2017\022%\n RET_REQ_FRIEND_AVATAR_FREQUENT" +
-      "LY\020\2027\022*\n%RET_PSN_GET_PLAYER_SOCIAL_DETAI" +
-      "L_FAIL\020\2037\022\032\n\025RET_OFFERING_NOT_OPEN\020\2517\022\035\n" +
-      "\030RET_OFFERING_LEVEL_LIMIT\020\2527\022!\n\034RET_OFFE" +
-      "RING_LEVEL_NOT_REACH\020\2537\022!\n\034RET_OFFERING_" +
-      "LEVEL_HAS_TAKEN\020\2547\022&\n!RET_OFFERING_PARI_" +
-      "SEARCH_NOT_OPEN\020\2557\022!\n\034RET_OFFERING_PARI_" +
-      "NOT_FINISH\020\2567\022.\n)RET_OFFERING_PARI_FINIS" +
-      "H_REWARD_HAS_TAKEN\020\2577\022(\n#RET_OFFERING_PA" +
-      "RI_SEARCH_ALL_FINISH\020\2607\022!\n\034RET_CITY_REPU" +
-      "TATION_NOT_OPEN\020\2757\022$\n\037RET_CITY_REPUTATIO" +
-      "N_LEVEL_TAKEN\020\2767\022(\n#RET_CITY_REPUTATION_" +
-      "LEVEL_NOT_REACH\020\2777\022+\n&RET_CITY_REPUTATIO" +
-      "N_PARENT_QUEST_TAKEN\020\3007\022.\n)RET_CITY_REPU" +
-      "TATION_PARENT_QUEST_UNFINISH\020\3017\022\'\n\"RET_C" +
-      "ITY_REPUTATION_ACCEPT_REQUEST\020\3027\022+\n&RET_" +
-      "CITY_REPUTATION_NOT_ACCEPT_REQUEST\020\3037\022-\n" +
-      "(RET_CITY_REPUTATION_ACCEPT_REQUEST_LIMI" +
-      "T\020\3047\022*\n%RET_CITY_REPUTATION_ENTRANCE_NOT" +
-      "_OPEN\020\3057\022-\n(RET_CITY_REPUTATION_TAKEN_RE" +
-      "QUEST_REWARD\020\3067\022%\n RET_CITY_REPUTATION_S" +
-      "WITCH_CLOSE\020\3077\022-\n(RET_CITY_REPUTATION_EN" +
-      "TRACE_SWITCH_CLOSE\020\3107\022-\n(RET_CITY_REPUTA" +
-      "TION_TAKEN_EXPLORE_REWARD\020\3117\022*\n%RET_CITY" +
-      "_REPUTATION_EXPLORE_NOT_REACH\020\3127\022\034\n\027RET_" +
-      "MECHANICUS_NOT_OPEN\020\3207\022\037\n\032RET_MECHANICUS" +
-      "_GEAR_UNLOCK\020\3217\022\035\n\030RET_MECHANICUS_GEAR_L" +
-      "OCK\020\3227\022$\n\037RET_MECHANICUS_GEAR_LEVEL_LIMI" +
-      "T\020\3237\022#\n\036RET_MECHANICUS_COIN_NOT_ENOUGH\020\324" +
-      "7\022\037\n\032RET_MECHANICUS_NO_SEQUENCE\020\3257\022(\n#RE" +
-      "T_MECHANICUS_SEQUENCE_LIMIT_LEVEL\020\3267\022\'\n\"" +
-      "RET_MECHANICUS_SEQUENCE_LIMIT_OPEN\020\3277\022)\n" +
-      "$RET_MECHANICUS_DIFFICULT_NOT_SUPPORT\020\3307" +
-      "\022%\n RET_MECHANICUS_TICKET_NOT_ENOUGH\020\3317\022" +
-      "$\n\037RET_MECHANICUS_TEACH_NOT_FINISH\020\3327\022\"\n" +
-      "\035RET_MECHANICUS_TEACH_FINISHED\020\3337\022.\n)RET" +
-      "_MECHANICUS_PREV_DIFFICULT_LEVEL_BLOCK\020\334" +
-      "7\022 \n\033RET_MECHANICUS_PLAYER_LIMIT\020\3357\022\037\n\032R" +
-      "ET_MECHANICUS_PUNISH_TIME\020\3367\022 \n\033RET_MECH" +
-      "ANICUS_SWITCH_CLOSE\020\3377\022)\n$RET_MECHANICUS" +
-      "_BATTLE_NOT_IN_DUNGEON\020\3567\022)\n$RET_MECHANI" +
-      "CUS_BATTLE_PLAY_NOT_FOUND\020\3577\022.\n)RET_MECH" +
-      "ANICUS_BATTLE_DUPLICATE_PICK_CARD\020\3607\022-\n(" +
-      "RET_MECHANICUS_BATTLE_PLAYER_NOT_IN_PLAY" +
-      "\020\3617\022-\n(RET_MECHANICUS_BATTLE_CARD_NOT_AV" +
-      "AILABLE\020\3627\022,\n\'RET_MECHANICUS_BATTLE_NOT_" +
-      "IN_CARD_STAGE\020\3637\022*\n%RET_MECHANICUS_BATTL" +
-      "E_CARD_IS_WAITING\020\3647\022-\n(RET_MECHANICUS_B" +
-      "ATTLE_CARD_ALL_CONFIRMED\020\3657\0221\n,RET_MECHA" +
-      "NICUS_BATTLE_CARD_ALREADY_CONFIRMED\020\3667\0222" +
-      "\n-RET_MECHANICUS_BATTLE_CARD_CONFIRMED_B" +
-      "Y_OTHER\020\3677\0221\n,RET_MECHANICUS_BATTLE_CARD" +
-      "_NOT_ENOUGH_POINTS\020\3707\022/\n*RET_MECHANICUS_" +
-      "BATTLE_CARD_ALREADY_SKIPPED\020\3717\022!\n\034RET_LE" +
-      "GENDARY_KEY_NOT_ENOUGH\020\301>\022#\n\036RET_LEGENDA" +
-      "RY_KEY_EXCEED_LIMIT\020\302>\022(\n#RET_DAILY_TASK" +
-      "_NOT_ENOUGH_TO_REDEEM\020\303>\022%\n RET_PERSONAL" +
-      "_LINE_OPEN_STATE_OFF\020\304>\022\'\n\"RET_PERSONAL_" +
-      "LINE_LEVEL_NOT_ENOUGH\020\305>\022\037\n\032RET_PERSONAL" +
-      "_LINE_NOT_OPEN\020\306>\022+\n&RET_PERSONAL_LINE_P" +
-      "RE_QUEST_NOT_FINISH\020\307>\022+\n&RET_HUNTING_AL" +
-      "READY_FINISH_OFFER_LIMIT\020\211@\022%\n RET_HUNTI" +
-      "NG_HAS_UNFINISHED_OFFER\020\212@\022*\n%RET_HUNTIN" +
-      "G_FAILED_OFFER_NOT_CD_READY\020\213@\022\037\n\032RET_HU" +
-      "NTING_NOT_TAKE_OFFER\020\214@\022\"\n\035RET_HUNTING_C" +
-      "ANNOT_TAKE_TWICE\020\215@\022*\n%RET_RPIVATE_CHAT_" +
-      "INVALID_CONTENT_TYPE\020\305E\022*\n%RET_PRIVATE_C" +
-      "HAT_TARGET_IS_NOT_FRIEND\020\306E\022+\n&RET_PRIVA" +
-      "TE_CHAT_CONTENT_NOT_SUPPORTED\020\307E\022&\n!RET_" +
-      "PRIVATE_CHAT_CONTENT_TOO_LONG\020\310E\022#\n\036RET_" +
-      "PRIVATE_CHAT_PULL_TOO_FAST\020\311E\022!\n\034RET_PRI" +
-      "VATE_CHAT_REPEAT_READ\020\312E\022%\n RET_PRIVATE_" +
-      "CHAT_READ_NOT_FRIEND\020\313E\022\031\n\024RET_REUNION_F" +
-      "INISHED\020\251F\022\036\n\031RET_REUNION_NOT_ACTIVATED\020" +
-      "\252F\022*\n%RET_REUNION_ALREADY_TAKE_FIRST_REW" +
-      "ARD\020\253F\022!\n\034RET_REUNION_SIGN_IN_REWARDED\020\254" +
-      "F\022!\n\034RET_REUNION_WATCHER_REWARDED\020\255F\022#\n\036" +
-      "RET_REUNION_WATCHER_NOT_FINISH\020\256F\022!\n\034RET" +
-      "_REUNION_MISSION_REWARDED\020\257F\022#\n\036RET_REUN" +
-      "ION_MISSION_NOT_FINISH\020\260F\022,\n\'RET_REUNION" +
-      "_WATCHER_REWARD_NOT_UNLOCKED\020\261F\022 \n\033RET_B" +
-      "LESSING_CONTENT_CLOSED\020\215G\022\034\n\027RET_BLESSIN" +
-      "G_NOT_ACTIVE\020\216G\022\"\n\035RET_BLESSING_NOT_TODA" +
-      "Y_ENTITY\020\217G\022.\n)RET_BLESSING_ENTITY_EXCEE" +
-      "D_SCAN_NUM_LIMIT\020\220G\022-\n(RET_BLESSING_DAIL" +
-      "Y_SCAN_NUM_EXCEED_LIMIT\020\221G\0220\n+RET_BLESSI" +
-      "NG_REDEEM_REWARD_NUM_EXCEED_LIMIT\020\222G\022+\n&" +
-      "RET_BLESSING_REDEEM_PIC_NUM_NOT_ENOUGH\020\223" +
-      "G\022 \n\033RET_BLESSING_PIC_NOT_ENOUGH\020\224G\022\"\n\035R" +
-      "ET_BLESSING_PIC_HAS_RECEIVED\020\225G\022(\n#RET_B" +
-      "LESSING_TARGET_RECV_NUM_EXCEED\020\226G\022\'\n\"RET" +
-      "_FLEUR_FAIR_CREDIT_EXCEED_LIMIT\020\227G\022%\n RE" +
-      "T_FLEUR_FAIR_CREDIT_NOT_ENOUGH\020\230G\022&\n!RET" +
-      "_FLEUR_FAIR_TOKEN_EXCEED_LIMIT\020\231G\022$\n\037RET" +
-      "_FLEUR_FAIR_TOKEN_NOT_ENOUGH\020\232G\022%\n RET_F" +
-      "LEUR_FAIR_MINIGAME_NOT_OPEN\020\233G\0224\n/RET_FL" +
-      "EUR_FAIR_MUSIC_GAME_DIFFICULTY_NOT_UNLOC" +
-      "K\020\234G\022\"\n\035RET_FLEUR_FAIR_DUNGEON_LOCKED\020\235G" +
-      "\022\'\n\"RET_FLEUR_FAIR_DUNGEON_PUNISH_TIME\020\236" +
-      "G\0222\n-RET_FLEUR_FAIR_ONLY_OWNER_CAN_RESTA" +
-      "RT_MINIGAM\020\237G\022\'\n\"RET_WATER_SPIRIT_COIN_E" +
-      "XCEED_LIMIT\020\240G\022%\n RET_WATER_SPIRIT_COIN_" +
-      "NOT_ENOUGH\020\241G\022 \n\033RET_REGION_SEARCH_NO_SE" +
-      "ARCH\020\242G\022\"\n\035RET_REGION_SEARCH_STATE_ERROR" +
-      "\020\243G\0224\n/RET_CHANNELLER_SLAB_LOOP_DUNGEON_" +
-      "STAGE_NOT_OPEN\020\252G\022.\n)RET_CHANNELLER_SLAB" +
-      "_LOOP_DUNGEON_NOT_OPEN\020\253G\022A\n<RET_CHANNEL" +
-      "LER_SLAB_LOOP_DUNGEON_FIRST_PASS_REWARD_" +
-      "HAS_TAKEN\020\254G\022<\n7RET_CHANNELLER_SLAB_LOOP" +
-      "_DUNGEON_SCORE_REWARD_HAS_TAKEN\020\255G\0220\n+RE" +
-      "T_CHANNELLER_SLAB_INVALID_ONE_OFF_DUNGEO" +
-      "N\020\256G\022-\n(RET_CHANNELLER_SLAB_ONE_OFF_DUNG" +
-      "EON_DONE\020\257G\0227\n2RET_CHANNELLER_SLAB_ONE_O" +
-      "FF_DUNGEON_STAGE_NOT_OPEN\020\260G\022+\n&RET_CHAN" +
-      "NELLER_SLAB_TOKEN_EXCEED_LIMIT\020\261G\022)\n$RET" +
-      "_CHANNELLER_SLAB_TOKEN_NOT_ENOUGH\020\262G\0226\n1" +
-      "RET_CHANNELLER_SLAB_PLAYER_NOT_IN_ONE_OF" +
-      "F_DUNGEON\020\263G\0223\n.RET_MIST_TRIAL_SELECT_CH" +
-      "ARACTER_NUM_NOT_ENOUGH\020\276G\022.\n)RET_MIST_TR" +
-      "IAL_ALREADY_USING_TRIAL_AVATAR\020\277G\022$\n\037RET" +
-      "_HIDE_AND_SEEK_PLAY_NOT_OPEN\020\310G\022(\n#RET_H" +
-      "IDE_AND_SEEK_PLAY_MAP_NOT_OPEN\020\311G\022*\n%RET" +
-      "_HIDE_AND_SEEK_PLAY_MAP_NOT_CHOSEN\020\312G\022-\n" +
-      "(RET_SUMMER_TIME_DRAFT_WOORD_EXCEED_LIMI" +
-      "T\020\322G\022+\n&RET_SUMMER_TIME_DRAFT_WOORD_NOT_" +
-      "ENOUGH\020\323G\0220\n+RET_SUMMER_TIME_MINI_HARPAS" +
-      "TUM_EXCEED_LIMIT\020\324G\022-\n(RET_SUMMER_TIME_M" +
-      "INI_HARPASTUMNOT_ENOUGH\020\325G\022+\n&RET_BOUNCE" +
-      "_CONJURING_COIN_EXCEED_LIMIT\020\334G\022)\n$RET_B" +
-      "OUNCE_CONJURING_COIN_NOT_ENOUGH\020\335G\022!\n\034RE" +
-      "T_CHESS_TEACH_MAP_FINISHED\020\337G\022#\n\036RET_CHE" +
-      "SS_TEACH_MAP_UNFINISHED\020\340G\022 \n\033RET_CHESS_" +
-      "COIN_EXCEED_LIMIT\020\341G\022\036\n\031RET_CHESS_COIN_N" +
-      "OT_ENOUGH\020\342G\022\035\n\030RET_CHESS_IN_PUNISH_TIME" +
-      "\020\343G\022\"\n\035RET_CHESS_PREV_MAP_UNFINISHED\020\344G\022" +
-      "\031\n\024RET_CHESS_MAP_LOCKED\020\345G\022\034\n\027RET_BLITZ_" +
-      "RUSH_NOT_OPEN\020\350G\022$\n\037RET_BLITZ_RUSH_DUNGE" +
-      "ON_NOT_OPEN\020\351G\022\'\n\"RET_BLITZ_RUSH_COIN_A_" +
-      "EXCEED_LIMIT\020\352G\022\'\n\"RET_BLITZ_RUSH_COIN_B" +
-      "_EXCEED_LIMIT\020\353G\022%\n RET_BLITZ_RUSH_COIN_" +
-      "A_NOT_ENOUGH\020\354G\022%\n RET_BLITZ_RUSH_COIN_B" +
-      "_NOT_ENOUGH\020\355G\022&\n!RET_MIRACLE_RING_VALUE" +
-      "_NOT_ENOUGH\020\361G\022\030\n\023RET_MIRACLE_RING_CD\020\362G" +
-      "\022&\n!RET_MIRACLE_RING_REWARD_NOT_TAKEN\020\363G" +
-      "\022!\n\034RET_MIRACLE_RING_NOT_DELIVER\020\364G\022$\n\037R" +
-      "ET_MIRACLE_RING_DELIVER_EXCEED\020\365G\022!\n\034RET" +
-      "_MIRACLE_RING_HAS_CREATED\020\366G\022%\n RET_MIRA" +
-      "CLE_RING_HAS_NOT_CREATED\020\367G\022\037\n\032RET_MIRAC" +
-      "LE_RING_NOT_YOURS\020\370G\022\'\n\"RET_GADGET_FOUND" +
-      "ATION_UNAUTHORIZED\020\243H\022*\n%RET_GADGET_FOUN" +
-      "DATION_SCENE_NOT_FOUND\020\244H\022,\n\'RET_GADGET_" +
-      "FOUNDATION_NOT_IN_INIT_STATE\020\245H\0224\n/RET_G" +
-      "ADGET_FOUNDATION_BILDING_POINT_NOT_ENOUG" +
-      "HT\020\246H\022-\n(RET_GADGET_FOUNDATION_NOT_IN_BU" +
-      "ILT_STATE\020\247H\022+\n&RET_GADGET_FOUNDATION_OP" +
-      "_NOT_SUPPORTED\020\250H\0222\n-RET_GADGET_FOUNDATI" +
-      "ON_REQ_PLAYER_NOT_IN_SCENE\020\251H\0223\n.RET_GAD" +
-      "GET_FOUNDATION_LOCKED_BY_ANOTHER_PLAYER\020" +
-      "\252H\022%\n RET_GADGET_FOUNDATION_NOT_LOCKED\020\253" +
-      "H\022)\n$RET_GADGET_FOUNDATION_DUPLICATE_LOC" +
-      "K\020\254H\022+\n&RET_GADGET_FOUNDATION_PLAYER_NOT" +
-      "_FOUND\020\255H\0220\n+RET_GADGET_FOUNDATION_PLAYE" +
-      "R_GEAR_NOT_FOUND\020\256H\022+\n&RET_GADGET_FOUNDA" +
-      "TION_ROTAION_DISABLED\020\257H\0223\n.RET_GADGET_F" +
-      "OUNDATION_REACH_DUNGEON_GEAR_LIMIT\020\260H\0222\n" +
-      "-RET_GADGET_FOUNDATION_REACH_SINGLE_GEAR" +
-      "_LIMIT\020\261H\022,\n\'RET_GADGET_FOUNDATION_ROTAT" +
-      "ION_ON_GOING\020\262H\022$\n\037RET_OP_ACTIVITY_BONUS" +
-      "_NOT_FOUND\020\325H\022\035\n\030RET_OP_ACTIVITY_NOT_OPE" +
-      "N\020\326H\022,\n\'RET_MULTISTAGE_PLAY_PLAYER_NOT_I" +
-      "N_SCENE\020\235J\022\"\n\035RET_MULTISTAGE_PLAY_NOT_FO" +
-      "UND\020\236J\022\'\n\"RET_MULTISTAGE_PLAY_IN_OTHER_S" +
-      "TAGE\020\237J\022\036\n\031RET_COOP_CHAPTER_NOT_OPEN\020\201K\022" +
-      "\033\n\026RET_COOP_COND_NOT_MEET\020\202K\022\032\n\025RET_COOP" +
-      "_POINT_LOCKED\020\203K\022\037\n\032RET_COOP_NOT_HAVE_PR" +
-      "OGRESS\020\204K\022\036\n\031RET_COOP_REWARD_HAS_TAKEN\020\205" +
-      "K\022\037\n\032RET_DRAFT_HAS_ACTIVE_DRAFT\020\263K\022\036\n\031RE" +
-      "T_DRAFT_NOT_IN_MY_WORLD\020\264K\022\035\n\030RET_DRAFT_" +
-      "NOT_SUPPORT_MP\020\265K\022 \n\033RET_DRAFT_PLAYER_NO" +
-      "T_ENOUGH\020\266K\022\036\n\031RET_DRAFT_INCORRECT_SCENE" +
-      "\020\267K\022$\n\037RET_DRAFT_OTHER_PLAYER_ENTERING\020\270" +
-      "K\022$\n\037RET_DRAFT_GUEST_IS_TRANSFERRING\020\271K\022" +
-      "\'\n\"RET_DRAFT_GUEST_NOT_IN_DRAFT_SCENE\020\272K" +
-      "\022\037\n\032RET_DRAFT_INVITE_OVER_TIME\020\273K\022\'\n\"RET" +
-      "_DRAFT_TWICE_CONFIRM_OVER_TIMER\020\274K\022\'\n\"RE" +
-      "T_DRAFT_GUEST_NOT_IN_WORLD_SCENE\020\275K\022\024\n\017R" +
-      "ET_HOME_UNKOWN\020\345K\022\"\n\035RET_HOME_INVALID_CL" +
-      "IENT_PARAM\020\346K\022&\n!RET_HOME_TARGE_PLAYER_H" +
-      "AS_NO_HOME\020\347K\022\030\n\023RET_HOME_NOT_ONLINE\020\350K\022" +
-      "\031\n\024RET_HOME_PLAYER_FULL\020\351K\022\025\n\020RET_HOME_B" +
-      "LOCKED\020\352K\022*\n%RET_HOME_ALREADY_IN_TARGET_" +
-      "HOME_WORLD\020\353K\022\032\n\025RET_HOME_IN_EDIT_MODE\020\354" +
-      "K\022\036\n\031RET_HOME_NOT_IN_EDIT_MODE\020\355K\022\027\n\022RET" +
-      "_HOME_HAS_GUEST\020\356K\022(\n#RET_HOME_CANT_ENTE" +
-      "R_BY_IN_EDIT_MODE\020\357K\022\"\n\035RET_HOME_CLIENT_" +
-      "PARAM_INVALID\020\360K\022&\n!RET_HOME_PLAYER_NOT_" +
-      "IN_HOME_WORLD\020\361K\022+\n&RET_HOME_PLAYER_NOT_" +
-      "IN_SELF_HOME_WORLD\020\362K\022\036\n\031RET_HOME_NOT_FO" +
-      "UND_IN_MEM\020\363K\022\'\n\"RET_HOME_PLAYER_IN_HOME" +
-      "_ROOM_SCENE\020\364K\022%\n RET_HOME_HOME_REFUSE_G" +
-      "UEST_ENTER\020\365K\022(\n#RET_HOME_OWNER_REFUSE_T" +
-      "O_ENTER_HOME\020\366K\022\033\n\026RET_HOME_OWNER_OFFLIN" +
-      "E\020\367K\022$\n\037RET_HOME_FURNITURE_EXCEED_LIMIT\020" +
-      "\370K\022(\n#RET_HOME_FURNITURE_COUNT_NOT_ENOUG" +
-      "H\020\371K\022\"\n\035RET_HOME_IN_TRY_ENTER_PROCESS\020\372K" +
-      "\022%\n RET_HOME_ALREADY_IN_TARGET_SCENE\020\373K\022" +
-      "\037\n\032RET_HOME_COIN_EXCEED_LIMIT\020\374K\022\035\n\030RET_" +
-      "HOME_COIN_NOT_ENOUGH\020\375K\022!\n\034RET_HOME_MODU" +
-      "LE_NOT_UNLOCKED\020\376K\022\037\n\032RET_HOME_CUR_MODUL" +
-      "E_CLOSED\020\377K\022*\n%RET_HOME_FURNITURE_SUITE_" +
-      "NOT_UNLOCKED\020\200L\022\026\n\021RET_HOME_IN_MATCH\020\201L\022" +
-      "\027\n\022RET_HOME_IN_COMBAT\020\202L\022\032\n\025RET_HOME_EDI" +
-      "T_MODE_CD\020\203L\022!\n\034RET_HOME_UPDATE_FURNITUR" +
-      "E_CD\020\204L\022#\n\036RET_HOME_BLOCK_FURNITURE_LIMI" +
-      "T\020\205L\022\031\n\024RET_HOME_NOT_SUPPORT\020\206L\022\034\n\027RET_H" +
-      "OME_STATE_NOT_OPEN\020\207L\022#\n\036RET_HOME_TARGET" +
-      "_STATE_NOT_OPEN\020\210L\022)\n$RET_HOME_APPLY_ENT" +
-      "ER_OTHER_HOME_FAIL\020\211L\022 \n\033RET_HOME_SAVE_N" +
-      "O_MAIN_HOUSE\020\212L\022\030\n\023RET_HOME_IN_DUNGEON\020\213" +
-      "L\022!\n\034RET_HOME_ANY_GALLERY_STARTED\020\214L\022\036\n\031" +
-      "RET_HOME_QUEST_BLOCK_HOME\020\215L\022!\n\034RET_HOME" +
-      "_WAITING_PRIOR_CHECK\020\216L\022#\n\036RET_HOME_PERS" +
-      "ISTENT_CHECK_FAIL\020\217L\022#\n\036RET_HOME_FIND_ON" +
-      "LINE_HOME_FAIL\020\220L\022\035\n\030RET_HOME_JOIN_SCENE" +
-      "_FAIL\020\221L\022\030\n\023RET_HOME_MAX_PLAYER\020\222L\022\031\n\024RE" +
-      "T_HOME_IN_TRANSFER\020\223L\022&\n!RET_HOME_ANY_HO" +
-      "ME_GALLERY_STARTED\020\224L\022$\n\037RET_HOME_CAN_NO" +
-      "T_ENTER_IN_AUDIT\020\225L\022#\n\036RET_FURNITURE_MAK" +
-      "E_INDEX_ERROR\020\226L\022\036\n\031RET_FURNITURE_MAKE_L" +
-      "OCKED\020\227L\022$\n\037RET_FURNITURE_MAKE_CONFIG_ER" +
-      "ROR\020\230L\022!\n\034RET_FURNITURE_MAKE_SLOT_FULL\020\231" +
-      "L\022*\n%RET_FURNITURE_MAKE_ADD_FURNITURE_FA" +
-      "IL\020\232L\022 \n\033RET_FURNITURE_MAKE_UNFINISH\020\233L\022" +
-      "!\n\034RET_FURNITURE_MAKE_IS_FINISH\020\234L\022+\n&RE" +
-      "T_FURNITURE_MAKE_NOT_IN_CORRECT_HOME\020\235L\022" +
-      " \n\033RET_FURNITURE_MAKE_NO_COUNT\020\236L\022(\n#RET" +
-      "_FURNITURE_MAKE_ACCELERATE_LIMIT\020\237L\022$\n\037R" +
-      "ET_FURNITURE_MAKE_NO_MAKE_DATA\020\240L\022 \n\033RET" +
-      "_HOME_LIMITED_SHOP_CLOSE\020\241L\022\035\n\030RET_HOME_" +
-      "AVATAR_NOT_SHOW\020\242L\022&\n!RET_HOME_EVENT_CON" +
-      "D_NOT_SATISFIED\020\243L\022*\n%RET_HOME_INVALID_A" +
-      "RRANGE_ANIMAL_PARAM\020\244L\022\'\n\"RET_HOME_INVAL" +
-      "ID_ARRANGE_NPC_PARAM\020\245L\022)\n$RET_HOME_INVA" +
-      "LID_ARRANGE_SUITE_PARAM\020\246L\022.\n)RET_HOME_I" +
-      "NVALID_ARRANGE_MAIN_HOUSE_PARAM\020\247L\022#\n\036RE" +
-      "T_HOME_AVATAR_STATE_NOT_OPEN\020\250L\022#\n\036RET_H" +
-      "OME_PLANT_FIELD_NOT_EMPTY\020\251L\022\037\n\032RET_HOME" +
-      "_PLANT_FIELD_EMPTY\020\252L\022$\n\037RET_HOME_PLANT_" +
-      "FIELD_TYPE_ERROR\020\253L\022#\n\036RET_HOME_PLANT_TI" +
-      "ME_NOT_ENOUGH\020\254L\022,\n\'RET_HOME_PLANT_SUB_F" +
-      "IELD_NUM_NOT_ENOUGH\020\255L\022%\n RET_HOME_PLANT" +
-      "_FIELD_PARAM_ERROR\020\256L\022\"\n\035RET_HOME_FURNIT" +
-      "URE_GUID_ERROR\020\257L\022%\n RET_HOME_FURNITURE_" +
-      "ARRANGE_LIMIT\020\260L\022 \n\033RET_HOME_FISH_FARMIN" +
-      "G_LIMIT\020\261L\022#\n\036RET_HOME_FISH_COUNT_NOT_EN" +
-      "OUGH\020\262L\022\"\n\035RET_HOME_FURNITURE_COST_LIMIT" +
-      "\020\263L\022&\n!RET_HOME_CUSTOM_FURNITURE_INVALID" +
-      "\020\264L\022)\n$RET_HOME_INVALID_ARRANGE_GROUP_PA" +
-      "RAM\020\265L\022+\n&RET_HOME_FURNITURE_ARRANGE_GRO" +
-      "UP_LIMIT\020\266L\0220\n+RET_HOME_PICTURE_FRAME_CO" +
-      "OP_CG_GENDER_ERROR\020\267L\022.\n)RET_HOME_PICTUR" +
-      "E_FRAME_COOP_CG_NOT_UNLOCK\020\270L\022&\n!RET_HOM" +
-      "E_FURNITURE_CANNOT_ARRANGE\020\271L\022*\n%RET_HOM" +
-      "E_FURNITURE_IN_DUPLICATE_SUITE\020\272L\022.\n)RET" +
-      "_HOME_FURNITURE_CUSTOM_SUITE_TOO_SMALL\020\273" +
-      "L\022,\n\'RET_HOME_FURNITURE_CUSTOM_SUITE_TOO" +
-      "_BIG\020\274L\022*\n%RET_HOME_FURNITURE_SUITE_EXCE" +
-      "ED_LIMIT\020\275L\0221\n,RET_HOME_FURNITURE_CUSTOM" +
-      "_SUITE_EXCEED_LIMIT\020\276L\0229\n4RET_HOME_FURNI" +
-      "TURE_CUSTOM_SUITE_INVALID_SURFACE_TYPE\020\277" +
-      "L\022\036\n\031RET_HOME_BGM_ID_NOT_FOUND\020\300L\022\036\n\031RET" +
-      "_HOME_BGM_NOT_UNLOCKED\020\301L\022%\n RET_HOME_BG" +
-      "M_FURNITURE_NOT_FOUND\020\302L\022*\n%RET_HOME_BGM" +
-      "_NOT_SUPPORT_BY_CUR_SCENE\020\303L\022(\n#RET_HOME" +
-      "_LIMITED_SHOP_GOODS_DISABLE\020\304L\022\'\n\"RET_HO" +
-      "ME_WORLD_WOOD_MATERIAL_EMPTY\020\305L\022+\n&RET_H" +
-      "OME_WORLD_WOOD_MATERIAL_NOT_FOUND\020\306L\022/\n*" +
-      "RET_HOME_WORLD_WOOD_MATERIAL_COUNT_INVAL" +
-      "ID\020\307L\022.\n)RET_HOME_WORLD_WOOD_EXCHANGE_EX" +
-      "CEED_LIMIT\020\310L\022#\n\036RET_HOME_BLUEPRINT_SEAR" +
-      "CH_SELF\020\311L\022*\n%RET_HOME_BLUEPRINT_SHARE_C" +
-      "ODE_INVALID\020\312L\022!\n\034RET_HOME_BLUEPRINT_NOT" +
-      "_EXIST\020\313L\0221\n,RET_HOME_BLUEPRINT_SLOT_HAS" +
-      "_EXIST_SHARE_CODE\020\314L\0221\n,RET_HOME_BLUEPRI" +
-      "NT_SLOT_NOT_EXIST_SHARE_CODE\020\315L\022/\n*RET_H" +
-      "OME_BLUEPRINT_CAN_NOT_CREATE_IN_AUDIT\020\316L" +
-      "\022 \n\033RET_HOME_BLOCK_NOT_UNLOCKED\020\317L\022!\n\034RE" +
-      "T_HOME_BLUEPRINT_CREATE_CD\020\320L\022%\n RET_HOM" +
-      "E_BLUEPRINT_SET_OPTION_CD\020\321L\022-\n(RET_HOME" +
-      "_BLUEPRINT_NOT_ALLOW_FRIEND_COPY\020\322L\022\'\n\"R" +
-      "ET_HOME_FURNITURE_POS_UNDER_DIE_Y\020\323L\022+\n&" +
-      "RET_HOME_BLUEPRINT_GEN_SHARE_CODE_FAIL\020\324" +
-      "L\022!\n\034RET_HOME_BLUEPRINT_SEARCH_CD\020\325L\022\"\n\035" +
-      "RET_HOME_BLUEPRINT_PREVIEW_CD\020\326L\022/\n*RET_" +
-      "HOME_BLUEPRINT_PREVIEW_SCENE_NOT_MATCH\020\327" +
-      "L\022!\n\034RET_HOME_BLUEPRINT_SLOT_FULL\020\330L\022)\n$" +
-      "RET_HOME_BLUEPRINT_OWNER_REJECT_COPY\020\331L\022" +
-      "\'\n\"RET_HOME_BLUEPRINT_SAVE_TO_SLOT_CD\020\332L" +
-      "\022%\n RET_HOME_BLUEPRINT_REPLY_TIMEOUT\020\333L\022",
-      "%\n RET_SUMO_ACTIVITY_STAGE_NOT_OPEN\020\220N\022(" +
-      "\n#RET_SUMO_ACTIVITY_SWITCH_TEAM_IN_CD\020\221N" +
-      "\022)\n$RET_SUMO_ACTIVITY_TEAM_NUM_INCORRECT" +
-      "\020\222N\022)\n$RET_LUNA_RITE_ACTIVITY_AREA_ID_ER" +
-      "ROR\020\224N\022-\n(RET_LUNA_RITE_ACTIVITY_BATTLE_" +
-      "NOT_FINISH\020\225N\022-\n(RET_LUNA_RITE_ACTIVITY_" +
-      "ALREADY_SACRIFICE\020\226N\022/\n*RET_LUNA_RITE_AC" +
-      "TIVITY_ALREADY_TAKE_REWARD\020\227N\0220\n+RET_LUN" +
-      "A_RITE_ACTIVITY_SACRIFICE_NOT_ENOUGH\020\230N\022" +
-      "3\n.RET_LUNA_RITE_ACTIVITY_SEARCHING_COND" +
-      "_NOT_MEET\020\231N\022\'\n\"RET_DIG_GADGET_CONFIG_ID" +
-      "_NOT_MATCH\020\237N\022\"\n\035RET_DIG_FIND_NEAREST_PO" +
-      "S_FAIL\020\240N\022\"\n\035RET_MUSIC_GAME_LEVEL_NOT_OP" +
-      "EN\020\245N\022$\n\037RET_MUSIC_GAME_LEVEL_NOT_UNLOCK" +
-      "\020\246N\022%\n RET_MUSIC_GAME_LEVEL_NOT_STARTED\020" +
-      "\247N\022*\n%RET_MUSIC_GAME_LEVEL_CONFIG_NOT_FO" +
-      "UND\020\250N\022&\n!RET_MUSIC_GAME_LEVEL_ID_NOT_MA" +
-      "TCH\020\251N\022$\n\037RET_ROGUELIKE_COIN_A_NOT_ENOUG" +
-      "H\020\257N\022$\n\037RET_ROGUELIKE_COIN_B_NOT_ENOUGH\020" +
-      "\260N\022$\n\037RET_ROGUELIKE_COIN_C_NOT_ENOUGH\020\261N" +
-      "\022&\n!RET_ROGUELIKE_COIN_A_EXCEED_LIMIT\020\262N" +
-      "\022&\n!RET_ROGUELIKE_COIN_B_EXCEED_LIMIT\020\263N" +
-      "\022&\n!RET_ROGUELIKE_COIN_C_EXCEED_LIMIT\020\264N" +
-      "\022(\n#RET_ROGUELIKE_RUNE_COUNT_NOT_ENOUGH\020" +
-      "\265N\022\'\n\"RET_ROGUELIKE_NOT_IN_ROGUE_DUNGEON" +
-      "\020\266N\022!\n\034RET_ROGUELIKE_CELL_NOT_FOUND\020\267N\022&" +
-      "\n!RET_ROGUELIKE_CELL_TYPE_INCORRECT\020\270N\022(" +
-      "\n#RET_ROGUELIKE_CELL_ALREADY_FINISHED\020\271N" +
-      "\0223\n.RET_ROGUELIKE_DUNGEON_HAVE_UNFINISHE" +
-      "D_PROGRESS\020\272N\022%\n RET_ROGUELIKE_STAGE_NOT" +
-      "_FINISHED\020\273N\0224\n/RET_ROGUELIKE_STAGE_FIRS" +
-      "T_PASS_REWARD_HAS_TAKEN\020\275N\022*\n%RET_ROGUEL" +
-      "IKE_ACTIVITY_CONTENT_CLOSED\020\276N\0221\n,RET_RO" +
-      "GUELIKE_DUNGEON_PRE_QUEST_NOT_FINISHED\020\277" +
-      "N\022#\n\036RET_ROGUELIKE_DUNGEON_NOT_OPEN\020\300N\022#" +
-      "\n\036RET_ROGUELIKE_SPRINT_IS_BANNED\020\301N\0221\n,R" +
-      "ET_ROGUELIKE_DUNGEON_PRE_STAGE_NOT_FINIS" +
-      "HED\020\302N\022/\n*RET_ROGUELIKE_ALL_AVATAR_DIE_C" +
-      "ANNOT_RESUME\020\303N\022\'\n\"RET_PLANT_FLOWER_ALRE" +
-      "ADY_TAKE_SEED\020\310N\022.\n)RET_PLANT_FLOWER_FRI" +
-      "END_HAVE_FLOWER_LIMIT\020\311N\0220\n+RET_PLANT_FL" +
-      "OWER_CAN_GIVE_FLOWER_NOT_ENOUGH\020\312N\022-\n(RE" +
-      "T_PLANT_FLOWER_WISH_FLOWER_KINDS_LIMIT\020\313" +
-      "N\022,\n\'RET_PLANT_FLOWER_HAVE_FLOWER_NOT_EN" +
-      "OUGH\020\314N\0220\n+RET_PLANT_FLOWER_FLOWER_COMBI" +
-      "NATION_INVALID\020\315N\022 \n\033RET_HACHI_DUNGEON_N" +
-      "OT_VALID\020\304N\022%\n RET_HACHI_DUNGEON_STAGE_N" +
-      "OT_OPEN\020\305N\022(\n#RET_HACHI_DUNGEON_TEAMMATE" +
-      "_NOT_PASS\020\306N\022&\n!RET_WINTER_CAMP_COIN_A_N" +
-      "OT_ENOUGH\020\327N\022&\n!RET_WINTER_CAMP_COIN_B_N" +
-      "OT_ENOUGH\020\330N\022(\n#RET_WINTER_CAMP_COIN_A_E" +
-      "XCEED_LIMIT\020\331N\022(\n#RET_WINTER_CAMP_COIN_B" +
-      "_EXCEED_LIMIT\020\332N\022$\n\037RET_WINTER_CAMP_WISH" +
-      "_ID_INVALID\020\333N\022-\n(RET_WINTER_CAMP_NOT_FO" +
-      "UND_RECV_ITEM_DATA\020\334N\022/\n*RET_WINTER_CAMP" +
-      "_FRIEND_ITEM_COUNT_OVERFLOW\020\335N\022-\n(RET_WI" +
-      "NTER_CAMP_SELECT_ITEM_DATA_INVALID\020\336N\022$\n" +
-      "\037RET_WINTER_CAMP_ITEM_LIST_EMPTY\020\337N\022)\n$R" +
-      "ET_WINTER_CAMP_REWARD_ALREADY_TAKEN\020\340N\022%" +
-      "\n RET_WINTER_CAMP_STAGE_NOT_FINISH\020\341N\022#\n" +
-      "\036RET_WINTER_CAMP_GADGET_INVALID\020\342N\022\'\n\"RE" +
-      "T_LANTERN_RITE_COIN_A_NOT_ENOUGH\020\352N\022\'\n\"R" +
-      "ET_LANTERN_RITE_COIN_B_NOT_ENOUGH\020\353N\022\'\n\"" +
-      "RET_LANTERN_RITE_COIN_C_NOT_ENOUGH\020\354N\022)\n" +
-      "$RET_LANTERN_RITE_COIN_A_EXCEED_LIMIT\020\355N" +
-      "\022)\n$RET_LANTERN_RITE_COIN_B_EXCEED_LIMIT" +
-      "\020\356N\022)\n$RET_LANTERN_RITE_COIN_C_EXCEED_LI" +
-      "MIT\020\357N\022/\n*RET_LANTERN_RITE_PROJECTION_CO" +
-      "NTENT_CLOSED\020\360N\022.\n)RET_LANTERN_RITE_PROJ" +
-      "ECTION_CAN_NOT_START\020\361N\022&\n!RET_LANTERN_R" +
-      "ITE_DUNGEON_NOT_OPEN\020\362N\022+\n&RET_LANTERN_R" +
-      "ITE_HAS_TAKEN_SKIN_REWARD\020\363N\0220\n+RET_LANT" +
-      "ERN_RITE_NOT_FINISHED_SKIN_WATCHERS\020\364N\022." +
-      "\n)RET_LANTERN_RITE_FIREWORKS_CONTENT_CLO" +
-      "SED\020\365N\0223\n.RET_LANTERN_RITE_FIREWORKS_CHA" +
-      "LLENGE_NOT_START\020\366N\0222\n-RET_LANTERN_RITE_" +
-      "FIREWORKS_REFORM_PARAM_ERROR\020\367N\0221\n,RET_L" +
-      "ANTERN_RITE_FIREWORKS_REFORM_SKILL_LOCK\020" +
-      "\370N\0229\n4RET_LANTERN_RITE_FIREWORKS_REFORM_" +
-      "STAMINA_NOT_ENOUGH\020\371N\022\'\n\"RET_POTION_ACTI" +
-      "VITY_STAGE_NOT_OPEN\020\376N\022(\n#RET_POTION_ACT" +
-      "IVITY_LEVEL_HAVE_PASS\020\377N\022+\n&RET_POTION_A" +
-      "CTIVITY_TEAM_NUM_INCORRECT\020\200O\022%\n RET_POT" +
-      "ION_ACTIVITY_AVATAR_IN_CD\020\201O\022#\n\036RET_POTI" +
-      "ON_ACTIVITY_BUFF_IN_CD\020\202O\022\'\n\"RET_IRODORI" +
-      "_POETRY_INVALID_LINE_ID\020\210O\022(\n#RET_IRODOR" +
-      "I_POETRY_INVALID_THEME_ID\020\211O\022/\n*RET_IROD" +
-      "ORI_POETRY_NOT_GET_ALL_INSPIRATION\020\212O\022/\n" +
-      "*RET_IRODORI_POETRY_INSPIRATION_REACH_LI" +
-      "MIE\020\213O\022.\n)RET_IRODORI_POETRY_ENTITY_ALRE" +
-      "ADY_SCANNED\020\214O\022(\n#RET_ACTIVITY_BANNER_AL" +
-      "READY_CLEARED\020\274P\022\037\n\032RET_IRODORI_CHESS_NO" +
-      "T_OPEN\020\275P\022%\n RET_IRODORI_CHESS_LEVEL_NOT" +
-      "_OPEN\020\276P\022#\n\036RET_IRODORI_CHESS_MAP_NOT_OP" +
-      "EN\020\277P\022/\n*RET_IRODORI_CHESS_MAP_CARD_ALRE" +
-      "ADY_EQUIPED\020\300P\022.\n)RET_IRODORI_CHESS_EQUI" +
-      "P_CARD_EXCEED_LIMIT\020\301P\022+\n&RET_IRODORI_CH" +
-      "ESS_MAP_CARD_NOT_EQUIPED\020\302P\0223\n.RET_IRODO" +
-      "RI_CHESS_ENTER_FAIL_CARD_EXCEED_LIMIT\020\303P" +
-      "\022(\n#RET_ACTIVITY_FRIEND_HAVE_GIFT_LIMIT\020" +
-      "\306P\022)\n$RET_GACHA_ACTIVITY_HAVE_REWARD_LIM" +
-      "IT\020\313P\022(\n#RET_GACHA_ACTIVITY_HAVE_ROBOT_L" +
-      "IMIT\020\314P\022)\n$RET_SUMMER_TIME_V2_COIN_EXCEE" +
-      "D_LIMIT\020\315P\022\'\n\"RET_SUMMER_TIME_V2_COIN_NO" +
-      "T_ENOUGH\020\316P\022.\n)RET_SUMMER_TIME_V2_DUNGEO" +
-      "N_STAGE_NOT_OPEN\020\317P\0221\n,RET_SUMMER_TIME_V" +
-      "2_PREV_DUNGEON_NOT_COMPLETE\020\320P\022!\n\034RET_RO" +
-      "GUE_DIARY_AVATAR_DEATH\020\356P\022!\n\034RET_ROGUE_D" +
-      "IARY_AVATAR_TIRED\020\357P\022&\n!RET_ROGUE_DIARY_" +
-      "AVATAR_DUPLICATED\020\360P\022$\n\037RET_ROGUE_DIARY_" +
-      "COIN_NOT_ENOUGH\020\361P\022.\n)RET_ROGUE_DIARY_VI" +
-      "RTUAL_COIN_EXCEED_LIMIT\020\362P\022,\n\'RET_ROGUE_" +
-      "DIARY_VIRTUAL_COIN_NOT_ENOUGH\020\363P\022#\n\036RET_" +
-      "ROGUE_DIARY_CONTENT_CLOSED\020\376P\022+\n&RET_GRA" +
-      "VEN_INNOCENCE_COIN_A_NOT_ENOUGH\020\214Q\022+\n&RE" +
-      "T_GRAVEN_INNOCENCE_COIN_B_NOT_ENOUGH\020\215Q\022" +
-      "-\n(RET_GRAVEN_INNOCENCE_COIN_A_EXCEED_LI" +
-      "MIT\020\216Q\022-\n(RET_GRAVEN_INNOCENCE_COIN_B_EX" +
-      "CEED_LIMIT\020\217Q\022$\n\037RET_ISLAND_PARTY_STAGE_" +
-      "NOT_OPEN\020\203Q\022\"\n\035RET_WIND_FIELD_STAGE_NOT_" +
-      "OPEN\020\226Q\022\037\n\032RET_VINTAGE_CONTENT_CLOSED\020\234Q" +
-      "\022\'\n\"RET_VINTAGE_STORE_CONTENT_FINISHED\020\235" +
-      "Q\022%\n RET_VINTAGE_STORE_ATTR_TOO_SMALL\020\236Q" +
-      "\022%\n RET_VINTAGE_STORE_ATTR_TOO_LARGE\020\237Q\022" +
-      "(\n#RET_VINTAGE_STORE_CONTENT_INTERRUPT\020\240" +
-      "Q\022(\n#RET_VINTAGE_VIRTUAL_COIN_NOT_ENOUGH" +
-      "\020\241Q\022*\n%RET_VINTAGE_STORE_ATTR_LESS_THAN_" +
-      "ZERO\020\242Q\022/\n*RET_FUNGUS_FIGHTER_CAPTURE_CO" +
-      "IN_NOT_ENOUGH\020\246Q\0220\n+RET_FUNGUS_FIGHTER_T" +
-      "RAINING_COIN_NOT_ENOUGH\020\247Q\0221\n,RET_FUNGUS" +
-      "_FIGHTER_CAPTURE_COIN_EXCEED_LIMIT\020\250Q\0222\n" +
-      "-RET_FUNGUS_FIGHTER_TRAINING_COIN_EXCEED" +
-      "_LIMIT\020\251Q\022&\n!RET_FUNGUS_FIGHTER_CONTENT_" +
-      "CLOSED\020\252Q\022+\n&RET_FUNGUS_FIGHTER_PLOT_STA" +
-      "GE_NOT_OPEN\020\253Q\0222\n-RET_FUNGUS_FIGHTER_FUN" +
-      "GUS_ID_CONFIG_NOT_VALID\020\254Q\022-\n(RET_FUNGUS" +
-      "_FIGHTER_FUNGUS_NOT_CULTIVATED\020\255Q\0221\n,RET" +
-      "_FUNGUS_FIGHTER_TRAINING_DUNGEON_NOT_OPE" +
-      "N\020\256Q\022,\n\'RET_EFFIGY_CHALLENGE_V2_COIN_NOT" +
-      "_ENOUGH\020\273Q\022.\n)RET_EFFIGY_CHALLENGE_V2_CO" +
-      "IN_EXCEED_LIMIT\020\274Q\022&\n!RET_CHAR_AMUSEMENT" +
-      "_STAGE_NOT_OPEN\020\304Q\022$\n\037RET_COIN_COLLECT_L" +
-      "EVEL_NOT_OPEN\020\316Q\022&\n!RET_COIN_COLLECT_NOT" +
-      "_EQUIP_WIDGET\020\317Q\022%\n RET_COIN_COLLECT_SCE" +
-      "NE_NOT_MATCH\020\320Q\022(\n#RET_COIN_COLLECT_CANT" +
-      "_ENTER_MP_MODE\020\321Q\022%\n RET_COIN_COLLECT_PL" +
-      "AYER_NUM_FAIL\020\322Q\022&\n!RET_BRICK_BREAKER_PL" +
-      "AYER_NUM_FAIL\020\330Q\022\'\n\"RET_BRICK_BREAKER_ST" +
-      "AGE_NOT_UNLOCK\020\331Q\022.\n)RET_BRICK_BREAKER_N" +
-      "ORMAL_LEVEL_NOT_FINISH\020\332Q\022+\n&RET_BRICK_B" +
-      "REAKER_PRE_LEVEL_NOT_FINISH\020\333Q\022+\n&RET_BR" +
-      "ICK_BREAKER_PRE_STAGE_NOT_FINISH\020\334Q\022-\n(R" +
-      "ET_BRICK_BREAKER_WORLD_LEVEL_NOT_UNLOCK\020" +
-      "\335Q\022/\n*RET_BRICK_BREAKER_DUNGEON_LEVEL_NO" +
-      "T_UNLOCK\020\336Q\022&\n!RET_BRICK_BREAKER_COIN_NO" +
-      "T_ENOUGH\020\337Q\022(\n#RET_BRICK_BREAKER_COIN_EX" +
-      "CEED_LIMIT\020\340Q\022#\n\036RET_TEAMCHAIN_WORLD_IN_" +
-      "MP_MODE\020\342Q\022)\n$RET_LAN_V3_BOAT_PLAYER_NUM" +
-      "_NOT_VALID\020\361Q\022\"\n\035RET_LAN_V3_BOAT_PLAY_NO" +
-      "T_OPEN\020\362Q\022\'\n\"RET_LAN_V3_BOAT_NOT_IN_WORL" +
-      "D_SCENE\020\363Q\022+\n&RET_FLEUR_FAIR_V2_PACMAN_P" +
-      "LAY_NOT_OPEN\020\204R\0222\n-RET_FLEUR_FAIR_V2_PAC" +
-      "MAN_PLAYER_NUM_INCORRECT\020\205R\022&\n!RET_FLEUR" +
-      "_FAIR_V2_COIN_NOT_ENOUGH\020\206R\022(\n#RET_FLEUR" +
-      "_FAIR_V2_COIN_EXCEED_LIMIT\020\207R\022&\n!RET_AKA" +
-      "_FES_RHYTHM_LEVEL_NOT_OPEN\020\231R\022)\n$RET_AKA" +
-      "_FES_RHYTHM_GALLERY_INIT_FAIL\020\232R\022/\n*RET_" +
-      "AKA_FES_RHYTHM_NOT_IN_EXPECTED_DUNGEON\020\245" +
-      "R\022)\n$RET_AKA_FES_REASONING_LEVEL_NOT_OPE" +
-      "N\020\243R\022)\n$RET_AKA_FES_ASTROLABE_LEVEL_NOT_" +
-      "OPEN\020\255R\022/\n*RET_AKA_FES_ASTROLABE_PRE_LEV" +
-      "EL_NOT_FINISH\020\256R\022+\n&RET_EFFIGY_CHALLENGE" +
-      "_V4_LEVEL_NOT_OPEN\020\267R\022,\n\'RET_EFFIGY_CHAL" +
-      "LENGE_V4_GUEST_NOT_READY\020\270R\022-\n(RET_EFFIG" +
-      "Y_CHALLENGE_V4_DUPLICATE_AVATAR\020\271R\022*\n%RE" +
-      "T_JOURNEY_ACTIVITY_PICK_PARAM_ERROR\020\301R\022," +
-      "\n\'RET_JOURNEY_ACTIVITY_PICK_COND_NOT_MEE" +
-      "T\020\302R\022)\n$RET_JOURNEY_ACTIVITY_COIN_NOT_EN" +
-      "OUGH\020\303R\022+\n&RET_JOURNEY_ACTIVITY_COIN_EXC" +
-      "EED_LIMIT\020\304R\022 \n\033RET_ACTIVITY_CONTENT_CLO" +
-      "SED\020\225U\022\027\n\022RET_NOT_IN_FISHING\020\371U\022\031\n\024RET_F" +
-      "ISH_STATE_ERROR\020\372U\022\030\n\023RET_FISH_BAIT_LIMI" +
-      "T\020\373U\022\035\n\030RET_FISHING_MAX_DISTANCE\020\374U\022\032\n\025R" +
-      "ET_FISHING_IN_COMBAT\020\375U\022!\n\034RET_FISHING_B" +
-      "ATTLE_TOO_SHORT\020\376U\022\027\n\022RET_FISH_GONE_AWAY" +
-      "\020\377U\022#\n\036RET_CAN_NOT_EDIT_OTHER_DUNGEON\020\253V" +
-      "\022 \n\033RET_CUSTOM_DUNGEON_DISMATCH\020\254V\022\037\n\032RE" +
-      "T_NO_CUSTOM_DUNGEON_DATA\020\255V\022\"\n\035RET_BUILD" +
-      "_CUSTOM_DUNGEON_FAIL\020\256V\022\'\n\"RET_CUSTOM_DU" +
-      "NGEON_ROOM_CHECK_FAIL\020\257V\022%\n RET_CUSTOM_D" +
-      "UNGEON_SAVE_MAY_FAIL\020\260V\022\036\n\031RET_NOT_IN_CU" +
-      "STOM_DUNGEON\020\261V\022%\n RET_CUSTOM_DUNGEON_IN" +
-      "TERNAL_FAIL\020\262V\022#\n\036RET_CUSTOM_DUNGEON_CAN" +
-      "_NOT_TRY\020\263V\022%\n RET_CUSTOM_DUNGEON_NO_STA" +
-      "RT_ROOM\020\264V\022$\n\037RET_CUSTOM_DUNGEON_NO_ROOM" +
-      "_DATA\020\265V\022)\n$RET_CUSTOM_DUNGEON_SAVE_TOO_" +
-      "FREQUENT\020\266V\022%\n RET_CUSTOM_DUNGEON_NOT_SE" +
-      "LF_PASS\020\267V\022!\n\034RET_CUSTOM_DUNGEON_LACK_CO" +
-      "IN\020\270V\022\'\n\"RET_CUSTOM_DUNGEON_NO_FINISH_BR" +
-      "ICK\020\271V\022$\n\037RET_CUSTOM_DUNGEON_MULTI_FINIS" +
-      "H\020\272V\022%\n RET_CUSTOM_DUNGEON_NOT_PUBLISHED" +
-      "\020\273V\022\"\n\035RET_CUSTOM_DUNGEON_FULL_STORE\020\274V\022" +
-      "$\n\037RET_CUSTOM_DUNGEON_STORE_REPEAT\020\275V\022*\n" +
-      "%RET_CUSTOM_DUNGEON_CAN_NOT_STORE_SELF\020\276" +
-      "V\022%\n RET_CUSTOM_DUNGEON_NOT_SAVE_SUCC\020\277V" +
-      "\022)\n$RET_CUSTOM_DUNGEON_CAN_NOT_LIKE_SELF" +
-      "\020\300V\022!\n\034RET_CUSTOM_DUNGEON_NOT_FOUND\020\301V\022\'" +
-      "\n\"RET_CUSTOM_DUNGEON_INVALID_SETTING\020\302V\022" +
-      ")\n$RET_CUSTOM_DUNGEON_NO_FINISH_SETTING\020" +
-      "\303V\022$\n\037RET_CUSTOM_DUNGEON_SAVE_NOTHING\020\304V" +
-      "\022$\n\037RET_CUSTOM_DUNGEON_NOT_IN_GROUP\020\305V\022$" +
-      "\n\037RET_CUSTOM_DUNGEON_NOT_OFFICIAL\020\306V\022&\n!" +
-      "RET_CUSTOM_DUNGEON_LIFE_NUM_ERROR\020\307V\022$\n\037" +
-      "RET_CUSTOM_DUNGEON_NO_OPEN_ROOM\020\310V\022*\n%RE" +
-      "T_CUSTOM_DUNGEON_BRICK_EXCEED_LIMIT\020\311V\022+" +
-      "\n&RET_CUSTOM_DUNGEON_OFFICIAL_NOT_UNLOCK" +
-      "\020\312V\022&\n!RET_CAN_NOT_EDIT_OFFICIAL_SETTING" +
-      "\020\313V\022#\n\036RET_CUSTOM_DUNGEON_BAN_PUBLISH\020\314V" +
-      "\022&\n!RET_CUSTOM_DUNGEON_CAN_NOT_REPLAY\020\315V" +
-      "\022&\n!RET_CUSTOM_DUNGEON_NOT_OPEN_GROUP\020\316V" +
-      "\022$\n\037RET_CUSTOM_DUNGEON_MAX_EDIT_NUM\020\317V\022)" +
-      "\n$RET_CUSTOM_DUNGEON_CAN_NOT_OUT_STUCK\020\320" +
-      "V\022\037\n\032RET_CUSTOM_DUNGEON_MAX_TAG\020\321V\022#\n\036RE" +
-      "T_CUSTOM_DUNGEON_INVALID_TAG\020\322V\022 \n\033RET_C" +
-      "USTOM_DUNGEON_MAX_COST\020\323V\022,\n\'RET_CUSTOM_" +
-      "DUNGEON_REQUEST_TOO_FREQUENT\020\324V\022 \n\033RET_C" +
-      "USTOM_DUNGEON_NOT_OPEN\020\325V\022\032\n\025RET_SHARE_C" +
-      "D_ID_ERROR\020\335V\022\035\n\030RET_SHARE_CD_INDEX_ERRO" +
-      "R\020\336V\022\027\n\022RET_SHARE_CD_IN_CD\020\337V\022\"\n\035RET_SHA" +
-      "RE_CD_TOKEN_NOT_ENOUGH\020\340V\022\025\n\020RET_UGC_DIS" +
-      "MATCH\020\217W\022\033\n\026RET_UGC_DATA_NOT_FOUND\020\220W\022\034\n" +
-      "\027RET_UGC_BRIEF_NOT_FOUND\020\221W\022\025\n\020RET_UGC_D" +
-      "ISABLED\020\222W\022\024\n\017RET_UGC_LIMITED\020\223W\022\023\n\016RET_" +
-      "UGC_LOCKED\020\224W\022\025\n\020RET_UGC_NOT_AUTH\020\225W\022\025\n\020" +
-      "RET_UGC_NOT_OPEN\020\226W\022\030\n\023RET_UGC_BAN_PUBLI" +
-      "SH\020\227W\022\037\n\032RET_UGC_MUSIC_EXCEED_LIMIT\020\230W\022$" +
-      "\n\037RET_UGC_MUSIC_SAVE_TOO_FREQUENT\020\231W\022&\n!" +
-      "RET_COMPOUND_BOOST_ITEM_NOT_EXIST\020\301W\022(\n#" +
-      "RET_COMPOUND_BOOST_TARGET_NOT_EXIST\020\302W\022#" +
-      "\n\036RET_QUICK_HIT_TREE_EMPTY_TREES\020\313W\022 \n\033R" +
-      "ET_GCG_FIND_GAME_MODE_FAIL\020\340]\022\"\n\035RET_GCG" +
-      "_OPERATION_PARAM_ERROR\020\341]\022\035\n\030RET_GCG_GAM" +
-      "E_NOT_RUNNING\020\342]\022\031\n\024RET_GCG_OP_NOT_ALLOW" +
-      "\020\343]\022\037\n\032RET_GCG_OP_NOT_MATCH_PHASE\020\344]\022(\n#" +
-      "RET_GCG_SELECT_HAND_CARD_GUID_ERROR\020\345]\022\037" +
-      "\n\032RET_GCG_DICE_INDEX_INVALID\020\346]\022#\n\036RET_G" +
-      "CG_CHARACTER_GUID_INVALID\020\347]\022\"\n\035RET_GCG_" +
-      "CHARACTER_ALREADY_DIE\020\350]\022\'\n\"RET_GCG_CHAR" +
-      "ACTER_ALREADY_ON_STAGE\020\351]\022\'\n\"RET_GCG_CHA" +
-      "RACTER_FORBIDDEN_ATTACK\020\352]\022\"\n\035RET_GCG_SE" +
-      "LECT_DICE_NOT_MATCH\020\353]\022\034\n\027RET_GCG_FIND_S" +
-      "KILL_FAIL\020\354]\022%\n RET_GCG_SKILL_CAN_NOT_AC" +
-      "TIVE_USE\020\355]\022\036\n\031RET_GCG_ENERGY_NOT_ENOUGH" +
-      "\020\356]\022\'\n\"RET_GCG_PLAY_CARD_TARGET_NOT_MATC" +
-      "H\020\357]\022&\n!RET_GCG_PLAY_CARD_ZONE_CANNOT_AD" +
-      "D\020\360]\022\'\n\"RET_GCG_REBOOT_SELECT_DICE_INVAL" +
-      "ID\020\361]\022\'\n\"RET_GCG_REBOOT_SELECT_CARD_INVA" +
-      "LID\020\362]\022+\n&RET_GCG_PLAY_CARD_CONDITION_CH" +
-      "ECK_FAIL\020\363]\022$\n\037RET_GCG_PLAY_CARD_PARAM_I" +
-      "NVALID\020\364]\022\025\n\020RET_GCG_MAX_GAME\020\365]\022\035\n\030RET_" +
-      "GCG_SEND_PACKET_FAIL\020\366]\022\033\n\026RET_GCG_ALREA" +
-      "DY_SETTLE\020\367]\022*\n%RET_GCG_PLAY_CARD_LEGEND" +
-      "_ALREADY_USED\020\370]\022#\n\036RET_GCG_COST_LEGEND_" +
-      "NOT_ENOUGH\020\371]\022 \n\033RET_GCG_WATCH_IN_BLACK_" +
-      "LIST\020\372]\022 \n\033RET_GCG_WATCH_FORBID_SWITCH\020\373" +
-      "]\022!\n\034RET_GCG_WATCH_ALREADY_JOINED\020\374]\022$\n\037" +
-      "RET_GCG_WATCH_KICK_NO_SPECTATOR\020\375]\022%\n RE" +
-      "T_GCG_WATCH_TARGET_NOT_IN_DUEL\020\376]\022$\n\037RET" +
-      "_GCG_WATCH_TARGET_NOT_FRIEND\020\377]\022\"\n\035RET_G" +
-      "CG_WATCH_TARGET_PSN_ONLY\020\200^\022\'\n\"RET_GCG_W" +
-      "ATCH_FORBID_BUSINESS_TYPE\020\201^\022 \n\033RET_GCG_" +
-      "WATCH_OPTION_REFUSE\020\202^\022\034\n\027RET_GCG_WATCH_" +
-      "NO_PLAYER\020\203^\022(\n#RET_GCG_WATCH_TARGET_STA" +
-      "TE_NOT_OPEN\020\204^\022\"\n\035RET_GCG_WATCH_SPECTATO" +
-      "R_LIMIT\020\205^\022\'\n\"RET_GCG_WATCH_FORBIDDEN_WA" +
-      "TCH_GAME\020\206^\022 \n\033RET_GCG_WATCH_NOT_SPECTAT" +
-      "OR\020\207^\022\"\n\035RET_GCG_WATCH_ALREADY_IN_DUEL\020\210" +
-      "^\022-\n(RET_GCG_WATCH_CLIENT_DATA_VERSOIN_F" +
-      "ORBID\020\211^\022\036\n\031RET_GCG_COIN_EXCEED_LIMIT\020\305^" +
-      "\022\034\n\027RET_GCG_COIN_NOT_ENOUGH\020\306^\022\036\n\031RET_GC" +
-      "G_NOT_IN_SELF_WORLD\020\307^\022\034\n\027RET_GCG_ALREAD" +
-      "Y_IN_DUEL\020\310^\022 \n\033RET_GCG_NOT_IN_PLAYER_WO" +
-      "RLD\020\311^\022\034\n\027RET_GCG_GALLERY_STARTED\020\312^\022\"\n\035" +
-      "RET_GCG_INVITE_TARGET_IS_SELF\020\313^\022\'\n\"RET_" +
-      "GCG_INVITE_TARGET_NOT_IN_WORLD\020\314^\022#\n\036RET" +
-      "_GCG_APPLY_INVITE_NOT_ALLOW\020\315^\022!\n\034RET_GC" +
-      "G_APPLY_INVITE_TIMEOUT\020\316^\022\035\n\030RET_GCG_CUR" +
-      "_DECK_INVALID\020\317^\022#\n\036RET_GCG_NEED_RESOURC" +
-      "E_COMPLETE\020\320^\022$\n\037RET_GCG_OPPONENT_PLAYER" +
-      "_IS_SELF\020\321^\022\034\n\027RET_GCG_GAME_ID_INVALID\020\322" +
-      "^\022\034\n\027RET_GCG_MATCH_IN_PUNISH\020\323^\022!\n\034RET_G" +
-      "CG_SETTLE_STILL_IN_DUEL\020\324^\022\"\n\035RET_GCG_SE" +
-      "TTLE_NOT_IN_DUNGEON\020\325^\022$\n\037RET_GCG_UNSUPP" +
-      "ORT_SETTLE_OPTION\020\326^\022\037\n\032RET_GCG_NOT_IN_G" +
-      "CG_DUNGEON\020\327^\022\037\n\032RET_GCG_WORLD_LEVEL_LOC" +
-      "KED\020\330^\022\036\n\031RET_GCG_BOSS_LEVEL_LOCKED\020\331^\022\032" +
-      "\n\025RET_GCG_NOT_IN_TAVERN\020\332^\022\037\n\032RET_GCG_WE" +
-      "EK_NPC_NOT_EXIST\020\333^\022 \n\033RET_GCG_ENTER_GAM" +
-      "E_FREQUENT\020\334^\022-\n(RET_GCG_BREAK_LEVEL_QUE" +
-      "ST_NOT_UNFINISHED\020\335^\022)\n$RET_GCG_GUIDE_LE" +
-      "VEL_ALREADY_FINISHED\020\336^\022!\n\034RET_GCG_LEVEL" +
-      "_CANNOT_RESTART\020\337^\022$\n\037RET_GCG_TARGET_CHE" +
-      "CK_ENTER_FAIL\020\340^\022\037\n\032RET_GCG_ALREADY_IN_D" +
-      "UNGEON\020\341^\022\036\n\031RET_GCG_BACK_DUEL_NO_GAME\020\342" +
-      "^\022\037\n\032RET_GCG_CONST_LEVEL_LOCKED\020\343^\022\033\n\026RE" +
-      "T_GCG_QUEST_ID_ERROR\020\344^\022\"\n\035RET_GCG_QUEST" +
-      "_NEED_UNFINISHED\020\345^\022\025\n\020RET_GCG_IN_MATCH\020" +
-      "\346^\022$\n\037RET_GCG_DATA_VERSION_NOT_LATEST\020\347^" +
-      "\022.\n)RET_GCG_INVITE_TARGET_ENTER_GAME_FRE" +
-      "QUENT\020\350^\0221\n,RET_GCG_INVITE_TARGET_NEED_R" +
-      "ESOURCE_COMPLETE\020\351^\022(\n#RET_GCG_INVITE_TA" +
-      "RGET_SCENE_IS_NULL\020\352^\022&\n!RET_GCG_INVITE_" +
-      "TARGET_IN_TRANSFER\020\353^\0222\n-RET_GCG_INVITE_" +
-      "TARGET_DATA_VERSION_NOT_LATEST\020\354^\022+\n&RET" +
-      "_GCG_INVITE_TARGET_CUR_DECK_INVALID\020\355^\022*" +
-      "\n%RET_GCG_CLIENT_DATA_VERSION_NOT_MATCH\020" +
-      "\356^\022\'\n\"RET_GCG_CLIENT_DATA_VERSOIN_FORBID" +
-      "\020\357^\022\032\n\025RET_GCG_MP_CANT_MATCH\020\360^\022)\n$RET_G" +
-      "CG_INVITE_TARGET_STATE_NOT_OPEN\020\361^\022\034\n\027RE" +
-      "T_GCG_CREATE_TIME_OUT\020\362^\022\026\n\021RET_GCG_BAN_" +
-      "MATCH\020\363^\022\027\n\022RET_GCG_BAN_INVITE\020\364^\022\036\n\031RET" +
-      "_GCG_TARGET_BAN_INVITE\020\365^\022\"\n\035RET_GCG_INV" +
-      "ITE_ALREADY_INVITE\020\366^\022#\n\036RET_GCG_FESTIVA" +
-      "L_MODE_NOT_OPEN\020\367^\022*\n%RET_GCG_TARGET_FES" +
-      "TIVAL_MODE_NOT_OPEN\020\370^\022\"\n\035RET_GCG_BACK_D" +
-      "UEL_PS_TO_OTHER\020\371^\022\"\n\035RET_GCG_BACK_DUEL_" +
-      "OTHER_TO_PS\020\372^\022\033\n\026RET_GCG_DS_DECK_LOCKED" +
-      "\020\251_\022!\n\034RET_GCG_DS_DECK_NAME_INVALID\020\252_\022*" +
-      "\n%RET_GCG_DS_DECK_CHAR_CARD_NUM_INVALID\020" +
-      "\254_\022%\n RET_GCG_DS_DECK_CARD_NUM_INVALID\020\255" +
-      "_\022%\n RET_GCG_DS_CARD_NUM_EXCEED_LIMIT\020\256_" +
-      "\022\034\n\027RET_GCG_DS_DECK_INVALID\020\257_\022\037\n\032RET_GC" +
-      "G_DS_CARD_ID_INVALID\020\260_\022(\n#RET_GCG_DS_CA" +
-      "RD_FACE_ALREADY_UNLOCK\020\261_\022!\n\034RET_GCG_DS_" +
-      "CARD_FACE_IS_LOCK\020\262_\022\032\n\025RET_GCG_DS_FIELD" +
-      "_LOCK\020\263_\022$\n\037RET_GCG_DS_FIELD_ALREADY_UNL" +
-      "OCK\020\264_\022 \n\033RET_GCG_DS_FIELD_ID_INVALID\020\265_" +
-      "\022 \n\033RET_GCG_DS_CARD_BACK_LOCKED\020\266_\022(\n#RE" +
-      "T_GCG_DS_CARD_BACK_ALREADY_UNLOCK\020\267_\022$\n\037" +
-      "RET_GCG_DS_CARD_BACK_ID_INVALID\020\270_\022$\n\037RE" +
-      "T_GCG_DS_CARD_FACE_ID_INVALID\020\271_\022!\n\034RET_" +
-      "GCG_DS_DECK_NAME_ILLEGAL\020\272_\022\034\n\027RET_GCG_D" +
-      "S_DECK_SAVE_CD\020\273_\022#\n\036RET_GCG_DS_DECK_CHA" +
-      "NGE_NAME_CD\020\274_\022\037\n\032RET_GCG_MATCH_DECK_INV" +
-      "ALID\020\275_\022%\n RET_GCG_DS_DECK_ALREADY_UNLOC" +
-      "KED\020\276_\022!\n\034RET_GCG_DS_AT_LEAST_ONE_DECK\020\277" +
-      "_\022(\n#RET_GCG_TC_CHARACTERNOT_MATCH_LEVEL" +
-      "\020\333_\022\"\n\035RET_GCG_TC_MUST_IN_SELF_WORLD\020\334_\022" +
-      "\036\n\031RET_GCG_TC_MUST_IN_TAVERN\020\335_\022\037\n\032RET_G" +
-      "CG_TC_ALREADY_IN_GAME\020\336_\022 \n\033RET_GCG_TC_A" +
-      "LREADY_IN_MATCH\020\337_\0221\n,RET_GCG_TC_UNLOCK_" +
-      "CHARACTER_QUEST_NOT_FINISH\020\340_\022\034\n\027RET_GCG" +
-      "_TC_LEVEL_LOCKED\020\341_\022\036\n\031RET_GCG_TC_NO_INV" +
-      "ITE_DATA\020\342_\022 \n\033RET_GCG_TC_CUR_DECK_INVAL" +
-      "ID\020\343_\022\032\n\025RET_GCG_TC_COND_QUEST\020\344_\022%\n RET" +
-      "_GCG_LEVEL_REWARD_LEVEL_ERROR\020\215`\022\'\n\"RET_" +
-      "GCG_LEVEL_REWARD_ALREADY_TAKEN\020\216`\022#\n\036RET" +
-      "_GCG_LEVEL_REWARD_NO_REWARD\020\217`\022\"\n\035RET_GC" +
-      "G_NOT_IN_REPLAY_DUNGEON\020\227`\022\033\n\026RET_GCG_IN" +
-      "VALID_REPLAY\020\230`\022#\n\036RET_GCG_SET_FAVORITE_" +
-      "LIMIT_NUM\020\231`\022\032\n\025RET_GCG_REPLAY_EXPIRE\020\232`" +
-      "\022#\n\036RET_GCG_REPLAY_DUNGEON_SETTLED\020\233`\022#\n" +
-      "\036RET_GCG_PICK_CUR_UID_NOT_MATCH\020\253`\022$\n\037RE" +
-      "T_GCG_PICK_SELECT_PARAM_ERROR\020\254`\022\037\n\032RET_" +
-      "GCG_PICK_CONFIRM_ERROR\020\255`\022\036\n\031RET_GCG_PIC" +
-      "K_BACK_NO_GAME\020\256`\022$\n\037RET_GCG_ARENA_SCHED" +
-      "ULE_INACTIVE\020\265`\022%\n RET_GCG_ARENA_SCHEDUL" +
-      "E_NOT_MATCH\020\266`\022\037\n\032RET_GCG_ARENA_DECK_NOT" +
-      "_SET\020\267`\022\037\n\032RET_GCG_ARENA_DECK_INVALID\020\270`" +
-      "\022/\n*RET_GCG_ARENA_IN_CHALLENGE_CANNOT_SE" +
-      "T_DECK\020\271`\022-\n(RET_GCG_ARENA_START_CHALLEN" +
-      "GE_IN_MP_MODE\020\272`\022)\n$RET_GCG_ARENA_START_" +
-      "MATCH_IN_MP_MODE\020\273`\022\037\n\032RET_UGC_DUNGEON_I" +
-      "N_DUNGEON\020\311e\022#\n\036RET_UGC_DUNGEON_ROOM_NUM" +
-      "_LIMIT\020\312e\022&\n!RET_UGC_DUNGEON_NOT_IN_EDIT" +
-      "_STATE\020\313e\022(\n#RET_UGC_DUNGEON_NOT_IN_EDIT" +
-      "_DUNGEON\020\314e\022\036\n\031RET_UGC_DUNGEON_NOT_EXIST" +
-      "\020\315e\022\035\n\030RET_UGC_DUNGEON_NOT_SAVE\020\316e\0222\n-RE" +
-      "T_UGC_DUNGEON_SCORE_CONDTION_BUT_NO_MONS" +
-      "TER\020\317e\022/\n*RET_UGC_DUNGEON_SCORE_CONDTION" +
-      "_BUT_NO_COIN\020\320e\0220\n+RET_UGC_DUNGEON_SCORE" +
-      "_CONDTION_BUT_NO_CHEST\020\321e\0226\n1RET_UGC_DUN" +
-      "GEON_SCORE_CONDTION_BUT_NO_ROOM_SETTLE\020\322" +
-      "e\022.\n)RET_UGC_DUNGEON_TARGET_SCORE_EXCEED" +
-      "_LIMIT\020\323e\0226\n1RET_UGC_DUNGEON_TIME_SETTLE" +
-      "_TARGET_SCORE_NOT_ZERO\020\324e\022,\n\'RET_UGC_DUN" +
-      "GEON_ALLOW_AVATAR_NOT_ENOUGH\020\325e\0225\n0RET_U" +
-      "GC_DUNGEON_HEART_BLOOD_WHILE_MONSTER_DEP" +
-      "LOY\020\326e\022(\n#RET_UGC_DUNGEON_ROOM_NO_EXIT_G" +
-      "ADGET\020\327e\022/\n*RET_UGC_DUNGEON_ROOM_HOST_EN" +
-      "TER_GADGET_NUM\020\330e\0227\n2RET_UGC_DUNGEON_ROO" +
-      "M_GUEST_ENTER_GADGET_NOT_ENOUGH\020\331e\0224\n/RE" +
-      "T_UGC_DUNGEON_ROOM_SETTING_COIN_NUM_TOO_" +
-      "LARGE\020\332e\0227\n2RET_UGC_DUNGEON_ROOM_SETTING" +
-      "_MONSTER_NUM_TOO_LARGE\020\333e\0222\n-RET_UGC_DUN" +
-      "GEON_ROOM_SETTING_NO_SETTLE_CONFIG\020\334e\0222\n" +
-      "-RET_UGC_DUNGEON_ROOM_SWITCH_INVITE_IN_P" +
-      "ROCESS\020\335e\022/\n*RET_UGC_DUNGEON_ROOM_DEPLOY" +
-      "MENT_COST_LIMIT\020\336e\0220\n+RET_UGC_DUNGEON_RO" +
-      "OM_TRIGGER_DUPLICATE_GUID\020\337e\022-\n(RET_UGC_",
-      "DUNGEON_ROOM_TRIGGER_PARAM_ERROR\020\340e\0223\n.R" +
-      "ET_UGC_DUNGEON_SCORE_SETTLE_TARGET_SCORE" +
-      "_ZERO\020\341e\022(\n#RET_UGC_DUNGEON_STATE_CAN_NO" +
-      "T_AUDIT\020\342e\022,\n\'RET_UGC_DUNGEON_AUDIT_VERS" +
-      "ION_NOT_MATCH\020\343e\022\035\n\030RET_UGC_DUNGEON_IN_A" +
-      "UDIT\020\344e\022*\n%RET_UGC_DUNGEON_STATE_CAN_NOT" +
-      "_PUBLISH\020\345e\022)\n$RET_UGC_DUNGEON_REQUEST_T" +
-      "OO_FREQUENT\020\346e\022,\n\'RET_UGC_DUNGEON_CAN_NO" +
-      "T_PUBLISH_NO_EDIT\020\347e\022%\n RET_UGC_DUNGEON_" +
-      "NOT_ALLOW_IMPORT\020\350e\022,\n\'RET_UGC_DUNGEON_I" +
-      "MPORT_ROOM_HAS_MONSTER\020\351e\022%\n RET_UGC_DUN" +
-      "GEON_SEARCH_NOT_EXIST\020\352e\022*\n%RET_UGC_DUNG" +
-      "EON_ROOM_SWITCH_LAST_ROOM\020\353e\022*\n%RET_UGC_" +
-      "DUNGEON_ROOM_GADGET_NUM_LIMIT\020\354e\022+\n&RET_" +
-      "UGC_DUNGEON_ROOM_MONSTER_NUM_LIMIT\020\355e\022)\n" +
-      "$RET_UGC_DUNGEON_NO_TRIAL_SUCC_RECORD\020\356e" +
-      "\022\036\n\031RET_UGC_DUNGEON_NUM_LIMIT\020\357e\022$\n\037RET_" +
-      "UGC_DUNGEON_IN_EDIT_DUNGEON\020\360e\022#\n\036RET_UG" +
-      "C_DUNGEON_NOT_IN_DUNGEON\020\361e\0220\n+RET_UGC_D" +
-      "UNGEON_CHANGE_SETTING_TOO_FREQUENT\020\362e\022\036\n" +
-      "\031RET_UGC_DUNGEON_NOT_OWNER\020\363e\022\"\n\035RET_UGC" +
-      "_DUNGEON_NOT_PUBLISHED\020\364e\022(\n#RET_UGC_DUN" +
-      "GEON_SHARE_CODE_GEN_FAIL\020\365e\022\037\n\032RET_UGC_D" +
-      "UNGEON_ROOM_LIMIT\020\366e\022\'\n\"RET_UGC_DUNGEON_" +
-      "SHARE_CODE_INVALID\020\367e\022)\n$RET_UGC_DUNGEON" +
-      "_ROOM_SUITE_NUM_LIMIT\020\370e\022-\n(RET_UGC_DUNG" +
-      "EON_TOWER_HAS_BEEN_PURCHASED\020\255f\022/\n*RET_U" +
-      "GC_DUNGEON_PLAYER_ADD_ITEM_OVER_STACK\020\256f" +
-      "\0222\n-RET_UGC_DUNGEON_PLAYER_TOWER_LEVEL_U" +
-      "P_LIMITED\020\257f\0223\n.RET_UGC_DUNGEON_PLAYER_C" +
-      "ONSUME_ITEM_NOT_ENOUGH\020\260f\0222\n-RET_UGC_DUN" +
-      "GEON_PLAYER_TOWER_ALREADY_LEVEL_UP\020\261f\0223\n" +
-      ".RET_UGC_DUNGEON_PLAYER_UGC_TARGET_IS_NO" +
-      "T_EXIST\020\262f\0224\n/RET_UGC_DUNGEON_PLAYER_UGC" +
-      "_TARGET_IS_NOT_ACTIVE\020\263f\022(\n#RET_UGC_DUNG" +
-      "EON_CHECK_LAYOUT_FAILED\020\264f\0221\n,RET_UGC_DU" +
-      "NGEON_PLAYER_TOWER_ALREADY_REMOVED\020\265f\022/\n" +
-      "*RET_UGC_DUNGEON_PLAYER_ADD_ITEM_OVER_LI" +
-      "MIT\020\266f\0223\n.RET_UGC_DUNGEON_PLAYER_GRANT_A" +
-      "VATAR_OVER_LIMIT\020\267f\022#\n\036RET_UGC_DUNGEON_D" +
-      "UPLICATE_STAR\020\313f\022*\n%RET_UGC_DUNGEON_CANC" +
-      "EL_STAR_NOT_EXIST\020\314f\022%\n RET_UGC_DUNGEON_" +
-      "STAR_REACH_LIMIT\020\315f\022\"\n\035RET_UGC_DUNGEON_I" +
-      "NTERNAL_FAIL\020\316f\022*\n%RET_UGC_DUNGEON_PLAYE" +
-      "R_PUBLISH_BANNED\020\317f\022,\n\'RET_UGC_DUNGEON_C" +
-      "USTOM_EDIT_IS_NOT_OPEN\020\337f\022/\n*RET_UGC_DUN" +
-      "GEON_OFFICIAL_LEVEL_IS_NOT_OPEN\020\340f\0220\n+RE" +
-      "T_UGC_DUNGEON_TEMPLATE_IMPORT_IS_NOT_OPE" +
-      "N\020\341f\022\'\n\"RET_TARGET_SHOOTING_LEVEL_NOT_OP" +
-      "EN\020\351f\022-\n(RET_TARGET_SHOOTING_PLAYER_NUM_" +
-      "NOT_VALID\020\352f\022&\n!RET_TARGET_SHOOTING_PLAY" +
-      "_NOT_OPEN\020\353f\022)\n$RET_TARGET_SHOOTING_CONF" +
-      "IG_NOT_FOUND\020\354f\022%\n RET_SHUFFLE_BOARD_LEV" +
-      "EL_NOT_OPEN\020\364f\022,\n\'RET_SHUFFLE_BOARD_NOT_" +
-      "IN_PENUMBRA_SCENE\020\365f\022%\n RET_SHUFFLE_BOAR" +
-      "D_LEVEL_MISMATCH\020\366f\022&\n!RET_SHUFFLE_BOARD" +
-      "_ALREADY_PLAYING\020\367f\022\'\n\"RET_RAFFLE_TICKET" +
-      "_INVALID_BONUS_ID\020\370f\022+\n&RET_RAFFLE_TICKE" +
-      "T_PREREQUISITE_NOT_MET\020\371f\022!\n\034RET_RAFFLE_" +
-      "TICKET_NOT_ENOUGH\020\372f\022#\n\036RET_FLIGHT_GEAR_" +
-      "LEVEL_NOT_OPEN\020\207g\022\037\n\032RET_FLIGHT_GEAR_IN_" +
-      "MP_MODE\020\210g\0220\n+RET_ANIMAL_VIEW_AVATAR_IS_" +
-      "CLOSING_TO_ANIMAL\020\234g\022%\n RET_ANIMAL_VIEW_" +
-      "NOT_EQUIP_WIDGET\020\235g\022!\n\034RET_COMBINE_POINT" +
-      "_NOT_ENOUGH\020\245g\022*\n%RET_TOY_BATTLE_CURRENT" +
-      "_LEVEL_NOT_OPEN\020\303g\022\'\n\"RET_TOY_BATTLE_CUR" +
-      "RENT_NOT_PLAYING\020\304g\0220\n+RET_FONTAINE_GATH" +
-      "ER_INVALID_GATHER_TRACKING\020\315g\0221\n,RET_FON" +
-      "TAINE_GATHER_INVALID_MONSTER_TRACKING\020\316g" +
-      "B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "_MATCH\020\304\006\022\037\n\032RET_GIVING_NOT_IN_MY_WORLD\020" +
+      "\305\006\022\031\n\024RET_GIVING_IS_FROZEN\020\306\006\022\027\n\022RET_ACT" +
+      "IVITY_CLOSE\020\334\006\022\034\n\027RET_ACTIVITY_ITEM_ERRO" +
+      "R\020\335\006\022)\n$RET_ACTIVITY_CONTRIBUTION_NOT_EN" +
+      "OUGH\020\336\006\022\"\n\035RET_SEA_LAMP_PHASE_NOT_FINISH" +
+      "\020\337\006\022\037\n\032RET_SEA_LAMP_FLY_NUM_LIMIT\020\340\006\022\'\n\"" +
+      "RET_SEA_LAMP_FLY_LAMP_WORD_ILLEGAL\020\341\006\022&\n" +
+      "!RET_ACTIVITY_WATCHER_REWARD_TAKEN\020\342\006\022-\n" +
+      "(RET_ACTIVITY_WATCHER_REWARD_NOT_FINISHE" +
+      "D\020\343\006\022#\n\036RET_SALESMAN_ALREADY_DELIVERED\020\344" +
+      "\006\022)\n$RET_SALESMAN_REWARD_COUNT_NOT_ENOUG" +
+      "H\020\345\006\022\"\n\035RET_SALESMAN_POSITION_INVALID\020\346\006" +
+      "\022%\n RET_DELIVER_NOT_FINISH_ALL_QUEST\020\347\006\022" +
+      "*\n%RET_DELIVER_ALREADY_TAKE_DAILY_REWARD" +
+      "\020\350\006\022$\n\037RET_ASTER_PROGRESS_EXCEED_LIMIT\020\351" +
+      "\006\022\"\n\035RET_ASTER_CREDIT_EXCEED_LIMIT\020\352\006\022!\n" +
+      "\034RET_ASTER_TOKEN_EXCEED_LIMIT\020\353\006\022 \n\033RET_" +
+      "ASTER_CREDIT_NOT_ENOUGH\020\354\006\022\037\n\032RET_ASTER_" +
+      "TOKEN_NOT_ENOUGH\020\355\006\022\'\n\"RET_ASTER_SPECIAL" +
+      "_REWARD_HAS_TAKEN\020\356\006\022*\n%RET_FLIGHT_GROUP" +
+      "_ACTIVITY_NOT_STARTED\020\357\006\022/\n*RET_ASTER_MI" +
+      "D_PREVIOUS_BATTLE_NOT_FINISHED\020\360\006\0225\n0RET" +
+      "_DRAGON_SPINE_SHIMMERING_ESSENCE_EXCEED_" +
+      "LIMIT\020\361\006\022/\n*RET_DRAGON_SPINE_WARM_ESSENC" +
+      "E_EXCEED_LIMIT\020\362\006\0223\n.RET_DRAGON_SPINE_WO" +
+      "NDROUS_ESSENCE_EXCEED_LIMIT\020\363\006\0223\n.RET_DR" +
+      "AGON_SPINE_SHIMMERING_ESSENCE_NOT_ENOUGH" +
+      "\020\364\006\022-\n(RET_DRAGON_SPINE_WARM_ESSENCE_NOT" +
+      "_ENOUGH\020\365\006\0221\n,RET_DRAGON_SPINE_WONDROUS_" +
+      "ESSENCE_NOT_ENOUGH\020\366\006\022+\n&RET_EFFIGY_FIRS" +
+      "T_PASS_REWARD_HAS_TAKEN\020\373\006\022 \n\033RET_EFFIGY" +
+      "_REWARD_HAS_TAKEN\020\374\006\022,\n\'RET_TREASURE_MAP" +
+      "_ADD_TOKEN_EXCEED_LIMIT\020\375\006\022\'\n\"RET_TREASU" +
+      "RE_MAP_TOKEN_NOT_ENOUGHT\020\376\006\022#\n\036RET_SEA_L" +
+      "AMP_COIN_EXCEED_LIMIT\020\377\006\022!\n\034RET_SEA_LAMP" +
+      "_COIN_NOT_ENOUGH\020\200\007\022)\n$RET_SEA_LAMP_POPU" +
+      "LARITY_EXCEED_LIMIT\020\201\007\022(\n#RET_ACTIVITY_A" +
+      "VATAR_REWARD_NOT_OPEN\020\202\007\022)\n$RET_ACTIVITY" +
+      "_AVATAR_REWARD_HAS_TAKEN\020\203\007\022\'\n\"RET_ARENA" +
+      "_ACTIVITY_ALREADY_STARTED\020\204\007\022\037\n\032RET_TALE" +
+      "NT_ALREAY_UNLOCKED\020\205\007\022!\n\034RET_PREV_TALENT" +
+      "_NOT_UNLOCKED\020\206\007\022$\n\037RET_BIG_TALENT_POINT" +
+      "_NOT_ENOUGH\020\207\007\022&\n!RET_SMALL_TALENT_POINT" +
+      "_NOT_ENOUGH\020\210\007\022 \n\033RET_PROUD_SKILL_ALREAD" +
+      "Y_GOT\020\211\007\022!\n\034RET_PREV_PROUD_SKILL_NOT_GET" +
+      "\020\212\007\022\036\n\031RET_PROUD_SKILL_MAX_LEVEL\020\213\007\022*\n%R" +
+      "ET_CANDIDATE_SKILL_DEPOT_ID_NOT_FIND\020\216\007\022" +
+      " \n\033RET_SKILL_DEPOT_IS_THE_SAME\020\217\007\022\032\n\025RET" +
+      "_MONSTER_NOT_EXIST\020\351\007\022\034\n\027RET_MONSTER_CRE" +
+      "ATE_FAIL\020\352\007\022\033\n\026RET_DUNGEON_ENTER_FAIL\020\315\010" +
+      "\022\032\n\025RET_DUNGEON_QUIT_FAIL\020\316\010\022\'\n\"RET_DUNG" +
+      "EON_ENTER_EXCEED_DAY_COUNT\020\317\010\022(\n#RET_DUN" +
+      "GEON_REVIVE_EXCEED_MAX_COUNT\020\320\010\022\034\n\027RET_D" +
+      "UNGEON_REVIVE_FAIL\020\321\010\022\034\n\027RET_DUNGEON_NOT" +
+      "_SUCCEED\020\322\010\022\037\n\032RET_DUNGEON_CAN_NOT_CANCE" +
+      "L\020\323\010\022\035\n\030RET_DEST_DUNGEON_SETTLED\020\324\010\022\'\n\"R" +
+      "ET_DUNGEON_CANDIDATE_TEAM_IS_FULL\020\325\010\022*\n%" +
+      "RET_DUNGEON_CANDIDATE_TEAM_IS_DISMISS\020\326\010" +
+      "\022-\n(RET_DUNGEON_CANDIDATE_TEAM_NOT_ALL_R" +
+      "EADY\020\327\010\0221\n,RET_DUNGEON_CANDIDATE_TEAM_HA" +
+      "S_REPEAT_AVATAR\020\330\010\022*\n%RET_DUNGEON_CANDID" +
+      "ATE_NOT_SINGEL_PASS\020\331\010\022+\n&RET_DUNGEON_RE" +
+      "PLAY_NEED_ALL_PLAYER_DIE\020\332\010\022(\n#RET_DUNGE" +
+      "ON_REPLAY_HAS_REVIVE_COUNT\020\333\010\022\035\n\030RET_DUN" +
+      "GEON_OTHERS_LEAVE\020\334\010\022\"\n\035RET_DUNGEON_ENTE" +
+      "R_LEVEL_LIMIT\020\335\010\022(\n#RET_DUNGEON_CANNOT_E" +
+      "NTER_PLOT_IN_MP\020\336\010\022$\n\037RET_DUNGEON_DROP_S" +
+      "UBFIELD_LIMIT\020\337\010\0220\n+RET_DUNGEON_BE_INVIT" +
+      "E_PLAYER_AVATAR_ALL_DIE\020\340\010\022\034\n\027RET_DUNGEO" +
+      "N_CANNOT_KICK\020\341\010\0223\n.RET_DUNGEON_CANDIDAT" +
+      "E_TEAM_SOMEONE_LEVEL_LIMIT\020\342\010\022\036\n\031RET_DUN" +
+      "GEON_IN_FORCE_QUIT\020\343\010\022#\n\036RET_DUNGEON_GUE" +
+      "ST_QUIT_DUNGEON\020\344\010\022\034\n\027RET_DUNGEON_TICKET" +
+      "_FAIL\020\345\010\022\034\n\027RET_CUR_DUNGEON_SETTLED\020\346\010\022\035" +
+      "\n\030RET_CUR_DUNGEON_NOT_PLOT\020\347\010\022*\n%RET_CUR" +
+      "_DUNGEON_NOT_ALLOW_SWITCH_TEAM\020\350\010\022*\n%RET" +
+      "_DUNGEON_ENTERED_BY_CANDIDATE_TEAM\020\351\010\022+\n" +
+      "&RET_DUNGEON_SWITCH_TEAM_BANNED_BY_PLAY\020" +
+      "\352\010\022*\n%RET_DUNGEON_ENTER_TEAM_INTERNAL_ER" +
+      "ROR\020\353\010\022/\n*RET_DUNGEON_ENTER_TEAM_SOMEONE" +
+      "_LEVEL_LIMIT\020\354\010\0225\n0RET_DUNGEON_ENTER_TEA" +
+      "M_SOMEONE_NOT_IN_SCENE_TEAM\020\355\010\022\033\n\026RET_MP" +
+      "_NOT_IN_MY_WORLD\020\261\t\022\026\n\021RET_MP_IN_MP_MODE" +
+      "\020\262\t\022\031\n\024RET_MP_SCENE_IS_FULL\020\263\t\022\036\n\031RET_MP" +
+      "_MODE_NOT_AVAILABLE\020\264\t\022 \n\033RET_MP_PLAYER_" +
+      "NOT_ENTERABLE\020\265\t\022\032\n\025RET_MP_QUEST_BLOCK_M" +
+      "P\020\266\t\022\031\n\024RET_MP_IN_ROOM_SCENE\020\267\t\022\031\n\024RET_M" +
+      "P_WORLD_IS_FULL\020\270\t\022\"\n\035RET_MP_PLAYER_NOT_" +
+      "ALLOW_ENTER\020\271\t\022\037\n\032RET_MP_PLAYER_DISCONNE" +
+      "CTED\020\272\t\022\032\n\025RET_MP_NOT_IN_MP_MODE\020\273\t\022\033\n\026R" +
+      "ET_MP_OWNER_NOT_ENTER\020\274\t\022#\n\036RET_MP_ALLOW" +
+      "_ENTER_PLAYER_FULL\020\275\t\022%\n RET_MP_TARGET_P" +
+      "LAYER_IN_TRANSFER\020\276\t\022!\n\034RET_MP_TARGET_EN" +
+      "TERING_OTHER\020\277\t\022\032\n\025RET_MP_OTHER_ENTERING" +
+      "\020\300\t\022%\n RET_MP_ENTER_MAIN_PLAYER_IN_PLOT\020" +
+      "\301\t\022\031\n\024RET_MP_NOT_PS_PLAYER\020\302\t\022\033\n\026RET_MP_" +
+      "PLAY_NOT_ACTIVE\020\303\t\022\037\n\032RET_MP_PLAY_REMAIN" +
+      "_REWARDS\020\304\t\022\032\n\025RET_MP_PLAY_NO_REWARD\020\305\t\022" +
+      "\033\n\026RET_MP_OPEN_STATE_FAIL\020\307\t\022\037\n\032RET_MP_P" +
+      "LAYER_IN_BLACKLIST\020\310\t\022\031\n\024RET_MP_REPLY_TI" +
+      "MEOUT\020\311\t\022\024\n\017RET_MP_IS_BLOCK\020\312\t\022(\n#RET_MP" +
+      "_ENTER_MAIN_PLAYER_IN_MP_PLAY\020\313\t\022\035\n\030RET_" +
+      "MP_IN_MP_PLAY_BATTLE\020\314\t\022%\n RET_MP_GUEST_" +
+      "HAS_REWARD_REMAINED\020\315\t\022\033\n\026RET_MP_QUIT_MP" +
+      "_INVALID\020\316\t\022)\n$RET_MP_OTHER_DATA_VERSION" +
+      "_NOT_LATEST\020\317\t\022#\n\036RET_MP_DATA_VERSION_NO" +
+      "T_LATEST\020\320\t\022#\n\036RET_MP_CUR_WORLD_NOT_ENTE" +
+      "RABLE\020\321\t\022\037\n\032RET_MP_ANY_GALLERY_STARTED\020\322" +
+      "\t\022\034\n\027RET_MP_HAS_ACTIVE_DRAFT\020\323\t\022\035\n\030RET_M" +
+      "P_PLAYER_IN_DUNGEON\020\324\t\022\026\n\021RET_MP_MATCH_F" +
+      "ULL\020\325\t\022\027\n\022RET_MP_MATCH_LIMIT\020\326\t\022\033\n\026RET_M" +
+      "P_MATCH_IN_PUNISH\020\327\t\022\034\n\027RET_MP_IS_IN_MUL" +
+      "TISTAGE\020\330\t\022\037\n\032RET_MP_MATCH_PLAY_NOT_OPEN" +
+      "\020\331\t\022\"\n\035RET_MP_ONLY_MP_WITH_PS_PLAYER\020\332\t\022" +
+      "%\n RET_MP_GUEST_LOADING_FIRST_ENTER\020\333\t\022+" +
+      "\n&RET_MP_SUMMER_TIME_SPRINT_BOAT_ONGOING" +
+      "\020\334\t\0220\n+RET_MP_BLITZ_RUSH_PARKOUR_CHALLEN" +
+      "GE_ONGOING\020\335\t\022\036\n\031RET_MP_MUSIC_GAME_ONGOI" +
+      "NG\020\336\t\022\031\n\024RET_MP_IN_MPING_MODE\020\337\t\022!\n\034RET_" +
+      "MP_OWNER_IN_SINGLE_SCENE\020\340\t\022\033\n\026RET_MP_IN" +
+      "_SINGLE_SCENE\020\341\t\022!\n\034RET_MP_REPLY_NO_VALI" +
+      "D_AVATAR\020\342\t\022$\n\037RET_MP_IS_NOT_IN_TRANSFER" +
+      "_GUARD\020\343\t\0223\n.RET_MP_CANNOT_EXEC_GIVING_I" +
+      "N_SINGLE_MODE_QUEST\020\344\t\022+\n&RET_MP_EFFIGY_" +
+      "CHALLENGE_V_4_IN_PREPARE\020\345\t\022!\n\034RET_MP_SH" +
+      "UFFLE_BOARD_ONGOING\020\346\t\022\037\n\032RET_MP_FLIGHT_",
+      "GEAR_ONGOING\020\347\t\022\"\n\035RET_MP_TOY_BATTLE_QTE" +
+      "_ONGOING\020\350\t\022#\n\036RET_MP_PAINTING_REPAIR_ON" +
+      "GOING\020\351\t\022\037\n\032RET_MP_FISHBLASTER_ONGOING\020\352" +
+      "\t\022%\n RET_MP_GUEST_MATCH_COND_NOT_MEET\020\353\t" +
+      "\022\026\n\021RET_MAIL_PARA_ERR\020\225\n\022\025\n\020RET_MAIL_MAX" +
+      "_NUM\020\226\n\022\035\n\030RET_MAIL_ITEM_NUM_EXCEED\020\227\n\022\036" +
+      "\n\031RET_MAIL_TITLE_LEN_EXCEED\020\230\n\022 \n\033RET_MA" +
+      "IL_CONTENT_LEN_EXCEED\020\231\n\022\037\n\032RET_MAIL_SEN" +
+      "DER_LEN_EXCEED\020\232\n\022\037\n\032RET_MAIL_PARSE_PACK" +
+      "ET_FAIL\020\233\n\022\034\n\027RET_OFFLINE_MSG_MAX_NUM\020\234\n" +
+      "\022 \n\033RET_OFFLINE_MSG_SAME_TICKET\020\235\n\022#\n\036RE" +
+      "T_MAIL_EXCEL_MAIL_TYPE_ERROR\020\236\n\022\037\n\032RET_M" +
+      "AIL_CANNOT_SEND_MCOIN\020\237\n\022 \n\033RET_MAIL_HCO" +
+      "IN_EXCEED_LIMIT\020\240\n\022 \n\033RET_MAIL_SCOIN_EXC" +
+      "EED_LIMIT\020\241\n\022!\n\034RET_MAIL_MATERIAL_ID_INV" +
+      "ALID\020\242\n\022!\n\034RET_MAIL_AVATAR_EXCEED_LIMIT\020" +
+      "\243\n\022+\n&RET_MAIL_GACHA_TICKET_ETC_EXCEED_L" +
+      "IMIT\020\244\n\022%\n RET_MAIL_ITEM_EXCEED_CEHUA_LI" +
+      "MIT\020\245\n\022*\n%RET_MAIL_SPACE_OR_REST_NUM_NOT" +
+      "_ENOUGH\020\246\n\022\035\n\030RET_MAIL_TICKET_IS_EMPTY\020\247" +
+      "\n\022\"\n\035RET_MAIL_TRANSACTION_IS_EMPTY\020\250\n\022\036\n" +
+      "\031RET_MAIL_DELETE_COLLECTED\020\251\n\022 \n\033RET_MAI" +
+      "L_COLLECTION_IS_FULL\020\252\n\022(\n#RET_MAIL_TITL" +
+      "E_CHARACTER_LEN_EXCEED\020\253\n\022\031\n\024RET_MAIL_TI" +
+      "TLE_EMPTY\020\254\n\022\033\n\026RET_MAIL_CONTENT_EMPTY\020\255" +
+      "\n\022\032\n\025RET_MAIL_SENDER_EMPTY\020\256\n\022\036\n\031RET_DAI" +
+      "LY_TASK_NOT_FINISH\020\262\n\022\035\n\030RET_DAILY_TAKS_" +
+      "HAS_TAKEN\020\263\n\022&\n!RET_SOCIAL_OFFLINE_MSG_N" +
+      "UM_EXCEED\020\264\n\022(\n#RET_DAILY_TASK_FILTER_CI" +
+      "TY_NOT_OPEN\020\265\n\022\"\n\035RET_DAILY_ATTENDANCE_N" +
+      "OT_OPEN\020\266\n\022$\n\037RET_DAILY_ATTENDANCE_REWAR" +
+      "D_MAX\020\267\n\022\032\n\025RET_GACHA_INAVAILABLE\020\371\n\022\037\n\032" +
+      "RET_GACHA_RANDOM_NOT_MATCH\020\372\n\022!\n\034RET_GAC" +
+      "HA_SCHEDULE_NOT_MATCH\020\373\n\022\034\n\027RET_GACHA_IN" +
+      "VALID_TIMES\020\374\n\022#\n\036RET_GACHA_COST_ITEM_NO" +
+      "T_ENOUGH\020\375\n\022\032\n\025RET_GACHA_TIMES_LIMIT\020\376\n\022" +
+      "\035\n\030RET_GACHA_WISH_SAME_ITEM\020\377\n\022 \n\033RET_GA" +
+      "CHA_WISH_INVALID_ITEM\020\200\013\022!\n\034RET_GACHA_MI" +
+      "NORS_TIMES_LIMIT\020\201\013\022\"\n\035RET_GACHA_GENERAL" +
+      "_TIMES_LIMIT\020\202\013\022*\n%RET_GACHA_WISH_IS_NEE" +
+      "DED_BEFORE_GACHA\020\203\013\022&\n!RET_INVESTIGAITON" +
+      "_NOT_IN_PROGRESS\020\335\013\022!\n\034RET_INVESTIGAITON" +
+      "_UNCOMPLETE\020\336\013\022#\n\036RET_INVESTIGAITON_REWA" +
+      "RD_TAKEN\020\337\013\022)\n$RET_INVESTIGAITON_TARGET_" +
+      "STATE_ERROR\020\340\013\022\034\n\027RET_PUSH_TIPS_NOT_FOUN" +
+      "D\020\341\013\022!\n\034RET_SIGN_IN_RECORD_NOT_FOUND\020\342\013\022" +
+      "\037\n\032RET_ALREADY_HAVE_SIGNED_IN\020\343\013\022#\n\036RET_" +
+      "SIGN_IN_COND_NOT_SATISFIED\020\344\013\022&\n!RET_BON" +
+      "US_ACTIVITY_NOT_UNREWARDED\020\345\013\022\031\n\024RET_SIG" +
+      "N_IN_REWARDED\020\346\013\022\027\n\022RET_TOWER_NOT_OPEN\020\361" +
+      "\013\022 \n\033RET_TOWER_HAVE_DAILY_RECORD\020\362\013\022\031\n\024R" +
+      "ET_TOWER_NOT_RECORD\020\363\013\022\032\n\025RET_TOWER_HAVE" +
+      "_RECORD\020\364\013\022\035\n\030RET_TOWER_TEAM_NUM_ERROR\020\365" +
+      "\013\022\035\n\030RET_TOWER_FLOOR_NOT_OPEN\020\366\013\022#\n\036RET_" +
+      "TOWER_NO_FLOOR_STAR_RECORD\020\367\013\022\037\n\032RET_ALR" +
+      "EADY_HAS_TOWER_BUFF\020\370\013\022\036\n\031RET_DUPLICATE_" +
+      "ENTER_LEVEL\020\371\013\022\033\n\026RET_NOT_IN_TOWER_LEVEL" +
+      "\020\372\013\022\027\n\022RET_IN_TOWER_LEVEL\020\373\013\022$\n\037RET_TOWE" +
+      "R_PREV_FLOOR_NOT_FINISH\020\374\013\022\036\n\031RET_TOWER_" +
+      "STAR_NOT_ENOUGH\020\375\013\022 \n\033RET_BATTLE_PASS_NO" +
+      "_SCHEDULE\020\205\014\022\036\n\031RET_BATTLE_PASS_HAS_BUYE" +
+      "D\020\206\014\022#\n\036RET_BATTLE_PASS_LEVEL_OVERFLOW\020\207" +
+      "\014\022$\n\037RET_BATTLE_PASS_PRODUCT_EXPIRED\020\210\014\022" +
+      "\030\n\023RET_MATCH_HOST_QUIT\020\231\014\022\037\n\032RET_MATCH_A" +
+      "LREADY_IN_MATCH\020\232\014\022\033\n\026RET_MATCH_NOT_IN_M" +
+      "ATCH\020\233\014\022 \n\033RET_MATCH_APPLYING_ENTER_MP\020\234" +
+      "\014\022\036\n\031RET_MATCH_INCORRECT_SCENE\020\235\014\022\'\n\"RET" +
+      "_WIDGET_TREASURE_SPOT_NOT_FOUND\020\255\014\022&\n!RE" +
+      "T_WIDGET_TREASURE_ENTITY_EXISTS\020\256\014\022&\n!RE" +
+      "T_WIDGET_TREASURE_SPOT_FAR_AWAY\020\257\014\022\'\n\"RE" +
+      "T_WIDGET_TREASURE_FINISHED_TODAY\020\260\014\022)\n$R" +
+      "ET_WIDGET_QUICK_USE_REQ_PARAM_ERROR\020\261\014\022$" +
+      "\n\037RET_WIDGET_CAMERA_SCAN_ID_ERROR\020\262\014\022\032\n\025" +
+      "RET_WIDGET_NOT_ACTIVE\020\263\014\022\"\n\035RET_WIDGET_F" +
+      "EATHER_NOT_ACTIVE\020\264\014\022+\n&RET_WIDGET_FEATH" +
+      "ER_GADGET_TOO_FAR_AWAY\020\265\014\022(\n#RET_WIDGET_" +
+      "CAPTURE_ANIMAL_NOT_EXIST\020\266\014\022-\n(RET_WIDGE" +
+      "T_CAPTURE_ANIMAL_DROP_BAG_LIMIT\020\267\014\022.\n)RE" +
+      "T_WIDGET_CAPTURE_ANIMAL_CAN_NOT_CAPTURE\020" +
+      "\270\014\022)\n$RET_WIDGET_SKY_CRYSTAL_ALL_COLLECT" +
+      "ED\020\271\014\022.\n)RET_WIDGET_SKY_CRYSTAL_HINT_ALR" +
+      "EADY_EXIST\020\272\014\022%\n RET_WIDGET_SKY_CRYSTAL_" +
+      "NOT_FOUND\020\273\014\022,\n\'RET_WIDGET_SKY_CRYSTAL_N" +
+      "O_HINT_TO_CLEAR\020\274\014\022-\n(RET_WIDGET_LIGHT_S" +
+      "TONE_ENERGY_NOT_ENOUGH\020\275\014\022-\n(RET_WIDGET_" +
+      "TOY_CRYSTAL_ENERGY_NOT_ENOUGH\020\276\014\022,\n\'RET_" +
+      "WIDGET_LIGHT_STONE_LEVEL_NOT_ENOUGH\020\277\014\022." +
+      "\n)RET_WIDGET_QUICK_SLOT_NOT_IN_WIDGET_PA" +
+      "NEL\020\300\014\022\037\n\032RET_ROLE_COMBAT_NOT_RECORD\020\301\014\022" +
+      "&\n!RET_ROLE_COMBAT_COIN_EXCEED_LIMIT\020\302\014\022" +
+      "$\n\037RET_ROLE_COMBAT_COIN_NOT_ENOUGH\020\303\014\022#\n" +
+      "\036RET_ROLE_COMBAT_LEVEL_NOT_MEET\020\304\014\022#\n\036RE" +
+      "T_ROLE_COMBAT_TOWER_NOT_MEET\020\305\014\022&\n!RET_R" +
+      "OLE_COMBAT_SCHEDULE_NOT_MEET\020\306\014\0226\n1RET_R" +
+      "OLE_COMBAT_REQ_FRIEND_RENT_AVATAR_FREQUE" +
+      "NTLY\020\321\014\0220\n+RET_ROLE_COMBAT_REQ_TRIAL_AVA" +
+      "TAR_FREQUENTLY\020\322\014\022-\n(RET_ROLE_COMBAT_REF" +
+      "RESH_COUNT_NOT_ENOUGH\020\323\014\022#\n\036RET_ROLE_COM" +
+      "BAT_QUEST_NOT_MEET\020\324\014\022\037\n\032RET_IN_ROLE_COM" +
+      "BAT_DUNGEON\020\325\014\022+\n&RET_IN_ROLE_COMBAT_DUN" +
+      "GEON_BY_USE_ITEM\020\326\014\022*\n%RET_ROLE_COMBAT_R" +
+      "ENT_AVATAR_NOT_FOUND\020\327\014\022%\n RET_ROLE_COMB" +
+      "AT_CARD_HAS_BLOCKED\020\330\014\022%\n RET_CHAR_MASTE" +
+      "R_KEY_EXCEED_LIMIT\020\337\014\022#\n\036RET_CHAR_MASTER" +
+      "_KEY_NOT_ENOUGH\020\340\014\022\"\n\035RET_CHAR_MASTER_PR" +
+      "EVIEW_IN_CD\020\341\014\022\026\n\021RET_UID_NOT_EXIST\020\321\017\022\030" +
+      "\n\023RET_PARSE_BIN_ERROR\020\322\017\022\037\n\032RET_ACCOUNT_" +
+      "INFO_NOT_EXIST\020\323\017\022\035\n\030RET_ORDER_INFO_NOT_" +
+      "EXIST\020\324\017\022\035\n\030RET_SNAPSHOT_INDEX_ERROR\020\325\017\022" +
+      "\033\n\026RET_MAIL_HAS_BEEN_SENT\020\326\017\022\032\n\025RET_PROD" +
+      "UCT_NOT_EXIST\020\327\017\022\027\n\022RET_UNFINISH_ORDER\020\330" +
+      "\017\022\025\n\020RET_ID_NOT_EXIST\020\331\017\022\032\n\025RET_ORDER_TR" +
+      "ADE_EARLY\020\332\017\022\027\n\022RET_ORDER_FINISHED\020\333\017\022!\n" +
+      "\034RET_GAMESERVER_VERSION_WRONG\020\334\017\022\037\n\032RET_" +
+      "OFFLINE_OP_FULL_LENGTH\020\335\017\022%\n RET_CONCERT" +
+      "_PRODUCT_OBTAIN_LIMIT\020\336\017\022*\n%RET_CONCERT_" +
+      "PRODUCT_TICKET_DUPLICATED\020\337\017\022%\n RET_CONC" +
+      "ERT_PRODUCT_TICKET_EMPTY\020\340\017\022\027\n\022RET_REDIS" +
+      "_MODIFIED\020\211\'\022\034\n\027RET_REDIS_UID_NOT_EXIST\020" +
+      "\212\'\022#\n\036RET_PATHFINDING_DATA_NOT_EXIST\020\361.\022" +
+      "*\n%RET_PATHFINDING_DESTINATION_NOT_EXIST" +
+      "\020\362.\022 \n\033RET_PATHFINDING_ERROR_SCENE\020\363.\022\'\n" +
+      "\"RET_PATHFINDING_SCENE_DATA_LOADING\020\364.\022\036" +
+      "\n\031RET_TOTHEMOON_ERROR_SCENE\020\2351\022#\n\036RET_TO" +
+      "THEMOON_PLAYER_NOT_EXIST\020\2361\022\036\n\031RET_FRIEN" +
+      "D_COUNT_EXCEEDED\020\3316\022\031\n\024RET_PLAYER_NOT_EX" +
+      "IST\020\3326\022!\n\034RET_ALREADY_SENT_ADD_REQUEST\020\333" +
+      "6\022\035\n\030RET_ASK_FRIEND_LIST_FULL\020\3346\022!\n\034RET_" +
+      "PLAYER_ALREADY_IS_FRIEND\020\3356\022\036\n\031RET_PLAYE" +
+      "R_NOT_ASK_FRIEND\020\3366\022#\n\036RET_TARGET_FRIEND" +
+      "_COUNT_EXCEED\020\3376\022\023\n\016RET_NOT_FRIEND\020\3406\022%\n" +
+      " RET_BIRTHDAY_CANNOT_BE_SET_TWICE\020\3416\022\037\n\032" +
+      "RET_CANNOT_ADD_SELF_FRIEND\020\3426\022\032\n\025RET_SIG" +
+      "NATURE_ILLEGAL\020\3436\022%\n RET_PS_PLAYER_CANNO" +
+      "T_ADD_FRIENDS\020\3446\022(\n#RET_PS_PLAYER_CANNOT" +
+      "_REMOVE_FRIENDS\020\3456\022\037\n\032RET_NAME_CARD_NOT_" +
+      "UNLOCKED\020\3466\022\035\n\030RET_ALREADY_IN_BLACKLIST\020" +
+      "\3476\022(\n#RET_PS_PALEYRS_CANNOT_ADD_BLACKLIS" +
+      "T\020\3506\022\036\n\031RET_PLAYER_BLACKLIST_FULL\020\3516\022 \n\033" +
+      "RET_PLAYER_NOT_IN_BLACKLIST\020\3526\022+\n&RET_BL" +
+      "ACKLIST_PLAYER_CANNOT_ADD_FRIEND\020\3536\022\034\n\027R" +
+      "ET_IN_TARGET_BLACKLIST\020\3546\022!\n\034RET_CANNOT_" +
+      "ADD_TARGET_FRIEND\020\3556\022\036\n\031RET_BIRTHDAY_FOR" +
+      "MAT_ERROR\020\3566\022\035\n\030RET_ONLINE_ID_NOT_EXISTS" +
+      "\020\3576\022%\n RET_FIRST_SHARE_REWARD_HAS_TAKEN\020" +
+      "\3606\022*\n%RET_PS_PLAYER_CANNOT_REMOVE_BLACKL" +
+      "IST\020\3616\022\022\n\rRET_REPORT_CD\020\3626\022\037\n\032RET_REPORT" +
+      "_CONTENT_ILLEGAL\020\3636\022\034\n\027RET_REMARK_WORD_I" +
+      "LLEGAL\020\3646\022\030\n\023RET_REMARK_TOO_LONG\020\3656\022\033\n\026R" +
+      "ET_REMARK_UTF_8_ERROR\020\3666\022\030\n\023RET_REMARK_I" +
+      "S_EMPTY\020\3676\022\032\n\025RET_ASK_ADD_FRIEND_CD\020\3706\022#" +
+      "\n\036RET_SHOW_AVATAR_INFO_NOT_EXIST\020\3716\022\037\n\032R" +
+      "ET_PLAYER_NOT_SHOW_AVATAR\020\3726\022*\n%RET_SOCI" +
+      "AL_UPDATE_SHOW_LIST_REPEAT_ID\020\3736\022\031\n\024RET_" +
+      "PSN_ID_NOT_FOUND\020\3746\022*\n%RET_EMOJI_COLLECT" +
+      "ION_NUM_EXCEED_LIMIT\020\3756\022\025\n\020RET_REMARK_EM" +
+      "PTY\020\3766\022 \n\033RET_IN_TARGET_PSN_BLACKLIST\020\3776" +
+      "\022\036\n\031RET_SIGNATURE_NOT_CHANGED\020\2007\022 \n\033RET_" +
+      "SIGNATURE_MONTHLY_LIMIT\020\2017\022%\n RET_REQ_FR" +
+      "IEND_AVATAR_FREQUENTLY\020\2027\022*\n%RET_PSN_GET" +
+      "_PLAYER_SOCIAL_DETAIL_FAIL\020\2037\022%\n RET_PRO" +
+      "FILE_PICTURE_NOT_UNLOCKED\020\2047\022\032\n\025RET_OFFE" +
+      "RING_NOT_OPEN\020\2517\022\035\n\030RET_OFFERING_LEVEL_L" +
+      "IMIT\020\2527\022!\n\034RET_OFFERING_LEVEL_NOT_REACH\020" +
+      "\2537\022!\n\034RET_OFFERING_LEVEL_HAS_TAKEN\020\2547\022&\n" +
+      "!RET_OFFERING_PARI_SEARCH_NOT_OPEN\020\2557\022!\n" +
+      "\034RET_OFFERING_PARI_NOT_FINISH\020\2567\022.\n)RET_" +
+      "OFFERING_PARI_FINISH_REWARD_HAS_TAKEN\020\2577" +
+      "\022(\n#RET_OFFERING_PARI_SEARCH_ALL_FINISH\020" +
+      "\2607\022\'\n\"RET_OFFERING_PARI_NO_FINISH_REWARD" +
+      "\020\2617\022!\n\034RET_CITY_REPUTATION_NOT_OPEN\020\2757\022$" +
+      "\n\037RET_CITY_REPUTATION_LEVEL_TAKEN\020\2767\022(\n#" +
+      "RET_CITY_REPUTATION_LEVEL_NOT_REACH\020\2777\022+" +
+      "\n&RET_CITY_REPUTATION_PARENT_QUEST_TAKEN" +
+      "\020\3007\022.\n)RET_CITY_REPUTATION_PARENT_QUEST_" +
+      "UNFINISH\020\3017\022\'\n\"RET_CITY_REPUTATION_ACCEP" +
+      "T_REQUEST\020\3027\022+\n&RET_CITY_REPUTATION_NOT_" +
+      "ACCEPT_REQUEST\020\3037\022-\n(RET_CITY_REPUTATION" +
+      "_ACCEPT_REQUEST_LIMIT\020\3047\022*\n%RET_CITY_REP" +
+      "UTATION_ENTRANCE_NOT_OPEN\020\3057\022-\n(RET_CITY" +
+      "_REPUTATION_TAKEN_REQUEST_REWARD\020\3067\022%\n R" +
+      "ET_CITY_REPUTATION_SWITCH_CLOSE\020\3077\022-\n(RE" +
+      "T_CITY_REPUTATION_ENTRACE_SWITCH_CLOSE\020\310" +
+      "7\022-\n(RET_CITY_REPUTATION_TAKEN_EXPLORE_R" +
+      "EWARD\020\3117\022*\n%RET_CITY_REPUTATION_EXPLORE_" +
+      "NOT_REACH\020\3127\022#\n\036RET_TRIBAL_REPUTATION_NO" +
+      "T_OPEN\020\3137\022&\n!RET_TRIBAL_REPUTATION_LEVEL" +
+      "_TAKEN\020\3147\022*\n%RET_TRIBAL_REPUTATION_LEVEL" +
+      "_NOT_REACH\020\3157\022/\n*RET_TRIBAL_REPUTATION_T" +
+      "AKEN_EXPLORE_REWARD\020\3167\022,\n\'RET_TRIBAL_REP" +
+      "UTATION_EXPLORE_NOT_REACH\020\3177\022-\n(RET_TRIB" +
+      "AL_REPUTATION_PARENT_QUEST_TAKEN\020\2418\0220\n+R" +
+      "ET_TRIBAL_REPUTATION_PARENT_QUEST_UNFINI" +
+      "SH\020\2428\022(\n#RET_CITY_REPUTATION_NOT_OPEN_TR" +
+      "IBAL\020\2438\022(\n#RET_CITY_REPUTATION_NO_THE_DO" +
+      "NATION\020\2448\022*\n%RET_CITY_REPUTATION_DONATIO" +
+      "N_FINISHED\020\2458\022\'\n\"RET_CITY_REPUTATION_DON" +
+      "ATION_LIMIT\020\2468\022+\n&RET_CITY_REPUTATION_TO" +
+      "TAL_REWARD_TAKEN\020\2478\022/\n*RET_CITY_REPUTATI" +
+      "ON_TOTAL_REWARD_NOT_REACH\020\2508\022#\n\036RET_CITY" +
+      "_REPUTATION_LEVEL_FULL\020\2518\022%\n RET_TRIBAL_" +
+      "REPUTATION_LEVEL_FULL\020\2528\022\034\n\027RET_MECHANIC" +
+      "US_NOT_OPEN\020\3207\022\037\n\032RET_MECHANICUS_GEAR_UN" +
+      "LOCK\020\3217\022\035\n\030RET_MECHANICUS_GEAR_LOCK\020\3227\022$" +
+      "\n\037RET_MECHANICUS_GEAR_LEVEL_LIMIT\020\3237\022#\n\036" +
+      "RET_MECHANICUS_COIN_NOT_ENOUGH\020\3247\022\037\n\032RET" +
+      "_MECHANICUS_NO_SEQUENCE\020\3257\022(\n#RET_MECHAN" +
+      "ICUS_SEQUENCE_LIMIT_LEVEL\020\3267\022\'\n\"RET_MECH" +
+      "ANICUS_SEQUENCE_LIMIT_OPEN\020\3277\022)\n$RET_MEC" +
+      "HANICUS_DIFFICULT_NOT_SUPPORT\020\3307\022%\n RET_" +
+      "MECHANICUS_TICKET_NOT_ENOUGH\020\3317\022$\n\037RET_M" +
+      "ECHANICUS_TEACH_NOT_FINISH\020\3327\022\"\n\035RET_MEC" +
+      "HANICUS_TEACH_FINISHED\020\3337\022.\n)RET_MECHANI" +
+      "CUS_PREV_DIFFICULT_LEVEL_BLOCK\020\3347\022 \n\033RET" +
+      "_MECHANICUS_PLAYER_LIMIT\020\3357\022\037\n\032RET_MECHA" +
+      "NICUS_PUNISH_TIME\020\3367\022 \n\033RET_MECHANICUS_S" +
+      "WITCH_CLOSE\020\3377\022)\n$RET_MECHANICUS_BATTLE_" +
+      "NOT_IN_DUNGEON\020\3567\022)\n$RET_MECHANICUS_BATT" +
+      "LE_PLAY_NOT_FOUND\020\3577\022.\n)RET_MECHANICUS_B" +
+      "ATTLE_DUPLICATE_PICK_CARD\020\3607\022-\n(RET_MECH" +
+      "ANICUS_BATTLE_PLAYER_NOT_IN_PLAY\020\3617\022-\n(R" +
+      "ET_MECHANICUS_BATTLE_CARD_NOT_AVAILABLE\020" +
+      "\3627\022,\n\'RET_MECHANICUS_BATTLE_NOT_IN_CARD_" +
+      "STAGE\020\3637\022*\n%RET_MECHANICUS_BATTLE_CARD_I" +
+      "S_WAITING\020\3647\022-\n(RET_MECHANICUS_BATTLE_CA" +
+      "RD_ALL_CONFIRMED\020\3657\0221\n,RET_MECHANICUS_BA" +
+      "TTLE_CARD_ALREADY_CONFIRMED\020\3667\0222\n-RET_ME" +
+      "CHANICUS_BATTLE_CARD_CONFIRMED_BY_OTHER\020" +
+      "\3677\0221\n,RET_MECHANICUS_BATTLE_CARD_NOT_ENO" +
+      "UGH_POINTS\020\3707\022/\n*RET_MECHANICUS_BATTLE_C" +
+      "ARD_ALREADY_SKIPPED\020\3717\022!\n\034RET_LEGENDARY_" +
+      "KEY_NOT_ENOUGH\020\301>\022#\n\036RET_LEGENDARY_KEY_E" +
+      "XCEED_LIMIT\020\302>\022(\n#RET_DAILY_TASK_NOT_ENO" +
+      "UGH_TO_REDEEM\020\303>\022%\n RET_PERSONAL_LINE_OP" +
+      "EN_STATE_OFF\020\304>\022\'\n\"RET_PERSONAL_LINE_LEV" +
+      "EL_NOT_ENOUGH\020\305>\022\037\n\032RET_PERSONAL_LINE_NO" +
+      "T_OPEN\020\306>\022+\n&RET_PERSONAL_LINE_PRE_QUEST" +
+      "_NOT_FINISH\020\307>\022+\n&RET_HUNTING_ALREADY_FI" +
+      "NISH_OFFER_LIMIT\020\211@\022%\n RET_HUNTING_HAS_U" +
+      "NFINISHED_OFFER\020\212@\022*\n%RET_HUNTING_FAILED" +
+      "_OFFER_NOT_CD_READY\020\213@\022\037\n\032RET_HUNTING_NO" +
+      "T_TAKE_OFFER\020\214@\022\"\n\035RET_HUNTING_CANNOT_TA" +
+      "KE_TWICE\020\215@\022*\n%RET_RPIVATE_CHAT_INVALID_" +
+      "CONTENT_TYPE\020\305E\022*\n%RET_PRIVATE_CHAT_TARG" +
+      "ET_IS_NOT_FRIEND\020\306E\022+\n&RET_PRIVATE_CHAT_" +
+      "CONTENT_NOT_SUPPORTED\020\307E\022&\n!RET_PRIVATE_" +
+      "CHAT_CONTENT_TOO_LONG\020\310E\022#\n\036RET_PRIVATE_" +
+      "CHAT_PULL_TOO_FAST\020\311E\022!\n\034RET_PRIVATE_CHA" +
+      "T_REPEAT_READ\020\312E\022%\n RET_PRIVATE_CHAT_REA" +
+      "D_NOT_FRIEND\020\313E\022\031\n\024RET_REUNION_FINISHED\020" +
+      "\251F\022\036\n\031RET_REUNION_NOT_ACTIVATED\020\252F\022*\n%RE" +
+      "T_REUNION_ALREADY_TAKE_FIRST_REWARD\020\253F\022!" +
+      "\n\034RET_REUNION_SIGN_IN_REWARDED\020\254F\022!\n\034RET" +
+      "_REUNION_WATCHER_REWARDED\020\255F\022#\n\036RET_REUN" +
+      "ION_WATCHER_NOT_FINISH\020\256F\022!\n\034RET_REUNION" +
+      "_MISSION_REWARDED\020\257F\022#\n\036RET_REUNION_MISS" +
+      "ION_NOT_FINISH\020\260F\022,\n\'RET_REUNION_WATCHER" +
+      "_REWARD_NOT_UNLOCKED\020\261F\022 \n\033RET_BLESSING_" +
+      "CONTENT_CLOSED\020\215G\022\034\n\027RET_BLESSING_NOT_AC" +
+      "TIVE\020\216G\022\"\n\035RET_BLESSING_NOT_TODAY_ENTITY" +
+      "\020\217G\022.\n)RET_BLESSING_ENTITY_EXCEED_SCAN_N" +
+      "UM_LIMIT\020\220G\022-\n(RET_BLESSING_DAILY_SCAN_N" +
+      "UM_EXCEED_LIMIT\020\221G\0220\n+RET_BLESSING_REDEE" +
+      "M_REWARD_NUM_EXCEED_LIMIT\020\222G\022+\n&RET_BLES" +
+      "SING_REDEEM_PIC_NUM_NOT_ENOUGH\020\223G\022 \n\033RET" +
+      "_BLESSING_PIC_NOT_ENOUGH\020\224G\022\"\n\035RET_BLESS" +
+      "ING_PIC_HAS_RECEIVED\020\225G\022(\n#RET_BLESSING_" +
+      "TARGET_RECV_NUM_EXCEED\020\226G\022\'\n\"RET_FLEUR_F" +
+      "AIR_CREDIT_EXCEED_LIMIT\020\227G\022%\n RET_FLEUR_" +
+      "FAIR_CREDIT_NOT_ENOUGH\020\230G\022&\n!RET_FLEUR_F" +
+      "AIR_TOKEN_EXCEED_LIMIT\020\231G\022$\n\037RET_FLEUR_F" +
+      "AIR_TOKEN_NOT_ENOUGH\020\232G\022%\n RET_FLEUR_FAI" +
+      "R_MINIGAME_NOT_OPEN\020\233G\0224\n/RET_FLEUR_FAIR" +
+      "_MUSIC_GAME_DIFFICULTY_NOT_UNLOCK\020\234G\022\"\n\035" +
+      "RET_FLEUR_FAIR_DUNGEON_LOCKED\020\235G\022\'\n\"RET_" +
+      "FLEUR_FAIR_DUNGEON_PUNISH_TIME\020\236G\0222\n-RET" +
+      "_FLEUR_FAIR_ONLY_OWNER_CAN_RESTART_MINIG" +
+      "AM\020\237G\022\'\n\"RET_WATER_SPIRIT_COIN_EXCEED_LI" +
+      "MIT\020\240G\022%\n RET_WATER_SPIRIT_COIN_NOT_ENOU" +
+      "GH\020\241G\022 \n\033RET_REGION_SEARCH_NO_SEARCH\020\242G\022" +
+      "\"\n\035RET_REGION_SEARCH_STATE_ERROR\020\243G\022\"\n\035R" +
+      "ET_BLESSING_GIVE_NUM_INVALID\020\244G\022#\n\036RET_B" +
+      "LESSING_NO_GROUP_OR_OWNER\020\245G\0224\n/RET_CHAN" +
+      "NELLER_SLAB_LOOP_DUNGEON_STAGE_NOT_OPEN\020" +
+      "\252G\022.\n)RET_CHANNELLER_SLAB_LOOP_DUNGEON_N" +
+      "OT_OPEN\020\253G\022A\n<RET_CHANNELLER_SLAB_LOOP_D" +
+      "UNGEON_FIRST_PASS_REWARD_HAS_TAKEN\020\254G\022<\n" +
+      "7RET_CHANNELLER_SLAB_LOOP_DUNGEON_SCORE_" +
+      "REWARD_HAS_TAKEN\020\255G\0220\n+RET_CHANNELLER_SL" +
+      "AB_INVALID_ONE_OFF_DUNGEON\020\256G\022-\n(RET_CHA" +
+      "NNELLER_SLAB_ONE_OFF_DUNGEON_DONE\020\257G\0227\n2" +
+      "RET_CHANNELLER_SLAB_ONE_OFF_DUNGEON_STAG" +
+      "E_NOT_OPEN\020\260G\022+\n&RET_CHANNELLER_SLAB_TOK" +
+      "EN_EXCEED_LIMIT\020\261G\022)\n$RET_CHANNELLER_SLA" +
+      "B_TOKEN_NOT_ENOUGH\020\262G\0226\n1RET_CHANNELLER_" +
+      "SLAB_PLAYER_NOT_IN_ONE_OFF_DUNGEON\020\263G\0223\n" +
+      ".RET_MIST_TRIAL_SELECT_CHARACTER_NUM_NOT" +
+      "_ENOUGH\020\276G\022.\n)RET_MIST_TRIAL_ALREADY_USI" +
+      "NG_TRIAL_AVATAR\020\277G\022$\n\037RET_HIDE_AND_SEEK_" +
+      "PLAY_NOT_OPEN\020\310G\022(\n#RET_HIDE_AND_SEEK_PL" +
+      "AY_MAP_NOT_OPEN\020\311G\022*\n%RET_HIDE_AND_SEEK_" +
+      "PLAY_MAP_NOT_CHOSEN\020\312G\022-\n(RET_SUMMER_TIM" +
+      "E_DRAFT_WOORD_EXCEED_LIMIT\020\322G\022+\n&RET_SUM" +
+      "MER_TIME_DRAFT_WOORD_NOT_ENOUGH\020\323G\0220\n+RE" +
+      "T_SUMMER_TIME_MINI_HARPASTUM_EXCEED_LIMI" +
+      "T\020\324G\022-\n(RET_SUMMER_TIME_MINI_HARPASTUMNO" +
+      "T_ENOUGH\020\325G\022+\n&RET_BOUNCE_CONJURING_COIN" +
+      "_EXCEED_LIMIT\020\334G\022)\n$RET_BOUNCE_CONJURING" +
+      "_COIN_NOT_ENOUGH\020\335G\022!\n\034RET_CHESS_TEACH_M" +
+      "AP_FINISHED\020\337G\022#\n\036RET_CHESS_TEACH_MAP_UN" +
+      "FINISHED\020\340G\022 \n\033RET_CHESS_COIN_EXCEED_LIM" +
+      "IT\020\341G\022\036\n\031RET_CHESS_COIN_NOT_ENOUGH\020\342G\022\035\n" +
+      "\030RET_CHESS_IN_PUNISH_TIME\020\343G\022\"\n\035RET_CHES" +
+      "S_PREV_MAP_UNFINISHED\020\344G\022\031\n\024RET_CHESS_MA" +
+      "P_LOCKED\020\345G\022\034\n\027RET_BLITZ_RUSH_NOT_OPEN\020\350" +
+      "G\022$\n\037RET_BLITZ_RUSH_DUNGEON_NOT_OPEN\020\351G\022" +
+      "\'\n\"RET_BLITZ_RUSH_COIN_A_EXCEED_LIMIT\020\352G" +
+      "\022\'\n\"RET_BLITZ_RUSH_COIN_B_EXCEED_LIMIT\020\353" +
+      "G\022%\n RET_BLITZ_RUSH_COIN_A_NOT_ENOUGH\020\354G" +
+      "\022%\n RET_BLITZ_RUSH_COIN_B_NOT_ENOUGH\020\355G\022" +
+      "&\n!RET_MIRACLE_RING_VALUE_NOT_ENOUGH\020\361G\022" +
+      "\030\n\023RET_MIRACLE_RING_CD\020\362G\022&\n!RET_MIRACLE" +
+      "_RING_REWARD_NOT_TAKEN\020\363G\022!\n\034RET_MIRACLE" +
+      "_RING_NOT_DELIVER\020\364G\022$\n\037RET_MIRACLE_RING" +
+      "_DELIVER_EXCEED\020\365G\022!\n\034RET_MIRACLE_RING_H" +
+      "AS_CREATED\020\366G\022%\n RET_MIRACLE_RING_HAS_NO" +
+      "T_CREATED\020\367G\022\037\n\032RET_MIRACLE_RING_NOT_YOU" +
+      "RS\020\370G\022\'\n\"RET_GADGET_FOUNDATION_UNAUTHORI" +
+      "ZED\020\243H\022*\n%RET_GADGET_FOUNDATION_SCENE_NO" +
+      "T_FOUND\020\244H\022,\n\'RET_GADGET_FOUNDATION_NOT_" +
+      "IN_INIT_STATE\020\245H\0224\n/RET_GADGET_FOUNDATIO" +
+      "N_BILDING_POINT_NOT_ENOUGHT\020\246H\022-\n(RET_GA" +
+      "DGET_FOUNDATION_NOT_IN_BUILT_STATE\020\247H\022+\n" +
+      "&RET_GADGET_FOUNDATION_OP_NOT_SUPPORTED\020" +
+      "\250H\0222\n-RET_GADGET_FOUNDATION_REQ_PLAYER_N" +
+      "OT_IN_SCENE\020\251H\0223\n.RET_GADGET_FOUNDATION_" +
+      "LOCKED_BY_ANOTHER_PLAYER\020\252H\022%\n RET_GADGE" +
+      "T_FOUNDATION_NOT_LOCKED\020\253H\022)\n$RET_GADGET" +
+      "_FOUNDATION_DUPLICATE_LOCK\020\254H\022+\n&RET_GAD" +
+      "GET_FOUNDATION_PLAYER_NOT_FOUND\020\255H\0220\n+RE" +
+      "T_GADGET_FOUNDATION_PLAYER_GEAR_NOT_FOUN" +
+      "D\020\256H\022+\n&RET_GADGET_FOUNDATION_ROTAION_DI" +
+      "SABLED\020\257H\0223\n.RET_GADGET_FOUNDATION_REACH" +
+      "_DUNGEON_GEAR_LIMIT\020\260H\0222\n-RET_GADGET_FOU" +
+      "NDATION_REACH_SINGLE_GEAR_LIMIT\020\261H\022,\n\'RE" +
+      "T_GADGET_FOUNDATION_ROTATION_ON_GOING\020\262H" +
+      "\022$\n\037RET_OP_ACTIVITY_BONUS_NOT_FOUND\020\325H\022\035" +
+      "\n\030RET_OP_ACTIVITY_NOT_OPEN\020\326H\022,\n\'RET_MUL" +
+      "TISTAGE_PLAY_PLAYER_NOT_IN_SCENE\020\235J\022\"\n\035R" +
+      "ET_MULTISTAGE_PLAY_NOT_FOUND\020\236J\022\'\n\"RET_M" +
+      "ULTISTAGE_PLAY_IN_OTHER_STAGE\020\237J\022\036\n\031RET_" +
+      "COOP_CHAPTER_NOT_OPEN\020\201K\022\033\n\026RET_COOP_CON" +
+      "D_NOT_MEET\020\202K\022\032\n\025RET_COOP_POINT_LOCKED\020\203" +
+      "K\022\037\n\032RET_COOP_NOT_HAVE_PROGRESS\020\204K\022\036\n\031RE" +
+      "T_COOP_REWARD_HAS_TAKEN\020\205K\022\037\n\032RET_DRAFT_" +
+      "HAS_ACTIVE_DRAFT\020\263K\022\036\n\031RET_DRAFT_NOT_IN_" +
+      "MY_WORLD\020\264K\022\035\n\030RET_DRAFT_NOT_SUPPORT_MP\020" +
+      "\265K\022 \n\033RET_DRAFT_PLAYER_NOT_ENOUGH\020\266K\022\036\n\031" +
+      "RET_DRAFT_INCORRECT_SCENE\020\267K\022$\n\037RET_DRAF" +
+      "T_OTHER_PLAYER_ENTERING\020\270K\022$\n\037RET_DRAFT_" +
+      "GUEST_IS_TRANSFERRING\020\271K\022\'\n\"RET_DRAFT_GU" +
+      "EST_NOT_IN_DRAFT_SCENE\020\272K\022\037\n\032RET_DRAFT_I" +
+      "NVITE_OVER_TIME\020\273K\022\'\n\"RET_DRAFT_TWICE_CO" +
+      "NFIRM_OVER_TIMER\020\274K\022\'\n\"RET_DRAFT_GUEST_N" +
+      "OT_IN_WORLD_SCENE\020\275K\022\024\n\017RET_HOME_UNKOWN\020" +
+      "\345K\022\"\n\035RET_HOME_INVALID_CLIENT_PARAM\020\346K\022&" +
+      "\n!RET_HOME_TARGE_PLAYER_HAS_NO_HOME\020\347K\022\030" +
+      "\n\023RET_HOME_NOT_ONLINE\020\350K\022\031\n\024RET_HOME_PLA" +
+      "YER_FULL\020\351K\022\025\n\020RET_HOME_BLOCKED\020\352K\022*\n%RE" +
+      "T_HOME_ALREADY_IN_TARGET_HOME_WORLD\020\353K\022\032" +
+      "\n\025RET_HOME_IN_EDIT_MODE\020\354K\022\036\n\031RET_HOME_N" +
+      "OT_IN_EDIT_MODE\020\355K\022\027\n\022RET_HOME_HAS_GUEST" +
+      "\020\356K\022(\n#RET_HOME_CANT_ENTER_BY_IN_EDIT_MO" +
+      "DE\020\357K\022\"\n\035RET_HOME_CLIENT_PARAM_INVALID\020\360" +
+      "K\022&\n!RET_HOME_PLAYER_NOT_IN_HOME_WORLD\020\361" +
+      "K\022+\n&RET_HOME_PLAYER_NOT_IN_SELF_HOME_WO" +
+      "RLD\020\362K\022\036\n\031RET_HOME_NOT_FOUND_IN_MEM\020\363K\022\'" +
+      "\n\"RET_HOME_PLAYER_IN_HOME_ROOM_SCENE\020\364K\022" +
+      "%\n RET_HOME_HOME_REFUSE_GUEST_ENTER\020\365K\022(" +
+      "\n#RET_HOME_OWNER_REFUSE_TO_ENTER_HOME\020\366K" +
+      "\022\033\n\026RET_HOME_OWNER_OFFLINE\020\367K\022$\n\037RET_HOM" +
+      "E_FURNITURE_EXCEED_LIMIT\020\370K\022(\n#RET_HOME_" +
+      "FURNITURE_COUNT_NOT_ENOUGH\020\371K\022\"\n\035RET_HOM" +
+      "E_IN_TRY_ENTER_PROCESS\020\372K\022%\n RET_HOME_AL" +
+      "READY_IN_TARGET_SCENE\020\373K\022\037\n\032RET_HOME_COI" +
+      "N_EXCEED_LIMIT\020\374K\022\035\n\030RET_HOME_COIN_NOT_E" +
+      "NOUGH\020\375K\022!\n\034RET_HOME_MODULE_NOT_UNLOCKED" +
+      "\020\376K\022\037\n\032RET_HOME_CUR_MODULE_CLOSED\020\377K\022*\n%" +
+      "RET_HOME_FURNITURE_SUITE_NOT_UNLOCKED\020\200L" +
+      "\022\026\n\021RET_HOME_IN_MATCH\020\201L\022\027\n\022RET_HOME_IN_" +
+      "COMBAT\020\202L\022\032\n\025RET_HOME_EDIT_MODE_CD\020\203L\022!\n" +
+      "\034RET_HOME_UPDATE_FURNITURE_CD\020\204L\022#\n\036RET_" +
+      "HOME_BLOCK_FURNITURE_LIMIT\020\205L\022\031\n\024RET_HOM" +
+      "E_NOT_SUPPORT\020\206L\022\034\n\027RET_HOME_STATE_NOT_O" +
+      "PEN\020\207L\022#\n\036RET_HOME_TARGET_STATE_NOT_OPEN" +
+      "\020\210L\022)\n$RET_HOME_APPLY_ENTER_OTHER_HOME_F" +
+      "AIL\020\211L\022 \n\033RET_HOME_SAVE_NO_MAIN_HOUSE\020\212L" +
+      "\022\030\n\023RET_HOME_IN_DUNGEON\020\213L\022!\n\034RET_HOME_A" +
+      "NY_GALLERY_STARTED\020\214L\022\036\n\031RET_HOME_QUEST_" +
+      "BLOCK_HOME\020\215L\022!\n\034RET_HOME_WAITING_PRIOR_",
+      "CHECK\020\216L\022#\n\036RET_HOME_PERSISTENT_CHECK_FA" +
+      "IL\020\217L\022#\n\036RET_HOME_FIND_ONLINE_HOME_FAIL\020" +
+      "\220L\022\035\n\030RET_HOME_JOIN_SCENE_FAIL\020\221L\022\030\n\023RET" +
+      "_HOME_MAX_PLAYER\020\222L\022\031\n\024RET_HOME_IN_TRANS" +
+      "FER\020\223L\022&\n!RET_HOME_ANY_HOME_GALLERY_STAR" +
+      "TED\020\224L\022$\n\037RET_HOME_CAN_NOT_ENTER_IN_AUDI" +
+      "T\020\225L\022#\n\036RET_FURNITURE_MAKE_INDEX_ERROR\020\226" +
+      "L\022\036\n\031RET_FURNITURE_MAKE_LOCKED\020\227L\022$\n\037RET" +
+      "_FURNITURE_MAKE_CONFIG_ERROR\020\230L\022!\n\034RET_F" +
+      "URNITURE_MAKE_SLOT_FULL\020\231L\022*\n%RET_FURNIT" +
+      "URE_MAKE_ADD_FURNITURE_FAIL\020\232L\022 \n\033RET_FU" +
+      "RNITURE_MAKE_UNFINISH\020\233L\022!\n\034RET_FURNITUR" +
+      "E_MAKE_IS_FINISH\020\234L\022+\n&RET_FURNITURE_MAK" +
+      "E_NOT_IN_CORRECT_HOME\020\235L\022 \n\033RET_FURNITUR" +
+      "E_MAKE_NO_COUNT\020\236L\022(\n#RET_FURNITURE_MAKE" +
+      "_ACCELERATE_LIMIT\020\237L\022$\n\037RET_FURNITURE_MA" +
+      "KE_NO_MAKE_DATA\020\240L\022 \n\033RET_HOME_LIMITED_S" +
+      "HOP_CLOSE\020\241L\022\035\n\030RET_HOME_AVATAR_NOT_SHOW" +
+      "\020\242L\022&\n!RET_HOME_EVENT_COND_NOT_SATISFIED" +
+      "\020\243L\022*\n%RET_HOME_INVALID_ARRANGE_ANIMAL_P" +
+      "ARAM\020\244L\022\'\n\"RET_HOME_INVALID_ARRANGE_NPC_" +
+      "PARAM\020\245L\022)\n$RET_HOME_INVALID_ARRANGE_SUI" +
+      "TE_PARAM\020\246L\022.\n)RET_HOME_INVALID_ARRANGE_" +
+      "MAIN_HOUSE_PARAM\020\247L\022#\n\036RET_HOME_AVATAR_S" +
+      "TATE_NOT_OPEN\020\250L\022#\n\036RET_HOME_PLANT_FIELD" +
+      "_NOT_EMPTY\020\251L\022\037\n\032RET_HOME_PLANT_FIELD_EM" +
+      "PTY\020\252L\022$\n\037RET_HOME_PLANT_FIELD_TYPE_ERRO" +
+      "R\020\253L\022#\n\036RET_HOME_PLANT_TIME_NOT_ENOUGH\020\254" +
+      "L\022,\n\'RET_HOME_PLANT_SUB_FIELD_NUM_NOT_EN" +
+      "OUGH\020\255L\022%\n RET_HOME_PLANT_FIELD_PARAM_ER" +
+      "ROR\020\256L\022\"\n\035RET_HOME_FURNITURE_GUID_ERROR\020" +
+      "\257L\022%\n RET_HOME_FURNITURE_ARRANGE_LIMIT\020\260" +
+      "L\022 \n\033RET_HOME_FISH_FARMING_LIMIT\020\261L\022#\n\036R" +
+      "ET_HOME_FISH_COUNT_NOT_ENOUGH\020\262L\022\"\n\035RET_" +
+      "HOME_FURNITURE_COST_LIMIT\020\263L\022&\n!RET_HOME" +
+      "_CUSTOM_FURNITURE_INVALID\020\264L\022)\n$RET_HOME" +
+      "_INVALID_ARRANGE_GROUP_PARAM\020\265L\022+\n&RET_H" +
+      "OME_FURNITURE_ARRANGE_GROUP_LIMIT\020\266L\0220\n+" +
+      "RET_HOME_PICTURE_FRAME_COOP_CG_GENDER_ER" +
+      "ROR\020\267L\022.\n)RET_HOME_PICTURE_FRAME_COOP_CG" +
+      "_NOT_UNLOCK\020\270L\022&\n!RET_HOME_FURNITURE_CAN" +
+      "NOT_ARRANGE\020\271L\022*\n%RET_HOME_FURNITURE_IN_" +
+      "DUPLICATE_SUITE\020\272L\022.\n)RET_HOME_FURNITURE" +
+      "_CUSTOM_SUITE_TOO_SMALL\020\273L\022,\n\'RET_HOME_F" +
+      "URNITURE_CUSTOM_SUITE_TOO_BIG\020\274L\022*\n%RET_" +
+      "HOME_FURNITURE_SUITE_EXCEED_LIMIT\020\275L\0221\n," +
+      "RET_HOME_FURNITURE_CUSTOM_SUITE_EXCEED_L" +
+      "IMIT\020\276L\0229\n4RET_HOME_FURNITURE_CUSTOM_SUI" +
+      "TE_INVALID_SURFACE_TYPE\020\277L\022\036\n\031RET_HOME_B" +
+      "GM_ID_NOT_FOUND\020\300L\022\036\n\031RET_HOME_BGM_NOT_U" +
+      "NLOCKED\020\301L\022%\n RET_HOME_BGM_FURNITURE_NOT" +
+      "_FOUND\020\302L\022*\n%RET_HOME_BGM_NOT_SUPPORT_BY" +
+      "_CUR_SCENE\020\303L\022(\n#RET_HOME_LIMITED_SHOP_G" +
+      "OODS_DISABLE\020\304L\022\'\n\"RET_HOME_WORLD_WOOD_M" +
+      "ATERIAL_EMPTY\020\305L\022+\n&RET_HOME_WORLD_WOOD_" +
+      "MATERIAL_NOT_FOUND\020\306L\022/\n*RET_HOME_WORLD_" +
+      "WOOD_MATERIAL_COUNT_INVALID\020\307L\022.\n)RET_HO" +
+      "ME_WORLD_WOOD_EXCHANGE_EXCEED_LIMIT\020\310L\022#" +
+      "\n\036RET_HOME_BLUEPRINT_SEARCH_SELF\020\311L\022*\n%R" +
+      "ET_HOME_BLUEPRINT_SHARE_CODE_INVALID\020\312L\022" +
+      "!\n\034RET_HOME_BLUEPRINT_NOT_EXIST\020\313L\0221\n,RE" +
+      "T_HOME_BLUEPRINT_SLOT_HAS_EXIST_SHARE_CO" +
+      "DE\020\314L\0221\n,RET_HOME_BLUEPRINT_SLOT_NOT_EXI" +
+      "ST_SHARE_CODE\020\315L\022/\n*RET_HOME_BLUEPRINT_C" +
+      "AN_NOT_CREATE_IN_AUDIT\020\316L\022 \n\033RET_HOME_BL" +
+      "OCK_NOT_UNLOCKED\020\317L\022!\n\034RET_HOME_BLUEPRIN" +
+      "T_CREATE_CD\020\320L\022%\n RET_HOME_BLUEPRINT_SET" +
+      "_OPTION_CD\020\321L\022-\n(RET_HOME_BLUEPRINT_NOT_" +
+      "ALLOW_FRIEND_COPY\020\322L\022\'\n\"RET_HOME_FURNITU" +
+      "RE_POS_UNDER_DIE_Y\020\323L\022+\n&RET_HOME_BLUEPR" +
+      "INT_GEN_SHARE_CODE_FAIL\020\324L\022!\n\034RET_HOME_B" +
+      "LUEPRINT_SEARCH_CD\020\325L\022\"\n\035RET_HOME_BLUEPR" +
+      "INT_PREVIEW_CD\020\326L\022/\n*RET_HOME_BLUEPRINT_" +
+      "PREVIEW_SCENE_NOT_MATCH\020\327L\022!\n\034RET_HOME_B" +
+      "LUEPRINT_SLOT_FULL\020\330L\022)\n$RET_HOME_BLUEPR" +
+      "INT_OWNER_REJECT_COPY\020\331L\022\'\n\"RET_HOME_BLU" +
+      "EPRINT_SAVE_TO_SLOT_CD\020\332L\022%\n RET_HOME_BL" +
+      "UEPRINT_REPLY_TIMEOUT\020\333L\022%\n RET_SUMO_ACT" +
+      "IVITY_STAGE_NOT_OPEN\020\220N\022(\n#RET_SUMO_ACTI" +
+      "VITY_SWITCH_TEAM_IN_CD\020\221N\022)\n$RET_SUMO_AC" +
+      "TIVITY_TEAM_NUM_INCORRECT\020\222N\022)\n$RET_LUNA" +
+      "_RITE_ACTIVITY_AREA_ID_ERROR\020\224N\022-\n(RET_L" +
+      "UNA_RITE_ACTIVITY_BATTLE_NOT_FINISH\020\225N\022-" +
+      "\n(RET_LUNA_RITE_ACTIVITY_ALREADY_SACRIFI" +
+      "CE\020\226N\022/\n*RET_LUNA_RITE_ACTIVITY_ALREADY_" +
+      "TAKE_REWARD\020\227N\0220\n+RET_LUNA_RITE_ACTIVITY" +
+      "_SACRIFICE_NOT_ENOUGH\020\230N\0223\n.RET_LUNA_RIT" +
+      "E_ACTIVITY_SEARCHING_COND_NOT_MEET\020\231N\022\'\n" +
+      "\"RET_DIG_GADGET_CONFIG_ID_NOT_MATCH\020\237N\022\"" +
+      "\n\035RET_DIG_FIND_NEAREST_POS_FAIL\020\240N\022\"\n\035RE" +
+      "T_MUSIC_GAME_LEVEL_NOT_OPEN\020\245N\022$\n\037RET_MU" +
+      "SIC_GAME_LEVEL_NOT_UNLOCK\020\246N\022%\n RET_MUSI" +
+      "C_GAME_LEVEL_NOT_STARTED\020\247N\022*\n%RET_MUSIC" +
+      "_GAME_LEVEL_CONFIG_NOT_FOUND\020\250N\022&\n!RET_M" +
+      "USIC_GAME_LEVEL_ID_NOT_MATCH\020\251N\022$\n\037RET_R" +
+      "OGUELIKE_COIN_A_NOT_ENOUGH\020\257N\022$\n\037RET_ROG" +
+      "UELIKE_COIN_B_NOT_ENOUGH\020\260N\022$\n\037RET_ROGUE" +
+      "LIKE_COIN_C_NOT_ENOUGH\020\261N\022&\n!RET_ROGUELI" +
+      "KE_COIN_A_EXCEED_LIMIT\020\262N\022&\n!RET_ROGUELI" +
+      "KE_COIN_B_EXCEED_LIMIT\020\263N\022&\n!RET_ROGUELI" +
+      "KE_COIN_C_EXCEED_LIMIT\020\264N\022(\n#RET_ROGUELI" +
+      "KE_RUNE_COUNT_NOT_ENOUGH\020\265N\022\'\n\"RET_ROGUE" +
+      "LIKE_NOT_IN_ROGUE_DUNGEON\020\266N\022!\n\034RET_ROGU" +
+      "ELIKE_CELL_NOT_FOUND\020\267N\022&\n!RET_ROGUELIKE" +
+      "_CELL_TYPE_INCORRECT\020\270N\022(\n#RET_ROGUELIKE" +
+      "_CELL_ALREADY_FINISHED\020\271N\0223\n.RET_ROGUELI" +
+      "KE_DUNGEON_HAVE_UNFINISHED_PROGRESS\020\272N\022%" +
+      "\n RET_ROGUELIKE_STAGE_NOT_FINISHED\020\273N\0224\n" +
+      "/RET_ROGUELIKE_STAGE_FIRST_PASS_REWARD_H" +
+      "AS_TAKEN\020\275N\022*\n%RET_ROGUELIKE_ACTIVITY_CO" +
+      "NTENT_CLOSED\020\276N\0221\n,RET_ROGUELIKE_DUNGEON" +
+      "_PRE_QUEST_NOT_FINISHED\020\277N\022#\n\036RET_ROGUEL" +
+      "IKE_DUNGEON_NOT_OPEN\020\300N\022#\n\036RET_ROGUELIKE" +
+      "_SPRINT_IS_BANNED\020\301N\0221\n,RET_ROGUELIKE_DU" +
+      "NGEON_PRE_STAGE_NOT_FINISHED\020\302N\022/\n*RET_R" +
+      "OGUELIKE_ALL_AVATAR_DIE_CANNOT_RESUME\020\303N" +
+      "\022\'\n\"RET_PLANT_FLOWER_ALREADY_TAKE_SEED\020\310" +
+      "N\022.\n)RET_PLANT_FLOWER_FRIEND_HAVE_FLOWER" +
+      "_LIMIT\020\311N\0220\n+RET_PLANT_FLOWER_CAN_GIVE_F" +
+      "LOWER_NOT_ENOUGH\020\312N\022-\n(RET_PLANT_FLOWER_" +
+      "WISH_FLOWER_KINDS_LIMIT\020\313N\022,\n\'RET_PLANT_" +
+      "FLOWER_HAVE_FLOWER_NOT_ENOUGH\020\314N\0220\n+RET_" +
+      "PLANT_FLOWER_FLOWER_COMBINATION_INVALID\020" +
+      "\315N\022 \n\033RET_HACHI_DUNGEON_NOT_VALID\020\304N\022%\n " +
+      "RET_HACHI_DUNGEON_STAGE_NOT_OPEN\020\305N\022(\n#R" +
+      "ET_HACHI_DUNGEON_TEAMMATE_NOT_PASS\020\306N\022&\n" +
+      "!RET_WINTER_CAMP_COIN_A_NOT_ENOUGH\020\327N\022&\n" +
+      "!RET_WINTER_CAMP_COIN_B_NOT_ENOUGH\020\330N\022(\n" +
+      "#RET_WINTER_CAMP_COIN_A_EXCEED_LIMIT\020\331N\022" +
+      "(\n#RET_WINTER_CAMP_COIN_B_EXCEED_LIMIT\020\332" +
+      "N\022$\n\037RET_WINTER_CAMP_WISH_ID_INVALID\020\333N\022" +
+      "-\n(RET_WINTER_CAMP_NOT_FOUND_RECV_ITEM_D" +
+      "ATA\020\334N\022/\n*RET_WINTER_CAMP_FRIEND_ITEM_CO" +
+      "UNT_OVERFLOW\020\335N\022-\n(RET_WINTER_CAMP_SELEC" +
+      "T_ITEM_DATA_INVALID\020\336N\022$\n\037RET_WINTER_CAM" +
+      "P_ITEM_LIST_EMPTY\020\337N\022)\n$RET_WINTER_CAMP_" +
+      "REWARD_ALREADY_TAKEN\020\340N\022%\n RET_WINTER_CA" +
+      "MP_STAGE_NOT_FINISH\020\341N\022#\n\036RET_WINTER_CAM" +
+      "P_GADGET_INVALID\020\342N\022\'\n\"RET_LANTERN_RITE_" +
+      "COIN_A_NOT_ENOUGH\020\352N\022\'\n\"RET_LANTERN_RITE" +
+      "_COIN_B_NOT_ENOUGH\020\353N\022\'\n\"RET_LANTERN_RIT" +
+      "E_COIN_C_NOT_ENOUGH\020\354N\022)\n$RET_LANTERN_RI" +
+      "TE_COIN_A_EXCEED_LIMIT\020\355N\022)\n$RET_LANTERN" +
+      "_RITE_COIN_B_EXCEED_LIMIT\020\356N\022)\n$RET_LANT" +
+      "ERN_RITE_COIN_C_EXCEED_LIMIT\020\357N\022/\n*RET_L" +
+      "ANTERN_RITE_PROJECTION_CONTENT_CLOSED\020\360N" +
+      "\022.\n)RET_LANTERN_RITE_PROJECTION_CAN_NOT_" +
+      "START\020\361N\022&\n!RET_LANTERN_RITE_DUNGEON_NOT" +
+      "_OPEN\020\362N\022+\n&RET_LANTERN_RITE_HAS_TAKEN_S" +
+      "KIN_REWARD\020\363N\0220\n+RET_LANTERN_RITE_NOT_FI" +
+      "NISHED_SKIN_WATCHERS\020\364N\022.\n)RET_LANTERN_R" +
+      "ITE_FIREWORKS_CONTENT_CLOSED\020\365N\0223\n.RET_L" +
+      "ANTERN_RITE_FIREWORKS_CHALLENGE_NOT_STAR" +
+      "T\020\366N\0222\n-RET_LANTERN_RITE_FIREWORKS_REFOR" +
+      "M_PARAM_ERROR\020\367N\0221\n,RET_LANTERN_RITE_FIR" +
+      "EWORKS_REFORM_SKILL_LOCK\020\370N\0229\n4RET_LANTE" +
+      "RN_RITE_FIREWORKS_REFORM_STAMINA_NOT_ENO" +
+      "UGH\020\371N\022\'\n\"RET_POTION_ACTIVITY_STAGE_NOT_" +
+      "OPEN\020\376N\022(\n#RET_POTION_ACTIVITY_LEVEL_HAV" +
+      "E_PASS\020\377N\022+\n&RET_POTION_ACTIVITY_TEAM_NU" +
+      "M_INCORRECT\020\200O\022%\n RET_POTION_ACTIVITY_AV" +
+      "ATAR_IN_CD\020\201O\022#\n\036RET_POTION_ACTIVITY_BUF" +
+      "F_IN_CD\020\202O\022\'\n\"RET_IRODORI_POETRY_INVALID" +
+      "_LINE_ID\020\210O\022(\n#RET_IRODORI_POETRY_INVALI" +
+      "D_THEME_ID\020\211O\022/\n*RET_IRODORI_POETRY_NOT_" +
+      "GET_ALL_INSPIRATION\020\212O\022/\n*RET_IRODORI_PO" +
+      "ETRY_INSPIRATION_REACH_LIMIE\020\213O\022.\n)RET_I" +
+      "RODORI_POETRY_ENTITY_ALREADY_SCANNED\020\214O\022" +
+      "(\n#RET_ACTIVITY_BANNER_ALREADY_CLEARED\020\274" +
+      "P\022\037\n\032RET_IRODORI_CHESS_NOT_OPEN\020\275P\022%\n RE" +
+      "T_IRODORI_CHESS_LEVEL_NOT_OPEN\020\276P\022#\n\036RET" +
+      "_IRODORI_CHESS_MAP_NOT_OPEN\020\277P\022/\n*RET_IR" +
+      "ODORI_CHESS_MAP_CARD_ALREADY_EQUIPED\020\300P\022" +
+      ".\n)RET_IRODORI_CHESS_EQUIP_CARD_EXCEED_L" +
+      "IMIT\020\301P\022+\n&RET_IRODORI_CHESS_MAP_CARD_NO" +
+      "T_EQUIPED\020\302P\0223\n.RET_IRODORI_CHESS_ENTER_" +
+      "FAIL_CARD_EXCEED_LIMIT\020\303P\022(\n#RET_ACTIVIT" +
+      "Y_FRIEND_HAVE_GIFT_LIMIT\020\306P\022)\n$RET_GACHA" +
+      "_ACTIVITY_HAVE_REWARD_LIMIT\020\313P\022(\n#RET_GA" +
+      "CHA_ACTIVITY_HAVE_ROBOT_LIMIT\020\314P\022*\n%RET_" +
+      "SUMMER_TIME_V_2_COIN_EXCEED_LIMIT\020\315P\022(\n#" +
+      "RET_SUMMER_TIME_V_2_COIN_NOT_ENOUGH\020\316P\022/" +
+      "\n*RET_SUMMER_TIME_V_2_DUNGEON_STAGE_NOT_" +
+      "OPEN\020\317P\0222\n-RET_SUMMER_TIME_V_2_PREV_DUNG" +
+      "EON_NOT_COMPLETE\020\320P\022!\n\034RET_ROGUE_DIARY_A" +
+      "VATAR_DEATH\020\356P\022!\n\034RET_ROGUE_DIARY_AVATAR" +
+      "_TIRED\020\357P\022&\n!RET_ROGUE_DIARY_AVATAR_DUPL" +
+      "ICATED\020\360P\022$\n\037RET_ROGUE_DIARY_COIN_NOT_EN" +
+      "OUGH\020\361P\022.\n)RET_ROGUE_DIARY_VIRTUAL_COIN_" +
+      "EXCEED_LIMIT\020\362P\022,\n\'RET_ROGUE_DIARY_VIRTU" +
+      "AL_COIN_NOT_ENOUGH\020\363P\022#\n\036RET_ROGUE_DIARY" +
+      "_CONTENT_CLOSED\020\376P\022+\n&RET_GRAVEN_INNOCEN" +
+      "CE_COIN_A_NOT_ENOUGH\020\214Q\022+\n&RET_GRAVEN_IN" +
+      "NOCENCE_COIN_B_NOT_ENOUGH\020\215Q\022-\n(RET_GRAV" +
+      "EN_INNOCENCE_COIN_A_EXCEED_LIMIT\020\216Q\022-\n(R" +
+      "ET_GRAVEN_INNOCENCE_COIN_B_EXCEED_LIMIT\020" +
+      "\217Q\022$\n\037RET_ISLAND_PARTY_STAGE_NOT_OPEN\020\203Q" +
+      "\022\"\n\035RET_WIND_FIELD_STAGE_NOT_OPEN\020\226Q\022\037\n\032" +
+      "RET_VINTAGE_CONTENT_CLOSED\020\234Q\022\'\n\"RET_VIN" +
+      "TAGE_STORE_CONTENT_FINISHED\020\235Q\022%\n RET_VI" +
+      "NTAGE_STORE_ATTR_TOO_SMALL\020\236Q\022%\n RET_VIN" +
+      "TAGE_STORE_ATTR_TOO_LARGE\020\237Q\022(\n#RET_VINT" +
+      "AGE_STORE_CONTENT_INTERRUPT\020\240Q\022(\n#RET_VI" +
+      "NTAGE_VIRTUAL_COIN_NOT_ENOUGH\020\241Q\022*\n%RET_" +
+      "VINTAGE_STORE_ATTR_LESS_THAN_ZERO\020\242Q\022/\n*" +
+      "RET_FUNGUS_FIGHTER_CAPTURE_COIN_NOT_ENOU" +
+      "GH\020\246Q\0220\n+RET_FUNGUS_FIGHTER_TRAINING_COI" +
+      "N_NOT_ENOUGH\020\247Q\0221\n,RET_FUNGUS_FIGHTER_CA" +
+      "PTURE_COIN_EXCEED_LIMIT\020\250Q\0222\n-RET_FUNGUS" +
+      "_FIGHTER_TRAINING_COIN_EXCEED_LIMIT\020\251Q\022&" +
+      "\n!RET_FUNGUS_FIGHTER_CONTENT_CLOSED\020\252Q\022+" +
+      "\n&RET_FUNGUS_FIGHTER_PLOT_STAGE_NOT_OPEN" +
+      "\020\253Q\0222\n-RET_FUNGUS_FIGHTER_FUNGUS_ID_CONF" +
+      "IG_NOT_VALID\020\254Q\022-\n(RET_FUNGUS_FIGHTER_FU" +
+      "NGUS_NOT_CULTIVATED\020\255Q\0221\n,RET_FUNGUS_FIG" +
+      "HTER_TRAINING_DUNGEON_NOT_OPEN\020\256Q\022-\n(RET" +
+      "_EFFIGY_CHALLENGE_V_2_COIN_NOT_ENOUGH\020\273Q" +
+      "\022/\n*RET_EFFIGY_CHALLENGE_V_2_COIN_EXCEED" +
+      "_LIMIT\020\274Q\022&\n!RET_CHAR_AMUSEMENT_STAGE_NO" +
+      "T_OPEN\020\304Q\022$\n\037RET_COIN_COLLECT_LEVEL_NOT_" +
+      "OPEN\020\316Q\022&\n!RET_COIN_COLLECT_NOT_EQUIP_WI" +
+      "DGET\020\317Q\022%\n RET_COIN_COLLECT_SCENE_NOT_MA" +
+      "TCH\020\320Q\022(\n#RET_COIN_COLLECT_CANT_ENTER_MP" +
+      "_MODE\020\321Q\022%\n RET_COIN_COLLECT_PLAYER_NUM_" +
+      "FAIL\020\322Q\022&\n!RET_BRICK_BREAKER_PLAYER_NUM_" +
+      "FAIL\020\330Q\022\'\n\"RET_BRICK_BREAKER_STAGE_NOT_U" +
+      "NLOCK\020\331Q\022.\n)RET_BRICK_BREAKER_NORMAL_LEV" +
+      "EL_NOT_FINISH\020\332Q\022+\n&RET_BRICK_BREAKER_PR" +
+      "E_LEVEL_NOT_FINISH\020\333Q\022+\n&RET_BRICK_BREAK" +
+      "ER_PRE_STAGE_NOT_FINISH\020\334Q\022-\n(RET_BRICK_" +
+      "BREAKER_WORLD_LEVEL_NOT_UNLOCK\020\335Q\022/\n*RET" +
+      "_BRICK_BREAKER_DUNGEON_LEVEL_NOT_UNLOCK\020" +
+      "\336Q\022&\n!RET_BRICK_BREAKER_COIN_NOT_ENOUGH\020" +
+      "\337Q\022(\n#RET_BRICK_BREAKER_COIN_EXCEED_LIMI" +
+      "T\020\340Q\022#\n\036RET_TEAMCHAIN_WORLD_IN_MP_MODE\020\342" +
+      "Q\022*\n%RET_LAN_V_3_BOAT_PLAYER_NUM_NOT_VAL" +
+      "ID\020\361Q\022#\n\036RET_LAN_V_3_BOAT_PLAY_NOT_OPEN\020" +
+      "\362Q\022(\n#RET_LAN_V_3_BOAT_NOT_IN_WORLD_SCEN" +
+      "E\020\363Q\022,\n\'RET_FLEUR_FAIR_V_2_PACMAN_PLAY_N" +
+      "OT_OPEN\020\204R\0223\n.RET_FLEUR_FAIR_V_2_PACMAN_" +
+      "PLAYER_NUM_INCORRECT\020\205R\022\'\n\"RET_FLEUR_FAI" +
+      "R_V_2_COIN_NOT_ENOUGH\020\206R\022)\n$RET_FLEUR_FA" +
+      "IR_V_2_COIN_EXCEED_LIMIT\020\207R\022&\n!RET_AKA_F" +
+      "ES_RHYTHM_LEVEL_NOT_OPEN\020\231R\022)\n$RET_AKA_F" +
+      "ES_RHYTHM_GALLERY_INIT_FAIL\020\232R\022/\n*RET_AK" +
+      "A_FES_RHYTHM_NOT_IN_EXPECTED_DUNGEON\020\245R\022" +
+      ")\n$RET_AKA_FES_REASONING_LEVEL_NOT_OPEN\020" +
+      "\243R\022)\n$RET_AKA_FES_ASTROLABE_LEVEL_NOT_OP" +
+      "EN\020\255R\022/\n*RET_AKA_FES_ASTROLABE_PRE_LEVEL" +
+      "_NOT_FINISH\020\256R\022,\n\'RET_EFFIGY_CHALLENGE_V" +
+      "_4_LEVEL_NOT_OPEN\020\267R\022-\n(RET_EFFIGY_CHALL" +
+      "ENGE_V_4_GUEST_NOT_READY\020\270R\022.\n)RET_EFFIG" +
+      "Y_CHALLENGE_V_4_DUPLICATE_AVATAR\020\271R\022*\n%R" +
+      "ET_JOURNEY_ACTIVITY_PICK_PARAM_ERROR\020\301R\022" +
+      ",\n\'RET_JOURNEY_ACTIVITY_PICK_COND_NOT_ME" +
+      "ET\020\302R\022)\n$RET_JOURNEY_ACTIVITY_COIN_NOT_E" +
+      "NOUGH\020\303R\022+\n&RET_JOURNEY_ACTIVITY_COIN_EX" +
+      "CEED_LIMIT\020\304R\022,\n\'RET_POETRY_FES_PITCH_PO" +
+      "T_STAGE_NOT_OPEN\020\313R\0222\n-RET_FILMFES_BALL_" +
+      "GAME_PLAYER_COUNT_NOT_ENOUGH\020\337R\022%\n RET_M" +
+      "P_FILMFEST_SHOOTING_ONGOING\020\340R\022$\n\037RET_FI" +
+      "LMFES_BALL_GAME_IS_LOCKED\020\341R\022*\n%RET_TREA" +
+      "SURE_HUNT_V_4_COIN_NOT_ENOUGH\020\363R\022,\n\'RET_" +
+      "TREASURE_HUNT_V_4_COIN_EXCEED_LIMIT\020\364R\022," +
+      "\n\'RET_LOST_SAMACHURL_SNEAK_LEVEL_NOT_OPE" +
+      "N\020\207S\022+\n&RET_LOST_SAMACHURL_BOSS_LEVEL_NO" +
+      "T_OPEN\020\210S\0223\n.RET_LAN_V_4_PARTY_LION_PLAY" +
+      "ER_COUNT_NOT_ENOUGH\020\221S\022*\n%RET_LAN_V_4_PA" +
+      "RTY_LION_LEVEL_NOT_OPEN\020\222S\022 \n\033RET_ACTIVI" +
+      "TY_CONTENT_CLOSED\020\225U\022$\n\037RET_ACTIVITY_CLI" +
+      "ENT_PLAY_BAN_MP\020\226U\022-\n(RET_ACTIVITY_CLIEN" +
+      "T_PLAY_FREQUENCY_ERROR\020\227U\0223\n.RET_ACTIVIT" +
+      "Y_CLIENT_PLAY_OTHER_PLAY_IS_RUNNING\020\230U\022-" +
+      "\n(RET_ACTIVITY_CLIENT_PLAY_DUPLICATE_STA" +
+      "RT\020\231U\022\027\n\022RET_NOT_IN_FISHING\020\371U\022\031\n\024RET_FI" +
+      "SH_STATE_ERROR\020\372U\022\030\n\023RET_FISH_BAIT_LIMIT" +
+      "\020\373U\022\035\n\030RET_FISHING_MAX_DISTANCE\020\374U\022\032\n\025RE" +
+      "T_FISHING_IN_COMBAT\020\375U\022!\n\034RET_FISHING_BA" +
+      "TTLE_TOO_SHORT\020\376U\022\027\n\022RET_FISH_GONE_AWAY\020" +
+      "\377U\022#\n\036RET_CAN_NOT_EDIT_OTHER_DUNGEON\020\253V\022" +
+      " \n\033RET_CUSTOM_DUNGEON_DISMATCH\020\254V\022\037\n\032RET" +
+      "_NO_CUSTOM_DUNGEON_DATA\020\255V\022\"\n\035RET_BUILD_" +
+      "CUSTOM_DUNGEON_FAIL\020\256V\022\'\n\"RET_CUSTOM_DUN" +
+      "GEON_ROOM_CHECK_FAIL\020\257V\022%\n RET_CUSTOM_DU" +
+      "NGEON_SAVE_MAY_FAIL\020\260V\022\036\n\031RET_NOT_IN_CUS" +
+      "TOM_DUNGEON\020\261V\022%\n RET_CUSTOM_DUNGEON_INT" +
+      "ERNAL_FAIL\020\262V\022#\n\036RET_CUSTOM_DUNGEON_CAN_" +
+      "NOT_TRY\020\263V\022%\n RET_CUSTOM_DUNGEON_NO_STAR" +
+      "T_ROOM\020\264V\022$\n\037RET_CUSTOM_DUNGEON_NO_ROOM_" +
+      "DATA\020\265V\022)\n$RET_CUSTOM_DUNGEON_SAVE_TOO_F" +
+      "REQUENT\020\266V\022%\n RET_CUSTOM_DUNGEON_NOT_SEL" +
+      "F_PASS\020\267V\022!\n\034RET_CUSTOM_DUNGEON_LACK_COI" +
+      "N\020\270V\022\'\n\"RET_CUSTOM_DUNGEON_NO_FINISH_BRI" +
+      "CK\020\271V\022$\n\037RET_CUSTOM_DUNGEON_MULTI_FINISH" +
+      "\020\272V\022%\n RET_CUSTOM_DUNGEON_NOT_PUBLISHED\020" +
+      "\273V\022\"\n\035RET_CUSTOM_DUNGEON_FULL_STORE\020\274V\022$" +
+      "\n\037RET_CUSTOM_DUNGEON_STORE_REPEAT\020\275V\022*\n%" +
+      "RET_CUSTOM_DUNGEON_CAN_NOT_STORE_SELF\020\276V" +
+      "\022%\n RET_CUSTOM_DUNGEON_NOT_SAVE_SUCC\020\277V\022" +
+      ")\n$RET_CUSTOM_DUNGEON_CAN_NOT_LIKE_SELF\020" +
+      "\300V\022!\n\034RET_CUSTOM_DUNGEON_NOT_FOUND\020\301V\022\'\n" +
+      "\"RET_CUSTOM_DUNGEON_INVALID_SETTING\020\302V\022)" +
+      "\n$RET_CUSTOM_DUNGEON_NO_FINISH_SETTING\020\303" +
+      "V\022$\n\037RET_CUSTOM_DUNGEON_SAVE_NOTHING\020\304V\022" +
+      "$\n\037RET_CUSTOM_DUNGEON_NOT_IN_GROUP\020\305V\022$\n" +
+      "\037RET_CUSTOM_DUNGEON_NOT_OFFICIAL\020\306V\022&\n!R" +
+      "ET_CUSTOM_DUNGEON_LIFE_NUM_ERROR\020\307V\022$\n\037R" +
+      "ET_CUSTOM_DUNGEON_NO_OPEN_ROOM\020\310V\022*\n%RET" +
+      "_CUSTOM_DUNGEON_BRICK_EXCEED_LIMIT\020\311V\022+\n" +
+      "&RET_CUSTOM_DUNGEON_OFFICIAL_NOT_UNLOCK\020" +
+      "\312V\022&\n!RET_CAN_NOT_EDIT_OFFICIAL_SETTING\020" +
+      "\313V\022#\n\036RET_CUSTOM_DUNGEON_BAN_PUBLISH\020\314V\022" +
+      "&\n!RET_CUSTOM_DUNGEON_CAN_NOT_REPLAY\020\315V\022" +
+      "&\n!RET_CUSTOM_DUNGEON_NOT_OPEN_GROUP\020\316V\022" +
+      "$\n\037RET_CUSTOM_DUNGEON_MAX_EDIT_NUM\020\317V\022)\n" +
+      "$RET_CUSTOM_DUNGEON_CAN_NOT_OUT_STUCK\020\320V" +
+      "\022\037\n\032RET_CUSTOM_DUNGEON_MAX_TAG\020\321V\022#\n\036RET" +
+      "_CUSTOM_DUNGEON_INVALID_TAG\020\322V\022 \n\033RET_CU" +
+      "STOM_DUNGEON_MAX_COST\020\323V\022,\n\'RET_CUSTOM_D" +
+      "UNGEON_REQUEST_TOO_FREQUENT\020\324V\022 \n\033RET_CU" +
+      "STOM_DUNGEON_NOT_OPEN\020\325V\022\032\n\025RET_SHARE_CD" +
+      "_ID_ERROR\020\335V\022\035\n\030RET_SHARE_CD_INDEX_ERROR" +
+      "\020\336V\022\027\n\022RET_SHARE_CD_IN_CD\020\337V\022\"\n\035RET_SHAR" +
+      "E_CD_TOKEN_NOT_ENOUGH\020\340V\022\025\n\020RET_UGC_DISM" +
+      "ATCH\020\217W\022\033\n\026RET_UGC_DATA_NOT_FOUND\020\220W\022\034\n\027" +
+      "RET_UGC_BRIEF_NOT_FOUND\020\221W\022\025\n\020RET_UGC_DI" +
+      "SABLED\020\222W\022\024\n\017RET_UGC_LIMITED\020\223W\022\023\n\016RET_U" +
+      "GC_LOCKED\020\224W\022\025\n\020RET_UGC_NOT_AUTH\020\225W\022\025\n\020R" +
+      "ET_UGC_NOT_OPEN\020\226W\022\030\n\023RET_UGC_BAN_PUBLIS" +
+      "H\020\227W\022\037\n\032RET_UGC_MUSIC_EXCEED_LIMIT\020\230W\022$\n" +
+      "\037RET_UGC_MUSIC_SAVE_TOO_FREQUENT\020\231W\022\035\n\030R" +
+      "ET_UGC_MUSIC_STORE_FULL\020\232W\022\037\n\032RET_UGC_MU" +
+      "SIC_STORE_REPEAT\020\233W\022%\n RET_UGC_MUSIC_STO" +
+      "RE_TOO_FREQUENT\020\234W\022#\n\036RET_UGC_MUSIC_SEAR" +
+      "CH_NOT_FOUND\020\235W\022$\n\037RET_UGC_MUSIC_LIKE_TO" +
+      "O_FREQUENT\020\236W\022)\n$RET_UGC_MUSIC_RECOMMEND" +
+      "_TOO_FREQUENT\020\237W\022#\n\036RET_UGC_MUSIC_IMPORT" +
+      "_NOT_ALLOW\020\240W\022#\n\036RET_UGC_MUSIC_IMPORT_NO" +
+      "T_FOUND\020\241W\022*\n%RET_UGC_MUSIC_SET_OPTION_T" +
+      "OO_FREQUENT\020\242W\022&\n!RET_UGC_MUSIC_IMPORT_T" +
+      "OO_FREQUENT\020\243W\022&\n!RET_UGC_MUSIC_GEN_SHAR" +
+      "E_CODE_FAIL\020\244W\022&\n!RET_UGC_MUSIC_CANCEL_S" +
+      "TORE_REPEAT\020\245W\022&\n!RET_COMPOUND_BOOST_ITE" +
+      "M_NOT_EXIST\020\301W\022(\n#RET_COMPOUND_BOOST_TAR" +
+      "GET_NOT_EXIST\020\302W\022#\n\036RET_QUICK_HIT_TREE_E" +
+      "MPTY_TREES\020\313W\022$\n\037RET_COMPOUND_NO_FINISH_" +
+      "CAN_TAKE\020\325W\022!\n\034RET_FORGE_NO_FINISH_CAN_T" +
+      "AKE\020\332W\022 \n\033RET_GCG_FIND_GAME_MODE_FAIL\020\340]" +
+      "\022\"\n\035RET_GCG_OPERATION_PARAM_ERROR\020\341]\022\035\n\030" +
+      "RET_GCG_GAME_NOT_RUNNING\020\342]\022\031\n\024RET_GCG_O" +
+      "P_NOT_ALLOW\020\343]\022\037\n\032RET_GCG_OP_NOT_MATCH_P" +
+      "HASE\020\344]\022(\n#RET_GCG_SELECT_HAND_CARD_GUID" +
+      "_ERROR\020\345]\022\037\n\032RET_GCG_DICE_INDEX_INVALID\020" +
+      "\346]\022#\n\036RET_GCG_CHARACTER_GUID_INVALID\020\347]\022" +
+      "\"\n\035RET_GCG_CHARACTER_ALREADY_DIE\020\350]\022\'\n\"R" +
+      "ET_GCG_CHARACTER_ALREADY_ON_STAGE\020\351]\022\'\n\"" +
+      "RET_GCG_CHARACTER_FORBIDDEN_ATTACK\020\352]\022\"\n" +
+      "\035RET_GCG_SELECT_DICE_NOT_MATCH\020\353]\022\034\n\027RET" +
+      "_GCG_FIND_SKILL_FAIL\020\354]\022%\n RET_GCG_SKILL" +
+      "_CAN_NOT_ACTIVE_USE\020\355]\022\036\n\031RET_GCG_ENERGY" +
+      "_NOT_ENOUGH\020\356]\022\'\n\"RET_GCG_PLAY_CARD_TARG" +
+      "ET_NOT_MATCH\020\357]\022&\n!RET_GCG_PLAY_CARD_ZON" +
+      "E_CANNOT_ADD\020\360]\022\'\n\"RET_GCG_REBOOT_SELECT" +
+      "_DICE_INVALID\020\361]\022\'\n\"RET_GCG_REBOOT_SELEC" +
+      "T_CARD_INVALID\020\362]\022+\n&RET_GCG_PLAY_CARD_C" +
+      "ONDITION_CHECK_FAIL\020\363]\022$\n\037RET_GCG_PLAY_C" +
+      "ARD_PARAM_INVALID\020\364]\022\025\n\020RET_GCG_MAX_GAME" +
+      "\020\365]\022\035\n\030RET_GCG_SEND_PACKET_FAIL\020\366]\022\033\n\026RE" +
+      "T_GCG_ALREADY_SETTLE\020\367]\022*\n%RET_GCG_PLAY_" +
+      "CARD_LEGEND_ALREADY_USED\020\370]\022#\n\036RET_GCG_C" +
+      "OST_LEGEND_NOT_ENOUGH\020\371]\022 \n\033RET_GCG_WATC" +
+      "H_IN_BLACK_LIST\020\372]\022 \n\033RET_GCG_WATCH_FORB" +
+      "ID_SWITCH\020\373]\022!\n\034RET_GCG_WATCH_ALREADY_JO" +
+      "INED\020\374]\022$\n\037RET_GCG_WATCH_KICK_NO_SPECTAT" +
+      "OR\020\375]\022%\n RET_GCG_WATCH_TARGET_NOT_IN_DUE" +
+      "L\020\376]\022$\n\037RET_GCG_WATCH_TARGET_NOT_FRIEND\020" +
+      "\377]\022\"\n\035RET_GCG_WATCH_TARGET_PSN_ONLY\020\200^\022\'" +
+      "\n\"RET_GCG_WATCH_FORBID_BUSINESS_TYPE\020\201^\022" +
+      " \n\033RET_GCG_WATCH_OPTION_REFUSE\020\202^\022\034\n\027RET" +
+      "_GCG_WATCH_NO_PLAYER\020\203^\022(\n#RET_GCG_WATCH" +
+      "_TARGET_STATE_NOT_OPEN\020\204^\022\"\n\035RET_GCG_WAT" +
+      "CH_SPECTATOR_LIMIT\020\205^\022\'\n\"RET_GCG_WATCH_F" +
+      "ORBIDDEN_WATCH_GAME\020\206^\022 \n\033RET_GCG_WATCH_" +
+      "NOT_SPECTATOR\020\207^\022\"\n\035RET_GCG_WATCH_ALREAD" +
+      "Y_IN_DUEL\020\210^\022-\n(RET_GCG_WATCH_CLIENT_DAT" +
+      "A_VERSOIN_FORBID\020\211^\022$\n\037RET_GCG_SKILL_NOT" +
+      "_VEHICLE_SKILL\020\212^\022\'\n\"RET_GCG_SKILL_CHECK" +
+      "_CONDITION_FAIL\020\213^\022/\n*RET_GCG_VEHICLE_SK" +
+      "ILL_CHECK_CONDITION_FAIL\020\214^\022\036\n\031RET_GCG_C" +
+      "OIN_EXCEED_LIMIT\020\305^\022\034\n\027RET_GCG_COIN_NOT_" +
+      "ENOUGH\020\306^\022\036\n\031RET_GCG_NOT_IN_SELF_WORLD\020\307" +
+      "^\022\034\n\027RET_GCG_ALREADY_IN_DUEL\020\310^\022 \n\033RET_G" +
+      "CG_NOT_IN_PLAYER_WORLD\020\311^\022\034\n\027RET_GCG_GAL" +
+      "LERY_STARTED\020\312^\022\"\n\035RET_GCG_INVITE_TARGET" +
+      "_IS_SELF\020\313^\022\'\n\"RET_GCG_INVITE_TARGET_NOT" +
+      "_IN_WORLD\020\314^\022#\n\036RET_GCG_APPLY_INVITE_NOT" +
+      "_ALLOW\020\315^\022!\n\034RET_GCG_APPLY_INVITE_TIMEOU" +
+      "T\020\316^\022\035\n\030RET_GCG_CUR_DECK_INVALID\020\317^\022#\n\036R" +
+      "ET_GCG_NEED_RESOURCE_COMPLETE\020\320^\022$\n\037RET_" +
+      "GCG_OPPONENT_PLAYER_IS_SELF\020\321^\022\034\n\027RET_GC",
+      "G_GAME_ID_INVALID\020\322^\022\034\n\027RET_GCG_MATCH_IN" +
+      "_PUNISH\020\323^\022!\n\034RET_GCG_SETTLE_STILL_IN_DU" +
+      "EL\020\324^\022\"\n\035RET_GCG_SETTLE_NOT_IN_DUNGEON\020\325" +
+      "^\022$\n\037RET_GCG_UNSUPPORT_SETTLE_OPTION\020\326^\022" +
+      "\037\n\032RET_GCG_NOT_IN_GCG_DUNGEON\020\327^\022\037\n\032RET_" +
+      "GCG_WORLD_LEVEL_LOCKED\020\330^\022\036\n\031RET_GCG_BOS" +
+      "S_LEVEL_LOCKED\020\331^\022\032\n\025RET_GCG_NOT_IN_TAVE" +
+      "RN\020\332^\022\037\n\032RET_GCG_WEEK_NPC_NOT_EXIST\020\333^\022 " +
+      "\n\033RET_GCG_ENTER_GAME_FREQUENT\020\334^\022-\n(RET_" +
+      "GCG_BREAK_LEVEL_QUEST_NOT_UNFINISHED\020\335^\022" +
+      ")\n$RET_GCG_GUIDE_LEVEL_ALREADY_FINISHED\020" +
+      "\336^\022!\n\034RET_GCG_LEVEL_CANNOT_RESTART\020\337^\022$\n" +
+      "\037RET_GCG_TARGET_CHECK_ENTER_FAIL\020\340^\022\037\n\032R" +
+      "ET_GCG_ALREADY_IN_DUNGEON\020\341^\022\036\n\031RET_GCG_" +
+      "BACK_DUEL_NO_GAME\020\342^\022\037\n\032RET_GCG_CONST_LE" +
+      "VEL_LOCKED\020\343^\022\033\n\026RET_GCG_QUEST_ID_ERROR\020" +
+      "\344^\022\"\n\035RET_GCG_QUEST_NEED_UNFINISHED\020\345^\022\025" +
+      "\n\020RET_GCG_IN_MATCH\020\346^\022$\n\037RET_GCG_DATA_VE" +
+      "RSION_NOT_LATEST\020\347^\022.\n)RET_GCG_INVITE_TA" +
+      "RGET_ENTER_GAME_FREQUENT\020\350^\0221\n,RET_GCG_I" +
+      "NVITE_TARGET_NEED_RESOURCE_COMPLETE\020\351^\022(" +
+      "\n#RET_GCG_INVITE_TARGET_SCENE_IS_NULL\020\352^" +
+      "\022&\n!RET_GCG_INVITE_TARGET_IN_TRANSFER\020\353^" +
+      "\0222\n-RET_GCG_INVITE_TARGET_DATA_VERSION_N" +
+      "OT_LATEST\020\354^\022+\n&RET_GCG_INVITE_TARGET_CU" +
+      "R_DECK_INVALID\020\355^\022*\n%RET_GCG_CLIENT_DATA" +
+      "_VERSION_NOT_MATCH\020\356^\022\'\n\"RET_GCG_CLIENT_" +
+      "DATA_VERSOIN_FORBID\020\357^\022\032\n\025RET_GCG_MP_CAN" +
+      "T_MATCH\020\360^\022)\n$RET_GCG_INVITE_TARGET_STAT" +
+      "E_NOT_OPEN\020\361^\022\034\n\027RET_GCG_CREATE_TIME_OUT" +
+      "\020\362^\022\026\n\021RET_GCG_BAN_MATCH\020\363^\022\027\n\022RET_GCG_B" +
+      "AN_INVITE\020\364^\022\036\n\031RET_GCG_TARGET_BAN_INVIT" +
+      "E\020\365^\022\"\n\035RET_GCG_INVITE_ALREADY_INVITE\020\366^" +
+      "\022#\n\036RET_GCG_FESTIVAL_MODE_NOT_OPEN\020\367^\022*\n" +
+      "%RET_GCG_TARGET_FESTIVAL_MODE_NOT_OPEN\020\370" +
+      "^\022\"\n\035RET_GCG_BACK_DUEL_PS_TO_OTHER\020\371^\022\"\n" +
+      "\035RET_GCG_BACK_DUEL_OTHER_TO_PS\020\372^\022\036\n\031RET" +
+      "_GCG_WEEK_REWARD_LIMIT\020\373^\022\"\n\035RET_GCG_FES" +
+      "TIVAL_MODE_IN_PICK\020\374^\022\033\n\026RET_GCG_DS_DECK" +
+      "_LOCKED\020\251_\022!\n\034RET_GCG_DS_DECK_NAME_INVAL" +
+      "ID\020\252_\022*\n%RET_GCG_DS_DECK_CHAR_CARD_NUM_I" +
+      "NVALID\020\254_\022%\n RET_GCG_DS_DECK_CARD_NUM_IN" +
+      "VALID\020\255_\022%\n RET_GCG_DS_CARD_NUM_EXCEED_L" +
+      "IMIT\020\256_\022\034\n\027RET_GCG_DS_DECK_INVALID\020\257_\022\037\n" +
+      "\032RET_GCG_DS_CARD_ID_INVALID\020\260_\022(\n#RET_GC" +
+      "G_DS_CARD_FACE_ALREADY_UNLOCK\020\261_\022!\n\034RET_" +
+      "GCG_DS_CARD_FACE_IS_LOCK\020\262_\022\032\n\025RET_GCG_D" +
+      "S_FIELD_LOCK\020\263_\022$\n\037RET_GCG_DS_FIELD_ALRE" +
+      "ADY_UNLOCK\020\264_\022 \n\033RET_GCG_DS_FIELD_ID_INV" +
+      "ALID\020\265_\022 \n\033RET_GCG_DS_CARD_BACK_LOCKED\020\266" +
+      "_\022(\n#RET_GCG_DS_CARD_BACK_ALREADY_UNLOCK" +
+      "\020\267_\022$\n\037RET_GCG_DS_CARD_BACK_ID_INVALID\020\270" +
+      "_\022$\n\037RET_GCG_DS_CARD_FACE_ID_INVALID\020\271_\022" +
+      "!\n\034RET_GCG_DS_DECK_NAME_ILLEGAL\020\272_\022\034\n\027RE" +
+      "T_GCG_DS_DECK_SAVE_CD\020\273_\022#\n\036RET_GCG_DS_D" +
+      "ECK_CHANGE_NAME_CD\020\274_\022\037\n\032RET_GCG_MATCH_D" +
+      "ECK_INVALID\020\275_\022%\n RET_GCG_DS_DECK_ALREAD" +
+      "Y_UNLOCKED\020\276_\022!\n\034RET_GCG_DS_AT_LEAST_ONE" +
+      "_DECK\020\277_\022!\n\034RET_GCG_DS_DECK_CODE_ILLEGAL" +
+      "\020\300_\022\034\n\027RET_GCG_DS_DECK_CODE_CD\020\301_\022(\n#RET" +
+      "_GCG_TC_CHARACTERNOT_MATCH_LEVEL\020\333_\022\"\n\035R" +
+      "ET_GCG_TC_MUST_IN_SELF_WORLD\020\334_\022\036\n\031RET_G" +
+      "CG_TC_MUST_IN_TAVERN\020\335_\022\037\n\032RET_GCG_TC_AL" +
+      "READY_IN_GAME\020\336_\022 \n\033RET_GCG_TC_ALREADY_I" +
+      "N_MATCH\020\337_\0221\n,RET_GCG_TC_UNLOCK_CHARACTE" +
+      "R_QUEST_NOT_FINISH\020\340_\022\034\n\027RET_GCG_TC_LEVE" +
+      "L_LOCKED\020\341_\022\036\n\031RET_GCG_TC_NO_INVITE_DATA" +
+      "\020\342_\022 \n\033RET_GCG_TC_CUR_DECK_INVALID\020\343_\022\032\n" +
+      "\025RET_GCG_TC_COND_QUEST\020\344_\022%\n RET_GCG_LEV" +
+      "EL_REWARD_LEVEL_ERROR\020\215`\022\'\n\"RET_GCG_LEVE" +
+      "L_REWARD_ALREADY_TAKEN\020\216`\022#\n\036RET_GCG_LEV" +
+      "EL_REWARD_NO_REWARD\020\217`\022\"\n\035RET_GCG_NOT_IN" +
+      "_REPLAY_DUNGEON\020\227`\022\033\n\026RET_GCG_INVALID_RE" +
+      "PLAY\020\230`\022#\n\036RET_GCG_SET_FAVORITE_LIMIT_NU" +
+      "M\020\231`\022\032\n\025RET_GCG_REPLAY_EXPIRE\020\232`\022#\n\036RET_" +
+      "GCG_REPLAY_DUNGEON_SETTLED\020\233`\022#\n\036RET_GCG" +
+      "_PICK_CUR_UID_NOT_MATCH\020\253`\022$\n\037RET_GCG_PI" +
+      "CK_SELECT_PARAM_ERROR\020\254`\022\037\n\032RET_GCG_PICK" +
+      "_CONFIRM_ERROR\020\255`\022\036\n\031RET_GCG_PICK_BACK_N" +
+      "O_GAME\020\256`\022$\n\037RET_GCG_ARENA_SCHEDULE_INAC" +
+      "TIVE\020\265`\022%\n RET_GCG_ARENA_SCHEDULE_NOT_MA" +
+      "TCH\020\266`\022\037\n\032RET_GCG_ARENA_DECK_NOT_SET\020\267`\022" +
+      "\037\n\032RET_GCG_ARENA_DECK_INVALID\020\270`\022/\n*RET_" +
+      "GCG_ARENA_IN_CHALLENGE_CANNOT_SET_DECK\020\271" +
+      "`\022-\n(RET_GCG_ARENA_START_CHALLENGE_IN_MP" +
+      "_MODE\020\272`\022)\n$RET_GCG_ARENA_START_MATCH_IN" +
+      "_MP_MODE\020\273`\022\037\n\032RET_UGC_DUNGEON_IN_DUNGEO" +
+      "N\020\311e\022#\n\036RET_UGC_DUNGEON_ROOM_NUM_LIMIT\020\312" +
+      "e\022&\n!RET_UGC_DUNGEON_NOT_IN_EDIT_STATE\020\313" +
+      "e\022(\n#RET_UGC_DUNGEON_NOT_IN_EDIT_DUNGEON" +
+      "\020\314e\022\036\n\031RET_UGC_DUNGEON_NOT_EXIST\020\315e\022\035\n\030R" +
+      "ET_UGC_DUNGEON_NOT_SAVE\020\316e\0222\n-RET_UGC_DU" +
+      "NGEON_SCORE_CONDTION_BUT_NO_MONSTER\020\317e\022/" +
+      "\n*RET_UGC_DUNGEON_SCORE_CONDTION_BUT_NO_" +
+      "COIN\020\320e\0220\n+RET_UGC_DUNGEON_SCORE_CONDTIO" +
+      "N_BUT_NO_CHEST\020\321e\0226\n1RET_UGC_DUNGEON_SCO" +
+      "RE_CONDTION_BUT_NO_ROOM_SETTLE\020\322e\022.\n)RET" +
+      "_UGC_DUNGEON_TARGET_SCORE_EXCEED_LIMIT\020\323" +
+      "e\0226\n1RET_UGC_DUNGEON_TIME_SETTLE_TARGET_" +
+      "SCORE_NOT_ZERO\020\324e\022,\n\'RET_UGC_DUNGEON_ALL" +
+      "OW_AVATAR_NOT_ENOUGH\020\325e\0225\n0RET_UGC_DUNGE" +
+      "ON_HEART_BLOOD_WHILE_MONSTER_DEPLOY\020\326e\022(" +
+      "\n#RET_UGC_DUNGEON_ROOM_NO_EXIT_GADGET\020\327e" +
+      "\022/\n*RET_UGC_DUNGEON_ROOM_HOST_ENTER_GADG" +
+      "ET_NUM\020\330e\0227\n2RET_UGC_DUNGEON_ROOM_GUEST_" +
+      "ENTER_GADGET_NOT_ENOUGH\020\331e\0224\n/RET_UGC_DU" +
+      "NGEON_ROOM_SETTING_COIN_NUM_TOO_LARGE\020\332e" +
+      "\0227\n2RET_UGC_DUNGEON_ROOM_SETTING_MONSTER" +
+      "_NUM_TOO_LARGE\020\333e\0222\n-RET_UGC_DUNGEON_ROO" +
+      "M_SETTING_NO_SETTLE_CONFIG\020\334e\0222\n-RET_UGC" +
+      "_DUNGEON_ROOM_SWITCH_INVITE_IN_PROCESS\020\335" +
+      "e\022/\n*RET_UGC_DUNGEON_ROOM_DEPLOYMENT_COS" +
+      "T_LIMIT\020\336e\0220\n+RET_UGC_DUNGEON_ROOM_TRIGG" +
+      "ER_DUPLICATE_GUID\020\337e\022-\n(RET_UGC_DUNGEON_" +
+      "ROOM_TRIGGER_PARAM_ERROR\020\340e\0223\n.RET_UGC_D" +
+      "UNGEON_SCORE_SETTLE_TARGET_SCORE_ZERO\020\341e" +
+      "\022(\n#RET_UGC_DUNGEON_STATE_CAN_NOT_AUDIT\020" +
+      "\342e\022,\n\'RET_UGC_DUNGEON_AUDIT_VERSION_NOT_" +
+      "MATCH\020\343e\022\035\n\030RET_UGC_DUNGEON_IN_AUDIT\020\344e\022" +
+      "*\n%RET_UGC_DUNGEON_STATE_CAN_NOT_PUBLISH" +
+      "\020\345e\022)\n$RET_UGC_DUNGEON_REQUEST_TOO_FREQU" +
+      "ENT\020\346e\022,\n\'RET_UGC_DUNGEON_CAN_NOT_PUBLIS" +
+      "H_NO_EDIT\020\347e\022%\n RET_UGC_DUNGEON_NOT_ALLO" +
+      "W_IMPORT\020\350e\022,\n\'RET_UGC_DUNGEON_IMPORT_RO" +
+      "OM_HAS_MONSTER\020\351e\022%\n RET_UGC_DUNGEON_SEA" +
+      "RCH_NOT_EXIST\020\352e\022*\n%RET_UGC_DUNGEON_ROOM" +
+      "_SWITCH_LAST_ROOM\020\353e\022*\n%RET_UGC_DUNGEON_" +
+      "ROOM_GADGET_NUM_LIMIT\020\354e\022+\n&RET_UGC_DUNG" +
+      "EON_ROOM_MONSTER_NUM_LIMIT\020\355e\022)\n$RET_UGC" +
+      "_DUNGEON_NO_TRIAL_SUCC_RECORD\020\356e\022\036\n\031RET_" +
+      "UGC_DUNGEON_NUM_LIMIT\020\357e\022$\n\037RET_UGC_DUNG" +
+      "EON_IN_EDIT_DUNGEON\020\360e\022#\n\036RET_UGC_DUNGEO" +
+      "N_NOT_IN_DUNGEON\020\361e\0220\n+RET_UGC_DUNGEON_C" +
+      "HANGE_SETTING_TOO_FREQUENT\020\362e\022\036\n\031RET_UGC" +
+      "_DUNGEON_NOT_OWNER\020\363e\022\"\n\035RET_UGC_DUNGEON" +
+      "_NOT_PUBLISHED\020\364e\022(\n#RET_UGC_DUNGEON_SHA" +
+      "RE_CODE_GEN_FAIL\020\365e\022\037\n\032RET_UGC_DUNGEON_R" +
+      "OOM_LIMIT\020\366e\022\'\n\"RET_UGC_DUNGEON_SHARE_CO" +
+      "DE_INVALID\020\367e\022)\n$RET_UGC_DUNGEON_ROOM_SU" +
+      "ITE_NUM_LIMIT\020\370e\022-\n(RET_UGC_DUNGEON_TOWE" +
+      "R_HAS_BEEN_PURCHASED\020\255f\022/\n*RET_UGC_DUNGE" +
+      "ON_PLAYER_ADD_ITEM_OVER_STACK\020\256f\0222\n-RET_" +
+      "UGC_DUNGEON_PLAYER_TOWER_LEVEL_UP_LIMITE" +
+      "D\020\257f\0223\n.RET_UGC_DUNGEON_PLAYER_CONSUME_I" +
+      "TEM_NOT_ENOUGH\020\260f\0222\n-RET_UGC_DUNGEON_PLA" +
+      "YER_TOWER_ALREADY_LEVEL_UP\020\261f\0223\n.RET_UGC" +
+      "_DUNGEON_PLAYER_UGC_TARGET_IS_NOT_EXIST\020" +
+      "\262f\0224\n/RET_UGC_DUNGEON_PLAYER_UGC_TARGET_" +
+      "IS_NOT_ACTIVE\020\263f\022(\n#RET_UGC_DUNGEON_CHEC" +
+      "K_LAYOUT_FAILED\020\264f\0221\n,RET_UGC_DUNGEON_PL" +
+      "AYER_TOWER_ALREADY_REMOVED\020\265f\022/\n*RET_UGC" +
+      "_DUNGEON_PLAYER_ADD_ITEM_OVER_LIMIT\020\266f\0223" +
+      "\n.RET_UGC_DUNGEON_PLAYER_GRANT_AVATAR_OV" +
+      "ER_LIMIT\020\267f\022#\n\036RET_UGC_DUNGEON_DUPLICATE" +
+      "_STAR\020\313f\022*\n%RET_UGC_DUNGEON_CANCEL_STAR_" +
+      "NOT_EXIST\020\314f\022%\n RET_UGC_DUNGEON_STAR_REA" +
+      "CH_LIMIT\020\315f\022\"\n\035RET_UGC_DUNGEON_INTERNAL_" +
+      "FAIL\020\316f\022*\n%RET_UGC_DUNGEON_PLAYER_PUBLIS" +
+      "H_BANNED\020\317f\022,\n\'RET_UGC_DUNGEON_CUSTOM_ED" +
+      "IT_IS_NOT_OPEN\020\337f\022/\n*RET_UGC_DUNGEON_OFF" +
+      "ICIAL_LEVEL_IS_NOT_OPEN\020\340f\0220\n+RET_UGC_DU" +
+      "NGEON_TEMPLATE_IMPORT_IS_NOT_OPEN\020\341f\022\'\n\"" +
+      "RET_TARGET_SHOOTING_LEVEL_NOT_OPEN\020\351f\022-\n" +
+      "(RET_TARGET_SHOOTING_PLAYER_NUM_NOT_VALI" +
+      "D\020\352f\022&\n!RET_TARGET_SHOOTING_PLAY_NOT_OPE" +
+      "N\020\353f\022)\n$RET_TARGET_SHOOTING_CONFIG_NOT_F" +
+      "OUND\020\354f\022%\n RET_SHUFFLE_BOARD_LEVEL_NOT_O" +
+      "PEN\020\364f\022,\n\'RET_SHUFFLE_BOARD_NOT_IN_PENUM" +
+      "BRA_SCENE\020\365f\022%\n RET_SHUFFLE_BOARD_LEVEL_" +
+      "MISMATCH\020\366f\022&\n!RET_SHUFFLE_BOARD_ALREADY" +
+      "_PLAYING\020\367f\022\'\n\"RET_RAFFLE_TICKET_INVALID" +
+      "_BONUS_ID\020\370f\022+\n&RET_RAFFLE_TICKET_PREREQ" +
+      "UISITE_NOT_MET\020\371f\022!\n\034RET_RAFFLE_TICKET_N" +
+      "OT_ENOUGH\020\372f\022#\n\036RET_FLIGHT_GEAR_LEVEL_NO" +
+      "T_OPEN\020\207g\022\037\n\032RET_FLIGHT_GEAR_IN_MP_MODE\020" +
+      "\210g\0220\n+RET_ANIMAL_VIEW_AVATAR_IS_CLOSING_" +
+      "TO_ANIMAL\020\234g\022%\n RET_ANIMAL_VIEW_NOT_EQUI" +
+      "P_WIDGET\020\235g\022!\n\034RET_COMBINE_POINT_NOT_ENO" +
+      "UGH\020\245g\022*\n%RET_TOY_BATTLE_CURRENT_LEVEL_N" +
+      "OT_OPEN\020\303g\022\'\n\"RET_TOY_BATTLE_CURRENT_NOT" +
+      "_PLAYING\020\304g\0220\n+RET_FONTAINE_GATHER_INVAL" +
+      "ID_GATHER_TRACKING\020\315g\0221\n,RET_FONTAINE_GA" +
+      "THER_INVALID_MONSTER_TRACKING\020\316g\022#\n\036RET_" +
+      "FISHBLASTER_LEVEL_NOT_OPEN\020\327g\022\'\n\"RET_FIS" +
+      "HBLASTER_NOT_IN_RIGHT_SCENE\020\330g\022#\n\036RET_FI" +
+      "SHBLASTER_LEVEL_MISMATCH\020\331g\022$\n\037RET_FISHB" +
+      "LASTER_ALREADY_PLAYING\020\332g\022&\n!RET_GOAL_CH" +
+      "ALLENGE_STAGE_NOT_OPEN\020\341g\022$\n\037RET_GOAL_CH" +
+      "ALLENGE_INVALID_TEAM\020\342g\022$\n\037RET_ALCHEMY_S" +
+      "IM_COIN_NOT_ENOUGH\020\353g\022&\n!RET_ALCHEMY_SIM" +
+      "_CROP_EXCEED_LIMIT\020\354g\022\'\n\"RET_ALCHEMY_SIM" +
+      "_FARMLAND_SAME_CROP\020\355g\022-\n(RET_ALCHEMY_SI" +
+      "M_CROP_NO_HARVESTABLE_LAND\020\356g\022$\n\037RET_ALC" +
+      "HEMY_SIM_CROP_NOT_ENOUGH\020\357g\022&\n!RET_ALCHE" +
+      "MY_SIM_CROP_NOT_UNLOCKED\020\360g\022\'\n\"RET_ALCHE" +
+      "MY_SIM_FARMLAND_NOT_READY\020\361g\022\"\n\035RET_ALCH" +
+      "EMY_SIM_CROP_RANK_MAX\020\362g\022.\n)RET_ALCHEMY_" +
+      "SIM_FARMLAND_IS_NOT_HARVESTED\020\363g\022/\n*RET_" +
+      "ALCHEMY_SIM_TECH_TREE_ALREADY_UNLOCKED\020\364" +
+      "g\022%\n RET_ALCHEMY_SIM_POTION_NOT_EXIST\020\365g" +
+      "\022\'\n\"RET_ALCHEMY_SIM_NOT_IN_TARGET_EXAM\020\366" +
+      "g\022-\n(RET_ALCHEMY_SIM_ROUND_ALCHEMY_COUNT" +
+      "_OVER\020\367g\022)\n$RET_ALCHEMY_SIM_INTERNAL_LOG" +
+      "IC_ERROR\020\370g\022*\n%RET_ALCHEMY_SIM_CROP_ON_F" +
+      "ORBIDDEN_POS\020\371g\022,\n\'RET_ALCHEMY_SIM_CROP_" +
+      "OVERLAP_OVER_LIMIT\020\372g\022+\n&RET_ALCHEMY_SIM" +
+      "_PUZZLE_RATE_NOT_ENOUGH\020\373g\022(\n#RET_ALCHEM" +
+      "Y_SIM_POTION_CANT_UPGRADE\020\374g\022*\n%RET_ALCH" +
+      "EMY_SIM_EXAM_COUNT_NOT_ENOUGH\020\375g\022*\n%RET_" +
+      "ALCHEMY_SIM_TECH_TREE_NOT_ALLOWED\020\376g\022\'\n\"" +
+      "RET_ALCHEMY_SIM_CROP_NO_RIPEN_LAND\020\377g\022#\n" +
+      "\036RET_ALCHEMY_SIM_UNFINISH_QUEST\020\200h\022(\n#RE" +
+      "T_ALCHEMY_SIM_INVALID_ROUND_STATE\020\201h\022.\n)" +
+      "RET_ALCHEMY_SIM_CROP_UPGRADE_EXP_OVERFLO" +
+      "W\020\202h\022.\n)RET_ALCHEMY_SIM_CROP_UPGRADE_NOT" +
+      "_UNLOCKED\020\203h\022+\n&RET_ALCHEMY_SIM_FINISH_R" +
+      "OUND_FREQUENCY\020\204h\0222\n-RET_ALCHEMY_SIM_TEM" +
+      "PLATE_ALCHEMY_NOT_UNLOCKED\020\205h\022\'\n\"RET_CAT" +
+      "CAFE_LAYOUT_STAGE_NOT_RIGHT\020\247h\022!\n\034RET_CA" +
+      "TCAFE_LAYOUT_NOT_RIGHT\020\250h\022*\n%RET_STAMINA" +
+      "_FIGHT_IS_IN_OTHER_DUNGEON\020\273h\022,\n\'RET_EFF" +
+      "IGY_CHALLENGE_V_5_LEVEL_NOT_OPEN\020\305h\022-\n(R" +
+      "ET_EFFIGY_CHALLENGE_V_5_INVALID_SUPPORT\020" +
+      "\306h\0220\n+RET_EFFIGY_CHALLENGE_V_5_INVALID_P" +
+      "LAYER_NUM\020\307h\022\'\n\"RET_EFFIGY_CHALLENGE_V_5" +
+      "_IN_COMBAT\020\310h\022+\n&RET_EFFIGY_CHALLENGE_V_" +
+      "5_INVALID_SCENE\020\311h\022!\n\034RET_BLUEPRINT_SLOT" +
+      "_NOT_FOUND\020\331h\022#\n\036RET_FURNITURE_SUITE_ID_" +
+      "INVALID\020\332h\022,\n\'RET_WISHLIST_BATCH_OPERATE" +
+      "_OUT_OF_LIMIT\020\333h\022(\n#RET_HIDE_AND_SEEK_V_" +
+      "4_GAME_NOT_OPEN\020\343h\022.\n)RET_HIDE_AND_SEEK_" +
+      "V_4_PLAY_MAP_NOT_CHOSEN\020\344h\0222\n-RET_HIDE_A" +
+      "ND_SEEK_V_4_PLAYER_COUNT_NOT_ENOUGH\020\345h\022," +
+      "\n\'RET_HIDE_AND_SEEK_V_4_PLAY_MAP_NOT_OPE" +
+      "N\020\346h\022 \n\033RET_WATERGUN_LEVEL_NOT_OPEN\020\367h\022)" +
+      "\n$RET_ACROBATICS_BATTLE_STAGE_NOT_OPEN\020\201" +
+      "i\022\'\n\"RET_ACROBATICS_BATTLE_INVALID_TEAM\020" +
+      "\202i\022*\n%RET_MONSTER_VS_MONSTER_LEVEL_NOT_O" +
+      "PEN\020\213i\022%\n RET_RECHARGE_DISK_LEVEL_NOT_OP" +
+      "EN\020\237i\022*\n%RET_RECHARGE_DISK_INVALID_LEVEL" +
+      "_BUILD\020\240i\022(\n#RET_RECHARGE_DISK_CUR_SCENE" +
+      "_INVALID\020\241i\022%\n RET_ACTIVITY_PREVIEW_TRIA" +
+      "L_IN_CD\020\246i\022$\n\037RET_BIRD_BALL_MP_LEVEL_NOT" +
+      "_OPEN\020\251i\022+\n&RET_BIRD_BALL_DRAFT_PLAYER_N" +
+      "UM_INVALID\020\252i\022,\n\'RET_FAIRY_TALES_LOTTER_" +
+      "AREA_IS_NOT_OPEN\020\263i\022/\n*RET_FAIRY_TALES_L" +
+      "OTTER_LEFT_CNT_NOT_ENOUGH\020\264i\0222\n-RET_FAIR" +
+      "Y_TALES_TOY_TOTAL_LEFT_CNT_NOT_ENOUGH\020\265i" +
+      "\022-\n(RET_FAIRY_TALES_WISH_TOY_TYPE_OVER_L" +
+      "IMIT\020\266i\0226\n1RET_FAIRY_TALES_TOY_CUSTOM_GA" +
+      "DGET_CONTENT_INVALID\020\267i\022*\n%RET_FAIRY_TAL" +
+      "ES_COMBAT_LEVEL_NOT_OPEN\020\270i\0220\n+RET_FAIRY" +
+      "_TALES_TICKET_PREREQUISITE_NOT_MET\020\271i\022&\n" +
+      "!RET_FAIRY_TALES_TICKET_NOT_ENOUGH\020\272i\022#\n" +
+      "\036RET_ACTIVITY_TEAM_INVALID_SIZE\020\357i\022&\n!RE" +
+      "T_ACTIVITY_INVALID_TRIAL_AVATAR\020\360i\022(\n#RE" +
+      "T_ACTIVITY_FORBIDDEN_TRIAL_AVATAR\020\361i\022#\n\036" +
+      "RET_RENAME_INVALID_QUEST_STATE\020\203j\022\032\n\025RET" +
+      "_RENAME_CONFLICTED\020\204j\0223\n.RET_RELIQUARY_O" +
+      "FFER_PURCHASE_VERSION_IDX_ERROR\020\227j\022,\n\'RE" +
+      "T_RELIQUARY_OFFER_VERSION_TIMES_LIMIT\020\230j" +
+      "\022,\n\'RET_RELIQUARY_OFFER_PROGRESS_NOT_ENO" +
+      "UGH\020\231j\022,\n\'RET_RELIQUARY_OFFER_PROGRESS_O" +
+      "VER_LIMIT\020\232j\0222\n-RET_RELIQUARY_PURCHASE_S" +
+      "UITE_TIMES_OVER_LIMIT\020\233jB\033\n\031emu.grasscut" +
+      "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeGadgetInfoOuterClass.java
index acade4a76..b08549ef1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RoguelikeGadgetInfoOuterClass.java
@@ -44,7 +44,7 @@ public final class RoguelikeGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: FFNNBKHJJDP
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code RoguelikeGadgetInfo}
@@ -377,7 +377,7 @@ public final class RoguelikeGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: FFNNBKHJJDP
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code RoguelikeGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RouteOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RouteOuterClass.java
index 3f8d83673..8230db121 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RouteOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RouteOuterClass.java
@@ -50,7 +50,7 @@ public final class RouteOuterClass {
   }
   /**
    * <pre>
-   * Obf: GPFODIPKJPN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code Route}
@@ -369,7 +369,7 @@ public final class RouteOuterClass {
     }
     /**
      * <pre>
-     * Obf: GPFODIPKJPN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code Route}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/RoutePointOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/RoutePointOuterClass.java
index ad3996f5e..d2ecb9f7a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/RoutePointOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/RoutePointOuterClass.java
@@ -117,10 +117,6 @@ public final class RoutePointOuterClass {
     public emu.grasscutter.net.proto.RoutePointOuterClass.RoutePoint.RotateParamsCase getRotateParamsCase();
   }
   /**
-   * <pre>
-   * Obf: EDGGMGMHPJB
-   * </pre>
-   *
    * Protobuf type {@code RoutePoint}
    */
   public static final class RoutePoint extends
@@ -826,10 +822,6 @@ public final class RoutePointOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EDGGMGMHPJB
-     * </pre>
-     *
      * Protobuf type {@code RoutePoint}
      */
     public static final class Builder extends
@@ -1842,14 +1834,14 @@ public final class RoutePointOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\020RoutePoint.proto\032\014Vector.proto\032\024MathQu" +
-      "aternion.proto\"\211\002\n\nRoutePoint\022\031\n\010positio" +
+      "aternion.proto\"\207\002\n\nRoutePoint\022\031\n\010positio" +
       "n\030\001 \001(\0132\007.Vector\022\024\n\014arrive_range\030\002 \001(\002\022\027" +
       "\n\017has_reach_event\030\003 \001(\010\022\022\n\010velocity\030\013 \001(" +
       "\002H\000\022\016\n\004time\030\014 \001(\002H\000\022\033\n\010rotation\030\025 \001(\0132\007." +
       "VectorH\001\022)\n\016rotation_speed\030\026 \001(\0132\017.MathQ" +
       "uaternionH\001\022%\n\naxis_speed\030\027 \001(\0132\017.MathQu" +
-      "aternionH\001B\r\n\013move_paramsB\017\n\rrotate_para" +
-      "msB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "aternionH\001B\014\n\nMoveParamsB\016\n\014RotateParams" +
+      "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventGallerySettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventGallerySettleInfoOuterClass.java
index 3895704b2..6f939450d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventGallerySettleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventGallerySettleInfoOuterClass.java
@@ -19,39 +19,35 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 monster_count = 11;</code>
-     * @return The monsterCount.
-     */
-    int getMonsterCount();
-
-    /**
-     * <code>uint32 final_score = 9;</code>
-     * @return The finalScore.
-     */
-    int getFinalScore();
-
-    /**
-     * <code>uint32 time_remain = 10;</code>
+     * <code>uint32 time_remain = 4;</code>
      * @return The timeRemain.
      */
     int getTimeRemain();
 
     /**
-     * <code>.SalvagePreventStopReason reason = 6;</code>
+     * <code>uint32 final_score = 7;</code>
+     * @return The finalScore.
+     */
+    int getFinalScore();
+
+    /**
+     * <code>.SalvagePreventStopReason reason = 10;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.SalvagePreventStopReason reason = 6;</code>
+     * <code>.SalvagePreventStopReason reason = 10;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason getReason();
+
+    /**
+     * <code>uint32 monster_count = 15;</code>
+     * @return The monsterCount.
+     */
+    int getMonsterCount();
   }
   /**
-   * <pre>
-   * Obf: HDLGEIILLID
-   * </pre>
-   *
    * Protobuf type {@code SalvagePreventGallerySettleInfo}
    */
   public static final class SalvagePreventGallerySettleInfo extends
@@ -97,23 +93,23 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-              int rawValue = input.readEnum();
+            case 32: {
 
-              reason_ = rawValue;
+              timeRemain_ = input.readUInt32();
               break;
             }
-            case 72: {
+            case 56: {
 
               finalScore_ = input.readUInt32();
               break;
             }
             case 80: {
+              int rawValue = input.readEnum();
 
-              timeRemain_ = input.readUInt32();
+              reason_ = rawValue;
               break;
             }
-            case 88: {
+            case 120: {
 
               monsterCount_ = input.readUInt32();
               break;
@@ -150,32 +146,10 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
               emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.class, emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder.class);
     }
 
-    public static final int MONSTER_COUNT_FIELD_NUMBER = 11;
-    private int monsterCount_;
-    /**
-     * <code>uint32 monster_count = 11;</code>
-     * @return The monsterCount.
-     */
-    @java.lang.Override
-    public int getMonsterCount() {
-      return monsterCount_;
-    }
-
-    public static final int FINAL_SCORE_FIELD_NUMBER = 9;
-    private int finalScore_;
-    /**
-     * <code>uint32 final_score = 9;</code>
-     * @return The finalScore.
-     */
-    @java.lang.Override
-    public int getFinalScore() {
-      return finalScore_;
-    }
-
-    public static final int TIME_REMAIN_FIELD_NUMBER = 10;
+    public static final int TIME_REMAIN_FIELD_NUMBER = 4;
     private int timeRemain_;
     /**
-     * <code>uint32 time_remain = 10;</code>
+     * <code>uint32 time_remain = 4;</code>
      * @return The timeRemain.
      */
     @java.lang.Override
@@ -183,17 +157,28 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       return timeRemain_;
     }
 
-    public static final int REASON_FIELD_NUMBER = 6;
+    public static final int FINAL_SCORE_FIELD_NUMBER = 7;
+    private int finalScore_;
+    /**
+     * <code>uint32 final_score = 7;</code>
+     * @return The finalScore.
+     */
+    @java.lang.Override
+    public int getFinalScore() {
+      return finalScore_;
+    }
+
+    public static final int REASON_FIELD_NUMBER = 10;
     private int reason_;
     /**
-     * <code>.SalvagePreventStopReason reason = 6;</code>
+     * <code>.SalvagePreventStopReason reason = 10;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.SalvagePreventStopReason reason = 6;</code>
+     * <code>.SalvagePreventStopReason reason = 10;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason getReason() {
@@ -202,6 +187,17 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       return result == null ? emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.UNRECOGNIZED : result;
     }
 
+    public static final int MONSTER_COUNT_FIELD_NUMBER = 15;
+    private int monsterCount_;
+    /**
+     * <code>uint32 monster_count = 15;</code>
+     * @return The monsterCount.
+     */
+    @java.lang.Override
+    public int getMonsterCount() {
+      return monsterCount_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -216,17 +212,17 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reason_ != emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.SALVAGE_PREVENT_STOP_NONE.getNumber()) {
-        output.writeEnum(6, reason_);
+      if (timeRemain_ != 0) {
+        output.writeUInt32(4, timeRemain_);
       }
       if (finalScore_ != 0) {
-        output.writeUInt32(9, finalScore_);
+        output.writeUInt32(7, finalScore_);
       }
-      if (timeRemain_ != 0) {
-        output.writeUInt32(10, timeRemain_);
+      if (reason_ != emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.SALVAGE_PREVENT_STOP_NONE.getNumber()) {
+        output.writeEnum(10, reason_);
       }
       if (monsterCount_ != 0) {
-        output.writeUInt32(11, monsterCount_);
+        output.writeUInt32(15, monsterCount_);
       }
       unknownFields.writeTo(output);
     }
@@ -237,21 +233,21 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (reason_ != emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.SALVAGE_PREVENT_STOP_NONE.getNumber()) {
+      if (timeRemain_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, reason_);
+          .computeUInt32Size(4, timeRemain_);
       }
       if (finalScore_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, finalScore_);
+          .computeUInt32Size(7, finalScore_);
       }
-      if (timeRemain_ != 0) {
+      if (reason_ != emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.SALVAGE_PREVENT_STOP_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, timeRemain_);
+          .computeEnumSize(10, reason_);
       }
       if (monsterCount_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, monsterCount_);
+          .computeUInt32Size(15, monsterCount_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -268,13 +264,13 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       }
       emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo other = (emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo) obj;
 
-      if (getMonsterCount()
-          != other.getMonsterCount()) return false;
-      if (getFinalScore()
-          != other.getFinalScore()) return false;
       if (getTimeRemain()
           != other.getTimeRemain()) return false;
+      if (getFinalScore()
+          != other.getFinalScore()) return false;
       if (reason_ != other.reason_) return false;
+      if (getMonsterCount()
+          != other.getMonsterCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -286,14 +282,14 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MONSTER_COUNT_FIELD_NUMBER;
-      hash = (53 * hash) + getMonsterCount();
-      hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER;
-      hash = (53 * hash) + getFinalScore();
       hash = (37 * hash) + TIME_REMAIN_FIELD_NUMBER;
       hash = (53 * hash) + getTimeRemain();
+      hash = (37 * hash) + FINAL_SCORE_FIELD_NUMBER;
+      hash = (53 * hash) + getFinalScore();
       hash = (37 * hash) + REASON_FIELD_NUMBER;
       hash = (53 * hash) + reason_;
+      hash = (37 * hash) + MONSTER_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + getMonsterCount();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -390,10 +386,6 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HDLGEIILLID
-     * </pre>
-     *
      * Protobuf type {@code SalvagePreventGallerySettleInfo}
      */
     public static final class Builder extends
@@ -431,14 +423,14 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        monsterCount_ = 0;
+        timeRemain_ = 0;
 
         finalScore_ = 0;
 
-        timeRemain_ = 0;
-
         reason_ = 0;
 
+        monsterCount_ = 0;
+
         return this;
       }
 
@@ -465,10 +457,10 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo buildPartial() {
         emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo result = new emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo(this);
-        result.monsterCount_ = monsterCount_;
-        result.finalScore_ = finalScore_;
         result.timeRemain_ = timeRemain_;
+        result.finalScore_ = finalScore_;
         result.reason_ = reason_;
+        result.monsterCount_ = monsterCount_;
         onBuilt();
         return result;
       }
@@ -517,18 +509,18 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo other) {
         if (other == emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.getDefaultInstance()) return this;
-        if (other.getMonsterCount() != 0) {
-          setMonsterCount(other.getMonsterCount());
+        if (other.getTimeRemain() != 0) {
+          setTimeRemain(other.getTimeRemain());
         }
         if (other.getFinalScore() != 0) {
           setFinalScore(other.getFinalScore());
         }
-        if (other.getTimeRemain() != 0) {
-          setTimeRemain(other.getTimeRemain());
-        }
         if (other.reason_ != 0) {
           setReasonValue(other.getReasonValue());
         }
+        if (other.getMonsterCount() != 0) {
+          setMonsterCount(other.getMonsterCount());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -558,71 +550,9 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return this;
       }
 
-      private int monsterCount_ ;
-      /**
-       * <code>uint32 monster_count = 11;</code>
-       * @return The monsterCount.
-       */
-      @java.lang.Override
-      public int getMonsterCount() {
-        return monsterCount_;
-      }
-      /**
-       * <code>uint32 monster_count = 11;</code>
-       * @param value The monsterCount to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMonsterCount(int value) {
-        
-        monsterCount_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 monster_count = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMonsterCount() {
-        
-        monsterCount_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int finalScore_ ;
-      /**
-       * <code>uint32 final_score = 9;</code>
-       * @return The finalScore.
-       */
-      @java.lang.Override
-      public int getFinalScore() {
-        return finalScore_;
-      }
-      /**
-       * <code>uint32 final_score = 9;</code>
-       * @param value The finalScore to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinalScore(int value) {
-        
-        finalScore_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 final_score = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinalScore() {
-        
-        finalScore_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int timeRemain_ ;
       /**
-       * <code>uint32 time_remain = 10;</code>
+       * <code>uint32 time_remain = 4;</code>
        * @return The timeRemain.
        */
       @java.lang.Override
@@ -630,7 +560,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return timeRemain_;
       }
       /**
-       * <code>uint32 time_remain = 10;</code>
+       * <code>uint32 time_remain = 4;</code>
        * @param value The timeRemain to set.
        * @return This builder for chaining.
        */
@@ -641,7 +571,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 time_remain = 10;</code>
+       * <code>uint32 time_remain = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTimeRemain() {
@@ -651,16 +581,47 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return this;
       }
 
+      private int finalScore_ ;
+      /**
+       * <code>uint32 final_score = 7;</code>
+       * @return The finalScore.
+       */
+      @java.lang.Override
+      public int getFinalScore() {
+        return finalScore_;
+      }
+      /**
+       * <code>uint32 final_score = 7;</code>
+       * @param value The finalScore to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinalScore(int value) {
+        
+        finalScore_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 final_score = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinalScore() {
+        
+        finalScore_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int reason_ = 0;
       /**
-       * <code>.SalvagePreventStopReason reason = 6;</code>
+       * <code>.SalvagePreventStopReason reason = 10;</code>
        * @return The enum numeric value on the wire for reason.
        */
       @java.lang.Override public int getReasonValue() {
         return reason_;
       }
       /**
-       * <code>.SalvagePreventStopReason reason = 6;</code>
+       * <code>.SalvagePreventStopReason reason = 10;</code>
        * @param value The enum numeric value on the wire for reason to set.
        * @return This builder for chaining.
        */
@@ -671,7 +632,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventStopReason reason = 6;</code>
+       * <code>.SalvagePreventStopReason reason = 10;</code>
        * @return The reason.
        */
       @java.lang.Override
@@ -681,7 +642,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return result == null ? emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.SalvagePreventStopReason.UNRECOGNIZED : result;
       }
       /**
-       * <code>.SalvagePreventStopReason reason = 6;</code>
+       * <code>.SalvagePreventStopReason reason = 10;</code>
        * @param value The reason to set.
        * @return This builder for chaining.
        */
@@ -695,7 +656,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventStopReason reason = 6;</code>
+       * <code>.SalvagePreventStopReason reason = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearReason() {
@@ -704,6 +665,37 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int monsterCount_ ;
+      /**
+       * <code>uint32 monster_count = 15;</code>
+       * @return The monsterCount.
+       */
+      @java.lang.Override
+      public int getMonsterCount() {
+        return monsterCount_;
+      }
+      /**
+       * <code>uint32 monster_count = 15;</code>
+       * @param value The monsterCount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMonsterCount(int value) {
+        
+        monsterCount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 monster_count = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMonsterCount() {
+        
+        monsterCount_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -773,10 +765,10 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n%SalvagePreventGallerySettleInfo.proto\032" +
       "\036SalvagePreventStopReason.proto\"\215\001\n\037Salv" +
-      "agePreventGallerySettleInfo\022\025\n\rmonster_c" +
-      "ount\030\013 \001(\r\022\023\n\013final_score\030\t \001(\r\022\023\n\013time_" +
-      "remain\030\n \001(\r\022)\n\006reason\030\006 \001(\0162\031.SalvagePr" +
-      "eventStopReasonB\033\n\031emu.grasscutter.net.p" +
+      "agePreventGallerySettleInfo\022\023\n\013time_rema" +
+      "in\030\004 \001(\r\022\023\n\013final_score\030\007 \001(\r\022)\n\006reason\030" +
+      "\n \001(\0162\031.SalvagePreventStopReason\022\025\n\rmons" +
+      "ter_count\030\017 \001(\rB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -789,7 +781,7 @@ public final class SalvagePreventGallerySettleInfoOuterClass {
     internal_static_SalvagePreventGallerySettleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SalvagePreventGallerySettleInfo_descriptor,
-        new java.lang.String[] { "MonsterCount", "FinalScore", "TimeRemain", "Reason", });
+        new java.lang.String[] { "TimeRemain", "FinalScore", "Reason", "MonsterCount", });
     emu.grasscutter.net.proto.SalvagePreventStopReasonOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleInfoOuterClass.java
index b3360fbcc..8f38b0d35 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleInfoOuterClass.java
@@ -19,17 +19,17 @@ public final class SalvagePreventSettleInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      * @return Whether the settleInfo field is set.
      */
     boolean hasSettleInfo();
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      * @return The settleInfo.
      */
     emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo getSettleInfo();
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      */
     emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfoOrBuilder getSettleInfoOrBuilder();
 
@@ -40,10 +40,6 @@ public final class SalvagePreventSettleInfoOuterClass {
     boolean getIsNewRecord();
   }
   /**
-   * <pre>
-   * Obf: CJHIMPDDGKJ
-   * </pre>
-   *
    * Protobuf type {@code SalvagePreventSettleInfo}
    */
   public static final class SalvagePreventSettleInfo extends
@@ -88,12 +84,7 @@ public final class SalvagePreventSettleInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
-
-              isNewRecord_ = input.readBool();
-              break;
-            }
-            case 122: {
+            case 66: {
               emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder subBuilder = null;
               if (settleInfo_ != null) {
                 subBuilder = settleInfo_.toBuilder();
@@ -106,6 +97,11 @@ public final class SalvagePreventSettleInfoOuterClass {
 
               break;
             }
+            case 112: {
+
+              isNewRecord_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -138,10 +134,10 @@ public final class SalvagePreventSettleInfoOuterClass {
               emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.class, emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder.class);
     }
 
-    public static final int SETTLE_INFO_FIELD_NUMBER = 15;
+    public static final int SETTLE_INFO_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo settleInfo_;
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      * @return Whether the settleInfo field is set.
      */
     @java.lang.Override
@@ -149,7 +145,7 @@ public final class SalvagePreventSettleInfoOuterClass {
       return settleInfo_ != null;
     }
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      * @return The settleInfo.
      */
     @java.lang.Override
@@ -157,7 +153,7 @@ public final class SalvagePreventSettleInfoOuterClass {
       return settleInfo_ == null ? emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.getDefaultInstance() : settleInfo_;
     }
     /**
-     * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+     * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfoOrBuilder getSettleInfoOrBuilder() {
@@ -189,12 +185,12 @@ public final class SalvagePreventSettleInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (settleInfo_ != null) {
+        output.writeMessage(8, getSettleInfo());
+      }
       if (isNewRecord_ != false) {
         output.writeBool(14, isNewRecord_);
       }
-      if (settleInfo_ != null) {
-        output.writeMessage(15, getSettleInfo());
-      }
       unknownFields.writeTo(output);
     }
 
@@ -204,14 +200,14 @@ public final class SalvagePreventSettleInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (settleInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getSettleInfo());
+      }
       if (isNewRecord_ != false) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(14, isNewRecord_);
       }
-      if (settleInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getSettleInfo());
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -348,10 +344,6 @@ public final class SalvagePreventSettleInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CJHIMPDDGKJ
-     * </pre>
-     *
      * Protobuf type {@code SalvagePreventSettleInfo}
      */
     public static final class Builder extends
@@ -516,14 +508,14 @@ public final class SalvagePreventSettleInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo, emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder, emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfoOrBuilder> settleInfoBuilder_;
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        * @return Whether the settleInfo field is set.
        */
       public boolean hasSettleInfo() {
         return settleInfoBuilder_ != null || settleInfo_ != null;
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        * @return The settleInfo.
        */
       public emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo getSettleInfo() {
@@ -534,7 +526,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         }
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public Builder setSettleInfo(emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo value) {
         if (settleInfoBuilder_ == null) {
@@ -550,7 +542,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public Builder setSettleInfo(
           emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder builderForValue) {
@@ -564,7 +556,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public Builder mergeSettleInfo(emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo value) {
         if (settleInfoBuilder_ == null) {
@@ -582,7 +574,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public Builder clearSettleInfo() {
         if (settleInfoBuilder_ == null) {
@@ -596,7 +588,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder getSettleInfoBuilder() {
         
@@ -604,7 +596,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         return getSettleInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       public emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfoOrBuilder getSettleInfoOrBuilder() {
         if (settleInfoBuilder_ != null) {
@@ -615,7 +607,7 @@ public final class SalvagePreventSettleInfoOuterClass {
         }
       }
       /**
-       * <code>.SalvagePreventGallerySettleInfo settle_info = 15;</code>
+       * <code>.SalvagePreventGallerySettleInfo settle_info = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo, emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfo.Builder, emu.grasscutter.net.proto.SalvagePreventGallerySettleInfoOuterClass.SalvagePreventGallerySettleInfoOrBuilder> 
@@ -730,7 +722,7 @@ public final class SalvagePreventSettleInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036SalvagePreventSettleInfo.proto\032%Salvag" +
       "ePreventGallerySettleInfo.proto\"h\n\030Salva" +
-      "gePreventSettleInfo\0225\n\013settle_info\030\017 \001(\013" +
+      "gePreventSettleInfo\0225\n\013settle_info\030\010 \001(\013" +
       "2 .SalvagePreventGallerySettleInfo\022\025\n\ris" +
       "_new_record\030\016 \001(\010B\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleNotifyOuterClass.java
index b1e52618c..2cbc1c89e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventSettleNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class SalvagePreventSettleNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>uint32 gallery_id = 3;</code>
+     * @return The galleryId.
+     */
+    int getGalleryId();
+
+    /**
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      * @return Whether the settleInfo field is set.
      */
     boolean hasSettleInfo();
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      * @return The settleInfo.
      */
     emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo getSettleInfo();
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      */
     emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfoOrBuilder getSettleInfoOrBuilder();
-
-    /**
-     * <code>uint32 gallery_id = 12;</code>
-     * @return The galleryId.
-     */
-    int getGalleryId();
   }
   /**
-   * <pre>
-   * CmdId: 24588
-   * Obf: JLEFKHKDMLC
-   * </pre>
-   *
    * Protobuf type {@code SalvagePreventSettleNotify}
    */
   public static final class SalvagePreventSettleNotify extends
@@ -89,7 +84,12 @@ public final class SalvagePreventSettleNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 24: {
+
+              galleryId_ = input.readUInt32();
+              break;
+            }
+            case 90: {
               emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder subBuilder = null;
               if (settleInfo_ != null) {
                 subBuilder = settleInfo_.toBuilder();
@@ -102,11 +102,6 @@ public final class SalvagePreventSettleNotifyOuterClass {
 
               break;
             }
-            case 96: {
-
-              galleryId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +134,21 @@ public final class SalvagePreventSettleNotifyOuterClass {
               emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify.class, emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify.Builder.class);
     }
 
-    public static final int SETTLE_INFO_FIELD_NUMBER = 8;
+    public static final int GALLERY_ID_FIELD_NUMBER = 3;
+    private int galleryId_;
+    /**
+     * <code>uint32 gallery_id = 3;</code>
+     * @return The galleryId.
+     */
+    @java.lang.Override
+    public int getGalleryId() {
+      return galleryId_;
+    }
+
+    public static final int SETTLE_INFO_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo settleInfo_;
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      * @return Whether the settleInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +156,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
       return settleInfo_ != null;
     }
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      * @return The settleInfo.
      */
     @java.lang.Override
@@ -158,24 +164,13 @@ public final class SalvagePreventSettleNotifyOuterClass {
       return settleInfo_ == null ? emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.getDefaultInstance() : settleInfo_;
     }
     /**
-     * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+     * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfoOrBuilder getSettleInfoOrBuilder() {
       return getSettleInfo();
     }
 
-    public static final int GALLERY_ID_FIELD_NUMBER = 12;
-    private int galleryId_;
-    /**
-     * <code>uint32 gallery_id = 12;</code>
-     * @return The galleryId.
-     */
-    @java.lang.Override
-    public int getGalleryId() {
-      return galleryId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +185,11 @@ public final class SalvagePreventSettleNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (settleInfo_ != null) {
-        output.writeMessage(8, getSettleInfo());
-      }
       if (galleryId_ != 0) {
-        output.writeUInt32(12, galleryId_);
+        output.writeUInt32(3, galleryId_);
+      }
+      if (settleInfo_ != null) {
+        output.writeMessage(11, getSettleInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class SalvagePreventSettleNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (settleInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getSettleInfo());
-      }
       if (galleryId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, galleryId_);
+          .computeUInt32Size(3, galleryId_);
+      }
+      if (settleInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, getSettleInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class SalvagePreventSettleNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify other = (emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify) obj;
 
+      if (getGalleryId()
+          != other.getGalleryId()) return false;
       if (hasSettleInfo() != other.hasSettleInfo()) return false;
       if (hasSettleInfo()) {
         if (!getSettleInfo()
             .equals(other.getSettleInfo())) return false;
       }
-      if (getGalleryId()
-          != other.getGalleryId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class SalvagePreventSettleNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + GALLERY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGalleryId();
       if (hasSettleInfo()) {
         hash = (37 * hash) + SETTLE_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSettleInfo().hashCode();
       }
-      hash = (37 * hash) + GALLERY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGalleryId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class SalvagePreventSettleNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24588
-     * Obf: JLEFKHKDMLC
-     * </pre>
-     *
      * Protobuf type {@code SalvagePreventSettleNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class SalvagePreventSettleNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        galleryId_ = 0;
+
         if (settleInfoBuilder_ == null) {
           settleInfo_ = null;
         } else {
           settleInfo_ = null;
           settleInfoBuilder_ = null;
         }
-        galleryId_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class SalvagePreventSettleNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify buildPartial() {
         emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify result = new emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify(this);
+        result.galleryId_ = galleryId_;
         if (settleInfoBuilder_ == null) {
           result.settleInfo_ = settleInfo_;
         } else {
           result.settleInfo_ = settleInfoBuilder_.build();
         }
-        result.galleryId_ = galleryId_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class SalvagePreventSettleNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify other) {
         if (other == emu.grasscutter.net.proto.SalvagePreventSettleNotifyOuterClass.SalvagePreventSettleNotify.getDefaultInstance()) return this;
-        if (other.hasSettleInfo()) {
-          mergeSettleInfo(other.getSettleInfo());
-        }
         if (other.getGalleryId() != 0) {
           setGalleryId(other.getGalleryId());
         }
+        if (other.hasSettleInfo()) {
+          mergeSettleInfo(other.getSettleInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,18 +503,49 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return this;
       }
 
+      private int galleryId_ ;
+      /**
+       * <code>uint32 gallery_id = 3;</code>
+       * @return The galleryId.
+       */
+      @java.lang.Override
+      public int getGalleryId() {
+        return galleryId_;
+      }
+      /**
+       * <code>uint32 gallery_id = 3;</code>
+       * @param value The galleryId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGalleryId(int value) {
+        
+        galleryId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 gallery_id = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGalleryId() {
+        
+        galleryId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo settleInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo, emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder, emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfoOrBuilder> settleInfoBuilder_;
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        * @return Whether the settleInfo field is set.
        */
       public boolean hasSettleInfo() {
         return settleInfoBuilder_ != null || settleInfo_ != null;
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        * @return The settleInfo.
        */
       public emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo getSettleInfo() {
@@ -535,7 +556,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         }
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public Builder setSettleInfo(emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo value) {
         if (settleInfoBuilder_ == null) {
@@ -551,7 +572,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public Builder setSettleInfo(
           emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder builderForValue) {
@@ -565,7 +586,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public Builder mergeSettleInfo(emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo value) {
         if (settleInfoBuilder_ == null) {
@@ -583,7 +604,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public Builder clearSettleInfo() {
         if (settleInfoBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder getSettleInfoBuilder() {
         
@@ -605,7 +626,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         return getSettleInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       public emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfoOrBuilder getSettleInfoOrBuilder() {
         if (settleInfoBuilder_ != null) {
@@ -616,7 +637,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
         }
       }
       /**
-       * <code>.SalvagePreventSettleInfo settle_info = 8;</code>
+       * <code>.SalvagePreventSettleInfo settle_info = 11;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo, emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfo.Builder, emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.SalvagePreventSettleInfoOrBuilder> 
@@ -631,37 +652,6 @@ public final class SalvagePreventSettleNotifyOuterClass {
         }
         return settleInfoBuilder_;
       }
-
-      private int galleryId_ ;
-      /**
-       * <code>uint32 gallery_id = 12;</code>
-       * @return The galleryId.
-       */
-      @java.lang.Override
-      public int getGalleryId() {
-        return galleryId_;
-      }
-      /**
-       * <code>uint32 gallery_id = 12;</code>
-       * @param value The galleryId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGalleryId(int value) {
-        
-        galleryId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 gallery_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGalleryId() {
-        
-        galleryId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,9 +721,9 @@ public final class SalvagePreventSettleNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n SalvagePreventSettleNotify.proto\032\036Salv" +
       "agePreventSettleInfo.proto\"`\n\032SalvagePre" +
-      "ventSettleNotify\022.\n\013settle_info\030\010 \001(\0132\031." +
-      "SalvagePreventSettleInfo\022\022\n\ngallery_id\030\014" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "ventSettleNotify\022\022\n\ngallery_id\030\003 \001(\r\022.\n\013" +
+      "settle_info\030\013 \001(\0132\031.SalvagePreventSettle" +
+      "InfoB\033\n\031emu.grasscutter.net.protob\006proto" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -746,7 +736,7 @@ public final class SalvagePreventSettleNotifyOuterClass {
     internal_static_SalvagePreventSettleNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SalvagePreventSettleNotify_descriptor,
-        new java.lang.String[] { "SettleInfo", "GalleryId", });
+        new java.lang.String[] { "GalleryId", "SettleInfo", });
     emu.grasscutter.net.proto.SalvagePreventSettleInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventStopReasonOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventStopReasonOuterClass.java
index bcad2d0ed..38ea23932 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventStopReasonOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SalvagePreventStopReasonOuterClass.java
@@ -15,10 +15,6 @@ public final class SalvagePreventStopReasonOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: MPKIGDOAHIH
-   * </pre>
-   *
    * Protobuf enum {@code SalvagePreventStopReason}
    */
   public enum SalvagePreventStopReason
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaUnlockNotifyOuterClass.java
index 31c9619a2..54f3e1b1e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaUnlockNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaUnlockNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class SceneAreaUnlockNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @return A list containing the areaList.
      */
     java.util.List<java.lang.Integer> getAreaListList();
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @return The count of areaList.
      */
     int getAreaListCount();
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @param index The index of the element to return.
      * @return The areaList at the given index.
      */
     int getAreaList(int index);
 
     /**
-     * <code>uint32 scene_id = 6;</code>
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     int getSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 9869
-   * Obf: CIGGADKIENC
-   * </pre>
-   *
    * Protobuf type {@code SceneAreaUnlockNotify}
    */
   public static final class SceneAreaUnlockNotify extends
@@ -93,7 +88,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 areaList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +96,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
               areaList_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -114,7 +109,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 48: {
+            case 112: {
 
               sceneId_ = input.readUInt32();
               break;
@@ -154,10 +149,10 @@ public final class SceneAreaUnlockNotifyOuterClass {
               emu.grasscutter.net.proto.SceneAreaUnlockNotifyOuterClass.SceneAreaUnlockNotify.class, emu.grasscutter.net.proto.SceneAreaUnlockNotifyOuterClass.SceneAreaUnlockNotify.Builder.class);
     }
 
-    public static final int AREA_LIST_FIELD_NUMBER = 1;
+    public static final int AREA_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.IntList areaList_;
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @return A list containing the areaList.
      */
     @java.lang.Override
@@ -166,14 +161,14 @@ public final class SceneAreaUnlockNotifyOuterClass {
       return areaList_;
     }
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @return The count of areaList.
      */
     public int getAreaListCount() {
       return areaList_.size();
     }
     /**
-     * <code>repeated uint32 area_list = 1;</code>
+     * <code>repeated uint32 area_list = 10;</code>
      * @param index The index of the element to return.
      * @return The areaList at the given index.
      */
@@ -182,10 +177,10 @@ public final class SceneAreaUnlockNotifyOuterClass {
     }
     private int areaListMemoizedSerializedSize = -1;
 
-    public static final int SCENE_ID_FIELD_NUMBER = 6;
+    public static final int SCENE_ID_FIELD_NUMBER = 14;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 6;</code>
+     * <code>uint32 scene_id = 14;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -209,14 +204,14 @@ public final class SceneAreaUnlockNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getAreaListList().size() > 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(areaListMemoizedSerializedSize);
       }
       for (int i = 0; i < areaList_.size(); i++) {
         output.writeUInt32NoTag(areaList_.getInt(i));
       }
       if (sceneId_ != 0) {
-        output.writeUInt32(6, sceneId_);
+        output.writeUInt32(14, sceneId_);
       }
       unknownFields.writeTo(output);
     }
@@ -243,7 +238,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, sceneId_);
+          .computeUInt32Size(14, sceneId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -377,11 +372,6 @@ public final class SceneAreaUnlockNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9869
-     * Obf: CIGGADKIENC
-     * </pre>
-     *
      * Protobuf type {@code SceneAreaUnlockNotify}
      */
     public static final class Builder extends
@@ -555,7 +545,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @return A list containing the areaList.
        */
       public java.util.List<java.lang.Integer>
@@ -564,14 +554,14 @@ public final class SceneAreaUnlockNotifyOuterClass {
                  java.util.Collections.unmodifiableList(areaList_) : areaList_;
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @return The count of areaList.
        */
       public int getAreaListCount() {
         return areaList_.size();
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @param index The index of the element to return.
        * @return The areaList at the given index.
        */
@@ -579,7 +569,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return areaList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The areaList to set.
        * @return This builder for chaining.
@@ -592,7 +582,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @param value The areaList to add.
        * @return This builder for chaining.
        */
@@ -603,7 +593,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @param values The areaList to add.
        * @return This builder for chaining.
        */
@@ -616,7 +606,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 area_list = 1;</code>
+       * <code>repeated uint32 area_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAreaList() {
@@ -628,7 +618,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 6;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -636,7 +626,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 6;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -647,7 +637,7 @@ public final class SceneAreaUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 6;</code>
+       * <code>uint32 scene_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -724,8 +714,8 @@ public final class SceneAreaUnlockNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SceneAreaUnlockNotify.proto\"<\n\025SceneAr" +
-      "eaUnlockNotify\022\021\n\tarea_list\030\001 \003(\r\022\020\n\010sce" +
-      "ne_id\030\006 \001(\rB\033\n\031emu.grasscutter.net.proto" +
+      "eaUnlockNotify\022\021\n\tarea_list\030\n \003(\r\022\020\n\010sce" +
+      "ne_id\030\016 \001(\rB\033\n\031emu.grasscutter.net.proto" +
       "b\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 2a5d21fea..4d978e19e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneAreaWeatherNotifyOuterClass.java
@@ -19,29 +19,17 @@ public final class SceneAreaWeatherNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 climate_type = 2;</code>
-     * @return The climateType.
-     */
-    int getClimateType();
-
-    /**
-     * <code>uint32 weather_area_id = 4;</code>
-     * @return The weatherAreaId.
-     */
-    int getWeatherAreaId();
-
-    /**
-     * <code>float trans_duration = 8;</code>
+     * <code>float trans_duration = 4;</code>
      * @return The transDuration.
      */
     float getTransDuration();
 
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     int getWeatherValueMapCount();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     boolean containsWeatherValueMap(
         int key);
@@ -52,36 +40,43 @@ public final class SceneAreaWeatherNotifyOuterClass {
     java.util.Map<java.lang.Integer, java.lang.String>
     getWeatherValueMap();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.String>
     getWeatherValueMapMap();
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
 
     java.lang.String getWeatherValueMapOrDefault(
         int key,
         java.lang.String defaultValue);
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
 
     java.lang.String getWeatherValueMapOrThrow(
         int key);
 
     /**
-     * <code>uint32 weather_gadget_id = 12;</code>
+     * <code>uint32 weather_area_id = 12;</code>
+     * @return The weatherAreaId.
+     */
+    int getWeatherAreaId();
+
+    /**
+     * <code>uint32 climate_type = 13;</code>
+     * @return The climateType.
+     */
+    int getClimateType();
+
+    /**
+     * <code>uint32 weather_gadget_id = 14;</code>
      * @return The weatherGadgetId.
      */
     int getWeatherGadgetId();
   }
   /**
-   * <pre>
-   * CmdId: 25752
-   * Obf: EAKJEHOGBIG
-   * </pre>
-   *
    * Protobuf type {@code SceneAreaWeatherNotify}
    */
   public static final class SceneAreaWeatherNotify extends
@@ -127,17 +122,12 @@ public final class SceneAreaWeatherNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 37: {
 
-              climateType_ = input.readUInt32();
+              transDuration_ = input.readFloat();
               break;
             }
-            case 32: {
-
-              weatherAreaId_ = input.readUInt32();
-              break;
-            }
-            case 58: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 weatherValueMap_ = com.google.protobuf.MapField.newMapField(
                     WeatherValueMapDefaultEntryHolder.defaultEntry);
@@ -150,12 +140,17 @@ public final class SceneAreaWeatherNotifyOuterClass {
                   weatherValueMap__.getKey(), weatherValueMap__.getValue());
               break;
             }
-            case 69: {
+            case 96: {
 
-              transDuration_ = input.readFloat();
+              weatherAreaId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 104: {
+
+              climateType_ = input.readUInt32();
+              break;
+            }
+            case 112: {
 
               weatherGadgetId_ = input.readUInt32();
               break;
@@ -189,7 +184,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 7:
+        case 8:
           return internalGetWeatherValueMap();
         default:
           throw new RuntimeException(
@@ -204,32 +199,10 @@ public final class SceneAreaWeatherNotifyOuterClass {
               emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.class, emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.Builder.class);
     }
 
-    public static final int CLIMATE_TYPE_FIELD_NUMBER = 2;
-    private int climateType_;
-    /**
-     * <code>uint32 climate_type = 2;</code>
-     * @return The climateType.
-     */
-    @java.lang.Override
-    public int getClimateType() {
-      return climateType_;
-    }
-
-    public static final int WEATHER_AREA_ID_FIELD_NUMBER = 4;
-    private int weatherAreaId_;
-    /**
-     * <code>uint32 weather_area_id = 4;</code>
-     * @return The weatherAreaId.
-     */
-    @java.lang.Override
-    public int getWeatherAreaId() {
-      return weatherAreaId_;
-    }
-
-    public static final int TRANS_DURATION_FIELD_NUMBER = 8;
+    public static final int TRANS_DURATION_FIELD_NUMBER = 4;
     private float transDuration_;
     /**
-     * <code>float trans_duration = 8;</code>
+     * <code>float trans_duration = 4;</code>
      * @return The transDuration.
      */
     @java.lang.Override
@@ -237,7 +210,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return transDuration_;
     }
 
-    public static final int WEATHER_VALUE_MAP_FIELD_NUMBER = 7;
+    public static final int WEATHER_VALUE_MAP_FIELD_NUMBER = 8;
     private static final class WeatherValueMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.String> defaultEntry =
@@ -264,7 +237,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return internalGetWeatherValueMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
 
     @java.lang.Override
@@ -282,7 +255,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return getWeatherValueMapMap();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     @java.lang.Override
 
@@ -290,7 +263,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return internalGetWeatherValueMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     @java.lang.Override
 
@@ -303,7 +276,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+     * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
      */
     @java.lang.Override
 
@@ -318,10 +291,32 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return map.get(key);
     }
 
-    public static final int WEATHER_GADGET_ID_FIELD_NUMBER = 12;
+    public static final int WEATHER_AREA_ID_FIELD_NUMBER = 12;
+    private int weatherAreaId_;
+    /**
+     * <code>uint32 weather_area_id = 12;</code>
+     * @return The weatherAreaId.
+     */
+    @java.lang.Override
+    public int getWeatherAreaId() {
+      return weatherAreaId_;
+    }
+
+    public static final int CLIMATE_TYPE_FIELD_NUMBER = 13;
+    private int climateType_;
+    /**
+     * <code>uint32 climate_type = 13;</code>
+     * @return The climateType.
+     */
+    @java.lang.Override
+    public int getClimateType() {
+      return climateType_;
+    }
+
+    public static final int WEATHER_GADGET_ID_FIELD_NUMBER = 14;
     private int weatherGadgetId_;
     /**
-     * <code>uint32 weather_gadget_id = 12;</code>
+     * <code>uint32 weather_gadget_id = 14;</code>
      * @return The weatherGadgetId.
      */
     @java.lang.Override
@@ -343,23 +338,23 @@ public final class SceneAreaWeatherNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (climateType_ != 0) {
-        output.writeUInt32(2, climateType_);
-      }
-      if (weatherAreaId_ != 0) {
-        output.writeUInt32(4, weatherAreaId_);
+      if (transDuration_ != 0F) {
+        output.writeFloat(4, transDuration_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetWeatherValueMap(),
           WeatherValueMapDefaultEntryHolder.defaultEntry,
-          7);
-      if (transDuration_ != 0F) {
-        output.writeFloat(8, transDuration_);
+          8);
+      if (weatherAreaId_ != 0) {
+        output.writeUInt32(12, weatherAreaId_);
+      }
+      if (climateType_ != 0) {
+        output.writeUInt32(13, climateType_);
       }
       if (weatherGadgetId_ != 0) {
-        output.writeUInt32(12, weatherGadgetId_);
+        output.writeUInt32(14, weatherGadgetId_);
       }
       unknownFields.writeTo(output);
     }
@@ -370,13 +365,9 @@ public final class SceneAreaWeatherNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (climateType_ != 0) {
+      if (transDuration_ != 0F) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, climateType_);
-      }
-      if (weatherAreaId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, weatherAreaId_);
+          .computeFloatSize(4, transDuration_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.String> entry
            : internalGetWeatherValueMap().getMap().entrySet()) {
@@ -386,15 +377,19 @@ public final class SceneAreaWeatherNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(7, weatherValueMap__);
+            .computeMessageSize(8, weatherValueMap__);
       }
-      if (transDuration_ != 0F) {
+      if (weatherAreaId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(8, transDuration_);
+          .computeUInt32Size(12, weatherAreaId_);
+      }
+      if (climateType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, climateType_);
       }
       if (weatherGadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, weatherGadgetId_);
+          .computeUInt32Size(14, weatherGadgetId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -411,15 +406,15 @@ public final class SceneAreaWeatherNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify other = (emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify) obj;
 
-      if (getClimateType()
-          != other.getClimateType()) return false;
-      if (getWeatherAreaId()
-          != other.getWeatherAreaId()) 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 (!unknownFields.equals(other.unknownFields)) return false;
@@ -433,10 +428,6 @@ public final class SceneAreaWeatherNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CLIMATE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getClimateType();
-      hash = (37 * hash) + WEATHER_AREA_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getWeatherAreaId();
       hash = (37 * hash) + TRANS_DURATION_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getTransDuration());
@@ -444,6 +435,10 @@ public final class SceneAreaWeatherNotifyOuterClass {
         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) + WEATHER_GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getWeatherGadgetId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -542,11 +537,6 @@ public final class SceneAreaWeatherNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25752
-     * Obf: EAKJEHOGBIG
-     * </pre>
-     *
      * Protobuf type {@code SceneAreaWeatherNotify}
      */
     public static final class Builder extends
@@ -562,7 +552,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 8:
             return internalGetWeatherValueMap();
           default:
             throw new RuntimeException(
@@ -573,7 +563,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 7:
+          case 8:
             return internalGetMutableWeatherValueMap();
           default:
             throw new RuntimeException(
@@ -606,13 +596,13 @@ public final class SceneAreaWeatherNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        climateType_ = 0;
-
-        weatherAreaId_ = 0;
-
         transDuration_ = 0F;
 
         internalGetMutableWeatherValueMap().clear();
+        weatherAreaId_ = 0;
+
+        climateType_ = 0;
+
         weatherGadgetId_ = 0;
 
         return this;
@@ -642,11 +632,11 @@ public final class SceneAreaWeatherNotifyOuterClass {
       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.climateType_ = climateType_;
-        result.weatherAreaId_ = weatherAreaId_;
         result.transDuration_ = transDuration_;
         result.weatherValueMap_ = internalGetWeatherValueMap();
         result.weatherValueMap_.makeImmutable();
+        result.weatherAreaId_ = weatherAreaId_;
+        result.climateType_ = climateType_;
         result.weatherGadgetId_ = weatherGadgetId_;
         onBuilt();
         return result;
@@ -696,17 +686,17 @@ public final class SceneAreaWeatherNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify other) {
         if (other == emu.grasscutter.net.proto.SceneAreaWeatherNotifyOuterClass.SceneAreaWeatherNotify.getDefaultInstance()) return this;
-        if (other.getClimateType() != 0) {
-          setClimateType(other.getClimateType());
-        }
-        if (other.getWeatherAreaId() != 0) {
-          setWeatherAreaId(other.getWeatherAreaId());
-        }
         if (other.getTransDuration() != 0F) {
           setTransDuration(other.getTransDuration());
         }
         internalGetMutableWeatherValueMap().mergeFrom(
             other.internalGetWeatherValueMap());
+        if (other.getWeatherAreaId() != 0) {
+          setWeatherAreaId(other.getWeatherAreaId());
+        }
+        if (other.getClimateType() != 0) {
+          setClimateType(other.getClimateType());
+        }
         if (other.getWeatherGadgetId() != 0) {
           setWeatherGadgetId(other.getWeatherGadgetId());
         }
@@ -740,71 +730,9 @@ public final class SceneAreaWeatherNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int climateType_ ;
-      /**
-       * <code>uint32 climate_type = 2;</code>
-       * @return The climateType.
-       */
-      @java.lang.Override
-      public int getClimateType() {
-        return climateType_;
-      }
-      /**
-       * <code>uint32 climate_type = 2;</code>
-       * @param value The climateType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClimateType(int value) {
-        
-        climateType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 climate_type = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClimateType() {
-        
-        climateType_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int weatherAreaId_ ;
-      /**
-       * <code>uint32 weather_area_id = 4;</code>
-       * @return The weatherAreaId.
-       */
-      @java.lang.Override
-      public int getWeatherAreaId() {
-        return weatherAreaId_;
-      }
-      /**
-       * <code>uint32 weather_area_id = 4;</code>
-       * @param value The weatherAreaId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWeatherAreaId(int value) {
-        
-        weatherAreaId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 weather_area_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeatherAreaId() {
-        
-        weatherAreaId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private float transDuration_ ;
       /**
-       * <code>float trans_duration = 8;</code>
+       * <code>float trans_duration = 4;</code>
        * @return The transDuration.
        */
       @java.lang.Override
@@ -812,7 +740,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return transDuration_;
       }
       /**
-       * <code>float trans_duration = 8;</code>
+       * <code>float trans_duration = 4;</code>
        * @param value The transDuration to set.
        * @return This builder for chaining.
        */
@@ -823,7 +751,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>float trans_duration = 8;</code>
+       * <code>float trans_duration = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTransDuration() {
@@ -860,7 +788,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return internalGetWeatherValueMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
 
       @java.lang.Override
@@ -878,7 +806,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return getWeatherValueMapMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
       @java.lang.Override
 
@@ -886,7 +814,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return internalGetWeatherValueMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
       @java.lang.Override
 
@@ -899,7 +827,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
       @java.lang.Override
 
@@ -920,7 +848,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
 
       public Builder removeWeatherValueMap(
@@ -939,7 +867,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return internalGetMutableWeatherValueMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
       public Builder putWeatherValueMap(
           int key,
@@ -951,7 +879,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, string&gt; weather_value_map = 7;</code>
+       * <code>map&lt;uint32, string&gt; weather_value_map = 8;</code>
        */
 
       public Builder putAllWeatherValueMap(
@@ -961,9 +889,71 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return this;
       }
 
+      private int weatherAreaId_ ;
+      /**
+       * <code>uint32 weather_area_id = 12;</code>
+       * @return The weatherAreaId.
+       */
+      @java.lang.Override
+      public int getWeatherAreaId() {
+        return weatherAreaId_;
+      }
+      /**
+       * <code>uint32 weather_area_id = 12;</code>
+       * @param value The weatherAreaId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWeatherAreaId(int value) {
+        
+        weatherAreaId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 weather_area_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeatherAreaId() {
+        
+        weatherAreaId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int climateType_ ;
+      /**
+       * <code>uint32 climate_type = 13;</code>
+       * @return The climateType.
+       */
+      @java.lang.Override
+      public int getClimateType() {
+        return climateType_;
+      }
+      /**
+       * <code>uint32 climate_type = 13;</code>
+       * @param value The climateType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClimateType(int value) {
+        
+        climateType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 climate_type = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClimateType() {
+        
+        climateType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int weatherGadgetId_ ;
       /**
-       * <code>uint32 weather_gadget_id = 12;</code>
+       * <code>uint32 weather_gadget_id = 14;</code>
        * @return The weatherGadgetId.
        */
       @java.lang.Override
@@ -971,7 +961,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return weatherGadgetId_;
       }
       /**
-       * <code>uint32 weather_gadget_id = 12;</code>
+       * <code>uint32 weather_gadget_id = 14;</code>
        * @param value The weatherGadgetId to set.
        * @return This builder for chaining.
        */
@@ -982,7 +972,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 weather_gadget_id = 12;</code>
+       * <code>uint32 weather_gadget_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearWeatherGadgetId() {
@@ -1064,11 +1054,11 @@ public final class SceneAreaWeatherNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034SceneAreaWeatherNotify.proto\"\373\001\n\026Scene" +
-      "AreaWeatherNotify\022\024\n\014climate_type\030\002 \001(\r\022" +
-      "\027\n\017weather_area_id\030\004 \001(\r\022\026\n\016trans_durati" +
-      "on\030\010 \001(\002\022G\n\021weather_value_map\030\007 \003(\0132,.Sc" +
-      "eneAreaWeatherNotify.WeatherValueMapEntr" +
-      "y\022\031\n\021weather_gadget_id\030\014 \001(\r\0326\n\024WeatherV" +
+      "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" +
       "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"
@@ -1082,7 +1072,7 @@ public final class SceneAreaWeatherNotifyOuterClass {
     internal_static_SceneAreaWeatherNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneAreaWeatherNotify_descriptor,
-        new java.lang.String[] { "ClimateType", "WeatherAreaId", "TransDuration", "WeatherValueMap", "WeatherGadgetId", });
+        new java.lang.String[] { "TransDuration", "WeatherValueMap", "WeatherAreaId", "ClimateType", "WeatherGadgetId", });
     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/SceneAvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneAvatarInfoOuterClass.java
index 6f8b697c3..6fc173388 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneAvatarInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneAvatarInfoOuterClass.java
@@ -306,12 +306,14 @@ public final class SceneAvatarInfoOuterClass {
      * @return The animHash.
      */
     int getAnimHash();
+
+    /**
+     * <code>uint32 KCINBOMOIGL = 23;</code>
+     * @return The kCINBOMOIGL.
+     */
+    int getKCINBOMOIGL();
   }
   /**
-   * <pre>
-   * Obf: JGKPGDAONID
-   * </pre>
-   *
    * Protobuf type {@code SceneAvatarInfo}
    */
   public static final class SceneAvatarInfo extends
@@ -580,6 +582,11 @@ public final class SceneAvatarInfoOuterClass {
               animHash_ = input.readUInt32();
               break;
             }
+            case 184: {
+
+              kCINBOMOIGL_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1186,6 +1193,17 @@ public final class SceneAvatarInfoOuterClass {
       return animHash_;
     }
 
+    public static final int KCINBOMOIGL_FIELD_NUMBER = 23;
+    private int kCINBOMOIGL_;
+    /**
+     * <code>uint32 KCINBOMOIGL = 23;</code>
+     * @return The kCINBOMOIGL.
+     */
+    @java.lang.Override
+    public int getKCINBOMOIGL() {
+      return kCINBOMOIGL_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1286,6 +1304,9 @@ public final class SceneAvatarInfoOuterClass {
       if (animHash_ != 0) {
         output.writeUInt32(22, animHash_);
       }
+      if (kCINBOMOIGL_ != 0) {
+        output.writeUInt32(23, kCINBOMOIGL_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1431,6 +1452,10 @@ public final class SceneAvatarInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(22, animHash_);
       }
+      if (kCINBOMOIGL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(23, kCINBOMOIGL_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1497,6 +1522,8 @@ public final class SceneAvatarInfoOuterClass {
       }
       if (getAnimHash()
           != other.getAnimHash()) return false;
+      if (getKCINBOMOIGL()
+          != other.getKCINBOMOIGL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1573,6 +1600,8 @@ public final class SceneAvatarInfoOuterClass {
       }
       hash = (37 * hash) + ANIM_HASH_FIELD_NUMBER;
       hash = (53 * hash) + getAnimHash();
+      hash = (37 * hash) + KCINBOMOIGL_FIELD_NUMBER;
+      hash = (53 * hash) + getKCINBOMOIGL();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1669,10 +1698,6 @@ public final class SceneAvatarInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JGKPGDAONID
-     * </pre>
-     *
      * Protobuf type {@code SceneAvatarInfo}
      */
     public static final class Builder extends
@@ -1798,6 +1823,8 @@ public final class SceneAvatarInfoOuterClass {
         }
         animHash_ = 0;
 
+        kCINBOMOIGL_ = 0;
+
         return this;
       }
 
@@ -1892,6 +1919,7 @@ public final class SceneAvatarInfoOuterClass {
           result.excelInfo_ = excelInfoBuilder_.build();
         }
         result.animHash_ = animHash_;
+        result.kCINBOMOIGL_ = kCINBOMOIGL_;
         onBuilt();
         return result;
       }
@@ -2075,6 +2103,9 @@ public final class SceneAvatarInfoOuterClass {
         if (other.getAnimHash() != 0) {
           setAnimHash(other.getAnimHash());
         }
+        if (other.getKCINBOMOIGL() != 0) {
+          setKCINBOMOIGL(other.getKCINBOMOIGL());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -3823,6 +3854,37 @@ public final class SceneAvatarInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int kCINBOMOIGL_ ;
+      /**
+       * <code>uint32 KCINBOMOIGL = 23;</code>
+       * @return The kCINBOMOIGL.
+       */
+      @java.lang.Override
+      public int getKCINBOMOIGL() {
+        return kCINBOMOIGL_;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 23;</code>
+       * @param value The kCINBOMOIGL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKCINBOMOIGL(int value) {
+        
+        kCINBOMOIGL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KCINBOMOIGL = 23;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKCINBOMOIGL() {
+        
+        kCINBOMOIGL_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3903,7 +3965,7 @@ public final class SceneAvatarInfoOuterClass {
       "\n\025SceneAvatarInfo.proto\032\025SceneWeaponInfo" +
       ".proto\032\030SceneReliquaryInfo.proto\032\020Server" +
       "Buff.proto\032\024CurVehicleInfo.proto\032\025Avatar" +
-      "ExcelInfo.proto\"\235\006\n\017SceneAvatarInfo\022\013\n\003u" +
+      "ExcelInfo.proto\"\262\006\n\017SceneAvatarInfo\022\013\n\003u" +
       "id\030\001 \001(\r\022\021\n\tavatar_id\030\002 \001(\r\022\014\n\004guid\030\003 \001(" +
       "\004\022\017\n\007peer_id\030\004 \001(\r\022\025\n\requip_id_list\030\005 \003(" +
       "\r\022\026\n\016skill_depot_id\030\006 \001(\r\022\026\n\016talent_id_l" +
@@ -3920,11 +3982,11 @@ public final class SceneAvatarInfoOuterClass {
       "\n\tborn_time\030\022 \001(\r\022\022\n\ncostume_id\030\023 \001(\r\022)\n" +
       "\020cur_vehicle_info\030\024 \001(\0132\017.CurVehicleInfo" +
       "\022$\n\nexcel_info\030\025 \001(\0132\020.AvatarExcelInfo\022\021" +
-      "\n\tanim_hash\030\026 \001(\r\0324\n\022SkillLevelMapEntry\022" +
-      "\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001\032>\n\034Proud" +
-      "SkillExtraLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005" +
-      "value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "\n\tanim_hash\030\026 \001(\r\022\023\n\013KCINBOMOIGL\030\027 \001(\r\0324" +
+      "\n\022SkillLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005val" +
+      "ue\030\002 \001(\r:\0028\001\032>\n\034ProudSkillExtraLevelMapE" +
+      "ntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031" +
+      "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3940,7 +4002,7 @@ public final class SceneAvatarInfoOuterClass {
     internal_static_SceneAvatarInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneAvatarInfo_descriptor,
-        new java.lang.String[] { "Uid", "AvatarId", "Guid", "PeerId", "EquipIdList", "SkillDepotId", "TalentIdList", "Weapon", "ReliquaryList", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ProudSkillExtraLevelMap", "ServerBuffList", "TeamResonanceList", "WearingFlycloakId", "BornTime", "CostumeId", "CurVehicleInfo", "ExcelInfo", "AnimHash", });
+        new java.lang.String[] { "Uid", "AvatarId", "Guid", "PeerId", "EquipIdList", "SkillDepotId", "TalentIdList", "Weapon", "ReliquaryList", "CoreProudSkillLevel", "InherentProudSkillList", "SkillLevelMap", "ProudSkillExtraLevelMap", "ServerBuffList", "TeamResonanceList", "WearingFlycloakId", "BornTime", "CostumeId", "CurVehicleInfo", "ExcelInfo", "AnimHash", "KCINBOMOIGL", });
     internal_static_SceneAvatarInfo_SkillLevelMapEntry_descriptor =
       internal_static_SceneAvatarInfo_descriptor.getNestedTypes().get(0);
     internal_static_SceneAvatarInfo_SkillLevelMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityReqOuterClass.java
index 1ed1b9d8d..563f1c365 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityReqOuterClass.java
@@ -19,41 +19,40 @@ public final class SceneCreateEntityReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.CreateReason reason = 2;</code>
+     * <code>.CreateEntityInfo entity = 1;</code>
+     * @return Whether the entity field is set.
+     */
+    boolean hasEntity();
+    /**
+     * <code>.CreateEntityInfo entity = 1;</code>
+     * @return The entity.
+     */
+    emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity();
+    /**
+     * <code>.CreateEntityInfo entity = 1;</code>
+     */
+    emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder();
+
+    /**
+     * <code>.CreateReason reason = 14;</code>
      * @return The enum numeric value on the wire for reason.
      */
     int getReasonValue();
     /**
-     * <code>.CreateReason reason = 2;</code>
+     * <code>.CreateReason reason = 14;</code>
      * @return The reason.
      */
     emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason getReason();
 
     /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     * @return Whether the entity field is set.
-     */
-    boolean hasEntity();
-    /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     * @return The entity.
-     */
-    emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity();
-    /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     */
-    emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder();
-
-    /**
-     * <code>bool is_destroy_when_disconnect = 13;</code>
+     * <code>bool is_destroy_when_disconnect = 2;</code>
      * @return The isDestroyWhenDisconnect.
      */
     boolean getIsDestroyWhenDisconnect();
   }
   /**
    * <pre>
-   * CmdId: 28428
-   * Obf: PPLJDAJJGGB
+   * CmdId: 8882
    * </pre>
    *
    * Protobuf type {@code SceneCreateEntityReq}
@@ -101,13 +100,7 @@ public final class SceneCreateEntityReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-              int rawValue = input.readEnum();
-
-              reason_ = rawValue;
-              break;
-            }
-            case 90: {
+            case 10: {
               emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder subBuilder = null;
               if (entity_ != null) {
                 subBuilder = entity_.toBuilder();
@@ -120,11 +113,17 @@ public final class SceneCreateEntityReqOuterClass {
 
               break;
             }
-            case 104: {
+            case 16: {
 
               isDestroyWhenDisconnect_ = input.readBool();
               break;
             }
+            case 112: {
+              int rawValue = input.readEnum();
+
+              reason_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -157,17 +156,43 @@ public final class SceneCreateEntityReqOuterClass {
               emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq.class, emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq.Builder.class);
     }
 
-    public static final int REASON_FIELD_NUMBER = 2;
+    public static final int ENTITY_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
+    /**
+     * <code>.CreateEntityInfo entity = 1;</code>
+     * @return Whether the entity field is set.
+     */
+    @java.lang.Override
+    public boolean hasEntity() {
+      return entity_ != null;
+    }
+    /**
+     * <code>.CreateEntityInfo entity = 1;</code>
+     * @return The entity.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
+      return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_;
+    }
+    /**
+     * <code>.CreateEntityInfo entity = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
+      return getEntity();
+    }
+
+    public static final int REASON_FIELD_NUMBER = 14;
     private int reason_;
     /**
-     * <code>.CreateReason reason = 2;</code>
+     * <code>.CreateReason reason = 14;</code>
      * @return The enum numeric value on the wire for reason.
      */
     @java.lang.Override public int getReasonValue() {
       return reason_;
     }
     /**
-     * <code>.CreateReason reason = 2;</code>
+     * <code>.CreateReason reason = 14;</code>
      * @return The reason.
      */
     @java.lang.Override public emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason getReason() {
@@ -176,36 +201,10 @@ public final class SceneCreateEntityReqOuterClass {
       return result == null ? emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.UNRECOGNIZED : result;
     }
 
-    public static final int ENTITY_FIELD_NUMBER = 11;
-    private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
-    /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     * @return Whether the entity field is set.
-     */
-    @java.lang.Override
-    public boolean hasEntity() {
-      return entity_ != null;
-    }
-    /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     * @return The entity.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
-      return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_;
-    }
-    /**
-     * <code>.CreateEntityInfo entity = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
-      return getEntity();
-    }
-
-    public static final int IS_DESTROY_WHEN_DISCONNECT_FIELD_NUMBER = 13;
+    public static final int IS_DESTROY_WHEN_DISCONNECT_FIELD_NUMBER = 2;
     private boolean isDestroyWhenDisconnect_;
     /**
-     * <code>bool is_destroy_when_disconnect = 13;</code>
+     * <code>bool is_destroy_when_disconnect = 2;</code>
      * @return The isDestroyWhenDisconnect.
      */
     @java.lang.Override
@@ -227,14 +226,14 @@ public final class SceneCreateEntityReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (reason_ != emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.CREATE_NONE.getNumber()) {
-        output.writeEnum(2, reason_);
-      }
       if (entity_ != null) {
-        output.writeMessage(11, getEntity());
+        output.writeMessage(1, getEntity());
       }
       if (isDestroyWhenDisconnect_ != false) {
-        output.writeBool(13, isDestroyWhenDisconnect_);
+        output.writeBool(2, isDestroyWhenDisconnect_);
+      }
+      if (reason_ != emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.CREATE_NONE.getNumber()) {
+        output.writeEnum(14, reason_);
       }
       unknownFields.writeTo(output);
     }
@@ -245,17 +244,17 @@ public final class SceneCreateEntityReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (reason_ != emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.CREATE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, reason_);
-      }
       if (entity_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getEntity());
+          .computeMessageSize(1, getEntity());
       }
       if (isDestroyWhenDisconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isDestroyWhenDisconnect_);
+          .computeBoolSize(2, isDestroyWhenDisconnect_);
+      }
+      if (reason_ != emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.CREATE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(14, reason_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -272,12 +271,12 @@ public final class SceneCreateEntityReqOuterClass {
       }
       emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq other = (emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq) obj;
 
-      if (reason_ != other.reason_) return false;
       if (hasEntity() != other.hasEntity()) return false;
       if (hasEntity()) {
         if (!getEntity()
             .equals(other.getEntity())) return false;
       }
+      if (reason_ != other.reason_) return false;
       if (getIsDestroyWhenDisconnect()
           != other.getIsDestroyWhenDisconnect()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -291,12 +290,12 @@ public final class SceneCreateEntityReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + REASON_FIELD_NUMBER;
-      hash = (53 * hash) + reason_;
       if (hasEntity()) {
         hash = (37 * hash) + ENTITY_FIELD_NUMBER;
         hash = (53 * hash) + getEntity().hashCode();
       }
+      hash = (37 * hash) + REASON_FIELD_NUMBER;
+      hash = (53 * hash) + reason_;
       hash = (37 * hash) + IS_DESTROY_WHEN_DISCONNECT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsDestroyWhenDisconnect());
@@ -397,8 +396,7 @@ public final class SceneCreateEntityReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 28428
-     * Obf: PPLJDAJJGGB
+     * CmdId: 8882
      * </pre>
      *
      * Protobuf type {@code SceneCreateEntityReq}
@@ -438,14 +436,14 @@ public final class SceneCreateEntityReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        reason_ = 0;
-
         if (entityBuilder_ == null) {
           entity_ = null;
         } else {
           entity_ = null;
           entityBuilder_ = null;
         }
+        reason_ = 0;
+
         isDestroyWhenDisconnect_ = false;
 
         return this;
@@ -474,12 +472,12 @@ public final class SceneCreateEntityReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq buildPartial() {
         emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq result = new emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq(this);
-        result.reason_ = reason_;
         if (entityBuilder_ == null) {
           result.entity_ = entity_;
         } else {
           result.entity_ = entityBuilder_.build();
         }
+        result.reason_ = reason_;
         result.isDestroyWhenDisconnect_ = isDestroyWhenDisconnect_;
         onBuilt();
         return result;
@@ -529,12 +527,12 @@ public final class SceneCreateEntityReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq other) {
         if (other == emu.grasscutter.net.proto.SceneCreateEntityReqOuterClass.SceneCreateEntityReq.getDefaultInstance()) return this;
-        if (other.reason_ != 0) {
-          setReasonValue(other.getReasonValue());
-        }
         if (other.hasEntity()) {
           mergeEntity(other.getEntity());
         }
+        if (other.reason_ != 0) {
+          setReasonValue(other.getReasonValue());
+        }
         if (other.getIsDestroyWhenDisconnect() != false) {
           setIsDestroyWhenDisconnect(other.getIsDestroyWhenDisconnect());
         }
@@ -567,72 +565,18 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
 
-      private int reason_ = 0;
-      /**
-       * <code>.CreateReason reason = 2;</code>
-       * @return The enum numeric value on the wire for reason.
-       */
-      @java.lang.Override public int getReasonValue() {
-        return reason_;
-      }
-      /**
-       * <code>.CreateReason reason = 2;</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>.CreateReason reason = 2;</code>
-       * @return The reason.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason getReason() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason result = emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.valueOf(reason_);
-        return result == null ? emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.CreateReason reason = 2;</code>
-       * @param value The reason to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReason(emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        reason_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.CreateReason reason = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReason() {
-        
-        reason_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> entityBuilder_;
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        * @return Whether the entity field is set.
        */
       public boolean hasEntity() {
         return entityBuilder_ != null || entity_ != null;
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        * @return The entity.
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
@@ -643,7 +587,7 @@ public final class SceneCreateEntityReqOuterClass {
         }
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
         if (entityBuilder_ == null) {
@@ -659,7 +603,7 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public Builder setEntity(
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder builderForValue) {
@@ -673,7 +617,7 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
         if (entityBuilder_ == null) {
@@ -691,7 +635,7 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public Builder clearEntity() {
         if (entityBuilder_ == null) {
@@ -705,7 +649,7 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder getEntityBuilder() {
         
@@ -713,7 +657,7 @@ public final class SceneCreateEntityReqOuterClass {
         return getEntityFieldBuilder().getBuilder();
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
         if (entityBuilder_ != null) {
@@ -724,7 +668,7 @@ public final class SceneCreateEntityReqOuterClass {
         }
       }
       /**
-       * <code>.CreateEntityInfo entity = 11;</code>
+       * <code>.CreateEntityInfo entity = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> 
@@ -740,9 +684,63 @@ public final class SceneCreateEntityReqOuterClass {
         return entityBuilder_;
       }
 
+      private int reason_ = 0;
+      /**
+       * <code>.CreateReason reason = 14;</code>
+       * @return The enum numeric value on the wire for reason.
+       */
+      @java.lang.Override public int getReasonValue() {
+        return reason_;
+      }
+      /**
+       * <code>.CreateReason reason = 14;</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>.CreateReason reason = 14;</code>
+       * @return The reason.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason getReason() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason result = emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.valueOf(reason_);
+        return result == null ? emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.CreateReason reason = 14;</code>
+       * @param value The reason to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReason(emu.grasscutter.net.proto.CreateReasonOuterClass.CreateReason value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        reason_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.CreateReason reason = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReason() {
+        
+        reason_ = 0;
+        onChanged();
+        return this;
+      }
+
       private boolean isDestroyWhenDisconnect_ ;
       /**
-       * <code>bool is_destroy_when_disconnect = 13;</code>
+       * <code>bool is_destroy_when_disconnect = 2;</code>
        * @return The isDestroyWhenDisconnect.
        */
       @java.lang.Override
@@ -750,7 +748,7 @@ public final class SceneCreateEntityReqOuterClass {
         return isDestroyWhenDisconnect_;
       }
       /**
-       * <code>bool is_destroy_when_disconnect = 13;</code>
+       * <code>bool is_destroy_when_disconnect = 2;</code>
        * @param value The isDestroyWhenDisconnect to set.
        * @return This builder for chaining.
        */
@@ -761,7 +759,7 @@ public final class SceneCreateEntityReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_destroy_when_disconnect = 13;</code>
+       * <code>bool is_destroy_when_disconnect = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsDestroyWhenDisconnect() {
@@ -837,27 +835,27 @@ public final class SceneCreateEntityReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032SceneCreateEntityReq.proto\032\022CreateReas" +
-      "on.proto\032\026CreateEntityInfo.proto\"|\n\024Scen" +
-      "eCreateEntityReq\022\035\n\006reason\030\002 \001(\0162\r.Creat" +
-      "eReason\022!\n\006entity\030\013 \001(\0132\021.CreateEntityIn" +
-      "fo\022\"\n\032is_destroy_when_disconnect\030\r \001(\010B\033" +
+      "\n\032SceneCreateEntityReq.proto\032\026CreateEnti" +
+      "tyInfo.proto\032\022CreateReason.proto\"|\n\024Scen" +
+      "eCreateEntityReq\022!\n\006entity\030\001 \001(\0132\021.Creat" +
+      "eEntityInfo\022\035\n\006reason\030\016 \001(\0162\r.CreateReas" +
+      "on\022\"\n\032is_destroy_when_disconnect\030\002 \001(\010B\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.CreateReasonOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.CreateReasonOuterClass.getDescriptor(),
         });
     internal_static_SceneCreateEntityReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SceneCreateEntityReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneCreateEntityReq_descriptor,
-        new java.lang.String[] { "Reason", "Entity", "IsDestroyWhenDisconnect", });
-    emu.grasscutter.net.proto.CreateReasonOuterClass.getDescriptor();
+        new java.lang.String[] { "Entity", "Reason", "IsDestroyWhenDisconnect", });
     emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.CreateReasonOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityRspOuterClass.java
index 9b3f2f289..c2087e28b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneCreateEntityRspOuterClass.java
@@ -19,36 +19,35 @@ public final class SceneCreateEntityRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>uint32 entity_id = 1;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>.CreateEntityInfo entity = 3;</code>
      * @return Whether the entity field is set.
      */
     boolean hasEntity();
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>.CreateEntityInfo entity = 3;</code>
      * @return The entity.
      */
     emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity();
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>.CreateEntityInfo entity = 3;</code>
      */
     emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder();
 
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
-
-    /**
-     * <code>uint32 entity_id = 5;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
   }
   /**
    * <pre>
-   * CmdId: 3079
-   * Obf: PHIOAGPDFCP
+   * CmdId: 7039
    * </pre>
    *
    * Protobuf type {@code SceneCreateEntityRsp}
@@ -95,12 +94,12 @@ public final class SceneCreateEntityRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
 
-              retcode_ = input.readInt32();
+              entityId_ = input.readUInt32();
               break;
             }
-            case 34: {
+            case 26: {
               emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder subBuilder = null;
               if (entity_ != null) {
                 subBuilder = entity_.toBuilder();
@@ -113,9 +112,9 @@ public final class SceneCreateEntityRspOuterClass {
 
               break;
             }
-            case 40: {
+            case 96: {
 
-              entityId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             default: {
@@ -150,10 +149,21 @@ public final class SceneCreateEntityRspOuterClass {
               emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp.class, emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp.Builder.class);
     }
 
-    public static final int ENTITY_FIELD_NUMBER = 4;
+    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 ENTITY_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>.CreateEntityInfo entity = 3;</code>
      * @return Whether the entity field is set.
      */
     @java.lang.Override
@@ -161,7 +171,7 @@ public final class SceneCreateEntityRspOuterClass {
       return entity_ != null;
     }
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>.CreateEntityInfo entity = 3;</code>
      * @return The entity.
      */
     @java.lang.Override
@@ -169,17 +179,17 @@ public final class SceneCreateEntityRspOuterClass {
       return entity_ == null ? emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.getDefaultInstance() : entity_;
     }
     /**
-     * <code>.CreateEntityInfo entity = 4;</code>
+     * <code>.CreateEntityInfo entity = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
       return getEntity();
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -187,17 +197,6 @@ public final class SceneCreateEntityRspOuterClass {
       return retcode_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 5;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 5;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -212,14 +211,14 @@ public final class SceneCreateEntityRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
+      if (entityId_ != 0) {
+        output.writeUInt32(1, entityId_);
       }
       if (entity_ != null) {
-        output.writeMessage(4, getEntity());
+        output.writeMessage(3, getEntity());
       }
-      if (entityId_ != 0) {
-        output.writeUInt32(5, entityId_);
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -230,17 +229,17 @@ public final class SceneCreateEntityRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
+          .computeUInt32Size(1, entityId_);
       }
       if (entity_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getEntity());
+          .computeMessageSize(3, getEntity());
       }
-      if (entityId_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, entityId_);
+          .computeInt32Size(12, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,6 +256,8 @@ public final class SceneCreateEntityRspOuterClass {
       }
       emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp other = (emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp) obj;
 
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (hasEntity() != other.hasEntity()) return false;
       if (hasEntity()) {
         if (!getEntity()
@@ -264,8 +265,6 @@ public final class SceneCreateEntityRspOuterClass {
       }
       if (getRetcode()
           != other.getRetcode()) return false;
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,14 +276,14 @@ public final class SceneCreateEntityRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       if (hasEntity()) {
         hash = (37 * hash) + ENTITY_FIELD_NUMBER;
         hash = (53 * hash) + getEntity().hashCode();
       }
       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;
@@ -382,8 +381,7 @@ public final class SceneCreateEntityRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3079
-     * Obf: PHIOAGPDFCP
+     * CmdId: 7039
      * </pre>
      *
      * Protobuf type {@code SceneCreateEntityRsp}
@@ -423,6 +421,8 @@ public final class SceneCreateEntityRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityId_ = 0;
+
         if (entityBuilder_ == null) {
           entity_ = null;
         } else {
@@ -431,8 +431,6 @@ public final class SceneCreateEntityRspOuterClass {
         }
         retcode_ = 0;
 
-        entityId_ = 0;
-
         return this;
       }
 
@@ -459,13 +457,13 @@ public final class SceneCreateEntityRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp buildPartial() {
         emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp result = new emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp(this);
+        result.entityId_ = entityId_;
         if (entityBuilder_ == null) {
           result.entity_ = entity_;
         } else {
           result.entity_ = entityBuilder_.build();
         }
         result.retcode_ = retcode_;
-        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -514,15 +512,15 @@ public final class SceneCreateEntityRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp other) {
         if (other == emu.grasscutter.net.proto.SceneCreateEntityRspOuterClass.SceneCreateEntityRsp.getDefaultInstance()) return this;
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         if (other.hasEntity()) {
           mergeEntity(other.getEntity());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -552,18 +550,49 @@ public final class SceneCreateEntityRspOuterClass {
         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 emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo entity_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> entityBuilder_;
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        * @return Whether the entity field is set.
        */
       public boolean hasEntity() {
         return entityBuilder_ != null || entity_ != null;
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        * @return The entity.
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo getEntity() {
@@ -574,7 +603,7 @@ public final class SceneCreateEntityRspOuterClass {
         }
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public Builder setEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
         if (entityBuilder_ == null) {
@@ -590,7 +619,7 @@ public final class SceneCreateEntityRspOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public Builder setEntity(
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder builderForValue) {
@@ -604,7 +633,7 @@ public final class SceneCreateEntityRspOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public Builder mergeEntity(emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo value) {
         if (entityBuilder_ == null) {
@@ -622,7 +651,7 @@ public final class SceneCreateEntityRspOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public Builder clearEntity() {
         if (entityBuilder_ == null) {
@@ -636,7 +665,7 @@ public final class SceneCreateEntityRspOuterClass {
         return this;
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder getEntityBuilder() {
         
@@ -644,7 +673,7 @@ public final class SceneCreateEntityRspOuterClass {
         return getEntityFieldBuilder().getBuilder();
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       public emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder getEntityOrBuilder() {
         if (entityBuilder_ != null) {
@@ -655,7 +684,7 @@ public final class SceneCreateEntityRspOuterClass {
         }
       }
       /**
-       * <code>.CreateEntityInfo entity = 4;</code>
+       * <code>.CreateEntityInfo entity = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfo.Builder, emu.grasscutter.net.proto.CreateEntityInfoOuterClass.CreateEntityInfoOrBuilder> 
@@ -673,7 +702,7 @@ public final class SceneCreateEntityRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -681,7 +710,7 @@ public final class SceneCreateEntityRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -692,7 +721,7 @@ public final class SceneCreateEntityRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -701,37 +730,6 @@ public final class SceneCreateEntityRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 5;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 5;</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 = 5;</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) {
@@ -800,9 +798,9 @@ public final class SceneCreateEntityRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneCreateEntityRsp.proto\032\026CreateEnti" +
-      "tyInfo.proto\"]\n\024SceneCreateEntityRsp\022!\n\006" +
-      "entity\030\004 \001(\0132\021.CreateEntityInfo\022\017\n\007retco" +
-      "de\030\003 \001(\005\022\021\n\tentity_id\030\005 \001(\rB\033\n\031emu.grass" +
+      "tyInfo.proto\"]\n\024SceneCreateEntityRsp\022\021\n\t" +
+      "entity_id\030\001 \001(\r\022!\n\006entity\030\003 \001(\0132\021.Create" +
+      "EntityInfo\022\017\n\007retcode\030\014 \001(\005B\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -815,7 +813,7 @@ public final class SceneCreateEntityRspOuterClass {
     internal_static_SceneCreateEntityRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneCreateEntityRsp_descriptor,
-        new java.lang.String[] { "Entity", "Retcode", "EntityId", });
+        new java.lang.String[] { "EntityId", "Entity", "Retcode", });
     emu.grasscutter.net.proto.CreateEntityInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneDataNotifyOuterClass.java
index ebb2796ca..66425e924 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneDataNotifyOuterClass.java
@@ -19,56 +19,61 @@ public final class SceneDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     * @return Whether the dCGPONECHMM field is set.
-     */
-    boolean hasDCGPONECHMM();
-    /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     * @return The dCGPONECHMM.
-     */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM();
-    /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     */
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder();
-
-    /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return A list containing the sceneTagIdList.
      */
     java.util.List<java.lang.Integer> getSceneTagIdListList();
     /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return The count of sceneTagIdList.
      */
     int getSceneTagIdListCount();
     /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The sceneTagIdList at the given index.
      */
     int getSceneTagIdList(int index);
 
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @return A list containing the levelConfigNameList.
      */
     java.util.List<java.lang.String>
         getLevelConfigNameListList();
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @return The count of levelConfigNameList.
      */
     int getLevelConfigNameListCount();
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @param index The index of the element to return.
      * @return The levelConfigNameList at the given index.
      */
     java.lang.String getLevelConfigNameList(int index);
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @param index The index of the value to return.
      * @return The bytes of the levelConfigNameList at the given index.
      */
@@ -76,11 +81,6 @@ public final class SceneDataNotifyOuterClass {
         getLevelConfigNameListBytes(int index);
   }
   /**
-   * <pre>
-   * CmdId: 29478
-   * Obf: MLCGOMLCFMI
-   * </pre>
-   *
    * Protobuf type {@code SceneDataNotify}
    */
   public static final class SceneDataNotify extends
@@ -128,16 +128,7 @@ public final class SceneDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                levelConfigNameList_ = new com.google.protobuf.LazyStringArrayList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              levelConfigNameList_.add(s);
-              break;
-            }
-            case 96: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTagIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -145,7 +136,7 @@ public final class SceneDataNotifyOuterClass {
               sceneTagIdList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -158,17 +149,13 @@ public final class SceneDataNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 106: {
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder subBuilder = null;
-              if (dCGPONECHMM_ != null) {
-                subBuilder = dCGPONECHMM_.toBuilder();
+            case 74: {
+              java.lang.String s = input.readStringRequireUtf8();
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                levelConfigNameList_ = new com.google.protobuf.LazyStringArrayList();
+                mutable_bitField0_ |= 0x00000002;
               }
-              dCGPONECHMM_ = input.readMessage(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(dCGPONECHMM_);
-                dCGPONECHMM_ = subBuilder.buildPartial();
-              }
-
+              levelConfigNameList_.add(s);
               break;
             }
             default: {
@@ -186,12 +173,12 @@ public final class SceneDataNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          levelConfigNameList_ = levelConfigNameList_.getUnmodifiableView();
-        }
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
           sceneTagIdList_.makeImmutable(); // C
         }
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          levelConfigNameList_ = levelConfigNameList_.getUnmodifiableView();
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -209,36 +196,10 @@ public final class SceneDataNotifyOuterClass {
               emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify.class, emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify.Builder.class);
     }
 
-    public static final int DCGPONECHMM_FIELD_NUMBER = 13;
-    private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
-    /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     * @return Whether the dCGPONECHMM field is set.
-     */
-    @java.lang.Override
-    public boolean hasDCGPONECHMM() {
-      return dCGPONECHMM_ != null;
-    }
-    /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     * @return The dCGPONECHMM.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
-      return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
-    }
-    /**
-     * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
-      return getDCGPONECHMM();
-    }
-
-    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 12;
+    public static final int SCENE_TAG_ID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList sceneTagIdList_;
     /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return A list containing the sceneTagIdList.
      */
     @java.lang.Override
@@ -247,14 +208,14 @@ public final class SceneDataNotifyOuterClass {
       return sceneTagIdList_;
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @return The count of sceneTagIdList.
      */
     public int getSceneTagIdListCount() {
       return sceneTagIdList_.size();
     }
     /**
-     * <code>repeated uint32 scene_tag_id_list = 12;</code>
+     * <code>repeated uint32 scene_tag_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The sceneTagIdList at the given index.
      */
@@ -263,10 +224,15 @@ public final class SceneDataNotifyOuterClass {
     }
     private int sceneTagIdListMemoizedSerializedSize = -1;
 
-    public static final int LEVEL_CONFIG_NAME_LIST_FIELD_NUMBER = 2;
+    public static final int LEVEL_CONFIG_NAME_LIST_FIELD_NUMBER = 9;
     private com.google.protobuf.LazyStringList levelConfigNameList_;
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @return A list containing the levelConfigNameList.
      */
     public com.google.protobuf.ProtocolStringList
@@ -274,14 +240,24 @@ public final class SceneDataNotifyOuterClass {
       return levelConfigNameList_;
     }
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @return The count of levelConfigNameList.
      */
     public int getLevelConfigNameListCount() {
       return levelConfigNameList_.size();
     }
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @param index The index of the element to return.
      * @return The levelConfigNameList at the given index.
      */
@@ -289,7 +265,12 @@ public final class SceneDataNotifyOuterClass {
       return levelConfigNameList_.get(index);
     }
     /**
-     * <code>repeated string level_config_name_list = 2;</code>
+     * <pre>
+     *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+     *CGMAOKBGOHO DFNDKDAFEJO = 15;
+     * </pre>
+     *
+     * <code>repeated string level_config_name_list = 9;</code>
      * @param index The index of the value to return.
      * @return The bytes of the levelConfigNameList at the given index.
      */
@@ -313,18 +294,15 @@ public final class SceneDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      for (int i = 0; i < levelConfigNameList_.size(); i++) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 2, levelConfigNameList_.getRaw(i));
-      }
       if (getSceneTagIdListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(sceneTagIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < sceneTagIdList_.size(); i++) {
         output.writeUInt32NoTag(sceneTagIdList_.getInt(i));
       }
-      if (dCGPONECHMM_ != null) {
-        output.writeMessage(13, getDCGPONECHMM());
+      for (int i = 0; i < levelConfigNameList_.size(); i++) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, levelConfigNameList_.getRaw(i));
       }
       unknownFields.writeTo(output);
     }
@@ -335,14 +313,6 @@ public final class SceneDataNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      {
-        int dataSize = 0;
-        for (int i = 0; i < levelConfigNameList_.size(); i++) {
-          dataSize += computeStringSizeNoTag(levelConfigNameList_.getRaw(i));
-        }
-        size += dataSize;
-        size += 1 * getLevelConfigNameListList().size();
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < sceneTagIdList_.size(); i++) {
@@ -357,9 +327,13 @@ public final class SceneDataNotifyOuterClass {
         }
         sceneTagIdListMemoizedSerializedSize = dataSize;
       }
-      if (dCGPONECHMM_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, getDCGPONECHMM());
+      {
+        int dataSize = 0;
+        for (int i = 0; i < levelConfigNameList_.size(); i++) {
+          dataSize += computeStringSizeNoTag(levelConfigNameList_.getRaw(i));
+        }
+        size += dataSize;
+        size += 1 * getLevelConfigNameListList().size();
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -376,11 +350,6 @@ public final class SceneDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify other = (emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify) obj;
 
-      if (hasDCGPONECHMM() != other.hasDCGPONECHMM()) return false;
-      if (hasDCGPONECHMM()) {
-        if (!getDCGPONECHMM()
-            .equals(other.getDCGPONECHMM())) return false;
-      }
       if (!getSceneTagIdListList()
           .equals(other.getSceneTagIdListList())) return false;
       if (!getLevelConfigNameListList()
@@ -396,10 +365,6 @@ public final class SceneDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (hasDCGPONECHMM()) {
-        hash = (37 * hash) + DCGPONECHMM_FIELD_NUMBER;
-        hash = (53 * hash) + getDCGPONECHMM().hashCode();
-      }
       if (getSceneTagIdListCount() > 0) {
         hash = (37 * hash) + SCENE_TAG_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSceneTagIdListList().hashCode();
@@ -504,11 +469,6 @@ public final class SceneDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29478
-     * Obf: MLCGOMLCFMI
-     * </pre>
-     *
      * Protobuf type {@code SceneDataNotify}
      */
     public static final class Builder extends
@@ -546,12 +506,6 @@ public final class SceneDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (dCGPONECHMMBuilder_ == null) {
-          dCGPONECHMM_ = null;
-        } else {
-          dCGPONECHMM_ = null;
-          dCGPONECHMMBuilder_ = null;
-        }
         sceneTagIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
         levelConfigNameList_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -583,11 +537,6 @@ public final class SceneDataNotifyOuterClass {
       public emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify buildPartial() {
         emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify result = new emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify(this);
         int from_bitField0_ = bitField0_;
-        if (dCGPONECHMMBuilder_ == null) {
-          result.dCGPONECHMM_ = dCGPONECHMM_;
-        } else {
-          result.dCGPONECHMM_ = dCGPONECHMMBuilder_.build();
-        }
         if (((bitField0_ & 0x00000001) != 0)) {
           sceneTagIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -646,9 +595,6 @@ public final class SceneDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify other) {
         if (other == emu.grasscutter.net.proto.SceneDataNotifyOuterClass.SceneDataNotify.getDefaultInstance()) return this;
-        if (other.hasDCGPONECHMM()) {
-          mergeDCGPONECHMM(other.getDCGPONECHMM());
-        }
         if (!other.sceneTagIdList_.isEmpty()) {
           if (sceneTagIdList_.isEmpty()) {
             sceneTagIdList_ = other.sceneTagIdList_;
@@ -699,125 +645,6 @@ public final class SceneDataNotifyOuterClass {
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH dCGPONECHMM_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> dCGPONECHMMBuilder_;
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       * @return Whether the dCGPONECHMM field is set.
-       */
-      public boolean hasDCGPONECHMM() {
-        return dCGPONECHMMBuilder_ != null || dCGPONECHMM_ != null;
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       * @return The dCGPONECHMM.
-       */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH getDCGPONECHMM() {
-        if (dCGPONECHMMBuilder_ == null) {
-          return dCGPONECHMM_ == null ? emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
-        } else {
-          return dCGPONECHMMBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public Builder setDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
-        if (dCGPONECHMMBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          dCGPONECHMM_ = value;
-          onChanged();
-        } else {
-          dCGPONECHMMBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public Builder setDCGPONECHMM(
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder builderForValue) {
-        if (dCGPONECHMMBuilder_ == null) {
-          dCGPONECHMM_ = builderForValue.build();
-          onChanged();
-        } else {
-          dCGPONECHMMBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public Builder mergeDCGPONECHMM(emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH value) {
-        if (dCGPONECHMMBuilder_ == null) {
-          if (dCGPONECHMM_ != null) {
-            dCGPONECHMM_ =
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.newBuilder(dCGPONECHMM_).mergeFrom(value).buildPartial();
-          } else {
-            dCGPONECHMM_ = value;
-          }
-          onChanged();
-        } else {
-          dCGPONECHMMBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public Builder clearDCGPONECHMM() {
-        if (dCGPONECHMMBuilder_ == null) {
-          dCGPONECHMM_ = null;
-          onChanged();
-        } else {
-          dCGPONECHMM_ = null;
-          dCGPONECHMMBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder getDCGPONECHMMBuilder() {
-        
-        onChanged();
-        return getDCGPONECHMMFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      public emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder getDCGPONECHMMOrBuilder() {
-        if (dCGPONECHMMBuilder_ != null) {
-          return dCGPONECHMMBuilder_.getMessageOrBuilder();
-        } else {
-          return dCGPONECHMM_ == null ?
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.getDefaultInstance() : dCGPONECHMM_;
-        }
-      }
-      /**
-       * <code>.NHFPBBLCHKH DCGPONECHMM = 13;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder> 
-          getDCGPONECHMMFieldBuilder() {
-        if (dCGPONECHMMBuilder_ == null) {
-          dCGPONECHMMBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKH.Builder, emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.NHFPBBLCHKHOrBuilder>(
-                  getDCGPONECHMM(),
-                  getParentForChildren(),
-                  isClean());
-          dCGPONECHMM_ = null;
-        }
-        return dCGPONECHMMBuilder_;
-      }
-
       private com.google.protobuf.Internal.IntList sceneTagIdList_ = emptyIntList();
       private void ensureSceneTagIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -826,7 +653,7 @@ public final class SceneDataNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @return A list containing the sceneTagIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -835,14 +662,14 @@ public final class SceneDataNotifyOuterClass {
                  java.util.Collections.unmodifiableList(sceneTagIdList_) : sceneTagIdList_;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @return The count of sceneTagIdList.
        */
       public int getSceneTagIdListCount() {
         return sceneTagIdList_.size();
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @param index The index of the element to return.
        * @return The sceneTagIdList at the given index.
        */
@@ -850,7 +677,7 @@ public final class SceneDataNotifyOuterClass {
         return sceneTagIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The sceneTagIdList to set.
        * @return This builder for chaining.
@@ -863,7 +690,7 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @param value The sceneTagIdList to add.
        * @return This builder for chaining.
        */
@@ -874,7 +701,7 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @param values The sceneTagIdList to add.
        * @return This builder for chaining.
        */
@@ -887,7 +714,7 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 scene_tag_id_list = 12;</code>
+       * <code>repeated uint32 scene_tag_id_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneTagIdList() {
@@ -905,7 +732,12 @@ public final class SceneDataNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @return A list containing the levelConfigNameList.
        */
       public com.google.protobuf.ProtocolStringList
@@ -913,14 +745,24 @@ public final class SceneDataNotifyOuterClass {
         return levelConfigNameList_.getUnmodifiableView();
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @return The count of levelConfigNameList.
        */
       public int getLevelConfigNameListCount() {
         return levelConfigNameList_.size();
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param index The index of the element to return.
        * @return The levelConfigNameList at the given index.
        */
@@ -928,7 +770,12 @@ public final class SceneDataNotifyOuterClass {
         return levelConfigNameList_.get(index);
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param index The index of the value to return.
        * @return The bytes of the levelConfigNameList at the given index.
        */
@@ -937,7 +784,12 @@ public final class SceneDataNotifyOuterClass {
         return levelConfigNameList_.getByteString(index);
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param index The index to set the value at.
        * @param value The levelConfigNameList to set.
        * @return This builder for chaining.
@@ -953,7 +805,12 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param value The levelConfigNameList to add.
        * @return This builder for chaining.
        */
@@ -968,7 +825,12 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param values The levelConfigNameList to add.
        * @return This builder for chaining.
        */
@@ -981,7 +843,12 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearLevelConfigNameList() {
@@ -991,7 +858,12 @@ public final class SceneDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated string level_config_name_list = 2;</code>
+       * <pre>
+       *PHJGPIPOKAA GALJCIMKFCH = 10;//MapLayer
+       *CGMAOKBGOHO DFNDKDAFEJO = 15;
+       * </pre>
+       *
+       * <code>repeated string level_config_name_list = 9;</code>
        * @param value The bytes of the levelConfigNameList to add.
        * @return This builder for chaining.
        */
@@ -1073,24 +945,21 @@ public final class SceneDataNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025SceneDataNotify.proto\032\021NHFPBBLCHKH.pro" +
-      "to\"o\n\017SceneDataNotify\022!\n\013DCGPONECHMM\030\r \001" +
-      "(\0132\014.NHFPBBLCHKH\022\031\n\021scene_tag_id_list\030\014 " +
-      "\003(\r\022\036\n\026level_config_name_list\030\002 \003(\tB\033\n\031e" +
-      "mu.grasscutter.net.protob\006proto3"
+      "\n\025SceneDataNotify.proto\"L\n\017SceneDataNoti" +
+      "fy\022\031\n\021scene_tag_id_list\030\005 \003(\r\022\036\n\026level_c" +
+      "onfig_name_list\030\t \003(\tB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor(),
         });
     internal_static_SceneDataNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SceneDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneDataNotify_descriptor,
-        new java.lang.String[] { "DCGPONECHMM", "SceneTagIdList", "LevelConfigNameList", });
-    emu.grasscutter.net.proto.NHFPBBLCHKHOuterClass.getDescriptor();
+        new java.lang.String[] { "SceneTagIdList", "LevelConfigNameList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntitiesMovesRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntitiesMovesRspOuterClass.java
index 59abf1167..a3cb7478a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntitiesMovesRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntitiesMovesRspOuterClass.java
@@ -19,35 +19,30 @@ public final class SceneEntitiesMovesRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo> 
         getEntityMoveFailInfoListList();
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo getEntityMoveFailInfoList(int index);
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     int getEntityMoveFailInfoListCount();
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder> 
         getEntityMoveFailInfoListOrBuilderList();
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder getEntityMoveFailInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 8605
-   * Obf: GKFMIOACJJA
-   * </pre>
-   *
    * Protobuf type {@code SceneEntitiesMovesRsp}
    */
   public static final class SceneEntitiesMovesRsp extends
@@ -94,7 +89,7 @@ public final class SceneEntitiesMovesRspOuterClass {
             case 0:
               done = true;
               break;
-            case 98: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityMoveFailInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class SceneEntitiesMovesRspOuterClass {
               emu.grasscutter.net.proto.SceneEntitiesMovesRspOuterClass.SceneEntitiesMovesRsp.class, emu.grasscutter.net.proto.SceneEntitiesMovesRspOuterClass.SceneEntitiesMovesRsp.Builder.class);
     }
 
-    public static final int ENTITY_MOVE_FAIL_INFO_LIST_FIELD_NUMBER = 12;
+    public static final int ENTITY_MOVE_FAIL_INFO_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo> entityMoveFailInfoList_;
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo> getEntityMoveFailInfoListList() {
       return entityMoveFailInfoList_;
     }
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class SceneEntitiesMovesRspOuterClass {
       return entityMoveFailInfoList_;
     }
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     @java.lang.Override
     public int getEntityMoveFailInfoListCount() {
       return entityMoveFailInfoList_.size();
     }
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo getEntityMoveFailInfoList(int index) {
       return entityMoveFailInfoList_.get(index);
     }
     /**
-     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+     * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder getEntityMoveFailInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class SceneEntitiesMovesRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < entityMoveFailInfoList_.size(); i++) {
-        output.writeMessage(12, entityMoveFailInfoList_.get(i));
+        output.writeMessage(6, entityMoveFailInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class SceneEntitiesMovesRspOuterClass {
       size = 0;
       for (int i = 0; i < entityMoveFailInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, entityMoveFailInfoList_.get(i));
+          .computeMessageSize(6, entityMoveFailInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class SceneEntitiesMovesRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8605
-     * Obf: GKFMIOACJJA
-     * </pre>
-     *
      * Protobuf type {@code SceneEntitiesMovesRsp}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class SceneEntitiesMovesRspOuterClass {
           emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder> entityMoveFailInfoListBuilder_;
 
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo> getEntityMoveFailInfoListList() {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public int getEntityMoveFailInfoListCount() {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo getEntityMoveFailInfoList(int index) {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder setEntityMoveFailInfoList(
           int index, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo value) {
@@ -585,7 +575,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder setEntityMoveFailInfoList(
           int index, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder addEntityMoveFailInfoList(emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo value) {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder addEntityMoveFailInfoList(
           int index, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo value) {
@@ -632,7 +622,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder addEntityMoveFailInfoList(
           emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder addEntityMoveFailInfoList(
           int index, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder addAllEntityMoveFailInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo> values) {
@@ -675,7 +665,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder clearEntityMoveFailInfoList() {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public Builder removeEntityMoveFailInfoList(int index) {
         if (entityMoveFailInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class SceneEntitiesMovesRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder getEntityMoveFailInfoListBuilder(
           int index) {
         return getEntityMoveFailInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder getEntityMoveFailInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class SceneEntitiesMovesRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfoOrBuilder> 
            getEntityMoveFailInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class SceneEntitiesMovesRspOuterClass {
         }
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder addEntityMoveFailInfoListBuilder() {
         return getEntityMoveFailInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder addEntityMoveFailInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class SceneEntitiesMovesRspOuterClass {
             index, emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 12;</code>
+       * <code>repeated .EntityMoveFailInfo entity_move_fail_info_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.EntityMoveFailInfoOuterClass.EntityMoveFailInfo.Builder> 
            getEntityMoveFailInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class SceneEntitiesMovesRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033SceneEntitiesMovesRsp.proto\032\030EntityMov" +
       "eFailInfo.proto\"P\n\025SceneEntitiesMovesRsp" +
-      "\0227\n\032entity_move_fail_info_list\030\014 \003(\0132\023.E" +
+      "\0227\n\032entity_move_fail_info_list\030\006 \003(\0132\023.E" +
       "ntityMoveFailInfoB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
index 107df7d2e..f89b2a1a1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAiInfoOuterClass.java
@@ -19,22 +19,38 @@ public final class SceneEntityAiInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>bool is_ai_open = 1;</code>
      * @return The isAiOpen.
      */
     boolean getIsAiOpen();
 
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      * @return Whether the bornPos field is set.
      */
     boolean hasBornPos();
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      * @return The bornPos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getBornPos();
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornPosOrBuilder();
@@ -163,14 +179,15 @@ public final class SceneEntityAiInfoOuterClass {
     int getCurTactic();
 
     /**
-     * <code>bool NMECJFPHFGH = 8;</code>
-     * @return The nMECJFPHFGH.
+     * <code>bool AADJDKIFENL = 8;</code>
+     * @return The aADJDKIFENL.
      */
-    boolean getNMECJFPHFGH();
+    boolean getAADJDKIFENL();
   }
   /**
    * <pre>
-   * Obf: NGIAJBBLFGD
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code SceneEntityAiInfo}
@@ -295,7 +312,7 @@ public final class SceneEntityAiInfoOuterClass {
             }
             case 64: {
 
-              nMECJFPHFGH_ = input.readBool();
+              aADJDKIFENL_ = input.readBool();
               break;
             }
             default: {
@@ -349,6 +366,10 @@ public final class SceneEntityAiInfoOuterClass {
     public static final int IS_AI_OPEN_FIELD_NUMBER = 1;
     private boolean isAiOpen_;
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>bool is_ai_open = 1;</code>
      * @return The isAiOpen.
      */
@@ -360,6 +381,10 @@ public final class SceneEntityAiInfoOuterClass {
     public static final int BORN_POS_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector bornPos_;
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      * @return Whether the bornPos field is set.
      */
@@ -368,6 +393,10 @@ public final class SceneEntityAiInfoOuterClass {
       return bornPos_ != null;
     }
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      * @return The bornPos.
      */
@@ -376,6 +405,10 @@ public final class SceneEntityAiInfoOuterClass {
       return bornPos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : bornPos_;
     }
     /**
+     * <pre>
+     *old
+     * </pre>
+     *
      * <code>.Vector born_pos = 2;</code>
      */
     @java.lang.Override
@@ -663,15 +696,15 @@ public final class SceneEntityAiInfoOuterClass {
       return curTactic_;
     }
 
-    public static final int NMECJFPHFGH_FIELD_NUMBER = 8;
-    private boolean nMECJFPHFGH_;
+    public static final int AADJDKIFENL_FIELD_NUMBER = 8;
+    private boolean aADJDKIFENL_;
     /**
-     * <code>bool NMECJFPHFGH = 8;</code>
-     * @return The nMECJFPHFGH.
+     * <code>bool AADJDKIFENL = 8;</code>
+     * @return The aADJDKIFENL.
      */
     @java.lang.Override
-    public boolean getNMECJFPHFGH() {
-      return nMECJFPHFGH_;
+    public boolean getAADJDKIFENL() {
+      return aADJDKIFENL_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -718,8 +751,8 @@ public final class SceneEntityAiInfoOuterClass {
       if (curTactic_ != 0) {
         output.writeUInt32(7, curTactic_);
       }
-      if (nMECJFPHFGH_ != false) {
-        output.writeBool(8, nMECJFPHFGH_);
+      if (aADJDKIFENL_ != false) {
+        output.writeBool(8, aADJDKIFENL_);
       }
       unknownFields.writeTo(output);
     }
@@ -776,9 +809,9 @@ public final class SceneEntityAiInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, curTactic_);
       }
-      if (nMECJFPHFGH_ != false) {
+      if (aADJDKIFENL_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, nMECJFPHFGH_);
+          .computeBoolSize(8, aADJDKIFENL_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -815,8 +848,8 @@ public final class SceneEntityAiInfoOuterClass {
           other.internalGetSkillGroupCdMap())) return false;
       if (getCurTactic()
           != other.getCurTactic()) return false;
-      if (getNMECJFPHFGH()
-          != other.getNMECJFPHFGH()) return false;
+      if (getAADJDKIFENL()
+          != other.getAADJDKIFENL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -853,9 +886,9 @@ public final class SceneEntityAiInfoOuterClass {
       }
       hash = (37 * hash) + CUR_TACTIC_FIELD_NUMBER;
       hash = (53 * hash) + getCurTactic();
-      hash = (37 * hash) + NMECJFPHFGH_FIELD_NUMBER;
+      hash = (37 * hash) + AADJDKIFENL_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getNMECJFPHFGH());
+          getAADJDKIFENL());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -953,7 +986,8 @@ public final class SceneEntityAiInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: NGIAJBBLFGD
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code SceneEntityAiInfo}
@@ -1042,7 +1076,7 @@ public final class SceneEntityAiInfoOuterClass {
         internalGetMutableSkillGroupCdMap().clear();
         curTactic_ = 0;
 
-        nMECJFPHFGH_ = false;
+        aADJDKIFENL_ = false;
 
         return this;
       }
@@ -1089,7 +1123,7 @@ public final class SceneEntityAiInfoOuterClass {
         result.skillGroupCdMap_ = internalGetSkillGroupCdMap();
         result.skillGroupCdMap_.makeImmutable();
         result.curTactic_ = curTactic_;
-        result.nMECJFPHFGH_ = nMECJFPHFGH_;
+        result.aADJDKIFENL_ = aADJDKIFENL_;
         onBuilt();
         return result;
       }
@@ -1156,8 +1190,8 @@ public final class SceneEntityAiInfoOuterClass {
         if (other.getCurTactic() != 0) {
           setCurTactic(other.getCurTactic());
         }
-        if (other.getNMECJFPHFGH() != false) {
-          setNMECJFPHFGH(other.getNMECJFPHFGH());
+        if (other.getAADJDKIFENL() != false) {
+          setAADJDKIFENL(other.getAADJDKIFENL());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1191,6 +1225,10 @@ public final class SceneEntityAiInfoOuterClass {
 
       private boolean isAiOpen_ ;
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>bool is_ai_open = 1;</code>
        * @return The isAiOpen.
        */
@@ -1199,6 +1237,10 @@ public final class SceneEntityAiInfoOuterClass {
         return isAiOpen_;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>bool is_ai_open = 1;</code>
        * @param value The isAiOpen to set.
        * @return This builder for chaining.
@@ -1210,6 +1252,10 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>bool is_ai_open = 1;</code>
        * @return This builder for chaining.
        */
@@ -1224,6 +1270,10 @@ public final class SceneEntityAiInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> bornPosBuilder_;
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        * @return Whether the bornPos field is set.
        */
@@ -1231,6 +1281,10 @@ public final class SceneEntityAiInfoOuterClass {
         return bornPosBuilder_ != null || bornPos_ != null;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        * @return The bornPos.
        */
@@ -1242,6 +1296,10 @@ public final class SceneEntityAiInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public Builder setBornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -1258,6 +1316,10 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public Builder setBornPos(
@@ -1272,6 +1334,10 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public Builder mergeBornPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -1290,6 +1356,10 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public Builder clearBornPos() {
@@ -1304,6 +1374,10 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getBornPosBuilder() {
@@ -1312,6 +1386,10 @@ public final class SceneEntityAiInfoOuterClass {
         return getBornPosFieldBuilder().getBuilder();
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getBornPosOrBuilder() {
@@ -1323,6 +1401,10 @@ public final class SceneEntityAiInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *old
+       * </pre>
+       *
        * <code>.Vector born_pos = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -1873,33 +1955,33 @@ public final class SceneEntityAiInfoOuterClass {
         return this;
       }
 
-      private boolean nMECJFPHFGH_ ;
+      private boolean aADJDKIFENL_ ;
       /**
-       * <code>bool NMECJFPHFGH = 8;</code>
-       * @return The nMECJFPHFGH.
+       * <code>bool AADJDKIFENL = 8;</code>
+       * @return The aADJDKIFENL.
        */
       @java.lang.Override
-      public boolean getNMECJFPHFGH() {
-        return nMECJFPHFGH_;
+      public boolean getAADJDKIFENL() {
+        return aADJDKIFENL_;
       }
       /**
-       * <code>bool NMECJFPHFGH = 8;</code>
-       * @param value The nMECJFPHFGH to set.
+       * <code>bool AADJDKIFENL = 8;</code>
+       * @param value The aADJDKIFENL to set.
        * @return This builder for chaining.
        */
-      public Builder setNMECJFPHFGH(boolean value) {
+      public Builder setAADJDKIFENL(boolean value) {
         
-        nMECJFPHFGH_ = value;
+        aADJDKIFENL_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>bool NMECJFPHFGH = 8;</code>
+       * <code>bool AADJDKIFENL = 8;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNMECJFPHFGH() {
+      public Builder clearAADJDKIFENL() {
         
-        nMECJFPHFGH_ = false;
+        aADJDKIFENL_ = false;
         onChanged();
         return this;
       }
@@ -1994,7 +2076,7 @@ public final class SceneEntityAiInfoOuterClass {
       " \003(\0132#.SceneEntityAiInfo.AiThreatMapEntr" +
       "y\022C\n\022skill_group_cd_map\030\006 \003(\0132\'.SceneEnt" +
       "ityAiInfo.SkillGroupCdMapEntry\022\022\n\ncur_ta" +
-      "ctic\030\007 \001(\r\022\023\n\013NMECJFPHFGH\030\010 \001(\010\0321\n\017Skill" +
+      "ctic\030\007 \001(\r\022\023\n\013AADJDKIFENL\030\010 \001(\010\0321\n\017Skill" +
       "CdMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\002" +
       "8\001\0322\n\020AiThreatMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005v" +
       "alue\030\002 \001(\r:\0028\001\0326\n\024SkillGroupCdMapEntry\022\013" +
@@ -2012,7 +2094,7 @@ public final class SceneEntityAiInfoOuterClass {
     internal_static_SceneEntityAiInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityAiInfo_descriptor,
-        new java.lang.String[] { "IsAiOpen", "BornPos", "SkillCdMap", "ServantInfo", "AiThreatMap", "SkillGroupCdMap", "CurTactic", "NMECJFPHFGH", });
+        new java.lang.String[] { "IsAiOpen", "BornPos", "SkillCdMap", "ServantInfo", "AiThreatMap", "SkillGroupCdMap", "CurTactic", "AADJDKIFENL", });
     internal_static_SceneEntityAiInfo_SkillCdMapEntry_descriptor =
       internal_static_SceneEntityAiInfo_descriptor.getNestedTypes().get(0);
     internal_static_SceneEntityAiInfo_SkillCdMapEntry_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 9e19abb5b..0456ccf0f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityAppearNotifyOuterClass.java
@@ -19,52 +19,47 @@ public final class SceneEntityAppearNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> 
         getEntityListList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index);
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     int getEntityListCount();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
         getEntityListOrBuilderList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
         int index);
 
     /**
-     * <code>.VisionType appear_type = 5;</code>
+     * <code>.VisionType appear_type = 8;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     int getAppearTypeValue();
     /**
-     * <code>.VisionType appear_type = 5;</code>
+     * <code>.VisionType appear_type = 8;</code>
      * @return The appearType.
      */
     emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType();
 
     /**
-     * <code>uint32 param = 15;</code>
+     * <code>uint32 param = 9;</code>
      * @return The param.
      */
     int getParam();
   }
   /**
-   * <pre>
-   * CmdId: 24016
-   * Obf: PBPDCGDBNHJ
-   * </pre>
-   *
    * Protobuf type {@code SceneEntityAppearNotify}
    */
   public static final class SceneEntityAppearNotify extends
@@ -112,13 +107,7 @@ public final class SceneEntityAppearNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
-              int rawValue = input.readEnum();
-
-              appearType_ = rawValue;
-              break;
-            }
-            case 58: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -127,7 +116,13 @@ public final class SceneEntityAppearNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry));
               break;
             }
-            case 120: {
+            case 64: {
+              int rawValue = input.readEnum();
+
+              appearType_ = rawValue;
+              break;
+            }
+            case 72: {
 
               param_ = input.readUInt32();
               break;
@@ -167,17 +162,17 @@ public final class SceneEntityAppearNotifyOuterClass {
               emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAppearNotify.class, emu.grasscutter.net.proto.SceneEntityAppearNotifyOuterClass.SceneEntityAppearNotify.Builder.class);
     }
 
-    public static final int ENTITY_LIST_FIELD_NUMBER = 7;
+    public static final int ENTITY_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> entityList_;
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
@@ -185,21 +180,21 @@ public final class SceneEntityAppearNotifyOuterClass {
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     @java.lang.Override
     public int getEntityListCount() {
       return entityList_.size();
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
       return entityList_.get(index);
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
@@ -207,17 +202,17 @@ public final class SceneEntityAppearNotifyOuterClass {
       return entityList_.get(index);
     }
 
-    public static final int APPEAR_TYPE_FIELD_NUMBER = 5;
+    public static final int APPEAR_TYPE_FIELD_NUMBER = 8;
     private int appearType_;
     /**
-     * <code>.VisionType appear_type = 5;</code>
+     * <code>.VisionType appear_type = 8;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     @java.lang.Override public int getAppearTypeValue() {
       return appearType_;
     }
     /**
-     * <code>.VisionType appear_type = 5;</code>
+     * <code>.VisionType appear_type = 8;</code>
      * @return The appearType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType() {
@@ -226,10 +221,10 @@ public final class SceneEntityAppearNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 15;
+    public static final int PARAM_FIELD_NUMBER = 9;
     private int param_;
     /**
-     * <code>uint32 param = 15;</code>
+     * <code>uint32 param = 9;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -251,14 +246,14 @@ public final class SceneEntityAppearNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        output.writeEnum(5, appearType_);
-      }
       for (int i = 0; i < entityList_.size(); i++) {
-        output.writeMessage(7, entityList_.get(i));
+        output.writeMessage(2, entityList_.get(i));
+      }
+      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+        output.writeEnum(8, appearType_);
       }
       if (param_ != 0) {
-        output.writeUInt32(15, param_);
+        output.writeUInt32(9, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -269,17 +264,17 @@ public final class SceneEntityAppearNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(5, appearType_);
-      }
       for (int i = 0; i < entityList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, entityList_.get(i));
+          .computeMessageSize(2, entityList_.get(i));
+      }
+      if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(8, appearType_);
       }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, param_);
+          .computeUInt32Size(9, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -416,11 +411,6 @@ public final class SceneEntityAppearNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24016
-     * Obf: PBPDCGDBNHJ
-     * </pre>
-     *
      * Protobuf type {@code SceneEntityAppearNotify}
      */
     public static final class Builder extends
@@ -630,7 +620,7 @@ public final class SceneEntityAppearNotifyOuterClass {
           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 = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
         if (entityListBuilder_ == null) {
@@ -640,7 +630,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public int getEntityListCount() {
         if (entityListBuilder_ == null) {
@@ -650,7 +640,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -660,7 +650,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -677,7 +667,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -691,7 +681,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder addEntityList(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
         if (entityListBuilder_ == null) {
@@ -707,7 +697,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -724,7 +714,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder addEntityList(
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -738,7 +728,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -752,7 +742,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder addAllEntityList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> values) {
@@ -767,7 +757,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder clearEntityList() {
         if (entityListBuilder_ == null) {
@@ -780,7 +770,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public Builder removeEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -793,14 +783,14 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getEntityListBuilder(
           int index) {
         return getEntityListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
           int index) {
@@ -810,7 +800,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
            getEntityListOrBuilderList() {
@@ -821,14 +811,14 @@ public final class SceneEntityAppearNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</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 = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder addEntityListBuilder(
           int index) {
@@ -836,7 +826,7 @@ public final class SceneEntityAppearNotifyOuterClass {
             index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder> 
            getEntityListBuilderList() {
@@ -859,14 +849,14 @@ public final class SceneEntityAppearNotifyOuterClass {
 
       private int appearType_ = 0;
       /**
-       * <code>.VisionType appear_type = 5;</code>
+       * <code>.VisionType appear_type = 8;</code>
        * @return The enum numeric value on the wire for appearType.
        */
       @java.lang.Override public int getAppearTypeValue() {
         return appearType_;
       }
       /**
-       * <code>.VisionType appear_type = 5;</code>
+       * <code>.VisionType appear_type = 8;</code>
        * @param value The enum numeric value on the wire for appearType to set.
        * @return This builder for chaining.
        */
@@ -877,7 +867,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 5;</code>
+       * <code>.VisionType appear_type = 8;</code>
        * @return The appearType.
        */
       @java.lang.Override
@@ -887,7 +877,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VisionType appear_type = 5;</code>
+       * <code>.VisionType appear_type = 8;</code>
        * @param value The appearType to set.
        * @return This builder for chaining.
        */
@@ -901,7 +891,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 5;</code>
+       * <code>.VisionType appear_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAppearType() {
@@ -913,7 +903,7 @@ public final class SceneEntityAppearNotifyOuterClass {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 15;</code>
+       * <code>uint32 param = 9;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -921,7 +911,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 15;</code>
+       * <code>uint32 param = 9;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -932,7 +922,7 @@ public final class SceneEntityAppearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 15;</code>
+       * <code>uint32 param = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -1010,9 +1000,9 @@ public final class SceneEntityAppearNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\035SceneEntityAppearNotify.proto\032\025SceneEn" +
       "tityInfo.proto\032\020VisionType.proto\"q\n\027Scen" +
-      "eEntityAppearNotify\022%\n\013entity_list\030\007 \003(\013" +
-      "2\020.SceneEntityInfo\022 \n\013appear_type\030\005 \001(\0162" +
-      "\013.VisionType\022\r\n\005param\030\017 \001(\rB\033\n\031emu.grass" +
+      "eEntityAppearNotify\022%\n\013entity_list\030\002 \003(\013" +
+      "2\020.SceneEntityInfo\022 \n\013appear_type\030\010 \001(\0162" +
+      "\013.VisionType\022\r\n\005param\030\t \001(\rB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
index 7407e0190..7e41abcb9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDisappearNotifyOuterClass.java
@@ -19,45 +19,40 @@ public final class SceneEntityDisappearNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 entity_list = 7;</code>
+     * <code>.VisionType disappear_type = 10;</code>
+     * @return The enum numeric value on the wire for disappearType.
+     */
+    int getDisappearTypeValue();
+    /**
+     * <code>.VisionType disappear_type = 10;</code>
+     * @return The disappearType.
+     */
+    emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType();
+
+    /**
+     * <code>repeated uint32 entity_list = 13;</code>
      * @return A list containing the entityList.
      */
     java.util.List<java.lang.Integer> getEntityListList();
     /**
-     * <code>repeated uint32 entity_list = 7;</code>
+     * <code>repeated uint32 entity_list = 13;</code>
      * @return The count of entityList.
      */
     int getEntityListCount();
     /**
-     * <code>repeated uint32 entity_list = 7;</code>
+     * <code>repeated uint32 entity_list = 13;</code>
      * @param index The index of the element to return.
      * @return The entityList at the given index.
      */
     int getEntityList(int index);
 
     /**
-     * <code>.VisionType disappear_type = 9;</code>
-     * @return The enum numeric value on the wire for disappearType.
-     */
-    int getDisappearTypeValue();
-    /**
-     * <code>.VisionType disappear_type = 9;</code>
-     * @return The disappearType.
-     */
-    emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType();
-
-    /**
-     * <code>uint32 param = 10;</code>
+     * <code>uint32 param = 15;</code>
      * @return The param.
      */
     int getParam();
   }
   /**
-   * <pre>
-   * CmdId: 1787
-   * Obf: GLPMBMHBAKI
-   * </pre>
-   *
    * Protobuf type {@code SceneEntityDisappearNotify}
    */
   public static final class SceneEntityDisappearNotify extends
@@ -70,8 +65,8 @@ public final class SceneEntityDisappearNotifyOuterClass {
       super(builder);
     }
     private SceneEntityDisappearNotify() {
-      entityList_ = emptyIntList();
       disappearType_ = 0;
+      entityList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -105,7 +100,13 @@ public final class SceneEntityDisappearNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 80: {
+              int rawValue = input.readEnum();
+
+              disappearType_ = rawValue;
+              break;
+            }
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,7 +114,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
               entityList_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -126,13 +127,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
-              int rawValue = input.readEnum();
-
-              disappearType_ = rawValue;
-              break;
-            }
-            case 80: {
+            case 120: {
 
               param_ = input.readUInt32();
               break;
@@ -172,45 +167,17 @@ public final class SceneEntityDisappearNotifyOuterClass {
               emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.class, emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.Builder.class);
     }
 
-    public static final int ENTITY_LIST_FIELD_NUMBER = 7;
-    private com.google.protobuf.Internal.IntList entityList_;
-    /**
-     * <code>repeated uint32 entity_list = 7;</code>
-     * @return A list containing the entityList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getEntityListList() {
-      return entityList_;
-    }
-    /**
-     * <code>repeated uint32 entity_list = 7;</code>
-     * @return The count of entityList.
-     */
-    public int getEntityListCount() {
-      return entityList_.size();
-    }
-    /**
-     * <code>repeated uint32 entity_list = 7;</code>
-     * @param index The index of the element to return.
-     * @return The entityList at the given index.
-     */
-    public int getEntityList(int index) {
-      return entityList_.getInt(index);
-    }
-    private int entityListMemoizedSerializedSize = -1;
-
-    public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 9;
+    public static final int DISAPPEAR_TYPE_FIELD_NUMBER = 10;
     private int disappearType_;
     /**
-     * <code>.VisionType disappear_type = 9;</code>
+     * <code>.VisionType disappear_type = 10;</code>
      * @return The enum numeric value on the wire for disappearType.
      */
     @java.lang.Override public int getDisappearTypeValue() {
       return disappearType_;
     }
     /**
-     * <code>.VisionType disappear_type = 9;</code>
+     * <code>.VisionType disappear_type = 10;</code>
      * @return The disappearType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getDisappearType() {
@@ -219,10 +186,38 @@ public final class SceneEntityDisappearNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
     }
 
-    public static final int PARAM_FIELD_NUMBER = 10;
+    public static final int ENTITY_LIST_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList entityList_;
+    /**
+     * <code>repeated uint32 entity_list = 13;</code>
+     * @return A list containing the entityList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getEntityListList() {
+      return entityList_;
+    }
+    /**
+     * <code>repeated uint32 entity_list = 13;</code>
+     * @return The count of entityList.
+     */
+    public int getEntityListCount() {
+      return entityList_.size();
+    }
+    /**
+     * <code>repeated uint32 entity_list = 13;</code>
+     * @param index The index of the element to return.
+     * @return The entityList at the given index.
+     */
+    public int getEntityList(int index) {
+      return entityList_.getInt(index);
+    }
+    private int entityListMemoizedSerializedSize = -1;
+
+    public static final int PARAM_FIELD_NUMBER = 15;
     private int param_;
     /**
-     * <code>uint32 param = 10;</code>
+     * <code>uint32 param = 15;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -245,18 +240,18 @@ public final class SceneEntityDisappearNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+        output.writeEnum(10, disappearType_);
+      }
       if (getEntityListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(entityListMemoizedSerializedSize);
       }
       for (int i = 0; i < entityList_.size(); i++) {
         output.writeUInt32NoTag(entityList_.getInt(i));
       }
-      if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        output.writeEnum(9, disappearType_);
-      }
       if (param_ != 0) {
-        output.writeUInt32(10, param_);
+        output.writeUInt32(15, param_);
       }
       unknownFields.writeTo(output);
     }
@@ -267,6 +262,10 @@ public final class SceneEntityDisappearNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, disappearType_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < entityList_.size(); i++) {
@@ -281,13 +280,9 @@ public final class SceneEntityDisappearNotifyOuterClass {
         }
         entityListMemoizedSerializedSize = dataSize;
       }
-      if (disappearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, disappearType_);
-      }
       if (param_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, param_);
+          .computeUInt32Size(15, param_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -304,9 +299,9 @@ public final class SceneEntityDisappearNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify other = (emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify) obj;
 
+      if (disappearType_ != other.disappearType_) return false;
       if (!getEntityListList()
           .equals(other.getEntityListList())) return false;
-      if (disappearType_ != other.disappearType_) return false;
       if (getParam()
           != other.getParam()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -320,12 +315,12 @@ public final class SceneEntityDisappearNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DISAPPEAR_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + disappearType_;
       if (getEntityListCount() > 0) {
         hash = (37 * hash) + ENTITY_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getEntityListList().hashCode();
       }
-      hash = (37 * hash) + DISAPPEAR_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + disappearType_;
       hash = (37 * hash) + PARAM_FIELD_NUMBER;
       hash = (53 * hash) + getParam();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -424,11 +419,6 @@ public final class SceneEntityDisappearNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1787
-     * Obf: GLPMBMHBAKI
-     * </pre>
-     *
      * Protobuf type {@code SceneEntityDisappearNotify}
      */
     public static final class Builder extends
@@ -466,10 +456,10 @@ public final class SceneEntityDisappearNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         disappearType_ = 0;
 
+        entityList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         param_ = 0;
 
         return this;
@@ -499,12 +489,12 @@ public final class SceneEntityDisappearNotifyOuterClass {
       public emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify buildPartial() {
         emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify result = new emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify(this);
         int from_bitField0_ = bitField0_;
+        result.disappearType_ = disappearType_;
         if (((bitField0_ & 0x00000001) != 0)) {
           entityList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.entityList_ = entityList_;
-        result.disappearType_ = disappearType_;
         result.param_ = param_;
         onBuilt();
         return result;
@@ -554,6 +544,9 @@ public final class SceneEntityDisappearNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify other) {
         if (other == emu.grasscutter.net.proto.SceneEntityDisappearNotifyOuterClass.SceneEntityDisappearNotify.getDefaultInstance()) return this;
+        if (other.disappearType_ != 0) {
+          setDisappearTypeValue(other.getDisappearTypeValue());
+        }
         if (!other.entityList_.isEmpty()) {
           if (entityList_.isEmpty()) {
             entityList_ = other.entityList_;
@@ -564,9 +557,6 @@ public final class SceneEntityDisappearNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.disappearType_ != 0) {
-          setDisappearTypeValue(other.getDisappearTypeValue());
-        }
         if (other.getParam() != 0) {
           setParam(other.getParam());
         }
@@ -600,95 +590,16 @@ public final class SceneEntityDisappearNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList entityList_ = emptyIntList();
-      private void ensureEntityListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          entityList_ = mutableCopy(entityList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @return A list containing the entityList.
-       */
-      public java.util.List<java.lang.Integer>
-          getEntityListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(entityList_) : entityList_;
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @return The count of entityList.
-       */
-      public int getEntityListCount() {
-        return entityList_.size();
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @param index The index of the element to return.
-       * @return The entityList at the given index.
-       */
-      public int getEntityList(int index) {
-        return entityList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @param index The index to set the value at.
-       * @param value The entityList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityList(
-          int index, int value) {
-        ensureEntityListIsMutable();
-        entityList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @param value The entityList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEntityList(int value) {
-        ensureEntityListIsMutable();
-        entityList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @param values The entityList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEntityList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureEntityListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, entityList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_list = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityList() {
-        entityList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
       private int disappearType_ = 0;
       /**
-       * <code>.VisionType disappear_type = 9;</code>
+       * <code>.VisionType disappear_type = 10;</code>
        * @return The enum numeric value on the wire for disappearType.
        */
       @java.lang.Override public int getDisappearTypeValue() {
         return disappearType_;
       }
       /**
-       * <code>.VisionType disappear_type = 9;</code>
+       * <code>.VisionType disappear_type = 10;</code>
        * @param value The enum numeric value on the wire for disappearType to set.
        * @return This builder for chaining.
        */
@@ -699,7 +610,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType disappear_type = 9;</code>
+       * <code>.VisionType disappear_type = 10;</code>
        * @return The disappearType.
        */
       @java.lang.Override
@@ -709,7 +620,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VisionType disappear_type = 9;</code>
+       * <code>.VisionType disappear_type = 10;</code>
        * @param value The disappearType to set.
        * @return This builder for chaining.
        */
@@ -723,7 +634,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType disappear_type = 9;</code>
+       * <code>.VisionType disappear_type = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDisappearType() {
@@ -733,9 +644,88 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return this;
       }
 
+      private com.google.protobuf.Internal.IntList entityList_ = emptyIntList();
+      private void ensureEntityListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          entityList_ = mutableCopy(entityList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @return A list containing the entityList.
+       */
+      public java.util.List<java.lang.Integer>
+          getEntityListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(entityList_) : entityList_;
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @return The count of entityList.
+       */
+      public int getEntityListCount() {
+        return entityList_.size();
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @param index The index of the element to return.
+       * @return The entityList at the given index.
+       */
+      public int getEntityList(int index) {
+        return entityList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The entityList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityList(
+          int index, int value) {
+        ensureEntityListIsMutable();
+        entityList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @param value The entityList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addEntityList(int value) {
+        ensureEntityListIsMutable();
+        entityList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @param values The entityList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllEntityList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureEntityListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, entityList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_list = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityList() {
+        entityList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private int param_ ;
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 15;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -743,7 +733,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 15;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -754,7 +744,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 10;</code>
+       * <code>uint32 param = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -832,8 +822,8 @@ public final class SceneEntityDisappearNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n SceneEntityDisappearNotify.proto\032\020Visi" +
       "onType.proto\"e\n\032SceneEntityDisappearNoti" +
-      "fy\022\023\n\013entity_list\030\007 \003(\r\022#\n\016disappear_typ" +
-      "e\030\t \001(\0162\013.VisionType\022\r\n\005param\030\n \001(\rB\033\n\031e" +
+      "fy\022#\n\016disappear_type\030\n \001(\0162\013.VisionType\022" +
+      "\023\n\013entity_list\030\r \003(\r\022\r\n\005param\030\017 \001(\rB\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -846,7 +836,7 @@ public final class SceneEntityDisappearNotifyOuterClass {
     internal_static_SceneEntityDisappearNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityDisappearNotify_descriptor,
-        new java.lang.String[] { "EntityList", "DisappearType", "Param", });
+        new java.lang.String[] { "DisappearType", "EntityList", "Param", });
     emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDrownRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDrownRspOuterClass.java
index a9c9b248f..96d39ed3d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDrownRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityDrownRspOuterClass.java
@@ -19,23 +19,18 @@ public final class SceneEntityDrownRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 15;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 entity_id = 10;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 23727
-   * Obf: BFJPILGBDJK
-   * </pre>
-   *
    * Protobuf type {@code SceneEntityDrownRsp}
    */
   public static final class SceneEntityDrownRsp extends
@@ -80,12 +75,12 @@ public final class SceneEntityDrownRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 56: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 80: {
 
               entityId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class SceneEntityDrownRspOuterClass {
               emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp.class, emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 15;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 15;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 7;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 7;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SceneEntityDrownRspOuterClass {
       return retcode_;
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    private int entityId_;
+    /**
+     * <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() {
@@ -159,10 +154,10 @@ public final class SceneEntityDrownRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(7, retcode_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(15, entityId_);
+        output.writeUInt32(10, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class SceneEntityDrownRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(7, retcode_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, entityId_);
+          .computeUInt32Size(10, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SceneEntityDrownRspOuterClass {
       }
       emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp other = (emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class SceneEntityDrownRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       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;
@@ -311,11 +306,6 @@ public final class SceneEntityDrownRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23727
-     * Obf: BFJPILGBDJK
-     * </pre>
-     *
      * Protobuf type {@code SceneEntityDrownRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class SceneEntityDrownRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         retcode_ = 0;
 
+        entityId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class SceneEntityDrownRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp buildPartial() {
         emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp result = new emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp(this);
-        result.entityId_ = entityId_;
         result.retcode_ = retcode_;
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class SceneEntityDrownRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp other) {
         if (other == emu.grasscutter.net.proto.SceneEntityDrownRspOuterClass.SceneEntityDrownRsp.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class SceneEntityDrownRspOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 15;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 7;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class SceneEntityDrownRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 7;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class SceneEntityDrownRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class SceneEntityDrownRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 10;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <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) {
@@ -597,8 +587,8 @@ public final class SceneEntityDrownRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031SceneEntityDrownRsp.proto\"9\n\023SceneEnti" +
-      "tyDrownRsp\022\021\n\tentity_id\030\017 \001(\r\022\017\n\007retcode" +
-      "\030\006 \001(\005B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "tyDrownRsp\022\017\n\007retcode\030\007 \001(\005\022\021\n\tentity_id" +
+      "\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class SceneEntityDrownRspOuterClass {
     internal_static_SceneEntityDrownRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityDrownRsp_descriptor,
-        new java.lang.String[] { "EntityId", "Retcode", });
+        new java.lang.String[] { "Retcode", "EntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityInfoOuterClass.java
index 153df4533..ec07d0deb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityInfoOuterClass.java
@@ -140,66 +140,6 @@ public final class SceneEntityInfoOuterClass {
     emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.AnimatorParameterValueInfoPairOrBuilder getAnimatorParaListOrBuilder(
         int index);
 
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     * @return Whether the avatar field is set.
-     */
-    boolean hasAvatar();
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     * @return The avatar.
-     */
-    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar();
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     */
-    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder();
-
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     * @return Whether the monster field is set.
-     */
-    boolean hasMonster();
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     * @return The monster.
-     */
-    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster();
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     */
-    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder();
-
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     * @return Whether the npc field is set.
-     */
-    boolean hasNpc();
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     * @return The npc.
-     */
-    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc();
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     */
-    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder();
-
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     * @return Whether the gadget field is set.
-     */
-    boolean hasGadget();
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     * @return The gadget.
-     */
-    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget();
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     */
-    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder();
-
     /**
      * <code>uint32 last_move_scene_time_ms = 17;</code>
      * @return The lastMoveSceneTimeMs.
@@ -315,13 +255,69 @@ public final class SceneEntityInfoOuterClass {
     emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
         int index);
 
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     * @return Whether the avatar field is set.
+     */
+    boolean hasAvatar();
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     * @return The avatar.
+     */
+    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar();
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     */
+    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder();
+
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     * @return Whether the monster field is set.
+     */
+    boolean hasMonster();
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     * @return The monster.
+     */
+    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster();
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     */
+    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder();
+
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     * @return Whether the npc field is set.
+     */
+    boolean hasNpc();
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     * @return The npc.
+     */
+    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc();
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     */
+    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder();
+
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     * @return Whether the gadget field is set.
+     */
+    boolean hasGadget();
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     * @return The gadget.
+     */
+    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget();
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     */
+    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder();
+
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.EntityCase getEntityCase();
   }
   /**
-   * <pre>
-   * Obf: DGPPPPBJILO
-   * </pre>
-   *
    * Protobuf type {@code SceneEntityInfo}
    */
   public static final class SceneEntityInfo extends
@@ -876,130 +872,6 @@ public final class SceneEntityInfoOuterClass {
       return animatorParaList_.get(index);
     }
 
-    public static final int AVATAR_FIELD_NUMBER = 10;
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     * @return Whether the avatar field is set.
-     */
-    @java.lang.Override
-    public boolean hasAvatar() {
-      return entityCase_ == 10;
-    }
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     * @return The avatar.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar() {
-      if (entityCase_ == 10) {
-         return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SceneAvatarInfo avatar = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder() {
-      if (entityCase_ == 10) {
-         return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-    }
-
-    public static final int MONSTER_FIELD_NUMBER = 11;
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     * @return Whether the monster field is set.
-     */
-    @java.lang.Override
-    public boolean hasMonster() {
-      return entityCase_ == 11;
-    }
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     * @return The monster.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster() {
-      if (entityCase_ == 11) {
-         return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SceneMonsterInfo monster = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder() {
-      if (entityCase_ == 11) {
-         return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-    }
-
-    public static final int NPC_FIELD_NUMBER = 12;
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     * @return Whether the npc field is set.
-     */
-    @java.lang.Override
-    public boolean hasNpc() {
-      return entityCase_ == 12;
-    }
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     * @return The npc.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc() {
-      if (entityCase_ == 12) {
-         return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SceneNpcInfo npc = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder() {
-      if (entityCase_ == 12) {
-         return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-    }
-
-    public static final int GADGET_FIELD_NUMBER = 13;
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     * @return Whether the gadget field is set.
-     */
-    @java.lang.Override
-    public boolean hasGadget() {
-      return entityCase_ == 13;
-    }
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     * @return The gadget.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget() {
-      if (entityCase_ == 13) {
-         return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-    }
-    /**
-     * <code>.SceneGadgetInfo gadget = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder() {
-      if (entityCase_ == 13) {
-         return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
-      }
-      return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-    }
-
     public static final int LAST_MOVE_SCENE_TIME_MS_FIELD_NUMBER = 17;
     private int lastMoveSceneTimeMs_;
     /**
@@ -1189,6 +1061,130 @@ public final class SceneEntityInfoOuterClass {
       return serverBuffList_.get(index);
     }
 
+    public static final int AVATAR_FIELD_NUMBER = 10;
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     * @return Whether the avatar field is set.
+     */
+    @java.lang.Override
+    public boolean hasAvatar() {
+      return entityCase_ == 10;
+    }
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     * @return The avatar.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar() {
+      if (entityCase_ == 10) {
+         return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+    }
+    /**
+     * <code>.SceneAvatarInfo avatar = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder() {
+      if (entityCase_ == 10) {
+         return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+    }
+
+    public static final int MONSTER_FIELD_NUMBER = 11;
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     * @return Whether the monster field is set.
+     */
+    @java.lang.Override
+    public boolean hasMonster() {
+      return entityCase_ == 11;
+    }
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     * @return The monster.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster() {
+      if (entityCase_ == 11) {
+         return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+    }
+    /**
+     * <code>.SceneMonsterInfo monster = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder() {
+      if (entityCase_ == 11) {
+         return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+    }
+
+    public static final int NPC_FIELD_NUMBER = 12;
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     * @return Whether the npc field is set.
+     */
+    @java.lang.Override
+    public boolean hasNpc() {
+      return entityCase_ == 12;
+    }
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     * @return The npc.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc() {
+      if (entityCase_ == 12) {
+         return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+    }
+    /**
+     * <code>.SceneNpcInfo npc = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder() {
+      if (entityCase_ == 12) {
+         return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+    }
+
+    public static final int GADGET_FIELD_NUMBER = 13;
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     * @return Whether the gadget field is set.
+     */
+    @java.lang.Override
+    public boolean hasGadget() {
+      return entityCase_ == 13;
+    }
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     * @return The gadget.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget() {
+      if (entityCase_ == 13) {
+         return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+    }
+    /**
+     * <code>.SceneGadgetInfo gadget = 13;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder() {
+      if (entityCase_ == 13) {
+         return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
+      }
+      return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1597,10 +1593,6 @@ public final class SceneEntityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DGPPPPBJILO
-     * </pre>
-     *
      * Protobuf type {@code SceneEntityInfo}
      */
     public static final class Builder extends
@@ -1770,34 +1762,6 @@ public final class SceneEntityInfoOuterClass {
         } else {
           result.animatorParaList_ = animatorParaListBuilder_.build();
         }
-        if (entityCase_ == 10) {
-          if (avatarBuilder_ == null) {
-            result.entity_ = entity_;
-          } else {
-            result.entity_ = avatarBuilder_.build();
-          }
-        }
-        if (entityCase_ == 11) {
-          if (monsterBuilder_ == null) {
-            result.entity_ = entity_;
-          } else {
-            result.entity_ = monsterBuilder_.build();
-          }
-        }
-        if (entityCase_ == 12) {
-          if (npcBuilder_ == null) {
-            result.entity_ = entity_;
-          } else {
-            result.entity_ = npcBuilder_.build();
-          }
-        }
-        if (entityCase_ == 13) {
-          if (gadgetBuilder_ == null) {
-            result.entity_ = entity_;
-          } else {
-            result.entity_ = gadgetBuilder_.build();
-          }
-        }
         result.lastMoveSceneTimeMs_ = lastMoveSceneTimeMs_;
         result.lastMoveReliableSeq_ = lastMoveReliableSeq_;
         if (entityClientDataBuilder_ == null) {
@@ -1833,6 +1797,34 @@ public final class SceneEntityInfoOuterClass {
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
+        if (entityCase_ == 10) {
+          if (avatarBuilder_ == null) {
+            result.entity_ = entity_;
+          } else {
+            result.entity_ = avatarBuilder_.build();
+          }
+        }
+        if (entityCase_ == 11) {
+          if (monsterBuilder_ == null) {
+            result.entity_ = entity_;
+          } else {
+            result.entity_ = monsterBuilder_.build();
+          }
+        }
+        if (entityCase_ == 12) {
+          if (npcBuilder_ == null) {
+            result.entity_ = entity_;
+          } else {
+            result.entity_ = npcBuilder_.build();
+          }
+        }
+        if (entityCase_ == 13) {
+          if (gadgetBuilder_ == null) {
+            result.entity_ = entity_;
+          } else {
+            result.entity_ = gadgetBuilder_.build();
+          }
+        }
         result.entityCase_ = entityCase_;
         onBuilt();
         return result;
@@ -3147,570 +3139,6 @@ public final class SceneEntityInfoOuterClass {
         return animatorParaListBuilder_;
       }
 
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> avatarBuilder_;
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       * @return Whether the avatar field is set.
-       */
-      @java.lang.Override
-      public boolean hasAvatar() {
-        return entityCase_ == 10;
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       * @return The avatar.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar() {
-        if (avatarBuilder_ == null) {
-          if (entityCase_ == 10) {
-            return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-        } else {
-          if (entityCase_ == 10) {
-            return avatarBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      public Builder setAvatar(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
-        if (avatarBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          entity_ = value;
-          onChanged();
-        } else {
-          avatarBuilder_.setMessage(value);
-        }
-        entityCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      public Builder setAvatar(
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder builderForValue) {
-        if (avatarBuilder_ == null) {
-          entity_ = builderForValue.build();
-          onChanged();
-        } else {
-          avatarBuilder_.setMessage(builderForValue.build());
-        }
-        entityCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      public Builder mergeAvatar(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
-        if (avatarBuilder_ == null) {
-          if (entityCase_ == 10 &&
-              entity_ != emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance()) {
-            entity_ = emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.newBuilder((emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            entity_ = value;
-          }
-          onChanged();
-        } else {
-          if (entityCase_ == 10) {
-            avatarBuilder_.mergeFrom(value);
-          }
-          avatarBuilder_.setMessage(value);
-        }
-        entityCase_ = 10;
-        return this;
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      public Builder clearAvatar() {
-        if (avatarBuilder_ == null) {
-          if (entityCase_ == 10) {
-            entityCase_ = 0;
-            entity_ = null;
-            onChanged();
-          }
-        } else {
-          if (entityCase_ == 10) {
-            entityCase_ = 0;
-            entity_ = null;
-          }
-          avatarBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder getAvatarBuilder() {
-        return getAvatarFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder() {
-        if ((entityCase_ == 10) && (avatarBuilder_ != null)) {
-          return avatarBuilder_.getMessageOrBuilder();
-        } else {
-          if (entityCase_ == 10) {
-            return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneAvatarInfo avatar = 10;</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> 
-          getAvatarFieldBuilder() {
-        if (avatarBuilder_ == null) {
-          if (!(entityCase_ == 10)) {
-            entity_ = emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
-          }
-          avatarBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_,
-                  getParentForChildren(),
-                  isClean());
-          entity_ = null;
-        }
-        entityCase_ = 10;
-        onChanged();;
-        return avatarBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder> monsterBuilder_;
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       * @return Whether the monster field is set.
-       */
-      @java.lang.Override
-      public boolean hasMonster() {
-        return entityCase_ == 11;
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       * @return The monster.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster() {
-        if (monsterBuilder_ == null) {
-          if (entityCase_ == 11) {
-            return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-        } else {
-          if (entityCase_ == 11) {
-            return monsterBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      public Builder setMonster(emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo value) {
-        if (monsterBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          entity_ = value;
-          onChanged();
-        } else {
-          monsterBuilder_.setMessage(value);
-        }
-        entityCase_ = 11;
-        return this;
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      public Builder setMonster(
-          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder builderForValue) {
-        if (monsterBuilder_ == null) {
-          entity_ = builderForValue.build();
-          onChanged();
-        } else {
-          monsterBuilder_.setMessage(builderForValue.build());
-        }
-        entityCase_ = 11;
-        return this;
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      public Builder mergeMonster(emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo value) {
-        if (monsterBuilder_ == null) {
-          if (entityCase_ == 11 &&
-              entity_ != emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance()) {
-            entity_ = emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.newBuilder((emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            entity_ = value;
-          }
-          onChanged();
-        } else {
-          if (entityCase_ == 11) {
-            monsterBuilder_.mergeFrom(value);
-          }
-          monsterBuilder_.setMessage(value);
-        }
-        entityCase_ = 11;
-        return this;
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      public Builder clearMonster() {
-        if (monsterBuilder_ == null) {
-          if (entityCase_ == 11) {
-            entityCase_ = 0;
-            entity_ = null;
-            onChanged();
-          }
-        } else {
-          if (entityCase_ == 11) {
-            entityCase_ = 0;
-            entity_ = null;
-          }
-          monsterBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder getMonsterBuilder() {
-        return getMonsterFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder() {
-        if ((entityCase_ == 11) && (monsterBuilder_ != null)) {
-          return monsterBuilder_.getMessageOrBuilder();
-        } else {
-          if (entityCase_ == 11) {
-            return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneMonsterInfo monster = 11;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder> 
-          getMonsterFieldBuilder() {
-        if (monsterBuilder_ == null) {
-          if (!(entityCase_ == 11)) {
-            entity_ = emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
-          }
-          monsterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_,
-                  getParentForChildren(),
-                  isClean());
-          entity_ = null;
-        }
-        entityCase_ = 11;
-        onChanged();;
-        return monsterBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder> npcBuilder_;
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       * @return Whether the npc field is set.
-       */
-      @java.lang.Override
-      public boolean hasNpc() {
-        return entityCase_ == 12;
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       * @return The npc.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc() {
-        if (npcBuilder_ == null) {
-          if (entityCase_ == 12) {
-            return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-        } else {
-          if (entityCase_ == 12) {
-            return npcBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      public Builder setNpc(emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo value) {
-        if (npcBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          entity_ = value;
-          onChanged();
-        } else {
-          npcBuilder_.setMessage(value);
-        }
-        entityCase_ = 12;
-        return this;
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      public Builder setNpc(
-          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder builderForValue) {
-        if (npcBuilder_ == null) {
-          entity_ = builderForValue.build();
-          onChanged();
-        } else {
-          npcBuilder_.setMessage(builderForValue.build());
-        }
-        entityCase_ = 12;
-        return this;
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      public Builder mergeNpc(emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo value) {
-        if (npcBuilder_ == null) {
-          if (entityCase_ == 12 &&
-              entity_ != emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance()) {
-            entity_ = emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.newBuilder((emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            entity_ = value;
-          }
-          onChanged();
-        } else {
-          if (entityCase_ == 12) {
-            npcBuilder_.mergeFrom(value);
-          }
-          npcBuilder_.setMessage(value);
-        }
-        entityCase_ = 12;
-        return this;
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      public Builder clearNpc() {
-        if (npcBuilder_ == null) {
-          if (entityCase_ == 12) {
-            entityCase_ = 0;
-            entity_ = null;
-            onChanged();
-          }
-        } else {
-          if (entityCase_ == 12) {
-            entityCase_ = 0;
-            entity_ = null;
-          }
-          npcBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder getNpcBuilder() {
-        return getNpcFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder() {
-        if ((entityCase_ == 12) && (npcBuilder_ != null)) {
-          return npcBuilder_.getMessageOrBuilder();
-        } else {
-          if (entityCase_ == 12) {
-            return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneNpcInfo npc = 12;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder> 
-          getNpcFieldBuilder() {
-        if (npcBuilder_ == null) {
-          if (!(entityCase_ == 12)) {
-            entity_ = emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
-          }
-          npcBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_,
-                  getParentForChildren(),
-                  isClean());
-          entity_ = null;
-        }
-        entityCase_ = 12;
-        onChanged();;
-        return npcBuilder_;
-      }
-
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder> gadgetBuilder_;
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       * @return Whether the gadget field is set.
-       */
-      @java.lang.Override
-      public boolean hasGadget() {
-        return entityCase_ == 13;
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       * @return The gadget.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget() {
-        if (gadgetBuilder_ == null) {
-          if (entityCase_ == 13) {
-            return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-        } else {
-          if (entityCase_ == 13) {
-            return gadgetBuilder_.getMessage();
-          }
-          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      public Builder setGadget(emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo value) {
-        if (gadgetBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          entity_ = value;
-          onChanged();
-        } else {
-          gadgetBuilder_.setMessage(value);
-        }
-        entityCase_ = 13;
-        return this;
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      public Builder setGadget(
-          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder builderForValue) {
-        if (gadgetBuilder_ == null) {
-          entity_ = builderForValue.build();
-          onChanged();
-        } else {
-          gadgetBuilder_.setMessage(builderForValue.build());
-        }
-        entityCase_ = 13;
-        return this;
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      public Builder mergeGadget(emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo value) {
-        if (gadgetBuilder_ == null) {
-          if (entityCase_ == 13 &&
-              entity_ != emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance()) {
-            entity_ = emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.newBuilder((emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_)
-                .mergeFrom(value).buildPartial();
-          } else {
-            entity_ = value;
-          }
-          onChanged();
-        } else {
-          if (entityCase_ == 13) {
-            gadgetBuilder_.mergeFrom(value);
-          }
-          gadgetBuilder_.setMessage(value);
-        }
-        entityCase_ = 13;
-        return this;
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      public Builder clearGadget() {
-        if (gadgetBuilder_ == null) {
-          if (entityCase_ == 13) {
-            entityCase_ = 0;
-            entity_ = null;
-            onChanged();
-          }
-        } else {
-          if (entityCase_ == 13) {
-            entityCase_ = 0;
-            entity_ = null;
-          }
-          gadgetBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder getGadgetBuilder() {
-        return getGadgetFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder() {
-        if ((entityCase_ == 13) && (gadgetBuilder_ != null)) {
-          return gadgetBuilder_.getMessageOrBuilder();
-        } else {
-          if (entityCase_ == 13) {
-            return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
-          }
-          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-        }
-      }
-      /**
-       * <code>.SceneGadgetInfo gadget = 13;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder> 
-          getGadgetFieldBuilder() {
-        if (gadgetBuilder_ == null) {
-          if (!(entityCase_ == 13)) {
-            entity_ = emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
-          }
-          gadgetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder>(
-                  (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_,
-                  getParentForChildren(),
-                  isClean());
-          entity_ = null;
-        }
-        entityCase_ = 13;
-        onChanged();;
-        return gadgetBuilder_;
-      }
-
       private int lastMoveSceneTimeMs_ ;
       /**
        * <code>uint32 last_move_scene_time_ms = 17;</code>
@@ -4600,6 +4028,570 @@ public final class SceneEntityInfoOuterClass {
         }
         return serverBuffListBuilder_;
       }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder> avatarBuilder_;
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       * @return Whether the avatar field is set.
+       */
+      @java.lang.Override
+      public boolean hasAvatar() {
+        return entityCase_ == 10;
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       * @return The avatar.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getAvatar() {
+        if (avatarBuilder_ == null) {
+          if (entityCase_ == 10) {
+            return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+        } else {
+          if (entityCase_ == 10) {
+            return avatarBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      public Builder setAvatar(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
+        if (avatarBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          entity_ = value;
+          onChanged();
+        } else {
+          avatarBuilder_.setMessage(value);
+        }
+        entityCase_ = 10;
+        return this;
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      public Builder setAvatar(
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder builderForValue) {
+        if (avatarBuilder_ == null) {
+          entity_ = builderForValue.build();
+          onChanged();
+        } else {
+          avatarBuilder_.setMessage(builderForValue.build());
+        }
+        entityCase_ = 10;
+        return this;
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      public Builder mergeAvatar(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
+        if (avatarBuilder_ == null) {
+          if (entityCase_ == 10 &&
+              entity_ != emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance()) {
+            entity_ = emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.newBuilder((emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            entity_ = value;
+          }
+          onChanged();
+        } else {
+          if (entityCase_ == 10) {
+            avatarBuilder_.mergeFrom(value);
+          }
+          avatarBuilder_.setMessage(value);
+        }
+        entityCase_ = 10;
+        return this;
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      public Builder clearAvatar() {
+        if (avatarBuilder_ == null) {
+          if (entityCase_ == 10) {
+            entityCase_ = 0;
+            entity_ = null;
+            onChanged();
+          }
+        } else {
+          if (entityCase_ == 10) {
+            entityCase_ = 0;
+            entity_ = null;
+          }
+          avatarBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder getAvatarBuilder() {
+        return getAvatarFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getAvatarOrBuilder() {
+        if ((entityCase_ == 10) && (avatarBuilder_ != null)) {
+          return avatarBuilder_.getMessageOrBuilder();
+        } else {
+          if (entityCase_ == 10) {
+            return (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneAvatarInfo avatar = 10;</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> 
+          getAvatarFieldBuilder() {
+        if (avatarBuilder_ == null) {
+          if (!(entityCase_ == 10)) {
+            entity_ = emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance();
+          }
+          avatarBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder, emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo) entity_,
+                  getParentForChildren(),
+                  isClean());
+          entity_ = null;
+        }
+        entityCase_ = 10;
+        onChanged();;
+        return avatarBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder> monsterBuilder_;
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       * @return Whether the monster field is set.
+       */
+      @java.lang.Override
+      public boolean hasMonster() {
+        return entityCase_ == 11;
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       * @return The monster.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo getMonster() {
+        if (monsterBuilder_ == null) {
+          if (entityCase_ == 11) {
+            return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+        } else {
+          if (entityCase_ == 11) {
+            return monsterBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      public Builder setMonster(emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo value) {
+        if (monsterBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          entity_ = value;
+          onChanged();
+        } else {
+          monsterBuilder_.setMessage(value);
+        }
+        entityCase_ = 11;
+        return this;
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      public Builder setMonster(
+          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder builderForValue) {
+        if (monsterBuilder_ == null) {
+          entity_ = builderForValue.build();
+          onChanged();
+        } else {
+          monsterBuilder_.setMessage(builderForValue.build());
+        }
+        entityCase_ = 11;
+        return this;
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      public Builder mergeMonster(emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo value) {
+        if (monsterBuilder_ == null) {
+          if (entityCase_ == 11 &&
+              entity_ != emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance()) {
+            entity_ = emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.newBuilder((emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            entity_ = value;
+          }
+          onChanged();
+        } else {
+          if (entityCase_ == 11) {
+            monsterBuilder_.mergeFrom(value);
+          }
+          monsterBuilder_.setMessage(value);
+        }
+        entityCase_ = 11;
+        return this;
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      public Builder clearMonster() {
+        if (monsterBuilder_ == null) {
+          if (entityCase_ == 11) {
+            entityCase_ = 0;
+            entity_ = null;
+            onChanged();
+          }
+        } else {
+          if (entityCase_ == 11) {
+            entityCase_ = 0;
+            entity_ = null;
+          }
+          monsterBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder getMonsterBuilder() {
+        return getMonsterFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder getMonsterOrBuilder() {
+        if ((entityCase_ == 11) && (monsterBuilder_ != null)) {
+          return monsterBuilder_.getMessageOrBuilder();
+        } else {
+          if (entityCase_ == 11) {
+            return (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneMonsterInfo monster = 11;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder> 
+          getMonsterFieldBuilder() {
+        if (monsterBuilder_ == null) {
+          if (!(entityCase_ == 11)) {
+            entity_ = emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.getDefaultInstance();
+          }
+          monsterBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.Builder, emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo) entity_,
+                  getParentForChildren(),
+                  isClean());
+          entity_ = null;
+        }
+        entityCase_ = 11;
+        onChanged();;
+        return monsterBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder> npcBuilder_;
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       * @return Whether the npc field is set.
+       */
+      @java.lang.Override
+      public boolean hasNpc() {
+        return entityCase_ == 12;
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       * @return The npc.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo getNpc() {
+        if (npcBuilder_ == null) {
+          if (entityCase_ == 12) {
+            return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+        } else {
+          if (entityCase_ == 12) {
+            return npcBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      public Builder setNpc(emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo value) {
+        if (npcBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          entity_ = value;
+          onChanged();
+        } else {
+          npcBuilder_.setMessage(value);
+        }
+        entityCase_ = 12;
+        return this;
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      public Builder setNpc(
+          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder builderForValue) {
+        if (npcBuilder_ == null) {
+          entity_ = builderForValue.build();
+          onChanged();
+        } else {
+          npcBuilder_.setMessage(builderForValue.build());
+        }
+        entityCase_ = 12;
+        return this;
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      public Builder mergeNpc(emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo value) {
+        if (npcBuilder_ == null) {
+          if (entityCase_ == 12 &&
+              entity_ != emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance()) {
+            entity_ = emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.newBuilder((emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            entity_ = value;
+          }
+          onChanged();
+        } else {
+          if (entityCase_ == 12) {
+            npcBuilder_.mergeFrom(value);
+          }
+          npcBuilder_.setMessage(value);
+        }
+        entityCase_ = 12;
+        return this;
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      public Builder clearNpc() {
+        if (npcBuilder_ == null) {
+          if (entityCase_ == 12) {
+            entityCase_ = 0;
+            entity_ = null;
+            onChanged();
+          }
+        } else {
+          if (entityCase_ == 12) {
+            entityCase_ = 0;
+            entity_ = null;
+          }
+          npcBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder getNpcBuilder() {
+        return getNpcFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder getNpcOrBuilder() {
+        if ((entityCase_ == 12) && (npcBuilder_ != null)) {
+          return npcBuilder_.getMessageOrBuilder();
+        } else {
+          if (entityCase_ == 12) {
+            return (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneNpcInfo npc = 12;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder> 
+          getNpcFieldBuilder() {
+        if (npcBuilder_ == null) {
+          if (!(entityCase_ == 12)) {
+            entity_ = emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.getDefaultInstance();
+          }
+          npcBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo.Builder, emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.SceneNpcInfoOuterClass.SceneNpcInfo) entity_,
+                  getParentForChildren(),
+                  isClean());
+          entity_ = null;
+        }
+        entityCase_ = 12;
+        onChanged();;
+        return npcBuilder_;
+      }
+
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder> gadgetBuilder_;
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       * @return Whether the gadget field is set.
+       */
+      @java.lang.Override
+      public boolean hasGadget() {
+        return entityCase_ == 13;
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       * @return The gadget.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo getGadget() {
+        if (gadgetBuilder_ == null) {
+          if (entityCase_ == 13) {
+            return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+        } else {
+          if (entityCase_ == 13) {
+            return gadgetBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      public Builder setGadget(emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo value) {
+        if (gadgetBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          entity_ = value;
+          onChanged();
+        } else {
+          gadgetBuilder_.setMessage(value);
+        }
+        entityCase_ = 13;
+        return this;
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      public Builder setGadget(
+          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder builderForValue) {
+        if (gadgetBuilder_ == null) {
+          entity_ = builderForValue.build();
+          onChanged();
+        } else {
+          gadgetBuilder_.setMessage(builderForValue.build());
+        }
+        entityCase_ = 13;
+        return this;
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      public Builder mergeGadget(emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo value) {
+        if (gadgetBuilder_ == null) {
+          if (entityCase_ == 13 &&
+              entity_ != emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance()) {
+            entity_ = emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.newBuilder((emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_)
+                .mergeFrom(value).buildPartial();
+          } else {
+            entity_ = value;
+          }
+          onChanged();
+        } else {
+          if (entityCase_ == 13) {
+            gadgetBuilder_.mergeFrom(value);
+          }
+          gadgetBuilder_.setMessage(value);
+        }
+        entityCase_ = 13;
+        return this;
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      public Builder clearGadget() {
+        if (gadgetBuilder_ == null) {
+          if (entityCase_ == 13) {
+            entityCase_ = 0;
+            entity_ = null;
+            onChanged();
+          }
+        } else {
+          if (entityCase_ == 13) {
+            entityCase_ = 0;
+            entity_ = null;
+          }
+          gadgetBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder getGadgetBuilder() {
+        return getGadgetFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder getGadgetOrBuilder() {
+        if ((entityCase_ == 13) && (gadgetBuilder_ != null)) {
+          return gadgetBuilder_.getMessageOrBuilder();
+        } else {
+          if (entityCase_ == 13) {
+            return (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_;
+          }
+          return emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+        }
+      }
+      /**
+       * <code>.SceneGadgetInfo gadget = 13;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder> 
+          getGadgetFieldBuilder() {
+        if (gadgetBuilder_ == null) {
+          if (!(entityCase_ == 13)) {
+            entity_ = emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.getDefaultInstance();
+          }
+          gadgetBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.Builder, emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfoOrBuilder>(
+                  (emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo) entity_,
+                  getParentForChildren(),
+                  isClean());
+          entity_ = null;
+        }
+        entityCase_ = 13;
+        onChanged();;
+        return gadgetBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -4670,11 +4662,11 @@ public final class SceneEntityInfoOuterClass {
       "\n\025SceneEntityInfo.proto\032\024ProtEntityType." +
       "proto\032\020MotionInfo.proto\032\016PropPair.proto\032" +
       "\023FightPropPair.proto\032$AnimatorParameterV" +
-      "alueInfoPair.proto\032\025SceneAvatarInfo.prot" +
-      "o\032\026SceneMonsterInfo.proto\032\022SceneNpcInfo." +
-      "proto\032\025SceneGadgetInfo.proto\032\026EntityClie" +
-      "ntData.proto\032\033EntityEnvironmentInfo.prot" +
-      "o\032\031EntityAuthorityInfo.proto\032\020ServerBuff" +
+      "alueInfoPair.proto\032\026EntityClientData.pro" +
+      "to\032\033EntityEnvironmentInfo.proto\032\031EntityA" +
+      "uthorityInfo.proto\032\020ServerBuff.proto\032\025Sc" +
+      "eneAvatarInfo.proto\032\026SceneMonsterInfo.pr" +
+      "oto\032\022SceneNpcInfo.proto\032\025SceneGadgetInfo" +
       ".proto\"\304\005\n\017SceneEntityInfo\022$\n\013entity_typ" +
       "e\030\001 \001(\0162\017.ProtEntityType\022\021\n\tentity_id\030\002 " +
       "\001(\r\022\014\n\004name\030\003 \001(\t\022 \n\013motion_info\030\004 \001(\0132\013" +
@@ -4682,17 +4674,17 @@ public final class SceneEntityInfoOuterClass {
       "r\022\'\n\017fight_prop_list\030\006 \003(\0132\016.FightPropPa" +
       "ir\022\022\n\nlife_state\030\007 \001(\r\022;\n\022animator_para_" +
       "list\030\t \003(\0132\037.AnimatorParameterValueInfoP" +
-      "air\022\"\n\006avatar\030\n \001(\0132\020.SceneAvatarInfoH\000\022" +
-      "$\n\007monster\030\013 \001(\0132\021.SceneMonsterInfoH\000\022\034\n" +
-      "\003npc\030\014 \001(\0132\r.SceneNpcInfoH\000\022\"\n\006gadget\030\r " +
-      "\001(\0132\020.SceneGadgetInfoH\000\022\037\n\027last_move_sce" +
-      "ne_time_ms\030\021 \001(\r\022\036\n\026last_move_reliable_s" +
-      "eq\030\022 \001(\r\022-\n\022entity_client_data\030\023 \001(\0132\021.E" +
-      "ntityClientData\022<\n\034entity_environment_in" +
-      "fo_list\030\024 \003(\0132\026.EntityEnvironmentInfo\0223\n" +
-      "\025entity_authority_info\030\025 \001(\0132\024.EntityAut" +
-      "horityInfo\022\020\n\010tag_list\030\026 \003(\t\022%\n\020server_b" +
-      "uff_list\030\027 \003(\0132\013.ServerBuffB\010\n\006entityB\033\n" +
+      "air\022\037\n\027last_move_scene_time_ms\030\021 \001(\r\022\036\n\026" +
+      "last_move_reliable_seq\030\022 \001(\r\022-\n\022entity_c" +
+      "lient_data\030\023 \001(\0132\021.EntityClientData\022<\n\034e" +
+      "ntity_environment_info_list\030\024 \003(\0132\026.Enti" +
+      "tyEnvironmentInfo\0223\n\025entity_authority_in" +
+      "fo\030\025 \001(\0132\024.EntityAuthorityInfo\022\020\n\010tag_li" +
+      "st\030\026 \003(\t\022%\n\020server_buff_list\030\027 \003(\0132\013.Ser" +
+      "verBuff\022\"\n\006avatar\030\n \001(\0132\020.SceneAvatarInf" +
+      "oH\000\022$\n\007monster\030\013 \001(\0132\021.SceneMonsterInfoH" +
+      "\000\022\034\n\003npc\030\014 \001(\0132\r.SceneNpcInfoH\000\022\"\n\006gadge" +
+      "t\030\r \001(\0132\020.SceneGadgetInfoH\000B\010\n\006EntityB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -4703,34 +4695,34 @@ public final class SceneEntityInfoOuterClass {
           emu.grasscutter.net.proto.PropPairOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.FightPropPairOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EntityClientDataOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EntityEnvironmentInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneNpcInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.getDescriptor(),
         });
     internal_static_SceneEntityInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SceneEntityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityInfo_descriptor,
-        new java.lang.String[] { "EntityType", "EntityId", "Name", "MotionInfo", "PropList", "FightPropList", "LifeState", "AnimatorParaList", "Avatar", "Monster", "Npc", "Gadget", "LastMoveSceneTimeMs", "LastMoveReliableSeq", "EntityClientData", "EntityEnvironmentInfoList", "EntityAuthorityInfo", "TagList", "ServerBuffList", "Entity", });
+        new java.lang.String[] { "EntityType", "EntityId", "Name", "MotionInfo", "PropList", "FightPropList", "LifeState", "AnimatorParaList", "LastMoveSceneTimeMs", "LastMoveReliableSeq", "EntityClientData", "EntityEnvironmentInfoList", "EntityAuthorityInfo", "TagList", "ServerBuffList", "Avatar", "Monster", "Npc", "Gadget", "Entity", });
     emu.grasscutter.net.proto.ProtEntityTypeOuterClass.getDescriptor();
     emu.grasscutter.net.proto.MotionInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PropPairOuterClass.getDescriptor();
     emu.grasscutter.net.proto.FightPropPairOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AnimatorParameterValueInfoPairOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EntityClientDataOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EntityEnvironmentInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.EntityAuthorityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneNpcInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java
index 377475127..f54287107 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneEntityUpdateNotifyOuterClass.java
@@ -19,50 +19,49 @@ public final class SceneEntityUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 param = 14;</code>
+     * <code>uint32 param = 2;</code>
      * @return The param.
      */
     int getParam();
 
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> 
         getEntityListList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index);
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     int getEntityListCount();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
         getEntityListOrBuilderList();
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
         int index);
 
     /**
-     * <code>.VisionType appear_type = 13;</code>
+     * <code>.VisionType appear_type = 15;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     int getAppearTypeValue();
     /**
-     * <code>.VisionType appear_type = 13;</code>
+     * <code>.VisionType appear_type = 15;</code>
      * @return The appearType.
      */
     emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType();
   }
   /**
    * <pre>
-   * CmdId: 27983
-   * Obf: PEEAFBLFBLC
+   * CmdId: 1936
    * </pre>
    *
    * Protobuf type {@code SceneEntityUpdateNotify}
@@ -112,7 +111,12 @@ public final class SceneEntityUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 82: {
+            case 16: {
+
+              param_ = input.readUInt32();
+              break;
+            }
+            case 58: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -121,17 +125,12 @@ public final class SceneEntityUpdateNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry));
               break;
             }
-            case 104: {
+            case 120: {
               int rawValue = input.readEnum();
 
               appearType_ = rawValue;
               break;
             }
-            case 112: {
-
-              param_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -167,10 +166,10 @@ public final class SceneEntityUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUpdateNotify.class, emu.grasscutter.net.proto.SceneEntityUpdateNotifyOuterClass.SceneEntityUpdateNotify.Builder.class);
     }
 
-    public static final int PARAM_FIELD_NUMBER = 14;
+    public static final int PARAM_FIELD_NUMBER = 2;
     private int param_;
     /**
-     * <code>uint32 param = 14;</code>
+     * <code>uint32 param = 2;</code>
      * @return The param.
      */
     @java.lang.Override
@@ -178,17 +177,17 @@ public final class SceneEntityUpdateNotifyOuterClass {
       return param_;
     }
 
-    public static final int ENTITY_LIST_FIELD_NUMBER = 10;
+    public static final int ENTITY_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> entityList_;
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
@@ -196,21 +195,21 @@ public final class SceneEntityUpdateNotifyOuterClass {
       return entityList_;
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     @java.lang.Override
     public int getEntityListCount() {
       return entityList_.size();
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
       return entityList_.get(index);
     }
     /**
-     * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+     * <code>repeated .SceneEntityInfo entity_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
@@ -218,17 +217,17 @@ public final class SceneEntityUpdateNotifyOuterClass {
       return entityList_.get(index);
     }
 
-    public static final int APPEAR_TYPE_FIELD_NUMBER = 13;
+    public static final int APPEAR_TYPE_FIELD_NUMBER = 15;
     private int appearType_;
     /**
-     * <code>.VisionType appear_type = 13;</code>
+     * <code>.VisionType appear_type = 15;</code>
      * @return The enum numeric value on the wire for appearType.
      */
     @java.lang.Override public int getAppearTypeValue() {
       return appearType_;
     }
     /**
-     * <code>.VisionType appear_type = 13;</code>
+     * <code>.VisionType appear_type = 15;</code>
      * @return The appearType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType getAppearType() {
@@ -251,14 +250,14 @@ public final class SceneEntityUpdateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (param_ != 0) {
+        output.writeUInt32(2, param_);
+      }
       for (int i = 0; i < entityList_.size(); i++) {
-        output.writeMessage(10, entityList_.get(i));
+        output.writeMessage(7, entityList_.get(i));
       }
       if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
-        output.writeEnum(13, appearType_);
-      }
-      if (param_ != 0) {
-        output.writeUInt32(14, param_);
+        output.writeEnum(15, appearType_);
       }
       unknownFields.writeTo(output);
     }
@@ -269,17 +268,17 @@ public final class SceneEntityUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (param_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, param_);
+      }
       for (int i = 0; i < entityList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, entityList_.get(i));
+          .computeMessageSize(7, entityList_.get(i));
       }
       if (appearType_ != emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.VISION_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(13, appearType_);
-      }
-      if (param_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, param_);
+          .computeEnumSize(15, appearType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -417,8 +416,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 27983
-     * Obf: PEEAFBLFBLC
+     * CmdId: 1936
      * </pre>
      *
      * Protobuf type {@code SceneEntityUpdateNotify}
@@ -619,7 +617,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
 
       private int param_ ;
       /**
-       * <code>uint32 param = 14;</code>
+       * <code>uint32 param = 2;</code>
        * @return The param.
        */
       @java.lang.Override
@@ -627,7 +625,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return param_;
       }
       /**
-       * <code>uint32 param = 14;</code>
+       * <code>uint32 param = 2;</code>
        * @param value The param to set.
        * @return This builder for chaining.
        */
@@ -638,7 +636,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 param = 14;</code>
+       * <code>uint32 param = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearParam() {
@@ -661,7 +659,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
           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 = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> getEntityListList() {
         if (entityListBuilder_ == null) {
@@ -671,7 +669,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public int getEntityListCount() {
         if (entityListBuilder_ == null) {
@@ -681,7 +679,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -691,7 +689,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -708,7 +706,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder setEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -722,7 +720,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder addEntityList(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
         if (entityListBuilder_ == null) {
@@ -738,7 +736,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
@@ -755,7 +753,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder addEntityList(
           emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -769,7 +767,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder addEntityList(
           int index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
@@ -783,7 +781,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder addAllEntityList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo> values) {
@@ -798,7 +796,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder clearEntityList() {
         if (entityListBuilder_ == null) {
@@ -811,7 +809,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public Builder removeEntityList(int index) {
         if (entityListBuilder_ == null) {
@@ -824,14 +822,14 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getEntityListBuilder(
           int index) {
         return getEntityListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getEntityListOrBuilder(
           int index) {
@@ -841,7 +839,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder> 
            getEntityListOrBuilderList() {
@@ -852,14 +850,14 @@ public final class SceneEntityUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</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 = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder addEntityListBuilder(
           int index) {
@@ -867,7 +865,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
             index, emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneEntityInfo entity_list = 10;</code>
+       * <code>repeated .SceneEntityInfo entity_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder> 
            getEntityListBuilderList() {
@@ -890,14 +888,14 @@ public final class SceneEntityUpdateNotifyOuterClass {
 
       private int appearType_ = 0;
       /**
-       * <code>.VisionType appear_type = 13;</code>
+       * <code>.VisionType appear_type = 15;</code>
        * @return The enum numeric value on the wire for appearType.
        */
       @java.lang.Override public int getAppearTypeValue() {
         return appearType_;
       }
       /**
-       * <code>.VisionType appear_type = 13;</code>
+       * <code>.VisionType appear_type = 15;</code>
        * @param value The enum numeric value on the wire for appearType to set.
        * @return This builder for chaining.
        */
@@ -908,7 +906,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 13;</code>
+       * <code>.VisionType appear_type = 15;</code>
        * @return The appearType.
        */
       @java.lang.Override
@@ -918,7 +916,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.VisionTypeOuterClass.VisionType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VisionType appear_type = 13;</code>
+       * <code>.VisionType appear_type = 15;</code>
        * @param value The appearType to set.
        * @return This builder for chaining.
        */
@@ -932,7 +930,7 @@ public final class SceneEntityUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.VisionType appear_type = 13;</code>
+       * <code>.VisionType appear_type = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearAppearType() {
@@ -1008,18 +1006,18 @@ public final class SceneEntityUpdateNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\035SceneEntityUpdateNotify.proto\032\025SceneEn" +
-      "tityInfo.proto\032\020VisionType.proto\"q\n\027Scen" +
-      "eEntityUpdateNotify\022\r\n\005param\030\016 \001(\r\022%\n\013en" +
-      "tity_list\030\n \003(\0132\020.SceneEntityInfo\022 \n\013app" +
-      "ear_type\030\r \001(\0162\013.VisionTypeB\033\n\031emu.grass" +
+      "\n\035SceneEntityUpdateNotify.proto\032\020VisionT" +
+      "ype.proto\032\025SceneEntityInfo.proto\"q\n\027Scen" +
+      "eEntityUpdateNotify\022\r\n\005param\030\002 \001(\r\022%\n\013en" +
+      "tity_list\030\007 \003(\0132\020.SceneEntityInfo\022 \n\013app" +
+      "ear_type\030\017 \001(\0162\013.VisionTypeB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(),
         });
     internal_static_SceneEntityUpdateNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -1027,8 +1025,8 @@ public final class SceneEntityUpdateNotifyOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneEntityUpdateNotify_descriptor,
         new java.lang.String[] { "Param", "EntityList", "AppearType", });
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VisionTypeOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneFishInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneFishInfoOuterClass.java
index bbcb97b7d..db6ed32b0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneFishInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneFishInfoOuterClass.java
@@ -58,10 +58,6 @@ public final class SceneFishInfoOuterClass {
     int getLastShockTime();
   }
   /**
-   * <pre>
-   * Obf: HNLLCGHHGFM
-   * </pre>
-   *
    * Protobuf type {@code SceneFishInfo}
    */
   public static final class SceneFishInfo extends
@@ -446,10 +442,6 @@ public final class SceneFishInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HNLLCGHHGFM
-     * </pre>
-     *
      * Protobuf type {@code SceneFishInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneForceLockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneForceLockNotifyOuterClass.java
index 89384e821..3c6a88787 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneForceLockNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneForceLockNotifyOuterClass.java
@@ -19,28 +19,23 @@ public final class SceneForceLockNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @return A list containing the forceIdList.
      */
     java.util.List<java.lang.Integer> getForceIdListList();
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @return The count of forceIdList.
      */
     int getForceIdListCount();
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The forceIdList at the given index.
      */
     int getForceIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 7079
-   * Obf: AOJACOMMPOP
-   * </pre>
-   *
    * Protobuf type {@code SceneForceLockNotify}
    */
   public static final class SceneForceLockNotify extends
@@ -87,7 +82,7 @@ public final class SceneForceLockNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 forceIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class SceneForceLockNotifyOuterClass {
               forceIdList_.addInt(input.readUInt32());
               break;
             }
-            case 10: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class SceneForceLockNotifyOuterClass {
               emu.grasscutter.net.proto.SceneForceLockNotifyOuterClass.SceneForceLockNotify.class, emu.grasscutter.net.proto.SceneForceLockNotifyOuterClass.SceneForceLockNotify.Builder.class);
     }
 
-    public static final int FORCE_ID_LIST_FIELD_NUMBER = 1;
+    public static final int FORCE_ID_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList forceIdList_;
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @return A list containing the forceIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class SceneForceLockNotifyOuterClass {
       return forceIdList_;
     }
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @return The count of forceIdList.
      */
     public int getForceIdListCount() {
       return forceIdList_.size();
     }
     /**
-     * <code>repeated uint32 force_id_list = 1;</code>
+     * <code>repeated uint32 force_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The forceIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class SceneForceLockNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getForceIdListList().size() > 0) {
-        output.writeUInt32NoTag(10);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(forceIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < forceIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class SceneForceLockNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7079
-     * Obf: AOJACOMMPOP
-     * </pre>
-     *
      * Protobuf type {@code SceneForceLockNotify}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class SceneForceLockNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @return A list containing the forceIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class SceneForceLockNotifyOuterClass {
                  java.util.Collections.unmodifiableList(forceIdList_) : forceIdList_;
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @return The count of forceIdList.
        */
       public int getForceIdListCount() {
         return forceIdList_.size();
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @param index The index of the element to return.
        * @return The forceIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class SceneForceLockNotifyOuterClass {
         return forceIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The forceIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class SceneForceLockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @param value The forceIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class SceneForceLockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @param values The forceIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class SceneForceLockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 1;</code>
+       * <code>repeated uint32 force_id_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearForceIdList() {
@@ -654,7 +644,7 @@ public final class SceneForceLockNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneForceLockNotify.proto\"-\n\024SceneFor" +
-      "ceLockNotify\022\025\n\rforce_id_list\030\001 \003(\rB\033\n\031e" +
+      "ceLockNotify\022\025\n\rforce_id_list\030\003 \003(\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/SceneForceUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneForceUnlockNotifyOuterClass.java
index d9c14ff69..1754a7d8e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneForceUnlockNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneForceUnlockNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class SceneForceUnlockNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_add = 15;</code>
+     * <code>bool is_add = 9;</code>
      * @return The isAdd.
      */
     boolean getIsAdd();
 
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @return A list containing the forceIdList.
      */
     java.util.List<java.lang.Integer> getForceIdListList();
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @return The count of forceIdList.
      */
     int getForceIdListCount();
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The forceIdList at the given index.
      */
     int getForceIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 3275
-   * Obf: AKPHLEGNIAH
-   * </pre>
-   *
    * Protobuf type {@code SceneForceUnlockNotify}
    */
   public static final class SceneForceUnlockNotify extends
@@ -93,7 +88,12 @@ public final class SceneForceUnlockNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 72: {
+
+              isAdd_ = input.readBool();
+              break;
+            }
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 forceIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +101,7 @@ public final class SceneForceUnlockNotifyOuterClass {
               forceIdList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -114,11 +114,6 @@ public final class SceneForceUnlockNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
-
-              isAdd_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +149,10 @@ public final class SceneForceUnlockNotifyOuterClass {
               emu.grasscutter.net.proto.SceneForceUnlockNotifyOuterClass.SceneForceUnlockNotify.class, emu.grasscutter.net.proto.SceneForceUnlockNotifyOuterClass.SceneForceUnlockNotify.Builder.class);
     }
 
-    public static final int IS_ADD_FIELD_NUMBER = 15;
+    public static final int IS_ADD_FIELD_NUMBER = 9;
     private boolean isAdd_;
     /**
-     * <code>bool is_add = 15;</code>
+     * <code>bool is_add = 9;</code>
      * @return The isAdd.
      */
     @java.lang.Override
@@ -165,10 +160,10 @@ public final class SceneForceUnlockNotifyOuterClass {
       return isAdd_;
     }
 
-    public static final int FORCE_ID_LIST_FIELD_NUMBER = 2;
+    public static final int FORCE_ID_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList forceIdList_;
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @return A list containing the forceIdList.
      */
     @java.lang.Override
@@ -177,14 +172,14 @@ public final class SceneForceUnlockNotifyOuterClass {
       return forceIdList_;
     }
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @return The count of forceIdList.
      */
     public int getForceIdListCount() {
       return forceIdList_.size();
     }
     /**
-     * <code>repeated uint32 force_id_list = 2;</code>
+     * <code>repeated uint32 force_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The forceIdList at the given index.
      */
@@ -208,16 +203,16 @@ public final class SceneForceUnlockNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (isAdd_ != false) {
+        output.writeBool(9, isAdd_);
+      }
       if (getForceIdListList().size() > 0) {
-        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(forceIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < forceIdList_.size(); i++) {
         output.writeUInt32NoTag(forceIdList_.getInt(i));
       }
-      if (isAdd_ != false) {
-        output.writeBool(15, isAdd_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -227,6 +222,10 @@ public final class SceneForceUnlockNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isAdd_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(9, isAdd_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < forceIdList_.size(); i++) {
@@ -241,10 +240,6 @@ public final class SceneForceUnlockNotifyOuterClass {
         }
         forceIdListMemoizedSerializedSize = dataSize;
       }
-      if (isAdd_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isAdd_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -378,11 +373,6 @@ public final class SceneForceUnlockNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3275
-     * Obf: AKPHLEGNIAH
-     * </pre>
-     *
      * Protobuf type {@code SceneForceUnlockNotify}
      */
     public static final class Builder extends
@@ -550,7 +540,7 @@ public final class SceneForceUnlockNotifyOuterClass {
 
       private boolean isAdd_ ;
       /**
-       * <code>bool is_add = 15;</code>
+       * <code>bool is_add = 9;</code>
        * @return The isAdd.
        */
       @java.lang.Override
@@ -558,7 +548,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return isAdd_;
       }
       /**
-       * <code>bool is_add = 15;</code>
+       * <code>bool is_add = 9;</code>
        * @param value The isAdd to set.
        * @return This builder for chaining.
        */
@@ -569,7 +559,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_add = 15;</code>
+       * <code>bool is_add = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsAdd() {
@@ -587,7 +577,7 @@ public final class SceneForceUnlockNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @return A list containing the forceIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -596,14 +586,14 @@ public final class SceneForceUnlockNotifyOuterClass {
                  java.util.Collections.unmodifiableList(forceIdList_) : forceIdList_;
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @return The count of forceIdList.
        */
       public int getForceIdListCount() {
         return forceIdList_.size();
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @param index The index of the element to return.
        * @return The forceIdList at the given index.
        */
@@ -611,7 +601,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return forceIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @param index The index to set the value at.
        * @param value The forceIdList to set.
        * @return This builder for chaining.
@@ -624,7 +614,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @param value The forceIdList to add.
        * @return This builder for chaining.
        */
@@ -635,7 +625,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @param values The forceIdList to add.
        * @return This builder for chaining.
        */
@@ -648,7 +638,7 @@ public final class SceneForceUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 force_id_list = 2;</code>
+       * <code>repeated uint32 force_id_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearForceIdList() {
@@ -725,8 +715,8 @@ public final class SceneForceUnlockNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034SceneForceUnlockNotify.proto\"?\n\026SceneF" +
-      "orceUnlockNotify\022\016\n\006is_add\030\017 \001(\010\022\025\n\rforc" +
-      "e_id_list\030\002 \003(\rB\033\n\031emu.grasscutter.net.p" +
+      "orceUnlockNotify\022\016\n\006is_add\030\t \001(\010\022\025\n\rforc" +
+      "e_id_list\030\r \003(\rB\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/SceneGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java
index 1f9d3f56c..de70a2abe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneGadgetInfoOuterClass.java
@@ -60,10 +60,10 @@ public final class SceneGadgetInfoOuterClass {
     int getGadgetState();
 
     /**
-     * <code>uint32 KPKNNJLPMFP = 7;</code>
-     * @return The kPKNNJLPMFP.
+     * <code>uint32 gadget_type = 7;</code>
+     * @return The gadgetType.
      */
-    int getKPKNNJLPMFP();
+    int getGadgetType();
 
     /**
      * <code>bool is_show_cutscene = 8;</code>
@@ -84,10 +84,10 @@ public final class SceneGadgetInfoOuterClass {
     boolean getIsEnableInteract();
 
     /**
-     * <code>uint32 CLICILNBKDD = 11;</code>
-     * @return The cLICILNBKDD.
+     * <code>uint32 interact_id = 11;</code>
+     * @return The interactId.
      */
-    int getCLICILNBKDD();
+    int getInteractId();
 
     /**
      * <code>.GatherGadgetInfo gather_gadget = 13;</code>
@@ -405,28 +405,16 @@ public final class SceneGadgetInfoOuterClass {
     emu.grasscutter.net.proto.CoinCollectOperatorInfoOuterClass.CoinCollectOperatorInfoOrBuilder getCoinCollectOperatorInfoOrBuilder();
 
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return Whether the trifleGadget field is set.
      */
     boolean hasTrifleGadget();
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return The trifleGadget.
      */
     emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget getTrifleGadget();
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      */
     emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder getTrifleGadgetOrBuilder();
@@ -482,93 +470,57 @@ public final class SceneGadgetInfoOuterClass {
     int getDraftId();
 
     /**
-     * <code>uint32 KHICBPFFAII = 26;</code>
-     * @return The kHICBPFFAII.
+     * <code>uint32 gadget_talk_state = 26;</code>
+     * @return The gadgetTalkState.
      */
-    int getKHICBPFFAII();
+    int getGadgetTalkState();
 
     /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     * @return Whether the gPOHBBPBBEC field is set.
+     * <pre>
+     *OKJCNOADKMM IGMDELMIHMA = 27;
+     * </pre>
+     *
+     * <code>uint32 init_pose_id = 28;</code>
+     * @return The initPoseId.
      */
-    boolean hasGPOHBBPBBEC();
-    /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     * @return The gPOHBBPBBEC.
-     */
-    emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED getGPOHBBPBBEC();
-    /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     */
-    emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder getGPOHBBPBBECOrBuilder();
+    int getInitPoseId();
 
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      * @return Whether the playInfo field is set.
      */
     boolean hasPlayInfo();
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      * @return The playInfo.
      */
     emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo getPlayInfo();
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      */
     emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfoOrBuilder getPlayInfoOrBuilder();
 
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     * @return Whether the dPJFGJDHGGJ field is set.
-     */
-    boolean hasDPJFGJDHGGJ();
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     * @return The dPJFGJDHGGJ.
-     */
-    emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH getDPJFGJDHGGJ();
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     */
-    emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder getDPJFGJDHGGJOrBuilder();
-
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     * @return Whether the pBBAFKFGHIB field is set.
-     */
-    boolean hasPBBAFKFGHIB();
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     * @return The pBBAFKFGHIB.
-     */
-    emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB getPBBAFKFGHIB();
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     */
-    emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder getPBBAFKFGHIBOrBuilder();
-
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     * @return Whether the fDKBHOCNBPH field is set.
-     */
-    boolean hasFDKBHOCNBPH();
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     * @return The fDKBHOCNBPH.
-     */
-    emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF getFDKBHOCNBPH();
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     */
-    emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder getFDKBHOCNBPHOrBuilder();
-
     public emu.grasscutter.net.proto.SceneGadgetInfoOuterClass.SceneGadgetInfo.ContentCase getContentCase();
   }
   /**
-   * <pre>
-   * Obf: JOBMECDLBKP
-   * </pre>
-   *
    * Protobuf type {@code SceneGadgetInfo}
    */
   public static final class SceneGadgetInfo extends
@@ -649,7 +601,7 @@ public final class SceneGadgetInfoOuterClass {
             }
             case 56: {
 
-              kPKNNJLPMFP_ = input.readUInt32();
+              gadgetType_ = input.readUInt32();
               break;
             }
             case 64: {
@@ -669,7 +621,7 @@ public final class SceneGadgetInfoOuterClass {
             }
             case 88: {
 
-              cLICILNBKDD_ = input.readUInt32();
+              interactId_ = input.readUInt32();
               break;
             }
             case 106: {
@@ -821,20 +773,12 @@ public final class SceneGadgetInfoOuterClass {
             }
             case 208: {
 
-              kHICBPFFAII_ = input.readUInt32();
+              gadgetTalkState_ = input.readUInt32();
               break;
             }
-            case 218: {
-              emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder subBuilder = null;
-              if (gPOHBBPBBEC_ != null) {
-                subBuilder = gPOHBBPBBEC_.toBuilder();
-              }
-              gPOHBBPBBEC_ = input.readMessage(emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(gPOHBBPBBEC_);
-                gPOHBBPBBEC_ = subBuilder.buildPartial();
-              }
+            case 224: {
 
+              initPoseId_ = input.readUInt32();
               break;
             }
             case 330: {
@@ -1060,45 +1004,6 @@ public final class SceneGadgetInfoOuterClass {
 
               break;
             }
-            case 810: {
-              emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder subBuilder = null;
-              if (dPJFGJDHGGJ_ != null) {
-                subBuilder = dPJFGJDHGGJ_.toBuilder();
-              }
-              dPJFGJDHGGJ_ = input.readMessage(emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(dPJFGJDHGGJ_);
-                dPJFGJDHGGJ_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 818: {
-              emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder subBuilder = null;
-              if (pBBAFKFGHIB_ != null) {
-                subBuilder = pBBAFKFGHIB_.toBuilder();
-              }
-              pBBAFKFGHIB_ = input.readMessage(emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(pBBAFKFGHIB_);
-                pBBAFKFGHIB_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 826: {
-              emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder subBuilder = null;
-              if (fDKBHOCNBPH_ != null) {
-                subBuilder = fDKBHOCNBPH_.toBuilder();
-              }
-              fDKBHOCNBPH_ = input.readMessage(emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(fDKBHOCNBPH_);
-                fDKBHOCNBPH_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1289,15 +1194,15 @@ public final class SceneGadgetInfoOuterClass {
       return gadgetState_;
     }
 
-    public static final int KPKNNJLPMFP_FIELD_NUMBER = 7;
-    private int kPKNNJLPMFP_;
+    public static final int GADGET_TYPE_FIELD_NUMBER = 7;
+    private int gadgetType_;
     /**
-     * <code>uint32 KPKNNJLPMFP = 7;</code>
-     * @return The kPKNNJLPMFP.
+     * <code>uint32 gadget_type = 7;</code>
+     * @return The gadgetType.
      */
     @java.lang.Override
-    public int getKPKNNJLPMFP() {
-      return kPKNNJLPMFP_;
+    public int getGadgetType() {
+      return gadgetType_;
     }
 
     public static final int IS_SHOW_CUTSCENE_FIELD_NUMBER = 8;
@@ -1333,15 +1238,15 @@ public final class SceneGadgetInfoOuterClass {
       return isEnableInteract_;
     }
 
-    public static final int CLICILNBKDD_FIELD_NUMBER = 11;
-    private int cLICILNBKDD_;
+    public static final int INTERACT_ID_FIELD_NUMBER = 11;
+    private int interactId_;
     /**
-     * <code>uint32 CLICILNBKDD = 11;</code>
-     * @return The cLICILNBKDD.
+     * <code>uint32 interact_id = 11;</code>
+     * @return The interactId.
      */
     @java.lang.Override
-    public int getCLICILNBKDD() {
-      return cLICILNBKDD_;
+    public int getInteractId() {
+      return interactId_;
     }
 
     public static final int GATHER_GADGET_FIELD_NUMBER = 13;
@@ -1997,10 +1902,6 @@ public final class SceneGadgetInfoOuterClass {
 
     public static final int TRIFLE_GADGET_FIELD_NUMBER = 67;
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return Whether the trifleGadget field is set.
      */
@@ -2009,10 +1910,6 @@ public final class SceneGadgetInfoOuterClass {
       return contentCase_ == 67;
     }
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      * @return The trifleGadget.
      */
@@ -2024,10 +1921,6 @@ public final class SceneGadgetInfoOuterClass {
       return emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.getDefaultInstance();
     }
     /**
-     * <pre>
-     *Item trifle_item = 67;
-     * </pre>
-     *
      * <code>.TrifleGadget trifle_gadget = 67;</code>
      */
     @java.lang.Override
@@ -2125,46 +2018,41 @@ public final class SceneGadgetInfoOuterClass {
       return draftId_;
     }
 
-    public static final int KHICBPFFAII_FIELD_NUMBER = 26;
-    private int kHICBPFFAII_;
+    public static final int GADGET_TALK_STATE_FIELD_NUMBER = 26;
+    private int gadgetTalkState_;
     /**
-     * <code>uint32 KHICBPFFAII = 26;</code>
-     * @return The kHICBPFFAII.
+     * <code>uint32 gadget_talk_state = 26;</code>
+     * @return The gadgetTalkState.
      */
     @java.lang.Override
-    public int getKHICBPFFAII() {
-      return kHICBPFFAII_;
+    public int getGadgetTalkState() {
+      return gadgetTalkState_;
     }
 
-    public static final int GPOHBBPBBEC_FIELD_NUMBER = 27;
-    private emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED gPOHBBPBBEC_;
+    public static final int INIT_POSE_ID_FIELD_NUMBER = 28;
+    private int initPoseId_;
     /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     * @return Whether the gPOHBBPBBEC field is set.
+     * <pre>
+     *OKJCNOADKMM IGMDELMIHMA = 27;
+     * </pre>
+     *
+     * <code>uint32 init_pose_id = 28;</code>
+     * @return The initPoseId.
      */
     @java.lang.Override
-    public boolean hasGPOHBBPBBEC() {
-      return gPOHBBPBBEC_ != null;
-    }
-    /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     * @return The gPOHBBPBBEC.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED getGPOHBBPBBEC() {
-      return gPOHBBPBBEC_ == null ? emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.getDefaultInstance() : gPOHBBPBBEC_;
-    }
-    /**
-     * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder getGPOHBBPBBECOrBuilder() {
-      return getGPOHBBPBBEC();
+    public int getInitPoseId() {
+      return initPoseId_;
     }
 
     public static final int PLAY_INFO_FIELD_NUMBER = 100;
     private emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo playInfo_;
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      * @return Whether the playInfo field is set.
      */
@@ -2173,6 +2061,12 @@ public final class SceneGadgetInfoOuterClass {
       return playInfo_ != null;
     }
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      * @return The playInfo.
      */
@@ -2181,6 +2075,12 @@ public final class SceneGadgetInfoOuterClass {
       return playInfo_ == null ? emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo.getDefaultInstance() : playInfo_;
     }
     /**
+     * <pre>
+     *HGPFAKAPMMB PNAJJDAFJCH = 101;
+     *DFBLLCCOCBA GLGAHAJNALA = 102;
+     *POLDBBPAHPC INIHNDCAMAJ = 103;
+     * </pre>
+     *
      * <code>.GadgetPlayInfo play_info = 100;</code>
      */
     @java.lang.Override
@@ -2188,84 +2088,6 @@ public final class SceneGadgetInfoOuterClass {
       return getPlayInfo();
     }
 
-    public static final int DPJFGJDHGGJ_FIELD_NUMBER = 101;
-    private emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH dPJFGJDHGGJ_;
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     * @return Whether the dPJFGJDHGGJ field is set.
-     */
-    @java.lang.Override
-    public boolean hasDPJFGJDHGGJ() {
-      return dPJFGJDHGGJ_ != null;
-    }
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     * @return The dPJFGJDHGGJ.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH getDPJFGJDHGGJ() {
-      return dPJFGJDHGGJ_ == null ? emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.getDefaultInstance() : dPJFGJDHGGJ_;
-    }
-    /**
-     * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder getDPJFGJDHGGJOrBuilder() {
-      return getDPJFGJDHGGJ();
-    }
-
-    public static final int PBBAFKFGHIB_FIELD_NUMBER = 102;
-    private emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB pBBAFKFGHIB_;
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     * @return Whether the pBBAFKFGHIB field is set.
-     */
-    @java.lang.Override
-    public boolean hasPBBAFKFGHIB() {
-      return pBBAFKFGHIB_ != null;
-    }
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     * @return The pBBAFKFGHIB.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB getPBBAFKFGHIB() {
-      return pBBAFKFGHIB_ == null ? emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.getDefaultInstance() : pBBAFKFGHIB_;
-    }
-    /**
-     * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder getPBBAFKFGHIBOrBuilder() {
-      return getPBBAFKFGHIB();
-    }
-
-    public static final int FDKBHOCNBPH_FIELD_NUMBER = 103;
-    private emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF fDKBHOCNBPH_;
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     * @return Whether the fDKBHOCNBPH field is set.
-     */
-    @java.lang.Override
-    public boolean hasFDKBHOCNBPH() {
-      return fDKBHOCNBPH_ != null;
-    }
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     * @return The fDKBHOCNBPH.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF getFDKBHOCNBPH() {
-      return fDKBHOCNBPH_ == null ? emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.getDefaultInstance() : fDKBHOCNBPH_;
-    }
-    /**
-     * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder getFDKBHOCNBPHOrBuilder() {
-      return getFDKBHOCNBPH();
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -2299,8 +2121,8 @@ public final class SceneGadgetInfoOuterClass {
       if (gadgetState_ != 0) {
         output.writeUInt32(6, gadgetState_);
       }
-      if (kPKNNJLPMFP_ != 0) {
-        output.writeUInt32(7, kPKNNJLPMFP_);
+      if (gadgetType_ != 0) {
+        output.writeUInt32(7, gadgetType_);
       }
       if (isShowCutscene_ != false) {
         output.writeBool(8, isShowCutscene_);
@@ -2311,8 +2133,8 @@ public final class SceneGadgetInfoOuterClass {
       if (isEnableInteract_ != false) {
         output.writeBool(10, isEnableInteract_);
       }
-      if (cLICILNBKDD_ != 0) {
-        output.writeUInt32(11, cLICILNBKDD_);
+      if (interactId_ != 0) {
+        output.writeUInt32(11, interactId_);
       }
       if (contentCase_ == 13) {
         output.writeMessage(13, (emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.GatherGadgetInfo) content_);
@@ -2354,11 +2176,11 @@ public final class SceneGadgetInfoOuterClass {
       if (draftId_ != 0) {
         output.writeUInt32(25, draftId_);
       }
-      if (kHICBPFFAII_ != 0) {
-        output.writeUInt32(26, kHICBPFFAII_);
+      if (gadgetTalkState_ != 0) {
+        output.writeUInt32(26, gadgetTalkState_);
       }
-      if (gPOHBBPBBEC_ != null) {
-        output.writeMessage(27, getGPOHBBPBBEC());
+      if (initPoseId_ != 0) {
+        output.writeUInt32(28, initPoseId_);
       }
       if (contentCase_ == 41) {
         output.writeMessage(41, (emu.grasscutter.net.proto.BlossomChestInfoOuterClass.BlossomChestInfo) content_);
@@ -2408,15 +2230,6 @@ public final class SceneGadgetInfoOuterClass {
       if (playInfo_ != null) {
         output.writeMessage(100, getPlayInfo());
       }
-      if (dPJFGJDHGGJ_ != null) {
-        output.writeMessage(101, getDPJFGJDHGGJ());
-      }
-      if (pBBAFKFGHIB_ != null) {
-        output.writeMessage(102, getPBBAFKFGHIB());
-      }
-      if (fDKBHOCNBPH_ != null) {
-        output.writeMessage(103, getFDKBHOCNBPH());
-      }
       unknownFields.writeTo(output);
     }
 
@@ -2450,9 +2263,9 @@ public final class SceneGadgetInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(6, gadgetState_);
       }
-      if (kPKNNJLPMFP_ != 0) {
+      if (gadgetType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, kPKNNJLPMFP_);
+          .computeUInt32Size(7, gadgetType_);
       }
       if (isShowCutscene_ != false) {
         size += com.google.protobuf.CodedOutputStream
@@ -2466,9 +2279,9 @@ public final class SceneGadgetInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(10, isEnableInteract_);
       }
-      if (cLICILNBKDD_ != 0) {
+      if (interactId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, cLICILNBKDD_);
+          .computeUInt32Size(11, interactId_);
       }
       if (contentCase_ == 13) {
         size += com.google.protobuf.CodedOutputStream
@@ -2528,13 +2341,13 @@ public final class SceneGadgetInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(25, draftId_);
       }
-      if (kHICBPFFAII_ != 0) {
+      if (gadgetTalkState_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(26, kHICBPFFAII_);
+          .computeUInt32Size(26, gadgetTalkState_);
       }
-      if (gPOHBBPBBEC_ != null) {
+      if (initPoseId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(27, getGPOHBBPBBEC());
+          .computeUInt32Size(28, initPoseId_);
       }
       if (contentCase_ == 41) {
         size += com.google.protobuf.CodedOutputStream
@@ -2600,18 +2413,6 @@ public final class SceneGadgetInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(100, getPlayInfo());
       }
-      if (dPJFGJDHGGJ_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(101, getDPJFGJDHGGJ());
-      }
-      if (pBBAFKFGHIB_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(102, getPBBAFKFGHIB());
-      }
-      if (fDKBHOCNBPH_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(103, getFDKBHOCNBPH());
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -2638,16 +2439,16 @@ public final class SceneGadgetInfoOuterClass {
       if (bornType_ != other.bornType_) return false;
       if (getGadgetState()
           != other.getGadgetState()) return false;
-      if (getKPKNNJLPMFP()
-          != other.getKPKNNJLPMFP()) return false;
+      if (getGadgetType()
+          != other.getGadgetType()) return false;
       if (getIsShowCutscene()
           != other.getIsShowCutscene()) return false;
       if (getAuthorityPeerId()
           != other.getAuthorityPeerId()) return false;
       if (getIsEnableInteract()
           != other.getIsEnableInteract()) return false;
-      if (getCLICILNBKDD()
-          != other.getCLICILNBKDD()) return false;
+      if (getInteractId()
+          != other.getInteractId()) return false;
       if (getMarkFlag()
           != other.getMarkFlag()) return false;
       if (getPropOwnerEntityId()
@@ -2661,33 +2462,15 @@ public final class SceneGadgetInfoOuterClass {
           .equals(other.getInteractUidListList())) return false;
       if (getDraftId()
           != other.getDraftId()) return false;
-      if (getKHICBPFFAII()
-          != other.getKHICBPFFAII()) return false;
-      if (hasGPOHBBPBBEC() != other.hasGPOHBBPBBEC()) return false;
-      if (hasGPOHBBPBBEC()) {
-        if (!getGPOHBBPBBEC()
-            .equals(other.getGPOHBBPBBEC())) return false;
-      }
+      if (getGadgetTalkState()
+          != other.getGadgetTalkState()) return false;
+      if (getInitPoseId()
+          != other.getInitPoseId()) return false;
       if (hasPlayInfo() != other.hasPlayInfo()) return false;
       if (hasPlayInfo()) {
         if (!getPlayInfo()
             .equals(other.getPlayInfo())) return false;
       }
-      if (hasDPJFGJDHGGJ() != other.hasDPJFGJDHGGJ()) return false;
-      if (hasDPJFGJDHGGJ()) {
-        if (!getDPJFGJDHGGJ()
-            .equals(other.getDPJFGJDHGGJ())) return false;
-      }
-      if (hasPBBAFKFGHIB() != other.hasPBBAFKFGHIB()) return false;
-      if (hasPBBAFKFGHIB()) {
-        if (!getPBBAFKFGHIB()
-            .equals(other.getPBBAFKFGHIB())) return false;
-      }
-      if (hasFDKBHOCNBPH() != other.hasFDKBHOCNBPH()) return false;
-      if (hasFDKBHOCNBPH()) {
-        if (!getFDKBHOCNBPH()
-            .equals(other.getFDKBHOCNBPH())) return false;
-      }
       if (!getContentCase().equals(other.getContentCase())) return false;
       switch (contentCase_) {
         case 13:
@@ -2804,8 +2587,8 @@ public final class SceneGadgetInfoOuterClass {
       hash = (53 * hash) + bornType_;
       hash = (37 * hash) + GADGET_STATE_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetState();
-      hash = (37 * hash) + KPKNNJLPMFP_FIELD_NUMBER;
-      hash = (53 * hash) + getKPKNNJLPMFP();
+      hash = (37 * hash) + GADGET_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetType();
       hash = (37 * hash) + IS_SHOW_CUTSCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsShowCutscene());
@@ -2814,8 +2597,8 @@ public final class SceneGadgetInfoOuterClass {
       hash = (37 * hash) + IS_ENABLE_INTERACT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsEnableInteract());
-      hash = (37 * hash) + CLICILNBKDD_FIELD_NUMBER;
-      hash = (53 * hash) + getCLICILNBKDD();
+      hash = (37 * hash) + INTERACT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInteractId();
       hash = (37 * hash) + MARK_FLAG_FIELD_NUMBER;
       hash = (53 * hash) + getMarkFlag();
       hash = (37 * hash) + PROP_OWNER_ENTITY_ID_FIELD_NUMBER;
@@ -2830,28 +2613,14 @@ public final class SceneGadgetInfoOuterClass {
       }
       hash = (37 * hash) + DRAFT_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDraftId();
-      hash = (37 * hash) + KHICBPFFAII_FIELD_NUMBER;
-      hash = (53 * hash) + getKHICBPFFAII();
-      if (hasGPOHBBPBBEC()) {
-        hash = (37 * hash) + GPOHBBPBBEC_FIELD_NUMBER;
-        hash = (53 * hash) + getGPOHBBPBBEC().hashCode();
-      }
+      hash = (37 * hash) + GADGET_TALK_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetTalkState();
+      hash = (37 * hash) + INIT_POSE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getInitPoseId();
       if (hasPlayInfo()) {
         hash = (37 * hash) + PLAY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getPlayInfo().hashCode();
       }
-      if (hasDPJFGJDHGGJ()) {
-        hash = (37 * hash) + DPJFGJDHGGJ_FIELD_NUMBER;
-        hash = (53 * hash) + getDPJFGJDHGGJ().hashCode();
-      }
-      if (hasPBBAFKFGHIB()) {
-        hash = (37 * hash) + PBBAFKFGHIB_FIELD_NUMBER;
-        hash = (53 * hash) + getPBBAFKFGHIB().hashCode();
-      }
-      if (hasFDKBHOCNBPH()) {
-        hash = (37 * hash) + FDKBHOCNBPH_FIELD_NUMBER;
-        hash = (53 * hash) + getFDKBHOCNBPH().hashCode();
-      }
       switch (contentCase_) {
         case 13:
           hash = (37 * hash) + GATHER_GADGET_FIELD_NUMBER;
@@ -3040,10 +2809,6 @@ public final class SceneGadgetInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JOBMECDLBKP
-     * </pre>
-     *
      * Protobuf type {@code SceneGadgetInfo}
      */
     public static final class Builder extends
@@ -3093,7 +2858,7 @@ public final class SceneGadgetInfoOuterClass {
 
         gadgetState_ = 0;
 
-        kPKNNJLPMFP_ = 0;
+        gadgetType_ = 0;
 
         isShowCutscene_ = false;
 
@@ -3101,7 +2866,7 @@ public final class SceneGadgetInfoOuterClass {
 
         isEnableInteract_ = false;
 
-        cLICILNBKDD_ = 0;
+        interactId_ = 0;
 
         markFlag_ = 0;
 
@@ -3117,38 +2882,16 @@ public final class SceneGadgetInfoOuterClass {
         bitField0_ = (bitField0_ & ~0x00000001);
         draftId_ = 0;
 
-        kHICBPFFAII_ = 0;
+        gadgetTalkState_ = 0;
+
+        initPoseId_ = 0;
 
-        if (gPOHBBPBBECBuilder_ == null) {
-          gPOHBBPBBEC_ = null;
-        } else {
-          gPOHBBPBBEC_ = null;
-          gPOHBBPBBECBuilder_ = null;
-        }
         if (playInfoBuilder_ == null) {
           playInfo_ = null;
         } else {
           playInfo_ = null;
           playInfoBuilder_ = null;
         }
-        if (dPJFGJDHGGJBuilder_ == null) {
-          dPJFGJDHGGJ_ = null;
-        } else {
-          dPJFGJDHGGJ_ = null;
-          dPJFGJDHGGJBuilder_ = null;
-        }
-        if (pBBAFKFGHIBBuilder_ == null) {
-          pBBAFKFGHIB_ = null;
-        } else {
-          pBBAFKFGHIB_ = null;
-          pBBAFKFGHIBBuilder_ = null;
-        }
-        if (fDKBHOCNBPHBuilder_ == null) {
-          fDKBHOCNBPH_ = null;
-        } else {
-          fDKBHOCNBPH_ = null;
-          fDKBHOCNBPHBuilder_ = null;
-        }
         contentCase_ = 0;
         content_ = null;
         return this;
@@ -3184,11 +2927,11 @@ public final class SceneGadgetInfoOuterClass {
         result.ownerEntityId_ = ownerEntityId_;
         result.bornType_ = bornType_;
         result.gadgetState_ = gadgetState_;
-        result.kPKNNJLPMFP_ = kPKNNJLPMFP_;
+        result.gadgetType_ = gadgetType_;
         result.isShowCutscene_ = isShowCutscene_;
         result.authorityPeerId_ = authorityPeerId_;
         result.isEnableInteract_ = isEnableInteract_;
-        result.cLICILNBKDD_ = cLICILNBKDD_;
+        result.interactId_ = interactId_;
         if (contentCase_ == 13) {
           if (gatherGadgetBuilder_ == null) {
             result.content_ = content_;
@@ -3356,32 +3099,13 @@ public final class SceneGadgetInfoOuterClass {
         }
         result.interactUidList_ = interactUidList_;
         result.draftId_ = draftId_;
-        result.kHICBPFFAII_ = kHICBPFFAII_;
-        if (gPOHBBPBBECBuilder_ == null) {
-          result.gPOHBBPBBEC_ = gPOHBBPBBEC_;
-        } else {
-          result.gPOHBBPBBEC_ = gPOHBBPBBECBuilder_.build();
-        }
+        result.gadgetTalkState_ = gadgetTalkState_;
+        result.initPoseId_ = initPoseId_;
         if (playInfoBuilder_ == null) {
           result.playInfo_ = playInfo_;
         } else {
           result.playInfo_ = playInfoBuilder_.build();
         }
-        if (dPJFGJDHGGJBuilder_ == null) {
-          result.dPJFGJDHGGJ_ = dPJFGJDHGGJ_;
-        } else {
-          result.dPJFGJDHGGJ_ = dPJFGJDHGGJBuilder_.build();
-        }
-        if (pBBAFKFGHIBBuilder_ == null) {
-          result.pBBAFKFGHIB_ = pBBAFKFGHIB_;
-        } else {
-          result.pBBAFKFGHIB_ = pBBAFKFGHIBBuilder_.build();
-        }
-        if (fDKBHOCNBPHBuilder_ == null) {
-          result.fDKBHOCNBPH_ = fDKBHOCNBPH_;
-        } else {
-          result.fDKBHOCNBPH_ = fDKBHOCNBPHBuilder_.build();
-        }
         result.contentCase_ = contentCase_;
         onBuilt();
         return result;
@@ -3449,8 +3173,8 @@ public final class SceneGadgetInfoOuterClass {
         if (other.getGadgetState() != 0) {
           setGadgetState(other.getGadgetState());
         }
-        if (other.getKPKNNJLPMFP() != 0) {
-          setKPKNNJLPMFP(other.getKPKNNJLPMFP());
+        if (other.getGadgetType() != 0) {
+          setGadgetType(other.getGadgetType());
         }
         if (other.getIsShowCutscene() != false) {
           setIsShowCutscene(other.getIsShowCutscene());
@@ -3461,8 +3185,8 @@ public final class SceneGadgetInfoOuterClass {
         if (other.getIsEnableInteract() != false) {
           setIsEnableInteract(other.getIsEnableInteract());
         }
-        if (other.getCLICILNBKDD() != 0) {
-          setCLICILNBKDD(other.getCLICILNBKDD());
+        if (other.getInteractId() != 0) {
+          setInteractId(other.getInteractId());
         }
         if (other.getMarkFlag() != 0) {
           setMarkFlag(other.getMarkFlag());
@@ -3486,24 +3210,15 @@ public final class SceneGadgetInfoOuterClass {
         if (other.getDraftId() != 0) {
           setDraftId(other.getDraftId());
         }
-        if (other.getKHICBPFFAII() != 0) {
-          setKHICBPFFAII(other.getKHICBPFFAII());
+        if (other.getGadgetTalkState() != 0) {
+          setGadgetTalkState(other.getGadgetTalkState());
         }
-        if (other.hasGPOHBBPBBEC()) {
-          mergeGPOHBBPBBEC(other.getGPOHBBPBBEC());
+        if (other.getInitPoseId() != 0) {
+          setInitPoseId(other.getInitPoseId());
         }
         if (other.hasPlayInfo()) {
           mergePlayInfo(other.getPlayInfo());
         }
-        if (other.hasDPJFGJDHGGJ()) {
-          mergeDPJFGJDHGGJ(other.getDPJFGJDHGGJ());
-        }
-        if (other.hasPBBAFKFGHIB()) {
-          mergePBBAFKFGHIB(other.getPBBAFKFGHIB());
-        }
-        if (other.hasFDKBHOCNBPH()) {
-          mergeFDKBHOCNBPH(other.getFDKBHOCNBPH());
-        }
         switch (other.getContentCase()) {
           case GATHER_GADGET: {
             mergeGatherGadget(other.getGatherGadget());
@@ -3851,33 +3566,33 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
 
-      private int kPKNNJLPMFP_ ;
+      private int gadgetType_ ;
       /**
-       * <code>uint32 KPKNNJLPMFP = 7;</code>
-       * @return The kPKNNJLPMFP.
+       * <code>uint32 gadget_type = 7;</code>
+       * @return The gadgetType.
        */
       @java.lang.Override
-      public int getKPKNNJLPMFP() {
-        return kPKNNJLPMFP_;
+      public int getGadgetType() {
+        return gadgetType_;
       }
       /**
-       * <code>uint32 KPKNNJLPMFP = 7;</code>
-       * @param value The kPKNNJLPMFP to set.
+       * <code>uint32 gadget_type = 7;</code>
+       * @param value The gadgetType to set.
        * @return This builder for chaining.
        */
-      public Builder setKPKNNJLPMFP(int value) {
+      public Builder setGadgetType(int value) {
         
-        kPKNNJLPMFP_ = value;
+        gadgetType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KPKNNJLPMFP = 7;</code>
+       * <code>uint32 gadget_type = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKPKNNJLPMFP() {
+      public Builder clearGadgetType() {
         
-        kPKNNJLPMFP_ = 0;
+        gadgetType_ = 0;
         onChanged();
         return this;
       }
@@ -3975,33 +3690,33 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
 
-      private int cLICILNBKDD_ ;
+      private int interactId_ ;
       /**
-       * <code>uint32 CLICILNBKDD = 11;</code>
-       * @return The cLICILNBKDD.
+       * <code>uint32 interact_id = 11;</code>
+       * @return The interactId.
        */
       @java.lang.Override
-      public int getCLICILNBKDD() {
-        return cLICILNBKDD_;
+      public int getInteractId() {
+        return interactId_;
       }
       /**
-       * <code>uint32 CLICILNBKDD = 11;</code>
-       * @param value The cLICILNBKDD to set.
+       * <code>uint32 interact_id = 11;</code>
+       * @param value The interactId to set.
        * @return This builder for chaining.
        */
-      public Builder setCLICILNBKDD(int value) {
+      public Builder setInteractId(int value) {
         
-        cLICILNBKDD_ = value;
+        interactId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 CLICILNBKDD = 11;</code>
+       * <code>uint32 interact_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearCLICILNBKDD() {
+      public Builder clearInteractId() {
         
-        cLICILNBKDD_ = 0;
+        interactId_ = 0;
         onChanged();
         return this;
       }
@@ -6970,10 +6685,6 @@ public final class SceneGadgetInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder, emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadgetOrBuilder> trifleGadgetBuilder_;
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        * @return Whether the trifleGadget field is set.
        */
@@ -6982,10 +6693,6 @@ public final class SceneGadgetInfoOuterClass {
         return contentCase_ == 67;
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        * @return The trifleGadget.
        */
@@ -7004,10 +6711,6 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder setTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) {
@@ -7024,10 +6727,6 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder setTrifleGadget(
@@ -7042,10 +6741,6 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder mergeTrifleGadget(emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget value) {
@@ -7068,10 +6763,6 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public Builder clearTrifleGadget() {
@@ -7091,20 +6782,12 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       public emu.grasscutter.net.proto.TrifleGadgetOuterClass.TrifleGadget.Builder getTrifleGadgetBuilder() {
         return getTrifleGadgetFieldBuilder().getBuilder();
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       @java.lang.Override
@@ -7119,10 +6802,6 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
-       * <pre>
-       *Item trifle_item = 67;
-       * </pre>
-       *
        * <code>.TrifleGadget trifle_gadget = 67;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -7435,160 +7114,90 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
 
-      private int kHICBPFFAII_ ;
+      private int gadgetTalkState_ ;
       /**
-       * <code>uint32 KHICBPFFAII = 26;</code>
-       * @return The kHICBPFFAII.
+       * <code>uint32 gadget_talk_state = 26;</code>
+       * @return The gadgetTalkState.
        */
       @java.lang.Override
-      public int getKHICBPFFAII() {
-        return kHICBPFFAII_;
+      public int getGadgetTalkState() {
+        return gadgetTalkState_;
       }
       /**
-       * <code>uint32 KHICBPFFAII = 26;</code>
-       * @param value The kHICBPFFAII to set.
+       * <code>uint32 gadget_talk_state = 26;</code>
+       * @param value The gadgetTalkState to set.
        * @return This builder for chaining.
        */
-      public Builder setKHICBPFFAII(int value) {
+      public Builder setGadgetTalkState(int value) {
         
-        kHICBPFFAII_ = value;
+        gadgetTalkState_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 KHICBPFFAII = 26;</code>
+       * <code>uint32 gadget_talk_state = 26;</code>
        * @return This builder for chaining.
        */
-      public Builder clearKHICBPFFAII() {
+      public Builder clearGadgetTalkState() {
         
-        kHICBPFFAII_ = 0;
+        gadgetTalkState_ = 0;
         onChanged();
         return this;
       }
 
-      private emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED gPOHBBPBBEC_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder> gPOHBBPBBECBuilder_;
+      private int initPoseId_ ;
       /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       * @return Whether the gPOHBBPBBEC field is set.
+       * <pre>
+       *OKJCNOADKMM IGMDELMIHMA = 27;
+       * </pre>
+       *
+       * <code>uint32 init_pose_id = 28;</code>
+       * @return The initPoseId.
        */
-      public boolean hasGPOHBBPBBEC() {
-        return gPOHBBPBBECBuilder_ != null || gPOHBBPBBEC_ != null;
+      @java.lang.Override
+      public int getInitPoseId() {
+        return initPoseId_;
       }
       /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       * @return The gPOHBBPBBEC.
+       * <pre>
+       *OKJCNOADKMM IGMDELMIHMA = 27;
+       * </pre>
+       *
+       * <code>uint32 init_pose_id = 28;</code>
+       * @param value The initPoseId to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED getGPOHBBPBBEC() {
-        if (gPOHBBPBBECBuilder_ == null) {
-          return gPOHBBPBBEC_ == null ? emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.getDefaultInstance() : gPOHBBPBBEC_;
-        } else {
-          return gPOHBBPBBECBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      public Builder setGPOHBBPBBEC(emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED value) {
-        if (gPOHBBPBBECBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          gPOHBBPBBEC_ = value;
-          onChanged();
-        } else {
-          gPOHBBPBBECBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      public Builder setGPOHBBPBBEC(
-          emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder builderForValue) {
-        if (gPOHBBPBBECBuilder_ == null) {
-          gPOHBBPBBEC_ = builderForValue.build();
-          onChanged();
-        } else {
-          gPOHBBPBBECBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      public Builder mergeGPOHBBPBBEC(emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED value) {
-        if (gPOHBBPBBECBuilder_ == null) {
-          if (gPOHBBPBBEC_ != null) {
-            gPOHBBPBBEC_ =
-              emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.newBuilder(gPOHBBPBBEC_).mergeFrom(value).buildPartial();
-          } else {
-            gPOHBBPBBEC_ = value;
-          }
-          onChanged();
-        } else {
-          gPOHBBPBBECBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      public Builder clearGPOHBBPBBEC() {
-        if (gPOHBBPBBECBuilder_ == null) {
-          gPOHBBPBBEC_ = null;
-          onChanged();
-        } else {
-          gPOHBBPBBEC_ = null;
-          gPOHBBPBBECBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      public emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder getGPOHBBPBBECBuilder() {
+      public Builder setInitPoseId(int value) {
         
+        initPoseId_ = value;
         onChanged();
-        return getGPOHBBPBBECFieldBuilder().getBuilder();
+        return this;
       }
       /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
+       * <pre>
+       *OKJCNOADKMM IGMDELMIHMA = 27;
+       * </pre>
+       *
+       * <code>uint32 init_pose_id = 28;</code>
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder getGPOHBBPBBECOrBuilder() {
-        if (gPOHBBPBBECBuilder_ != null) {
-          return gPOHBBPBBECBuilder_.getMessageOrBuilder();
-        } else {
-          return gPOHBBPBBEC_ == null ?
-              emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.getDefaultInstance() : gPOHBBPBBEC_;
-        }
-      }
-      /**
-       * <code>.JMFPBNKNHED GPOHBBPBBEC = 27;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder> 
-          getGPOHBBPBBECFieldBuilder() {
-        if (gPOHBBPBBECBuilder_ == null) {
-          gPOHBBPBBECBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHED.Builder, emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.JMFPBNKNHEDOrBuilder>(
-                  getGPOHBBPBBEC(),
-                  getParentForChildren(),
-                  isClean());
-          gPOHBBPBBEC_ = null;
-        }
-        return gPOHBBPBBECBuilder_;
+      public Builder clearInitPoseId() {
+        
+        initPoseId_ = 0;
+        onChanged();
+        return this;
       }
 
       private emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo playInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo, emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo.Builder, emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfoOrBuilder> playInfoBuilder_;
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        * @return Whether the playInfo field is set.
        */
@@ -7596,6 +7205,12 @@ public final class SceneGadgetInfoOuterClass {
         return playInfoBuilder_ != null || playInfo_ != null;
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        * @return The playInfo.
        */
@@ -7607,6 +7222,12 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public Builder setPlayInfo(emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo value) {
@@ -7623,6 +7244,12 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public Builder setPlayInfo(
@@ -7637,6 +7264,12 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public Builder mergePlayInfo(emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo value) {
@@ -7655,6 +7288,12 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public Builder clearPlayInfo() {
@@ -7669,6 +7308,12 @@ public final class SceneGadgetInfoOuterClass {
         return this;
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfo.Builder getPlayInfoBuilder() {
@@ -7677,6 +7322,12 @@ public final class SceneGadgetInfoOuterClass {
         return getPlayInfoFieldBuilder().getBuilder();
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       public emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.GadgetPlayInfoOrBuilder getPlayInfoOrBuilder() {
@@ -7688,6 +7339,12 @@ public final class SceneGadgetInfoOuterClass {
         }
       }
       /**
+       * <pre>
+       *HGPFAKAPMMB PNAJJDAFJCH = 101;
+       *DFBLLCCOCBA GLGAHAJNALA = 102;
+       *POLDBBPAHPC INIHNDCAMAJ = 103;
+       * </pre>
+       *
        * <code>.GadgetPlayInfo play_info = 100;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
@@ -7703,363 +7360,6 @@ public final class SceneGadgetInfoOuterClass {
         }
         return playInfoBuilder_;
       }
-
-      private emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH dPJFGJDHGGJ_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder> dPJFGJDHGGJBuilder_;
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       * @return Whether the dPJFGJDHGGJ field is set.
-       */
-      public boolean hasDPJFGJDHGGJ() {
-        return dPJFGJDHGGJBuilder_ != null || dPJFGJDHGGJ_ != null;
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       * @return The dPJFGJDHGGJ.
-       */
-      public emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH getDPJFGJDHGGJ() {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          return dPJFGJDHGGJ_ == null ? emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.getDefaultInstance() : dPJFGJDHGGJ_;
-        } else {
-          return dPJFGJDHGGJBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public Builder setDPJFGJDHGGJ(emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH value) {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          dPJFGJDHGGJ_ = value;
-          onChanged();
-        } else {
-          dPJFGJDHGGJBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public Builder setDPJFGJDHGGJ(
-          emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder builderForValue) {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          dPJFGJDHGGJ_ = builderForValue.build();
-          onChanged();
-        } else {
-          dPJFGJDHGGJBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public Builder mergeDPJFGJDHGGJ(emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH value) {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          if (dPJFGJDHGGJ_ != null) {
-            dPJFGJDHGGJ_ =
-              emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.newBuilder(dPJFGJDHGGJ_).mergeFrom(value).buildPartial();
-          } else {
-            dPJFGJDHGGJ_ = value;
-          }
-          onChanged();
-        } else {
-          dPJFGJDHGGJBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public Builder clearDPJFGJDHGGJ() {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          dPJFGJDHGGJ_ = null;
-          onChanged();
-        } else {
-          dPJFGJDHGGJ_ = null;
-          dPJFGJDHGGJBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder getDPJFGJDHGGJBuilder() {
-        
-        onChanged();
-        return getDPJFGJDHGGJFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      public emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder getDPJFGJDHGGJOrBuilder() {
-        if (dPJFGJDHGGJBuilder_ != null) {
-          return dPJFGJDHGGJBuilder_.getMessageOrBuilder();
-        } else {
-          return dPJFGJDHGGJ_ == null ?
-              emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.getDefaultInstance() : dPJFGJDHGGJ_;
-        }
-      }
-      /**
-       * <code>.GDGKKLFMJKH DPJFGJDHGGJ = 101;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder> 
-          getDPJFGJDHGGJFieldBuilder() {
-        if (dPJFGJDHGGJBuilder_ == null) {
-          dPJFGJDHGGJBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKH.Builder, emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.GDGKKLFMJKHOrBuilder>(
-                  getDPJFGJDHGGJ(),
-                  getParentForChildren(),
-                  isClean());
-          dPJFGJDHGGJ_ = null;
-        }
-        return dPJFGJDHGGJBuilder_;
-      }
-
-      private emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB pBBAFKFGHIB_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder> pBBAFKFGHIBBuilder_;
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       * @return Whether the pBBAFKFGHIB field is set.
-       */
-      public boolean hasPBBAFKFGHIB() {
-        return pBBAFKFGHIBBuilder_ != null || pBBAFKFGHIB_ != null;
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       * @return The pBBAFKFGHIB.
-       */
-      public emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB getPBBAFKFGHIB() {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          return pBBAFKFGHIB_ == null ? emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.getDefaultInstance() : pBBAFKFGHIB_;
-        } else {
-          return pBBAFKFGHIBBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public Builder setPBBAFKFGHIB(emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB value) {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pBBAFKFGHIB_ = value;
-          onChanged();
-        } else {
-          pBBAFKFGHIBBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public Builder setPBBAFKFGHIB(
-          emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder builderForValue) {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          pBBAFKFGHIB_ = builderForValue.build();
-          onChanged();
-        } else {
-          pBBAFKFGHIBBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public Builder mergePBBAFKFGHIB(emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB value) {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          if (pBBAFKFGHIB_ != null) {
-            pBBAFKFGHIB_ =
-              emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.newBuilder(pBBAFKFGHIB_).mergeFrom(value).buildPartial();
-          } else {
-            pBBAFKFGHIB_ = value;
-          }
-          onChanged();
-        } else {
-          pBBAFKFGHIBBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public Builder clearPBBAFKFGHIB() {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          pBBAFKFGHIB_ = null;
-          onChanged();
-        } else {
-          pBBAFKFGHIB_ = null;
-          pBBAFKFGHIBBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder getPBBAFKFGHIBBuilder() {
-        
-        onChanged();
-        return getPBBAFKFGHIBFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      public emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder getPBBAFKFGHIBOrBuilder() {
-        if (pBBAFKFGHIBBuilder_ != null) {
-          return pBBAFKFGHIBBuilder_.getMessageOrBuilder();
-        } else {
-          return pBBAFKFGHIB_ == null ?
-              emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.getDefaultInstance() : pBBAFKFGHIB_;
-        }
-      }
-      /**
-       * <code>.OMBIJJLAHFB PBBAFKFGHIB = 102;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder> 
-          getPBBAFKFGHIBFieldBuilder() {
-        if (pBBAFKFGHIBBuilder_ == null) {
-          pBBAFKFGHIBBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFB.Builder, emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.OMBIJJLAHFBOrBuilder>(
-                  getPBBAFKFGHIB(),
-                  getParentForChildren(),
-                  isClean());
-          pBBAFKFGHIB_ = null;
-        }
-        return pBBAFKFGHIBBuilder_;
-      }
-
-      private emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF fDKBHOCNBPH_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder> fDKBHOCNBPHBuilder_;
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       * @return Whether the fDKBHOCNBPH field is set.
-       */
-      public boolean hasFDKBHOCNBPH() {
-        return fDKBHOCNBPHBuilder_ != null || fDKBHOCNBPH_ != null;
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       * @return The fDKBHOCNBPH.
-       */
-      public emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF getFDKBHOCNBPH() {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          return fDKBHOCNBPH_ == null ? emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.getDefaultInstance() : fDKBHOCNBPH_;
-        } else {
-          return fDKBHOCNBPHBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public Builder setFDKBHOCNBPH(emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF value) {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          fDKBHOCNBPH_ = value;
-          onChanged();
-        } else {
-          fDKBHOCNBPHBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public Builder setFDKBHOCNBPH(
-          emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder builderForValue) {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          fDKBHOCNBPH_ = builderForValue.build();
-          onChanged();
-        } else {
-          fDKBHOCNBPHBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public Builder mergeFDKBHOCNBPH(emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF value) {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          if (fDKBHOCNBPH_ != null) {
-            fDKBHOCNBPH_ =
-              emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.newBuilder(fDKBHOCNBPH_).mergeFrom(value).buildPartial();
-          } else {
-            fDKBHOCNBPH_ = value;
-          }
-          onChanged();
-        } else {
-          fDKBHOCNBPHBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public Builder clearFDKBHOCNBPH() {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          fDKBHOCNBPH_ = null;
-          onChanged();
-        } else {
-          fDKBHOCNBPH_ = null;
-          fDKBHOCNBPHBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder getFDKBHOCNBPHBuilder() {
-        
-        onChanged();
-        return getFDKBHOCNBPHFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      public emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder getFDKBHOCNBPHOrBuilder() {
-        if (fDKBHOCNBPHBuilder_ != null) {
-          return fDKBHOCNBPHBuilder_.getMessageOrBuilder();
-        } else {
-          return fDKBHOCNBPH_ == null ?
-              emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.getDefaultInstance() : fDKBHOCNBPH_;
-        }
-      }
-      /**
-       * <code>.BDOCPDNCIEF FDKBHOCNBPH = 103;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder> 
-          getFDKBHOCNBPHFieldBuilder() {
-        if (fDKBHOCNBPHBuilder_ == null) {
-          fDKBHOCNBPHBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEF.Builder, emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.BDOCPDNCIEFOrBuilder>(
-                  getFDKBHOCNBPH(),
-                  getParentForChildren(),
-                  isClean());
-          fDKBHOCNBPH_ = null;
-        }
-        return fDKBHOCNBPHBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -8128,70 +7428,65 @@ public final class SceneGadgetInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025SceneGadgetInfo.proto\032\024GadgetBornType." +
-      "proto\032\nItem.proto\032\026GatherGadgetInfo.prot" +
-      "o\032\021WorktopInfo.proto\032\026ClientGadgetInfo.p" +
-      "roto\032\021WeatherInfo.proto\032\027AbilityGadgetIn" +
-      "fo.proto\032\026StatueGadgetInfo.proto\032\023BossCh" +
-      "estInfo.proto\032\026BlossomChestInfo.proto\032\026M" +
-      "pPlayRewardInfo.proto\032\035GadgetGeneralRewa" +
-      "rdInfo.proto\032\022OfferingInfo.proto\032\024Founda" +
-      "tionInfo.proto\032\021VehicleInfo.proto\032\023EchoS" +
-      "hellInfo.proto\032\020ScreenInfo.proto\032\022FishPo" +
-      "olInfo.proto\032\032CustomGadgetTreeInfo.proto" +
-      "\032\031RoguelikeGadgetInfo.proto\032\031NightCrowGa" +
-      "dgetInfo.proto\032\036DeshretObeliskGadgetInfo" +
-      ".proto\032\035CoinCollectOperatorInfo.proto\032\022T" +
-      "rifleGadget.proto\032\022PlatformInfo.proto\032\021J" +
-      "MFPBNKNHED.proto\032\024GadgetPlayInfo.proto\032\021" +
-      "GDGKKLFMJKH.proto\032\021OMBIJJLAHFB.proto\032\021BD" +
-      "OCPDNCIEF.proto\"\315\014\n\017SceneGadgetInfo\022\021\n\tg" +
-      "adget_id\030\001 \001(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconf" +
-      "ig_id\030\003 \001(\r\022\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\t" +
-      "born_type\030\005 \001(\0162\017.GadgetBornType\022\024\n\014gadg" +
-      "et_state\030\006 \001(\r\022\023\n\013KPKNNJLPMFP\030\007 \001(\r\022\030\n\020i" +
-      "s_show_cutscene\030\010 \001(\010\022\031\n\021authority_peer_" +
-      "id\030\t \001(\r\022\032\n\022is_enable_interact\030\n \001(\010\022\023\n\013" +
-      "CLICILNBKDD\030\013 \001(\r\022*\n\rgather_gadget\030\r \001(\013" +
-      "2\021.GatherGadgetInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014" +
-      ".WorktopInfoH\000\022*\n\rclient_gadget\030\017 \001(\0132\021." +
-      "ClientGadgetInfoH\000\022\037\n\007weather\030\021 \001(\0132\014.We" +
-      "atherInfoH\000\022,\n\016ability_gadget\030\022 \001(\0132\022.Ab" +
-      "ilityGadgetInfoH\000\022*\n\rstatue_gadget\030\023 \001(\013" +
-      "2\021.StatueGadgetInfoH\000\022$\n\nboss_chest\030\024 \001(" +
-      "\0132\016.BossChestInfoH\000\022*\n\rblossom_chest\030) \001" +
-      "(\0132\021.BlossomChestInfoH\000\022+\n\016mp_play_rewar" +
-      "d\030* \001(\0132\021.MpPlayRewardInfoH\000\0222\n\016general_" +
-      "reward\030+ \001(\0132\030.GadgetGeneralRewardInfoH\000" +
-      "\022&\n\roffering_info\030, \001(\0132\r.OfferingInfoH\000" +
-      "\022*\n\017foundation_info\030- \001(\0132\017.FoundationIn" +
-      "foH\000\022$\n\014vehicle_info\030. \001(\0132\014.VehicleInfo" +
-      "H\000\022$\n\nshell_info\030/ \001(\0132\016.EchoShellInfoH\000" +
-      "\022\"\n\013screen_info\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016" +
-      "fish_pool_info\030; \001(\0132\r.FishPoolInfoH\000\0228\n" +
-      "\027custom_gadget_tree_info\030< \001(\0132\025.CustomG" +
-      "adgetTreeInfoH\000\0225\n\025roguelike_gadget_info" +
-      "\030= \001(\0132\024.RoguelikeGadgetInfoH\000\0226\n\026night_" +
-      "crow_gadget_info\030> \001(\0132\024.NightCrowGadget" +
-      "InfoH\000\022@\n\033deshret_obelisk_gadget_info\030? " +
-      "\001(\0132\031.DeshretObeliskGadgetInfoH\000\022>\n\032coin" +
-      "_collect_operator_info\030@ \001(\0132\030.CoinColle" +
-      "ctOperatorInfoH\000\022&\n\rtrifle_gadget\030C \001(\0132" +
-      "\r.TrifleGadgetH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024p" +
-      "rop_owner_entity_id\030\026 \001(\r\022\037\n\010platform\030\027 " +
-      "\001(\0132\r.PlatformInfo\022\031\n\021interact_uid_list\030" +
-      "\030 \003(\r\022\020\n\010draft_id\030\031 \001(\r\022\023\n\013KHICBPFFAII\030\032" +
-      " \001(\r\022!\n\013GPOHBBPBBEC\030\033 \001(\0132\014.JMFPBNKNHED\022" +
-      "\"\n\tplay_info\030d \001(\0132\017.GadgetPlayInfo\022!\n\013D" +
-      "PJFGJDHGGJ\030e \001(\0132\014.GDGKKLFMJKH\022!\n\013PBBAFK" +
-      "FGHIB\030f \001(\0132\014.OMBIJJLAHFB\022!\n\013FDKBHOCNBPH" +
-      "\030g \001(\0132\014.BDOCPDNCIEFB\t\n\007contentB\033\n\031emu.g" +
+      "proto\032\022PlatformInfo.proto\032\026GatherGadgetI" +
+      "nfo.proto\032\021WorktopInfo.proto\032\026ClientGadg" +
+      "etInfo.proto\032\021WeatherInfo.proto\032\027Ability" +
+      "GadgetInfo.proto\032\026StatueGadgetInfo.proto" +
+      "\032\023BossChestInfo.proto\032\026BlossomChestInfo." +
+      "proto\032\026MpPlayRewardInfo.proto\032\035GadgetGen" +
+      "eralRewardInfo.proto\032\022OfferingInfo.proto" +
+      "\032\024FoundationInfo.proto\032\021VehicleInfo.prot" +
+      "o\032\023EchoShellInfo.proto\032\020ScreenInfo.proto" +
+      "\032\022FishPoolInfo.proto\032\032CustomGadgetTreeIn" +
+      "fo.proto\032\031RoguelikeGadgetInfo.proto\032\031Nig" +
+      "htCrowGadgetInfo.proto\032\036DeshretObeliskGa" +
+      "dgetInfo.proto\032\035CoinCollectOperatorInfo." +
+      "proto\032\022TrifleGadget.proto\032\024GadgetPlayInf" +
+      "o.proto\"\335\013\n\017SceneGadgetInfo\022\021\n\tgadget_id" +
+      "\030\001 \001(\r\022\020\n\010group_id\030\002 \001(\r\022\021\n\tconfig_id\030\003 " +
+      "\001(\r\022\027\n\017owner_entity_id\030\004 \001(\r\022\"\n\tborn_typ" +
+      "e\030\005 \001(\0162\017.GadgetBornType\022\024\n\014gadget_state" +
+      "\030\006 \001(\r\022\023\n\013gadget_type\030\007 \001(\r\022\030\n\020is_show_c" +
+      "utscene\030\010 \001(\010\022\031\n\021authority_peer_id\030\t \001(\r" +
+      "\022\032\n\022is_enable_interact\030\n \001(\010\022\023\n\013interact" +
+      "_id\030\013 \001(\r\022*\n\rgather_gadget\030\r \001(\0132\021.Gathe" +
+      "rGadgetInfoH\000\022\037\n\007worktop\030\016 \001(\0132\014.Worktop" +
+      "InfoH\000\022*\n\rclient_gadget\030\017 \001(\0132\021.ClientGa" +
+      "dgetInfoH\000\022\037\n\007weather\030\021 \001(\0132\014.WeatherInf" +
+      "oH\000\022,\n\016ability_gadget\030\022 \001(\0132\022.AbilityGad" +
+      "getInfoH\000\022*\n\rstatue_gadget\030\023 \001(\0132\021.Statu" +
+      "eGadgetInfoH\000\022$\n\nboss_chest\030\024 \001(\0132\016.Boss" +
+      "ChestInfoH\000\022*\n\rblossom_chest\030) \001(\0132\021.Blo" +
+      "ssomChestInfoH\000\022+\n\016mp_play_reward\030* \001(\0132" +
+      "\021.MpPlayRewardInfoH\000\0222\n\016general_reward\030+" +
+      " \001(\0132\030.GadgetGeneralRewardInfoH\000\022&\n\roffe" +
+      "ring_info\030, \001(\0132\r.OfferingInfoH\000\022*\n\017foun" +
+      "dation_info\030- \001(\0132\017.FoundationInfoH\000\022$\n\014" +
+      "vehicle_info\030. \001(\0132\014.VehicleInfoH\000\022$\n\nsh" +
+      "ell_info\030/ \001(\0132\016.EchoShellInfoH\000\022\"\n\013scre" +
+      "en_info\0300 \001(\0132\013.ScreenInfoH\000\022\'\n\016fish_poo" +
+      "l_info\030; \001(\0132\r.FishPoolInfoH\000\0228\n\027custom_" +
+      "gadget_tree_info\030< \001(\0132\025.CustomGadgetTre" +
+      "eInfoH\000\0225\n\025roguelike_gadget_info\030= \001(\0132\024" +
+      ".RoguelikeGadgetInfoH\000\0226\n\026night_crow_gad" +
+      "get_info\030> \001(\0132\024.NightCrowGadgetInfoH\000\022@" +
+      "\n\033deshret_obelisk_gadget_info\030? \001(\0132\031.De" +
+      "shretObeliskGadgetInfoH\000\022>\n\032coin_collect" +
+      "_operator_info\030@ \001(\0132\030.CoinCollectOperat" +
+      "orInfoH\000\022&\n\rtrifle_gadget\030C \001(\0132\r.Trifle" +
+      "GadgetH\000\022\021\n\tmark_flag\030\025 \001(\r\022\034\n\024prop_owne" +
+      "r_entity_id\030\026 \001(\r\022\037\n\010platform\030\027 \001(\0132\r.Pl" +
+      "atformInfo\022\031\n\021interact_uid_list\030\030 \003(\r\022\020\n" +
+      "\010draft_id\030\031 \001(\r\022\031\n\021gadget_talk_state\030\032 \001" +
+      "(\r\022\024\n\014init_pose_id\030\034 \001(\r\022\"\n\tplay_info\030d " +
+      "\001(\0132\017.GadgetPlayInfoB\t\n\007ContentB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ItemOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PlatformInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor(),
@@ -8214,21 +7509,16 @@ public final class SceneGadgetInfoOuterClass {
           emu.grasscutter.net.proto.DeshretObeliskGadgetInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.CoinCollectOperatorInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.TrifleGadgetOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.PlatformInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.getDescriptor(),
         });
     internal_static_SceneGadgetInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SceneGadgetInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneGadgetInfo_descriptor,
-        new java.lang.String[] { "GadgetId", "GroupId", "ConfigId", "OwnerEntityId", "BornType", "GadgetState", "KPKNNJLPMFP", "IsShowCutscene", "AuthorityPeerId", "IsEnableInteract", "CLICILNBKDD", "GatherGadget", "Worktop", "ClientGadget", "Weather", "AbilityGadget", "StatueGadget", "BossChest", "BlossomChest", "MpPlayReward", "GeneralReward", "OfferingInfo", "FoundationInfo", "VehicleInfo", "ShellInfo", "ScreenInfo", "FishPoolInfo", "CustomGadgetTreeInfo", "RoguelikeGadgetInfo", "NightCrowGadgetInfo", "DeshretObeliskGadgetInfo", "CoinCollectOperatorInfo", "TrifleGadget", "MarkFlag", "PropOwnerEntityId", "Platform", "InteractUidList", "DraftId", "KHICBPFFAII", "GPOHBBPBBEC", "PlayInfo", "DPJFGJDHGGJ", "PBBAFKFGHIB", "FDKBHOCNBPH", "Content", });
+        new java.lang.String[] { "GadgetId", "GroupId", "ConfigId", "OwnerEntityId", "BornType", "GadgetState", "GadgetType", "IsShowCutscene", "AuthorityPeerId", "IsEnableInteract", "InteractId", "GatherGadget", "Worktop", "ClientGadget", "Weather", "AbilityGadget", "StatueGadget", "BossChest", "BlossomChest", "MpPlayReward", "GeneralReward", "OfferingInfo", "FoundationInfo", "VehicleInfo", "ShellInfo", "ScreenInfo", "FishPoolInfo", "CustomGadgetTreeInfo", "RoguelikeGadgetInfo", "NightCrowGadgetInfo", "DeshretObeliskGadgetInfo", "CoinCollectOperatorInfo", "TrifleGadget", "MarkFlag", "PropOwnerEntityId", "Platform", "InteractUidList", "DraftId", "GadgetTalkState", "InitPoseId", "PlayInfo", "Content", });
     emu.grasscutter.net.proto.GadgetBornTypeOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ItemOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PlatformInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.GatherGadgetInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.WorktopInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ClientGadgetInfoOuterClass.getDescriptor();
@@ -8251,12 +7541,7 @@ public final class SceneGadgetInfoOuterClass {
     emu.grasscutter.net.proto.DeshretObeliskGadgetInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.CoinCollectOperatorInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.TrifleGadgetOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.PlatformInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.JMFPBNKNHEDOuterClass.getDescriptor();
     emu.grasscutter.net.proto.GadgetPlayInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.GDGKKLFMJKHOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.OMBIJJLAHFBOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.BDOCPDNCIEFOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 b8cc679dd..073c8e3e5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishReqOuterClass.java
@@ -19,17 +19,12 @@ public final class SceneInitFinishReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 enter_scene_token = 5;</code>
+     * <code>uint32 enter_scene_token = 10;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
   }
   /**
-   * <pre>
-   * CmdId: 6923
-   * Obf: HCCCOGKOBNN
-   * </pre>
-   *
    * Protobuf type {@code SceneInitFinishReq}
    */
   public static final class SceneInitFinishReq extends
@@ -74,7 +69,7 @@ public final class SceneInitFinishReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 80: {
 
               enterSceneToken_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class SceneInitFinishReqOuterClass {
               emu.grasscutter.net.proto.SceneInitFinishReqOuterClass.SceneInitFinishReq.class, emu.grasscutter.net.proto.SceneInitFinishReqOuterClass.SceneInitFinishReq.Builder.class);
     }
 
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 5;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 10;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 5;</code>
+     * <code>uint32 enter_scene_token = 10;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class SceneInitFinishReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(5, enterSceneToken_);
+        output.writeUInt32(10, enterSceneToken_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class SceneInitFinishReqOuterClass {
       size = 0;
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, enterSceneToken_);
+          .computeUInt32Size(10, enterSceneToken_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class SceneInitFinishReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6923
-     * Obf: HCCCOGKOBNN
-     * </pre>
-     *
      * Protobuf type {@code SceneInitFinishReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class SceneInitFinishReqOuterClass {
 
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <code>uint32 enter_scene_token = 10;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class SceneInitFinishReqOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <code>uint32 enter_scene_token = 10;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class SceneInitFinishReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 5;</code>
+       * <code>uint32 enter_scene_token = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -527,7 +517,7 @@ public final class SceneInitFinishReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030SceneInitFinishReq.proto\"/\n\022SceneInitF" +
-      "inishReq\022\031\n\021enter_scene_token\030\005 \001(\rB\033\n\031e" +
+      "inishReq\022\031\n\021enter_scene_token\030\n \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 9d330a838..ad2fa39b2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneInitFinishRspOuterClass.java
@@ -19,23 +19,18 @@ public final class SceneInitFinishRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 enter_scene_token = 13;</code>
+     * <code>uint32 enter_scene_token = 9;</code>
      * @return The enterSceneToken.
      */
     int getEnterSceneToken();
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 3805
-   * Obf: IEBDLOBLJDP
-   * </pre>
-   *
    * Protobuf type {@code SceneInitFinishRsp}
    */
   public static final class SceneInitFinishRsp extends
@@ -80,16 +75,16 @@ public final class SceneInitFinishRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 104: {
+            case 72: {
 
               enterSceneToken_ = input.readUInt32();
               break;
             }
+            case 120: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class SceneInitFinishRspOuterClass {
               emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp.class, emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 13;
+    public static final int ENTER_SCENE_TOKEN_FIELD_NUMBER = 9;
     private int enterSceneToken_;
     /**
-     * <code>uint32 enter_scene_token = 13;</code>
+     * <code>uint32 enter_scene_token = 9;</code>
      * @return The enterSceneToken.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SceneInitFinishRspOuterClass {
       return enterSceneToken_;
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class SceneInitFinishRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
-      }
       if (enterSceneToken_ != 0) {
-        output.writeUInt32(13, enterSceneToken_);
+        output.writeUInt32(9, enterSceneToken_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class SceneInitFinishRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
-      }
       if (enterSceneToken_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, enterSceneToken_);
+          .computeUInt32Size(9, enterSceneToken_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SceneInitFinishRspOuterClass {
       }
       emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp other = (emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp) 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;
     }
@@ -211,10 +206,10 @@ public final class SceneInitFinishRspOuterClass {
       }
       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;
@@ -311,11 +306,6 @@ public final class SceneInitFinishRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3805
-     * Obf: IEBDLOBLJDP
-     * </pre>
-     *
      * Protobuf type {@code SceneInitFinishRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class SceneInitFinishRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         enterSceneToken_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class SceneInitFinishRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp buildPartial() {
         emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp result = new emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp(this);
-        result.retcode_ = retcode_;
         result.enterSceneToken_ = enterSceneToken_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class SceneInitFinishRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp other) {
         if (other == emu.grasscutter.net.proto.SceneInitFinishRspOuterClass.SceneInitFinishRsp.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;
@@ -468,40 +458,9 @@ public final class SceneInitFinishRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int enterSceneToken_ ;
       /**
-       * <code>uint32 enter_scene_token = 13;</code>
+       * <code>uint32 enter_scene_token = 9;</code>
        * @return The enterSceneToken.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class SceneInitFinishRspOuterClass {
         return enterSceneToken_;
       }
       /**
-       * <code>uint32 enter_scene_token = 13;</code>
+       * <code>uint32 enter_scene_token = 9;</code>
        * @param value The enterSceneToken to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class SceneInitFinishRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 enter_scene_token = 13;</code>
+       * <code>uint32 enter_scene_token = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearEnterSceneToken() {
@@ -529,6 +488,37 @@ public final class SceneInitFinishRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
@@ -597,8 +587,8 @@ public final class SceneInitFinishRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030SceneInitFinishRsp.proto\"@\n\022SceneInitF" +
-      "inishRsp\022\017\n\007retcode\030\004 \001(\005\022\031\n\021enter_scene" +
-      "_token\030\r \001(\rB\033\n\031emu.grasscutter.net.prot" +
+      "inishRsp\022\031\n\021enter_scene_token\030\t \001(\r\022\017\n\007r" +
+      "etcode\030\017 \001(\005B\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class SceneInitFinishRspOuterClass {
     internal_static_SceneInitFinishRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneInitFinishRsp_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/SceneMonsterInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneMonsterInfoOuterClass.java
index da5d3b568..fc06e9216 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneMonsterInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneMonsterInfoOuterClass.java
@@ -260,10 +260,6 @@ public final class SceneMonsterInfoOuterClass {
     public emu.grasscutter.net.proto.SceneMonsterInfoOuterClass.SceneMonsterInfo.ContentCase getContentCase();
   }
   /**
-   * <pre>
-   * Obf: JIEPEMAABDK
-   * </pre>
-   *
    * Protobuf type {@code SceneMonsterInfo}
    */
   public static final class SceneMonsterInfo extends
@@ -1510,10 +1506,6 @@ public final class SceneMonsterInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JIEPEMAABDK
-     * </pre>
-     *
      * Protobuf type {@code SceneMonsterInfo}
      */
     public static final class Builder extends
@@ -3467,7 +3459,7 @@ public final class SceneMonsterInfoOuterClass {
       "m\030\027 \001(\r\022#\n\tfish_info\0302 \001(\0132\016.SceneFishIn" +
       "foH\000\022/\n\022fishtank_fish_info\0303 \001(\0132\021.Fisht" +
       "ankFishInfoH\000\0323\n\021SummonTagMapEntry\022\013\n\003ke" +
-      "y\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\t\n\007contentB\033\n" +
+      "y\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\t\n\007ContentB\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneNpcInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneNpcInfoOuterClass.java
index b651d2832..50c094e78 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneNpcInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneNpcInfoOuterClass.java
@@ -43,10 +43,6 @@ public final class SceneNpcInfoOuterClass {
     int getBlockId();
   }
   /**
-   * <pre>
-   * Obf: HHIHPEEHHNI
-   * </pre>
-   *
    * Protobuf type {@code SceneNpcInfo}
    */
   public static final class SceneNpcInfo extends
@@ -376,10 +372,6 @@ public final class SceneNpcInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HHIHPEEHHNI
-     * </pre>
-     *
      * Protobuf type {@code SceneNpcInfo}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java
index c52679682..b9834f7a4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class ScenePlayerInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo> 
         getPlayerInfoListList();
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index);
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     int getPlayerInfoListCount();
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder> 
         getPlayerInfoListOrBuilderList();
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 23510
-   * Obf: AKPNDPFIBFH
-   * </pre>
-   *
    * Protobuf type {@code ScenePlayerInfoNotify}
    */
   public static final class ScenePlayerInfoNotify extends
@@ -94,7 +89,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 74: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class ScenePlayerInfoNotifyOuterClass {
               emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfoNotify.class, emu.grasscutter.net.proto.ScenePlayerInfoNotifyOuterClass.ScenePlayerInfoNotify.Builder.class);
     }
 
-    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 9;
+    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 3;
     private java.util.List<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo> playerInfoList_;
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo> getPlayerInfoListList() {
       return playerInfoList_;
     }
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class ScenePlayerInfoNotifyOuterClass {
       return playerInfoList_;
     }
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     @java.lang.Override
     public int getPlayerInfoListCount() {
       return playerInfoList_.size();
     }
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index) {
       return playerInfoList_.get(index);
     }
     /**
-     * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+     * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < playerInfoList_.size(); i++) {
-        output.writeMessage(9, playerInfoList_.get(i));
+        output.writeMessage(3, playerInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < playerInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, playerInfoList_.get(i));
+          .computeMessageSize(3, playerInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class ScenePlayerInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23510
-     * Obf: AKPNDPFIBFH
-     * </pre>
-     *
      * Protobuf type {@code ScenePlayerInfoNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
           emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder> playerInfoListBuilder_;
 
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo> getPlayerInfoListList() {
         if (playerInfoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public int getPlayerInfoListCount() {
         if (playerInfoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo getPlayerInfoList(int index) {
         if (playerInfoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder setPlayerInfoList(
           int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) {
@@ -585,7 +575,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder setPlayerInfoList(
           int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder addPlayerInfoList(emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) {
         if (playerInfoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder addPlayerInfoList(
           int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo value) {
@@ -632,7 +622,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder addPlayerInfoList(
           emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder addPlayerInfoList(
           int index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder addAllPlayerInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo> values) {
@@ -675,7 +665,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder clearPlayerInfoList() {
         if (playerInfoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public Builder removePlayerInfoList(int index) {
         if (playerInfoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class ScenePlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder getPlayerInfoListBuilder(
           int index) {
         return getPlayerInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfoOrBuilder> 
            getPlayerInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class ScenePlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder addPlayerInfoListBuilder() {
         return getPlayerInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder addPlayerInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .ScenePlayerInfo player_info_list = 9;</code>
+       * <code>repeated .ScenePlayerInfo player_info_list = 3;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder> 
            getPlayerInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class ScenePlayerInfoNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033ScenePlayerInfoNotify.proto\032\025ScenePlay" +
       "erInfo.proto\"C\n\025ScenePlayerInfoNotify\022*\n" +
-      "\020player_info_list\030\t \003(\0132\020.ScenePlayerInf" +
+      "\020player_info_list\030\003 \003(\0132\020.ScenePlayerInf" +
       "oB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java
index b3d065822..447c323d0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerInfoOuterClass.java
@@ -19,61 +19,57 @@ public final class ScenePlayerInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 peer_id = 15;</code>
-     * @return The peerId.
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     * @return Whether the onlinePlayerInfo field is set.
      */
-    int getPeerId();
+    boolean hasOnlinePlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     * @return The onlinePlayerInfo.
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo();
+    /**
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder();
 
     /**
-     * <code>bool is_connected = 14;</code>
+     * <code>bool is_connected = 2;</code>
      * @return The isConnected.
      */
     boolean getIsConnected();
 
     /**
-     * <code>uint32 uid = 4;</code>
-     * @return The uid.
+     * <code>uint32 scene_id = 5;</code>
+     * @return The sceneId.
      */
-    int getUid();
+    int getSceneId();
 
     /**
-     * <code>string name = 13;</code>
+     * <code>string name = 8;</code>
      * @return The name.
      */
     java.lang.String getName();
     /**
-     * <code>string name = 13;</code>
+     * <code>string name = 8;</code>
      * @return The bytes for name.
      */
     com.google.protobuf.ByteString
         getNameBytes();
 
     /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     * @return Whether the onlinePlayerInfo field is set.
+     * <code>uint32 peer_id = 11;</code>
+     * @return The peerId.
      */
-    boolean hasOnlinePlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     * @return The onlinePlayerInfo.
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo();
-    /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder();
+    int getPeerId();
 
     /**
-     * <code>uint32 scene_id = 1;</code>
-     * @return The sceneId.
+     * <code>uint32 uid = 13;</code>
+     * @return The uid.
      */
-    int getSceneId();
+    int getUid();
   }
   /**
-   * <pre>
-   * Obf: AADLFNACADO
-   * </pre>
-   *
    * Protobuf type {@code ScenePlayerInfo}
    */
   public static final class ScenePlayerInfo extends
@@ -119,17 +115,7 @@ public final class ScenePlayerInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
-            case 98: {
+            case 10: {
               emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder subBuilder = null;
               if (onlinePlayerInfo_ != null) {
                 subBuilder = onlinePlayerInfo_.toBuilder();
@@ -142,22 +128,32 @@ public final class ScenePlayerInfoOuterClass {
 
               break;
             }
-            case 106: {
+            case 16: {
+
+              isConnected_ = input.readBool();
+              break;
+            }
+            case 40: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 66: {
               java.lang.String s = input.readStringRequireUtf8();
 
               name_ = s;
               break;
             }
-            case 112: {
-
-              isConnected_ = input.readBool();
-              break;
-            }
-            case 120: {
+            case 88: {
 
               peerId_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -190,21 +186,36 @@ public final class ScenePlayerInfoOuterClass {
               emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.class, emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.Builder.class);
     }
 
-    public static final int PEER_ID_FIELD_NUMBER = 15;
-    private int peerId_;
+    public static final int ONLINE_PLAYER_INFO_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo onlinePlayerInfo_;
     /**
-     * <code>uint32 peer_id = 15;</code>
-     * @return The peerId.
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     * @return Whether the onlinePlayerInfo field is set.
      */
     @java.lang.Override
-    public int getPeerId() {
-      return peerId_;
+    public boolean hasOnlinePlayerInfo() {
+      return onlinePlayerInfo_ != null;
+    }
+    /**
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     * @return The onlinePlayerInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo() {
+      return onlinePlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : onlinePlayerInfo_;
+    }
+    /**
+     * <code>.OnlinePlayerInfo online_player_info = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder() {
+      return getOnlinePlayerInfo();
     }
 
-    public static final int IS_CONNECTED_FIELD_NUMBER = 14;
+    public static final int IS_CONNECTED_FIELD_NUMBER = 2;
     private boolean isConnected_;
     /**
-     * <code>bool is_connected = 14;</code>
+     * <code>bool is_connected = 2;</code>
      * @return The isConnected.
      */
     @java.lang.Override
@@ -212,21 +223,21 @@ public final class ScenePlayerInfoOuterClass {
       return isConnected_;
     }
 
-    public static final int UID_FIELD_NUMBER = 4;
-    private int uid_;
+    public static final int SCENE_ID_FIELD_NUMBER = 5;
+    private int sceneId_;
     /**
-     * <code>uint32 uid = 4;</code>
-     * @return The uid.
+     * <code>uint32 scene_id = 5;</code>
+     * @return The sceneId.
      */
     @java.lang.Override
-    public int getUid() {
-      return uid_;
+    public int getSceneId() {
+      return sceneId_;
     }
 
-    public static final int NAME_FIELD_NUMBER = 13;
+    public static final int NAME_FIELD_NUMBER = 8;
     private volatile java.lang.Object name_;
     /**
-     * <code>string name = 13;</code>
+     * <code>string name = 8;</code>
      * @return The name.
      */
     @java.lang.Override
@@ -243,7 +254,7 @@ public final class ScenePlayerInfoOuterClass {
       }
     }
     /**
-     * <code>string name = 13;</code>
+     * <code>string name = 8;</code>
      * @return The bytes for name.
      */
     @java.lang.Override
@@ -261,41 +272,26 @@ public final class ScenePlayerInfoOuterClass {
       }
     }
 
-    public static final int ONLINE_PLAYER_INFO_FIELD_NUMBER = 12;
-    private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo onlinePlayerInfo_;
+    public static final int PEER_ID_FIELD_NUMBER = 11;
+    private int peerId_;
     /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     * @return Whether the onlinePlayerInfo field is set.
+     * <code>uint32 peer_id = 11;</code>
+     * @return The peerId.
      */
     @java.lang.Override
-    public boolean hasOnlinePlayerInfo() {
-      return onlinePlayerInfo_ != null;
-    }
-    /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     * @return The onlinePlayerInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo() {
-      return onlinePlayerInfo_ == null ? emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance() : onlinePlayerInfo_;
-    }
-    /**
-     * <code>.OnlinePlayerInfo online_player_info = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder() {
-      return getOnlinePlayerInfo();
+    public int getPeerId() {
+      return peerId_;
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 1;
-    private int sceneId_;
+    public static final int UID_FIELD_NUMBER = 13;
+    private int uid_;
     /**
-     * <code>uint32 scene_id = 1;</code>
-     * @return The sceneId.
+     * <code>uint32 uid = 13;</code>
+     * @return The uid.
      */
     @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
+    public int getUid() {
+      return uid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -312,23 +308,23 @@ public final class ScenePlayerInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (sceneId_ != 0) {
-        output.writeUInt32(1, sceneId_);
-      }
-      if (uid_ != 0) {
-        output.writeUInt32(4, uid_);
-      }
       if (onlinePlayerInfo_ != null) {
-        output.writeMessage(12, getOnlinePlayerInfo());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, name_);
+        output.writeMessage(1, getOnlinePlayerInfo());
       }
       if (isConnected_ != false) {
-        output.writeBool(14, isConnected_);
+        output.writeBool(2, isConnected_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(5, sceneId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, name_);
       }
       if (peerId_ != 0) {
-        output.writeUInt32(15, peerId_);
+        output.writeUInt32(11, peerId_);
+      }
+      if (uid_ != 0) {
+        output.writeUInt32(13, uid_);
       }
       unknownFields.writeTo(output);
     }
@@ -339,28 +335,28 @@ public final class ScenePlayerInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, sceneId_);
-      }
-      if (uid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, uid_);
-      }
       if (onlinePlayerInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getOnlinePlayerInfo());
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, name_);
+          .computeMessageSize(1, getOnlinePlayerInfo());
       }
       if (isConnected_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(14, isConnected_);
+          .computeBoolSize(2, isConnected_);
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, sceneId_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, name_);
       }
       if (peerId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, peerId_);
+          .computeUInt32Size(11, peerId_);
+      }
+      if (uid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, uid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -377,21 +373,21 @@ public final class ScenePlayerInfoOuterClass {
       }
       emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo other = (emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo) obj;
 
-      if (getPeerId()
-          != other.getPeerId()) return false;
-      if (getIsConnected()
-          != other.getIsConnected()) return false;
-      if (getUid()
-          != other.getUid()) return false;
-      if (!getName()
-          .equals(other.getName())) return false;
       if (hasOnlinePlayerInfo() != other.hasOnlinePlayerInfo()) return false;
       if (hasOnlinePlayerInfo()) {
         if (!getOnlinePlayerInfo()
             .equals(other.getOnlinePlayerInfo())) return false;
       }
+      if (getIsConnected()
+          != other.getIsConnected()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (!getName()
+          .equals(other.getName())) return false;
+      if (getPeerId()
+          != other.getPeerId()) return false;
+      if (getUid()
+          != other.getUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -403,21 +399,21 @@ public final class ScenePlayerInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getPeerId();
-      hash = (37 * hash) + IS_CONNECTED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsConnected());
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
-      hash = (37 * hash) + NAME_FIELD_NUMBER;
-      hash = (53 * hash) + getName().hashCode();
       if (hasOnlinePlayerInfo()) {
         hash = (37 * hash) + ONLINE_PLAYER_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getOnlinePlayerInfo().hashCode();
       }
+      hash = (37 * hash) + IS_CONNECTED_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsConnected());
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + NAME_FIELD_NUMBER;
+      hash = (53 * hash) + getName().hashCode();
+      hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPeerId();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -514,10 +510,6 @@ public final class ScenePlayerInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: AADLFNACADO
-     * </pre>
-     *
      * Protobuf type {@code ScenePlayerInfo}
      */
     public static final class Builder extends
@@ -555,22 +547,22 @@ public final class ScenePlayerInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        peerId_ = 0;
-
-        isConnected_ = false;
-
-        uid_ = 0;
-
-        name_ = "";
-
         if (onlinePlayerInfoBuilder_ == null) {
           onlinePlayerInfo_ = null;
         } else {
           onlinePlayerInfo_ = null;
           onlinePlayerInfoBuilder_ = null;
         }
+        isConnected_ = false;
+
         sceneId_ = 0;
 
+        name_ = "";
+
+        peerId_ = 0;
+
+        uid_ = 0;
+
         return this;
       }
 
@@ -597,16 +589,16 @@ public final class ScenePlayerInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo buildPartial() {
         emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo result = new emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo(this);
-        result.peerId_ = peerId_;
-        result.isConnected_ = isConnected_;
-        result.uid_ = uid_;
-        result.name_ = name_;
         if (onlinePlayerInfoBuilder_ == null) {
           result.onlinePlayerInfo_ = onlinePlayerInfo_;
         } else {
           result.onlinePlayerInfo_ = onlinePlayerInfoBuilder_.build();
         }
+        result.isConnected_ = isConnected_;
         result.sceneId_ = sceneId_;
+        result.name_ = name_;
+        result.peerId_ = peerId_;
+        result.uid_ = uid_;
         onBuilt();
         return result;
       }
@@ -655,24 +647,24 @@ public final class ScenePlayerInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo other) {
         if (other == emu.grasscutter.net.proto.ScenePlayerInfoOuterClass.ScenePlayerInfo.getDefaultInstance()) return this;
-        if (other.getPeerId() != 0) {
-          setPeerId(other.getPeerId());
+        if (other.hasOnlinePlayerInfo()) {
+          mergeOnlinePlayerInfo(other.getOnlinePlayerInfo());
         }
         if (other.getIsConnected() != false) {
           setIsConnected(other.getIsConnected());
         }
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
         }
         if (!other.getName().isEmpty()) {
           name_ = other.name_;
           onChanged();
         }
-        if (other.hasOnlinePlayerInfo()) {
-          mergeOnlinePlayerInfo(other.getOnlinePlayerInfo());
+        if (other.getPeerId() != 0) {
+          setPeerId(other.getPeerId());
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -703,187 +695,18 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
 
-      private int peerId_ ;
-      /**
-       * <code>uint32 peer_id = 15;</code>
-       * @return The peerId.
-       */
-      @java.lang.Override
-      public int getPeerId() {
-        return peerId_;
-      }
-      /**
-       * <code>uint32 peer_id = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPeerId() {
-        
-        peerId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean isConnected_ ;
-      /**
-       * <code>bool is_connected = 14;</code>
-       * @return The isConnected.
-       */
-      @java.lang.Override
-      public boolean getIsConnected() {
-        return isConnected_;
-      }
-      /**
-       * <code>bool is_connected = 14;</code>
-       * @param value The isConnected to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsConnected(boolean value) {
-        
-        isConnected_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_connected = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsConnected() {
-        
-        isConnected_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 4;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 4;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.lang.Object name_ = "";
-      /**
-       * <code>string name = 13;</code>
-       * @return The name.
-       */
-      public java.lang.String getName() {
-        java.lang.Object ref = name_;
-        if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          name_ = s;
-          return s;
-        } else {
-          return (java.lang.String) ref;
-        }
-      }
-      /**
-       * <code>string name = 13;</code>
-       * @return The bytes for name.
-       */
-      public com.google.protobuf.ByteString
-          getNameBytes() {
-        java.lang.Object ref = name_;
-        if (ref instanceof String) {
-          com.google.protobuf.ByteString b = 
-              com.google.protobuf.ByteString.copyFromUtf8(
-                  (java.lang.String) ref);
-          name_ = b;
-          return b;
-        } else {
-          return (com.google.protobuf.ByteString) ref;
-        }
-      }
-      /**
-       * <code>string name = 13;</code>
-       * @param value The name to set.
-       * @return This builder for chaining.
-       */
-      public Builder setName(
-          java.lang.String value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  
-        name_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string name = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearName() {
-        
-        name_ = getDefaultInstance().getName();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>string name = 13;</code>
-       * @param value The bytes for name to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNameBytes(
-          com.google.protobuf.ByteString value) {
-        if (value == null) {
-    throw new NullPointerException();
-  }
-  checkByteStringIsUtf8(value);
-        
-        name_ = value;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo onlinePlayerInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> onlinePlayerInfoBuilder_;
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        * @return Whether the onlinePlayerInfo field is set.
        */
       public boolean hasOnlinePlayerInfo() {
         return onlinePlayerInfoBuilder_ != null || onlinePlayerInfo_ != null;
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        * @return The onlinePlayerInfo.
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getOnlinePlayerInfo() {
@@ -894,7 +717,7 @@ public final class ScenePlayerInfoOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public Builder setOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (onlinePlayerInfoBuilder_ == null) {
@@ -910,7 +733,7 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public Builder setOnlinePlayerInfo(
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
@@ -924,7 +747,7 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public Builder mergeOnlinePlayerInfo(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
         if (onlinePlayerInfoBuilder_ == null) {
@@ -942,7 +765,7 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public Builder clearOnlinePlayerInfo() {
         if (onlinePlayerInfoBuilder_ == null) {
@@ -956,7 +779,7 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getOnlinePlayerInfoBuilder() {
         
@@ -964,7 +787,7 @@ public final class ScenePlayerInfoOuterClass {
         return getOnlinePlayerInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getOnlinePlayerInfoOrBuilder() {
         if (onlinePlayerInfoBuilder_ != null) {
@@ -975,7 +798,7 @@ public final class ScenePlayerInfoOuterClass {
         }
       }
       /**
-       * <code>.OnlinePlayerInfo online_player_info = 12;</code>
+       * <code>.OnlinePlayerInfo online_player_info = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
@@ -991,9 +814,40 @@ public final class ScenePlayerInfoOuterClass {
         return onlinePlayerInfoBuilder_;
       }
 
+      private boolean isConnected_ ;
+      /**
+       * <code>bool is_connected = 2;</code>
+       * @return The isConnected.
+       */
+      @java.lang.Override
+      public boolean getIsConnected() {
+        return isConnected_;
+      }
+      /**
+       * <code>bool is_connected = 2;</code>
+       * @param value The isConnected to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsConnected(boolean value) {
+        
+        isConnected_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_connected = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsConnected() {
+        
+        isConnected_ = false;
+        onChanged();
+        return this;
+      }
+
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -1001,7 +855,7 @@ public final class ScenePlayerInfoOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -1012,7 +866,7 @@ public final class ScenePlayerInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -1021,6 +875,144 @@ public final class ScenePlayerInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private java.lang.Object name_ = "";
+      /**
+       * <code>string name = 8;</code>
+       * @return The name.
+       */
+      public java.lang.String getName() {
+        java.lang.Object ref = name_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          name_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string name = 8;</code>
+       * @return The bytes for name.
+       */
+      public com.google.protobuf.ByteString
+          getNameBytes() {
+        java.lang.Object ref = name_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          name_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string name = 8;</code>
+       * @param value The name to set.
+       * @return This builder for chaining.
+       */
+      public Builder setName(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        name_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string name = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearName() {
+        
+        name_ = getDefaultInstance().getName();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string name = 8;</code>
+       * @param value The bytes for name to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNameBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        name_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int peerId_ ;
+      /**
+       * <code>uint32 peer_id = 11;</code>
+       * @return The peerId.
+       */
+      @java.lang.Override
+      public int getPeerId() {
+        return peerId_;
+      }
+      /**
+       * <code>uint32 peer_id = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPeerId() {
+        
+        peerId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 13;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 13;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1089,10 +1081,10 @@ public final class ScenePlayerInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025ScenePlayerInfo.proto\032\026OnlinePlayerInf" +
-      "o.proto\"\224\001\n\017ScenePlayerInfo\022\017\n\007peer_id\030\017" +
-      " \001(\r\022\024\n\014is_connected\030\016 \001(\010\022\013\n\003uid\030\004 \001(\r\022" +
-      "\014\n\004name\030\r \001(\t\022-\n\022online_player_info\030\014 \001(" +
-      "\0132\021.OnlinePlayerInfo\022\020\n\010scene_id\030\001 \001(\rB\033" +
+      "o.proto\"\224\001\n\017ScenePlayerInfo\022-\n\022online_pl" +
+      "ayer_info\030\001 \001(\0132\021.OnlinePlayerInfo\022\024\n\014is" +
+      "_connected\030\002 \001(\010\022\020\n\010scene_id\030\005 \001(\r\022\014\n\004na" +
+      "me\030\010 \001(\t\022\017\n\007peer_id\030\013 \001(\r\022\013\n\003uid\030\r \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1105,7 +1097,7 @@ public final class ScenePlayerInfoOuterClass {
     internal_static_ScenePlayerInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ScenePlayerInfo_descriptor,
-        new java.lang.String[] { "PeerId", "IsConnected", "Uid", "Name", "OnlinePlayerInfo", "SceneId", });
+        new java.lang.String[] { "OnlinePlayerInfo", "IsConnected", "SceneId", "Name", "PeerId", "Uid", });
     emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerLocationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerLocationNotifyOuterClass.java
index 431acfbdc..c33e4a2ca 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerLocationNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePlayerLocationNotifyOuterClass.java
@@ -43,41 +43,36 @@ public final class ScenePlayerLocationNotifyOuterClass {
         int index);
 
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>uint32 scene_id = 10;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> 
         getVehicleLocListList();
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo getVehicleLocList(int index);
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     int getVehicleLocListCount();
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder> 
         getVehicleLocListOrBuilderList();
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder getVehicleLocListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 scene_id = 14;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 29652
-   * Obf: ADLIMHMEMDB
-   * </pre>
-   *
    * Protobuf type {@code ScenePlayerLocationNotify}
    */
   public static final class ScenePlayerLocationNotify extends
@@ -134,7 +129,12 @@ public final class ScenePlayerLocationNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.parser(), extensionRegistry));
               break;
             }
-            case 106: {
+            case 80: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 90: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 vehicleLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo>();
                 mutable_bitField0_ |= 0x00000002;
@@ -143,11 +143,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -226,17 +221,28 @@ public final class ScenePlayerLocationNotifyOuterClass {
       return playerLocList_.get(index);
     }
 
-    public static final int VEHICLE_LOC_LIST_FIELD_NUMBER = 13;
+    public static final int SCENE_ID_FIELD_NUMBER = 10;
+    private int sceneId_;
+    /**
+     * <code>uint32 scene_id = 10;</code>
+     * @return The sceneId.
+     */
+    @java.lang.Override
+    public int getSceneId() {
+      return sceneId_;
+    }
+
+    public static final int VEHICLE_LOC_LIST_FIELD_NUMBER = 11;
     private java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> vehicleLocList_;
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> getVehicleLocListList() {
       return vehicleLocList_;
     }
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder> 
@@ -244,21 +250,21 @@ public final class ScenePlayerLocationNotifyOuterClass {
       return vehicleLocList_;
     }
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     @java.lang.Override
     public int getVehicleLocListCount() {
       return vehicleLocList_.size();
     }
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo getVehicleLocList(int index) {
       return vehicleLocList_.get(index);
     }
     /**
-     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+     * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder getVehicleLocListOrBuilder(
@@ -266,17 +272,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
       return vehicleLocList_.get(index);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 14;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 14;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -294,11 +289,11 @@ public final class ScenePlayerLocationNotifyOuterClass {
       for (int i = 0; i < playerLocList_.size(); i++) {
         output.writeMessage(3, playerLocList_.get(i));
       }
-      for (int i = 0; i < vehicleLocList_.size(); i++) {
-        output.writeMessage(13, vehicleLocList_.get(i));
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(14, sceneId_);
+        output.writeUInt32(10, sceneId_);
+      }
+      for (int i = 0; i < vehicleLocList_.size(); i++) {
+        output.writeMessage(11, vehicleLocList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -313,13 +308,13 @@ public final class ScenePlayerLocationNotifyOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(3, playerLocList_.get(i));
       }
-      for (int i = 0; i < vehicleLocList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, vehicleLocList_.get(i));
-      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, sceneId_);
+          .computeUInt32Size(10, sceneId_);
+      }
+      for (int i = 0; i < vehicleLocList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, vehicleLocList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -338,10 +333,10 @@ public final class ScenePlayerLocationNotifyOuterClass {
 
       if (!getPlayerLocListList()
           .equals(other.getPlayerLocListList())) return false;
-      if (!getVehicleLocListList()
-          .equals(other.getVehicleLocListList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (!getVehicleLocListList()
+          .equals(other.getVehicleLocListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -357,12 +352,12 @@ public final class ScenePlayerLocationNotifyOuterClass {
         hash = (37 * hash) + PLAYER_LOC_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerLocListList().hashCode();
       }
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       if (getVehicleLocListCount() > 0) {
         hash = (37 * hash) + VEHICLE_LOC_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getVehicleLocListList().hashCode();
       }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -459,11 +454,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29652
-     * Obf: ADLIMHMEMDB
-     * </pre>
-     *
      * Protobuf type {@code ScenePlayerLocationNotify}
      */
     public static final class Builder extends
@@ -509,14 +499,14 @@ public final class ScenePlayerLocationNotifyOuterClass {
         } else {
           playerLocListBuilder_.clear();
         }
+        sceneId_ = 0;
+
         if (vehicleLocListBuilder_ == null) {
           vehicleLocList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           vehicleLocListBuilder_.clear();
         }
-        sceneId_ = 0;
-
         return this;
       }
 
@@ -553,6 +543,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         } else {
           result.playerLocList_ = playerLocListBuilder_.build();
         }
+        result.sceneId_ = sceneId_;
         if (vehicleLocListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
             vehicleLocList_ = java.util.Collections.unmodifiableList(vehicleLocList_);
@@ -562,7 +553,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
         } else {
           result.vehicleLocList_ = vehicleLocListBuilder_.build();
         }
-        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -637,6 +627,9 @@ public final class ScenePlayerLocationNotifyOuterClass {
             }
           }
         }
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         if (vehicleLocListBuilder_ == null) {
           if (!other.vehicleLocList_.isEmpty()) {
             if (vehicleLocList_.isEmpty()) {
@@ -663,9 +656,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
             }
           }
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -936,6 +926,37 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return playerLocListBuilder_;
       }
 
+      private int sceneId_ ;
+      /**
+       * <code>uint32 scene_id = 10;</code>
+       * @return The sceneId.
+       */
+      @java.lang.Override
+      public int getSceneId() {
+        return sceneId_;
+      }
+      /**
+       * <code>uint32 scene_id = 10;</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 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearSceneId() {
+        
+        sceneId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> vehicleLocList_ =
         java.util.Collections.emptyList();
       private void ensureVehicleLocListIsMutable() {
@@ -949,7 +970,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
           emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder> vehicleLocListBuilder_;
 
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> getVehicleLocListList() {
         if (vehicleLocListBuilder_ == null) {
@@ -959,7 +980,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public int getVehicleLocListCount() {
         if (vehicleLocListBuilder_ == null) {
@@ -969,7 +990,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo getVehicleLocList(int index) {
         if (vehicleLocListBuilder_ == null) {
@@ -979,7 +1000,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder setVehicleLocList(
           int index, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo value) {
@@ -996,7 +1017,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder setVehicleLocList(
           int index, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder builderForValue) {
@@ -1010,7 +1031,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder addVehicleLocList(emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo value) {
         if (vehicleLocListBuilder_ == null) {
@@ -1026,7 +1047,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder addVehicleLocList(
           int index, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo value) {
@@ -1043,7 +1064,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder addVehicleLocList(
           emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder builderForValue) {
@@ -1057,7 +1078,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder addVehicleLocList(
           int index, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder builderForValue) {
@@ -1071,7 +1092,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder addAllVehicleLocList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo> values) {
@@ -1086,7 +1107,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder clearVehicleLocList() {
         if (vehicleLocListBuilder_ == null) {
@@ -1099,7 +1120,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public Builder removeVehicleLocList(int index) {
         if (vehicleLocListBuilder_ == null) {
@@ -1112,14 +1133,14 @@ public final class ScenePlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder getVehicleLocListBuilder(
           int index) {
         return getVehicleLocListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder getVehicleLocListOrBuilder(
           int index) {
@@ -1129,7 +1150,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfoOrBuilder> 
            getVehicleLocListOrBuilderList() {
@@ -1140,14 +1161,14 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder addVehicleLocListBuilder() {
         return getVehicleLocListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder addVehicleLocListBuilder(
           int index) {
@@ -1155,7 +1176,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
             index, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 13;</code>
+       * <code>repeated .VehicleLocationInfo vehicle_loc_list = 11;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder> 
            getVehicleLocListBuilderList() {
@@ -1175,37 +1196,6 @@ public final class ScenePlayerLocationNotifyOuterClass {
         }
         return vehicleLocListBuilder_;
       }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 14;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 14;</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 = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1277,8 +1267,8 @@ public final class ScenePlayerLocationNotifyOuterClass {
       "rLocationInfo.proto\032\031VehicleLocationInfo" +
       ".proto\"\213\001\n\031ScenePlayerLocationNotify\022,\n\017" +
       "player_loc_list\030\003 \003(\0132\023.PlayerLocationIn" +
-      "fo\022.\n\020vehicle_loc_list\030\r \003(\0132\024.VehicleLo" +
-      "cationInfo\022\020\n\010scene_id\030\016 \001(\rB\033\n\031emu.gras" +
+      "fo\022\020\n\010scene_id\030\n \001(\r\022.\n\020vehicle_loc_list" +
+      "\030\013 \003(\0132\024.VehicleLocationInfoB\033\n\031emu.gras" +
       "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1292,7 +1282,7 @@ public final class ScenePlayerLocationNotifyOuterClass {
     internal_static_ScenePlayerLocationNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ScenePlayerLocationNotify_descriptor,
-        new java.lang.String[] { "PlayerLocList", "VehicleLocList", "SceneId", });
+        new java.lang.String[] { "PlayerLocList", "SceneId", "VehicleLocList", });
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.getDescriptor();
   }
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
index d03c79511..5cdbec974 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
@@ -19,85 +19,80 @@ public final class ScenePointUnlockNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @return A list containing the eLDLGKEKABI.
-     */
-    java.util.List<java.lang.Integer> getELDLGKEKABIList();
-    /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @return The count of eLDLGKEKABI.
-     */
-    int getELDLGKEKABICount();
-    /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @param index The index of the element to return.
-     * @return The eLDLGKEKABI at the given index.
-     */
-    int getELDLGKEKABI(int index);
-
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @return A list containing the kOPAHGHMECF.
-     */
-    java.util.List<java.lang.Integer> getKOPAHGHMECFList();
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @return The count of kOPAHGHMECF.
-     */
-    int getKOPAHGHMECFCount();
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @param index The index of the element to return.
-     * @return The kOPAHGHMECF at the given index.
-     */
-    int getKOPAHGHMECF(int index);
-
-    /**
-     * <code>uint32 scene_id = 12;</code>
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 unhide_point_list = 4;</code>
+     * @return A list containing the unhidePointList.
+     */
+    java.util.List<java.lang.Integer> getUnhidePointListList();
+    /**
+     * <code>repeated uint32 unhide_point_list = 4;</code>
+     * @return The count of unhidePointList.
+     */
+    int getUnhidePointListCount();
+    /**
+     * <code>repeated uint32 unhide_point_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The unhidePointList at the given index.
+     */
+    int getUnhidePointList(int index);
+
+    /**
+     * <code>repeated uint32 point_list = 11;</code>
      * @return A list containing the pointList.
      */
     java.util.List<java.lang.Integer> getPointListList();
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 point_list = 11;</code>
      * @return The count of pointList.
      */
     int getPointListCount();
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 point_list = 11;</code>
      * @param index The index of the element to return.
      * @return The pointList at the given index.
      */
     int getPointList(int index);
 
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-     * @return A list containing the jCLHNODLPOH.
+     * <code>repeated uint32 hide_point_list = 13;</code>
+     * @return A list containing the hidePointList.
      */
-    java.util.List<java.lang.Integer> getJCLHNODLPOHList();
+    java.util.List<java.lang.Integer> getHidePointListList();
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-     * @return The count of jCLHNODLPOH.
+     * <code>repeated uint32 hide_point_list = 13;</code>
+     * @return The count of hidePointList.
      */
-    int getJCLHNODLPOHCount();
+    int getHidePointListCount();
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
+     * <code>repeated uint32 hide_point_list = 13;</code>
      * @param index The index of the element to return.
-     * @return The jCLHNODLPOH at the given index.
+     * @return The hidePointList at the given index.
      */
-    int getJCLHNODLPOH(int index);
+    int getHidePointList(int index);
+
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</code>
+     * @return A list containing the lockedPointList.
+     */
+    java.util.List<java.lang.Integer> getLockedPointListList();
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</code>
+     * @return The count of lockedPointList.
+     */
+    int getLockedPointListCount();
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The lockedPointList at the given index.
+     */
+    int getLockedPointList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 5431
-   * Obf: CBIBGAOCEHP
-   * </pre>
-   *
    * Protobuf type {@code ScenePointUnlockNotify}
    */
   public static final class ScenePointUnlockNotify extends
@@ -110,10 +105,10 @@ public final class ScenePointUnlockNotifyOuterClass {
       super(builder);
     }
     private ScenePointUnlockNotify() {
-      eLDLGKEKABI_ = emptyIntList();
-      kOPAHGHMECF_ = emptyIntList();
+      unhidePointList_ = emptyIntList();
       pointList_ = emptyIntList();
-      jCLHNODLPOH_ = emptyIntList();
+      hidePointList_ = emptyIntList();
+      lockedPointList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -147,20 +142,46 @@ public final class ScenePointUnlockNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 24: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                unhidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              unhidePointList_.addInt(input.readUInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                unhidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                unhidePointList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 pointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               pointList_.addInt(input.readUInt32());
               break;
             }
-            case 18: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 pointList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 pointList_.addInt(input.readUInt32());
@@ -168,74 +189,48 @@ public final class ScenePointUnlockNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 32: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                kOPAHGHMECF_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+            case 104: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                hidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
-              kOPAHGHMECF_.addInt(input.readUInt32());
+              hidePointList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                hidePointList_ = newIntList();
+                mutable_bitField0_ |= 0x00000004;
               }
               while (input.getBytesUntilLimit() > 0) {
-                kOPAHGHMECF_.addInt(input.readUInt32());
+                hidePointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 48: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                eLDLGKEKABI_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              eLDLGKEKABI_.addInt(input.readUInt32());
-              break;
-            }
-            case 50: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                eLDLGKEKABI_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 88: {
+            case 120: {
               if (!((mutable_bitField0_ & 0x00000008) != 0)) {
-                jCLHNODLPOH_ = newIntList();
+                lockedPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000008;
               }
-              jCLHNODLPOH_.addInt(input.readUInt32());
+              lockedPointList_.addInt(input.readUInt32());
               break;
             }
-            case 90: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000008) != 0) && input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_ = newIntList();
+                lockedPointList_ = newIntList();
                 mutable_bitField0_ |= 0x00000008;
               }
               while (input.getBytesUntilLimit() > 0) {
-                jCLHNODLPOH_.addInt(input.readUInt32());
+                lockedPointList_.addInt(input.readUInt32());
               }
               input.popLimit(limit);
               break;
             }
-            case 96: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -251,17 +246,17 @@ public final class ScenePointUnlockNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          pointList_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          unhidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          kOPAHGHMECF_.makeImmutable(); // C
+          pointList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          eLDLGKEKABI_.makeImmutable(); // C
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          hidePointList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000008) != 0)) {
-          jCLHNODLPOH_.makeImmutable(); // C
+          lockedPointList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -280,66 +275,10 @@ public final class ScenePointUnlockNotifyOuterClass {
               emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.class, emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.Builder.class);
     }
 
-    public static final int ELDLGKEKABI_FIELD_NUMBER = 6;
-    private com.google.protobuf.Internal.IntList eLDLGKEKABI_;
-    /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @return A list containing the eLDLGKEKABI.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getELDLGKEKABIList() {
-      return eLDLGKEKABI_;
-    }
-    /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @return The count of eLDLGKEKABI.
-     */
-    public int getELDLGKEKABICount() {
-      return eLDLGKEKABI_.size();
-    }
-    /**
-     * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-     * @param index The index of the element to return.
-     * @return The eLDLGKEKABI at the given index.
-     */
-    public int getELDLGKEKABI(int index) {
-      return eLDLGKEKABI_.getInt(index);
-    }
-    private int eLDLGKEKABIMemoizedSerializedSize = -1;
-
-    public static final int KOPAHGHMECF_FIELD_NUMBER = 4;
-    private com.google.protobuf.Internal.IntList kOPAHGHMECF_;
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @return A list containing the kOPAHGHMECF.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getKOPAHGHMECFList() {
-      return kOPAHGHMECF_;
-    }
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @return The count of kOPAHGHMECF.
-     */
-    public int getKOPAHGHMECFCount() {
-      return kOPAHGHMECF_.size();
-    }
-    /**
-     * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-     * @param index The index of the element to return.
-     * @return The kOPAHGHMECF at the given index.
-     */
-    public int getKOPAHGHMECF(int index) {
-      return kOPAHGHMECF_.getInt(index);
-    }
-    private int kOPAHGHMECFMemoizedSerializedSize = -1;
-
-    public static final int SCENE_ID_FIELD_NUMBER = 12;
+    public static final int SCENE_ID_FIELD_NUMBER = 3;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 12;</code>
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -347,10 +286,38 @@ public final class ScenePointUnlockNotifyOuterClass {
       return sceneId_;
     }
 
-    public static final int POINT_LIST_FIELD_NUMBER = 2;
+    public static final int UNHIDE_POINT_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList unhidePointList_;
+    /**
+     * <code>repeated uint32 unhide_point_list = 4;</code>
+     * @return A list containing the unhidePointList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getUnhidePointListList() {
+      return unhidePointList_;
+    }
+    /**
+     * <code>repeated uint32 unhide_point_list = 4;</code>
+     * @return The count of unhidePointList.
+     */
+    public int getUnhidePointListCount() {
+      return unhidePointList_.size();
+    }
+    /**
+     * <code>repeated uint32 unhide_point_list = 4;</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);
+    }
+    private int unhidePointListMemoizedSerializedSize = -1;
+
+    public static final int POINT_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList pointList_;
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 point_list = 11;</code>
      * @return A list containing the pointList.
      */
     @java.lang.Override
@@ -359,14 +326,14 @@ public final class ScenePointUnlockNotifyOuterClass {
       return pointList_;
     }
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 point_list = 11;</code>
      * @return The count of pointList.
      */
     public int getPointListCount() {
       return pointList_.size();
     }
     /**
-     * <code>repeated uint32 point_list = 2;</code>
+     * <code>repeated uint32 point_list = 11;</code>
      * @param index The index of the element to return.
      * @return The pointList at the given index.
      */
@@ -375,33 +342,61 @@ public final class ScenePointUnlockNotifyOuterClass {
     }
     private int pointListMemoizedSerializedSize = -1;
 
-    public static final int JCLHNODLPOH_FIELD_NUMBER = 11;
-    private com.google.protobuf.Internal.IntList jCLHNODLPOH_;
+    public static final int HIDE_POINT_LIST_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList hidePointList_;
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-     * @return A list containing the jCLHNODLPOH.
+     * <code>repeated uint32 hide_point_list = 13;</code>
+     * @return A list containing the hidePointList.
      */
     @java.lang.Override
     public java.util.List<java.lang.Integer>
-        getJCLHNODLPOHList() {
-      return jCLHNODLPOH_;
+        getHidePointListList() {
+      return hidePointList_;
     }
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-     * @return The count of jCLHNODLPOH.
+     * <code>repeated uint32 hide_point_list = 13;</code>
+     * @return The count of hidePointList.
      */
-    public int getJCLHNODLPOHCount() {
-      return jCLHNODLPOH_.size();
+    public int getHidePointListCount() {
+      return hidePointList_.size();
     }
     /**
-     * <code>repeated uint32 JCLHNODLPOH = 11;</code>
+     * <code>repeated uint32 hide_point_list = 13;</code>
      * @param index The index of the element to return.
-     * @return The jCLHNODLPOH at the given index.
+     * @return The hidePointList at the given index.
      */
-    public int getJCLHNODLPOH(int index) {
-      return jCLHNODLPOH_.getInt(index);
+    public int getHidePointList(int index) {
+      return hidePointList_.getInt(index);
     }
-    private int jCLHNODLPOHMemoizedSerializedSize = -1;
+    private int hidePointListMemoizedSerializedSize = -1;
+
+    public static final int LOCKED_POINT_LIST_FIELD_NUMBER = 15;
+    private com.google.protobuf.Internal.IntList lockedPointList_;
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</code>
+     * @return A list containing the lockedPointList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getLockedPointListList() {
+      return lockedPointList_;
+    }
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</code>
+     * @return The count of lockedPointList.
+     */
+    public int getLockedPointListCount() {
+      return lockedPointList_.size();
+    }
+    /**
+     * <code>repeated uint32 locked_point_list = 15;</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;
 
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
@@ -418,36 +413,36 @@ public final class ScenePointUnlockNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (sceneId_ != 0) {
+        output.writeUInt32(3, sceneId_);
+      }
+      if (getUnhidePointListList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(unhidePointListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < unhidePointList_.size(); i++) {
+        output.writeUInt32NoTag(unhidePointList_.getInt(i));
+      }
       if (getPointListList().size() > 0) {
-        output.writeUInt32NoTag(18);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(pointListMemoizedSerializedSize);
       }
       for (int i = 0; i < pointList_.size(); i++) {
         output.writeUInt32NoTag(pointList_.getInt(i));
       }
-      if (getKOPAHGHMECFList().size() > 0) {
-        output.writeUInt32NoTag(34);
-        output.writeUInt32NoTag(kOPAHGHMECFMemoizedSerializedSize);
+      if (getHidePointListList().size() > 0) {
+        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(hidePointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
-        output.writeUInt32NoTag(kOPAHGHMECF_.getInt(i));
+      for (int i = 0; i < hidePointList_.size(); i++) {
+        output.writeUInt32NoTag(hidePointList_.getInt(i));
       }
-      if (getELDLGKEKABIList().size() > 0) {
-        output.writeUInt32NoTag(50);
-        output.writeUInt32NoTag(eLDLGKEKABIMemoizedSerializedSize);
+      if (getLockedPointListList().size() > 0) {
+        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(lockedPointListMemoizedSerializedSize);
       }
-      for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
-        output.writeUInt32NoTag(eLDLGKEKABI_.getInt(i));
-      }
-      if (getJCLHNODLPOHList().size() > 0) {
-        output.writeUInt32NoTag(90);
-        output.writeUInt32NoTag(jCLHNODLPOHMemoizedSerializedSize);
-      }
-      for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
-        output.writeUInt32NoTag(jCLHNODLPOH_.getInt(i));
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(12, sceneId_);
+      for (int i = 0; i < lockedPointList_.size(); i++) {
+        output.writeUInt32NoTag(lockedPointList_.getInt(i));
       }
       unknownFields.writeTo(output);
     }
@@ -458,6 +453,24 @@ public final class ScenePointUnlockNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, sceneId_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < unhidePointList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(unhidePointList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getUnhidePointListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        unhidePointListMemoizedSerializedSize = dataSize;
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < pointList_.size(); i++) {
@@ -474,49 +487,31 @@ public final class ScenePointUnlockNotifyOuterClass {
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < kOPAHGHMECF_.size(); i++) {
+        for (int i = 0; i < hidePointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(kOPAHGHMECF_.getInt(i));
+            .computeUInt32SizeNoTag(hidePointList_.getInt(i));
         }
         size += dataSize;
-        if (!getKOPAHGHMECFList().isEmpty()) {
+        if (!getHidePointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        kOPAHGHMECFMemoizedSerializedSize = dataSize;
+        hidePointListMemoizedSerializedSize = dataSize;
       }
       {
         int dataSize = 0;
-        for (int i = 0; i < eLDLGKEKABI_.size(); i++) {
+        for (int i = 0; i < lockedPointList_.size(); i++) {
           dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(eLDLGKEKABI_.getInt(i));
+            .computeUInt32SizeNoTag(lockedPointList_.getInt(i));
         }
         size += dataSize;
-        if (!getELDLGKEKABIList().isEmpty()) {
+        if (!getLockedPointListList().isEmpty()) {
           size += 1;
           size += com.google.protobuf.CodedOutputStream
               .computeInt32SizeNoTag(dataSize);
         }
-        eLDLGKEKABIMemoizedSerializedSize = dataSize;
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < jCLHNODLPOH_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(jCLHNODLPOH_.getInt(i));
-        }
-        size += dataSize;
-        if (!getJCLHNODLPOHList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        jCLHNODLPOHMemoizedSerializedSize = dataSize;
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, sceneId_);
+        lockedPointListMemoizedSerializedSize = dataSize;
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -533,16 +528,16 @@ public final class ScenePointUnlockNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify other = (emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify) obj;
 
-      if (!getELDLGKEKABIList()
-          .equals(other.getELDLGKEKABIList())) return false;
-      if (!getKOPAHGHMECFList()
-          .equals(other.getKOPAHGHMECFList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (!getUnhidePointListList()
+          .equals(other.getUnhidePointListList())) return false;
       if (!getPointListList()
           .equals(other.getPointListList())) return false;
-      if (!getJCLHNODLPOHList()
-          .equals(other.getJCLHNODLPOHList())) return false;
+      if (!getHidePointListList()
+          .equals(other.getHidePointListList())) return false;
+      if (!getLockedPointListList()
+          .equals(other.getLockedPointListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -554,23 +549,23 @@ public final class ScenePointUnlockNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getELDLGKEKABICount() > 0) {
-        hash = (37 * hash) + ELDLGKEKABI_FIELD_NUMBER;
-        hash = (53 * hash) + getELDLGKEKABIList().hashCode();
-      }
-      if (getKOPAHGHMECFCount() > 0) {
-        hash = (37 * hash) + KOPAHGHMECF_FIELD_NUMBER;
-        hash = (53 * hash) + getKOPAHGHMECFList().hashCode();
-      }
       hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getSceneId();
+      if (getUnhidePointListCount() > 0) {
+        hash = (37 * hash) + UNHIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getUnhidePointListList().hashCode();
+      }
       if (getPointListCount() > 0) {
         hash = (37 * hash) + POINT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPointListList().hashCode();
       }
-      if (getJCLHNODLPOHCount() > 0) {
-        hash = (37 * hash) + JCLHNODLPOH_FIELD_NUMBER;
-        hash = (53 * hash) + getJCLHNODLPOHList().hashCode();
+      if (getHidePointListCount() > 0) {
+        hash = (37 * hash) + HIDE_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getHidePointListList().hashCode();
+      }
+      if (getLockedPointListCount() > 0) {
+        hash = (37 * hash) + LOCKED_POINT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getLockedPointListList().hashCode();
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -668,11 +663,6 @@ public final class ScenePointUnlockNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5431
-     * Obf: CBIBGAOCEHP
-     * </pre>
-     *
      * Protobuf type {@code ScenePointUnlockNotify}
      */
     public static final class Builder extends
@@ -710,15 +700,15 @@ public final class ScenePointUnlockNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        eLDLGKEKABI_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        kOPAHGHMECF_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         sceneId_ = 0;
 
+        unhidePointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         pointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        hidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        jCLHNODLPOH_ = emptyIntList();
+        lockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
         return this;
       }
@@ -747,27 +737,27 @@ public final class ScenePointUnlockNotifyOuterClass {
       public emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify buildPartial() {
         emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify result = new emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify(this);
         int from_bitField0_ = bitField0_;
+        result.sceneId_ = sceneId_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          eLDLGKEKABI_.makeImmutable();
+          unhidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.eLDLGKEKABI_ = eLDLGKEKABI_;
+        result.unhidePointList_ = unhidePointList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          kOPAHGHMECF_.makeImmutable();
+          pointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.kOPAHGHMECF_ = kOPAHGHMECF_;
-        result.sceneId_ = sceneId_;
+        result.pointList_ = pointList_;
         if (((bitField0_ & 0x00000004) != 0)) {
-          pointList_.makeImmutable();
+          hidePointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
-        result.pointList_ = pointList_;
+        result.hidePointList_ = hidePointList_;
         if (((bitField0_ & 0x00000008) != 0)) {
-          jCLHNODLPOH_.makeImmutable();
+          lockedPointList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000008);
         }
-        result.jCLHNODLPOH_ = jCLHNODLPOH_;
+        result.lockedPointList_ = lockedPointList_;
         onBuilt();
         return result;
       }
@@ -816,46 +806,46 @@ public final class ScenePointUnlockNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify other) {
         if (other == emu.grasscutter.net.proto.ScenePointUnlockNotifyOuterClass.ScenePointUnlockNotify.getDefaultInstance()) return this;
-        if (!other.eLDLGKEKABI_.isEmpty()) {
-          if (eLDLGKEKABI_.isEmpty()) {
-            eLDLGKEKABI_ = other.eLDLGKEKABI_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureELDLGKEKABIIsMutable();
-            eLDLGKEKABI_.addAll(other.eLDLGKEKABI_);
-          }
-          onChanged();
-        }
-        if (!other.kOPAHGHMECF_.isEmpty()) {
-          if (kOPAHGHMECF_.isEmpty()) {
-            kOPAHGHMECF_ = other.kOPAHGHMECF_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureKOPAHGHMECFIsMutable();
-            kOPAHGHMECF_.addAll(other.kOPAHGHMECF_);
-          }
-          onChanged();
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (!other.unhidePointList_.isEmpty()) {
+          if (unhidePointList_.isEmpty()) {
+            unhidePointList_ = other.unhidePointList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureUnhidePointListIsMutable();
+            unhidePointList_.addAll(other.unhidePointList_);
+          }
+          onChanged();
+        }
         if (!other.pointList_.isEmpty()) {
           if (pointList_.isEmpty()) {
             pointList_ = other.pointList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePointListIsMutable();
             pointList_.addAll(other.pointList_);
           }
           onChanged();
         }
-        if (!other.jCLHNODLPOH_.isEmpty()) {
-          if (jCLHNODLPOH_.isEmpty()) {
-            jCLHNODLPOH_ = other.jCLHNODLPOH_;
+        if (!other.hidePointList_.isEmpty()) {
+          if (hidePointList_.isEmpty()) {
+            hidePointList_ = other.hidePointList_;
+            bitField0_ = (bitField0_ & ~0x00000004);
+          } else {
+            ensureHidePointListIsMutable();
+            hidePointList_.addAll(other.hidePointList_);
+          }
+          onChanged();
+        }
+        if (!other.lockedPointList_.isEmpty()) {
+          if (lockedPointList_.isEmpty()) {
+            lockedPointList_ = other.lockedPointList_;
             bitField0_ = (bitField0_ & ~0x00000008);
           } else {
-            ensureJCLHNODLPOHIsMutable();
-            jCLHNODLPOH_.addAll(other.jCLHNODLPOH_);
+            ensureLockedPointListIsMutable();
+            lockedPointList_.addAll(other.lockedPointList_);
           }
           onChanged();
         }
@@ -889,167 +879,9 @@ public final class ScenePointUnlockNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList eLDLGKEKABI_ = emptyIntList();
-      private void ensureELDLGKEKABIIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          eLDLGKEKABI_ = mutableCopy(eLDLGKEKABI_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @return A list containing the eLDLGKEKABI.
-       */
-      public java.util.List<java.lang.Integer>
-          getELDLGKEKABIList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(eLDLGKEKABI_) : eLDLGKEKABI_;
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @return The count of eLDLGKEKABI.
-       */
-      public int getELDLGKEKABICount() {
-        return eLDLGKEKABI_.size();
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @param index The index of the element to return.
-       * @return The eLDLGKEKABI at the given index.
-       */
-      public int getELDLGKEKABI(int index) {
-        return eLDLGKEKABI_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @param index The index to set the value at.
-       * @param value The eLDLGKEKABI to set.
-       * @return This builder for chaining.
-       */
-      public Builder setELDLGKEKABI(
-          int index, int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @param value The eLDLGKEKABI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addELDLGKEKABI(int value) {
-        ensureELDLGKEKABIIsMutable();
-        eLDLGKEKABI_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @param values The eLDLGKEKABI to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllELDLGKEKABI(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureELDLGKEKABIIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, eLDLGKEKABI_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 ELDLGKEKABI = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearELDLGKEKABI() {
-        eLDLGKEKABI_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList kOPAHGHMECF_ = emptyIntList();
-      private void ensureKOPAHGHMECFIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          kOPAHGHMECF_ = mutableCopy(kOPAHGHMECF_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @return A list containing the kOPAHGHMECF.
-       */
-      public java.util.List<java.lang.Integer>
-          getKOPAHGHMECFList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(kOPAHGHMECF_) : kOPAHGHMECF_;
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @return The count of kOPAHGHMECF.
-       */
-      public int getKOPAHGHMECFCount() {
-        return kOPAHGHMECF_.size();
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @param index The index of the element to return.
-       * @return The kOPAHGHMECF at the given index.
-       */
-      public int getKOPAHGHMECF(int index) {
-        return kOPAHGHMECF_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The kOPAHGHMECF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKOPAHGHMECF(
-          int index, int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @param value The kOPAHGHMECF to add.
-       * @return This builder for chaining.
-       */
-      public Builder addKOPAHGHMECF(int value) {
-        ensureKOPAHGHMECFIsMutable();
-        kOPAHGHMECF_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @param values The kOPAHGHMECF to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllKOPAHGHMECF(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureKOPAHGHMECFIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, kOPAHGHMECF_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 KOPAHGHMECF = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKOPAHGHMECF() {
-        kOPAHGHMECF_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 12;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -1057,7 +889,7 @@ public final class ScenePointUnlockNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 12;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -1068,7 +900,7 @@ public final class ScenePointUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 12;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -1078,31 +910,110 @@ public final class ScenePointUnlockNotifyOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList pointList_ = emptyIntList();
-      private void ensurePointListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          pointList_ = mutableCopy(pointList_);
-          bitField0_ |= 0x00000004;
+      private com.google.protobuf.Internal.IntList unhidePointList_ = emptyIntList();
+      private void ensureUnhidePointListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          unhidePointList_ = mutableCopy(unhidePointList_);
+          bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 unhide_point_list = 4;</code>
+       * @return A list containing the unhidePointList.
+       */
+      public java.util.List<java.lang.Integer>
+          getUnhidePointListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(unhidePointList_) : unhidePointList_;
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</code>
+       * @return The count of unhidePointList.
+       */
+      public int getUnhidePointListCount() {
+        return unhidePointList_.size();
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</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);
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</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;
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</code>
+       * @param value The unhidePointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addUnhidePointList(int value) {
+        ensureUnhidePointListIsMutable();
+        unhidePointList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</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;
+      }
+      /**
+       * <code>repeated uint32 unhide_point_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUnhidePointList() {
+        unhidePointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList pointList_ = emptyIntList();
+      private void ensurePointListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          pointList_ = mutableCopy(pointList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 point_list = 11;</code>
        * @return A list containing the pointList.
        */
       public java.util.List<java.lang.Integer>
           getPointListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000002) != 0) ?
                  java.util.Collections.unmodifiableList(pointList_) : pointList_;
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @return The count of pointList.
        */
       public int getPointListCount() {
         return pointList_.size();
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @param index The index of the element to return.
        * @return The pointList at the given index.
        */
@@ -1110,7 +1021,7 @@ public final class ScenePointUnlockNotifyOuterClass {
         return pointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The pointList to set.
        * @return This builder for chaining.
@@ -1123,7 +1034,7 @@ public final class ScenePointUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @param value The pointList to add.
        * @return This builder for chaining.
        */
@@ -1134,7 +1045,7 @@ public final class ScenePointUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @param values The pointList to add.
        * @return This builder for chaining.
        */
@@ -1147,90 +1058,169 @@ public final class ScenePointUnlockNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 point_list = 2;</code>
+       * <code>repeated uint32 point_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointList() {
         pointList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList hidePointList_ = emptyIntList();
+      private void ensureHidePointListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          hidePointList_ = mutableCopy(hidePointList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @return A list containing the hidePointList.
+       */
+      public java.util.List<java.lang.Integer>
+          getHidePointListList() {
+        return ((bitField0_ & 0x00000004) != 0) ?
+                 java.util.Collections.unmodifiableList(hidePointList_) : hidePointList_;
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @return The count of hidePointList.
+       */
+      public int getHidePointListCount() {
+        return hidePointList_.size();
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @param index The index of the element to return.
+       * @return The hidePointList at the given index.
+       */
+      public int getHidePointList(int index) {
+        return hidePointList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The hidePointList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHidePointList(
+          int index, int value) {
+        ensureHidePointListIsMutable();
+        hidePointList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @param value The hidePointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addHidePointList(int value) {
+        ensureHidePointListIsMutable();
+        hidePointList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @param values The hidePointList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllHidePointList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureHidePointListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, hidePointList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 hide_point_list = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHidePointList() {
+        hidePointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList jCLHNODLPOH_ = emptyIntList();
-      private void ensureJCLHNODLPOHIsMutable() {
+      private com.google.protobuf.Internal.IntList lockedPointList_ = emptyIntList();
+      private void ensureLockedPointListIsMutable() {
         if (!((bitField0_ & 0x00000008) != 0)) {
-          jCLHNODLPOH_ = mutableCopy(jCLHNODLPOH_);
+          lockedPointList_ = mutableCopy(lockedPointList_);
           bitField0_ |= 0x00000008;
          }
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-       * @return A list containing the jCLHNODLPOH.
+       * <code>repeated uint32 locked_point_list = 15;</code>
+       * @return A list containing the lockedPointList.
        */
       public java.util.List<java.lang.Integer>
-          getJCLHNODLPOHList() {
+          getLockedPointListList() {
         return ((bitField0_ & 0x00000008) != 0) ?
-                 java.util.Collections.unmodifiableList(jCLHNODLPOH_) : jCLHNODLPOH_;
+                 java.util.Collections.unmodifiableList(lockedPointList_) : lockedPointList_;
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-       * @return The count of jCLHNODLPOH.
+       * <code>repeated uint32 locked_point_list = 15;</code>
+       * @return The count of lockedPointList.
        */
-      public int getJCLHNODLPOHCount() {
-        return jCLHNODLPOH_.size();
+      public int getLockedPointListCount() {
+        return lockedPointList_.size();
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
+       * <code>repeated uint32 locked_point_list = 15;</code>
        * @param index The index of the element to return.
-       * @return The jCLHNODLPOH at the given index.
+       * @return The lockedPointList at the given index.
        */
-      public int getJCLHNODLPOH(int index) {
-        return jCLHNODLPOH_.getInt(index);
+      public int getLockedPointList(int index) {
+        return lockedPointList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
+       * <code>repeated uint32 locked_point_list = 15;</code>
        * @param index The index to set the value at.
-       * @param value The jCLHNODLPOH to set.
+       * @param value The lockedPointList to set.
        * @return This builder for chaining.
        */
-      public Builder setJCLHNODLPOH(
+      public Builder setLockedPointList(
           int index, int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.setInt(index, value);
+        ensureLockedPointListIsMutable();
+        lockedPointList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-       * @param value The jCLHNODLPOH to add.
+       * <code>repeated uint32 locked_point_list = 15;</code>
+       * @param value The lockedPointList to add.
        * @return This builder for chaining.
        */
-      public Builder addJCLHNODLPOH(int value) {
-        ensureJCLHNODLPOHIsMutable();
-        jCLHNODLPOH_.addInt(value);
+      public Builder addLockedPointList(int value) {
+        ensureLockedPointListIsMutable();
+        lockedPointList_.addInt(value);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
-       * @param values The jCLHNODLPOH to add.
+       * <code>repeated uint32 locked_point_list = 15;</code>
+       * @param values The lockedPointList to add.
        * @return This builder for chaining.
        */
-      public Builder addAllJCLHNODLPOH(
+      public Builder addAllLockedPointList(
           java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureJCLHNODLPOHIsMutable();
+        ensureLockedPointListIsMutable();
         com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, jCLHNODLPOH_);
+            values, lockedPointList_);
         onChanged();
         return this;
       }
       /**
-       * <code>repeated uint32 JCLHNODLPOH = 11;</code>
+       * <code>repeated uint32 locked_point_list = 15;</code>
        * @return This builder for chaining.
        */
-      public Builder clearJCLHNODLPOH() {
-        jCLHNODLPOH_ = emptyIntList();
+      public Builder clearLockedPointList() {
+        lockedPointList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000008);
         onChanged();
         return this;
@@ -1302,11 +1292,12 @@ public final class ScenePointUnlockNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034ScenePointUnlockNotify.proto\"}\n\026SceneP" +
-      "ointUnlockNotify\022\023\n\013ELDLGKEKABI\030\006 \003(\r\022\023\n" +
-      "\013KOPAHGHMECF\030\004 \003(\r\022\020\n\010scene_id\030\014 \001(\r\022\022\n\n" +
-      "point_list\030\002 \003(\r\022\023\n\013JCLHNODLPOH\030\013 \003(\rB\033\n" +
-      "\031emu.grasscutter.net.protob\006proto3"
+      "\n\034ScenePointUnlockNotify.proto\"\215\001\n\026Scene" +
+      "PointUnlockNotify\022\020\n\010scene_id\030\003 \001(\r\022\031\n\021u" +
+      "nhide_point_list\030\004 \003(\r\022\022\n\npoint_list\030\013 \003" +
+      "(\r\022\027\n\017hide_point_list\030\r \003(\r\022\031\n\021locked_po" +
+      "int_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1317,7 +1308,7 @@ public final class ScenePointUnlockNotifyOuterClass {
     internal_static_ScenePointUnlockNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ScenePointUnlockNotify_descriptor,
-        new java.lang.String[] { "ELDLGKEKABI", "KOPAHGHMECF", "SceneId", "PointList", "JCLHNODLPOH", });
+        new java.lang.String[] { "SceneId", "UnhidePointList", "PointList", "HidePointList", "LockedPointList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneReliquaryInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneReliquaryInfoOuterClass.java
index 662710685..e7802f63f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneReliquaryInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneReliquaryInfoOuterClass.java
@@ -43,10 +43,6 @@ public final class SceneReliquaryInfoOuterClass {
     int getPromoteLevel();
   }
   /**
-   * <pre>
-   * Obf: HEMALDBEKEL
-   * </pre>
-   *
    * Protobuf type {@code SceneReliquaryInfo}
    */
   public static final class SceneReliquaryInfo extends
@@ -377,10 +373,6 @@ public final class SceneReliquaryInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HEMALDBEKEL
-     * </pre>
-     *
      * Protobuf type {@code SceneReliquaryInfo}
      */
     public static final class Builder extends
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 2a0574e95..7f633b780 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamAvatarOuterClass.java
@@ -19,140 +19,11 @@ public final class SceneTeamAvatarOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     * @return Whether the sceneEntityInfo field is set.
-     */
-    boolean hasSceneEntityInfo();
-    /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     * @return The sceneEntityInfo.
-     */
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo();
-    /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     */
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder();
-
-    /**
-     * <code>uint32 weapon_entity_id = 8;</code>
-     * @return The weaponEntityId.
-     */
-    int getWeaponEntityId();
-
-    /**
-     * <code>uint32 player_uid = 3;</code>
-     * @return The playerUid.
-     */
-    int getPlayerUid();
-
-    /**
-     * <code>bool is_reconnect = 15;</code>
+     * <code>bool is_reconnect = 1;</code>
      * @return The isReconnect.
      */
     boolean getIsReconnect();
 
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     * @return Whether the weaponAbilityInfo field is set.
-     */
-    boolean hasWeaponAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     * @return The weaponAbilityInfo.
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
-
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
-
-    /**
-     * <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>
-     */
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
-
-    /**
-     * <code>uint64 weapon_guid = 5;</code>
-     * @return The weaponGuid.
-     */
-    long getWeaponGuid();
-
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     * @return Whether the avatarInfo field is set.
-     */
-    boolean hasAvatarInfo();
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     * @return The avatarInfo.
-     */
-    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo();
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     */
-    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>uint64 avatar_guid = 12;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
-
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     * @return Whether the abilityControlBlock field is set.
-     */
-    boolean hasAbilityControlBlock();
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     * @return The abilityControlBlock.
-     */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
-
     /**
      * <code>uint32 scene_id = 2;</code>
      * @return The sceneId.
@@ -160,37 +31,162 @@ public final class SceneTeamAvatarOuterClass {
     int getSceneId();
 
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
+        getServerBuffListList();
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    int getServerBuffListCount();
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList();
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index);
+
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     * @return Whether the avatarInfo field is set.
+     */
+    boolean hasAvatarInfo();
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     * @return The avatarInfo.
+     */
+    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo();
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     */
+    emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder();
+
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     * @return Whether the sceneEntityInfo field is set.
+     */
+    boolean hasSceneEntityInfo();
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     * @return The sceneEntityInfo.
+     */
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo();
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     */
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder();
+
+    /**
+     * <code>uint32 weapon_entity_id = 6;</code>
+     * @return The weaponEntityId.
+     */
+    int getWeaponEntityId();
+
+    /**
+     * <code>uint32 player_uid = 7;</code>
+     * @return The playerUid.
+     */
+    int getPlayerUid();
+
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     * @return Whether the abilityControlBlock field is set.
+     */
+    boolean hasAbilityControlBlock();
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     * @return The abilityControlBlock.
+     */
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     */
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>uint64 weapon_guid = 10;</code>
+     * @return The weaponGuid.
+     */
+    long getWeaponGuid();
+
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+     * @return Whether the avatarAbilityInfo field is set.
+     */
+    boolean hasAvatarAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+     * @return The avatarAbilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getAvatarAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder();
+
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     * @return Whether the weaponAbilityInfo field is set.
+     */
+    boolean hasWeaponAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     * @return The weaponAbilityInfo.
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo();
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     */
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder();
+
+    /**
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      * @return Whether the sceneAvatarInfo field is set.
      */
     boolean hasSceneAvatarInfo();
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      * @return The sceneAvatarInfo.
      */
     emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo();
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      */
     emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder();
 
     /**
-     * <code>bool is_player_cur_avatar = 1765;</code>
+     * <code>bool is_player_cur_avatar = 14;</code>
      * @return The isPlayerCurAvatar.
      */
     boolean getIsPlayerCurAvatar();
 
     /**
-     * <code>bool is_on_scene = 13;</code>
+     * <code>uint64 avatar_guid = 15;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>bool is_on_scene = 588;</code>
      * @return The isOnScene.
      */
     boolean getIsOnScene();
   }
   /**
-   * <pre>
-   * Obf: EOCBJIPDPMB
-   * </pre>
-   *
    * Protobuf type {@code SceneTeamAvatar}
    */
   public static final class SceneTeamAvatar extends
@@ -237,17 +233,9 @@ public final class SceneTeamAvatarOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
-              if (abilityControlBlock_ != null) {
-                subBuilder = abilityControlBlock_.toBuilder();
-              }
-              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(abilityControlBlock_);
-                abilityControlBlock_ = subBuilder.buildPartial();
-              }
+            case 8: {
 
+              isReconnect_ = input.readBool();
               break;
             }
             case 16: {
@@ -255,30 +243,16 @@ public final class SceneTeamAvatarOuterClass {
               sceneId_ = input.readUInt32();
               break;
             }
-            case 24: {
-
-              playerUid_ = input.readUInt32();
+            case 26: {
+              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 34: {
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder subBuilder = null;
-              if (sceneEntityInfo_ != null) {
-                subBuilder = sceneEntityInfo_.toBuilder();
-              }
-              sceneEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(sceneEntityInfo_);
-                sceneEntityInfo_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 40: {
-
-              weaponGuid_ = input.readUInt64();
-              break;
-            }
-            case 50: {
               emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder subBuilder = null;
               if (avatarInfo_ != null) {
                 subBuilder = avatarInfo_.toBuilder();
@@ -291,7 +265,53 @@ public final class SceneTeamAvatarOuterClass {
 
               break;
             }
-            case 58: {
+            case 42: {
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder subBuilder = null;
+              if (sceneEntityInfo_ != null) {
+                subBuilder = sceneEntityInfo_.toBuilder();
+              }
+              sceneEntityInfo_ = input.readMessage(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(sceneEntityInfo_);
+                sceneEntityInfo_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 48: {
+
+              weaponEntityId_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              playerUid_ = input.readUInt32();
+              break;
+            }
+            case 66: {
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
+              if (abilityControlBlock_ != null) {
+                subBuilder = abilityControlBlock_.toBuilder();
+              }
+              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(abilityControlBlock_);
+                abilityControlBlock_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 72: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              weaponGuid_ = input.readUInt64();
+              break;
+            }
+            case 90: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (avatarAbilityInfo_ != null) {
                 subBuilder = avatarAbilityInfo_.toBuilder();
@@ -304,26 +324,7 @@ public final class SceneTeamAvatarOuterClass {
 
               break;
             }
-            case 64: {
-
-              weaponEntityId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 82: {
-              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 90: {
+            case 98: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (weaponAbilityInfo_ != null) {
                 subBuilder = weaponAbilityInfo_.toBuilder();
@@ -336,17 +337,7 @@ public final class SceneTeamAvatarOuterClass {
 
               break;
             }
-            case 96: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 104: {
-
-              isOnScene_ = input.readBool();
-              break;
-            }
-            case 114: {
+            case 106: {
               emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder subBuilder = null;
               if (sceneAvatarInfo_ != null) {
                 subBuilder = sceneAvatarInfo_.toBuilder();
@@ -359,16 +350,21 @@ public final class SceneTeamAvatarOuterClass {
 
               break;
             }
-            case 120: {
-
-              isReconnect_ = input.readBool();
-              break;
-            }
-            case 14120: {
+            case 112: {
 
               isPlayerCurAvatar_ = input.readBool();
               break;
             }
+            case 120: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 4704: {
+
+              isOnScene_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -404,58 +400,10 @@ public final class SceneTeamAvatarOuterClass {
               emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.class, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder.class);
     }
 
-    public static final int SCENE_ENTITY_INFO_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
-    /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     * @return Whether the sceneEntityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasSceneEntityInfo() {
-      return sceneEntityInfo_ != null;
-    }
-    /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     * @return The sceneEntityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
-      return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
-    }
-    /**
-     * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
-      return getSceneEntityInfo();
-    }
-
-    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 8;
-    private int weaponEntityId_;
-    /**
-     * <code>uint32 weapon_entity_id = 8;</code>
-     * @return The weaponEntityId.
-     */
-    @java.lang.Override
-    public int getWeaponEntityId() {
-      return weaponEntityId_;
-    }
-
-    public static final int PLAYER_UID_FIELD_NUMBER = 3;
-    private int playerUid_;
-    /**
-     * <code>uint32 player_uid = 3;</code>
-     * @return The playerUid.
-     */
-    @java.lang.Override
-    public int getPlayerUid() {
-      return playerUid_;
-    }
-
-    public static final int IS_RECONNECT_FIELD_NUMBER = 15;
+    public static final int IS_RECONNECT_FIELD_NUMBER = 1;
     private boolean isReconnect_;
     /**
-     * <code>bool is_reconnect = 15;</code>
+     * <code>bool is_reconnect = 1;</code>
      * @return The isReconnect.
      */
     @java.lang.Override
@@ -463,183 +411,6 @@ public final class SceneTeamAvatarOuterClass {
       return isReconnect_;
     }
 
-    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 11;
-    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     * @return Whether the weaponAbilityInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasWeaponAbilityInfo() {
-      return weaponAbilityInfo_ != null;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     * @return The weaponAbilityInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
-      return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
-      return getWeaponAbilityInfo();
-    }
-
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
-      return serverBuffList_.get(index);
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index) {
-      return serverBuffList_.get(index);
-    }
-
-    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_;
-    }
-    /**
-     * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
-      return getAvatarAbilityInfo();
-    }
-
-    public static final int WEAPON_GUID_FIELD_NUMBER = 5;
-    private long weaponGuid_;
-    /**
-     * <code>uint64 weapon_guid = 5;</code>
-     * @return The weaponGuid.
-     */
-    @java.lang.Override
-    public long getWeaponGuid() {
-      return weaponGuid_;
-    }
-
-    public static final int AVATAR_INFO_FIELD_NUMBER = 6;
-    private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     * @return Whether the avatarInfo field is set.
-     */
-    @java.lang.Override
-    public boolean hasAvatarInfo() {
-      return avatarInfo_ != null;
-    }
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     * @return The avatarInfo.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
-      return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
-    }
-    /**
-     * <code>.AvatarInfo avatar_info = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
-      return getAvatarInfo();
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 9;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 9;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int AVATAR_GUID_FIELD_NUMBER = 12;
-    private long avatarGuid_;
-    /**
-     * <code>uint64 avatar_guid = 12;</code>
-     * @return The avatarGuid.
-     */
-    @java.lang.Override
-    public long getAvatarGuid() {
-      return avatarGuid_;
-    }
-
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     * @return Whether the abilityControlBlock field is set.
-     */
-    @java.lang.Override
-    public boolean hasAbilityControlBlock() {
-      return abilityControlBlock_ != null;
-    }
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     * @return The abilityControlBlock.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
-      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
-    }
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
-      return getAbilityControlBlock();
-    }
-
     public static final int SCENE_ID_FIELD_NUMBER = 2;
     private int sceneId_;
     /**
@@ -651,10 +422,224 @@ public final class SceneTeamAvatarOuterClass {
       return sceneId_;
     }
 
-    public static final int SCENE_AVATAR_INFO_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 = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 3;</code>
+     */
+    @java.lang.Override
+    public int getServerBuffListCount() {
+      return serverBuffList_.size();
+    }
+    /**
+     * <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 = 3;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index) {
+      return serverBuffList_.get(index);
+    }
+
+    public static final int AVATAR_INFO_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     * @return Whether the avatarInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasAvatarInfo() {
+      return avatarInfo_ != null;
+    }
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     * @return The avatarInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
+      return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
+    }
+    /**
+     * <code>.AvatarInfo avatar_info = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
+      return getAvatarInfo();
+    }
+
+    public static final int SCENE_ENTITY_INFO_FIELD_NUMBER = 5;
+    private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     * @return Whether the sceneEntityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasSceneEntityInfo() {
+      return sceneEntityInfo_ != null;
+    }
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     * @return The sceneEntityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
+      return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+    }
+    /**
+     * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
+      return getSceneEntityInfo();
+    }
+
+    public static final int WEAPON_ENTITY_ID_FIELD_NUMBER = 6;
+    private int weaponEntityId_;
+    /**
+     * <code>uint32 weapon_entity_id = 6;</code>
+     * @return The weaponEntityId.
+     */
+    @java.lang.Override
+    public int getWeaponEntityId() {
+      return weaponEntityId_;
+    }
+
+    public static final int PLAYER_UID_FIELD_NUMBER = 7;
+    private int playerUid_;
+    /**
+     * <code>uint32 player_uid = 7;</code>
+     * @return The playerUid.
+     */
+    @java.lang.Override
+    public int getPlayerUid() {
+      return playerUid_;
+    }
+
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 8;
+    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     * @return Whether the abilityControlBlock field is set.
+     */
+    @java.lang.Override
+    public boolean hasAbilityControlBlock() {
+      return abilityControlBlock_ != null;
+    }
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     * @return The abilityControlBlock.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
+      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+    }
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
+      return getAbilityControlBlock();
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int WEAPON_GUID_FIELD_NUMBER = 10;
+    private long weaponGuid_;
+    /**
+     * <code>uint64 weapon_guid = 10;</code>
+     * @return The weaponGuid.
+     */
+    @java.lang.Override
+    public long getWeaponGuid() {
+      return weaponGuid_;
+    }
+
+    public static final int AVATAR_ABILITY_INFO_FIELD_NUMBER = 11;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo avatarAbilityInfo_;
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+     * @return Whether the avatarAbilityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasAvatarAbilityInfo() {
+      return avatarAbilityInfo_ != null;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</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_;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getAvatarAbilityInfoOrBuilder() {
+      return getAvatarAbilityInfo();
+    }
+
+    public static final int WEAPON_ABILITY_INFO_FIELD_NUMBER = 12;
+    private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo weaponAbilityInfo_;
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     * @return Whether the weaponAbilityInfo field is set.
+     */
+    @java.lang.Override
+    public boolean hasWeaponAbilityInfo() {
+      return weaponAbilityInfo_ != null;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     * @return The weaponAbilityInfo.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getWeaponAbilityInfo() {
+      return weaponAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : weaponAbilityInfo_;
+    }
+    /**
+     * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getWeaponAbilityInfoOrBuilder() {
+      return getWeaponAbilityInfo();
+    }
+
+    public static final int SCENE_AVATAR_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      * @return Whether the sceneAvatarInfo field is set.
      */
     @java.lang.Override
@@ -662,7 +647,7 @@ public final class SceneTeamAvatarOuterClass {
       return sceneAvatarInfo_ != null;
     }
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      * @return The sceneAvatarInfo.
      */
     @java.lang.Override
@@ -670,17 +655,17 @@ public final class SceneTeamAvatarOuterClass {
       return sceneAvatarInfo_ == null ? emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.getDefaultInstance() : sceneAvatarInfo_;
     }
     /**
-     * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+     * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
       return getSceneAvatarInfo();
     }
 
-    public static final int IS_PLAYER_CUR_AVATAR_FIELD_NUMBER = 1765;
+    public static final int IS_PLAYER_CUR_AVATAR_FIELD_NUMBER = 14;
     private boolean isPlayerCurAvatar_;
     /**
-     * <code>bool is_player_cur_avatar = 1765;</code>
+     * <code>bool is_player_cur_avatar = 14;</code>
      * @return The isPlayerCurAvatar.
      */
     @java.lang.Override
@@ -688,10 +673,21 @@ public final class SceneTeamAvatarOuterClass {
       return isPlayerCurAvatar_;
     }
 
-    public static final int IS_ON_SCENE_FIELD_NUMBER = 13;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
+    private long avatarGuid_;
+    /**
+     * <code>uint64 avatar_guid = 15;</code>
+     * @return The avatarGuid.
+     */
+    @java.lang.Override
+    public long getAvatarGuid() {
+      return avatarGuid_;
+    }
+
+    public static final int IS_ON_SCENE_FIELD_NUMBER = 588;
     private boolean isOnScene_;
     /**
-     * <code>bool is_on_scene = 13;</code>
+     * <code>bool is_on_scene = 588;</code>
      * @return The isOnScene.
      */
     @java.lang.Override
@@ -713,53 +709,53 @@ public final class SceneTeamAvatarOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (abilityControlBlock_ != null) {
-        output.writeMessage(1, getAbilityControlBlock());
+      if (isReconnect_ != false) {
+        output.writeBool(1, isReconnect_);
       }
       if (sceneId_ != 0) {
         output.writeUInt32(2, sceneId_);
       }
-      if (playerUid_ != 0) {
-        output.writeUInt32(3, playerUid_);
-      }
-      if (sceneEntityInfo_ != null) {
-        output.writeMessage(4, getSceneEntityInfo());
-      }
-      if (weaponGuid_ != 0L) {
-        output.writeUInt64(5, weaponGuid_);
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        output.writeMessage(3, serverBuffList_.get(i));
       }
       if (avatarInfo_ != null) {
-        output.writeMessage(6, getAvatarInfo());
+        output.writeMessage(4, getAvatarInfo());
       }
-      if (avatarAbilityInfo_ != null) {
-        output.writeMessage(7, getAvatarAbilityInfo());
+      if (sceneEntityInfo_ != null) {
+        output.writeMessage(5, getSceneEntityInfo());
       }
       if (weaponEntityId_ != 0) {
-        output.writeUInt32(8, weaponEntityId_);
+        output.writeUInt32(6, weaponEntityId_);
+      }
+      if (playerUid_ != 0) {
+        output.writeUInt32(7, playerUid_);
+      }
+      if (abilityControlBlock_ != null) {
+        output.writeMessage(8, getAbilityControlBlock());
       }
       if (entityId_ != 0) {
         output.writeUInt32(9, entityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(10, serverBuffList_.get(i));
+      if (weaponGuid_ != 0L) {
+        output.writeUInt64(10, weaponGuid_);
+      }
+      if (avatarAbilityInfo_ != null) {
+        output.writeMessage(11, getAvatarAbilityInfo());
       }
       if (weaponAbilityInfo_ != null) {
-        output.writeMessage(11, getWeaponAbilityInfo());
-      }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(12, avatarGuid_);
-      }
-      if (isOnScene_ != false) {
-        output.writeBool(13, isOnScene_);
+        output.writeMessage(12, getWeaponAbilityInfo());
       }
       if (sceneAvatarInfo_ != null) {
-        output.writeMessage(14, getSceneAvatarInfo());
-      }
-      if (isReconnect_ != false) {
-        output.writeBool(15, isReconnect_);
+        output.writeMessage(13, getSceneAvatarInfo());
       }
       if (isPlayerCurAvatar_ != false) {
-        output.writeBool(1765, isPlayerCurAvatar_);
+        output.writeBool(14, isPlayerCurAvatar_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(15, avatarGuid_);
+      }
+      if (isOnScene_ != false) {
+        output.writeBool(588, isOnScene_);
       }
       unknownFields.writeTo(output);
     }
@@ -770,69 +766,69 @@ public final class SceneTeamAvatarOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (abilityControlBlock_ != null) {
+      if (isReconnect_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getAbilityControlBlock());
+          .computeBoolSize(1, isReconnect_);
       }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(2, sceneId_);
       }
-      if (playerUid_ != 0) {
+      for (int i = 0; i < serverBuffList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, playerUid_);
-      }
-      if (sceneEntityInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getSceneEntityInfo());
-      }
-      if (weaponGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, weaponGuid_);
+          .computeMessageSize(3, serverBuffList_.get(i));
       }
       if (avatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getAvatarInfo());
+          .computeMessageSize(4, getAvatarInfo());
       }
-      if (avatarAbilityInfo_ != null) {
+      if (sceneEntityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getAvatarAbilityInfo());
+          .computeMessageSize(5, getSceneEntityInfo());
       }
       if (weaponEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, weaponEntityId_);
+          .computeUInt32Size(6, weaponEntityId_);
+      }
+      if (playerUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, playerUid_);
+      }
+      if (abilityControlBlock_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, getAbilityControlBlock());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(9, entityId_);
       }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
+      if (weaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, serverBuffList_.get(i));
+          .computeUInt64Size(10, weaponGuid_);
+      }
+      if (avatarAbilityInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, getAvatarAbilityInfo());
       }
       if (weaponAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(11, getWeaponAbilityInfo());
-      }
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, avatarGuid_);
-      }
-      if (isOnScene_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(13, isOnScene_);
+          .computeMessageSize(12, getWeaponAbilityInfo());
       }
       if (sceneAvatarInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getSceneAvatarInfo());
-      }
-      if (isReconnect_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, isReconnect_);
+          .computeMessageSize(13, getSceneAvatarInfo());
       }
       if (isPlayerCurAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1765, isPlayerCurAvatar_);
+          .computeBoolSize(14, isPlayerCurAvatar_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(15, avatarGuid_);
+      }
+      if (isOnScene_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(588, isOnScene_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -849,6 +845,17 @@ public final class SceneTeamAvatarOuterClass {
       }
       emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar other = (emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar) obj;
 
+      if (getIsReconnect()
+          != other.getIsReconnect()) return false;
+      if (getSceneId()
+          != other.getSceneId()) return false;
+      if (!getServerBuffListList()
+          .equals(other.getServerBuffListList())) return false;
+      if (hasAvatarInfo() != other.hasAvatarInfo()) return false;
+      if (hasAvatarInfo()) {
+        if (!getAvatarInfo()
+            .equals(other.getAvatarInfo())) return false;
+      }
       if (hasSceneEntityInfo() != other.hasSceneEntityInfo()) return false;
       if (hasSceneEntityInfo()) {
         if (!getSceneEntityInfo()
@@ -858,38 +865,25 @@ public final class SceneTeamAvatarOuterClass {
           != other.getWeaponEntityId()) return false;
       if (getPlayerUid()
           != other.getPlayerUid()) return false;
-      if (getIsReconnect()
-          != other.getIsReconnect()) return false;
-      if (hasWeaponAbilityInfo() != other.hasWeaponAbilityInfo()) return false;
-      if (hasWeaponAbilityInfo()) {
-        if (!getWeaponAbilityInfo()
-            .equals(other.getWeaponAbilityInfo())) 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 (getWeaponGuid()
-          != other.getWeaponGuid()) return false;
-      if (hasAvatarInfo() != other.hasAvatarInfo()) return false;
-      if (hasAvatarInfo()) {
-        if (!getAvatarInfo()
-            .equals(other.getAvatarInfo())) return false;
-      }
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
       if (hasAbilityControlBlock()) {
         if (!getAbilityControlBlock()
             .equals(other.getAbilityControlBlock())) return false;
       }
-      if (getSceneId()
-          != other.getSceneId()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (getWeaponGuid()
+          != other.getWeaponGuid()) 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 (hasSceneAvatarInfo() != other.hasSceneAvatarInfo()) return false;
       if (hasSceneAvatarInfo()) {
         if (!getSceneAvatarInfo()
@@ -897,6 +891,8 @@ public final class SceneTeamAvatarOuterClass {
       }
       if (getIsPlayerCurAvatar()
           != other.getIsPlayerCurAvatar()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
       if (getIsOnScene()
           != other.getIsOnScene()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -910,6 +906,19 @@ public final class SceneTeamAvatarOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + IS_RECONNECT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsReconnect());
+      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();
+      }
+      if (hasAvatarInfo()) {
+        hash = (37 * hash) + AVATAR_INFO_FIELD_NUMBER;
+        hash = (53 * hash) + getAvatarInfo().hashCode();
+      }
       if (hasSceneEntityInfo()) {
         hash = (37 * hash) + SCENE_ENTITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSceneEntityInfo().hashCode();
@@ -918,39 +927,23 @@ public final class SceneTeamAvatarOuterClass {
       hash = (53 * hash) + getWeaponEntityId();
       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());
-      if (hasWeaponAbilityInfo()) {
-        hash = (37 * hash) + WEAPON_ABILITY_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getWeaponAbilityInfo().hashCode();
-      }
-      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();
-      }
-      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getWeaponGuid());
-      if (hasAvatarInfo()) {
-        hash = (37 * hash) + AVATAR_INFO_FIELD_NUMBER;
-        hash = (53 * hash) + getAvatarInfo().hashCode();
-      }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getAvatarGuid());
       if (hasAbilityControlBlock()) {
         hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
         hash = (53 * hash) + getAbilityControlBlock().hashCode();
       }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getWeaponGuid());
+      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 (hasSceneAvatarInfo()) {
         hash = (37 * hash) + SCENE_AVATAR_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getSceneAvatarInfo().hashCode();
@@ -958,6 +951,9 @@ public final class SceneTeamAvatarOuterClass {
       hash = (37 * hash) + IS_PLAYER_CUR_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsPlayerCurAvatar());
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
       hash = (37 * hash) + IS_ON_SCENE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsOnScene());
@@ -1057,10 +1053,6 @@ public final class SceneTeamAvatarOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EOCBJIPDPMB
-     * </pre>
-     *
      * Protobuf type {@code SceneTeamAvatar}
      */
     public static final class Builder extends
@@ -1099,6 +1091,22 @@ public final class SceneTeamAvatarOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        isReconnect_ = false;
+
+        sceneId_ = 0;
+
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          serverBuffListBuilder_.clear();
+        }
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = null;
+        } else {
+          avatarInfo_ = null;
+          avatarInfoBuilder_ = null;
+        }
         if (sceneEntityInfoBuilder_ == null) {
           sceneEntityInfo_ = null;
         } else {
@@ -1109,46 +1117,28 @@ public final class SceneTeamAvatarOuterClass {
 
         playerUid_ = 0;
 
-        isReconnect_ = false;
-
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfo_ = null;
-        } else {
-          weaponAbilityInfo_ = null;
-          weaponAbilityInfoBuilder_ = null;
-        }
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          serverBuffListBuilder_.clear();
-        }
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
-        } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
-        }
-        weaponGuid_ = 0L;
-
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = null;
-        } else {
-          avatarInfo_ = null;
-          avatarInfoBuilder_ = null;
-        }
-        entityId_ = 0;
-
-        avatarGuid_ = 0L;
-
         if (abilityControlBlockBuilder_ == null) {
           abilityControlBlock_ = null;
         } else {
           abilityControlBlock_ = null;
           abilityControlBlockBuilder_ = null;
         }
-        sceneId_ = 0;
+        entityId_ = 0;
 
+        weaponGuid_ = 0L;
+
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = null;
+        } else {
+          avatarAbilityInfo_ = null;
+          avatarAbilityInfoBuilder_ = null;
+        }
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfo_ = null;
+        } else {
+          weaponAbilityInfo_ = null;
+          weaponAbilityInfoBuilder_ = null;
+        }
         if (sceneAvatarInfoBuilder_ == null) {
           sceneAvatarInfo_ = null;
         } else {
@@ -1157,6 +1147,8 @@ public final class SceneTeamAvatarOuterClass {
         }
         isPlayerCurAvatar_ = false;
 
+        avatarGuid_ = 0L;
+
         isOnScene_ = false;
 
         return this;
@@ -1186,19 +1178,8 @@ public final class SceneTeamAvatarOuterClass {
       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_;
-        } else {
-          result.sceneEntityInfo_ = sceneEntityInfoBuilder_.build();
-        }
-        result.weaponEntityId_ = weaponEntityId_;
-        result.playerUid_ = playerUid_;
         result.isReconnect_ = isReconnect_;
-        if (weaponAbilityInfoBuilder_ == null) {
-          result.weaponAbilityInfo_ = weaponAbilityInfo_;
-        } else {
-          result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
-        }
+        result.sceneId_ = sceneId_;
         if (serverBuffListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
@@ -1208,31 +1189,42 @@ public final class SceneTeamAvatarOuterClass {
         } else {
           result.serverBuffList_ = serverBuffListBuilder_.build();
         }
-        if (avatarAbilityInfoBuilder_ == null) {
-          result.avatarAbilityInfo_ = avatarAbilityInfo_;
-        } else {
-          result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
-        }
-        result.weaponGuid_ = weaponGuid_;
         if (avatarInfoBuilder_ == null) {
           result.avatarInfo_ = avatarInfo_;
         } else {
           result.avatarInfo_ = avatarInfoBuilder_.build();
         }
-        result.entityId_ = entityId_;
-        result.avatarGuid_ = avatarGuid_;
+        if (sceneEntityInfoBuilder_ == null) {
+          result.sceneEntityInfo_ = sceneEntityInfo_;
+        } else {
+          result.sceneEntityInfo_ = sceneEntityInfoBuilder_.build();
+        }
+        result.weaponEntityId_ = weaponEntityId_;
+        result.playerUid_ = playerUid_;
         if (abilityControlBlockBuilder_ == null) {
           result.abilityControlBlock_ = abilityControlBlock_;
         } else {
           result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
         }
-        result.sceneId_ = sceneId_;
+        result.entityId_ = entityId_;
+        result.weaponGuid_ = weaponGuid_;
+        if (avatarAbilityInfoBuilder_ == null) {
+          result.avatarAbilityInfo_ = avatarAbilityInfo_;
+        } else {
+          result.avatarAbilityInfo_ = avatarAbilityInfoBuilder_.build();
+        }
+        if (weaponAbilityInfoBuilder_ == null) {
+          result.weaponAbilityInfo_ = weaponAbilityInfo_;
+        } else {
+          result.weaponAbilityInfo_ = weaponAbilityInfoBuilder_.build();
+        }
         if (sceneAvatarInfoBuilder_ == null) {
           result.sceneAvatarInfo_ = sceneAvatarInfo_;
         } else {
           result.sceneAvatarInfo_ = sceneAvatarInfoBuilder_.build();
         }
         result.isPlayerCurAvatar_ = isPlayerCurAvatar_;
+        result.avatarGuid_ = avatarGuid_;
         result.isOnScene_ = isOnScene_;
         onBuilt();
         return result;
@@ -1282,20 +1274,11 @@ public final class SceneTeamAvatarOuterClass {
 
       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.getWeaponEntityId() != 0) {
-          setWeaponEntityId(other.getWeaponEntityId());
-        }
-        if (other.getPlayerUid() != 0) {
-          setPlayerUid(other.getPlayerUid());
-        }
         if (other.getIsReconnect() != false) {
           setIsReconnect(other.getIsReconnect());
         }
-        if (other.hasWeaponAbilityInfo()) {
-          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
         }
         if (serverBuffListBuilder_ == null) {
           if (!other.serverBuffList_.isEmpty()) {
@@ -1323,26 +1306,32 @@ public final class SceneTeamAvatarOuterClass {
             }
           }
         }
-        if (other.hasAvatarAbilityInfo()) {
-          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
-        }
-        if (other.getWeaponGuid() != 0L) {
-          setWeaponGuid(other.getWeaponGuid());
-        }
         if (other.hasAvatarInfo()) {
           mergeAvatarInfo(other.getAvatarInfo());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
+        if (other.hasSceneEntityInfo()) {
+          mergeSceneEntityInfo(other.getSceneEntityInfo());
         }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
+        if (other.getWeaponEntityId() != 0) {
+          setWeaponEntityId(other.getWeaponEntityId());
+        }
+        if (other.getPlayerUid() != 0) {
+          setPlayerUid(other.getPlayerUid());
         }
         if (other.hasAbilityControlBlock()) {
           mergeAbilityControlBlock(other.getAbilityControlBlock());
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.getWeaponGuid() != 0L) {
+          setWeaponGuid(other.getWeaponGuid());
+        }
+        if (other.hasAvatarAbilityInfo()) {
+          mergeAvatarAbilityInfo(other.getAvatarAbilityInfo());
+        }
+        if (other.hasWeaponAbilityInfo()) {
+          mergeWeaponAbilityInfo(other.getWeaponAbilityInfo());
         }
         if (other.hasSceneAvatarInfo()) {
           mergeSceneAvatarInfo(other.getSceneAvatarInfo());
@@ -1350,6 +1339,9 @@ public final class SceneTeamAvatarOuterClass {
         if (other.getIsPlayerCurAvatar() != false) {
           setIsPlayerCurAvatar(other.getIsPlayerCurAvatar());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
         if (other.getIsOnScene() != false) {
           setIsOnScene(other.getIsOnScene());
         }
@@ -1383,190 +1375,9 @@ public final class SceneTeamAvatarOuterClass {
       }
       private int bitField0_;
 
-      private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
-      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_;
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       * @return Whether the sceneEntityInfo field is set.
-       */
-      public boolean hasSceneEntityInfo() {
-        return sceneEntityInfoBuilder_ != null || sceneEntityInfo_ != null;
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       * @return The sceneEntityInfo.
-       */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
-        if (sceneEntityInfoBuilder_ == null) {
-          return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
-        } else {
-          return sceneEntityInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       */
-      public Builder setSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
-        if (sceneEntityInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          sceneEntityInfo_ = value;
-          onChanged();
-        } else {
-          sceneEntityInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       */
-      public Builder setSceneEntityInfo(
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          sceneEntityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</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();
-          } else {
-            sceneEntityInfo_ = value;
-          }
-          onChanged();
-        } else {
-          sceneEntityInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       */
-      public Builder clearSceneEntityInfo() {
-        if (sceneEntityInfoBuilder_ == null) {
-          sceneEntityInfo_ = null;
-          onChanged();
-        } else {
-          sceneEntityInfo_ = null;
-          sceneEntityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getSceneEntityInfoBuilder() {
-        
-        onChanged();
-        return getSceneEntityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</code>
-       */
-      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
-        if (sceneEntityInfoBuilder_ != null) {
-          return sceneEntityInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return sceneEntityInfo_ == null ?
-              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
-        }
-      }
-      /**
-       * <code>.SceneEntityInfo scene_entity_info = 4;</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(),
-                  getParentForChildren(),
-                  isClean());
-          sceneEntityInfo_ = null;
-        }
-        return sceneEntityInfoBuilder_;
-      }
-
-      private int weaponEntityId_ ;
-      /**
-       * <code>uint32 weapon_entity_id = 8;</code>
-       * @return The weaponEntityId.
-       */
-      @java.lang.Override
-      public int getWeaponEntityId() {
-        return weaponEntityId_;
-      }
-      /**
-       * <code>uint32 weapon_entity_id = 8;</code>
-       * @param value The weaponEntityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setWeaponEntityId(int value) {
-        
-        weaponEntityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 weapon_entity_id = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponEntityId() {
-        
-        weaponEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int playerUid_ ;
-      /**
-       * <code>uint32 player_uid = 3;</code>
-       * @return The playerUid.
-       */
-      @java.lang.Override
-      public int getPlayerUid() {
-        return playerUid_;
-      }
-      /**
-       * <code>uint32 player_uid = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPlayerUid() {
-        
-        playerUid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isReconnect_ ;
       /**
-       * <code>bool is_reconnect = 15;</code>
+       * <code>bool is_reconnect = 1;</code>
        * @return The isReconnect.
        */
       @java.lang.Override
@@ -1574,7 +1385,7 @@ public final class SceneTeamAvatarOuterClass {
         return isReconnect_;
       }
       /**
-       * <code>bool is_reconnect = 15;</code>
+       * <code>bool is_reconnect = 1;</code>
        * @param value The isReconnect to set.
        * @return This builder for chaining.
        */
@@ -1585,7 +1396,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>bool is_reconnect = 15;</code>
+       * <code>bool is_reconnect = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsReconnect() {
@@ -1595,815 +1406,6 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
-      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>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       * @return Whether the weaponAbilityInfo field is set.
-       */
-      public boolean hasWeaponAbilityInfo() {
-        return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       * @return The weaponAbilityInfo.
-       */
-      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>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       */
-      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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       */
-      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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       */
-      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>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       */
-      public Builder clearWeaponAbilityInfo() {
-        if (weaponAbilityInfoBuilder_ == null) {
-          weaponAbilityInfo_ = null;
-          onChanged();
-        } else {
-          weaponAbilityInfo_ = null;
-          weaponAbilityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
-        
-        onChanged();
-        return getWeaponAbilityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</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_;
-        }
-      }
-      /**
-       * <code>.AbilitySyncStateInfo weapon_ability_info = 11;</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_ =
-        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>repeated .ServerBuff server_buff_list = 10;</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 = 10;</code>
-       */
-      public int getServerBuffListCount() {
-        if (serverBuffListBuilder_ == null) {
-          return serverBuffList_.size();
-        } else {
-          return serverBuffListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</code>
-       */
-      public Builder clearServerBuffList() {
-        if (serverBuffListBuilder_ == null) {
-          serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          serverBuffListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 10;</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 = 10;</code>
-       */
-      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
-          int index) {
-        return getServerBuffListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ServerBuff server_buff_list = 10;</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 = 10;</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 = 10;</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 = 10;</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 = 10;</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 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 = 7;</code>
-       * @return Whether the avatarAbilityInfo field is set.
-       */
-      public boolean hasAvatarAbilityInfo() {
-        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       * @return The avatarAbilityInfo.
-       */
-      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>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       */
-      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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       */
-      public Builder setAvatarAbilityInfo(
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</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;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       */
-      public Builder clearAvatarAbilityInfo() {
-        if (avatarAbilityInfoBuilder_ == null) {
-          avatarAbilityInfo_ = null;
-          onChanged();
-        } else {
-          avatarAbilityInfo_ = null;
-          avatarAbilityInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</code>
-       */
-      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
-        
-        onChanged();
-        return getAvatarAbilityInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilitySyncStateInfo avatar_ability_info = 7;</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 = 7;</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 long weaponGuid_ ;
-      /**
-       * <code>uint64 weapon_guid = 5;</code>
-       * @return The weaponGuid.
-       */
-      @java.lang.Override
-      public long getWeaponGuid() {
-        return weaponGuid_;
-      }
-      /**
-       * <code>uint64 weapon_guid = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponGuid() {
-        
-        weaponGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
-      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_;
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       * @return Whether the avatarInfo field is set.
-       */
-      public boolean hasAvatarInfo() {
-        return avatarInfoBuilder_ != null || avatarInfo_ != null;
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       * @return The avatarInfo.
-       */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
-        if (avatarInfoBuilder_ == null) {
-          return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
-        } else {
-          return avatarInfoBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       */
-      public Builder setAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
-        if (avatarInfoBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          avatarInfo_ = value;
-          onChanged();
-        } else {
-          avatarInfoBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       */
-      public Builder setAvatarInfo(
-          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = builderForValue.build();
-          onChanged();
-        } else {
-          avatarInfoBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</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();
-          } else {
-            avatarInfo_ = value;
-          }
-          onChanged();
-        } else {
-          avatarInfoBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       */
-      public Builder clearAvatarInfo() {
-        if (avatarInfoBuilder_ == null) {
-          avatarInfo_ = null;
-          onChanged();
-        } else {
-          avatarInfo_ = null;
-          avatarInfoBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarInfoBuilder() {
-        
-        onChanged();
-        return getAvatarInfoFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</code>
-       */
-      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
-        if (avatarInfoBuilder_ != null) {
-          return avatarInfoBuilder_.getMessageOrBuilder();
-        } else {
-          return avatarInfo_ == null ?
-              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
-        }
-      }
-      /**
-       * <code>.AvatarInfo avatar_info = 6;</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(),
-                  getParentForChildren(),
-                  isClean());
-          avatarInfo_ = null;
-        }
-        return avatarInfoBuilder_;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 9;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 9;</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 = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private long avatarGuid_ ;
-      /**
-       * <code>uint64 avatar_guid = 12;</code>
-       * @return The avatarGuid.
-       */
-      @java.lang.Override
-      public long getAvatarGuid() {
-        return avatarGuid_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint64 avatar_guid = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAvatarGuid() {
-        
-        avatarGuid_ = 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 = 1;</code>
-       * @return Whether the abilityControlBlock field is set.
-       */
-      public boolean hasAbilityControlBlock() {
-        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</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 = 1;</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 = 1;</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 = 1;</code>
-       */
-      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
-        if (abilityControlBlockBuilder_ == null) {
-          if (abilityControlBlock_ != null) {
-            abilityControlBlock_ =
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
-          } else {
-            abilityControlBlock_ = value;
-          }
-          onChanged();
-        } else {
-          abilityControlBlockBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
-       */
-      public Builder clearAbilityControlBlock() {
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlock_ = null;
-          onChanged();
-        } else {
-          abilityControlBlock_ = null;
-          abilityControlBlockBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
-       */
-      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
-        
-        onChanged();
-        return getAbilityControlBlockFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</code>
-       */
-      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
-        if (abilityControlBlockBuilder_ != null) {
-          return abilityControlBlockBuilder_.getMessageOrBuilder();
-        } else {
-          return abilityControlBlock_ == null ?
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
-        }
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 1;</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> 
-          getAbilityControlBlockFieldBuilder() {
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
-                  getAbilityControlBlock(),
-                  getParentForChildren(),
-                  isClean());
-          abilityControlBlock_ = null;
-        }
-        return abilityControlBlockBuilder_;
-      }
-
       private int sceneId_ ;
       /**
        * <code>uint32 scene_id = 2;</code>
@@ -2435,18 +1437,977 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
+      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>repeated .ServerBuff server_buff_list = 3;</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 = 3;</code>
+       */
+      public int getServerBuffListCount() {
+        if (serverBuffListBuilder_ == null) {
+          return serverBuffList_.size();
+        } else {
+          return serverBuffListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</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 = 3;</code>
+       */
+      public Builder clearServerBuffList() {
+        if (serverBuffListBuilder_ == null) {
+          serverBuffList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          serverBuffListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 3;</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 = 3;</code>
+       */
+      public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder getServerBuffListBuilder(
+          int index) {
+        return getServerBuffListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ServerBuff server_buff_list = 3;</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 = 3;</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 = 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 = 3;</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 = 3;</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 emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo avatarInfo_;
+      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_;
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       * @return Whether the avatarInfo field is set.
+       */
+      public boolean hasAvatarInfo() {
+        return avatarInfoBuilder_ != null || avatarInfo_ != null;
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       * @return The avatarInfo.
+       */
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo getAvatarInfo() {
+        if (avatarInfoBuilder_ == null) {
+          return avatarInfo_ == null ? emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
+        } else {
+          return avatarInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       */
+      public Builder setAvatarInfo(emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo value) {
+        if (avatarInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          avatarInfo_ = value;
+          onChanged();
+        } else {
+          avatarInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       */
+      public Builder setAvatarInfo(
+          emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder builderForValue) {
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          avatarInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</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();
+          } else {
+            avatarInfo_ = value;
+          }
+          onChanged();
+        } else {
+          avatarInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       */
+      public Builder clearAvatarInfo() {
+        if (avatarInfoBuilder_ == null) {
+          avatarInfo_ = null;
+          onChanged();
+        } else {
+          avatarInfo_ = null;
+          avatarInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       */
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.Builder getAvatarInfoBuilder() {
+        
+        onChanged();
+        return getAvatarInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</code>
+       */
+      public emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfoOrBuilder getAvatarInfoOrBuilder() {
+        if (avatarInfoBuilder_ != null) {
+          return avatarInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return avatarInfo_ == null ?
+              emu.grasscutter.net.proto.AvatarInfoOuterClass.AvatarInfo.getDefaultInstance() : avatarInfo_;
+        }
+      }
+      /**
+       * <code>.AvatarInfo avatar_info = 4;</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(),
+                  getParentForChildren(),
+                  isClean());
+          avatarInfo_ = null;
+        }
+        return avatarInfoBuilder_;
+      }
+
+      private emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo sceneEntityInfo_;
+      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_;
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       * @return Whether the sceneEntityInfo field is set.
+       */
+      public boolean hasSceneEntityInfo() {
+        return sceneEntityInfoBuilder_ != null || sceneEntityInfo_ != null;
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       * @return The sceneEntityInfo.
+       */
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo getSceneEntityInfo() {
+        if (sceneEntityInfoBuilder_ == null) {
+          return sceneEntityInfo_ == null ? emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+        } else {
+          return sceneEntityInfoBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       */
+      public Builder setSceneEntityInfo(emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo value) {
+        if (sceneEntityInfoBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          sceneEntityInfo_ = value;
+          onChanged();
+        } else {
+          sceneEntityInfoBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       */
+      public Builder setSceneEntityInfo(
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder builderForValue) {
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          sceneEntityInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</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();
+          } else {
+            sceneEntityInfo_ = value;
+          }
+          onChanged();
+        } else {
+          sceneEntityInfoBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       */
+      public Builder clearSceneEntityInfo() {
+        if (sceneEntityInfoBuilder_ == null) {
+          sceneEntityInfo_ = null;
+          onChanged();
+        } else {
+          sceneEntityInfo_ = null;
+          sceneEntityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       */
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.Builder getSceneEntityInfoBuilder() {
+        
+        onChanged();
+        return getSceneEntityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</code>
+       */
+      public emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfoOrBuilder getSceneEntityInfoOrBuilder() {
+        if (sceneEntityInfoBuilder_ != null) {
+          return sceneEntityInfoBuilder_.getMessageOrBuilder();
+        } else {
+          return sceneEntityInfo_ == null ?
+              emu.grasscutter.net.proto.SceneEntityInfoOuterClass.SceneEntityInfo.getDefaultInstance() : sceneEntityInfo_;
+        }
+      }
+      /**
+       * <code>.SceneEntityInfo scene_entity_info = 5;</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(),
+                  getParentForChildren(),
+                  isClean());
+          sceneEntityInfo_ = null;
+        }
+        return sceneEntityInfoBuilder_;
+      }
+
+      private int weaponEntityId_ ;
+      /**
+       * <code>uint32 weapon_entity_id = 6;</code>
+       * @return The weaponEntityId.
+       */
+      @java.lang.Override
+      public int getWeaponEntityId() {
+        return weaponEntityId_;
+      }
+      /**
+       * <code>uint32 weapon_entity_id = 6;</code>
+       * @param value The weaponEntityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setWeaponEntityId(int value) {
+        
+        weaponEntityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 weapon_entity_id = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeaponEntityId() {
+        
+        weaponEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int playerUid_ ;
+      /**
+       * <code>uint32 player_uid = 7;</code>
+       * @return The playerUid.
+       */
+      @java.lang.Override
+      public int getPlayerUid() {
+        return playerUid_;
+      }
+      /**
+       * <code>uint32 player_uid = 7;</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 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPlayerUid() {
+        
+        playerUid_ = 0;
+        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 = 8;</code>
+       * @return Whether the abilityControlBlock field is set.
+       */
+      public boolean hasAbilityControlBlock() {
+        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 8;</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 = 8;</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 = 8;</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 = 8;</code>
+       */
+      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
+        if (abilityControlBlockBuilder_ == null) {
+          if (abilityControlBlock_ != null) {
+            abilityControlBlock_ =
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
+          } else {
+            abilityControlBlock_ = value;
+          }
+          onChanged();
+        } else {
+          abilityControlBlockBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 8;</code>
+       */
+      public Builder clearAbilityControlBlock() {
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlock_ = null;
+          onChanged();
+        } else {
+          abilityControlBlock_ = null;
+          abilityControlBlockBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 8;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
+        
+        onChanged();
+        return getAbilityControlBlockFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 8;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
+        if (abilityControlBlockBuilder_ != null) {
+          return abilityControlBlockBuilder_.getMessageOrBuilder();
+        } else {
+          return abilityControlBlock_ == null ?
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+        }
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 8;</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> 
+          getAbilityControlBlockFieldBuilder() {
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
+                  getAbilityControlBlock(),
+                  getParentForChildren(),
+                  isClean());
+          abilityControlBlock_ = null;
+        }
+        return abilityControlBlockBuilder_;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long weaponGuid_ ;
+      /**
+       * <code>uint64 weapon_guid = 10;</code>
+       * @return The weaponGuid.
+       */
+      @java.lang.Override
+      public long getWeaponGuid() {
+        return weaponGuid_;
+      }
+      /**
+       * <code>uint64 weapon_guid = 10;</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 = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearWeaponGuid() {
+        
+        weaponGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      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 = 11;</code>
+       * @return Whether the avatarAbilityInfo field is set.
+       */
+      public boolean hasAvatarAbilityInfo() {
+        return avatarAbilityInfoBuilder_ != null || avatarAbilityInfo_ != null;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+       * @return The avatarAbilityInfo.
+       */
+      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>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+       */
+      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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+       */
+      public Builder setAvatarAbilityInfo(
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = builderForValue.build();
+          onChanged();
+        } else {
+          avatarAbilityInfoBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+       */
+      public Builder clearAvatarAbilityInfo() {
+        if (avatarAbilityInfoBuilder_ == null) {
+          avatarAbilityInfo_ = null;
+          onChanged();
+        } else {
+          avatarAbilityInfo_ = null;
+          avatarAbilityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getAvatarAbilityInfoBuilder() {
+        
+        onChanged();
+        return getAvatarAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilitySyncStateInfo avatar_ability_info = 11;</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 = 11;</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 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>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       * @return Whether the weaponAbilityInfo field is set.
+       */
+      public boolean hasWeaponAbilityInfo() {
+        return weaponAbilityInfoBuilder_ != null || weaponAbilityInfo_ != null;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       * @return The weaponAbilityInfo.
+       */
+      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>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       */
+      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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       */
+      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;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       */
+      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>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       */
+      public Builder clearWeaponAbilityInfo() {
+        if (weaponAbilityInfoBuilder_ == null) {
+          weaponAbilityInfo_ = null;
+          onChanged();
+        } else {
+          weaponAbilityInfo_ = null;
+          weaponAbilityInfoBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</code>
+       */
+      public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getWeaponAbilityInfoBuilder() {
+        
+        onChanged();
+        return getWeaponAbilityInfoFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</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_;
+        }
+      }
+      /**
+       * <code>.AbilitySyncStateInfo weapon_ability_info = 12;</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 emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo sceneAvatarInfo_;
       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_;
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        * @return Whether the sceneAvatarInfo field is set.
        */
       public boolean hasSceneAvatarInfo() {
         return sceneAvatarInfoBuilder_ != null || sceneAvatarInfo_ != null;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        * @return The sceneAvatarInfo.
        */
       public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo getSceneAvatarInfo() {
@@ -2457,7 +2418,7 @@ public final class SceneTeamAvatarOuterClass {
         }
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public Builder setSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
         if (sceneAvatarInfoBuilder_ == null) {
@@ -2473,7 +2434,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public Builder setSceneAvatarInfo(
           emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder builderForValue) {
@@ -2487,7 +2448,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public Builder mergeSceneAvatarInfo(emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo value) {
         if (sceneAvatarInfoBuilder_ == null) {
@@ -2505,7 +2466,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public Builder clearSceneAvatarInfo() {
         if (sceneAvatarInfoBuilder_ == null) {
@@ -2519,7 +2480,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfo.Builder getSceneAvatarInfoBuilder() {
         
@@ -2527,7 +2488,7 @@ public final class SceneTeamAvatarOuterClass {
         return getSceneAvatarInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</code>
        */
       public emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.SceneAvatarInfoOrBuilder getSceneAvatarInfoOrBuilder() {
         if (sceneAvatarInfoBuilder_ != null) {
@@ -2538,7 +2499,7 @@ public final class SceneTeamAvatarOuterClass {
         }
       }
       /**
-       * <code>.SceneAvatarInfo scene_avatar_info = 14;</code>
+       * <code>.SceneAvatarInfo scene_avatar_info = 13;</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> 
@@ -2556,7 +2517,7 @@ public final class SceneTeamAvatarOuterClass {
 
       private boolean isPlayerCurAvatar_ ;
       /**
-       * <code>bool is_player_cur_avatar = 1765;</code>
+       * <code>bool is_player_cur_avatar = 14;</code>
        * @return The isPlayerCurAvatar.
        */
       @java.lang.Override
@@ -2564,7 +2525,7 @@ public final class SceneTeamAvatarOuterClass {
         return isPlayerCurAvatar_;
       }
       /**
-       * <code>bool is_player_cur_avatar = 1765;</code>
+       * <code>bool is_player_cur_avatar = 14;</code>
        * @param value The isPlayerCurAvatar to set.
        * @return This builder for chaining.
        */
@@ -2575,7 +2536,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>bool is_player_cur_avatar = 1765;</code>
+       * <code>bool is_player_cur_avatar = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPlayerCurAvatar() {
@@ -2585,9 +2546,40 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
 
+      private long avatarGuid_ ;
+      /**
+       * <code>uint64 avatar_guid = 15;</code>
+       * @return The avatarGuid.
+       */
+      @java.lang.Override
+      public long getAvatarGuid() {
+        return avatarGuid_;
+      }
+      /**
+       * <code>uint64 avatar_guid = 15;</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 = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAvatarGuid() {
+        
+        avatarGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private boolean isOnScene_ ;
       /**
-       * <code>bool is_on_scene = 13;</code>
+       * <code>bool is_on_scene = 588;</code>
        * @return The isOnScene.
        */
       @java.lang.Override
@@ -2595,7 +2587,7 @@ public final class SceneTeamAvatarOuterClass {
         return isOnScene_;
       }
       /**
-       * <code>bool is_on_scene = 13;</code>
+       * <code>bool is_on_scene = 588;</code>
        * @param value The isOnScene to set.
        * @return This builder for chaining.
        */
@@ -2606,7 +2598,7 @@ public final class SceneTeamAvatarOuterClass {
         return this;
       }
       /**
-       * <code>bool is_on_scene = 13;</code>
+       * <code>bool is_on_scene = 588;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsOnScene() {
@@ -2682,34 +2674,34 @@ public final class SceneTeamAvatarOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025SceneTeamAvatar.proto\032\025SceneEntityInfo" +
-      ".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\004 \001(\0132\020.SceneEntityInfo\022\030\n\020weapon_enti" +
-      "ty_id\030\010 \001(\r\022\022\n\nplayer_uid\030\003 \001(\r\022\024\n\014is_re" +
-      "connect\030\017 \001(\010\0222\n\023weapon_ability_info\030\013 \001" +
-      "(\0132\025.AbilitySyncStateInfo\022%\n\020server_buff" +
-      "_list\030\n \003(\0132\013.ServerBuff\0222\n\023avatar_abili" +
-      "ty_info\030\007 \001(\0132\025.AbilitySyncStateInfo\022\023\n\013" +
-      "weapon_guid\030\005 \001(\004\022 \n\013avatar_info\030\006 \001(\0132\013" +
-      ".AvatarInfo\022\021\n\tentity_id\030\t \001(\r\022\023\n\013avatar" +
-      "_guid\030\014 \001(\004\0223\n\025ability_control_block\030\001 \001" +
-      "(\0132\024.AbilityControlBlock\022\020\n\010scene_id\030\002 \001" +
-      "(\r\022+\n\021scene_avatar_info\030\016 \001(\0132\020.SceneAva" +
-      "tarInfo\022\035\n\024is_player_cur_avatar\030\345\r \001(\010\022\023" +
-      "\n\013is_on_scene\030\r \001(\010B\033\n\031emu.grasscutter.n" +
+      "\n\025SceneTeamAvatar.proto\032\020ServerBuff.prot" +
+      "o\032\020AvatarInfo.proto\032\025SceneEntityInfo.pro" +
+      "to\032\031AbilityControlBlock.proto\032\032AbilitySy" +
+      "ncStateInfo.proto\032\025SceneAvatarInfo.proto" +
+      "\"\230\004\n\017SceneTeamAvatar\022\024\n\014is_reconnect\030\001 \001" +
+      "(\010\022\020\n\010scene_id\030\002 \001(\r\022%\n\020server_buff_list" +
+      "\030\003 \003(\0132\013.ServerBuff\022 \n\013avatar_info\030\004 \001(\013" +
+      "2\013.AvatarInfo\022+\n\021scene_entity_info\030\005 \001(\013" +
+      "2\020.SceneEntityInfo\022\030\n\020weapon_entity_id\030\006" +
+      " \001(\r\022\022\n\nplayer_uid\030\007 \001(\r\0223\n\025ability_cont" +
+      "rol_block\030\010 \001(\0132\024.AbilityControlBlock\022\021\n" +
+      "\tentity_id\030\t \001(\r\022\023\n\013weapon_guid\030\n \001(\004\0222\n" +
+      "\023avatar_ability_info\030\013 \001(\0132\025.AbilitySync" +
+      "StateInfo\0222\n\023weapon_ability_info\030\014 \001(\0132\025" +
+      ".AbilitySyncStateInfo\022+\n\021scene_avatar_in" +
+      "fo\030\r \001(\0132\020.SceneAvatarInfo\022\034\n\024is_player_" +
+      "cur_avatar\030\016 \001(\010\022\023\n\013avatar_guid\030\017 \001(\004\022\024\n" +
+      "\013is_on_scene\030\314\004 \001(\010B\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.getDescriptor(),
         });
     internal_static_SceneTeamAvatar_descriptor =
@@ -2717,12 +2709,12 @@ public final class SceneTeamAvatarOuterClass {
     internal_static_SceneTeamAvatar_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTeamAvatar_descriptor,
-        new java.lang.String[] { "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "IsReconnect", "WeaponAbilityInfo", "ServerBuffList", "AvatarAbilityInfo", "WeaponGuid", "AvatarInfo", "EntityId", "AvatarGuid", "AbilityControlBlock", "SceneId", "SceneAvatarInfo", "IsPlayerCurAvatar", "IsOnScene", });
-    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "IsReconnect", "SceneId", "ServerBuffList", "AvatarInfo", "SceneEntityInfo", "WeaponEntityId", "PlayerUid", "AbilityControlBlock", "EntityId", "WeaponGuid", "AvatarAbilityInfo", "WeaponAbilityInfo", "SceneAvatarInfo", "IsPlayerCurAvatar", "AvatarGuid", "IsOnScene", });
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.SceneEntityInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SceneAvatarInfoOuterClass.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 8d339fa4d..a8805af0d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTeamUpdateNotifyOuterClass.java
@@ -19,41 +19,36 @@ public final class SceneTeamUpdateNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_in_mp = 4;</code>
-     * @return The isInMp.
-     */
-    boolean getIsInMp();
-
-    /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> 
         getSceneTeamAvatarListList();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index);
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     int getSceneTeamAvatarListCount();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
         getSceneTeamAvatarListOrBuilderList();
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
         int index);
+
+    /**
+     * <code>bool is_in_mp = 11;</code>
+     * @return The isInMp.
+     */
+    boolean getIsInMp();
   }
   /**
-   * <pre>
-   * CmdId: 4509
-   * Obf: CJJPNPLKBCA
-   * </pre>
-   *
    * Protobuf type {@code SceneTeamUpdateNotify}
    */
   public static final class SceneTeamUpdateNotify extends
@@ -100,12 +95,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              isInMp_ = input.readBool();
-              break;
-            }
-            case 106: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 sceneTeamAvatarList_ = new java.util.ArrayList<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar>();
                 mutable_bitField0_ |= 0x00000001;
@@ -114,6 +104,11 @@ public final class SceneTeamUpdateNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.parser(), extensionRegistry));
               break;
             }
+            case 88: {
+
+              isInMp_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,28 +144,17 @@ public final class SceneTeamUpdateNotifyOuterClass {
               emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.class, emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.Builder.class);
     }
 
-    public static final int IS_IN_MP_FIELD_NUMBER = 4;
-    private boolean isInMp_;
-    /**
-     * <code>bool is_in_mp = 4;</code>
-     * @return The isInMp.
-     */
-    @java.lang.Override
-    public boolean getIsInMp() {
-      return isInMp_;
-    }
-
-    public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 13;
+    public static final int SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_;
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
       return sceneTeamAvatarList_;
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
@@ -178,21 +162,21 @@ public final class SceneTeamUpdateNotifyOuterClass {
       return sceneTeamAvatarList_;
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     @java.lang.Override
     public int getSceneTeamAvatarListCount() {
       return sceneTeamAvatarList_.size();
     }
     /**
-     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</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 = 13;</code>
+     * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
@@ -200,6 +184,17 @@ public final class SceneTeamUpdateNotifyOuterClass {
       return sceneTeamAvatarList_.get(index);
     }
 
+    public static final int IS_IN_MP_FIELD_NUMBER = 11;
+    private boolean isInMp_;
+    /**
+     * <code>bool is_in_mp = 11;</code>
+     * @return The isInMp.
+     */
+    @java.lang.Override
+    public boolean getIsInMp() {
+      return isInMp_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class SceneTeamUpdateNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isInMp_ != false) {
-        output.writeBool(4, isInMp_);
-      }
       for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
-        output.writeMessage(13, sceneTeamAvatarList_.get(i));
+        output.writeMessage(5, sceneTeamAvatarList_.get(i));
+      }
+      if (isInMp_ != false) {
+        output.writeBool(11, isInMp_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class SceneTeamUpdateNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isInMp_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(4, isInMp_);
-      }
       for (int i = 0; i < sceneTeamAvatarList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, sceneTeamAvatarList_.get(i));
+          .computeMessageSize(5, sceneTeamAvatarList_.get(i));
+      }
+      if (isInMp_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isInMp_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class SceneTeamUpdateNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify other = (emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify) obj;
 
-      if (getIsInMp()
-          != other.getIsInMp()) return false;
       if (!getSceneTeamAvatarListList()
           .equals(other.getSceneTeamAvatarListList())) return false;
+      if (getIsInMp()
+          != other.getIsInMp()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,13 +262,13 @@ public final class SceneTeamUpdateNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_IN_MP_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsInMp());
       if (getSceneTeamAvatarListCount() > 0) {
         hash = (37 * hash) + SCENE_TEAM_AVATAR_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getSceneTeamAvatarListList().hashCode();
       }
+      hash = (37 * hash) + IS_IN_MP_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsInMp());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -370,11 +365,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4509
-     * Obf: CJJPNPLKBCA
-     * </pre>
-     *
      * Protobuf type {@code SceneTeamUpdateNotify}
      */
     public static final class Builder extends
@@ -413,14 +403,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isInMp_ = false;
-
         if (sceneTeamAvatarListBuilder_ == null) {
           sceneTeamAvatarList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           sceneTeamAvatarListBuilder_.clear();
         }
+        isInMp_ = false;
+
         return this;
       }
 
@@ -448,7 +438,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
       public emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify buildPartial() {
         emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify result = new emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify(this);
         int from_bitField0_ = bitField0_;
-        result.isInMp_ = isInMp_;
         if (sceneTeamAvatarListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             sceneTeamAvatarList_ = java.util.Collections.unmodifiableList(sceneTeamAvatarList_);
@@ -458,6 +447,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         } else {
           result.sceneTeamAvatarList_ = sceneTeamAvatarListBuilder_.build();
         }
+        result.isInMp_ = isInMp_;
         onBuilt();
         return result;
       }
@@ -506,9 +496,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify other) {
         if (other == emu.grasscutter.net.proto.SceneTeamUpdateNotifyOuterClass.SceneTeamUpdateNotify.getDefaultInstance()) return this;
-        if (other.getIsInMp() != false) {
-          setIsInMp(other.getIsInMp());
-        }
         if (sceneTeamAvatarListBuilder_ == null) {
           if (!other.sceneTeamAvatarList_.isEmpty()) {
             if (sceneTeamAvatarList_.isEmpty()) {
@@ -535,6 +522,9 @@ public final class SceneTeamUpdateNotifyOuterClass {
             }
           }
         }
+        if (other.getIsInMp() != false) {
+          setIsInMp(other.getIsInMp());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -565,37 +555,6 @@ public final class SceneTeamUpdateNotifyOuterClass {
       }
       private int bitField0_;
 
-      private boolean isInMp_ ;
-      /**
-       * <code>bool is_in_mp = 4;</code>
-       * @return The isInMp.
-       */
-      @java.lang.Override
-      public boolean getIsInMp() {
-        return isInMp_;
-      }
-      /**
-       * <code>bool is_in_mp = 4;</code>
-       * @param value The isInMp to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsInMp(boolean value) {
-        
-        isInMp_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_in_mp = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsInMp() {
-        
-        isInMp_ = false;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> sceneTeamAvatarList_ =
         java.util.Collections.emptyList();
       private void ensureSceneTeamAvatarListIsMutable() {
@@ -609,7 +568,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
           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 = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> getSceneTeamAvatarListList() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -619,7 +578,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public int getSceneTeamAvatarListCount() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -629,7 +588,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar getSceneTeamAvatarList(int index) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -639,7 +598,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder setSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -656,7 +615,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder setSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -670,7 +629,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder addSceneTeamAvatarList(emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -686,7 +645,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder addSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar value) {
@@ -703,7 +662,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder addSceneTeamAvatarList(
           emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -717,7 +676,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder addSceneTeamAvatarList(
           int index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder builderForValue) {
@@ -731,7 +690,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder addAllSceneTeamAvatarList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar> values) {
@@ -746,7 +705,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder clearSceneTeamAvatarList() {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -759,7 +718,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public Builder removeSceneTeamAvatarList(int index) {
         if (sceneTeamAvatarListBuilder_ == null) {
@@ -772,14 +731,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder getSceneTeamAvatarListBuilder(
           int index) {
         return getSceneTeamAvatarListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder getSceneTeamAvatarListOrBuilder(
           int index) {
@@ -789,7 +748,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatarOrBuilder> 
            getSceneTeamAvatarListOrBuilderList() {
@@ -800,14 +759,14 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</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 = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder addSceneTeamAvatarListBuilder(
           int index) {
@@ -815,7 +774,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
             index, emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.getDefaultInstance());
       }
       /**
-       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 13;</code>
+       * <code>repeated .SceneTeamAvatar scene_team_avatar_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.SceneTeamAvatar.Builder> 
            getSceneTeamAvatarListBuilderList() {
@@ -835,6 +794,37 @@ public final class SceneTeamUpdateNotifyOuterClass {
         }
         return sceneTeamAvatarListBuilder_;
       }
+
+      private boolean isInMp_ ;
+      /**
+       * <code>bool is_in_mp = 11;</code>
+       * @return The isInMp.
+       */
+      @java.lang.Override
+      public boolean getIsInMp() {
+        return isInMp_;
+      }
+      /**
+       * <code>bool is_in_mp = 11;</code>
+       * @param value The isInMp to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsInMp(boolean value) {
+        
+        isInMp_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_in_mp = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsInMp() {
+        
+        isInMp_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +893,9 @@ public final class SceneTeamUpdateNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SceneTeamUpdateNotify.proto\032\025SceneTeam" +
-      "Avatar.proto\"[\n\025SceneTeamUpdateNotify\022\020\n" +
-      "\010is_in_mp\030\004 \001(\010\0220\n\026scene_team_avatar_lis" +
-      "t\030\r \003(\0132\020.SceneTeamAvatarB\033\n\031emu.grasscu" +
+      "Avatar.proto\"[\n\025SceneTeamUpdateNotify\0220\n" +
+      "\026scene_team_avatar_list\030\005 \003(\0132\020.SceneTea" +
+      "mAvatar\022\020\n\010is_in_mp\030\013 \001(\010B\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -918,7 +908,7 @@ public final class SceneTeamUpdateNotifyOuterClass {
     internal_static_SceneTeamUpdateNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTeamUpdateNotify_descriptor,
-        new java.lang.String[] { "IsInMp", "SceneTeamAvatarList", });
+        new java.lang.String[] { "SceneTeamAvatarList", "IsInMp", });
     emu.grasscutter.net.proto.SceneTeamAvatarOuterClass.getDescriptor();
   }
 
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 7141583ea..16a59ebd8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTimeNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class SceneTimeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 9;</code>
+     * <code>uint32 scene_id = 7;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>uint64 scene_time = 1;</code>
+     * <code>uint64 scene_time = 11;</code>
      * @return The sceneTime.
      */
     long getSceneTime();
 
     /**
-     * <code>bool is_paused = 5;</code>
+     * <code>bool is_paused = 13;</code>
      * @return The isPaused.
      */
     boolean getIsPaused();
   }
   /**
-   * <pre>
-   * CmdId: 21694
-   * Obf: EPOHGAAPIFG
-   * </pre>
-   *
    * Protobuf type {@code SceneTimeNotify}
    */
   public static final class SceneTimeNotify extends
@@ -86,21 +81,21 @@ public final class SceneTimeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 56: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               sceneTime_ = input.readUInt64();
               break;
             }
-            case 40: {
+            case 104: {
 
               isPaused_ = input.readBool();
               break;
             }
-            case 72: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class SceneTimeNotifyOuterClass {
               emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.class, emu.grasscutter.net.proto.SceneTimeNotifyOuterClass.SceneTimeNotify.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 9;
+    public static final int SCENE_ID_FIELD_NUMBER = 7;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 9;</code>
+     * <code>uint32 scene_id = 7;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class SceneTimeNotifyOuterClass {
       return sceneId_;
     }
 
-    public static final int SCENE_TIME_FIELD_NUMBER = 1;
+    public static final int SCENE_TIME_FIELD_NUMBER = 11;
     private long sceneTime_;
     /**
-     * <code>uint64 scene_time = 1;</code>
+     * <code>uint64 scene_time = 11;</code>
      * @return The sceneTime.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class SceneTimeNotifyOuterClass {
       return sceneTime_;
     }
 
-    public static final int IS_PAUSED_FIELD_NUMBER = 5;
+    public static final int IS_PAUSED_FIELD_NUMBER = 13;
     private boolean isPaused_;
     /**
-     * <code>bool is_paused = 5;</code>
+     * <code>bool is_paused = 13;</code>
      * @return The isPaused.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class SceneTimeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (sceneId_ != 0) {
+        output.writeUInt32(7, sceneId_);
+      }
       if (sceneTime_ != 0L) {
-        output.writeUInt64(1, sceneTime_);
+        output.writeUInt64(11, sceneTime_);
       }
       if (isPaused_ != false) {
-        output.writeBool(5, isPaused_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(9, sceneId_);
+        output.writeBool(13, isPaused_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class SceneTimeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, sceneId_);
+      }
       if (sceneTime_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, sceneTime_);
+          .computeUInt64Size(11, sceneTime_);
       }
       if (isPaused_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isPaused_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, sceneId_);
+          .computeBoolSize(13, isPaused_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,11 +341,6 @@ public final class SceneTimeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21694
-     * Obf: EPOHGAAPIFG
-     * </pre>
-     *
      * Protobuf type {@code SceneTimeNotify}
      */
     public static final class Builder extends
@@ -511,7 +501,7 @@ public final class SceneTimeNotifyOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -519,7 +509,7 @@ public final class SceneTimeNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -530,7 +520,7 @@ public final class SceneTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 9;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -542,7 +532,7 @@ public final class SceneTimeNotifyOuterClass {
 
       private long sceneTime_ ;
       /**
-       * <code>uint64 scene_time = 1;</code>
+       * <code>uint64 scene_time = 11;</code>
        * @return The sceneTime.
        */
       @java.lang.Override
@@ -550,7 +540,7 @@ public final class SceneTimeNotifyOuterClass {
         return sceneTime_;
       }
       /**
-       * <code>uint64 scene_time = 1;</code>
+       * <code>uint64 scene_time = 11;</code>
        * @param value The sceneTime to set.
        * @return This builder for chaining.
        */
@@ -561,7 +551,7 @@ public final class SceneTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint64 scene_time = 1;</code>
+       * <code>uint64 scene_time = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneTime() {
@@ -573,7 +563,7 @@ public final class SceneTimeNotifyOuterClass {
 
       private boolean isPaused_ ;
       /**
-       * <code>bool is_paused = 5;</code>
+       * <code>bool is_paused = 13;</code>
        * @return The isPaused.
        */
       @java.lang.Override
@@ -581,7 +571,7 @@ public final class SceneTimeNotifyOuterClass {
         return isPaused_;
       }
       /**
-       * <code>bool is_paused = 5;</code>
+       * <code>bool is_paused = 13;</code>
        * @param value The isPaused to set.
        * @return This builder for chaining.
        */
@@ -592,7 +582,7 @@ public final class SceneTimeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>bool is_paused = 5;</code>
+       * <code>bool is_paused = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsPaused() {
@@ -669,8 +659,8 @@ public final class SceneTimeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025SceneTimeNotify.proto\"J\n\017SceneTimeNoti" +
-      "fy\022\020\n\010scene_id\030\t \001(\r\022\022\n\nscene_time\030\001 \001(\004" +
-      "\022\021\n\tis_paused\030\005 \001(\010B\033\n\031emu.grasscutter.n" +
+      "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" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 2a57a7a0b..67a966292 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointReqOuterClass.java
@@ -19,23 +19,18 @@ public final class SceneTransToPointReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 12;</code>
-     * @return The pointId.
-     */
-    int getPointId();
-
-    /**
-     * <code>uint32 scene_id = 4;</code>
+     * <code>uint32 scene_id = 7;</code>
      * @return The sceneId.
      */
     int getSceneId();
+
+    /**
+     * <code>uint32 point_id = 11;</code>
+     * @return The pointId.
+     */
+    int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 26498
-   * Obf: EBDJGELLMOF
-   * </pre>
-   *
    * Protobuf type {@code SceneTransToPointReq}
    */
   public static final class SceneTransToPointReq extends
@@ -80,12 +75,12 @@ public final class SceneTransToPointReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 56: {
 
               sceneId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 88: {
 
               pointId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class SceneTransToPointReqOuterClass {
               emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.class, emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 12;
-    private int pointId_;
-    /**
-     * <code>uint32 point_id = 12;</code>
-     * @return The pointId.
-     */
-    @java.lang.Override
-    public int getPointId() {
-      return pointId_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 4;
+    public static final int SCENE_ID_FIELD_NUMBER = 7;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 4;</code>
+     * <code>uint32 scene_id = 7;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SceneTransToPointReqOuterClass {
       return sceneId_;
     }
 
+    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() {
@@ -159,10 +154,10 @@ public final class SceneTransToPointReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(4, sceneId_);
+        output.writeUInt32(7, sceneId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(12, pointId_);
+        output.writeUInt32(11, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class SceneTransToPointReqOuterClass {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, sceneId_);
+          .computeUInt32Size(7, sceneId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, pointId_);
+          .computeUInt32Size(11, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SceneTransToPointReqOuterClass {
       }
       emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq other = (emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq) obj;
 
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class SceneTransToPointReqOuterClass {
       }
       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) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class SceneTransToPointReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26498
-     * Obf: EBDJGELLMOF
-     * </pre>
-     *
      * Protobuf type {@code SceneTransToPointReq}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class SceneTransToPointReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pointId_ = 0;
-
         sceneId_ = 0;
 
+        pointId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class SceneTransToPointReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq buildPartial() {
         emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq result = new emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq(this);
-        result.pointId_ = pointId_;
         result.sceneId_ = sceneId_;
+        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class SceneTransToPointReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq other) {
         if (other == emu.grasscutter.net.proto.SceneTransToPointReqOuterClass.SceneTransToPointReq.getDefaultInstance()) return this;
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class SceneTransToPointReqOuterClass {
         return this;
       }
 
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 12;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 12;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class SceneTransToPointReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class SceneTransToPointReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -529,6 +488,37 @@ public final class SceneTransToPointReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 11;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 11;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class SceneTransToPointReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneTransToPointReq.proto\":\n\024SceneTra" +
-      "nsToPointReq\022\020\n\010point_id\030\014 \001(\r\022\020\n\010scene_" +
-      "id\030\004 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "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" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class SceneTransToPointReqOuterClass {
     internal_static_SceneTransToPointReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneTransToPointReq_descriptor,
-        new java.lang.String[] { "PointId", "SceneId", });
+        new java.lang.String[] { "SceneId", "PointId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 a627c2d85..d5703377a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneTransToPointRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SceneTransToPointRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 14;</code>
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 11;</code>
      * @return The pointId.
      */
     int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 28443
-   * Obf: GNAGNBFBJEB
-   * </pre>
-   *
    * Protobuf type {@code SceneTransToPointRsp}
    */
   public static final class SceneTransToPointRsp extends
@@ -86,21 +81,21 @@ public final class SceneTransToPointRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 40: {
+            case 88: {
 
               pointId_ = input.readUInt32();
               break;
             }
-            case 112: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class SceneTransToPointRspOuterClass {
               emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.class, emu.grasscutter.net.proto.SceneTransToPointRspOuterClass.SceneTransToPointRsp.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 14;
+    public static final int SCENE_ID_FIELD_NUMBER = 3;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 14;</code>
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class SceneTransToPointRspOuterClass {
       return sceneId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 10;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class SceneTransToPointRspOuterClass {
       return retcode_;
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 5;
+    public static final int POINT_ID_FIELD_NUMBER = 11;
     private int pointId_;
     /**
-     * <code>uint32 point_id = 5;</code>
+     * <code>uint32 point_id = 11;</code>
      * @return The pointId.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class SceneTransToPointRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (sceneId_ != 0) {
+        output.writeUInt32(3, sceneId_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+        output.writeInt32(10, retcode_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(5, pointId_);
-      }
-      if (sceneId_ != 0) {
-        output.writeUInt32(14, sceneId_);
+        output.writeUInt32(11, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class SceneTransToPointRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, sceneId_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
+          .computeInt32Size(10, retcode_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, pointId_);
-      }
-      if (sceneId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, sceneId_);
+          .computeUInt32Size(11, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -344,11 +339,6 @@ public final class SceneTransToPointRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28443
-     * Obf: GNAGNBFBJEB
-     * </pre>
-     *
      * Protobuf type {@code SceneTransToPointRsp}
      */
     public static final class Builder extends
@@ -509,7 +499,7 @@ public final class SceneTransToPointRspOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class SceneTransToPointRspOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class SceneTransToPointRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 14;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -540,7 +530,7 @@ public final class SceneTransToPointRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -548,7 +538,7 @@ public final class SceneTransToPointRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -559,7 +549,7 @@ public final class SceneTransToPointRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -571,7 +561,7 @@ public final class SceneTransToPointRspOuterClass {
 
       private int pointId_ ;
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 11;</code>
        * @return The pointId.
        */
       @java.lang.Override
@@ -579,7 +569,7 @@ public final class SceneTransToPointRspOuterClass {
         return pointId_;
       }
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 11;</code>
        * @param value The pointId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +580,7 @@ public final class SceneTransToPointRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 point_id = 5;</code>
+       * <code>uint32 point_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearPointId() {
@@ -667,8 +657,8 @@ public final class SceneTransToPointRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SceneTransToPointRsp.proto\"K\n\024SceneTra" +
-      "nsToPointRsp\022\020\n\010scene_id\030\016 \001(\r\022\017\n\007retcod" +
-      "e\030\002 \001(\005\022\020\n\010point_id\030\005 \001(\rB\033\n\031emu.grasscu" +
+      "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" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SceneWeaponInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SceneWeaponInfoOuterClass.java
index 714b86834..7799410d8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SceneWeaponInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SceneWeaponInfoOuterClass.java
@@ -117,12 +117,14 @@ public final class SceneWeaponInfoOuterClass {
      * <code>.EntityRendererChangedInfo renderer_changed_info = 9;</code>
      */
     emu.grasscutter.net.proto.EntityRendererChangedInfoOuterClass.EntityRendererChangedInfoOrBuilder getRendererChangedInfoOrBuilder();
+
+    /**
+     * <code>bool HHLNNPOILDL = 10;</code>
+     * @return The hHLNNPOILDL.
+     */
+    boolean getHHLNNPOILDL();
   }
   /**
-   * <pre>
-   * Obf: MGEGKKGBHPI
-   * </pre>
-   *
    * Protobuf type {@code SceneWeaponInfo}
    */
   public static final class SceneWeaponInfo extends
@@ -237,6 +239,11 @@ public final class SceneWeaponInfoOuterClass {
 
               break;
             }
+            case 80: {
+
+              hHLNNPOILDL_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -480,6 +487,17 @@ public final class SceneWeaponInfoOuterClass {
       return getRendererChangedInfo();
     }
 
+    public static final int HHLNNPOILDL_FIELD_NUMBER = 10;
+    private boolean hHLNNPOILDL_;
+    /**
+     * <code>bool HHLNNPOILDL = 10;</code>
+     * @return The hHLNNPOILDL.
+     */
+    @java.lang.Override
+    public boolean getHHLNNPOILDL() {
+      return hHLNNPOILDL_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -524,6 +542,9 @@ public final class SceneWeaponInfoOuterClass {
       if (rendererChangedInfo_ != null) {
         output.writeMessage(9, getRendererChangedInfo());
       }
+      if (hHLNNPOILDL_ != false) {
+        output.writeBool(10, hHLNNPOILDL_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -575,6 +596,10 @@ public final class SceneWeaponInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(9, getRendererChangedInfo());
       }
+      if (hHLNNPOILDL_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, hHLNNPOILDL_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -614,6 +639,8 @@ public final class SceneWeaponInfoOuterClass {
         if (!getRendererChangedInfo()
             .equals(other.getRendererChangedInfo())) return false;
       }
+      if (getHHLNNPOILDL()
+          != other.getHHLNNPOILDL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -650,6 +677,9 @@ public final class SceneWeaponInfoOuterClass {
         hash = (37 * hash) + RENDERER_CHANGED_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getRendererChangedInfo().hashCode();
       }
+      hash = (37 * hash) + HHLNNPOILDL_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHHLNNPOILDL());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -746,10 +776,6 @@ public final class SceneWeaponInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MGEGKKGBHPI
-     * </pre>
-     *
      * Protobuf type {@code SceneWeaponInfo}
      */
     public static final class Builder extends
@@ -834,6 +860,8 @@ public final class SceneWeaponInfoOuterClass {
           rendererChangedInfo_ = null;
           rendererChangedInfoBuilder_ = null;
         }
+        hHLNNPOILDL_ = false;
+
         return this;
       }
 
@@ -879,6 +907,7 @@ public final class SceneWeaponInfoOuterClass {
         } else {
           result.rendererChangedInfo_ = rendererChangedInfoBuilder_.build();
         }
+        result.hHLNNPOILDL_ = hHLNNPOILDL_;
         onBuilt();
         return result;
       }
@@ -953,6 +982,9 @@ public final class SceneWeaponInfoOuterClass {
         if (other.hasRendererChangedInfo()) {
           mergeRendererChangedInfo(other.getRendererChangedInfo());
         }
+        if (other.getHHLNNPOILDL() != false) {
+          setHHLNNPOILDL(other.getHHLNNPOILDL());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1534,6 +1566,37 @@ public final class SceneWeaponInfoOuterClass {
         }
         return rendererChangedInfoBuilder_;
       }
+
+      private boolean hHLNNPOILDL_ ;
+      /**
+       * <code>bool HHLNNPOILDL = 10;</code>
+       * @return The hHLNNPOILDL.
+       */
+      @java.lang.Override
+      public boolean getHHLNNPOILDL() {
+        return hHLNNPOILDL_;
+      }
+      /**
+       * <code>bool HHLNNPOILDL = 10;</code>
+       * @param value The hHLNNPOILDL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHHLNNPOILDL(boolean value) {
+        
+        hHLNNPOILDL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HHLNNPOILDL = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHHLNNPOILDL() {
+        
+        hHLNNPOILDL_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1608,16 +1671,16 @@ public final class SceneWeaponInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\025SceneWeaponInfo.proto\032\032AbilitySyncStat" +
       "eInfo.proto\032\037EntityRendererChangedInfo.p" +
-      "roto\"\310\002\n\017SceneWeaponInfo\022\021\n\tentity_id\030\001 " +
+      "roto\"\335\002\n\017SceneWeaponInfo\022\021\n\tentity_id\030\001 " +
       "\001(\r\022\021\n\tgadget_id\030\002 \001(\r\022\017\n\007item_id\030\003 \001(\r\022" +
       "\014\n\004guid\030\004 \001(\004\022\r\n\005level\030\005 \001(\r\022\025\n\rpromote_" +
       "level\030\006 \001(\r\022+\n\014ability_info\030\007 \001(\0132\025.Abil" +
       "itySyncStateInfo\0221\n\taffix_map\030\010 \003(\0132\036.Sc" +
       "eneWeaponInfo.AffixMapEntry\0229\n\025renderer_" +
       "changed_info\030\t \001(\0132\032.EntityRendererChang" +
-      "edInfo\032/\n\rAffixMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005" +
-      "value\030\002 \001(\r:\0028\001B\033\n\031emu.grasscutter.net.p" +
-      "rotob\006proto3"
+      "edInfo\022\023\n\013HHLNNPOILDL\030\n \001(\010\032/\n\rAffixMapE" +
+      "ntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031" +
+      "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1630,7 +1693,7 @@ public final class SceneWeaponInfoOuterClass {
     internal_static_SceneWeaponInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SceneWeaponInfo_descriptor,
-        new java.lang.String[] { "EntityId", "GadgetId", "ItemId", "Guid", "Level", "PromoteLevel", "AbilityInfo", "AffixMap", "RendererChangedInfo", });
+        new java.lang.String[] { "EntityId", "GadgetId", "ItemId", "Guid", "Level", "PromoteLevel", "AbilityInfo", "AffixMap", "RendererChangedInfo", "HHLNNPOILDL", });
     internal_static_SceneWeaponInfo_AffixMapEntry_descriptor =
       internal_static_SceneWeaponInfo_descriptor.getNestedTypes().get(0);
     internal_static_SceneWeaponInfo_AffixMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ScreenInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ScreenInfoOuterClass.java
index f98ae0f6c..3e0632416 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ScreenInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ScreenInfoOuterClass.java
@@ -32,7 +32,7 @@ public final class ScreenInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: MPEEPHMCGKD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ScreenInfo}
@@ -311,7 +311,7 @@ public final class ScreenInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: MPEEPHMCGKD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ScreenInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyReqOuterClass.java
index 47b19b575..2a210cc8c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyReqOuterClass.java
@@ -19,27 +19,26 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 schedule_id = 15;</code>
+     * <code>uint32 schedule_id = 12;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
 
     /**
-     * <code>uint32 gadget_entity_id = 13;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
-
-    /**
-     * <code>uint32 difficulty_id = 9;</code>
+     * <code>uint32 difficulty_id = 8;</code>
      * @return The difficultyId.
      */
     int getDifficultyId();
+
+    /**
+     * <code>uint32 gadget_entity_id = 1;</code>
+     * @return The gadgetEntityId.
+     */
+    int getGadgetEntityId();
   }
   /**
    * <pre>
-   * CmdId: 971
-   * Obf: KJNNKPKFEFK
+   * CmdId: 9382
    * </pre>
    *
    * Protobuf type {@code SelectAsterMidDifficultyReq}
@@ -86,17 +85,17 @@ public final class SelectAsterMidDifficultyReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
-
-              difficultyId_ = input.readUInt32();
-              break;
-            }
-            case 104: {
+            case 8: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 64: {
+
+              difficultyId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
 
               scheduleId_ = input.readUInt32();
               break;
@@ -133,10 +132,10 @@ public final class SelectAsterMidDifficultyReqOuterClass {
               emu.grasscutter.net.proto.SelectAsterMidDifficultyReqOuterClass.SelectAsterMidDifficultyReq.class, emu.grasscutter.net.proto.SelectAsterMidDifficultyReqOuterClass.SelectAsterMidDifficultyReq.Builder.class);
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 15;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 12;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 15;</code>
+     * <code>uint32 schedule_id = 12;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -144,21 +143,10 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       return scheduleId_;
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 13;
-    private int gadgetEntityId_;
-    /**
-     * <code>uint32 gadget_entity_id = 13;</code>
-     * @return The gadgetEntityId.
-     */
-    @java.lang.Override
-    public int getGadgetEntityId() {
-      return gadgetEntityId_;
-    }
-
-    public static final int DIFFICULTY_ID_FIELD_NUMBER = 9;
+    public static final int DIFFICULTY_ID_FIELD_NUMBER = 8;
     private int difficultyId_;
     /**
-     * <code>uint32 difficulty_id = 9;</code>
+     * <code>uint32 difficulty_id = 8;</code>
      * @return The difficultyId.
      */
     @java.lang.Override
@@ -166,6 +154,17 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       return difficultyId_;
     }
 
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 1;
+    private int gadgetEntityId_;
+    /**
+     * <code>uint32 gadget_entity_id = 1;</code>
+     * @return The gadgetEntityId.
+     */
+    @java.lang.Override
+    public int getGadgetEntityId() {
+      return gadgetEntityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +179,14 @@ public final class SelectAsterMidDifficultyReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (difficultyId_ != 0) {
-        output.writeUInt32(9, difficultyId_);
-      }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(13, gadgetEntityId_);
+        output.writeUInt32(1, gadgetEntityId_);
+      }
+      if (difficultyId_ != 0) {
+        output.writeUInt32(8, difficultyId_);
       }
       if (scheduleId_ != 0) {
-        output.writeUInt32(15, scheduleId_);
+        output.writeUInt32(12, scheduleId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (difficultyId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, difficultyId_);
-      }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, gadgetEntityId_);
+          .computeUInt32Size(1, gadgetEntityId_);
+      }
+      if (difficultyId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, difficultyId_);
       }
       if (scheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, scheduleId_);
+          .computeUInt32Size(12, scheduleId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +226,10 @@ public final class SelectAsterMidDifficultyReqOuterClass {
 
       if (getScheduleId()
           != other.getScheduleId()) return false;
-      if (getGadgetEntityId()
-          != other.getGadgetEntityId()) return false;
       if (getDifficultyId()
           != other.getDifficultyId()) return false;
+      if (getGadgetEntityId()
+          != other.getGadgetEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +243,10 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + SCHEDULE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getScheduleId();
-      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetEntityId();
       hash = (37 * hash) + DIFFICULTY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getDifficultyId();
+      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,8 +344,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 971
-     * Obf: KJNNKPKFEFK
+     * CmdId: 9382
      * </pre>
      *
      * Protobuf type {@code SelectAsterMidDifficultyReq}
@@ -388,10 +386,10 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         super.clear();
         scheduleId_ = 0;
 
-        gadgetEntityId_ = 0;
-
         difficultyId_ = 0;
 
+        gadgetEntityId_ = 0;
+
         return this;
       }
 
@@ -419,8 +417,8 @@ public final class SelectAsterMidDifficultyReqOuterClass {
       public emu.grasscutter.net.proto.SelectAsterMidDifficultyReqOuterClass.SelectAsterMidDifficultyReq buildPartial() {
         emu.grasscutter.net.proto.SelectAsterMidDifficultyReqOuterClass.SelectAsterMidDifficultyReq result = new emu.grasscutter.net.proto.SelectAsterMidDifficultyReqOuterClass.SelectAsterMidDifficultyReq(this);
         result.scheduleId_ = scheduleId_;
-        result.gadgetEntityId_ = gadgetEntityId_;
         result.difficultyId_ = difficultyId_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         onBuilt();
         return result;
       }
@@ -472,12 +470,12 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         if (other.getScheduleId() != 0) {
           setScheduleId(other.getScheduleId());
         }
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         if (other.getDifficultyId() != 0) {
           setDifficultyId(other.getDifficultyId());
         }
+        if (other.getGadgetEntityId() != 0) {
+          setGadgetEntityId(other.getGadgetEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +507,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 15;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -517,7 +515,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 15;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +526,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 15;</code>
+       * <code>uint32 schedule_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -538,40 +536,9 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         return this;
       }
 
-      private int gadgetEntityId_ ;
-      /**
-       * <code>uint32 gadget_entity_id = 13;</code>
-       * @return The gadgetEntityId.
-       */
-      @java.lang.Override
-      public int getGadgetEntityId() {
-        return gadgetEntityId_;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetEntityId() {
-        
-        gadgetEntityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int difficultyId_ ;
       /**
-       * <code>uint32 difficulty_id = 9;</code>
+       * <code>uint32 difficulty_id = 8;</code>
        * @return The difficultyId.
        */
       @java.lang.Override
@@ -579,7 +546,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         return difficultyId_;
       }
       /**
-       * <code>uint32 difficulty_id = 9;</code>
+       * <code>uint32 difficulty_id = 8;</code>
        * @param value The difficultyId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +557,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 difficulty_id = 9;</code>
+       * <code>uint32 difficulty_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearDifficultyId() {
@@ -599,6 +566,37 @@ public final class SelectAsterMidDifficultyReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int gadgetEntityId_ ;
+      /**
+       * <code>uint32 gadget_entity_id = 1;</code>
+       * @return The gadgetEntityId.
+       */
+      @java.lang.Override
+      public int getGadgetEntityId() {
+        return gadgetEntityId_;
+      }
+      /**
+       * <code>uint32 gadget_entity_id = 1;</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 = 1;</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) {
@@ -668,8 +666,8 @@ public final class SelectAsterMidDifficultyReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n!SelectAsterMidDifficultyReq.proto\"c\n\033S" +
       "electAsterMidDifficultyReq\022\023\n\013schedule_i" +
-      "d\030\017 \001(\r\022\030\n\020gadget_entity_id\030\r \001(\r\022\025\n\rdif" +
-      "ficulty_id\030\t \001(\rB\033\n\031emu.grasscutter.net." +
+      "d\030\014 \001(\r\022\025\n\rdifficulty_id\030\010 \001(\r\022\030\n\020gadget" +
+      "_entity_id\030\001 \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +679,7 @@ public final class SelectAsterMidDifficultyReqOuterClass {
     internal_static_SelectAsterMidDifficultyReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SelectAsterMidDifficultyReq_descriptor,
-        new java.lang.String[] { "ScheduleId", "GadgetEntityId", "DifficultyId", });
+        new java.lang.String[] { "ScheduleId", "DifficultyId", "GadgetEntityId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyRspOuterClass.java
index 7c38477f4..0986c2f6f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectAsterMidDifficultyRspOuterClass.java
@@ -19,33 +19,32 @@ public final class SelectAsterMidDifficultyRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gadget_entity_id = 10;</code>
+     * <code>uint32 gadget_entity_id = 1;</code>
      * @return The gadgetEntityId.
      */
     int getGadgetEntityId();
 
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 schedule_id = 9;</code>
+     * <code>uint32 schedule_id = 8;</code>
      * @return The scheduleId.
      */
     int getScheduleId();
 
     /**
-     * <code>uint32 difficulty_id = 6;</code>
+     * <code>uint32 difficulty_id = 12;</code>
      * @return The difficultyId.
      */
     int getDifficultyId();
   }
   /**
    * <pre>
-   * CmdId: 23097
-   * Obf: PCNKGFBDAGK
+   * CmdId: 25063
    * </pre>
    *
    * Protobuf type {@code SelectAsterMidDifficultyRsp}
@@ -92,24 +91,24 @@ public final class SelectAsterMidDifficultyRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 8: {
 
-              difficultyId_ = input.readUInt32();
+              gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 72: {
+            case 64: {
 
               scheduleId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 96: {
 
-              gadgetEntityId_ = input.readUInt32();
+              difficultyId_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,10 +143,10 @@ public final class SelectAsterMidDifficultyRspOuterClass {
               emu.grasscutter.net.proto.SelectAsterMidDifficultyRspOuterClass.SelectAsterMidDifficultyRsp.class, emu.grasscutter.net.proto.SelectAsterMidDifficultyRspOuterClass.SelectAsterMidDifficultyRsp.Builder.class);
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 1;
     private int gadgetEntityId_;
     /**
-     * <code>uint32 gadget_entity_id = 10;</code>
+     * <code>uint32 gadget_entity_id = 1;</code>
      * @return The gadgetEntityId.
      */
     @java.lang.Override
@@ -155,10 +154,10 @@ public final class SelectAsterMidDifficultyRspOuterClass {
       return gadgetEntityId_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 8;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,10 +165,10 @@ public final class SelectAsterMidDifficultyRspOuterClass {
       return retcode_;
     }
 
-    public static final int SCHEDULE_ID_FIELD_NUMBER = 9;
+    public static final int SCHEDULE_ID_FIELD_NUMBER = 8;
     private int scheduleId_;
     /**
-     * <code>uint32 schedule_id = 9;</code>
+     * <code>uint32 schedule_id = 8;</code>
      * @return The scheduleId.
      */
     @java.lang.Override
@@ -177,10 +176,10 @@ public final class SelectAsterMidDifficultyRspOuterClass {
       return scheduleId_;
     }
 
-    public static final int DIFFICULTY_ID_FIELD_NUMBER = 6;
+    public static final int DIFFICULTY_ID_FIELD_NUMBER = 12;
     private int difficultyId_;
     /**
-     * <code>uint32 difficulty_id = 6;</code>
+     * <code>uint32 difficulty_id = 12;</code>
      * @return The difficultyId.
      */
     @java.lang.Override
@@ -202,17 +201,17 @@ public final class SelectAsterMidDifficultyRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (difficultyId_ != 0) {
-        output.writeUInt32(6, difficultyId_);
+      if (gadgetEntityId_ != 0) {
+        output.writeUInt32(1, gadgetEntityId_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
+        output.writeInt32(6, retcode_);
       }
       if (scheduleId_ != 0) {
-        output.writeUInt32(9, scheduleId_);
+        output.writeUInt32(8, scheduleId_);
       }
-      if (gadgetEntityId_ != 0) {
-        output.writeUInt32(10, gadgetEntityId_);
+      if (difficultyId_ != 0) {
+        output.writeUInt32(12, difficultyId_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +222,21 @@ public final class SelectAsterMidDifficultyRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (difficultyId_ != 0) {
+      if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, difficultyId_);
+          .computeUInt32Size(1, gadgetEntityId_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
+          .computeInt32Size(6, retcode_);
       }
       if (scheduleId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, scheduleId_);
+          .computeUInt32Size(8, scheduleId_);
       }
-      if (gadgetEntityId_ != 0) {
+      if (difficultyId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, gadgetEntityId_);
+          .computeUInt32Size(12, difficultyId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -378,8 +377,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 23097
-     * Obf: PCNKGFBDAGK
+     * CmdId: 25063
      * </pre>
      *
      * Protobuf type {@code SelectAsterMidDifficultyRsp}
@@ -548,7 +546,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
 
       private int gadgetEntityId_ ;
       /**
-       * <code>uint32 gadget_entity_id = 10;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @return The gadgetEntityId.
        */
       @java.lang.Override
@@ -556,7 +554,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return gadgetEntityId_;
       }
       /**
-       * <code>uint32 gadget_entity_id = 10;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @param value The gadgetEntityId to set.
        * @return This builder for chaining.
        */
@@ -567,7 +565,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_entity_id = 10;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetEntityId() {
@@ -579,7 +577,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -587,7 +585,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -598,7 +596,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 8;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -610,7 +608,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
 
       private int scheduleId_ ;
       /**
-       * <code>uint32 schedule_id = 9;</code>
+       * <code>uint32 schedule_id = 8;</code>
        * @return The scheduleId.
        */
       @java.lang.Override
@@ -618,7 +616,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return scheduleId_;
       }
       /**
-       * <code>uint32 schedule_id = 9;</code>
+       * <code>uint32 schedule_id = 8;</code>
        * @param value The scheduleId to set.
        * @return This builder for chaining.
        */
@@ -629,7 +627,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 schedule_id = 9;</code>
+       * <code>uint32 schedule_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearScheduleId() {
@@ -641,7 +639,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
 
       private int difficultyId_ ;
       /**
-       * <code>uint32 difficulty_id = 6;</code>
+       * <code>uint32 difficulty_id = 12;</code>
        * @return The difficultyId.
        */
       @java.lang.Override
@@ -649,7 +647,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return difficultyId_;
       }
       /**
-       * <code>uint32 difficulty_id = 6;</code>
+       * <code>uint32 difficulty_id = 12;</code>
        * @param value The difficultyId to set.
        * @return This builder for chaining.
        */
@@ -660,7 +658,7 @@ public final class SelectAsterMidDifficultyRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 difficulty_id = 6;</code>
+       * <code>uint32 difficulty_id = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearDifficultyId() {
@@ -738,8 +736,8 @@ public final class SelectAsterMidDifficultyRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n!SelectAsterMidDifficultyRsp.proto\"t\n\033S" +
       "electAsterMidDifficultyRsp\022\030\n\020gadget_ent" +
-      "ity_id\030\n \001(\r\022\017\n\007retcode\030\010 \001(\005\022\023\n\013schedul" +
-      "e_id\030\t \001(\r\022\025\n\rdifficulty_id\030\006 \001(\rB\033\n\031emu" +
+      "ity_id\030\001 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\023\n\013schedul" +
+      "e_id\030\010 \001(\r\022\025\n\rdifficulty_id\030\014 \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/SelectEffigyChallengeConditionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionReqOuterClass.java
index 28e4bbf30..b0c8cbcca 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionReqOuterClass.java
@@ -19,38 +19,37 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @return A list containing the conditionIdList.
      */
     java.util.List<java.lang.Integer> getConditionIdListList();
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @return The count of conditionIdList.
      */
     int getConditionIdListCount();
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @param index The index of the element to return.
      * @return The conditionIdList at the given index.
      */
     int getConditionIdList(int index);
 
     /**
-     * <code>uint32 challenge_id = 15;</code>
+     * <code>uint32 challenge_id = 9;</code>
      * @return The challengeId.
      */
     int getChallengeId();
 
     /**
-     * <code>uint32 difficulty_id = 7;</code>
+     * <code>uint32 difficulty_id = 10;</code>
      * @return The difficultyId.
      */
     int getDifficultyId();
   }
   /**
    * <pre>
-   * CmdId: 7159
-   * Obf: KOMEHDLAFCI
+   * CmdId: 26519
    * </pre>
    *
    * Protobuf type {@code SelectEffigyChallengeConditionReq}
@@ -99,7 +98,17 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 72: {
+
+              challengeId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              difficultyId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 conditionIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -107,7 +116,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
               conditionIdList_.addInt(input.readUInt32());
               break;
             }
-            case 42: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,16 +129,6 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 56: {
-
-              difficultyId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              challengeId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +164,10 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
               emu.grasscutter.net.proto.SelectEffigyChallengeConditionReqOuterClass.SelectEffigyChallengeConditionReq.class, emu.grasscutter.net.proto.SelectEffigyChallengeConditionReqOuterClass.SelectEffigyChallengeConditionReq.Builder.class);
     }
 
-    public static final int CONDITION_ID_LIST_FIELD_NUMBER = 5;
+    public static final int CONDITION_ID_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList conditionIdList_;
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @return A list containing the conditionIdList.
      */
     @java.lang.Override
@@ -177,14 +176,14 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
       return conditionIdList_;
     }
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @return The count of conditionIdList.
      */
     public int getConditionIdListCount() {
       return conditionIdList_.size();
     }
     /**
-     * <code>repeated uint32 condition_id_list = 5;</code>
+     * <code>repeated uint32 condition_id_list = 11;</code>
      * @param index The index of the element to return.
      * @return The conditionIdList at the given index.
      */
@@ -193,10 +192,10 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
     }
     private int conditionIdListMemoizedSerializedSize = -1;
 
-    public static final int CHALLENGE_ID_FIELD_NUMBER = 15;
+    public static final int CHALLENGE_ID_FIELD_NUMBER = 9;
     private int challengeId_;
     /**
-     * <code>uint32 challenge_id = 15;</code>
+     * <code>uint32 challenge_id = 9;</code>
      * @return The challengeId.
      */
     @java.lang.Override
@@ -204,10 +203,10 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
       return challengeId_;
     }
 
-    public static final int DIFFICULTY_ID_FIELD_NUMBER = 7;
+    public static final int DIFFICULTY_ID_FIELD_NUMBER = 10;
     private int difficultyId_;
     /**
-     * <code>uint32 difficulty_id = 7;</code>
+     * <code>uint32 difficulty_id = 10;</code>
      * @return The difficultyId.
      */
     @java.lang.Override
@@ -230,19 +229,19 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (challengeId_ != 0) {
+        output.writeUInt32(9, challengeId_);
+      }
+      if (difficultyId_ != 0) {
+        output.writeUInt32(10, difficultyId_);
+      }
       if (getConditionIdListList().size() > 0) {
-        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(conditionIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < conditionIdList_.size(); i++) {
         output.writeUInt32NoTag(conditionIdList_.getInt(i));
       }
-      if (difficultyId_ != 0) {
-        output.writeUInt32(7, difficultyId_);
-      }
-      if (challengeId_ != 0) {
-        output.writeUInt32(15, challengeId_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -252,6 +251,14 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (challengeId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, challengeId_);
+      }
+      if (difficultyId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, difficultyId_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < conditionIdList_.size(); i++) {
@@ -266,14 +273,6 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         }
         conditionIdListMemoizedSerializedSize = dataSize;
       }
-      if (difficultyId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, difficultyId_);
-      }
-      if (challengeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, challengeId_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -411,8 +410,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 7159
-     * Obf: KOMEHDLAFCI
+     * CmdId: 26519
      * </pre>
      *
      * Protobuf type {@code SelectEffigyChallengeConditionReq}
@@ -594,7 +592,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @return A list containing the conditionIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -603,14 +601,14 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
                  java.util.Collections.unmodifiableList(conditionIdList_) : conditionIdList_;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @return The count of conditionIdList.
        */
       public int getConditionIdListCount() {
         return conditionIdList_.size();
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @param index The index of the element to return.
        * @return The conditionIdList at the given index.
        */
@@ -618,7 +616,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return conditionIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The conditionIdList to set.
        * @return This builder for chaining.
@@ -631,7 +629,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @param value The conditionIdList to add.
        * @return This builder for chaining.
        */
@@ -642,7 +640,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @param values The conditionIdList to add.
        * @return This builder for chaining.
        */
@@ -655,7 +653,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 5;</code>
+       * <code>repeated uint32 condition_id_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearConditionIdList() {
@@ -667,7 +665,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
 
       private int challengeId_ ;
       /**
-       * <code>uint32 challenge_id = 15;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @return The challengeId.
        */
       @java.lang.Override
@@ -675,7 +673,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return challengeId_;
       }
       /**
-       * <code>uint32 challenge_id = 15;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @param value The challengeId to set.
        * @return This builder for chaining.
        */
@@ -686,7 +684,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_id = 15;</code>
+       * <code>uint32 challenge_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeId() {
@@ -698,7 +696,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
 
       private int difficultyId_ ;
       /**
-       * <code>uint32 difficulty_id = 7;</code>
+       * <code>uint32 difficulty_id = 10;</code>
        * @return The difficultyId.
        */
       @java.lang.Override
@@ -706,7 +704,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return difficultyId_;
       }
       /**
-       * <code>uint32 difficulty_id = 7;</code>
+       * <code>uint32 difficulty_id = 10;</code>
        * @param value The difficultyId to set.
        * @return This builder for chaining.
        */
@@ -717,7 +715,7 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 difficulty_id = 7;</code>
+       * <code>uint32 difficulty_id = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearDifficultyId() {
@@ -795,8 +793,8 @@ public final class SelectEffigyChallengeConditionReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\'SelectEffigyChallengeConditionReq.prot" +
       "o\"k\n!SelectEffigyChallengeConditionReq\022\031" +
-      "\n\021condition_id_list\030\005 \003(\r\022\024\n\014challenge_i" +
-      "d\030\017 \001(\r\022\025\n\rdifficulty_id\030\007 \001(\rB\033\n\031emu.gr" +
+      "\n\021condition_id_list\030\013 \003(\r\022\024\n\014challenge_i" +
+      "d\030\t \001(\r\022\025\n\rdifficulty_id\030\n \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/SelectEffigyChallengeConditionRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionRspOuterClass.java
index bf6587731..863b1468b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectEffigyChallengeConditionRspOuterClass.java
@@ -19,44 +19,43 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 1;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 challenge_id = 12;</code>
+     * <code>uint32 challenge_id = 1;</code>
      * @return The challengeId.
      */
     int getChallengeId();
 
     /**
-     * <code>uint32 difficulty_id = 9;</code>
-     * @return The difficultyId.
-     */
-    int getDifficultyId();
-
-    /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @return A list containing the conditionIdList.
      */
     java.util.List<java.lang.Integer> getConditionIdListList();
     /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @return The count of conditionIdList.
      */
     int getConditionIdListCount();
     /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @param index The index of the element to return.
      * @return The conditionIdList at the given index.
      */
     int getConditionIdList(int index);
+
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>uint32 difficulty_id = 15;</code>
+     * @return The difficultyId.
+     */
+    int getDifficultyId();
   }
   /**
    * <pre>
-   * CmdId: 3284
-   * Obf: HLKDIBKJBIN
+   * CmdId: 2737
    * </pre>
    *
    * Protobuf type {@code SelectEffigyChallengeConditionRsp}
@@ -107,10 +106,10 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
               break;
             case 8: {
 
-              retcode_ = input.readInt32();
+              challengeId_ = input.readUInt32();
               break;
             }
-            case 24: {
+            case 32: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 conditionIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -118,7 +117,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
               conditionIdList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 34: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -131,14 +130,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 72: {
+            case 104: {
 
-              difficultyId_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 120: {
 
-              challengeId_ = input.readUInt32();
+              difficultyId_ = input.readUInt32();
               break;
             }
             default: {
@@ -176,21 +175,10 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
               emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp.class, emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp.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 CHALLENGE_ID_FIELD_NUMBER = 12;
+    public static final int CHALLENGE_ID_FIELD_NUMBER = 1;
     private int challengeId_;
     /**
-     * <code>uint32 challenge_id = 12;</code>
+     * <code>uint32 challenge_id = 1;</code>
      * @return The challengeId.
      */
     @java.lang.Override
@@ -198,21 +186,10 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       return challengeId_;
     }
 
-    public static final int DIFFICULTY_ID_FIELD_NUMBER = 9;
-    private int difficultyId_;
-    /**
-     * <code>uint32 difficulty_id = 9;</code>
-     * @return The difficultyId.
-     */
-    @java.lang.Override
-    public int getDifficultyId() {
-      return difficultyId_;
-    }
-
-    public static final int CONDITION_ID_LIST_FIELD_NUMBER = 3;
+    public static final int CONDITION_ID_LIST_FIELD_NUMBER = 4;
     private com.google.protobuf.Internal.IntList conditionIdList_;
     /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @return A list containing the conditionIdList.
      */
     @java.lang.Override
@@ -221,14 +198,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       return conditionIdList_;
     }
     /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @return The count of conditionIdList.
      */
     public int getConditionIdListCount() {
       return conditionIdList_.size();
     }
     /**
-     * <code>repeated uint32 condition_id_list = 3;</code>
+     * <code>repeated uint32 condition_id_list = 4;</code>
      * @param index The index of the element to return.
      * @return The conditionIdList at the given index.
      */
@@ -237,6 +214,28 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
     }
     private int conditionIdListMemoizedSerializedSize = -1;
 
+    public static final int RETCODE_FIELD_NUMBER = 13;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 13;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int DIFFICULTY_ID_FIELD_NUMBER = 15;
+    private int difficultyId_;
+    /**
+     * <code>uint32 difficulty_id = 15;</code>
+     * @return The difficultyId.
+     */
+    @java.lang.Override
+    public int getDifficultyId() {
+      return difficultyId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -252,21 +251,21 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(1, retcode_);
+      if (challengeId_ != 0) {
+        output.writeUInt32(1, challengeId_);
       }
       if (getConditionIdListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(34);
         output.writeUInt32NoTag(conditionIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < conditionIdList_.size(); i++) {
         output.writeUInt32NoTag(conditionIdList_.getInt(i));
       }
-      if (difficultyId_ != 0) {
-        output.writeUInt32(9, difficultyId_);
+      if (retcode_ != 0) {
+        output.writeInt32(13, retcode_);
       }
-      if (challengeId_ != 0) {
-        output.writeUInt32(12, challengeId_);
+      if (difficultyId_ != 0) {
+        output.writeUInt32(15, difficultyId_);
       }
       unknownFields.writeTo(output);
     }
@@ -277,9 +276,9 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
+      if (challengeId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(1, retcode_);
+          .computeUInt32Size(1, challengeId_);
       }
       {
         int dataSize = 0;
@@ -295,13 +294,13 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         }
         conditionIdListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(13, retcode_);
+      }
       if (difficultyId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, difficultyId_);
-      }
-      if (challengeId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, challengeId_);
+          .computeUInt32Size(15, difficultyId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -318,14 +317,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       }
       emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp other = (emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getChallengeId()
           != other.getChallengeId()) return false;
-      if (getDifficultyId()
-          != other.getDifficultyId()) return false;
       if (!getConditionIdListList()
           .equals(other.getConditionIdListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getDifficultyId()
+          != other.getDifficultyId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -337,16 +336,16 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + CHALLENGE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getChallengeId();
-      hash = (37 * hash) + DIFFICULTY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getDifficultyId();
       if (getConditionIdListCount() > 0) {
         hash = (37 * hash) + CONDITION_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getConditionIdListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + DIFFICULTY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDifficultyId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -444,8 +443,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 3284
-     * Obf: HLKDIBKJBIN
+     * CmdId: 2737
      * </pre>
      *
      * Protobuf type {@code SelectEffigyChallengeConditionRsp}
@@ -485,14 +483,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         challengeId_ = 0;
 
-        difficultyId_ = 0;
-
         conditionIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
+        difficultyId_ = 0;
+
         return this;
       }
 
@@ -520,14 +518,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       public emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp buildPartial() {
         emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp result = new emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         result.challengeId_ = challengeId_;
-        result.difficultyId_ = difficultyId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           conditionIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.conditionIdList_ = conditionIdList_;
+        result.retcode_ = retcode_;
+        result.difficultyId_ = difficultyId_;
         onBuilt();
         return result;
       }
@@ -576,15 +574,9 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp other) {
         if (other == emu.grasscutter.net.proto.SelectEffigyChallengeConditionRspOuterClass.SelectEffigyChallengeConditionRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getChallengeId() != 0) {
           setChallengeId(other.getChallengeId());
         }
-        if (other.getDifficultyId() != 0) {
-          setDifficultyId(other.getDifficultyId());
-        }
         if (!other.conditionIdList_.isEmpty()) {
           if (conditionIdList_.isEmpty()) {
             conditionIdList_ = other.conditionIdList_;
@@ -595,6 +587,12 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
+        if (other.getDifficultyId() != 0) {
+          setDifficultyId(other.getDifficultyId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -625,40 +623,9 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
       }
       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 challengeId_ ;
       /**
-       * <code>uint32 challenge_id = 12;</code>
+       * <code>uint32 challenge_id = 1;</code>
        * @return The challengeId.
        */
       @java.lang.Override
@@ -666,7 +633,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return challengeId_;
       }
       /**
-       * <code>uint32 challenge_id = 12;</code>
+       * <code>uint32 challenge_id = 1;</code>
        * @param value The challengeId to set.
        * @return This builder for chaining.
        */
@@ -677,7 +644,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 challenge_id = 12;</code>
+       * <code>uint32 challenge_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearChallengeId() {
@@ -687,37 +654,6 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return this;
       }
 
-      private int difficultyId_ ;
-      /**
-       * <code>uint32 difficulty_id = 9;</code>
-       * @return The difficultyId.
-       */
-      @java.lang.Override
-      public int getDifficultyId() {
-        return difficultyId_;
-      }
-      /**
-       * <code>uint32 difficulty_id = 9;</code>
-       * @param value The difficultyId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDifficultyId(int value) {
-        
-        difficultyId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 difficulty_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDifficultyId() {
-        
-        difficultyId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList conditionIdList_ = emptyIntList();
       private void ensureConditionIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -726,7 +662,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @return A list containing the conditionIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -735,14 +671,14 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
                  java.util.Collections.unmodifiableList(conditionIdList_) : conditionIdList_;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @return The count of conditionIdList.
        */
       public int getConditionIdListCount() {
         return conditionIdList_.size();
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @param index The index of the element to return.
        * @return The conditionIdList at the given index.
        */
@@ -750,7 +686,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return conditionIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @param index The index to set the value at.
        * @param value The conditionIdList to set.
        * @return This builder for chaining.
@@ -763,7 +699,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @param value The conditionIdList to add.
        * @return This builder for chaining.
        */
@@ -774,7 +710,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @param values The conditionIdList to add.
        * @return This builder for chaining.
        */
@@ -787,7 +723,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 condition_id_list = 3;</code>
+       * <code>repeated uint32 condition_id_list = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearConditionIdList() {
@@ -796,6 +732,68 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 13;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 13;</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 = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int difficultyId_ ;
+      /**
+       * <code>uint32 difficulty_id = 15;</code>
+       * @return The difficultyId.
+       */
+      @java.lang.Override
+      public int getDifficultyId() {
+        return difficultyId_;
+      }
+      /**
+       * <code>uint32 difficulty_id = 15;</code>
+       * @param value The difficultyId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDifficultyId(int value) {
+        
+        difficultyId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 difficulty_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDifficultyId() {
+        
+        difficultyId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -864,10 +862,10 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\'SelectEffigyChallengeConditionRsp.prot" +
-      "o\"|\n!SelectEffigyChallengeConditionRsp\022\017" +
-      "\n\007retcode\030\001 \001(\005\022\024\n\014challenge_id\030\014 \001(\r\022\025\n" +
-      "\rdifficulty_id\030\t \001(\r\022\031\n\021condition_id_lis" +
-      "t\030\003 \003(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "o\"|\n!SelectEffigyChallengeConditionRsp\022\024" +
+      "\n\014challenge_id\030\001 \001(\r\022\031\n\021condition_id_lis" +
+      "t\030\004 \003(\r\022\017\n\007retcode\030\r \001(\005\022\025\n\rdifficulty_i" +
+      "d\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -879,7 +877,7 @@ public final class SelectEffigyChallengeConditionRspOuterClass {
     internal_static_SelectEffigyChallengeConditionRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SelectEffigyChallengeConditionRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ChallengeId", "DifficultyId", "ConditionIdList", });
+        new java.lang.String[] { "ChallengeId", "ConditionIdList", "Retcode", "DifficultyId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java
index 878601040..c1d95e983 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionReqOuterClass.java
@@ -19,23 +19,24 @@ public final class SelectWorktopOptionReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 gadget_entity_id = 12;</code>
+     * <code>uint32 CHDDOFMLBLM = 8;</code>
+     * @return The cHDDOFMLBLM.
+     */
+    int getCHDDOFMLBLM();
+
+    /**
+     * <code>uint32 gadget_entity_id = 1;</code>
      * @return The gadgetEntityId.
      */
     int getGadgetEntityId();
 
     /**
-     * <code>uint32 option_id = 6;</code>
+     * <code>uint32 option_id = 13;</code>
      * @return The optionId.
      */
     int getOptionId();
   }
   /**
-   * <pre>
-   * CmdId: 24949
-   * Obf: KGNHIFGFOIA
-   * </pre>
-   *
    * Protobuf type {@code SelectWorktopOptionReq}
    */
   public static final class SelectWorktopOptionReq extends
@@ -80,16 +81,21 @@ public final class SelectWorktopOptionReqOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              optionId_ = input.readUInt32();
-              break;
-            }
-            case 96: {
+            case 8: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
+            case 64: {
+
+              cHDDOFMLBLM_ = input.readUInt32();
+              break;
+            }
+            case 104: {
+
+              optionId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +128,21 @@ public final class SelectWorktopOptionReqOuterClass {
               emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq.class, emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq.Builder.class);
     }
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 12;
+    public static final int CHDDOFMLBLM_FIELD_NUMBER = 8;
+    private int cHDDOFMLBLM_;
+    /**
+     * <code>uint32 CHDDOFMLBLM = 8;</code>
+     * @return The cHDDOFMLBLM.
+     */
+    @java.lang.Override
+    public int getCHDDOFMLBLM() {
+      return cHDDOFMLBLM_;
+    }
+
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 1;
     private int gadgetEntityId_;
     /**
-     * <code>uint32 gadget_entity_id = 12;</code>
+     * <code>uint32 gadget_entity_id = 1;</code>
      * @return The gadgetEntityId.
      */
     @java.lang.Override
@@ -133,10 +150,10 @@ public final class SelectWorktopOptionReqOuterClass {
       return gadgetEntityId_;
     }
 
-    public static final int OPTION_ID_FIELD_NUMBER = 6;
+    public static final int OPTION_ID_FIELD_NUMBER = 13;
     private int optionId_;
     /**
-     * <code>uint32 option_id = 6;</code>
+     * <code>uint32 option_id = 13;</code>
      * @return The optionId.
      */
     @java.lang.Override
@@ -158,11 +175,14 @@ public final class SelectWorktopOptionReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (optionId_ != 0) {
-        output.writeUInt32(6, optionId_);
-      }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(12, gadgetEntityId_);
+        output.writeUInt32(1, gadgetEntityId_);
+      }
+      if (cHDDOFMLBLM_ != 0) {
+        output.writeUInt32(8, cHDDOFMLBLM_);
+      }
+      if (optionId_ != 0) {
+        output.writeUInt32(13, optionId_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +193,17 @@ public final class SelectWorktopOptionReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (optionId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, optionId_);
-      }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gadgetEntityId_);
+          .computeUInt32Size(1, gadgetEntityId_);
+      }
+      if (cHDDOFMLBLM_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(8, cHDDOFMLBLM_);
+      }
+      if (optionId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, optionId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,6 +220,8 @@ public final class SelectWorktopOptionReqOuterClass {
       }
       emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq other = (emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq) obj;
 
+      if (getCHDDOFMLBLM()
+          != other.getCHDDOFMLBLM()) return false;
       if (getGadgetEntityId()
           != other.getGadgetEntityId()) return false;
       if (getOptionId()
@@ -211,6 +237,8 @@ public final class SelectWorktopOptionReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CHDDOFMLBLM_FIELD_NUMBER;
+      hash = (53 * hash) + getCHDDOFMLBLM();
       hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetEntityId();
       hash = (37 * hash) + OPTION_ID_FIELD_NUMBER;
@@ -311,11 +339,6 @@ public final class SelectWorktopOptionReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24949
-     * Obf: KGNHIFGFOIA
-     * </pre>
-     *
      * Protobuf type {@code SelectWorktopOptionReq}
      */
     public static final class Builder extends
@@ -353,6 +376,8 @@ public final class SelectWorktopOptionReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        cHDDOFMLBLM_ = 0;
+
         gadgetEntityId_ = 0;
 
         optionId_ = 0;
@@ -383,6 +408,7 @@ public final class SelectWorktopOptionReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq buildPartial() {
         emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq result = new emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq(this);
+        result.cHDDOFMLBLM_ = cHDDOFMLBLM_;
         result.gadgetEntityId_ = gadgetEntityId_;
         result.optionId_ = optionId_;
         onBuilt();
@@ -433,6 +459,9 @@ public final class SelectWorktopOptionReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq other) {
         if (other == emu.grasscutter.net.proto.SelectWorktopOptionReqOuterClass.SelectWorktopOptionReq.getDefaultInstance()) return this;
+        if (other.getCHDDOFMLBLM() != 0) {
+          setCHDDOFMLBLM(other.getCHDDOFMLBLM());
+        }
         if (other.getGadgetEntityId() != 0) {
           setGadgetEntityId(other.getGadgetEntityId());
         }
@@ -468,9 +497,40 @@ public final class SelectWorktopOptionReqOuterClass {
         return this;
       }
 
+      private int cHDDOFMLBLM_ ;
+      /**
+       * <code>uint32 CHDDOFMLBLM = 8;</code>
+       * @return The cHDDOFMLBLM.
+       */
+      @java.lang.Override
+      public int getCHDDOFMLBLM() {
+        return cHDDOFMLBLM_;
+      }
+      /**
+       * <code>uint32 CHDDOFMLBLM = 8;</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 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCHDDOFMLBLM() {
+        
+        cHDDOFMLBLM_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int gadgetEntityId_ ;
       /**
-       * <code>uint32 gadget_entity_id = 12;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @return The gadgetEntityId.
        */
       @java.lang.Override
@@ -478,7 +538,7 @@ public final class SelectWorktopOptionReqOuterClass {
         return gadgetEntityId_;
       }
       /**
-       * <code>uint32 gadget_entity_id = 12;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @param value The gadgetEntityId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +549,7 @@ public final class SelectWorktopOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_entity_id = 12;</code>
+       * <code>uint32 gadget_entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetEntityId() {
@@ -501,7 +561,7 @@ public final class SelectWorktopOptionReqOuterClass {
 
       private int optionId_ ;
       /**
-       * <code>uint32 option_id = 6;</code>
+       * <code>uint32 option_id = 13;</code>
        * @return The optionId.
        */
       @java.lang.Override
@@ -509,7 +569,7 @@ public final class SelectWorktopOptionReqOuterClass {
         return optionId_;
       }
       /**
-       * <code>uint32 option_id = 6;</code>
+       * <code>uint32 option_id = 13;</code>
        * @param value The optionId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +580,7 @@ public final class SelectWorktopOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 option_id = 6;</code>
+       * <code>uint32 option_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionId() {
@@ -596,10 +656,10 @@ public final class SelectWorktopOptionReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034SelectWorktopOptionReq.proto\"E\n\026Select" +
-      "WorktopOptionReq\022\030\n\020gadget_entity_id\030\014 \001" +
-      "(\r\022\021\n\toption_id\030\006 \001(\rB\033\n\031emu.grasscutter" +
-      ".net.protob\006proto3"
+      "\n\034SelectWorktopOptionReq.proto\"Z\n\026Select" +
+      "WorktopOptionReq\022\023\n\013CHDDOFMLBLM\030\010 \001(\r\022\030\n" +
+      "\020gadget_entity_id\030\001 \001(\r\022\021\n\toption_id\030\r \001" +
+      "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -610,7 +670,7 @@ public final class SelectWorktopOptionReqOuterClass {
     internal_static_SelectWorktopOptionReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SelectWorktopOptionReq_descriptor,
-        new java.lang.String[] { "GadgetEntityId", "OptionId", });
+        new java.lang.String[] { "CHDDOFMLBLM", "GadgetEntityId", "OptionId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java
index 2b9a15482..b15ca4bb6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SelectWorktopOptionRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SelectWorktopOptionRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 option_id = 13;</code>
+     * <code>uint32 option_id = 1;</code>
      * @return The optionId.
      */
     int getOptionId();
 
     /**
-     * <code>int32 retcode = 9;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 gadget_entity_id = 14;</code>
+     * <code>uint32 gadget_entity_id = 9;</code>
      * @return The gadgetEntityId.
      */
     int getGadgetEntityId();
+
+    /**
+     * <code>int32 retcode = 14;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 27194
-   * Obf: MJHAKKACKEC
-   * </pre>
-   *
    * Protobuf type {@code SelectWorktopOptionRsp}
    */
   public static final class SelectWorktopOptionRsp extends
@@ -86,21 +81,21 @@ public final class SelectWorktopOptionRspOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 104: {
+            case 8: {
 
               optionId_ = input.readUInt32();
               break;
             }
-            case 112: {
+            case 72: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
+            case 112: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class SelectWorktopOptionRspOuterClass {
               emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp.class, emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp.Builder.class);
     }
 
-    public static final int OPTION_ID_FIELD_NUMBER = 13;
+    public static final int OPTION_ID_FIELD_NUMBER = 1;
     private int optionId_;
     /**
-     * <code>uint32 option_id = 13;</code>
+     * <code>uint32 option_id = 1;</code>
      * @return The optionId.
      */
     @java.lang.Override
@@ -144,21 +139,10 @@ public final class SelectWorktopOptionRspOuterClass {
       return optionId_;
     }
 
-    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 GADGET_ENTITY_ID_FIELD_NUMBER = 14;
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 9;
     private int gadgetEntityId_;
     /**
-     * <code>uint32 gadget_entity_id = 14;</code>
+     * <code>uint32 gadget_entity_id = 9;</code>
      * @return The gadgetEntityId.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class SelectWorktopOptionRspOuterClass {
       return gadgetEntityId_;
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class SelectWorktopOptionRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
-      }
       if (optionId_ != 0) {
-        output.writeUInt32(13, optionId_);
+        output.writeUInt32(1, optionId_);
       }
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(14, gadgetEntityId_);
+        output.writeUInt32(9, gadgetEntityId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(14, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class SelectWorktopOptionRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
-      }
       if (optionId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, optionId_);
+          .computeUInt32Size(1, optionId_);
       }
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, gadgetEntityId_);
+          .computeUInt32Size(9, gadgetEntityId_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(14, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -227,10 +222,10 @@ public final class SelectWorktopOptionRspOuterClass {
 
       if (getOptionId()
           != other.getOptionId()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getGadgetEntityId()
           != other.getGadgetEntityId()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -244,10 +239,10 @@ public final class SelectWorktopOptionRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + OPTION_ID_FIELD_NUMBER;
       hash = (53 * hash) + getOptionId();
-      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) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class SelectWorktopOptionRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27194
-     * Obf: MJHAKKACKEC
-     * </pre>
-     *
      * Protobuf type {@code SelectWorktopOptionRsp}
      */
     public static final class Builder extends
@@ -388,10 +378,10 @@ public final class SelectWorktopOptionRspOuterClass {
         super.clear();
         optionId_ = 0;
 
-        retcode_ = 0;
-
         gadgetEntityId_ = 0;
 
+        retcode_ = 0;
+
         return this;
       }
 
@@ -419,8 +409,8 @@ public final class SelectWorktopOptionRspOuterClass {
       public emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp buildPartial() {
         emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp result = new emu.grasscutter.net.proto.SelectWorktopOptionRspOuterClass.SelectWorktopOptionRsp(this);
         result.optionId_ = optionId_;
-        result.retcode_ = retcode_;
         result.gadgetEntityId_ = gadgetEntityId_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -472,12 +462,12 @@ public final class SelectWorktopOptionRspOuterClass {
         if (other.getOptionId() != 0) {
           setOptionId(other.getOptionId());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getGadgetEntityId() != 0) {
           setGadgetEntityId(other.getGadgetEntityId());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -509,7 +499,7 @@ public final class SelectWorktopOptionRspOuterClass {
 
       private int optionId_ ;
       /**
-       * <code>uint32 option_id = 13;</code>
+       * <code>uint32 option_id = 1;</code>
        * @return The optionId.
        */
       @java.lang.Override
@@ -517,7 +507,7 @@ public final class SelectWorktopOptionRspOuterClass {
         return optionId_;
       }
       /**
-       * <code>uint32 option_id = 13;</code>
+       * <code>uint32 option_id = 1;</code>
        * @param value The optionId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +518,7 @@ public final class SelectWorktopOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 option_id = 13;</code>
+       * <code>uint32 option_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionId() {
@@ -538,40 +528,9 @@ public final class SelectWorktopOptionRspOuterClass {
         return this;
       }
 
-      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 int gadgetEntityId_ ;
       /**
-       * <code>uint32 gadget_entity_id = 14;</code>
+       * <code>uint32 gadget_entity_id = 9;</code>
        * @return The gadgetEntityId.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class SelectWorktopOptionRspOuterClass {
         return gadgetEntityId_;
       }
       /**
-       * <code>uint32 gadget_entity_id = 14;</code>
+       * <code>uint32 gadget_entity_id = 9;</code>
        * @param value The gadgetEntityId to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class SelectWorktopOptionRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 gadget_entity_id = 14;</code>
+       * <code>uint32 gadget_entity_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetEntityId() {
@@ -599,6 +558,37 @@ public final class SelectWorktopOptionRspOuterClass {
         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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class SelectWorktopOptionRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034SelectWorktopOptionRsp.proto\"V\n\026Select" +
-      "WorktopOptionRsp\022\021\n\toption_id\030\r \001(\r\022\017\n\007r" +
-      "etcode\030\t \001(\005\022\030\n\020gadget_entity_id\030\016 \001(\rB\033" +
+      "WorktopOptionRsp\022\021\n\toption_id\030\001 \001(\r\022\030\n\020g" +
+      "adget_entity_id\030\t \001(\r\022\017\n\007retcode\030\016 \001(\005B\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class SelectWorktopOptionRspOuterClass {
     internal_static_SelectWorktopOptionRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SelectWorktopOptionRsp_descriptor,
-        new java.lang.String[] { "OptionId", "Retcode", "GadgetEntityId", });
+        new java.lang.String[] { "OptionId", "GadgetEntityId", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServantInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServantInfoOuterClass.java
index 382b6cd7c..9199a47dc 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServantInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServantInfoOuterClass.java
@@ -32,7 +32,7 @@ public final class ServantInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: CILIBMDMDLK
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code ServantInfo}
@@ -311,7 +311,7 @@ public final class ServantInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: CILIBMDMDLK
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code ServantInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerAnnounceNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerAnnounceNotifyOuterClass.java
index 83c4647a2..6cfe6bf2e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerAnnounceNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerAnnounceNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class ServerAnnounceNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> 
         getAnnounceDataListList();
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index);
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     int getAnnounceDataListCount();
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder> 
         getAnnounceDataListOrBuilderList();
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 7548
-   * Obf: MHDDLLDBBJD
-   * </pre>
-   *
    * Protobuf type {@code ServerAnnounceNotify}
    */
   public static final class ServerAnnounceNotify extends
@@ -94,7 +89,7 @@ public final class ServerAnnounceNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 122: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 announceDataList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class ServerAnnounceNotifyOuterClass {
               emu.grasscutter.net.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.class, emu.grasscutter.net.proto.ServerAnnounceNotifyOuterClass.ServerAnnounceNotify.Builder.class);
     }
 
-    public static final int ANNOUNCE_DATA_LIST_FIELD_NUMBER = 3;
+    public static final int ANNOUNCE_DATA_LIST_FIELD_NUMBER = 15;
     private java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> announceDataList_;
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> getAnnounceDataListList() {
       return announceDataList_;
     }
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder> 
@@ -156,21 +151,21 @@ public final class ServerAnnounceNotifyOuterClass {
       return announceDataList_;
     }
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     @java.lang.Override
     public int getAnnounceDataListCount() {
       return announceDataList_.size();
     }
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index) {
       return announceDataList_.get(index);
     }
     /**
-     * <code>repeated .AnnounceData announce_data_list = 3;</code>
+     * <code>repeated .AnnounceData announce_data_list = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
@@ -193,7 +188,7 @@ public final class ServerAnnounceNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < announceDataList_.size(); i++) {
-        output.writeMessage(3, announceDataList_.get(i));
+        output.writeMessage(15, announceDataList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class ServerAnnounceNotifyOuterClass {
       size = 0;
       for (int i = 0; i < announceDataList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, announceDataList_.get(i));
+          .computeMessageSize(15, announceDataList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class ServerAnnounceNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7548
-     * Obf: MHDDLLDBBJD
-     * </pre>
-     *
      * Protobuf type {@code ServerAnnounceNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class ServerAnnounceNotifyOuterClass {
           emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder> announceDataListBuilder_;
 
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> getAnnounceDataListList() {
         if (announceDataListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class ServerAnnounceNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public int getAnnounceDataListCount() {
         if (announceDataListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class ServerAnnounceNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData getAnnounceDataList(int index) {
         if (announceDataListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class ServerAnnounceNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder setAnnounceDataList(
           int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
@@ -585,7 +575,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder setAnnounceDataList(
           int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder addAnnounceDataList(emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
         if (announceDataListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder addAnnounceDataList(
           int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData value) {
@@ -632,7 +622,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder addAnnounceDataList(
           emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder addAnnounceDataList(
           int index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder addAllAnnounceDataList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData> values) {
@@ -675,7 +665,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder clearAnnounceDataList() {
         if (announceDataListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public Builder removeAnnounceDataList(int index) {
         if (announceDataListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class ServerAnnounceNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder getAnnounceDataListBuilder(
           int index) {
         return getAnnounceDataListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder getAnnounceDataListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class ServerAnnounceNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceDataOrBuilder> 
            getAnnounceDataListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class ServerAnnounceNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder addAnnounceDataListBuilder() {
         return getAnnounceDataListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder addAnnounceDataListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class ServerAnnounceNotifyOuterClass {
             index, emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.getDefaultInstance());
       }
       /**
-       * <code>repeated .AnnounceData announce_data_list = 3;</code>
+       * <code>repeated .AnnounceData announce_data_list = 15;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AnnounceDataOuterClass.AnnounceData.Builder> 
            getAnnounceDataListBuilderList() {
@@ -833,7 +823,7 @@ public final class ServerAnnounceNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032ServerAnnounceNotify.proto\032\022AnnounceDa" +
       "ta.proto\"A\n\024ServerAnnounceNotify\022)\n\022anno" +
-      "unce_data_list\030\003 \003(\0132\r.AnnounceDataB\033\n\031e" +
+      "unce_data_list\030\017 \003(\0132\r.AnnounceDataB\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/ServerBuffChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeNotifyOuterClass.java
index 0d5acbc42..d459e65e3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeNotifyOuterClass.java
@@ -19,86 +19,81 @@ public final class ServerBuffChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
-        getServerBuffListList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    int getServerBuffListCount();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList();
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @return A list containing the avatarGuidList.
-     */
-    java.util.List<java.lang.Long> getAvatarGuidListList();
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @return The count of avatarGuidList.
-     */
-    int getAvatarGuidListCount();
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The avatarGuidList at the given index.
-     */
-    long getAvatarGuidList(int index);
-
-    /**
-     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
-     * @return The enum numeric value on the wire for serverBuffChangeType.
-     */
-    int getServerBuffChangeTypeValue();
-    /**
-     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
-     * @return The serverBuffChangeType.
-     */
-    emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType getServerBuffChangeType();
-
-    /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @return A list containing the entityIdList.
      */
     java.util.List<java.lang.Integer> getEntityIdListList();
     /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @return The count of entityIdList.
      */
     int getEntityIdListCount();
     /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The entityIdList at the given index.
      */
     int getEntityIdList(int index);
 
     /**
-     * <code>bool is_creature_buff = 7;</code>
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> 
+        getServerBuffListList();
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index);
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
+     */
+    int getServerBuffListCount();
+    /**
+     * <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 = 2;</code>
+     */
+    emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index);
+
+    /**
+     * <code>bool is_creature_buff = 3;</code>
      * @return The isCreatureBuff.
      */
     boolean getIsCreatureBuff();
+
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @return A list containing the avatarGuidList.
+     */
+    java.util.List<java.lang.Long> getAvatarGuidListList();
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @return The count of avatarGuidList.
+     */
+    int getAvatarGuidListCount();
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The avatarGuidList at the given index.
+     */
+    long getAvatarGuidList(int index);
+
+    /**
+     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
+     * @return The enum numeric value on the wire for serverBuffChangeType.
+     */
+    int getServerBuffChangeTypeValue();
+    /**
+     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
+     * @return The serverBuffChangeType.
+     */
+    emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType getServerBuffChangeType();
   }
   /**
-   * <pre>
-   * CmdId: 6462
-   * Obf: FIKGOMABCGP
-   * </pre>
-   *
    * Protobuf type {@code ServerBuffChangeNotify}
    */
   public static final class ServerBuffChangeNotify extends
@@ -111,10 +106,10 @@ public final class ServerBuffChangeNotifyOuterClass {
       super(builder);
     }
     private ServerBuffChangeNotify() {
+      entityIdList_ = emptyIntList();
       serverBuffList_ = java.util.Collections.emptyList();
       avatarGuidList_ = emptyLongList();
       serverBuffChangeType_ = 0;
-      entityIdList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -148,52 +143,20 @@ public final class ServerBuffChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              isCreatureBuff_ = input.readBool();
-              break;
-            }
-            case 64: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                avatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              avatarGuidList_.addLong(input.readUInt64());
-              break;
-            }
-            case 66: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
-                avatarGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                avatarGuidList_.addLong(input.readUInt64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 88: {
-              int rawValue = input.readEnum();
-
-              serverBuffChangeType_ = rawValue;
-              break;
-            }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 8: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               entityIdList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
                 entityIdList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 entityIdList_.addInt(input.readUInt32());
@@ -201,15 +164,47 @@ public final class ServerBuffChangeNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 serverBuffList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               serverBuffList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.parser(), extensionRegistry));
               break;
             }
+            case 24: {
+
+              isCreatureBuff_ = input.readBool();
+              break;
+            }
+            case 88: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                avatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              avatarGuidList_.addLong(input.readUInt64());
+              break;
+            }
+            case 90: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+                avatarGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                avatarGuidList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 112: {
+              int rawValue = input.readEnum();
+
+              serverBuffChangeType_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -225,15 +220,15 @@ public final class ServerBuffChangeNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          avatarGuidList_.makeImmutable(); // C
-        }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           entityIdList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           serverBuffList_ = java.util.Collections.unmodifiableList(serverBuffList_);
         }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
+          avatarGuidList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -252,10 +247,6 @@ public final class ServerBuffChangeNotifyOuterClass {
     }
 
     /**
-     * <pre>
-     * Obf: EEAKJOFDEFO
-     * </pre>
-     *
      * Protobuf enum {@code ServerBuffChangeNotify.ServerBuffChangeType}
      */
     public enum ServerBuffChangeType
@@ -363,97 +354,10 @@ public final class ServerBuffChangeNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:ServerBuffChangeNotify.ServerBuffChangeType)
     }
 
-    public static final int SERVER_BUFF_LIST_FIELD_NUMBER = 15;
-    private java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> serverBuffList_;
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
-        getServerBuffListOrBuilderList() {
-      return serverBuffList_;
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    @java.lang.Override
-    public int getServerBuffListCount() {
-      return serverBuffList_.size();
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
-      return serverBuffList_.get(index);
-    }
-    /**
-     * <code>repeated .ServerBuff server_buff_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
-        int index) {
-      return serverBuffList_.get(index);
-    }
-
-    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 8;
-    private com.google.protobuf.Internal.LongList avatarGuidList_;
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @return A list containing the avatarGuidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Long>
-        getAvatarGuidListList() {
-      return avatarGuidList_;
-    }
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @return The count of avatarGuidList.
-     */
-    public int getAvatarGuidListCount() {
-      return avatarGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 avatar_guid_list = 8;</code>
-     * @param index The index of the element to return.
-     * @return The avatarGuidList at the given index.
-     */
-    public long getAvatarGuidList(int index) {
-      return avatarGuidList_.getLong(index);
-    }
-    private int avatarGuidListMemoizedSerializedSize = -1;
-
-    public static final int SERVER_BUFF_CHANGE_TYPE_FIELD_NUMBER = 11;
-    private int serverBuffChangeType_;
-    /**
-     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
-     * @return The enum numeric value on the wire for serverBuffChangeType.
-     */
-    @java.lang.Override public int getServerBuffChangeTypeValue() {
-      return serverBuffChangeType_;
-    }
-    /**
-     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
-     * @return The serverBuffChangeType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType getServerBuffChangeType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType result = emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.valueOf(serverBuffChangeType_);
-      return result == null ? emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.UNRECOGNIZED : result;
-    }
-
-    public static final int ENTITY_ID_LIST_FIELD_NUMBER = 14;
+    public static final int ENTITY_ID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList entityIdList_;
     /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @return A list containing the entityIdList.
      */
     @java.lang.Override
@@ -462,14 +366,14 @@ public final class ServerBuffChangeNotifyOuterClass {
       return entityIdList_;
     }
     /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @return The count of entityIdList.
      */
     public int getEntityIdListCount() {
       return entityIdList_.size();
     }
     /**
-     * <code>repeated uint32 entity_id_list = 14;</code>
+     * <code>repeated uint32 entity_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The entityIdList at the given index.
      */
@@ -478,10 +382,50 @@ public final class ServerBuffChangeNotifyOuterClass {
     }
     private int entityIdListMemoizedSerializedSize = -1;
 
-    public static final int IS_CREATURE_BUFF_FIELD_NUMBER = 7;
+    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 = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
+        getServerBuffListOrBuilderList() {
+      return serverBuffList_;
+    }
+    /**
+     * <code>repeated .ServerBuff server_buff_list = 2;</code>
+     */
+    @java.lang.Override
+    public int getServerBuffListCount() {
+      return serverBuffList_.size();
+    }
+    /**
+     * <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 = 2;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
+        int index) {
+      return serverBuffList_.get(index);
+    }
+
+    public static final int IS_CREATURE_BUFF_FIELD_NUMBER = 3;
     private boolean isCreatureBuff_;
     /**
-     * <code>bool is_creature_buff = 7;</code>
+     * <code>bool is_creature_buff = 3;</code>
      * @return The isCreatureBuff.
      */
     @java.lang.Override
@@ -489,6 +433,53 @@ public final class ServerBuffChangeNotifyOuterClass {
       return isCreatureBuff_;
     }
 
+    public static final int AVATAR_GUID_LIST_FIELD_NUMBER = 11;
+    private com.google.protobuf.Internal.LongList avatarGuidList_;
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @return A list containing the avatarGuidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getAvatarGuidListList() {
+      return avatarGuidList_;
+    }
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @return The count of avatarGuidList.
+     */
+    public int getAvatarGuidListCount() {
+      return avatarGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 avatar_guid_list = 11;</code>
+     * @param index The index of the element to return.
+     * @return The avatarGuidList at the given index.
+     */
+    public long getAvatarGuidList(int index) {
+      return avatarGuidList_.getLong(index);
+    }
+    private int avatarGuidListMemoizedSerializedSize = -1;
+
+    public static final int SERVER_BUFF_CHANGE_TYPE_FIELD_NUMBER = 14;
+    private int serverBuffChangeType_;
+    /**
+     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
+     * @return The enum numeric value on the wire for serverBuffChangeType.
+     */
+    @java.lang.Override public int getServerBuffChangeTypeValue() {
+      return serverBuffChangeType_;
+    }
+    /**
+     * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
+     * @return The serverBuffChangeType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType getServerBuffChangeType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType result = emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.valueOf(serverBuffChangeType_);
+      return result == null ? emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -504,28 +495,28 @@ public final class ServerBuffChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (isCreatureBuff_ != false) {
-        output.writeBool(7, isCreatureBuff_);
-      }
-      if (getAvatarGuidListList().size() > 0) {
-        output.writeUInt32NoTag(66);
-        output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
-      }
-      for (int i = 0; i < avatarGuidList_.size(); i++) {
-        output.writeUInt64NoTag(avatarGuidList_.getLong(i));
-      }
-      if (serverBuffChangeType_ != emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF.getNumber()) {
-        output.writeEnum(11, serverBuffChangeType_);
-      }
       if (getEntityIdListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(entityIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < entityIdList_.size(); i++) {
         output.writeUInt32NoTag(entityIdList_.getInt(i));
       }
       for (int i = 0; i < serverBuffList_.size(); i++) {
-        output.writeMessage(15, serverBuffList_.get(i));
+        output.writeMessage(2, serverBuffList_.get(i));
+      }
+      if (isCreatureBuff_ != false) {
+        output.writeBool(3, isCreatureBuff_);
+      }
+      if (getAvatarGuidListList().size() > 0) {
+        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(avatarGuidListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < avatarGuidList_.size(); i++) {
+        output.writeUInt64NoTag(avatarGuidList_.getLong(i));
+      }
+      if (serverBuffChangeType_ != emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF.getNumber()) {
+        output.writeEnum(14, serverBuffChangeType_);
       }
       unknownFields.writeTo(output);
     }
@@ -536,9 +527,27 @@ public final class ServerBuffChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < entityIdList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(entityIdList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getEntityIdListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        entityIdListMemoizedSerializedSize = dataSize;
+      }
+      for (int i = 0; i < serverBuffList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(2, serverBuffList_.get(i));
+      }
       if (isCreatureBuff_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isCreatureBuff_);
+          .computeBoolSize(3, isCreatureBuff_);
       }
       {
         int dataSize = 0;
@@ -556,25 +565,7 @@ public final class ServerBuffChangeNotifyOuterClass {
       }
       if (serverBuffChangeType_ != emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.SERVER_BUFF_CHANGE_TYPE_ADD_SERVER_BUFF.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, serverBuffChangeType_);
-      }
-      {
-        int dataSize = 0;
-        for (int i = 0; i < entityIdList_.size(); i++) {
-          dataSize += com.google.protobuf.CodedOutputStream
-            .computeUInt32SizeNoTag(entityIdList_.getInt(i));
-        }
-        size += dataSize;
-        if (!getEntityIdListList().isEmpty()) {
-          size += 1;
-          size += com.google.protobuf.CodedOutputStream
-              .computeInt32SizeNoTag(dataSize);
-        }
-        entityIdListMemoizedSerializedSize = dataSize;
-      }
-      for (int i = 0; i < serverBuffList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, serverBuffList_.get(i));
+          .computeEnumSize(14, serverBuffChangeType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -591,15 +582,15 @@ public final class ServerBuffChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify other = (emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify) obj;
 
+      if (!getEntityIdListList()
+          .equals(other.getEntityIdListList())) return false;
       if (!getServerBuffListList()
           .equals(other.getServerBuffListList())) return false;
+      if (getIsCreatureBuff()
+          != other.getIsCreatureBuff()) return false;
       if (!getAvatarGuidListList()
           .equals(other.getAvatarGuidListList())) return false;
       if (serverBuffChangeType_ != other.serverBuffChangeType_) return false;
-      if (!getEntityIdListList()
-          .equals(other.getEntityIdListList())) return false;
-      if (getIsCreatureBuff()
-          != other.getIsCreatureBuff()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -611,23 +602,23 @@ public final class ServerBuffChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getEntityIdListCount() > 0) {
+        hash = (37 * hash) + ENTITY_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getEntityIdListList().hashCode();
+      }
       if (getServerBuffListCount() > 0) {
         hash = (37 * hash) + SERVER_BUFF_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getServerBuffListList().hashCode();
       }
+      hash = (37 * hash) + IS_CREATURE_BUFF_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsCreatureBuff());
       if (getAvatarGuidListCount() > 0) {
         hash = (37 * hash) + AVATAR_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarGuidListList().hashCode();
       }
       hash = (37 * hash) + SERVER_BUFF_CHANGE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + serverBuffChangeType_;
-      if (getEntityIdListCount() > 0) {
-        hash = (37 * hash) + ENTITY_ID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getEntityIdListList().hashCode();
-      }
-      hash = (37 * hash) + IS_CREATURE_BUFF_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsCreatureBuff());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -724,11 +715,6 @@ public final class ServerBuffChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6462
-     * Obf: FIKGOMABCGP
-     * </pre>
-     *
      * Protobuf type {@code ServerBuffChangeNotify}
      */
     public static final class Builder extends
@@ -767,20 +753,20 @@ public final class ServerBuffChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        entityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         if (serverBuffListBuilder_ == null) {
           serverBuffList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           serverBuffListBuilder_.clear();
         }
-        avatarGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        serverBuffChangeType_ = 0;
-
-        entityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
         isCreatureBuff_ = false;
 
+        avatarGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000004);
+        serverBuffChangeType_ = 0;
+
         return this;
       }
 
@@ -808,27 +794,27 @@ public final class ServerBuffChangeNotifyOuterClass {
       public emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify buildPartial() {
         emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify result = new emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify(this);
         int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          entityIdList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.entityIdList_ = entityIdList_;
         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 (((bitField0_ & 0x00000002) != 0)) {
+        result.isCreatureBuff_ = isCreatureBuff_;
+        if (((bitField0_ & 0x00000004) != 0)) {
           avatarGuidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.avatarGuidList_ = avatarGuidList_;
         result.serverBuffChangeType_ = serverBuffChangeType_;
-        if (((bitField0_ & 0x00000004) != 0)) {
-          entityIdList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.entityIdList_ = entityIdList_;
-        result.isCreatureBuff_ = isCreatureBuff_;
         onBuilt();
         return result;
       }
@@ -877,11 +863,21 @@ public final class ServerBuffChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify other) {
         if (other == emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.getDefaultInstance()) return this;
+        if (!other.entityIdList_.isEmpty()) {
+          if (entityIdList_.isEmpty()) {
+            entityIdList_ = other.entityIdList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureEntityIdListIsMutable();
+            entityIdList_.addAll(other.entityIdList_);
+          }
+          onChanged();
+        }
         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_);
@@ -894,7 +890,7 @@ public final class ServerBuffChangeNotifyOuterClass {
               serverBuffListBuilder_.dispose();
               serverBuffListBuilder_ = null;
               serverBuffList_ = other.serverBuffList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               serverBuffListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getServerBuffListFieldBuilder() : null;
@@ -903,10 +899,13 @@ public final class ServerBuffChangeNotifyOuterClass {
             }
           }
         }
+        if (other.getIsCreatureBuff() != false) {
+          setIsCreatureBuff(other.getIsCreatureBuff());
+        }
         if (!other.avatarGuidList_.isEmpty()) {
           if (avatarGuidList_.isEmpty()) {
             avatarGuidList_ = other.avatarGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
           } else {
             ensureAvatarGuidListIsMutable();
             avatarGuidList_.addAll(other.avatarGuidList_);
@@ -916,19 +915,6 @@ public final class ServerBuffChangeNotifyOuterClass {
         if (other.serverBuffChangeType_ != 0) {
           setServerBuffChangeTypeValue(other.getServerBuffChangeTypeValue());
         }
-        if (!other.entityIdList_.isEmpty()) {
-          if (entityIdList_.isEmpty()) {
-            entityIdList_ = other.entityIdList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
-          } else {
-            ensureEntityIdListIsMutable();
-            entityIdList_.addAll(other.entityIdList_);
-          }
-          onChanged();
-        }
-        if (other.getIsCreatureBuff() != false) {
-          setIsCreatureBuff(other.getIsCreatureBuff());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -959,12 +945,91 @@ public final class ServerBuffChangeNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList entityIdList_ = emptyIntList();
+      private void ensureEntityIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          entityIdList_ = mutableCopy(entityIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @return A list containing the entityIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getEntityIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(entityIdList_) : entityIdList_;
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @return The count of entityIdList.
+       */
+      public int getEntityIdListCount() {
+        return entityIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @param index The index of the element to return.
+       * @return The entityIdList at the given index.
+       */
+      public int getEntityIdList(int index) {
+        return entityIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The entityIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEntityIdList(
+          int index, int value) {
+        ensureEntityIdListIsMutable();
+        entityIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @param value The entityIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addEntityIdList(int value) {
+        ensureEntityIdListIsMutable();
+        entityIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @param values The entityIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllEntityIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureEntityIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, entityIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 entity_id_list = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityIdList() {
+        entityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       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;
          }
       }
 
@@ -972,7 +1037,7 @@ public final class ServerBuffChangeNotifyOuterClass {
           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 = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> getServerBuffListList() {
         if (serverBuffListBuilder_ == null) {
@@ -982,7 +1047,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public int getServerBuffListCount() {
         if (serverBuffListBuilder_ == null) {
@@ -992,7 +1057,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff getServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1002,7 +1067,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1019,7 +1084,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder setServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1033,7 +1098,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
         if (serverBuffListBuilder_ == null) {
@@ -1049,7 +1114,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff value) {
@@ -1066,7 +1131,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1080,7 +1145,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addServerBuffList(
           int index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder builderForValue) {
@@ -1094,7 +1159,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder addAllServerBuffList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff> values) {
@@ -1109,12 +1174,12 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <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();
@@ -1122,7 +1187,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public Builder removeServerBuffList(int index) {
         if (serverBuffListBuilder_ == null) {
@@ -1135,14 +1200,14 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <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 = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder getServerBuffListOrBuilder(
           int index) {
@@ -1152,7 +1217,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuffOrBuilder> 
            getServerBuffListOrBuilderList() {
@@ -1163,14 +1228,14 @@ public final class ServerBuffChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <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 = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder addServerBuffListBuilder(
           int index) {
@@ -1178,7 +1243,7 @@ public final class ServerBuffChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.getDefaultInstance());
       }
       /**
-       * <code>repeated .ServerBuff server_buff_list = 15;</code>
+       * <code>repeated .ServerBuff server_buff_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ServerBuffOuterClass.ServerBuff.Builder> 
            getServerBuffListBuilderList() {
@@ -1191,7 +1256,7 @@ public final class ServerBuffChangeNotifyOuterClass {
           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;
@@ -1199,31 +1264,62 @@ public final class ServerBuffChangeNotifyOuterClass {
         return serverBuffListBuilder_;
       }
 
+      private boolean isCreatureBuff_ ;
+      /**
+       * <code>bool is_creature_buff = 3;</code>
+       * @return The isCreatureBuff.
+       */
+      @java.lang.Override
+      public boolean getIsCreatureBuff() {
+        return isCreatureBuff_;
+      }
+      /**
+       * <code>bool is_creature_buff = 3;</code>
+       * @param value The isCreatureBuff to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsCreatureBuff(boolean value) {
+        
+        isCreatureBuff_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_creature_buff = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsCreatureBuff() {
+        
+        isCreatureBuff_ = false;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.LongList avatarGuidList_ = emptyLongList();
       private void ensureAvatarGuidListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000004) != 0)) {
           avatarGuidList_ = mutableCopy(avatarGuidList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000004;
          }
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return A list containing the avatarGuidList.
        */
       public java.util.List<java.lang.Long>
           getAvatarGuidListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000004) != 0) ?
                  java.util.Collections.unmodifiableList(avatarGuidList_) : avatarGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return The count of avatarGuidList.
        */
       public int getAvatarGuidListCount() {
         return avatarGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param index The index of the element to return.
        * @return The avatarGuidList at the given index.
        */
@@ -1231,7 +1327,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return avatarGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The avatarGuidList to set.
        * @return This builder for chaining.
@@ -1244,7 +1340,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param value The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -1255,7 +1351,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @param values The avatarGuidList to add.
        * @return This builder for chaining.
        */
@@ -1268,26 +1364,26 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_guid_list = 8;</code>
+       * <code>repeated uint64 avatar_guid_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuidList() {
         avatarGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        bitField0_ = (bitField0_ & ~0x00000004);
         onChanged();
         return this;
       }
 
       private int serverBuffChangeType_ = 0;
       /**
-       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
+       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
        * @return The enum numeric value on the wire for serverBuffChangeType.
        */
       @java.lang.Override public int getServerBuffChangeTypeValue() {
         return serverBuffChangeType_;
       }
       /**
-       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
+       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
        * @param value The enum numeric value on the wire for serverBuffChangeType to set.
        * @return This builder for chaining.
        */
@@ -1298,7 +1394,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
+       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
        * @return The serverBuffChangeType.
        */
       @java.lang.Override
@@ -1308,7 +1404,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.ServerBuffChangeNotifyOuterClass.ServerBuffChangeNotify.ServerBuffChangeType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
+       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
        * @param value The serverBuffChangeType to set.
        * @return This builder for chaining.
        */
@@ -1322,7 +1418,7 @@ public final class ServerBuffChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 11;</code>
+       * <code>.ServerBuffChangeNotify.ServerBuffChangeType server_buff_change_type = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearServerBuffChangeType() {
@@ -1331,116 +1427,6 @@ public final class ServerBuffChangeNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList entityIdList_ = emptyIntList();
-      private void ensureEntityIdListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          entityIdList_ = mutableCopy(entityIdList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @return A list containing the entityIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getEntityIdListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
-                 java.util.Collections.unmodifiableList(entityIdList_) : entityIdList_;
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @return The count of entityIdList.
-       */
-      public int getEntityIdListCount() {
-        return entityIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @param index The index of the element to return.
-       * @return The entityIdList at the given index.
-       */
-      public int getEntityIdList(int index) {
-        return entityIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The entityIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEntityIdList(
-          int index, int value) {
-        ensureEntityIdListIsMutable();
-        entityIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @param value The entityIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addEntityIdList(int value) {
-        ensureEntityIdListIsMutable();
-        entityIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @param values The entityIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllEntityIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureEntityIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, entityIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 entity_id_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityIdList() {
-        entityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
-        onChanged();
-        return this;
-      }
-
-      private boolean isCreatureBuff_ ;
-      /**
-       * <code>bool is_creature_buff = 7;</code>
-       * @return The isCreatureBuff.
-       */
-      @java.lang.Override
-      public boolean getIsCreatureBuff() {
-        return isCreatureBuff_;
-      }
-      /**
-       * <code>bool is_creature_buff = 7;</code>
-       * @param value The isCreatureBuff to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsCreatureBuff(boolean value) {
-        
-        isCreatureBuff_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_creature_buff = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsCreatureBuff() {
-        
-        isCreatureBuff_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1509,12 +1495,12 @@ public final class ServerBuffChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034ServerBuffChangeNotify.proto\032\020ServerBu" +
-      "ff.proto\"\314\002\n\026ServerBuffChangeNotify\022%\n\020s" +
-      "erver_buff_list\030\017 \003(\0132\013.ServerBuff\022\030\n\020av" +
-      "atar_guid_list\030\010 \003(\004\022M\n\027server_buff_chan" +
-      "ge_type\030\013 \001(\0162,.ServerBuffChangeNotify.S" +
-      "erverBuffChangeType\022\026\n\016entity_id_list\030\016 " +
-      "\003(\r\022\030\n\020is_creature_buff\030\007 \001(\010\"p\n\024ServerB" +
+      "ff.proto\"\314\002\n\026ServerBuffChangeNotify\022\026\n\016e" +
+      "ntity_id_list\030\001 \003(\r\022%\n\020server_buff_list\030" +
+      "\002 \003(\0132\013.ServerBuff\022\030\n\020is_creature_buff\030\003" +
+      " \001(\010\022\030\n\020avatar_guid_list\030\013 \003(\004\022M\n\027server" +
+      "_buff_change_type\030\016 \001(\0162,.ServerBuffChan" +
+      "geNotify.ServerBuffChangeType\"p\n\024ServerB" +
       "uffChangeType\022+\n\'SERVER_BUFF_CHANGE_TYPE" +
       "_ADD_SERVER_BUFF\020\000\022+\n\'SERVER_BUFF_CHANGE" +
       "_TYPE_DEL_SERVER_BUFF\020\001B\033\n\031emu.grasscutt" +
@@ -1530,7 +1516,7 @@ public final class ServerBuffChangeNotifyOuterClass {
     internal_static_ServerBuffChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ServerBuffChangeNotify_descriptor,
-        new java.lang.String[] { "ServerBuffList", "AvatarGuidList", "ServerBuffChangeType", "EntityIdList", "IsCreatureBuff", });
+        new java.lang.String[] { "EntityIdList", "ServerBuffList", "IsCreatureBuff", "AvatarGuidList", "ServerBuffChangeType", });
     emu.grasscutter.net.proto.ServerBuffOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeTypeOuterClass.java
new file mode 100644
index 000000000..d08c24abc
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffChangeTypeOuterClass.java
@@ -0,0 +1,146 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ServerBuffChangeType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ServerBuffChangeTypeOuterClass {
+  private ServerBuffChangeTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code ServerBuffChangeType}
+   */
+  public enum ServerBuffChangeType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>ADD_SERVER_BUFF = 0;</code>
+     */
+    ADD_SERVER_BUFF(0),
+    /**
+     * <code>DEL_SERVER_BUFF = 1;</code>
+     */
+    DEL_SERVER_BUFF(1),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>ADD_SERVER_BUFF = 0;</code>
+     */
+    public static final int ADD_SERVER_BUFF_VALUE = 0;
+    /**
+     * <code>DEL_SERVER_BUFF = 1;</code>
+     */
+    public static final int DEL_SERVER_BUFF_VALUE = 1;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ServerBuffChangeType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ServerBuffChangeType forNumber(int value) {
+      switch (value) {
+        case 0: return ADD_SERVER_BUFF;
+        case 1: return DEL_SERVER_BUFF;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ServerBuffChangeType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ServerBuffChangeType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ServerBuffChangeType>() {
+            public ServerBuffChangeType findValueByNumber(int number) {
+              return ServerBuffChangeType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ServerBuffChangeTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ServerBuffChangeType[] VALUES = values();
+
+    public static ServerBuffChangeType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ServerBuffChangeType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:ServerBuffChangeType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\032ServerBuffChangeType.proto*@\n\024ServerBu" +
+      "ffChangeType\022\023\n\017ADD_SERVER_BUFF\020\000\022\023\n\017DEL" +
+      "_SERVER_BUFF\020\001B\033\n\031emu.grasscutter.net.pr" +
+      "otob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffOuterClass.java
index 2b314db44..39c44e4eb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerBuffOuterClass.java
@@ -49,10 +49,6 @@ public final class ServerBuffOuterClass {
     boolean getIsModifierAdded();
   }
   /**
-   * <pre>
-   * Obf: JGJPJFGLDOE
-   * </pre>
-   *
    * Protobuf type {@code ServerBuff}
    */
   public static final class ServerBuff extends
@@ -410,10 +406,6 @@ public final class ServerBuffOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JGJPJFGLDOE
-     * </pre>
-     *
      * Protobuf type {@code ServerBuff}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ServerDisconnectClientNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerDisconnectClientNotifyOuterClass.java
index 446d090bc..f428a65e2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerDisconnectClientNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerDisconnectClientNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class ServerDisconnectClientNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 data = 13;</code>
+     * <code>uint32 data = 15;</code>
      * @return The data.
      */
     int getData();
   }
   /**
-   * <pre>
-   * CmdId: 22635
-   * Obf: HEHEEJKLCGH
-   * </pre>
-   *
    * Protobuf type {@code ServerDisconnectClientNotify}
    */
   public static final class ServerDisconnectClientNotify extends
@@ -74,7 +69,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 104: {
+            case 120: {
 
               data_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class ServerDisconnectClientNotifyOuterClass {
               emu.grasscutter.net.proto.ServerDisconnectClientNotifyOuterClass.ServerDisconnectClientNotify.class, emu.grasscutter.net.proto.ServerDisconnectClientNotifyOuterClass.ServerDisconnectClientNotify.Builder.class);
     }
 
-    public static final int DATA_FIELD_NUMBER = 13;
+    public static final int DATA_FIELD_NUMBER = 15;
     private int data_;
     /**
-     * <code>uint32 data = 13;</code>
+     * <code>uint32 data = 15;</code>
      * @return The data.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (data_ != 0) {
-        output.writeUInt32(13, data_);
+        output.writeUInt32(15, data_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
       size = 0;
       if (data_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, data_);
+          .computeUInt32Size(15, data_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class ServerDisconnectClientNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22635
-     * Obf: HEHEEJKLCGH
-     * </pre>
-     *
      * Protobuf type {@code ServerDisconnectClientNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
 
       private int data_ ;
       /**
-       * <code>uint32 data = 13;</code>
+       * <code>uint32 data = 15;</code>
        * @return The data.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
         return data_;
       }
       /**
-       * <code>uint32 data = 13;</code>
+       * <code>uint32 data = 15;</code>
        * @param value The data to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 data = 13;</code>
+       * <code>uint32 data = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearData() {
@@ -527,7 +517,7 @@ public final class ServerDisconnectClientNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\"ServerDisconnectClientNotify.proto\",\n\034" +
-      "ServerDisconnectClientNotify\022\014\n\004data\030\r \001" +
+      "ServerDisconnectClientNotify\022\014\n\004data\030\017 \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/ServerGlobalValueChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
index 4e5756b16..8c4426683 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerGlobalValueChangeNotifyOuterClass.java
@@ -19,29 +19,24 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float value = 6;</code>
-     * @return The value.
-     */
-    float getValue();
-
-    /**
-     * <code>uint32 key_hash = 2;</code>
+     * <code>uint32 key_hash = 5;</code>
      * @return The keyHash.
      */
     int getKeyHash();
 
     /**
-     * <code>uint32 entity_id = 14;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     int getEntityId();
+
+    /**
+     * <code>float value = 9;</code>
+     * @return The value.
+     */
+    float getValue();
   }
   /**
-   * <pre>
-   * CmdId: 28698
-   * Obf: GKKPLLOCNMC
-   * </pre>
-   *
    * Protobuf type {@code ServerGlobalValueChangeNotify}
    */
   public static final class ServerGlobalValueChangeNotify extends
@@ -86,21 +81,21 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 40: {
 
               keyHash_ = input.readUInt32();
               break;
             }
-            case 53: {
-
-              value_ = input.readFloat();
-              break;
-            }
-            case 112: {
+            case 56: {
 
               entityId_ = input.readUInt32();
               break;
             }
+            case 77: {
+
+              value_ = input.readFloat();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
               emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify.class, emu.grasscutter.net.proto.ServerGlobalValueChangeNotifyOuterClass.ServerGlobalValueChangeNotify.Builder.class);
     }
 
-    public static final int VALUE_FIELD_NUMBER = 6;
-    private float value_;
-    /**
-     * <code>float value = 6;</code>
-     * @return The value.
-     */
-    @java.lang.Override
-    public float getValue() {
-      return value_;
-    }
-
-    public static final int KEY_HASH_FIELD_NUMBER = 2;
+    public static final int KEY_HASH_FIELD_NUMBER = 5;
     private int keyHash_;
     /**
-     * <code>uint32 key_hash = 2;</code>
+     * <code>uint32 key_hash = 5;</code>
      * @return The keyHash.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       return keyHash_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 14;
+    public static final int ENTITY_ID_FIELD_NUMBER = 7;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 14;</code>
+     * <code>uint32 entity_id = 7;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       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() {
@@ -181,13 +176,13 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (keyHash_ != 0) {
-        output.writeUInt32(2, keyHash_);
-      }
-      if (value_ != 0F) {
-        output.writeFloat(6, value_);
+        output.writeUInt32(5, keyHash_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(14, entityId_);
+        output.writeUInt32(7, entityId_);
+      }
+      if (value_ != 0F) {
+        output.writeFloat(9, value_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       size = 0;
       if (keyHash_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, keyHash_);
-      }
-      if (value_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(6, value_);
+          .computeUInt32Size(5, keyHash_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, entityId_);
+          .computeUInt32Size(7, entityId_);
+      }
+      if (value_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(9, value_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,13 +220,13 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       }
       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;
     }
@@ -243,13 +238,13 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       }
       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,11 +341,6 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28698
-     * Obf: GKKPLLOCNMC
-     * </pre>
-     *
      * Protobuf type {@code ServerGlobalValueChangeNotify}
      */
     public static final class Builder extends
@@ -388,12 +378,12 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        value_ = 0F;
-
         keyHash_ = 0;
 
         entityId_ = 0;
 
+        value_ = 0F;
+
         return this;
       }
 
@@ -420,9 +410,9 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
       @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;
       }
@@ -471,15 +461,15 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
 
       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;
@@ -509,40 +499,9 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         return this;
       }
 
-      private float value_ ;
-      /**
-       * <code>float value = 6;</code>
-       * @return The value.
-       */
-      @java.lang.Override
-      public float getValue() {
-        return value_;
-      }
-      /**
-       * <code>float value = 6;</code>
-       * @param value The value to set.
-       * @return This builder for chaining.
-       */
-      public Builder setValue(float value) {
-        
-        value_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float value = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearValue() {
-        
-        value_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private int keyHash_ ;
       /**
-       * <code>uint32 key_hash = 2;</code>
+       * <code>uint32 key_hash = 5;</code>
        * @return The keyHash.
        */
       @java.lang.Override
@@ -550,7 +509,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         return keyHash_;
       }
       /**
-       * <code>uint32 key_hash = 2;</code>
+       * <code>uint32 key_hash = 5;</code>
        * @param value The keyHash to set.
        * @return This builder for chaining.
        */
@@ -561,7 +520,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 key_hash = 2;</code>
+       * <code>uint32 key_hash = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearKeyHash() {
@@ -573,7 +532,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 14;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -581,7 +540,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 14;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -592,7 +551,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 14;</code>
+       * <code>uint32 entity_id = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -601,6 +560,37 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private float value_ ;
+      /**
+       * <code>float value = 9;</code>
+       * @return The value.
+       */
+      @java.lang.Override
+      public float getValue() {
+        return value_;
+      }
+      /**
+       * <code>float value = 9;</code>
+       * @param value The value to set.
+       * @return This builder for chaining.
+       */
+      public Builder setValue(float value) {
+        
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float value = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearValue() {
+        
+        value_ = 0F;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -669,9 +659,9 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n#ServerGlobalValueChangeNotify.proto\"S\n" +
-      "\035ServerGlobalValueChangeNotify\022\r\n\005value\030" +
-      "\006 \001(\002\022\020\n\010key_hash\030\002 \001(\r\022\021\n\tentity_id\030\016 \001" +
-      "(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "\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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -682,7 +672,7 @@ public final class ServerGlobalValueChangeNotifyOuterClass {
     internal_static_ServerGlobalValueChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ServerGlobalValueChangeNotify_descriptor,
-        new java.lang.String[] { "Value", "KeyHash", "EntityId", });
+        new java.lang.String[] { "KeyHash", "EntityId", "Value", });
   }
 
   // @@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 ec93a2fd0..5e7596c17 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ServerTimeNotifyOuterClass.java
@@ -25,11 +25,6 @@ public final class ServerTimeNotifyOuterClass {
     long getServerTime();
   }
   /**
-   * <pre>
-   * CmdId: 21404
-   * Obf: LHMEAJDEOAI
-   * </pre>
-   *
    * Protobuf type {@code ServerTimeNotify}
    */
   public static final class ServerTimeNotify extends
@@ -279,11 +274,6 @@ public final class ServerTimeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21404
-     * Obf: LHMEAJDEOAI
-     * </pre>
-     *
      * Protobuf type {@code ServerTimeNotify}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java
index bf1aeb754..a336ac680 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEntityClientDataNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class SetEntityClientDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      * @return Whether the entityClientData field is set.
      */
     boolean hasEntityClientData();
     /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      * @return The entityClientData.
      */
     emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData getEntityClientData();
     /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      */
     emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 2;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 1139
-   * Obf: ICKIGFONKFE
-   * </pre>
-   *
    * Protobuf type {@code SetEntityClientDataNotify}
    */
   public static final class SetEntityClientDataNotify extends
@@ -89,7 +84,7 @@ public final class SetEntityClientDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 10: {
               emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder subBuilder = null;
               if (entityClientData_ != null) {
                 subBuilder = entityClientData_.toBuilder();
@@ -102,7 +97,7 @@ public final class SetEntityClientDataNotifyOuterClass {
 
               break;
             }
-            case 80: {
+            case 16: {
 
               entityId_ = input.readUInt32();
               break;
@@ -139,21 +134,10 @@ public final class SetEntityClientDataNotifyOuterClass {
               emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.class, emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int ENTITY_CLIENT_DATA_FIELD_NUMBER = 4;
+    public static final int ENTITY_CLIENT_DATA_FIELD_NUMBER = 1;
     private emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData entityClientData_;
     /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      * @return Whether the entityClientData field is set.
      */
     @java.lang.Override
@@ -161,7 +145,7 @@ public final class SetEntityClientDataNotifyOuterClass {
       return entityClientData_ != null;
     }
     /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      * @return The entityClientData.
      */
     @java.lang.Override
@@ -169,13 +153,24 @@ public final class SetEntityClientDataNotifyOuterClass {
       return entityClientData_ == null ? emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.getDefaultInstance() : entityClientData_;
     }
     /**
-     * <code>.EntityClientData entity_client_data = 4;</code>
+     * <code>.EntityClientData entity_client_data = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder() {
       return getEntityClientData();
     }
 
+    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_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -191,10 +186,10 @@ public final class SetEntityClientDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (entityClientData_ != null) {
-        output.writeMessage(4, getEntityClientData());
+        output.writeMessage(1, getEntityClientData());
       }
       if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+        output.writeUInt32(2, entityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class SetEntityClientDataNotifyOuterClass {
       size = 0;
       if (entityClientData_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getEntityClientData());
+          .computeMessageSize(1, getEntityClientData());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeUInt32Size(2, entityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class SetEntityClientDataNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify other = (emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (hasEntityClientData() != other.hasEntityClientData()) return false;
       if (hasEntityClientData()) {
         if (!getEntityClientData()
             .equals(other.getEntityClientData())) return false;
       }
+      if (getEntityId()
+          != other.getEntityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class SetEntityClientDataNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       if (hasEntityClientData()) {
         hash = (37 * hash) + ENTITY_CLIENT_DATA_FIELD_NUMBER;
         hash = (53 * hash) + getEntityClientData().hashCode();
       }
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class SetEntityClientDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1139
-     * Obf: ICKIGFONKFE
-     * </pre>
-     *
      * Protobuf type {@code SetEntityClientDataNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class SetEntityClientDataNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         if (entityClientDataBuilder_ == null) {
           entityClientData_ = null;
         } else {
           entityClientData_ = null;
           entityClientDataBuilder_ = null;
         }
+        entityId_ = 0;
+
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class SetEntityClientDataNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify buildPartial() {
         emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify result = new emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify(this);
-        result.entityId_ = entityId_;
         if (entityClientDataBuilder_ == null) {
           result.entityClientData_ = entityClientData_;
         } else {
           result.entityClientData_ = entityClientDataBuilder_.build();
         }
+        result.entityId_ = entityId_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class SetEntityClientDataNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify other) {
         if (other == emu.grasscutter.net.proto.SetEntityClientDataNotifyOuterClass.SetEntityClientDataNotify.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.hasEntityClientData()) {
           mergeEntityClientData(other.getEntityClientData());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,49 +503,18 @@ public final class SetEntityClientDataNotifyOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 10;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 entity_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData entityClientData_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder> entityClientDataBuilder_;
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        * @return Whether the entityClientData field is set.
        */
       public boolean hasEntityClientData() {
         return entityClientDataBuilder_ != null || entityClientData_ != null;
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        * @return The entityClientData.
        */
       public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData getEntityClientData() {
@@ -566,7 +525,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public Builder setEntityClientData(emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData value) {
         if (entityClientDataBuilder_ == null) {
@@ -582,7 +541,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public Builder setEntityClientData(
           emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder builderForValue) {
@@ -596,7 +555,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public Builder mergeEntityClientData(emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData value) {
         if (entityClientDataBuilder_ == null) {
@@ -614,7 +573,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public Builder clearEntityClientData() {
         if (entityClientDataBuilder_ == null) {
@@ -628,7 +587,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder getEntityClientDataBuilder() {
         
@@ -636,7 +595,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         return getEntityClientDataFieldBuilder().getBuilder();
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       public emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder getEntityClientDataOrBuilder() {
         if (entityClientDataBuilder_ != null) {
@@ -647,7 +606,7 @@ public final class SetEntityClientDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.EntityClientData entity_client_data = 4;</code>
+       * <code>.EntityClientData entity_client_data = 1;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientData.Builder, emu.grasscutter.net.proto.EntityClientDataOuterClass.EntityClientDataOrBuilder> 
@@ -662,6 +621,37 @@ public final class SetEntityClientDataNotifyOuterClass {
         }
         return entityClientDataBuilder_;
       }
+
+      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;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,8 +721,8 @@ public final class SetEntityClientDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037SetEntityClientDataNotify.proto\032\026Entit" +
       "yClientData.proto\"]\n\031SetEntityClientData" +
-      "Notify\022\021\n\tentity_id\030\n \001(\r\022-\n\022entity_clie" +
-      "nt_data\030\004 \001(\0132\021.EntityClientDataB\033\n\031emu." +
+      "Notify\022-\n\022entity_client_data\030\001 \001(\0132\021.Ent" +
+      "ityClientData\022\021\n\tentity_id\030\002 \001(\rB\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class SetEntityClientDataNotifyOuterClass {
     internal_static_SetEntityClientDataNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetEntityClientDataNotify_descriptor,
-        new java.lang.String[] { "EntityId", "EntityClientData", });
+        new java.lang.String[] { "EntityClientData", "EntityId", });
     emu.grasscutter.net.proto.EntityClientDataOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java
index e83451ac1..56f5db7e5 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateReqOuterClass.java
@@ -19,23 +19,18 @@ public final class SetEquipLockStateReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_locked = 2;</code>
-     * @return The isLocked.
-     */
-    boolean getIsLocked();
-
-    /**
-     * <code>uint64 target_equip_guid = 12;</code>
+     * <code>uint64 target_equip_guid = 11;</code>
      * @return The targetEquipGuid.
      */
     long getTargetEquipGuid();
+
+    /**
+     * <code>bool is_locked = 7;</code>
+     * @return The isLocked.
+     */
+    boolean getIsLocked();
   }
   /**
-   * <pre>
-   * CmdId: 8002
-   * Obf: POOALLFACLH
-   * </pre>
-   *
    * Protobuf type {@code SetEquipLockStateReq}
    */
   public static final class SetEquipLockStateReq extends
@@ -80,12 +75,12 @@ public final class SetEquipLockStateReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 56: {
 
               isLocked_ = input.readBool();
               break;
             }
-            case 96: {
+            case 88: {
 
               targetEquipGuid_ = input.readUInt64();
               break;
@@ -122,21 +117,10 @@ public final class SetEquipLockStateReqOuterClass {
               emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.class, emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.Builder.class);
     }
 
-    public static final int IS_LOCKED_FIELD_NUMBER = 2;
-    private boolean isLocked_;
-    /**
-     * <code>bool is_locked = 2;</code>
-     * @return The isLocked.
-     */
-    @java.lang.Override
-    public boolean getIsLocked() {
-      return isLocked_;
-    }
-
-    public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 12;
+    public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 11;
     private long targetEquipGuid_;
     /**
-     * <code>uint64 target_equip_guid = 12;</code>
+     * <code>uint64 target_equip_guid = 11;</code>
      * @return The targetEquipGuid.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SetEquipLockStateReqOuterClass {
       return targetEquipGuid_;
     }
 
+    public static final int IS_LOCKED_FIELD_NUMBER = 7;
+    private boolean isLocked_;
+    /**
+     * <code>bool is_locked = 7;</code>
+     * @return The isLocked.
+     */
+    @java.lang.Override
+    public boolean getIsLocked() {
+      return isLocked_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class SetEquipLockStateReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (isLocked_ != false) {
-        output.writeBool(2, isLocked_);
+        output.writeBool(7, isLocked_);
       }
       if (targetEquipGuid_ != 0L) {
-        output.writeUInt64(12, targetEquipGuid_);
+        output.writeUInt64(11, targetEquipGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class SetEquipLockStateReqOuterClass {
       size = 0;
       if (isLocked_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isLocked_);
+          .computeBoolSize(7, isLocked_);
       }
       if (targetEquipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, targetEquipGuid_);
+          .computeUInt64Size(11, targetEquipGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SetEquipLockStateReqOuterClass {
       }
       emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other = (emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq) obj;
 
-      if (getIsLocked()
-          != other.getIsLocked()) return false;
       if (getTargetEquipGuid()
           != other.getTargetEquipGuid()) return false;
+      if (getIsLocked()
+          != other.getIsLocked()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,12 +206,12 @@ public final class SetEquipLockStateReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsLocked());
       hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetEquipGuid());
+      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;
@@ -313,11 +308,6 @@ public final class SetEquipLockStateReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8002
-     * Obf: POOALLFACLH
-     * </pre>
-     *
      * Protobuf type {@code SetEquipLockStateReq}
      */
     public static final class Builder extends
@@ -355,10 +345,10 @@ public final class SetEquipLockStateReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isLocked_ = false;
-
         targetEquipGuid_ = 0L;
 
+        isLocked_ = false;
+
         return this;
       }
 
@@ -385,8 +375,8 @@ public final class SetEquipLockStateReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq buildPartial() {
         emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq result = new emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq(this);
-        result.isLocked_ = isLocked_;
         result.targetEquipGuid_ = targetEquipGuid_;
+        result.isLocked_ = isLocked_;
         onBuilt();
         return result;
       }
@@ -435,12 +425,12 @@ public final class SetEquipLockStateReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq other) {
         if (other == emu.grasscutter.net.proto.SetEquipLockStateReqOuterClass.SetEquipLockStateReq.getDefaultInstance()) return this;
-        if (other.getIsLocked() != false) {
-          setIsLocked(other.getIsLocked());
-        }
         if (other.getTargetEquipGuid() != 0L) {
           setTargetEquipGuid(other.getTargetEquipGuid());
         }
+        if (other.getIsLocked() != false) {
+          setIsLocked(other.getIsLocked());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -470,40 +460,9 @@ public final class SetEquipLockStateReqOuterClass {
         return this;
       }
 
-      private boolean isLocked_ ;
-      /**
-       * <code>bool is_locked = 2;</code>
-       * @return The isLocked.
-       */
-      @java.lang.Override
-      public boolean getIsLocked() {
-        return isLocked_;
-      }
-      /**
-       * <code>bool is_locked = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsLocked() {
-        
-        isLocked_ = false;
-        onChanged();
-        return this;
-      }
-
       private long targetEquipGuid_ ;
       /**
-       * <code>uint64 target_equip_guid = 12;</code>
+       * <code>uint64 target_equip_guid = 11;</code>
        * @return The targetEquipGuid.
        */
       @java.lang.Override
@@ -511,7 +470,7 @@ public final class SetEquipLockStateReqOuterClass {
         return targetEquipGuid_;
       }
       /**
-       * <code>uint64 target_equip_guid = 12;</code>
+       * <code>uint64 target_equip_guid = 11;</code>
        * @param value The targetEquipGuid to set.
        * @return This builder for chaining.
        */
@@ -522,7 +481,7 @@ public final class SetEquipLockStateReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_equip_guid = 12;</code>
+       * <code>uint64 target_equip_guid = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetEquipGuid() {
@@ -531,6 +490,37 @@ public final class SetEquipLockStateReqOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isLocked_ ;
+      /**
+       * <code>bool is_locked = 7;</code>
+       * @return The isLocked.
+       */
+      @java.lang.Override
+      public boolean getIsLocked() {
+        return isLocked_;
+      }
+      /**
+       * <code>bool is_locked = 7;</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 = 7;</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) {
@@ -599,8 +589,8 @@ public final class SetEquipLockStateReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SetEquipLockStateReq.proto\"D\n\024SetEquip" +
-      "LockStateReq\022\021\n\tis_locked\030\002 \001(\010\022\031\n\021targe" +
-      "t_equip_guid\030\014 \001(\004B\033\n\031emu.grasscutter.ne" +
+      "LockStateReq\022\031\n\021target_equip_guid\030\013 \001(\004\022" +
+      "\021\n\tis_locked\030\007 \001(\010B\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -612,7 +602,7 @@ public final class SetEquipLockStateReqOuterClass {
     internal_static_SetEquipLockStateReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetEquipLockStateReq_descriptor,
-        new java.lang.String[] { "IsLocked", "TargetEquipGuid", });
+        new java.lang.String[] { "TargetEquipGuid", "IsLocked", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java
index 7d6c88dc9..5f1283401 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetEquipLockStateRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SetEquipLockStateRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 target_equip_guid = 1;</code>
-     * @return The targetEquipGuid.
-     */
-    long getTargetEquipGuid();
-
-    /**
-     * <code>bool is_locked = 6;</code>
+     * <code>bool is_locked = 10;</code>
      * @return The isLocked.
      */
     boolean getIsLocked();
 
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>uint64 target_equip_guid = 11;</code>
+     * @return The targetEquipGuid.
+     */
+    long getTargetEquipGuid();
+
+    /**
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 2517
-   * Obf: HDOHDJDDMDG
-   * </pre>
-   *
    * Protobuf type {@code SetEquipLockStateRsp}
    */
   public static final class SetEquipLockStateRsp extends
@@ -86,21 +81,21 @@ public final class SetEquipLockStateRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 80: {
+
+              isLocked_ = input.readBool();
+              break;
+            }
+            case 88: {
 
               targetEquipGuid_ = input.readUInt64();
               break;
             }
-            case 40: {
+            case 120: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 48: {
-
-              isLocked_ = input.readBool();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class SetEquipLockStateRspOuterClass {
               emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.class, emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.Builder.class);
     }
 
-    public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 1;
-    private long targetEquipGuid_;
-    /**
-     * <code>uint64 target_equip_guid = 1;</code>
-     * @return The targetEquipGuid.
-     */
-    @java.lang.Override
-    public long getTargetEquipGuid() {
-      return targetEquipGuid_;
-    }
-
-    public static final int IS_LOCKED_FIELD_NUMBER = 6;
+    public static final int IS_LOCKED_FIELD_NUMBER = 10;
     private boolean isLocked_;
     /**
-     * <code>bool is_locked = 6;</code>
+     * <code>bool is_locked = 10;</code>
      * @return The isLocked.
      */
     @java.lang.Override
@@ -155,10 +139,21 @@ public final class SetEquipLockStateRspOuterClass {
       return isLocked_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int TARGET_EQUIP_GUID_FIELD_NUMBER = 11;
+    private long targetEquipGuid_;
+    /**
+     * <code>uint64 target_equip_guid = 11;</code>
+     * @return The targetEquipGuid.
+     */
+    @java.lang.Override
+    public long getTargetEquipGuid() {
+      return targetEquipGuid_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 15;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 15;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class SetEquipLockStateRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (isLocked_ != false) {
+        output.writeBool(10, isLocked_);
+      }
       if (targetEquipGuid_ != 0L) {
-        output.writeUInt64(1, targetEquipGuid_);
+        output.writeUInt64(11, targetEquipGuid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
-      if (isLocked_ != false) {
-        output.writeBool(6, isLocked_);
+        output.writeInt32(15, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class SetEquipLockStateRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isLocked_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isLocked_);
+      }
       if (targetEquipGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(1, targetEquipGuid_);
+          .computeUInt64Size(11, targetEquipGuid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
-      }
-      if (isLocked_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, isLocked_);
+          .computeInt32Size(15, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +220,10 @@ public final class SetEquipLockStateRspOuterClass {
       }
       emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp other = (emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp) obj;
 
-      if (getTargetEquipGuid()
-          != other.getTargetEquipGuid()) return false;
       if (getIsLocked()
           != other.getIsLocked()) return false;
+      if (getTargetEquipGuid()
+          != other.getTargetEquipGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,12 +237,12 @@ public final class SetEquipLockStateRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getTargetEquipGuid());
       hash = (37 * hash) + IS_LOCKED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsLocked());
+      hash = (37 * hash) + TARGET_EQUIP_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTargetEquipGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -346,11 +341,6 @@ public final class SetEquipLockStateRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2517
-     * Obf: HDOHDJDDMDG
-     * </pre>
-     *
      * Protobuf type {@code SetEquipLockStateRsp}
      */
     public static final class Builder extends
@@ -388,10 +378,10 @@ public final class SetEquipLockStateRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetEquipGuid_ = 0L;
-
         isLocked_ = false;
 
+        targetEquipGuid_ = 0L;
+
         retcode_ = 0;
 
         return this;
@@ -420,8 +410,8 @@ public final class SetEquipLockStateRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp buildPartial() {
         emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp result = new emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp(this);
-        result.targetEquipGuid_ = targetEquipGuid_;
         result.isLocked_ = isLocked_;
+        result.targetEquipGuid_ = targetEquipGuid_;
         result.retcode_ = retcode_;
         onBuilt();
         return result;
@@ -471,12 +461,12 @@ public final class SetEquipLockStateRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp other) {
         if (other == emu.grasscutter.net.proto.SetEquipLockStateRspOuterClass.SetEquipLockStateRsp.getDefaultInstance()) return this;
-        if (other.getTargetEquipGuid() != 0L) {
-          setTargetEquipGuid(other.getTargetEquipGuid());
-        }
         if (other.getIsLocked() != false) {
           setIsLocked(other.getIsLocked());
         }
+        if (other.getTargetEquipGuid() != 0L) {
+          setTargetEquipGuid(other.getTargetEquipGuid());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -509,40 +499,9 @@ public final class SetEquipLockStateRspOuterClass {
         return this;
       }
 
-      private long targetEquipGuid_ ;
-      /**
-       * <code>uint64 target_equip_guid = 1;</code>
-       * @return The targetEquipGuid.
-       */
-      @java.lang.Override
-      public long getTargetEquipGuid() {
-        return targetEquipGuid_;
-      }
-      /**
-       * <code>uint64 target_equip_guid = 1;</code>
-       * @param value The targetEquipGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetEquipGuid(long value) {
-        
-        targetEquipGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 target_equip_guid = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetEquipGuid() {
-        
-        targetEquipGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private boolean isLocked_ ;
       /**
-       * <code>bool is_locked = 6;</code>
+       * <code>bool is_locked = 10;</code>
        * @return The isLocked.
        */
       @java.lang.Override
@@ -550,7 +509,7 @@ public final class SetEquipLockStateRspOuterClass {
         return isLocked_;
       }
       /**
-       * <code>bool is_locked = 6;</code>
+       * <code>bool is_locked = 10;</code>
        * @param value The isLocked to set.
        * @return This builder for chaining.
        */
@@ -561,7 +520,7 @@ public final class SetEquipLockStateRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_locked = 6;</code>
+       * <code>bool is_locked = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsLocked() {
@@ -571,9 +530,40 @@ public final class SetEquipLockStateRspOuterClass {
         return this;
       }
 
+      private long targetEquipGuid_ ;
+      /**
+       * <code>uint64 target_equip_guid = 11;</code>
+       * @return The targetEquipGuid.
+       */
+      @java.lang.Override
+      public long getTargetEquipGuid() {
+        return targetEquipGuid_;
+      }
+      /**
+       * <code>uint64 target_equip_guid = 11;</code>
+       * @param value The targetEquipGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetEquipGuid(long value) {
+        
+        targetEquipGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 target_equip_guid = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetEquipGuid() {
+        
+        targetEquipGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 15;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -581,7 +571,7 @@ public final class SetEquipLockStateRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 15;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -592,7 +582,7 @@ public final class SetEquipLockStateRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -669,8 +659,8 @@ public final class SetEquipLockStateRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SetEquipLockStateRsp.proto\"U\n\024SetEquip" +
-      "LockStateRsp\022\031\n\021target_equip_guid\030\001 \001(\004\022" +
-      "\021\n\tis_locked\030\006 \001(\010\022\017\n\007retcode\030\005 \001(\005B\033\n\031e" +
+      "LockStateRsp\022\021\n\tis_locked\030\n \001(\010\022\031\n\021targe" +
+      "t_equip_guid\030\013 \001(\004\022\017\n\007retcode\030\017 \001(\005B\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -682,7 +672,7 @@ public final class SetEquipLockStateRspOuterClass {
     internal_static_SetEquipLockStateRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetEquipLockStateRsp_descriptor,
-        new java.lang.String[] { "TargetEquipGuid", "IsLocked", "Retcode", });
+        new java.lang.String[] { "IsLocked", "TargetEquipGuid", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendEnterHomeOptionReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendEnterHomeOptionReqOuterClass.java
index 41d8db751..7c0c49408 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendEnterHomeOptionReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendEnterHomeOptionReqOuterClass.java
@@ -19,22 +19,17 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.FriendEnterHomeOption option = 6;</code>
+     * <code>.FriendEnterHomeOption option = 13;</code>
      * @return The enum numeric value on the wire for option.
      */
     int getOptionValue();
     /**
-     * <code>.FriendEnterHomeOption option = 6;</code>
+     * <code>.FriendEnterHomeOption option = 13;</code>
      * @return The option.
      */
     emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getOption();
   }
   /**
-   * <pre>
-   * CmdId: 26896
-   * Obf: GFLDPKKAAKP
-   * </pre>
-   *
    * Protobuf type {@code SetFriendEnterHomeOptionReq}
    */
   public static final class SetFriendEnterHomeOptionReq extends
@@ -80,7 +75,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 104: {
               int rawValue = input.readEnum();
 
               option_ = rawValue;
@@ -118,17 +113,17 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
               emu.grasscutter.net.proto.SetFriendEnterHomeOptionReqOuterClass.SetFriendEnterHomeOptionReq.class, emu.grasscutter.net.proto.SetFriendEnterHomeOptionReqOuterClass.SetFriendEnterHomeOptionReq.Builder.class);
     }
 
-    public static final int OPTION_FIELD_NUMBER = 6;
+    public static final int OPTION_FIELD_NUMBER = 13;
     private int option_;
     /**
-     * <code>.FriendEnterHomeOption option = 6;</code>
+     * <code>.FriendEnterHomeOption option = 13;</code>
      * @return The enum numeric value on the wire for option.
      */
     @java.lang.Override public int getOptionValue() {
       return option_;
     }
     /**
-     * <code>.FriendEnterHomeOption option = 6;</code>
+     * <code>.FriendEnterHomeOption option = 13;</code>
      * @return The option.
      */
     @java.lang.Override public emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption getOption() {
@@ -152,7 +147,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (option_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
-        output.writeEnum(6, option_);
+        output.writeEnum(13, option_);
       }
       unknownFields.writeTo(output);
     }
@@ -165,7 +160,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
       size = 0;
       if (option_ != emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.FRIEND_ENTER_HOME_OPTION_NEED_CONFIRM.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(6, option_);
+          .computeEnumSize(13, option_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -292,11 +287,6 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26896
-     * Obf: GFLDPKKAAKP
-     * </pre>
-     *
      * Protobuf type {@code SetFriendEnterHomeOptionReq}
      */
     public static final class Builder extends
@@ -445,14 +435,14 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
 
       private int option_ = 0;
       /**
-       * <code>.FriendEnterHomeOption option = 6;</code>
+       * <code>.FriendEnterHomeOption option = 13;</code>
        * @return The enum numeric value on the wire for option.
        */
       @java.lang.Override public int getOptionValue() {
         return option_;
       }
       /**
-       * <code>.FriendEnterHomeOption option = 6;</code>
+       * <code>.FriendEnterHomeOption option = 13;</code>
        * @param value The enum numeric value on the wire for option to set.
        * @return This builder for chaining.
        */
@@ -463,7 +453,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>.FriendEnterHomeOption option = 6;</code>
+       * <code>.FriendEnterHomeOption option = 13;</code>
        * @return The option.
        */
       @java.lang.Override
@@ -473,7 +463,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
         return result == null ? emu.grasscutter.net.proto.FriendEnterHomeOptionOuterClass.FriendEnterHomeOption.UNRECOGNIZED : result;
       }
       /**
-       * <code>.FriendEnterHomeOption option = 6;</code>
+       * <code>.FriendEnterHomeOption option = 13;</code>
        * @param value The option to set.
        * @return This builder for chaining.
        */
@@ -487,7 +477,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
         return this;
       }
       /**
-       * <code>.FriendEnterHomeOption option = 6;</code>
+       * <code>.FriendEnterHomeOption option = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearOption() {
@@ -565,7 +555,7 @@ public final class SetFriendEnterHomeOptionReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n!SetFriendEnterHomeOptionReq.proto\032\033Fri" +
       "endEnterHomeOption.proto\"E\n\033SetFriendEnt" +
-      "erHomeOptionReq\022&\n\006option\030\006 \001(\0162\026.Friend" +
+      "erHomeOptionReq\022&\n\006option\030\r \001(\0162\026.Friend" +
       "EnterHomeOptionB\033\n\031emu.grasscutter.net.p" +
       "rotob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameReqOuterClass.java
index 750da8dd2..cf02fad0e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameReqOuterClass.java
@@ -19,29 +19,24 @@ public final class SetFriendRemarkNameReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 uid = 14;</code>
-     * @return The uid.
-     */
-    int getUid();
-
-    /**
-     * <code>string remark_name = 6;</code>
+     * <code>string remark_name = 14;</code>
      * @return The remarkName.
      */
     java.lang.String getRemarkName();
     /**
-     * <code>string remark_name = 6;</code>
+     * <code>string remark_name = 14;</code>
      * @return The bytes for remarkName.
      */
     com.google.protobuf.ByteString
         getRemarkNameBytes();
+
+    /**
+     * <code>uint32 uid = 12;</code>
+     * @return The uid.
+     */
+    int getUid();
   }
   /**
-   * <pre>
-   * CmdId: 1521
-   * Obf: KGIPKDELIOE
-   * </pre>
-   *
    * Protobuf type {@code SetFriendRemarkNameReq}
    */
   public static final class SetFriendRemarkNameReq extends
@@ -87,17 +82,17 @@ public final class SetFriendRemarkNameReqOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 96: {
+
+              uid_ = input.readUInt32();
+              break;
+            }
+            case 114: {
               java.lang.String s = input.readStringRequireUtf8();
 
               remarkName_ = s;
               break;
             }
-            case 112: {
-
-              uid_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -130,21 +125,10 @@ public final class SetFriendRemarkNameReqOuterClass {
               emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq.class, emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq.Builder.class);
     }
 
-    public static final int UID_FIELD_NUMBER = 14;
-    private int uid_;
-    /**
-     * <code>uint32 uid = 14;</code>
-     * @return The uid.
-     */
-    @java.lang.Override
-    public int getUid() {
-      return uid_;
-    }
-
-    public static final int REMARK_NAME_FIELD_NUMBER = 6;
+    public static final int REMARK_NAME_FIELD_NUMBER = 14;
     private volatile java.lang.Object remarkName_;
     /**
-     * <code>string remark_name = 6;</code>
+     * <code>string remark_name = 14;</code>
      * @return The remarkName.
      */
     @java.lang.Override
@@ -161,7 +145,7 @@ public final class SetFriendRemarkNameReqOuterClass {
       }
     }
     /**
-     * <code>string remark_name = 6;</code>
+     * <code>string remark_name = 14;</code>
      * @return The bytes for remarkName.
      */
     @java.lang.Override
@@ -179,6 +163,17 @@ public final class SetFriendRemarkNameReqOuterClass {
       }
     }
 
+    public static final int UID_FIELD_NUMBER = 12;
+    private int uid_;
+    /**
+     * <code>uint32 uid = 12;</code>
+     * @return The uid.
+     */
+    @java.lang.Override
+    public int getUid() {
+      return uid_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -193,11 +188,11 @@ public final class SetFriendRemarkNameReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 6, remarkName_);
-      }
       if (uid_ != 0) {
-        output.writeUInt32(14, uid_);
+        output.writeUInt32(12, uid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 14, remarkName_);
       }
       unknownFields.writeTo(output);
     }
@@ -208,12 +203,12 @@ public final class SetFriendRemarkNameReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, remarkName_);
-      }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, uid_);
+          .computeUInt32Size(12, uid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, remarkName_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -230,10 +225,10 @@ public final class SetFriendRemarkNameReqOuterClass {
       }
       emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq other = (emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq) obj;
 
-      if (getUid()
-          != other.getUid()) return false;
       if (!getRemarkName()
           .equals(other.getRemarkName())) return false;
+      if (getUid()
+          != other.getUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -245,10 +240,10 @@ public final class SetFriendRemarkNameReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + UID_FIELD_NUMBER;
-      hash = (53 * hash) + getUid();
       hash = (37 * hash) + REMARK_NAME_FIELD_NUMBER;
       hash = (53 * hash) + getRemarkName().hashCode();
+      hash = (37 * hash) + UID_FIELD_NUMBER;
+      hash = (53 * hash) + getUid();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,11 +340,6 @@ public final class SetFriendRemarkNameReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1521
-     * Obf: KGIPKDELIOE
-     * </pre>
-     *
      * Protobuf type {@code SetFriendRemarkNameReq}
      */
     public static final class Builder extends
@@ -387,10 +377,10 @@ public final class SetFriendRemarkNameReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        uid_ = 0;
-
         remarkName_ = "";
 
+        uid_ = 0;
+
         return this;
       }
 
@@ -417,8 +407,8 @@ public final class SetFriendRemarkNameReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq buildPartial() {
         emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq result = new emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq(this);
-        result.uid_ = uid_;
         result.remarkName_ = remarkName_;
+        result.uid_ = uid_;
         onBuilt();
         return result;
       }
@@ -467,13 +457,13 @@ public final class SetFriendRemarkNameReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq other) {
         if (other == emu.grasscutter.net.proto.SetFriendRemarkNameReqOuterClass.SetFriendRemarkNameReq.getDefaultInstance()) return this;
-        if (other.getUid() != 0) {
-          setUid(other.getUid());
-        }
         if (!other.getRemarkName().isEmpty()) {
           remarkName_ = other.remarkName_;
           onChanged();
         }
+        if (other.getUid() != 0) {
+          setUid(other.getUid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -503,40 +493,9 @@ public final class SetFriendRemarkNameReqOuterClass {
         return this;
       }
 
-      private int uid_ ;
-      /**
-       * <code>uint32 uid = 14;</code>
-       * @return The uid.
-       */
-      @java.lang.Override
-      public int getUid() {
-        return uid_;
-      }
-      /**
-       * <code>uint32 uid = 14;</code>
-       * @param value The uid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setUid(int value) {
-        
-        uid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 uid = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearUid() {
-        
-        uid_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.lang.Object remarkName_ = "";
       /**
-       * <code>string remark_name = 6;</code>
+       * <code>string remark_name = 14;</code>
        * @return The remarkName.
        */
       public java.lang.String getRemarkName() {
@@ -552,7 +511,7 @@ public final class SetFriendRemarkNameReqOuterClass {
         }
       }
       /**
-       * <code>string remark_name = 6;</code>
+       * <code>string remark_name = 14;</code>
        * @return The bytes for remarkName.
        */
       public com.google.protobuf.ByteString
@@ -569,7 +528,7 @@ public final class SetFriendRemarkNameReqOuterClass {
         }
       }
       /**
-       * <code>string remark_name = 6;</code>
+       * <code>string remark_name = 14;</code>
        * @param value The remarkName to set.
        * @return This builder for chaining.
        */
@@ -584,7 +543,7 @@ public final class SetFriendRemarkNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string remark_name = 6;</code>
+       * <code>string remark_name = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearRemarkName() {
@@ -594,7 +553,7 @@ public final class SetFriendRemarkNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string remark_name = 6;</code>
+       * <code>string remark_name = 14;</code>
        * @param value The bytes for remarkName to set.
        * @return This builder for chaining.
        */
@@ -609,6 +568,37 @@ public final class SetFriendRemarkNameReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int uid_ ;
+      /**
+       * <code>uint32 uid = 12;</code>
+       * @return The uid.
+       */
+      @java.lang.Override
+      public int getUid() {
+        return uid_;
+      }
+      /**
+       * <code>uint32 uid = 12;</code>
+       * @param value The uid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setUid(int value) {
+        
+        uid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 uid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearUid() {
+        
+        uid_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -677,8 +667,8 @@ public final class SetFriendRemarkNameReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034SetFriendRemarkNameReq.proto\":\n\026SetFri" +
-      "endRemarkNameReq\022\013\n\003uid\030\016 \001(\r\022\023\n\013remark_" +
-      "name\030\006 \001(\tB\033\n\031emu.grasscutter.net.protob" +
+      "endRemarkNameReq\022\023\n\013remark_name\030\016 \001(\t\022\013\n" +
+      "\003uid\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -690,7 +680,7 @@ public final class SetFriendRemarkNameReqOuterClass {
     internal_static_SetFriendRemarkNameReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetFriendRemarkNameReq_descriptor,
-        new java.lang.String[] { "Uid", "RemarkName", });
+        new java.lang.String[] { "RemarkName", "Uid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameRspOuterClass.java
index 8e5ad1086..6d29973a0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetFriendRemarkNameRspOuterClass.java
@@ -25,35 +25,30 @@ public final class SetFriendRemarkNameRspOuterClass {
     int getUid();
 
     /**
-     * <code>string remark_name = 11;</code>
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>string remark_name = 9;</code>
      * @return The remarkName.
      */
     java.lang.String getRemarkName();
     /**
-     * <code>string remark_name = 11;</code>
+     * <code>string remark_name = 9;</code>
      * @return The bytes for remarkName.
      */
     com.google.protobuf.ByteString
         getRemarkNameBytes();
 
     /**
-     * <code>bool is_clear_remark = 5;</code>
+     * <code>bool is_clear_remark = 13;</code>
      * @return The isClearRemark.
      */
     boolean getIsClearRemark();
-
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 25535
-   * Obf: LMCPOEKAKNN
-   * </pre>
-   *
    * Protobuf type {@code SetFriendRemarkNameRsp}
    */
   public static final class SetFriendRemarkNameRsp extends
@@ -99,27 +94,27 @@ public final class SetFriendRemarkNameRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 40: {
-
-              isClearRemark_ = input.readBool();
-              break;
-            }
             case 56: {
 
               uid_ = input.readUInt32();
               break;
             }
-            case 90: {
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 74: {
               java.lang.String s = input.readStringRequireUtf8();
 
               remarkName_ = s;
               break;
             }
+            case 104: {
+
+              isClearRemark_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -163,10 +158,21 @@ public final class SetFriendRemarkNameRspOuterClass {
       return uid_;
     }
 
-    public static final int REMARK_NAME_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int REMARK_NAME_FIELD_NUMBER = 9;
     private volatile java.lang.Object remarkName_;
     /**
-     * <code>string remark_name = 11;</code>
+     * <code>string remark_name = 9;</code>
      * @return The remarkName.
      */
     @java.lang.Override
@@ -183,7 +189,7 @@ public final class SetFriendRemarkNameRspOuterClass {
       }
     }
     /**
-     * <code>string remark_name = 11;</code>
+     * <code>string remark_name = 9;</code>
      * @return The bytes for remarkName.
      */
     @java.lang.Override
@@ -201,10 +207,10 @@ public final class SetFriendRemarkNameRspOuterClass {
       }
     }
 
-    public static final int IS_CLEAR_REMARK_FIELD_NUMBER = 5;
+    public static final int IS_CLEAR_REMARK_FIELD_NUMBER = 13;
     private boolean isClearRemark_;
     /**
-     * <code>bool is_clear_remark = 5;</code>
+     * <code>bool is_clear_remark = 13;</code>
      * @return The isClearRemark.
      */
     @java.lang.Override
@@ -212,17 +218,6 @@ public final class SetFriendRemarkNameRspOuterClass {
       return isClearRemark_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 2;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -237,17 +232,17 @@ public final class SetFriendRemarkNameRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
-      }
-      if (isClearRemark_ != false) {
-        output.writeBool(5, isClearRemark_);
-      }
       if (uid_ != 0) {
         output.writeUInt32(7, uid_);
       }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
+      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 11, remarkName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 9, remarkName_);
+      }
+      if (isClearRemark_ != false) {
+        output.writeBool(13, isClearRemark_);
       }
       unknownFields.writeTo(output);
     }
@@ -258,20 +253,20 @@ public final class SetFriendRemarkNameRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
-      if (isClearRemark_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isClearRemark_);
-      }
       if (uid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, uid_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
+      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(remarkName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, remarkName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, remarkName_);
+      }
+      if (isClearRemark_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, isClearRemark_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -290,12 +285,12 @@ public final class SetFriendRemarkNameRspOuterClass {
 
       if (getUid()
           != other.getUid()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!getRemarkName()
           .equals(other.getRemarkName())) return false;
       if (getIsClearRemark()
           != other.getIsClearRemark()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -309,13 +304,13 @@ public final class SetFriendRemarkNameRspOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + UID_FIELD_NUMBER;
       hash = (53 * hash) + getUid();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + REMARK_NAME_FIELD_NUMBER;
       hash = (53 * hash) + getRemarkName().hashCode();
       hash = (37 * hash) + IS_CLEAR_REMARK_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsClearRemark());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -412,11 +407,6 @@ public final class SetFriendRemarkNameRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25535
-     * Obf: LMCPOEKAKNN
-     * </pre>
-     *
      * Protobuf type {@code SetFriendRemarkNameRsp}
      */
     public static final class Builder extends
@@ -456,12 +446,12 @@ public final class SetFriendRemarkNameRspOuterClass {
         super.clear();
         uid_ = 0;
 
+        retcode_ = 0;
+
         remarkName_ = "";
 
         isClearRemark_ = false;
 
-        retcode_ = 0;
-
         return this;
       }
 
@@ -489,9 +479,9 @@ public final class SetFriendRemarkNameRspOuterClass {
       public emu.grasscutter.net.proto.SetFriendRemarkNameRspOuterClass.SetFriendRemarkNameRsp buildPartial() {
         emu.grasscutter.net.proto.SetFriendRemarkNameRspOuterClass.SetFriendRemarkNameRsp result = new emu.grasscutter.net.proto.SetFriendRemarkNameRspOuterClass.SetFriendRemarkNameRsp(this);
         result.uid_ = uid_;
+        result.retcode_ = retcode_;
         result.remarkName_ = remarkName_;
         result.isClearRemark_ = isClearRemark_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -543,6 +533,9 @@ public final class SetFriendRemarkNameRspOuterClass {
         if (other.getUid() != 0) {
           setUid(other.getUid());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (!other.getRemarkName().isEmpty()) {
           remarkName_ = other.remarkName_;
           onChanged();
@@ -550,9 +543,6 @@ public final class SetFriendRemarkNameRspOuterClass {
         if (other.getIsClearRemark() != false) {
           setIsClearRemark(other.getIsClearRemark());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -613,9 +603,40 @@ public final class SetFriendRemarkNameRspOuterClass {
         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;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>int32 retcode = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.lang.Object remarkName_ = "";
       /**
-       * <code>string remark_name = 11;</code>
+       * <code>string remark_name = 9;</code>
        * @return The remarkName.
        */
       public java.lang.String getRemarkName() {
@@ -631,7 +652,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         }
       }
       /**
-       * <code>string remark_name = 11;</code>
+       * <code>string remark_name = 9;</code>
        * @return The bytes for remarkName.
        */
       public com.google.protobuf.ByteString
@@ -648,7 +669,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         }
       }
       /**
-       * <code>string remark_name = 11;</code>
+       * <code>string remark_name = 9;</code>
        * @param value The remarkName to set.
        * @return This builder for chaining.
        */
@@ -663,7 +684,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string remark_name = 11;</code>
+       * <code>string remark_name = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearRemarkName() {
@@ -673,7 +694,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string remark_name = 11;</code>
+       * <code>string remark_name = 9;</code>
        * @param value The bytes for remarkName to set.
        * @return This builder for chaining.
        */
@@ -691,7 +712,7 @@ public final class SetFriendRemarkNameRspOuterClass {
 
       private boolean isClearRemark_ ;
       /**
-       * <code>bool is_clear_remark = 5;</code>
+       * <code>bool is_clear_remark = 13;</code>
        * @return The isClearRemark.
        */
       @java.lang.Override
@@ -699,7 +720,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         return isClearRemark_;
       }
       /**
-       * <code>bool is_clear_remark = 5;</code>
+       * <code>bool is_clear_remark = 13;</code>
        * @param value The isClearRemark to set.
        * @return This builder for chaining.
        */
@@ -710,7 +731,7 @@ public final class SetFriendRemarkNameRspOuterClass {
         return this;
       }
       /**
-       * <code>bool is_clear_remark = 5;</code>
+       * <code>bool is_clear_remark = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsClearRemark() {
@@ -719,37 +740,6 @@ public final class SetFriendRemarkNameRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 2;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 2;</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 = 2;</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) {
@@ -818,9 +808,9 @@ public final class SetFriendRemarkNameRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034SetFriendRemarkNameRsp.proto\"d\n\026SetFri" +
-      "endRemarkNameRsp\022\013\n\003uid\030\007 \001(\r\022\023\n\013remark_" +
-      "name\030\013 \001(\t\022\027\n\017is_clear_remark\030\005 \001(\010\022\017\n\007r" +
-      "etcode\030\002 \001(\005B\033\n\031emu.grasscutter.net.prot" +
+      "endRemarkNameRsp\022\013\n\003uid\030\007 \001(\r\022\017\n\007retcode" +
+      "\030\010 \001(\005\022\023\n\013remark_name\030\t \001(\t\022\027\n\017is_clear_" +
+      "remark\030\r \001(\010B\033\n\031emu.grasscutter.net.prot" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -832,7 +822,7 @@ public final class SetFriendRemarkNameRspOuterClass {
     internal_static_SetFriendRemarkNameRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetFriendRemarkNameRsp_descriptor,
-        new java.lang.String[] { "Uid", "RemarkName", "IsClearRemark", "Retcode", });
+        new java.lang.String[] { "Uid", "Retcode", "RemarkName", "IsClearRemark", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 d6c8a83aa..c2a6d9aed 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardReqOuterClass.java
@@ -19,17 +19,12 @@ public final class SetNameCardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 name_card_id = 15;</code>
+     * <code>uint32 name_card_id = 11;</code>
      * @return The nameCardId.
      */
     int getNameCardId();
   }
   /**
-   * <pre>
-   * CmdId: 3853
-   * Obf: KBHCHCMMILM
-   * </pre>
-   *
    * Protobuf type {@code SetNameCardReq}
    */
   public static final class SetNameCardReq extends
@@ -74,7 +69,7 @@ public final class SetNameCardReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 88: {
 
               nameCardId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class SetNameCardReqOuterClass {
               emu.grasscutter.net.proto.SetNameCardReqOuterClass.SetNameCardReq.class, emu.grasscutter.net.proto.SetNameCardReqOuterClass.SetNameCardReq.Builder.class);
     }
 
-    public static final int NAME_CARD_ID_FIELD_NUMBER = 15;
+    public static final int NAME_CARD_ID_FIELD_NUMBER = 11;
     private int nameCardId_;
     /**
-     * <code>uint32 name_card_id = 15;</code>
+     * <code>uint32 name_card_id = 11;</code>
      * @return The nameCardId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class SetNameCardReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (nameCardId_ != 0) {
-        output.writeUInt32(15, nameCardId_);
+        output.writeUInt32(11, nameCardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class SetNameCardReqOuterClass {
       size = 0;
       if (nameCardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, nameCardId_);
+          .computeUInt32Size(11, nameCardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class SetNameCardReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3853
-     * Obf: KBHCHCMMILM
-     * </pre>
-     *
      * Protobuf type {@code SetNameCardReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class SetNameCardReqOuterClass {
 
       private int nameCardId_ ;
       /**
-       * <code>uint32 name_card_id = 15;</code>
+       * <code>uint32 name_card_id = 11;</code>
        * @return The nameCardId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class SetNameCardReqOuterClass {
         return nameCardId_;
       }
       /**
-       * <code>uint32 name_card_id = 15;</code>
+       * <code>uint32 name_card_id = 11;</code>
        * @param value The nameCardId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class SetNameCardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 name_card_id = 15;</code>
+       * <code>uint32 name_card_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearNameCardId() {
@@ -527,7 +517,7 @@ public final class SetNameCardReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024SetNameCardReq.proto\"&\n\016SetNameCardReq" +
-      "\022\024\n\014name_card_id\030\017 \001(\rB\033\n\031emu.grasscutte" +
+      "\022\024\n\014name_card_id\030\013 \001(\rB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 cabf3788b..8b68676da 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetNameCardRspOuterClass.java
@@ -19,23 +19,18 @@ public final class SetNameCardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 name_card_id = 13;</code>
-     * @return The nameCardId.
-     */
-    int getNameCardId();
-
-    /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 name_card_id = 11;</code>
+     * @return The nameCardId.
+     */
+    int getNameCardId();
   }
   /**
-   * <pre>
-   * CmdId: 22422
-   * Obf: BPEHJKPKNGO
-   * </pre>
-   *
    * Protobuf type {@code SetNameCardRsp}
    */
   public static final class SetNameCardRsp extends
@@ -80,12 +75,12 @@ public final class SetNameCardRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 104: {
+            case 88: {
 
               nameCardId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class SetNameCardRspOuterClass {
               emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.class, emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.Builder.class);
     }
 
-    public static final int NAME_CARD_ID_FIELD_NUMBER = 13;
-    private int nameCardId_;
-    /**
-     * <code>uint32 name_card_id = 13;</code>
-     * @return The nameCardId.
-     */
-    @java.lang.Override
-    public int getNameCardId() {
-      return nameCardId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SetNameCardRspOuterClass {
       return retcode_;
     }
 
+    public static final int NAME_CARD_ID_FIELD_NUMBER = 11;
+    private int nameCardId_;
+    /**
+     * <code>uint32 name_card_id = 11;</code>
+     * @return The nameCardId.
+     */
+    @java.lang.Override
+    public int getNameCardId() {
+      return nameCardId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class SetNameCardRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(6, retcode_);
       }
       if (nameCardId_ != 0) {
-        output.writeUInt32(13, nameCardId_);
+        output.writeUInt32(11, nameCardId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class SetNameCardRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(6, retcode_);
       }
       if (nameCardId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, nameCardId_);
+          .computeUInt32Size(11, nameCardId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SetNameCardRspOuterClass {
       }
       emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp other = (emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp) obj;
 
-      if (getNameCardId()
-          != other.getNameCardId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getNameCardId()
+          != other.getNameCardId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class SetNameCardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getNameCardId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + NAME_CARD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getNameCardId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class SetNameCardRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22422
-     * Obf: BPEHJKPKNGO
-     * </pre>
-     *
      * Protobuf type {@code SetNameCardRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class SetNameCardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        nameCardId_ = 0;
-
         retcode_ = 0;
 
+        nameCardId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class SetNameCardRspOuterClass {
       @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.nameCardId_ = nameCardId_;
         result.retcode_ = retcode_;
+        result.nameCardId_ = nameCardId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class SetNameCardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp other) {
         if (other == emu.grasscutter.net.proto.SetNameCardRspOuterClass.SetNameCardRsp.getDefaultInstance()) return this;
-        if (other.getNameCardId() != 0) {
-          setNameCardId(other.getNameCardId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getNameCardId() != 0) {
+          setNameCardId(other.getNameCardId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class SetNameCardRspOuterClass {
         return this;
       }
 
-      private int nameCardId_ ;
-      /**
-       * <code>uint32 name_card_id = 13;</code>
-       * @return The nameCardId.
-       */
-      @java.lang.Override
-      public int getNameCardId() {
-        return nameCardId_;
-      }
-      /**
-       * <code>uint32 name_card_id = 13;</code>
-       * @param value The nameCardId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setNameCardId(int value) {
-        
-        nameCardId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 name_card_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearNameCardId() {
-        
-        nameCardId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class SetNameCardRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class SetNameCardRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class SetNameCardRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int nameCardId_ ;
+      /**
+       * <code>uint32 name_card_id = 11;</code>
+       * @return The nameCardId.
+       */
+      @java.lang.Override
+      public int getNameCardId() {
+        return nameCardId_;
+      }
+      /**
+       * <code>uint32 name_card_id = 11;</code>
+       * @param value The nameCardId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNameCardId(int value) {
+        
+        nameCardId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 name_card_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNameCardId() {
+        
+        nameCardId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,7 +587,7 @@ public final class SetNameCardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024SetNameCardRsp.proto\"7\n\016SetNameCardRsp" +
-      "\022\024\n\014name_card_id\030\r \001(\r\022\017\n\007retcode\030\004 \001(\005B" +
+      "\022\017\n\007retcode\030\006 \001(\005\022\024\n\014name_card_id\030\013 \001(\rB" +
       "\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -609,7 +599,7 @@ public final class SetNameCardRspOuterClass {
     internal_static_SetNameCardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetNameCardRsp_descriptor,
-        new java.lang.String[] { "NameCardId", "Retcode", });
+        new java.lang.String[] { "Retcode", "NameCardId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateReqOuterClass.java
index 4833cdd4e..1666b8703 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateReqOuterClass.java
@@ -19,23 +19,18 @@ public final class SetOpenStateReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 value = 13;</code>
-     * @return The value.
-     */
-    int getValue();
-
-    /**
-     * <code>uint32 key = 12;</code>
+     * <code>uint32 key = 3;</code>
      * @return The key.
      */
     int getKey();
+
+    /**
+     * <code>uint32 value = 1;</code>
+     * @return The value.
+     */
+    int getValue();
   }
   /**
-   * <pre>
-   * CmdId: 20702
-   * Obf: KFLGFOELPIO
-   * </pre>
-   *
    * Protobuf type {@code SetOpenStateReq}
    */
   public static final class SetOpenStateReq extends
@@ -80,16 +75,16 @@ public final class SetOpenStateReqOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
-
-              key_ = input.readUInt32();
-              break;
-            }
-            case 104: {
+            case 8: {
 
               value_ = input.readUInt32();
               break;
             }
+            case 24: {
+
+              key_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,21 +117,10 @@ public final class SetOpenStateReqOuterClass {
               emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.class, emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.Builder.class);
     }
 
-    public static final int VALUE_FIELD_NUMBER = 13;
-    private int value_;
-    /**
-     * <code>uint32 value = 13;</code>
-     * @return The value.
-     */
-    @java.lang.Override
-    public int getValue() {
-      return value_;
-    }
-
-    public static final int KEY_FIELD_NUMBER = 12;
+    public static final int KEY_FIELD_NUMBER = 3;
     private int key_;
     /**
-     * <code>uint32 key = 12;</code>
+     * <code>uint32 key = 3;</code>
      * @return The key.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class SetOpenStateReqOuterClass {
       return key_;
     }
 
+    public static final int VALUE_FIELD_NUMBER = 1;
+    private int value_;
+    /**
+     * <code>uint32 value = 1;</code>
+     * @return The value.
+     */
+    @java.lang.Override
+    public int getValue() {
+      return value_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -158,11 +153,11 @@ public final class SetOpenStateReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (key_ != 0) {
-        output.writeUInt32(12, key_);
-      }
       if (value_ != 0) {
-        output.writeUInt32(13, value_);
+        output.writeUInt32(1, value_);
+      }
+      if (key_ != 0) {
+        output.writeUInt32(3, key_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class SetOpenStateReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (key_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, key_);
-      }
       if (value_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, value_);
+          .computeUInt32Size(1, value_);
+      }
+      if (key_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, key_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class SetOpenStateReqOuterClass {
       }
       emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq other = (emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq) obj;
 
-      if (getValue()
-          != other.getValue()) return false;
       if (getKey()
           != other.getKey()) return false;
+      if (getValue()
+          != other.getValue()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class SetOpenStateReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getValue();
       hash = (37 * hash) + KEY_FIELD_NUMBER;
       hash = (53 * hash) + getKey();
+      hash = (37 * hash) + VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getValue();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class SetOpenStateReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20702
-     * Obf: KFLGFOELPIO
-     * </pre>
-     *
      * Protobuf type {@code SetOpenStateReq}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class SetOpenStateReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        value_ = 0;
-
         key_ = 0;
 
+        value_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class SetOpenStateReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq buildPartial() {
         emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq result = new emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq(this);
-        result.value_ = value_;
         result.key_ = key_;
+        result.value_ = value_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class SetOpenStateReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq other) {
         if (other == emu.grasscutter.net.proto.SetOpenStateReqOuterClass.SetOpenStateReq.getDefaultInstance()) return this;
-        if (other.getValue() != 0) {
-          setValue(other.getValue());
-        }
         if (other.getKey() != 0) {
           setKey(other.getKey());
         }
+        if (other.getValue() != 0) {
+          setValue(other.getValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class SetOpenStateReqOuterClass {
         return this;
       }
 
-      private int value_ ;
-      /**
-       * <code>uint32 value = 13;</code>
-       * @return The value.
-       */
-      @java.lang.Override
-      public int getValue() {
-        return value_;
-      }
-      /**
-       * <code>uint32 value = 13;</code>
-       * @param value The value to set.
-       * @return This builder for chaining.
-       */
-      public Builder setValue(int value) {
-        
-        value_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 value = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearValue() {
-        
-        value_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int key_ ;
       /**
-       * <code>uint32 key = 12;</code>
+       * <code>uint32 key = 3;</code>
        * @return The key.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class SetOpenStateReqOuterClass {
         return key_;
       }
       /**
-       * <code>uint32 key = 12;</code>
+       * <code>uint32 key = 3;</code>
        * @param value The key to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class SetOpenStateReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 key = 12;</code>
+       * <code>uint32 key = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearKey() {
@@ -529,6 +488,37 @@ public final class SetOpenStateReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int value_ ;
+      /**
+       * <code>uint32 value = 1;</code>
+       * @return The value.
+       */
+      @java.lang.Override
+      public int getValue() {
+        return value_;
+      }
+      /**
+       * <code>uint32 value = 1;</code>
+       * @param value The value to set.
+       * @return This builder for chaining.
+       */
+      public Builder setValue(int value) {
+        
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 value = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearValue() {
+        
+        value_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,7 +587,7 @@ public final class SetOpenStateReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025SetOpenStateReq.proto\"-\n\017SetOpenStateR" +
-      "eq\022\r\n\005value\030\r \001(\r\022\013\n\003key\030\014 \001(\rB\033\n\031emu.gr" +
+      "eq\022\013\n\003key\030\003 \001(\r\022\r\n\005value\030\001 \001(\rB\033\n\031emu.gr" +
       "asscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -609,7 +599,7 @@ public final class SetOpenStateReqOuterClass {
     internal_static_SetOpenStateReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetOpenStateReq_descriptor,
-        new java.lang.String[] { "Value", "Key", });
+        new java.lang.String[] { "Key", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateRspOuterClass.java
index bcd975c58..ee4f73659 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetOpenStateRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SetOpenStateRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 value = 1;</code>
-     * @return The value.
-     */
-    int getValue();
-
-    /**
-     * <code>uint32 key = 8;</code>
+     * <code>uint32 key = 5;</code>
      * @return The key.
      */
     int getKey();
 
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 value = 10;</code>
+     * @return The value.
+     */
+    int getValue();
   }
   /**
-   * <pre>
-   * CmdId: 934
-   * Obf: PCMONDAPKNM
-   * </pre>
-   *
    * Protobuf type {@code SetOpenStateRsp}
    */
   public static final class SetOpenStateRsp extends
@@ -86,21 +81,21 @@ public final class SetOpenStateRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              value_ = input.readUInt32();
-              break;
-            }
-            case 64: {
+            case 40: {
 
               key_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 80: {
+
+              value_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,21 +128,10 @@ public final class SetOpenStateRspOuterClass {
               emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp.class, emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp.Builder.class);
     }
 
-    public static final int VALUE_FIELD_NUMBER = 1;
-    private int value_;
-    /**
-     * <code>uint32 value = 1;</code>
-     * @return The value.
-     */
-    @java.lang.Override
-    public int getValue() {
-      return value_;
-    }
-
-    public static final int KEY_FIELD_NUMBER = 8;
+    public static final int KEY_FIELD_NUMBER = 5;
     private int key_;
     /**
-     * <code>uint32 key = 8;</code>
+     * <code>uint32 key = 5;</code>
      * @return The key.
      */
     @java.lang.Override
@@ -155,10 +139,10 @@ public final class SetOpenStateRspOuterClass {
       return key_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -166,6 +150,17 @@ public final class SetOpenStateRspOuterClass {
       return retcode_;
     }
 
+    public static final int VALUE_FIELD_NUMBER = 10;
+    private int value_;
+    /**
+     * <code>uint32 value = 10;</code>
+     * @return The value.
+     */
+    @java.lang.Override
+    public int getValue() {
+      return value_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +175,14 @@ public final class SetOpenStateRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (value_ != 0) {
-        output.writeUInt32(1, value_);
-      }
       if (key_ != 0) {
-        output.writeUInt32(8, key_);
+        output.writeUInt32(5, key_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(6, retcode_);
+      }
+      if (value_ != 0) {
+        output.writeUInt32(10, value_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class SetOpenStateRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (value_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, value_);
-      }
       if (key_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, key_);
+          .computeUInt32Size(5, key_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(6, retcode_);
+      }
+      if (value_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, value_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +220,12 @@ public final class SetOpenStateRspOuterClass {
       }
       emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp other = (emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp) obj;
 
-      if (getValue()
-          != other.getValue()) return false;
       if (getKey()
           != other.getKey()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getValue()
+          != other.getValue()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +237,12 @@ public final class SetOpenStateRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + VALUE_FIELD_NUMBER;
-      hash = (53 * hash) + getValue();
       hash = (37 * hash) + KEY_FIELD_NUMBER;
       hash = (53 * hash) + getKey();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + VALUE_FIELD_NUMBER;
+      hash = (53 * hash) + getValue();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +339,6 @@ public final class SetOpenStateRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 934
-     * Obf: PCMONDAPKNM
-     * </pre>
-     *
      * Protobuf type {@code SetOpenStateRsp}
      */
     public static final class Builder extends
@@ -386,12 +376,12 @@ public final class SetOpenStateRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        value_ = 0;
-
         key_ = 0;
 
         retcode_ = 0;
 
+        value_ = 0;
+
         return this;
       }
 
@@ -418,9 +408,9 @@ public final class SetOpenStateRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp buildPartial() {
         emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp result = new emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp(this);
-        result.value_ = value_;
         result.key_ = key_;
         result.retcode_ = retcode_;
+        result.value_ = value_;
         onBuilt();
         return result;
       }
@@ -469,15 +459,15 @@ public final class SetOpenStateRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp other) {
         if (other == emu.grasscutter.net.proto.SetOpenStateRspOuterClass.SetOpenStateRsp.getDefaultInstance()) return this;
-        if (other.getValue() != 0) {
-          setValue(other.getValue());
-        }
         if (other.getKey() != 0) {
           setKey(other.getKey());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getValue() != 0) {
+          setValue(other.getValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,40 +497,9 @@ public final class SetOpenStateRspOuterClass {
         return this;
       }
 
-      private int value_ ;
-      /**
-       * <code>uint32 value = 1;</code>
-       * @return The value.
-       */
-      @java.lang.Override
-      public int getValue() {
-        return value_;
-      }
-      /**
-       * <code>uint32 value = 1;</code>
-       * @param value The value to set.
-       * @return This builder for chaining.
-       */
-      public Builder setValue(int value) {
-        
-        value_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 value = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearValue() {
-        
-        value_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int key_ ;
       /**
-       * <code>uint32 key = 8;</code>
+       * <code>uint32 key = 5;</code>
        * @return The key.
        */
       @java.lang.Override
@@ -548,7 +507,7 @@ public final class SetOpenStateRspOuterClass {
         return key_;
       }
       /**
-       * <code>uint32 key = 8;</code>
+       * <code>uint32 key = 5;</code>
        * @param value The key to set.
        * @return This builder for chaining.
        */
@@ -559,7 +518,7 @@ public final class SetOpenStateRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 key = 8;</code>
+       * <code>uint32 key = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearKey() {
@@ -571,7 +530,7 @@ public final class SetOpenStateRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -579,7 +538,7 @@ public final class SetOpenStateRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -590,7 +549,7 @@ public final class SetOpenStateRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -599,6 +558,37 @@ public final class SetOpenStateRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int value_ ;
+      /**
+       * <code>uint32 value = 10;</code>
+       * @return The value.
+       */
+      @java.lang.Override
+      public int getValue() {
+        return value_;
+      }
+      /**
+       * <code>uint32 value = 10;</code>
+       * @param value The value to set.
+       * @return This builder for chaining.
+       */
+      public Builder setValue(int value) {
+        
+        value_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 value = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearValue() {
+        
+        value_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +657,8 @@ public final class SetOpenStateRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025SetOpenStateRsp.proto\">\n\017SetOpenStateR" +
-      "sp\022\r\n\005value\030\001 \001(\r\022\013\n\003key\030\010 \001(\r\022\017\n\007retcod" +
-      "e\030\014 \001(\005B\033\n\031emu.grasscutter.net.protob\006pr" +
+      "sp\022\013\n\003key\030\005 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\r\n\005valu" +
+      "e\030\n \001(\rB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +670,7 @@ public final class SetOpenStateRspOuterClass {
     internal_static_SetOpenStateRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetOpenStateRsp_descriptor,
-        new java.lang.String[] { "Value", "Key", "Retcode", });
+        new java.lang.String[] { "Key", "Retcode", "Value", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java
index bd16b0877..ed2fe3701 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayReqOuterClass.java
@@ -19,26 +19,21 @@ public final class SetPlayerBirthdayReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      * @return Whether the birthday field is set.
      */
     boolean hasBirthday();
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      * @return The birthday.
      */
     emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday();
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      */
     emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 26479
-   * Obf: JPDKMIFAEJF
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerBirthdayReq}
    */
   public static final class SetPlayerBirthdayReq extends
@@ -83,7 +78,7 @@ public final class SetPlayerBirthdayReqOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 90: {
               emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder subBuilder = null;
               if (birthday_ != null) {
                 subBuilder = birthday_.toBuilder();
@@ -128,10 +123,10 @@ public final class SetPlayerBirthdayReqOuterClass {
               emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq.class, emu.grasscutter.net.proto.SetPlayerBirthdayReqOuterClass.SetPlayerBirthdayReq.Builder.class);
     }
 
-    public static final int BIRTHDAY_FIELD_NUMBER = 15;
+    public static final int BIRTHDAY_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_;
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      * @return Whether the birthday field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class SetPlayerBirthdayReqOuterClass {
       return birthday_ != null;
     }
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      * @return The birthday.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class SetPlayerBirthdayReqOuterClass {
       return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_;
     }
     /**
-     * <code>.Birthday birthday = 15;</code>
+     * <code>.Birthday birthday = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() {
@@ -169,7 +164,7 @@ public final class SetPlayerBirthdayReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (birthday_ != null) {
-        output.writeMessage(15, getBirthday());
+        output.writeMessage(11, getBirthday());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class SetPlayerBirthdayReqOuterClass {
       size = 0;
       if (birthday_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getBirthday());
+          .computeMessageSize(11, getBirthday());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class SetPlayerBirthdayReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26479
-     * Obf: JPDKMIFAEJF
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerBirthdayReq}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class SetPlayerBirthdayReqOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthdayBuilder_;
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        * @return Whether the birthday field is set.
        */
       public boolean hasBirthday() {
         return birthdayBuilder_ != null || birthday_ != null;
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        * @return The birthday.
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() {
@@ -496,7 +486,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         }
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public Builder setBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) {
         if (birthdayBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public Builder setBirthday(
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public Builder mergeBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) {
         if (birthdayBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public Builder clearBirthday() {
         if (birthdayBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthdayBuilder() {
         
@@ -566,7 +556,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         return getBirthdayFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() {
         if (birthdayBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class SetPlayerBirthdayReqOuterClass {
         }
       }
       /**
-       * <code>.Birthday birthday = 15;</code>
+       * <code>.Birthday birthday = 11;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> 
@@ -661,7 +651,7 @@ public final class SetPlayerBirthdayReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032SetPlayerBirthdayReq.proto\032\016Birthday.p" +
       "roto\"3\n\024SetPlayerBirthdayReq\022\033\n\010birthday" +
-      "\030\017 \001(\0132\t.BirthdayB\033\n\031emu.grasscutter.net" +
+      "\030\013 \001(\0132\t.BirthdayB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java
index d7c11c8d1..2d36b461e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBirthdayRspOuterClass.java
@@ -19,32 +19,27 @@ public final class SetPlayerBirthdayRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      * @return Whether the birthday field is set.
      */
     boolean hasBirthday();
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      * @return The birthday.
      */
     emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday();
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      */
     emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder();
 
     /**
-     * <code>int32 retcode = 11;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 26814
-   * Obf: GFMCLOFLLAL
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerBirthdayRsp}
    */
   public static final class SetPlayerBirthdayRsp extends
@@ -89,7 +84,7 @@ public final class SetPlayerBirthdayRspOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 26: {
               emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder subBuilder = null;
               if (birthday_ != null) {
                 subBuilder = birthday_.toBuilder();
@@ -102,7 +97,7 @@ public final class SetPlayerBirthdayRspOuterClass {
 
               break;
             }
-            case 88: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
@@ -139,10 +134,10 @@ public final class SetPlayerBirthdayRspOuterClass {
               emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp.class, emu.grasscutter.net.proto.SetPlayerBirthdayRspOuterClass.SetPlayerBirthdayRsp.Builder.class);
     }
 
-    public static final int BIRTHDAY_FIELD_NUMBER = 8;
+    public static final int BIRTHDAY_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.BirthdayOuterClass.Birthday birthday_;
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      * @return Whether the birthday field is set.
      */
     @java.lang.Override
@@ -150,7 +145,7 @@ public final class SetPlayerBirthdayRspOuterClass {
       return birthday_ != null;
     }
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      * @return The birthday.
      */
     @java.lang.Override
@@ -158,17 +153,17 @@ public final class SetPlayerBirthdayRspOuterClass {
       return birthday_ == null ? emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.getDefaultInstance() : birthday_;
     }
     /**
-     * <code>.Birthday birthday = 8;</code>
+     * <code>.Birthday birthday = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() {
       return getBirthday();
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 11;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -191,10 +186,10 @@ public final class SetPlayerBirthdayRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (birthday_ != null) {
-        output.writeMessage(8, getBirthday());
+        output.writeMessage(3, getBirthday());
       }
       if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeInt32(6, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -207,11 +202,11 @@ public final class SetPlayerBirthdayRspOuterClass {
       size = 0;
       if (birthday_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getBirthday());
+          .computeMessageSize(3, getBirthday());
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeInt32Size(6, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,6 @@ public final class SetPlayerBirthdayRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26814
-     * Obf: GFMCLOFLLAL
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerBirthdayRsp}
      */
     public static final class Builder extends
@@ -517,14 +507,14 @@ public final class SetPlayerBirthdayRspOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> birthdayBuilder_;
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        * @return Whether the birthday field is set.
        */
       public boolean hasBirthday() {
         return birthdayBuilder_ != null || birthday_ != null;
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        * @return The birthday.
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday getBirthday() {
@@ -535,7 +525,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         }
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public Builder setBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) {
         if (birthdayBuilder_ == null) {
@@ -551,7 +541,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public Builder setBirthday(
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder builderForValue) {
@@ -565,7 +555,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public Builder mergeBirthday(emu.grasscutter.net.proto.BirthdayOuterClass.Birthday value) {
         if (birthdayBuilder_ == null) {
@@ -583,7 +573,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public Builder clearBirthday() {
         if (birthdayBuilder_ == null) {
@@ -597,7 +587,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return this;
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder getBirthdayBuilder() {
         
@@ -605,7 +595,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return getBirthdayFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       public emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder getBirthdayOrBuilder() {
         if (birthdayBuilder_ != null) {
@@ -616,7 +606,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         }
       }
       /**
-       * <code>.Birthday birthday = 8;</code>
+       * <code>.Birthday birthday = 3;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.BirthdayOuterClass.Birthday, emu.grasscutter.net.proto.BirthdayOuterClass.Birthday.Builder, emu.grasscutter.net.proto.BirthdayOuterClass.BirthdayOrBuilder> 
@@ -634,7 +624,7 @@ public final class SetPlayerBirthdayRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -642,7 +632,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -653,7 +643,7 @@ public final class SetPlayerBirthdayRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -731,7 +721,7 @@ public final class SetPlayerBirthdayRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032SetPlayerBirthdayRsp.proto\032\016Birthday.p" +
       "roto\"D\n\024SetPlayerBirthdayRsp\022\033\n\010birthday" +
-      "\030\010 \001(\0132\t.Birthday\022\017\n\007retcode\030\013 \001(\005B\033\n\031em" +
+      "\030\003 \001(\0132\t.Birthday\022\017\n\007retcode\030\006 \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/SetPlayerBornDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataReqOuterClass.java
index 1b42dfbd2..40928bf38 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataReqOuterClass.java
@@ -19,29 +19,24 @@ public final class SetPlayerBornDataReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string nick_name = 10;</code>
+     * <code>string nick_name = 7;</code>
      * @return The nickName.
      */
     java.lang.String getNickName();
     /**
-     * <code>string nick_name = 10;</code>
+     * <code>string nick_name = 7;</code>
      * @return The bytes for nickName.
      */
     com.google.protobuf.ByteString
         getNickNameBytes();
 
     /**
-     * <code>uint32 avatar_id = 2;</code>
+     * <code>uint32 avatar_id = 1;</code>
      * @return The avatarId.
      */
     int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 7992
-   * Obf: OBEJBFKGLPI
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerBornDataReq}
    */
   public static final class SetPlayerBornDataReq extends
@@ -87,12 +82,12 @@ public final class SetPlayerBornDataReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 8: {
 
               avatarId_ = input.readUInt32();
               break;
             }
-            case 82: {
+            case 58: {
               java.lang.String s = input.readStringRequireUtf8();
 
               nickName_ = s;
@@ -130,10 +125,10 @@ public final class SetPlayerBornDataReqOuterClass {
               emu.grasscutter.net.proto.SetPlayerBornDataReqOuterClass.SetPlayerBornDataReq.class, emu.grasscutter.net.proto.SetPlayerBornDataReqOuterClass.SetPlayerBornDataReq.Builder.class);
     }
 
-    public static final int NICK_NAME_FIELD_NUMBER = 10;
+    public static final int NICK_NAME_FIELD_NUMBER = 7;
     private volatile java.lang.Object nickName_;
     /**
-     * <code>string nick_name = 10;</code>
+     * <code>string nick_name = 7;</code>
      * @return The nickName.
      */
     @java.lang.Override
@@ -150,7 +145,7 @@ public final class SetPlayerBornDataReqOuterClass {
       }
     }
     /**
-     * <code>string nick_name = 10;</code>
+     * <code>string nick_name = 7;</code>
      * @return The bytes for nickName.
      */
     @java.lang.Override
@@ -168,10 +163,10 @@ public final class SetPlayerBornDataReqOuterClass {
       }
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 2;
+    public static final int AVATAR_ID_FIELD_NUMBER = 1;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 2;</code>
+     * <code>uint32 avatar_id = 1;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -194,10 +189,10 @@ public final class SetPlayerBornDataReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarId_ != 0) {
-        output.writeUInt32(2, avatarId_);
+        output.writeUInt32(1, avatarId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, nickName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, nickName_);
       }
       unknownFields.writeTo(output);
     }
@@ -210,10 +205,10 @@ public final class SetPlayerBornDataReqOuterClass {
       size = 0;
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, avatarId_);
+          .computeUInt32Size(1, avatarId_);
       }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, nickName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, nickName_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class SetPlayerBornDataReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7992
-     * Obf: OBEJBFKGLPI
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerBornDataReq}
      */
     public static final class Builder extends
@@ -505,7 +495,7 @@ public final class SetPlayerBornDataReqOuterClass {
 
       private java.lang.Object nickName_ = "";
       /**
-       * <code>string nick_name = 10;</code>
+       * <code>string nick_name = 7;</code>
        * @return The nickName.
        */
       public java.lang.String getNickName() {
@@ -521,7 +511,7 @@ public final class SetPlayerBornDataReqOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 10;</code>
+       * <code>string nick_name = 7;</code>
        * @return The bytes for nickName.
        */
       public com.google.protobuf.ByteString
@@ -538,7 +528,7 @@ public final class SetPlayerBornDataReqOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 10;</code>
+       * <code>string nick_name = 7;</code>
        * @param value The nickName to set.
        * @return This builder for chaining.
        */
@@ -553,7 +543,7 @@ public final class SetPlayerBornDataReqOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 10;</code>
+       * <code>string nick_name = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearNickName() {
@@ -563,7 +553,7 @@ public final class SetPlayerBornDataReqOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 10;</code>
+       * <code>string nick_name = 7;</code>
        * @param value The bytes for nickName to set.
        * @return This builder for chaining.
        */
@@ -581,7 +571,7 @@ public final class SetPlayerBornDataReqOuterClass {
 
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 2;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -589,7 +579,7 @@ public final class SetPlayerBornDataReqOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 2;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -600,7 +590,7 @@ public final class SetPlayerBornDataReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 2;</code>
+       * <code>uint32 avatar_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -677,8 +667,8 @@ public final class SetPlayerBornDataReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SetPlayerBornDataReq.proto\"<\n\024SetPlaye" +
-      "rBornDataReq\022\021\n\tnick_name\030\n \001(\t\022\021\n\tavata" +
-      "r_id\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "rBornDataReq\022\021\n\tnick_name\030\007 \001(\t\022\021\n\tavata" +
+      "r_id\030\001 \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/SetPlayerBornDataRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java
index 5c78705cb..943d2172f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerBornDataRspOuterClass.java
@@ -19,17 +19,12 @@ public final class SetPlayerBornDataRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 22804
-   * Obf: CGFIJAMAKEG
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerBornDataRsp}
    */
   public static final class SetPlayerBornDataRsp extends
@@ -74,7 +69,7 @@ public final class SetPlayerBornDataRspOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 80: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class SetPlayerBornDataRspOuterClass {
               emu.grasscutter.net.proto.SetPlayerBornDataRspOuterClass.SetPlayerBornDataRsp.class, emu.grasscutter.net.proto.SetPlayerBornDataRspOuterClass.SetPlayerBornDataRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 10;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 10;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class SetPlayerBornDataRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(10, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class SetPlayerBornDataRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(10, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class SetPlayerBornDataRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22804
-     * Obf: CGFIJAMAKEG
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerBornDataRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class SetPlayerBornDataRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 10;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class SetPlayerBornDataRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 10;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class SetPlayerBornDataRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class SetPlayerBornDataRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032SetPlayerBornDataRsp.proto\"\'\n\024SetPlaye" +
-      "rBornDataRsp\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.gra" +
+      "rBornDataRsp\022\017\n\007retcode\030\n \001(\005B\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageReqOuterClass.java
index 8083ebefb..867652c35 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageReqOuterClass.java
@@ -19,17 +19,12 @@ public final class SetPlayerHeadImageReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 avatar_id = 7;</code>
+     * <code>uint32 avatar_id = 9;</code>
      * @return The avatarId.
      */
     int getAvatarId();
   }
   /**
-   * <pre>
-   * CmdId: 4071
-   * Obf: PDIPMMGDOGN
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerHeadImageReq}
    */
   public static final class SetPlayerHeadImageReq extends
@@ -74,7 +69,7 @@ public final class SetPlayerHeadImageReqOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 72: {
 
               avatarId_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class SetPlayerHeadImageReqOuterClass {
               emu.grasscutter.net.proto.SetPlayerHeadImageReqOuterClass.SetPlayerHeadImageReq.class, emu.grasscutter.net.proto.SetPlayerHeadImageReqOuterClass.SetPlayerHeadImageReq.Builder.class);
     }
 
-    public static final int AVATAR_ID_FIELD_NUMBER = 7;
+    public static final int AVATAR_ID_FIELD_NUMBER = 9;
     private int avatarId_;
     /**
-     * <code>uint32 avatar_id = 7;</code>
+     * <code>uint32 avatar_id = 9;</code>
      * @return The avatarId.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class SetPlayerHeadImageReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarId_ != 0) {
-        output.writeUInt32(7, avatarId_);
+        output.writeUInt32(9, avatarId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class SetPlayerHeadImageReqOuterClass {
       size = 0;
       if (avatarId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, avatarId_);
+          .computeUInt32Size(9, avatarId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class SetPlayerHeadImageReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4071
-     * Obf: PDIPMMGDOGN
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerHeadImageReq}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class SetPlayerHeadImageReqOuterClass {
 
       private int avatarId_ ;
       /**
-       * <code>uint32 avatar_id = 7;</code>
+       * <code>uint32 avatar_id = 9;</code>
        * @return The avatarId.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class SetPlayerHeadImageReqOuterClass {
         return avatarId_;
       }
       /**
-       * <code>uint32 avatar_id = 7;</code>
+       * <code>uint32 avatar_id = 9;</code>
        * @param value The avatarId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class SetPlayerHeadImageReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 avatar_id = 7;</code>
+       * <code>uint32 avatar_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarId() {
@@ -527,7 +517,7 @@ public final class SetPlayerHeadImageReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SetPlayerHeadImageReq.proto\"*\n\025SetPlay" +
-      "erHeadImageReq\022\021\n\tavatar_id\030\007 \001(\rB\033\n\031emu" +
+      "erHeadImageReq\022\021\n\tavatar_id\030\t \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/SetPlayerHeadImageRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageRspOuterClass.java
index 432afab75..37fc5db72 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerHeadImageRspOuterClass.java
@@ -19,38 +19,27 @@ public final class SetPlayerHeadImageRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 avatar_id = 13;</code>
-     * @return The avatarId.
-     */
-    int getAvatarId();
-
-    /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      * @return Whether the profilePicture field is set.
      */
     boolean hasProfilePicture();
     /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      * @return The profilePicture.
      */
     emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture();
     /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      */
     emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder();
+
+    /**
+     * <code>int32 retcode = 4;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 20979
-   * Obf: PAGKCLAMNDJ
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerHeadImageRsp}
    */
   public static final class SetPlayerHeadImageRsp extends
@@ -95,7 +84,7 @@ public final class SetPlayerHeadImageRspOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 18: {
               emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder subBuilder = null;
               if (profilePicture_ != null) {
                 subBuilder = profilePicture_.toBuilder();
@@ -108,16 +97,11 @@ public final class SetPlayerHeadImageRspOuterClass {
 
               break;
             }
-            case 64: {
+            case 32: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 104: {
-
-              avatarId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -150,32 +134,10 @@ public final class SetPlayerHeadImageRspOuterClass {
               emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.class, emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 8;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    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 PROFILE_PICTURE_FIELD_NUMBER = 6;
+    public static final int PROFILE_PICTURE_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
     /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      * @return Whether the profilePicture field is set.
      */
     @java.lang.Override
@@ -183,7 +145,7 @@ public final class SetPlayerHeadImageRspOuterClass {
       return profilePicture_ != null;
     }
     /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      * @return The profilePicture.
      */
     @java.lang.Override
@@ -191,13 +153,24 @@ public final class SetPlayerHeadImageRspOuterClass {
       return profilePicture_ == null ? emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.getDefaultInstance() : profilePicture_;
     }
     /**
-     * <code>.ProfilePicture profile_picture = 6;</code>
+     * <code>.ProfilePicture profile_picture = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
       return getProfilePicture();
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 4;
+    private int retcode_;
+    /**
+     * <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() {
@@ -213,13 +186,10 @@ public final class SetPlayerHeadImageRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (profilePicture_ != null) {
-        output.writeMessage(6, getProfilePicture());
+        output.writeMessage(2, getProfilePicture());
       }
       if (retcode_ != 0) {
-        output.writeInt32(8, retcode_);
-      }
-      if (avatarId_ != 0) {
-        output.writeUInt32(13, avatarId_);
+        output.writeInt32(4, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -232,15 +202,11 @@ public final class SetPlayerHeadImageRspOuterClass {
       size = 0;
       if (profilePicture_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getProfilePicture());
+          .computeMessageSize(2, getProfilePicture());
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(8, retcode_);
-      }
-      if (avatarId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, avatarId_);
+          .computeInt32Size(4, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -257,15 +223,13 @@ public final class SetPlayerHeadImageRspOuterClass {
       }
       emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp other = (emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
-      if (getAvatarId()
-          != other.getAvatarId()) return false;
       if (hasProfilePicture() != other.hasProfilePicture()) return false;
       if (hasProfilePicture()) {
         if (!getProfilePicture()
             .equals(other.getProfilePicture())) return false;
       }
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -277,14 +241,12 @@ public final class SetPlayerHeadImageRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
-      hash = (37 * hash) + AVATAR_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAvatarId();
       if (hasProfilePicture()) {
         hash = (37 * hash) + PROFILE_PICTURE_FIELD_NUMBER;
         hash = (53 * hash) + getProfilePicture().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -381,11 +343,6 @@ public final class SetPlayerHeadImageRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20979
-     * Obf: PAGKCLAMNDJ
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerHeadImageRsp}
      */
     public static final class Builder extends
@@ -423,16 +380,14 @@ public final class SetPlayerHeadImageRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
-        avatarId_ = 0;
-
         if (profilePictureBuilder_ == null) {
           profilePicture_ = null;
         } else {
           profilePicture_ = null;
           profilePictureBuilder_ = null;
         }
+        retcode_ = 0;
+
         return this;
       }
 
@@ -459,13 +414,12 @@ public final class SetPlayerHeadImageRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp buildPartial() {
         emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp result = new emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp(this);
-        result.retcode_ = retcode_;
-        result.avatarId_ = avatarId_;
         if (profilePictureBuilder_ == null) {
           result.profilePicture_ = profilePicture_;
         } else {
           result.profilePicture_ = profilePictureBuilder_.build();
         }
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -514,15 +468,12 @@ public final class SetPlayerHeadImageRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp other) {
         if (other == emu.grasscutter.net.proto.SetPlayerHeadImageRspOuterClass.SetPlayerHeadImageRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
-        if (other.getAvatarId() != 0) {
-          setAvatarId(other.getAvatarId());
-        }
         if (other.hasProfilePicture()) {
           mergeProfilePicture(other.getProfilePicture());
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -552,80 +503,18 @@ public final class SetPlayerHeadImageRspOuterClass {
         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;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 retcode = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        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 emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture profilePicture_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> profilePictureBuilder_;
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        * @return Whether the profilePicture field is set.
        */
       public boolean hasProfilePicture() {
         return profilePictureBuilder_ != null || profilePicture_ != null;
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        * @return The profilePicture.
        */
       public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture getProfilePicture() {
@@ -636,7 +525,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         }
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public Builder setProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
         if (profilePictureBuilder_ == null) {
@@ -652,7 +541,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         return this;
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public Builder setProfilePicture(
           emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder builderForValue) {
@@ -666,7 +555,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         return this;
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public Builder mergeProfilePicture(emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture value) {
         if (profilePictureBuilder_ == null) {
@@ -684,7 +573,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         return this;
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public Builder clearProfilePicture() {
         if (profilePictureBuilder_ == null) {
@@ -698,7 +587,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         return this;
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder getProfilePictureBuilder() {
         
@@ -706,7 +595,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         return getProfilePictureFieldBuilder().getBuilder();
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       public emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder getProfilePictureOrBuilder() {
         if (profilePictureBuilder_ != null) {
@@ -717,7 +606,7 @@ public final class SetPlayerHeadImageRspOuterClass {
         }
       }
       /**
-       * <code>.ProfilePicture profile_picture = 6;</code>
+       * <code>.ProfilePicture profile_picture = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePicture.Builder, emu.grasscutter.net.proto.ProfilePictureOuterClass.ProfilePictureOrBuilder> 
@@ -732,6 +621,37 @@ public final class SetPlayerHeadImageRspOuterClass {
         }
         return profilePictureBuilder_;
       }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 4;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <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) {
@@ -800,10 +720,10 @@ public final class SetPlayerHeadImageRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SetPlayerHeadImageRsp.proto\032\024ProfilePi" +
-      "cture.proto\"e\n\025SetPlayerHeadImageRsp\022\017\n\007" +
-      "retcode\030\010 \001(\005\022\021\n\tavatar_id\030\r \001(\r\022(\n\017prof" +
-      "ile_picture\030\006 \001(\0132\017.ProfilePictureB\033\n\031em" +
-      "u.grasscutter.net.protob\006proto3"
+      "cture.proto\"R\n\025SetPlayerHeadImageRsp\022(\n\017" +
+      "profile_picture\030\002 \001(\0132\017.ProfilePicture\022\017" +
+      "\n\007retcode\030\004 \001(\005B\033\n\031emu.grasscutter.net.p" +
+      "rotob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -815,7 +735,7 @@ public final class SetPlayerHeadImageRspOuterClass {
     internal_static_SetPlayerHeadImageRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetPlayerHeadImageRsp_descriptor,
-        new java.lang.String[] { "Retcode", "AvatarId", "ProfilePicture", });
+        new java.lang.String[] { "ProfilePicture", "Retcode", });
     emu.grasscutter.net.proto.ProfilePictureOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
index cb7983b6c..637e52700 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameReqOuterClass.java
@@ -19,23 +19,18 @@ public final class SetPlayerNameReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string nick_name = 11;</code>
+     * <code>string nick_name = 7;</code>
      * @return The nickName.
      */
     java.lang.String getNickName();
     /**
-     * <code>string nick_name = 11;</code>
+     * <code>string nick_name = 7;</code>
      * @return The bytes for nickName.
      */
     com.google.protobuf.ByteString
         getNickNameBytes();
   }
   /**
-   * <pre>
-   * CmdId: 2665
-   * Obf: OGIPOOMFBGD
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerNameReq}
    */
   public static final class SetPlayerNameReq extends
@@ -81,7 +76,7 @@ public final class SetPlayerNameReqOuterClass {
             case 0:
               done = true;
               break;
-            case 90: {
+            case 58: {
               java.lang.String s = input.readStringRequireUtf8();
 
               nickName_ = s;
@@ -119,10 +114,10 @@ public final class SetPlayerNameReqOuterClass {
               emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.class, emu.grasscutter.net.proto.SetPlayerNameReqOuterClass.SetPlayerNameReq.Builder.class);
     }
 
-    public static final int NICK_NAME_FIELD_NUMBER = 11;
+    public static final int NICK_NAME_FIELD_NUMBER = 7;
     private volatile java.lang.Object nickName_;
     /**
-     * <code>string nick_name = 11;</code>
+     * <code>string nick_name = 7;</code>
      * @return The nickName.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class SetPlayerNameReqOuterClass {
       }
     }
     /**
-     * <code>string nick_name = 11;</code>
+     * <code>string nick_name = 7;</code>
      * @return The bytes for nickName.
      */
     @java.lang.Override
@@ -172,7 +167,7 @@ public final class SetPlayerNameReqOuterClass {
     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, 11, nickName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 7, nickName_);
       }
       unknownFields.writeTo(output);
     }
@@ -184,7 +179,7 @@ public final class SetPlayerNameReqOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(11, nickName_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, nickName_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class SetPlayerNameReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2665
-     * Obf: OGIPOOMFBGD
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerNameReq}
      */
     public static final class Builder extends
@@ -466,7 +456,7 @@ public final class SetPlayerNameReqOuterClass {
 
       private java.lang.Object nickName_ = "";
       /**
-       * <code>string nick_name = 11;</code>
+       * <code>string nick_name = 7;</code>
        * @return The nickName.
        */
       public java.lang.String getNickName() {
@@ -482,7 +472,7 @@ public final class SetPlayerNameReqOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 11;</code>
+       * <code>string nick_name = 7;</code>
        * @return The bytes for nickName.
        */
       public com.google.protobuf.ByteString
@@ -499,7 +489,7 @@ public final class SetPlayerNameReqOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 11;</code>
+       * <code>string nick_name = 7;</code>
        * @param value The nickName to set.
        * @return This builder for chaining.
        */
@@ -514,7 +504,7 @@ public final class SetPlayerNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 11;</code>
+       * <code>string nick_name = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearNickName() {
@@ -524,7 +514,7 @@ public final class SetPlayerNameReqOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 11;</code>
+       * <code>string nick_name = 7;</code>
        * @param value The bytes for nickName to set.
        * @return This builder for chaining.
        */
@@ -607,7 +597,7 @@ public final class SetPlayerNameReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026SetPlayerNameReq.proto\"%\n\020SetPlayerNam" +
-      "eReq\022\021\n\tnick_name\030\013 \001(\tB\033\n\031emu.grasscutt" +
+      "eReq\022\021\n\tnick_name\030\007 \001(\tB\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/SetPlayerNameRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
index 084d1b650..89e5cb002 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerNameRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SetPlayerNameRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string nick_name = 12;</code>
+     * <code>string nick_name = 4;</code>
      * @return The nickName.
      */
     java.lang.String getNickName();
     /**
-     * <code>string nick_name = 12;</code>
+     * <code>string nick_name = 4;</code>
      * @return The bytes for nickName.
      */
     com.google.protobuf.ByteString
         getNickNameBytes();
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 25056
-   * Obf: FEDOJGKOGLO
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerNameRsp}
    */
   public static final class SetPlayerNameRsp extends
@@ -87,17 +82,17 @@ public final class SetPlayerNameRspOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 98: {
+            case 34: {
               java.lang.String s = input.readStringRequireUtf8();
 
               nickName_ = s;
               break;
             }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -130,10 +125,10 @@ public final class SetPlayerNameRspOuterClass {
               emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp.class, emu.grasscutter.net.proto.SetPlayerNameRspOuterClass.SetPlayerNameRsp.Builder.class);
     }
 
-    public static final int NICK_NAME_FIELD_NUMBER = 12;
+    public static final int NICK_NAME_FIELD_NUMBER = 4;
     private volatile java.lang.Object nickName_;
     /**
-     * <code>string nick_name = 12;</code>
+     * <code>string nick_name = 4;</code>
      * @return The nickName.
      */
     @java.lang.Override
@@ -150,7 +145,7 @@ public final class SetPlayerNameRspOuterClass {
       }
     }
     /**
-     * <code>string nick_name = 12;</code>
+     * <code>string nick_name = 4;</code>
      * @return The bytes for nickName.
      */
     @java.lang.Override
@@ -168,10 +163,10 @@ public final class SetPlayerNameRspOuterClass {
       }
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -193,11 +188,11 @@ public final class SetPlayerNameRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 12, nickName_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, nickName_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -208,12 +203,12 @@ public final class SetPlayerNameRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, nickName_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(nickName_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, nickName_);
+          .computeInt32Size(8, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class SetPlayerNameRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25056
-     * Obf: FEDOJGKOGLO
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerNameRsp}
      */
     public static final class Builder extends
@@ -505,7 +495,7 @@ public final class SetPlayerNameRspOuterClass {
 
       private java.lang.Object nickName_ = "";
       /**
-       * <code>string nick_name = 12;</code>
+       * <code>string nick_name = 4;</code>
        * @return The nickName.
        */
       public java.lang.String getNickName() {
@@ -521,7 +511,7 @@ public final class SetPlayerNameRspOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 12;</code>
+       * <code>string nick_name = 4;</code>
        * @return The bytes for nickName.
        */
       public com.google.protobuf.ByteString
@@ -538,7 +528,7 @@ public final class SetPlayerNameRspOuterClass {
         }
       }
       /**
-       * <code>string nick_name = 12;</code>
+       * <code>string nick_name = 4;</code>
        * @param value The nickName to set.
        * @return This builder for chaining.
        */
@@ -553,7 +543,7 @@ public final class SetPlayerNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 12;</code>
+       * <code>string nick_name = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearNickName() {
@@ -563,7 +553,7 @@ public final class SetPlayerNameRspOuterClass {
         return this;
       }
       /**
-       * <code>string nick_name = 12;</code>
+       * <code>string nick_name = 4;</code>
        * @param value The bytes for nickName to set.
        * @return This builder for chaining.
        */
@@ -581,7 +571,7 @@ public final class SetPlayerNameRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -589,7 +579,7 @@ public final class SetPlayerNameRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -600,7 +590,7 @@ public final class SetPlayerNameRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -677,7 +667,7 @@ public final class SetPlayerNameRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026SetPlayerNameRsp.proto\"6\n\020SetPlayerNam" +
-      "eRsp\022\021\n\tnick_name\030\014 \001(\t\022\017\n\007retcode\030\006 \001(\005" +
+      "eRsp\022\021\n\tnick_name\030\004 \001(\t\022\017\n\007retcode\030\010 \001(\005" +
       "B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerPropReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerPropReqOuterClass.java
index 05668a529..d76462989 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerPropReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerPropReqOuterClass.java
@@ -43,11 +43,6 @@ public final class SetPlayerPropReqOuterClass {
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 25174
-   * Obf: FNNAEOMEFBL
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerPropReq}
    */
   public static final class SetPlayerPropReq extends
@@ -336,11 +331,6 @@ public final class SetPlayerPropReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25174
-     * Obf: FNNAEOMEFBL
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerPropReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
index 2c5495cc2..d9aad213e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureReqOuterClass.java
@@ -19,23 +19,18 @@ public final class SetPlayerSignatureReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>string signature = 4;</code>
+     * <code>string signature = 10;</code>
      * @return The signature.
      */
     java.lang.String getSignature();
     /**
-     * <code>string signature = 4;</code>
+     * <code>string signature = 10;</code>
      * @return The bytes for signature.
      */
     com.google.protobuf.ByteString
         getSignatureBytes();
   }
   /**
-   * <pre>
-   * CmdId: 771
-   * Obf: HPKEIDMJIJI
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerSignatureReq}
    */
   public static final class SetPlayerSignatureReq extends
@@ -81,7 +76,7 @@ public final class SetPlayerSignatureReqOuterClass {
             case 0:
               done = true;
               break;
-            case 34: {
+            case 82: {
               java.lang.String s = input.readStringRequireUtf8();
 
               signature_ = s;
@@ -119,10 +114,10 @@ public final class SetPlayerSignatureReqOuterClass {
               emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignatureReq.class, emu.grasscutter.net.proto.SetPlayerSignatureReqOuterClass.SetPlayerSignatureReq.Builder.class);
     }
 
-    public static final int SIGNATURE_FIELD_NUMBER = 4;
+    public static final int SIGNATURE_FIELD_NUMBER = 10;
     private volatile java.lang.Object signature_;
     /**
-     * <code>string signature = 4;</code>
+     * <code>string signature = 10;</code>
      * @return The signature.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class SetPlayerSignatureReqOuterClass {
       }
     }
     /**
-     * <code>string signature = 4;</code>
+     * <code>string signature = 10;</code>
      * @return The bytes for signature.
      */
     @java.lang.Override
@@ -172,7 +167,7 @@ public final class SetPlayerSignatureReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 4, signature_);
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, signature_);
       }
       unknownFields.writeTo(output);
     }
@@ -184,7 +179,7 @@ public final class SetPlayerSignatureReqOuterClass {
 
       size = 0;
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, signature_);
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, signature_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class SetPlayerSignatureReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 771
-     * Obf: HPKEIDMJIJI
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerSignatureReq}
      */
     public static final class Builder extends
@@ -466,7 +456,7 @@ public final class SetPlayerSignatureReqOuterClass {
 
       private java.lang.Object signature_ = "";
       /**
-       * <code>string signature = 4;</code>
+       * <code>string signature = 10;</code>
        * @return The signature.
        */
       public java.lang.String getSignature() {
@@ -482,7 +472,7 @@ public final class SetPlayerSignatureReqOuterClass {
         }
       }
       /**
-       * <code>string signature = 4;</code>
+       * <code>string signature = 10;</code>
        * @return The bytes for signature.
        */
       public com.google.protobuf.ByteString
@@ -499,7 +489,7 @@ public final class SetPlayerSignatureReqOuterClass {
         }
       }
       /**
-       * <code>string signature = 4;</code>
+       * <code>string signature = 10;</code>
        * @param value The signature to set.
        * @return This builder for chaining.
        */
@@ -514,7 +504,7 @@ public final class SetPlayerSignatureReqOuterClass {
         return this;
       }
       /**
-       * <code>string signature = 4;</code>
+       * <code>string signature = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearSignature() {
@@ -524,7 +514,7 @@ public final class SetPlayerSignatureReqOuterClass {
         return this;
       }
       /**
-       * <code>string signature = 4;</code>
+       * <code>string signature = 10;</code>
        * @param value The bytes for signature to set.
        * @return This builder for chaining.
        */
@@ -607,7 +597,7 @@ public final class SetPlayerSignatureReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SetPlayerSignatureReq.proto\"*\n\025SetPlay" +
-      "erSignatureReq\022\021\n\tsignature\030\004 \001(\tB\033\n\031emu" +
+      "erSignatureReq\022\021\n\tsignature\030\n \001(\tB\033\n\031emu" +
       ".grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
index eecc001f1..a23aaf40a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetPlayerSignatureRspOuterClass.java
@@ -19,29 +19,24 @@ public final class SetPlayerSignatureRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>string signature = 8;</code>
+     * <code>string signature = 10;</code>
      * @return The signature.
      */
     java.lang.String getSignature();
     /**
-     * <code>string signature = 8;</code>
+     * <code>string signature = 10;</code>
      * @return The bytes for signature.
      */
     com.google.protobuf.ByteString
         getSignatureBytes();
   }
   /**
-   * <pre>
-   * CmdId: 28588
-   * Obf: GGJIINKCKBA
-   * </pre>
-   *
    * Protobuf type {@code SetPlayerSignatureRsp}
    */
   public static final class SetPlayerSignatureRsp extends
@@ -87,17 +82,17 @@ public final class SetPlayerSignatureRspOuterClass {
             case 0:
               done = true;
               break;
-            case 66: {
+            case 48: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 82: {
               java.lang.String s = input.readStringRequireUtf8();
 
               signature_ = s;
               break;
             }
-            case 112: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -130,10 +125,10 @@ public final class SetPlayerSignatureRspOuterClass {
               emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignatureRsp.class, emu.grasscutter.net.proto.SetPlayerSignatureRspOuterClass.SetPlayerSignatureRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -141,10 +136,10 @@ public final class SetPlayerSignatureRspOuterClass {
       return retcode_;
     }
 
-    public static final int SIGNATURE_FIELD_NUMBER = 8;
+    public static final int SIGNATURE_FIELD_NUMBER = 10;
     private volatile java.lang.Object signature_;
     /**
-     * <code>string signature = 8;</code>
+     * <code>string signature = 10;</code>
      * @return The signature.
      */
     @java.lang.Override
@@ -161,7 +156,7 @@ public final class SetPlayerSignatureRspOuterClass {
       }
     }
     /**
-     * <code>string signature = 8;</code>
+     * <code>string signature = 10;</code>
      * @return The bytes for signature.
      */
     @java.lang.Override
@@ -193,11 +188,11 @@ public final class SetPlayerSignatureRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
-        com.google.protobuf.GeneratedMessageV3.writeString(output, 8, signature_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(6, retcode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 10, signature_);
       }
       unknownFields.writeTo(output);
     }
@@ -208,12 +203,12 @@ public final class SetPlayerSignatureRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
-        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, signature_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(6, retcode_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(signature_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, signature_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class SetPlayerSignatureRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28588
-     * Obf: GGJIINKCKBA
-     * </pre>
-     *
      * Protobuf type {@code SetPlayerSignatureRsp}
      */
     public static final class Builder extends
@@ -505,7 +495,7 @@ public final class SetPlayerSignatureRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -513,7 +503,7 @@ public final class SetPlayerSignatureRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -524,7 +514,7 @@ public final class SetPlayerSignatureRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -536,7 +526,7 @@ public final class SetPlayerSignatureRspOuterClass {
 
       private java.lang.Object signature_ = "";
       /**
-       * <code>string signature = 8;</code>
+       * <code>string signature = 10;</code>
        * @return The signature.
        */
       public java.lang.String getSignature() {
@@ -552,7 +542,7 @@ public final class SetPlayerSignatureRspOuterClass {
         }
       }
       /**
-       * <code>string signature = 8;</code>
+       * <code>string signature = 10;</code>
        * @return The bytes for signature.
        */
       public com.google.protobuf.ByteString
@@ -569,7 +559,7 @@ public final class SetPlayerSignatureRspOuterClass {
         }
       }
       /**
-       * <code>string signature = 8;</code>
+       * <code>string signature = 10;</code>
        * @param value The signature to set.
        * @return This builder for chaining.
        */
@@ -584,7 +574,7 @@ public final class SetPlayerSignatureRspOuterClass {
         return this;
       }
       /**
-       * <code>string signature = 8;</code>
+       * <code>string signature = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearSignature() {
@@ -594,7 +584,7 @@ public final class SetPlayerSignatureRspOuterClass {
         return this;
       }
       /**
-       * <code>string signature = 8;</code>
+       * <code>string signature = 10;</code>
        * @param value The bytes for signature to set.
        * @return This builder for chaining.
        */
@@ -677,8 +667,8 @@ public final class SetPlayerSignatureRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SetPlayerSignatureRsp.proto\";\n\025SetPlay" +
-      "erSignatureRsp\022\017\n\007retcode\030\016 \001(\005\022\021\n\tsigna" +
-      "ture\030\010 \001(\tB\033\n\031emu.grasscutter.net.protob" +
+      "erSignatureRsp\022\017\n\007retcode\030\006 \001(\005\022\021\n\tsigna" +
+      "ture\030\n \001(\tB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 7f37d48a8..0e288e702 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamReqOuterClass.java
@@ -19,24 +19,24 @@ public final class SetUpAvatarTeamReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     java.util.List<java.lang.Long> getAvatarTeamGuidListList();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
      * @return The count of avatarTeamGuidList.
      */
     int getAvatarTeamGuidListCount();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</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 = 13;</code>
+     * <code>uint64 cur_avatar_guid = 2;</code>
      * @return The curAvatarGuid.
      */
     long getCurAvatarGuid();
@@ -48,11 +48,6 @@ public final class SetUpAvatarTeamReqOuterClass {
     int getTeamId();
   }
   /**
-   * <pre>
-   * CmdId: 5889
-   * Obf: ADMCJJMPKGL
-   * </pre>
-   *
    * Protobuf type {@code SetUpAvatarTeamReq}
    */
   public static final class SetUpAvatarTeamReq extends
@@ -99,12 +94,17 @@ public final class SetUpAvatarTeamReqOuterClass {
             case 0:
               done = true;
               break;
+            case 16: {
+
+              curAvatarGuid_ = input.readUInt64();
+              break;
+            }
             case 24: {
 
               teamId_ = input.readUInt32();
               break;
             }
-            case 96: {
+            case 80: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarTeamGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -112,7 +112,7 @@ public final class SetUpAvatarTeamReqOuterClass {
               avatarTeamGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 98: {
+            case 82: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -125,11 +125,6 @@ public final class SetUpAvatarTeamReqOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 104: {
-
-              curAvatarGuid_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +160,10 @@ public final class SetUpAvatarTeamReqOuterClass {
               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 = 12;
+    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 10;
     private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     @java.lang.Override
@@ -177,14 +172,14 @@ public final class SetUpAvatarTeamReqOuterClass {
       return avatarTeamGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
      * @return The count of avatarTeamGuidList.
      */
     public int getAvatarTeamGuidListCount() {
       return avatarTeamGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 10;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
@@ -193,10 +188,10 @@ public final class SetUpAvatarTeamReqOuterClass {
     }
     private int avatarTeamGuidListMemoizedSerializedSize = -1;
 
-    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 13;
+    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 2;
     private long curAvatarGuid_;
     /**
-     * <code>uint64 cur_avatar_guid = 13;</code>
+     * <code>uint64 cur_avatar_guid = 2;</code>
      * @return The curAvatarGuid.
      */
     @java.lang.Override
@@ -230,19 +225,19 @@ public final class SetUpAvatarTeamReqOuterClass {
     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(98);
+        output.writeUInt32NoTag(82);
         output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
         output.writeUInt64NoTag(avatarTeamGuidList_.getLong(i));
       }
-      if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(13, curAvatarGuid_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -252,6 +247,10 @@ public final class SetUpAvatarTeamReqOuterClass {
       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_);
@@ -270,10 +269,6 @@ public final class SetUpAvatarTeamReqOuterClass {
         }
         avatarTeamGuidListMemoizedSerializedSize = dataSize;
       }
-      if (curAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, curAvatarGuid_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -411,11 +406,6 @@ public final class SetUpAvatarTeamReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5889
-     * Obf: ADMCJJMPKGL
-     * </pre>
-     *
      * Protobuf type {@code SetUpAvatarTeamReq}
      */
     public static final class Builder extends
@@ -595,7 +585,7 @@ public final class SetUpAvatarTeamReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @return A list containing the avatarTeamGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -604,14 +594,14 @@ public final class SetUpAvatarTeamReqOuterClass {
                  java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @return The count of avatarTeamGuidList.
        */
       public int getAvatarTeamGuidListCount() {
         return avatarTeamGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @param index The index of the element to return.
        * @return The avatarTeamGuidList at the given index.
        */
@@ -619,7 +609,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return avatarTeamGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @param index The index to set the value at.
        * @param value The avatarTeamGuidList to set.
        * @return This builder for chaining.
@@ -632,7 +622,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @param value The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -643,7 +633,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @param values The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -656,7 +646,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 12;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarTeamGuidList() {
@@ -668,7 +658,7 @@ public final class SetUpAvatarTeamReqOuterClass {
 
       private long curAvatarGuid_ ;
       /**
-       * <code>uint64 cur_avatar_guid = 13;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @return The curAvatarGuid.
        */
       @java.lang.Override
@@ -676,7 +666,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return curAvatarGuid_;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 13;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @param value The curAvatarGuid to set.
        * @return This builder for chaining.
        */
@@ -687,7 +677,7 @@ public final class SetUpAvatarTeamReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 13;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurAvatarGuid() {
@@ -795,8 +785,8 @@ public final class SetUpAvatarTeamReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030SetUpAvatarTeamReq.proto\"]\n\022SetUpAvata" +
-      "rTeamReq\022\035\n\025avatar_team_guid_list\030\014 \003(\004\022" +
-      "\027\n\017cur_avatar_guid\030\r \001(\004\022\017\n\007team_id\030\003 \001(" +
+      "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"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
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 93ed8e8b3..423a15542 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetUpAvatarTeamRspOuterClass.java
@@ -19,46 +19,41 @@ public final class SetUpAvatarTeamRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 team_id = 4;</code>
-     * @return The teamId.
-     */
-    int getTeamId();
-
-    /**
-     * <code>uint64 cur_avatar_guid = 7;</code>
+     * <code>uint64 cur_avatar_guid = 2;</code>
      * @return The curAvatarGuid.
      */
     long getCurAvatarGuid();
 
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>uint32 team_id = 3;</code>
+     * @return The teamId.
+     */
+    int getTeamId();
+
+    /**
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     java.util.List<java.lang.Long> getAvatarTeamGuidListList();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @return The count of avatarTeamGuidList.
      */
     int getAvatarTeamGuidListCount();
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
     long getAvatarTeamGuidList(int index);
 
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 8572
-   * Obf: CPNEKEDGLHM
-   * </pre>
-   *
    * Protobuf type {@code SetUpAvatarTeamRsp}
    */
   public static final class SetUpAvatarTeamRsp extends
@@ -105,7 +100,17 @@ public final class SetUpAvatarTeamRspOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 16: {
+
+              curAvatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 24: {
+
+              teamId_ = input.readUInt32();
+              break;
+            }
+            case 48: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 avatarTeamGuidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -113,7 +118,7 @@ public final class SetUpAvatarTeamRspOuterClass {
               avatarTeamGuidList_.addLong(input.readUInt64());
               break;
             }
-            case 10: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -126,21 +131,11 @@ public final class SetUpAvatarTeamRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 24: {
+            case 64: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 32: {
-
-              teamId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              curAvatarGuid_ = input.readUInt64();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -176,21 +171,10 @@ public final class SetUpAvatarTeamRspOuterClass {
               emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.class, emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.Builder.class);
     }
 
-    public static final int TEAM_ID_FIELD_NUMBER = 4;
-    private int teamId_;
-    /**
-     * <code>uint32 team_id = 4;</code>
-     * @return The teamId.
-     */
-    @java.lang.Override
-    public int getTeamId() {
-      return teamId_;
-    }
-
-    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 7;
+    public static final int CUR_AVATAR_GUID_FIELD_NUMBER = 2;
     private long curAvatarGuid_;
     /**
-     * <code>uint64 cur_avatar_guid = 7;</code>
+     * <code>uint64 cur_avatar_guid = 2;</code>
      * @return The curAvatarGuid.
      */
     @java.lang.Override
@@ -198,10 +182,21 @@ public final class SetUpAvatarTeamRspOuterClass {
       return curAvatarGuid_;
     }
 
-    public static final int AVATAR_TEAM_GUID_LIST_FIELD_NUMBER = 1;
+    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;
     private com.google.protobuf.Internal.LongList avatarTeamGuidList_;
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @return A list containing the avatarTeamGuidList.
      */
     @java.lang.Override
@@ -210,14 +205,14 @@ public final class SetUpAvatarTeamRspOuterClass {
       return avatarTeamGuidList_;
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @return The count of avatarTeamGuidList.
      */
     public int getAvatarTeamGuidListCount() {
       return avatarTeamGuidList_.size();
     }
     /**
-     * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+     * <code>repeated uint64 avatar_team_guid_list = 6;</code>
      * @param index The index of the element to return.
      * @return The avatarTeamGuidList at the given index.
      */
@@ -226,10 +221,10 @@ public final class SetUpAvatarTeamRspOuterClass {
     }
     private int avatarTeamGuidListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 3;
+    public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
-     * <code>int32 retcode = 3;</code>
+     * <code>int32 retcode = 8;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -252,21 +247,21 @@ public final class SetUpAvatarTeamRspOuterClass {
     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(10);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(avatarTeamGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < avatarTeamGuidList_.size(); i++) {
         output.writeUInt64NoTag(avatarTeamGuidList_.getLong(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(3, retcode_);
-      }
-      if (teamId_ != 0) {
-        output.writeUInt32(4, teamId_);
-      }
-      if (curAvatarGuid_ != 0L) {
-        output.writeUInt64(7, curAvatarGuid_);
+        output.writeInt32(8, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -277,6 +272,14 @@ public final class SetUpAvatarTeamRspOuterClass {
       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++) {
@@ -293,15 +296,7 @@ public final class SetUpAvatarTeamRspOuterClass {
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(3, retcode_);
-      }
-      if (teamId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, teamId_);
-      }
-      if (curAvatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(7, curAvatarGuid_);
+          .computeInt32Size(8, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -318,10 +313,10 @@ public final class SetUpAvatarTeamRspOuterClass {
       }
       emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp other = (emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp) obj;
 
-      if (getTeamId()
-          != other.getTeamId()) return false;
       if (getCurAvatarGuid()
           != other.getCurAvatarGuid()) return false;
+      if (getTeamId()
+          != other.getTeamId()) return false;
       if (!getAvatarTeamGuidListList()
           .equals(other.getAvatarTeamGuidListList())) return false;
       if (getRetcode()
@@ -337,11 +332,11 @@ public final class SetUpAvatarTeamRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().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();
       if (getAvatarTeamGuidListCount() > 0) {
         hash = (37 * hash) + AVATAR_TEAM_GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getAvatarTeamGuidListList().hashCode();
@@ -444,11 +439,6 @@ public final class SetUpAvatarTeamRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8572
-     * Obf: CPNEKEDGLHM
-     * </pre>
-     *
      * Protobuf type {@code SetUpAvatarTeamRsp}
      */
     public static final class Builder extends
@@ -486,10 +476,10 @@ public final class SetUpAvatarTeamRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        teamId_ = 0;
-
         curAvatarGuid_ = 0L;
 
+        teamId_ = 0;
+
         avatarTeamGuidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
@@ -521,8 +511,8 @@ public final class SetUpAvatarTeamRspOuterClass {
       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.teamId_ = teamId_;
         result.curAvatarGuid_ = curAvatarGuid_;
+        result.teamId_ = teamId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           avatarTeamGuidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
@@ -577,12 +567,12 @@ public final class SetUpAvatarTeamRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp other) {
         if (other == emu.grasscutter.net.proto.SetUpAvatarTeamRspOuterClass.SetUpAvatarTeamRsp.getDefaultInstance()) return this;
-        if (other.getTeamId() != 0) {
-          setTeamId(other.getTeamId());
-        }
         if (other.getCurAvatarGuid() != 0L) {
           setCurAvatarGuid(other.getCurAvatarGuid());
         }
+        if (other.getTeamId() != 0) {
+          setTeamId(other.getTeamId());
+        }
         if (!other.avatarTeamGuidList_.isEmpty()) {
           if (avatarTeamGuidList_.isEmpty()) {
             avatarTeamGuidList_ = other.avatarTeamGuidList_;
@@ -626,40 +616,9 @@ public final class SetUpAvatarTeamRspOuterClass {
       }
       private int bitField0_;
 
-      private int teamId_ ;
-      /**
-       * <code>uint32 team_id = 4;</code>
-       * @return The teamId.
-       */
-      @java.lang.Override
-      public int getTeamId() {
-        return teamId_;
-      }
-      /**
-       * <code>uint32 team_id = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTeamId() {
-        
-        teamId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long curAvatarGuid_ ;
       /**
-       * <code>uint64 cur_avatar_guid = 7;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @return The curAvatarGuid.
        */
       @java.lang.Override
@@ -667,7 +626,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return curAvatarGuid_;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 7;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @param value The curAvatarGuid to set.
        * @return This builder for chaining.
        */
@@ -678,7 +637,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 cur_avatar_guid = 7;</code>
+       * <code>uint64 cur_avatar_guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurAvatarGuid() {
@@ -688,6 +647,37 @@ public final class SetUpAvatarTeamRspOuterClass {
         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)) {
@@ -696,7 +686,7 @@ public final class SetUpAvatarTeamRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @return A list containing the avatarTeamGuidList.
        */
       public java.util.List<java.lang.Long>
@@ -705,14 +695,14 @@ public final class SetUpAvatarTeamRspOuterClass {
                  java.util.Collections.unmodifiableList(avatarTeamGuidList_) : avatarTeamGuidList_;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @return The count of avatarTeamGuidList.
        */
       public int getAvatarTeamGuidListCount() {
         return avatarTeamGuidList_.size();
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @param index The index of the element to return.
        * @return The avatarTeamGuidList at the given index.
        */
@@ -720,7 +710,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return avatarTeamGuidList_.getLong(index);
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @param index The index to set the value at.
        * @param value The avatarTeamGuidList to set.
        * @return This builder for chaining.
@@ -733,7 +723,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @param value The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -744,7 +734,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @param values The avatarTeamGuidList to add.
        * @return This builder for chaining.
        */
@@ -757,7 +747,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint64 avatar_team_guid_list = 1;</code>
+       * <code>repeated uint64 avatar_team_guid_list = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarTeamGuidList() {
@@ -769,7 +759,7 @@ public final class SetUpAvatarTeamRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -777,7 +767,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -788,7 +778,7 @@ public final class SetUpAvatarTeamRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 3;</code>
+       * <code>int32 retcode = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -865,9 +855,9 @@ public final class SetUpAvatarTeamRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030SetUpAvatarTeamRsp.proto\"n\n\022SetUpAvata" +
-      "rTeamRsp\022\017\n\007team_id\030\004 \001(\r\022\027\n\017cur_avatar_" +
-      "guid\030\007 \001(\004\022\035\n\025avatar_team_guid_list\030\001 \003(" +
-      "\004\022\017\n\007retcode\030\003 \001(\005B\033\n\031emu.grasscutter.ne" +
+      "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" +
       "t.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -879,7 +869,7 @@ public final class SetUpAvatarTeamRspOuterClass {
     internal_static_SetUpAvatarTeamRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetUpAvatarTeamRsp_descriptor,
-        new java.lang.String[] { "TeamId", "CurAvatarGuid", "AvatarTeamGuidList", "Retcode", });
+        new java.lang.String[] { "CurAvatarGuid", "TeamId", "AvatarTeamGuidList", "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 2154148fe..177696b4c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotReqOuterClass.java
@@ -19,57 +19,52 @@ public final class SetWidgetSlotReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 material_id = 15;</code>
-     * @return The materialId.
-     */
-    int getMaterialId();
-
-    /**
-     * <code>.WidgetSlotOp op = 2;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    int getOpValue();
-    /**
-     * <code>.WidgetSlotOp op = 2;</code>
-     * @return The op.
-     */
-    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
-
-    /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the tagList.
      */
     java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> getTagListList();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return The count of tagList.
      */
     int getTagListCount();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <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);
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <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();
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <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.
      */
     int getTagListValue(int index);
+
+    /**
+     * <code>.WidgetSlotOp op = 12;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    int getOpValue();
+    /**
+     * <code>.WidgetSlotOp op = 12;</code>
+     * @return The op.
+     */
+    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
+
+    /**
+     * <code>uint32 material_id = 8;</code>
+     * @return The materialId.
+     */
+    int getMaterialId();
   }
   /**
-   * <pre>
-   * CmdId: 21852
-   * Obf: INPIBEBKEEA
-   * </pre>
-   *
    * Protobuf type {@code SetWidgetSlotReq}
    */
   public static final class SetWidgetSlotReq extends
@@ -82,8 +77,8 @@ public final class SetWidgetSlotReqOuterClass {
       super(builder);
     }
     private SetWidgetSlotReq() {
-      op_ = 0;
       tagList_ = java.util.Collections.emptyList();
+      op_ = 0;
     }
 
     @java.lang.Override
@@ -119,12 +114,6 @@ public final class SetWidgetSlotReqOuterClass {
               break;
             case 16: {
               int rawValue = input.readEnum();
-
-              op_ = rawValue;
-              break;
-            }
-            case 88: {
-              int rawValue = input.readEnum();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 tagList_ = new java.util.ArrayList<java.lang.Integer>();
                 mutable_bitField0_ |= 0x00000001;
@@ -132,7 +121,7 @@ public final class SetWidgetSlotReqOuterClass {
               tagList_.add(rawValue);
               break;
             }
-            case 90: {
+            case 18: {
               int length = input.readRawVarint32();
               int oldLimit = input.pushLimit(length);
               while(input.getBytesUntilLimit() > 0) {
@@ -146,11 +135,17 @@ public final class SetWidgetSlotReqOuterClass {
               input.popLimit(oldLimit);
               break;
             }
-            case 120: {
+            case 64: {
 
               materialId_ = input.readUInt32();
               break;
             }
+            case 96: {
+              int rawValue = input.readEnum();
+
+              op_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -186,37 +181,7 @@ public final class SetWidgetSlotReqOuterClass {
               emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq.class, emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq.Builder.class);
     }
 
-    public static final int MATERIAL_ID_FIELD_NUMBER = 15;
-    private int materialId_;
-    /**
-     * <code>uint32 material_id = 15;</code>
-     * @return The materialId.
-     */
-    @java.lang.Override
-    public int getMaterialId() {
-      return materialId_;
-    }
-
-    public static final int OP_FIELD_NUMBER = 2;
-    private int op_;
-    /**
-     * <code>.WidgetSlotOp op = 2;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    @java.lang.Override public int getOpValue() {
-      return op_;
-    }
-    /**
-     * <code>.WidgetSlotOp op = 2;</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 TAG_LIST_FIELD_NUMBER = 11;
+    public static final int TAG_LIST_FIELD_NUMBER = 2;
     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_ =
@@ -229,7 +194,7 @@ public final class SetWidgetSlotReqOuterClass {
               }
             };
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the tagList.
      */
     @java.lang.Override
@@ -238,7 +203,7 @@ public final class SetWidgetSlotReqOuterClass {
           java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return The count of tagList.
      */
     @java.lang.Override
@@ -246,7 +211,7 @@ public final class SetWidgetSlotReqOuterClass {
       return tagList_.size();
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @param index The index of the element to return.
      * @return The tagList at the given index.
      */
@@ -255,7 +220,7 @@ public final class SetWidgetSlotReqOuterClass {
       return tagList_converter_.convert(tagList_.get(index));
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <code>repeated .WidgetSlotTag tag_list = 2;</code>
      * @return A list containing the enum numeric values on the wire for tagList.
      */
     @java.lang.Override
@@ -264,7 +229,7 @@ public final class SetWidgetSlotReqOuterClass {
       return tagList_;
     }
     /**
-     * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+     * <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.
      */
@@ -274,6 +239,36 @@ public final class SetWidgetSlotReqOuterClass {
     }
     private int tagListMemoizedSerializedSize;
 
+    public static final int OP_FIELD_NUMBER = 12;
+    private int op_;
+    /**
+     * <code>.WidgetSlotOp op = 12;</code>
+     * @return The enum numeric value on the wire for op.
+     */
+    @java.lang.Override public int getOpValue() {
+      return op_;
+    }
+    /**
+     * <code>.WidgetSlotOp op = 12;</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 = 8;
+    private int materialId_;
+    /**
+     * <code>uint32 material_id = 8;</code>
+     * @return The materialId.
+     */
+    @java.lang.Override
+    public int getMaterialId() {
+      return materialId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -289,18 +284,18 @@ public final class SetWidgetSlotReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        output.writeEnum(2, op_);
-      }
       if (getTagListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(18);
         output.writeUInt32NoTag(tagListMemoizedSerializedSize);
       }
       for (int i = 0; i < tagList_.size(); i++) {
         output.writeEnumNoTag(tagList_.get(i));
       }
       if (materialId_ != 0) {
-        output.writeUInt32(15, materialId_);
+        output.writeUInt32(8, materialId_);
+      }
+      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
+        output.writeEnum(12, op_);
       }
       unknownFields.writeTo(output);
     }
@@ -311,10 +306,6 @@ public final class SetWidgetSlotReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(2, op_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < tagList_.size(); i++) {
@@ -329,7 +320,11 @@ public final class SetWidgetSlotReqOuterClass {
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, materialId_);
+          .computeUInt32Size(8, materialId_);
+      }
+      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(12, op_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,10 +341,10 @@ public final class SetWidgetSlotReqOuterClass {
       }
       emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq other = (emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq) obj;
 
+      if (!tagList_.equals(other.tagList_)) return false;
+      if (op_ != other.op_) return false;
       if (getMaterialId()
           != other.getMaterialId()) return false;
-      if (op_ != other.op_) return false;
-      if (!tagList_.equals(other.tagList_)) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -361,14 +356,14 @@ public final class SetWidgetSlotReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMaterialId();
-      hash = (37 * hash) + OP_FIELD_NUMBER;
-      hash = (53 * hash) + op_;
       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 = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -465,11 +460,6 @@ public final class SetWidgetSlotReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21852
-     * Obf: INPIBEBKEEA
-     * </pre>
-     *
      * Protobuf type {@code SetWidgetSlotReq}
      */
     public static final class Builder extends
@@ -507,12 +497,12 @@ public final class SetWidgetSlotReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        materialId_ = 0;
-
-        op_ = 0;
-
         tagList_ = java.util.Collections.emptyList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        op_ = 0;
+
+        materialId_ = 0;
+
         return this;
       }
 
@@ -540,13 +530,13 @@ public final class SetWidgetSlotReqOuterClass {
       public emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq buildPartial() {
         emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq result = new emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq(this);
         int from_bitField0_ = bitField0_;
-        result.materialId_ = materialId_;
-        result.op_ = op_;
         if (((bitField0_ & 0x00000001) != 0)) {
           tagList_ = java.util.Collections.unmodifiableList(tagList_);
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.tagList_ = tagList_;
+        result.op_ = op_;
+        result.materialId_ = materialId_;
         onBuilt();
         return result;
       }
@@ -595,12 +585,6 @@ public final class SetWidgetSlotReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq other) {
         if (other == emu.grasscutter.net.proto.SetWidgetSlotReqOuterClass.SetWidgetSlotReq.getDefaultInstance()) return this;
-        if (other.getMaterialId() != 0) {
-          setMaterialId(other.getMaterialId());
-        }
-        if (other.op_ != 0) {
-          setOpValue(other.getOpValue());
-        }
         if (!other.tagList_.isEmpty()) {
           if (tagList_.isEmpty()) {
             tagList_ = other.tagList_;
@@ -611,6 +595,12 @@ public final class SetWidgetSlotReqOuterClass {
           }
           onChanged();
         }
+        if (other.op_ != 0) {
+          setOpValue(other.getOpValue());
+        }
+        if (other.getMaterialId() != 0) {
+          setMaterialId(other.getMaterialId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -641,91 +631,6 @@ public final class SetWidgetSlotReqOuterClass {
       }
       private int bitField0_;
 
-      private int materialId_ ;
-      /**
-       * <code>uint32 material_id = 15;</code>
-       * @return The materialId.
-       */
-      @java.lang.Override
-      public int getMaterialId() {
-        return materialId_;
-      }
-      /**
-       * <code>uint32 material_id = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaterialId() {
-        
-        materialId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int op_ = 0;
-      /**
-       * <code>.WidgetSlotOp op = 2;</code>
-       * @return The enum numeric value on the wire for op.
-       */
-      @java.lang.Override public int getOpValue() {
-        return op_;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 2;</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 = 2;</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 = 2;</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 = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOp() {
-        
-        op_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<java.lang.Integer> tagList_ =
         java.util.Collections.emptyList();
       private void ensureTagListIsMutable() {
@@ -735,7 +640,7 @@ public final class SetWidgetSlotReqOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return A list containing the tagList.
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag> getTagListList() {
@@ -743,14 +648,14 @@ public final class SetWidgetSlotReqOuterClass {
             java.lang.Integer, emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag>(tagList_, tagList_converter_);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return The count of tagList.
        */
       public int getTagListCount() {
         return tagList_.size();
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index of the element to return.
        * @return The tagList at the given index.
        */
@@ -758,7 +663,7 @@ public final class SetWidgetSlotReqOuterClass {
         return tagList_converter_.convert(tagList_.get(index));
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param index The index to set the value at.
        * @param value The tagList to set.
        * @return This builder for chaining.
@@ -774,7 +679,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param value The tagList to add.
        * @return This builder for chaining.
        */
@@ -788,7 +693,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @param values The tagList to add.
        * @return This builder for chaining.
        */
@@ -802,7 +707,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearTagList() {
@@ -812,7 +717,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <code>repeated .WidgetSlotTag tag_list = 2;</code>
        * @return A list containing the enum numeric values on the wire for tagList.
        */
       public java.util.List<java.lang.Integer>
@@ -820,7 +725,7 @@ public final class SetWidgetSlotReqOuterClass {
         return java.util.Collections.unmodifiableList(tagList_);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <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.
        */
@@ -828,7 +733,7 @@ public final class SetWidgetSlotReqOuterClass {
         return tagList_.get(index);
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <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.
        * @return This builder for chaining.
@@ -841,7 +746,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <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.
        */
@@ -852,7 +757,7 @@ public final class SetWidgetSlotReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetSlotTag tag_list = 11;</code>
+       * <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.
        */
@@ -865,6 +770,91 @@ public final class SetWidgetSlotReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int op_ = 0;
+      /**
+       * <code>.WidgetSlotOp op = 12;</code>
+       * @return The enum numeric value on the wire for op.
+       */
+      @java.lang.Override public int getOpValue() {
+        return op_;
+      }
+      /**
+       * <code>.WidgetSlotOp op = 12;</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 = 12;</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 = 12;</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 = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOp() {
+        
+        op_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int materialId_ ;
+      /**
+       * <code>uint32 material_id = 8;</code>
+       * @return The materialId.
+       */
+      @java.lang.Override
+      public int getMaterialId() {
+        return materialId_;
+      }
+      /**
+       * <code>uint32 material_id = 8;</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 = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaterialId() {
+        
+        materialId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -932,27 +922,27 @@ public final class SetWidgetSlotReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026SetWidgetSlotReq.proto\032\022WidgetSlotOp.p" +
-      "roto\032\023WidgetSlotTag.proto\"d\n\020SetWidgetSl" +
-      "otReq\022\023\n\013material_id\030\017 \001(\r\022\031\n\002op\030\002 \001(\0162\r" +
-      ".WidgetSlotOp\022 \n\010tag_list\030\013 \003(\0162\016.Widget" +
-      "SlotTagB\033\n\031emu.grasscutter.net.protob\006pr" +
+      "\n\026SetWidgetSlotReq.proto\032\023WidgetSlotTag." +
+      "proto\032\022WidgetSlotOp.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" +
       "oto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor(),
         });
     internal_static_SetWidgetSlotReq_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SetWidgetSlotReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetWidgetSlotReq_descriptor,
-        new java.lang.String[] { "MaterialId", "Op", "TagList", });
-    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor();
+        new java.lang.String[] { "TagList", "Op", "MaterialId", });
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 2c787bb78..5e40450dd 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SetWidgetSlotRspOuterClass.java
@@ -19,11 +19,28 @@ public final class SetWidgetSlotRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 11;</code>
+     * <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>
      * @return A list containing the tagList.
@@ -52,30 +69,8 @@ public final class SetWidgetSlotRspOuterClass {
      * @return The enum numeric value on the wire of tagList at the given index.
      */
     int getTagListValue(int index);
-
-    /**
-     * <code>uint32 material_id = 4;</code>
-     * @return The materialId.
-     */
-    int getMaterialId();
-
-    /**
-     * <code>.WidgetSlotOp op = 3;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    int getOpValue();
-    /**
-     * <code>.WidgetSlotOp op = 3;</code>
-     * @return The op.
-     */
-    emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
   }
   /**
-   * <pre>
-   * CmdId: 21258
-   * Obf: LOLIHGGKHCF
-   * </pre>
-   *
    * Protobuf type {@code SetWidgetSlotRsp}
    */
   public static final class SetWidgetSlotRsp extends
@@ -88,8 +83,8 @@ public final class SetWidgetSlotRspOuterClass {
       super(builder);
     }
     private SetWidgetSlotRsp() {
-      tagList_ = java.util.Collections.emptyList();
       op_ = 0;
+      tagList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -123,22 +118,22 @@ public final class SetWidgetSlotRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 8: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 48: {
               int rawValue = input.readEnum();
 
               op_ = rawValue;
               break;
             }
-            case 32: {
+            case 80: {
 
               materialId_ = input.readUInt32();
               break;
             }
-            case 88: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
             case 96: {
               int rawValue = input.readEnum();
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
@@ -197,10 +192,10 @@ public final class SetWidgetSlotRspOuterClass {
               emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.class, emu.grasscutter.net.proto.SetWidgetSlotRspOuterClass.SetWidgetSlotRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
+    public static final int RETCODE_FIELD_NUMBER = 1;
     private int retcode_;
     /**
-     * <code>int32 retcode = 11;</code>
+     * <code>int32 retcode = 1;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -208,6 +203,36 @@ public final class SetWidgetSlotRspOuterClass {
       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;
     private java.util.List<java.lang.Integer> tagList_;
     private static final com.google.protobuf.Internal.ListAdapter.Converter<
@@ -266,36 +291,6 @@ public final class SetWidgetSlotRspOuterClass {
     }
     private int tagListMemoizedSerializedSize;
 
-    public static final int MATERIAL_ID_FIELD_NUMBER = 4;
-    private int materialId_;
-    /**
-     * <code>uint32 material_id = 4;</code>
-     * @return The materialId.
-     */
-    @java.lang.Override
-    public int getMaterialId() {
-      return materialId_;
-    }
-
-    public static final int OP_FIELD_NUMBER = 3;
-    private int op_;
-    /**
-     * <code>.WidgetSlotOp op = 3;</code>
-     * @return The enum numeric value on the wire for op.
-     */
-    @java.lang.Override public int getOpValue() {
-      return op_;
-    }
-    /**
-     * <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;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -311,14 +306,14 @@ public final class SetWidgetSlotRspOuterClass {
     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(3, op_);
+        output.writeEnum(6, op_);
       }
       if (materialId_ != 0) {
-        output.writeUInt32(4, materialId_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeUInt32(10, materialId_);
       }
       if (getTagListList().size() > 0) {
         output.writeUInt32NoTag(98);
@@ -336,17 +331,17 @@ public final class SetWidgetSlotRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(1, retcode_);
+      }
       if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(3, op_);
+          .computeEnumSize(6, op_);
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, materialId_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeUInt32Size(10, materialId_);
       }
       {
         int dataSize = 0;
@@ -377,10 +372,10 @@ public final class SetWidgetSlotRspOuterClass {
 
       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 (op_ != other.op_) return false;
+      if (!tagList_.equals(other.tagList_)) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -394,14 +389,14 @@ public final class SetWidgetSlotRspOuterClass {
       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) + MATERIAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMaterialId();
-      hash = (37 * hash) + OP_FIELD_NUMBER;
-      hash = (53 * hash) + op_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -498,11 +493,6 @@ public final class SetWidgetSlotRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21258
-     * Obf: LOLIHGGKHCF
-     * </pre>
-     *
      * Protobuf type {@code SetWidgetSlotRsp}
      */
     public static final class Builder extends
@@ -542,12 +532,12 @@ public final class SetWidgetSlotRspOuterClass {
         super.clear();
         retcode_ = 0;
 
-        tagList_ = java.util.Collections.emptyList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        materialId_ = 0;
-
         op_ = 0;
 
+        materialId_ = 0;
+
+        tagList_ = java.util.Collections.emptyList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -576,13 +566,13 @@ public final class SetWidgetSlotRspOuterClass {
         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.materialId_ = materialId_;
-        result.op_ = op_;
         onBuilt();
         return result;
       }
@@ -634,6 +624,12 @@ public final class SetWidgetSlotRspOuterClass {
         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_;
@@ -644,12 +640,6 @@ public final class SetWidgetSlotRspOuterClass {
           }
           onChanged();
         }
-        if (other.getMaterialId() != 0) {
-          setMaterialId(other.getMaterialId());
-        }
-        if (other.op_ != 0) {
-          setOpValue(other.getOpValue());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -682,7 +672,7 @@ public final class SetWidgetSlotRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 1;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -690,7 +680,7 @@ public final class SetWidgetSlotRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 1;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -701,7 +691,7 @@ public final class SetWidgetSlotRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -711,6 +701,91 @@ public final class SetWidgetSlotRspOuterClass {
         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() {
@@ -850,91 +925,6 @@ public final class SetWidgetSlotRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int materialId_ ;
-      /**
-       * <code>uint32 material_id = 4;</code>
-       * @return The materialId.
-       */
-      @java.lang.Override
-      public int getMaterialId() {
-        return materialId_;
-      }
-      /**
-       * <code>uint32 material_id = 4;</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 = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaterialId() {
-        
-        materialId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int op_ = 0;
-      /**
-       * <code>.WidgetSlotOp op = 3;</code>
-       * @return The enum numeric value on the wire for op.
-       */
-      @java.lang.Override public int getOpValue() {
-        return op_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>.WidgetSlotOp op = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOp() {
-        
-        op_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1002,27 +992,27 @@ public final class SetWidgetSlotRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\026SetWidgetSlotRsp.proto\032\023WidgetSlotTag." +
-      "proto\032\022WidgetSlotOp.proto\"u\n\020SetWidgetSl" +
-      "otRsp\022\017\n\007retcode\030\013 \001(\005\022 \n\010tag_list\030\014 \003(\016" +
-      "2\016.WidgetSlotTag\022\023\n\013material_id\030\004 \001(\r\022\031\n" +
-      "\002op\030\003 \001(\0162\r.WidgetSlotOpB\033\n\031emu.grasscut" +
+      "\n\026SetWidgetSlotRsp.proto\032\022WidgetSlotOp.p" +
+      "roto\032\023WidgetSlotTag.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" +
       "ter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor(),
         });
     internal_static_SetWidgetSlotRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_SetWidgetSlotRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SetWidgetSlotRsp_descriptor,
-        new java.lang.String[] { "Retcode", "TagList", "MaterialId", "Op", });
-    emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
+        new java.lang.String[] { "Retcode", "Op", "MaterialId", "TagList", });
     emu.grasscutter.net.proto.WidgetSlotOpOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShapeTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShapeTypeOuterClass.java
new file mode 100644
index 000000000..c1ed9564e
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShapeTypeOuterClass.java
@@ -0,0 +1,145 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: ShapeType.proto
+
+package emu.grasscutter.net.proto;
+
+public final class ShapeTypeOuterClass {
+  private ShapeTypeOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  /**
+   * Protobuf enum {@code ShapeType}
+   */
+  public enum ShapeType
+      implements com.google.protobuf.ProtocolMessageEnum {
+    /**
+     * <code>OBSTACLE_SHAPE_CAPSULE = 0;</code>
+     */
+    OBSTACLE_SHAPE_CAPSULE(0),
+    /**
+     * <code>OBSTACLE_SHAPE_BOX = 1;</code>
+     */
+    OBSTACLE_SHAPE_BOX(1),
+    UNRECOGNIZED(-1),
+    ;
+
+    /**
+     * <code>OBSTACLE_SHAPE_CAPSULE = 0;</code>
+     */
+    public static final int OBSTACLE_SHAPE_CAPSULE_VALUE = 0;
+    /**
+     * <code>OBSTACLE_SHAPE_BOX = 1;</code>
+     */
+    public static final int OBSTACLE_SHAPE_BOX_VALUE = 1;
+
+
+    public final int getNumber() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalArgumentException(
+            "Can't get the number of an unknown enum value.");
+      }
+      return value;
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     * @deprecated Use {@link #forNumber(int)} instead.
+     */
+    @java.lang.Deprecated
+    public static ShapeType valueOf(int value) {
+      return forNumber(value);
+    }
+
+    /**
+     * @param value The numeric wire value of the corresponding enum entry.
+     * @return The enum associated with the given numeric wire value.
+     */
+    public static ShapeType forNumber(int value) {
+      switch (value) {
+        case 0: return OBSTACLE_SHAPE_CAPSULE;
+        case 1: return OBSTACLE_SHAPE_BOX;
+        default: return null;
+      }
+    }
+
+    public static com.google.protobuf.Internal.EnumLiteMap<ShapeType>
+        internalGetValueMap() {
+      return internalValueMap;
+    }
+    private static final com.google.protobuf.Internal.EnumLiteMap<
+        ShapeType> internalValueMap =
+          new com.google.protobuf.Internal.EnumLiteMap<ShapeType>() {
+            public ShapeType findValueByNumber(int number) {
+              return ShapeType.forNumber(number);
+            }
+          };
+
+    public final com.google.protobuf.Descriptors.EnumValueDescriptor
+        getValueDescriptor() {
+      if (this == UNRECOGNIZED) {
+        throw new java.lang.IllegalStateException(
+            "Can't get the descriptor of an unrecognized enum value.");
+      }
+      return getDescriptor().getValues().get(ordinal());
+    }
+    public final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptorForType() {
+      return getDescriptor();
+    }
+    public static final com.google.protobuf.Descriptors.EnumDescriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.ShapeTypeOuterClass.getDescriptor().getEnumTypes().get(0);
+    }
+
+    private static final ShapeType[] VALUES = values();
+
+    public static ShapeType valueOf(
+        com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+      if (desc.getType() != getDescriptor()) {
+        throw new java.lang.IllegalArgumentException(
+          "EnumValueDescriptor is not for this type.");
+      }
+      if (desc.getIndex() == -1) {
+        return UNRECOGNIZED;
+      }
+      return VALUES[desc.getIndex()];
+    }
+
+    private final int value;
+
+    private ShapeType(int value) {
+      this.value = value;
+    }
+
+    // @@protoc_insertion_point(enum_scope:ShapeType)
+  }
+
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\017ShapeType.proto*?\n\tShapeType\022\032\n\026OBSTAC" +
+      "LE_SHAPE_CAPSULE\020\000\022\026\n\022OBSTACLE_SHAPE_BOX" +
+      "\020\001B\033\n\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopCardProductOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopCardProductOuterClass.java
index 3a7dc18cc..2ffe485c3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopCardProductOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopCardProductOuterClass.java
@@ -73,25 +73,23 @@ public final class ShopCardProductOuterClass {
     int getCardProductType();
 
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      * @return Whether the resinCard field is set.
      */
     boolean hasResinCard();
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      * @return The resinCard.
      */
-    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getResinCard();
+    emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getResinCard();
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      */
-    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder getResinCardOrBuilder();
+    emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder getResinCardOrBuilder();
+
+    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.HLAOFKPENGICase getHLAOFKPENGICase();
   }
   /**
-   * <pre>
-   * Obf: LJJFPCDLGIJ
-   * </pre>
-   *
    * Protobuf type {@code ShopCardProduct}
    */
   public static final class ShopCardProduct extends
@@ -128,7 +126,6 @@ public final class ShopCardProductOuterClass {
       if (extensionRegistry == null) {
         throw new java.lang.NullPointerException();
       }
-      int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -177,16 +174,17 @@ public final class ShopCardProductOuterClass {
               break;
             }
             case 810: {
-              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder subBuilder = null;
-              if (((bitField0_ & 0x00000001) != 0)) {
-                subBuilder = resinCard_.toBuilder();
+              emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder subBuilder = null;
+              if (hLAOFKPENGICase_ == 101) {
+                subBuilder = ((emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_).toBuilder();
               }
-              resinCard_ = input.readMessage(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.parser(), extensionRegistry);
+              hLAOFKPENGI_ =
+                  input.readMessage(emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.parser(), extensionRegistry);
               if (subBuilder != null) {
-                subBuilder.mergeFrom(resinCard_);
-                resinCard_ = subBuilder.buildPartial();
+                subBuilder.mergeFrom((emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_);
+                hLAOFKPENGI_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00000001;
+              hLAOFKPENGICase_ = 101;
               break;
             }
             default: {
@@ -221,1180 +219,45 @@ public final class ShopCardProductOuterClass {
               emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.class, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder.class);
     }
 
-    public interface ResinCardOrBuilder extends
-        // @@protoc_insertion_point(interface_extends:ShopCardProduct.ResinCard)
-        com.google.protobuf.MessageOrBuilder {
-
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-          getBaseItemListList();
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index);
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      int getBaseItemListCount();
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getBaseItemListOrBuilderList();
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
-          int index);
-
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-          getPerDayItemListList();
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index);
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      int getPerDayItemListCount();
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getPerDayItemListOrBuilderList();
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
-          int index);
-    }
-    /**
-     * <pre>
-     * Obf: JIBALNEIBIK
-     * </pre>
-     *
-     * Protobuf type {@code ShopCardProduct.ResinCard}
-     */
-    public static final class ResinCard extends
-        com.google.protobuf.GeneratedMessageV3 implements
-        // @@protoc_insertion_point(message_implements:ShopCardProduct.ResinCard)
-        ResinCardOrBuilder {
-    private static final long serialVersionUID = 0L;
-      // Use ResinCard.newBuilder() to construct.
-      private ResinCard(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
-        super(builder);
-      }
-      private ResinCard() {
-        baseItemList_ = java.util.Collections.emptyList();
-        perDayItemList_ = java.util.Collections.emptyList();
-      }
-
-      @java.lang.Override
-      @SuppressWarnings({"unused"})
-      protected java.lang.Object newInstance(
-          UnusedPrivateParameter unused) {
-        return new ResinCard();
-      }
-
-      @java.lang.Override
-      public final com.google.protobuf.UnknownFieldSet
-      getUnknownFields() {
-        return this.unknownFields;
-      }
-      private ResinCard(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
-        int mutable_bitField0_ = 0;
-        com.google.protobuf.UnknownFieldSet.Builder unknownFields =
-            com.google.protobuf.UnknownFieldSet.newBuilder();
-        try {
-          boolean done = false;
-          while (!done) {
-            int tag = input.readTag();
-            switch (tag) {
-              case 0:
-                done = true;
-                break;
-              case 10: {
-                if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                  baseItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                  mutable_bitField0_ |= 0x00000001;
-                }
-                baseItemList_.add(
-                    input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-                break;
-              }
-              case 18: {
-                if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                  perDayItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                  mutable_bitField0_ |= 0x00000002;
-                }
-                perDayItemList_.add(
-                    input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-                break;
-              }
-              default: {
-                if (!parseUnknownField(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
-            }
-          }
-        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-          throw e.setUnfinishedMessage(this);
-        } catch (java.io.IOException e) {
-          throw new com.google.protobuf.InvalidProtocolBufferException(
-              e).setUnfinishedMessage(this);
-        } finally {
-          if (((mutable_bitField0_ & 0x00000001) != 0)) {
-            baseItemList_ = java.util.Collections.unmodifiableList(baseItemList_);
-          }
-          if (((mutable_bitField0_ & 0x00000002) != 0)) {
-            perDayItemList_ = java.util.Collections.unmodifiableList(perDayItemList_);
-          }
-          this.unknownFields = unknownFields.build();
-          makeExtensionsImmutable();
-        }
-      }
-      public static final com.google.protobuf.Descriptors.Descriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.ShopCardProductOuterClass.internal_static_ShopCardProduct_ResinCard_descriptor;
-      }
-
-      @java.lang.Override
-      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-          internalGetFieldAccessorTable() {
-        return emu.grasscutter.net.proto.ShopCardProductOuterClass.internal_static_ShopCardProduct_ResinCard_fieldAccessorTable
-            .ensureFieldAccessorsInitialized(
-                emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.class, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder.class);
-      }
-
-      public static final int BASE_ITEM_LIST_FIELD_NUMBER = 1;
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> baseItemList_;
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      @java.lang.Override
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getBaseItemListList() {
-        return baseItemList_;
+    private int hLAOFKPENGICase_ = 0;
+    private java.lang.Object hLAOFKPENGI_;
+    public enum HLAOFKPENGICase
+        implements com.google.protobuf.Internal.EnumLite,
+            com.google.protobuf.AbstractMessage.InternalOneOfEnum {
+      RESIN_CARD(101),
+      HLAOFKPENGI_NOT_SET(0);
+      private final int value;
+      private HLAOFKPENGICase(int value) {
+        this.value = value;
       }
       /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
+       * @param value The number of the enum to look for.
+       * @return The enum associated with the given number.
+       * @deprecated Use {@link #forNumber(int)} instead.
        */
-      @java.lang.Override
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getBaseItemListOrBuilderList() {
-        return baseItemList_;
-      }
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      @java.lang.Override
-      public int getBaseItemListCount() {
-        return baseItemList_.size();
-      }
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index) {
-        return baseItemList_.get(index);
-      }
-      /**
-       * <code>repeated .ItemParam base_item_list = 1;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
-          int index) {
-        return baseItemList_.get(index);
+      @java.lang.Deprecated
+      public static HLAOFKPENGICase valueOf(int value) {
+        return forNumber(value);
       }
 
-      public static final int PER_DAY_ITEM_LIST_FIELD_NUMBER = 2;
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> perDayItemList_;
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      @java.lang.Override
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getPerDayItemListList() {
-        return perDayItemList_;
+      public static HLAOFKPENGICase forNumber(int value) {
+        switch (value) {
+          case 101: return RESIN_CARD;
+          case 0: return HLAOFKPENGI_NOT_SET;
+          default: return null;
+        }
       }
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      @java.lang.Override
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getPerDayItemListOrBuilderList() {
-        return perDayItemList_;
-      }
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      @java.lang.Override
-      public int getPerDayItemListCount() {
-        return perDayItemList_.size();
-      }
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index) {
-        return perDayItemList_.get(index);
-      }
-      /**
-       * <code>repeated .ItemParam per_day_item_list = 2;</code>
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
-          int index) {
-        return perDayItemList_.get(index);
-      }
-
-      private byte memoizedIsInitialized = -1;
-      @java.lang.Override
-      public final boolean isInitialized() {
-        byte isInitialized = memoizedIsInitialized;
-        if (isInitialized == 1) return true;
-        if (isInitialized == 0) return false;
-
-        memoizedIsInitialized = 1;
-        return true;
-      }
-
-      @java.lang.Override
-      public void writeTo(com.google.protobuf.CodedOutputStream output)
-                          throws java.io.IOException {
-        for (int i = 0; i < baseItemList_.size(); i++) {
-          output.writeMessage(1, baseItemList_.get(i));
-        }
-        for (int i = 0; i < perDayItemList_.size(); i++) {
-          output.writeMessage(2, perDayItemList_.get(i));
-        }
-        unknownFields.writeTo(output);
-      }
-
-      @java.lang.Override
-      public int getSerializedSize() {
-        int size = memoizedSize;
-        if (size != -1) return size;
-
-        size = 0;
-        for (int i = 0; i < baseItemList_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(1, baseItemList_.get(i));
-        }
-        for (int i = 0; i < perDayItemList_.size(); i++) {
-          size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(2, perDayItemList_.get(i));
-        }
-        size += unknownFields.getSerializedSize();
-        memoizedSize = size;
-        return size;
-      }
-
-      @java.lang.Override
-      public boolean equals(final java.lang.Object obj) {
-        if (obj == this) {
-         return true;
-        }
-        if (!(obj instanceof emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard)) {
-          return super.equals(obj);
-        }
-        emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard other = (emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard) obj;
-
-        if (!getBaseItemListList()
-            .equals(other.getBaseItemListList())) return false;
-        if (!getPerDayItemListList()
-            .equals(other.getPerDayItemListList())) return false;
-        if (!unknownFields.equals(other.unknownFields)) return false;
-        return true;
-      }
-
-      @java.lang.Override
-      public int hashCode() {
-        if (memoizedHashCode != 0) {
-          return memoizedHashCode;
-        }
-        int hash = 41;
-        hash = (19 * hash) + getDescriptor().hashCode();
-        if (getBaseItemListCount() > 0) {
-          hash = (37 * hash) + BASE_ITEM_LIST_FIELD_NUMBER;
-          hash = (53 * hash) + getBaseItemListList().hashCode();
-        }
-        if (getPerDayItemListCount() > 0) {
-          hash = (37 * hash) + PER_DAY_ITEM_LIST_FIELD_NUMBER;
-          hash = (53 * hash) + getPerDayItemListList().hashCode();
-        }
-        hash = (29 * hash) + unknownFields.hashCode();
-        memoizedHashCode = hash;
-        return hash;
-      }
-
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          java.nio.ByteBuffer data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          java.nio.ByteBuffer data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          com.google.protobuf.ByteString data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          com.google.protobuf.ByteString data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(byte[] data)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          byte[] data,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws com.google.protobuf.InvalidProtocolBufferException {
-        return PARSER.parseFrom(data, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseDelimitedFrom(java.io.InputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseDelimitedFrom(
-          java.io.InputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          com.google.protobuf.CodedInputStream input)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input);
-      }
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard parseFrom(
-          com.google.protobuf.CodedInputStream input,
-          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-          throws java.io.IOException {
-        return com.google.protobuf.GeneratedMessageV3
-            .parseWithIOException(PARSER, input, extensionRegistry);
-      }
-
-      @java.lang.Override
-      public Builder newBuilderForType() { return newBuilder(); }
-      public static Builder newBuilder() {
-        return DEFAULT_INSTANCE.toBuilder();
-      }
-      public static Builder newBuilder(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard prototype) {
-        return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
-      }
-      @java.lang.Override
-      public Builder toBuilder() {
-        return this == DEFAULT_INSTANCE
-            ? new Builder() : new Builder().mergeFrom(this);
-      }
-
-      @java.lang.Override
-      protected Builder newBuilderForType(
-          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-        Builder builder = new Builder(parent);
-        return builder;
-      }
-      /**
-       * <pre>
-       * Obf: JIBALNEIBIK
-       * </pre>
-       *
-       * Protobuf type {@code ShopCardProduct.ResinCard}
-       */
-      public static final class Builder extends
-          com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
-          // @@protoc_insertion_point(builder_implements:ShopCardProduct.ResinCard)
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder {
-        public static final com.google.protobuf.Descriptors.Descriptor
-            getDescriptor() {
-          return emu.grasscutter.net.proto.ShopCardProductOuterClass.internal_static_ShopCardProduct_ResinCard_descriptor;
-        }
-
-        @java.lang.Override
-        protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-            internalGetFieldAccessorTable() {
-          return emu.grasscutter.net.proto.ShopCardProductOuterClass.internal_static_ShopCardProduct_ResinCard_fieldAccessorTable
-              .ensureFieldAccessorsInitialized(
-                  emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.class, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder.class);
-        }
-
-        // Construct using emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.newBuilder()
-        private Builder() {
-          maybeForceBuilderInitialization();
-        }
-
-        private Builder(
-            com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
-          super(parent);
-          maybeForceBuilderInitialization();
-        }
-        private void maybeForceBuilderInitialization() {
-          if (com.google.protobuf.GeneratedMessageV3
-                  .alwaysUseFieldBuilders) {
-            getBaseItemListFieldBuilder();
-            getPerDayItemListFieldBuilder();
-          }
-        }
-        @java.lang.Override
-        public Builder clear() {
-          super.clear();
-          if (baseItemListBuilder_ == null) {
-            baseItemList_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            baseItemListBuilder_.clear();
-          }
-          if (perDayItemListBuilder_ == null) {
-            perDayItemList_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            perDayItemListBuilder_.clear();
-          }
-          return this;
-        }
-
-        @java.lang.Override
-        public com.google.protobuf.Descriptors.Descriptor
-            getDescriptorForType() {
-          return emu.grasscutter.net.proto.ShopCardProductOuterClass.internal_static_ShopCardProduct_ResinCard_descriptor;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getDefaultInstanceForType() {
-          return emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance();
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard build() {
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard result = buildPartial();
-          if (!result.isInitialized()) {
-            throw newUninitializedMessageException(result);
-          }
-          return result;
-        }
-
-        @java.lang.Override
-        public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard buildPartial() {
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard result = new emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard(this);
-          int from_bitField0_ = bitField0_;
-          if (baseItemListBuilder_ == null) {
-            if (((bitField0_ & 0x00000001) != 0)) {
-              baseItemList_ = java.util.Collections.unmodifiableList(baseItemList_);
-              bitField0_ = (bitField0_ & ~0x00000001);
-            }
-            result.baseItemList_ = baseItemList_;
-          } else {
-            result.baseItemList_ = baseItemListBuilder_.build();
-          }
-          if (perDayItemListBuilder_ == null) {
-            if (((bitField0_ & 0x00000002) != 0)) {
-              perDayItemList_ = java.util.Collections.unmodifiableList(perDayItemList_);
-              bitField0_ = (bitField0_ & ~0x00000002);
-            }
-            result.perDayItemList_ = perDayItemList_;
-          } else {
-            result.perDayItemList_ = perDayItemListBuilder_.build();
-          }
-          onBuilt();
-          return result;
-        }
-
-        @java.lang.Override
-        public Builder clone() {
-          return super.clone();
-        }
-        @java.lang.Override
-        public Builder setField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.setField(field, value);
-        }
-        @java.lang.Override
-        public Builder clearField(
-            com.google.protobuf.Descriptors.FieldDescriptor field) {
-          return super.clearField(field);
-        }
-        @java.lang.Override
-        public Builder clearOneof(
-            com.google.protobuf.Descriptors.OneofDescriptor oneof) {
-          return super.clearOneof(oneof);
-        }
-        @java.lang.Override
-        public Builder setRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            int index, java.lang.Object value) {
-          return super.setRepeatedField(field, index, value);
-        }
-        @java.lang.Override
-        public Builder addRepeatedField(
-            com.google.protobuf.Descriptors.FieldDescriptor field,
-            java.lang.Object value) {
-          return super.addRepeatedField(field, value);
-        }
-        @java.lang.Override
-        public Builder mergeFrom(com.google.protobuf.Message other) {
-          if (other instanceof emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard) {
-            return mergeFrom((emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard)other);
-          } else {
-            super.mergeFrom(other);
-            return this;
-          }
-        }
-
-        public Builder mergeFrom(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard other) {
-          if (other == emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance()) return this;
-          if (baseItemListBuilder_ == null) {
-            if (!other.baseItemList_.isEmpty()) {
-              if (baseItemList_.isEmpty()) {
-                baseItemList_ = other.baseItemList_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-              } else {
-                ensureBaseItemListIsMutable();
-                baseItemList_.addAll(other.baseItemList_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.baseItemList_.isEmpty()) {
-              if (baseItemListBuilder_.isEmpty()) {
-                baseItemListBuilder_.dispose();
-                baseItemListBuilder_ = null;
-                baseItemList_ = other.baseItemList_;
-                bitField0_ = (bitField0_ & ~0x00000001);
-                baseItemListBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getBaseItemListFieldBuilder() : null;
-              } else {
-                baseItemListBuilder_.addAllMessages(other.baseItemList_);
-              }
-            }
-          }
-          if (perDayItemListBuilder_ == null) {
-            if (!other.perDayItemList_.isEmpty()) {
-              if (perDayItemList_.isEmpty()) {
-                perDayItemList_ = other.perDayItemList_;
-                bitField0_ = (bitField0_ & ~0x00000002);
-              } else {
-                ensurePerDayItemListIsMutable();
-                perDayItemList_.addAll(other.perDayItemList_);
-              }
-              onChanged();
-            }
-          } else {
-            if (!other.perDayItemList_.isEmpty()) {
-              if (perDayItemListBuilder_.isEmpty()) {
-                perDayItemListBuilder_.dispose();
-                perDayItemListBuilder_ = null;
-                perDayItemList_ = other.perDayItemList_;
-                bitField0_ = (bitField0_ & ~0x00000002);
-                perDayItemListBuilder_ = 
-                  com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                     getPerDayItemListFieldBuilder() : null;
-              } else {
-                perDayItemListBuilder_.addAllMessages(other.perDayItemList_);
-              }
-            }
-          }
-          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.ShopCardProductOuterClass.ShopCardProduct.ResinCard parsedMessage = null;
-          try {
-            parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
-          } catch (com.google.protobuf.InvalidProtocolBufferException e) {
-            parsedMessage = (emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard) e.getUnfinishedMessage();
-            throw e.unwrapIOException();
-          } finally {
-            if (parsedMessage != null) {
-              mergeFrom(parsedMessage);
-            }
-          }
-          return this;
-        }
-        private int bitField0_;
-
-        private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> baseItemList_ =
-          java.util.Collections.emptyList();
-        private void ensureBaseItemListIsMutable() {
-          if (!((bitField0_ & 0x00000001) != 0)) {
-            baseItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(baseItemList_);
-            bitField0_ |= 0x00000001;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> baseItemListBuilder_;
-
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getBaseItemListList() {
-          if (baseItemListBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(baseItemList_);
-          } else {
-            return baseItemListBuilder_.getMessageList();
-          }
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public int getBaseItemListCount() {
-          if (baseItemListBuilder_ == null) {
-            return baseItemList_.size();
-          } else {
-            return baseItemListBuilder_.getCount();
-          }
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getBaseItemList(int index) {
-          if (baseItemListBuilder_ == null) {
-            return baseItemList_.get(index);
-          } else {
-            return baseItemListBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder setBaseItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (baseItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBaseItemListIsMutable();
-            baseItemList_.set(index, value);
-            onChanged();
-          } else {
-            baseItemListBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder setBaseItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (baseItemListBuilder_ == null) {
-            ensureBaseItemListIsMutable();
-            baseItemList_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            baseItemListBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder addBaseItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (baseItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBaseItemListIsMutable();
-            baseItemList_.add(value);
-            onChanged();
-          } else {
-            baseItemListBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder addBaseItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (baseItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensureBaseItemListIsMutable();
-            baseItemList_.add(index, value);
-            onChanged();
-          } else {
-            baseItemListBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder addBaseItemList(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (baseItemListBuilder_ == null) {
-            ensureBaseItemListIsMutable();
-            baseItemList_.add(builderForValue.build());
-            onChanged();
-          } else {
-            baseItemListBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder addBaseItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (baseItemListBuilder_ == null) {
-            ensureBaseItemListIsMutable();
-            baseItemList_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            baseItemListBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder addAllBaseItemList(
-            java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-          if (baseItemListBuilder_ == null) {
-            ensureBaseItemListIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, baseItemList_);
-            onChanged();
-          } else {
-            baseItemListBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder clearBaseItemList() {
-          if (baseItemListBuilder_ == null) {
-            baseItemList_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000001);
-            onChanged();
-          } else {
-            baseItemListBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public Builder removeBaseItemList(int index) {
-          if (baseItemListBuilder_ == null) {
-            ensureBaseItemListIsMutable();
-            baseItemList_.remove(index);
-            onChanged();
-          } else {
-            baseItemListBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getBaseItemListBuilder(
-            int index) {
-          return getBaseItemListFieldBuilder().getBuilder(index);
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getBaseItemListOrBuilder(
-            int index) {
-          if (baseItemListBuilder_ == null) {
-            return baseItemList_.get(index);  } else {
-            return baseItemListBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-             getBaseItemListOrBuilderList() {
-          if (baseItemListBuilder_ != null) {
-            return baseItemListBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(baseItemList_);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addBaseItemListBuilder() {
-          return getBaseItemListFieldBuilder().addBuilder(
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addBaseItemListBuilder(
-            int index) {
-          return getBaseItemListFieldBuilder().addBuilder(
-              index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-        }
-        /**
-         * <code>repeated .ItemParam base_item_list = 1;</code>
-         */
-        public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-             getBaseItemListBuilderList() {
-          return getBaseItemListFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-            getBaseItemListFieldBuilder() {
-          if (baseItemListBuilder_ == null) {
-            baseItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                    baseItemList_,
-                    ((bitField0_ & 0x00000001) != 0),
-                    getParentForChildren(),
-                    isClean());
-            baseItemList_ = null;
-          }
-          return baseItemListBuilder_;
-        }
-
-        private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> perDayItemList_ =
-          java.util.Collections.emptyList();
-        private void ensurePerDayItemListIsMutable() {
-          if (!((bitField0_ & 0x00000002) != 0)) {
-            perDayItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(perDayItemList_);
-            bitField0_ |= 0x00000002;
-           }
-        }
-
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> perDayItemListBuilder_;
-
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getPerDayItemListList() {
-          if (perDayItemListBuilder_ == null) {
-            return java.util.Collections.unmodifiableList(perDayItemList_);
-          } else {
-            return perDayItemListBuilder_.getMessageList();
-          }
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public int getPerDayItemListCount() {
-          if (perDayItemListBuilder_ == null) {
-            return perDayItemList_.size();
-          } else {
-            return perDayItemListBuilder_.getCount();
-          }
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getPerDayItemList(int index) {
-          if (perDayItemListBuilder_ == null) {
-            return perDayItemList_.get(index);
-          } else {
-            return perDayItemListBuilder_.getMessage(index);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder setPerDayItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (perDayItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.set(index, value);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.setMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder setPerDayItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (perDayItemListBuilder_ == null) {
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.set(index, builderForValue.build());
-            onChanged();
-          } else {
-            perDayItemListBuilder_.setMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder addPerDayItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (perDayItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.add(value);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.addMessage(value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder addPerDayItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-          if (perDayItemListBuilder_ == null) {
-            if (value == null) {
-              throw new NullPointerException();
-            }
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.add(index, value);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.addMessage(index, value);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder addPerDayItemList(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (perDayItemListBuilder_ == null) {
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.add(builderForValue.build());
-            onChanged();
-          } else {
-            perDayItemListBuilder_.addMessage(builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder addPerDayItemList(
-            int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-          if (perDayItemListBuilder_ == null) {
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.add(index, builderForValue.build());
-            onChanged();
-          } else {
-            perDayItemListBuilder_.addMessage(index, builderForValue.build());
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder addAllPerDayItemList(
-            java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-          if (perDayItemListBuilder_ == null) {
-            ensurePerDayItemListIsMutable();
-            com.google.protobuf.AbstractMessageLite.Builder.addAll(
-                values, perDayItemList_);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.addAllMessages(values);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder clearPerDayItemList() {
-          if (perDayItemListBuilder_ == null) {
-            perDayItemList_ = java.util.Collections.emptyList();
-            bitField0_ = (bitField0_ & ~0x00000002);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.clear();
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public Builder removePerDayItemList(int index) {
-          if (perDayItemListBuilder_ == null) {
-            ensurePerDayItemListIsMutable();
-            perDayItemList_.remove(index);
-            onChanged();
-          } else {
-            perDayItemListBuilder_.remove(index);
-          }
-          return this;
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getPerDayItemListBuilder(
-            int index) {
-          return getPerDayItemListFieldBuilder().getBuilder(index);
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getPerDayItemListOrBuilder(
-            int index) {
-          if (perDayItemListBuilder_ == null) {
-            return perDayItemList_.get(index);  } else {
-            return perDayItemListBuilder_.getMessageOrBuilder(index);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-             getPerDayItemListOrBuilderList() {
-          if (perDayItemListBuilder_ != null) {
-            return perDayItemListBuilder_.getMessageOrBuilderList();
-          } else {
-            return java.util.Collections.unmodifiableList(perDayItemList_);
-          }
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addPerDayItemListBuilder() {
-          return getPerDayItemListFieldBuilder().addBuilder(
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addPerDayItemListBuilder(
-            int index) {
-          return getPerDayItemListFieldBuilder().addBuilder(
-              index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-        }
-        /**
-         * <code>repeated .ItemParam per_day_item_list = 2;</code>
-         */
-        public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-             getPerDayItemListBuilderList() {
-          return getPerDayItemListFieldBuilder().getBuilderList();
-        }
-        private com.google.protobuf.RepeatedFieldBuilderV3<
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-            getPerDayItemListFieldBuilder() {
-          if (perDayItemListBuilder_ == null) {
-            perDayItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-                emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                    perDayItemList_,
-                    ((bitField0_ & 0x00000002) != 0),
-                    getParentForChildren(),
-                    isClean());
-            perDayItemList_ = null;
-          }
-          return perDayItemListBuilder_;
-        }
-        @java.lang.Override
-        public final Builder setUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.setUnknownFields(unknownFields);
-        }
-
-        @java.lang.Override
-        public final Builder mergeUnknownFields(
-            final com.google.protobuf.UnknownFieldSet unknownFields) {
-          return super.mergeUnknownFields(unknownFields);
-        }
-
-
-        // @@protoc_insertion_point(builder_scope:ShopCardProduct.ResinCard)
-      }
-
-      // @@protoc_insertion_point(class_scope:ShopCardProduct.ResinCard)
-      private static final emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard DEFAULT_INSTANCE;
-      static {
-        DEFAULT_INSTANCE = new emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard();
-      }
-
-      public static emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getDefaultInstance() {
-        return DEFAULT_INSTANCE;
-      }
-
-      private static final com.google.protobuf.Parser<ResinCard>
-          PARSER = new com.google.protobuf.AbstractParser<ResinCard>() {
-        @java.lang.Override
-        public ResinCard parsePartialFrom(
-            com.google.protobuf.CodedInputStream input,
-            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
-            throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ResinCard(input, extensionRegistry);
-        }
-      };
-
-      public static com.google.protobuf.Parser<ResinCard> parser() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public com.google.protobuf.Parser<ResinCard> getParserForType() {
-        return PARSER;
-      }
-
-      @java.lang.Override
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getDefaultInstanceForType() {
-        return DEFAULT_INSTANCE;
+      public int getNumber() {
+        return this.value;
       }
+    };
 
+    public HLAOFKPENGICase
+    getHLAOFKPENGICase() {
+      return HLAOFKPENGICase.forNumber(
+          hLAOFKPENGICase_);
     }
 
-    private int bitField0_;
     public static final int PRODUCT_ID_FIELD_NUMBER = 1;
     private volatile java.lang.Object productId_;
     /**
@@ -1527,29 +390,34 @@ public final class ShopCardProductOuterClass {
     }
 
     public static final int RESIN_CARD_FIELD_NUMBER = 101;
-    private emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard resinCard_;
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      * @return Whether the resinCard field is set.
      */
     @java.lang.Override
     public boolean hasResinCard() {
-      return ((bitField0_ & 0x00000001) != 0);
+      return hLAOFKPENGICase_ == 101;
     }
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      * @return The resinCard.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getResinCard() {
-      return resinCard_ == null ? emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance() : resinCard_;
+    public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getResinCard() {
+      if (hLAOFKPENGICase_ == 101) {
+         return (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_;
+      }
+      return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
     }
     /**
-     * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+     * <code>.ResinCard resin_card = 101;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder getResinCardOrBuilder() {
-      return resinCard_ == null ? emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance() : resinCard_;
+    public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder getResinCardOrBuilder() {
+      if (hLAOFKPENGICase_ == 101) {
+         return (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_;
+      }
+      return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -1587,8 +455,8 @@ public final class ShopCardProductOuterClass {
       if (cardProductType_ != 0) {
         output.writeUInt32(7, cardProductType_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
-        output.writeMessage(101, getResinCard());
+      if (hLAOFKPENGICase_ == 101) {
+        output.writeMessage(101, (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_);
       }
       unknownFields.writeTo(output);
     }
@@ -1625,9 +493,9 @@ public final class ShopCardProductOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(7, cardProductType_);
       }
-      if (((bitField0_ & 0x00000001) != 0)) {
+      if (hLAOFKPENGICase_ == 101) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(101, getResinCard());
+          .computeMessageSize(101, (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -1658,10 +526,14 @@ public final class ShopCardProductOuterClass {
           != other.getRemainRewardDays()) return false;
       if (getCardProductType()
           != other.getCardProductType()) return false;
-      if (hasResinCard() != other.hasResinCard()) return false;
-      if (hasResinCard()) {
-        if (!getResinCard()
-            .equals(other.getResinCard())) return false;
+      if (!getHLAOFKPENGICase().equals(other.getHLAOFKPENGICase())) return false;
+      switch (hLAOFKPENGICase_) {
+        case 101:
+          if (!getResinCard()
+              .equals(other.getResinCard())) return false;
+          break;
+        case 0:
+        default:
       }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -1688,9 +560,13 @@ public final class ShopCardProductOuterClass {
       hash = (53 * hash) + getRemainRewardDays();
       hash = (37 * hash) + CARD_PRODUCT_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + getCardProductType();
-      if (hasResinCard()) {
-        hash = (37 * hash) + RESIN_CARD_FIELD_NUMBER;
-        hash = (53 * hash) + getResinCard().hashCode();
+      switch (hLAOFKPENGICase_) {
+        case 101:
+          hash = (37 * hash) + RESIN_CARD_FIELD_NUMBER;
+          hash = (53 * hash) + getResinCard().hashCode();
+          break;
+        case 0:
+        default:
       }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
@@ -1788,10 +664,6 @@ public final class ShopCardProductOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: LJJFPCDLGIJ
-     * </pre>
-     *
      * Protobuf type {@code ShopCardProduct}
      */
     public static final class Builder extends
@@ -1824,7 +696,6 @@ public final class ShopCardProductOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getResinCardFieldBuilder();
         }
       }
       @java.lang.Override
@@ -1844,12 +715,8 @@ public final class ShopCardProductOuterClass {
 
         cardProductType_ = 0;
 
-        if (resinCardBuilder_ == null) {
-          resinCard_ = null;
-        } else {
-          resinCardBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00000001);
+        hLAOFKPENGICase_ = 0;
+        hLAOFKPENGI_ = null;
         return this;
       }
 
@@ -1876,8 +743,6 @@ public final class ShopCardProductOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct buildPartial() {
         emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct result = new emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct(this);
-        int from_bitField0_ = bitField0_;
-        int to_bitField0_ = 0;
         result.productId_ = productId_;
         result.priceTier_ = priceTier_;
         result.mcoinBase_ = mcoinBase_;
@@ -1885,15 +750,14 @@ public final class ShopCardProductOuterClass {
         result.days_ = days_;
         result.remainRewardDays_ = remainRewardDays_;
         result.cardProductType_ = cardProductType_;
-        if (((from_bitField0_ & 0x00000001) != 0)) {
+        if (hLAOFKPENGICase_ == 101) {
           if (resinCardBuilder_ == null) {
-            result.resinCard_ = resinCard_;
+            result.hLAOFKPENGI_ = hLAOFKPENGI_;
           } else {
-            result.resinCard_ = resinCardBuilder_.build();
+            result.hLAOFKPENGI_ = resinCardBuilder_.build();
           }
-          to_bitField0_ |= 0x00000001;
         }
-        result.bitField0_ = to_bitField0_;
+        result.hLAOFKPENGICase_ = hLAOFKPENGICase_;
         onBuilt();
         return result;
       }
@@ -1965,8 +829,14 @@ public final class ShopCardProductOuterClass {
         if (other.getCardProductType() != 0) {
           setCardProductType(other.getCardProductType());
         }
-        if (other.hasResinCard()) {
-          mergeResinCard(other.getResinCard());
+        switch (other.getHLAOFKPENGICase()) {
+          case RESIN_CARD: {
+            mergeResinCard(other.getResinCard());
+            break;
+          }
+          case HLAOFKPENGI_NOT_SET: {
+            break;
+          }
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1996,7 +866,21 @@ public final class ShopCardProductOuterClass {
         }
         return this;
       }
-      private int bitField0_;
+      private int hLAOFKPENGICase_ = 0;
+      private java.lang.Object hLAOFKPENGI_;
+      public HLAOFKPENGICase
+          getHLAOFKPENGICase() {
+        return HLAOFKPENGICase.forNumber(
+            hLAOFKPENGICase_);
+      }
+
+      public Builder clearHLAOFKPENGI() {
+        hLAOFKPENGICase_ = 0;
+        hLAOFKPENGI_ = null;
+        onChanged();
+        return this;
+      }
+
 
       private java.lang.Object productId_ = "";
       /**
@@ -2305,123 +1189,144 @@ public final class ShopCardProductOuterClass {
         return this;
       }
 
-      private emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard resinCard_;
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder> resinCardBuilder_;
+          emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder> resinCardBuilder_;
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        * @return Whether the resinCard field is set.
        */
+      @java.lang.Override
       public boolean hasResinCard() {
-        return ((bitField0_ & 0x00000001) != 0);
+        return hLAOFKPENGICase_ == 101;
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        * @return The resinCard.
        */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard getResinCard() {
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard getResinCard() {
         if (resinCardBuilder_ == null) {
-          return resinCard_ == null ? emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance() : resinCard_;
+          if (hLAOFKPENGICase_ == 101) {
+            return (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_;
+          }
+          return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
         } else {
-          return resinCardBuilder_.getMessage();
+          if (hLAOFKPENGICase_ == 101) {
+            return resinCardBuilder_.getMessage();
+          }
+          return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
         }
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
-      public Builder setResinCard(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard value) {
+      public Builder setResinCard(emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard value) {
         if (resinCardBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          resinCard_ = value;
+          hLAOFKPENGI_ = value;
           onChanged();
         } else {
           resinCardBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
+        hLAOFKPENGICase_ = 101;
         return this;
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
       public Builder setResinCard(
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder builderForValue) {
+          emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder builderForValue) {
         if (resinCardBuilder_ == null) {
-          resinCard_ = builderForValue.build();
+          hLAOFKPENGI_ = builderForValue.build();
           onChanged();
         } else {
           resinCardBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000001;
+        hLAOFKPENGICase_ = 101;
         return this;
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
-      public Builder mergeResinCard(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard value) {
+      public Builder mergeResinCard(emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard value) {
         if (resinCardBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0) &&
-              resinCard_ != null &&
-              resinCard_ != emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance()) {
-            resinCard_ =
-              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.newBuilder(resinCard_).mergeFrom(value).buildPartial();
+          if (hLAOFKPENGICase_ == 101 &&
+              hLAOFKPENGI_ != emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance()) {
+            hLAOFKPENGI_ = emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.newBuilder((emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_)
+                .mergeFrom(value).buildPartial();
           } else {
-            resinCard_ = value;
+            hLAOFKPENGI_ = value;
           }
           onChanged();
         } else {
-          resinCardBuilder_.mergeFrom(value);
+          if (hLAOFKPENGICase_ == 101) {
+            resinCardBuilder_.mergeFrom(value);
+          }
+          resinCardBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000001;
+        hLAOFKPENGICase_ = 101;
         return this;
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
       public Builder clearResinCard() {
         if (resinCardBuilder_ == null) {
-          resinCard_ = null;
-          onChanged();
+          if (hLAOFKPENGICase_ == 101) {
+            hLAOFKPENGICase_ = 0;
+            hLAOFKPENGI_ = null;
+            onChanged();
+          }
         } else {
+          if (hLAOFKPENGICase_ == 101) {
+            hLAOFKPENGICase_ = 0;
+            hLAOFKPENGI_ = null;
+          }
           resinCardBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder getResinCardBuilder() {
-        bitField0_ |= 0x00000001;
-        onChanged();
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder getResinCardBuilder() {
         return getResinCardFieldBuilder().getBuilder();
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder getResinCardOrBuilder() {
-        if (resinCardBuilder_ != null) {
+      @java.lang.Override
+      public emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder getResinCardOrBuilder() {
+        if ((hLAOFKPENGICase_ == 101) && (resinCardBuilder_ != null)) {
           return resinCardBuilder_.getMessageOrBuilder();
         } else {
-          return resinCard_ == null ?
-              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.getDefaultInstance() : resinCard_;
+          if (hLAOFKPENGICase_ == 101) {
+            return (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_;
+          }
+          return emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
         }
       }
       /**
-       * <code>optional .ShopCardProduct.ResinCard resin_card = 101;</code>
+       * <code>.ResinCard resin_card = 101;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder> 
+          emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder> 
           getResinCardFieldBuilder() {
         if (resinCardBuilder_ == null) {
+          if (!(hLAOFKPENGICase_ == 101)) {
+            hLAOFKPENGI_ = emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.getDefaultInstance();
+          }
           resinCardBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCard.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.ResinCardOrBuilder>(
-                  getResinCard(),
+              emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard.Builder, emu.grasscutter.net.proto.ResinCardOuterClass.ResinCardOrBuilder>(
+                  (emu.grasscutter.net.proto.ResinCardOuterClass.ResinCard) hLAOFKPENGI_,
                   getParentForChildren(),
                   isClean());
-          resinCard_ = null;
+          hLAOFKPENGI_ = null;
         }
+        hLAOFKPENGICase_ = 101;
+        onChanged();;
         return resinCardBuilder_;
       }
       @java.lang.Override
@@ -2482,11 +1387,6 @@ public final class ShopCardProductOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_ShopCardProduct_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_ShopCardProduct_ResinCard_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_ShopCardProduct_ResinCard_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -2496,36 +1396,27 @@ public final class ShopCardProductOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025ShopCardProduct.proto\032\017ItemParam.proto" +
-      "\"\305\002\n\017ShopCardProduct\022\022\n\nproduct_id\030\001 \001(\t" +
+      "\n\025ShopCardProduct.proto\032\017ResinCard.proto" +
+      "\"\332\001\n\017ShopCardProduct\022\022\n\nproduct_id\030\001 \001(\t" +
       "\022\022\n\nprice_tier\030\002 \001(\t\022\022\n\nmcoin_base\030\003 \001(\r" +
       "\022\025\n\rhcoin_per_day\030\004 \001(\r\022\014\n\004days\030\005 \001(\r\022\032\n" +
       "\022remain_reward_days\030\006 \001(\r\022\031\n\021card_produc" +
-      "t_type\030\007 \001(\r\0223\n\nresin_card\030e \001(\0132\032.ShopC" +
-      "ardProduct.ResinCardH\000\210\001\001\032V\n\tResinCard\022\"" +
-      "\n\016base_item_list\030\001 \003(\0132\n.ItemParam\022%\n\021pe" +
-      "r_day_item_list\030\002 \003(\0132\n.ItemParamB\r\n\013_re" +
-      "sin_cardB\033\n\031emu.grasscutter.net.protob\006p" +
-      "roto3"
+      "t_type\030\007 \001(\r\022 \n\nresin_card\030e \001(\0132\n.Resin" +
+      "CardH\000B\r\n\013HLAOFKPENGIB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.ResinCardOuterClass.getDescriptor(),
         });
     internal_static_ShopCardProduct_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_ShopCardProduct_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShopCardProduct_descriptor,
-        new java.lang.String[] { "ProductId", "PriceTier", "McoinBase", "HcoinPerDay", "Days", "RemainRewardDays", "CardProductType", "ResinCard", "ResinCard", });
-    internal_static_ShopCardProduct_ResinCard_descriptor =
-      internal_static_ShopCardProduct_descriptor.getNestedTypes().get(0);
-    internal_static_ShopCardProduct_ResinCard_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_ShopCardProduct_ResinCard_descriptor,
-        new java.lang.String[] { "BaseItemList", "PerDayItemList", });
-    emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
+        new java.lang.String[] { "ProductId", "PriceTier", "McoinBase", "HcoinPerDay", "Days", "RemainRewardDays", "CardProductType", "ResinCard", "HLAOFKPENGI", });
+    emu.grasscutter.net.proto.ResinCardOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopConcertProductOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopConcertProductOuterClass.java
index 8b8f9fa34..c088720d9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopConcertProductOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopConcertProductOuterClass.java
@@ -73,10 +73,6 @@ public final class ShopConcertProductOuterClass {
     int getBuyTimes();
   }
   /**
-   * <pre>
-   * Obf: ABHPGEAODHI
-   * </pre>
-   *
    * Protobuf type {@code ShopConcertProduct}
    */
   public static final class ShopConcertProduct extends
@@ -543,10 +539,6 @@ public final class ShopConcertProductOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ABHPGEAODHI
-     * </pre>
-     *
      * Protobuf type {@code ShopConcertProduct}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
index a7a514a7f..63f44ef72 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopGoodsOuterClass.java
@@ -19,64 +19,120 @@ public final class ShopGoodsOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <pre>
-     *Stardust // paimon
-     * </pre>
-     *
-     * <code>uint32 scoin = 4;</code>
-     * @return The scoin.
-     */
-    int getScoin();
-
-    /**
-     * <pre>
-     * FEMEEIEHBBL
-     * </pre>
-     *
-     * <code>uint32 mcoin = 11;</code>
-     * @return The mcoin.
-     */
-    int getMcoin();
-
-    /**
-     * <pre>
-     * benar
-     * </pre>
-     *
-     * <code>uint32 goods_id = 8;</code>
+     * <code>uint32 goods_id = 1;</code>
      * @return The goodsId.
      */
     int getGoodsId();
 
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>uint32 begin_time = 2;</code>
+     * @return The beginTime.
+     */
+    int getBeginTime();
+
+    /**
+     * <code>uint32 next_refresh_time = 3;</code>
+     * @return The nextRefreshTime.
+     */
+    int getNextRefreshTime();
+
+    /**
+     * <code>uint32 disable_type = 4;</code>
+     * @return The disableType.
+     */
+    int getDisableType();
+
+    /**
+     * <code>uint32 mcoin = 5;</code>
+     * @return The mcoin.
+     */
+    int getMcoin();
+
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     * @return Whether the goodsItem field is set.
+     */
+    boolean hasGoodsItem();
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     * @return The goodsItem.
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem();
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder();
+
+    /**
+     * <code>uint32 buy_limit = 7;</code>
+     * @return The buyLimit.
+     */
+    int getBuyLimit();
+
+    /**
+     * <code>uint32 hcoin = 8;</code>
+     * @return The hcoin.
+     */
+    int getHcoin();
+
+    /**
+     * <code>uint32 IBCGFFJGCID = 9;</code>
+     * @return The iBCGFFJGCID.
+     */
+    int getIBCGFFJGCID();
+
+    /**
+     * <code>uint32 scoin = 10;</code>
+     * @return The scoin.
+     */
+    int getScoin();
+
+    /**
+     * <code>uint32 min_level = 11;</code>
+     * @return The minLevel.
+     */
+    int getMinLevel();
+
+    /**
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getCostItemListList();
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index);
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     int getCostItemListCount();
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getCostItemListOrBuilderList();
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 min_level = 1690;</code>
-     * @return The minLevel.
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @return A list containing the preGoodsIdList.
      */
-    int getMinLevel();
+    java.util.List<java.lang.Integer> getPreGoodsIdListList();
+    /**
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @return The count of preGoodsIdList.
+     */
+    int getPreGoodsIdListCount();
+    /**
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @param index The index of the element to return.
+     * @return The preGoodsIdList at the given index.
+     */
+    int getPreGoodsIdList(int index);
 
     /**
      * <code>uint32 bought_num = 14;</code>
@@ -85,120 +141,48 @@ public final class ShopGoodsOuterClass {
     int getBoughtNum();
 
     /**
-     * <code>uint32 DIHOGOJNKHB = 923;</code>
-     * @return The dIHOGOJNKHB.
-     */
-    int getDIHOGOJNKHB();
-
-    /**
-     * <code>uint32 begin_time = 13;</code>
-     * @return The beginTime.
-     */
-    int getBeginTime();
-
-    /**
-     * <code>uint32 BNEKKILPEKF = 1950;</code>
-     * @return The bNEKKILPEKF.
-     */
-    int getBNEKKILPEKF();
-
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @return A list containing the preGoodsIdList.
-     */
-    java.util.List<java.lang.Integer> getPreGoodsIdListList();
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @return The count of preGoodsIdList.
-     */
-    int getPreGoodsIdListCount();
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @param index The index of the element to return.
-     * @return The preGoodsIdList at the given index.
-     */
-    int getPreGoodsIdList(int index);
-
-    /**
-     * <code>uint32 buy_limit = 10;</code>
-     * @return The buyLimit.
-     */
-    int getBuyLimit();
-
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     * @return Whether the goodsItem field is set.
-     */
-    boolean hasGoodsItem();
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     * @return The goodsItem.
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem();
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder();
-
-    /**
-     * <code>uint32 hcoin = 12;</code>
-     * @return The hcoin.
-     */
-    int getHcoin();
-
-    /**
-     * <code>uint32 EKGBDJFIDJO = 2;</code>
-     * @return The eKGBDJFIDJO.
-     */
-    int getEKGBDJFIDJO();
-
-    /**
-     * <code>uint32 KKKOCADJCHM = 898;</code>
-     * @return The kKKOCADJCHM.
-     */
-    int getKKKOCADJCHM();
-
-    /**
-     * <code>uint32 OENMLOAFHMJ = 1946;</code>
-     * @return The oENMLOAFHMJ.
-     */
-    int getOENMLOAFHMJ();
-
-    /**
-     * <code>uint32 max_level = 7;</code>
-     * @return The maxLevel.
-     */
-    int getMaxLevel();
-
-    /**
-     * <code>uint32 end_time = 6;</code>
+     * <code>uint32 end_time = 15;</code>
      * @return The endTime.
      */
     int getEndTime();
 
     /**
-     * <code>uint32 uk15 = 15;</code>
-     * @return The uk15.
+     * <code>uint32 max_level = 590;</code>
+     * @return The maxLevel.
      */
-    int getUk15();
+    int getMaxLevel();
 
     /**
-     * <pre>
-     * mcoin = Crystals
-     * scoin = Stardust
-     * hcoin = Starglitter
-     * </pre>
-     *
-     * <code>uint32 next_refresh_time = 9;</code>
-     * @return The nextRefreshTime.
+     * <code>uint32 BHNAJCLPOJE = 1487;</code>
+     * @return The bHNAJCLPOJE.
      */
-    int getNextRefreshTime();
+    int getBHNAJCLPOJE();
+
+    /**
+     * <code>uint32 KJAGOOHCNON = 1541;</code>
+     * @return The kJAGOOHCNON.
+     */
+    int getKJAGOOHCNON();
+
+    /**
+     * <code>uint32 AFOGAPGJCOH = 1587;</code>
+     * @return The aFOGAPGJCOH.
+     */
+    int getAFOGAPGJCOH();
+
+    /**
+     * <code>bool EHIAIOONFDH = 1748;</code>
+     * @return The eHIAIOONFDH.
+     */
+    boolean getEHIAIOONFDH();
+
+    /**
+     * <code>uint32 MNCAAIMGCJJ = 1942;</code>
+     * @return The mNCAAIMGCJJ.
+     */
+    int getMNCAAIMGCJJ();
   }
   /**
-   * <pre>
-   * Obf: OBABFCEJLGK
-   * </pre>
-   *
    * Protobuf type {@code ShopGoods}
    */
   public static final class ShopGoods extends
@@ -246,7 +230,32 @@ public final class ShopGoodsOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 8: {
+
+              goodsId_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+
+              beginTime_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              nextRefreshTime_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+
+              disableType_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              mcoin_ = input.readUInt32();
+              break;
+            }
+            case 50: {
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder subBuilder = null;
               if (goodsItem_ != null) {
                 subBuilder = goodsItem_.toBuilder();
@@ -259,12 +268,32 @@ public final class ShopGoodsOuterClass {
 
               break;
             }
-            case 16: {
+            case 56: {
 
-              eKGBDJFIDJO_ = input.readUInt32();
+              buyLimit_ = input.readUInt32();
               break;
             }
-            case 26: {
+            case 64: {
+
+              hcoin_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              iBCGFFJGCID_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              scoin_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              minLevel_ = input.readUInt32();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 costItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
                 mutable_bitField0_ |= 0x00000001;
@@ -273,12 +302,7 @@ public final class ShopGoodsOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
-            case 32: {
-
-              scoin_ = input.readUInt32();
-              break;
-            }
-            case 40: {
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 preGoodsIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000002;
@@ -286,7 +310,7 @@ public final class ShopGoodsOuterClass {
               preGoodsIdList_.addInt(input.readUInt32());
               break;
             }
-            case 42: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
@@ -299,46 +323,6 @@ public final class ShopGoodsOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 48: {
-
-              endTime_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              maxLevel_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              goodsId_ = input.readUInt32();
-              break;
-            }
-            case 72: {
-
-              nextRefreshTime_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              buyLimit_ = input.readUInt32();
-              break;
-            }
-            case 88: {
-
-              mcoin_ = input.readUInt32();
-              break;
-            }
-            case 96: {
-
-              hcoin_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              beginTime_ = input.readUInt32();
-              break;
-            }
             case 112: {
 
               boughtNum_ = input.readUInt32();
@@ -346,32 +330,37 @@ public final class ShopGoodsOuterClass {
             }
             case 120: {
 
-              uk15_ = input.readUInt32();
+              endTime_ = input.readUInt32();
               break;
             }
-            case 7184: {
+            case 4720: {
 
-              kKKOCADJCHM_ = input.readUInt32();
+              maxLevel_ = input.readUInt32();
               break;
             }
-            case 7384: {
+            case 11896: {
 
-              dIHOGOJNKHB_ = input.readUInt32();
+              bHNAJCLPOJE_ = input.readUInt32();
               break;
             }
-            case 13520: {
+            case 12328: {
 
-              minLevel_ = input.readUInt32();
+              kJAGOOHCNON_ = input.readUInt32();
               break;
             }
-            case 15568: {
+            case 12696: {
 
-              oENMLOAFHMJ_ = input.readUInt32();
+              aFOGAPGJCOH_ = input.readUInt32();
               break;
             }
-            case 15600: {
+            case 13984: {
 
-              bNEKKILPEKF_ = input.readUInt32();
+              eHIAIOONFDH_ = input.readBool();
+              break;
+            }
+            case 15536: {
+
+              mNCAAIMGCJJ_ = input.readUInt32();
               break;
             }
             default: {
@@ -412,44 +401,10 @@ public final class ShopGoodsOuterClass {
               emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.class, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder.class);
     }
 
-    public static final int SCOIN_FIELD_NUMBER = 4;
-    private int scoin_;
-    /**
-     * <pre>
-     *Stardust // paimon
-     * </pre>
-     *
-     * <code>uint32 scoin = 4;</code>
-     * @return The scoin.
-     */
-    @java.lang.Override
-    public int getScoin() {
-      return scoin_;
-    }
-
-    public static final int MCOIN_FIELD_NUMBER = 11;
-    private int mcoin_;
-    /**
-     * <pre>
-     * FEMEEIEHBBL
-     * </pre>
-     *
-     * <code>uint32 mcoin = 11;</code>
-     * @return The mcoin.
-     */
-    @java.lang.Override
-    public int getMcoin() {
-      return mcoin_;
-    }
-
-    public static final int GOODS_ID_FIELD_NUMBER = 8;
+    public static final int GOODS_ID_FIELD_NUMBER = 1;
     private int goodsId_;
     /**
-     * <pre>
-     * benar
-     * </pre>
-     *
-     * <code>uint32 goods_id = 8;</code>
+     * <code>uint32 goods_id = 1;</code>
      * @return The goodsId.
      */
     @java.lang.Override
@@ -457,17 +412,142 @@ public final class ShopGoodsOuterClass {
       return goodsId_;
     }
 
-    public static final int COST_ITEM_LIST_FIELD_NUMBER = 3;
+    public static final int BEGIN_TIME_FIELD_NUMBER = 2;
+    private int beginTime_;
+    /**
+     * <code>uint32 begin_time = 2;</code>
+     * @return The beginTime.
+     */
+    @java.lang.Override
+    public int getBeginTime() {
+      return beginTime_;
+    }
+
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 3;
+    private int nextRefreshTime_;
+    /**
+     * <code>uint32 next_refresh_time = 3;</code>
+     * @return The nextRefreshTime.
+     */
+    @java.lang.Override
+    public int getNextRefreshTime() {
+      return nextRefreshTime_;
+    }
+
+    public static final int DISABLE_TYPE_FIELD_NUMBER = 4;
+    private int disableType_;
+    /**
+     * <code>uint32 disable_type = 4;</code>
+     * @return The disableType.
+     */
+    @java.lang.Override
+    public int getDisableType() {
+      return disableType_;
+    }
+
+    public static final int MCOIN_FIELD_NUMBER = 5;
+    private int mcoin_;
+    /**
+     * <code>uint32 mcoin = 5;</code>
+     * @return The mcoin.
+     */
+    @java.lang.Override
+    public int getMcoin() {
+      return mcoin_;
+    }
+
+    public static final int GOODS_ITEM_FIELD_NUMBER = 6;
+    private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_;
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     * @return Whether the goodsItem field is set.
+     */
+    @java.lang.Override
+    public boolean hasGoodsItem() {
+      return goodsItem_ != null;
+    }
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     * @return The goodsItem.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() {
+      return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
+    }
+    /**
+     * <code>.ItemParam goods_item = 6;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() {
+      return getGoodsItem();
+    }
+
+    public static final int BUY_LIMIT_FIELD_NUMBER = 7;
+    private int buyLimit_;
+    /**
+     * <code>uint32 buy_limit = 7;</code>
+     * @return The buyLimit.
+     */
+    @java.lang.Override
+    public int getBuyLimit() {
+      return buyLimit_;
+    }
+
+    public static final int HCOIN_FIELD_NUMBER = 8;
+    private int hcoin_;
+    /**
+     * <code>uint32 hcoin = 8;</code>
+     * @return The hcoin.
+     */
+    @java.lang.Override
+    public int getHcoin() {
+      return hcoin_;
+    }
+
+    public static final int IBCGFFJGCID_FIELD_NUMBER = 9;
+    private int iBCGFFJGCID_;
+    /**
+     * <code>uint32 IBCGFFJGCID = 9;</code>
+     * @return The iBCGFFJGCID.
+     */
+    @java.lang.Override
+    public int getIBCGFFJGCID() {
+      return iBCGFFJGCID_;
+    }
+
+    public static final int SCOIN_FIELD_NUMBER = 10;
+    private int scoin_;
+    /**
+     * <code>uint32 scoin = 10;</code>
+     * @return The scoin.
+     */
+    @java.lang.Override
+    public int getScoin() {
+      return scoin_;
+    }
+
+    public static final int MIN_LEVEL_FIELD_NUMBER = 11;
+    private int minLevel_;
+    /**
+     * <code>uint32 min_level = 11;</code>
+     * @return The minLevel.
+     */
+    @java.lang.Override
+    public int getMinLevel() {
+      return minLevel_;
+    }
+
+    public static final int COST_ITEM_LIST_FIELD_NUMBER = 12;
     private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> costItemList_;
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getCostItemListList() {
       return costItemList_;
     }
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -475,21 +555,21 @@ public final class ShopGoodsOuterClass {
       return costItemList_;
     }
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     @java.lang.Override
     public int getCostItemListCount() {
       return costItemList_.size();
     }
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) {
       return costItemList_.get(index);
     }
     /**
-     * <code>repeated .ItemParam cost_item_list = 3;</code>
+     * <code>repeated .ItemParam cost_item_list = 12;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder(
@@ -497,16 +577,33 @@ public final class ShopGoodsOuterClass {
       return costItemList_.get(index);
     }
 
-    public static final int MIN_LEVEL_FIELD_NUMBER = 1690;
-    private int minLevel_;
+    public static final int PRE_GOODS_ID_LIST_FIELD_NUMBER = 13;
+    private com.google.protobuf.Internal.IntList preGoodsIdList_;
     /**
-     * <code>uint32 min_level = 1690;</code>
-     * @return The minLevel.
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @return A list containing the preGoodsIdList.
      */
     @java.lang.Override
-    public int getMinLevel() {
-      return minLevel_;
+    public java.util.List<java.lang.Integer>
+        getPreGoodsIdListList() {
+      return preGoodsIdList_;
     }
+    /**
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @return The count of preGoodsIdList.
+     */
+    public int getPreGoodsIdListCount() {
+      return preGoodsIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 pre_goods_id_list = 13;</code>
+     * @param index The index of the element to return.
+     * @return The preGoodsIdList at the given index.
+     */
+    public int getPreGoodsIdList(int index) {
+      return preGoodsIdList_.getInt(index);
+    }
+    private int preGoodsIdListMemoizedSerializedSize = -1;
 
     public static final int BOUGHT_NUM_FIELD_NUMBER = 14;
     private int boughtNum_;
@@ -519,163 +616,10 @@ public final class ShopGoodsOuterClass {
       return boughtNum_;
     }
 
-    public static final int DIHOGOJNKHB_FIELD_NUMBER = 923;
-    private int dIHOGOJNKHB_;
-    /**
-     * <code>uint32 DIHOGOJNKHB = 923;</code>
-     * @return The dIHOGOJNKHB.
-     */
-    @java.lang.Override
-    public int getDIHOGOJNKHB() {
-      return dIHOGOJNKHB_;
-    }
-
-    public static final int BEGIN_TIME_FIELD_NUMBER = 13;
-    private int beginTime_;
-    /**
-     * <code>uint32 begin_time = 13;</code>
-     * @return The beginTime.
-     */
-    @java.lang.Override
-    public int getBeginTime() {
-      return beginTime_;
-    }
-
-    public static final int BNEKKILPEKF_FIELD_NUMBER = 1950;
-    private int bNEKKILPEKF_;
-    /**
-     * <code>uint32 BNEKKILPEKF = 1950;</code>
-     * @return The bNEKKILPEKF.
-     */
-    @java.lang.Override
-    public int getBNEKKILPEKF() {
-      return bNEKKILPEKF_;
-    }
-
-    public static final int PREGOODSIDLIST_FIELD_NUMBER = 5;
-    private com.google.protobuf.Internal.IntList preGoodsIdList_;
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @return A list containing the preGoodsIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getPreGoodsIdListList() {
-      return preGoodsIdList_;
-    }
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @return The count of preGoodsIdList.
-     */
-    public int getPreGoodsIdListCount() {
-      return preGoodsIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 preGoodsIdList = 5;</code>
-     * @param index The index of the element to return.
-     * @return The preGoodsIdList at the given index.
-     */
-    public int getPreGoodsIdList(int index) {
-      return preGoodsIdList_.getInt(index);
-    }
-    private int preGoodsIdListMemoizedSerializedSize = -1;
-
-    public static final int BUY_LIMIT_FIELD_NUMBER = 10;
-    private int buyLimit_;
-    /**
-     * <code>uint32 buy_limit = 10;</code>
-     * @return The buyLimit.
-     */
-    @java.lang.Override
-    public int getBuyLimit() {
-      return buyLimit_;
-    }
-
-    public static final int GOODS_ITEM_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_;
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     * @return Whether the goodsItem field is set.
-     */
-    @java.lang.Override
-    public boolean hasGoodsItem() {
-      return goodsItem_ != null;
-    }
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     * @return The goodsItem.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() {
-      return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
-    }
-    /**
-     * <code>.ItemParam goods_item = 1;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() {
-      return getGoodsItem();
-    }
-
-    public static final int HCOIN_FIELD_NUMBER = 12;
-    private int hcoin_;
-    /**
-     * <code>uint32 hcoin = 12;</code>
-     * @return The hcoin.
-     */
-    @java.lang.Override
-    public int getHcoin() {
-      return hcoin_;
-    }
-
-    public static final int EKGBDJFIDJO_FIELD_NUMBER = 2;
-    private int eKGBDJFIDJO_;
-    /**
-     * <code>uint32 EKGBDJFIDJO = 2;</code>
-     * @return The eKGBDJFIDJO.
-     */
-    @java.lang.Override
-    public int getEKGBDJFIDJO() {
-      return eKGBDJFIDJO_;
-    }
-
-    public static final int KKKOCADJCHM_FIELD_NUMBER = 898;
-    private int kKKOCADJCHM_;
-    /**
-     * <code>uint32 KKKOCADJCHM = 898;</code>
-     * @return The kKKOCADJCHM.
-     */
-    @java.lang.Override
-    public int getKKKOCADJCHM() {
-      return kKKOCADJCHM_;
-    }
-
-    public static final int OENMLOAFHMJ_FIELD_NUMBER = 1946;
-    private int oENMLOAFHMJ_;
-    /**
-     * <code>uint32 OENMLOAFHMJ = 1946;</code>
-     * @return The oENMLOAFHMJ.
-     */
-    @java.lang.Override
-    public int getOENMLOAFHMJ() {
-      return oENMLOAFHMJ_;
-    }
-
-    public static final int MAX_LEVEL_FIELD_NUMBER = 7;
-    private int maxLevel_;
-    /**
-     * <code>uint32 max_level = 7;</code>
-     * @return The maxLevel.
-     */
-    @java.lang.Override
-    public int getMaxLevel() {
-      return maxLevel_;
-    }
-
-    public static final int END_TIME_FIELD_NUMBER = 6;
+    public static final int END_TIME_FIELD_NUMBER = 15;
     private int endTime_;
     /**
-     * <code>uint32 end_time = 6;</code>
+     * <code>uint32 end_time = 15;</code>
      * @return The endTime.
      */
     @java.lang.Override
@@ -683,32 +627,70 @@ public final class ShopGoodsOuterClass {
       return endTime_;
     }
 
-    public static final int UK15_FIELD_NUMBER = 15;
-    private int uk15_;
+    public static final int MAX_LEVEL_FIELD_NUMBER = 590;
+    private int maxLevel_;
     /**
-     * <code>uint32 uk15 = 15;</code>
-     * @return The uk15.
+     * <code>uint32 max_level = 590;</code>
+     * @return The maxLevel.
      */
     @java.lang.Override
-    public int getUk15() {
-      return uk15_;
+    public int getMaxLevel() {
+      return maxLevel_;
     }
 
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 9;
-    private int nextRefreshTime_;
+    public static final int BHNAJCLPOJE_FIELD_NUMBER = 1487;
+    private int bHNAJCLPOJE_;
     /**
-     * <pre>
-     * mcoin = Crystals
-     * scoin = Stardust
-     * hcoin = Starglitter
-     * </pre>
-     *
-     * <code>uint32 next_refresh_time = 9;</code>
-     * @return The nextRefreshTime.
+     * <code>uint32 BHNAJCLPOJE = 1487;</code>
+     * @return The bHNAJCLPOJE.
      */
     @java.lang.Override
-    public int getNextRefreshTime() {
-      return nextRefreshTime_;
+    public int getBHNAJCLPOJE() {
+      return bHNAJCLPOJE_;
+    }
+
+    public static final int KJAGOOHCNON_FIELD_NUMBER = 1541;
+    private int kJAGOOHCNON_;
+    /**
+     * <code>uint32 KJAGOOHCNON = 1541;</code>
+     * @return The kJAGOOHCNON.
+     */
+    @java.lang.Override
+    public int getKJAGOOHCNON() {
+      return kJAGOOHCNON_;
+    }
+
+    public static final int AFOGAPGJCOH_FIELD_NUMBER = 1587;
+    private int aFOGAPGJCOH_;
+    /**
+     * <code>uint32 AFOGAPGJCOH = 1587;</code>
+     * @return The aFOGAPGJCOH.
+     */
+    @java.lang.Override
+    public int getAFOGAPGJCOH() {
+      return aFOGAPGJCOH_;
+    }
+
+    public static final int EHIAIOONFDH_FIELD_NUMBER = 1748;
+    private boolean eHIAIOONFDH_;
+    /**
+     * <code>bool EHIAIOONFDH = 1748;</code>
+     * @return The eHIAIOONFDH.
+     */
+    @java.lang.Override
+    public boolean getEHIAIOONFDH() {
+      return eHIAIOONFDH_;
+    }
+
+    public static final int MNCAAIMGCJJ_FIELD_NUMBER = 1942;
+    private int mNCAAIMGCJJ_;
+    /**
+     * <code>uint32 MNCAAIMGCJJ = 1942;</code>
+     * @return The mNCAAIMGCJJ.
+     */
+    @java.lang.Override
+    public int getMNCAAIMGCJJ() {
+      return mNCAAIMGCJJ_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -726,69 +708,72 @@ public final class ShopGoodsOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      if (goodsId_ != 0) {
+        output.writeUInt32(1, goodsId_);
+      }
+      if (beginTime_ != 0) {
+        output.writeUInt32(2, beginTime_);
+      }
+      if (nextRefreshTime_ != 0) {
+        output.writeUInt32(3, nextRefreshTime_);
+      }
+      if (disableType_ != 0) {
+        output.writeUInt32(4, disableType_);
+      }
+      if (mcoin_ != 0) {
+        output.writeUInt32(5, mcoin_);
+      }
       if (goodsItem_ != null) {
-        output.writeMessage(1, getGoodsItem());
+        output.writeMessage(6, getGoodsItem());
       }
-      if (eKGBDJFIDJO_ != 0) {
-        output.writeUInt32(2, eKGBDJFIDJO_);
+      if (buyLimit_ != 0) {
+        output.writeUInt32(7, buyLimit_);
       }
-      for (int i = 0; i < costItemList_.size(); i++) {
-        output.writeMessage(3, costItemList_.get(i));
+      if (hcoin_ != 0) {
+        output.writeUInt32(8, hcoin_);
+      }
+      if (iBCGFFJGCID_ != 0) {
+        output.writeUInt32(9, iBCGFFJGCID_);
       }
       if (scoin_ != 0) {
-        output.writeUInt32(4, scoin_);
+        output.writeUInt32(10, scoin_);
+      }
+      if (minLevel_ != 0) {
+        output.writeUInt32(11, minLevel_);
+      }
+      for (int i = 0; i < costItemList_.size(); i++) {
+        output.writeMessage(12, costItemList_.get(i));
       }
       if (getPreGoodsIdListList().size() > 0) {
-        output.writeUInt32NoTag(42);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(preGoodsIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < preGoodsIdList_.size(); i++) {
         output.writeUInt32NoTag(preGoodsIdList_.getInt(i));
       }
-      if (endTime_ != 0) {
-        output.writeUInt32(6, endTime_);
-      }
-      if (maxLevel_ != 0) {
-        output.writeUInt32(7, maxLevel_);
-      }
-      if (goodsId_ != 0) {
-        output.writeUInt32(8, goodsId_);
-      }
-      if (nextRefreshTime_ != 0) {
-        output.writeUInt32(9, nextRefreshTime_);
-      }
-      if (buyLimit_ != 0) {
-        output.writeUInt32(10, buyLimit_);
-      }
-      if (mcoin_ != 0) {
-        output.writeUInt32(11, mcoin_);
-      }
-      if (hcoin_ != 0) {
-        output.writeUInt32(12, hcoin_);
-      }
-      if (beginTime_ != 0) {
-        output.writeUInt32(13, beginTime_);
-      }
       if (boughtNum_ != 0) {
         output.writeUInt32(14, boughtNum_);
       }
-      if (uk15_ != 0) {
-        output.writeUInt32(15, uk15_);
+      if (endTime_ != 0) {
+        output.writeUInt32(15, endTime_);
       }
-      if (kKKOCADJCHM_ != 0) {
-        output.writeUInt32(898, kKKOCADJCHM_);
+      if (maxLevel_ != 0) {
+        output.writeUInt32(590, maxLevel_);
       }
-      if (dIHOGOJNKHB_ != 0) {
-        output.writeUInt32(923, dIHOGOJNKHB_);
+      if (bHNAJCLPOJE_ != 0) {
+        output.writeUInt32(1487, bHNAJCLPOJE_);
       }
-      if (minLevel_ != 0) {
-        output.writeUInt32(1690, minLevel_);
+      if (kJAGOOHCNON_ != 0) {
+        output.writeUInt32(1541, kJAGOOHCNON_);
       }
-      if (oENMLOAFHMJ_ != 0) {
-        output.writeUInt32(1946, oENMLOAFHMJ_);
+      if (aFOGAPGJCOH_ != 0) {
+        output.writeUInt32(1587, aFOGAPGJCOH_);
       }
-      if (bNEKKILPEKF_ != 0) {
-        output.writeUInt32(1950, bNEKKILPEKF_);
+      if (eHIAIOONFDH_ != false) {
+        output.writeBool(1748, eHIAIOONFDH_);
+      }
+      if (mNCAAIMGCJJ_ != 0) {
+        output.writeUInt32(1942, mNCAAIMGCJJ_);
       }
       unknownFields.writeTo(output);
     }
@@ -799,21 +784,53 @@ public final class ShopGoodsOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (goodsId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, goodsId_);
+      }
+      if (beginTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, beginTime_);
+      }
+      if (nextRefreshTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, nextRefreshTime_);
+      }
+      if (disableType_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, disableType_);
+      }
+      if (mcoin_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, mcoin_);
+      }
       if (goodsItem_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getGoodsItem());
+          .computeMessageSize(6, getGoodsItem());
       }
-      if (eKGBDJFIDJO_ != 0) {
+      if (buyLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, eKGBDJFIDJO_);
+          .computeUInt32Size(7, buyLimit_);
       }
-      for (int i = 0; i < costItemList_.size(); i++) {
+      if (hcoin_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, costItemList_.get(i));
+          .computeUInt32Size(8, hcoin_);
+      }
+      if (iBCGFFJGCID_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, iBCGFFJGCID_);
       }
       if (scoin_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, scoin_);
+          .computeUInt32Size(10, scoin_);
+      }
+      if (minLevel_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, minLevel_);
+      }
+      for (int i = 0; i < costItemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, costItemList_.get(i));
       }
       {
         int dataSize = 0;
@@ -829,65 +846,37 @@ public final class ShopGoodsOuterClass {
         }
         preGoodsIdListMemoizedSerializedSize = dataSize;
       }
-      if (endTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, endTime_);
-      }
-      if (maxLevel_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, maxLevel_);
-      }
-      if (goodsId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, goodsId_);
-      }
-      if (nextRefreshTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, nextRefreshTime_);
-      }
-      if (buyLimit_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, buyLimit_);
-      }
-      if (mcoin_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, mcoin_);
-      }
-      if (hcoin_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, hcoin_);
-      }
-      if (beginTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, beginTime_);
-      }
       if (boughtNum_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(14, boughtNum_);
       }
-      if (uk15_ != 0) {
+      if (endTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, uk15_);
+          .computeUInt32Size(15, endTime_);
       }
-      if (kKKOCADJCHM_ != 0) {
+      if (maxLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(898, kKKOCADJCHM_);
+          .computeUInt32Size(590, maxLevel_);
       }
-      if (dIHOGOJNKHB_ != 0) {
+      if (bHNAJCLPOJE_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(923, dIHOGOJNKHB_);
+          .computeUInt32Size(1487, bHNAJCLPOJE_);
       }
-      if (minLevel_ != 0) {
+      if (kJAGOOHCNON_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1690, minLevel_);
+          .computeUInt32Size(1541, kJAGOOHCNON_);
       }
-      if (oENMLOAFHMJ_ != 0) {
+      if (aFOGAPGJCOH_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1946, oENMLOAFHMJ_);
+          .computeUInt32Size(1587, aFOGAPGJCOH_);
       }
-      if (bNEKKILPEKF_ != 0) {
+      if (eHIAIOONFDH_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1950, bNEKKILPEKF_);
+          .computeBoolSize(1748, eHIAIOONFDH_);
+      }
+      if (mNCAAIMGCJJ_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1942, mNCAAIMGCJJ_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -904,49 +893,51 @@ public final class ShopGoodsOuterClass {
       }
       emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods other = (emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods) obj;
 
-      if (getScoin()
-          != other.getScoin()) return false;
-      if (getMcoin()
-          != other.getMcoin()) return false;
       if (getGoodsId()
           != other.getGoodsId()) return false;
-      if (!getCostItemListList()
-          .equals(other.getCostItemListList())) return false;
-      if (getMinLevel()
-          != other.getMinLevel()) return false;
-      if (getBoughtNum()
-          != other.getBoughtNum()) return false;
-      if (getDIHOGOJNKHB()
-          != other.getDIHOGOJNKHB()) return false;
       if (getBeginTime()
           != other.getBeginTime()) return false;
-      if (getBNEKKILPEKF()
-          != other.getBNEKKILPEKF()) return false;
-      if (!getPreGoodsIdListList()
-          .equals(other.getPreGoodsIdListList())) return false;
-      if (getBuyLimit()
-          != other.getBuyLimit()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getDisableType()
+          != other.getDisableType()) return false;
+      if (getMcoin()
+          != other.getMcoin()) return false;
       if (hasGoodsItem() != other.hasGoodsItem()) return false;
       if (hasGoodsItem()) {
         if (!getGoodsItem()
             .equals(other.getGoodsItem())) return false;
       }
+      if (getBuyLimit()
+          != other.getBuyLimit()) return false;
       if (getHcoin()
           != other.getHcoin()) return false;
-      if (getEKGBDJFIDJO()
-          != other.getEKGBDJFIDJO()) return false;
-      if (getKKKOCADJCHM()
-          != other.getKKKOCADJCHM()) return false;
-      if (getOENMLOAFHMJ()
-          != other.getOENMLOAFHMJ()) return false;
-      if (getMaxLevel()
-          != other.getMaxLevel()) return false;
+      if (getIBCGFFJGCID()
+          != other.getIBCGFFJGCID()) return false;
+      if (getScoin()
+          != other.getScoin()) return false;
+      if (getMinLevel()
+          != other.getMinLevel()) return false;
+      if (!getCostItemListList()
+          .equals(other.getCostItemListList())) return false;
+      if (!getPreGoodsIdListList()
+          .equals(other.getPreGoodsIdListList())) return false;
+      if (getBoughtNum()
+          != other.getBoughtNum()) return false;
       if (getEndTime()
           != other.getEndTime()) return false;
-      if (getUk15()
-          != other.getUk15()) return false;
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
+      if (getMaxLevel()
+          != other.getMaxLevel()) return false;
+      if (getBHNAJCLPOJE()
+          != other.getBHNAJCLPOJE()) return false;
+      if (getKJAGOOHCNON()
+          != other.getKJAGOOHCNON()) return false;
+      if (getAFOGAPGJCOH()
+          != other.getAFOGAPGJCOH()) return false;
+      if (getEHIAIOONFDH()
+          != other.getEHIAIOONFDH()) return false;
+      if (getMNCAAIMGCJJ()
+          != other.getMNCAAIMGCJJ()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -958,52 +949,55 @@ public final class ShopGoodsOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + SCOIN_FIELD_NUMBER;
-      hash = (53 * hash) + getScoin();
-      hash = (37 * hash) + MCOIN_FIELD_NUMBER;
-      hash = (53 * hash) + getMcoin();
       hash = (37 * hash) + GOODS_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGoodsId();
-      if (getCostItemListCount() > 0) {
-        hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getCostItemListList().hashCode();
-      }
-      hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getMinLevel();
-      hash = (37 * hash) + BOUGHT_NUM_FIELD_NUMBER;
-      hash = (53 * hash) + getBoughtNum();
-      hash = (37 * hash) + DIHOGOJNKHB_FIELD_NUMBER;
-      hash = (53 * hash) + getDIHOGOJNKHB();
       hash = (37 * hash) + BEGIN_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getBeginTime();
-      hash = (37 * hash) + BNEKKILPEKF_FIELD_NUMBER;
-      hash = (53 * hash) + getBNEKKILPEKF();
-      if (getPreGoodsIdListCount() > 0) {
-        hash = (37 * hash) + PREGOODSIDLIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPreGoodsIdListList().hashCode();
-      }
-      hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getBuyLimit();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + DISABLE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getDisableType();
+      hash = (37 * hash) + MCOIN_FIELD_NUMBER;
+      hash = (53 * hash) + getMcoin();
       if (hasGoodsItem()) {
         hash = (37 * hash) + GOODS_ITEM_FIELD_NUMBER;
         hash = (53 * hash) + getGoodsItem().hashCode();
       }
+      hash = (37 * hash) + BUY_LIMIT_FIELD_NUMBER;
+      hash = (53 * hash) + getBuyLimit();
       hash = (37 * hash) + HCOIN_FIELD_NUMBER;
       hash = (53 * hash) + getHcoin();
-      hash = (37 * hash) + EKGBDJFIDJO_FIELD_NUMBER;
-      hash = (53 * hash) + getEKGBDJFIDJO();
-      hash = (37 * hash) + KKKOCADJCHM_FIELD_NUMBER;
-      hash = (53 * hash) + getKKKOCADJCHM();
-      hash = (37 * hash) + OENMLOAFHMJ_FIELD_NUMBER;
-      hash = (53 * hash) + getOENMLOAFHMJ();
-      hash = (37 * hash) + MAX_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getMaxLevel();
+      hash = (37 * hash) + IBCGFFJGCID_FIELD_NUMBER;
+      hash = (53 * hash) + getIBCGFFJGCID();
+      hash = (37 * hash) + SCOIN_FIELD_NUMBER;
+      hash = (53 * hash) + getScoin();
+      hash = (37 * hash) + MIN_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getMinLevel();
+      if (getCostItemListCount() > 0) {
+        hash = (37 * hash) + COST_ITEM_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getCostItemListList().hashCode();
+      }
+      if (getPreGoodsIdListCount() > 0) {
+        hash = (37 * hash) + PRE_GOODS_ID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPreGoodsIdListList().hashCode();
+      }
+      hash = (37 * hash) + BOUGHT_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + getBoughtNum();
       hash = (37 * hash) + END_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getEndTime();
-      hash = (37 * hash) + UK15_FIELD_NUMBER;
-      hash = (53 * hash) + getUk15();
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + MAX_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxLevel();
+      hash = (37 * hash) + BHNAJCLPOJE_FIELD_NUMBER;
+      hash = (53 * hash) + getBHNAJCLPOJE();
+      hash = (37 * hash) + KJAGOOHCNON_FIELD_NUMBER;
+      hash = (53 * hash) + getKJAGOOHCNON();
+      hash = (37 * hash) + AFOGAPGJCOH_FIELD_NUMBER;
+      hash = (53 * hash) + getAFOGAPGJCOH();
+      hash = (37 * hash) + EHIAIOONFDH_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getEHIAIOONFDH());
+      hash = (37 * hash) + MNCAAIMGCJJ_FIELD_NUMBER;
+      hash = (53 * hash) + getMNCAAIMGCJJ();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1100,10 +1094,6 @@ public final class ShopGoodsOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OBABFCEJLGK
-     * </pre>
-     *
      * Protobuf type {@code ShopGoods}
      */
     public static final class Builder extends
@@ -1142,31 +1132,15 @@ public final class ShopGoodsOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        scoin_ = 0;
-
-        mcoin_ = 0;
-
         goodsId_ = 0;
 
-        if (costItemListBuilder_ == null) {
-          costItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          costItemListBuilder_.clear();
-        }
-        minLevel_ = 0;
-
-        boughtNum_ = 0;
-
-        dIHOGOJNKHB_ = 0;
-
         beginTime_ = 0;
 
-        bNEKKILPEKF_ = 0;
+        nextRefreshTime_ = 0;
 
-        preGoodsIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        buyLimit_ = 0;
+        disableType_ = 0;
+
+        mcoin_ = 0;
 
         if (goodsItemBuilder_ == null) {
           goodsItem_ = null;
@@ -1174,21 +1148,39 @@ public final class ShopGoodsOuterClass {
           goodsItem_ = null;
           goodsItemBuilder_ = null;
         }
+        buyLimit_ = 0;
+
         hcoin_ = 0;
 
-        eKGBDJFIDJO_ = 0;
+        iBCGFFJGCID_ = 0;
 
-        kKKOCADJCHM_ = 0;
+        scoin_ = 0;
 
-        oENMLOAFHMJ_ = 0;
+        minLevel_ = 0;
 
-        maxLevel_ = 0;
+        if (costItemListBuilder_ == null) {
+          costItemList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          costItemListBuilder_.clear();
+        }
+        preGoodsIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        boughtNum_ = 0;
 
         endTime_ = 0;
 
-        uk15_ = 0;
+        maxLevel_ = 0;
 
-        nextRefreshTime_ = 0;
+        bHNAJCLPOJE_ = 0;
+
+        kJAGOOHCNON_ = 0;
+
+        aFOGAPGJCOH_ = 0;
+
+        eHIAIOONFDH_ = false;
+
+        mNCAAIMGCJJ_ = 0;
 
         return this;
       }
@@ -1217,9 +1209,21 @@ public final class ShopGoodsOuterClass {
       public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods buildPartial() {
         emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods result = new emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods(this);
         int from_bitField0_ = bitField0_;
-        result.scoin_ = scoin_;
-        result.mcoin_ = mcoin_;
         result.goodsId_ = goodsId_;
+        result.beginTime_ = beginTime_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.disableType_ = disableType_;
+        result.mcoin_ = mcoin_;
+        if (goodsItemBuilder_ == null) {
+          result.goodsItem_ = goodsItem_;
+        } else {
+          result.goodsItem_ = goodsItemBuilder_.build();
+        }
+        result.buyLimit_ = buyLimit_;
+        result.hcoin_ = hcoin_;
+        result.iBCGFFJGCID_ = iBCGFFJGCID_;
+        result.scoin_ = scoin_;
+        result.minLevel_ = minLevel_;
         if (costItemListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             costItemList_ = java.util.Collections.unmodifiableList(costItemList_);
@@ -1229,30 +1233,19 @@ public final class ShopGoodsOuterClass {
         } else {
           result.costItemList_ = costItemListBuilder_.build();
         }
-        result.minLevel_ = minLevel_;
-        result.boughtNum_ = boughtNum_;
-        result.dIHOGOJNKHB_ = dIHOGOJNKHB_;
-        result.beginTime_ = beginTime_;
-        result.bNEKKILPEKF_ = bNEKKILPEKF_;
         if (((bitField0_ & 0x00000002) != 0)) {
           preGoodsIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.preGoodsIdList_ = preGoodsIdList_;
-        result.buyLimit_ = buyLimit_;
-        if (goodsItemBuilder_ == null) {
-          result.goodsItem_ = goodsItem_;
-        } else {
-          result.goodsItem_ = goodsItemBuilder_.build();
-        }
-        result.hcoin_ = hcoin_;
-        result.eKGBDJFIDJO_ = eKGBDJFIDJO_;
-        result.kKKOCADJCHM_ = kKKOCADJCHM_;
-        result.oENMLOAFHMJ_ = oENMLOAFHMJ_;
-        result.maxLevel_ = maxLevel_;
+        result.boughtNum_ = boughtNum_;
         result.endTime_ = endTime_;
-        result.uk15_ = uk15_;
-        result.nextRefreshTime_ = nextRefreshTime_;
+        result.maxLevel_ = maxLevel_;
+        result.bHNAJCLPOJE_ = bHNAJCLPOJE_;
+        result.kJAGOOHCNON_ = kJAGOOHCNON_;
+        result.aFOGAPGJCOH_ = aFOGAPGJCOH_;
+        result.eHIAIOONFDH_ = eHIAIOONFDH_;
+        result.mNCAAIMGCJJ_ = mNCAAIMGCJJ_;
         onBuilt();
         return result;
       }
@@ -1301,14 +1294,38 @@ public final class ShopGoodsOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods other) {
         if (other == emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance()) return this;
-        if (other.getScoin() != 0) {
-          setScoin(other.getScoin());
+        if (other.getGoodsId() != 0) {
+          setGoodsId(other.getGoodsId());
+        }
+        if (other.getBeginTime() != 0) {
+          setBeginTime(other.getBeginTime());
+        }
+        if (other.getNextRefreshTime() != 0) {
+          setNextRefreshTime(other.getNextRefreshTime());
+        }
+        if (other.getDisableType() != 0) {
+          setDisableType(other.getDisableType());
         }
         if (other.getMcoin() != 0) {
           setMcoin(other.getMcoin());
         }
-        if (other.getGoodsId() != 0) {
-          setGoodsId(other.getGoodsId());
+        if (other.hasGoodsItem()) {
+          mergeGoodsItem(other.getGoodsItem());
+        }
+        if (other.getBuyLimit() != 0) {
+          setBuyLimit(other.getBuyLimit());
+        }
+        if (other.getHcoin() != 0) {
+          setHcoin(other.getHcoin());
+        }
+        if (other.getIBCGFFJGCID() != 0) {
+          setIBCGFFJGCID(other.getIBCGFFJGCID());
+        }
+        if (other.getScoin() != 0) {
+          setScoin(other.getScoin());
+        }
+        if (other.getMinLevel() != 0) {
+          setMinLevel(other.getMinLevel());
         }
         if (costItemListBuilder_ == null) {
           if (!other.costItemList_.isEmpty()) {
@@ -1336,21 +1353,6 @@ public final class ShopGoodsOuterClass {
             }
           }
         }
-        if (other.getMinLevel() != 0) {
-          setMinLevel(other.getMinLevel());
-        }
-        if (other.getBoughtNum() != 0) {
-          setBoughtNum(other.getBoughtNum());
-        }
-        if (other.getDIHOGOJNKHB() != 0) {
-          setDIHOGOJNKHB(other.getDIHOGOJNKHB());
-        }
-        if (other.getBeginTime() != 0) {
-          setBeginTime(other.getBeginTime());
-        }
-        if (other.getBNEKKILPEKF() != 0) {
-          setBNEKKILPEKF(other.getBNEKKILPEKF());
-        }
         if (!other.preGoodsIdList_.isEmpty()) {
           if (preGoodsIdList_.isEmpty()) {
             preGoodsIdList_ = other.preGoodsIdList_;
@@ -1361,35 +1363,29 @@ public final class ShopGoodsOuterClass {
           }
           onChanged();
         }
-        if (other.getBuyLimit() != 0) {
-          setBuyLimit(other.getBuyLimit());
-        }
-        if (other.hasGoodsItem()) {
-          mergeGoodsItem(other.getGoodsItem());
-        }
-        if (other.getHcoin() != 0) {
-          setHcoin(other.getHcoin());
-        }
-        if (other.getEKGBDJFIDJO() != 0) {
-          setEKGBDJFIDJO(other.getEKGBDJFIDJO());
-        }
-        if (other.getKKKOCADJCHM() != 0) {
-          setKKKOCADJCHM(other.getKKKOCADJCHM());
-        }
-        if (other.getOENMLOAFHMJ() != 0) {
-          setOENMLOAFHMJ(other.getOENMLOAFHMJ());
-        }
-        if (other.getMaxLevel() != 0) {
-          setMaxLevel(other.getMaxLevel());
+        if (other.getBoughtNum() != 0) {
+          setBoughtNum(other.getBoughtNum());
         }
         if (other.getEndTime() != 0) {
           setEndTime(other.getEndTime());
         }
-        if (other.getUk15() != 0) {
-          setUk15(other.getUk15());
+        if (other.getMaxLevel() != 0) {
+          setMaxLevel(other.getMaxLevel());
         }
-        if (other.getNextRefreshTime() != 0) {
-          setNextRefreshTime(other.getNextRefreshTime());
+        if (other.getBHNAJCLPOJE() != 0) {
+          setBHNAJCLPOJE(other.getBHNAJCLPOJE());
+        }
+        if (other.getKJAGOOHCNON() != 0) {
+          setKJAGOOHCNON(other.getKJAGOOHCNON());
+        }
+        if (other.getAFOGAPGJCOH() != 0) {
+          setAFOGAPGJCOH(other.getAFOGAPGJCOH());
+        }
+        if (other.getEHIAIOONFDH() != false) {
+          setEHIAIOONFDH(other.getEHIAIOONFDH());
+        }
+        if (other.getMNCAAIMGCJJ() != 0) {
+          setMNCAAIMGCJJ(other.getMNCAAIMGCJJ());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -1421,99 +1417,9 @@ public final class ShopGoodsOuterClass {
       }
       private int bitField0_;
 
-      private int scoin_ ;
-      /**
-       * <pre>
-       *Stardust // paimon
-       * </pre>
-       *
-       * <code>uint32 scoin = 4;</code>
-       * @return The scoin.
-       */
-      @java.lang.Override
-      public int getScoin() {
-        return scoin_;
-      }
-      /**
-       * <pre>
-       *Stardust // paimon
-       * </pre>
-       *
-       * <code>uint32 scoin = 4;</code>
-       * @param value The scoin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setScoin(int value) {
-        
-        scoin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       *Stardust // paimon
-       * </pre>
-       *
-       * <code>uint32 scoin = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearScoin() {
-        
-        scoin_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int mcoin_ ;
-      /**
-       * <pre>
-       * FEMEEIEHBBL
-       * </pre>
-       *
-       * <code>uint32 mcoin = 11;</code>
-       * @return The mcoin.
-       */
-      @java.lang.Override
-      public int getMcoin() {
-        return mcoin_;
-      }
-      /**
-       * <pre>
-       * FEMEEIEHBBL
-       * </pre>
-       *
-       * <code>uint32 mcoin = 11;</code>
-       * @param value The mcoin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMcoin(int value) {
-        
-        mcoin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <pre>
-       * FEMEEIEHBBL
-       * </pre>
-       *
-       * <code>uint32 mcoin = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMcoin() {
-        
-        mcoin_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int goodsId_ ;
       /**
-       * <pre>
-       * benar
-       * </pre>
-       *
-       * <code>uint32 goods_id = 8;</code>
+       * <code>uint32 goods_id = 1;</code>
        * @return The goodsId.
        */
       @java.lang.Override
@@ -1521,11 +1427,7 @@ public final class ShopGoodsOuterClass {
         return goodsId_;
       }
       /**
-       * <pre>
-       * benar
-       * </pre>
-       *
-       * <code>uint32 goods_id = 8;</code>
+       * <code>uint32 goods_id = 1;</code>
        * @param value The goodsId to set.
        * @return This builder for chaining.
        */
@@ -1536,11 +1438,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <pre>
-       * benar
-       * </pre>
-       *
-       * <code>uint32 goods_id = 8;</code>
+       * <code>uint32 goods_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearGoodsId() {
@@ -1550,6 +1448,404 @@ public final class ShopGoodsOuterClass {
         return this;
       }
 
+      private int beginTime_ ;
+      /**
+       * <code>uint32 begin_time = 2;</code>
+       * @return The beginTime.
+       */
+      @java.lang.Override
+      public int getBeginTime() {
+        return beginTime_;
+      }
+      /**
+       * <code>uint32 begin_time = 2;</code>
+       * @param value The beginTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBeginTime(int value) {
+        
+        beginTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 begin_time = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBeginTime() {
+        
+        beginTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int nextRefreshTime_ ;
+      /**
+       * <code>uint32 next_refresh_time = 3;</code>
+       * @return The nextRefreshTime.
+       */
+      @java.lang.Override
+      public int getNextRefreshTime() {
+        return nextRefreshTime_;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 3;</code>
+       * @param value The nextRefreshTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextRefreshTime(int value) {
+        
+        nextRefreshTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextRefreshTime() {
+        
+        nextRefreshTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int disableType_ ;
+      /**
+       * <code>uint32 disable_type = 4;</code>
+       * @return The disableType.
+       */
+      @java.lang.Override
+      public int getDisableType() {
+        return disableType_;
+      }
+      /**
+       * <code>uint32 disable_type = 4;</code>
+       * @param value The disableType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDisableType(int value) {
+        
+        disableType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 disable_type = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDisableType() {
+        
+        disableType_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mcoin_ ;
+      /**
+       * <code>uint32 mcoin = 5;</code>
+       * @return The mcoin.
+       */
+      @java.lang.Override
+      public int getMcoin() {
+        return mcoin_;
+      }
+      /**
+       * <code>uint32 mcoin = 5;</code>
+       * @param value The mcoin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMcoin(int value) {
+        
+        mcoin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 mcoin = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMcoin() {
+        
+        mcoin_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> goodsItemBuilder_;
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       * @return Whether the goodsItem field is set.
+       */
+      public boolean hasGoodsItem() {
+        return goodsItemBuilder_ != null || goodsItem_ != null;
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       * @return The goodsItem.
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() {
+        if (goodsItemBuilder_ == null) {
+          return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
+        } else {
+          return goodsItemBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public Builder setGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (goodsItemBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          goodsItem_ = value;
+          onChanged();
+        } else {
+          goodsItemBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public Builder setGoodsItem(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (goodsItemBuilder_ == null) {
+          goodsItem_ = builderForValue.build();
+          onChanged();
+        } else {
+          goodsItemBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public Builder mergeGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (goodsItemBuilder_ == null) {
+          if (goodsItem_ != null) {
+            goodsItem_ =
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(goodsItem_).mergeFrom(value).buildPartial();
+          } else {
+            goodsItem_ = value;
+          }
+          onChanged();
+        } else {
+          goodsItemBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public Builder clearGoodsItem() {
+        if (goodsItemBuilder_ == null) {
+          goodsItem_ = null;
+          onChanged();
+        } else {
+          goodsItem_ = null;
+          goodsItemBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGoodsItemBuilder() {
+        
+        onChanged();
+        return getGoodsItemFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() {
+        if (goodsItemBuilder_ != null) {
+          return goodsItemBuilder_.getMessageOrBuilder();
+        } else {
+          return goodsItem_ == null ?
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
+        }
+      }
+      /**
+       * <code>.ItemParam goods_item = 6;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getGoodsItemFieldBuilder() {
+        if (goodsItemBuilder_ == null) {
+          goodsItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  getGoodsItem(),
+                  getParentForChildren(),
+                  isClean());
+          goodsItem_ = null;
+        }
+        return goodsItemBuilder_;
+      }
+
+      private int buyLimit_ ;
+      /**
+       * <code>uint32 buy_limit = 7;</code>
+       * @return The buyLimit.
+       */
+      @java.lang.Override
+      public int getBuyLimit() {
+        return buyLimit_;
+      }
+      /**
+       * <code>uint32 buy_limit = 7;</code>
+       * @param value The buyLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setBuyLimit(int value) {
+        
+        buyLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 buy_limit = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearBuyLimit() {
+        
+        buyLimit_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int hcoin_ ;
+      /**
+       * <code>uint32 hcoin = 8;</code>
+       * @return The hcoin.
+       */
+      @java.lang.Override
+      public int getHcoin() {
+        return hcoin_;
+      }
+      /**
+       * <code>uint32 hcoin = 8;</code>
+       * @param value The hcoin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHcoin(int value) {
+        
+        hcoin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 hcoin = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHcoin() {
+        
+        hcoin_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int iBCGFFJGCID_ ;
+      /**
+       * <code>uint32 IBCGFFJGCID = 9;</code>
+       * @return The iBCGFFJGCID.
+       */
+      @java.lang.Override
+      public int getIBCGFFJGCID() {
+        return iBCGFFJGCID_;
+      }
+      /**
+       * <code>uint32 IBCGFFJGCID = 9;</code>
+       * @param value The iBCGFFJGCID to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIBCGFFJGCID(int value) {
+        
+        iBCGFFJGCID_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IBCGFFJGCID = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIBCGFFJGCID() {
+        
+        iBCGFFJGCID_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int scoin_ ;
+      /**
+       * <code>uint32 scoin = 10;</code>
+       * @return The scoin.
+       */
+      @java.lang.Override
+      public int getScoin() {
+        return scoin_;
+      }
+      /**
+       * <code>uint32 scoin = 10;</code>
+       * @param value The scoin to set.
+       * @return This builder for chaining.
+       */
+      public Builder setScoin(int value) {
+        
+        scoin_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 scoin = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearScoin() {
+        
+        scoin_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int minLevel_ ;
+      /**
+       * <code>uint32 min_level = 11;</code>
+       * @return The minLevel.
+       */
+      @java.lang.Override
+      public int getMinLevel() {
+        return minLevel_;
+      }
+      /**
+       * <code>uint32 min_level = 11;</code>
+       * @param value The minLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMinLevel(int value) {
+        
+        minLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 min_level = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMinLevel() {
+        
+        minLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> costItemList_ =
         java.util.Collections.emptyList();
       private void ensureCostItemListIsMutable() {
@@ -1563,7 +1859,7 @@ public final class ShopGoodsOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> costItemListBuilder_;
 
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getCostItemListList() {
         if (costItemListBuilder_ == null) {
@@ -1573,7 +1869,7 @@ public final class ShopGoodsOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public int getCostItemListCount() {
         if (costItemListBuilder_ == null) {
@@ -1583,7 +1879,7 @@ public final class ShopGoodsOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getCostItemList(int index) {
         if (costItemListBuilder_ == null) {
@@ -1593,7 +1889,7 @@ public final class ShopGoodsOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder setCostItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -1610,7 +1906,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder setCostItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1624,7 +1920,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder addCostItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (costItemListBuilder_ == null) {
@@ -1640,7 +1936,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder addCostItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -1657,7 +1953,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder addCostItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1671,7 +1967,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder addCostItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1685,7 +1981,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder addAllCostItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -1700,7 +1996,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder clearCostItemList() {
         if (costItemListBuilder_ == null) {
@@ -1713,7 +2009,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public Builder removeCostItemList(int index) {
         if (costItemListBuilder_ == null) {
@@ -1726,14 +2022,14 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getCostItemListBuilder(
           int index) {
         return getCostItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getCostItemListOrBuilder(
           int index) {
@@ -1743,7 +2039,7 @@ public final class ShopGoodsOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getCostItemListOrBuilderList() {
@@ -1754,14 +2050,14 @@ public final class ShopGoodsOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder() {
         return getCostItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addCostItemListBuilder(
           int index) {
@@ -1769,7 +2065,7 @@ public final class ShopGoodsOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam cost_item_list = 3;</code>
+       * <code>repeated .ItemParam cost_item_list = 12;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getCostItemListBuilderList() {
@@ -1790,33 +2086,81 @@ public final class ShopGoodsOuterClass {
         return costItemListBuilder_;
       }
 
-      private int minLevel_ ;
-      /**
-       * <code>uint32 min_level = 1690;</code>
-       * @return The minLevel.
-       */
-      @java.lang.Override
-      public int getMinLevel() {
-        return minLevel_;
+      private com.google.protobuf.Internal.IntList preGoodsIdList_ = emptyIntList();
+      private void ensurePreGoodsIdListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          preGoodsIdList_ = mutableCopy(preGoodsIdList_);
+          bitField0_ |= 0x00000002;
+         }
       }
       /**
-       * <code>uint32 min_level = 1690;</code>
-       * @param value The minLevel to set.
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @return A list containing the preGoodsIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getPreGoodsIdListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(preGoodsIdList_) : preGoodsIdList_;
+      }
+      /**
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @return The count of preGoodsIdList.
+       */
+      public int getPreGoodsIdListCount() {
+        return preGoodsIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @param index The index of the element to return.
+       * @return The preGoodsIdList at the given index.
+       */
+      public int getPreGoodsIdList(int index) {
+        return preGoodsIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @param index The index to set the value at.
+       * @param value The preGoodsIdList to set.
        * @return This builder for chaining.
        */
-      public Builder setMinLevel(int value) {
-        
-        minLevel_ = value;
+      public Builder setPreGoodsIdList(
+          int index, int value) {
+        ensurePreGoodsIdListIsMutable();
+        preGoodsIdList_.setInt(index, value);
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 min_level = 1690;</code>
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @param value The preGoodsIdList to add.
        * @return This builder for chaining.
        */
-      public Builder clearMinLevel() {
-        
-        minLevel_ = 0;
+      public Builder addPreGoodsIdList(int value) {
+        ensurePreGoodsIdListIsMutable();
+        preGoodsIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @param values The preGoodsIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllPreGoodsIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensurePreGoodsIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, preGoodsIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 pre_goods_id_list = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPreGoodsIdList() {
+        preGoodsIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
@@ -1852,486 +2196,9 @@ public final class ShopGoodsOuterClass {
         return this;
       }
 
-      private int dIHOGOJNKHB_ ;
-      /**
-       * <code>uint32 DIHOGOJNKHB = 923;</code>
-       * @return The dIHOGOJNKHB.
-       */
-      @java.lang.Override
-      public int getDIHOGOJNKHB() {
-        return dIHOGOJNKHB_;
-      }
-      /**
-       * <code>uint32 DIHOGOJNKHB = 923;</code>
-       * @param value The dIHOGOJNKHB to set.
-       * @return This builder for chaining.
-       */
-      public Builder setDIHOGOJNKHB(int value) {
-        
-        dIHOGOJNKHB_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 DIHOGOJNKHB = 923;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearDIHOGOJNKHB() {
-        
-        dIHOGOJNKHB_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int beginTime_ ;
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @return The beginTime.
-       */
-      @java.lang.Override
-      public int getBeginTime() {
-        return beginTime_;
-      }
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @param value The beginTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBeginTime(int value) {
-        
-        beginTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 begin_time = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBeginTime() {
-        
-        beginTime_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int bNEKKILPEKF_ ;
-      /**
-       * <code>uint32 BNEKKILPEKF = 1950;</code>
-       * @return The bNEKKILPEKF.
-       */
-      @java.lang.Override
-      public int getBNEKKILPEKF() {
-        return bNEKKILPEKF_;
-      }
-      /**
-       * <code>uint32 BNEKKILPEKF = 1950;</code>
-       * @param value The bNEKKILPEKF to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBNEKKILPEKF(int value) {
-        
-        bNEKKILPEKF_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 BNEKKILPEKF = 1950;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBNEKKILPEKF() {
-        
-        bNEKKILPEKF_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList preGoodsIdList_ = emptyIntList();
-      private void ensurePreGoodsIdListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          preGoodsIdList_ = mutableCopy(preGoodsIdList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @return A list containing the preGoodsIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getPreGoodsIdListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(preGoodsIdList_) : preGoodsIdList_;
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @return The count of preGoodsIdList.
-       */
-      public int getPreGoodsIdListCount() {
-        return preGoodsIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @param index The index of the element to return.
-       * @return The preGoodsIdList at the given index.
-       */
-      public int getPreGoodsIdList(int index) {
-        return preGoodsIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @param index The index to set the value at.
-       * @param value The preGoodsIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPreGoodsIdList(
-          int index, int value) {
-        ensurePreGoodsIdListIsMutable();
-        preGoodsIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @param value The preGoodsIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addPreGoodsIdList(int value) {
-        ensurePreGoodsIdListIsMutable();
-        preGoodsIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @param values The preGoodsIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllPreGoodsIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensurePreGoodsIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, preGoodsIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 preGoodsIdList = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPreGoodsIdList() {
-        preGoodsIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
-        onChanged();
-        return this;
-      }
-
-      private int buyLimit_ ;
-      /**
-       * <code>uint32 buy_limit = 10;</code>
-       * @return The buyLimit.
-       */
-      @java.lang.Override
-      public int getBuyLimit() {
-        return buyLimit_;
-      }
-      /**
-       * <code>uint32 buy_limit = 10;</code>
-       * @param value The buyLimit to set.
-       * @return This builder for chaining.
-       */
-      public Builder setBuyLimit(int value) {
-        
-        buyLimit_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 buy_limit = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearBuyLimit() {
-        
-        buyLimit_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam goodsItem_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> goodsItemBuilder_;
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       * @return Whether the goodsItem field is set.
-       */
-      public boolean hasGoodsItem() {
-        return goodsItemBuilder_ != null || goodsItem_ != null;
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       * @return The goodsItem.
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getGoodsItem() {
-        if (goodsItemBuilder_ == null) {
-          return goodsItem_ == null ? emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
-        } else {
-          return goodsItemBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public Builder setGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (goodsItemBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          goodsItem_ = value;
-          onChanged();
-        } else {
-          goodsItemBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public Builder setGoodsItem(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (goodsItemBuilder_ == null) {
-          goodsItem_ = builderForValue.build();
-          onChanged();
-        } else {
-          goodsItemBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public Builder mergeGoodsItem(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (goodsItemBuilder_ == null) {
-          if (goodsItem_ != null) {
-            goodsItem_ =
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.newBuilder(goodsItem_).mergeFrom(value).buildPartial();
-          } else {
-            goodsItem_ = value;
-          }
-          onChanged();
-        } else {
-          goodsItemBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public Builder clearGoodsItem() {
-        if (goodsItemBuilder_ == null) {
-          goodsItem_ = null;
-          onChanged();
-        } else {
-          goodsItem_ = null;
-          goodsItemBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getGoodsItemBuilder() {
-        
-        onChanged();
-        return getGoodsItemFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getGoodsItemOrBuilder() {
-        if (goodsItemBuilder_ != null) {
-          return goodsItemBuilder_.getMessageOrBuilder();
-        } else {
-          return goodsItem_ == null ?
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance() : goodsItem_;
-        }
-      }
-      /**
-       * <code>.ItemParam goods_item = 1;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getGoodsItemFieldBuilder() {
-        if (goodsItemBuilder_ == null) {
-          goodsItemBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  getGoodsItem(),
-                  getParentForChildren(),
-                  isClean());
-          goodsItem_ = null;
-        }
-        return goodsItemBuilder_;
-      }
-
-      private int hcoin_ ;
-      /**
-       * <code>uint32 hcoin = 12;</code>
-       * @return The hcoin.
-       */
-      @java.lang.Override
-      public int getHcoin() {
-        return hcoin_;
-      }
-      /**
-       * <code>uint32 hcoin = 12;</code>
-       * @param value The hcoin to set.
-       * @return This builder for chaining.
-       */
-      public Builder setHcoin(int value) {
-        
-        hcoin_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 hcoin = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearHcoin() {
-        
-        hcoin_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int eKGBDJFIDJO_ ;
-      /**
-       * <code>uint32 EKGBDJFIDJO = 2;</code>
-       * @return The eKGBDJFIDJO.
-       */
-      @java.lang.Override
-      public int getEKGBDJFIDJO() {
-        return eKGBDJFIDJO_;
-      }
-      /**
-       * <code>uint32 EKGBDJFIDJO = 2;</code>
-       * @param value The eKGBDJFIDJO to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEKGBDJFIDJO(int value) {
-        
-        eKGBDJFIDJO_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 EKGBDJFIDJO = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEKGBDJFIDJO() {
-        
-        eKGBDJFIDJO_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int kKKOCADJCHM_ ;
-      /**
-       * <code>uint32 KKKOCADJCHM = 898;</code>
-       * @return The kKKOCADJCHM.
-       */
-      @java.lang.Override
-      public int getKKKOCADJCHM() {
-        return kKKOCADJCHM_;
-      }
-      /**
-       * <code>uint32 KKKOCADJCHM = 898;</code>
-       * @param value The kKKOCADJCHM to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKKKOCADJCHM(int value) {
-        
-        kKKOCADJCHM_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KKKOCADJCHM = 898;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKKKOCADJCHM() {
-        
-        kKKOCADJCHM_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int oENMLOAFHMJ_ ;
-      /**
-       * <code>uint32 OENMLOAFHMJ = 1946;</code>
-       * @return The oENMLOAFHMJ.
-       */
-      @java.lang.Override
-      public int getOENMLOAFHMJ() {
-        return oENMLOAFHMJ_;
-      }
-      /**
-       * <code>uint32 OENMLOAFHMJ = 1946;</code>
-       * @param value The oENMLOAFHMJ to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOENMLOAFHMJ(int value) {
-        
-        oENMLOAFHMJ_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 OENMLOAFHMJ = 1946;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOENMLOAFHMJ() {
-        
-        oENMLOAFHMJ_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int maxLevel_ ;
-      /**
-       * <code>uint32 max_level = 7;</code>
-       * @return The maxLevel.
-       */
-      @java.lang.Override
-      public int getMaxLevel() {
-        return maxLevel_;
-      }
-      /**
-       * <code>uint32 max_level = 7;</code>
-       * @param value The maxLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMaxLevel(int value) {
-        
-        maxLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 max_level = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaxLevel() {
-        
-        maxLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int endTime_ ;
       /**
-       * <code>uint32 end_time = 6;</code>
+       * <code>uint32 end_time = 15;</code>
        * @return The endTime.
        */
       @java.lang.Override
@@ -2339,7 +2206,7 @@ public final class ShopGoodsOuterClass {
         return endTime_;
       }
       /**
-       * <code>uint32 end_time = 6;</code>
+       * <code>uint32 end_time = 15;</code>
        * @param value The endTime to set.
        * @return This builder for chaining.
        */
@@ -2350,7 +2217,7 @@ public final class ShopGoodsOuterClass {
         return this;
       }
       /**
-       * <code>uint32 end_time = 6;</code>
+       * <code>uint32 end_time = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearEndTime() {
@@ -2360,82 +2227,188 @@ public final class ShopGoodsOuterClass {
         return this;
       }
 
-      private int uk15_ ;
+      private int maxLevel_ ;
       /**
-       * <code>uint32 uk15 = 15;</code>
-       * @return The uk15.
+       * <code>uint32 max_level = 590;</code>
+       * @return The maxLevel.
        */
       @java.lang.Override
-      public int getUk15() {
-        return uk15_;
+      public int getMaxLevel() {
+        return maxLevel_;
       }
       /**
-       * <code>uint32 uk15 = 15;</code>
-       * @param value The uk15 to set.
+       * <code>uint32 max_level = 590;</code>
+       * @param value The maxLevel to set.
        * @return This builder for chaining.
        */
-      public Builder setUk15(int value) {
+      public Builder setMaxLevel(int value) {
         
-        uk15_ = value;
+        maxLevel_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 uk15 = 15;</code>
+       * <code>uint32 max_level = 590;</code>
        * @return This builder for chaining.
        */
-      public Builder clearUk15() {
+      public Builder clearMaxLevel() {
         
-        uk15_ = 0;
+        maxLevel_ = 0;
         onChanged();
         return this;
       }
 
-      private int nextRefreshTime_ ;
+      private int bHNAJCLPOJE_ ;
       /**
-       * <pre>
-       * mcoin = Crystals
-       * scoin = Stardust
-       * hcoin = Starglitter
-       * </pre>
-       *
-       * <code>uint32 next_refresh_time = 9;</code>
-       * @return The nextRefreshTime.
+       * <code>uint32 BHNAJCLPOJE = 1487;</code>
+       * @return The bHNAJCLPOJE.
        */
       @java.lang.Override
-      public int getNextRefreshTime() {
-        return nextRefreshTime_;
+      public int getBHNAJCLPOJE() {
+        return bHNAJCLPOJE_;
       }
       /**
-       * <pre>
-       * mcoin = Crystals
-       * scoin = Stardust
-       * hcoin = Starglitter
-       * </pre>
-       *
-       * <code>uint32 next_refresh_time = 9;</code>
-       * @param value The nextRefreshTime to set.
+       * <code>uint32 BHNAJCLPOJE = 1487;</code>
+       * @param value The bHNAJCLPOJE to set.
        * @return This builder for chaining.
        */
-      public Builder setNextRefreshTime(int value) {
+      public Builder setBHNAJCLPOJE(int value) {
         
-        nextRefreshTime_ = value;
+        bHNAJCLPOJE_ = value;
         onChanged();
         return this;
       }
       /**
-       * <pre>
-       * mcoin = Crystals
-       * scoin = Stardust
-       * hcoin = Starglitter
-       * </pre>
-       *
-       * <code>uint32 next_refresh_time = 9;</code>
+       * <code>uint32 BHNAJCLPOJE = 1487;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNextRefreshTime() {
+      public Builder clearBHNAJCLPOJE() {
         
-        nextRefreshTime_ = 0;
+        bHNAJCLPOJE_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int kJAGOOHCNON_ ;
+      /**
+       * <code>uint32 KJAGOOHCNON = 1541;</code>
+       * @return The kJAGOOHCNON.
+       */
+      @java.lang.Override
+      public int getKJAGOOHCNON() {
+        return kJAGOOHCNON_;
+      }
+      /**
+       * <code>uint32 KJAGOOHCNON = 1541;</code>
+       * @param value The kJAGOOHCNON to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKJAGOOHCNON(int value) {
+        
+        kJAGOOHCNON_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 KJAGOOHCNON = 1541;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKJAGOOHCNON() {
+        
+        kJAGOOHCNON_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int aFOGAPGJCOH_ ;
+      /**
+       * <code>uint32 AFOGAPGJCOH = 1587;</code>
+       * @return The aFOGAPGJCOH.
+       */
+      @java.lang.Override
+      public int getAFOGAPGJCOH() {
+        return aFOGAPGJCOH_;
+      }
+      /**
+       * <code>uint32 AFOGAPGJCOH = 1587;</code>
+       * @param value The aFOGAPGJCOH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAFOGAPGJCOH(int value) {
+        
+        aFOGAPGJCOH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 AFOGAPGJCOH = 1587;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAFOGAPGJCOH() {
+        
+        aFOGAPGJCOH_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean eHIAIOONFDH_ ;
+      /**
+       * <code>bool EHIAIOONFDH = 1748;</code>
+       * @return The eHIAIOONFDH.
+       */
+      @java.lang.Override
+      public boolean getEHIAIOONFDH() {
+        return eHIAIOONFDH_;
+      }
+      /**
+       * <code>bool EHIAIOONFDH = 1748;</code>
+       * @param value The eHIAIOONFDH to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEHIAIOONFDH(boolean value) {
+        
+        eHIAIOONFDH_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool EHIAIOONFDH = 1748;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEHIAIOONFDH() {
+        
+        eHIAIOONFDH_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int mNCAAIMGCJJ_ ;
+      /**
+       * <code>uint32 MNCAAIMGCJJ = 1942;</code>
+       * @return The mNCAAIMGCJJ.
+       */
+      @java.lang.Override
+      public int getMNCAAIMGCJJ() {
+        return mNCAAIMGCJJ_;
+      }
+      /**
+       * <code>uint32 MNCAAIMGCJJ = 1942;</code>
+       * @param value The mNCAAIMGCJJ to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMNCAAIMGCJJ(int value) {
+        
+        mNCAAIMGCJJ_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MNCAAIMGCJJ = 1942;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMNCAAIMGCJJ() {
+        
+        mNCAAIMGCJJ_ = 0;
         onChanged();
         return this;
       }
@@ -2506,19 +2479,20 @@ public final class ShopGoodsOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\017ShopGoods.proto\032\017ItemParam.proto\"\260\003\n\tS" +
-      "hopGoods\022\r\n\005scoin\030\004 \001(\r\022\r\n\005mcoin\030\013 \001(\r\022\020" +
-      "\n\010goods_id\030\010 \001(\r\022\"\n\016cost_item_list\030\003 \003(\013" +
-      "2\n.ItemParam\022\022\n\tmin_level\030\232\r \001(\r\022\022\n\nboug" +
-      "ht_num\030\016 \001(\r\022\024\n\013DIHOGOJNKHB\030\233\007 \001(\r\022\022\n\nbe" +
-      "gin_time\030\r \001(\r\022\024\n\013BNEKKILPEKF\030\236\017 \001(\r\022\026\n\016" +
-      "preGoodsIdList\030\005 \003(\r\022\021\n\tbuy_limit\030\n \001(\r\022" +
-      "\036\n\ngoods_item\030\001 \001(\0132\n.ItemParam\022\r\n\005hcoin" +
-      "\030\014 \001(\r\022\023\n\013EKGBDJFIDJO\030\002 \001(\r\022\024\n\013KKKOCADJC" +
-      "HM\030\202\007 \001(\r\022\024\n\013OENMLOAFHMJ\030\232\017 \001(\r\022\021\n\tmax_l" +
-      "evel\030\007 \001(\r\022\020\n\010end_time\030\006 \001(\r\022\014\n\004uk15\030\017 \001" +
-      "(\r\022\031\n\021next_refresh_time\030\t \001(\rB\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\n\017ShopGoods.proto\032\017ItemParam.proto\"\321\003\n\tS" +
+      "hopGoods\022\020\n\010goods_id\030\001 \001(\r\022\022\n\nbegin_time" +
+      "\030\002 \001(\r\022\031\n\021next_refresh_time\030\003 \001(\r\022\024\n\014dis" +
+      "able_type\030\004 \001(\r\022\r\n\005mcoin\030\005 \001(\r\022\036\n\ngoods_" +
+      "item\030\006 \001(\0132\n.ItemParam\022\021\n\tbuy_limit\030\007 \001(" +
+      "\r\022\r\n\005hcoin\030\010 \001(\r\022\023\n\013IBCGFFJGCID\030\t \001(\r\022\r\n" +
+      "\005scoin\030\n \001(\r\022\021\n\tmin_level\030\013 \001(\r\022\"\n\016cost_" +
+      "item_list\030\014 \003(\0132\n.ItemParam\022\031\n\021pre_goods" +
+      "_id_list\030\r \003(\r\022\022\n\nbought_num\030\016 \001(\r\022\020\n\010en" +
+      "d_time\030\017 \001(\r\022\022\n\tmax_level\030\316\004 \001(\r\022\024\n\013BHNA" +
+      "JCLPOJE\030\317\013 \001(\r\022\024\n\013KJAGOOHCNON\030\205\014 \001(\r\022\024\n\013" +
+      "AFOGAPGJCOH\030\263\014 \001(\r\022\024\n\013EHIAIOONFDH\030\324\r \001(\010" +
+      "\022\024\n\013MNCAAIMGCJJ\030\226\017 \001(\rB\033\n\031emu.grasscutte" +
+      "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -2530,7 +2504,7 @@ public final class ShopGoodsOuterClass {
     internal_static_ShopGoods_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShopGoods_descriptor,
-        new java.lang.String[] { "Scoin", "Mcoin", "GoodsId", "CostItemList", "MinLevel", "BoughtNum", "DIHOGOJNKHB", "BeginTime", "BNEKKILPEKF", "PreGoodsIdList", "BuyLimit", "GoodsItem", "Hcoin", "EKGBDJFIDJO", "KKKOCADJCHM", "OENMLOAFHMJ", "MaxLevel", "EndTime", "Uk15", "NextRefreshTime", });
+        new java.lang.String[] { "GoodsId", "BeginTime", "NextRefreshTime", "DisableType", "Mcoin", "GoodsItem", "BuyLimit", "Hcoin", "IBCGFFJGCID", "Scoin", "MinLevel", "CostItemList", "PreGoodsIdList", "BoughtNum", "EndTime", "MaxLevel", "BHNAJCLPOJE", "KJAGOOHCNON", "AFOGAPGJCOH", "EHIAIOONFDH", "MNCAAIMGCJJ", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopMcoinProductOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopMcoinProductOuterClass.java
index 161486955..58557d895 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopMcoinProductOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopMcoinProductOuterClass.java
@@ -73,10 +73,6 @@ public final class ShopMcoinProductOuterClass {
     boolean getIsAudit();
   }
   /**
-   * <pre>
-   * Obf: BNMNBLNCBIG
-   * </pre>
-   *
    * Protobuf type {@code ShopMcoinProduct}
    */
   public static final class ShopMcoinProduct extends
@@ -544,10 +540,6 @@ public final class ShopMcoinProductOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BNMNBLNCBIG
-     * </pre>
-     *
      * Protobuf type {@code ShopMcoinProduct}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShopOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShopOuterClass.java
index 622550c82..e48c80a95 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShopOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShopOuterClass.java
@@ -19,130 +19,136 @@ public final class ShopOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> 
-        getCardProductListList();
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index);
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    int getCardProductListCount();
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
-        getCardProductListOrBuilderList();
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> 
-        getGoodsListList();
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index);
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    int getGoodsListCount();
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
-        getGoodsListOrBuilderList();
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> 
-        getConcertProductListList();
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index);
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    int getConcertProductListCount();
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
-        getConcertProductListOrBuilderList();
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 city_reputation_level = 3;</code>
+     * <pre>
+     * 5
+     * </pre>
+     *
+     * <code>uint32 city_reputation_level = 2;</code>
      * @return The cityReputationLevel.
      */
     int getCityReputationLevel();
 
     /**
-     * <code>uint32 shop_type = 4;</code>
+     * <code>uint32 shop_type = 3;</code>
      * @return The shopType.
      */
     int getShopType();
 
     /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> 
-        getMcoinProductListList();
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct getMcoinProductList(int index);
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    int getMcoinProductListCount();
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> 
-        getMcoinProductListOrBuilderList();
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder getMcoinProductListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 next_refresh_time = 8;</code>
+     * <code>uint32 next_refresh_time = 4;</code>
      * @return The nextRefreshTime.
      */
     int getNextRefreshTime();
 
     /**
-     * <code>uint32 city_id = 7;</code>
+     * <code>uint32 DGEAKOFNGDN = 5;</code>
+     * @return The dGEAKOFNGDN.
+     */
+    int getDGEAKOFNGDN();
+
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> 
+        getMcoinProductListList();
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct getMcoinProductList(int index);
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    int getMcoinProductListCount();
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> 
+        getMcoinProductListOrBuilderList();
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder getMcoinProductListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> 
+        getCardProductListList();
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index);
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    int getCardProductListCount();
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
+        getCardProductListOrBuilderList();
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> 
+        getGoodsListList();
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index);
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    int getGoodsListCount();
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
+        getGoodsListOrBuilderList();
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
+        int index);
+
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> 
+        getConcertProductListList();
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index);
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    int getConcertProductListCount();
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
+        getConcertProductListOrBuilderList();
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
+        int index);
+
+    /**
+     * <code>uint32 city_id = 14;</code>
      * @return The cityId.
      */
     int getCityId();
   }
   /**
-   * <pre>
-   * Obf: MKCHFJGDPJL
-   * </pre>
-   *
    * Protobuf type {@code Shop}
    */
   public static final class Shop extends
@@ -155,10 +161,10 @@ public final class ShopOuterClass {
       super(builder);
     }
     private Shop() {
+      mcoinProductList_ = java.util.Collections.emptyList();
       cardProductList_ = java.util.Collections.emptyList();
       goodsList_ = java.util.Collections.emptyList();
       concertProductList_ = java.util.Collections.emptyList();
-      mcoinProductList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -192,62 +198,67 @@ public final class ShopOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
-              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+            case 16: {
+
+              cityReputationLevel_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              shopType_ = input.readUInt32();
+              break;
+            }
+            case 32: {
+
+              nextRefreshTime_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              dGEAKOFNGDN_ = input.readUInt32();
+              break;
+            }
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 mcoinProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct>();
-                mutable_bitField0_ |= 0x00000008;
+                mutable_bitField0_ |= 0x00000001;
               }
               mcoinProductList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.parser(), extensionRegistry));
               break;
             }
-            case 24: {
-
-              cityReputationLevel_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-
-              shopType_ = input.readUInt32();
-              break;
-            }
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
-                concertProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct>();
-                mutable_bitField0_ |= 0x00000004;
-              }
-              concertProductList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.parser(), extensionRegistry));
-              break;
-            }
-            case 50: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>();
+                cardProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct>();
                 mutable_bitField0_ |= 0x00000002;
               }
+              cardProductList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.parser(), extensionRegistry));
+              break;
+            }
+            case 82: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>();
+                mutable_bitField0_ |= 0x00000004;
+              }
               goodsList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.parser(), extensionRegistry));
               break;
             }
-            case 56: {
+            case 98: {
+              if (!((mutable_bitField0_ & 0x00000008) != 0)) {
+                concertProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct>();
+                mutable_bitField0_ |= 0x00000008;
+              }
+              concertProductList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.parser(), extensionRegistry));
+              break;
+            }
+            case 112: {
 
               cityId_ = input.readUInt32();
               break;
             }
-            case 64: {
-
-              nextRefreshTime_ = input.readUInt32();
-              break;
-            }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                cardProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              cardProductList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -263,17 +274,17 @@ public final class ShopOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           mcoinProductList_ = java.util.Collections.unmodifiableList(mcoinProductList_);
         }
-        if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          concertProductList_ = java.util.Collections.unmodifiableList(concertProductList_);
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          cardProductList_ = java.util.Collections.unmodifiableList(cardProductList_);
+        }
+        if (((mutable_bitField0_ & 0x00000004) != 0)) {
           goodsList_ = java.util.Collections.unmodifiableList(goodsList_);
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          cardProductList_ = java.util.Collections.unmodifiableList(cardProductList_);
+        if (((mutable_bitField0_ & 0x00000008) != 0)) {
+          concertProductList_ = java.util.Collections.unmodifiableList(concertProductList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -292,130 +303,14 @@ public final class ShopOuterClass {
               emu.grasscutter.net.proto.ShopOuterClass.Shop.class, emu.grasscutter.net.proto.ShopOuterClass.Shop.Builder.class);
     }
 
-    public static final int CARD_PRODUCT_LIST_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> cardProductList_;
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> getCardProductListList() {
-      return cardProductList_;
-    }
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
-        getCardProductListOrBuilderList() {
-      return cardProductList_;
-    }
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    @java.lang.Override
-    public int getCardProductListCount() {
-      return cardProductList_.size();
-    }
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index) {
-      return cardProductList_.get(index);
-    }
-    /**
-     * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
-        int index) {
-      return cardProductList_.get(index);
-    }
-
-    public static final int GOODS_LIST_FIELD_NUMBER = 6;
-    private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_;
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
-      return goodsList_;
-    }
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
-        getGoodsListOrBuilderList() {
-      return goodsList_;
-    }
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    @java.lang.Override
-    public int getGoodsListCount() {
-      return goodsList_.size();
-    }
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
-      return goodsList_.get(index);
-    }
-    /**
-     * <code>repeated .ShopGoods goods_list = 6;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
-        int index) {
-      return goodsList_.get(index);
-    }
-
-    public static final int CONCERT_PRODUCT_LIST_FIELD_NUMBER = 5;
-    private java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> concertProductList_;
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> getConcertProductListList() {
-      return concertProductList_;
-    }
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
-        getConcertProductListOrBuilderList() {
-      return concertProductList_;
-    }
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    @java.lang.Override
-    public int getConcertProductListCount() {
-      return concertProductList_.size();
-    }
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index) {
-      return concertProductList_.get(index);
-    }
-    /**
-     * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
-        int index) {
-      return concertProductList_.get(index);
-    }
-
-    public static final int CITY_REPUTATION_LEVEL_FIELD_NUMBER = 3;
+    public static final int CITY_REPUTATION_LEVEL_FIELD_NUMBER = 2;
     private int cityReputationLevel_;
     /**
-     * <code>uint32 city_reputation_level = 3;</code>
+     * <pre>
+     * 5
+     * </pre>
+     *
+     * <code>uint32 city_reputation_level = 2;</code>
      * @return The cityReputationLevel.
      */
     @java.lang.Override
@@ -423,10 +318,10 @@ public final class ShopOuterClass {
       return cityReputationLevel_;
     }
 
-    public static final int SHOP_TYPE_FIELD_NUMBER = 4;
+    public static final int SHOP_TYPE_FIELD_NUMBER = 3;
     private int shopType_;
     /**
-     * <code>uint32 shop_type = 4;</code>
+     * <code>uint32 shop_type = 3;</code>
      * @return The shopType.
      */
     @java.lang.Override
@@ -434,50 +329,10 @@ public final class ShopOuterClass {
       return shopType_;
     }
 
-    public static final int MCOIN_PRODUCT_LIST_FIELD_NUMBER = 2;
-    private java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> mcoinProductList_;
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> getMcoinProductListList() {
-      return mcoinProductList_;
-    }
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> 
-        getMcoinProductListOrBuilderList() {
-      return mcoinProductList_;
-    }
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    @java.lang.Override
-    public int getMcoinProductListCount() {
-      return mcoinProductList_.size();
-    }
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct getMcoinProductList(int index) {
-      return mcoinProductList_.get(index);
-    }
-    /**
-     * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder getMcoinProductListOrBuilder(
-        int index) {
-      return mcoinProductList_.get(index);
-    }
-
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 8;
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 4;
     private int nextRefreshTime_;
     /**
-     * <code>uint32 next_refresh_time = 8;</code>
+     * <code>uint32 next_refresh_time = 4;</code>
      * @return The nextRefreshTime.
      */
     @java.lang.Override
@@ -485,10 +340,181 @@ public final class ShopOuterClass {
       return nextRefreshTime_;
     }
 
-    public static final int CITY_ID_FIELD_NUMBER = 7;
+    public static final int DGEAKOFNGDN_FIELD_NUMBER = 5;
+    private int dGEAKOFNGDN_;
+    /**
+     * <code>uint32 DGEAKOFNGDN = 5;</code>
+     * @return The dGEAKOFNGDN.
+     */
+    @java.lang.Override
+    public int getDGEAKOFNGDN() {
+      return dGEAKOFNGDN_;
+    }
+
+    public static final int MCOIN_PRODUCT_LIST_FIELD_NUMBER = 7;
+    private java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> mcoinProductList_;
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> getMcoinProductListList() {
+      return mcoinProductList_;
+    }
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> 
+        getMcoinProductListOrBuilderList() {
+      return mcoinProductList_;
+    }
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    @java.lang.Override
+    public int getMcoinProductListCount() {
+      return mcoinProductList_.size();
+    }
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct getMcoinProductList(int index) {
+      return mcoinProductList_.get(index);
+    }
+    /**
+     * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder getMcoinProductListOrBuilder(
+        int index) {
+      return mcoinProductList_.get(index);
+    }
+
+    public static final int CARD_PRODUCT_LIST_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> cardProductList_;
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> getCardProductListList() {
+      return cardProductList_;
+    }
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
+        getCardProductListOrBuilderList() {
+      return cardProductList_;
+    }
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    @java.lang.Override
+    public int getCardProductListCount() {
+      return cardProductList_.size();
+    }
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index) {
+      return cardProductList_.get(index);
+    }
+    /**
+     * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
+        int index) {
+      return cardProductList_.get(index);
+    }
+
+    public static final int GOODS_LIST_FIELD_NUMBER = 10;
+    private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_;
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
+      return goodsList_;
+    }
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
+        getGoodsListOrBuilderList() {
+      return goodsList_;
+    }
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    @java.lang.Override
+    public int getGoodsListCount() {
+      return goodsList_.size();
+    }
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
+      return goodsList_.get(index);
+    }
+    /**
+     * <code>repeated .ShopGoods goods_list = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
+        int index) {
+      return goodsList_.get(index);
+    }
+
+    public static final int CONCERT_PRODUCT_LIST_FIELD_NUMBER = 12;
+    private java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> concertProductList_;
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> getConcertProductListList() {
+      return concertProductList_;
+    }
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
+        getConcertProductListOrBuilderList() {
+      return concertProductList_;
+    }
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    @java.lang.Override
+    public int getConcertProductListCount() {
+      return concertProductList_.size();
+    }
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index) {
+      return concertProductList_.get(index);
+    }
+    /**
+     * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
+        int index) {
+      return concertProductList_.get(index);
+    }
+
+    public static final int CITY_ID_FIELD_NUMBER = 14;
     private int cityId_;
     /**
-     * <code>uint32 city_id = 7;</code>
+     * <code>uint32 city_id = 14;</code>
      * @return The cityId.
      */
     @java.lang.Override
@@ -510,29 +536,32 @@ public final class ShopOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < mcoinProductList_.size(); i++) {
-        output.writeMessage(2, mcoinProductList_.get(i));
-      }
       if (cityReputationLevel_ != 0) {
-        output.writeUInt32(3, cityReputationLevel_);
+        output.writeUInt32(2, cityReputationLevel_);
       }
       if (shopType_ != 0) {
-        output.writeUInt32(4, shopType_);
-      }
-      for (int i = 0; i < concertProductList_.size(); i++) {
-        output.writeMessage(5, concertProductList_.get(i));
-      }
-      for (int i = 0; i < goodsList_.size(); i++) {
-        output.writeMessage(6, goodsList_.get(i));
-      }
-      if (cityId_ != 0) {
-        output.writeUInt32(7, cityId_);
+        output.writeUInt32(3, shopType_);
       }
       if (nextRefreshTime_ != 0) {
-        output.writeUInt32(8, nextRefreshTime_);
+        output.writeUInt32(4, nextRefreshTime_);
+      }
+      if (dGEAKOFNGDN_ != 0) {
+        output.writeUInt32(5, dGEAKOFNGDN_);
+      }
+      for (int i = 0; i < mcoinProductList_.size(); i++) {
+        output.writeMessage(7, mcoinProductList_.get(i));
       }
       for (int i = 0; i < cardProductList_.size(); i++) {
-        output.writeMessage(12, cardProductList_.get(i));
+        output.writeMessage(9, cardProductList_.get(i));
+      }
+      for (int i = 0; i < goodsList_.size(); i++) {
+        output.writeMessage(10, goodsList_.get(i));
+      }
+      for (int i = 0; i < concertProductList_.size(); i++) {
+        output.writeMessage(12, concertProductList_.get(i));
+      }
+      if (cityId_ != 0) {
+        output.writeUInt32(14, cityId_);
       }
       unknownFields.writeTo(output);
     }
@@ -543,37 +572,41 @@ public final class ShopOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < mcoinProductList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, mcoinProductList_.get(i));
-      }
       if (cityReputationLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, cityReputationLevel_);
+          .computeUInt32Size(2, cityReputationLevel_);
       }
       if (shopType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, shopType_);
-      }
-      for (int i = 0; i < concertProductList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, concertProductList_.get(i));
-      }
-      for (int i = 0; i < goodsList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, goodsList_.get(i));
-      }
-      if (cityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, cityId_);
+          .computeUInt32Size(3, shopType_);
       }
       if (nextRefreshTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(8, nextRefreshTime_);
+          .computeUInt32Size(4, nextRefreshTime_);
+      }
+      if (dGEAKOFNGDN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, dGEAKOFNGDN_);
+      }
+      for (int i = 0; i < mcoinProductList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, mcoinProductList_.get(i));
       }
       for (int i = 0; i < cardProductList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, cardProductList_.get(i));
+          .computeMessageSize(9, cardProductList_.get(i));
+      }
+      for (int i = 0; i < goodsList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, goodsList_.get(i));
+      }
+      for (int i = 0; i < concertProductList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(12, concertProductList_.get(i));
+      }
+      if (cityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, cityId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -590,20 +623,22 @@ public final class ShopOuterClass {
       }
       emu.grasscutter.net.proto.ShopOuterClass.Shop other = (emu.grasscutter.net.proto.ShopOuterClass.Shop) obj;
 
+      if (getCityReputationLevel()
+          != other.getCityReputationLevel()) return false;
+      if (getShopType()
+          != other.getShopType()) return false;
+      if (getNextRefreshTime()
+          != other.getNextRefreshTime()) return false;
+      if (getDGEAKOFNGDN()
+          != other.getDGEAKOFNGDN()) return false;
+      if (!getMcoinProductListList()
+          .equals(other.getMcoinProductListList())) return false;
       if (!getCardProductListList()
           .equals(other.getCardProductListList())) return false;
       if (!getGoodsListList()
           .equals(other.getGoodsListList())) return false;
       if (!getConcertProductListList()
           .equals(other.getConcertProductListList())) return false;
-      if (getCityReputationLevel()
-          != other.getCityReputationLevel()) return false;
-      if (getShopType()
-          != other.getShopType()) return false;
-      if (!getMcoinProductListList()
-          .equals(other.getMcoinProductListList())) return false;
-      if (getNextRefreshTime()
-          != other.getNextRefreshTime()) return false;
       if (getCityId()
           != other.getCityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -617,6 +652,18 @@ public final class ShopOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + CITY_REPUTATION_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCityReputationLevel();
+      hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getShopType();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + DGEAKOFNGDN_FIELD_NUMBER;
+      hash = (53 * hash) + getDGEAKOFNGDN();
+      if (getMcoinProductListCount() > 0) {
+        hash = (37 * hash) + MCOIN_PRODUCT_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getMcoinProductListList().hashCode();
+      }
       if (getCardProductListCount() > 0) {
         hash = (37 * hash) + CARD_PRODUCT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getCardProductListList().hashCode();
@@ -629,16 +676,6 @@ public final class ShopOuterClass {
         hash = (37 * hash) + CONCERT_PRODUCT_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getConcertProductListList().hashCode();
       }
-      hash = (37 * hash) + CITY_REPUTATION_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCityReputationLevel();
-      hash = (37 * hash) + SHOP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getShopType();
-      if (getMcoinProductListCount() > 0) {
-        hash = (37 * hash) + MCOIN_PRODUCT_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getMcoinProductListList().hashCode();
-      }
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
       hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCityId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -737,10 +774,6 @@ public final class ShopOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: MKCHFJGDPJL
-     * </pre>
-     *
      * Protobuf type {@code Shop}
      */
     public static final class Builder extends
@@ -773,45 +806,47 @@ public final class ShopOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
+          getMcoinProductListFieldBuilder();
           getCardProductListFieldBuilder();
           getGoodsListFieldBuilder();
           getConcertProductListFieldBuilder();
-          getMcoinProductListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        cityReputationLevel_ = 0;
+
+        shopType_ = 0;
+
+        nextRefreshTime_ = 0;
+
+        dGEAKOFNGDN_ = 0;
+
+        if (mcoinProductListBuilder_ == null) {
+          mcoinProductList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        } else {
+          mcoinProductListBuilder_.clear();
+        }
         if (cardProductListBuilder_ == null) {
           cardProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           cardProductListBuilder_.clear();
         }
         if (goodsListBuilder_ == null) {
           goodsList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000004);
         } else {
           goodsListBuilder_.clear();
         }
         if (concertProductListBuilder_ == null) {
           concertProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000008);
         } else {
           concertProductListBuilder_.clear();
         }
-        cityReputationLevel_ = 0;
-
-        shopType_ = 0;
-
-        if (mcoinProductListBuilder_ == null) {
-          mcoinProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
-        } else {
-          mcoinProductListBuilder_.clear();
-        }
-        nextRefreshTime_ = 0;
-
         cityId_ = 0;
 
         return this;
@@ -841,45 +876,46 @@ public final class ShopOuterClass {
       public emu.grasscutter.net.proto.ShopOuterClass.Shop buildPartial() {
         emu.grasscutter.net.proto.ShopOuterClass.Shop result = new emu.grasscutter.net.proto.ShopOuterClass.Shop(this);
         int from_bitField0_ = bitField0_;
-        if (cardProductListBuilder_ == null) {
+        result.cityReputationLevel_ = cityReputationLevel_;
+        result.shopType_ = shopType_;
+        result.nextRefreshTime_ = nextRefreshTime_;
+        result.dGEAKOFNGDN_ = dGEAKOFNGDN_;
+        if (mcoinProductListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
-            cardProductList_ = java.util.Collections.unmodifiableList(cardProductList_);
+            mcoinProductList_ = java.util.Collections.unmodifiableList(mcoinProductList_);
             bitField0_ = (bitField0_ & ~0x00000001);
           }
+          result.mcoinProductList_ = mcoinProductList_;
+        } else {
+          result.mcoinProductList_ = mcoinProductListBuilder_.build();
+        }
+        if (cardProductListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            cardProductList_ = java.util.Collections.unmodifiableList(cardProductList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
           result.cardProductList_ = cardProductList_;
         } else {
           result.cardProductList_ = cardProductListBuilder_.build();
         }
         if (goodsListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000004) != 0)) {
             goodsList_ = java.util.Collections.unmodifiableList(goodsList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000004);
           }
           result.goodsList_ = goodsList_;
         } else {
           result.goodsList_ = goodsListBuilder_.build();
         }
         if (concertProductListBuilder_ == null) {
-          if (((bitField0_ & 0x00000004) != 0)) {
+          if (((bitField0_ & 0x00000008) != 0)) {
             concertProductList_ = java.util.Collections.unmodifiableList(concertProductList_);
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000008);
           }
           result.concertProductList_ = concertProductList_;
         } else {
           result.concertProductList_ = concertProductListBuilder_.build();
         }
-        result.cityReputationLevel_ = cityReputationLevel_;
-        result.shopType_ = shopType_;
-        if (mcoinProductListBuilder_ == null) {
-          if (((bitField0_ & 0x00000008) != 0)) {
-            mcoinProductList_ = java.util.Collections.unmodifiableList(mcoinProductList_);
-            bitField0_ = (bitField0_ & ~0x00000008);
-          }
-          result.mcoinProductList_ = mcoinProductList_;
-        } else {
-          result.mcoinProductList_ = mcoinProductListBuilder_.build();
-        }
-        result.nextRefreshTime_ = nextRefreshTime_;
         result.cityId_ = cityId_;
         onBuilt();
         return result;
@@ -929,95 +965,23 @@ public final class ShopOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ShopOuterClass.Shop other) {
         if (other == emu.grasscutter.net.proto.ShopOuterClass.Shop.getDefaultInstance()) return this;
-        if (cardProductListBuilder_ == null) {
-          if (!other.cardProductList_.isEmpty()) {
-            if (cardProductList_.isEmpty()) {
-              cardProductList_ = other.cardProductList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensureCardProductListIsMutable();
-              cardProductList_.addAll(other.cardProductList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.cardProductList_.isEmpty()) {
-            if (cardProductListBuilder_.isEmpty()) {
-              cardProductListBuilder_.dispose();
-              cardProductListBuilder_ = null;
-              cardProductList_ = other.cardProductList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              cardProductListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getCardProductListFieldBuilder() : null;
-            } else {
-              cardProductListBuilder_.addAllMessages(other.cardProductList_);
-            }
-          }
-        }
-        if (goodsListBuilder_ == null) {
-          if (!other.goodsList_.isEmpty()) {
-            if (goodsList_.isEmpty()) {
-              goodsList_ = other.goodsList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-            } else {
-              ensureGoodsListIsMutable();
-              goodsList_.addAll(other.goodsList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.goodsList_.isEmpty()) {
-            if (goodsListBuilder_.isEmpty()) {
-              goodsListBuilder_.dispose();
-              goodsListBuilder_ = null;
-              goodsList_ = other.goodsList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
-              goodsListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getGoodsListFieldBuilder() : null;
-            } else {
-              goodsListBuilder_.addAllMessages(other.goodsList_);
-            }
-          }
-        }
-        if (concertProductListBuilder_ == null) {
-          if (!other.concertProductList_.isEmpty()) {
-            if (concertProductList_.isEmpty()) {
-              concertProductList_ = other.concertProductList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-            } else {
-              ensureConcertProductListIsMutable();
-              concertProductList_.addAll(other.concertProductList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.concertProductList_.isEmpty()) {
-            if (concertProductListBuilder_.isEmpty()) {
-              concertProductListBuilder_.dispose();
-              concertProductListBuilder_ = null;
-              concertProductList_ = other.concertProductList_;
-              bitField0_ = (bitField0_ & ~0x00000004);
-              concertProductListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getConcertProductListFieldBuilder() : null;
-            } else {
-              concertProductListBuilder_.addAllMessages(other.concertProductList_);
-            }
-          }
-        }
         if (other.getCityReputationLevel() != 0) {
           setCityReputationLevel(other.getCityReputationLevel());
         }
         if (other.getShopType() != 0) {
           setShopType(other.getShopType());
         }
+        if (other.getNextRefreshTime() != 0) {
+          setNextRefreshTime(other.getNextRefreshTime());
+        }
+        if (other.getDGEAKOFNGDN() != 0) {
+          setDGEAKOFNGDN(other.getDGEAKOFNGDN());
+        }
         if (mcoinProductListBuilder_ == null) {
           if (!other.mcoinProductList_.isEmpty()) {
             if (mcoinProductList_.isEmpty()) {
               mcoinProductList_ = other.mcoinProductList_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureMcoinProductListIsMutable();
               mcoinProductList_.addAll(other.mcoinProductList_);
@@ -1030,7 +994,7 @@ public final class ShopOuterClass {
               mcoinProductListBuilder_.dispose();
               mcoinProductListBuilder_ = null;
               mcoinProductList_ = other.mcoinProductList_;
-              bitField0_ = (bitField0_ & ~0x00000008);
+              bitField0_ = (bitField0_ & ~0x00000001);
               mcoinProductListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getMcoinProductListFieldBuilder() : null;
@@ -1039,8 +1003,83 @@ public final class ShopOuterClass {
             }
           }
         }
-        if (other.getNextRefreshTime() != 0) {
-          setNextRefreshTime(other.getNextRefreshTime());
+        if (cardProductListBuilder_ == null) {
+          if (!other.cardProductList_.isEmpty()) {
+            if (cardProductList_.isEmpty()) {
+              cardProductList_ = other.cardProductList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensureCardProductListIsMutable();
+              cardProductList_.addAll(other.cardProductList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.cardProductList_.isEmpty()) {
+            if (cardProductListBuilder_.isEmpty()) {
+              cardProductListBuilder_.dispose();
+              cardProductListBuilder_ = null;
+              cardProductList_ = other.cardProductList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              cardProductListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getCardProductListFieldBuilder() : null;
+            } else {
+              cardProductListBuilder_.addAllMessages(other.cardProductList_);
+            }
+          }
+        }
+        if (goodsListBuilder_ == null) {
+          if (!other.goodsList_.isEmpty()) {
+            if (goodsList_.isEmpty()) {
+              goodsList_ = other.goodsList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+            } else {
+              ensureGoodsListIsMutable();
+              goodsList_.addAll(other.goodsList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.goodsList_.isEmpty()) {
+            if (goodsListBuilder_.isEmpty()) {
+              goodsListBuilder_.dispose();
+              goodsListBuilder_ = null;
+              goodsList_ = other.goodsList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+              goodsListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getGoodsListFieldBuilder() : null;
+            } else {
+              goodsListBuilder_.addAllMessages(other.goodsList_);
+            }
+          }
+        }
+        if (concertProductListBuilder_ == null) {
+          if (!other.concertProductList_.isEmpty()) {
+            if (concertProductList_.isEmpty()) {
+              concertProductList_ = other.concertProductList_;
+              bitField0_ = (bitField0_ & ~0x00000008);
+            } else {
+              ensureConcertProductListIsMutable();
+              concertProductList_.addAll(other.concertProductList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.concertProductList_.isEmpty()) {
+            if (concertProductListBuilder_.isEmpty()) {
+              concertProductListBuilder_.dispose();
+              concertProductListBuilder_ = null;
+              concertProductList_ = other.concertProductList_;
+              bitField0_ = (bitField0_ & ~0x00000008);
+              concertProductListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getConcertProductListFieldBuilder() : null;
+            } else {
+              concertProductListBuilder_.addAllMessages(other.concertProductList_);
+            }
+          }
         }
         if (other.getCityId() != 0) {
           setCityId(other.getCityId());
@@ -1075,729 +1114,13 @@ public final class ShopOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> cardProductList_ =
-        java.util.Collections.emptyList();
-      private void ensureCardProductListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          cardProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct>(cardProductList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> cardProductListBuilder_;
-
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> getCardProductListList() {
-        if (cardProductListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(cardProductList_);
-        } else {
-          return cardProductListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public int getCardProductListCount() {
-        if (cardProductListBuilder_ == null) {
-          return cardProductList_.size();
-        } else {
-          return cardProductListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index) {
-        if (cardProductListBuilder_ == null) {
-          return cardProductList_.get(index);
-        } else {
-          return cardProductListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder setCardProductList(
-          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
-        if (cardProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureCardProductListIsMutable();
-          cardProductList_.set(index, value);
-          onChanged();
-        } else {
-          cardProductListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder setCardProductList(
-          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
-        if (cardProductListBuilder_ == null) {
-          ensureCardProductListIsMutable();
-          cardProductList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          cardProductListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder addCardProductList(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
-        if (cardProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureCardProductListIsMutable();
-          cardProductList_.add(value);
-          onChanged();
-        } else {
-          cardProductListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder addCardProductList(
-          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
-        if (cardProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureCardProductListIsMutable();
-          cardProductList_.add(index, value);
-          onChanged();
-        } else {
-          cardProductListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder addCardProductList(
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
-        if (cardProductListBuilder_ == null) {
-          ensureCardProductListIsMutable();
-          cardProductList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          cardProductListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder addCardProductList(
-          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
-        if (cardProductListBuilder_ == null) {
-          ensureCardProductListIsMutable();
-          cardProductList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          cardProductListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder addAllCardProductList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> values) {
-        if (cardProductListBuilder_ == null) {
-          ensureCardProductListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, cardProductList_);
-          onChanged();
-        } else {
-          cardProductListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder clearCardProductList() {
-        if (cardProductListBuilder_ == null) {
-          cardProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          cardProductListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public Builder removeCardProductList(int index) {
-        if (cardProductListBuilder_ == null) {
-          ensureCardProductListIsMutable();
-          cardProductList_.remove(index);
-          onChanged();
-        } else {
-          cardProductListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder getCardProductListBuilder(
-          int index) {
-        return getCardProductListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
-          int index) {
-        if (cardProductListBuilder_ == null) {
-          return cardProductList_.get(index);  } else {
-          return cardProductListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
-           getCardProductListOrBuilderList() {
-        if (cardProductListBuilder_ != null) {
-          return cardProductListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(cardProductList_);
-        }
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder addCardProductListBuilder() {
-        return getCardProductListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder addCardProductListBuilder(
-          int index) {
-        return getCardProductListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopCardProduct card_product_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder> 
-           getCardProductListBuilderList() {
-        return getCardProductListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
-          getCardProductListFieldBuilder() {
-        if (cardProductListBuilder_ == null) {
-          cardProductListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder>(
-                  cardProductList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          cardProductList_ = null;
-        }
-        return cardProductListBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_ =
-        java.util.Collections.emptyList();
-      private void ensureGoodsListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>(goodsList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsListBuilder_;
-
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
-        if (goodsListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(goodsList_);
-        } else {
-          return goodsListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public int getGoodsListCount() {
-        if (goodsListBuilder_ == null) {
-          return goodsList_.size();
-        } else {
-          return goodsListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
-        if (goodsListBuilder_ == null) {
-          return goodsList_.get(index);
-        } else {
-          return goodsListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder setGoodsList(
-          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
-        if (goodsListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGoodsListIsMutable();
-          goodsList_.set(index, value);
-          onChanged();
-        } else {
-          goodsListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder setGoodsList(
-          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
-        if (goodsListBuilder_ == null) {
-          ensureGoodsListIsMutable();
-          goodsList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          goodsListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder addGoodsList(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
-        if (goodsListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGoodsListIsMutable();
-          goodsList_.add(value);
-          onChanged();
-        } else {
-          goodsListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder addGoodsList(
-          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
-        if (goodsListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureGoodsListIsMutable();
-          goodsList_.add(index, value);
-          onChanged();
-        } else {
-          goodsListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder addGoodsList(
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
-        if (goodsListBuilder_ == null) {
-          ensureGoodsListIsMutable();
-          goodsList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          goodsListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder addGoodsList(
-          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
-        if (goodsListBuilder_ == null) {
-          ensureGoodsListIsMutable();
-          goodsList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          goodsListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder addAllGoodsList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> values) {
-        if (goodsListBuilder_ == null) {
-          ensureGoodsListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, goodsList_);
-          onChanged();
-        } else {
-          goodsListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder clearGoodsList() {
-        if (goodsListBuilder_ == null) {
-          goodsList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          goodsListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public Builder removeGoodsList(int index) {
-        if (goodsListBuilder_ == null) {
-          ensureGoodsListIsMutable();
-          goodsList_.remove(index);
-          onChanged();
-        } else {
-          goodsListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsListBuilder(
-          int index) {
-        return getGoodsListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
-          int index) {
-        if (goodsListBuilder_ == null) {
-          return goodsList_.get(index);  } else {
-          return goodsListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
-           getGoodsListOrBuilderList() {
-        if (goodsListBuilder_ != null) {
-          return goodsListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(goodsList_);
-        }
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder() {
-        return getGoodsListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder(
-          int index) {
-        return getGoodsListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopGoods goods_list = 6;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder> 
-           getGoodsListBuilderList() {
-        return getGoodsListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
-          getGoodsListFieldBuilder() {
-        if (goodsListBuilder_ == null) {
-          goodsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder>(
-                  goodsList_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          goodsList_ = null;
-        }
-        return goodsListBuilder_;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> concertProductList_ =
-        java.util.Collections.emptyList();
-      private void ensureConcertProductListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
-          concertProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct>(concertProductList_);
-          bitField0_ |= 0x00000004;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> concertProductListBuilder_;
-
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> getConcertProductListList() {
-        if (concertProductListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(concertProductList_);
-        } else {
-          return concertProductListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public int getConcertProductListCount() {
-        if (concertProductListBuilder_ == null) {
-          return concertProductList_.size();
-        } else {
-          return concertProductListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index) {
-        if (concertProductListBuilder_ == null) {
-          return concertProductList_.get(index);
-        } else {
-          return concertProductListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder setConcertProductList(
-          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
-        if (concertProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConcertProductListIsMutable();
-          concertProductList_.set(index, value);
-          onChanged();
-        } else {
-          concertProductListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder setConcertProductList(
-          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
-        if (concertProductListBuilder_ == null) {
-          ensureConcertProductListIsMutable();
-          concertProductList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          concertProductListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder addConcertProductList(emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
-        if (concertProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConcertProductListIsMutable();
-          concertProductList_.add(value);
-          onChanged();
-        } else {
-          concertProductListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder addConcertProductList(
-          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
-        if (concertProductListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureConcertProductListIsMutable();
-          concertProductList_.add(index, value);
-          onChanged();
-        } else {
-          concertProductListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder addConcertProductList(
-          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
-        if (concertProductListBuilder_ == null) {
-          ensureConcertProductListIsMutable();
-          concertProductList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          concertProductListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder addConcertProductList(
-          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
-        if (concertProductListBuilder_ == null) {
-          ensureConcertProductListIsMutable();
-          concertProductList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          concertProductListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder addAllConcertProductList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> values) {
-        if (concertProductListBuilder_ == null) {
-          ensureConcertProductListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, concertProductList_);
-          onChanged();
-        } else {
-          concertProductListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder clearConcertProductList() {
-        if (concertProductListBuilder_ == null) {
-          concertProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000004);
-          onChanged();
-        } else {
-          concertProductListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public Builder removeConcertProductList(int index) {
-        if (concertProductListBuilder_ == null) {
-          ensureConcertProductListIsMutable();
-          concertProductList_.remove(index);
-          onChanged();
-        } else {
-          concertProductListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder getConcertProductListBuilder(
-          int index) {
-        return getConcertProductListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
-          int index) {
-        if (concertProductListBuilder_ == null) {
-          return concertProductList_.get(index);  } else {
-          return concertProductListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
-           getConcertProductListOrBuilderList() {
-        if (concertProductListBuilder_ != null) {
-          return concertProductListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(concertProductList_);
-        }
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder addConcertProductListBuilder() {
-        return getConcertProductListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder addConcertProductListBuilder(
-          int index) {
-        return getConcertProductListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ShopConcertProduct concert_product_list = 5;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder> 
-           getConcertProductListBuilderList() {
-        return getConcertProductListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
-          getConcertProductListFieldBuilder() {
-        if (concertProductListBuilder_ == null) {
-          concertProductListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder>(
-                  concertProductList_,
-                  ((bitField0_ & 0x00000004) != 0),
-                  getParentForChildren(),
-                  isClean());
-          concertProductList_ = null;
-        }
-        return concertProductListBuilder_;
-      }
-
       private int cityReputationLevel_ ;
       /**
-       * <code>uint32 city_reputation_level = 3;</code>
+       * <pre>
+       * 5
+       * </pre>
+       *
+       * <code>uint32 city_reputation_level = 2;</code>
        * @return The cityReputationLevel.
        */
       @java.lang.Override
@@ -1805,7 +1128,11 @@ public final class ShopOuterClass {
         return cityReputationLevel_;
       }
       /**
-       * <code>uint32 city_reputation_level = 3;</code>
+       * <pre>
+       * 5
+       * </pre>
+       *
+       * <code>uint32 city_reputation_level = 2;</code>
        * @param value The cityReputationLevel to set.
        * @return This builder for chaining.
        */
@@ -1816,7 +1143,11 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>uint32 city_reputation_level = 3;</code>
+       * <pre>
+       * 5
+       * </pre>
+       *
+       * <code>uint32 city_reputation_level = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearCityReputationLevel() {
@@ -1828,7 +1159,7 @@ public final class ShopOuterClass {
 
       private int shopType_ ;
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 3;</code>
        * @return The shopType.
        */
       @java.lang.Override
@@ -1836,7 +1167,7 @@ public final class ShopOuterClass {
         return shopType_;
       }
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 3;</code>
        * @param value The shopType to set.
        * @return This builder for chaining.
        */
@@ -1847,7 +1178,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>uint32 shop_type = 4;</code>
+       * <code>uint32 shop_type = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearShopType() {
@@ -1857,12 +1188,74 @@ public final class ShopOuterClass {
         return this;
       }
 
+      private int nextRefreshTime_ ;
+      /**
+       * <code>uint32 next_refresh_time = 4;</code>
+       * @return The nextRefreshTime.
+       */
+      @java.lang.Override
+      public int getNextRefreshTime() {
+        return nextRefreshTime_;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 4;</code>
+       * @param value The nextRefreshTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setNextRefreshTime(int value) {
+        
+        nextRefreshTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 next_refresh_time = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearNextRefreshTime() {
+        
+        nextRefreshTime_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int dGEAKOFNGDN_ ;
+      /**
+       * <code>uint32 DGEAKOFNGDN = 5;</code>
+       * @return The dGEAKOFNGDN.
+       */
+      @java.lang.Override
+      public int getDGEAKOFNGDN() {
+        return dGEAKOFNGDN_;
+      }
+      /**
+       * <code>uint32 DGEAKOFNGDN = 5;</code>
+       * @param value The dGEAKOFNGDN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDGEAKOFNGDN(int value) {
+        
+        dGEAKOFNGDN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DGEAKOFNGDN = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDGEAKOFNGDN() {
+        
+        dGEAKOFNGDN_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> mcoinProductList_ =
         java.util.Collections.emptyList();
       private void ensureMcoinProductListIsMutable() {
-        if (!((bitField0_ & 0x00000008) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           mcoinProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct>(mcoinProductList_);
-          bitField0_ |= 0x00000008;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -1870,7 +1263,7 @@ public final class ShopOuterClass {
           emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> mcoinProductListBuilder_;
 
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> getMcoinProductListList() {
         if (mcoinProductListBuilder_ == null) {
@@ -1880,7 +1273,7 @@ public final class ShopOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public int getMcoinProductListCount() {
         if (mcoinProductListBuilder_ == null) {
@@ -1890,7 +1283,7 @@ public final class ShopOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct getMcoinProductList(int index) {
         if (mcoinProductListBuilder_ == null) {
@@ -1900,7 +1293,7 @@ public final class ShopOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder setMcoinProductList(
           int index, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct value) {
@@ -1917,7 +1310,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder setMcoinProductList(
           int index, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder builderForValue) {
@@ -1931,7 +1324,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder addMcoinProductList(emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct value) {
         if (mcoinProductListBuilder_ == null) {
@@ -1947,7 +1340,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder addMcoinProductList(
           int index, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct value) {
@@ -1964,7 +1357,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder addMcoinProductList(
           emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder builderForValue) {
@@ -1978,7 +1371,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder addMcoinProductList(
           int index, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder builderForValue) {
@@ -1992,7 +1385,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder addAllMcoinProductList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct> values) {
@@ -2007,12 +1400,12 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder clearMcoinProductList() {
         if (mcoinProductListBuilder_ == null) {
           mcoinProductList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000008);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           mcoinProductListBuilder_.clear();
@@ -2020,7 +1413,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public Builder removeMcoinProductList(int index) {
         if (mcoinProductListBuilder_ == null) {
@@ -2033,14 +1426,14 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder getMcoinProductListBuilder(
           int index) {
         return getMcoinProductListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder getMcoinProductListOrBuilder(
           int index) {
@@ -2050,7 +1443,7 @@ public final class ShopOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder> 
            getMcoinProductListOrBuilderList() {
@@ -2061,14 +1454,14 @@ public final class ShopOuterClass {
         }
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder addMcoinProductListBuilder() {
         return getMcoinProductListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder addMcoinProductListBuilder(
           int index) {
@@ -2076,7 +1469,7 @@ public final class ShopOuterClass {
             index, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.getDefaultInstance());
       }
       /**
-       * <code>repeated .ShopMcoinProduct mcoin_product_list = 2;</code>
+       * <code>repeated .ShopMcoinProduct mcoin_product_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder> 
            getMcoinProductListBuilderList() {
@@ -2089,7 +1482,7 @@ public final class ShopOuterClass {
           mcoinProductListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProduct.Builder, emu.grasscutter.net.proto.ShopMcoinProductOuterClass.ShopMcoinProductOrBuilder>(
                   mcoinProductList_,
-                  ((bitField0_ & 0x00000008) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           mcoinProductList_ = null;
@@ -2097,40 +1490,729 @@ public final class ShopOuterClass {
         return mcoinProductListBuilder_;
       }
 
-      private int nextRefreshTime_ ;
+      private java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> cardProductList_ =
+        java.util.Collections.emptyList();
+      private void ensureCardProductListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          cardProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct>(cardProductList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> cardProductListBuilder_;
+
       /**
-       * <code>uint32 next_refresh_time = 8;</code>
-       * @return The nextRefreshTime.
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
        */
-      @java.lang.Override
-      public int getNextRefreshTime() {
-        return nextRefreshTime_;
+      public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> getCardProductListList() {
+        if (cardProductListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(cardProductList_);
+        } else {
+          return cardProductListBuilder_.getMessageList();
+        }
       }
       /**
-       * <code>uint32 next_refresh_time = 8;</code>
-       * @param value The nextRefreshTime to set.
-       * @return This builder for chaining.
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
        */
-      public Builder setNextRefreshTime(int value) {
-        
-        nextRefreshTime_ = value;
-        onChanged();
+      public int getCardProductListCount() {
+        if (cardProductListBuilder_ == null) {
+          return cardProductList_.size();
+        } else {
+          return cardProductListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct getCardProductList(int index) {
+        if (cardProductListBuilder_ == null) {
+          return cardProductList_.get(index);
+        } else {
+          return cardProductListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder setCardProductList(
+          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
+        if (cardProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureCardProductListIsMutable();
+          cardProductList_.set(index, value);
+          onChanged();
+        } else {
+          cardProductListBuilder_.setMessage(index, value);
+        }
         return this;
       }
       /**
-       * <code>uint32 next_refresh_time = 8;</code>
-       * @return This builder for chaining.
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
        */
-      public Builder clearNextRefreshTime() {
-        
-        nextRefreshTime_ = 0;
-        onChanged();
+      public Builder setCardProductList(
+          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
+        if (cardProductListBuilder_ == null) {
+          ensureCardProductListIsMutable();
+          cardProductList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          cardProductListBuilder_.setMessage(index, builderForValue.build());
+        }
         return this;
       }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder addCardProductList(emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
+        if (cardProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureCardProductListIsMutable();
+          cardProductList_.add(value);
+          onChanged();
+        } else {
+          cardProductListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder addCardProductList(
+          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct value) {
+        if (cardProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureCardProductListIsMutable();
+          cardProductList_.add(index, value);
+          onChanged();
+        } else {
+          cardProductListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder addCardProductList(
+          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
+        if (cardProductListBuilder_ == null) {
+          ensureCardProductListIsMutable();
+          cardProductList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          cardProductListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder addCardProductList(
+          int index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder builderForValue) {
+        if (cardProductListBuilder_ == null) {
+          ensureCardProductListIsMutable();
+          cardProductList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          cardProductListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder addAllCardProductList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct> values) {
+        if (cardProductListBuilder_ == null) {
+          ensureCardProductListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, cardProductList_);
+          onChanged();
+        } else {
+          cardProductListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder clearCardProductList() {
+        if (cardProductListBuilder_ == null) {
+          cardProductList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          cardProductListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public Builder removeCardProductList(int index) {
+        if (cardProductListBuilder_ == null) {
+          ensureCardProductListIsMutable();
+          cardProductList_.remove(index);
+          onChanged();
+        } else {
+          cardProductListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder getCardProductListBuilder(
+          int index) {
+        return getCardProductListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder getCardProductListOrBuilder(
+          int index) {
+        if (cardProductListBuilder_ == null) {
+          return cardProductList_.get(index);  } else {
+          return cardProductListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
+           getCardProductListOrBuilderList() {
+        if (cardProductListBuilder_ != null) {
+          return cardProductListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(cardProductList_);
+        }
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder addCardProductListBuilder() {
+        return getCardProductListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder addCardProductListBuilder(
+          int index) {
+        return getCardProductListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopCardProduct card_product_list = 9;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder> 
+           getCardProductListBuilderList() {
+        return getCardProductListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder> 
+          getCardProductListFieldBuilder() {
+        if (cardProductListBuilder_ == null) {
+          cardProductListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProduct.Builder, emu.grasscutter.net.proto.ShopCardProductOuterClass.ShopCardProductOrBuilder>(
+                  cardProductList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          cardProductList_ = null;
+        }
+        return cardProductListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> goodsList_ =
+        java.util.Collections.emptyList();
+      private void ensureGoodsListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          goodsList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods>(goodsList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> goodsListBuilder_;
+
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> getGoodsListList() {
+        if (goodsListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(goodsList_);
+        } else {
+          return goodsListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public int getGoodsListCount() {
+        if (goodsListBuilder_ == null) {
+          return goodsList_.size();
+        } else {
+          return goodsListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods getGoodsList(int index) {
+        if (goodsListBuilder_ == null) {
+          return goodsList_.get(index);
+        } else {
+          return goodsListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder setGoodsList(
+          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
+        if (goodsListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGoodsListIsMutable();
+          goodsList_.set(index, value);
+          onChanged();
+        } else {
+          goodsListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder setGoodsList(
+          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
+        if (goodsListBuilder_ == null) {
+          ensureGoodsListIsMutable();
+          goodsList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          goodsListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder addGoodsList(emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
+        if (goodsListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGoodsListIsMutable();
+          goodsList_.add(value);
+          onChanged();
+        } else {
+          goodsListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder addGoodsList(
+          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods value) {
+        if (goodsListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureGoodsListIsMutable();
+          goodsList_.add(index, value);
+          onChanged();
+        } else {
+          goodsListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder addGoodsList(
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
+        if (goodsListBuilder_ == null) {
+          ensureGoodsListIsMutable();
+          goodsList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          goodsListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder addGoodsList(
+          int index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder builderForValue) {
+        if (goodsListBuilder_ == null) {
+          ensureGoodsListIsMutable();
+          goodsList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          goodsListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder addAllGoodsList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods> values) {
+        if (goodsListBuilder_ == null) {
+          ensureGoodsListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, goodsList_);
+          onChanged();
+        } else {
+          goodsListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder clearGoodsList() {
+        if (goodsListBuilder_ == null) {
+          goodsList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+        } else {
+          goodsListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public Builder removeGoodsList(int index) {
+        if (goodsListBuilder_ == null) {
+          ensureGoodsListIsMutable();
+          goodsList_.remove(index);
+          onChanged();
+        } else {
+          goodsListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder getGoodsListBuilder(
+          int index) {
+        return getGoodsListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder getGoodsListOrBuilder(
+          int index) {
+        if (goodsListBuilder_ == null) {
+          return goodsList_.get(index);  } else {
+          return goodsListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
+           getGoodsListOrBuilderList() {
+        if (goodsListBuilder_ != null) {
+          return goodsListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(goodsList_);
+        }
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder() {
+        return getGoodsListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder addGoodsListBuilder(
+          int index) {
+        return getGoodsListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopGoods goods_list = 10;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder> 
+           getGoodsListBuilderList() {
+        return getGoodsListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder> 
+          getGoodsListFieldBuilder() {
+        if (goodsListBuilder_ == null) {
+          goodsListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoods.Builder, emu.grasscutter.net.proto.ShopGoodsOuterClass.ShopGoodsOrBuilder>(
+                  goodsList_,
+                  ((bitField0_ & 0x00000004) != 0),
+                  getParentForChildren(),
+                  isClean());
+          goodsList_ = null;
+        }
+        return goodsListBuilder_;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> concertProductList_ =
+        java.util.Collections.emptyList();
+      private void ensureConcertProductListIsMutable() {
+        if (!((bitField0_ & 0x00000008) != 0)) {
+          concertProductList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct>(concertProductList_);
+          bitField0_ |= 0x00000008;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> concertProductListBuilder_;
+
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> getConcertProductListList() {
+        if (concertProductListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(concertProductList_);
+        } else {
+          return concertProductListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public int getConcertProductListCount() {
+        if (concertProductListBuilder_ == null) {
+          return concertProductList_.size();
+        } else {
+          return concertProductListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct getConcertProductList(int index) {
+        if (concertProductListBuilder_ == null) {
+          return concertProductList_.get(index);
+        } else {
+          return concertProductListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder setConcertProductList(
+          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
+        if (concertProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureConcertProductListIsMutable();
+          concertProductList_.set(index, value);
+          onChanged();
+        } else {
+          concertProductListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder setConcertProductList(
+          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
+        if (concertProductListBuilder_ == null) {
+          ensureConcertProductListIsMutable();
+          concertProductList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          concertProductListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder addConcertProductList(emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
+        if (concertProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureConcertProductListIsMutable();
+          concertProductList_.add(value);
+          onChanged();
+        } else {
+          concertProductListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder addConcertProductList(
+          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct value) {
+        if (concertProductListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureConcertProductListIsMutable();
+          concertProductList_.add(index, value);
+          onChanged();
+        } else {
+          concertProductListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder addConcertProductList(
+          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
+        if (concertProductListBuilder_ == null) {
+          ensureConcertProductListIsMutable();
+          concertProductList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          concertProductListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder addConcertProductList(
+          int index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder builderForValue) {
+        if (concertProductListBuilder_ == null) {
+          ensureConcertProductListIsMutable();
+          concertProductList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          concertProductListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder addAllConcertProductList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct> values) {
+        if (concertProductListBuilder_ == null) {
+          ensureConcertProductListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, concertProductList_);
+          onChanged();
+        } else {
+          concertProductListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder clearConcertProductList() {
+        if (concertProductListBuilder_ == null) {
+          concertProductList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000008);
+          onChanged();
+        } else {
+          concertProductListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public Builder removeConcertProductList(int index) {
+        if (concertProductListBuilder_ == null) {
+          ensureConcertProductListIsMutable();
+          concertProductList_.remove(index);
+          onChanged();
+        } else {
+          concertProductListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder getConcertProductListBuilder(
+          int index) {
+        return getConcertProductListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder getConcertProductListOrBuilder(
+          int index) {
+        if (concertProductListBuilder_ == null) {
+          return concertProductList_.get(index);  } else {
+          return concertProductListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
+           getConcertProductListOrBuilderList() {
+        if (concertProductListBuilder_ != null) {
+          return concertProductListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(concertProductList_);
+        }
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder addConcertProductListBuilder() {
+        return getConcertProductListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder addConcertProductListBuilder(
+          int index) {
+        return getConcertProductListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ShopConcertProduct concert_product_list = 12;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder> 
+           getConcertProductListBuilderList() {
+        return getConcertProductListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder> 
+          getConcertProductListFieldBuilder() {
+        if (concertProductListBuilder_ == null) {
+          concertProductListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProduct.Builder, emu.grasscutter.net.proto.ShopConcertProductOuterClass.ShopConcertProductOrBuilder>(
+                  concertProductList_,
+                  ((bitField0_ & 0x00000008) != 0),
+                  getParentForChildren(),
+                  isClean());
+          concertProductList_ = null;
+        }
+        return concertProductListBuilder_;
+      }
 
       private int cityId_ ;
       /**
-       * <code>uint32 city_id = 7;</code>
+       * <code>uint32 city_id = 14;</code>
        * @return The cityId.
        */
       @java.lang.Override
@@ -2138,7 +2220,7 @@ public final class ShopOuterClass {
         return cityId_;
       }
       /**
-       * <code>uint32 city_id = 7;</code>
+       * <code>uint32 city_id = 14;</code>
        * @param value The cityId to set.
        * @return This builder for chaining.
        */
@@ -2149,7 +2231,7 @@ public final class ShopOuterClass {
         return this;
       }
       /**
-       * <code>uint32 city_id = 7;</code>
+       * <code>uint32 city_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearCityId() {
@@ -2225,36 +2307,36 @@ public final class ShopOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\nShop.proto\032\025ShopCardProduct.proto\032\017Sho" +
-      "pGoods.proto\032\030ShopConcertProduct.proto\032\026" +
-      "ShopMcoinProduct.proto\"\223\002\n\004Shop\022+\n\021card_" +
-      "product_list\030\014 \003(\0132\020.ShopCardProduct\022\036\n\n" +
-      "goods_list\030\006 \003(\0132\n.ShopGoods\0221\n\024concert_" +
-      "product_list\030\005 \003(\0132\023.ShopConcertProduct\022" +
-      "\035\n\025city_reputation_level\030\003 \001(\r\022\021\n\tshop_t" +
-      "ype\030\004 \001(\r\022-\n\022mcoin_product_list\030\002 \003(\0132\021." +
-      "ShopMcoinProduct\022\031\n\021next_refresh_time\030\010 " +
-      "\001(\r\022\017\n\007city_id\030\007 \001(\rB\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "\n\nShop.proto\032\026ShopMcoinProduct.proto\032\025Sh" +
+      "opCardProduct.proto\032\017ShopGoods.proto\032\030Sh" +
+      "opConcertProduct.proto\"\250\002\n\004Shop\022\035\n\025city_" +
+      "reputation_level\030\002 \001(\r\022\021\n\tshop_type\030\003 \001(" +
+      "\r\022\031\n\021next_refresh_time\030\004 \001(\r\022\023\n\013DGEAKOFN" +
+      "GDN\030\005 \001(\r\022-\n\022mcoin_product_list\030\007 \003(\0132\021." +
+      "ShopMcoinProduct\022+\n\021card_product_list\030\t " +
+      "\003(\0132\020.ShopCardProduct\022\036\n\ngoods_list\030\n \003(" +
+      "\0132\n.ShopGoods\0221\n\024concert_product_list\030\014 " +
+      "\003(\0132\023.ShopConcertProduct\022\017\n\007city_id\030\016 \001(" +
+      "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.ShopMcoinProductOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ShopCardProductOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ShopConcertProductOuterClass.getDescriptor(),
-          emu.grasscutter.net.proto.ShopMcoinProductOuterClass.getDescriptor(),
         });
     internal_static_Shop_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_Shop_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Shop_descriptor,
-        new java.lang.String[] { "CardProductList", "GoodsList", "ConcertProductList", "CityReputationLevel", "ShopType", "McoinProductList", "NextRefreshTime", "CityId", });
+        new java.lang.String[] { "CityReputationLevel", "ShopType", "NextRefreshTime", "DGEAKOFNGDN", "McoinProductList", "CardProductList", "GoodsList", "ConcertProductList", "CityId", });
+    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ShopCardProductOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ShopGoodsOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ShopConcertProductOuterClass.getDescriptor();
-    emu.grasscutter.net.proto.ShopMcoinProductOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShortAbilityHashPairOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShortAbilityHashPairOuterClass.java
index 110ea05b8..00c60ebc6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShortAbilityHashPairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShortAbilityHashPairOuterClass.java
@@ -18,23 +18,19 @@ public final class ShortAbilityHashPairOuterClass {
       // @@protoc_insertion_point(interface_extends:ShortAbilityHashPair)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>sfixed32 OMPEBEMNKLG = 13;</code>
+     * @return The oMPEBEMNKLG.
+     */
+    int getOMPEBEMNKLG();
+
     /**
      * <code>sfixed32 ability_name_hash = 15;</code>
      * @return The abilityNameHash.
      */
     int getAbilityNameHash();
-
-    /**
-     * <code>sfixed32 ability_config_hash = 14;</code>
-     * @return The abilityConfigHash.
-     */
-    int getAbilityConfigHash();
   }
   /**
-   * <pre>
-   * Obf: HJEEHJPLDFD
-   * </pre>
-   *
    * Protobuf type {@code ShortAbilityHashPair}
    */
   public static final class ShortAbilityHashPair extends
@@ -79,9 +75,9 @@ public final class ShortAbilityHashPairOuterClass {
             case 0:
               done = true;
               break;
-            case 117: {
+            case 109: {
 
-              abilityConfigHash_ = input.readSFixed32();
+              oMPEBEMNKLG_ = input.readSFixed32();
               break;
             }
             case 125: {
@@ -121,6 +117,17 @@ public final class ShortAbilityHashPairOuterClass {
               emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.class, emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.Builder.class);
     }
 
+    public static final int OMPEBEMNKLG_FIELD_NUMBER = 13;
+    private int oMPEBEMNKLG_;
+    /**
+     * <code>sfixed32 OMPEBEMNKLG = 13;</code>
+     * @return The oMPEBEMNKLG.
+     */
+    @java.lang.Override
+    public int getOMPEBEMNKLG() {
+      return oMPEBEMNKLG_;
+    }
+
     public static final int ABILITY_NAME_HASH_FIELD_NUMBER = 15;
     private int abilityNameHash_;
     /**
@@ -132,17 +139,6 @@ public final class ShortAbilityHashPairOuterClass {
       return abilityNameHash_;
     }
 
-    public static final int ABILITY_CONFIG_HASH_FIELD_NUMBER = 14;
-    private int abilityConfigHash_;
-    /**
-     * <code>sfixed32 ability_config_hash = 14;</code>
-     * @return The abilityConfigHash.
-     */
-    @java.lang.Override
-    public int getAbilityConfigHash() {
-      return abilityConfigHash_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -157,8 +153,8 @@ public final class ShortAbilityHashPairOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (abilityConfigHash_ != 0) {
-        output.writeSFixed32(14, abilityConfigHash_);
+      if (oMPEBEMNKLG_ != 0) {
+        output.writeSFixed32(13, oMPEBEMNKLG_);
       }
       if (abilityNameHash_ != 0) {
         output.writeSFixed32(15, abilityNameHash_);
@@ -172,9 +168,9 @@ public final class ShortAbilityHashPairOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (abilityConfigHash_ != 0) {
+      if (oMPEBEMNKLG_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeSFixed32Size(14, abilityConfigHash_);
+          .computeSFixed32Size(13, oMPEBEMNKLG_);
       }
       if (abilityNameHash_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -195,10 +191,10 @@ public final class ShortAbilityHashPairOuterClass {
       }
       emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair other = (emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair) obj;
 
+      if (getOMPEBEMNKLG()
+          != other.getOMPEBEMNKLG()) return false;
       if (getAbilityNameHash()
           != other.getAbilityNameHash()) return false;
-      if (getAbilityConfigHash()
-          != other.getAbilityConfigHash()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +206,10 @@ public final class ShortAbilityHashPairOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + OMPEBEMNKLG_FIELD_NUMBER;
+      hash = (53 * hash) + getOMPEBEMNKLG();
       hash = (37 * hash) + ABILITY_NAME_HASH_FIELD_NUMBER;
       hash = (53 * hash) + getAbilityNameHash();
-      hash = (37 * hash) + ABILITY_CONFIG_HASH_FIELD_NUMBER;
-      hash = (53 * hash) + getAbilityConfigHash();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -310,10 +306,6 @@ public final class ShortAbilityHashPairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HJEEHJPLDFD
-     * </pre>
-     *
      * Protobuf type {@code ShortAbilityHashPair}
      */
     public static final class Builder extends
@@ -351,9 +343,9 @@ public final class ShortAbilityHashPairOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        abilityNameHash_ = 0;
+        oMPEBEMNKLG_ = 0;
 
-        abilityConfigHash_ = 0;
+        abilityNameHash_ = 0;
 
         return this;
       }
@@ -381,8 +373,8 @@ public final class ShortAbilityHashPairOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair buildPartial() {
         emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair result = new emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair(this);
+        result.oMPEBEMNKLG_ = oMPEBEMNKLG_;
         result.abilityNameHash_ = abilityNameHash_;
-        result.abilityConfigHash_ = abilityConfigHash_;
         onBuilt();
         return result;
       }
@@ -431,12 +423,12 @@ public final class ShortAbilityHashPairOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair other) {
         if (other == emu.grasscutter.net.proto.ShortAbilityHashPairOuterClass.ShortAbilityHashPair.getDefaultInstance()) return this;
+        if (other.getOMPEBEMNKLG() != 0) {
+          setOMPEBEMNKLG(other.getOMPEBEMNKLG());
+        }
         if (other.getAbilityNameHash() != 0) {
           setAbilityNameHash(other.getAbilityNameHash());
         }
-        if (other.getAbilityConfigHash() != 0) {
-          setAbilityConfigHash(other.getAbilityConfigHash());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -466,6 +458,37 @@ public final class ShortAbilityHashPairOuterClass {
         return this;
       }
 
+      private int oMPEBEMNKLG_ ;
+      /**
+       * <code>sfixed32 OMPEBEMNKLG = 13;</code>
+       * @return The oMPEBEMNKLG.
+       */
+      @java.lang.Override
+      public int getOMPEBEMNKLG() {
+        return oMPEBEMNKLG_;
+      }
+      /**
+       * <code>sfixed32 OMPEBEMNKLG = 13;</code>
+       * @param value The oMPEBEMNKLG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOMPEBEMNKLG(int value) {
+        
+        oMPEBEMNKLG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>sfixed32 OMPEBEMNKLG = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOMPEBEMNKLG() {
+        
+        oMPEBEMNKLG_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int abilityNameHash_ ;
       /**
        * <code>sfixed32 ability_name_hash = 15;</code>
@@ -496,37 +519,6 @@ public final class ShortAbilityHashPairOuterClass {
         onChanged();
         return this;
       }
-
-      private int abilityConfigHash_ ;
-      /**
-       * <code>sfixed32 ability_config_hash = 14;</code>
-       * @return The abilityConfigHash.
-       */
-      @java.lang.Override
-      public int getAbilityConfigHash() {
-        return abilityConfigHash_;
-      }
-      /**
-       * <code>sfixed32 ability_config_hash = 14;</code>
-       * @param value The abilityConfigHash to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAbilityConfigHash(int value) {
-        
-        abilityConfigHash_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>sfixed32 ability_config_hash = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAbilityConfigHash() {
-        
-        abilityConfigHash_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -594,10 +586,10 @@ public final class ShortAbilityHashPairOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032ShortAbilityHashPair.proto\"N\n\024ShortAbi" +
-      "lityHashPair\022\031\n\021ability_name_hash\030\017 \001(\017\022" +
-      "\033\n\023ability_config_hash\030\016 \001(\017B\033\n\031emu.gras" +
-      "scutter.net.protob\006proto3"
+      "\n\032ShortAbilityHashPair.proto\"F\n\024ShortAbi" +
+      "lityHashPair\022\023\n\013OMPEBEMNKLG\030\r \001(\017\022\031\n\021abi" +
+      "lity_name_hash\030\017 \001(\017B\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -608,7 +600,7 @@ public final class ShortAbilityHashPairOuterClass {
     internal_static_ShortAbilityHashPair_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShortAbilityHashPair_descriptor,
-        new java.lang.String[] { "AbilityNameHash", "AbilityConfigHash", });
+        new java.lang.String[] { "OMPEBEMNKLG", "AbilityNameHash", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShowAvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShowAvatarInfoOuterClass.java
index 0b46e8bc9..e51691cdb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShowAvatarInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShowAvatarInfoOuterClass.java
@@ -267,10 +267,6 @@ public final class ShowAvatarInfoOuterClass {
     emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.AvatarExcelInfoOrBuilder getExcelInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: BHNAGPHOKLL
-   * </pre>
-   *
    * Protobuf type {@code ShowAvatarInfo}
    */
   public static final class ShowAvatarInfo extends
@@ -1420,10 +1416,6 @@ public final class ShowAvatarInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BHNAGPHOKLL
-     * </pre>
-     *
      * Protobuf type {@code ShowAvatarInfo}
      */
     public static final class Builder extends
@@ -3106,9 +3098,9 @@ public final class ShowAvatarInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\024ShowAvatarInfo.proto\032\017PropValue.proto\032" +
-      "\017ShowEquip.proto\032\026AvatarFetterInfo.proto" +
-      "\032\025AvatarExcelInfo.proto\"\372\005\n\016ShowAvatarIn" +
+      "\n\024ShowAvatarInfo.proto\032\017ShowEquip.proto\032" +
+      "\026AvatarFetterInfo.proto\032\025AvatarExcelInfo" +
+      ".proto\032\017PropValue.proto\"\372\005\n\016ShowAvatarIn" +
       "fo\022\021\n\tavatar_id\030\001 \001(\r\022.\n\010prop_map\030\002 \003(\0132" +
       "\034.ShowAvatarInfo.PropMapEntry\022\026\n\016talent_" +
       "id_list\030\003 \003(\r\0229\n\016fight_prop_map\030\004 \003(\0132!." +
@@ -3133,10 +3125,10 @@ public final class ShowAvatarInfoOuterClass {
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.ShowEquipOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor(),
         });
     internal_static_ShowAvatarInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
@@ -3168,10 +3160,10 @@ public final class ShowAvatarInfoOuterClass {
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShowAvatarInfo_ProudSkillExtraLevelMapEntry_descriptor,
         new java.lang.String[] { "Key", "Value", });
-    emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor();
     emu.grasscutter.net.proto.ShowEquipOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarFetterInfoOuterClass.getDescriptor();
     emu.grasscutter.net.proto.AvatarExcelInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PropValueOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShowEquipOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShowEquipOuterClass.java
index 1efc98c44..f6a2e4a8b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShowEquipOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShowEquipOuterClass.java
@@ -57,10 +57,6 @@ public final class ShowEquipOuterClass {
     public emu.grasscutter.net.proto.ShowEquipOuterClass.ShowEquip.DetailCase getDetailCase();
   }
   /**
-   * <pre>
-   * Obf: OJMNHOEOFAN
-   * </pre>
-   *
    * Protobuf type {@code ShowEquip}
    */
   public static final class ShowEquip extends
@@ -479,10 +475,6 @@ public final class ShowEquipOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OJMNHOEOFAN
-     * </pre>
-     *
      * Protobuf type {@code ShowEquip}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ShowTemplateReminderNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ShowTemplateReminderNotifyOuterClass.java
index e48ea0671..92a0f367e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ShowTemplateReminderNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ShowTemplateReminderNotifyOuterClass.java
@@ -19,63 +19,58 @@ public final class ShowTemplateReminderNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 template_reminder_id = 5;</code>
-     * @return The templateReminderId.
+     * <code>bool teis_need_cache = 3;</code>
+     * @return The teisNeedCache.
      */
-    int getTemplateReminderId();
+    boolean getTeisNeedCache();
 
     /**
-     * <code>bool EGFLCDAEPJA = 2;</code>
-     * @return The eGFLCDAEPJA.
+     * <code>repeated int32 param_list = 4;</code>
+     * @return A list containing the paramList.
      */
-    boolean getEGFLCDAEPJA();
+    java.util.List<java.lang.Integer> getParamListList();
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @return The count of paramList.
+     */
+    int getParamListCount();
+    /**
+     * <code>repeated int32 param_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The paramList at the given index.
+     */
+    int getParamList(int index);
 
     /**
-     * <code>bool FKICHIHKNGC = 6;</code>
-     * @return The fKICHIHKNGC.
-     */
-    boolean getFKICHIHKNGC();
-
-    /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
+     * <code>repeated uint32 param_uid_list = 6;</code>
      * @return A list containing the paramUidList.
      */
     java.util.List<java.lang.Integer> getParamUidListList();
     /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
+     * <code>repeated uint32 param_uid_list = 6;</code>
      * @return The count of paramUidList.
      */
     int getParamUidListCount();
     /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
+     * <code>repeated uint32 param_uid_list = 6;</code>
      * @param index The index of the element to return.
      * @return The paramUidList at the given index.
      */
     int getParamUidList(int index);
 
     /**
-     * <code>repeated int32 param_list = 3;</code>
-     * @return A list containing the paramList.
+     * <code>uint32 template_reminder_id = 9;</code>
+     * @return The templateReminderId.
      */
-    java.util.List<java.lang.Integer> getParamListList();
+    int getTemplateReminderId();
+
     /**
-     * <code>repeated int32 param_list = 3;</code>
-     * @return The count of paramList.
+     * <code>bool is_revoke = 10;</code>
+     * @return The isRevoke.
      */
-    int getParamListCount();
-    /**
-     * <code>repeated int32 param_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The paramList at the given index.
-     */
-    int getParamList(int index);
+    boolean getIsRevoke();
   }
   /**
-   * <pre>
-   * CmdId: 24864
-   * Obf: OFDMEDPBBHI
-   * </pre>
-   *
    * Protobuf type {@code ShowTemplateReminderNotify}
    */
   public static final class ShowTemplateReminderNotify extends
@@ -88,8 +83,8 @@ public final class ShowTemplateReminderNotifyOuterClass {
       super(builder);
     }
     private ShowTemplateReminderNotify() {
-      paramUidList_ = emptyIntList();
       paramList_ = emptyIntList();
+      paramUidList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -123,25 +118,25 @@ public final class ShowTemplateReminderNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
-              eGFLCDAEPJA_ = input.readBool();
+              teisNeedCache_ = input.readBool();
               break;
             }
-            case 24: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               paramList_.addInt(input.readInt32());
               break;
             }
-            case 26: {
+            case 34: {
               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) {
                 paramList_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 paramList_.addInt(input.readInt32());
@@ -149,30 +144,20 @@ public final class ShowTemplateReminderNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 40: {
-
-              templateReminderId_ = input.readUInt32();
-              break;
-            }
             case 48: {
-
-              fKICHIHKNGC_ = input.readBool();
-              break;
-            }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 paramUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               paramUidList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 50: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 paramUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 paramUidList_.addInt(input.readUInt32());
@@ -180,6 +165,16 @@ public final class ShowTemplateReminderNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 72: {
+
+              templateReminderId_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              isRevoke_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -195,10 +190,10 @@ public final class ShowTemplateReminderNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           paramList_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           paramUidList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -218,71 +213,21 @@ public final class ShowTemplateReminderNotifyOuterClass {
               emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify.class, emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify.Builder.class);
     }
 
-    public static final int TEMPLATE_REMINDER_ID_FIELD_NUMBER = 5;
-    private int templateReminderId_;
+    public static final int TEIS_NEED_CACHE_FIELD_NUMBER = 3;
+    private boolean teisNeedCache_;
     /**
-     * <code>uint32 template_reminder_id = 5;</code>
-     * @return The templateReminderId.
+     * <code>bool teis_need_cache = 3;</code>
+     * @return The teisNeedCache.
      */
     @java.lang.Override
-    public int getTemplateReminderId() {
-      return templateReminderId_;
+    public boolean getTeisNeedCache() {
+      return teisNeedCache_;
     }
 
-    public static final int EGFLCDAEPJA_FIELD_NUMBER = 2;
-    private boolean eGFLCDAEPJA_;
-    /**
-     * <code>bool EGFLCDAEPJA = 2;</code>
-     * @return The eGFLCDAEPJA.
-     */
-    @java.lang.Override
-    public boolean getEGFLCDAEPJA() {
-      return eGFLCDAEPJA_;
-    }
-
-    public static final int FKICHIHKNGC_FIELD_NUMBER = 6;
-    private boolean fKICHIHKNGC_;
-    /**
-     * <code>bool FKICHIHKNGC = 6;</code>
-     * @return The fKICHIHKNGC.
-     */
-    @java.lang.Override
-    public boolean getFKICHIHKNGC() {
-      return fKICHIHKNGC_;
-    }
-
-    public static final int PARAM_UID_LIST_FIELD_NUMBER = 15;
-    private com.google.protobuf.Internal.IntList paramUidList_;
-    /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
-     * @return A list containing the paramUidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getParamUidListList() {
-      return paramUidList_;
-    }
-    /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
-     * @return The count of paramUidList.
-     */
-    public int getParamUidListCount() {
-      return paramUidList_.size();
-    }
-    /**
-     * <code>repeated uint32 param_uid_list = 15;</code>
-     * @param index The index of the element to return.
-     * @return The paramUidList at the given index.
-     */
-    public int getParamUidList(int index) {
-      return paramUidList_.getInt(index);
-    }
-    private int paramUidListMemoizedSerializedSize = -1;
-
-    public static final int PARAM_LIST_FIELD_NUMBER = 3;
+    public static final int PARAM_LIST_FIELD_NUMBER = 4;
     private com.google.protobuf.Internal.IntList paramList_;
     /**
-     * <code>repeated int32 param_list = 3;</code>
+     * <code>repeated int32 param_list = 4;</code>
      * @return A list containing the paramList.
      */
     @java.lang.Override
@@ -291,14 +236,14 @@ public final class ShowTemplateReminderNotifyOuterClass {
       return paramList_;
     }
     /**
-     * <code>repeated int32 param_list = 3;</code>
+     * <code>repeated int32 param_list = 4;</code>
      * @return The count of paramList.
      */
     public int getParamListCount() {
       return paramList_.size();
     }
     /**
-     * <code>repeated int32 param_list = 3;</code>
+     * <code>repeated int32 param_list = 4;</code>
      * @param index The index of the element to return.
      * @return The paramList at the given index.
      */
@@ -307,6 +252,56 @@ public final class ShowTemplateReminderNotifyOuterClass {
     }
     private int paramListMemoizedSerializedSize = -1;
 
+    public static final int PARAM_UID_LIST_FIELD_NUMBER = 6;
+    private com.google.protobuf.Internal.IntList paramUidList_;
+    /**
+     * <code>repeated uint32 param_uid_list = 6;</code>
+     * @return A list containing the paramUidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getParamUidListList() {
+      return paramUidList_;
+    }
+    /**
+     * <code>repeated uint32 param_uid_list = 6;</code>
+     * @return The count of paramUidList.
+     */
+    public int getParamUidListCount() {
+      return paramUidList_.size();
+    }
+    /**
+     * <code>repeated uint32 param_uid_list = 6;</code>
+     * @param index The index of the element to return.
+     * @return The paramUidList at the given index.
+     */
+    public int getParamUidList(int index) {
+      return paramUidList_.getInt(index);
+    }
+    private int paramUidListMemoizedSerializedSize = -1;
+
+    public static final int TEMPLATE_REMINDER_ID_FIELD_NUMBER = 9;
+    private int templateReminderId_;
+    /**
+     * <code>uint32 template_reminder_id = 9;</code>
+     * @return The templateReminderId.
+     */
+    @java.lang.Override
+    public int getTemplateReminderId() {
+      return templateReminderId_;
+    }
+
+    public static final int IS_REVOKE_FIELD_NUMBER = 10;
+    private boolean isRevoke_;
+    /**
+     * <code>bool is_revoke = 10;</code>
+     * @return The isRevoke.
+     */
+    @java.lang.Override
+    public boolean getIsRevoke() {
+      return isRevoke_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -322,29 +317,29 @@ public final class ShowTemplateReminderNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (eGFLCDAEPJA_ != false) {
-        output.writeBool(2, eGFLCDAEPJA_);
+      if (teisNeedCache_ != false) {
+        output.writeBool(3, teisNeedCache_);
       }
       if (getParamListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(34);
         output.writeUInt32NoTag(paramListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramList_.size(); i++) {
         output.writeInt32NoTag(paramList_.getInt(i));
       }
-      if (templateReminderId_ != 0) {
-        output.writeUInt32(5, templateReminderId_);
-      }
-      if (fKICHIHKNGC_ != false) {
-        output.writeBool(6, fKICHIHKNGC_);
-      }
       if (getParamUidListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(50);
         output.writeUInt32NoTag(paramUidListMemoizedSerializedSize);
       }
       for (int i = 0; i < paramUidList_.size(); i++) {
         output.writeUInt32NoTag(paramUidList_.getInt(i));
       }
+      if (templateReminderId_ != 0) {
+        output.writeUInt32(9, templateReminderId_);
+      }
+      if (isRevoke_ != false) {
+        output.writeBool(10, isRevoke_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -354,9 +349,9 @@ public final class ShowTemplateReminderNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (eGFLCDAEPJA_ != false) {
+      if (teisNeedCache_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, eGFLCDAEPJA_);
+          .computeBoolSize(3, teisNeedCache_);
       }
       {
         int dataSize = 0;
@@ -372,14 +367,6 @@ public final class ShowTemplateReminderNotifyOuterClass {
         }
         paramListMemoizedSerializedSize = dataSize;
       }
-      if (templateReminderId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, templateReminderId_);
-      }
-      if (fKICHIHKNGC_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(6, fKICHIHKNGC_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < paramUidList_.size(); i++) {
@@ -394,6 +381,14 @@ public final class ShowTemplateReminderNotifyOuterClass {
         }
         paramUidListMemoizedSerializedSize = dataSize;
       }
+      if (templateReminderId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, templateReminderId_);
+      }
+      if (isRevoke_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isRevoke_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -409,16 +404,16 @@ public final class ShowTemplateReminderNotifyOuterClass {
       }
       emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify other = (emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify) obj;
 
-      if (getTemplateReminderId()
-          != other.getTemplateReminderId()) return false;
-      if (getEGFLCDAEPJA()
-          != other.getEGFLCDAEPJA()) return false;
-      if (getFKICHIHKNGC()
-          != other.getFKICHIHKNGC()) return false;
-      if (!getParamUidListList()
-          .equals(other.getParamUidListList())) return false;
+      if (getTeisNeedCache()
+          != other.getTeisNeedCache()) return false;
       if (!getParamListList()
           .equals(other.getParamListList())) return false;
+      if (!getParamUidListList()
+          .equals(other.getParamUidListList())) return false;
+      if (getTemplateReminderId()
+          != other.getTemplateReminderId()) return false;
+      if (getIsRevoke()
+          != other.getIsRevoke()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -430,22 +425,22 @@ public final class ShowTemplateReminderNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TEMPLATE_REMINDER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getTemplateReminderId();
-      hash = (37 * hash) + EGFLCDAEPJA_FIELD_NUMBER;
+      hash = (37 * hash) + TEIS_NEED_CACHE_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getEGFLCDAEPJA());
-      hash = (37 * hash) + FKICHIHKNGC_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getFKICHIHKNGC());
-      if (getParamUidListCount() > 0) {
-        hash = (37 * hash) + PARAM_UID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getParamUidListList().hashCode();
-      }
+          getTeisNeedCache());
       if (getParamListCount() > 0) {
         hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamListList().hashCode();
       }
+      if (getParamUidListCount() > 0) {
+        hash = (37 * hash) + PARAM_UID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getParamUidListList().hashCode();
+      }
+      hash = (37 * hash) + TEMPLATE_REMINDER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getTemplateReminderId();
+      hash = (37 * hash) + IS_REVOKE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsRevoke());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -542,11 +537,6 @@ public final class ShowTemplateReminderNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 24864
-     * Obf: OFDMEDPBBHI
-     * </pre>
-     *
      * Protobuf type {@code ShowTemplateReminderNotify}
      */
     public static final class Builder extends
@@ -584,16 +574,16 @@ public final class ShowTemplateReminderNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        teisNeedCache_ = false;
+
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        paramUidList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
         templateReminderId_ = 0;
 
-        eGFLCDAEPJA_ = false;
+        isRevoke_ = false;
 
-        fKICHIHKNGC_ = false;
-
-        paramUidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
         return this;
       }
 
@@ -621,19 +611,19 @@ public final class ShowTemplateReminderNotifyOuterClass {
       public emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify buildPartial() {
         emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify result = new emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify(this);
         int from_bitField0_ = bitField0_;
-        result.templateReminderId_ = templateReminderId_;
-        result.eGFLCDAEPJA_ = eGFLCDAEPJA_;
-        result.fKICHIHKNGC_ = fKICHIHKNGC_;
+        result.teisNeedCache_ = teisNeedCache_;
         if (((bitField0_ & 0x00000001) != 0)) {
-          paramUidList_.makeImmutable();
+          paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
-        result.paramUidList_ = paramUidList_;
+        result.paramList_ = paramList_;
         if (((bitField0_ & 0x00000002) != 0)) {
-          paramList_.makeImmutable();
+          paramUidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000002);
         }
-        result.paramList_ = paramList_;
+        result.paramUidList_ = paramUidList_;
+        result.templateReminderId_ = templateReminderId_;
+        result.isRevoke_ = isRevoke_;
         onBuilt();
         return result;
       }
@@ -682,34 +672,34 @@ public final class ShowTemplateReminderNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify other) {
         if (other == emu.grasscutter.net.proto.ShowTemplateReminderNotifyOuterClass.ShowTemplateReminderNotify.getDefaultInstance()) return this;
-        if (other.getTemplateReminderId() != 0) {
-          setTemplateReminderId(other.getTemplateReminderId());
+        if (other.getTeisNeedCache() != false) {
+          setTeisNeedCache(other.getTeisNeedCache());
         }
-        if (other.getEGFLCDAEPJA() != false) {
-          setEGFLCDAEPJA(other.getEGFLCDAEPJA());
-        }
-        if (other.getFKICHIHKNGC() != false) {
-          setFKICHIHKNGC(other.getFKICHIHKNGC());
+        if (!other.paramList_.isEmpty()) {
+          if (paramList_.isEmpty()) {
+            paramList_ = other.paramList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureParamListIsMutable();
+            paramList_.addAll(other.paramList_);
+          }
+          onChanged();
         }
         if (!other.paramUidList_.isEmpty()) {
           if (paramUidList_.isEmpty()) {
             paramUidList_ = other.paramUidList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensureParamUidListIsMutable();
             paramUidList_.addAll(other.paramUidList_);
           }
           onChanged();
         }
-        if (!other.paramList_.isEmpty()) {
-          if (paramList_.isEmpty()) {
-            paramList_ = other.paramList_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureParamListIsMutable();
-            paramList_.addAll(other.paramList_);
-          }
-          onChanged();
+        if (other.getTemplateReminderId() != 0) {
+          setTemplateReminderId(other.getTemplateReminderId());
+        }
+        if (other.getIsRevoke() != false) {
+          setIsRevoke(other.getIsRevoke());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -741,203 +731,62 @@ public final class ShowTemplateReminderNotifyOuterClass {
       }
       private int bitField0_;
 
-      private int templateReminderId_ ;
+      private boolean teisNeedCache_ ;
       /**
-       * <code>uint32 template_reminder_id = 5;</code>
-       * @return The templateReminderId.
+       * <code>bool teis_need_cache = 3;</code>
+       * @return The teisNeedCache.
        */
       @java.lang.Override
-      public int getTemplateReminderId() {
-        return templateReminderId_;
+      public boolean getTeisNeedCache() {
+        return teisNeedCache_;
       }
       /**
-       * <code>uint32 template_reminder_id = 5;</code>
-       * @param value The templateReminderId to set.
+       * <code>bool teis_need_cache = 3;</code>
+       * @param value The teisNeedCache to set.
        * @return This builder for chaining.
        */
-      public Builder setTemplateReminderId(int value) {
+      public Builder setTeisNeedCache(boolean value) {
         
-        templateReminderId_ = value;
+        teisNeedCache_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 template_reminder_id = 5;</code>
+       * <code>bool teis_need_cache = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearTemplateReminderId() {
+      public Builder clearTeisNeedCache() {
         
-        templateReminderId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private boolean eGFLCDAEPJA_ ;
-      /**
-       * <code>bool EGFLCDAEPJA = 2;</code>
-       * @return The eGFLCDAEPJA.
-       */
-      @java.lang.Override
-      public boolean getEGFLCDAEPJA() {
-        return eGFLCDAEPJA_;
-      }
-      /**
-       * <code>bool EGFLCDAEPJA = 2;</code>
-       * @param value The eGFLCDAEPJA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEGFLCDAEPJA(boolean value) {
-        
-        eGFLCDAEPJA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool EGFLCDAEPJA = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEGFLCDAEPJA() {
-        
-        eGFLCDAEPJA_ = false;
-        onChanged();
-        return this;
-      }
-
-      private boolean fKICHIHKNGC_ ;
-      /**
-       * <code>bool FKICHIHKNGC = 6;</code>
-       * @return The fKICHIHKNGC.
-       */
-      @java.lang.Override
-      public boolean getFKICHIHKNGC() {
-        return fKICHIHKNGC_;
-      }
-      /**
-       * <code>bool FKICHIHKNGC = 6;</code>
-       * @param value The fKICHIHKNGC to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFKICHIHKNGC(boolean value) {
-        
-        fKICHIHKNGC_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool FKICHIHKNGC = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFKICHIHKNGC() {
-        
-        fKICHIHKNGC_ = false;
-        onChanged();
-        return this;
-      }
-
-      private com.google.protobuf.Internal.IntList paramUidList_ = emptyIntList();
-      private void ensureParamUidListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          paramUidList_ = mutableCopy(paramUidList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @return A list containing the paramUidList.
-       */
-      public java.util.List<java.lang.Integer>
-          getParamUidListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(paramUidList_) : paramUidList_;
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @return The count of paramUidList.
-       */
-      public int getParamUidListCount() {
-        return paramUidList_.size();
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @param index The index of the element to return.
-       * @return The paramUidList at the given index.
-       */
-      public int getParamUidList(int index) {
-        return paramUidList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @param index The index to set the value at.
-       * @param value The paramUidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setParamUidList(
-          int index, int value) {
-        ensureParamUidListIsMutable();
-        paramUidList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @param value The paramUidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addParamUidList(int value) {
-        ensureParamUidListIsMutable();
-        paramUidList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @param values The paramUidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllParamUidList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureParamUidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, paramUidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 param_uid_list = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearParamUidList() {
-        paramUidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
+        teisNeedCache_ = false;
         onChanged();
         return this;
       }
 
       private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
       private void ensureParamListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           paramList_ = mutableCopy(paramList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @return A list containing the paramList.
        */
       public java.util.List<java.lang.Integer>
           getParamListList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
+        return ((bitField0_ & 0x00000001) != 0) ?
                  java.util.Collections.unmodifiableList(paramList_) : paramList_;
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @return The count of paramList.
        */
       public int getParamListCount() {
         return paramList_.size();
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @param index The index of the element to return.
        * @return The paramList at the given index.
        */
@@ -945,7 +794,7 @@ public final class ShowTemplateReminderNotifyOuterClass {
         return paramList_.getInt(index);
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @param index The index to set the value at.
        * @param value The paramList to set.
        * @return This builder for chaining.
@@ -958,7 +807,7 @@ public final class ShowTemplateReminderNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @param value The paramList to add.
        * @return This builder for chaining.
        */
@@ -969,7 +818,7 @@ public final class ShowTemplateReminderNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @param values The paramList to add.
        * @return This builder for chaining.
        */
@@ -982,15 +831,156 @@ public final class ShowTemplateReminderNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated int32 param_list = 3;</code>
+       * <code>repeated int32 param_list = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearParamList() {
         paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList paramUidList_ = emptyIntList();
+      private void ensureParamUidListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          paramUidList_ = mutableCopy(paramUidList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @return A list containing the paramUidList.
+       */
+      public java.util.List<java.lang.Integer>
+          getParamUidListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(paramUidList_) : paramUidList_;
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @return The count of paramUidList.
+       */
+      public int getParamUidListCount() {
+        return paramUidList_.size();
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @param index The index of the element to return.
+       * @return The paramUidList at the given index.
+       */
+      public int getParamUidList(int index) {
+        return paramUidList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @param index The index to set the value at.
+       * @param value The paramUidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setParamUidList(
+          int index, int value) {
+        ensureParamUidListIsMutable();
+        paramUidList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @param value The paramUidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addParamUidList(int value) {
+        ensureParamUidListIsMutable();
+        paramUidList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @param values The paramUidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllParamUidList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureParamUidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, paramUidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 param_uid_list = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearParamUidList() {
+        paramUidList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
+
+      private int templateReminderId_ ;
+      /**
+       * <code>uint32 template_reminder_id = 9;</code>
+       * @return The templateReminderId.
+       */
+      @java.lang.Override
+      public int getTemplateReminderId() {
+        return templateReminderId_;
+      }
+      /**
+       * <code>uint32 template_reminder_id = 9;</code>
+       * @param value The templateReminderId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTemplateReminderId(int value) {
+        
+        templateReminderId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 template_reminder_id = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTemplateReminderId() {
+        
+        templateReminderId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isRevoke_ ;
+      /**
+       * <code>bool is_revoke = 10;</code>
+       * @return The isRevoke.
+       */
+      @java.lang.Override
+      public boolean getIsRevoke() {
+        return isRevoke_;
+      }
+      /**
+       * <code>bool is_revoke = 10;</code>
+       * @param value The isRevoke to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsRevoke(boolean value) {
+        
+        isRevoke_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_revoke = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsRevoke() {
+        
+        isRevoke_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1058,12 +1048,12 @@ public final class ShowTemplateReminderNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n ShowTemplateReminderNotify.proto\"\220\001\n\032S" +
-      "howTemplateReminderNotify\022\034\n\024template_re" +
-      "minder_id\030\005 \001(\r\022\023\n\013EGFLCDAEPJA\030\002 \001(\010\022\023\n\013" +
-      "FKICHIHKNGC\030\006 \001(\010\022\026\n\016param_uid_list\030\017 \003(" +
-      "\r\022\022\n\nparam_list\030\003 \003(\005B\033\n\031emu.grasscutter" +
-      ".net.protob\006proto3"
+      "\n ShowTemplateReminderNotify.proto\"\222\001\n\032S" +
+      "howTemplateReminderNotify\022\027\n\017teis_need_c" +
+      "ache\030\003 \001(\010\022\022\n\nparam_list\030\004 \003(\005\022\026\n\016param_" +
+      "uid_list\030\006 \003(\r\022\034\n\024template_reminder_id\030\t" +
+      " \001(\r\022\021\n\tis_revoke\030\n \001(\010B\033\n\031emu.grasscutt" +
+      "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1074,7 +1064,7 @@ public final class ShowTemplateReminderNotifyOuterClass {
     internal_static_ShowTemplateReminderNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ShowTemplateReminderNotify_descriptor,
-        new java.lang.String[] { "TemplateReminderId", "EGFLCDAEPJA", "FKICHIHKNGC", "ParamUidList", "ParamList", });
+        new java.lang.String[] { "TeisNeedCache", "ParamList", "ParamUidList", "TemplateReminderId", "IsRevoke", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java
index 7d8890598..12c52f4ed 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeReqOuterClass.java
@@ -19,27 +19,26 @@ public final class SkipPlayerGameTimeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 game_time = 12;</code>
-     * @return The gameTime.
-     */
-    int getGameTime();
-
-    /**
-     * <code>bool is_force_set = 1;</code>
+     * <code>bool is_force_set = 5;</code>
      * @return The isForceSet.
      */
     boolean getIsForceSet();
 
     /**
-     * <code>uint32 client_game_time = 7;</code>
+     * <code>uint32 game_time = 1;</code>
+     * @return The gameTime.
+     */
+    int getGameTime();
+
+    /**
+     * <code>uint32 client_game_time = 12;</code>
      * @return The clientGameTime.
      */
     int getClientGameTime();
   }
   /**
    * <pre>
-   * CmdId: 22076
-   * Obf: DEFBFNOLMID
+   * CmdId: 29432
    * </pre>
    *
    * Protobuf type {@code SkipPlayerGameTimeReq}
@@ -88,17 +87,17 @@ public final class SkipPlayerGameTimeReqOuterClass {
               break;
             case 8: {
 
-              isForceSet_ = input.readBool();
+              gameTime_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 40: {
 
-              clientGameTime_ = input.readUInt32();
+              isForceSet_ = input.readBool();
               break;
             }
             case 96: {
 
-              gameTime_ = input.readUInt32();
+              clientGameTime_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,21 +132,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
               emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.class, emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.Builder.class);
     }
 
-    public static final int GAME_TIME_FIELD_NUMBER = 12;
-    private int gameTime_;
-    /**
-     * <code>uint32 game_time = 12;</code>
-     * @return The gameTime.
-     */
-    @java.lang.Override
-    public int getGameTime() {
-      return gameTime_;
-    }
-
-    public static final int IS_FORCE_SET_FIELD_NUMBER = 1;
+    public static final int IS_FORCE_SET_FIELD_NUMBER = 5;
     private boolean isForceSet_;
     /**
-     * <code>bool is_force_set = 1;</code>
+     * <code>bool is_force_set = 5;</code>
      * @return The isForceSet.
      */
     @java.lang.Override
@@ -155,10 +143,21 @@ public final class SkipPlayerGameTimeReqOuterClass {
       return isForceSet_;
     }
 
-    public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 7;
+    public static final int GAME_TIME_FIELD_NUMBER = 1;
+    private int gameTime_;
+    /**
+     * <code>uint32 game_time = 1;</code>
+     * @return The gameTime.
+     */
+    @java.lang.Override
+    public int getGameTime() {
+      return gameTime_;
+    }
+
+    public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 12;
     private int clientGameTime_;
     /**
-     * <code>uint32 client_game_time = 7;</code>
+     * <code>uint32 client_game_time = 12;</code>
      * @return The clientGameTime.
      */
     @java.lang.Override
@@ -180,14 +179,14 @@ public final class SkipPlayerGameTimeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (gameTime_ != 0) {
+        output.writeUInt32(1, gameTime_);
+      }
       if (isForceSet_ != false) {
-        output.writeBool(1, isForceSet_);
+        output.writeBool(5, isForceSet_);
       }
       if (clientGameTime_ != 0) {
-        output.writeUInt32(7, clientGameTime_);
-      }
-      if (gameTime_ != 0) {
-        output.writeUInt32(12, gameTime_);
+        output.writeUInt32(12, clientGameTime_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class SkipPlayerGameTimeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (gameTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, gameTime_);
+      }
       if (isForceSet_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(1, isForceSet_);
+          .computeBoolSize(5, isForceSet_);
       }
       if (clientGameTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, clientGameTime_);
-      }
-      if (gameTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, gameTime_);
+          .computeUInt32Size(12, clientGameTime_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,10 +224,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
       }
       emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq other = (emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq) obj;
 
-      if (getGameTime()
-          != other.getGameTime()) return false;
       if (getIsForceSet()
           != other.getIsForceSet()) return false;
+      if (getGameTime()
+          != other.getGameTime()) return false;
       if (getClientGameTime()
           != other.getClientGameTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,11 +241,11 @@ public final class SkipPlayerGameTimeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getGameTime();
       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) + CLIENT_GAME_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getClientGameTime();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -346,8 +345,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 22076
-     * Obf: DEFBFNOLMID
+     * CmdId: 29432
      * </pre>
      *
      * Protobuf type {@code SkipPlayerGameTimeReq}
@@ -387,10 +385,10 @@ public final class SkipPlayerGameTimeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gameTime_ = 0;
-
         isForceSet_ = false;
 
+        gameTime_ = 0;
+
         clientGameTime_ = 0;
 
         return this;
@@ -419,8 +417,8 @@ public final class SkipPlayerGameTimeReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq buildPartial() {
         emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq result = new emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq(this);
-        result.gameTime_ = gameTime_;
         result.isForceSet_ = isForceSet_;
+        result.gameTime_ = gameTime_;
         result.clientGameTime_ = clientGameTime_;
         onBuilt();
         return result;
@@ -470,12 +468,12 @@ public final class SkipPlayerGameTimeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq other) {
         if (other == emu.grasscutter.net.proto.SkipPlayerGameTimeReqOuterClass.SkipPlayerGameTimeReq.getDefaultInstance()) return this;
-        if (other.getGameTime() != 0) {
-          setGameTime(other.getGameTime());
-        }
         if (other.getIsForceSet() != false) {
           setIsForceSet(other.getIsForceSet());
         }
+        if (other.getGameTime() != 0) {
+          setGameTime(other.getGameTime());
+        }
         if (other.getClientGameTime() != 0) {
           setClientGameTime(other.getClientGameTime());
         }
@@ -508,40 +506,9 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return this;
       }
 
-      private int gameTime_ ;
-      /**
-       * <code>uint32 game_time = 12;</code>
-       * @return The gameTime.
-       */
-      @java.lang.Override
-      public int getGameTime() {
-        return gameTime_;
-      }
-      /**
-       * <code>uint32 game_time = 12;</code>
-       * @param value The gameTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGameTime(int value) {
-        
-        gameTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 game_time = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGameTime() {
-        
-        gameTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private boolean isForceSet_ ;
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <code>bool is_force_set = 5;</code>
        * @return The isForceSet.
        */
       @java.lang.Override
@@ -549,7 +516,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return isForceSet_;
       }
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <code>bool is_force_set = 5;</code>
        * @param value The isForceSet to set.
        * @return This builder for chaining.
        */
@@ -560,7 +527,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_force_set = 1;</code>
+       * <code>bool is_force_set = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsForceSet() {
@@ -570,9 +537,40 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return this;
       }
 
+      private int gameTime_ ;
+      /**
+       * <code>uint32 game_time = 1;</code>
+       * @return The gameTime.
+       */
+      @java.lang.Override
+      public int getGameTime() {
+        return gameTime_;
+      }
+      /**
+       * <code>uint32 game_time = 1;</code>
+       * @param value The gameTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGameTime(int value) {
+        
+        gameTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 game_time = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGameTime() {
+        
+        gameTime_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int clientGameTime_ ;
       /**
-       * <code>uint32 client_game_time = 7;</code>
+       * <code>uint32 client_game_time = 12;</code>
        * @return The clientGameTime.
        */
       @java.lang.Override
@@ -580,7 +578,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return clientGameTime_;
       }
       /**
-       * <code>uint32 client_game_time = 7;</code>
+       * <code>uint32 client_game_time = 12;</code>
        * @param value The clientGameTime to set.
        * @return This builder for chaining.
        */
@@ -591,7 +589,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 client_game_time = 7;</code>
+       * <code>uint32 client_game_time = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearClientGameTime() {
@@ -668,8 +666,8 @@ public final class SkipPlayerGameTimeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SkipPlayerGameTimeReq.proto\"Z\n\025SkipPla" +
-      "yerGameTimeReq\022\021\n\tgame_time\030\014 \001(\r\022\024\n\014is_" +
-      "force_set\030\001 \001(\010\022\030\n\020client_game_time\030\007 \001(" +
+      "yerGameTimeReq\022\024\n\014is_force_set\030\005 \001(\010\022\021\n\t" +
+      "game_time\030\001 \001(\r\022\030\n\020client_game_time\030\014 \001(" +
       "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -681,7 +679,7 @@ public final class SkipPlayerGameTimeReqOuterClass {
     internal_static_SkipPlayerGameTimeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SkipPlayerGameTimeReq_descriptor,
-        new java.lang.String[] { "GameTime", "IsForceSet", "ClientGameTime", });
+        new java.lang.String[] { "IsForceSet", "GameTime", "ClientGameTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java
index d085cc39a..ce2da2200 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SkipPlayerGameTimeRspOuterClass.java
@@ -19,17 +19,17 @@ public final class SkipPlayerGameTimeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 client_game_time = 2;</code>
-     * @return The clientGameTime.
-     */
-    int getClientGameTime();
-
-    /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     int getRetcode();
 
+    /**
+     * <code>uint32 client_game_time = 7;</code>
+     * @return The clientGameTime.
+     */
+    int getClientGameTime();
+
     /**
      * <code>uint32 game_time = 13;</code>
      * @return The gameTime.
@@ -38,8 +38,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
   }
   /**
    * <pre>
-   * CmdId: 24529
-   * Obf: PFBBCGKLBFC
+   * CmdId: 338
    * </pre>
    *
    * Protobuf type {@code SkipPlayerGameTimeRsp}
@@ -86,16 +85,16 @@ public final class SkipPlayerGameTimeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              clientGameTime_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 48: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 56: {
+
+              clientGameTime_ = input.readUInt32();
+              break;
+            }
             case 104: {
 
               gameTime_ = input.readUInt32();
@@ -133,21 +132,10 @@ public final class SkipPlayerGameTimeRspOuterClass {
               emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.class, emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.Builder.class);
     }
 
-    public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 2;
-    private int clientGameTime_;
-    /**
-     * <code>uint32 client_game_time = 2;</code>
-     * @return The clientGameTime.
-     */
-    @java.lang.Override
-    public int getClientGameTime() {
-      return clientGameTime_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 9;
+    public static final int RETCODE_FIELD_NUMBER = 6;
     private int retcode_;
     /**
-     * <code>int32 retcode = 9;</code>
+     * <code>int32 retcode = 6;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,6 +143,17 @@ public final class SkipPlayerGameTimeRspOuterClass {
       return retcode_;
     }
 
+    public static final int CLIENT_GAME_TIME_FIELD_NUMBER = 7;
+    private int clientGameTime_;
+    /**
+     * <code>uint32 client_game_time = 7;</code>
+     * @return The clientGameTime.
+     */
+    @java.lang.Override
+    public int getClientGameTime() {
+      return clientGameTime_;
+    }
+
     public static final int GAME_TIME_FIELD_NUMBER = 13;
     private int gameTime_;
     /**
@@ -180,11 +179,11 @@ public final class SkipPlayerGameTimeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (clientGameTime_ != 0) {
-        output.writeUInt32(2, clientGameTime_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(9, retcode_);
+        output.writeInt32(6, retcode_);
+      }
+      if (clientGameTime_ != 0) {
+        output.writeUInt32(7, clientGameTime_);
       }
       if (gameTime_ != 0) {
         output.writeUInt32(13, gameTime_);
@@ -198,13 +197,13 @@ public final class SkipPlayerGameTimeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (clientGameTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, clientGameTime_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(9, retcode_);
+          .computeInt32Size(6, retcode_);
+      }
+      if (clientGameTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, clientGameTime_);
       }
       if (gameTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -225,10 +224,10 @@ public final class SkipPlayerGameTimeRspOuterClass {
       }
       emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other = (emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp) obj;
 
-      if (getClientGameTime()
-          != other.getClientGameTime()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getClientGameTime()
+          != other.getClientGameTime()) return false;
       if (getGameTime()
           != other.getGameTime()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -242,10 +241,10 @@ public final class SkipPlayerGameTimeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getClientGameTime();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + CLIENT_GAME_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getClientGameTime();
       hash = (37 * hash) + GAME_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getGameTime();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -345,8 +344,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 24529
-     * Obf: PFBBCGKLBFC
+     * CmdId: 338
      * </pre>
      *
      * Protobuf type {@code SkipPlayerGameTimeRsp}
@@ -386,10 +384,10 @@ public final class SkipPlayerGameTimeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        clientGameTime_ = 0;
-
         retcode_ = 0;
 
+        clientGameTime_ = 0;
+
         gameTime_ = 0;
 
         return this;
@@ -418,8 +416,8 @@ public final class SkipPlayerGameTimeRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp buildPartial() {
         emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp result = new emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp(this);
-        result.clientGameTime_ = clientGameTime_;
         result.retcode_ = retcode_;
+        result.clientGameTime_ = clientGameTime_;
         result.gameTime_ = gameTime_;
         onBuilt();
         return result;
@@ -469,12 +467,12 @@ public final class SkipPlayerGameTimeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp other) {
         if (other == emu.grasscutter.net.proto.SkipPlayerGameTimeRspOuterClass.SkipPlayerGameTimeRsp.getDefaultInstance()) return this;
-        if (other.getClientGameTime() != 0) {
-          setClientGameTime(other.getClientGameTime());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getClientGameTime() != 0) {
+          setClientGameTime(other.getClientGameTime());
+        }
         if (other.getGameTime() != 0) {
           setGameTime(other.getGameTime());
         }
@@ -507,40 +505,9 @@ public final class SkipPlayerGameTimeRspOuterClass {
         return this;
       }
 
-      private int clientGameTime_ ;
-      /**
-       * <code>uint32 client_game_time = 2;</code>
-       * @return The clientGameTime.
-       */
-      @java.lang.Override
-      public int getClientGameTime() {
-        return clientGameTime_;
-      }
-      /**
-       * <code>uint32 client_game_time = 2;</code>
-       * @param value The clientGameTime to set.
-       * @return This builder for chaining.
-       */
-      public Builder setClientGameTime(int value) {
-        
-        clientGameTime_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 client_game_time = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearClientGameTime() {
-        
-        clientGameTime_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 6;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -548,7 +515,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 6;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -559,7 +526,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 9;</code>
+       * <code>int32 retcode = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -569,6 +536,37 @@ public final class SkipPlayerGameTimeRspOuterClass {
         return this;
       }
 
+      private int clientGameTime_ ;
+      /**
+       * <code>uint32 client_game_time = 7;</code>
+       * @return The clientGameTime.
+       */
+      @java.lang.Override
+      public int getClientGameTime() {
+        return clientGameTime_;
+      }
+      /**
+       * <code>uint32 client_game_time = 7;</code>
+       * @param value The clientGameTime to set.
+       * @return This builder for chaining.
+       */
+      public Builder setClientGameTime(int value) {
+        
+        clientGameTime_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 client_game_time = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearClientGameTime() {
+        
+        clientGameTime_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int gameTime_ ;
       /**
        * <code>uint32 game_time = 13;</code>
@@ -667,8 +665,8 @@ public final class SkipPlayerGameTimeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033SkipPlayerGameTimeRsp.proto\"U\n\025SkipPla" +
-      "yerGameTimeRsp\022\030\n\020client_game_time\030\002 \001(\r" +
-      "\022\017\n\007retcode\030\t \001(\005\022\021\n\tgame_time\030\r \001(\rB\033\n\031" +
+      "yerGameTimeRsp\022\017\n\007retcode\030\006 \001(\005\022\030\n\020clien" +
+      "t_game_time\030\007 \001(\r\022\021\n\tgame_time\030\r \001(\rB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +678,7 @@ public final class SkipPlayerGameTimeRspOuterClass {
     internal_static_SkipPlayerGameTimeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SkipPlayerGameTimeRsp_descriptor,
-        new java.lang.String[] { "ClientGameTime", "Retcode", "GameTime", });
+        new java.lang.String[] { "Retcode", "ClientGameTime", "GameTime", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SocialDetailOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SocialDetailOuterClass.java
index 657219886..058ab764c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SocialDetailOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SocialDetailOuterClass.java
@@ -271,12 +271,48 @@ public final class SocialDetailOuterClass {
      */
     com.google.protobuf.ByteString
         getIpCodeBytes();
+
+    /**
+     * <code>uint32 CMOBLNACDIE = 27;</code>
+     * @return The cMOBLNACDIE.
+     */
+    int getCMOBLNACDIE();
+
+    /**
+     * <code>uint32 GEGBOECJJMO = 28;</code>
+     * @return The gEGBOECJJMO.
+     */
+    int getGEGBOECJJMO();
+
+    /**
+     * <code>uint32 MBOLLDBJPCP = 32;</code>
+     * @return The mBOLLDBJPCP.
+     */
+    int getMBOLLDBJPCP();
+
+    /**
+     * <code>bool is_show_constellation_num = 33;</code>
+     * @return The isShowConstellationNum.
+     */
+    boolean getIsShowConstellationNum();
+
+    /**
+     * <code>uint32 FLMFEMCAFHB = 34;</code>
+     * @return The fLMFEMCAFHB.
+     */
+    int getFLMFEMCAFHB();
+
+    /**
+     * <pre>
+     *GBNIKBFHHKP GFKFJJOADMH = 36;
+     * </pre>
+     *
+     * <code>uint32 MOBMAJIJJGL = 35;</code>
+     * @return The mOBMAJIJJGL.
+     */
+    int getMOBMAJIJJGL();
   }
   /**
-   * <pre>
-   * Obf: NBNCHDGBFEC
-   * </pre>
-   *
    * Protobuf type {@code SocialDetail}
    */
   public static final class SocialDetail extends
@@ -521,6 +557,36 @@ public final class SocialDetailOuterClass {
               ipCode_ = s;
               break;
             }
+            case 216: {
+
+              cMOBLNACDIE_ = input.readUInt32();
+              break;
+            }
+            case 224: {
+
+              gEGBOECJJMO_ = input.readUInt32();
+              break;
+            }
+            case 256: {
+
+              mBOLLDBJPCP_ = input.readUInt32();
+              break;
+            }
+            case 264: {
+
+              isShowConstellationNum_ = input.readBool();
+              break;
+            }
+            case 272: {
+
+              fLMFEMCAFHB_ = input.readUInt32();
+              break;
+            }
+            case 280: {
+
+              mOBMAJIJJGL_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -1092,6 +1158,76 @@ public final class SocialDetailOuterClass {
       }
     }
 
+    public static final int CMOBLNACDIE_FIELD_NUMBER = 27;
+    private int cMOBLNACDIE_;
+    /**
+     * <code>uint32 CMOBLNACDIE = 27;</code>
+     * @return The cMOBLNACDIE.
+     */
+    @java.lang.Override
+    public int getCMOBLNACDIE() {
+      return cMOBLNACDIE_;
+    }
+
+    public static final int GEGBOECJJMO_FIELD_NUMBER = 28;
+    private int gEGBOECJJMO_;
+    /**
+     * <code>uint32 GEGBOECJJMO = 28;</code>
+     * @return The gEGBOECJJMO.
+     */
+    @java.lang.Override
+    public int getGEGBOECJJMO() {
+      return gEGBOECJJMO_;
+    }
+
+    public static final int MBOLLDBJPCP_FIELD_NUMBER = 32;
+    private int mBOLLDBJPCP_;
+    /**
+     * <code>uint32 MBOLLDBJPCP = 32;</code>
+     * @return The mBOLLDBJPCP.
+     */
+    @java.lang.Override
+    public int getMBOLLDBJPCP() {
+      return mBOLLDBJPCP_;
+    }
+
+    public static final int IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER = 33;
+    private boolean isShowConstellationNum_;
+    /**
+     * <code>bool is_show_constellation_num = 33;</code>
+     * @return The isShowConstellationNum.
+     */
+    @java.lang.Override
+    public boolean getIsShowConstellationNum() {
+      return isShowConstellationNum_;
+    }
+
+    public static final int FLMFEMCAFHB_FIELD_NUMBER = 34;
+    private int fLMFEMCAFHB_;
+    /**
+     * <code>uint32 FLMFEMCAFHB = 34;</code>
+     * @return The fLMFEMCAFHB.
+     */
+    @java.lang.Override
+    public int getFLMFEMCAFHB() {
+      return fLMFEMCAFHB_;
+    }
+
+    public static final int MOBMAJIJJGL_FIELD_NUMBER = 35;
+    private int mOBMAJIJJGL_;
+    /**
+     * <pre>
+     *GBNIKBFHHKP GFKFJJOADMH = 36;
+     * </pre>
+     *
+     * <code>uint32 MOBMAJIJJGL = 35;</code>
+     * @return The mOBMAJIJJGL.
+     */
+    @java.lang.Override
+    public int getMOBMAJIJJGL() {
+      return mOBMAJIJJGL_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -1193,6 +1329,24 @@ public final class SocialDetailOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ipCode_)) {
         com.google.protobuf.GeneratedMessageV3.writeString(output, 26, ipCode_);
       }
+      if (cMOBLNACDIE_ != 0) {
+        output.writeUInt32(27, cMOBLNACDIE_);
+      }
+      if (gEGBOECJJMO_ != 0) {
+        output.writeUInt32(28, gEGBOECJJMO_);
+      }
+      if (mBOLLDBJPCP_ != 0) {
+        output.writeUInt32(32, mBOLLDBJPCP_);
+      }
+      if (isShowConstellationNum_ != false) {
+        output.writeBool(33, isShowConstellationNum_);
+      }
+      if (fLMFEMCAFHB_ != 0) {
+        output.writeUInt32(34, fLMFEMCAFHB_);
+      }
+      if (mOBMAJIJJGL_ != 0) {
+        output.writeUInt32(35, mOBMAJIJJGL_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -1321,6 +1475,30 @@ public final class SocialDetailOuterClass {
       if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(ipCode_)) {
         size += com.google.protobuf.GeneratedMessageV3.computeStringSize(26, ipCode_);
       }
+      if (cMOBLNACDIE_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(27, cMOBLNACDIE_);
+      }
+      if (gEGBOECJJMO_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(28, gEGBOECJJMO_);
+      }
+      if (mBOLLDBJPCP_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(32, mBOLLDBJPCP_);
+      }
+      if (isShowConstellationNum_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(33, isShowConstellationNum_);
+      }
+      if (fLMFEMCAFHB_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(34, fLMFEMCAFHB_);
+      }
+      if (mOBMAJIJJGL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(35, mOBMAJIJJGL_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -1392,6 +1570,18 @@ public final class SocialDetailOuterClass {
       }
       if (!getIpCode()
           .equals(other.getIpCode())) return false;
+      if (getCMOBLNACDIE()
+          != other.getCMOBLNACDIE()) return false;
+      if (getGEGBOECJJMO()
+          != other.getGEGBOECJJMO()) return false;
+      if (getMBOLLDBJPCP()
+          != other.getMBOLLDBJPCP()) return false;
+      if (getIsShowConstellationNum()
+          != other.getIsShowConstellationNum()) return false;
+      if (getFLMFEMCAFHB()
+          != other.getFLMFEMCAFHB()) return false;
+      if (getMOBMAJIJJGL()
+          != other.getMOBMAJIJJGL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -1470,6 +1660,19 @@ public final class SocialDetailOuterClass {
       }
       hash = (37 * hash) + IP_CODE_FIELD_NUMBER;
       hash = (53 * hash) + getIpCode().hashCode();
+      hash = (37 * hash) + CMOBLNACDIE_FIELD_NUMBER;
+      hash = (53 * hash) + getCMOBLNACDIE();
+      hash = (37 * hash) + GEGBOECJJMO_FIELD_NUMBER;
+      hash = (53 * hash) + getGEGBOECJJMO();
+      hash = (37 * hash) + MBOLLDBJPCP_FIELD_NUMBER;
+      hash = (53 * hash) + getMBOLLDBJPCP();
+      hash = (37 * hash) + IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsShowConstellationNum());
+      hash = (37 * hash) + FLMFEMCAFHB_FIELD_NUMBER;
+      hash = (53 * hash) + getFLMFEMCAFHB();
+      hash = (37 * hash) + MOBMAJIJJGL_FIELD_NUMBER;
+      hash = (53 * hash) + getMOBMAJIJJGL();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -1566,10 +1769,6 @@ public final class SocialDetailOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NBNCHDGBFEC
-     * </pre>
-     *
      * Protobuf type {@code SocialDetail}
      */
     public static final class Builder extends
@@ -1672,6 +1871,18 @@ public final class SocialDetailOuterClass {
         }
         ipCode_ = "";
 
+        cMOBLNACDIE_ = 0;
+
+        gEGBOECJJMO_ = 0;
+
+        mBOLLDBJPCP_ = 0;
+
+        isShowConstellationNum_ = false;
+
+        fLMFEMCAFHB_ = 0;
+
+        mOBMAJIJJGL_ = 0;
+
         return this;
       }
 
@@ -1749,6 +1960,12 @@ public final class SocialDetailOuterClass {
           result.profilePicture_ = profilePictureBuilder_.build();
         }
         result.ipCode_ = ipCode_;
+        result.cMOBLNACDIE_ = cMOBLNACDIE_;
+        result.gEGBOECJJMO_ = gEGBOECJJMO_;
+        result.mBOLLDBJPCP_ = mBOLLDBJPCP_;
+        result.isShowConstellationNum_ = isShowConstellationNum_;
+        result.fLMFEMCAFHB_ = fLMFEMCAFHB_;
+        result.mOBMAJIJJGL_ = mOBMAJIJJGL_;
         onBuilt();
         return result;
       }
@@ -1917,6 +2134,24 @@ public final class SocialDetailOuterClass {
           ipCode_ = other.ipCode_;
           onChanged();
         }
+        if (other.getCMOBLNACDIE() != 0) {
+          setCMOBLNACDIE(other.getCMOBLNACDIE());
+        }
+        if (other.getGEGBOECJJMO() != 0) {
+          setGEGBOECJJMO(other.getGEGBOECJJMO());
+        }
+        if (other.getMBOLLDBJPCP() != 0) {
+          setMBOLLDBJPCP(other.getMBOLLDBJPCP());
+        }
+        if (other.getIsShowConstellationNum() != false) {
+          setIsShowConstellationNum(other.getIsShowConstellationNum());
+        }
+        if (other.getFLMFEMCAFHB() != 0) {
+          setFLMFEMCAFHB(other.getFLMFEMCAFHB());
+        }
+        if (other.getMOBMAJIJJGL() != 0) {
+          setMOBMAJIJJGL(other.getMOBMAJIJJGL());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -3504,6 +3739,204 @@ public final class SocialDetailOuterClass {
         onChanged();
         return this;
       }
+
+      private int cMOBLNACDIE_ ;
+      /**
+       * <code>uint32 CMOBLNACDIE = 27;</code>
+       * @return The cMOBLNACDIE.
+       */
+      @java.lang.Override
+      public int getCMOBLNACDIE() {
+        return cMOBLNACDIE_;
+      }
+      /**
+       * <code>uint32 CMOBLNACDIE = 27;</code>
+       * @param value The cMOBLNACDIE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCMOBLNACDIE(int value) {
+        
+        cMOBLNACDIE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 CMOBLNACDIE = 27;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCMOBLNACDIE() {
+        
+        cMOBLNACDIE_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int gEGBOECJJMO_ ;
+      /**
+       * <code>uint32 GEGBOECJJMO = 28;</code>
+       * @return The gEGBOECJJMO.
+       */
+      @java.lang.Override
+      public int getGEGBOECJJMO() {
+        return gEGBOECJJMO_;
+      }
+      /**
+       * <code>uint32 GEGBOECJJMO = 28;</code>
+       * @param value The gEGBOECJJMO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGEGBOECJJMO(int value) {
+        
+        gEGBOECJJMO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GEGBOECJJMO = 28;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGEGBOECJJMO() {
+        
+        gEGBOECJJMO_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mBOLLDBJPCP_ ;
+      /**
+       * <code>uint32 MBOLLDBJPCP = 32;</code>
+       * @return The mBOLLDBJPCP.
+       */
+      @java.lang.Override
+      public int getMBOLLDBJPCP() {
+        return mBOLLDBJPCP_;
+      }
+      /**
+       * <code>uint32 MBOLLDBJPCP = 32;</code>
+       * @param value The mBOLLDBJPCP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMBOLLDBJPCP(int value) {
+        
+        mBOLLDBJPCP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 MBOLLDBJPCP = 32;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMBOLLDBJPCP() {
+        
+        mBOLLDBJPCP_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isShowConstellationNum_ ;
+      /**
+       * <code>bool is_show_constellation_num = 33;</code>
+       * @return The isShowConstellationNum.
+       */
+      @java.lang.Override
+      public boolean getIsShowConstellationNum() {
+        return isShowConstellationNum_;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 33;</code>
+       * @param value The isShowConstellationNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsShowConstellationNum(boolean value) {
+        
+        isShowConstellationNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 33;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsShowConstellationNum() {
+        
+        isShowConstellationNum_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int fLMFEMCAFHB_ ;
+      /**
+       * <code>uint32 FLMFEMCAFHB = 34;</code>
+       * @return The fLMFEMCAFHB.
+       */
+      @java.lang.Override
+      public int getFLMFEMCAFHB() {
+        return fLMFEMCAFHB_;
+      }
+      /**
+       * <code>uint32 FLMFEMCAFHB = 34;</code>
+       * @param value The fLMFEMCAFHB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFLMFEMCAFHB(int value) {
+        
+        fLMFEMCAFHB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 FLMFEMCAFHB = 34;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFLMFEMCAFHB() {
+        
+        fLMFEMCAFHB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int mOBMAJIJJGL_ ;
+      /**
+       * <pre>
+       *GBNIKBFHHKP GFKFJJOADMH = 36;
+       * </pre>
+       *
+       * <code>uint32 MOBMAJIJJGL = 35;</code>
+       * @return The mOBMAJIJJGL.
+       */
+      @java.lang.Override
+      public int getMOBMAJIJJGL() {
+        return mOBMAJIJJGL_;
+      }
+      /**
+       * <pre>
+       *GBNIKBFHHKP GFKFJJOADMH = 36;
+       * </pre>
+       *
+       * <code>uint32 MOBMAJIJJGL = 35;</code>
+       * @param value The mOBMAJIJJGL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMOBMAJIJJGL(int value) {
+        
+        mOBMAJIJJGL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *GBNIKBFHHKP GFKFJJOADMH = 36;
+       * </pre>
+       *
+       * <code>uint32 MOBMAJIJJGL = 35;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMOBMAJIJJGL() {
+        
+        mOBMAJIJJGL_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -3574,7 +4007,7 @@ public final class SocialDetailOuterClass {
       "\n\022SocialDetail.proto\032\016Birthday.proto\032\027Fr" +
       "iendOnlineState.proto\032\032SocialShowAvatarI" +
       "nfo.proto\032\033FriendEnterHomeOption.proto\032\024" +
-      "ProfilePicture.proto\"\301\005\n\014SocialDetail\022\013\n" +
+      "ProfilePicture.proto\"\315\006\n\014SocialDetail\022\013\n" +
       "\003uid\030\001 \001(\r\022\020\n\010nickname\030\002 \001(\t\022\r\n\005level\030\003 " +
       "\001(\r\022\021\n\tavatar_id\030\004 \001(\r\022\021\n\tsignature\030\005 \001(" +
       "\t\022\033\n\010birthday\030\006 \001(\0132\t.Birthday\022\023\n\013world_" +
@@ -3592,8 +4025,11 @@ public final class SocialDetailOuterClass {
       "_list\030\027 \003(\r\0228\n\030friend_enter_home_option\030" +
       "\030 \001(\0162\026.FriendEnterHomeOption\022(\n\017profile" +
       "_picture\030\031 \001(\0132\017.ProfilePicture\022\017\n\007ip_co" +
-      "de\030\032 \001(\tB\033\n\031emu.grasscutter.net.protob\006p" +
-      "roto3"
+      "de\030\032 \001(\t\022\023\n\013CMOBLNACDIE\030\033 \001(\r\022\023\n\013GEGBOEC" +
+      "JJMO\030\034 \001(\r\022\023\n\013MBOLLDBJPCP\030  \001(\r\022!\n\031is_sh" +
+      "ow_constellation_num\030! \001(\010\022\023\n\013FLMFEMCAFH" +
+      "B\030\" \001(\r\022\023\n\013MOBMAJIJJGL\030# \001(\rB\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -3609,7 +4045,7 @@ public final class SocialDetailOuterClass {
     internal_static_SocialDetail_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SocialDetail_descriptor,
-        new java.lang.String[] { "Uid", "Nickname", "Level", "AvatarId", "Signature", "Birthday", "WorldLevel", "ReservedList", "OnlineState", "Param", "IsFriend", "IsMpModeAvailable", "OnlineId", "NameCardId", "IsInBlacklist", "IsChatNoDisturb", "RemarkName", "FinishAchievementNum", "TowerFloorIndex", "TowerLevelIndex", "IsShowAvatar", "ShowAvatarInfoList", "ShowNameCardIdList", "FriendEnterHomeOption", "ProfilePicture", "IpCode", });
+        new java.lang.String[] { "Uid", "Nickname", "Level", "AvatarId", "Signature", "Birthday", "WorldLevel", "ReservedList", "OnlineState", "Param", "IsFriend", "IsMpModeAvailable", "OnlineId", "NameCardId", "IsInBlacklist", "IsChatNoDisturb", "RemarkName", "FinishAchievementNum", "TowerFloorIndex", "TowerLevelIndex", "IsShowAvatar", "ShowAvatarInfoList", "ShowNameCardIdList", "FriendEnterHomeOption", "ProfilePicture", "IpCode", "CMOBLNACDIE", "GEGBOECJJMO", "MBOLLDBJPCP", "IsShowConstellationNum", "FLMFEMCAFHB", "MOBMAJIJJGL", });
     emu.grasscutter.net.proto.BirthdayOuterClass.getDescriptor();
     emu.grasscutter.net.proto.FriendOnlineStateOuterClass.getDescriptor();
     emu.grasscutter.net.proto.SocialShowAvatarInfoOuterClass.getDescriptor();
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SocialShowAvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SocialShowAvatarInfoOuterClass.java
index 47f4ab166..19ebf38cf 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SocialShowAvatarInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SocialShowAvatarInfoOuterClass.java
@@ -35,12 +35,20 @@ public final class SocialShowAvatarInfoOuterClass {
      * @return The costumeId.
      */
     int getCostumeId();
+
+    /**
+     * <code>uint32 AEPNHMCDBFL = 4;</code>
+     * @return The aEPNHMCDBFL.
+     */
+    int getAEPNHMCDBFL();
+
+    /**
+     * <code>uint32 CMAFEKGPACG = 5;</code>
+     * @return The cMAFEKGPACG.
+     */
+    int getCMAFEKGPACG();
   }
   /**
-   * <pre>
-   * Obf: OGKHFCINDJP
-   * </pre>
-   *
    * Protobuf type {@code SocialShowAvatarInfo}
    */
   public static final class SocialShowAvatarInfo extends
@@ -100,6 +108,16 @@ public final class SocialShowAvatarInfoOuterClass {
               costumeId_ = input.readUInt32();
               break;
             }
+            case 32: {
+
+              aEPNHMCDBFL_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              cMAFEKGPACG_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,6 +183,28 @@ public final class SocialShowAvatarInfoOuterClass {
       return costumeId_;
     }
 
+    public static final int AEPNHMCDBFL_FIELD_NUMBER = 4;
+    private int aEPNHMCDBFL_;
+    /**
+     * <code>uint32 AEPNHMCDBFL = 4;</code>
+     * @return The aEPNHMCDBFL.
+     */
+    @java.lang.Override
+    public int getAEPNHMCDBFL() {
+      return aEPNHMCDBFL_;
+    }
+
+    public static final int CMAFEKGPACG_FIELD_NUMBER = 5;
+    private int cMAFEKGPACG_;
+    /**
+     * <code>uint32 CMAFEKGPACG = 5;</code>
+     * @return The cMAFEKGPACG.
+     */
+    @java.lang.Override
+    public int getCMAFEKGPACG() {
+      return cMAFEKGPACG_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -188,6 +228,12 @@ public final class SocialShowAvatarInfoOuterClass {
       if (costumeId_ != 0) {
         output.writeUInt32(3, costumeId_);
       }
+      if (aEPNHMCDBFL_ != 0) {
+        output.writeUInt32(4, aEPNHMCDBFL_);
+      }
+      if (cMAFEKGPACG_ != 0) {
+        output.writeUInt32(5, cMAFEKGPACG_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -209,6 +255,14 @@ public final class SocialShowAvatarInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(3, costumeId_);
       }
+      if (aEPNHMCDBFL_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, aEPNHMCDBFL_);
+      }
+      if (cMAFEKGPACG_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(5, cMAFEKGPACG_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -230,6 +284,10 @@ public final class SocialShowAvatarInfoOuterClass {
           != other.getLevel()) return false;
       if (getCostumeId()
           != other.getCostumeId()) return false;
+      if (getAEPNHMCDBFL()
+          != other.getAEPNHMCDBFL()) return false;
+      if (getCMAFEKGPACG()
+          != other.getCMAFEKGPACG()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -247,6 +305,10 @@ public final class SocialShowAvatarInfoOuterClass {
       hash = (53 * hash) + getLevel();
       hash = (37 * hash) + COSTUME_ID_FIELD_NUMBER;
       hash = (53 * hash) + getCostumeId();
+      hash = (37 * hash) + AEPNHMCDBFL_FIELD_NUMBER;
+      hash = (53 * hash) + getAEPNHMCDBFL();
+      hash = (37 * hash) + CMAFEKGPACG_FIELD_NUMBER;
+      hash = (53 * hash) + getCMAFEKGPACG();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -343,10 +405,6 @@ public final class SocialShowAvatarInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: OGKHFCINDJP
-     * </pre>
-     *
      * Protobuf type {@code SocialShowAvatarInfo}
      */
     public static final class Builder extends
@@ -390,6 +448,10 @@ public final class SocialShowAvatarInfoOuterClass {
 
         costumeId_ = 0;
 
+        aEPNHMCDBFL_ = 0;
+
+        cMAFEKGPACG_ = 0;
+
         return this;
       }
 
@@ -419,6 +481,8 @@ public final class SocialShowAvatarInfoOuterClass {
         result.avatarId_ = avatarId_;
         result.level_ = level_;
         result.costumeId_ = costumeId_;
+        result.aEPNHMCDBFL_ = aEPNHMCDBFL_;
+        result.cMAFEKGPACG_ = cMAFEKGPACG_;
         onBuilt();
         return result;
       }
@@ -476,6 +540,12 @@ public final class SocialShowAvatarInfoOuterClass {
         if (other.getCostumeId() != 0) {
           setCostumeId(other.getCostumeId());
         }
+        if (other.getAEPNHMCDBFL() != 0) {
+          setAEPNHMCDBFL(other.getAEPNHMCDBFL());
+        }
+        if (other.getCMAFEKGPACG() != 0) {
+          setCMAFEKGPACG(other.getCMAFEKGPACG());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -597,6 +667,68 @@ public final class SocialShowAvatarInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int aEPNHMCDBFL_ ;
+      /**
+       * <code>uint32 AEPNHMCDBFL = 4;</code>
+       * @return The aEPNHMCDBFL.
+       */
+      @java.lang.Override
+      public int getAEPNHMCDBFL() {
+        return aEPNHMCDBFL_;
+      }
+      /**
+       * <code>uint32 AEPNHMCDBFL = 4;</code>
+       * @param value The aEPNHMCDBFL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAEPNHMCDBFL(int value) {
+        
+        aEPNHMCDBFL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 AEPNHMCDBFL = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAEPNHMCDBFL() {
+        
+        aEPNHMCDBFL_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cMAFEKGPACG_ ;
+      /**
+       * <code>uint32 CMAFEKGPACG = 5;</code>
+       * @return The cMAFEKGPACG.
+       */
+      @java.lang.Override
+      public int getCMAFEKGPACG() {
+        return cMAFEKGPACG_;
+      }
+      /**
+       * <code>uint32 CMAFEKGPACG = 5;</code>
+       * @param value The cMAFEKGPACG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCMAFEKGPACG(int value) {
+        
+        cMAFEKGPACG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 CMAFEKGPACG = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCMAFEKGPACG() {
+        
+        cMAFEKGPACG_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -664,10 +796,11 @@ public final class SocialShowAvatarInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032SocialShowAvatarInfo.proto\"L\n\024SocialSh" +
+      "\n\032SocialShowAvatarInfo.proto\"v\n\024SocialSh" +
       "owAvatarInfo\022\021\n\tavatar_id\030\001 \001(\r\022\r\n\005level" +
-      "\030\002 \001(\r\022\022\n\ncostume_id\030\003 \001(\rB\033\n\031emu.grassc" +
-      "utter.net.protob\006proto3"
+      "\030\002 \001(\r\022\022\n\ncostume_id\030\003 \001(\r\022\023\n\013AEPNHMCDBF" +
+      "L\030\004 \001(\r\022\023\n\013CMAFEKGPACG\030\005 \001(\rB\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -678,7 +811,7 @@ public final class SocialShowAvatarInfoOuterClass {
     internal_static_SocialShowAvatarInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SocialShowAvatarInfo_descriptor,
-        new java.lang.String[] { "AvatarId", "Level", "CostumeId", });
+        new java.lang.String[] { "AvatarId", "Level", "CostumeId", "AEPNHMCDBFL", "CMAFEKGPACG", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StatueGadgetInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StatueGadgetInfoOuterClass.java
index 60856bcdc..76a2ee6b9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StatueGadgetInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StatueGadgetInfoOuterClass.java
@@ -37,7 +37,7 @@ public final class StatueGadgetInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: MAIBEHDCKJL
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code StatueGadgetInfo}
@@ -344,7 +344,7 @@ public final class StatueGadgetInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: MAIBEHDCKJL
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code StatueGadgetInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StopServerInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StopServerInfoOuterClass.java
index 99a3dd774..3205db816 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StopServerInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StopServerInfoOuterClass.java
@@ -55,10 +55,6 @@ public final class StopServerInfoOuterClass {
         getContentMsgBytes();
   }
   /**
-   * <pre>
-   * Obf: DIAMBGNPCHH
-   * </pre>
-   *
    * Protobuf type {@code StopServerInfo}
    */
   public static final class StopServerInfo extends
@@ -444,10 +440,6 @@ public final class StopServerInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: DIAMBGNPCHH
-     * </pre>
-     *
      * Protobuf type {@code StopServerInfo}
      */
     public static final class Builder extends
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 013a22aa4..a7b48baf8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemChangeNotifyOuterClass.java
@@ -19,46 +19,41 @@ public final class StoreItemChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> 
         getItemListList();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index);
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
         int index);
 
     /**
-     * <code>.StoreType store_type = 10;</code>
+     * <code>.StoreType store_type = 12;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 10;</code>
+     * <code>.StoreType store_type = 12;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
   }
   /**
-   * <pre>
-   * CmdId: 370
-   * Obf: IBPNONJJFIN
-   * </pre>
-   *
    * Protobuf type {@code StoreItemChangeNotify}
    */
   public static final class StoreItemChangeNotify extends
@@ -106,7 +101,7 @@ public final class StoreItemChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 82: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemOuterClass.Item>();
                 mutable_bitField0_ |= 0x00000001;
@@ -115,7 +110,7 @@ public final class StoreItemChangeNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.ItemOuterClass.Item.parser(), extensionRegistry));
               break;
             }
-            case 80: {
+            case 96: {
               int rawValue = input.readEnum();
 
               storeType_ = rawValue;
@@ -156,17 +151,17 @@ public final class StoreItemChangeNotifyOuterClass {
               emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChangeNotify.class, emu.grasscutter.net.proto.StoreItemChangeNotifyOuterClass.StoreItemChangeNotify.Builder.class);
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 1;
+    public static final int ITEM_LIST_FIELD_NUMBER = 10;
     private java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> itemList_;
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
@@ -174,21 +169,21 @@ public final class StoreItemChangeNotifyOuterClass {
       return itemList_;
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .Item item_list = 1;</code>
+     * <code>repeated .Item item_list = 10;</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>
+     * <code>repeated .Item item_list = 10;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
@@ -196,17 +191,17 @@ public final class StoreItemChangeNotifyOuterClass {
       return itemList_.get(index);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 10;
+    public static final int STORE_TYPE_FIELD_NUMBER = 12;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 10;</code>
+     * <code>.StoreType store_type = 12;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 10;</code>
+     * <code>.StoreType store_type = 12;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -230,10 +225,10 @@ public final class StoreItemChangeNotifyOuterClass {
     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));
+        output.writeMessage(10, itemList_.get(i));
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(10, storeType_);
+        output.writeEnum(12, storeType_);
       }
       unknownFields.writeTo(output);
     }
@@ -246,11 +241,11 @@ public final class StoreItemChangeNotifyOuterClass {
       size = 0;
       for (int i = 0; i < itemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, itemList_.get(i));
+          .computeMessageSize(10, itemList_.get(i));
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, storeType_);
+          .computeEnumSize(12, storeType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -383,11 +378,6 @@ public final class StoreItemChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 370
-     * Obf: IBPNONJJFIN
-     * </pre>
-     *
      * Protobuf type {@code StoreItemChangeNotify}
      */
     public static final class Builder extends
@@ -591,7 +581,7 @@ public final class StoreItemChangeNotifyOuterClass {
           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>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -601,7 +591,7 @@ public final class StoreItemChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -611,7 +601,7 @@ public final class StoreItemChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -621,7 +611,7 @@ public final class StoreItemChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -638,7 +628,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -652,7 +642,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemOuterClass.Item value) {
         if (itemListBuilder_ == null) {
@@ -668,7 +658,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item value) {
@@ -685,7 +675,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -699,7 +689,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemOuterClass.Item.Builder builderForValue) {
@@ -713,7 +703,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemOuterClass.Item> values) {
@@ -728,7 +718,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -741,7 +731,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -754,14 +744,14 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemListOrBuilder(
           int index) {
@@ -771,7 +761,7 @@ public final class StoreItemChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder> 
            getItemListOrBuilderList() {
@@ -782,14 +772,14 @@ public final class StoreItemChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</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>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public emu.grasscutter.net.proto.ItemOuterClass.Item.Builder addItemListBuilder(
           int index) {
@@ -797,7 +787,7 @@ public final class StoreItemChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.ItemOuterClass.Item.getDefaultInstance());
       }
       /**
-       * <code>repeated .Item item_list = 1;</code>
+       * <code>repeated .Item item_list = 10;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemOuterClass.Item.Builder> 
            getItemListBuilderList() {
@@ -820,14 +810,14 @@ public final class StoreItemChangeNotifyOuterClass {
 
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 10;</code>
+       * <code>.StoreType store_type = 12;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 10;</code>
+       * <code>.StoreType store_type = 12;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -838,7 +828,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 10;</code>
+       * <code>.StoreType store_type = 12;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -848,7 +838,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 10;</code>
+       * <code>.StoreType store_type = 12;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -862,7 +852,7 @@ public final class StoreItemChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 10;</code>
+       * <code>.StoreType store_type = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -940,8 +930,8 @@ public final class StoreItemChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\033StoreItemChangeNotify.proto\032\nItem.prot" +
       "o\032\017StoreType.proto\"Q\n\025StoreItemChangeNot" +
-      "ify\022\030\n\titem_list\030\001 \003(\0132\005.Item\022\036\n\nstore_t" +
-      "ype\030\n \001(\0162\n.StoreTypeB\033\n\031emu.grasscutter" +
+      "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" +
       ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java
index 9f78f2d33..4d99842b7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreItemDelNotifyOuterClass.java
@@ -19,39 +19,34 @@ public final class StoreItemDelNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.StoreType store_type = 15;</code>
-     * @return The enum numeric value on the wire for storeType.
-     */
-    int getStoreTypeValue();
-    /**
-     * <code>.StoreType store_type = 15;</code>
-     * @return The storeType.
-     */
-    emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
-
-    /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @return A list containing the guidList.
      */
     java.util.List<java.lang.Long> getGuidListList();
     /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @return The count of guidList.
      */
     int getGuidListCount();
     /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @param index The index of the element to return.
      * @return The guidList at the given index.
      */
     long getGuidList(int index);
+
+    /**
+     * <code>.StoreType store_type = 13;</code>
+     * @return The enum numeric value on the wire for storeType.
+     */
+    int getStoreTypeValue();
+    /**
+     * <code>.StoreType store_type = 13;</code>
+     * @return The storeType.
+     */
+    emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
   }
   /**
-   * <pre>
-   * CmdId: 28814
-   * Obf: FHAAIBEDGOD
-   * </pre>
-   *
    * Protobuf type {@code StoreItemDelNotify}
    */
   public static final class StoreItemDelNotify extends
@@ -64,8 +59,8 @@ public final class StoreItemDelNotifyOuterClass {
       super(builder);
     }
     private StoreItemDelNotify() {
-      storeType_ = 0;
       guidList_ = emptyLongList();
+      storeType_ = 0;
     }
 
     @java.lang.Override
@@ -99,7 +94,7 @@ public final class StoreItemDelNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 guidList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
@@ -107,7 +102,7 @@ public final class StoreItemDelNotifyOuterClass {
               guidList_.addLong(input.readUInt64());
               break;
             }
-            case 34: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,7 +115,7 @@ public final class StoreItemDelNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 120: {
+            case 104: {
               int rawValue = input.readEnum();
 
               storeType_ = rawValue;
@@ -161,29 +156,10 @@ public final class StoreItemDelNotifyOuterClass {
               emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify.class, emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify.Builder.class);
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 15;
-    private int storeType_;
-    /**
-     * <code>.StoreType store_type = 15;</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>
-     * @return The storeType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
-      return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
-    }
-
-    public static final int GUID_LIST_FIELD_NUMBER = 4;
+    public static final int GUID_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.LongList guidList_;
     /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @return A list containing the guidList.
      */
     @java.lang.Override
@@ -192,14 +168,14 @@ public final class StoreItemDelNotifyOuterClass {
       return guidList_;
     }
     /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @return The count of guidList.
      */
     public int getGuidListCount() {
       return guidList_.size();
     }
     /**
-     * <code>repeated uint64 guid_list = 4;</code>
+     * <code>repeated uint64 guid_list = 11;</code>
      * @param index The index of the element to return.
      * @return The guidList at the given index.
      */
@@ -208,6 +184,25 @@ public final class StoreItemDelNotifyOuterClass {
     }
     private int guidListMemoizedSerializedSize = -1;
 
+    public static final int STORE_TYPE_FIELD_NUMBER = 13;
+    private int storeType_;
+    /**
+     * <code>.StoreType store_type = 13;</code>
+     * @return The enum numeric value on the wire for storeType.
+     */
+    @java.lang.Override public int getStoreTypeValue() {
+      return storeType_;
+    }
+    /**
+     * <code>.StoreType store_type = 13;</code>
+     * @return The storeType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType result = emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.valueOf(storeType_);
+      return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -224,14 +219,14 @@ public final class StoreItemDelNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getGuidListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(guidListMemoizedSerializedSize);
       }
       for (int i = 0; i < guidList_.size(); i++) {
         output.writeUInt64NoTag(guidList_.getLong(i));
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(15, storeType_);
+        output.writeEnum(13, storeType_);
       }
       unknownFields.writeTo(output);
     }
@@ -258,7 +253,7 @@ public final class StoreItemDelNotifyOuterClass {
       }
       if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(15, storeType_);
+          .computeEnumSize(13, storeType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -275,9 +270,9 @@ public final class StoreItemDelNotifyOuterClass {
       }
       emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify other = (emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify) obj;
 
-      if (storeType_ != other.storeType_) return false;
       if (!getGuidListList()
           .equals(other.getGuidListList())) return false;
+      if (storeType_ != other.storeType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -289,12 +284,12 @@ public final class StoreItemDelNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + storeType_;
       if (getGuidListCount() > 0) {
         hash = (37 * hash) + GUID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGuidListList().hashCode();
       }
+      hash = (37 * hash) + STORE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + storeType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -391,11 +386,6 @@ public final class StoreItemDelNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28814
-     * Obf: FHAAIBEDGOD
-     * </pre>
-     *
      * Protobuf type {@code StoreItemDelNotify}
      */
     public static final class Builder extends
@@ -433,10 +423,10 @@ public final class StoreItemDelNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        storeType_ = 0;
-
         guidList_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        storeType_ = 0;
+
         return this;
       }
 
@@ -464,12 +454,12 @@ public final class StoreItemDelNotifyOuterClass {
       public emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify buildPartial() {
         emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify result = new emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify(this);
         int from_bitField0_ = bitField0_;
-        result.storeType_ = storeType_;
         if (((bitField0_ & 0x00000001) != 0)) {
           guidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.guidList_ = guidList_;
+        result.storeType_ = storeType_;
         onBuilt();
         return result;
       }
@@ -518,9 +508,6 @@ public final class StoreItemDelNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify other) {
         if (other == emu.grasscutter.net.proto.StoreItemDelNotifyOuterClass.StoreItemDelNotify.getDefaultInstance()) return this;
-        if (other.storeType_ != 0) {
-          setStoreTypeValue(other.getStoreTypeValue());
-        }
         if (!other.guidList_.isEmpty()) {
           if (guidList_.isEmpty()) {
             guidList_ = other.guidList_;
@@ -531,6 +518,9 @@ public final class StoreItemDelNotifyOuterClass {
           }
           onChanged();
         }
+        if (other.storeType_ != 0) {
+          setStoreTypeValue(other.getStoreTypeValue());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -561,16 +551,95 @@ public final class StoreItemDelNotifyOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.LongList guidList_ = emptyLongList();
+      private void ensureGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          guidList_ = mutableCopy(guidList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @return A list containing the guidList.
+       */
+      public java.util.List<java.lang.Long>
+          getGuidListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(guidList_) : guidList_;
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @return The count of guidList.
+       */
+      public int getGuidListCount() {
+        return guidList_.size();
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @param index The index of the element to return.
+       * @return The guidList at the given index.
+       */
+      public long getGuidList(int index) {
+        return guidList_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @param index The index to set the value at.
+       * @param value The guidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuidList(
+          int index, long value) {
+        ensureGuidListIsMutable();
+        guidList_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @param value The guidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addGuidList(long value) {
+        ensureGuidListIsMutable();
+        guidList_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @param values The guidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllGuidList(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureGuidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, guidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 guid_list = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuidList() {
+        guidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <code>.StoreType store_type = 13;</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>
+       * <code>.StoreType store_type = 13;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -581,7 +650,7 @@ public final class StoreItemDelNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <code>.StoreType store_type = 13;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -591,7 +660,7 @@ public final class StoreItemDelNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <code>.StoreType store_type = 13;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -605,7 +674,7 @@ public final class StoreItemDelNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 15;</code>
+       * <code>.StoreType store_type = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -614,85 +683,6 @@ public final class StoreItemDelNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.LongList guidList_ = emptyLongList();
-      private void ensureGuidListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          guidList_ = mutableCopy(guidList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @return A list containing the guidList.
-       */
-      public java.util.List<java.lang.Long>
-          getGuidListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(guidList_) : guidList_;
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @return The count of guidList.
-       */
-      public int getGuidListCount() {
-        return guidList_.size();
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @param index The index of the element to return.
-       * @return The guidList at the given index.
-       */
-      public long getGuidList(int index) {
-        return guidList_.getLong(index);
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @param index The index to set the value at.
-       * @param value The guidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuidList(
-          int index, long value) {
-        ensureGuidListIsMutable();
-        guidList_.setLong(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @param value The guidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addGuidList(long value) {
-        ensureGuidListIsMutable();
-        guidList_.addLong(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @param values The guidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllGuidList(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureGuidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, guidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 guid_list = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuidList() {
-        guidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -761,8 +751,8 @@ public final class StoreItemDelNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030StoreItemDelNotify.proto\032\017StoreType.pr" +
-      "oto\"G\n\022StoreItemDelNotify\022\036\n\nstore_type\030" +
-      "\017 \001(\0162\n.StoreType\022\021\n\tguid_list\030\004 \003(\004B\033\n\031" +
+      "oto\"G\n\022StoreItemDelNotify\022\021\n\tguid_list\030\013" +
+      " \003(\004\022\036\n\nstore_type\030\r \001(\0162\n.StoreTypeB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -775,7 +765,7 @@ public final class StoreItemDelNotifyOuterClass {
     internal_static_StoreItemDelNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StoreItemDelNotify_descriptor,
-        new java.lang.String[] { "StoreType", "GuidList", });
+        new java.lang.String[] { "GuidList", "StoreType", });
     emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StoreTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StoreTypeOuterClass.java
index 98c4fc6b6..f6d6a6cd3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class StoreTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: HDHLNCKJKCA
-   * </pre>
-   *
    * Protobuf enum {@code StoreType}
    */
   public enum StoreType
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 07da12490..8ff06a388 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StoreWeightLimitNotifyOuterClass.java
@@ -19,52 +19,47 @@ public final class StoreWeightLimitNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 weight_limit = 2;</code>
-     * @return The weightLimit.
-     */
-    int getWeightLimit();
-
-    /**
-     * <code>uint32 furniture_count_limit = 1;</code>
-     * @return The furnitureCountLimit.
-     */
-    int getFurnitureCountLimit();
-
-    /**
-     * <code>uint32 weapon_count_limit = 10;</code>
+     * <code>uint32 weapon_count_limit = 3;</code>
      * @return The weaponCountLimit.
      */
     int getWeaponCountLimit();
 
     /**
-     * <code>uint32 reliquary_count_limit = 11;</code>
-     * @return The reliquaryCountLimit.
+     * <code>uint32 weight_limit = 5;</code>
+     * @return The weightLimit.
      */
-    int getReliquaryCountLimit();
+    int getWeightLimit();
 
     /**
-     * <code>uint32 material_count_limit = 14;</code>
+     * <code>uint32 furniture_count_limit = 7;</code>
+     * @return The furnitureCountLimit.
+     */
+    int getFurnitureCountLimit();
+
+    /**
+     * <code>uint32 material_count_limit = 11;</code>
      * @return The materialCountLimit.
      */
     int getMaterialCountLimit();
 
     /**
-     * <code>.StoreType store_type = 4;</code>
+     * <code>uint32 reliquary_count_limit = 14;</code>
+     * @return The reliquaryCountLimit.
+     */
+    int getReliquaryCountLimit();
+
+    /**
+     * <code>.StoreType store_type = 15;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     int getStoreTypeValue();
     /**
-     * <code>.StoreType store_type = 4;</code>
+     * <code>.StoreType store_type = 15;</code>
      * @return The storeType.
      */
     emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType();
   }
   /**
-   * <pre>
-   * CmdId: 22706
-   * Obf: OLOEDFBEHGA
-   * </pre>
-   *
    * Protobuf type {@code StoreWeightLimitNotify}
    */
   public static final class StoreWeightLimitNotify extends
@@ -110,35 +105,35 @@ public final class StoreWeightLimitNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-
-              furnitureCountLimit_ = input.readUInt32();
-              break;
-            }
-            case 16: {
-
-              weightLimit_ = input.readUInt32();
-              break;
-            }
-            case 32: {
-              int rawValue = input.readEnum();
-
-              storeType_ = rawValue;
-              break;
-            }
-            case 80: {
+            case 24: {
 
               weaponCountLimit_ = input.readUInt32();
               break;
             }
+            case 40: {
+
+              weightLimit_ = input.readUInt32();
+              break;
+            }
+            case 56: {
+
+              furnitureCountLimit_ = input.readUInt32();
+              break;
+            }
             case 88: {
 
-              reliquaryCountLimit_ = input.readUInt32();
+              materialCountLimit_ = input.readUInt32();
               break;
             }
             case 112: {
 
-              materialCountLimit_ = input.readUInt32();
+              reliquaryCountLimit_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+              int rawValue = input.readEnum();
+
+              storeType_ = rawValue;
               break;
             }
             default: {
@@ -173,32 +168,10 @@ public final class StoreWeightLimitNotifyOuterClass {
               emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify.class, emu.grasscutter.net.proto.StoreWeightLimitNotifyOuterClass.StoreWeightLimitNotify.Builder.class);
     }
 
-    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 2;
-    private int weightLimit_;
-    /**
-     * <code>uint32 weight_limit = 2;</code>
-     * @return The weightLimit.
-     */
-    @java.lang.Override
-    public int getWeightLimit() {
-      return weightLimit_;
-    }
-
-    public static final int FURNITURE_COUNT_LIMIT_FIELD_NUMBER = 1;
-    private int furnitureCountLimit_;
-    /**
-     * <code>uint32 furniture_count_limit = 1;</code>
-     * @return The furnitureCountLimit.
-     */
-    @java.lang.Override
-    public int getFurnitureCountLimit() {
-      return furnitureCountLimit_;
-    }
-
-    public static final int WEAPON_COUNT_LIMIT_FIELD_NUMBER = 10;
+    public static final int WEAPON_COUNT_LIMIT_FIELD_NUMBER = 3;
     private int weaponCountLimit_;
     /**
-     * <code>uint32 weapon_count_limit = 10;</code>
+     * <code>uint32 weapon_count_limit = 3;</code>
      * @return The weaponCountLimit.
      */
     @java.lang.Override
@@ -206,21 +179,32 @@ public final class StoreWeightLimitNotifyOuterClass {
       return weaponCountLimit_;
     }
 
-    public static final int RELIQUARY_COUNT_LIMIT_FIELD_NUMBER = 11;
-    private int reliquaryCountLimit_;
+    public static final int WEIGHT_LIMIT_FIELD_NUMBER = 5;
+    private int weightLimit_;
     /**
-     * <code>uint32 reliquary_count_limit = 11;</code>
-     * @return The reliquaryCountLimit.
+     * <code>uint32 weight_limit = 5;</code>
+     * @return The weightLimit.
      */
     @java.lang.Override
-    public int getReliquaryCountLimit() {
-      return reliquaryCountLimit_;
+    public int getWeightLimit() {
+      return weightLimit_;
     }
 
-    public static final int MATERIAL_COUNT_LIMIT_FIELD_NUMBER = 14;
+    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_;
     /**
-     * <code>uint32 material_count_limit = 14;</code>
+     * <code>uint32 material_count_limit = 11;</code>
      * @return The materialCountLimit.
      */
     @java.lang.Override
@@ -228,17 +212,28 @@ public final class StoreWeightLimitNotifyOuterClass {
       return materialCountLimit_;
     }
 
-    public static final int STORE_TYPE_FIELD_NUMBER = 4;
+    public static final int RELIQUARY_COUNT_LIMIT_FIELD_NUMBER = 14;
+    private int reliquaryCountLimit_;
+    /**
+     * <code>uint32 reliquary_count_limit = 14;</code>
+     * @return The reliquaryCountLimit.
+     */
+    @java.lang.Override
+    public int getReliquaryCountLimit() {
+      return reliquaryCountLimit_;
+    }
+
+    public static final int STORE_TYPE_FIELD_NUMBER = 15;
     private int storeType_;
     /**
-     * <code>.StoreType store_type = 4;</code>
+     * <code>.StoreType store_type = 15;</code>
      * @return The enum numeric value on the wire for storeType.
      */
     @java.lang.Override public int getStoreTypeValue() {
       return storeType_;
     }
     /**
-     * <code>.StoreType store_type = 4;</code>
+     * <code>.StoreType store_type = 15;</code>
      * @return The storeType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType getStoreType() {
@@ -261,23 +256,23 @@ public final class StoreWeightLimitNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (furnitureCountLimit_ != 0) {
-        output.writeUInt32(1, furnitureCountLimit_);
+      if (weaponCountLimit_ != 0) {
+        output.writeUInt32(3, weaponCountLimit_);
       }
       if (weightLimit_ != 0) {
-        output.writeUInt32(2, weightLimit_);
+        output.writeUInt32(5, weightLimit_);
       }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
-        output.writeEnum(4, storeType_);
-      }
-      if (weaponCountLimit_ != 0) {
-        output.writeUInt32(10, weaponCountLimit_);
-      }
-      if (reliquaryCountLimit_ != 0) {
-        output.writeUInt32(11, reliquaryCountLimit_);
+      if (furnitureCountLimit_ != 0) {
+        output.writeUInt32(7, furnitureCountLimit_);
       }
       if (materialCountLimit_ != 0) {
-        output.writeUInt32(14, materialCountLimit_);
+        output.writeUInt32(11, materialCountLimit_);
+      }
+      if (reliquaryCountLimit_ != 0) {
+        output.writeUInt32(14, reliquaryCountLimit_);
+      }
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        output.writeEnum(15, storeType_);
       }
       unknownFields.writeTo(output);
     }
@@ -288,29 +283,29 @@ public final class StoreWeightLimitNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (furnitureCountLimit_ != 0) {
+      if (weaponCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, furnitureCountLimit_);
+          .computeUInt32Size(3, weaponCountLimit_);
       }
       if (weightLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, weightLimit_);
+          .computeUInt32Size(5, weightLimit_);
       }
-      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+      if (furnitureCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(4, storeType_);
-      }
-      if (weaponCountLimit_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, weaponCountLimit_);
-      }
-      if (reliquaryCountLimit_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, reliquaryCountLimit_);
+          .computeUInt32Size(7, furnitureCountLimit_);
       }
       if (materialCountLimit_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, materialCountLimit_);
+          .computeUInt32Size(11, materialCountLimit_);
+      }
+      if (reliquaryCountLimit_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, reliquaryCountLimit_);
+      }
+      if (storeType_ != emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.STORE_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(15, storeType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -327,16 +322,16 @@ public final class StoreWeightLimitNotifyOuterClass {
       }
       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 (getWeaponCountLimit()
-          != other.getWeaponCountLimit()) return false;
-      if (getReliquaryCountLimit()
-          != other.getReliquaryCountLimit()) return false;
       if (getMaterialCountLimit()
           != other.getMaterialCountLimit()) return false;
+      if (getReliquaryCountLimit()
+          != other.getReliquaryCountLimit()) return false;
       if (storeType_ != other.storeType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
@@ -349,16 +344,16 @@ public final class StoreWeightLimitNotifyOuterClass {
       }
       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) + WEAPON_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getWeaponCountLimit();
-      hash = (37 * hash) + RELIQUARY_COUNT_LIMIT_FIELD_NUMBER;
-      hash = (53 * hash) + getReliquaryCountLimit();
       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) + STORE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + storeType_;
       hash = (29 * hash) + unknownFields.hashCode();
@@ -457,11 +452,6 @@ public final class StoreWeightLimitNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22706
-     * Obf: OLOEDFBEHGA
-     * </pre>
-     *
      * Protobuf type {@code StoreWeightLimitNotify}
      */
     public static final class Builder extends
@@ -499,16 +489,16 @@ public final class StoreWeightLimitNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        weaponCountLimit_ = 0;
+
         weightLimit_ = 0;
 
         furnitureCountLimit_ = 0;
 
-        weaponCountLimit_ = 0;
+        materialCountLimit_ = 0;
 
         reliquaryCountLimit_ = 0;
 
-        materialCountLimit_ = 0;
-
         storeType_ = 0;
 
         return this;
@@ -537,11 +527,11 @@ public final class StoreWeightLimitNotifyOuterClass {
       @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.weaponCountLimit_ = weaponCountLimit_;
-        result.reliquaryCountLimit_ = reliquaryCountLimit_;
         result.materialCountLimit_ = materialCountLimit_;
+        result.reliquaryCountLimit_ = reliquaryCountLimit_;
         result.storeType_ = storeType_;
         onBuilt();
         return result;
@@ -591,21 +581,21 @@ public final class StoreWeightLimitNotifyOuterClass {
 
       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.getWeaponCountLimit() != 0) {
-          setWeaponCountLimit(other.getWeaponCountLimit());
+        if (other.getMaterialCountLimit() != 0) {
+          setMaterialCountLimit(other.getMaterialCountLimit());
         }
         if (other.getReliquaryCountLimit() != 0) {
           setReliquaryCountLimit(other.getReliquaryCountLimit());
         }
-        if (other.getMaterialCountLimit() != 0) {
-          setMaterialCountLimit(other.getMaterialCountLimit());
-        }
         if (other.storeType_ != 0) {
           setStoreTypeValue(other.getStoreTypeValue());
         }
@@ -638,9 +628,40 @@ public final class StoreWeightLimitNotifyOuterClass {
         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 = 2;</code>
+       * <code>uint32 weight_limit = 5;</code>
        * @return The weightLimit.
        */
       @java.lang.Override
@@ -648,7 +669,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return weightLimit_;
       }
       /**
-       * <code>uint32 weight_limit = 2;</code>
+       * <code>uint32 weight_limit = 5;</code>
        * @param value The weightLimit to set.
        * @return This builder for chaining.
        */
@@ -659,7 +680,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 weight_limit = 2;</code>
+       * <code>uint32 weight_limit = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearWeightLimit() {
@@ -671,7 +692,7 @@ public final class StoreWeightLimitNotifyOuterClass {
 
       private int furnitureCountLimit_ ;
       /**
-       * <code>uint32 furniture_count_limit = 1;</code>
+       * <code>uint32 furniture_count_limit = 7;</code>
        * @return The furnitureCountLimit.
        */
       @java.lang.Override
@@ -679,7 +700,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return furnitureCountLimit_;
       }
       /**
-       * <code>uint32 furniture_count_limit = 1;</code>
+       * <code>uint32 furniture_count_limit = 7;</code>
        * @param value The furnitureCountLimit to set.
        * @return This builder for chaining.
        */
@@ -690,7 +711,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 furniture_count_limit = 1;</code>
+       * <code>uint32 furniture_count_limit = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearFurnitureCountLimit() {
@@ -700,71 +721,9 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
 
-      private int weaponCountLimit_ ;
-      /**
-       * <code>uint32 weapon_count_limit = 10;</code>
-       * @return The weaponCountLimit.
-       */
-      @java.lang.Override
-      public int getWeaponCountLimit() {
-        return weaponCountLimit_;
-      }
-      /**
-       * <code>uint32 weapon_count_limit = 10;</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 = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearWeaponCountLimit() {
-        
-        weaponCountLimit_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int reliquaryCountLimit_ ;
-      /**
-       * <code>uint32 reliquary_count_limit = 11;</code>
-       * @return The reliquaryCountLimit.
-       */
-      @java.lang.Override
-      public int getReliquaryCountLimit() {
-        return reliquaryCountLimit_;
-      }
-      /**
-       * <code>uint32 reliquary_count_limit = 11;</code>
-       * @param value The reliquaryCountLimit to set.
-       * @return This builder for chaining.
-       */
-      public Builder setReliquaryCountLimit(int value) {
-        
-        reliquaryCountLimit_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reliquary_count_limit = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearReliquaryCountLimit() {
-        
-        reliquaryCountLimit_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int materialCountLimit_ ;
       /**
-       * <code>uint32 material_count_limit = 14;</code>
+       * <code>uint32 material_count_limit = 11;</code>
        * @return The materialCountLimit.
        */
       @java.lang.Override
@@ -772,7 +731,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return materialCountLimit_;
       }
       /**
-       * <code>uint32 material_count_limit = 14;</code>
+       * <code>uint32 material_count_limit = 11;</code>
        * @param value The materialCountLimit to set.
        * @return This builder for chaining.
        */
@@ -783,7 +742,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 material_count_limit = 14;</code>
+       * <code>uint32 material_count_limit = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaterialCountLimit() {
@@ -793,16 +752,47 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
 
+      private int reliquaryCountLimit_ ;
+      /**
+       * <code>uint32 reliquary_count_limit = 14;</code>
+       * @return The reliquaryCountLimit.
+       */
+      @java.lang.Override
+      public int getReliquaryCountLimit() {
+        return reliquaryCountLimit_;
+      }
+      /**
+       * <code>uint32 reliquary_count_limit = 14;</code>
+       * @param value The reliquaryCountLimit to set.
+       * @return This builder for chaining.
+       */
+      public Builder setReliquaryCountLimit(int value) {
+        
+        reliquaryCountLimit_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reliquary_count_limit = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearReliquaryCountLimit() {
+        
+        reliquaryCountLimit_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int storeType_ = 0;
       /**
-       * <code>.StoreType store_type = 4;</code>
+       * <code>.StoreType store_type = 15;</code>
        * @return The enum numeric value on the wire for storeType.
        */
       @java.lang.Override public int getStoreTypeValue() {
         return storeType_;
       }
       /**
-       * <code>.StoreType store_type = 4;</code>
+       * <code>.StoreType store_type = 15;</code>
        * @param value The enum numeric value on the wire for storeType to set.
        * @return This builder for chaining.
        */
@@ -813,7 +803,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 4;</code>
+       * <code>.StoreType store_type = 15;</code>
        * @return The storeType.
        */
       @java.lang.Override
@@ -823,7 +813,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.StoreTypeOuterClass.StoreType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.StoreType store_type = 4;</code>
+       * <code>.StoreType store_type = 15;</code>
        * @param value The storeType to set.
        * @return This builder for chaining.
        */
@@ -837,7 +827,7 @@ public final class StoreWeightLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.StoreType store_type = 4;</code>
+       * <code>.StoreType store_type = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearStoreType() {
@@ -914,11 +904,11 @@ public final class StoreWeightLimitNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034StoreWeightLimitNotify.proto\032\017StoreTyp" +
-      "e.proto\"\306\001\n\026StoreWeightLimitNotify\022\024\n\014we" +
-      "ight_limit\030\002 \001(\r\022\035\n\025furniture_count_limi" +
-      "t\030\001 \001(\r\022\032\n\022weapon_count_limit\030\n \001(\r\022\035\n\025r" +
-      "eliquary_count_limit\030\013 \001(\r\022\034\n\024material_c" +
-      "ount_limit\030\016 \001(\r\022\036\n\nstore_type\030\004 \001(\0162\n.S" +
+      "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" +
       "roto3"
     };
@@ -932,7 +922,7 @@ public final class StoreWeightLimitNotifyOuterClass {
     internal_static_StoreWeightLimitNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StoreWeightLimitNotify_descriptor,
-        new java.lang.String[] { "WeightLimit", "FurnitureCountLimit", "WeaponCountLimit", "ReliquaryCountLimit", "MaterialCountLimit", "StoreType", });
+        new java.lang.String[] { "WeaponCountLimit", "WeightLimit", "FurnitureCountLimit", "MaterialCountLimit", "ReliquaryCountLimit", "StoreType", });
     emu.grasscutter.net.proto.StoreTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java
index 1d41859df..df9b79c5a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/StrengthenPointDataOuterClass.java
@@ -19,20 +19,20 @@ public final class StrengthenPointDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 FNBNNLOLACD = 2;</code>
-     * @return The fNBNNLOLACD.
+     * <code>uint32 base_point = 3;</code>
+     * @return The basePoint.
      */
-    int getFNBNNLOLACD();
+    int getBasePoint();
 
     /**
-     * <code>uint32 ENNCLEFEMDF = 5;</code>
-     * @return The eNNCLEFEMDF.
+     * <code>uint32 cur_point = 7;</code>
+     * @return The curPoint.
      */
-    int getENNCLEFEMDF();
+    int getCurPoint();
   }
   /**
    * <pre>
-   * Obf: DELLDHCKHKJ
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code StrengthenPointData}
@@ -79,14 +79,14 @@ public final class StrengthenPointDataOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
+            case 24: {
 
-              fNBNNLOLACD_ = input.readUInt32();
+              basePoint_ = input.readUInt32();
               break;
             }
-            case 40: {
+            case 56: {
 
-              eNNCLEFEMDF_ = input.readUInt32();
+              curPoint_ = input.readUInt32();
               break;
             }
             default: {
@@ -121,26 +121,26 @@ public final class StrengthenPointDataOuterClass {
               emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData.class, emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData.Builder.class);
     }
 
-    public static final int FNBNNLOLACD_FIELD_NUMBER = 2;
-    private int fNBNNLOLACD_;
+    public static final int BASE_POINT_FIELD_NUMBER = 3;
+    private int basePoint_;
     /**
-     * <code>uint32 FNBNNLOLACD = 2;</code>
-     * @return The fNBNNLOLACD.
+     * <code>uint32 base_point = 3;</code>
+     * @return The basePoint.
      */
     @java.lang.Override
-    public int getFNBNNLOLACD() {
-      return fNBNNLOLACD_;
+    public int getBasePoint() {
+      return basePoint_;
     }
 
-    public static final int ENNCLEFEMDF_FIELD_NUMBER = 5;
-    private int eNNCLEFEMDF_;
+    public static final int CUR_POINT_FIELD_NUMBER = 7;
+    private int curPoint_;
     /**
-     * <code>uint32 ENNCLEFEMDF = 5;</code>
-     * @return The eNNCLEFEMDF.
+     * <code>uint32 cur_point = 7;</code>
+     * @return The curPoint.
      */
     @java.lang.Override
-    public int getENNCLEFEMDF() {
-      return eNNCLEFEMDF_;
+    public int getCurPoint() {
+      return curPoint_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -157,11 +157,11 @@ public final class StrengthenPointDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (fNBNNLOLACD_ != 0) {
-        output.writeUInt32(2, fNBNNLOLACD_);
+      if (basePoint_ != 0) {
+        output.writeUInt32(3, basePoint_);
       }
-      if (eNNCLEFEMDF_ != 0) {
-        output.writeUInt32(5, eNNCLEFEMDF_);
+      if (curPoint_ != 0) {
+        output.writeUInt32(7, curPoint_);
       }
       unknownFields.writeTo(output);
     }
@@ -172,13 +172,13 @@ public final class StrengthenPointDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (fNBNNLOLACD_ != 0) {
+      if (basePoint_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, fNBNNLOLACD_);
+          .computeUInt32Size(3, basePoint_);
       }
-      if (eNNCLEFEMDF_ != 0) {
+      if (curPoint_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, eNNCLEFEMDF_);
+          .computeUInt32Size(7, curPoint_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -195,10 +195,10 @@ public final class StrengthenPointDataOuterClass {
       }
       emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData other = (emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData) obj;
 
-      if (getFNBNNLOLACD()
-          != other.getFNBNNLOLACD()) return false;
-      if (getENNCLEFEMDF()
-          != other.getENNCLEFEMDF()) return false;
+      if (getBasePoint()
+          != other.getBasePoint()) return false;
+      if (getCurPoint()
+          != other.getCurPoint()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -210,10 +210,10 @@ public final class StrengthenPointDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + FNBNNLOLACD_FIELD_NUMBER;
-      hash = (53 * hash) + getFNBNNLOLACD();
-      hash = (37 * hash) + ENNCLEFEMDF_FIELD_NUMBER;
-      hash = (53 * hash) + getENNCLEFEMDF();
+      hash = (37 * hash) + BASE_POINT_FIELD_NUMBER;
+      hash = (53 * hash) + getBasePoint();
+      hash = (37 * hash) + CUR_POINT_FIELD_NUMBER;
+      hash = (53 * hash) + getCurPoint();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,7 +311,7 @@ public final class StrengthenPointDataOuterClass {
     }
     /**
      * <pre>
-     * Obf: DELLDHCKHKJ
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code StrengthenPointData}
@@ -351,9 +351,9 @@ public final class StrengthenPointDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        fNBNNLOLACD_ = 0;
+        basePoint_ = 0;
 
-        eNNCLEFEMDF_ = 0;
+        curPoint_ = 0;
 
         return this;
       }
@@ -381,8 +381,8 @@ public final class StrengthenPointDataOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData buildPartial() {
         emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData result = new emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData(this);
-        result.fNBNNLOLACD_ = fNBNNLOLACD_;
-        result.eNNCLEFEMDF_ = eNNCLEFEMDF_;
+        result.basePoint_ = basePoint_;
+        result.curPoint_ = curPoint_;
         onBuilt();
         return result;
       }
@@ -431,11 +431,11 @@ public final class StrengthenPointDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData other) {
         if (other == emu.grasscutter.net.proto.StrengthenPointDataOuterClass.StrengthenPointData.getDefaultInstance()) return this;
-        if (other.getFNBNNLOLACD() != 0) {
-          setFNBNNLOLACD(other.getFNBNNLOLACD());
+        if (other.getBasePoint() != 0) {
+          setBasePoint(other.getBasePoint());
         }
-        if (other.getENNCLEFEMDF() != 0) {
-          setENNCLEFEMDF(other.getENNCLEFEMDF());
+        if (other.getCurPoint() != 0) {
+          setCurPoint(other.getCurPoint());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -466,64 +466,64 @@ public final class StrengthenPointDataOuterClass {
         return this;
       }
 
-      private int fNBNNLOLACD_ ;
+      private int basePoint_ ;
       /**
-       * <code>uint32 FNBNNLOLACD = 2;</code>
-       * @return The fNBNNLOLACD.
+       * <code>uint32 base_point = 3;</code>
+       * @return The basePoint.
        */
       @java.lang.Override
-      public int getFNBNNLOLACD() {
-        return fNBNNLOLACD_;
+      public int getBasePoint() {
+        return basePoint_;
       }
       /**
-       * <code>uint32 FNBNNLOLACD = 2;</code>
-       * @param value The fNBNNLOLACD to set.
+       * <code>uint32 base_point = 3;</code>
+       * @param value The basePoint to set.
        * @return This builder for chaining.
        */
-      public Builder setFNBNNLOLACD(int value) {
+      public Builder setBasePoint(int value) {
         
-        fNBNNLOLACD_ = value;
+        basePoint_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 FNBNNLOLACD = 2;</code>
+       * <code>uint32 base_point = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFNBNNLOLACD() {
+      public Builder clearBasePoint() {
         
-        fNBNNLOLACD_ = 0;
+        basePoint_ = 0;
         onChanged();
         return this;
       }
 
-      private int eNNCLEFEMDF_ ;
+      private int curPoint_ ;
       /**
-       * <code>uint32 ENNCLEFEMDF = 5;</code>
-       * @return The eNNCLEFEMDF.
+       * <code>uint32 cur_point = 7;</code>
+       * @return The curPoint.
        */
       @java.lang.Override
-      public int getENNCLEFEMDF() {
-        return eNNCLEFEMDF_;
+      public int getCurPoint() {
+        return curPoint_;
       }
       /**
-       * <code>uint32 ENNCLEFEMDF = 5;</code>
-       * @param value The eNNCLEFEMDF to set.
+       * <code>uint32 cur_point = 7;</code>
+       * @param value The curPoint to set.
        * @return This builder for chaining.
        */
-      public Builder setENNCLEFEMDF(int value) {
+      public Builder setCurPoint(int value) {
         
-        eNNCLEFEMDF_ = value;
+        curPoint_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 ENNCLEFEMDF = 5;</code>
+       * <code>uint32 cur_point = 7;</code>
        * @return This builder for chaining.
        */
-      public Builder clearENNCLEFEMDF() {
+      public Builder clearCurPoint() {
         
-        eNNCLEFEMDF_ = 0;
+        curPoint_ = 0;
         onChanged();
         return this;
       }
@@ -594,10 +594,10 @@ public final class StrengthenPointDataOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\031StrengthenPointData.proto\"?\n\023Strengthe" +
-      "nPointData\022\023\n\013FNBNNLOLACD\030\002 \001(\r\022\023\n\013ENNCL" +
-      "EFEMDF\030\005 \001(\rB\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\n\031StrengthenPointData.proto\"<\n\023Strengthe" +
+      "nPointData\022\022\n\nbase_point\030\003 \001(\r\022\021\n\tcur_po" +
+      "int\030\007 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
+      "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -608,7 +608,7 @@ public final class StrengthenPointDataOuterClass {
     internal_static_StrengthenPointData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_StrengthenPointData_descriptor,
-        new java.lang.String[] { "FNBNNLOLACD", "ENNCLEFEMDF", });
+        new java.lang.String[] { "BasePoint", "CurPoint", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SyncScenePlayTeamEntityNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SyncScenePlayTeamEntityNotifyOuterClass.java
index 790b6cb14..8c859d4a7 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SyncScenePlayTeamEntityNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SyncScenePlayTeamEntityNotifyOuterClass.java
@@ -19,41 +19,36 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>uint32 scene_id = 8;</code>
+     * @return The sceneId.
+     */
+    int getSceneId();
+
+    /**
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> 
         getEntityInfoListList();
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index);
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     int getEntityInfoListCount();
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder> 
         getEntityInfoListOrBuilderList();
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
         int index);
-
-    /**
-     * <code>uint32 scene_id = 7;</code>
-     * @return The sceneId.
-     */
-    int getSceneId();
   }
   /**
-   * <pre>
-   * CmdId: 4915
-   * Obf: OFHJPADOKFG
-   * </pre>
-   *
    * Protobuf type {@code SyncScenePlayTeamEntityNotify}
    */
   public static final class SyncScenePlayTeamEntityNotify extends
@@ -100,7 +95,12 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 64: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 entityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.parser(), extensionRegistry));
               break;
             }
-            case 56: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,17 +144,28 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
               emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.class, emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.Builder.class);
     }
 
-    public static final int ENTITY_INFO_LIST_FIELD_NUMBER = 1;
+    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 ENTITY_INFO_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> entityInfoList_;
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> getEntityInfoListList() {
       return entityInfoList_;
     }
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder> 
@@ -167,21 +173,21 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       return entityInfoList_;
     }
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     @java.lang.Override
     public int getEntityInfoListCount() {
       return entityInfoList_.size();
     }
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index) {
       return entityInfoList_.get(index);
     }
     /**
-     * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+     * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
@@ -189,17 +195,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       return entityInfoList_.get(index);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 7;
-    private int sceneId_;
-    /**
-     * <code>uint32 scene_id = 7;</code>
-     * @return The sceneId.
-     */
-    @java.lang.Override
-    public int getSceneId() {
-      return sceneId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -214,11 +209,11 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < entityInfoList_.size(); i++) {
-        output.writeMessage(1, entityInfoList_.get(i));
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
+        output.writeUInt32(8, sceneId_);
+      }
+      for (int i = 0; i < entityInfoList_.size(); i++) {
+        output.writeMessage(14, entityInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < entityInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, entityInfoList_.get(i));
-      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
+          .computeUInt32Size(8, sceneId_);
+      }
+      for (int i = 0; i < entityInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, entityInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -252,10 +247,10 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       }
       emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify other = (emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify) obj;
 
-      if (!getEntityInfoListList()
-          .equals(other.getEntityInfoListList())) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (!getEntityInfoListList()
+          .equals(other.getEntityInfoListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -267,12 +262,12 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getSceneId();
       if (getEntityInfoListCount() > 0) {
         hash = (37 * hash) + ENTITY_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getEntityInfoListList().hashCode();
       }
-      hash = (37 * hash) + SCENE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getSceneId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -369,11 +364,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4915
-     * Obf: OFHJPADOKFG
-     * </pre>
-     *
      * Protobuf type {@code SyncScenePlayTeamEntityNotify}
      */
     public static final class Builder extends
@@ -412,14 +402,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        sceneId_ = 0;
+
         if (entityInfoListBuilder_ == null) {
           entityInfoList_ = java.util.Collections.emptyList();
           bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           entityInfoListBuilder_.clear();
         }
-        sceneId_ = 0;
-
         return this;
       }
 
@@ -447,6 +437,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       public emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify buildPartial() {
         emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify result = new emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify(this);
         int from_bitField0_ = bitField0_;
+        result.sceneId_ = sceneId_;
         if (entityInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             entityInfoList_ = java.util.Collections.unmodifiableList(entityInfoList_);
@@ -456,7 +447,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         } else {
           result.entityInfoList_ = entityInfoListBuilder_.build();
         }
-        result.sceneId_ = sceneId_;
         onBuilt();
         return result;
       }
@@ -505,6 +495,9 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify other) {
         if (other == emu.grasscutter.net.proto.SyncScenePlayTeamEntityNotifyOuterClass.SyncScenePlayTeamEntityNotify.getDefaultInstance()) return this;
+        if (other.getSceneId() != 0) {
+          setSceneId(other.getSceneId());
+        }
         if (entityInfoListBuilder_ == null) {
           if (!other.entityInfoList_.isEmpty()) {
             if (entityInfoList_.isEmpty()) {
@@ -531,9 +524,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
             }
           }
         }
-        if (other.getSceneId() != 0) {
-          setSceneId(other.getSceneId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,6 +554,37 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
       }
       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.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> entityInfoList_ =
         java.util.Collections.emptyList();
       private void ensureEntityInfoListIsMutable() {
@@ -577,7 +598,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
           emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder> entityInfoListBuilder_;
 
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> getEntityInfoListList() {
         if (entityInfoListBuilder_ == null) {
@@ -587,7 +608,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public int getEntityInfoListCount() {
         if (entityInfoListBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo getEntityInfoList(int index) {
         if (entityInfoListBuilder_ == null) {
@@ -607,7 +628,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder setEntityInfoList(
           int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
@@ -624,7 +645,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder setEntityInfoList(
           int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -638,7 +659,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder addEntityInfoList(emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
         if (entityInfoListBuilder_ == null) {
@@ -654,7 +675,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder addEntityInfoList(
           int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo value) {
@@ -671,7 +692,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder addEntityInfoList(
           emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -685,7 +706,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder addEntityInfoList(
           int index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder builderForValue) {
@@ -699,7 +720,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder addAllEntityInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo> values) {
@@ -714,7 +735,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder clearEntityInfoList() {
         if (entityInfoListBuilder_ == null) {
@@ -727,7 +748,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public Builder removeEntityInfoList(int index) {
         if (entityInfoListBuilder_ == null) {
@@ -740,14 +761,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder getEntityInfoListBuilder(
           int index) {
         return getEntityInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder getEntityInfoListOrBuilder(
           int index) {
@@ -757,7 +778,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfoOrBuilder> 
            getEntityInfoListOrBuilderList() {
@@ -768,14 +789,14 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder addEntityInfoListBuilder() {
         return getEntityInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder addEntityInfoListBuilder(
           int index) {
@@ -783,7 +804,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayTeamEntityInfo entity_info_list = 1;</code>
+       * <code>repeated .PlayTeamEntityInfo entity_info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.PlayTeamEntityInfo.Builder> 
            getEntityInfoListBuilderList() {
@@ -803,37 +824,6 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
         }
         return entityInfoListBuilder_;
       }
-
-      private int sceneId_ ;
-      /**
-       * <code>uint32 scene_id = 7;</code>
-       * @return The sceneId.
-       */
-      @java.lang.Override
-      public int getSceneId() {
-        return sceneId_;
-      }
-      /**
-       * <code>uint32 scene_id = 7;</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 = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearSceneId() {
-        
-        sceneId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -903,9 +893,9 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n#SyncScenePlayTeamEntityNotify.proto\032\030P" +
       "layTeamEntityInfo.proto\"`\n\035SyncScenePlay" +
-      "TeamEntityNotify\022-\n\020entity_info_list\030\001 \003" +
-      "(\0132\023.PlayTeamEntityInfo\022\020\n\010scene_id\030\007 \001(" +
-      "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "TeamEntityNotify\022\020\n\010scene_id\030\010 \001(\r\022-\n\020en" +
+      "tity_info_list\030\016 \003(\0132\023.PlayTeamEntityInf" +
+      "oB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -917,7 +907,7 @@ public final class SyncScenePlayTeamEntityNotifyOuterClass {
     internal_static_SyncScenePlayTeamEntityNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_SyncScenePlayTeamEntityNotify_descriptor,
-        new java.lang.String[] { "EntityInfoList", "SceneId", });
+        new java.lang.String[] { "SceneId", "EntityInfoList", });
     emu.grasscutter.net.proto.PlayTeamEntityInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SyncTeamEntityNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SyncTeamEntityNotifyOuterClass.java
index 905de4b40..305c70872 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/SyncTeamEntityNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SyncTeamEntityNotifyOuterClass.java
@@ -19,41 +19,36 @@ public final class SyncTeamEntityNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 4;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     int getSceneId();
 
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> 
         getTeamEntityInfoListList();
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index);
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     int getTeamEntityInfoListCount();
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> 
         getTeamEntityInfoListOrBuilderList();
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 25071
-   * Obf: OCCHGJLNKDC
-   * </pre>
-   *
    * Protobuf type {@code SyncTeamEntityNotify}
    */
   public static final class SyncTeamEntityNotify extends
@@ -100,7 +95,12 @@ public final class SyncTeamEntityNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 64: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 teamEntityInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -109,11 +109,6 @@ public final class SyncTeamEntityNotifyOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.parser(), extensionRegistry));
               break;
             }
-            case 32: {
-
-              sceneId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +144,10 @@ public final class SyncTeamEntityNotifyOuterClass {
               emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.class, emu.grasscutter.net.proto.SyncTeamEntityNotifyOuterClass.SyncTeamEntityNotify.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 4;
+    public static final int SCENE_ID_FIELD_NUMBER = 8;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 4;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -160,17 +155,17 @@ public final class SyncTeamEntityNotifyOuterClass {
       return sceneId_;
     }
 
-    public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 3;
+    public static final int TEAM_ENTITY_INFO_LIST_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> teamEntityInfoList_;
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
       return teamEntityInfoList_;
     }
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> 
@@ -178,21 +173,21 @@ public final class SyncTeamEntityNotifyOuterClass {
       return teamEntityInfoList_;
     }
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     @java.lang.Override
     public int getTeamEntityInfoListCount() {
       return teamEntityInfoList_.size();
     }
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
       return teamEntityInfoList_.get(index);
     }
     /**
-     * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+     * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
@@ -214,11 +209,11 @@ public final class SyncTeamEntityNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      for (int i = 0; i < teamEntityInfoList_.size(); i++) {
-        output.writeMessage(3, teamEntityInfoList_.get(i));
-      }
       if (sceneId_ != 0) {
-        output.writeUInt32(4, sceneId_);
+        output.writeUInt32(8, sceneId_);
+      }
+      for (int i = 0; i < teamEntityInfoList_.size(); i++) {
+        output.writeMessage(9, teamEntityInfoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -229,13 +224,13 @@ public final class SyncTeamEntityNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      for (int i = 0; i < teamEntityInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, teamEntityInfoList_.get(i));
-      }
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, sceneId_);
+          .computeUInt32Size(8, sceneId_);
+      }
+      for (int i = 0; i < teamEntityInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(9, teamEntityInfoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -369,11 +364,6 @@ public final class SyncTeamEntityNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25071
-     * Obf: OCCHGJLNKDC
-     * </pre>
-     *
      * Protobuf type {@code SyncTeamEntityNotify}
      */
     public static final class Builder extends
@@ -566,7 +556,7 @@ public final class SyncTeamEntityNotifyOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -574,7 +564,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -585,7 +575,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 4;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -608,7 +598,7 @@ public final class SyncTeamEntityNotifyOuterClass {
           emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> teamEntityInfoListBuilder_;
 
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> getTeamEntityInfoListList() {
         if (teamEntityInfoListBuilder_ == null) {
@@ -618,7 +608,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public int getTeamEntityInfoListCount() {
         if (teamEntityInfoListBuilder_ == null) {
@@ -628,7 +618,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo getTeamEntityInfoList(int index) {
         if (teamEntityInfoListBuilder_ == null) {
@@ -638,7 +628,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder setTeamEntityInfoList(
           int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -655,7 +645,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder setTeamEntityInfoList(
           int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -669,7 +659,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder addTeamEntityInfoList(emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
         if (teamEntityInfoListBuilder_ == null) {
@@ -685,7 +675,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder addTeamEntityInfoList(
           int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo value) {
@@ -702,7 +692,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder addTeamEntityInfoList(
           emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -716,7 +706,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder addTeamEntityInfoList(
           int index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder builderForValue) {
@@ -730,7 +720,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder addAllTeamEntityInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo> values) {
@@ -745,7 +735,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder clearTeamEntityInfoList() {
         if (teamEntityInfoListBuilder_ == null) {
@@ -758,7 +748,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public Builder removeTeamEntityInfoList(int index) {
         if (teamEntityInfoListBuilder_ == null) {
@@ -771,14 +761,14 @@ public final class SyncTeamEntityNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder getTeamEntityInfoListBuilder(
           int index) {
         return getTeamEntityInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder getTeamEntityInfoListOrBuilder(
           int index) {
@@ -788,7 +778,7 @@ public final class SyncTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfoOrBuilder> 
            getTeamEntityInfoListOrBuilderList() {
@@ -799,14 +789,14 @@ public final class SyncTeamEntityNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder() {
         return getTeamEntityInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder addTeamEntityInfoListBuilder(
           int index) {
@@ -814,7 +804,7 @@ public final class SyncTeamEntityNotifyOuterClass {
             index, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .TeamEntityInfo team_entity_info_list = 3;</code>
+       * <code>repeated .TeamEntityInfo team_entity_info_list = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder> 
            getTeamEntityInfoListBuilderList() {
@@ -903,7 +893,7 @@ public final class SyncTeamEntityNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032SyncTeamEntityNotify.proto\032\024TeamEntity" +
       "Info.proto\"X\n\024SyncTeamEntityNotify\022\020\n\010sc" +
-      "ene_id\030\004 \001(\r\022.\n\025team_entity_info_list\030\003 " +
+      "ene_id\030\010 \001(\r\022.\n\025team_entity_info_list\030\t " +
       "\003(\0132\017.TeamEntityInfoB\033\n\031emu.grasscutter." +
       "net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/SystemHintOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/SystemHintOuterClass.java
new file mode 100644
index 000000000..393d1b9e2
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/SystemHintOuterClass.java
@@ -0,0 +1,536 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SystemHint.proto
+
+package emu.grasscutter.net.proto;
+
+public final class SystemHintOuterClass {
+  private SystemHintOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface SystemHintOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:SystemHint)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 type = 2;</code>
+     * @return The type.
+     */
+    int getType();
+  }
+  /**
+   * Protobuf type {@code SystemHint}
+   */
+  public static final class SystemHint extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:SystemHint)
+      SystemHintOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use SystemHint.newBuilder() to construct.
+    private SystemHint(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private SystemHint() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new SystemHint();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private SystemHint(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 16: {
+
+              type_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.SystemHintOuterClass.internal_static_SystemHint_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.SystemHintOuterClass.internal_static_SystemHint_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.class, emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.Builder.class);
+    }
+
+    public static final int TYPE_FIELD_NUMBER = 2;
+    private int type_;
+    /**
+     * <code>uint32 type = 2;</code>
+     * @return The type.
+     */
+    @java.lang.Override
+    public int getType() {
+      return type_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (type_ != 0) {
+        output.writeUInt32(2, type_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (type_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, type_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint other = (emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint) obj;
+
+      if (getType()
+          != other.getType()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getType();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code SystemHint}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:SystemHint)
+        emu.grasscutter.net.proto.SystemHintOuterClass.SystemHintOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.SystemHintOuterClass.internal_static_SystemHint_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.SystemHintOuterClass.internal_static_SystemHint_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.class, emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        type_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.SystemHintOuterClass.internal_static_SystemHint_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint build() {
+        emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint buildPartial() {
+        emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint result = new emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint(this);
+        result.type_ = type_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint) {
+          return mergeFrom((emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint other) {
+        if (other == emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint.getDefaultInstance()) return this;
+        if (other.getType() != 0) {
+          setType(other.getType());
+        }
+        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.SystemHintOuterClass.SystemHint parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int type_ ;
+      /**
+       * <code>uint32 type = 2;</code>
+       * @return The type.
+       */
+      @java.lang.Override
+      public int getType() {
+        return type_;
+      }
+      /**
+       * <code>uint32 type = 2;</code>
+       * @param value The type to set.
+       * @return This builder for chaining.
+       */
+      public Builder setType(int value) {
+        
+        type_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 type = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearType() {
+        
+        type_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:SystemHint)
+    }
+
+    // @@protoc_insertion_point(class_scope:SystemHint)
+    private static final emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint();
+    }
+
+    public static emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<SystemHint>
+        PARSER = new com.google.protobuf.AbstractParser<SystemHint>() {
+      @java.lang.Override
+      public SystemHint parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new SystemHint(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<SystemHint> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<SystemHint> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.SystemHintOuterClass.SystemHint getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_SystemHint_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_SystemHint_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\020SystemHint.proto\"\032\n\nSystemHint\022\014\n\004type" +
+      "\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "to3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_SystemHint_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_SystemHint_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_SystemHint_descriptor,
+        new java.lang.String[] { "Type", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointRspOuterClass.java
index 753b79a7b..818a5aac9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TakeBattlePassMissionPointRspOuterClass.java
@@ -19,34 +19,29 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 8;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
+     * <code>repeated uint32 mission_id_list = 5;</code>
      * @return A list containing the missionIdList.
      */
     java.util.List<java.lang.Integer> getMissionIdListList();
     /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
+     * <code>repeated uint32 mission_id_list = 5;</code>
      * @return The count of missionIdList.
      */
     int getMissionIdListCount();
     /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
+     * <code>repeated uint32 mission_id_list = 5;</code>
      * @param index The index of the element to return.
      * @return The missionIdList at the given index.
      */
     int getMissionIdList(int index);
+
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 9060
-   * Obf: KBDNDEDCINE
-   * </pre>
-   *
    * Protobuf type {@code TakeBattlePassMissionPointRsp}
    */
   public static final class TakeBattlePassMissionPointRsp extends
@@ -93,7 +88,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 40: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 missionIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -101,7 +96,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
               missionIdList_.addInt(input.readUInt32());
               break;
             }
-            case 26: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -154,6 +149,34 @@ public final class TakeBattlePassMissionPointRspOuterClass {
               emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.class, emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.Builder.class);
     }
 
+    public static final int MISSION_ID_LIST_FIELD_NUMBER = 5;
+    private com.google.protobuf.Internal.IntList missionIdList_;
+    /**
+     * <code>repeated uint32 mission_id_list = 5;</code>
+     * @return A list containing the missionIdList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getMissionIdListList() {
+      return missionIdList_;
+    }
+    /**
+     * <code>repeated uint32 mission_id_list = 5;</code>
+     * @return The count of missionIdList.
+     */
+    public int getMissionIdListCount() {
+      return missionIdList_.size();
+    }
+    /**
+     * <code>repeated uint32 mission_id_list = 5;</code>
+     * @param index The index of the element to return.
+     * @return The missionIdList at the given index.
+     */
+    public int getMissionIdList(int index) {
+      return missionIdList_.getInt(index);
+    }
+    private int missionIdListMemoizedSerializedSize = -1;
+
     public static final int RETCODE_FIELD_NUMBER = 8;
     private int retcode_;
     /**
@@ -165,34 +188,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       return retcode_;
     }
 
-    public static final int MISSION_ID_LIST_FIELD_NUMBER = 3;
-    private com.google.protobuf.Internal.IntList missionIdList_;
-    /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
-     * @return A list containing the missionIdList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Integer>
-        getMissionIdListList() {
-      return missionIdList_;
-    }
-    /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
-     * @return The count of missionIdList.
-     */
-    public int getMissionIdListCount() {
-      return missionIdList_.size();
-    }
-    /**
-     * <code>repeated uint32 mission_id_list = 3;</code>
-     * @param index The index of the element to return.
-     * @return The missionIdList at the given index.
-     */
-    public int getMissionIdList(int index) {
-      return missionIdList_.getInt(index);
-    }
-    private int missionIdListMemoizedSerializedSize = -1;
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -209,7 +204,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getMissionIdListList().size() > 0) {
-        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(missionIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < missionIdList_.size(); i++) {
@@ -260,10 +255,10 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       }
       emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp other = (emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getMissionIdListList()
           .equals(other.getMissionIdListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getMissionIdListCount() > 0) {
         hash = (37 * hash) + MISSION_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getMissionIdListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9060
-     * Obf: KBDNDEDCINE
-     * </pre>
-     *
      * Protobuf type {@code TakeBattlePassMissionPointRsp}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         missionIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       public emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp buildPartial() {
         emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp result = new emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           missionIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.missionIdList_ = missionIdList_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -504,9 +494,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp other) {
         if (other == emu.grasscutter.net.proto.TakeBattlePassMissionPointRspOuterClass.TakeBattlePassMissionPointRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (!other.missionIdList_.isEmpty()) {
           if (missionIdList_.isEmpty()) {
             missionIdList_ = other.missionIdList_;
@@ -517,6 +504,9 @@ public final class TakeBattlePassMissionPointRspOuterClass {
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,6 +537,85 @@ public final class TakeBattlePassMissionPointRspOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList missionIdList_ = emptyIntList();
+      private void ensureMissionIdListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          missionIdList_ = mutableCopy(missionIdList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @return A list containing the missionIdList.
+       */
+      public java.util.List<java.lang.Integer>
+          getMissionIdListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(missionIdList_) : missionIdList_;
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @return The count of missionIdList.
+       */
+      public int getMissionIdListCount() {
+        return missionIdList_.size();
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @param index The index of the element to return.
+       * @return The missionIdList at the given index.
+       */
+      public int getMissionIdList(int index) {
+        return missionIdList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @param index The index to set the value at.
+       * @param value The missionIdList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMissionIdList(
+          int index, int value) {
+        ensureMissionIdListIsMutable();
+        missionIdList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @param value The missionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addMissionIdList(int value) {
+        ensureMissionIdListIsMutable();
+        missionIdList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @param values The missionIdList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllMissionIdList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureMissionIdListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, missionIdList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 mission_id_list = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMissionIdList() {
+        missionIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
        * <code>int32 retcode = 8;</code>
@@ -577,85 +646,6 @@ public final class TakeBattlePassMissionPointRspOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.IntList missionIdList_ = emptyIntList();
-      private void ensureMissionIdListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          missionIdList_ = mutableCopy(missionIdList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @return A list containing the missionIdList.
-       */
-      public java.util.List<java.lang.Integer>
-          getMissionIdListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(missionIdList_) : missionIdList_;
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @return The count of missionIdList.
-       */
-      public int getMissionIdListCount() {
-        return missionIdList_.size();
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @param index The index of the element to return.
-       * @return The missionIdList at the given index.
-       */
-      public int getMissionIdList(int index) {
-        return missionIdList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @param index The index to set the value at.
-       * @param value The missionIdList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMissionIdList(
-          int index, int value) {
-        ensureMissionIdListIsMutable();
-        missionIdList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @param value The missionIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addMissionIdList(int value) {
-        ensureMissionIdListIsMutable();
-        missionIdList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @param values The missionIdList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllMissionIdList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureMissionIdListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, missionIdList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 mission_id_list = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMissionIdList() {
-        missionIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -724,8 +714,8 @@ public final class TakeBattlePassMissionPointRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n#TakeBattlePassMissionPointRsp.proto\"I\n" +
-      "\035TakeBattlePassMissionPointRsp\022\017\n\007retcod" +
-      "e\030\010 \001(\005\022\027\n\017mission_id_list\030\003 \003(\rB\033\n\031emu." +
+      "\035TakeBattlePassMissionPointRsp\022\027\n\017missio" +
+      "n_id_list\030\005 \003(\r\022\017\n\007retcode\030\010 \001(\005B\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +727,7 @@ public final class TakeBattlePassMissionPointRspOuterClass {
     internal_static_TakeBattlePassMissionPointRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TakeBattlePassMissionPointRsp_descriptor,
-        new java.lang.String[] { "Retcode", "MissionIdList", });
+        new java.lang.String[] { "MissionIdList", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java
index 838aa2aef..8c8630024 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardReqOuterClass.java
@@ -19,15 +19,14 @@ public final class TakePlayerLevelRewardReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 level = 6;</code>
+     * <code>uint32 level = 15;</code>
      * @return The level.
      */
     int getLevel();
   }
   /**
    * <pre>
-   * CmdId: 4273
-   * Obf: FHNEDFBJCED
+   * CmdId: 9556
    * </pre>
    *
    * Protobuf type {@code TakePlayerLevelRewardReq}
@@ -74,7 +73,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 120: {
 
               level_ = input.readUInt32();
               break;
@@ -111,10 +110,10 @@ public final class TakePlayerLevelRewardReqOuterClass {
               emu.grasscutter.net.proto.TakePlayerLevelRewardReqOuterClass.TakePlayerLevelRewardReq.class, emu.grasscutter.net.proto.TakePlayerLevelRewardReqOuterClass.TakePlayerLevelRewardReq.Builder.class);
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 6;
+    public static final int LEVEL_FIELD_NUMBER = 15;
     private int level_;
     /**
-     * <code>uint32 level = 6;</code>
+     * <code>uint32 level = 15;</code>
      * @return The level.
      */
     @java.lang.Override
@@ -137,7 +136,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (level_ != 0) {
-        output.writeUInt32(6, level_);
+        output.writeUInt32(15, level_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +149,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
       size = 0;
       if (level_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, level_);
+          .computeUInt32Size(15, level_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +278,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 4273
-     * Obf: FHNEDFBJCED
+     * CmdId: 9556
      * </pre>
      *
      * Protobuf type {@code TakePlayerLevelRewardReq}
@@ -431,7 +429,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
 
       private int level_ ;
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @return The level.
        */
       @java.lang.Override
@@ -439,7 +437,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
         return level_;
       }
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @param value The level to set.
        * @return This builder for chaining.
        */
@@ -450,7 +448,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearLevel() {
@@ -527,7 +525,7 @@ public final class TakePlayerLevelRewardReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036TakePlayerLevelRewardReq.proto\")\n\030Take" +
-      "PlayerLevelRewardReq\022\r\n\005level\030\006 \001(\rB\033\n\031e" +
+      "PlayerLevelRewardReq\022\r\n\005level\030\017 \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/TakePlayerLevelRewardRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java
index 1e1292f0d..384e25c04 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TakePlayerLevelRewardRspOuterClass.java
@@ -19,27 +19,26 @@ public final class TakePlayerLevelRewardRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>uint32 reward_id = 1;</code>
+     * @return The rewardId.
+     */
+    int getRewardId();
+
+    /**
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint32 level = 6;</code>
+     * <code>uint32 level = 15;</code>
      * @return The level.
      */
     int getLevel();
-
-    /**
-     * <code>uint32 reward_id = 14;</code>
-     * @return The rewardId.
-     */
-    int getRewardId();
   }
   /**
    * <pre>
-   * CmdId: 767
-   * Obf: NOJIOLBGOMB
+   * CmdId: 21700
    * </pre>
    *
    * Protobuf type {@code TakePlayerLevelRewardRsp}
@@ -86,21 +85,21 @@ public final class TakePlayerLevelRewardRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
+
+              rewardId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 48: {
+            case 120: {
 
               level_ = input.readUInt32();
               break;
             }
-            case 112: {
-
-              rewardId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +132,21 @@ public final class TakePlayerLevelRewardRspOuterClass {
               emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp.class, emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int REWARD_ID_FIELD_NUMBER = 1;
+    private int rewardId_;
+    /**
+     * <code>uint32 reward_id = 1;</code>
+     * @return The rewardId.
+     */
+    @java.lang.Override
+    public int getRewardId() {
+      return rewardId_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,10 +154,10 @@ public final class TakePlayerLevelRewardRspOuterClass {
       return retcode_;
     }
 
-    public static final int LEVEL_FIELD_NUMBER = 6;
+    public static final int LEVEL_FIELD_NUMBER = 15;
     private int level_;
     /**
-     * <code>uint32 level = 6;</code>
+     * <code>uint32 level = 15;</code>
      * @return The level.
      */
     @java.lang.Override
@@ -155,17 +165,6 @@ public final class TakePlayerLevelRewardRspOuterClass {
       return level_;
     }
 
-    public static final int REWARD_ID_FIELD_NUMBER = 14;
-    private int rewardId_;
-    /**
-     * <code>uint32 reward_id = 14;</code>
-     * @return The rewardId.
-     */
-    @java.lang.Override
-    public int getRewardId() {
-      return rewardId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +179,14 @@ public final class TakePlayerLevelRewardRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (rewardId_ != 0) {
+        output.writeUInt32(1, rewardId_);
+      }
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(11, retcode_);
       }
       if (level_ != 0) {
-        output.writeUInt32(6, level_);
-      }
-      if (rewardId_ != 0) {
-        output.writeUInt32(14, rewardId_);
+        output.writeUInt32(15, level_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +197,17 @@ public final class TakePlayerLevelRewardRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (rewardId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, rewardId_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       if (level_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, level_);
-      }
-      if (rewardId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, rewardId_);
+          .computeUInt32Size(15, level_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +224,12 @@ public final class TakePlayerLevelRewardRspOuterClass {
       }
       emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp other = (emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp) obj;
 
+      if (getRewardId()
+          != other.getRewardId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (getLevel()
           != other.getLevel()) return false;
-      if (getRewardId()
-          != other.getRewardId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +241,12 @@ public final class TakePlayerLevelRewardRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRewardId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getLevel();
-      hash = (37 * hash) + REWARD_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRewardId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -345,8 +344,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 767
-     * Obf: NOJIOLBGOMB
+     * CmdId: 21700
      * </pre>
      *
      * Protobuf type {@code TakePlayerLevelRewardRsp}
@@ -386,12 +384,12 @@ public final class TakePlayerLevelRewardRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        rewardId_ = 0;
+
         retcode_ = 0;
 
         level_ = 0;
 
-        rewardId_ = 0;
-
         return this;
       }
 
@@ -418,9 +416,9 @@ public final class TakePlayerLevelRewardRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp buildPartial() {
         emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp result = new emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp(this);
+        result.rewardId_ = rewardId_;
         result.retcode_ = retcode_;
         result.level_ = level_;
-        result.rewardId_ = rewardId_;
         onBuilt();
         return result;
       }
@@ -469,15 +467,15 @@ public final class TakePlayerLevelRewardRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp other) {
         if (other == emu.grasscutter.net.proto.TakePlayerLevelRewardRspOuterClass.TakePlayerLevelRewardRsp.getDefaultInstance()) return this;
+        if (other.getRewardId() != 0) {
+          setRewardId(other.getRewardId());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
         if (other.getLevel() != 0) {
           setLevel(other.getLevel());
         }
-        if (other.getRewardId() != 0) {
-          setRewardId(other.getRewardId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,9 +505,40 @@ public final class TakePlayerLevelRewardRspOuterClass {
         return this;
       }
 
+      private int rewardId_ ;
+      /**
+       * <code>uint32 reward_id = 1;</code>
+       * @return The rewardId.
+       */
+      @java.lang.Override
+      public int getRewardId() {
+        return rewardId_;
+      }
+      /**
+       * <code>uint32 reward_id = 1;</code>
+       * @param value The rewardId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRewardId(int value) {
+        
+        rewardId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 reward_id = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRewardId() {
+        
+        rewardId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -517,7 +546,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -528,7 +557,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -540,7 +569,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
 
       private int level_ ;
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @return The level.
        */
       @java.lang.Override
@@ -548,7 +577,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
         return level_;
       }
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @param value The level to set.
        * @return This builder for chaining.
        */
@@ -559,7 +588,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 level = 6;</code>
+       * <code>uint32 level = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearLevel() {
@@ -568,37 +597,6 @@ public final class TakePlayerLevelRewardRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int rewardId_ ;
-      /**
-       * <code>uint32 reward_id = 14;</code>
-       * @return The rewardId.
-       */
-      @java.lang.Override
-      public int getRewardId() {
-        return rewardId_;
-      }
-      /**
-       * <code>uint32 reward_id = 14;</code>
-       * @param value The rewardId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRewardId(int value) {
-        
-        rewardId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 reward_id = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRewardId() {
-        
-        rewardId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -667,8 +665,8 @@ public final class TakePlayerLevelRewardRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036TakePlayerLevelRewardRsp.proto\"M\n\030Take" +
-      "PlayerLevelRewardRsp\022\017\n\007retcode\030\004 \001(\005\022\r\n" +
-      "\005level\030\006 \001(\r\022\021\n\treward_id\030\016 \001(\rB\033\n\031emu.g" +
+      "PlayerLevelRewardRsp\022\021\n\treward_id\030\001 \001(\r\022" +
+      "\017\n\007retcode\030\013 \001(\005\022\r\n\005level\030\017 \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -680,7 +678,7 @@ public final class TakePlayerLevelRewardRspOuterClass {
     internal_static_TakePlayerLevelRewardRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TakePlayerLevelRewardRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Level", "RewardId", });
+        new java.lang.String[] { "RewardId", "Retcode", "Level", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
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 bb8a071fb..8caed7039 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TeamEnterSceneInfoOuterClass.java
@@ -19,46 +19,42 @@ public final class TeamEnterSceneInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 team_entity_id = 5;</code>
+     * <code>uint32 team_entity_id = 1;</code>
      * @return The teamEntityId.
      */
     int getTeamEntityId();
 
     /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     * @return Whether the abilityControlBlock field is set.
-     */
-    boolean hasAbilityControlBlock();
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     * @return The abilityControlBlock.
-     */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     */
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
-
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
     boolean hasTeamAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      * @return The teamAbilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
+
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     * @return Whether the abilityControlBlock field is set.
+     */
+    boolean hasAbilityControlBlock();
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     * @return The abilityControlBlock.
+     */
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock();
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     */
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: PMLNKMHJPKI
-   * </pre>
-   *
    * Protobuf type {@code TeamEnterSceneInfo}
    */
   public static final class TeamEnterSceneInfo extends
@@ -103,25 +99,12 @@ public final class TeamEnterSceneInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 40: {
+            case 8: {
 
               teamEntityId_ = input.readUInt32();
               break;
             }
-            case 58: {
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
-              if (abilityControlBlock_ != null) {
-                subBuilder = abilityControlBlock_.toBuilder();
-              }
-              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(abilityControlBlock_);
-                abilityControlBlock_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 66: {
+            case 42: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (teamAbilityInfo_ != null) {
                 subBuilder = teamAbilityInfo_.toBuilder();
@@ -134,6 +117,19 @@ public final class TeamEnterSceneInfoOuterClass {
 
               break;
             }
+            case 122: {
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder subBuilder = null;
+              if (abilityControlBlock_ != null) {
+                subBuilder = abilityControlBlock_.toBuilder();
+              }
+              abilityControlBlock_ = input.readMessage(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(abilityControlBlock_);
+                abilityControlBlock_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -166,10 +162,10 @@ public final class TeamEnterSceneInfoOuterClass {
               emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.class, emu.grasscutter.net.proto.TeamEnterSceneInfoOuterClass.TeamEnterSceneInfo.Builder.class);
     }
 
-    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 5;
+    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 1;
     private int teamEntityId_;
     /**
-     * <code>uint32 team_entity_id = 5;</code>
+     * <code>uint32 team_entity_id = 1;</code>
      * @return The teamEntityId.
      */
     @java.lang.Override
@@ -177,36 +173,10 @@ public final class TeamEnterSceneInfoOuterClass {
       return teamEntityId_;
     }
 
-    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 7;
-    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     * @return Whether the abilityControlBlock field is set.
-     */
-    @java.lang.Override
-    public boolean hasAbilityControlBlock() {
-      return abilityControlBlock_ != null;
-    }
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     * @return The abilityControlBlock.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
-      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
-    }
-    /**
-     * <code>.AbilityControlBlock ability_control_block = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
-      return getAbilityControlBlock();
-    }
-
-    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 8;
+    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 5;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
     @java.lang.Override
@@ -214,7 +184,7 @@ public final class TeamEnterSceneInfoOuterClass {
       return teamAbilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      * @return The teamAbilityInfo.
      */
     @java.lang.Override
@@ -222,13 +192,39 @@ public final class TeamEnterSceneInfoOuterClass {
       return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
       return getTeamAbilityInfo();
     }
 
+    public static final int ABILITY_CONTROL_BLOCK_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock abilityControlBlock_;
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     * @return Whether the abilityControlBlock field is set.
+     */
+    @java.lang.Override
+    public boolean hasAbilityControlBlock() {
+      return abilityControlBlock_ != null;
+    }
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     * @return The abilityControlBlock.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock getAbilityControlBlock() {
+      return abilityControlBlock_ == null ? emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+    }
+    /**
+     * <code>.AbilityControlBlock ability_control_block = 15;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
+      return getAbilityControlBlock();
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -244,13 +240,13 @@ public final class TeamEnterSceneInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (teamEntityId_ != 0) {
-        output.writeUInt32(5, teamEntityId_);
-      }
-      if (abilityControlBlock_ != null) {
-        output.writeMessage(7, getAbilityControlBlock());
+        output.writeUInt32(1, teamEntityId_);
       }
       if (teamAbilityInfo_ != null) {
-        output.writeMessage(8, getTeamAbilityInfo());
+        output.writeMessage(5, getTeamAbilityInfo());
+      }
+      if (abilityControlBlock_ != null) {
+        output.writeMessage(15, getAbilityControlBlock());
       }
       unknownFields.writeTo(output);
     }
@@ -263,15 +259,15 @@ public final class TeamEnterSceneInfoOuterClass {
       size = 0;
       if (teamEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, teamEntityId_);
-      }
-      if (abilityControlBlock_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, getAbilityControlBlock());
+          .computeUInt32Size(1, teamEntityId_);
       }
       if (teamAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(8, getTeamAbilityInfo());
+          .computeMessageSize(5, getTeamAbilityInfo());
+      }
+      if (abilityControlBlock_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getAbilityControlBlock());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -290,16 +286,16 @@ public final class TeamEnterSceneInfoOuterClass {
 
       if (getTeamEntityId()
           != other.getTeamEntityId()) return false;
-      if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
-      if (hasAbilityControlBlock()) {
-        if (!getAbilityControlBlock()
-            .equals(other.getAbilityControlBlock())) return false;
-      }
       if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
       if (hasTeamAbilityInfo()) {
         if (!getTeamAbilityInfo()
             .equals(other.getTeamAbilityInfo())) return false;
       }
+      if (hasAbilityControlBlock() != other.hasAbilityControlBlock()) return false;
+      if (hasAbilityControlBlock()) {
+        if (!getAbilityControlBlock()
+            .equals(other.getAbilityControlBlock())) return false;
+      }
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -313,14 +309,14 @@ public final class TeamEnterSceneInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTeamEntityId();
-      if (hasAbilityControlBlock()) {
-        hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
-        hash = (53 * hash) + getAbilityControlBlock().hashCode();
-      }
       if (hasTeamAbilityInfo()) {
         hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getTeamAbilityInfo().hashCode();
       }
+      if (hasAbilityControlBlock()) {
+        hash = (37 * hash) + ABILITY_CONTROL_BLOCK_FIELD_NUMBER;
+        hash = (53 * hash) + getAbilityControlBlock().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -417,10 +413,6 @@ public final class TeamEnterSceneInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PMLNKMHJPKI
-     * </pre>
-     *
      * Protobuf type {@code TeamEnterSceneInfo}
      */
     public static final class Builder extends
@@ -460,18 +452,18 @@ public final class TeamEnterSceneInfoOuterClass {
         super.clear();
         teamEntityId_ = 0;
 
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlock_ = null;
-        } else {
-          abilityControlBlock_ = null;
-          abilityControlBlockBuilder_ = null;
-        }
         if (teamAbilityInfoBuilder_ == null) {
           teamAbilityInfo_ = null;
         } else {
           teamAbilityInfo_ = null;
           teamAbilityInfoBuilder_ = null;
         }
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlock_ = null;
+        } else {
+          abilityControlBlock_ = null;
+          abilityControlBlockBuilder_ = null;
+        }
         return this;
       }
 
@@ -499,16 +491,16 @@ public final class TeamEnterSceneInfoOuterClass {
       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 (abilityControlBlockBuilder_ == null) {
-          result.abilityControlBlock_ = abilityControlBlock_;
-        } else {
-          result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
-        }
         if (teamAbilityInfoBuilder_ == null) {
           result.teamAbilityInfo_ = teamAbilityInfo_;
         } else {
           result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
         }
+        if (abilityControlBlockBuilder_ == null) {
+          result.abilityControlBlock_ = abilityControlBlock_;
+        } else {
+          result.abilityControlBlock_ = abilityControlBlockBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -560,12 +552,12 @@ public final class TeamEnterSceneInfoOuterClass {
         if (other.getTeamEntityId() != 0) {
           setTeamEntityId(other.getTeamEntityId());
         }
-        if (other.hasAbilityControlBlock()) {
-          mergeAbilityControlBlock(other.getAbilityControlBlock());
-        }
         if (other.hasTeamAbilityInfo()) {
           mergeTeamAbilityInfo(other.getTeamAbilityInfo());
         }
+        if (other.hasAbilityControlBlock()) {
+          mergeAbilityControlBlock(other.getAbilityControlBlock());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -597,7 +589,7 @@ public final class TeamEnterSceneInfoOuterClass {
 
       private int teamEntityId_ ;
       /**
-       * <code>uint32 team_entity_id = 5;</code>
+       * <code>uint32 team_entity_id = 1;</code>
        * @return The teamEntityId.
        */
       @java.lang.Override
@@ -605,7 +597,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return teamEntityId_;
       }
       /**
-       * <code>uint32 team_entity_id = 5;</code>
+       * <code>uint32 team_entity_id = 1;</code>
        * @param value The teamEntityId to set.
        * @return This builder for chaining.
        */
@@ -616,7 +608,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 team_entity_id = 5;</code>
+       * <code>uint32 team_entity_id = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamEntityId() {
@@ -626,137 +618,18 @@ public final class TeamEnterSceneInfoOuterClass {
         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 = 7;</code>
-       * @return Whether the abilityControlBlock field is set.
-       */
-      public boolean hasAbilityControlBlock() {
-        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 7;</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 = 7;</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 = 7;</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 = 7;</code>
-       */
-      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
-        if (abilityControlBlockBuilder_ == null) {
-          if (abilityControlBlock_ != null) {
-            abilityControlBlock_ =
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
-          } else {
-            abilityControlBlock_ = value;
-          }
-          onChanged();
-        } else {
-          abilityControlBlockBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 7;</code>
-       */
-      public Builder clearAbilityControlBlock() {
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlock_ = null;
-          onChanged();
-        } else {
-          abilityControlBlock_ = null;
-          abilityControlBlockBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 7;</code>
-       */
-      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
-        
-        onChanged();
-        return getAbilityControlBlockFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 7;</code>
-       */
-      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
-        if (abilityControlBlockBuilder_ != null) {
-          return abilityControlBlockBuilder_.getMessageOrBuilder();
-        } else {
-          return abilityControlBlock_ == null ?
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
-        }
-      }
-      /**
-       * <code>.AbilityControlBlock ability_control_block = 7;</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> 
-          getAbilityControlBlockFieldBuilder() {
-        if (abilityControlBlockBuilder_ == null) {
-          abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
-                  getAbilityControlBlock(),
-                  getParentForChildren(),
-                  isClean());
-          abilityControlBlock_ = null;
-        }
-        return abilityControlBlockBuilder_;
-      }
-
       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_;
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        * @return Whether the teamAbilityInfo field is set.
        */
       public boolean hasTeamAbilityInfo() {
         return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        * @return The teamAbilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
@@ -767,7 +640,7 @@ public final class TeamEnterSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (teamAbilityInfoBuilder_ == null) {
@@ -783,7 +656,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public Builder setTeamAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -797,7 +670,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (teamAbilityInfoBuilder_ == null) {
@@ -815,7 +688,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public Builder clearTeamAbilityInfo() {
         if (teamAbilityInfoBuilder_ == null) {
@@ -829,7 +702,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
         
@@ -837,7 +710,7 @@ public final class TeamEnterSceneInfoOuterClass {
         return getTeamAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 5;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
         if (teamAbilityInfoBuilder_ != null) {
@@ -848,7 +721,7 @@ public final class TeamEnterSceneInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 8;</code>
+       * <code>.AbilitySyncStateInfo team_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> 
@@ -863,6 +736,125 @@ public final class TeamEnterSceneInfoOuterClass {
         }
         return teamAbilityInfoBuilder_;
       }
+
+      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 = 15;</code>
+       * @return Whether the abilityControlBlock field is set.
+       */
+      public boolean hasAbilityControlBlock() {
+        return abilityControlBlockBuilder_ != null || abilityControlBlock_ != null;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 15;</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 = 15;</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 = 15;</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 = 15;</code>
+       */
+      public Builder mergeAbilityControlBlock(emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock value) {
+        if (abilityControlBlockBuilder_ == null) {
+          if (abilityControlBlock_ != null) {
+            abilityControlBlock_ =
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.newBuilder(abilityControlBlock_).mergeFrom(value).buildPartial();
+          } else {
+            abilityControlBlock_ = value;
+          }
+          onChanged();
+        } else {
+          abilityControlBlockBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
+       */
+      public Builder clearAbilityControlBlock() {
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlock_ = null;
+          onChanged();
+        } else {
+          abilityControlBlock_ = null;
+          abilityControlBlockBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder getAbilityControlBlockBuilder() {
+        
+        onChanged();
+        return getAbilityControlBlockFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 15;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder getAbilityControlBlockOrBuilder() {
+        if (abilityControlBlockBuilder_ != null) {
+          return abilityControlBlockBuilder_.getMessageOrBuilder();
+        } else {
+          return abilityControlBlock_ == null ?
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.getDefaultInstance() : abilityControlBlock_;
+        }
+      }
+      /**
+       * <code>.AbilityControlBlock ability_control_block = 15;</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> 
+          getAbilityControlBlockFieldBuilder() {
+        if (abilityControlBlockBuilder_ == null) {
+          abilityControlBlockBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlock.Builder, emu.grasscutter.net.proto.AbilityControlBlockOuterClass.AbilityControlBlockOrBuilder>(
+                  getAbilityControlBlock(),
+                  getParentForChildren(),
+                  isClean());
+          abilityControlBlock_ = null;
+        }
+        return abilityControlBlockBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -930,28 +922,28 @@ public final class TeamEnterSceneInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\030TeamEnterSceneInfo.proto\032\031AbilityContr" +
-      "olBlock.proto\032\032AbilitySyncStateInfo.prot" +
+      "\n\030TeamEnterSceneInfo.proto\032\032AbilitySyncS" +
+      "tateInfo.proto\032\031AbilityControlBlock.prot" +
       "o\"\223\001\n\022TeamEnterSceneInfo\022\026\n\016team_entity_" +
-      "id\030\005 \001(\r\0223\n\025ability_control_block\030\007 \001(\0132" +
-      "\024.AbilityControlBlock\0220\n\021team_ability_in" +
-      "fo\030\010 \001(\0132\025.AbilitySyncStateInfoB\033\n\031emu.g" +
+      "id\030\001 \001(\r\0220\n\021team_ability_info\030\005 \001(\0132\025.Ab" +
+      "ilitySyncStateInfo\0223\n\025ability_control_bl" +
+      "ock\030\017 \001(\0132\024.AbilityControlBlockB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor(),
         });
     internal_static_TeamEnterSceneInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_TeamEnterSceneInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TeamEnterSceneInfo_descriptor,
-        new java.lang.String[] { "TeamEntityId", "AbilityControlBlock", "TeamAbilityInfo", });
-    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
+        new java.lang.String[] { "TeamEntityId", "TeamAbilityInfo", "AbilityControlBlock", });
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.AbilityControlBlockOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TeamEntityInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TeamEntityInfoOuterClass.java
index 47765a61a..eddfedfe2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TeamEntityInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TeamEntityInfoOuterClass.java
@@ -19,37 +19,33 @@ public final class TeamEntityInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 team_entity_id = 10;</code>
+     * <code>uint32 team_entity_id = 9;</code>
      * @return The teamEntityId.
      */
     int getTeamEntityId();
 
     /**
-     * <code>uint32 authority_peer_id = 9;</code>
-     * @return The authorityPeerId.
-     */
-    int getAuthorityPeerId();
-
-    /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
     boolean hasTeamAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      * @return The teamAbilityInfo.
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo();
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      */
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder();
+
+    /**
+     * <code>uint32 authority_peer_id = 15;</code>
+     * @return The authorityPeerId.
+     */
+    int getAuthorityPeerId();
   }
   /**
-   * <pre>
-   * Obf: KOMDBIHEDIA
-   * </pre>
-   *
    * Protobuf type {@code TeamEntityInfo}
    */
   public static final class TeamEntityInfo extends
@@ -96,15 +92,10 @@ public final class TeamEntityInfoOuterClass {
               break;
             case 72: {
 
-              authorityPeerId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
               teamEntityId_ = input.readUInt32();
               break;
             }
-            case 98: {
+            case 106: {
               emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder subBuilder = null;
               if (teamAbilityInfo_ != null) {
                 subBuilder = teamAbilityInfo_.toBuilder();
@@ -117,6 +108,11 @@ public final class TeamEntityInfoOuterClass {
 
               break;
             }
+            case 120: {
+
+              authorityPeerId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -149,10 +145,10 @@ public final class TeamEntityInfoOuterClass {
               emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.class, emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo.Builder.class);
     }
 
-    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int TEAM_ENTITY_ID_FIELD_NUMBER = 9;
     private int teamEntityId_;
     /**
-     * <code>uint32 team_entity_id = 10;</code>
+     * <code>uint32 team_entity_id = 9;</code>
      * @return The teamEntityId.
      */
     @java.lang.Override
@@ -160,21 +156,10 @@ public final class TeamEntityInfoOuterClass {
       return teamEntityId_;
     }
 
-    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 9;
-    private int authorityPeerId_;
-    /**
-     * <code>uint32 authority_peer_id = 9;</code>
-     * @return The authorityPeerId.
-     */
-    @java.lang.Override
-    public int getAuthorityPeerId() {
-      return authorityPeerId_;
-    }
-
-    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 12;
+    public static final int TEAM_ABILITY_INFO_FIELD_NUMBER = 13;
     private emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo teamAbilityInfo_;
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      * @return Whether the teamAbilityInfo field is set.
      */
     @java.lang.Override
@@ -182,7 +167,7 @@ public final class TeamEntityInfoOuterClass {
       return teamAbilityInfo_ != null;
     }
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      * @return The teamAbilityInfo.
      */
     @java.lang.Override
@@ -190,13 +175,24 @@ public final class TeamEntityInfoOuterClass {
       return teamAbilityInfo_ == null ? emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.getDefaultInstance() : teamAbilityInfo_;
     }
     /**
-     * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+     * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
       return getTeamAbilityInfo();
     }
 
+    public static final int AUTHORITY_PEER_ID_FIELD_NUMBER = 15;
+    private int authorityPeerId_;
+    /**
+     * <code>uint32 authority_peer_id = 15;</code>
+     * @return The authorityPeerId.
+     */
+    @java.lang.Override
+    public int getAuthorityPeerId() {
+      return authorityPeerId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -211,14 +207,14 @@ public final class TeamEntityInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (authorityPeerId_ != 0) {
-        output.writeUInt32(9, authorityPeerId_);
-      }
       if (teamEntityId_ != 0) {
-        output.writeUInt32(10, teamEntityId_);
+        output.writeUInt32(9, teamEntityId_);
       }
       if (teamAbilityInfo_ != null) {
-        output.writeMessage(12, getTeamAbilityInfo());
+        output.writeMessage(13, getTeamAbilityInfo());
+      }
+      if (authorityPeerId_ != 0) {
+        output.writeUInt32(15, authorityPeerId_);
       }
       unknownFields.writeTo(output);
     }
@@ -229,17 +225,17 @@ public final class TeamEntityInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (authorityPeerId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, authorityPeerId_);
-      }
       if (teamEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, teamEntityId_);
+          .computeUInt32Size(9, teamEntityId_);
       }
       if (teamAbilityInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, getTeamAbilityInfo());
+          .computeMessageSize(13, getTeamAbilityInfo());
+      }
+      if (authorityPeerId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(15, authorityPeerId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -258,13 +254,13 @@ public final class TeamEntityInfoOuterClass {
 
       if (getTeamEntityId()
           != other.getTeamEntityId()) return false;
-      if (getAuthorityPeerId()
-          != other.getAuthorityPeerId()) return false;
       if (hasTeamAbilityInfo() != other.hasTeamAbilityInfo()) return false;
       if (hasTeamAbilityInfo()) {
         if (!getTeamAbilityInfo()
             .equals(other.getTeamAbilityInfo())) return false;
       }
+      if (getAuthorityPeerId()
+          != other.getAuthorityPeerId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -278,12 +274,12 @@ public final class TeamEntityInfoOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TEAM_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getTeamEntityId();
-      hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getAuthorityPeerId();
       if (hasTeamAbilityInfo()) {
         hash = (37 * hash) + TEAM_ABILITY_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getTeamAbilityInfo().hashCode();
       }
+      hash = (37 * hash) + AUTHORITY_PEER_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getAuthorityPeerId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -380,10 +376,6 @@ public final class TeamEntityInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KOMDBIHEDIA
-     * </pre>
-     *
      * Protobuf type {@code TeamEntityInfo}
      */
     public static final class Builder extends
@@ -423,14 +415,14 @@ public final class TeamEntityInfoOuterClass {
         super.clear();
         teamEntityId_ = 0;
 
-        authorityPeerId_ = 0;
-
         if (teamAbilityInfoBuilder_ == null) {
           teamAbilityInfo_ = null;
         } else {
           teamAbilityInfo_ = null;
           teamAbilityInfoBuilder_ = null;
         }
+        authorityPeerId_ = 0;
+
         return this;
       }
 
@@ -458,12 +450,12 @@ public final class TeamEntityInfoOuterClass {
       public emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo buildPartial() {
         emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo result = new emu.grasscutter.net.proto.TeamEntityInfoOuterClass.TeamEntityInfo(this);
         result.teamEntityId_ = teamEntityId_;
-        result.authorityPeerId_ = authorityPeerId_;
         if (teamAbilityInfoBuilder_ == null) {
           result.teamAbilityInfo_ = teamAbilityInfo_;
         } else {
           result.teamAbilityInfo_ = teamAbilityInfoBuilder_.build();
         }
+        result.authorityPeerId_ = authorityPeerId_;
         onBuilt();
         return result;
       }
@@ -515,12 +507,12 @@ public final class TeamEntityInfoOuterClass {
         if (other.getTeamEntityId() != 0) {
           setTeamEntityId(other.getTeamEntityId());
         }
-        if (other.getAuthorityPeerId() != 0) {
-          setAuthorityPeerId(other.getAuthorityPeerId());
-        }
         if (other.hasTeamAbilityInfo()) {
           mergeTeamAbilityInfo(other.getTeamAbilityInfo());
         }
+        if (other.getAuthorityPeerId() != 0) {
+          setAuthorityPeerId(other.getAuthorityPeerId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -552,7 +544,7 @@ public final class TeamEntityInfoOuterClass {
 
       private int teamEntityId_ ;
       /**
-       * <code>uint32 team_entity_id = 10;</code>
+       * <code>uint32 team_entity_id = 9;</code>
        * @return The teamEntityId.
        */
       @java.lang.Override
@@ -560,7 +552,7 @@ public final class TeamEntityInfoOuterClass {
         return teamEntityId_;
       }
       /**
-       * <code>uint32 team_entity_id = 10;</code>
+       * <code>uint32 team_entity_id = 9;</code>
        * @param value The teamEntityId to set.
        * @return This builder for chaining.
        */
@@ -571,7 +563,7 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 team_entity_id = 10;</code>
+       * <code>uint32 team_entity_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTeamEntityId() {
@@ -581,49 +573,18 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
 
-      private int authorityPeerId_ ;
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return The authorityPeerId.
-       */
-      @java.lang.Override
-      public int getAuthorityPeerId() {
-        return authorityPeerId_;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @param value The authorityPeerId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setAuthorityPeerId(int value) {
-        
-        authorityPeerId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 authority_peer_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearAuthorityPeerId() {
-        
-        authorityPeerId_ = 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_;
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        * @return Whether the teamAbilityInfo field is set.
        */
       public boolean hasTeamAbilityInfo() {
         return teamAbilityInfoBuilder_ != null || teamAbilityInfo_ != null;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        * @return The teamAbilityInfo.
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo getTeamAbilityInfo() {
@@ -634,7 +595,7 @@ public final class TeamEntityInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public Builder setTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (teamAbilityInfoBuilder_ == null) {
@@ -650,7 +611,7 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public Builder setTeamAbilityInfo(
           emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder builderForValue) {
@@ -664,7 +625,7 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public Builder mergeTeamAbilityInfo(emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo value) {
         if (teamAbilityInfoBuilder_ == null) {
@@ -682,7 +643,7 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public Builder clearTeamAbilityInfo() {
         if (teamAbilityInfoBuilder_ == null) {
@@ -696,7 +657,7 @@ public final class TeamEntityInfoOuterClass {
         return this;
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfo.Builder getTeamAbilityInfoBuilder() {
         
@@ -704,7 +665,7 @@ public final class TeamEntityInfoOuterClass {
         return getTeamAbilityInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</code>
        */
       public emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.AbilitySyncStateInfoOrBuilder getTeamAbilityInfoOrBuilder() {
         if (teamAbilityInfoBuilder_ != null) {
@@ -715,7 +676,7 @@ public final class TeamEntityInfoOuterClass {
         }
       }
       /**
-       * <code>.AbilitySyncStateInfo team_ability_info = 12;</code>
+       * <code>.AbilitySyncStateInfo team_ability_info = 13;</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> 
@@ -730,6 +691,37 @@ public final class TeamEntityInfoOuterClass {
         }
         return teamAbilityInfoBuilder_;
       }
+
+      private int authorityPeerId_ ;
+      /**
+       * <code>uint32 authority_peer_id = 15;</code>
+       * @return The authorityPeerId.
+       */
+      @java.lang.Override
+      public int getAuthorityPeerId() {
+        return authorityPeerId_;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 15;</code>
+       * @param value The authorityPeerId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAuthorityPeerId(int value) {
+        
+        authorityPeerId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 authority_peer_id = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAuthorityPeerId() {
+        
+        authorityPeerId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -799,9 +791,9 @@ public final class TeamEntityInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\024TeamEntityInfo.proto\032\032AbilitySyncState" +
       "Info.proto\"u\n\016TeamEntityInfo\022\026\n\016team_ent" +
-      "ity_id\030\n \001(\r\022\031\n\021authority_peer_id\030\t \001(\r\022" +
-      "0\n\021team_ability_info\030\014 \001(\0132\025.AbilitySync" +
-      "StateInfoB\033\n\031emu.grasscutter.net.protob\006" +
+      "ity_id\030\t \001(\r\0220\n\021team_ability_info\030\r \001(\0132" +
+      "\025.AbilitySyncStateInfo\022\031\n\021authority_peer" +
+      "_id\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006" +
       "proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -814,7 +806,7 @@ public final class TeamEntityInfoOuterClass {
     internal_static_TeamEntityInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TeamEntityInfo_descriptor,
-        new java.lang.String[] { "TeamEntityId", "AuthorityPeerId", "TeamAbilityInfo", });
+        new java.lang.String[] { "TeamEntityId", "TeamAbilityInfo", "AuthorityPeerId", });
     emu.grasscutter.net.proto.AbilitySyncStateInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TeamResonanceChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TeamResonanceChangeNotifyOuterClass.java
index 9b393db6d..f5dfc25de 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TeamResonanceChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TeamResonanceChangeNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class TeamResonanceChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     java.util.List<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo> 
         getInfoListList();
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo getInfoList(int index);
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     int getInfoListCount();
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder> 
         getInfoListOrBuilderList();
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder getInfoListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 23566
-   * Obf: GPHMDAHPNLK
-   * </pre>
-   *
    * Protobuf type {@code TeamResonanceChangeNotify}
    */
   public static final class TeamResonanceChangeNotify extends
@@ -94,7 +89,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
+            case 114: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 infoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class TeamResonanceChangeNotifyOuterClass {
               emu.grasscutter.net.proto.TeamResonanceChangeNotifyOuterClass.TeamResonanceChangeNotify.class, emu.grasscutter.net.proto.TeamResonanceChangeNotifyOuterClass.TeamResonanceChangeNotify.Builder.class);
     }
 
-    public static final int INFO_LIST_FIELD_NUMBER = 1;
+    public static final int INFO_LIST_FIELD_NUMBER = 14;
     private java.util.List<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo> infoList_;
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo> getInfoListList() {
       return infoList_;
     }
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class TeamResonanceChangeNotifyOuterClass {
       return infoList_;
     }
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     @java.lang.Override
     public int getInfoListCount() {
       return infoList_.size();
     }
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo getInfoList(int index) {
       return infoList_.get(index);
     }
     /**
-     * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+     * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder getInfoListOrBuilder(
@@ -193,7 +188,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < infoList_.size(); i++) {
-        output.writeMessage(1, infoList_.get(i));
+        output.writeMessage(14, infoList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
       size = 0;
       for (int i = 0; i < infoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, infoList_.get(i));
+          .computeMessageSize(14, infoList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class TeamResonanceChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23566
-     * Obf: GPHMDAHPNLK
-     * </pre>
-     *
      * Protobuf type {@code TeamResonanceChangeNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
           emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder> infoListBuilder_;
 
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo> getInfoListList() {
         if (infoListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public int getInfoListCount() {
         if (infoListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo getInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo value) {
@@ -585,7 +575,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder setInfoList(
           int index, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder addInfoList(emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo value) {
         if (infoListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo value) {
@@ -632,7 +622,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder addInfoList(
           emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder addInfoList(
           int index, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder addAllInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo> values) {
@@ -675,7 +665,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder clearInfoList() {
         if (infoListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public Builder removeInfoList(int index) {
         if (infoListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class TeamResonanceChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder getInfoListBuilder(
           int index) {
         return getInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder getInfoListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfoOrBuilder> 
            getInfoListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class TeamResonanceChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder addInfoListBuilder() {
         return getInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder addInfoListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
             index, emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .AvatarTeamResonanceInfo info_list = 1;</code>
+       * <code>repeated .AvatarTeamResonanceInfo info_list = 14;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.AvatarTeamResonanceInfoOuterClass.AvatarTeamResonanceInfo.Builder> 
            getInfoListBuilderList() {
@@ -833,7 +823,7 @@ public final class TeamResonanceChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037TeamResonanceChangeNotify.proto\032\035Avata" +
       "rTeamResonanceInfo.proto\"H\n\031TeamResonanc" +
-      "eChangeNotify\022+\n\tinfo_list\030\001 \003(\0132\030.Avata" +
+      "eChangeNotify\022+\n\tinfo_list\030\016 \003(\0132\030.Avata" +
       "rTeamResonanceInfoB\033\n\031emu.grasscutter.ne" +
       "t.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpReqOuterClass.java
new file mode 100644
index 000000000..e809941cc
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpReqOuterClass.java
@@ -0,0 +1,466 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: TheaterLobbySceneJumpReq.proto
+
+package emu.grasscutter.net.proto;
+
+public final class TheaterLobbySceneJumpReqOuterClass {
+  private TheaterLobbySceneJumpReqOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface TheaterLobbySceneJumpReqOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:TheaterLobbySceneJumpReq)
+      com.google.protobuf.MessageOrBuilder {
+  }
+  /**
+   * Protobuf type {@code TheaterLobbySceneJumpReq}
+   */
+  public static final class TheaterLobbySceneJumpReq extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:TheaterLobbySceneJumpReq)
+      TheaterLobbySceneJumpReqOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TheaterLobbySceneJumpReq.newBuilder() to construct.
+    private TheaterLobbySceneJumpReq(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private TheaterLobbySceneJumpReq() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new TheaterLobbySceneJumpReq();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private TheaterLobbySceneJumpReq(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.internal_static_TheaterLobbySceneJumpReq_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.internal_static_TheaterLobbySceneJumpReq_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.class, emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.Builder.class);
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq other = (emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq) obj;
+
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code TheaterLobbySceneJumpReq}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:TheaterLobbySceneJumpReq)
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReqOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.internal_static_TheaterLobbySceneJumpReq_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.internal_static_TheaterLobbySceneJumpReq_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.class, emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.internal_static_TheaterLobbySceneJumpReq_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq build() {
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq buildPartial() {
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq result = new emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq(this);
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq) {
+          return mergeFrom((emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq other) {
+        if (other == emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq.getDefaultInstance()) return this;
+        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.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:TheaterLobbySceneJumpReq)
+    }
+
+    // @@protoc_insertion_point(class_scope:TheaterLobbySceneJumpReq)
+    private static final emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq();
+    }
+
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TheaterLobbySceneJumpReq>
+        PARSER = new com.google.protobuf.AbstractParser<TheaterLobbySceneJumpReq>() {
+      @java.lang.Override
+      public TheaterLobbySceneJumpReq parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TheaterLobbySceneJumpReq(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TheaterLobbySceneJumpReq> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TheaterLobbySceneJumpReq> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.TheaterLobbySceneJumpReqOuterClass.TheaterLobbySceneJumpReq getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_TheaterLobbySceneJumpReq_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_TheaterLobbySceneJumpReq_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\036TheaterLobbySceneJumpReq.proto\"\032\n\030Thea" +
+      "terLobbySceneJumpReqB\033\n\031emu.grasscutter." +
+      "net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_TheaterLobbySceneJumpReq_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_TheaterLobbySceneJumpReq_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_TheaterLobbySceneJumpReq_descriptor,
+        new java.lang.String[] { });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpRspOuterClass.java
new file mode 100644
index 000000000..3d884663f
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TheaterLobbySceneJumpRspOuterClass.java
@@ -0,0 +1,536 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: TheaterLobbySceneJumpRsp.proto
+
+package emu.grasscutter.net.proto;
+
+public final class TheaterLobbySceneJumpRspOuterClass {
+  private TheaterLobbySceneJumpRspOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface TheaterLobbySceneJumpRspOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:TheaterLobbySceneJumpRsp)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+  }
+  /**
+   * Protobuf type {@code TheaterLobbySceneJumpRsp}
+   */
+  public static final class TheaterLobbySceneJumpRsp extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:TheaterLobbySceneJumpRsp)
+      TheaterLobbySceneJumpRspOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use TheaterLobbySceneJumpRsp.newBuilder() to construct.
+    private TheaterLobbySceneJumpRsp(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private TheaterLobbySceneJumpRsp() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new TheaterLobbySceneJumpRsp();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private TheaterLobbySceneJumpRsp(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 120: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.internal_static_TheaterLobbySceneJumpRsp_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.internal_static_TheaterLobbySceneJumpRsp_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.class, emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.Builder.class);
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 15;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 15;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (retcode_ != 0) {
+        output.writeInt32(15, retcode_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(15, retcode_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp other = (emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp) obj;
+
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code TheaterLobbySceneJumpRsp}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:TheaterLobbySceneJumpRsp)
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRspOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.internal_static_TheaterLobbySceneJumpRsp_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.internal_static_TheaterLobbySceneJumpRsp_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.class, emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        retcode_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.internal_static_TheaterLobbySceneJumpRsp_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp build() {
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp buildPartial() {
+        emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp result = new emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp(this);
+        result.retcode_ = retcode_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp) {
+          return mergeFrom((emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp other) {
+        if (other == emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp.getDefaultInstance()) return this;
+        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.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 15;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 15;</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 = 15;</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) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:TheaterLobbySceneJumpRsp)
+    }
+
+    // @@protoc_insertion_point(class_scope:TheaterLobbySceneJumpRsp)
+    private static final emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp();
+    }
+
+    public static emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<TheaterLobbySceneJumpRsp>
+        PARSER = new com.google.protobuf.AbstractParser<TheaterLobbySceneJumpRsp>() {
+      @java.lang.Override
+      public TheaterLobbySceneJumpRsp parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new TheaterLobbySceneJumpRsp(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<TheaterLobbySceneJumpRsp> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<TheaterLobbySceneJumpRsp> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.TheaterLobbySceneJumpRspOuterClass.TheaterLobbySceneJumpRsp getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_TheaterLobbySceneJumpRsp_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_TheaterLobbySceneJumpRsp_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\036TheaterLobbySceneJumpRsp.proto\"+\n\030Thea" +
+      "terLobbySceneJumpRsp\022\017\n\007retcode\030\017 \001(\005B\033\n" +
+      "\031emu.grasscutter.net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_TheaterLobbySceneJumpRsp_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_TheaterLobbySceneJumpRsp_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_TheaterLobbySceneJumpRsp_descriptor,
+        new java.lang.String[] { "Retcode", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
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 0b1eb3dc1..f15c55ad8 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneReqOuterClass.java
@@ -19,7 +19,19 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <code>uint32 DKEOBFMAFPK = 5;</code>
+     * @return The dKEOBFMAFPK.
+     */
+    int getDKEOBFMAFPK();
+
+    /**
+     * <code>uint32 CDDPHGDDCCN = 2;</code>
+     * @return The cDDPHGDDCCN.
+     */
+    int getCDDPHGDDCCN();
+
+    /**
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     int getSceneId();
@@ -29,19 +41,8 @@ public final class ToTheMoonEnterSceneReqOuterClass {
      * @return The version.
      */
     int getVersion();
-
-    /**
-     * <code>uint32 KJJLLFIJKNA = 10;</code>
-     * @return The kJJLLFIJKNA.
-     */
-    int getKJJLLFIJKNA();
   }
   /**
-   * <pre>
-   * CmdId: 6144
-   * Obf: DGDIOJLNEPG
-   * </pre>
-   *
    * Protobuf type {@code ToTheMoonEnterSceneReq}
    */
   public static final class ToTheMoonEnterSceneReq extends
@@ -86,19 +87,24 @@ public final class ToTheMoonEnterSceneReqOuterClass {
             case 0:
               done = true;
               break;
+            case 16: {
+
+              cDDPHGDDCCN_ = input.readUInt32();
+              break;
+            }
+            case 24: {
+
+              sceneId_ = input.readUInt32();
+              break;
+            }
             case 32: {
 
               version_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 40: {
 
-              sceneId_ = input.readUInt32();
-              break;
-            }
-            case 80: {
-
-              kJJLLFIJKNA_ = input.readUInt32();
+              dKEOBFMAFPK_ = input.readUInt32();
               break;
             }
             default: {
@@ -133,10 +139,32 @@ public final class ToTheMoonEnterSceneReqOuterClass {
               emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq.class, emu.grasscutter.net.proto.ToTheMoonEnterSceneReqOuterClass.ToTheMoonEnterSceneReq.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 7;
+    public static final int DKEOBFMAFPK_FIELD_NUMBER = 5;
+    private int dKEOBFMAFPK_;
+    /**
+     * <code>uint32 DKEOBFMAFPK = 5;</code>
+     * @return The dKEOBFMAFPK.
+     */
+    @java.lang.Override
+    public int getDKEOBFMAFPK() {
+      return dKEOBFMAFPK_;
+    }
+
+    public static final int CDDPHGDDCCN_FIELD_NUMBER = 2;
+    private int cDDPHGDDCCN_;
+    /**
+     * <code>uint32 CDDPHGDDCCN = 2;</code>
+     * @return The cDDPHGDDCCN.
+     */
+    @java.lang.Override
+    public int getCDDPHGDDCCN() {
+      return cDDPHGDDCCN_;
+    }
+
+    public static final int SCENE_ID_FIELD_NUMBER = 3;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 7;</code>
+     * <code>uint32 scene_id = 3;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -155,17 +183,6 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       return version_;
     }
 
-    public static final int KJJLLFIJKNA_FIELD_NUMBER = 10;
-    private int kJJLLFIJKNA_;
-    /**
-     * <code>uint32 KJJLLFIJKNA = 10;</code>
-     * @return The kJJLLFIJKNA.
-     */
-    @java.lang.Override
-    public int getKJJLLFIJKNA() {
-      return kJJLLFIJKNA_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -180,14 +197,17 @@ public final class ToTheMoonEnterSceneReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (cDDPHGDDCCN_ != 0) {
+        output.writeUInt32(2, cDDPHGDDCCN_);
+      }
+      if (sceneId_ != 0) {
+        output.writeUInt32(3, sceneId_);
+      }
       if (version_ != 0) {
         output.writeUInt32(4, version_);
       }
-      if (sceneId_ != 0) {
-        output.writeUInt32(7, sceneId_);
-      }
-      if (kJJLLFIJKNA_ != 0) {
-        output.writeUInt32(10, kJJLLFIJKNA_);
+      if (dKEOBFMAFPK_ != 0) {
+        output.writeUInt32(5, dKEOBFMAFPK_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +218,21 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (cDDPHGDDCCN_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, cDDPHGDDCCN_);
+      }
+      if (sceneId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(3, sceneId_);
+      }
       if (version_ != 0) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(4, version_);
       }
-      if (sceneId_ != 0) {
+      if (dKEOBFMAFPK_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, sceneId_);
-      }
-      if (kJJLLFIJKNA_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, kJJLLFIJKNA_);
+          .computeUInt32Size(5, dKEOBFMAFPK_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -225,12 +249,14 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       }
       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 (getVersion()
           != other.getVersion()) return false;
-      if (getKJJLLFIJKNA()
-          != other.getKJJLLFIJKNA()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -242,12 +268,14 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       }
       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) + VERSION_FIELD_NUMBER;
       hash = (53 * hash) + getVersion();
-      hash = (37 * hash) + KJJLLFIJKNA_FIELD_NUMBER;
-      hash = (53 * hash) + getKJJLLFIJKNA();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -344,11 +372,6 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6144
-     * Obf: DGDIOJLNEPG
-     * </pre>
-     *
      * Protobuf type {@code ToTheMoonEnterSceneReq}
      */
     public static final class Builder extends
@@ -386,12 +409,14 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        dKEOBFMAFPK_ = 0;
+
+        cDDPHGDDCCN_ = 0;
+
         sceneId_ = 0;
 
         version_ = 0;
 
-        kJJLLFIJKNA_ = 0;
-
         return this;
       }
 
@@ -418,9 +443,10 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       @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.version_ = version_;
-        result.kJJLLFIJKNA_ = kJJLLFIJKNA_;
         onBuilt();
         return result;
       }
@@ -469,15 +495,18 @@ public final class ToTheMoonEnterSceneReqOuterClass {
 
       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.getVersion() != 0) {
           setVersion(other.getVersion());
         }
-        if (other.getKJJLLFIJKNA() != 0) {
-          setKJJLLFIJKNA(other.getKJJLLFIJKNA());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -507,9 +536,71 @@ public final class ToTheMoonEnterSceneReqOuterClass {
         return this;
       }
 
+      private int dKEOBFMAFPK_ ;
+      /**
+       * <code>uint32 DKEOBFMAFPK = 5;</code>
+       * @return The dKEOBFMAFPK.
+       */
+      @java.lang.Override
+      public int getDKEOBFMAFPK() {
+        return dKEOBFMAFPK_;
+      }
+      /**
+       * <code>uint32 DKEOBFMAFPK = 5;</code>
+       * @param value The dKEOBFMAFPK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDKEOBFMAFPK(int value) {
+        
+        dKEOBFMAFPK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DKEOBFMAFPK = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDKEOBFMAFPK() {
+        
+        dKEOBFMAFPK_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int cDDPHGDDCCN_ ;
+      /**
+       * <code>uint32 CDDPHGDDCCN = 2;</code>
+       * @return The cDDPHGDDCCN.
+       */
+      @java.lang.Override
+      public int getCDDPHGDDCCN() {
+        return cDDPHGDDCCN_;
+      }
+      /**
+       * <code>uint32 CDDPHGDDCCN = 2;</code>
+       * @param value The cDDPHGDDCCN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCDDPHGDDCCN(int value) {
+        
+        cDDPHGDDCCN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 CDDPHGDDCCN = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCDDPHGDDCCN() {
+        
+        cDDPHGDDCCN_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -517,7 +608,7 @@ public final class ToTheMoonEnterSceneReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -528,7 +619,7 @@ public final class ToTheMoonEnterSceneReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 7;</code>
+       * <code>uint32 scene_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -568,37 +659,6 @@ public final class ToTheMoonEnterSceneReqOuterClass {
         onChanged();
         return this;
       }
-
-      private int kJJLLFIJKNA_ ;
-      /**
-       * <code>uint32 KJJLLFIJKNA = 10;</code>
-       * @return The kJJLLFIJKNA.
-       */
-      @java.lang.Override
-      public int getKJJLLFIJKNA() {
-        return kJJLLFIJKNA_;
-      }
-      /**
-       * <code>uint32 KJJLLFIJKNA = 10;</code>
-       * @param value The kJJLLFIJKNA to set.
-       * @return This builder for chaining.
-       */
-      public Builder setKJJLLFIJKNA(int value) {
-        
-        kJJLLFIJKNA_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 KJJLLFIJKNA = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearKJJLLFIJKNA() {
-        
-        kJJLLFIJKNA_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -666,10 +726,11 @@ public final class ToTheMoonEnterSceneReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\034ToTheMoonEnterSceneReq.proto\"P\n\026ToTheM" +
-      "oonEnterSceneReq\022\020\n\010scene_id\030\007 \001(\r\022\017\n\007ve" +
-      "rsion\030\004 \001(\r\022\023\n\013KJJLLFIJKNA\030\n \001(\rB\033\n\031emu." +
-      "grasscutter.net.protob\006proto3"
+      "\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" +
+      "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -680,7 +741,7 @@ public final class ToTheMoonEnterSceneReqOuterClass {
     internal_static_ToTheMoonEnterSceneReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ToTheMoonEnterSceneReq_descriptor,
-        new java.lang.String[] { "SceneId", "Version", "KJJLLFIJKNA", });
+        new java.lang.String[] { "DKEOBFMAFPK", "CDDPHGDDCCN", "SceneId", "Version", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneRspOuterClass.java
index ccb05c2fd..763a6b76a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonEnterSceneRspOuterClass.java
@@ -19,17 +19,12 @@ public final class ToTheMoonEnterSceneRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 6130
-   * Obf: ECOFGBHBFEO
-   * </pre>
-   *
    * Protobuf type {@code ToTheMoonEnterSceneRsp}
    */
   public static final class ToTheMoonEnterSceneRsp extends
@@ -74,7 +69,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 104: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class ToTheMoonEnterSceneRspOuterClass {
               emu.grasscutter.net.proto.ToTheMoonEnterSceneRspOuterClass.ToTheMoonEnterSceneRsp.class, emu.grasscutter.net.proto.ToTheMoonEnterSceneRspOuterClass.ToTheMoonEnterSceneRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int RETCODE_FIELD_NUMBER = 13;
     private int retcode_;
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 13;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(13, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeInt32Size(13, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class ToTheMoonEnterSceneRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6130
-     * Obf: ECOFGBHBFEO
-     * </pre>
-     *
      * Protobuf type {@code ToTheMoonEnterSceneRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 13;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 13;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class ToTheMoonEnterSceneRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\034ToTheMoonEnterSceneRsp.proto\")\n\026ToTheM" +
-      "oonEnterSceneRsp\022\017\n\007retcode\030\014 \001(\005B\033\n\031emu" +
+      "oonEnterSceneRsp\022\017\n\007retcode\030\r \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/ToTheMoonQueryPathRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonQueryPathRspOuterClass.java
index 7f3534beb..2a5e13830 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonQueryPathRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/ToTheMoonQueryPathRspOuterClass.java
@@ -19,62 +19,68 @@ public final class ToTheMoonQueryPathRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .Vector corners = 14;</code>
+     * <code>repeated int32 level = 1;</code>
+     * @return A list containing the level.
+     */
+    java.util.List<java.lang.Integer> getLevelList();
+    /**
+     * <code>repeated int32 level = 1;</code>
+     * @return The count of level.
+     */
+    int getLevelCount();
+    /**
+     * <code>repeated int32 level = 1;</code>
+     * @param index The index of the element to return.
+     * @return The level at the given index.
+     */
+    int getLevel(int index);
+
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>repeated .Vector corners = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> 
         getCornersList();
     /**
-     * <code>repeated .Vector corners = 14;</code>
+     * <code>repeated .Vector corners = 9;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index);
     /**
-     * <code>repeated .Vector corners = 14;</code>
+     * <code>repeated .Vector corners = 9;</code>
      */
     int getCornersCount();
     /**
-     * <code>repeated .Vector corners = 14;</code>
+     * <code>repeated .Vector corners = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
         getCornersOrBuilderList();
     /**
-     * <code>repeated .Vector corners = 14;</code>
+     * <code>repeated .Vector corners = 9;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
         int index);
 
     /**
-     * <code>int32 query_id = 2;</code>
-     * @return The queryId.
-     */
-    int getQueryId();
-
-    /**
-     * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+     * <code>.PathStatusType query_status = 10;</code>
      * @return The enum numeric value on the wire for queryStatus.
      */
     int getQueryStatusValue();
     /**
-     * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+     * <code>.PathStatusType query_status = 10;</code>
      * @return The queryStatus.
      */
-    emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType getQueryStatus();
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus();
 
     /**
-     * <code>repeated int32 level = 13;</code>
-     * @return A list containing the level.
+     * <code>int32 query_id = 13;</code>
+     * @return The queryId.
      */
-    java.util.List<java.lang.Integer> getLevelList();
-    /**
-     * <code>repeated int32 level = 13;</code>
-     * @return The count of level.
-     */
-    int getLevelCount();
-    /**
-     * <code>repeated int32 level = 13;</code>
-     * @param index The index of the element to return.
-     * @return The level at the given index.
-     */
-    int getLevel(int index);
+    int getQueryId();
 
     /**
      * <code>repeated int64 index = 15;</code>
@@ -92,19 +98,8 @@ public final class ToTheMoonQueryPathRspOuterClass {
      * @return The index at the given index.
      */
     long getIndex(int index);
-
-    /**
-     * <code>int32 retcode = 7;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 6191
-   * Obf: FMMCBFGLFPH
-   * </pre>
-   *
    * Protobuf type {@code ToTheMoonQueryPathRsp}
    */
   public static final class ToTheMoonQueryPathRsp extends
@@ -117,9 +112,9 @@ public final class ToTheMoonQueryPathRspOuterClass {
       super(builder);
     }
     private ToTheMoonQueryPathRsp() {
+      level_ = emptyIntList();
       corners_ = java.util.Collections.emptyList();
       queryStatus_ = 0;
-      level_ = emptyIntList();
       index_ = emptyLongList();
     }
 
@@ -154,36 +149,20 @@ public final class ToTheMoonQueryPathRspOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              queryId_ = input.readInt32();
-              break;
-            }
-            case 56: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 88: {
-              int rawValue = input.readEnum();
-
-              queryStatus_ = rawValue;
-              break;
-            }
-            case 104: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 8: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 level_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               level_.addInt(input.readInt32());
               break;
             }
-            case 106: {
+            case 10: {
               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) {
                 level_ = newIntList();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               while (input.getBytesUntilLimit() > 0) {
                 level_.addInt(input.readInt32());
@@ -191,15 +170,31 @@ public final class ToTheMoonQueryPathRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 114: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 56: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 74: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 corners_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               corners_.add(
                   input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry));
               break;
             }
+            case 80: {
+              int rawValue = input.readEnum();
+
+              queryStatus_ = rawValue;
+              break;
+            }
+            case 104: {
+
+              queryId_ = input.readInt32();
+              break;
+            }
             case 120: {
               if (!((mutable_bitField0_ & 0x00000004) != 0)) {
                 index_ = newLongList();
@@ -236,10 +231,10 @@ public final class ToTheMoonQueryPathRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           level_.makeImmutable(); // C
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           corners_ = java.util.Collections.unmodifiableList(corners_);
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
@@ -262,201 +257,10 @@ public final class ToTheMoonQueryPathRspOuterClass {
               emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.class, emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.Builder.class);
     }
 
-    /**
-     * <pre>
-     * Obf: OHGIBJOJCED
-     * </pre>
-     *
-     * Protobuf enum {@code ToTheMoonQueryPathRsp.PathStatusType}
-     */
-    public enum PathStatusType
-        implements com.google.protobuf.ProtocolMessageEnum {
-      /**
-       * <code>STATUS_FAIL = 0;</code>
-       */
-      STATUS_FAIL(0),
-      /**
-       * <code>STATUS_SUCC = 1;</code>
-       */
-      STATUS_SUCC(1),
-      /**
-       * <code>STATUS_PARTIAL = 2;</code>
-       */
-      STATUS_PARTIAL(2),
-      UNRECOGNIZED(-1),
-      ;
-
-      /**
-       * <code>STATUS_FAIL = 0;</code>
-       */
-      public static final int STATUS_FAIL_VALUE = 0;
-      /**
-       * <code>STATUS_SUCC = 1;</code>
-       */
-      public static final int STATUS_SUCC_VALUE = 1;
-      /**
-       * <code>STATUS_PARTIAL = 2;</code>
-       */
-      public static final int STATUS_PARTIAL_VALUE = 2;
-
-
-      public final int getNumber() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalArgumentException(
-              "Can't get the number of an unknown enum value.");
-        }
-        return value;
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       * @deprecated Use {@link #forNumber(int)} instead.
-       */
-      @java.lang.Deprecated
-      public static PathStatusType valueOf(int value) {
-        return forNumber(value);
-      }
-
-      /**
-       * @param value The numeric wire value of the corresponding enum entry.
-       * @return The enum associated with the given numeric wire value.
-       */
-      public static PathStatusType forNumber(int value) {
-        switch (value) {
-          case 0: return STATUS_FAIL;
-          case 1: return STATUS_SUCC;
-          case 2: return STATUS_PARTIAL;
-          default: return null;
-        }
-      }
-
-      public static com.google.protobuf.Internal.EnumLiteMap<PathStatusType>
-          internalGetValueMap() {
-        return internalValueMap;
-      }
-      private static final com.google.protobuf.Internal.EnumLiteMap<
-          PathStatusType> internalValueMap =
-            new com.google.protobuf.Internal.EnumLiteMap<PathStatusType>() {
-              public PathStatusType findValueByNumber(int number) {
-                return PathStatusType.forNumber(number);
-              }
-            };
-
-      public final com.google.protobuf.Descriptors.EnumValueDescriptor
-          getValueDescriptor() {
-        if (this == UNRECOGNIZED) {
-          throw new java.lang.IllegalStateException(
-              "Can't get the descriptor of an unrecognized enum value.");
-        }
-        return getDescriptor().getValues().get(ordinal());
-      }
-      public final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptorForType() {
-        return getDescriptor();
-      }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
-          getDescriptor() {
-        return emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.getDescriptor().getEnumTypes().get(0);
-      }
-
-      private static final PathStatusType[] VALUES = values();
-
-      public static PathStatusType valueOf(
-          com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
-        if (desc.getType() != getDescriptor()) {
-          throw new java.lang.IllegalArgumentException(
-            "EnumValueDescriptor is not for this type.");
-        }
-        if (desc.getIndex() == -1) {
-          return UNRECOGNIZED;
-        }
-        return VALUES[desc.getIndex()];
-      }
-
-      private final int value;
-
-      private PathStatusType(int value) {
-        this.value = value;
-      }
-
-      // @@protoc_insertion_point(enum_scope:ToTheMoonQueryPathRsp.PathStatusType)
-    }
-
-    public static final int CORNERS_FIELD_NUMBER = 14;
-    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_;
-    /**
-     * <code>repeated .Vector corners = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
-      return corners_;
-    }
-    /**
-     * <code>repeated .Vector corners = 14;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-        getCornersOrBuilderList() {
-      return corners_;
-    }
-    /**
-     * <code>repeated .Vector corners = 14;</code>
-     */
-    @java.lang.Override
-    public int getCornersCount() {
-      return corners_.size();
-    }
-    /**
-     * <code>repeated .Vector corners = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
-      return corners_.get(index);
-    }
-    /**
-     * <code>repeated .Vector corners = 14;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
-        int index) {
-      return corners_.get(index);
-    }
-
-    public static final int QUERY_ID_FIELD_NUMBER = 2;
-    private int queryId_;
-    /**
-     * <code>int32 query_id = 2;</code>
-     * @return The queryId.
-     */
-    @java.lang.Override
-    public int getQueryId() {
-      return queryId_;
-    }
-
-    public static final int QUERY_STATUS_FIELD_NUMBER = 11;
-    private int queryStatus_;
-    /**
-     * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
-     * @return The enum numeric value on the wire for queryStatus.
-     */
-    @java.lang.Override public int getQueryStatusValue() {
-      return queryStatus_;
-    }
-    /**
-     * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
-     * @return The queryStatus.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType getQueryStatus() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType result = emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.valueOf(queryStatus_);
-      return result == null ? emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.UNRECOGNIZED : result;
-    }
-
-    public static final int LEVEL_FIELD_NUMBER = 13;
+    public static final int LEVEL_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList level_;
     /**
-     * <code>repeated int32 level = 13;</code>
+     * <code>repeated int32 level = 1;</code>
      * @return A list containing the level.
      */
     @java.lang.Override
@@ -465,14 +269,14 @@ public final class ToTheMoonQueryPathRspOuterClass {
       return level_;
     }
     /**
-     * <code>repeated int32 level = 13;</code>
+     * <code>repeated int32 level = 1;</code>
      * @return The count of level.
      */
     public int getLevelCount() {
       return level_.size();
     }
     /**
-     * <code>repeated int32 level = 13;</code>
+     * <code>repeated int32 level = 1;</code>
      * @param index The index of the element to return.
      * @return The level at the given index.
      */
@@ -481,6 +285,87 @@ public final class ToTheMoonQueryPathRspOuterClass {
     }
     private int levelMemoizedSerializedSize = -1;
 
+    public static final int RETCODE_FIELD_NUMBER = 7;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 7;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int CORNERS_FIELD_NUMBER = 9;
+    private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_;
+    /**
+     * <code>repeated .Vector corners = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
+      return corners_;
+    }
+    /**
+     * <code>repeated .Vector corners = 9;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
+        getCornersOrBuilderList() {
+      return corners_;
+    }
+    /**
+     * <code>repeated .Vector corners = 9;</code>
+     */
+    @java.lang.Override
+    public int getCornersCount() {
+      return corners_.size();
+    }
+    /**
+     * <code>repeated .Vector corners = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
+      return corners_.get(index);
+    }
+    /**
+     * <code>repeated .Vector corners = 9;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
+        int index) {
+      return corners_.get(index);
+    }
+
+    public static final int QUERY_STATUS_FIELD_NUMBER = 10;
+    private int queryStatus_;
+    /**
+     * <code>.PathStatusType query_status = 10;</code>
+     * @return The enum numeric value on the wire for queryStatus.
+     */
+    @java.lang.Override public int getQueryStatusValue() {
+      return queryStatus_;
+    }
+    /**
+     * <code>.PathStatusType query_status = 10;</code>
+     * @return The queryStatus.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+      return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
+    }
+
+    public static final int QUERY_ID_FIELD_NUMBER = 13;
+    private int queryId_;
+    /**
+     * <code>int32 query_id = 13;</code>
+     * @return The queryId.
+     */
+    @java.lang.Override
+    public int getQueryId() {
+      return queryId_;
+    }
+
     public static final int INDEX_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.LongList index_;
     /**
@@ -509,17 +394,6 @@ public final class ToTheMoonQueryPathRspOuterClass {
     }
     private int indexMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
-    private int retcode_;
-    /**
-     * <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() {
@@ -535,24 +409,24 @@ public final class ToTheMoonQueryPathRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (queryId_ != 0) {
-        output.writeInt32(2, queryId_);
-      }
-      if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
-      }
-      if (queryStatus_ != emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.STATUS_FAIL.getNumber()) {
-        output.writeEnum(11, queryStatus_);
-      }
       if (getLevelList().size() > 0) {
-        output.writeUInt32NoTag(106);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(levelMemoizedSerializedSize);
       }
       for (int i = 0; i < level_.size(); i++) {
         output.writeInt32NoTag(level_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(7, retcode_);
+      }
       for (int i = 0; i < corners_.size(); i++) {
-        output.writeMessage(14, corners_.get(i));
+        output.writeMessage(9, corners_.get(i));
+      }
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
+        output.writeEnum(10, queryStatus_);
+      }
+      if (queryId_ != 0) {
+        output.writeInt32(13, queryId_);
       }
       if (getIndexList().size() > 0) {
         output.writeUInt32NoTag(122);
@@ -570,18 +444,6 @@ public final class ToTheMoonQueryPathRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (queryId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, queryId_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
-      }
-      if (queryStatus_ != emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.STATUS_FAIL.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, queryStatus_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < level_.size(); i++) {
@@ -596,9 +458,21 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
         levelMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(7, retcode_);
+      }
       for (int i = 0; i < corners_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, corners_.get(i));
+          .computeMessageSize(9, corners_.get(i));
+      }
+      if (queryStatus_ != emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.PATH_STATUS_TYPE_FAIL.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(10, queryStatus_);
+      }
+      if (queryId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(13, queryId_);
       }
       {
         int dataSize = 0;
@@ -629,17 +503,17 @@ public final class ToTheMoonQueryPathRspOuterClass {
       }
       emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp other = (emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp) obj;
 
-      if (!getCornersList()
-          .equals(other.getCornersList())) return false;
-      if (getQueryId()
-          != other.getQueryId()) return false;
-      if (queryStatus_ != other.queryStatus_) return false;
       if (!getLevelList()
           .equals(other.getLevelList())) return false;
-      if (!getIndexList()
-          .equals(other.getIndexList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getCornersList()
+          .equals(other.getCornersList())) return false;
+      if (queryStatus_ != other.queryStatus_) return false;
+      if (getQueryId()
+          != other.getQueryId()) return false;
+      if (!getIndexList()
+          .equals(other.getIndexList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -651,24 +525,24 @@ public final class ToTheMoonQueryPathRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getCornersCount() > 0) {
-        hash = (37 * hash) + CORNERS_FIELD_NUMBER;
-        hash = (53 * hash) + getCornersList().hashCode();
-      }
-      hash = (37 * hash) + QUERY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getQueryId();
-      hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER;
-      hash = (53 * hash) + queryStatus_;
       if (getLevelCount() > 0) {
         hash = (37 * hash) + LEVEL_FIELD_NUMBER;
         hash = (53 * hash) + getLevelList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      if (getCornersCount() > 0) {
+        hash = (37 * hash) + CORNERS_FIELD_NUMBER;
+        hash = (53 * hash) + getCornersList().hashCode();
+      }
+      hash = (37 * hash) + QUERY_STATUS_FIELD_NUMBER;
+      hash = (53 * hash) + queryStatus_;
+      hash = (37 * hash) + QUERY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getQueryId();
       if (getIndexCount() > 0) {
         hash = (37 * hash) + INDEX_FIELD_NUMBER;
         hash = (53 * hash) + getIndexList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -765,11 +639,6 @@ public final class ToTheMoonQueryPathRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6191
-     * Obf: FMMCBFGLFPH
-     * </pre>
-     *
      * Protobuf type {@code ToTheMoonQueryPathRsp}
      */
     public static final class Builder extends
@@ -808,22 +677,22 @@ public final class ToTheMoonQueryPathRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        level_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         if (cornersBuilder_ == null) {
           corners_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
         } else {
           cornersBuilder_.clear();
         }
-        queryId_ = 0;
-
         queryStatus_ = 0;
 
-        level_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+        queryId_ = 0;
+
         index_ = emptyLongList();
         bitField0_ = (bitField0_ & ~0x00000004);
-        retcode_ = 0;
-
         return this;
       }
 
@@ -851,28 +720,28 @@ public final class ToTheMoonQueryPathRspOuterClass {
       public emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp buildPartial() {
         emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp result = new emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp(this);
         int from_bitField0_ = bitField0_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          level_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.level_ = level_;
+        result.retcode_ = retcode_;
         if (cornersBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
+          if (((bitField0_ & 0x00000002) != 0)) {
             corners_ = java.util.Collections.unmodifiableList(corners_);
-            bitField0_ = (bitField0_ & ~0x00000001);
+            bitField0_ = (bitField0_ & ~0x00000002);
           }
           result.corners_ = corners_;
         } else {
           result.corners_ = cornersBuilder_.build();
         }
-        result.queryId_ = queryId_;
         result.queryStatus_ = queryStatus_;
-        if (((bitField0_ & 0x00000002) != 0)) {
-          level_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000002);
-        }
-        result.level_ = level_;
+        result.queryId_ = queryId_;
         if (((bitField0_ & 0x00000004) != 0)) {
           index_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000004);
         }
         result.index_ = index_;
-        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -921,11 +790,24 @@ public final class ToTheMoonQueryPathRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp other) {
         if (other == emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.getDefaultInstance()) return this;
+        if (!other.level_.isEmpty()) {
+          if (level_.isEmpty()) {
+            level_ = other.level_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureLevelIsMutable();
+            level_.addAll(other.level_);
+          }
+          onChanged();
+        }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (cornersBuilder_ == null) {
           if (!other.corners_.isEmpty()) {
             if (corners_.isEmpty()) {
               corners_ = other.corners_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
             } else {
               ensureCornersIsMutable();
               corners_.addAll(other.corners_);
@@ -938,7 +820,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
               cornersBuilder_.dispose();
               cornersBuilder_ = null;
               corners_ = other.corners_;
-              bitField0_ = (bitField0_ & ~0x00000001);
+              bitField0_ = (bitField0_ & ~0x00000002);
               cornersBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getCornersFieldBuilder() : null;
@@ -947,21 +829,11 @@ public final class ToTheMoonQueryPathRspOuterClass {
             }
           }
         }
-        if (other.getQueryId() != 0) {
-          setQueryId(other.getQueryId());
-        }
         if (other.queryStatus_ != 0) {
           setQueryStatusValue(other.getQueryStatusValue());
         }
-        if (!other.level_.isEmpty()) {
-          if (level_.isEmpty()) {
-            level_ = other.level_;
-            bitField0_ = (bitField0_ & ~0x00000002);
-          } else {
-            ensureLevelIsMutable();
-            level_.addAll(other.level_);
-          }
-          onChanged();
+        if (other.getQueryId() != 0) {
+          setQueryId(other.getQueryId());
         }
         if (!other.index_.isEmpty()) {
           if (index_.isEmpty()) {
@@ -973,9 +845,6 @@ public final class ToTheMoonQueryPathRspOuterClass {
           }
           onChanged();
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -1006,12 +875,122 @@ public final class ToTheMoonQueryPathRspOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.IntList level_ = emptyIntList();
+      private void ensureLevelIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          level_ = mutableCopy(level_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @return A list containing the level.
+       */
+      public java.util.List<java.lang.Integer>
+          getLevelList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(level_) : level_;
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @return The count of level.
+       */
+      public int getLevelCount() {
+        return level_.size();
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @param index The index of the element to return.
+       * @return The level at the given index.
+       */
+      public int getLevel(int index) {
+        return level_.getInt(index);
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @param index The index to set the value at.
+       * @param value The level to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLevel(
+          int index, int value) {
+        ensureLevelIsMutable();
+        level_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @param value The level to add.
+       * @return This builder for chaining.
+       */
+      public Builder addLevel(int value) {
+        ensureLevelIsMutable();
+        level_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @param values The level to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllLevel(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureLevelIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, level_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated int32 level = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLevel() {
+        level_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <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;
+      }
+      /**
+       * <code>int32 retcode = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> corners_ =
         java.util.Collections.emptyList();
       private void ensureCornersIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           corners_ = new java.util.ArrayList<emu.grasscutter.net.proto.VectorOuterClass.Vector>(corners_);
-          bitField0_ |= 0x00000001;
+          bitField0_ |= 0x00000002;
          }
       }
 
@@ -1019,7 +998,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> cornersBuilder_;
 
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector> getCornersList() {
         if (cornersBuilder_ == null) {
@@ -1029,7 +1008,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public int getCornersCount() {
         if (cornersBuilder_ == null) {
@@ -1039,7 +1018,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getCorners(int index) {
         if (cornersBuilder_ == null) {
@@ -1049,7 +1028,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder setCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -1066,7 +1045,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder setCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1080,7 +1059,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder addCorners(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (cornersBuilder_ == null) {
@@ -1096,7 +1075,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder addCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
@@ -1113,7 +1092,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder addCorners(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1127,7 +1106,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder addCorners(
           int index, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -1141,7 +1120,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder addAllCorners(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.VectorOuterClass.Vector> values) {
@@ -1156,12 +1135,12 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder clearCorners() {
         if (cornersBuilder_ == null) {
           corners_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
+          bitField0_ = (bitField0_ & ~0x00000002);
           onChanged();
         } else {
           cornersBuilder_.clear();
@@ -1169,7 +1148,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public Builder removeCorners(int index) {
         if (cornersBuilder_ == null) {
@@ -1182,14 +1161,14 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getCornersBuilder(
           int index) {
         return getCornersFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getCornersOrBuilder(
           int index) {
@@ -1199,7 +1178,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
            getCornersOrBuilderList() {
@@ -1210,14 +1189,14 @@ public final class ToTheMoonQueryPathRspOuterClass {
         }
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder() {
         return getCornersFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder addCornersBuilder(
           int index) {
@@ -1225,7 +1204,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
             index, emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance());
       }
       /**
-       * <code>repeated .Vector corners = 14;</code>
+       * <code>repeated .Vector corners = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder> 
            getCornersBuilderList() {
@@ -1238,7 +1217,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
           cornersBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
                   corners_,
-                  ((bitField0_ & 0x00000001) != 0),
+                  ((bitField0_ & 0x00000002) != 0),
                   getParentForChildren(),
                   isClean());
           corners_ = null;
@@ -1246,47 +1225,16 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return cornersBuilder_;
       }
 
-      private int queryId_ ;
-      /**
-       * <code>int32 query_id = 2;</code>
-       * @return The queryId.
-       */
-      @java.lang.Override
-      public int getQueryId() {
-        return queryId_;
-      }
-      /**
-       * <code>int32 query_id = 2;</code>
-       * @param value The queryId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setQueryId(int value) {
-        
-        queryId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>int32 query_id = 2;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearQueryId() {
-        
-        queryId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int queryStatus_ = 0;
       /**
-       * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+       * <code>.PathStatusType query_status = 10;</code>
        * @return The enum numeric value on the wire for queryStatus.
        */
       @java.lang.Override public int getQueryStatusValue() {
         return queryStatus_;
       }
       /**
-       * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+       * <code>.PathStatusType query_status = 10;</code>
        * @param value The enum numeric value on the wire for queryStatus to set.
        * @return This builder for chaining.
        */
@@ -1297,21 +1245,21 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+       * <code>.PathStatusType query_status = 10;</code>
        * @return The queryStatus.
        */
       @java.lang.Override
-      public emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType getQueryStatus() {
+      public emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType getQueryStatus() {
         @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType result = emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.valueOf(queryStatus_);
-        return result == null ? emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType.UNRECOGNIZED : result;
+        emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType result = emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.valueOf(queryStatus_);
+        return result == null ? emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+       * <code>.PathStatusType query_status = 10;</code>
        * @param value The queryStatus to set.
        * @return This builder for chaining.
        */
-      public Builder setQueryStatus(emu.grasscutter.net.proto.ToTheMoonQueryPathRspOuterClass.ToTheMoonQueryPathRsp.PathStatusType value) {
+      public Builder setQueryStatus(emu.grasscutter.net.proto.PathStatusTypeOuterClass.PathStatusType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1321,7 +1269,7 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
       /**
-       * <code>.ToTheMoonQueryPathRsp.PathStatusType query_status = 11;</code>
+       * <code>.PathStatusType query_status = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearQueryStatus() {
@@ -1331,81 +1279,33 @@ public final class ToTheMoonQueryPathRspOuterClass {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList level_ = emptyIntList();
-      private void ensureLevelIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          level_ = mutableCopy(level_);
-          bitField0_ |= 0x00000002;
-         }
-      }
+      private int queryId_ ;
       /**
-       * <code>repeated int32 level = 13;</code>
-       * @return A list containing the level.
+       * <code>int32 query_id = 13;</code>
+       * @return The queryId.
        */
-      public java.util.List<java.lang.Integer>
-          getLevelList() {
-        return ((bitField0_ & 0x00000002) != 0) ?
-                 java.util.Collections.unmodifiableList(level_) : level_;
+      @java.lang.Override
+      public int getQueryId() {
+        return queryId_;
       }
       /**
-       * <code>repeated int32 level = 13;</code>
-       * @return The count of level.
-       */
-      public int getLevelCount() {
-        return level_.size();
-      }
-      /**
-       * <code>repeated int32 level = 13;</code>
-       * @param index The index of the element to return.
-       * @return The level at the given index.
-       */
-      public int getLevel(int index) {
-        return level_.getInt(index);
-      }
-      /**
-       * <code>repeated int32 level = 13;</code>
-       * @param index The index to set the value at.
-       * @param value The level to set.
+       * <code>int32 query_id = 13;</code>
+       * @param value The queryId to set.
        * @return This builder for chaining.
        */
-      public Builder setLevel(
-          int index, int value) {
-        ensureLevelIsMutable();
-        level_.setInt(index, value);
+      public Builder setQueryId(int value) {
+        
+        queryId_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>repeated int32 level = 13;</code>
-       * @param value The level to add.
+       * <code>int32 query_id = 13;</code>
        * @return This builder for chaining.
        */
-      public Builder addLevel(int value) {
-        ensureLevelIsMutable();
-        level_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 level = 13;</code>
-       * @param values The level to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllLevel(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureLevelIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, level_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated int32 level = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearLevel() {
-        level_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000002);
+      public Builder clearQueryId() {
+        
+        queryId_ = 0;
         onChanged();
         return this;
       }
@@ -1488,37 +1388,6 @@ public final class ToTheMoonQueryPathRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 7;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <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) {
@@ -1587,27 +1456,27 @@ public final class ToTheMoonQueryPathRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033ToTheMoonQueryPathRsp.proto\032\014Vector.pr" +
-      "oto\"\367\001\n\025ToTheMoonQueryPathRsp\022\030\n\007corners" +
-      "\030\016 \003(\0132\007.Vector\022\020\n\010query_id\030\002 \001(\005\022;\n\014que" +
-      "ry_status\030\013 \001(\0162%.ToTheMoonQueryPathRsp." +
-      "PathStatusType\022\r\n\005level\030\r \003(\005\022\r\n\005index\030\017" +
-      " \003(\003\022\017\n\007retcode\030\007 \001(\005\"F\n\016PathStatusType\022" +
-      "\017\n\013STATUS_FAIL\020\000\022\017\n\013STATUS_SUCC\020\001\022\022\n\016STA" +
-      "TUS_PARTIAL\020\002B\033\n\031emu.grasscutter.net.pro" +
-      "tob\006proto3"
+      "oto\032\024PathStatusType.proto\"\231\001\n\025ToTheMoonQ" +
+      "ueryPathRsp\022\r\n\005level\030\001 \003(\005\022\017\n\007retcode\030\007 " +
+      "\001(\005\022\030\n\007corners\030\t \003(\0132\007.Vector\022%\n\014query_s" +
+      "tatus\030\n \001(\0162\017.PathStatusType\022\020\n\010query_id" +
+      "\030\r \001(\005\022\r\n\005index\030\017 \003(\003B\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           emu.grasscutter.net.proto.VectorOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor(),
         });
     internal_static_ToTheMoonQueryPathRsp_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_ToTheMoonQueryPathRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_ToTheMoonQueryPathRsp_descriptor,
-        new java.lang.String[] { "Corners", "QueryId", "QueryStatus", "Level", "Index", "Retcode", });
+        new java.lang.String[] { "Level", "Retcode", "Corners", "QueryStatus", "QueryId", "Index", });
     emu.grasscutter.net.proto.VectorOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PathStatusTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java
index 1d8155c0a..988b48863 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerAllDataReqOuterClass.java
@@ -25,11 +25,6 @@ public final class TowerAllDataReqOuterClass {
     boolean getIsInteract();
   }
   /**
-   * <pre>
-   * CmdId: 23009
-   * Obf: OBIBAPPDOKJ
-   * </pre>
-   *
    * Protobuf type {@code TowerAllDataReq}
    */
   public static final class TowerAllDataReq extends
@@ -279,11 +274,6 @@ public final class TowerAllDataReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23009
-     * Obf: OBIBAPPDOKJ
-     * </pre>
-     *
      * Protobuf type {@code TowerAllDataReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
index 5e3513ca1..ca11b7399 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TowerLevelEndNotifyOuterClass.java
@@ -19,68 +19,76 @@ public final class TowerLevelEndNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getRewardItemListList();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index);
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    int getRewardItemListCount();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getRewardItemListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
+        int index);
+
+    /**
+     * <pre>
+     *sus 11
+     * </pre>
+     *
+     * <code>uint32 next_floor_id = 3;</code>
+     * @return The nextFloorId.
+     */
+    int getNextFloorId();
+
+    /**
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @return A list containing the finishedStarCondList.
      */
     java.util.List<java.lang.Integer> getFinishedStarCondListList();
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @return The count of finishedStarCondList.
      */
     int getFinishedStarCondListCount();
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @param index The index of the element to return.
      * @return The finishedStarCondList at the given index.
      */
     int getFinishedStarCondList(int index);
 
     /**
-     * <code>bool is_success = 7;</code>
-     * @return The isSuccess.
-     */
-    boolean getIsSuccess();
-
-    /**
-     * <code>uint32 continue_state = 4;</code>
+     * <pre>
+     *sus 3
+     * </pre>
+     *
+     * <code>uint32 continue_state = 11;</code>
      * @return The continueState.
      */
     int getContinueState();
 
     /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
+     * <code>bool is_success = 12;</code>
+     * @return The isSuccess.
      */
-    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getRewardItemListList();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index);
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    int getRewardItemListCount();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getRewardItemListOrBuilderList();
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
-        int index);
-
-    /**
-     * <code>uint32 next_floor_id = 5;</code>
-     * @return The nextFloorId.
-     */
-    int getNextFloorId();
+    boolean getIsSuccess();
   }
   /**
    * <pre>
-   * CmdId: 20886
-   * Obf: BHDDDPNGPNF
+   * 5.0.0
+   * CmdId: 22669
    * </pre>
    *
    * Protobuf type {@code TowerLevelEndNotify}
@@ -95,8 +103,8 @@ public final class TowerLevelEndNotifyOuterClass {
       super(builder);
     }
     private TowerLevelEndNotify() {
-      finishedStarCondList_ = emptyIntList();
       rewardItemList_ = java.util.Collections.emptyList();
+      finishedStarCondList_ = emptyIntList();
     }
 
     @java.lang.Override
@@ -130,44 +138,34 @@ public final class TowerLevelEndNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              continueState_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              nextFloorId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
-
-              isSuccess_ = input.readBool();
-              break;
-            }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               rewardItemList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
               break;
             }
-            case 112: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 24: {
+
+              nextFloorId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 finishedStarCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               finishedStarCondList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 66: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 finishedStarCondList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 finishedStarCondList_.addInt(input.readUInt32());
@@ -175,6 +173,16 @@ public final class TowerLevelEndNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 88: {
+
+              continueState_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              isSuccess_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -190,10 +198,10 @@ public final class TowerLevelEndNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           rewardItemList_ = java.util.Collections.unmodifiableList(rewardItemList_);
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           finishedStarCondList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
@@ -330,10 +338,65 @@ public final class TowerLevelEndNotifyOuterClass {
       // @@protoc_insertion_point(enum_scope:TowerLevelEndNotify.ContinueStateType)
     }
 
-    public static final int FINISHED_STAR_COND_LIST_FIELD_NUMBER = 14;
+    public static final int REWARD_ITEM_LIST_FIELD_NUMBER = 1;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_;
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
+      return rewardItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getRewardItemListOrBuilderList() {
+      return rewardItemList_;
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public int getRewardItemListCount() {
+      return rewardItemList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
+      return rewardItemList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam reward_item_list = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
+        int index) {
+      return rewardItemList_.get(index);
+    }
+
+    public static final int NEXT_FLOOR_ID_FIELD_NUMBER = 3;
+    private int nextFloorId_;
+    /**
+     * <pre>
+     *sus 11
+     * </pre>
+     *
+     * <code>uint32 next_floor_id = 3;</code>
+     * @return The nextFloorId.
+     */
+    @java.lang.Override
+    public int getNextFloorId() {
+      return nextFloorId_;
+    }
+
+    public static final int FINISHED_STAR_COND_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList finishedStarCondList_;
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @return A list containing the finishedStarCondList.
      */
     @java.lang.Override
@@ -342,14 +405,14 @@ public final class TowerLevelEndNotifyOuterClass {
       return finishedStarCondList_;
     }
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @return The count of finishedStarCondList.
      */
     public int getFinishedStarCondListCount() {
       return finishedStarCondList_.size();
     }
     /**
-     * <code>repeated uint32 finished_star_cond_list = 14;</code>
+     * <code>repeated uint32 finished_star_cond_list = 8;</code>
      * @param index The index of the element to return.
      * @return The finishedStarCondList at the given index.
      */
@@ -358,21 +421,14 @@ public final class TowerLevelEndNotifyOuterClass {
     }
     private int finishedStarCondListMemoizedSerializedSize = -1;
 
-    public static final int IS_SUCCESS_FIELD_NUMBER = 7;
-    private boolean isSuccess_;
-    /**
-     * <code>bool is_success = 7;</code>
-     * @return The isSuccess.
-     */
-    @java.lang.Override
-    public boolean getIsSuccess() {
-      return isSuccess_;
-    }
-
-    public static final int CONTINUE_STATE_FIELD_NUMBER = 4;
+    public static final int CONTINUE_STATE_FIELD_NUMBER = 11;
     private int continueState_;
     /**
-     * <code>uint32 continue_state = 4;</code>
+     * <pre>
+     *sus 3
+     * </pre>
+     *
+     * <code>uint32 continue_state = 11;</code>
      * @return The continueState.
      */
     @java.lang.Override
@@ -380,55 +436,15 @@ public final class TowerLevelEndNotifyOuterClass {
       return continueState_;
     }
 
-    public static final int REWARD_ITEM_LIST_FIELD_NUMBER = 13;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_;
+    public static final int IS_SUCCESS_FIELD_NUMBER = 12;
+    private boolean isSuccess_;
     /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
+     * <code>bool is_success = 12;</code>
+     * @return The isSuccess.
      */
     @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
-      return rewardItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getRewardItemListOrBuilderList() {
-      return rewardItemList_;
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    @java.lang.Override
-    public int getRewardItemListCount() {
-      return rewardItemList_.size();
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
-      return rewardItemList_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam reward_item_list = 13;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
-        int index) {
-      return rewardItemList_.get(index);
-    }
-
-    public static final int NEXT_FLOOR_ID_FIELD_NUMBER = 5;
-    private int nextFloorId_;
-    /**
-     * <code>uint32 next_floor_id = 5;</code>
-     * @return The nextFloorId.
-     */
-    @java.lang.Override
-    public int getNextFloorId() {
-      return nextFloorId_;
+    public boolean getIsSuccess() {
+      return isSuccess_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -446,25 +462,25 @@ public final class TowerLevelEndNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (continueState_ != 0) {
-        output.writeUInt32(4, continueState_);
+      for (int i = 0; i < rewardItemList_.size(); i++) {
+        output.writeMessage(1, rewardItemList_.get(i));
       }
       if (nextFloorId_ != 0) {
-        output.writeUInt32(5, nextFloorId_);
-      }
-      if (isSuccess_ != false) {
-        output.writeBool(7, isSuccess_);
-      }
-      for (int i = 0; i < rewardItemList_.size(); i++) {
-        output.writeMessage(13, rewardItemList_.get(i));
+        output.writeUInt32(3, nextFloorId_);
       }
       if (getFinishedStarCondListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(66);
         output.writeUInt32NoTag(finishedStarCondListMemoizedSerializedSize);
       }
       for (int i = 0; i < finishedStarCondList_.size(); i++) {
         output.writeUInt32NoTag(finishedStarCondList_.getInt(i));
       }
+      if (continueState_ != 0) {
+        output.writeUInt32(11, continueState_);
+      }
+      if (isSuccess_ != false) {
+        output.writeBool(12, isSuccess_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -474,21 +490,13 @@ public final class TowerLevelEndNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (continueState_ != 0) {
+      for (int i = 0; i < rewardItemList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, continueState_);
+          .computeMessageSize(1, rewardItemList_.get(i));
       }
       if (nextFloorId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, nextFloorId_);
-      }
-      if (isSuccess_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isSuccess_);
-      }
-      for (int i = 0; i < rewardItemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, rewardItemList_.get(i));
+          .computeUInt32Size(3, nextFloorId_);
       }
       {
         int dataSize = 0;
@@ -504,6 +512,14 @@ public final class TowerLevelEndNotifyOuterClass {
         }
         finishedStarCondListMemoizedSerializedSize = dataSize;
       }
+      if (continueState_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, continueState_);
+      }
+      if (isSuccess_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isSuccess_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -519,16 +535,16 @@ public final class TowerLevelEndNotifyOuterClass {
       }
       emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify other = (emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify) obj;
 
-      if (!getFinishedStarCondListList()
-          .equals(other.getFinishedStarCondListList())) return false;
-      if (getIsSuccess()
-          != other.getIsSuccess()) return false;
-      if (getContinueState()
-          != other.getContinueState()) return false;
       if (!getRewardItemListList()
           .equals(other.getRewardItemListList())) return false;
       if (getNextFloorId()
           != other.getNextFloorId()) return false;
+      if (!getFinishedStarCondListList()
+          .equals(other.getFinishedStarCondListList())) return false;
+      if (getContinueState()
+          != other.getContinueState()) return false;
+      if (getIsSuccess()
+          != other.getIsSuccess()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -540,21 +556,21 @@ public final class TowerLevelEndNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getFinishedStarCondListCount() > 0) {
-        hash = (37 * hash) + FINISHED_STAR_COND_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFinishedStarCondListList().hashCode();
-      }
-      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsSuccess());
-      hash = (37 * hash) + CONTINUE_STATE_FIELD_NUMBER;
-      hash = (53 * hash) + getContinueState();
       if (getRewardItemListCount() > 0) {
         hash = (37 * hash) + REWARD_ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getRewardItemListList().hashCode();
       }
       hash = (37 * hash) + NEXT_FLOOR_ID_FIELD_NUMBER;
       hash = (53 * hash) + getNextFloorId();
+      if (getFinishedStarCondListCount() > 0) {
+        hash = (37 * hash) + FINISHED_STAR_COND_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFinishedStarCondListList().hashCode();
+      }
+      hash = (37 * hash) + CONTINUE_STATE_FIELD_NUMBER;
+      hash = (53 * hash) + getContinueState();
+      hash = (37 * hash) + IS_SUCCESS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsSuccess());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -652,8 +668,8 @@ public final class TowerLevelEndNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 20886
-     * Obf: BHDDDPNGPNF
+     * 5.0.0
+     * CmdId: 22669
      * </pre>
      *
      * Protobuf type {@code TowerLevelEndNotify}
@@ -694,20 +710,20 @@ public final class TowerLevelEndNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        finishedStarCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        isSuccess_ = false;
-
-        continueState_ = 0;
-
         if (rewardItemListBuilder_ == null) {
           rewardItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           rewardItemListBuilder_.clear();
         }
         nextFloorId_ = 0;
 
+        finishedStarCondList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        continueState_ = 0;
+
+        isSuccess_ = false;
+
         return this;
       }
 
@@ -735,23 +751,23 @@ public final class TowerLevelEndNotifyOuterClass {
       public emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify buildPartial() {
         emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify result = new emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify(this);
         int from_bitField0_ = bitField0_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          finishedStarCondList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.finishedStarCondList_ = finishedStarCondList_;
-        result.isSuccess_ = isSuccess_;
-        result.continueState_ = continueState_;
         if (rewardItemListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             rewardItemList_ = java.util.Collections.unmodifiableList(rewardItemList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.rewardItemList_ = rewardItemList_;
         } else {
           result.rewardItemList_ = rewardItemListBuilder_.build();
         }
         result.nextFloorId_ = nextFloorId_;
+        if (((bitField0_ & 0x00000002) != 0)) {
+          finishedStarCondList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.finishedStarCondList_ = finishedStarCondList_;
+        result.continueState_ = continueState_;
+        result.isSuccess_ = isSuccess_;
         onBuilt();
         return result;
       }
@@ -800,27 +816,11 @@ public final class TowerLevelEndNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify other) {
         if (other == emu.grasscutter.net.proto.TowerLevelEndNotifyOuterClass.TowerLevelEndNotify.getDefaultInstance()) return this;
-        if (!other.finishedStarCondList_.isEmpty()) {
-          if (finishedStarCondList_.isEmpty()) {
-            finishedStarCondList_ = other.finishedStarCondList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFinishedStarCondListIsMutable();
-            finishedStarCondList_.addAll(other.finishedStarCondList_);
-          }
-          onChanged();
-        }
-        if (other.getIsSuccess() != false) {
-          setIsSuccess(other.getIsSuccess());
-        }
-        if (other.getContinueState() != 0) {
-          setContinueState(other.getContinueState());
-        }
         if (rewardItemListBuilder_ == null) {
           if (!other.rewardItemList_.isEmpty()) {
             if (rewardItemList_.isEmpty()) {
               rewardItemList_ = other.rewardItemList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureRewardItemListIsMutable();
               rewardItemList_.addAll(other.rewardItemList_);
@@ -833,7 +833,7 @@ public final class TowerLevelEndNotifyOuterClass {
               rewardItemListBuilder_.dispose();
               rewardItemListBuilder_ = null;
               rewardItemList_ = other.rewardItemList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               rewardItemListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getRewardItemListFieldBuilder() : null;
@@ -845,6 +845,22 @@ public final class TowerLevelEndNotifyOuterClass {
         if (other.getNextFloorId() != 0) {
           setNextFloorId(other.getNextFloorId());
         }
+        if (!other.finishedStarCondList_.isEmpty()) {
+          if (finishedStarCondList_.isEmpty()) {
+            finishedStarCondList_ = other.finishedStarCondList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureFinishedStarCondListIsMutable();
+            finishedStarCondList_.addAll(other.finishedStarCondList_);
+          }
+          onChanged();
+        }
+        if (other.getContinueState() != 0) {
+          setContinueState(other.getContinueState());
+        }
+        if (other.getIsSuccess() != false) {
+          setIsSuccess(other.getIsSuccess());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -875,153 +891,12 @@ public final class TowerLevelEndNotifyOuterClass {
       }
       private int bitField0_;
 
-      private com.google.protobuf.Internal.IntList finishedStarCondList_ = emptyIntList();
-      private void ensureFinishedStarCondListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          finishedStarCondList_ = mutableCopy(finishedStarCondList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @return A list containing the finishedStarCondList.
-       */
-      public java.util.List<java.lang.Integer>
-          getFinishedStarCondListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(finishedStarCondList_) : finishedStarCondList_;
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @return The count of finishedStarCondList.
-       */
-      public int getFinishedStarCondListCount() {
-        return finishedStarCondList_.size();
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @param index The index of the element to return.
-       * @return The finishedStarCondList at the given index.
-       */
-      public int getFinishedStarCondList(int index) {
-        return finishedStarCondList_.getInt(index);
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @param index The index to set the value at.
-       * @param value The finishedStarCondList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFinishedStarCondList(
-          int index, int value) {
-        ensureFinishedStarCondListIsMutable();
-        finishedStarCondList_.setInt(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @param value The finishedStarCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFinishedStarCondList(int value) {
-        ensureFinishedStarCondListIsMutable();
-        finishedStarCondList_.addInt(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @param values The finishedStarCondList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFinishedStarCondList(
-          java.lang.Iterable<? extends java.lang.Integer> values) {
-        ensureFinishedStarCondListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, finishedStarCondList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint32 finished_star_cond_list = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFinishedStarCondList() {
-        finishedStarCondList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private boolean isSuccess_ ;
-      /**
-       * <code>bool is_success = 7;</code>
-       * @return The isSuccess.
-       */
-      @java.lang.Override
-      public boolean getIsSuccess() {
-        return isSuccess_;
-      }
-      /**
-       * <code>bool is_success = 7;</code>
-       * @param value The isSuccess to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsSuccess(boolean value) {
-        
-        isSuccess_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_success = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsSuccess() {
-        
-        isSuccess_ = false;
-        onChanged();
-        return this;
-      }
-
-      private int continueState_ ;
-      /**
-       * <code>uint32 continue_state = 4;</code>
-       * @return The continueState.
-       */
-      @java.lang.Override
-      public int getContinueState() {
-        return continueState_;
-      }
-      /**
-       * <code>uint32 continue_state = 4;</code>
-       * @param value The continueState to set.
-       * @return This builder for chaining.
-       */
-      public Builder setContinueState(int value) {
-        
-        continueState_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 continue_state = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearContinueState() {
-        
-        continueState_ = 0;
-        onChanged();
-        return this;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> rewardItemList_ =
         java.util.Collections.emptyList();
       private void ensureRewardItemListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           rewardItemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(rewardItemList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -1029,7 +904,7 @@ public final class TowerLevelEndNotifyOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> rewardItemListBuilder_;
 
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getRewardItemListList() {
         if (rewardItemListBuilder_ == null) {
@@ -1039,7 +914,7 @@ public final class TowerLevelEndNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public int getRewardItemListCount() {
         if (rewardItemListBuilder_ == null) {
@@ -1049,7 +924,7 @@ public final class TowerLevelEndNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getRewardItemList(int index) {
         if (rewardItemListBuilder_ == null) {
@@ -1059,7 +934,7 @@ public final class TowerLevelEndNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder setRewardItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -1076,7 +951,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder setRewardItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1090,7 +965,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder addRewardItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (rewardItemListBuilder_ == null) {
@@ -1106,7 +981,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder addRewardItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -1123,7 +998,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder addRewardItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1137,7 +1012,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder addRewardItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -1151,7 +1026,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder addAllRewardItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -1166,12 +1041,12 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder clearRewardItemList() {
         if (rewardItemListBuilder_ == null) {
           rewardItemList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           rewardItemListBuilder_.clear();
@@ -1179,7 +1054,7 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public Builder removeRewardItemList(int index) {
         if (rewardItemListBuilder_ == null) {
@@ -1192,14 +1067,14 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getRewardItemListBuilder(
           int index) {
         return getRewardItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getRewardItemListOrBuilder(
           int index) {
@@ -1209,7 +1084,7 @@ public final class TowerLevelEndNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getRewardItemListOrBuilderList() {
@@ -1220,14 +1095,14 @@ public final class TowerLevelEndNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder() {
         return getRewardItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addRewardItemListBuilder(
           int index) {
@@ -1235,7 +1110,7 @@ public final class TowerLevelEndNotifyOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam reward_item_list = 13;</code>
+       * <code>repeated .ItemParam reward_item_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getRewardItemListBuilderList() {
@@ -1248,7 +1123,7 @@ public final class TowerLevelEndNotifyOuterClass {
           rewardItemListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
                   rewardItemList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           rewardItemList_ = null;
@@ -1258,7 +1133,11 @@ public final class TowerLevelEndNotifyOuterClass {
 
       private int nextFloorId_ ;
       /**
-       * <code>uint32 next_floor_id = 5;</code>
+       * <pre>
+       *sus 11
+       * </pre>
+       *
+       * <code>uint32 next_floor_id = 3;</code>
        * @return The nextFloorId.
        */
       @java.lang.Override
@@ -1266,7 +1145,11 @@ public final class TowerLevelEndNotifyOuterClass {
         return nextFloorId_;
       }
       /**
-       * <code>uint32 next_floor_id = 5;</code>
+       * <pre>
+       *sus 11
+       * </pre>
+       *
+       * <code>uint32 next_floor_id = 3;</code>
        * @param value The nextFloorId to set.
        * @return This builder for chaining.
        */
@@ -1277,7 +1160,11 @@ public final class TowerLevelEndNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 next_floor_id = 5;</code>
+       * <pre>
+       *sus 11
+       * </pre>
+       *
+       * <code>uint32 next_floor_id = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearNextFloorId() {
@@ -1286,6 +1173,159 @@ public final class TowerLevelEndNotifyOuterClass {
         onChanged();
         return this;
       }
+
+      private com.google.protobuf.Internal.IntList finishedStarCondList_ = emptyIntList();
+      private void ensureFinishedStarCondListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          finishedStarCondList_ = mutableCopy(finishedStarCondList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @return A list containing the finishedStarCondList.
+       */
+      public java.util.List<java.lang.Integer>
+          getFinishedStarCondListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(finishedStarCondList_) : finishedStarCondList_;
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @return The count of finishedStarCondList.
+       */
+      public int getFinishedStarCondListCount() {
+        return finishedStarCondList_.size();
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @param index The index of the element to return.
+       * @return The finishedStarCondList at the given index.
+       */
+      public int getFinishedStarCondList(int index) {
+        return finishedStarCondList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @param index The index to set the value at.
+       * @param value The finishedStarCondList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFinishedStarCondList(
+          int index, int value) {
+        ensureFinishedStarCondListIsMutable();
+        finishedStarCondList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @param value The finishedStarCondList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFinishedStarCondList(int value) {
+        ensureFinishedStarCondListIsMutable();
+        finishedStarCondList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @param values The finishedStarCondList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFinishedStarCondList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureFinishedStarCondListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, finishedStarCondList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 finished_star_cond_list = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFinishedStarCondList() {
+        finishedStarCondList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
+      private int continueState_ ;
+      /**
+       * <pre>
+       *sus 3
+       * </pre>
+       *
+       * <code>uint32 continue_state = 11;</code>
+       * @return The continueState.
+       */
+      @java.lang.Override
+      public int getContinueState() {
+        return continueState_;
+      }
+      /**
+       * <pre>
+       *sus 3
+       * </pre>
+       *
+       * <code>uint32 continue_state = 11;</code>
+       * @param value The continueState to set.
+       * @return This builder for chaining.
+       */
+      public Builder setContinueState(int value) {
+        
+        continueState_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *sus 3
+       * </pre>
+       *
+       * <code>uint32 continue_state = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearContinueState() {
+        
+        continueState_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean isSuccess_ ;
+      /**
+       * <code>bool is_success = 12;</code>
+       * @return The isSuccess.
+       */
+      @java.lang.Override
+      public boolean getIsSuccess() {
+        return isSuccess_;
+      }
+      /**
+       * <code>bool is_success = 12;</code>
+       * @param value The isSuccess to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsSuccess(boolean value) {
+        
+        isSuccess_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_success = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsSuccess() {
+        
+        isSuccess_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1354,11 +1394,11 @@ public final class TowerLevelEndNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031TowerLevelEndNotify.proto\032\017ItemParam.p" +
-      "roto\"\273\002\n\023TowerLevelEndNotify\022\037\n\027finished" +
-      "_star_cond_list\030\016 \003(\r\022\022\n\nis_success\030\007 \001(" +
-      "\010\022\026\n\016continue_state\030\004 \001(\r\022$\n\020reward_item" +
-      "_list\030\r \003(\0132\n.ItemParam\022\025\n\rnext_floor_id" +
-      "\030\005 \001(\r\"\231\001\n\021ContinueStateType\022(\n$CONTINUE" +
+      "roto\"\273\002\n\023TowerLevelEndNotify\022$\n\020reward_i" +
+      "tem_list\030\001 \003(\0132\n.ItemParam\022\025\n\rnext_floor" +
+      "_id\030\003 \001(\r\022\037\n\027finished_star_cond_list\030\010 \003" +
+      "(\r\022\026\n\016continue_state\030\013 \001(\r\022\022\n\nis_success" +
+      "\030\014 \001(\010\"\231\001\n\021ContinueStateType\022(\n$CONTINUE" +
       "_STATE_TYPE_CAN_NOT_CONTINUE\020\000\022,\n(CONTIN" +
       "UE_STATE_TYPE_CAN_ENTER_NEXT_LEVEL\020\001\022,\n(" +
       "CONTINUE_STATE_TYPE_CAN_ENTER_NEXT_FLOOR" +
@@ -1374,7 +1414,7 @@ public final class TowerLevelEndNotifyOuterClass {
     internal_static_TowerLevelEndNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TowerLevelEndNotify_descriptor,
-        new java.lang.String[] { "FinishedStarCondList", "IsSuccess", "ContinueState", "RewardItemList", "NextFloorId", });
+        new java.lang.String[] { "RewardItemList", "NextFloorId", "FinishedStarCondList", "ContinueState", "IsSuccess", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java
index 6426b9fed..91ff3261c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarFirstPassDungeonNotifyOuterClass.java
@@ -19,15 +19,15 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 trial_avatar_index_id = 6;</code>
+     * <code>uint32 trial_avatar_index_id = 5;</code>
      * @return The trialAvatarIndexId.
      */
     int getTrialAvatarIndexId();
   }
   /**
    * <pre>
-   * CmdId: 6009
-   * Obf: FMDPKNJCNHO
+   * 5.0.0
+   * CmdId: 8103
    * </pre>
    *
    * Protobuf type {@code TrialAvatarFirstPassDungeonNotify}
@@ -74,7 +74,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 48: {
+            case 40: {
 
               trialAvatarIndexId_ = input.readUInt32();
               break;
@@ -111,10 +111,10 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
               emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.class, emu.grasscutter.net.proto.TrialAvatarFirstPassDungeonNotifyOuterClass.TrialAvatarFirstPassDungeonNotify.Builder.class);
     }
 
-    public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 6;
+    public static final int TRIAL_AVATAR_INDEX_ID_FIELD_NUMBER = 5;
     private int trialAvatarIndexId_;
     /**
-     * <code>uint32 trial_avatar_index_id = 6;</code>
+     * <code>uint32 trial_avatar_index_id = 5;</code>
      * @return The trialAvatarIndexId.
      */
     @java.lang.Override
@@ -137,7 +137,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (trialAvatarIndexId_ != 0) {
-        output.writeUInt32(6, trialAvatarIndexId_);
+        output.writeUInt32(5, trialAvatarIndexId_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +150,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
       size = 0;
       if (trialAvatarIndexId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, trialAvatarIndexId_);
+          .computeUInt32Size(5, trialAvatarIndexId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,8 +279,8 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
     }
     /**
      * <pre>
-     * CmdId: 6009
-     * Obf: FMDPKNJCNHO
+     * 5.0.0
+     * CmdId: 8103
      * </pre>
      *
      * Protobuf type {@code TrialAvatarFirstPassDungeonNotify}
@@ -431,7 +431,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
 
       private int trialAvatarIndexId_ ;
       /**
-       * <code>uint32 trial_avatar_index_id = 6;</code>
+       * <code>uint32 trial_avatar_index_id = 5;</code>
        * @return The trialAvatarIndexId.
        */
       @java.lang.Override
@@ -439,7 +439,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
         return trialAvatarIndexId_;
       }
       /**
-       * <code>uint32 trial_avatar_index_id = 6;</code>
+       * <code>uint32 trial_avatar_index_id = 5;</code>
        * @param value The trialAvatarIndexId to set.
        * @return This builder for chaining.
        */
@@ -450,7 +450,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 trial_avatar_index_id = 6;</code>
+       * <code>uint32 trial_avatar_index_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTrialAvatarIndexId() {
@@ -528,7 +528,7 @@ public final class TrialAvatarFirstPassDungeonNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\'TrialAvatarFirstPassDungeonNotify.prot" +
       "o\"B\n!TrialAvatarFirstPassDungeonNotify\022\035" +
-      "\n\025trial_avatar_index_id\030\006 \001(\rB\033\n\031emu.gra" +
+      "\n\025trial_avatar_index_id\030\005 \001(\rB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
index 57abadb5c..69b12122a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarGrantRecordOuterClass.java
@@ -32,7 +32,7 @@ public final class TrialAvatarGrantRecordOuterClass {
   }
   /**
    * <pre>
-   * Obf: KBNIDGMCKMD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code TrialAvatarGrantRecord}
@@ -545,7 +545,7 @@ public final class TrialAvatarGrantRecordOuterClass {
     }
     /**
      * <pre>
-     * Obf: KBNIDGMCKMD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code TrialAvatarGrantRecord}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarInfoOuterClass.java
index 75a8f9c54..ca044f47c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrialAvatarInfoOuterClass.java
@@ -65,7 +65,7 @@ public final class TrialAvatarInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: FMNJAFCPNPD
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code TrialAvatarInfo}
@@ -439,7 +439,7 @@ public final class TrialAvatarInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: FMNJAFCPNPD
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code TrialAvatarInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TrifleGadgetOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TrifleGadgetOuterClass.java
index 22dec1fad..272160f44 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TrifleGadgetOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TrifleGadgetOuterClass.java
@@ -34,14 +34,15 @@ public final class TrifleGadgetOuterClass {
     emu.grasscutter.net.proto.ItemOuterClass.ItemOrBuilder getItemOrBuilder();
 
     /**
-     * <code>uint32 GAHBDCCFPGJ = 2;</code>
-     * @return The gAHBDCCFPGJ.
+     * <code>uint32 EJNBFCIJOMO = 2;</code>
+     * @return The eJNBFCIJOMO.
      */
-    int getGAHBDCCFPGJ();
+    int getEJNBFCIJOMO();
   }
   /**
    * <pre>
-   * Obf: LEEAOCFCGJA
+   * 5.0.0
+   * CmdId: 
    * </pre>
    *
    * Protobuf type {@code TrifleGadget}
@@ -103,7 +104,7 @@ public final class TrifleGadgetOuterClass {
             }
             case 16: {
 
-              gAHBDCCFPGJ_ = input.readUInt32();
+              eJNBFCIJOMO_ = input.readUInt32();
               break;
             }
             default: {
@@ -164,15 +165,15 @@ public final class TrifleGadgetOuterClass {
       return getItem();
     }
 
-    public static final int GAHBDCCFPGJ_FIELD_NUMBER = 2;
-    private int gAHBDCCFPGJ_;
+    public static final int EJNBFCIJOMO_FIELD_NUMBER = 2;
+    private int eJNBFCIJOMO_;
     /**
-     * <code>uint32 GAHBDCCFPGJ = 2;</code>
-     * @return The gAHBDCCFPGJ.
+     * <code>uint32 EJNBFCIJOMO = 2;</code>
+     * @return The eJNBFCIJOMO.
      */
     @java.lang.Override
-    public int getGAHBDCCFPGJ() {
-      return gAHBDCCFPGJ_;
+    public int getEJNBFCIJOMO() {
+      return eJNBFCIJOMO_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -192,8 +193,8 @@ public final class TrifleGadgetOuterClass {
       if (item_ != null) {
         output.writeMessage(1, getItem());
       }
-      if (gAHBDCCFPGJ_ != 0) {
-        output.writeUInt32(2, gAHBDCCFPGJ_);
+      if (eJNBFCIJOMO_ != 0) {
+        output.writeUInt32(2, eJNBFCIJOMO_);
       }
       unknownFields.writeTo(output);
     }
@@ -208,9 +209,9 @@ public final class TrifleGadgetOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(1, getItem());
       }
-      if (gAHBDCCFPGJ_ != 0) {
+      if (eJNBFCIJOMO_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, gAHBDCCFPGJ_);
+          .computeUInt32Size(2, eJNBFCIJOMO_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -232,8 +233,8 @@ public final class TrifleGadgetOuterClass {
         if (!getItem()
             .equals(other.getItem())) return false;
       }
-      if (getGAHBDCCFPGJ()
-          != other.getGAHBDCCFPGJ()) return false;
+      if (getEJNBFCIJOMO()
+          != other.getEJNBFCIJOMO()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -249,8 +250,8 @@ public final class TrifleGadgetOuterClass {
         hash = (37 * hash) + ITEM_FIELD_NUMBER;
         hash = (53 * hash) + getItem().hashCode();
       }
-      hash = (37 * hash) + GAHBDCCFPGJ_FIELD_NUMBER;
-      hash = (53 * hash) + getGAHBDCCFPGJ();
+      hash = (37 * hash) + EJNBFCIJOMO_FIELD_NUMBER;
+      hash = (53 * hash) + getEJNBFCIJOMO();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,7 +349,8 @@ public final class TrifleGadgetOuterClass {
     }
     /**
      * <pre>
-     * Obf: LEEAOCFCGJA
+     * 5.0.0
+     * CmdId: 
      * </pre>
      *
      * Protobuf type {@code TrifleGadget}
@@ -394,7 +396,7 @@ public final class TrifleGadgetOuterClass {
           item_ = null;
           itemBuilder_ = null;
         }
-        gAHBDCCFPGJ_ = 0;
+        eJNBFCIJOMO_ = 0;
 
         return this;
       }
@@ -427,7 +429,7 @@ public final class TrifleGadgetOuterClass {
         } else {
           result.item_ = itemBuilder_.build();
         }
-        result.gAHBDCCFPGJ_ = gAHBDCCFPGJ_;
+        result.eJNBFCIJOMO_ = eJNBFCIJOMO_;
         onBuilt();
         return result;
       }
@@ -479,8 +481,8 @@ public final class TrifleGadgetOuterClass {
         if (other.hasItem()) {
           mergeItem(other.getItem());
         }
-        if (other.getGAHBDCCFPGJ() != 0) {
-          setGAHBDCCFPGJ(other.getGAHBDCCFPGJ());
+        if (other.getEJNBFCIJOMO() != 0) {
+          setEJNBFCIJOMO(other.getEJNBFCIJOMO());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -630,33 +632,33 @@ public final class TrifleGadgetOuterClass {
         return itemBuilder_;
       }
 
-      private int gAHBDCCFPGJ_ ;
+      private int eJNBFCIJOMO_ ;
       /**
-       * <code>uint32 GAHBDCCFPGJ = 2;</code>
-       * @return The gAHBDCCFPGJ.
+       * <code>uint32 EJNBFCIJOMO = 2;</code>
+       * @return The eJNBFCIJOMO.
        */
       @java.lang.Override
-      public int getGAHBDCCFPGJ() {
-        return gAHBDCCFPGJ_;
+      public int getEJNBFCIJOMO() {
+        return eJNBFCIJOMO_;
       }
       /**
-       * <code>uint32 GAHBDCCFPGJ = 2;</code>
-       * @param value The gAHBDCCFPGJ to set.
+       * <code>uint32 EJNBFCIJOMO = 2;</code>
+       * @param value The eJNBFCIJOMO to set.
        * @return This builder for chaining.
        */
-      public Builder setGAHBDCCFPGJ(int value) {
+      public Builder setEJNBFCIJOMO(int value) {
         
-        gAHBDCCFPGJ_ = value;
+        eJNBFCIJOMO_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 GAHBDCCFPGJ = 2;</code>
+       * <code>uint32 EJNBFCIJOMO = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGAHBDCCFPGJ() {
+      public Builder clearEJNBFCIJOMO() {
         
-        gAHBDCCFPGJ_ = 0;
+        eJNBFCIJOMO_ = 0;
         onChanged();
         return this;
       }
@@ -728,8 +730,8 @@ public final class TrifleGadgetOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022TrifleGadget.proto\032\nItem.proto\"8\n\014Trif" +
-      "leGadget\022\023\n\004item\030\001 \001(\0132\005.Item\022\023\n\013GAHBDCC" +
-      "FPGJ\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
+      "leGadget\022\023\n\004item\030\001 \001(\0132\005.Item\022\023\n\013EJNBFCI" +
+      "JOMO\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob" +
       "\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -742,7 +744,7 @@ public final class TrifleGadgetOuterClass {
     internal_static_TrifleGadget_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TrifleGadget_descriptor,
-        new java.lang.String[] { "Item", "GAHBDCCFPGJ", });
+        new java.lang.String[] { "Item", "EJNBFCIJOMO", });
     emu.grasscutter.net.proto.ItemOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeReqOuterClass.java
index 574c3360c..c00466ce2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeReqOuterClass.java
@@ -19,35 +19,30 @@ public final class TryEnterHomeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     int getTargetUid();
 
     /**
-     * <code>bool is_transfer_to_safe_point = 9;</code>
+     * <code>bool is_transfer_to_main_house_point = 1;</code>
+     * @return The isTransferToMainHousePoint.
+     */
+    boolean getIsTransferToMainHousePoint();
+
+    /**
+     * <code>bool is_transfer_to_safe_point = 11;</code>
      * @return The isTransferToSafePoint.
      */
     boolean getIsTransferToSafePoint();
 
     /**
-     * <code>uint32 target_point = 5;</code>
+     * <code>uint32 target_point = 15;</code>
      * @return The targetPoint.
      */
     int getTargetPoint();
-
-    /**
-     * <code>bool is_transfer_to_main_house_point = 12;</code>
-     * @return The isTransferToMainHousePoint.
-     */
-    boolean getIsTransferToMainHousePoint();
   }
   /**
-   * <pre>
-   * CmdId: 26594
-   * Obf: EPFFLHEAHIE
-   * </pre>
-   *
    * Protobuf type {@code TryEnterHomeReq}
    */
   public static final class TryEnterHomeReq extends
@@ -92,24 +87,24 @@ public final class TryEnterHomeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
+
+              isTransferToMainHousePoint_ = input.readBool();
+              break;
+            }
+            case 56: {
 
               targetUid_ = input.readUInt32();
               break;
             }
-            case 40: {
-
-              targetPoint_ = input.readUInt32();
-              break;
-            }
-            case 72: {
+            case 88: {
 
               isTransferToSafePoint_ = input.readBool();
               break;
             }
-            case 96: {
+            case 120: {
 
-              isTransferToMainHousePoint_ = input.readBool();
+              targetPoint_ = input.readUInt32();
               break;
             }
             default: {
@@ -144,10 +139,10 @@ public final class TryEnterHomeReqOuterClass {
               emu.grasscutter.net.proto.TryEnterHomeReqOuterClass.TryEnterHomeReq.class, emu.grasscutter.net.proto.TryEnterHomeReqOuterClass.TryEnterHomeReq.Builder.class);
     }
 
-    public static final int TARGET_UID_FIELD_NUMBER = 4;
+    public static final int TARGET_UID_FIELD_NUMBER = 7;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 4;</code>
+     * <code>uint32 target_uid = 7;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -155,10 +150,21 @@ public final class TryEnterHomeReqOuterClass {
       return targetUid_;
     }
 
-    public static final int IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER = 9;
+    public static final int IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER = 1;
+    private boolean isTransferToMainHousePoint_;
+    /**
+     * <code>bool is_transfer_to_main_house_point = 1;</code>
+     * @return The isTransferToMainHousePoint.
+     */
+    @java.lang.Override
+    public boolean getIsTransferToMainHousePoint() {
+      return isTransferToMainHousePoint_;
+    }
+
+    public static final int IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER = 11;
     private boolean isTransferToSafePoint_;
     /**
-     * <code>bool is_transfer_to_safe_point = 9;</code>
+     * <code>bool is_transfer_to_safe_point = 11;</code>
      * @return The isTransferToSafePoint.
      */
     @java.lang.Override
@@ -166,10 +172,10 @@ public final class TryEnterHomeReqOuterClass {
       return isTransferToSafePoint_;
     }
 
-    public static final int TARGET_POINT_FIELD_NUMBER = 5;
+    public static final int TARGET_POINT_FIELD_NUMBER = 15;
     private int targetPoint_;
     /**
-     * <code>uint32 target_point = 5;</code>
+     * <code>uint32 target_point = 15;</code>
      * @return The targetPoint.
      */
     @java.lang.Override
@@ -177,17 +183,6 @@ public final class TryEnterHomeReqOuterClass {
       return targetPoint_;
     }
 
-    public static final int IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER = 12;
-    private boolean isTransferToMainHousePoint_;
-    /**
-     * <code>bool is_transfer_to_main_house_point = 12;</code>
-     * @return The isTransferToMainHousePoint.
-     */
-    @java.lang.Override
-    public boolean getIsTransferToMainHousePoint() {
-      return isTransferToMainHousePoint_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -202,17 +197,17 @@ public final class TryEnterHomeReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetUid_ != 0) {
-        output.writeUInt32(4, targetUid_);
+      if (isTransferToMainHousePoint_ != false) {
+        output.writeBool(1, isTransferToMainHousePoint_);
       }
-      if (targetPoint_ != 0) {
-        output.writeUInt32(5, targetPoint_);
+      if (targetUid_ != 0) {
+        output.writeUInt32(7, targetUid_);
       }
       if (isTransferToSafePoint_ != false) {
-        output.writeBool(9, isTransferToSafePoint_);
+        output.writeBool(11, isTransferToSafePoint_);
       }
-      if (isTransferToMainHousePoint_ != false) {
-        output.writeBool(12, isTransferToMainHousePoint_);
+      if (targetPoint_ != 0) {
+        output.writeUInt32(15, targetPoint_);
       }
       unknownFields.writeTo(output);
     }
@@ -223,21 +218,21 @@ public final class TryEnterHomeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (isTransferToMainHousePoint_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1, isTransferToMainHousePoint_);
+      }
       if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, targetUid_);
-      }
-      if (targetPoint_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, targetPoint_);
+          .computeUInt32Size(7, targetUid_);
       }
       if (isTransferToSafePoint_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(9, isTransferToSafePoint_);
+          .computeBoolSize(11, isTransferToSafePoint_);
       }
-      if (isTransferToMainHousePoint_ != false) {
+      if (targetPoint_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isTransferToMainHousePoint_);
+          .computeUInt32Size(15, targetPoint_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -256,12 +251,12 @@ public final class TryEnterHomeReqOuterClass {
 
       if (getTargetUid()
           != other.getTargetUid()) return false;
+      if (getIsTransferToMainHousePoint()
+          != other.getIsTransferToMainHousePoint()) return false;
       if (getIsTransferToSafePoint()
           != other.getIsTransferToSafePoint()) return false;
       if (getTargetPoint()
           != other.getTargetPoint()) return false;
-      if (getIsTransferToMainHousePoint()
-          != other.getIsTransferToMainHousePoint()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,14 +270,14 @@ public final class TryEnterHomeReqOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
+      hash = (37 * hash) + IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsTransferToMainHousePoint());
       hash = (37 * hash) + IS_TRANSFER_TO_SAFE_POINT_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsTransferToSafePoint());
       hash = (37 * hash) + TARGET_POINT_FIELD_NUMBER;
       hash = (53 * hash) + getTargetPoint();
-      hash = (37 * hash) + IS_TRANSFER_TO_MAIN_HOUSE_POINT_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsTransferToMainHousePoint());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -379,11 +374,6 @@ public final class TryEnterHomeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26594
-     * Obf: EPFFLHEAHIE
-     * </pre>
-     *
      * Protobuf type {@code TryEnterHomeReq}
      */
     public static final class Builder extends
@@ -423,12 +413,12 @@ public final class TryEnterHomeReqOuterClass {
         super.clear();
         targetUid_ = 0;
 
+        isTransferToMainHousePoint_ = false;
+
         isTransferToSafePoint_ = false;
 
         targetPoint_ = 0;
 
-        isTransferToMainHousePoint_ = false;
-
         return this;
       }
 
@@ -456,9 +446,9 @@ public final class TryEnterHomeReqOuterClass {
       public emu.grasscutter.net.proto.TryEnterHomeReqOuterClass.TryEnterHomeReq buildPartial() {
         emu.grasscutter.net.proto.TryEnterHomeReqOuterClass.TryEnterHomeReq result = new emu.grasscutter.net.proto.TryEnterHomeReqOuterClass.TryEnterHomeReq(this);
         result.targetUid_ = targetUid_;
+        result.isTransferToMainHousePoint_ = isTransferToMainHousePoint_;
         result.isTransferToSafePoint_ = isTransferToSafePoint_;
         result.targetPoint_ = targetPoint_;
-        result.isTransferToMainHousePoint_ = isTransferToMainHousePoint_;
         onBuilt();
         return result;
       }
@@ -510,15 +500,15 @@ public final class TryEnterHomeReqOuterClass {
         if (other.getTargetUid() != 0) {
           setTargetUid(other.getTargetUid());
         }
+        if (other.getIsTransferToMainHousePoint() != false) {
+          setIsTransferToMainHousePoint(other.getIsTransferToMainHousePoint());
+        }
         if (other.getIsTransferToSafePoint() != false) {
           setIsTransferToSafePoint(other.getIsTransferToSafePoint());
         }
         if (other.getTargetPoint() != 0) {
           setTargetPoint(other.getTargetPoint());
         }
-        if (other.getIsTransferToMainHousePoint() != false) {
-          setIsTransferToMainHousePoint(other.getIsTransferToMainHousePoint());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -550,7 +540,7 @@ public final class TryEnterHomeReqOuterClass {
 
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -558,7 +548,7 @@ public final class TryEnterHomeReqOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -569,7 +559,7 @@ public final class TryEnterHomeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 4;</code>
+       * <code>uint32 target_uid = 7;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -579,9 +569,40 @@ public final class TryEnterHomeReqOuterClass {
         return this;
       }
 
+      private boolean isTransferToMainHousePoint_ ;
+      /**
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
+       * @return The isTransferToMainHousePoint.
+       */
+      @java.lang.Override
+      public boolean getIsTransferToMainHousePoint() {
+        return isTransferToMainHousePoint_;
+      }
+      /**
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
+       * @param value The isTransferToMainHousePoint to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsTransferToMainHousePoint(boolean value) {
+        
+        isTransferToMainHousePoint_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_transfer_to_main_house_point = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsTransferToMainHousePoint() {
+        
+        isTransferToMainHousePoint_ = false;
+        onChanged();
+        return this;
+      }
+
       private boolean isTransferToSafePoint_ ;
       /**
-       * <code>bool is_transfer_to_safe_point = 9;</code>
+       * <code>bool is_transfer_to_safe_point = 11;</code>
        * @return The isTransferToSafePoint.
        */
       @java.lang.Override
@@ -589,7 +610,7 @@ public final class TryEnterHomeReqOuterClass {
         return isTransferToSafePoint_;
       }
       /**
-       * <code>bool is_transfer_to_safe_point = 9;</code>
+       * <code>bool is_transfer_to_safe_point = 11;</code>
        * @param value The isTransferToSafePoint to set.
        * @return This builder for chaining.
        */
@@ -600,7 +621,7 @@ public final class TryEnterHomeReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_transfer_to_safe_point = 9;</code>
+       * <code>bool is_transfer_to_safe_point = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsTransferToSafePoint() {
@@ -612,7 +633,7 @@ public final class TryEnterHomeReqOuterClass {
 
       private int targetPoint_ ;
       /**
-       * <code>uint32 target_point = 5;</code>
+       * <code>uint32 target_point = 15;</code>
        * @return The targetPoint.
        */
       @java.lang.Override
@@ -620,7 +641,7 @@ public final class TryEnterHomeReqOuterClass {
         return targetPoint_;
       }
       /**
-       * <code>uint32 target_point = 5;</code>
+       * <code>uint32 target_point = 15;</code>
        * @param value The targetPoint to set.
        * @return This builder for chaining.
        */
@@ -631,7 +652,7 @@ public final class TryEnterHomeReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_point = 5;</code>
+       * <code>uint32 target_point = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetPoint() {
@@ -640,37 +661,6 @@ public final class TryEnterHomeReqOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean isTransferToMainHousePoint_ ;
-      /**
-       * <code>bool is_transfer_to_main_house_point = 12;</code>
-       * @return The isTransferToMainHousePoint.
-       */
-      @java.lang.Override
-      public boolean getIsTransferToMainHousePoint() {
-        return isTransferToMainHousePoint_;
-      }
-      /**
-       * <code>bool is_transfer_to_main_house_point = 12;</code>
-       * @param value The isTransferToMainHousePoint to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsTransferToMainHousePoint(boolean value) {
-        
-        isTransferToMainHousePoint_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_transfer_to_main_house_point = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsTransferToMainHousePoint() {
-        
-        isTransferToMainHousePoint_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -739,10 +729,10 @@ public final class TryEnterHomeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025TryEnterHomeReq.proto\"\207\001\n\017TryEnterHome" +
-      "Req\022\022\n\ntarget_uid\030\004 \001(\r\022!\n\031is_transfer_t" +
-      "o_safe_point\030\t \001(\010\022\024\n\014target_point\030\005 \001(\r" +
-      "\022\'\n\037is_transfer_to_main_house_point\030\014 \001(" +
-      "\010B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "Req\022\022\n\ntarget_uid\030\007 \001(\r\022\'\n\037is_transfer_t" +
+      "o_main_house_point\030\001 \001(\010\022!\n\031is_transfer_" +
+      "to_safe_point\030\013 \001(\010\022\024\n\014target_point\030\017 \001(" +
+      "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -753,7 +743,7 @@ public final class TryEnterHomeReqOuterClass {
     internal_static_TryEnterHomeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TryEnterHomeReq_descriptor,
-        new java.lang.String[] { "TargetUid", "IsTransferToSafePoint", "TargetPoint", "IsTransferToMainHousePoint", });
+        new java.lang.String[] { "TargetUid", "IsTransferToMainHousePoint", "IsTransferToSafePoint", "TargetPoint", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeRspOuterClass.java
index 58de9eb4b..7ff44c4cb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/TryEnterHomeRspOuterClass.java
@@ -18,6 +18,12 @@ public final class TryEnterHomeRspOuterClass {
       // @@protoc_insertion_point(interface_extends:TryEnterHomeRsp)
       com.google.protobuf.MessageOrBuilder {
 
+    /**
+     * <code>int32 retcode = 6;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
     /**
      * <code>repeated uint32 param_list = 8;</code>
      * @return A list containing the paramList.
@@ -36,23 +42,12 @@ public final class TryEnterHomeRspOuterClass {
     int getParamList(int index);
 
     /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>uint32 target_uid = 6;</code>
+     * <code>uint32 target_uid = 9;</code>
      * @return The targetUid.
      */
     int getTargetUid();
   }
   /**
-   * <pre>
-   * CmdId: 351
-   * Obf: NDAPMOBJOBI
-   * </pre>
-   *
    * Protobuf type {@code TryEnterHomeRsp}
    */
   public static final class TryEnterHomeRsp extends
@@ -101,7 +96,7 @@ public final class TryEnterHomeRspOuterClass {
               break;
             case 48: {
 
-              targetUid_ = input.readUInt32();
+              retcode_ = input.readInt32();
               break;
             }
             case 64: {
@@ -125,9 +120,9 @@ public final class TryEnterHomeRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 104: {
+            case 72: {
 
-              retcode_ = input.readInt32();
+              targetUid_ = input.readUInt32();
               break;
             }
             default: {
@@ -165,6 +160,17 @@ public final class TryEnterHomeRspOuterClass {
               emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.class, emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.Builder.class);
     }
 
+    public static final int RETCODE_FIELD_NUMBER = 6;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 6;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
     public static final int PARAM_LIST_FIELD_NUMBER = 8;
     private com.google.protobuf.Internal.IntList paramList_;
     /**
@@ -193,21 +199,10 @@ public final class TryEnterHomeRspOuterClass {
     }
     private int paramListMemoizedSerializedSize = -1;
 
-    public static final int RETCODE_FIELD_NUMBER = 13;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 13;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int TARGET_UID_FIELD_NUMBER = 6;
+    public static final int TARGET_UID_FIELD_NUMBER = 9;
     private int targetUid_;
     /**
-     * <code>uint32 target_uid = 6;</code>
+     * <code>uint32 target_uid = 9;</code>
      * @return The targetUid.
      */
     @java.lang.Override
@@ -230,8 +225,8 @@ public final class TryEnterHomeRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (targetUid_ != 0) {
-        output.writeUInt32(6, targetUid_);
+      if (retcode_ != 0) {
+        output.writeInt32(6, retcode_);
       }
       if (getParamListList().size() > 0) {
         output.writeUInt32NoTag(66);
@@ -240,8 +235,8 @@ public final class TryEnterHomeRspOuterClass {
       for (int i = 0; i < paramList_.size(); i++) {
         output.writeUInt32NoTag(paramList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(13, retcode_);
+      if (targetUid_ != 0) {
+        output.writeUInt32(9, targetUid_);
       }
       unknownFields.writeTo(output);
     }
@@ -252,9 +247,9 @@ public final class TryEnterHomeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (targetUid_ != 0) {
+      if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, targetUid_);
+          .computeInt32Size(6, retcode_);
       }
       {
         int dataSize = 0;
@@ -270,9 +265,9 @@ public final class TryEnterHomeRspOuterClass {
         }
         paramListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
+      if (targetUid_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(13, retcode_);
+          .computeUInt32Size(9, targetUid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -289,10 +284,10 @@ public final class TryEnterHomeRspOuterClass {
       }
       emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp other = (emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp) obj;
 
-      if (!getParamListList()
-          .equals(other.getParamListList())) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (!getParamListList()
+          .equals(other.getParamListList())) return false;
       if (getTargetUid()
           != other.getTargetUid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -306,12 +301,12 @@ public final class TryEnterHomeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       if (getParamListCount() > 0) {
         hash = (37 * hash) + PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParamListList().hashCode();
       }
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_UID_FIELD_NUMBER;
       hash = (53 * hash) + getTargetUid();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -410,11 +405,6 @@ public final class TryEnterHomeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 351
-     * Obf: NDAPMOBJOBI
-     * </pre>
-     *
      * Protobuf type {@code TryEnterHomeRsp}
      */
     public static final class Builder extends
@@ -452,10 +442,10 @@ public final class TryEnterHomeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        paramList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         retcode_ = 0;
 
+        paramList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         targetUid_ = 0;
 
         return this;
@@ -485,12 +475,12 @@ public final class TryEnterHomeRspOuterClass {
       public emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp buildPartial() {
         emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp result = new emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp(this);
         int from_bitField0_ = bitField0_;
+        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           paramList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.paramList_ = paramList_;
-        result.retcode_ = retcode_;
         result.targetUid_ = targetUid_;
         onBuilt();
         return result;
@@ -540,6 +530,9 @@ public final class TryEnterHomeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp other) {
         if (other == emu.grasscutter.net.proto.TryEnterHomeRspOuterClass.TryEnterHomeRsp.getDefaultInstance()) return this;
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (!other.paramList_.isEmpty()) {
           if (paramList_.isEmpty()) {
             paramList_ = other.paramList_;
@@ -550,9 +543,6 @@ public final class TryEnterHomeRspOuterClass {
           }
           onChanged();
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.getTargetUid() != 0) {
           setTargetUid(other.getTargetUid());
         }
@@ -586,6 +576,37 @@ public final class TryEnterHomeRspOuterClass {
       }
       private int bitField0_;
 
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 6;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 6;</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 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList paramList_ = emptyIntList();
       private void ensureParamListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -665,40 +686,9 @@ public final class TryEnterHomeRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 13;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 13;</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 = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int targetUid_ ;
       /**
-       * <code>uint32 target_uid = 6;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return The targetUid.
        */
       @java.lang.Override
@@ -706,7 +696,7 @@ public final class TryEnterHomeRspOuterClass {
         return targetUid_;
       }
       /**
-       * <code>uint32 target_uid = 6;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @param value The targetUid to set.
        * @return This builder for chaining.
        */
@@ -717,7 +707,7 @@ public final class TryEnterHomeRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 target_uid = 6;</code>
+       * <code>uint32 target_uid = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetUid() {
@@ -794,8 +784,8 @@ public final class TryEnterHomeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025TryEnterHomeRsp.proto\"J\n\017TryEnterHomeR" +
-      "sp\022\022\n\nparam_list\030\010 \003(\r\022\017\n\007retcode\030\r \001(\005\022" +
-      "\022\n\ntarget_uid\030\006 \001(\rB\033\n\031emu.grasscutter.n" +
+      "sp\022\017\n\007retcode\030\006 \001(\005\022\022\n\nparam_list\030\010 \003(\r\022" +
+      "\022\n\ntarget_uid\030\t \001(\rB\033\n\031emu.grasscutter.n" +
       "et.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -807,7 +797,7 @@ public final class TryEnterHomeRspOuterClass {
     internal_static_TryEnterHomeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TryEnterHomeRsp_descriptor,
-        new java.lang.String[] { "ParamList", "Retcode", "TargetUid", });
+        new java.lang.String[] { "Retcode", "ParamList", "TargetUid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonBriefOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonBriefOuterClass.java
new file mode 100644
index 000000000..3b2b11c6a
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonBriefOuterClass.java
@@ -0,0 +1,1810 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: UgcDungeonBrief.proto
+
+package emu.grasscutter.net.proto;
+
+public final class UgcDungeonBriefOuterClass {
+  private UgcDungeonBriefOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface UgcDungeonBriefOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:UgcDungeonBrief)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint32 PEIOEFBCMFP = 1;</code>
+     * @return The pEIOEFBCMFP.
+     */
+    int getPEIOEFBCMFP();
+
+    /**
+     * <code>bool DHAOMGMMDPD = 2;</code>
+     * @return The dHAOMGMMDPD.
+     */
+    boolean getDHAOMGMMDPD();
+
+    /**
+     * <code>string EBBPBOEJJPP = 3;</code>
+     * @return The eBBPBOEJJPP.
+     */
+    java.lang.String getEBBPBOEJJPP();
+    /**
+     * <code>string EBBPBOEJJPP = 3;</code>
+     * @return The bytes for eBBPBOEJJPP.
+     */
+    com.google.protobuf.ByteString
+        getEBBPBOEJJPPBytes();
+
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @return A list containing the tagList.
+     */
+    java.util.List<java.lang.Integer> getTagListList();
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @return The count of tagList.
+     */
+    int getTagListCount();
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The tagList at the given index.
+     */
+    int getTagList(int index);
+
+    /**
+     * <pre>
+     *EKPABLIFILG JAPDKNHENLD = 5;
+     *DFAFGEPBLDO EHLOECHHEPI = 6;
+     * </pre>
+     *
+     * <code>uint32 KFEHEOJCKLB = 7;</code>
+     * @return The kFEHEOJCKLB.
+     */
+    int getKFEHEOJCKLB();
+
+    /**
+     * <pre>
+     *repeated NPFPJAHEIDH KOHLIMEPNPM = 8;
+     * </pre>
+     *
+     * <code>uint32 OPPFABKNMMB = 9;</code>
+     * @return The oPPFABKNMMB.
+     */
+    int getOPPFABKNMMB();
+
+    /**
+     * <code>uint32 dungeon_id = 10;</code>
+     * @return The dungeonId.
+     */
+    int getDungeonId();
+
+    /**
+     * <pre>
+     *KBMIGNFIMKF FPOJGLANECO = 11;
+     * </pre>
+     *
+     * <code>uint64 dungeon_guid = 12;</code>
+     * @return The dungeonGuid.
+     */
+    long getDungeonGuid();
+
+    /**
+     * <code>string DPPIBJFOMOC = 13;</code>
+     * @return The dPPIBJFOMOC.
+     */
+    java.lang.String getDPPIBJFOMOC();
+    /**
+     * <code>string DPPIBJFOMOC = 13;</code>
+     * @return The bytes for dPPIBJFOMOC.
+     */
+    com.google.protobuf.ByteString
+        getDPPIBJFOMOCBytes();
+
+    /**
+     * <code>uint32 IIACGGOGMLP = 14;</code>
+     * @return The iIACGGOGMLP.
+     */
+    int getIIACGGOGMLP();
+
+    /**
+     * <code>bool JFOEEKHEIMO = 15;</code>
+     * @return The jFOEEKHEIMO.
+     */
+    boolean getJFOEEKHEIMO();
+
+    /**
+     * <code>bool PFLAJCKEHFA = 838;</code>
+     * @return The pFLAJCKEHFA.
+     */
+    boolean getPFLAJCKEHFA();
+
+    /**
+     * <code>uint32 DGBMJCFHLBB = 910;</code>
+     * @return The dGBMJCFHLBB.
+     */
+    int getDGBMJCFHLBB();
+
+    /**
+     * <code>bool ANICOPJPCFM = 1448;</code>
+     * @return The aNICOPJPCFM.
+     */
+    boolean getANICOPJPCFM();
+  }
+  /**
+   * Protobuf type {@code UgcDungeonBrief}
+   */
+  public static final class UgcDungeonBrief extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:UgcDungeonBrief)
+      UgcDungeonBriefOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use UgcDungeonBrief.newBuilder() to construct.
+    private UgcDungeonBrief(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private UgcDungeonBrief() {
+      eBBPBOEJJPP_ = "";
+      tagList_ = emptyIntList();
+      dPPIBJFOMOC_ = "";
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new UgcDungeonBrief();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private UgcDungeonBrief(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              pEIOEFBCMFP_ = input.readUInt32();
+              break;
+            }
+            case 16: {
+
+              dHAOMGMMDPD_ = input.readBool();
+              break;
+            }
+            case 26: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              eBBPBOEJJPP_ = s;
+              break;
+            }
+            case 32: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                tagList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              tagList_.addInt(input.readUInt32());
+              break;
+            }
+            case 34: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                tagList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                tagList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 56: {
+
+              kFEHEOJCKLB_ = input.readUInt32();
+              break;
+            }
+            case 72: {
+
+              oPPFABKNMMB_ = input.readUInt32();
+              break;
+            }
+            case 80: {
+
+              dungeonId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              dungeonGuid_ = input.readUInt64();
+              break;
+            }
+            case 106: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              dPPIBJFOMOC_ = s;
+              break;
+            }
+            case 112: {
+
+              iIACGGOGMLP_ = input.readUInt32();
+              break;
+            }
+            case 120: {
+
+              jFOEEKHEIMO_ = input.readBool();
+              break;
+            }
+            case 6704: {
+
+              pFLAJCKEHFA_ = input.readBool();
+              break;
+            }
+            case 7280: {
+
+              dGBMJCFHLBB_ = input.readUInt32();
+              break;
+            }
+            case 11584: {
+
+              aNICOPJPCFM_ = input.readBool();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          tagList_.makeImmutable(); // C
+        }
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.internal_static_UgcDungeonBrief_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.internal_static_UgcDungeonBrief_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.class, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder.class);
+    }
+
+    public static final int PEIOEFBCMFP_FIELD_NUMBER = 1;
+    private int pEIOEFBCMFP_;
+    /**
+     * <code>uint32 PEIOEFBCMFP = 1;</code>
+     * @return The pEIOEFBCMFP.
+     */
+    @java.lang.Override
+    public int getPEIOEFBCMFP() {
+      return pEIOEFBCMFP_;
+    }
+
+    public static final int DHAOMGMMDPD_FIELD_NUMBER = 2;
+    private boolean dHAOMGMMDPD_;
+    /**
+     * <code>bool DHAOMGMMDPD = 2;</code>
+     * @return The dHAOMGMMDPD.
+     */
+    @java.lang.Override
+    public boolean getDHAOMGMMDPD() {
+      return dHAOMGMMDPD_;
+    }
+
+    public static final int EBBPBOEJJPP_FIELD_NUMBER = 3;
+    private volatile java.lang.Object eBBPBOEJJPP_;
+    /**
+     * <code>string EBBPBOEJJPP = 3;</code>
+     * @return The eBBPBOEJJPP.
+     */
+    @java.lang.Override
+    public java.lang.String getEBBPBOEJJPP() {
+      java.lang.Object ref = eBBPBOEJJPP_;
+      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();
+        eBBPBOEJJPP_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string EBBPBOEJJPP = 3;</code>
+     * @return The bytes for eBBPBOEJJPP.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getEBBPBOEJJPPBytes() {
+      java.lang.Object ref = eBBPBOEJJPP_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        eBBPBOEJJPP_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int TAG_LIST_FIELD_NUMBER = 4;
+    private com.google.protobuf.Internal.IntList tagList_;
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @return A list containing the tagList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Integer>
+        getTagListList() {
+      return tagList_;
+    }
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @return The count of tagList.
+     */
+    public int getTagListCount() {
+      return tagList_.size();
+    }
+    /**
+     * <code>repeated uint32 tag_list = 4;</code>
+     * @param index The index of the element to return.
+     * @return The tagList at the given index.
+     */
+    public int getTagList(int index) {
+      return tagList_.getInt(index);
+    }
+    private int tagListMemoizedSerializedSize = -1;
+
+    public static final int KFEHEOJCKLB_FIELD_NUMBER = 7;
+    private int kFEHEOJCKLB_;
+    /**
+     * <pre>
+     *EKPABLIFILG JAPDKNHENLD = 5;
+     *DFAFGEPBLDO EHLOECHHEPI = 6;
+     * </pre>
+     *
+     * <code>uint32 KFEHEOJCKLB = 7;</code>
+     * @return The kFEHEOJCKLB.
+     */
+    @java.lang.Override
+    public int getKFEHEOJCKLB() {
+      return kFEHEOJCKLB_;
+    }
+
+    public static final int OPPFABKNMMB_FIELD_NUMBER = 9;
+    private int oPPFABKNMMB_;
+    /**
+     * <pre>
+     *repeated NPFPJAHEIDH KOHLIMEPNPM = 8;
+     * </pre>
+     *
+     * <code>uint32 OPPFABKNMMB = 9;</code>
+     * @return The oPPFABKNMMB.
+     */
+    @java.lang.Override
+    public int getOPPFABKNMMB() {
+      return oPPFABKNMMB_;
+    }
+
+    public static final int DUNGEON_ID_FIELD_NUMBER = 10;
+    private int dungeonId_;
+    /**
+     * <code>uint32 dungeon_id = 10;</code>
+     * @return The dungeonId.
+     */
+    @java.lang.Override
+    public int getDungeonId() {
+      return dungeonId_;
+    }
+
+    public static final int DUNGEON_GUID_FIELD_NUMBER = 12;
+    private long dungeonGuid_;
+    /**
+     * <pre>
+     *KBMIGNFIMKF FPOJGLANECO = 11;
+     * </pre>
+     *
+     * <code>uint64 dungeon_guid = 12;</code>
+     * @return The dungeonGuid.
+     */
+    @java.lang.Override
+    public long getDungeonGuid() {
+      return dungeonGuid_;
+    }
+
+    public static final int DPPIBJFOMOC_FIELD_NUMBER = 13;
+    private volatile java.lang.Object dPPIBJFOMOC_;
+    /**
+     * <code>string DPPIBJFOMOC = 13;</code>
+     * @return The dPPIBJFOMOC.
+     */
+    @java.lang.Override
+    public java.lang.String getDPPIBJFOMOC() {
+      java.lang.Object ref = dPPIBJFOMOC_;
+      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();
+        dPPIBJFOMOC_ = s;
+        return s;
+      }
+    }
+    /**
+     * <code>string DPPIBJFOMOC = 13;</code>
+     * @return The bytes for dPPIBJFOMOC.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString
+        getDPPIBJFOMOCBytes() {
+      java.lang.Object ref = dPPIBJFOMOC_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        dPPIBJFOMOC_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    public static final int IIACGGOGMLP_FIELD_NUMBER = 14;
+    private int iIACGGOGMLP_;
+    /**
+     * <code>uint32 IIACGGOGMLP = 14;</code>
+     * @return The iIACGGOGMLP.
+     */
+    @java.lang.Override
+    public int getIIACGGOGMLP() {
+      return iIACGGOGMLP_;
+    }
+
+    public static final int JFOEEKHEIMO_FIELD_NUMBER = 15;
+    private boolean jFOEEKHEIMO_;
+    /**
+     * <code>bool JFOEEKHEIMO = 15;</code>
+     * @return The jFOEEKHEIMO.
+     */
+    @java.lang.Override
+    public boolean getJFOEEKHEIMO() {
+      return jFOEEKHEIMO_;
+    }
+
+    public static final int PFLAJCKEHFA_FIELD_NUMBER = 838;
+    private boolean pFLAJCKEHFA_;
+    /**
+     * <code>bool PFLAJCKEHFA = 838;</code>
+     * @return The pFLAJCKEHFA.
+     */
+    @java.lang.Override
+    public boolean getPFLAJCKEHFA() {
+      return pFLAJCKEHFA_;
+    }
+
+    public static final int DGBMJCFHLBB_FIELD_NUMBER = 910;
+    private int dGBMJCFHLBB_;
+    /**
+     * <code>uint32 DGBMJCFHLBB = 910;</code>
+     * @return The dGBMJCFHLBB.
+     */
+    @java.lang.Override
+    public int getDGBMJCFHLBB() {
+      return dGBMJCFHLBB_;
+    }
+
+    public static final int ANICOPJPCFM_FIELD_NUMBER = 1448;
+    private boolean aNICOPJPCFM_;
+    /**
+     * <code>bool ANICOPJPCFM = 1448;</code>
+     * @return The aNICOPJPCFM.
+     */
+    @java.lang.Override
+    public boolean getANICOPJPCFM() {
+      return aNICOPJPCFM_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (pEIOEFBCMFP_ != 0) {
+        output.writeUInt32(1, pEIOEFBCMFP_);
+      }
+      if (dHAOMGMMDPD_ != false) {
+        output.writeBool(2, dHAOMGMMDPD_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eBBPBOEJJPP_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 3, eBBPBOEJJPP_);
+      }
+      if (getTagListList().size() > 0) {
+        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(tagListMemoizedSerializedSize);
+      }
+      for (int i = 0; i < tagList_.size(); i++) {
+        output.writeUInt32NoTag(tagList_.getInt(i));
+      }
+      if (kFEHEOJCKLB_ != 0) {
+        output.writeUInt32(7, kFEHEOJCKLB_);
+      }
+      if (oPPFABKNMMB_ != 0) {
+        output.writeUInt32(9, oPPFABKNMMB_);
+      }
+      if (dungeonId_ != 0) {
+        output.writeUInt32(10, dungeonId_);
+      }
+      if (dungeonGuid_ != 0L) {
+        output.writeUInt64(12, dungeonGuid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dPPIBJFOMOC_)) {
+        com.google.protobuf.GeneratedMessageV3.writeString(output, 13, dPPIBJFOMOC_);
+      }
+      if (iIACGGOGMLP_ != 0) {
+        output.writeUInt32(14, iIACGGOGMLP_);
+      }
+      if (jFOEEKHEIMO_ != false) {
+        output.writeBool(15, jFOEEKHEIMO_);
+      }
+      if (pFLAJCKEHFA_ != false) {
+        output.writeBool(838, pFLAJCKEHFA_);
+      }
+      if (dGBMJCFHLBB_ != 0) {
+        output.writeUInt32(910, dGBMJCFHLBB_);
+      }
+      if (aNICOPJPCFM_ != false) {
+        output.writeBool(1448, aNICOPJPCFM_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (pEIOEFBCMFP_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(1, pEIOEFBCMFP_);
+      }
+      if (dHAOMGMMDPD_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(2, dHAOMGMMDPD_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(eBBPBOEJJPP_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, eBBPBOEJJPP_);
+      }
+      {
+        int dataSize = 0;
+        for (int i = 0; i < tagList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt32SizeNoTag(tagList_.getInt(i));
+        }
+        size += dataSize;
+        if (!getTagListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        tagListMemoizedSerializedSize = dataSize;
+      }
+      if (kFEHEOJCKLB_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, kFEHEOJCKLB_);
+      }
+      if (oPPFABKNMMB_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, oPPFABKNMMB_);
+      }
+      if (dungeonId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, dungeonId_);
+      }
+      if (dungeonGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(12, dungeonGuid_);
+      }
+      if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(dPPIBJFOMOC_)) {
+        size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, dPPIBJFOMOC_);
+      }
+      if (iIACGGOGMLP_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(14, iIACGGOGMLP_);
+      }
+      if (jFOEEKHEIMO_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(15, jFOEEKHEIMO_);
+      }
+      if (pFLAJCKEHFA_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(838, pFLAJCKEHFA_);
+      }
+      if (dGBMJCFHLBB_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(910, dGBMJCFHLBB_);
+      }
+      if (aNICOPJPCFM_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(1448, aNICOPJPCFM_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief other = (emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief) obj;
+
+      if (getPEIOEFBCMFP()
+          != other.getPEIOEFBCMFP()) return false;
+      if (getDHAOMGMMDPD()
+          != other.getDHAOMGMMDPD()) return false;
+      if (!getEBBPBOEJJPP()
+          .equals(other.getEBBPBOEJJPP())) return false;
+      if (!getTagListList()
+          .equals(other.getTagListList())) return false;
+      if (getKFEHEOJCKLB()
+          != other.getKFEHEOJCKLB()) return false;
+      if (getOPPFABKNMMB()
+          != other.getOPPFABKNMMB()) return false;
+      if (getDungeonId()
+          != other.getDungeonId()) return false;
+      if (getDungeonGuid()
+          != other.getDungeonGuid()) return false;
+      if (!getDPPIBJFOMOC()
+          .equals(other.getDPPIBJFOMOC())) return false;
+      if (getIIACGGOGMLP()
+          != other.getIIACGGOGMLP()) return false;
+      if (getJFOEEKHEIMO()
+          != other.getJFOEEKHEIMO()) return false;
+      if (getPFLAJCKEHFA()
+          != other.getPFLAJCKEHFA()) return false;
+      if (getDGBMJCFHLBB()
+          != other.getDGBMJCFHLBB()) return false;
+      if (getANICOPJPCFM()
+          != other.getANICOPJPCFM()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + PEIOEFBCMFP_FIELD_NUMBER;
+      hash = (53 * hash) + getPEIOEFBCMFP();
+      hash = (37 * hash) + DHAOMGMMDPD_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getDHAOMGMMDPD());
+      hash = (37 * hash) + EBBPBOEJJPP_FIELD_NUMBER;
+      hash = (53 * hash) + getEBBPBOEJJPP().hashCode();
+      if (getTagListCount() > 0) {
+        hash = (37 * hash) + TAG_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getTagListList().hashCode();
+      }
+      hash = (37 * hash) + KFEHEOJCKLB_FIELD_NUMBER;
+      hash = (53 * hash) + getKFEHEOJCKLB();
+      hash = (37 * hash) + OPPFABKNMMB_FIELD_NUMBER;
+      hash = (53 * hash) + getOPPFABKNMMB();
+      hash = (37 * hash) + DUNGEON_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getDungeonId();
+      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDungeonGuid());
+      hash = (37 * hash) + DPPIBJFOMOC_FIELD_NUMBER;
+      hash = (53 * hash) + getDPPIBJFOMOC().hashCode();
+      hash = (37 * hash) + IIACGGOGMLP_FIELD_NUMBER;
+      hash = (53 * hash) + getIIACGGOGMLP();
+      hash = (37 * hash) + JFOEEKHEIMO_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getJFOEEKHEIMO());
+      hash = (37 * hash) + PFLAJCKEHFA_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getPFLAJCKEHFA());
+      hash = (37 * hash) + DGBMJCFHLBB_FIELD_NUMBER;
+      hash = (53 * hash) + getDGBMJCFHLBB();
+      hash = (37 * hash) + ANICOPJPCFM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getANICOPJPCFM());
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code UgcDungeonBrief}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:UgcDungeonBrief)
+        emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBriefOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.internal_static_UgcDungeonBrief_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.internal_static_UgcDungeonBrief_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.class, emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        pEIOEFBCMFP_ = 0;
+
+        dHAOMGMMDPD_ = false;
+
+        eBBPBOEJJPP_ = "";
+
+        tagList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        kFEHEOJCKLB_ = 0;
+
+        oPPFABKNMMB_ = 0;
+
+        dungeonId_ = 0;
+
+        dungeonGuid_ = 0L;
+
+        dPPIBJFOMOC_ = "";
+
+        iIACGGOGMLP_ = 0;
+
+        jFOEEKHEIMO_ = false;
+
+        pFLAJCKEHFA_ = false;
+
+        dGBMJCFHLBB_ = 0;
+
+        aNICOPJPCFM_ = false;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.internal_static_UgcDungeonBrief_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief build() {
+        emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief buildPartial() {
+        emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief result = new emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief(this);
+        int from_bitField0_ = bitField0_;
+        result.pEIOEFBCMFP_ = pEIOEFBCMFP_;
+        result.dHAOMGMMDPD_ = dHAOMGMMDPD_;
+        result.eBBPBOEJJPP_ = eBBPBOEJJPP_;
+        if (((bitField0_ & 0x00000001) != 0)) {
+          tagList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.tagList_ = tagList_;
+        result.kFEHEOJCKLB_ = kFEHEOJCKLB_;
+        result.oPPFABKNMMB_ = oPPFABKNMMB_;
+        result.dungeonId_ = dungeonId_;
+        result.dungeonGuid_ = dungeonGuid_;
+        result.dPPIBJFOMOC_ = dPPIBJFOMOC_;
+        result.iIACGGOGMLP_ = iIACGGOGMLP_;
+        result.jFOEEKHEIMO_ = jFOEEKHEIMO_;
+        result.pFLAJCKEHFA_ = pFLAJCKEHFA_;
+        result.dGBMJCFHLBB_ = dGBMJCFHLBB_;
+        result.aNICOPJPCFM_ = aNICOPJPCFM_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief) {
+          return mergeFrom((emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief other) {
+        if (other == emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief.getDefaultInstance()) return this;
+        if (other.getPEIOEFBCMFP() != 0) {
+          setPEIOEFBCMFP(other.getPEIOEFBCMFP());
+        }
+        if (other.getDHAOMGMMDPD() != false) {
+          setDHAOMGMMDPD(other.getDHAOMGMMDPD());
+        }
+        if (!other.getEBBPBOEJJPP().isEmpty()) {
+          eBBPBOEJJPP_ = other.eBBPBOEJJPP_;
+          onChanged();
+        }
+        if (!other.tagList_.isEmpty()) {
+          if (tagList_.isEmpty()) {
+            tagList_ = other.tagList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureTagListIsMutable();
+            tagList_.addAll(other.tagList_);
+          }
+          onChanged();
+        }
+        if (other.getKFEHEOJCKLB() != 0) {
+          setKFEHEOJCKLB(other.getKFEHEOJCKLB());
+        }
+        if (other.getOPPFABKNMMB() != 0) {
+          setOPPFABKNMMB(other.getOPPFABKNMMB());
+        }
+        if (other.getDungeonId() != 0) {
+          setDungeonId(other.getDungeonId());
+        }
+        if (other.getDungeonGuid() != 0L) {
+          setDungeonGuid(other.getDungeonGuid());
+        }
+        if (!other.getDPPIBJFOMOC().isEmpty()) {
+          dPPIBJFOMOC_ = other.dPPIBJFOMOC_;
+          onChanged();
+        }
+        if (other.getIIACGGOGMLP() != 0) {
+          setIIACGGOGMLP(other.getIIACGGOGMLP());
+        }
+        if (other.getJFOEEKHEIMO() != false) {
+          setJFOEEKHEIMO(other.getJFOEEKHEIMO());
+        }
+        if (other.getPFLAJCKEHFA() != false) {
+          setPFLAJCKEHFA(other.getPFLAJCKEHFA());
+        }
+        if (other.getDGBMJCFHLBB() != 0) {
+          setDGBMJCFHLBB(other.getDGBMJCFHLBB());
+        }
+        if (other.getANICOPJPCFM() != false) {
+          setANICOPJPCFM(other.getANICOPJPCFM());
+        }
+        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.UgcDungeonBriefOuterClass.UgcDungeonBrief parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+      private int bitField0_;
+
+      private int pEIOEFBCMFP_ ;
+      /**
+       * <code>uint32 PEIOEFBCMFP = 1;</code>
+       * @return The pEIOEFBCMFP.
+       */
+      @java.lang.Override
+      public int getPEIOEFBCMFP() {
+        return pEIOEFBCMFP_;
+      }
+      /**
+       * <code>uint32 PEIOEFBCMFP = 1;</code>
+       * @param value The pEIOEFBCMFP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPEIOEFBCMFP(int value) {
+        
+        pEIOEFBCMFP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 PEIOEFBCMFP = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPEIOEFBCMFP() {
+        
+        pEIOEFBCMFP_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean dHAOMGMMDPD_ ;
+      /**
+       * <code>bool DHAOMGMMDPD = 2;</code>
+       * @return The dHAOMGMMDPD.
+       */
+      @java.lang.Override
+      public boolean getDHAOMGMMDPD() {
+        return dHAOMGMMDPD_;
+      }
+      /**
+       * <code>bool DHAOMGMMDPD = 2;</code>
+       * @param value The dHAOMGMMDPD to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDHAOMGMMDPD(boolean value) {
+        
+        dHAOMGMMDPD_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool DHAOMGMMDPD = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDHAOMGMMDPD() {
+        
+        dHAOMGMMDPD_ = false;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object eBBPBOEJJPP_ = "";
+      /**
+       * <code>string EBBPBOEJJPP = 3;</code>
+       * @return The eBBPBOEJJPP.
+       */
+      public java.lang.String getEBBPBOEJJPP() {
+        java.lang.Object ref = eBBPBOEJJPP_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          eBBPBOEJJPP_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string EBBPBOEJJPP = 3;</code>
+       * @return The bytes for eBBPBOEJJPP.
+       */
+      public com.google.protobuf.ByteString
+          getEBBPBOEJJPPBytes() {
+        java.lang.Object ref = eBBPBOEJJPP_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          eBBPBOEJJPP_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string EBBPBOEJJPP = 3;</code>
+       * @param value The eBBPBOEJJPP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEBBPBOEJJPP(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        eBBPBOEJJPP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string EBBPBOEJJPP = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEBBPBOEJJPP() {
+        
+        eBBPBOEJJPP_ = getDefaultInstance().getEBBPBOEJJPP();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string EBBPBOEJJPP = 3;</code>
+       * @param value The bytes for eBBPBOEJJPP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEBBPBOEJJPPBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        eBBPBOEJJPP_ = value;
+        onChanged();
+        return this;
+      }
+
+      private com.google.protobuf.Internal.IntList tagList_ = emptyIntList();
+      private void ensureTagListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          tagList_ = mutableCopy(tagList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @return A list containing the tagList.
+       */
+      public java.util.List<java.lang.Integer>
+          getTagListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(tagList_) : tagList_;
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @return The count of tagList.
+       */
+      public int getTagListCount() {
+        return tagList_.size();
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @param index The index of the element to return.
+       * @return The tagList at the given index.
+       */
+      public int getTagList(int index) {
+        return tagList_.getInt(index);
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @param index The index to set the value at.
+       * @param value The tagList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTagList(
+          int index, int value) {
+        ensureTagListIsMutable();
+        tagList_.setInt(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @param value The tagList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addTagList(int value) {
+        ensureTagListIsMutable();
+        tagList_.addInt(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @param values The tagList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllTagList(
+          java.lang.Iterable<? extends java.lang.Integer> values) {
+        ensureTagListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, tagList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint32 tag_list = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTagList() {
+        tagList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int kFEHEOJCKLB_ ;
+      /**
+       * <pre>
+       *EKPABLIFILG JAPDKNHENLD = 5;
+       *DFAFGEPBLDO EHLOECHHEPI = 6;
+       * </pre>
+       *
+       * <code>uint32 KFEHEOJCKLB = 7;</code>
+       * @return The kFEHEOJCKLB.
+       */
+      @java.lang.Override
+      public int getKFEHEOJCKLB() {
+        return kFEHEOJCKLB_;
+      }
+      /**
+       * <pre>
+       *EKPABLIFILG JAPDKNHENLD = 5;
+       *DFAFGEPBLDO EHLOECHHEPI = 6;
+       * </pre>
+       *
+       * <code>uint32 KFEHEOJCKLB = 7;</code>
+       * @param value The kFEHEOJCKLB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setKFEHEOJCKLB(int value) {
+        
+        kFEHEOJCKLB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *EKPABLIFILG JAPDKNHENLD = 5;
+       *DFAFGEPBLDO EHLOECHHEPI = 6;
+       * </pre>
+       *
+       * <code>uint32 KFEHEOJCKLB = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearKFEHEOJCKLB() {
+        
+        kFEHEOJCKLB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oPPFABKNMMB_ ;
+      /**
+       * <pre>
+       *repeated NPFPJAHEIDH KOHLIMEPNPM = 8;
+       * </pre>
+       *
+       * <code>uint32 OPPFABKNMMB = 9;</code>
+       * @return The oPPFABKNMMB.
+       */
+      @java.lang.Override
+      public int getOPPFABKNMMB() {
+        return oPPFABKNMMB_;
+      }
+      /**
+       * <pre>
+       *repeated NPFPJAHEIDH KOHLIMEPNPM = 8;
+       * </pre>
+       *
+       * <code>uint32 OPPFABKNMMB = 9;</code>
+       * @param value The oPPFABKNMMB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOPPFABKNMMB(int value) {
+        
+        oPPFABKNMMB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *repeated NPFPJAHEIDH KOHLIMEPNPM = 8;
+       * </pre>
+       *
+       * <code>uint32 OPPFABKNMMB = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOPPFABKNMMB() {
+        
+        oPPFABKNMMB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int dungeonId_ ;
+      /**
+       * <code>uint32 dungeon_id = 10;</code>
+       * @return The dungeonId.
+       */
+      @java.lang.Override
+      public int getDungeonId() {
+        return dungeonId_;
+      }
+      /**
+       * <code>uint32 dungeon_id = 10;</code>
+       * @param value The dungeonId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonId(int value) {
+        
+        dungeonId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 dungeon_id = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonId() {
+        
+        dungeonId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private long dungeonGuid_ ;
+      /**
+       * <pre>
+       *KBMIGNFIMKF FPOJGLANECO = 11;
+       * </pre>
+       *
+       * <code>uint64 dungeon_guid = 12;</code>
+       * @return The dungeonGuid.
+       */
+      @java.lang.Override
+      public long getDungeonGuid() {
+        return dungeonGuid_;
+      }
+      /**
+       * <pre>
+       *KBMIGNFIMKF FPOJGLANECO = 11;
+       * </pre>
+       *
+       * <code>uint64 dungeon_guid = 12;</code>
+       * @param value The dungeonGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonGuid(long value) {
+        
+        dungeonGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <pre>
+       *KBMIGNFIMKF FPOJGLANECO = 11;
+       * </pre>
+       *
+       * <code>uint64 dungeon_guid = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonGuid() {
+        
+        dungeonGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private java.lang.Object dPPIBJFOMOC_ = "";
+      /**
+       * <code>string DPPIBJFOMOC = 13;</code>
+       * @return The dPPIBJFOMOC.
+       */
+      public java.lang.String getDPPIBJFOMOC() {
+        java.lang.Object ref = dPPIBJFOMOC_;
+        if (!(ref instanceof java.lang.String)) {
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          dPPIBJFOMOC_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>string DPPIBJFOMOC = 13;</code>
+       * @return The bytes for dPPIBJFOMOC.
+       */
+      public com.google.protobuf.ByteString
+          getDPPIBJFOMOCBytes() {
+        java.lang.Object ref = dPPIBJFOMOC_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          dPPIBJFOMOC_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>string DPPIBJFOMOC = 13;</code>
+       * @param value The dPPIBJFOMOC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDPPIBJFOMOC(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  
+        dPPIBJFOMOC_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string DPPIBJFOMOC = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDPPIBJFOMOC() {
+        
+        dPPIBJFOMOC_ = getDefaultInstance().getDPPIBJFOMOC();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>string DPPIBJFOMOC = 13;</code>
+       * @param value The bytes for dPPIBJFOMOC to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDPPIBJFOMOCBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+        
+        dPPIBJFOMOC_ = value;
+        onChanged();
+        return this;
+      }
+
+      private int iIACGGOGMLP_ ;
+      /**
+       * <code>uint32 IIACGGOGMLP = 14;</code>
+       * @return The iIACGGOGMLP.
+       */
+      @java.lang.Override
+      public int getIIACGGOGMLP() {
+        return iIACGGOGMLP_;
+      }
+      /**
+       * <code>uint32 IIACGGOGMLP = 14;</code>
+       * @param value The iIACGGOGMLP to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIIACGGOGMLP(int value) {
+        
+        iIACGGOGMLP_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 IIACGGOGMLP = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIIACGGOGMLP() {
+        
+        iIACGGOGMLP_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean jFOEEKHEIMO_ ;
+      /**
+       * <code>bool JFOEEKHEIMO = 15;</code>
+       * @return The jFOEEKHEIMO.
+       */
+      @java.lang.Override
+      public boolean getJFOEEKHEIMO() {
+        return jFOEEKHEIMO_;
+      }
+      /**
+       * <code>bool JFOEEKHEIMO = 15;</code>
+       * @param value The jFOEEKHEIMO to set.
+       * @return This builder for chaining.
+       */
+      public Builder setJFOEEKHEIMO(boolean value) {
+        
+        jFOEEKHEIMO_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool JFOEEKHEIMO = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearJFOEEKHEIMO() {
+        
+        jFOEEKHEIMO_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean pFLAJCKEHFA_ ;
+      /**
+       * <code>bool PFLAJCKEHFA = 838;</code>
+       * @return The pFLAJCKEHFA.
+       */
+      @java.lang.Override
+      public boolean getPFLAJCKEHFA() {
+        return pFLAJCKEHFA_;
+      }
+      /**
+       * <code>bool PFLAJCKEHFA = 838;</code>
+       * @param value The pFLAJCKEHFA to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPFLAJCKEHFA(boolean value) {
+        
+        pFLAJCKEHFA_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool PFLAJCKEHFA = 838;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPFLAJCKEHFA() {
+        
+        pFLAJCKEHFA_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int dGBMJCFHLBB_ ;
+      /**
+       * <code>uint32 DGBMJCFHLBB = 910;</code>
+       * @return The dGBMJCFHLBB.
+       */
+      @java.lang.Override
+      public int getDGBMJCFHLBB() {
+        return dGBMJCFHLBB_;
+      }
+      /**
+       * <code>uint32 DGBMJCFHLBB = 910;</code>
+       * @param value The dGBMJCFHLBB to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDGBMJCFHLBB(int value) {
+        
+        dGBMJCFHLBB_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 DGBMJCFHLBB = 910;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDGBMJCFHLBB() {
+        
+        dGBMJCFHLBB_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean aNICOPJPCFM_ ;
+      /**
+       * <code>bool ANICOPJPCFM = 1448;</code>
+       * @return The aNICOPJPCFM.
+       */
+      @java.lang.Override
+      public boolean getANICOPJPCFM() {
+        return aNICOPJPCFM_;
+      }
+      /**
+       * <code>bool ANICOPJPCFM = 1448;</code>
+       * @param value The aNICOPJPCFM to set.
+       * @return This builder for chaining.
+       */
+      public Builder setANICOPJPCFM(boolean value) {
+        
+        aNICOPJPCFM_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool ANICOPJPCFM = 1448;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearANICOPJPCFM() {
+        
+        aNICOPJPCFM_ = false;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:UgcDungeonBrief)
+    }
+
+    // @@protoc_insertion_point(class_scope:UgcDungeonBrief)
+    private static final emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief();
+    }
+
+    public static emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<UgcDungeonBrief>
+        PARSER = new com.google.protobuf.AbstractParser<UgcDungeonBrief>() {
+      @java.lang.Override
+      public UgcDungeonBrief parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new UgcDungeonBrief(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<UgcDungeonBrief> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<UgcDungeonBrief> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonBriefOuterClass.UgcDungeonBrief getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_UgcDungeonBrief_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_UgcDungeonBrief_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\025UgcDungeonBrief.proto\"\267\002\n\017UgcDungeonBr" +
+      "ief\022\023\n\013PEIOEFBCMFP\030\001 \001(\r\022\023\n\013DHAOMGMMDPD\030" +
+      "\002 \001(\010\022\023\n\013EBBPBOEJJPP\030\003 \001(\t\022\020\n\010tag_list\030\004" +
+      " \003(\r\022\023\n\013KFEHEOJCKLB\030\007 \001(\r\022\023\n\013OPPFABKNMMB" +
+      "\030\t \001(\r\022\022\n\ndungeon_id\030\n \001(\r\022\024\n\014dungeon_gu" +
+      "id\030\014 \001(\004\022\023\n\013DPPIBJFOMOC\030\r \001(\t\022\023\n\013IIACGGO" +
+      "GMLP\030\016 \001(\r\022\023\n\013JFOEEKHEIMO\030\017 \001(\010\022\024\n\013PFLAJ" +
+      "CKEHFA\030\306\006 \001(\010\022\024\n\013DGBMJCFHLBB\030\216\007 \001(\r\022\024\n\013A" +
+      "NICOPJPCFM\030\250\013 \001(\010B\033\n\031emu.grasscutter.net" +
+      ".protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_UgcDungeonBrief_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_UgcDungeonBrief_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_UgcDungeonBrief_descriptor,
+        new java.lang.String[] { "PEIOEFBCMFP", "DHAOMGMMDPD", "EBBPBOEJJPP", "TagList", "KFEHEOJCKLB", "OPPFABKNMMB", "DungeonId", "DungeonGuid", "DPPIBJFOMOC", "IIACGGOGMLP", "JFOEEKHEIMO", "PFLAJCKEHFA", "DGBMJCFHLBB", "ANICOPJPCFM", });
+  }
+
+  // @@protoc_insertion_point(outer_class_scope)
+}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonStarredRoomDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonStarredRoomDataOuterClass.java
new file mode 100644
index 000000000..3eaacdd3d
--- /dev/null
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UgcDungeonStarredRoomDataOuterClass.java
@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: UgcDungeonStarredRoomData.proto
+
+package emu.grasscutter.net.proto;
+
+public final class UgcDungeonStarredRoomDataOuterClass {
+  private UgcDungeonStarredRoomDataOuterClass() {}
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistryLite registry) {
+  }
+
+  public static void registerAllExtensions(
+      com.google.protobuf.ExtensionRegistry registry) {
+    registerAllExtensions(
+        (com.google.protobuf.ExtensionRegistryLite) registry);
+  }
+  public interface UgcDungeonStarredRoomDataOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:UgcDungeonStarredRoomData)
+      com.google.protobuf.MessageOrBuilder {
+
+    /**
+     * <code>uint64 dungeon_guid = 1;</code>
+     * @return The dungeonGuid.
+     */
+    long getDungeonGuid();
+
+    /**
+     * <code>uint32 room_id = 2;</code>
+     * @return The roomId.
+     */
+    int getRoomId();
+  }
+  /**
+   * Protobuf type {@code UgcDungeonStarredRoomData}
+   */
+  public static final class UgcDungeonStarredRoomData extends
+      com.google.protobuf.GeneratedMessageV3 implements
+      // @@protoc_insertion_point(message_implements:UgcDungeonStarredRoomData)
+      UgcDungeonStarredRoomDataOrBuilder {
+  private static final long serialVersionUID = 0L;
+    // Use UgcDungeonStarredRoomData.newBuilder() to construct.
+    private UgcDungeonStarredRoomData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+      super(builder);
+    }
+    private UgcDungeonStarredRoomData() {
+    }
+
+    @java.lang.Override
+    @SuppressWarnings({"unused"})
+    protected java.lang.Object newInstance(
+        UnusedPrivateParameter unused) {
+      return new UgcDungeonStarredRoomData();
+    }
+
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+    getUnknownFields() {
+      return this.unknownFields;
+    }
+    private UgcDungeonStarredRoomData(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      this();
+      if (extensionRegistry == null) {
+        throw new java.lang.NullPointerException();
+      }
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            case 8: {
+
+              dungeonGuid_ = input.readUInt64();
+              break;
+            }
+            case 16: {
+
+              roomId_ = input.readUInt32();
+              break;
+            }
+            default: {
+              if (!parseUnknownField(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.internal_static_UgcDungeonStarredRoomData_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.internal_static_UgcDungeonStarredRoomData_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.class, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder.class);
+    }
+
+    public static final int DUNGEON_GUID_FIELD_NUMBER = 1;
+    private long dungeonGuid_;
+    /**
+     * <code>uint64 dungeon_guid = 1;</code>
+     * @return The dungeonGuid.
+     */
+    @java.lang.Override
+    public long getDungeonGuid() {
+      return dungeonGuid_;
+    }
+
+    public static final int ROOM_ID_FIELD_NUMBER = 2;
+    private int roomId_;
+    /**
+     * <code>uint32 room_id = 2;</code>
+     * @return The roomId.
+     */
+    @java.lang.Override
+    public int getRoomId() {
+      return roomId_;
+    }
+
+    private byte memoizedIsInitialized = -1;
+    @java.lang.Override
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    @java.lang.Override
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      if (dungeonGuid_ != 0L) {
+        output.writeUInt64(1, dungeonGuid_);
+      }
+      if (roomId_ != 0) {
+        output.writeUInt32(2, roomId_);
+      }
+      unknownFields.writeTo(output);
+    }
+
+    @java.lang.Override
+    public int getSerializedSize() {
+      int size = memoizedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (dungeonGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(1, dungeonGuid_);
+      }
+      if (roomId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(2, roomId_);
+      }
+      size += unknownFields.getSerializedSize();
+      memoizedSize = size;
+      return size;
+    }
+
+    @java.lang.Override
+    public boolean equals(final java.lang.Object obj) {
+      if (obj == this) {
+       return true;
+      }
+      if (!(obj instanceof emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData)) {
+        return super.equals(obj);
+      }
+      emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData other = (emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData) obj;
+
+      if (getDungeonGuid()
+          != other.getDungeonGuid()) return false;
+      if (getRoomId()
+          != other.getRoomId()) return false;
+      if (!unknownFields.equals(other.unknownFields)) return false;
+      return true;
+    }
+
+    @java.lang.Override
+    public int hashCode() {
+      if (memoizedHashCode != 0) {
+        return memoizedHashCode;
+      }
+      int hash = 41;
+      hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + DUNGEON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getDungeonGuid());
+      hash = (37 * hash) + ROOM_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRoomId();
+      hash = (29 * hash) + unknownFields.hashCode();
+      memoizedHashCode = hash;
+      return hash;
+    }
+
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        java.nio.ByteBuffer data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        java.nio.ByteBuffer data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(byte[] data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input);
+    }
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return com.google.protobuf.GeneratedMessageV3
+          .parseWithIOException(PARSER, input, extensionRegistry);
+    }
+
+    @java.lang.Override
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder newBuilder() {
+      return DEFAULT_INSTANCE.toBuilder();
+    }
+    public static Builder newBuilder(emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData prototype) {
+      return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+    }
+    @java.lang.Override
+    public Builder toBuilder() {
+      return this == DEFAULT_INSTANCE
+          ? new Builder() : new Builder().mergeFrom(this);
+    }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code UgcDungeonStarredRoomData}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:UgcDungeonStarredRoomData)
+        emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomDataOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.internal_static_UgcDungeonStarredRoomData_descriptor;
+      }
+
+      @java.lang.Override
+      protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.internal_static_UgcDungeonStarredRoomData_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.class, emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.Builder.class);
+      }
+
+      // Construct using emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessageV3
+                .alwaysUseFieldBuilders) {
+        }
+      }
+      @java.lang.Override
+      public Builder clear() {
+        super.clear();
+        dungeonGuid_ = 0L;
+
+        roomId_ = 0;
+
+        return this;
+      }
+
+      @java.lang.Override
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.internal_static_UgcDungeonStarredRoomData_descriptor;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getDefaultInstanceForType() {
+        return emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.getDefaultInstance();
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData build() {
+        emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData result = buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      @java.lang.Override
+      public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData buildPartial() {
+        emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData result = new emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData(this);
+        result.dungeonGuid_ = dungeonGuid_;
+        result.roomId_ = roomId_;
+        onBuilt();
+        return result;
+      }
+
+      @java.lang.Override
+      public Builder clone() {
+        return super.clone();
+      }
+      @java.lang.Override
+      public Builder setField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.setField(field, value);
+      }
+      @java.lang.Override
+      public Builder clearField(
+          com.google.protobuf.Descriptors.FieldDescriptor field) {
+        return super.clearField(field);
+      }
+      @java.lang.Override
+      public Builder clearOneof(
+          com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+        return super.clearOneof(oneof);
+      }
+      @java.lang.Override
+      public Builder setRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          int index, java.lang.Object value) {
+        return super.setRepeatedField(field, index, value);
+      }
+      @java.lang.Override
+      public Builder addRepeatedField(
+          com.google.protobuf.Descriptors.FieldDescriptor field,
+          java.lang.Object value) {
+        return super.addRepeatedField(field, value);
+      }
+      @java.lang.Override
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData) {
+          return mergeFrom((emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
+      }
+
+      public Builder mergeFrom(emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData other) {
+        if (other == emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData.getDefaultInstance()) return this;
+        if (other.getDungeonGuid() != 0L) {
+          setDungeonGuid(other.getDungeonGuid());
+        }
+        if (other.getRoomId() != 0) {
+          setRoomId(other.getRoomId());
+        }
+        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.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = (emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData) e.getUnfinishedMessage();
+          throw e.unwrapIOException();
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
+        return this;
+      }
+
+      private long dungeonGuid_ ;
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @return The dungeonGuid.
+       */
+      @java.lang.Override
+      public long getDungeonGuid() {
+        return dungeonGuid_;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @param value The dungeonGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setDungeonGuid(long value) {
+        
+        dungeonGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 dungeon_guid = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearDungeonGuid() {
+        
+        dungeonGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private int roomId_ ;
+      /**
+       * <code>uint32 room_id = 2;</code>
+       * @return The roomId.
+       */
+      @java.lang.Override
+      public int getRoomId() {
+        return roomId_;
+      }
+      /**
+       * <code>uint32 room_id = 2;</code>
+       * @param value The roomId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRoomId(int value) {
+        
+        roomId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 room_id = 2;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRoomId() {
+        
+        roomId_ = 0;
+        onChanged();
+        return this;
+      }
+      @java.lang.Override
+      public final Builder setUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.setUnknownFields(unknownFields);
+      }
+
+      @java.lang.Override
+      public final Builder mergeUnknownFields(
+          final com.google.protobuf.UnknownFieldSet unknownFields) {
+        return super.mergeUnknownFields(unknownFields);
+      }
+
+
+      // @@protoc_insertion_point(builder_scope:UgcDungeonStarredRoomData)
+    }
+
+    // @@protoc_insertion_point(class_scope:UgcDungeonStarredRoomData)
+    private static final emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData DEFAULT_INSTANCE;
+    static {
+      DEFAULT_INSTANCE = new emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData();
+    }
+
+    public static emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getDefaultInstance() {
+      return DEFAULT_INSTANCE;
+    }
+
+    private static final com.google.protobuf.Parser<UgcDungeonStarredRoomData>
+        PARSER = new com.google.protobuf.AbstractParser<UgcDungeonStarredRoomData>() {
+      @java.lang.Override
+      public UgcDungeonStarredRoomData parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new UgcDungeonStarredRoomData(input, extensionRegistry);
+      }
+    };
+
+    public static com.google.protobuf.Parser<UgcDungeonStarredRoomData> parser() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<UgcDungeonStarredRoomData> getParserForType() {
+      return PARSER;
+    }
+
+    @java.lang.Override
+    public emu.grasscutter.net.proto.UgcDungeonStarredRoomDataOuterClass.UgcDungeonStarredRoomData getDefaultInstanceForType() {
+      return DEFAULT_INSTANCE;
+    }
+
+  }
+
+  private static final com.google.protobuf.Descriptors.Descriptor
+    internal_static_UgcDungeonStarredRoomData_descriptor;
+  private static final 
+    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_UgcDungeonStarredRoomData_fieldAccessorTable;
+
+  public static com.google.protobuf.Descriptors.FileDescriptor
+      getDescriptor() {
+    return descriptor;
+  }
+  private static  com.google.protobuf.Descriptors.FileDescriptor
+      descriptor;
+  static {
+    java.lang.String[] descriptorData = {
+      "\n\037UgcDungeonStarredRoomData.proto\"B\n\031Ugc" +
+      "DungeonStarredRoomData\022\024\n\014dungeon_guid\030\001" +
+      " \001(\004\022\017\n\007room_id\030\002 \001(\rB\033\n\031emu.grasscutter" +
+      ".net.protob\006proto3"
+    };
+    descriptor = com.google.protobuf.Descriptors.FileDescriptor
+      .internalBuildGeneratedFileFrom(descriptorData,
+        new com.google.protobuf.Descriptors.FileDescriptor[] {
+        });
+    internal_static_UgcDungeonStarredRoomData_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_UgcDungeonStarredRoomData_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+        internal_static_UgcDungeonStarredRoomData_descriptor,
+        new java.lang.String[] { "DungeonGuid", "RoomId", });
+  }
+
+  // @@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 c3ac1e8c2..227f4c5e1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/Uint32PairOuterClass.java
@@ -31,10 +31,6 @@ public final class Uint32PairOuterClass {
     int getValue();
   }
   /**
-   * <pre>
-   * Obf: CBDJBGDIJBB
-   * </pre>
-   *
    * Protobuf type {@code Uint32Pair}
    */
   public static final class Uint32Pair extends
@@ -310,10 +306,6 @@ public final class Uint32PairOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CBDJBGDIJBB
-     * </pre>
-     *
      * Protobuf type {@code Uint32Pair}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnfreezeGroupLimitNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnfreezeGroupLimitNotifyOuterClass.java
index c7a32bfbb..87f9fcac9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnfreezeGroupLimitNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnfreezeGroupLimitNotifyOuterClass.java
@@ -19,7 +19,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 scene_id = 1;</code>
+     * <code>uint32 scene_id = 5;</code>
      * @return The sceneId.
      */
     int getSceneId();
@@ -31,11 +31,6 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
     int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 23739
-   * Obf: JEGDFLEGJLH
-   * </pre>
-   *
    * Protobuf type {@code UnfreezeGroupLimitNotify}
    */
   public static final class UnfreezeGroupLimitNotify extends
@@ -80,7 +75,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
+            case 40: {
 
               sceneId_ = input.readUInt32();
               break;
@@ -122,10 +117,10 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
               emu.grasscutter.net.proto.UnfreezeGroupLimitNotifyOuterClass.UnfreezeGroupLimitNotify.class, emu.grasscutter.net.proto.UnfreezeGroupLimitNotifyOuterClass.UnfreezeGroupLimitNotify.Builder.class);
     }
 
-    public static final int SCENE_ID_FIELD_NUMBER = 1;
+    public static final int SCENE_ID_FIELD_NUMBER = 5;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 1;</code>
+     * <code>uint32 scene_id = 5;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -159,7 +154,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(1, sceneId_);
+        output.writeUInt32(5, sceneId_);
       }
       if (pointId_ != 0) {
         output.writeUInt32(12, pointId_);
@@ -175,7 +170,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, sceneId_);
+          .computeUInt32Size(5, sceneId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
@@ -311,11 +306,6 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23739
-     * Obf: JEGDFLEGJLH
-     * </pre>
-     *
      * Protobuf type {@code UnfreezeGroupLimitNotify}
      */
     public static final class Builder extends
@@ -470,7 +460,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
 
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -478,7 +468,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -489,7 +479,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 1;</code>
+       * <code>uint32 scene_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -597,7 +587,7 @@ public final class UnfreezeGroupLimitNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\036UnfreezeGroupLimitNotify.proto\">\n\030Unfr" +
-      "eezeGroupLimitNotify\022\020\n\010scene_id\030\001 \001(\r\022\020" +
+      "eezeGroupLimitNotify\022\020\n\010scene_id\030\005 \001(\r\022\020" +
       "\n\010point_id\030\014 \001(\rB\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
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 f7b25adb9..8b21e63b9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class UnionCmdNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> 
         getCmdListList();
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index);
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     int getCmdListCount();
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
         getCmdListOrBuilderList();
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 21088
-   * Obf: GLEELPIOJHO
-   * </pre>
-   *
    * Protobuf type {@code UnionCmdNotify}
    */
   public static final class UnionCmdNotify extends
@@ -94,7 +89,7 @@ public final class UnionCmdNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 58: {
+            case 50: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 cmdList_ = new java.util.ArrayList<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class UnionCmdNotifyOuterClass {
               emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify.class, emu.grasscutter.net.proto.UnionCmdNotifyOuterClass.UnionCmdNotify.Builder.class);
     }
 
-    public static final int CMD_LIST_FIELD_NUMBER = 7;
+    public static final int CMD_LIST_FIELD_NUMBER = 6;
     private java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> cmdList_;
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> getCmdListList() {
       return cmdList_;
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
@@ -156,21 +151,21 @@ public final class UnionCmdNotifyOuterClass {
       return cmdList_;
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     @java.lang.Override
     public int getCmdListCount() {
       return cmdList_.size();
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index) {
       return cmdList_.get(index);
     }
     /**
-     * <code>repeated .UnionCmd cmd_list = 7;</code>
+     * <code>repeated .UnionCmd cmd_list = 6;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
@@ -193,7 +188,7 @@ public final class UnionCmdNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < cmdList_.size(); i++) {
-        output.writeMessage(7, cmdList_.get(i));
+        output.writeMessage(6, cmdList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class UnionCmdNotifyOuterClass {
       size = 0;
       for (int i = 0; i < cmdList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, cmdList_.get(i));
+          .computeMessageSize(6, cmdList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class UnionCmdNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21088
-     * Obf: GLEELPIOJHO
-     * </pre>
-     *
      * Protobuf type {@code UnionCmdNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class UnionCmdNotifyOuterClass {
           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 = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> getCmdListList() {
         if (cmdListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class UnionCmdNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public int getCmdListCount() {
         if (cmdListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class UnionCmdNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd getCmdList(int index) {
         if (cmdListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class UnionCmdNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder setCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
@@ -585,7 +575,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder setCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder addCmdList(emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
         if (cmdListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder addCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd value) {
@@ -632,7 +622,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder addCmdList(
           emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder addCmdList(
           int index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder addAllCmdList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd> values) {
@@ -675,7 +665,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder clearCmdList() {
         if (cmdListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public Builder removeCmdList(int index) {
         if (cmdListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class UnionCmdNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder getCmdListBuilder(
           int index) {
         return getCmdListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder getCmdListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class UnionCmdNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmdOrBuilder> 
            getCmdListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class UnionCmdNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</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 = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder addCmdListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class UnionCmdNotifyOuterClass {
             index, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.getDefaultInstance());
       }
       /**
-       * <code>repeated .UnionCmd cmd_list = 7;</code>
+       * <code>repeated .UnionCmd cmd_list = 6;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder> 
            getCmdListBuilderList() {
@@ -832,7 +822,7 @@ public final class UnionCmdNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024UnionCmdNotify.proto\032\016UnionCmd.proto\"-" +
-      "\n\016UnionCmdNotify\022\033\n\010cmd_list\030\007 \003(\0132\t.Uni" +
+      "\n\016UnionCmdNotify\022\033\n\010cmd_list\030\006 \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 8d06f587d..98a993077 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnionCmdOuterClass.java
@@ -19,22 +19,18 @@ public final class UnionCmdOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bytes body = 13;</code>
-     * @return The body.
-     */
-    com.google.protobuf.ByteString getBody();
-
-    /**
-     * <code>uint32 message_id = 4;</code>
+     * <code>uint32 message_id = 8;</code>
      * @return The messageId.
      */
     int getMessageId();
+
+    /**
+     * <code>bytes body = 14;</code>
+     * @return The body.
+     */
+    com.google.protobuf.ByteString getBody();
   }
   /**
-   * <pre>
-   * Obf: ICNBNJOGGOP
-   * </pre>
-   *
    * Protobuf type {@code UnionCmd}
    */
   public static final class UnionCmd extends
@@ -80,12 +76,12 @@ public final class UnionCmdOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 64: {
 
               messageId_ = input.readUInt32();
               break;
             }
-            case 106: {
+            case 114: {
 
               body_ = input.readBytes();
               break;
@@ -122,21 +118,10 @@ public final class UnionCmdOuterClass {
               emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.class, emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.Builder.class);
     }
 
-    public static final int BODY_FIELD_NUMBER = 13;
-    private com.google.protobuf.ByteString body_;
-    /**
-     * <code>bytes body = 13;</code>
-     * @return The body.
-     */
-    @java.lang.Override
-    public com.google.protobuf.ByteString getBody() {
-      return body_;
-    }
-
-    public static final int MESSAGE_ID_FIELD_NUMBER = 4;
+    public static final int MESSAGE_ID_FIELD_NUMBER = 8;
     private int messageId_;
     /**
-     * <code>uint32 message_id = 4;</code>
+     * <code>uint32 message_id = 8;</code>
      * @return The messageId.
      */
     @java.lang.Override
@@ -144,6 +129,17 @@ public final class UnionCmdOuterClass {
       return messageId_;
     }
 
+    public static final int BODY_FIELD_NUMBER = 14;
+    private com.google.protobuf.ByteString body_;
+    /**
+     * <code>bytes body = 14;</code>
+     * @return The body.
+     */
+    @java.lang.Override
+    public com.google.protobuf.ByteString getBody() {
+      return body_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +155,10 @@ public final class UnionCmdOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (messageId_ != 0) {
-        output.writeUInt32(4, messageId_);
+        output.writeUInt32(8, messageId_);
       }
       if (!body_.isEmpty()) {
-        output.writeBytes(13, body_);
+        output.writeBytes(14, body_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +171,11 @@ public final class UnionCmdOuterClass {
       size = 0;
       if (messageId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, messageId_);
+          .computeUInt32Size(8, messageId_);
       }
       if (!body_.isEmpty()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(13, body_);
+          .computeBytesSize(14, body_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +192,10 @@ public final class UnionCmdOuterClass {
       }
       emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd other = (emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd) obj;
 
-      if (!getBody()
-          .equals(other.getBody())) return false;
       if (getMessageId()
           != other.getMessageId()) return false;
+      if (!getBody()
+          .equals(other.getBody())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +207,10 @@ public final class UnionCmdOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + BODY_FIELD_NUMBER;
-      hash = (53 * hash) + getBody().hashCode();
       hash = (37 * hash) + MESSAGE_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMessageId();
+      hash = (37 * hash) + BODY_FIELD_NUMBER;
+      hash = (53 * hash) + getBody().hashCode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,10 +307,6 @@ public final class UnionCmdOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ICNBNJOGGOP
-     * </pre>
-     *
      * Protobuf type {@code UnionCmd}
      */
     public static final class Builder extends
@@ -352,10 +344,10 @@ public final class UnionCmdOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        body_ = com.google.protobuf.ByteString.EMPTY;
-
         messageId_ = 0;
 
+        body_ = com.google.protobuf.ByteString.EMPTY;
+
         return this;
       }
 
@@ -382,8 +374,8 @@ public final class UnionCmdOuterClass {
       @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.body_ = body_;
         result.messageId_ = messageId_;
+        result.body_ = body_;
         onBuilt();
         return result;
       }
@@ -432,12 +424,12 @@ public final class UnionCmdOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd other) {
         if (other == emu.grasscutter.net.proto.UnionCmdOuterClass.UnionCmd.getDefaultInstance()) return this;
-        if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
-          setBody(other.getBody());
-        }
         if (other.getMessageId() != 0) {
           setMessageId(other.getMessageId());
         }
+        if (other.getBody() != com.google.protobuf.ByteString.EMPTY) {
+          setBody(other.getBody());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -467,9 +459,40 @@ public final class UnionCmdOuterClass {
         return this;
       }
 
+      private int messageId_ ;
+      /**
+       * <code>uint32 message_id = 8;</code>
+       * @return The messageId.
+       */
+      @java.lang.Override
+      public int getMessageId() {
+        return messageId_;
+      }
+      /**
+       * <code>uint32 message_id = 8;</code>
+       * @param value The messageId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setMessageId(int value) {
+        
+        messageId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 message_id = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMessageId() {
+        
+        messageId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.ByteString body_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes body = 13;</code>
+       * <code>bytes body = 14;</code>
        * @return The body.
        */
       @java.lang.Override
@@ -477,7 +500,7 @@ public final class UnionCmdOuterClass {
         return body_;
       }
       /**
-       * <code>bytes body = 13;</code>
+       * <code>bytes body = 14;</code>
        * @param value The body to set.
        * @return This builder for chaining.
        */
@@ -491,7 +514,7 @@ public final class UnionCmdOuterClass {
         return this;
       }
       /**
-       * <code>bytes body = 13;</code>
+       * <code>bytes body = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearBody() {
@@ -500,37 +523,6 @@ public final class UnionCmdOuterClass {
         onChanged();
         return this;
       }
-
-      private int messageId_ ;
-      /**
-       * <code>uint32 message_id = 4;</code>
-       * @return The messageId.
-       */
-      @java.lang.Override
-      public int getMessageId() {
-        return messageId_;
-      }
-      /**
-       * <code>uint32 message_id = 4;</code>
-       * @param value The messageId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setMessageId(int value) {
-        
-        messageId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 message_id = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMessageId() {
-        
-        messageId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -598,8 +590,8 @@ public final class UnionCmdOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\016UnionCmd.proto\",\n\010UnionCmd\022\014\n\004body\030\r \001" +
-      "(\014\022\022\n\nmessage_id\030\004 \001(\rB\033\n\031emu.grasscutte" +
+      "\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" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -611,7 +603,7 @@ public final class UnionCmdOuterClass {
     internal_static_UnionCmd_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UnionCmd_descriptor,
-        new java.lang.String[] { "Body", "MessageId", });
+        new java.lang.String[] { "MessageId", "Body", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java
index d25fb4bbd..6c7633e59 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentReqOuterClass.java
@@ -19,23 +19,18 @@ public final class UnlockAvatarTalentReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 talent_id = 9;</code>
+     * <code>uint32 talent_id = 5;</code>
      * @return The talentId.
      */
     int getTalentId();
 
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 13;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 20169
-   * Obf: AOFKDEMHKNJ
-   * </pre>
-   *
    * Protobuf type {@code UnlockAvatarTalentReq}
    */
   public static final class UnlockAvatarTalentReq extends
@@ -80,16 +75,16 @@ public final class UnlockAvatarTalentReqOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 72: {
+            case 40: {
 
               talentId_ = input.readUInt32();
               break;
             }
+            case 104: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class UnlockAvatarTalentReqOuterClass {
               emu.grasscutter.net.proto.UnlockAvatarTalentReqOuterClass.UnlockAvatarTalentReq.class, emu.grasscutter.net.proto.UnlockAvatarTalentReqOuterClass.UnlockAvatarTalentReq.Builder.class);
     }
 
-    public static final int TALENT_ID_FIELD_NUMBER = 9;
+    public static final int TALENT_ID_FIELD_NUMBER = 5;
     private int talentId_;
     /**
-     * <code>uint32 talent_id = 9;</code>
+     * <code>uint32 talent_id = 5;</code>
      * @return The talentId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class UnlockAvatarTalentReqOuterClass {
       return talentId_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 13;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class UnlockAvatarTalentReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
-      }
       if (talentId_ != 0) {
-        output.writeUInt32(9, talentId_);
+        output.writeUInt32(5, talentId_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(13, avatarGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class UnlockAvatarTalentReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (avatarGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
-      }
       if (talentId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, talentId_);
+          .computeUInt32Size(5, talentId_);
+      }
+      if (avatarGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, avatarGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class UnlockAvatarTalentReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 20169
-     * Obf: AOFKDEMHKNJ
-     * </pre>
-     *
      * Protobuf type {@code UnlockAvatarTalentReq}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class UnlockAvatarTalentReqOuterClass {
 
       private int talentId_ ;
       /**
-       * <code>uint32 talent_id = 9;</code>
+       * <code>uint32 talent_id = 5;</code>
        * @return The talentId.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class UnlockAvatarTalentReqOuterClass {
         return talentId_;
       }
       /**
-       * <code>uint32 talent_id = 9;</code>
+       * <code>uint32 talent_id = 5;</code>
        * @param value The talentId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class UnlockAvatarTalentReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 talent_id = 9;</code>
+       * <code>uint32 talent_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearTalentId() {
@@ -502,7 +492,7 @@ public final class UnlockAvatarTalentReqOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 13;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -510,7 +500,7 @@ public final class UnlockAvatarTalentReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 13;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -521,7 +511,7 @@ public final class UnlockAvatarTalentReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -598,8 +588,8 @@ public final class UnlockAvatarTalentReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033UnlockAvatarTalentReq.proto\"?\n\025UnlockA" +
-      "vatarTalentReq\022\021\n\ttalent_id\030\t \001(\r\022\023\n\013ava" +
-      "tar_guid\030\004 \001(\004B\033\n\031emu.grasscutter.net.pr" +
+      "vatarTalentReq\022\021\n\ttalent_id\030\005 \001(\r\022\023\n\013ava" +
+      "tar_guid\030\r \001(\004B\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java
index 391a6b835..985296a01 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockAvatarTalentRspOuterClass.java
@@ -19,29 +19,24 @@ public final class UnlockAvatarTalentRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 avatar_guid = 15;</code>
+     * <code>uint64 avatar_guid = 8;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>uint32 talent_id = 2;</code>
+     * <code>uint32 talent_id = 13;</code>
      * @return The talentId.
      */
     int getTalentId();
   }
   /**
-   * <pre>
-   * CmdId: 21745
-   * Obf: GGEBNABPEKK
-   * </pre>
-   *
    * Protobuf type {@code UnlockAvatarTalentRsp}
    */
   public static final class UnlockAvatarTalentRsp extends
@@ -88,19 +83,19 @@ public final class UnlockAvatarTalentRspOuterClass {
               break;
             case 16: {
 
-              talentId_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
               retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 64: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 104: {
+
+              talentId_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class UnlockAvatarTalentRspOuterClass {
               emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.class, emu.grasscutter.net.proto.UnlockAvatarTalentRspOuterClass.UnlockAvatarTalentRsp.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>
+     * <code>int32 retcode = 2;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class UnlockAvatarTalentRspOuterClass {
       return retcode_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 15;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 8;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 15;</code>
+     * <code>uint64 avatar_guid = 8;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class UnlockAvatarTalentRspOuterClass {
       return avatarGuid_;
     }
 
-    public static final int TALENT_ID_FIELD_NUMBER = 2;
+    public static final int TALENT_ID_FIELD_NUMBER = 13;
     private int talentId_;
     /**
-     * <code>uint32 talent_id = 2;</code>
+     * <code>uint32 talent_id = 13;</code>
      * @return The talentId.
      */
     @java.lang.Override
@@ -180,14 +175,14 @@ public final class UnlockAvatarTalentRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (talentId_ != 0) {
-        output.writeUInt32(2, talentId_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(2, retcode_);
       }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(15, avatarGuid_);
+        output.writeUInt64(8, avatarGuid_);
+      }
+      if (talentId_ != 0) {
+        output.writeUInt32(13, talentId_);
       }
       unknownFields.writeTo(output);
     }
@@ -198,17 +193,17 @@ public final class UnlockAvatarTalentRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (talentId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, talentId_);
-      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(2, retcode_);
       }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, avatarGuid_);
+          .computeUInt64Size(8, avatarGuid_);
+      }
+      if (talentId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, talentId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -345,11 +340,6 @@ public final class UnlockAvatarTalentRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 21745
-     * Obf: GGEBNABPEKK
-     * </pre>
-     *
      * Protobuf type {@code UnlockAvatarTalentRsp}
      */
     public static final class Builder extends
@@ -510,7 +500,7 @@ public final class UnlockAvatarTalentRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -518,7 +508,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -529,7 +519,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 6;</code>
+       * <code>int32 retcode = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -541,7 +531,7 @@ public final class UnlockAvatarTalentRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 15;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -549,7 +539,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 15;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -560,7 +550,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 15;</code>
+       * <code>uint64 avatar_guid = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -572,7 +562,7 @@ public final class UnlockAvatarTalentRspOuterClass {
 
       private int talentId_ ;
       /**
-       * <code>uint32 talent_id = 2;</code>
+       * <code>uint32 talent_id = 13;</code>
        * @return The talentId.
        */
       @java.lang.Override
@@ -580,7 +570,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return talentId_;
       }
       /**
-       * <code>uint32 talent_id = 2;</code>
+       * <code>uint32 talent_id = 13;</code>
        * @param value The talentId to set.
        * @return This builder for chaining.
        */
@@ -591,7 +581,7 @@ public final class UnlockAvatarTalentRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 talent_id = 2;</code>
+       * <code>uint32 talent_id = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearTalentId() {
@@ -668,8 +658,8 @@ public final class UnlockAvatarTalentRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\033UnlockAvatarTalentRsp.proto\"P\n\025UnlockA" +
-      "vatarTalentRsp\022\017\n\007retcode\030\006 \001(\005\022\023\n\013avata" +
-      "r_guid\030\017 \001(\004\022\021\n\ttalent_id\030\002 \001(\rB\033\n\031emu.g" +
+      "vatarTalentRsp\022\017\n\007retcode\030\002 \001(\005\022\023\n\013avata" +
+      "r_guid\030\010 \001(\004\022\021\n\ttalent_id\030\r \001(\rB\033\n\031emu.g" +
       "rasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java
index 417807cef..9cd7d9548 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UnlockTransPointReqOuterClass.java
@@ -19,23 +19,18 @@ public final class UnlockTransPointReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 point_id = 13;</code>
-     * @return The pointId.
-     */
-    int getPointId();
-
-    /**
-     * <code>uint32 scene_id = 11;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     int getSceneId();
+
+    /**
+     * <code>uint32 point_id = 12;</code>
+     * @return The pointId.
+     */
+    int getPointId();
   }
   /**
-   * <pre>
-   * CmdId: 27465
-   * Obf: GHELOHKEPBF
-   * </pre>
-   *
    * Protobuf type {@code UnlockTransPointReq}
    */
   public static final class UnlockTransPointReq extends
@@ -80,12 +75,12 @@ public final class UnlockTransPointReqOuterClass {
             case 0:
               done = true;
               break;
-            case 88: {
+            case 64: {
 
               sceneId_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 96: {
 
               pointId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class UnlockTransPointReqOuterClass {
               emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.class, emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.Builder.class);
     }
 
-    public static final int POINT_ID_FIELD_NUMBER = 13;
-    private int pointId_;
-    /**
-     * <code>uint32 point_id = 13;</code>
-     * @return The pointId.
-     */
-    @java.lang.Override
-    public int getPointId() {
-      return pointId_;
-    }
-
-    public static final int SCENE_ID_FIELD_NUMBER = 11;
+    public static final int SCENE_ID_FIELD_NUMBER = 8;
     private int sceneId_;
     /**
-     * <code>uint32 scene_id = 11;</code>
+     * <code>uint32 scene_id = 8;</code>
      * @return The sceneId.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class UnlockTransPointReqOuterClass {
       return sceneId_;
     }
 
+    public static final int POINT_ID_FIELD_NUMBER = 12;
+    private int pointId_;
+    /**
+     * <code>uint32 point_id = 12;</code>
+     * @return The pointId.
+     */
+    @java.lang.Override
+    public int getPointId() {
+      return pointId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class UnlockTransPointReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (sceneId_ != 0) {
-        output.writeUInt32(11, sceneId_);
+        output.writeUInt32(8, sceneId_);
       }
       if (pointId_ != 0) {
-        output.writeUInt32(13, pointId_);
+        output.writeUInt32(12, pointId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class UnlockTransPointReqOuterClass {
       size = 0;
       if (sceneId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(11, sceneId_);
+          .computeUInt32Size(8, sceneId_);
       }
       if (pointId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, pointId_);
+          .computeUInt32Size(12, pointId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class UnlockTransPointReqOuterClass {
       }
       emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq other = (emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq) obj;
 
-      if (getPointId()
-          != other.getPointId()) return false;
       if (getSceneId()
           != other.getSceneId()) return false;
+      if (getPointId()
+          != other.getPointId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class UnlockTransPointReqOuterClass {
       }
       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) + POINT_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getPointId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class UnlockTransPointReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 27465
-     * Obf: GHELOHKEPBF
-     * </pre>
-     *
      * Protobuf type {@code UnlockTransPointReq}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class UnlockTransPointReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pointId_ = 0;
-
         sceneId_ = 0;
 
+        pointId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class UnlockTransPointReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq buildPartial() {
         emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq result = new emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq(this);
-        result.pointId_ = pointId_;
         result.sceneId_ = sceneId_;
+        result.pointId_ = pointId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class UnlockTransPointReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq other) {
         if (other == emu.grasscutter.net.proto.UnlockTransPointReqOuterClass.UnlockTransPointReq.getDefaultInstance()) return this;
-        if (other.getPointId() != 0) {
-          setPointId(other.getPointId());
-        }
         if (other.getSceneId() != 0) {
           setSceneId(other.getSceneId());
         }
+        if (other.getPointId() != 0) {
+          setPointId(other.getPointId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class UnlockTransPointReqOuterClass {
         return this;
       }
 
-      private int pointId_ ;
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @return The pointId.
-       */
-      @java.lang.Override
-      public int getPointId() {
-        return pointId_;
-      }
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @param value The pointId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPointId(int value) {
-        
-        pointId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 point_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPointId() {
-        
-        pointId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int sceneId_ ;
       /**
-       * <code>uint32 scene_id = 11;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return The sceneId.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class UnlockTransPointReqOuterClass {
         return sceneId_;
       }
       /**
-       * <code>uint32 scene_id = 11;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @param value The sceneId to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class UnlockTransPointReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 scene_id = 11;</code>
+       * <code>uint32 scene_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearSceneId() {
@@ -529,6 +488,37 @@ public final class UnlockTransPointReqOuterClass {
         onChanged();
         return this;
       }
+
+      private int pointId_ ;
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @return The pointId.
+       */
+      @java.lang.Override
+      public int getPointId() {
+        return pointId_;
+      }
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @param value The pointId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPointId(int value) {
+        
+        pointId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 point_id = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearPointId() {
+        
+        pointId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,8 +587,8 @@ public final class UnlockTransPointReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031UnlockTransPointReq.proto\"9\n\023UnlockTra" +
-      "nsPointReq\022\020\n\010point_id\030\r \001(\r\022\020\n\010scene_id" +
-      "\030\013 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
+      "nsPointReq\022\020\n\010scene_id\030\010 \001(\r\022\020\n\010point_id" +
+      "\030\014 \001(\rB\033\n\031emu.grasscutter.net.protob\006pro" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -610,7 +600,7 @@ public final class UnlockTransPointReqOuterClass {
     internal_static_UnlockTransPointReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UnlockTransPointReq_descriptor,
-        new java.lang.String[] { "PointId", "SceneId", });
+        new java.lang.String[] { "SceneId", "PointId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListReqOuterClass.java
index c187d3776..d64322ed4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListReqOuterClass.java
@@ -19,34 +19,35 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return A list containing the showAvatarIdList.
      */
     java.util.List<java.lang.Integer> getShowAvatarIdListList();
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return The count of showAvatarIdList.
      */
     int getShowAvatarIdListCount();
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The showAvatarIdList at the given index.
      */
     int getShowAvatarIdList(int index);
 
     /**
-     * <code>bool is_show_avatar = 2;</code>
+     * <code>bool is_show_avatar = 13;</code>
      * @return The isShowAvatar.
      */
     boolean getIsShowAvatar();
+
+    /**
+     * <code>bool is_show_constellation_num = 11;</code>
+     * @return The isShowConstellationNum.
+     */
+    boolean getIsShowConstellationNum();
   }
   /**
-   * <pre>
-   * CmdId: 6950
-   * Obf: JJAJFEBFLED
-   * </pre>
-   *
    * Protobuf type {@code UpdatePlayerShowAvatarListReq}
    */
   public static final class UpdatePlayerShowAvatarListReq extends
@@ -93,12 +94,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              isShowAvatar_ = input.readBool();
-              break;
-            }
-            case 112: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showAvatarIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +102,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
               showAvatarIdList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -119,6 +115,16 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 88: {
+
+              isShowConstellationNum_ = input.readBool();
+              break;
+            }
+            case 104: {
+
+              isShowAvatar_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,10 +160,10 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
               emu.grasscutter.net.proto.UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq.class, emu.grasscutter.net.proto.UpdatePlayerShowAvatarListReqOuterClass.UpdatePlayerShowAvatarListReq.Builder.class);
     }
 
-    public static final int SHOW_AVATAR_ID_LIST_FIELD_NUMBER = 14;
+    public static final int SHOW_AVATAR_ID_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList showAvatarIdList_;
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return A list containing the showAvatarIdList.
      */
     @java.lang.Override
@@ -166,14 +172,14 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       return showAvatarIdList_;
     }
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return The count of showAvatarIdList.
      */
     public int getShowAvatarIdListCount() {
       return showAvatarIdList_.size();
     }
     /**
-     * <code>repeated uint32 show_avatar_id_list = 14;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The showAvatarIdList at the given index.
      */
@@ -182,10 +188,10 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
     }
     private int showAvatarIdListMemoizedSerializedSize = -1;
 
-    public static final int IS_SHOW_AVATAR_FIELD_NUMBER = 2;
+    public static final int IS_SHOW_AVATAR_FIELD_NUMBER = 13;
     private boolean isShowAvatar_;
     /**
-     * <code>bool is_show_avatar = 2;</code>
+     * <code>bool is_show_avatar = 13;</code>
      * @return The isShowAvatar.
      */
     @java.lang.Override
@@ -193,6 +199,17 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       return isShowAvatar_;
     }
 
+    public static final int IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER = 11;
+    private boolean isShowConstellationNum_;
+    /**
+     * <code>bool is_show_constellation_num = 11;</code>
+     * @return The isShowConstellationNum.
+     */
+    @java.lang.Override
+    public boolean getIsShowConstellationNum() {
+      return isShowConstellationNum_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -208,16 +225,19 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (isShowAvatar_ != false) {
-        output.writeBool(2, isShowAvatar_);
-      }
       if (getShowAvatarIdListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(showAvatarIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < showAvatarIdList_.size(); i++) {
         output.writeUInt32NoTag(showAvatarIdList_.getInt(i));
       }
+      if (isShowConstellationNum_ != false) {
+        output.writeBool(11, isShowConstellationNum_);
+      }
+      if (isShowAvatar_ != false) {
+        output.writeBool(13, isShowAvatar_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -227,10 +247,6 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isShowAvatar_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(2, isShowAvatar_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < showAvatarIdList_.size(); i++) {
@@ -245,6 +261,14 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         }
         showAvatarIdListMemoizedSerializedSize = dataSize;
       }
+      if (isShowConstellationNum_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(11, isShowConstellationNum_);
+      }
+      if (isShowAvatar_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(13, isShowAvatar_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -264,6 +288,8 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
           .equals(other.getShowAvatarIdListList())) return false;
       if (getIsShowAvatar()
           != other.getIsShowAvatar()) return false;
+      if (getIsShowConstellationNum()
+          != other.getIsShowConstellationNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -282,6 +308,9 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       hash = (37 * hash) + IS_SHOW_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsShowAvatar());
+      hash = (37 * hash) + IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsShowConstellationNum());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +407,6 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6950
-     * Obf: JJAJFEBFLED
-     * </pre>
-     *
      * Protobuf type {@code UpdatePlayerShowAvatarListReq}
      */
     public static final class Builder extends
@@ -424,6 +448,8 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         bitField0_ = (bitField0_ & ~0x00000001);
         isShowAvatar_ = false;
 
+        isShowConstellationNum_ = false;
+
         return this;
       }
 
@@ -457,6 +483,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         }
         result.showAvatarIdList_ = showAvatarIdList_;
         result.isShowAvatar_ = isShowAvatar_;
+        result.isShowConstellationNum_ = isShowConstellationNum_;
         onBuilt();
         return result;
       }
@@ -518,6 +545,9 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         if (other.getIsShowAvatar() != false) {
           setIsShowAvatar(other.getIsShowAvatar());
         }
+        if (other.getIsShowConstellationNum() != false) {
+          setIsShowConstellationNum(other.getIsShowConstellationNum());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -556,7 +586,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return A list containing the showAvatarIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -565,14 +595,14 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
                  java.util.Collections.unmodifiableList(showAvatarIdList_) : showAvatarIdList_;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return The count of showAvatarIdList.
        */
       public int getShowAvatarIdListCount() {
         return showAvatarIdList_.size();
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param index The index of the element to return.
        * @return The showAvatarIdList at the given index.
        */
@@ -580,7 +610,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return showAvatarIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The showAvatarIdList to set.
        * @return This builder for chaining.
@@ -593,7 +623,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param value The showAvatarIdList to add.
        * @return This builder for chaining.
        */
@@ -604,7 +634,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param values The showAvatarIdList to add.
        * @return This builder for chaining.
        */
@@ -617,7 +647,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 14;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearShowAvatarIdList() {
@@ -629,7 +659,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
 
       private boolean isShowAvatar_ ;
       /**
-       * <code>bool is_show_avatar = 2;</code>
+       * <code>bool is_show_avatar = 13;</code>
        * @return The isShowAvatar.
        */
       @java.lang.Override
@@ -637,7 +667,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return isShowAvatar_;
       }
       /**
-       * <code>bool is_show_avatar = 2;</code>
+       * <code>bool is_show_avatar = 13;</code>
        * @param value The isShowAvatar to set.
        * @return This builder for chaining.
        */
@@ -648,7 +678,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         return this;
       }
       /**
-       * <code>bool is_show_avatar = 2;</code>
+       * <code>bool is_show_avatar = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearIsShowAvatar() {
@@ -657,6 +687,37 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isShowConstellationNum_ ;
+      /**
+       * <code>bool is_show_constellation_num = 11;</code>
+       * @return The isShowConstellationNum.
+       */
+      @java.lang.Override
+      public boolean getIsShowConstellationNum() {
+        return isShowConstellationNum_;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 11;</code>
+       * @param value The isShowConstellationNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsShowConstellationNum(boolean value) {
+        
+        isShowConstellationNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsShowConstellationNum() {
+        
+        isShowConstellationNum_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -724,10 +785,11 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n#UpdatePlayerShowAvatarListReq.proto\"T\n" +
+      "\n#UpdatePlayerShowAvatarListReq.proto\"w\n" +
       "\035UpdatePlayerShowAvatarListReq\022\033\n\023show_a" +
-      "vatar_id_list\030\016 \003(\r\022\026\n\016is_show_avatar\030\002 " +
-      "\001(\010B\033\n\031emu.grasscutter.net.protob\006proto3"
+      "vatar_id_list\030\003 \003(\r\022\026\n\016is_show_avatar\030\r " +
+      "\001(\010\022!\n\031is_show_constellation_num\030\013 \001(\010B\033" +
+      "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -738,7 +800,7 @@ public final class UpdatePlayerShowAvatarListReqOuterClass {
     internal_static_UpdatePlayerShowAvatarListReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UpdatePlayerShowAvatarListReq_descriptor,
-        new java.lang.String[] { "ShowAvatarIdList", "IsShowAvatar", });
+        new java.lang.String[] { "ShowAvatarIdList", "IsShowAvatar", "IsShowConstellationNum", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListRspOuterClass.java
index b2569e76b..2f6f5957f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowAvatarListRspOuterClass.java
@@ -19,40 +19,41 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return A list containing the showAvatarIdList.
      */
     java.util.List<java.lang.Integer> getShowAvatarIdListList();
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return The count of showAvatarIdList.
      */
     int getShowAvatarIdListCount();
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The showAvatarIdList at the given index.
      */
     int getShowAvatarIdList(int index);
 
     /**
-     * <code>bool is_show_avatar = 12;</code>
+     * <code>int32 retcode = 5;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
+
+    /**
+     * <code>bool is_show_avatar = 8;</code>
      * @return The isShowAvatar.
      */
     boolean getIsShowAvatar();
 
     /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>bool is_show_constellation_num = 15;</code>
+     * @return The isShowConstellationNum.
      */
-    int getRetcode();
+    boolean getIsShowConstellationNum();
   }
   /**
-   * <pre>
-   * CmdId: 9339
-   * Obf: IADAAMNGFLB
-   * </pre>
-   *
    * Protobuf type {@code UpdatePlayerShowAvatarListRsp}
    */
   public static final class UpdatePlayerShowAvatarListRsp extends
@@ -99,7 +100,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
             case 0:
               done = true;
               break;
-            case 64: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showAvatarIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -107,7 +108,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
               showAvatarIdList_.addInt(input.readUInt32());
               break;
             }
-            case 66: {
+            case 26: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -120,16 +121,21 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 88: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 96: {
+            case 64: {
 
               isShowAvatar_ = input.readBool();
               break;
             }
+            case 120: {
+
+              isShowConstellationNum_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -165,10 +171,10 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
               emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp.class, emu.grasscutter.net.proto.UpdatePlayerShowAvatarListRspOuterClass.UpdatePlayerShowAvatarListRsp.Builder.class);
     }
 
-    public static final int SHOW_AVATAR_ID_LIST_FIELD_NUMBER = 8;
+    public static final int SHOW_AVATAR_ID_LIST_FIELD_NUMBER = 3;
     private com.google.protobuf.Internal.IntList showAvatarIdList_;
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return A list containing the showAvatarIdList.
      */
     @java.lang.Override
@@ -177,14 +183,14 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       return showAvatarIdList_;
     }
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @return The count of showAvatarIdList.
      */
     public int getShowAvatarIdListCount() {
       return showAvatarIdList_.size();
     }
     /**
-     * <code>repeated uint32 show_avatar_id_list = 8;</code>
+     * <code>repeated uint32 show_avatar_id_list = 3;</code>
      * @param index The index of the element to return.
      * @return The showAvatarIdList at the given index.
      */
@@ -193,10 +199,21 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
     }
     private int showAvatarIdListMemoizedSerializedSize = -1;
 
-    public static final int IS_SHOW_AVATAR_FIELD_NUMBER = 12;
+    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 IS_SHOW_AVATAR_FIELD_NUMBER = 8;
     private boolean isShowAvatar_;
     /**
-     * <code>bool is_show_avatar = 12;</code>
+     * <code>bool is_show_avatar = 8;</code>
      * @return The isShowAvatar.
      */
     @java.lang.Override
@@ -204,15 +221,15 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       return isShowAvatar_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 11;
-    private int retcode_;
+    public static final int IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER = 15;
+    private boolean isShowConstellationNum_;
     /**
-     * <code>int32 retcode = 11;</code>
-     * @return The retcode.
+     * <code>bool is_show_constellation_num = 15;</code>
+     * @return The isShowConstellationNum.
      */
     @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
+    public boolean getIsShowConstellationNum() {
+      return isShowConstellationNum_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -231,17 +248,20 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getShowAvatarIdListList().size() > 0) {
-        output.writeUInt32NoTag(66);
+        output.writeUInt32NoTag(26);
         output.writeUInt32NoTag(showAvatarIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < showAvatarIdList_.size(); i++) {
         output.writeUInt32NoTag(showAvatarIdList_.getInt(i));
       }
       if (retcode_ != 0) {
-        output.writeInt32(11, retcode_);
+        output.writeInt32(5, retcode_);
       }
       if (isShowAvatar_ != false) {
-        output.writeBool(12, isShowAvatar_);
+        output.writeBool(8, isShowAvatar_);
+      }
+      if (isShowConstellationNum_ != false) {
+        output.writeBool(15, isShowConstellationNum_);
       }
       unknownFields.writeTo(output);
     }
@@ -268,11 +288,15 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(11, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       if (isShowAvatar_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(12, isShowAvatar_);
+          .computeBoolSize(8, isShowAvatar_);
+      }
+      if (isShowConstellationNum_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(15, isShowConstellationNum_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -291,10 +315,12 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
 
       if (!getShowAvatarIdListList()
           .equals(other.getShowAvatarIdListList())) return false;
-      if (getIsShowAvatar()
-          != other.getIsShowAvatar()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getIsShowAvatar()
+          != other.getIsShowAvatar()) return false;
+      if (getIsShowConstellationNum()
+          != other.getIsShowConstellationNum()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -310,11 +336,14 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         hash = (37 * hash) + SHOW_AVATAR_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getShowAvatarIdListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + IS_SHOW_AVATAR_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsShowAvatar());
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + IS_SHOW_CONSTELLATION_NUM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsShowConstellationNum());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -411,11 +440,6 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9339
-     * Obf: IADAAMNGFLB
-     * </pre>
-     *
      * Protobuf type {@code UpdatePlayerShowAvatarListRsp}
      */
     public static final class Builder extends
@@ -455,9 +479,11 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         super.clear();
         showAvatarIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         isShowAvatar_ = false;
 
-        retcode_ = 0;
+        isShowConstellationNum_ = false;
 
         return this;
       }
@@ -491,8 +517,9 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.showAvatarIdList_ = showAvatarIdList_;
-        result.isShowAvatar_ = isShowAvatar_;
         result.retcode_ = retcode_;
+        result.isShowAvatar_ = isShowAvatar_;
+        result.isShowConstellationNum_ = isShowConstellationNum_;
         onBuilt();
         return result;
       }
@@ -551,11 +578,14 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         if (other.getIsShowAvatar() != false) {
           setIsShowAvatar(other.getIsShowAvatar());
         }
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
+        if (other.getIsShowConstellationNum() != false) {
+          setIsShowConstellationNum(other.getIsShowConstellationNum());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -595,7 +625,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return A list containing the showAvatarIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -604,14 +634,14 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
                  java.util.Collections.unmodifiableList(showAvatarIdList_) : showAvatarIdList_;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return The count of showAvatarIdList.
        */
       public int getShowAvatarIdListCount() {
         return showAvatarIdList_.size();
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param index The index of the element to return.
        * @return The showAvatarIdList at the given index.
        */
@@ -619,7 +649,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return showAvatarIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param index The index to set the value at.
        * @param value The showAvatarIdList to set.
        * @return This builder for chaining.
@@ -632,7 +662,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param value The showAvatarIdList to add.
        * @return This builder for chaining.
        */
@@ -643,7 +673,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @param values The showAvatarIdList to add.
        * @return This builder for chaining.
        */
@@ -656,7 +686,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_avatar_id_list = 8;</code>
+       * <code>repeated uint32 show_avatar_id_list = 3;</code>
        * @return This builder for chaining.
        */
       public Builder clearShowAvatarIdList() {
@@ -666,40 +696,9 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return this;
       }
 
-      private boolean isShowAvatar_ ;
-      /**
-       * <code>bool is_show_avatar = 12;</code>
-       * @return The isShowAvatar.
-       */
-      @java.lang.Override
-      public boolean getIsShowAvatar() {
-        return isShowAvatar_;
-      }
-      /**
-       * <code>bool is_show_avatar = 12;</code>
-       * @param value The isShowAvatar to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsShowAvatar(boolean value) {
-        
-        isShowAvatar_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_show_avatar = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsShowAvatar() {
-        
-        isShowAvatar_ = false;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -707,7 +706,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -718,7 +717,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 11;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -727,6 +726,68 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isShowAvatar_ ;
+      /**
+       * <code>bool is_show_avatar = 8;</code>
+       * @return The isShowAvatar.
+       */
+      @java.lang.Override
+      public boolean getIsShowAvatar() {
+        return isShowAvatar_;
+      }
+      /**
+       * <code>bool is_show_avatar = 8;</code>
+       * @param value The isShowAvatar to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsShowAvatar(boolean value) {
+        
+        isShowAvatar_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_show_avatar = 8;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsShowAvatar() {
+        
+        isShowAvatar_ = false;
+        onChanged();
+        return this;
+      }
+
+      private boolean isShowConstellationNum_ ;
+      /**
+       * <code>bool is_show_constellation_num = 15;</code>
+       * @return The isShowConstellationNum.
+       */
+      @java.lang.Override
+      public boolean getIsShowConstellationNum() {
+        return isShowConstellationNum_;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 15;</code>
+       * @param value The isShowConstellationNum to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsShowConstellationNum(boolean value) {
+        
+        isShowConstellationNum_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_show_constellation_num = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsShowConstellationNum() {
+        
+        isShowConstellationNum_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -794,11 +855,12 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n#UpdatePlayerShowAvatarListRsp.proto\"e\n" +
-      "\035UpdatePlayerShowAvatarListRsp\022\033\n\023show_a" +
-      "vatar_id_list\030\010 \003(\r\022\026\n\016is_show_avatar\030\014 " +
-      "\001(\010\022\017\n\007retcode\030\013 \001(\005B\033\n\031emu.grasscutter." +
-      "net.protob\006proto3"
+      "\n#UpdatePlayerShowAvatarListRsp.proto\"\210\001" +
+      "\n\035UpdatePlayerShowAvatarListRsp\022\033\n\023show_" +
+      "avatar_id_list\030\003 \003(\r\022\017\n\007retcode\030\005 \001(\005\022\026\n" +
+      "\016is_show_avatar\030\010 \001(\010\022!\n\031is_show_constel" +
+      "lation_num\030\017 \001(\010B\033\n\031emu.grasscutter.net." +
+      "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -809,7 +871,7 @@ public final class UpdatePlayerShowAvatarListRspOuterClass {
     internal_static_UpdatePlayerShowAvatarListRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UpdatePlayerShowAvatarListRsp_descriptor,
-        new java.lang.String[] { "ShowAvatarIdList", "IsShowAvatar", "Retcode", });
+        new java.lang.String[] { "ShowAvatarIdList", "Retcode", "IsShowAvatar", "IsShowConstellationNum", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListReqOuterClass.java
index 0de5ce1ad..0ec7114eb 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListReqOuterClass.java
@@ -19,28 +19,23 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @return A list containing the showNameCardIdList.
      */
     java.util.List<java.lang.Integer> getShowNameCardIdListList();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @return The count of showNameCardIdList.
      */
     int getShowNameCardIdListCount();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
     int getShowNameCardIdList(int index);
   }
   /**
-   * <pre>
-   * CmdId: 25424
-   * Obf: OBEFEMPNKNB
-   * </pre>
-   *
    * Protobuf type {@code UpdatePlayerShowNameCardListReq}
    */
   public static final class UpdatePlayerShowNameCardListReq extends
@@ -87,7 +82,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 104: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showNameCardIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -95,7 +90,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
               showNameCardIdList_.addInt(input.readUInt32());
               break;
             }
-            case 114: {
+            case 106: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -143,10 +138,10 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
               emu.grasscutter.net.proto.UpdatePlayerShowNameCardListReqOuterClass.UpdatePlayerShowNameCardListReq.class, emu.grasscutter.net.proto.UpdatePlayerShowNameCardListReqOuterClass.UpdatePlayerShowNameCardListReq.Builder.class);
     }
 
-    public static final int SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 14;
+    public static final int SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 13;
     private com.google.protobuf.Internal.IntList showNameCardIdList_;
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @return A list containing the showNameCardIdList.
      */
     @java.lang.Override
@@ -155,14 +150,14 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
       return showNameCardIdList_;
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @return The count of showNameCardIdList.
      */
     public int getShowNameCardIdListCount() {
       return showNameCardIdList_.size();
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 14;</code>
+     * <code>repeated uint32 show_name_card_id_list = 13;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
@@ -187,7 +182,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (getShowNameCardIdListList().size() > 0) {
-        output.writeUInt32NoTag(114);
+        output.writeUInt32NoTag(106);
         output.writeUInt32NoTag(showNameCardIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < showNameCardIdList_.size(); i++) {
@@ -344,11 +339,6 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 25424
-     * Obf: OBEFEMPNKNB
-     * </pre>
-     *
      * Protobuf type {@code UpdatePlayerShowNameCardListReq}
      */
     public static final class Builder extends
@@ -516,7 +506,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @return A list containing the showNameCardIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -525,14 +515,14 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
                  java.util.Collections.unmodifiableList(showNameCardIdList_) : showNameCardIdList_;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @return The count of showNameCardIdList.
        */
       public int getShowNameCardIdListCount() {
         return showNameCardIdList_.size();
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @param index The index of the element to return.
        * @return The showNameCardIdList at the given index.
        */
@@ -540,7 +530,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
         return showNameCardIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @param index The index to set the value at.
        * @param value The showNameCardIdList to set.
        * @return This builder for chaining.
@@ -553,7 +543,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @param value The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -564,7 +554,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @param values The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -577,7 +567,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 14;</code>
+       * <code>repeated uint32 show_name_card_id_list = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearShowNameCardIdList() {
@@ -655,7 +645,7 @@ public final class UpdatePlayerShowNameCardListReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n%UpdatePlayerShowNameCardListReq.proto\"" +
       "A\n\037UpdatePlayerShowNameCardListReq\022\036\n\026sh" +
-      "ow_name_card_id_list\030\016 \003(\rB\033\n\031emu.grassc" +
+      "ow_name_card_id_list\030\r \003(\rB\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/UpdatePlayerShowNameCardListRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListRspOuterClass.java
index 4cfa8c11e..81ff8631b 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UpdatePlayerShowNameCardListRspOuterClass.java
@@ -19,34 +19,29 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 10;</code>
-     * @return The retcode.
-     */
-    int getRetcode();
-
-    /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @return A list containing the showNameCardIdList.
      */
     java.util.List<java.lang.Integer> getShowNameCardIdListList();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @return The count of showNameCardIdList.
      */
     int getShowNameCardIdListCount();
     /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
     int getShowNameCardIdList(int index);
+
+    /**
+     * <code>int32 retcode = 8;</code>
+     * @return The retcode.
+     */
+    int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 5380
-   * Obf: HKCEGKBFPCM
-   * </pre>
-   *
    * Protobuf type {@code UpdatePlayerShowNameCardListRsp}
    */
   public static final class UpdatePlayerShowNameCardListRsp extends
@@ -93,12 +88,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
             case 0:
               done = true;
               break;
-            case 80: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 96: {
+            case 8: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 showNameCardIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +96,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
               showNameCardIdList_.addInt(input.readUInt32());
               break;
             }
-            case 98: {
+            case 10: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -119,6 +109,11 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 64: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -154,21 +149,10 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
               emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp.class, emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp.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 SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 12;
+    public static final int SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList showNameCardIdList_;
     /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @return A list containing the showNameCardIdList.
      */
     @java.lang.Override
@@ -177,14 +161,14 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       return showNameCardIdList_;
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @return The count of showNameCardIdList.
      */
     public int getShowNameCardIdListCount() {
       return showNameCardIdList_.size();
     }
     /**
-     * <code>repeated uint32 show_name_card_id_list = 12;</code>
+     * <code>repeated uint32 show_name_card_id_list = 1;</code>
      * @param index The index of the element to return.
      * @return The showNameCardIdList at the given index.
      */
@@ -193,6 +177,17 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
     }
     private int showNameCardIdListMemoizedSerializedSize = -1;
 
+    public static final int RETCODE_FIELD_NUMBER = 8;
+    private int retcode_;
+    /**
+     * <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() {
@@ -208,16 +203,16 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (retcode_ != 0) {
-        output.writeInt32(10, retcode_);
-      }
       if (getShowNameCardIdListList().size() > 0) {
-        output.writeUInt32NoTag(98);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(showNameCardIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < showNameCardIdList_.size(); i++) {
         output.writeUInt32NoTag(showNameCardIdList_.getInt(i));
       }
+      if (retcode_ != 0) {
+        output.writeInt32(8, retcode_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -227,10 +222,6 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       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 < showNameCardIdList_.size(); i++) {
@@ -245,6 +236,10 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         }
         showNameCardIdListMemoizedSerializedSize = dataSize;
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(8, retcode_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -260,10 +255,10 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       }
       emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp other = (emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (!getShowNameCardIdListList()
           .equals(other.getShowNameCardIdListList())) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (getShowNameCardIdListCount() > 0) {
         hash = (37 * hash) + SHOW_NAME_CARD_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getShowNameCardIdListList().hashCode();
       }
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5380
-     * Obf: HKCEGKBFPCM
-     * </pre>
-     *
      * Protobuf type {@code UpdatePlayerShowNameCardListRsp}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         showNameCardIdList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
+        retcode_ = 0;
+
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       public emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp buildPartial() {
         emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp result = new emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp(this);
         int from_bitField0_ = bitField0_;
-        result.retcode_ = retcode_;
         if (((bitField0_ & 0x00000001) != 0)) {
           showNameCardIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.showNameCardIdList_ = showNameCardIdList_;
+        result.retcode_ = retcode_;
         onBuilt();
         return result;
       }
@@ -504,9 +494,6 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp other) {
         if (other == emu.grasscutter.net.proto.UpdatePlayerShowNameCardListRspOuterClass.UpdatePlayerShowNameCardListRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (!other.showNameCardIdList_.isEmpty()) {
           if (showNameCardIdList_.isEmpty()) {
             showNameCardIdList_ = other.showNameCardIdList_;
@@ -517,6 +504,9 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
           }
           onChanged();
         }
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,37 +537,6 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
       }
       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 showNameCardIdList_ = emptyIntList();
       private void ensureShowNameCardIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -586,7 +545,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @return A list containing the showNameCardIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -595,14 +554,14 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
                  java.util.Collections.unmodifiableList(showNameCardIdList_) : showNameCardIdList_;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @return The count of showNameCardIdList.
        */
       public int getShowNameCardIdListCount() {
         return showNameCardIdList_.size();
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @param index The index of the element to return.
        * @return The showNameCardIdList at the given index.
        */
@@ -610,7 +569,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         return showNameCardIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The showNameCardIdList to set.
        * @return This builder for chaining.
@@ -623,7 +582,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @param value The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -634,7 +593,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @param values The showNameCardIdList to add.
        * @return This builder for chaining.
        */
@@ -647,7 +606,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 show_name_card_id_list = 12;</code>
+       * <code>repeated uint32 show_name_card_id_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearShowNameCardIdList() {
@@ -656,6 +615,37 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
         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;
+        onChanged();
+        return this;
+      }
+      /**
+       * <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) {
@@ -724,9 +714,9 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n%UpdatePlayerShowNameCardListRsp.proto\"" +
-      "R\n\037UpdatePlayerShowNameCardListRsp\022\017\n\007re" +
-      "tcode\030\n \001(\005\022\036\n\026show_name_card_id_list\030\014 " +
-      "\003(\rB\033\n\031emu.grasscutter.net.protob\006proto3"
+      "R\n\037UpdatePlayerShowNameCardListRsp\022\036\n\026sh" +
+      "ow_name_card_id_list\030\001 \003(\r\022\017\n\007retcode\030\010 " +
+      "\001(\005B\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -737,7 +727,7 @@ public final class UpdatePlayerShowNameCardListRspOuterClass {
     internal_static_UpdatePlayerShowNameCardListRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UpdatePlayerShowNameCardListRsp_descriptor,
-        new java.lang.String[] { "Retcode", "ShowNameCardIdList", });
+        new java.lang.String[] { "ShowNameCardIdList", "Retcode", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UseItemReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UseItemReqOuterClass.java
index dad9b420e..bb85e62ab 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UseItemReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UseItemReqOuterClass.java
@@ -19,41 +19,36 @@ public final class UseItemReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_enter_mp_dungeon_team = 8;</code>
-     * @return The isEnterMpDungeonTeam.
-     */
-    boolean getIsEnterMpDungeonTeam();
-
-    /**
-     * <code>uint32 count = 14;</code>
+     * <code>uint32 count = 9;</code>
      * @return The count.
      */
     int getCount();
 
     /**
-     * <code>uint64 guid = 9;</code>
-     * @return The guid.
+     * <code>uint32 option_idx = 6;</code>
+     * @return The optionIdx.
      */
-    long getGuid();
+    int getOptionIdx();
 
     /**
-     * <code>uint64 target_guid = 15;</code>
+     * <code>uint64 target_guid = 5;</code>
      * @return The targetGuid.
      */
     long getTargetGuid();
 
     /**
-     * <code>uint32 option_idx = 3;</code>
-     * @return The optionIdx.
+     * <code>bool is_enter_mp_dungeon_team = 10;</code>
+     * @return The isEnterMpDungeonTeam.
      */
-    int getOptionIdx();
+    boolean getIsEnterMpDungeonTeam();
+
+    /**
+     * <code>uint64 guid = 4;</code>
+     * @return The guid.
+     */
+    long getGuid();
   }
   /**
-   * <pre>
-   * CmdId: 9155
-   * Obf: OKFMPIODGJM
-   * </pre>
-   *
    * Protobuf type {@code UseItemReq}
    */
   public static final class UseItemReq extends
@@ -98,29 +93,29 @@ public final class UseItemReqOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
-
-              optionIdx_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-
-              isEnterMpDungeonTeam_ = input.readBool();
-              break;
-            }
-            case 72: {
+            case 32: {
 
               guid_ = input.readUInt64();
               break;
             }
-            case 112: {
+            case 40: {
+
+              targetGuid_ = input.readUInt64();
+              break;
+            }
+            case 48: {
+
+              optionIdx_ = input.readUInt32();
+              break;
+            }
+            case 72: {
 
               count_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 80: {
 
-              targetGuid_ = input.readUInt64();
+              isEnterMpDungeonTeam_ = input.readBool();
               break;
             }
             default: {
@@ -155,21 +150,10 @@ public final class UseItemReqOuterClass {
               emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq.class, emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq.Builder.class);
     }
 
-    public static final int IS_ENTER_MP_DUNGEON_TEAM_FIELD_NUMBER = 8;
-    private boolean isEnterMpDungeonTeam_;
-    /**
-     * <code>bool is_enter_mp_dungeon_team = 8;</code>
-     * @return The isEnterMpDungeonTeam.
-     */
-    @java.lang.Override
-    public boolean getIsEnterMpDungeonTeam() {
-      return isEnterMpDungeonTeam_;
-    }
-
-    public static final int COUNT_FIELD_NUMBER = 14;
+    public static final int COUNT_FIELD_NUMBER = 9;
     private int count_;
     /**
-     * <code>uint32 count = 14;</code>
+     * <code>uint32 count = 9;</code>
      * @return The count.
      */
     @java.lang.Override
@@ -177,21 +161,21 @@ public final class UseItemReqOuterClass {
       return count_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 9;
-    private long guid_;
+    public static final int OPTION_IDX_FIELD_NUMBER = 6;
+    private int optionIdx_;
     /**
-     * <code>uint64 guid = 9;</code>
-     * @return The guid.
+     * <code>uint32 option_idx = 6;</code>
+     * @return The optionIdx.
      */
     @java.lang.Override
-    public long getGuid() {
-      return guid_;
+    public int getOptionIdx() {
+      return optionIdx_;
     }
 
-    public static final int TARGET_GUID_FIELD_NUMBER = 15;
+    public static final int TARGET_GUID_FIELD_NUMBER = 5;
     private long targetGuid_;
     /**
-     * <code>uint64 target_guid = 15;</code>
+     * <code>uint64 target_guid = 5;</code>
      * @return The targetGuid.
      */
     @java.lang.Override
@@ -199,15 +183,26 @@ public final class UseItemReqOuterClass {
       return targetGuid_;
     }
 
-    public static final int OPTION_IDX_FIELD_NUMBER = 3;
-    private int optionIdx_;
+    public static final int IS_ENTER_MP_DUNGEON_TEAM_FIELD_NUMBER = 10;
+    private boolean isEnterMpDungeonTeam_;
     /**
-     * <code>uint32 option_idx = 3;</code>
-     * @return The optionIdx.
+     * <code>bool is_enter_mp_dungeon_team = 10;</code>
+     * @return The isEnterMpDungeonTeam.
      */
     @java.lang.Override
-    public int getOptionIdx() {
-      return optionIdx_;
+    public boolean getIsEnterMpDungeonTeam() {
+      return isEnterMpDungeonTeam_;
+    }
+
+    public static final int GUID_FIELD_NUMBER = 4;
+    private long guid_;
+    /**
+     * <code>uint64 guid = 4;</code>
+     * @return The guid.
+     */
+    @java.lang.Override
+    public long getGuid() {
+      return guid_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -224,20 +219,20 @@ public final class UseItemReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (optionIdx_ != 0) {
-        output.writeUInt32(3, optionIdx_);
-      }
-      if (isEnterMpDungeonTeam_ != false) {
-        output.writeBool(8, isEnterMpDungeonTeam_);
-      }
       if (guid_ != 0L) {
-        output.writeUInt64(9, guid_);
-      }
-      if (count_ != 0) {
-        output.writeUInt32(14, count_);
+        output.writeUInt64(4, guid_);
       }
       if (targetGuid_ != 0L) {
-        output.writeUInt64(15, targetGuid_);
+        output.writeUInt64(5, targetGuid_);
+      }
+      if (optionIdx_ != 0) {
+        output.writeUInt32(6, optionIdx_);
+      }
+      if (count_ != 0) {
+        output.writeUInt32(9, count_);
+      }
+      if (isEnterMpDungeonTeam_ != false) {
+        output.writeBool(10, isEnterMpDungeonTeam_);
       }
       unknownFields.writeTo(output);
     }
@@ -248,25 +243,25 @@ public final class UseItemReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (optionIdx_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, optionIdx_);
-      }
-      if (isEnterMpDungeonTeam_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(8, isEnterMpDungeonTeam_);
-      }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, guid_);
-      }
-      if (count_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, count_);
+          .computeUInt64Size(4, guid_);
       }
       if (targetGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, targetGuid_);
+          .computeUInt64Size(5, targetGuid_);
+      }
+      if (optionIdx_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, optionIdx_);
+      }
+      if (count_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(9, count_);
+      }
+      if (isEnterMpDungeonTeam_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(10, isEnterMpDungeonTeam_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,16 +278,16 @@ public final class UseItemReqOuterClass {
       }
       emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq other = (emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq) obj;
 
-      if (getIsEnterMpDungeonTeam()
-          != other.getIsEnterMpDungeonTeam()) return false;
       if (getCount()
           != other.getCount()) return false;
-      if (getGuid()
-          != other.getGuid()) return false;
-      if (getTargetGuid()
-          != other.getTargetGuid()) return false;
       if (getOptionIdx()
           != other.getOptionIdx()) return false;
+      if (getTargetGuid()
+          != other.getTargetGuid()) return false;
+      if (getIsEnterMpDungeonTeam()
+          != other.getIsEnterMpDungeonTeam()) return false;
+      if (getGuid()
+          != other.getGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -304,19 +299,19 @@ public final class UseItemReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + IS_ENTER_MP_DUNGEON_TEAM_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsEnterMpDungeonTeam());
       hash = (37 * hash) + COUNT_FIELD_NUMBER;
       hash = (53 * hash) + getCount();
-      hash = (37 * hash) + GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getGuid());
+      hash = (37 * hash) + OPTION_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + getOptionIdx();
       hash = (37 * hash) + TARGET_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetGuid());
-      hash = (37 * hash) + OPTION_IDX_FIELD_NUMBER;
-      hash = (53 * hash) + getOptionIdx();
+      hash = (37 * hash) + IS_ENTER_MP_DUNGEON_TEAM_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsEnterMpDungeonTeam());
+      hash = (37 * hash) + GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -413,11 +408,6 @@ public final class UseItemReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9155
-     * Obf: OKFMPIODGJM
-     * </pre>
-     *
      * Protobuf type {@code UseItemReq}
      */
     public static final class Builder extends
@@ -455,15 +445,15 @@ public final class UseItemReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isEnterMpDungeonTeam_ = false;
-
         count_ = 0;
 
-        guid_ = 0L;
+        optionIdx_ = 0;
 
         targetGuid_ = 0L;
 
-        optionIdx_ = 0;
+        isEnterMpDungeonTeam_ = false;
+
+        guid_ = 0L;
 
         return this;
       }
@@ -491,11 +481,11 @@ public final class UseItemReqOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq buildPartial() {
         emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq result = new emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq(this);
-        result.isEnterMpDungeonTeam_ = isEnterMpDungeonTeam_;
         result.count_ = count_;
-        result.guid_ = guid_;
-        result.targetGuid_ = targetGuid_;
         result.optionIdx_ = optionIdx_;
+        result.targetGuid_ = targetGuid_;
+        result.isEnterMpDungeonTeam_ = isEnterMpDungeonTeam_;
+        result.guid_ = guid_;
         onBuilt();
         return result;
       }
@@ -544,20 +534,20 @@ public final class UseItemReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq other) {
         if (other == emu.grasscutter.net.proto.UseItemReqOuterClass.UseItemReq.getDefaultInstance()) return this;
-        if (other.getIsEnterMpDungeonTeam() != false) {
-          setIsEnterMpDungeonTeam(other.getIsEnterMpDungeonTeam());
-        }
         if (other.getCount() != 0) {
           setCount(other.getCount());
         }
-        if (other.getGuid() != 0L) {
-          setGuid(other.getGuid());
+        if (other.getOptionIdx() != 0) {
+          setOptionIdx(other.getOptionIdx());
         }
         if (other.getTargetGuid() != 0L) {
           setTargetGuid(other.getTargetGuid());
         }
-        if (other.getOptionIdx() != 0) {
-          setOptionIdx(other.getOptionIdx());
+        if (other.getIsEnterMpDungeonTeam() != false) {
+          setIsEnterMpDungeonTeam(other.getIsEnterMpDungeonTeam());
+        }
+        if (other.getGuid() != 0L) {
+          setGuid(other.getGuid());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -588,40 +578,9 @@ public final class UseItemReqOuterClass {
         return this;
       }
 
-      private boolean isEnterMpDungeonTeam_ ;
-      /**
-       * <code>bool is_enter_mp_dungeon_team = 8;</code>
-       * @return The isEnterMpDungeonTeam.
-       */
-      @java.lang.Override
-      public boolean getIsEnterMpDungeonTeam() {
-        return isEnterMpDungeonTeam_;
-      }
-      /**
-       * <code>bool is_enter_mp_dungeon_team = 8;</code>
-       * @param value The isEnterMpDungeonTeam to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsEnterMpDungeonTeam(boolean value) {
-        
-        isEnterMpDungeonTeam_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_enter_mp_dungeon_team = 8;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsEnterMpDungeonTeam() {
-        
-        isEnterMpDungeonTeam_ = false;
-        onChanged();
-        return this;
-      }
-
       private int count_ ;
       /**
-       * <code>uint32 count = 14;</code>
+       * <code>uint32 count = 9;</code>
        * @return The count.
        */
       @java.lang.Override
@@ -629,7 +588,7 @@ public final class UseItemReqOuterClass {
         return count_;
       }
       /**
-       * <code>uint32 count = 14;</code>
+       * <code>uint32 count = 9;</code>
        * @param value The count to set.
        * @return This builder for chaining.
        */
@@ -640,7 +599,7 @@ public final class UseItemReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 count = 14;</code>
+       * <code>uint32 count = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearCount() {
@@ -650,71 +609,9 @@ public final class UseItemReqOuterClass {
         return this;
       }
 
-      private long guid_ ;
-      /**
-       * <code>uint64 guid = 9;</code>
-       * @return The guid.
-       */
-      @java.lang.Override
-      public long getGuid() {
-        return guid_;
-      }
-      /**
-       * <code>uint64 guid = 9;</code>
-       * @param value The guid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setGuid(long value) {
-        
-        guid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 guid = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGuid() {
-        
-        guid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private long targetGuid_ ;
-      /**
-       * <code>uint64 target_guid = 15;</code>
-       * @return The targetGuid.
-       */
-      @java.lang.Override
-      public long getTargetGuid() {
-        return targetGuid_;
-      }
-      /**
-       * <code>uint64 target_guid = 15;</code>
-       * @param value The targetGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetGuid(long value) {
-        
-        targetGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 target_guid = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetGuid() {
-        
-        targetGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
       private int optionIdx_ ;
       /**
-       * <code>uint32 option_idx = 3;</code>
+       * <code>uint32 option_idx = 6;</code>
        * @return The optionIdx.
        */
       @java.lang.Override
@@ -722,7 +619,7 @@ public final class UseItemReqOuterClass {
         return optionIdx_;
       }
       /**
-       * <code>uint32 option_idx = 3;</code>
+       * <code>uint32 option_idx = 6;</code>
        * @param value The optionIdx to set.
        * @return This builder for chaining.
        */
@@ -733,7 +630,7 @@ public final class UseItemReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 option_idx = 3;</code>
+       * <code>uint32 option_idx = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionIdx() {
@@ -742,6 +639,99 @@ public final class UseItemReqOuterClass {
         onChanged();
         return this;
       }
+
+      private long targetGuid_ ;
+      /**
+       * <code>uint64 target_guid = 5;</code>
+       * @return The targetGuid.
+       */
+      @java.lang.Override
+      public long getTargetGuid() {
+        return targetGuid_;
+      }
+      /**
+       * <code>uint64 target_guid = 5;</code>
+       * @param value The targetGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetGuid(long value) {
+        
+        targetGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 target_guid = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetGuid() {
+        
+        targetGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
+      private boolean isEnterMpDungeonTeam_ ;
+      /**
+       * <code>bool is_enter_mp_dungeon_team = 10;</code>
+       * @return The isEnterMpDungeonTeam.
+       */
+      @java.lang.Override
+      public boolean getIsEnterMpDungeonTeam() {
+        return isEnterMpDungeonTeam_;
+      }
+      /**
+       * <code>bool is_enter_mp_dungeon_team = 10;</code>
+       * @param value The isEnterMpDungeonTeam to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsEnterMpDungeonTeam(boolean value) {
+        
+        isEnterMpDungeonTeam_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_enter_mp_dungeon_team = 10;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsEnterMpDungeonTeam() {
+        
+        isEnterMpDungeonTeam_ = false;
+        onChanged();
+        return this;
+      }
+
+      private long guid_ ;
+      /**
+       * <code>uint64 guid = 4;</code>
+       * @return The guid.
+       */
+      @java.lang.Override
+      public long getGuid() {
+        return guid_;
+      }
+      /**
+       * <code>uint64 guid = 4;</code>
+       * @param value The guid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGuid(long value) {
+        
+        guid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 guid = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGuid() {
+        
+        guid_ = 0L;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -809,10 +799,10 @@ public final class UseItemReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020UseItemReq.proto\"t\n\nUseItemReq\022 \n\030is_e" +
-      "nter_mp_dungeon_team\030\010 \001(\010\022\r\n\005count\030\016 \001(" +
-      "\r\022\014\n\004guid\030\t \001(\004\022\023\n\013target_guid\030\017 \001(\004\022\022\n\n" +
-      "option_idx\030\003 \001(\rB\033\n\031emu.grasscutter.net." +
+      "\n\020UseItemReq.proto\"t\n\nUseItemReq\022\r\n\005coun" +
+      "t\030\t \001(\r\022\022\n\noption_idx\030\006 \001(\r\022\023\n\013target_gu" +
+      "id\030\005 \001(\004\022 \n\030is_enter_mp_dungeon_team\030\n \001" +
+      "(\010\022\014\n\004guid\030\004 \001(\004B\033\n\031emu.grasscutter.net." +
       "protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -824,7 +814,7 @@ public final class UseItemReqOuterClass {
     internal_static_UseItemReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UseItemReq_descriptor,
-        new java.lang.String[] { "IsEnterMpDungeonTeam", "Count", "Guid", "TargetGuid", "OptionIdx", });
+        new java.lang.String[] { "Count", "OptionIdx", "TargetGuid", "IsEnterMpDungeonTeam", "Guid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/UseItemRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/UseItemRspOuterClass.java
index e0919392a..38a8461e2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/UseItemRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/UseItemRspOuterClass.java
@@ -19,41 +19,36 @@ public final class UseItemRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 option_idx = 7;</code>
-     * @return The optionIdx.
-     */
-    int getOptionIdx();
-
-    /**
-     * <code>uint64 target_guid = 10;</code>
+     * <code>uint64 target_guid = 2;</code>
      * @return The targetGuid.
      */
     long getTargetGuid();
 
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 guid = 8;</code>
+     * <code>uint32 option_idx = 11;</code>
+     * @return The optionIdx.
+     */
+    int getOptionIdx();
+
+    /**
+     * <code>uint64 guid = 12;</code>
      * @return The guid.
      */
     long getGuid();
 
     /**
-     * <code>uint32 item_id = 3;</code>
+     * <code>uint32 item_id = 14;</code>
      * @return The itemId.
      */
     int getItemId();
   }
   /**
-   * <pre>
-   * CmdId: 5970
-   * Obf: KNLKONFMMIA
-   * </pre>
-   *
    * Protobuf type {@code UseItemRsp}
    */
   public static final class UseItemRsp extends
@@ -100,27 +95,27 @@ public final class UseItemRspOuterClass {
               break;
             case 16: {
 
+              targetGuid_ = input.readUInt64();
+              break;
+            }
+            case 40: {
+
               retcode_ = input.readInt32();
               break;
             }
-            case 24: {
-
-              itemId_ = input.readUInt32();
-              break;
-            }
-            case 56: {
+            case 88: {
 
               optionIdx_ = input.readUInt32();
               break;
             }
-            case 64: {
+            case 96: {
 
               guid_ = input.readUInt64();
               break;
             }
-            case 80: {
+            case 112: {
 
-              targetGuid_ = input.readUInt64();
+              itemId_ = input.readUInt32();
               break;
             }
             default: {
@@ -155,21 +150,10 @@ public final class UseItemRspOuterClass {
               emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp.class, emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp.Builder.class);
     }
 
-    public static final int OPTION_IDX_FIELD_NUMBER = 7;
-    private int optionIdx_;
-    /**
-     * <code>uint32 option_idx = 7;</code>
-     * @return The optionIdx.
-     */
-    @java.lang.Override
-    public int getOptionIdx() {
-      return optionIdx_;
-    }
-
-    public static final int TARGET_GUID_FIELD_NUMBER = 10;
+    public static final int TARGET_GUID_FIELD_NUMBER = 2;
     private long targetGuid_;
     /**
-     * <code>uint64 target_guid = 10;</code>
+     * <code>uint64 target_guid = 2;</code>
      * @return The targetGuid.
      */
     @java.lang.Override
@@ -177,10 +161,10 @@ public final class UseItemRspOuterClass {
       return targetGuid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 2;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 2;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -188,10 +172,21 @@ public final class UseItemRspOuterClass {
       return retcode_;
     }
 
-    public static final int GUID_FIELD_NUMBER = 8;
+    public static final int OPTION_IDX_FIELD_NUMBER = 11;
+    private int optionIdx_;
+    /**
+     * <code>uint32 option_idx = 11;</code>
+     * @return The optionIdx.
+     */
+    @java.lang.Override
+    public int getOptionIdx() {
+      return optionIdx_;
+    }
+
+    public static final int GUID_FIELD_NUMBER = 12;
     private long guid_;
     /**
-     * <code>uint64 guid = 8;</code>
+     * <code>uint64 guid = 12;</code>
      * @return The guid.
      */
     @java.lang.Override
@@ -199,10 +194,10 @@ public final class UseItemRspOuterClass {
       return guid_;
     }
 
-    public static final int ITEM_ID_FIELD_NUMBER = 3;
+    public static final int ITEM_ID_FIELD_NUMBER = 14;
     private int itemId_;
     /**
-     * <code>uint32 item_id = 3;</code>
+     * <code>uint32 item_id = 14;</code>
      * @return The itemId.
      */
     @java.lang.Override
@@ -224,20 +219,20 @@ public final class UseItemRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(2, retcode_);
+      if (targetGuid_ != 0L) {
+        output.writeUInt64(2, targetGuid_);
       }
-      if (itemId_ != 0) {
-        output.writeUInt32(3, itemId_);
+      if (retcode_ != 0) {
+        output.writeInt32(5, retcode_);
       }
       if (optionIdx_ != 0) {
-        output.writeUInt32(7, optionIdx_);
+        output.writeUInt32(11, optionIdx_);
       }
       if (guid_ != 0L) {
-        output.writeUInt64(8, guid_);
+        output.writeUInt64(12, guid_);
       }
-      if (targetGuid_ != 0L) {
-        output.writeUInt64(10, targetGuid_);
+      if (itemId_ != 0) {
+        output.writeUInt32(14, itemId_);
       }
       unknownFields.writeTo(output);
     }
@@ -248,25 +243,25 @@ public final class UseItemRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (targetGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(2, targetGuid_);
+      }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(2, retcode_);
-      }
-      if (itemId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, itemId_);
+          .computeInt32Size(5, retcode_);
       }
       if (optionIdx_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, optionIdx_);
+          .computeUInt32Size(11, optionIdx_);
       }
       if (guid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(8, guid_);
+          .computeUInt64Size(12, guid_);
       }
-      if (targetGuid_ != 0L) {
+      if (itemId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(10, targetGuid_);
+          .computeUInt32Size(14, itemId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -283,12 +278,12 @@ public final class UseItemRspOuterClass {
       }
       emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp other = (emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp) obj;
 
-      if (getOptionIdx()
-          != other.getOptionIdx()) return false;
       if (getTargetGuid()
           != other.getTargetGuid()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getOptionIdx()
+          != other.getOptionIdx()) return false;
       if (getGuid()
           != other.getGuid()) return false;
       if (getItemId()
@@ -304,13 +299,13 @@ public final class UseItemRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + OPTION_IDX_FIELD_NUMBER;
-      hash = (53 * hash) + getOptionIdx();
       hash = (37 * hash) + TARGET_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetGuid());
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + OPTION_IDX_FIELD_NUMBER;
+      hash = (53 * hash) + getOptionIdx();
       hash = (37 * hash) + GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getGuid());
@@ -412,11 +407,6 @@ public final class UseItemRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 5970
-     * Obf: KNLKONFMMIA
-     * </pre>
-     *
      * Protobuf type {@code UseItemRsp}
      */
     public static final class Builder extends
@@ -454,12 +444,12 @@ public final class UseItemRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        optionIdx_ = 0;
-
         targetGuid_ = 0L;
 
         retcode_ = 0;
 
+        optionIdx_ = 0;
+
         guid_ = 0L;
 
         itemId_ = 0;
@@ -490,9 +480,9 @@ public final class UseItemRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp buildPartial() {
         emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp result = new emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp(this);
-        result.optionIdx_ = optionIdx_;
         result.targetGuid_ = targetGuid_;
         result.retcode_ = retcode_;
+        result.optionIdx_ = optionIdx_;
         result.guid_ = guid_;
         result.itemId_ = itemId_;
         onBuilt();
@@ -543,15 +533,15 @@ public final class UseItemRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp other) {
         if (other == emu.grasscutter.net.proto.UseItemRspOuterClass.UseItemRsp.getDefaultInstance()) return this;
-        if (other.getOptionIdx() != 0) {
-          setOptionIdx(other.getOptionIdx());
-        }
         if (other.getTargetGuid() != 0L) {
           setTargetGuid(other.getTargetGuid());
         }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getOptionIdx() != 0) {
+          setOptionIdx(other.getOptionIdx());
+        }
         if (other.getGuid() != 0L) {
           setGuid(other.getGuid());
         }
@@ -587,40 +577,9 @@ public final class UseItemRspOuterClass {
         return this;
       }
 
-      private int optionIdx_ ;
-      /**
-       * <code>uint32 option_idx = 7;</code>
-       * @return The optionIdx.
-       */
-      @java.lang.Override
-      public int getOptionIdx() {
-        return optionIdx_;
-      }
-      /**
-       * <code>uint32 option_idx = 7;</code>
-       * @param value The optionIdx to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOptionIdx(int value) {
-        
-        optionIdx_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 option_idx = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOptionIdx() {
-        
-        optionIdx_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long targetGuid_ ;
       /**
-       * <code>uint64 target_guid = 10;</code>
+       * <code>uint64 target_guid = 2;</code>
        * @return The targetGuid.
        */
       @java.lang.Override
@@ -628,7 +587,7 @@ public final class UseItemRspOuterClass {
         return targetGuid_;
       }
       /**
-       * <code>uint64 target_guid = 10;</code>
+       * <code>uint64 target_guid = 2;</code>
        * @param value The targetGuid to set.
        * @return This builder for chaining.
        */
@@ -639,7 +598,7 @@ public final class UseItemRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_guid = 10;</code>
+       * <code>uint64 target_guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetGuid() {
@@ -651,7 +610,7 @@ public final class UseItemRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -659,7 +618,7 @@ public final class UseItemRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -670,7 +629,7 @@ public final class UseItemRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 2;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -680,9 +639,40 @@ public final class UseItemRspOuterClass {
         return this;
       }
 
+      private int optionIdx_ ;
+      /**
+       * <code>uint32 option_idx = 11;</code>
+       * @return The optionIdx.
+       */
+      @java.lang.Override
+      public int getOptionIdx() {
+        return optionIdx_;
+      }
+      /**
+       * <code>uint32 option_idx = 11;</code>
+       * @param value The optionIdx to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOptionIdx(int value) {
+        
+        optionIdx_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 option_idx = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOptionIdx() {
+        
+        optionIdx_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long guid_ ;
       /**
-       * <code>uint64 guid = 8;</code>
+       * <code>uint64 guid = 12;</code>
        * @return The guid.
        */
       @java.lang.Override
@@ -690,7 +680,7 @@ public final class UseItemRspOuterClass {
         return guid_;
       }
       /**
-       * <code>uint64 guid = 8;</code>
+       * <code>uint64 guid = 12;</code>
        * @param value The guid to set.
        * @return This builder for chaining.
        */
@@ -701,7 +691,7 @@ public final class UseItemRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 guid = 8;</code>
+       * <code>uint64 guid = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearGuid() {
@@ -713,7 +703,7 @@ public final class UseItemRspOuterClass {
 
       private int itemId_ ;
       /**
-       * <code>uint32 item_id = 3;</code>
+       * <code>uint32 item_id = 14;</code>
        * @return The itemId.
        */
       @java.lang.Override
@@ -721,7 +711,7 @@ public final class UseItemRspOuterClass {
         return itemId_;
       }
       /**
-       * <code>uint32 item_id = 3;</code>
+       * <code>uint32 item_id = 14;</code>
        * @param value The itemId to set.
        * @return This builder for chaining.
        */
@@ -732,7 +722,7 @@ public final class UseItemRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 item_id = 3;</code>
+       * <code>uint32 item_id = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearItemId() {
@@ -808,9 +798,9 @@ public final class UseItemRspOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\020UseItemRsp.proto\"e\n\nUseItemRsp\022\022\n\nopti" +
-      "on_idx\030\007 \001(\r\022\023\n\013target_guid\030\n \001(\004\022\017\n\007ret" +
-      "code\030\002 \001(\005\022\014\n\004guid\030\010 \001(\004\022\017\n\007item_id\030\003 \001(" +
+      "\n\020UseItemRsp.proto\"e\n\nUseItemRsp\022\023\n\013targ" +
+      "et_guid\030\002 \001(\004\022\017\n\007retcode\030\005 \001(\005\022\022\n\noption" +
+      "_idx\030\013 \001(\r\022\014\n\004guid\030\014 \001(\004\022\017\n\007item_id\030\016 \001(" +
       "\rB\033\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -822,7 +812,7 @@ public final class UseItemRspOuterClass {
     internal_static_UseItemRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_UseItemRsp_descriptor,
-        new java.lang.String[] { "OptionIdx", "TargetGuid", "Retcode", "Guid", "ItemId", });
+        new java.lang.String[] { "TargetGuid", "Retcode", "OptionIdx", "Guid", "ItemId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/Vector3IntOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/Vector3IntOuterClass.java
index 76ae5a338..4ab4fd329 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/Vector3IntOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/Vector3IntOuterClass.java
@@ -37,10 +37,6 @@ public final class Vector3IntOuterClass {
     int getZ();
   }
   /**
-   * <pre>
-   * Obf: KKPDGAEKGHF
-   * </pre>
-   *
    * Protobuf type {@code Vector3Int}
    */
   public static final class Vector3Int extends
@@ -343,10 +339,6 @@ public final class Vector3IntOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: KKPDGAEKGHF
-     * </pre>
-     *
      * Protobuf type {@code Vector3Int}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VectorOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VectorOuterClass.java
index 3f3916dad..4151faaec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VectorOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VectorOuterClass.java
@@ -37,10 +37,6 @@ public final class VectorOuterClass {
     float getZ();
   }
   /**
-   * <pre>
-   * Obf: FMFHHKCONCE
-   * </pre>
-   *
    * Protobuf type {@code Vector}
    */
   public static final class Vector extends
@@ -349,10 +345,6 @@ public final class VectorOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FMFHHKCONCE
-     * </pre>
-     *
      * Protobuf type {@code Vector}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInfoOuterClass.java
index bbabec6ad..f6bf77663 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInfoOuterClass.java
@@ -53,10 +53,28 @@ public final class VehicleInfoOuterClass {
      * @return The curStamina.
      */
     float getCurStamina();
+
+    /**
+     * <code>uint32 GPMPAEGBEJE = 4;</code>
+     * @return The gPMPAEGBEJE.
+     */
+    int getGPMPAEGBEJE();
+
+    /**
+     * <code>float LLGKENMIENL = 5;</code>
+     * @return The lLGKENMIENL.
+     */
+    float getLLGKENMIENL();
+
+    /**
+     * <code>uint32 anim_hash = 6;</code>
+     * @return The animHash.
+     */
+    int getAnimHash();
   }
   /**
    * <pre>
-   * Obf: ICCEPDBOFHC
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code VehicleInfo}
@@ -124,6 +142,21 @@ public final class VehicleInfoOuterClass {
               curStamina_ = input.readFloat();
               break;
             }
+            case 32: {
+
+              gPMPAEGBEJE_ = input.readUInt32();
+              break;
+            }
+            case 45: {
+
+              lLGKENMIENL_ = input.readFloat();
+              break;
+            }
+            case 48: {
+
+              animHash_ = input.readUInt32();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -221,6 +254,39 @@ public final class VehicleInfoOuterClass {
       return curStamina_;
     }
 
+    public static final int GPMPAEGBEJE_FIELD_NUMBER = 4;
+    private int gPMPAEGBEJE_;
+    /**
+     * <code>uint32 GPMPAEGBEJE = 4;</code>
+     * @return The gPMPAEGBEJE.
+     */
+    @java.lang.Override
+    public int getGPMPAEGBEJE() {
+      return gPMPAEGBEJE_;
+    }
+
+    public static final int LLGKENMIENL_FIELD_NUMBER = 5;
+    private float lLGKENMIENL_;
+    /**
+     * <code>float LLGKENMIENL = 5;</code>
+     * @return The lLGKENMIENL.
+     */
+    @java.lang.Override
+    public float getLLGKENMIENL() {
+      return lLGKENMIENL_;
+    }
+
+    public static final int ANIM_HASH_FIELD_NUMBER = 6;
+    private int animHash_;
+    /**
+     * <code>uint32 anim_hash = 6;</code>
+     * @return The animHash.
+     */
+    @java.lang.Override
+    public int getAnimHash() {
+      return animHash_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -244,6 +310,15 @@ public final class VehicleInfoOuterClass {
       if (curStamina_ != 0F) {
         output.writeFloat(3, curStamina_);
       }
+      if (gPMPAEGBEJE_ != 0) {
+        output.writeUInt32(4, gPMPAEGBEJE_);
+      }
+      if (lLGKENMIENL_ != 0F) {
+        output.writeFloat(5, lLGKENMIENL_);
+      }
+      if (animHash_ != 0) {
+        output.writeUInt32(6, animHash_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -265,6 +340,18 @@ public final class VehicleInfoOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeFloatSize(3, curStamina_);
       }
+      if (gPMPAEGBEJE_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, gPMPAEGBEJE_);
+      }
+      if (lLGKENMIENL_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(5, lLGKENMIENL_);
+      }
+      if (animHash_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(6, animHash_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -287,6 +374,13 @@ public final class VehicleInfoOuterClass {
       if (java.lang.Float.floatToIntBits(getCurStamina())
           != java.lang.Float.floatToIntBits(
               other.getCurStamina())) return false;
+      if (getGPMPAEGBEJE()
+          != other.getGPMPAEGBEJE()) return false;
+      if (java.lang.Float.floatToIntBits(getLLGKENMIENL())
+          != java.lang.Float.floatToIntBits(
+              other.getLLGKENMIENL())) return false;
+      if (getAnimHash()
+          != other.getAnimHash()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -307,6 +401,13 @@ public final class VehicleInfoOuterClass {
       hash = (37 * hash) + CUR_STAMINA_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
           getCurStamina());
+      hash = (37 * hash) + GPMPAEGBEJE_FIELD_NUMBER;
+      hash = (53 * hash) + getGPMPAEGBEJE();
+      hash = (37 * hash) + LLGKENMIENL_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getLLGKENMIENL());
+      hash = (37 * hash) + ANIM_HASH_FIELD_NUMBER;
+      hash = (53 * hash) + getAnimHash();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -404,7 +505,7 @@ public final class VehicleInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: ICCEPDBOFHC
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code VehicleInfo}
@@ -455,6 +556,12 @@ public final class VehicleInfoOuterClass {
 
         curStamina_ = 0F;
 
+        gPMPAEGBEJE_ = 0;
+
+        lLGKENMIENL_ = 0F;
+
+        animHash_ = 0;
+
         return this;
       }
 
@@ -493,6 +600,9 @@ public final class VehicleInfoOuterClass {
         }
         result.ownerUid_ = ownerUid_;
         result.curStamina_ = curStamina_;
+        result.gPMPAEGBEJE_ = gPMPAEGBEJE_;
+        result.lLGKENMIENL_ = lLGKENMIENL_;
+        result.animHash_ = animHash_;
         onBuilt();
         return result;
       }
@@ -573,6 +683,15 @@ public final class VehicleInfoOuterClass {
         if (other.getCurStamina() != 0F) {
           setCurStamina(other.getCurStamina());
         }
+        if (other.getGPMPAEGBEJE() != 0) {
+          setGPMPAEGBEJE(other.getGPMPAEGBEJE());
+        }
+        if (other.getLLGKENMIENL() != 0F) {
+          setLLGKENMIENL(other.getLLGKENMIENL());
+        }
+        if (other.getAnimHash() != 0) {
+          setAnimHash(other.getAnimHash());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -904,6 +1023,99 @@ public final class VehicleInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private int gPMPAEGBEJE_ ;
+      /**
+       * <code>uint32 GPMPAEGBEJE = 4;</code>
+       * @return The gPMPAEGBEJE.
+       */
+      @java.lang.Override
+      public int getGPMPAEGBEJE() {
+        return gPMPAEGBEJE_;
+      }
+      /**
+       * <code>uint32 GPMPAEGBEJE = 4;</code>
+       * @param value The gPMPAEGBEJE to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGPMPAEGBEJE(int value) {
+        
+        gPMPAEGBEJE_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GPMPAEGBEJE = 4;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGPMPAEGBEJE() {
+        
+        gPMPAEGBEJE_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private float lLGKENMIENL_ ;
+      /**
+       * <code>float LLGKENMIENL = 5;</code>
+       * @return The lLGKENMIENL.
+       */
+      @java.lang.Override
+      public float getLLGKENMIENL() {
+        return lLGKENMIENL_;
+      }
+      /**
+       * <code>float LLGKENMIENL = 5;</code>
+       * @param value The lLGKENMIENL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setLLGKENMIENL(float value) {
+        
+        lLGKENMIENL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float LLGKENMIENL = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearLLGKENMIENL() {
+        
+        lLGKENMIENL_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private int animHash_ ;
+      /**
+       * <code>uint32 anim_hash = 6;</code>
+       * @return The animHash.
+       */
+      @java.lang.Override
+      public int getAnimHash() {
+        return animHash_;
+      }
+      /**
+       * <code>uint32 anim_hash = 6;</code>
+       * @param value The animHash to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAnimHash(int value) {
+        
+        animHash_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 anim_hash = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAnimHash() {
+        
+        animHash_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -972,10 +1184,11 @@ public final class VehicleInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\021VehicleInfo.proto\032\023VehicleMember.proto" +
-      "\"Z\n\013VehicleInfo\022#\n\013member_list\030\001 \003(\0132\016.V" +
-      "ehicleMember\022\021\n\towner_uid\030\002 \001(\r\022\023\n\013cur_s" +
-      "tamina\030\003 \001(\002B\033\n\031emu.grasscutter.net.prot" +
-      "ob\006proto3"
+      "\"\227\001\n\013VehicleInfo\022#\n\013member_list\030\001 \003(\0132\016." +
+      "VehicleMember\022\021\n\towner_uid\030\002 \001(\r\022\023\n\013cur_" +
+      "stamina\030\003 \001(\002\022\023\n\013GPMPAEGBEJE\030\004 \001(\r\022\023\n\013LL" +
+      "GKENMIENL\030\005 \001(\002\022\021\n\tanim_hash\030\006 \001(\rB\033\n\031em" +
+      "u.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -987,7 +1200,7 @@ public final class VehicleInfoOuterClass {
     internal_static_VehicleInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleInfo_descriptor,
-        new java.lang.String[] { "MemberList", "OwnerUid", "CurStamina", });
+        new java.lang.String[] { "MemberList", "OwnerUid", "CurStamina", "GPMPAEGBEJE", "LLGKENMIENL", "AnimHash", });
     emu.grasscutter.net.proto.VehicleMemberOuterClass.getDescriptor();
   }
 
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 ab816fe15..4e2ed41ec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractReqOuterClass.java
@@ -19,40 +19,35 @@ public final class VehicleInteractReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>uint32 pos = 7;</code>
+     * <code>uint32 pos = 13;</code>
      * @return The pos.
      */
     int getPos();
 
     /**
-     * <code>.VehicleInteractType interact_type = 9;</code>
+     * <code>uint32 entity_id = 5;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>bool EILHBJJEPOK = 1;</code>
+     * @return The eILHBJJEPOK.
+     */
+    boolean getEILHBJJEPOK();
+
+    /**
+     * <code>.VehicleInteractType interact_type = 8;</code>
      * @return The enum numeric value on the wire for interactType.
      */
     int getInteractTypeValue();
     /**
-     * <code>.VehicleInteractType interact_type = 9;</code>
+     * <code>.VehicleInteractType interact_type = 8;</code>
      * @return The interactType.
      */
     emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType();
-
-    /**
-     * <code>bool EPCIACIPLAN = 15;</code>
-     * @return The ePCIACIPLAN.
-     */
-    boolean getEPCIACIPLAN();
   }
   /**
-   * <pre>
-   * CmdId: 28312
-   * Obf: BPOCDLCHOCO
-   * </pre>
-   *
    * Protobuf type {@code VehicleInteractReq}
    */
   public static final class VehicleInteractReq extends
@@ -98,25 +93,25 @@ public final class VehicleInteractReqOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 8: {
 
-              pos_ = input.readUInt32();
+              eILHBJJEPOK_ = input.readBool();
               break;
             }
-            case 72: {
+            case 40: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
               int rawValue = input.readEnum();
 
               interactType_ = rawValue;
               break;
             }
-            case 80: {
+            case 104: {
 
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 120: {
-
-              ePCIACIPLAN_ = input.readBool();
+              pos_ = input.readUInt32();
               break;
             }
             default: {
@@ -151,21 +146,10 @@ public final class VehicleInteractReqOuterClass {
               emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.class, emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 10;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int POS_FIELD_NUMBER = 7;
+    public static final int POS_FIELD_NUMBER = 13;
     private int pos_;
     /**
-     * <code>uint32 pos = 7;</code>
+     * <code>uint32 pos = 13;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -173,17 +157,39 @@ public final class VehicleInteractReqOuterClass {
       return pos_;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 9;
+    public static final int ENTITY_ID_FIELD_NUMBER = 5;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 5;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int EILHBJJEPOK_FIELD_NUMBER = 1;
+    private boolean eILHBJJEPOK_;
+    /**
+     * <code>bool EILHBJJEPOK = 1;</code>
+     * @return The eILHBJJEPOK.
+     */
+    @java.lang.Override
+    public boolean getEILHBJJEPOK() {
+      return eILHBJJEPOK_;
+    }
+
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 8;
     private int interactType_;
     /**
-     * <code>.VehicleInteractType interact_type = 9;</code>
+     * <code>.VehicleInteractType interact_type = 8;</code>
      * @return The enum numeric value on the wire for interactType.
      */
     @java.lang.Override public int getInteractTypeValue() {
       return interactType_;
     }
     /**
-     * <code>.VehicleInteractType interact_type = 9;</code>
+     * <code>.VehicleInteractType interact_type = 8;</code>
      * @return The interactType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
@@ -192,17 +198,6 @@ public final class VehicleInteractReqOuterClass {
       return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
     }
 
-    public static final int EPCIACIPLAN_FIELD_NUMBER = 15;
-    private boolean ePCIACIPLAN_;
-    /**
-     * <code>bool EPCIACIPLAN = 15;</code>
-     * @return The ePCIACIPLAN.
-     */
-    @java.lang.Override
-    public boolean getEPCIACIPLAN() {
-      return ePCIACIPLAN_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -217,17 +212,17 @@ public final class VehicleInteractReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (pos_ != 0) {
-        output.writeUInt32(7, pos_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(9, interactType_);
+      if (eILHBJJEPOK_ != false) {
+        output.writeBool(1, eILHBJJEPOK_);
       }
       if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+        output.writeUInt32(5, entityId_);
       }
-      if (ePCIACIPLAN_ != false) {
-        output.writeBool(15, ePCIACIPLAN_);
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
+        output.writeEnum(8, interactType_);
+      }
+      if (pos_ != 0) {
+        output.writeUInt32(13, pos_);
       }
       unknownFields.writeTo(output);
     }
@@ -238,21 +233,21 @@ public final class VehicleInteractReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pos_ != 0) {
+      if (eILHBJJEPOK_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, pos_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, interactType_);
+          .computeBoolSize(1, eILHBJJEPOK_);
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeUInt32Size(5, entityId_);
       }
-      if (ePCIACIPLAN_ != false) {
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(15, ePCIACIPLAN_);
+          .computeEnumSize(8, interactType_);
+      }
+      if (pos_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, pos_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -269,13 +264,13 @@ public final class VehicleInteractReqOuterClass {
       }
       emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq other = (emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
       if (getPos()
           != other.getPos()) return false;
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (getEILHBJJEPOK()
+          != other.getEILHBJJEPOK()) return false;
       if (interactType_ != other.interactType_) return false;
-      if (getEPCIACIPLAN()
-          != other.getEPCIACIPLAN()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -287,15 +282,15 @@ public final class VehicleInteractReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
       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) + EPCIACIPLAN_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getEPCIACIPLAN());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -392,11 +387,6 @@ public final class VehicleInteractReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 28312
-     * Obf: BPOCDLCHOCO
-     * </pre>
-     *
      * Protobuf type {@code VehicleInteractReq}
      */
     public static final class Builder extends
@@ -434,13 +424,13 @@ public final class VehicleInteractReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
         pos_ = 0;
 
-        interactType_ = 0;
+        entityId_ = 0;
 
-        ePCIACIPLAN_ = false;
+        eILHBJJEPOK_ = false;
+
+        interactType_ = 0;
 
         return this;
       }
@@ -468,10 +458,10 @@ public final class VehicleInteractReqOuterClass {
       @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.entityId_ = entityId_;
         result.pos_ = pos_;
+        result.entityId_ = entityId_;
+        result.eILHBJJEPOK_ = eILHBJJEPOK_;
         result.interactType_ = interactType_;
-        result.ePCIACIPLAN_ = ePCIACIPLAN_;
         onBuilt();
         return result;
       }
@@ -520,18 +510,18 @@ public final class VehicleInteractReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq other) {
         if (other == emu.grasscutter.net.proto.VehicleInteractReqOuterClass.VehicleInteractReq.getDefaultInstance()) return this;
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
         if (other.getPos() != 0) {
           setPos(other.getPos());
         }
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
+        }
+        if (other.getEILHBJJEPOK() != false) {
+          setEILHBJJEPOK(other.getEILHBJJEPOK());
+        }
         if (other.interactType_ != 0) {
           setInteractTypeValue(other.getInteractTypeValue());
         }
-        if (other.getEPCIACIPLAN() != false) {
-          setEPCIACIPLAN(other.getEPCIACIPLAN());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -561,40 +551,9 @@ public final class VehicleInteractReqOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 10;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 entity_id = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int pos_ ;
       /**
-       * <code>uint32 pos = 7;</code>
+       * <code>uint32 pos = 13;</code>
        * @return The pos.
        */
       @java.lang.Override
@@ -602,7 +561,7 @@ public final class VehicleInteractReqOuterClass {
         return pos_;
       }
       /**
-       * <code>uint32 pos = 7;</code>
+       * <code>uint32 pos = 13;</code>
        * @param value The pos to set.
        * @return This builder for chaining.
        */
@@ -613,7 +572,7 @@ public final class VehicleInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 pos = 7;</code>
+       * <code>uint32 pos = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearPos() {
@@ -623,16 +582,78 @@ public final class VehicleInteractReqOuterClass {
         return this;
       }
 
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 5;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 5;</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 = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private boolean eILHBJJEPOK_ ;
+      /**
+       * <code>bool EILHBJJEPOK = 1;</code>
+       * @return The eILHBJJEPOK.
+       */
+      @java.lang.Override
+      public boolean getEILHBJJEPOK() {
+        return eILHBJJEPOK_;
+      }
+      /**
+       * <code>bool EILHBJJEPOK = 1;</code>
+       * @param value The eILHBJJEPOK to set.
+       * @return This builder for chaining.
+       */
+      public Builder setEILHBJJEPOK(boolean value) {
+        
+        eILHBJJEPOK_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool EILHBJJEPOK = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEILHBJJEPOK() {
+        
+        eILHBJJEPOK_ = false;
+        onChanged();
+        return this;
+      }
+
       private int interactType_ = 0;
       /**
-       * <code>.VehicleInteractType interact_type = 9;</code>
+       * <code>.VehicleInteractType interact_type = 8;</code>
        * @return The enum numeric value on the wire for interactType.
        */
       @java.lang.Override public int getInteractTypeValue() {
         return interactType_;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 9;</code>
+       * <code>.VehicleInteractType interact_type = 8;</code>
        * @param value The enum numeric value on the wire for interactType to set.
        * @return This builder for chaining.
        */
@@ -643,7 +664,7 @@ public final class VehicleInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 9;</code>
+       * <code>.VehicleInteractType interact_type = 8;</code>
        * @return The interactType.
        */
       @java.lang.Override
@@ -653,7 +674,7 @@ public final class VehicleInteractReqOuterClass {
         return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 9;</code>
+       * <code>.VehicleInteractType interact_type = 8;</code>
        * @param value The interactType to set.
        * @return This builder for chaining.
        */
@@ -667,7 +688,7 @@ public final class VehicleInteractReqOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 9;</code>
+       * <code>.VehicleInteractType interact_type = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearInteractType() {
@@ -676,37 +697,6 @@ public final class VehicleInteractReqOuterClass {
         onChanged();
         return this;
       }
-
-      private boolean ePCIACIPLAN_ ;
-      /**
-       * <code>bool EPCIACIPLAN = 15;</code>
-       * @return The ePCIACIPLAN.
-       */
-      @java.lang.Override
-      public boolean getEPCIACIPLAN() {
-        return ePCIACIPLAN_;
-      }
-      /**
-       * <code>bool EPCIACIPLAN = 15;</code>
-       * @param value The ePCIACIPLAN to set.
-       * @return This builder for chaining.
-       */
-      public Builder setEPCIACIPLAN(boolean value) {
-        
-        ePCIACIPLAN_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool EPCIACIPLAN = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEPCIACIPLAN() {
-        
-        ePCIACIPLAN_ = false;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -775,10 +765,10 @@ public final class VehicleInteractReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\030VehicleInteractReq.proto\032\031VehicleInter" +
-      "actType.proto\"v\n\022VehicleInteractReq\022\021\n\te" +
-      "ntity_id\030\n \001(\r\022\013\n\003pos\030\007 \001(\r\022+\n\rinteract_" +
-      "type\030\t \001(\0162\024.VehicleInteractType\022\023\n\013EPCI" +
-      "ACIPLAN\030\017 \001(\010B\033\n\031emu.grasscutter.net.pro" +
+      "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" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -791,7 +781,7 @@ public final class VehicleInteractReqOuterClass {
     internal_static_VehicleInteractReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleInteractReq_descriptor,
-        new java.lang.String[] { "EntityId", "Pos", "InteractType", "EPCIACIPLAN", });
+        new java.lang.String[] { "Pos", "EntityId", "EILHBJJEPOK", "InteractType", });
     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 aed9fad3c..fa7266b17 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractRspOuterClass.java
@@ -19,91 +19,90 @@ public final class VehicleInteractRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>.VehicleMember member = 3;</code>
+     * @return Whether the member field is set.
+     */
+    boolean hasMember();
+    /**
+     * <code>.VehicleMember member = 3;</code>
+     * @return The member.
+     */
+    emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember();
+    /**
+     * <code>.VehicleMember member = 3;</code>
+     */
+    emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder();
+
+    /**
+     * <code>uint32 GIICKAOFKDB = 4;</code>
+     * @return The gIICKAOFKDB.
+     */
+    int getGIICKAOFKDB();
+
+    /**
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>.VehicleMember member = 14;</code>
-     * @return Whether the member field is set.
-     */
-    boolean hasMember();
-    /**
-     * <code>.VehicleMember member = 14;</code>
-     * @return The member.
-     */
-    emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember();
-    /**
-     * <code>.VehicleMember member = 14;</code>
-     */
-    emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder();
-
-    /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return Whether the kKDFCJENDNI field is set.
-     */
-    boolean hasKKDFCJENDNI();
-    /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return The kKDFCJENDNI.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI();
-    /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 5;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
-    /**
-     * <code>.VehicleInteractType interact_type = 7;</code>
-     * @return The enum numeric value on the wire for interactType.
-     */
-    int getInteractTypeValue();
-    /**
-     * <code>.VehicleInteractType interact_type = 7;</code>
-     * @return The interactType.
-     */
-    emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType();
-
-    /**
-     * <code>uint32 gadget_id = 13;</code>
+     * <pre>
+     *HDPDHDLPHAE IIFDBEPLDKE = 6;
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 7;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
     /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
-     * @return Whether the jGOGBMEKOPP field is set.
+     * <code>uint32 entity_id = 8;</code>
+     * @return The entityId.
      */
-    boolean hasJGOGBMEKOPP();
-    /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
-     * @return The jGOGBMEKOPP.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP();
-    /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder();
+    int getEntityId();
 
     /**
-     * <code>uint32 CJIMMADJKHD = 10;</code>
-     * @return The cJIMMADJKHD.
+     * <code>.Vector vehicle_pos = 10;</code>
+     * @return Whether the vehiclePos field is set.
      */
-    int getCJIMMADJKHD();
+    boolean hasVehiclePos();
+    /**
+     * <code>.Vector vehicle_pos = 10;</code>
+     * @return The vehiclePos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos();
+    /**
+     * <code>.Vector vehicle_pos = 10;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder();
+
+    /**
+     * <code>.VehicleInteractType interact_type = 11;</code>
+     * @return The enum numeric value on the wire for interactType.
+     */
+    int getInteractTypeValue();
+    /**
+     * <code>.VehicleInteractType interact_type = 11;</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.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot();
+    /**
+     * <code>.Vector vehicle_rot = 15;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 29349
-   * Obf: CFHCGPCDLPA
-   * </pre>
-   *
    * Protobuf type {@code VehicleInteractRsp}
    */
   public static final class VehicleInteractRsp extends
@@ -149,59 +148,7 @@ public final class VehicleInteractRspOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (jGOGBMEKOPP_ != null) {
-                subBuilder = jGOGBMEKOPP_.toBuilder();
-              }
-              jGOGBMEKOPP_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(jGOGBMEKOPP_);
-                jGOGBMEKOPP_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 34: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (kKDFCJENDNI_ != null) {
-                subBuilder = kKDFCJENDNI_.toBuilder();
-              }
-              kKDFCJENDNI_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(kKDFCJENDNI_);
-                kKDFCJENDNI_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 40: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
-            case 48: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 56: {
-              int rawValue = input.readEnum();
-
-              interactType_ = rawValue;
-              break;
-            }
-            case 80: {
-
-              cJIMMADJKHD_ = input.readUInt32();
-              break;
-            }
-            case 104: {
-
-              gadgetId_ = input.readUInt32();
-              break;
-            }
-            case 114: {
+            case 26: {
               emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder subBuilder = null;
               if (member_ != null) {
                 subBuilder = member_.toBuilder();
@@ -214,6 +161,58 @@ public final class VehicleInteractRspOuterClass {
 
               break;
             }
+            case 32: {
+
+              gIICKAOFKDB_ = input.readUInt32();
+              break;
+            }
+            case 40: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 56: {
+
+              gadgetId_ = input.readUInt32();
+              break;
+            }
+            case 64: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 82: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (vehiclePos_ != null) {
+                subBuilder = vehiclePos_.toBuilder();
+              }
+              vehiclePos_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(vehiclePos_);
+                vehiclePos_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 88: {
+              int rawValue = input.readEnum();
+
+              interactType_ = rawValue;
+              break;
+            }
+            case 122: {
+              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();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -246,21 +245,10 @@ public final class VehicleInteractRspOuterClass {
               emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp.class, emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 6;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 6;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int MEMBER_FIELD_NUMBER = 14;
+    public static final int MEMBER_FIELD_NUMBER = 3;
     private emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember member_;
     /**
-     * <code>.VehicleMember member = 14;</code>
+     * <code>.VehicleMember member = 3;</code>
      * @return Whether the member field is set.
      */
     @java.lang.Override
@@ -268,7 +256,7 @@ public final class VehicleInteractRspOuterClass {
       return member_ != null;
     }
     /**
-     * <code>.VehicleMember member = 14;</code>
+     * <code>.VehicleMember member = 3;</code>
      * @return The member.
      */
     @java.lang.Override
@@ -276,43 +264,54 @@ public final class VehicleInteractRspOuterClass {
       return member_ == null ? emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.getDefaultInstance() : member_;
     }
     /**
-     * <code>.VehicleMember member = 14;</code>
+     * <code>.VehicleMember member = 3;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder() {
       return getMember();
     }
 
-    public static final int KKDFCJENDNI_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector kKDFCJENDNI_;
+    public static final int GIICKAOFKDB_FIELD_NUMBER = 4;
+    private int gIICKAOFKDB_;
     /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return Whether the kKDFCJENDNI field is set.
+     * <code>uint32 GIICKAOFKDB = 4;</code>
+     * @return The gIICKAOFKDB.
      */
     @java.lang.Override
-    public boolean hasKKDFCJENDNI() {
-      return kKDFCJENDNI_ != null;
-    }
-    /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     * @return The kKDFCJENDNI.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI() {
-      return kKDFCJENDNI_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
-    }
-    /**
-     * <code>.Vector KKDFCJENDNI = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder() {
-      return getKKDFCJENDNI();
+    public int getGIICKAOFKDB() {
+      return gIICKAOFKDB_;
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 5;
+    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 GADGET_ID_FIELD_NUMBER = 7;
+    private int gadgetId_;
+    /**
+     * <pre>
+     *HDPDHDLPHAE IIFDBEPLDKE = 6;
+     * </pre>
+     *
+     * <code>uint32 gadget_id = 7;</code>
+     * @return The gadgetId.
+     */
+    @java.lang.Override
+    public int getGadgetId() {
+      return gadgetId_;
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 8;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 5;</code>
+     * <code>uint32 entity_id = 8;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -320,17 +319,43 @@ public final class VehicleInteractRspOuterClass {
       return entityId_;
     }
 
-    public static final int INTERACT_TYPE_FIELD_NUMBER = 7;
+    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.
+     */
+    @java.lang.Override
+    public boolean hasVehiclePos() {
+      return vehiclePos_ != null;
+    }
+    /**
+     * <code>.Vector vehicle_pos = 10;</code>
+     * @return The vehiclePos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
+      return vehiclePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehiclePos_;
+    }
+    /**
+     * <code>.Vector vehicle_pos = 10;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder() {
+      return getVehiclePos();
+    }
+
+    public static final int INTERACT_TYPE_FIELD_NUMBER = 11;
     private int interactType_;
     /**
-     * <code>.VehicleInteractType interact_type = 7;</code>
+     * <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 = 7;</code>
+     * <code>.VehicleInteractType interact_type = 11;</code>
      * @return The interactType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType getInteractType() {
@@ -339,52 +364,30 @@ public final class VehicleInteractRspOuterClass {
       return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
     }
 
-    public static final int GADGET_ID_FIELD_NUMBER = 13;
-    private int gadgetId_;
+    public static final int VEHICLE_ROT_FIELD_NUMBER = 15;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector vehicleRot_;
     /**
-     * <code>uint32 gadget_id = 13;</code>
-     * @return The gadgetId.
+     * <code>.Vector vehicle_rot = 15;</code>
+     * @return Whether the vehicleRot field is set.
      */
     @java.lang.Override
-    public int getGadgetId() {
-      return gadgetId_;
-    }
-
-    public static final int JGOGBMEKOPP_FIELD_NUMBER = 1;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector jGOGBMEKOPP_;
-    /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
-     * @return Whether the jGOGBMEKOPP field is set.
-     */
-    @java.lang.Override
-    public boolean hasJGOGBMEKOPP() {
-      return jGOGBMEKOPP_ != null;
+    public boolean hasVehicleRot() {
+      return vehicleRot_ != null;
     }
     /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
-     * @return The jGOGBMEKOPP.
+     * <code>.Vector vehicle_rot = 15;</code>
+     * @return The vehicleRot.
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP() {
-      return jGOGBMEKOPP_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
+      return vehicleRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehicleRot_;
     }
     /**
-     * <code>.Vector JGOGBMEKOPP = 1;</code>
+     * <code>.Vector vehicle_rot = 15;</code>
      */
     @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder() {
-      return getJGOGBMEKOPP();
-    }
-
-    public static final int CJIMMADJKHD_FIELD_NUMBER = 10;
-    private int cJIMMADJKHD_;
-    /**
-     * <code>uint32 CJIMMADJKHD = 10;</code>
-     * @return The cJIMMADJKHD.
-     */
-    @java.lang.Override
-    public int getCJIMMADJKHD() {
-      return cJIMMADJKHD_;
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder() {
+      return getVehicleRot();
     }
 
     private byte memoizedIsInitialized = -1;
@@ -401,29 +404,29 @@ public final class VehicleInteractRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (jGOGBMEKOPP_ != null) {
-        output.writeMessage(1, getJGOGBMEKOPP());
+      if (member_ != null) {
+        output.writeMessage(3, getMember());
       }
-      if (kKDFCJENDNI_ != null) {
-        output.writeMessage(4, getKKDFCJENDNI());
-      }
-      if (entityId_ != 0) {
-        output.writeUInt32(5, entityId_);
+      if (gIICKAOFKDB_ != 0) {
+        output.writeUInt32(4, gIICKAOFKDB_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        output.writeEnum(7, interactType_);
-      }
-      if (cJIMMADJKHD_ != 0) {
-        output.writeUInt32(10, cJIMMADJKHD_);
+        output.writeInt32(5, retcode_);
       }
       if (gadgetId_ != 0) {
-        output.writeUInt32(13, gadgetId_);
+        output.writeUInt32(7, gadgetId_);
       }
-      if (member_ != null) {
-        output.writeMessage(14, getMember());
+      if (entityId_ != 0) {
+        output.writeUInt32(8, entityId_);
+      }
+      if (vehiclePos_ != null) {
+        output.writeMessage(10, getVehiclePos());
+      }
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
+        output.writeEnum(11, interactType_);
+      }
+      if (vehicleRot_ != null) {
+        output.writeMessage(15, getVehicleRot());
       }
       unknownFields.writeTo(output);
     }
@@ -434,37 +437,37 @@ public final class VehicleInteractRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (jGOGBMEKOPP_ != null) {
+      if (member_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getJGOGBMEKOPP());
+          .computeMessageSize(3, getMember());
       }
-      if (kKDFCJENDNI_ != null) {
+      if (gIICKAOFKDB_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getKKDFCJENDNI());
-      }
-      if (entityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, entityId_);
+          .computeUInt32Size(4, gIICKAOFKDB_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
-      }
-      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(7, interactType_);
-      }
-      if (cJIMMADJKHD_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, cJIMMADJKHD_);
+          .computeInt32Size(5, retcode_);
       }
       if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, gadgetId_);
+          .computeUInt32Size(7, gadgetId_);
       }
-      if (member_ != null) {
+      if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(14, getMember());
+          .computeUInt32Size(8, entityId_);
+      }
+      if (vehiclePos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(10, getVehiclePos());
+      }
+      if (interactType_ != emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.VEHICLE_INTERACT_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(11, interactType_);
+      }
+      if (vehicleRot_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getVehicleRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -481,30 +484,30 @@ public final class VehicleInteractRspOuterClass {
       }
       emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp other = (emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp) obj;
 
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (hasMember() != other.hasMember()) return false;
       if (hasMember()) {
         if (!getMember()
             .equals(other.getMember())) return false;
       }
-      if (hasKKDFCJENDNI() != other.hasKKDFCJENDNI()) return false;
-      if (hasKKDFCJENDNI()) {
-        if (!getKKDFCJENDNI()
-            .equals(other.getKKDFCJENDNI())) return false;
-      }
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (interactType_ != other.interactType_) return false;
+      if (getGIICKAOFKDB()
+          != other.getGIICKAOFKDB()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
-      if (hasJGOGBMEKOPP() != other.hasJGOGBMEKOPP()) return false;
-      if (hasJGOGBMEKOPP()) {
-        if (!getJGOGBMEKOPP()
-            .equals(other.getJGOGBMEKOPP())) 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 (getCJIMMADJKHD()
-          != other.getCJIMMADJKHD()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -516,28 +519,28 @@ public final class VehicleInteractRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       if (hasMember()) {
         hash = (37 * hash) + MEMBER_FIELD_NUMBER;
         hash = (53 * hash) + getMember().hashCode();
       }
-      if (hasKKDFCJENDNI()) {
-        hash = (37 * hash) + KKDFCJENDNI_FIELD_NUMBER;
-        hash = (53 * hash) + getKKDFCJENDNI().hashCode();
-      }
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + INTERACT_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + interactType_;
+      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();
-      if (hasJGOGBMEKOPP()) {
-        hash = (37 * hash) + JGOGBMEKOPP_FIELD_NUMBER;
-        hash = (53 * hash) + getJGOGBMEKOPP().hashCode();
+      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) + CJIMMADJKHD_FIELD_NUMBER;
-      hash = (53 * hash) + getCJIMMADJKHD();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -634,11 +637,6 @@ public final class VehicleInteractRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 29349
-     * Obf: CFHCGPCDLPA
-     * </pre>
-     *
      * Protobuf type {@code VehicleInteractRsp}
      */
     public static final class Builder extends
@@ -676,34 +674,34 @@ public final class VehicleInteractRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
         if (memberBuilder_ == null) {
           member_ = null;
         } else {
           member_ = null;
           memberBuilder_ = null;
         }
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = null;
-        } else {
-          kKDFCJENDNI_ = null;
-          kKDFCJENDNIBuilder_ = null;
-        }
-        entityId_ = 0;
+        gIICKAOFKDB_ = 0;
 
-        interactType_ = 0;
+        retcode_ = 0;
 
         gadgetId_ = 0;
 
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = null;
-        } else {
-          jGOGBMEKOPP_ = null;
-          jGOGBMEKOPPBuilder_ = null;
-        }
-        cJIMMADJKHD_ = 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;
+        }
         return this;
       }
 
@@ -730,26 +728,26 @@ public final class VehicleInteractRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp buildPartial() {
         emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp result = new emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp(this);
-        result.retcode_ = retcode_;
         if (memberBuilder_ == null) {
           result.member_ = member_;
         } else {
           result.member_ = memberBuilder_.build();
         }
-        if (kKDFCJENDNIBuilder_ == null) {
-          result.kKDFCJENDNI_ = kKDFCJENDNI_;
-        } else {
-          result.kKDFCJENDNI_ = kKDFCJENDNIBuilder_.build();
-        }
-        result.entityId_ = entityId_;
-        result.interactType_ = interactType_;
+        result.gIICKAOFKDB_ = gIICKAOFKDB_;
+        result.retcode_ = retcode_;
         result.gadgetId_ = gadgetId_;
-        if (jGOGBMEKOPPBuilder_ == null) {
-          result.jGOGBMEKOPP_ = jGOGBMEKOPP_;
+        result.entityId_ = entityId_;
+        if (vehiclePosBuilder_ == null) {
+          result.vehiclePos_ = vehiclePos_;
         } else {
-          result.jGOGBMEKOPP_ = jGOGBMEKOPPBuilder_.build();
+          result.vehiclePos_ = vehiclePosBuilder_.build();
+        }
+        result.interactType_ = interactType_;
+        if (vehicleRotBuilder_ == null) {
+          result.vehicleRot_ = vehicleRot_;
+        } else {
+          result.vehicleRot_ = vehicleRotBuilder_.build();
         }
-        result.cJIMMADJKHD_ = cJIMMADJKHD_;
         onBuilt();
         return result;
       }
@@ -798,29 +796,29 @@ public final class VehicleInteractRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp other) {
         if (other == emu.grasscutter.net.proto.VehicleInteractRspOuterClass.VehicleInteractRsp.getDefaultInstance()) return this;
-        if (other.getRetcode() != 0) {
-          setRetcode(other.getRetcode());
-        }
         if (other.hasMember()) {
           mergeMember(other.getMember());
         }
-        if (other.hasKKDFCJENDNI()) {
-          mergeKKDFCJENDNI(other.getKKDFCJENDNI());
+        if (other.getGIICKAOFKDB() != 0) {
+          setGIICKAOFKDB(other.getGIICKAOFKDB());
         }
-        if (other.getEntityId() != 0) {
-          setEntityId(other.getEntityId());
-        }
-        if (other.interactType_ != 0) {
-          setInteractTypeValue(other.getInteractTypeValue());
+        if (other.getRetcode() != 0) {
+          setRetcode(other.getRetcode());
         }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
-        if (other.hasJGOGBMEKOPP()) {
-          mergeJGOGBMEKOPP(other.getJGOGBMEKOPP());
+        if (other.getEntityId() != 0) {
+          setEntityId(other.getEntityId());
         }
-        if (other.getCJIMMADJKHD() != 0) {
-          setCJIMMADJKHD(other.getCJIMMADJKHD());
+        if (other.hasVehiclePos()) {
+          mergeVehiclePos(other.getVehiclePos());
+        }
+        if (other.interactType_ != 0) {
+          setInteractTypeValue(other.getInteractTypeValue());
+        }
+        if (other.hasVehicleRot()) {
+          mergeVehicleRot(other.getVehicleRot());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -851,49 +849,18 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
 
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember member_;
       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 = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        * @return Whether the member field is set.
        */
       public boolean hasMember() {
         return memberBuilder_ != null || member_ != null;
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        * @return The member.
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember getMember() {
@@ -904,7 +871,7 @@ public final class VehicleInteractRspOuterClass {
         }
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public Builder setMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember value) {
         if (memberBuilder_ == null) {
@@ -920,7 +887,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public Builder setMember(
           emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder builderForValue) {
@@ -934,7 +901,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public Builder mergeMember(emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember value) {
         if (memberBuilder_ == null) {
@@ -952,7 +919,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public Builder clearMember() {
         if (memberBuilder_ == null) {
@@ -966,7 +933,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMember.Builder getMemberBuilder() {
         
@@ -974,7 +941,7 @@ public final class VehicleInteractRspOuterClass {
         return getMemberFieldBuilder().getBuilder();
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</code>
        */
       public emu.grasscutter.net.proto.VehicleMemberOuterClass.VehicleMemberOrBuilder getMemberOrBuilder() {
         if (memberBuilder_ != null) {
@@ -985,7 +952,7 @@ public final class VehicleInteractRspOuterClass {
         }
       }
       /**
-       * <code>.VehicleMember member = 14;</code>
+       * <code>.VehicleMember member = 3;</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> 
@@ -1001,128 +968,114 @@ public final class VehicleInteractRspOuterClass {
         return memberBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector kKDFCJENDNI_;
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> kKDFCJENDNIBuilder_;
+      private int gIICKAOFKDB_ ;
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       * @return Whether the kKDFCJENDNI field is set.
+       * <code>uint32 GIICKAOFKDB = 4;</code>
+       * @return The gIICKAOFKDB.
        */
-      public boolean hasKKDFCJENDNI() {
-        return kKDFCJENDNIBuilder_ != null || kKDFCJENDNI_ != null;
+      @java.lang.Override
+      public int getGIICKAOFKDB() {
+        return gIICKAOFKDB_;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       * @return The kKDFCJENDNI.
+       * <code>uint32 GIICKAOFKDB = 4;</code>
+       * @param value The gIICKAOFKDB to set.
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getKKDFCJENDNI() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          return kKDFCJENDNI_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
-        } else {
-          return kKDFCJENDNIBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       */
-      public Builder setKKDFCJENDNI(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kKDFCJENDNIBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          kKDFCJENDNI_ = value;
-          onChanged();
-        } else {
-          kKDFCJENDNIBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       */
-      public Builder setKKDFCJENDNI(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = builderForValue.build();
-          onChanged();
-        } else {
-          kKDFCJENDNIBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       */
-      public Builder mergeKKDFCJENDNI(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (kKDFCJENDNIBuilder_ == null) {
-          if (kKDFCJENDNI_ != null) {
-            kKDFCJENDNI_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(kKDFCJENDNI_).mergeFrom(value).buildPartial();
-          } else {
-            kKDFCJENDNI_ = value;
-          }
-          onChanged();
-        } else {
-          kKDFCJENDNIBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       */
-      public Builder clearKKDFCJENDNI() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNI_ = null;
-          onChanged();
-        } else {
-          kKDFCJENDNI_ = null;
-          kKDFCJENDNIBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getKKDFCJENDNIBuilder() {
+      public Builder setGIICKAOFKDB(int value) {
         
+        gIICKAOFKDB_ = value;
         onChanged();
-        return getKKDFCJENDNIFieldBuilder().getBuilder();
+        return this;
       }
       /**
-       * <code>.Vector KKDFCJENDNI = 4;</code>
+       * <code>uint32 GIICKAOFKDB = 4;</code>
+       * @return This builder for chaining.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getKKDFCJENDNIOrBuilder() {
-        if (kKDFCJENDNIBuilder_ != null) {
-          return kKDFCJENDNIBuilder_.getMessageOrBuilder();
-        } else {
-          return kKDFCJENDNI_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : kKDFCJENDNI_;
-        }
+      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>.Vector KKDFCJENDNI = 4;</code>
+       * <code>int32 retcode = 5;</code>
+       * @param value The retcode to set.
+       * @return This builder for chaining.
        */
-      private com.google.protobuf.SingleFieldBuilderV3<
-          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> 
-          getKKDFCJENDNIFieldBuilder() {
-        if (kKDFCJENDNIBuilder_ == null) {
-          kKDFCJENDNIBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getKKDFCJENDNI(),
-                  getParentForChildren(),
-                  isClean());
-          kKDFCJENDNI_ = null;
-        }
-        return kKDFCJENDNIBuilder_;
+      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_ ;
+      /**
+       * <pre>
+       *HDPDHDLPHAE IIFDBEPLDKE = 6;
+       * </pre>
+       *
+       * <code>uint32 gadget_id = 7;</code>
+       * @return The gadgetId.
+       */
+      @java.lang.Override
+      public int getGadgetId() {
+        return gadgetId_;
+      }
+      /**
+       * <pre>
+       *HDPDHDLPHAE IIFDBEPLDKE = 6;
+       * </pre>
+       *
+       * <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;
+      }
+      /**
+       * <pre>
+       *HDPDHDLPHAE IIFDBEPLDKE = 6;
+       * </pre>
+       *
+       * <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 = 5;</code>
+       * <code>uint32 entity_id = 8;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -1130,7 +1083,7 @@ public final class VehicleInteractRspOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <code>uint32 entity_id = 8;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -1141,7 +1094,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 5;</code>
+       * <code>uint32 entity_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -1151,16 +1104,135 @@ public final class VehicleInteractRspOuterClass {
         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>
+       * @return Whether the vehiclePos field is set.
+       */
+      public boolean hasVehiclePos() {
+        return vehiclePosBuilder_ != null || vehiclePos_ != null;
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       * @return The vehiclePos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehiclePos() {
+        if (vehiclePosBuilder_ == null) {
+          return vehiclePos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehiclePos_;
+        } else {
+          return vehiclePosBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public Builder setVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vehiclePosBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          vehiclePos_ = value;
+          onChanged();
+        } else {
+          vehiclePosBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public Builder setVehiclePos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (vehiclePosBuilder_ == null) {
+          vehiclePos_ = builderForValue.build();
+          onChanged();
+        } else {
+          vehiclePosBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public Builder mergeVehiclePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vehiclePosBuilder_ == null) {
+          if (vehiclePos_ != null) {
+            vehiclePos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(vehiclePos_).mergeFrom(value).buildPartial();
+          } else {
+            vehiclePos_ = value;
+          }
+          onChanged();
+        } else {
+          vehiclePosBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public Builder clearVehiclePos() {
+        if (vehiclePosBuilder_ == null) {
+          vehiclePos_ = null;
+          onChanged();
+        } else {
+          vehiclePos_ = null;
+          vehiclePosBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehiclePosBuilder() {
+        
+        onChanged();
+        return getVehiclePosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehiclePosOrBuilder() {
+        if (vehiclePosBuilder_ != null) {
+          return vehiclePosBuilder_.getMessageOrBuilder();
+        } else {
+          return vehiclePos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehiclePos_;
+        }
+      }
+      /**
+       * <code>.Vector vehicle_pos = 10;</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> 
+          getVehiclePosFieldBuilder() {
+        if (vehiclePosBuilder_ == null) {
+          vehiclePosBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getVehiclePos(),
+                  getParentForChildren(),
+                  isClean());
+          vehiclePos_ = null;
+        }
+        return vehiclePosBuilder_;
+      }
+
       private int interactType_ = 0;
       /**
-       * <code>.VehicleInteractType interact_type = 7;</code>
+       * <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 = 7;</code>
+       * <code>.VehicleInteractType interact_type = 11;</code>
        * @param value The enum numeric value on the wire for interactType to set.
        * @return This builder for chaining.
        */
@@ -1171,7 +1243,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 7;</code>
+       * <code>.VehicleInteractType interact_type = 11;</code>
        * @return The interactType.
        */
       @java.lang.Override
@@ -1181,7 +1253,7 @@ public final class VehicleInteractRspOuterClass {
         return result == null ? emu.grasscutter.net.proto.VehicleInteractTypeOuterClass.VehicleInteractType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 7;</code>
+       * <code>.VehicleInteractType interact_type = 11;</code>
        * @param value The interactType to set.
        * @return This builder for chaining.
        */
@@ -1195,7 +1267,7 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
       /**
-       * <code>.VehicleInteractType interact_type = 7;</code>
+       * <code>.VehicleInteractType interact_type = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearInteractType() {
@@ -1205,185 +1277,123 @@ public final class VehicleInteractRspOuterClass {
         return this;
       }
 
-      private int gadgetId_ ;
-      /**
-       * <code>uint32 gadget_id = 13;</code>
-       * @return The gadgetId.
-       */
-      @java.lang.Override
-      public int getGadgetId() {
-        return gadgetId_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>uint32 gadget_id = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetId() {
-        
-        gadgetId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector jGOGBMEKOPP_;
+      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> jGOGBMEKOPPBuilder_;
+          emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> vehicleRotBuilder_;
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
-       * @return Whether the jGOGBMEKOPP field is set.
+       * <code>.Vector vehicle_rot = 15;</code>
+       * @return Whether the vehicleRot field is set.
        */
-      public boolean hasJGOGBMEKOPP() {
-        return jGOGBMEKOPPBuilder_ != null || jGOGBMEKOPP_ != null;
+      public boolean hasVehicleRot() {
+        return vehicleRotBuilder_ != null || vehicleRot_ != null;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
-       * @return The jGOGBMEKOPP.
+       * <code>.Vector vehicle_rot = 15;</code>
+       * @return The vehicleRot.
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getJGOGBMEKOPP() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          return jGOGBMEKOPP_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getVehicleRot() {
+        if (vehicleRotBuilder_ == null) {
+          return vehicleRot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehicleRot_;
         } else {
-          return jGOGBMEKOPPBuilder_.getMessage();
+          return vehicleRotBuilder_.getMessage();
         }
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public Builder setJGOGBMEKOPP(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (jGOGBMEKOPPBuilder_ == null) {
+      public Builder setVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vehicleRotBuilder_ == null) {
           if (value == null) {
             throw new NullPointerException();
           }
-          jGOGBMEKOPP_ = value;
+          vehicleRot_ = value;
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.setMessage(value);
+          vehicleRotBuilder_.setMessage(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public Builder setJGOGBMEKOPP(
+      public Builder setVehicleRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = builderForValue.build();
+        if (vehicleRotBuilder_ == null) {
+          vehicleRot_ = builderForValue.build();
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.setMessage(builderForValue.build());
+          vehicleRotBuilder_.setMessage(builderForValue.build());
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public Builder mergeJGOGBMEKOPP(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          if (jGOGBMEKOPP_ != null) {
-            jGOGBMEKOPP_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(jGOGBMEKOPP_).mergeFrom(value).buildPartial();
+      public Builder mergeVehicleRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (vehicleRotBuilder_ == null) {
+          if (vehicleRot_ != null) {
+            vehicleRot_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(vehicleRot_).mergeFrom(value).buildPartial();
           } else {
-            jGOGBMEKOPP_ = value;
+            vehicleRot_ = value;
           }
           onChanged();
         } else {
-          jGOGBMEKOPPBuilder_.mergeFrom(value);
+          vehicleRotBuilder_.mergeFrom(value);
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public Builder clearJGOGBMEKOPP() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPP_ = null;
+      public Builder clearVehicleRot() {
+        if (vehicleRotBuilder_ == null) {
+          vehicleRot_ = null;
           onChanged();
         } else {
-          jGOGBMEKOPP_ = null;
-          jGOGBMEKOPPBuilder_ = null;
+          vehicleRot_ = null;
+          vehicleRotBuilder_ = null;
         }
 
         return this;
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getJGOGBMEKOPPBuilder() {
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getVehicleRotBuilder() {
         
         onChanged();
-        return getJGOGBMEKOPPFieldBuilder().getBuilder();
+        return getVehicleRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 15;</code>
        */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getJGOGBMEKOPPOrBuilder() {
-        if (jGOGBMEKOPPBuilder_ != null) {
-          return jGOGBMEKOPPBuilder_.getMessageOrBuilder();
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getVehicleRotOrBuilder() {
+        if (vehicleRotBuilder_ != null) {
+          return vehicleRotBuilder_.getMessageOrBuilder();
         } else {
-          return jGOGBMEKOPP_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : jGOGBMEKOPP_;
+          return vehicleRot_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : vehicleRot_;
         }
       }
       /**
-       * <code>.Vector JGOGBMEKOPP = 1;</code>
+       * <code>.Vector vehicle_rot = 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> 
-          getJGOGBMEKOPPFieldBuilder() {
-        if (jGOGBMEKOPPBuilder_ == null) {
-          jGOGBMEKOPPBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+          getVehicleRotFieldBuilder() {
+        if (vehicleRotBuilder_ == null) {
+          vehicleRotBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
               emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getJGOGBMEKOPP(),
+                  getVehicleRot(),
                   getParentForChildren(),
                   isClean());
-          jGOGBMEKOPP_ = null;
+          vehicleRot_ = null;
         }
-        return jGOGBMEKOPPBuilder_;
-      }
-
-      private int cJIMMADJKHD_ ;
-      /**
-       * <code>uint32 CJIMMADJKHD = 10;</code>
-       * @return The cJIMMADJKHD.
-       */
-      @java.lang.Override
-      public int getCJIMMADJKHD() {
-        return cJIMMADJKHD_;
-      }
-      /**
-       * <code>uint32 CJIMMADJKHD = 10;</code>
-       * @param value The cJIMMADJKHD to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCJIMMADJKHD(int value) {
-        
-        cJIMMADJKHD_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 CJIMMADJKHD = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCJIMMADJKHD() {
-        
-        cJIMMADJKHD_ = 0;
-        onChanged();
-        return this;
+        return vehicleRotBuilder_;
       }
       @java.lang.Override
       public final Builder setUnknownFields(
@@ -1454,13 +1464,13 @@ public final class VehicleInteractRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n\030VehicleInteractRsp.proto\032\023VehicleMembe" +
       "r.proto\032\014Vector.proto\032\031VehicleInteractTy" +
-      "pe.proto\"\351\001\n\022VehicleInteractRsp\022\017\n\007retco" +
-      "de\030\006 \001(\005\022\036\n\006member\030\016 \001(\0132\016.VehicleMember" +
-      "\022\034\n\013KKDFCJENDNI\030\004 \001(\0132\007.Vector\022\021\n\tentity" +
-      "_id\030\005 \001(\r\022+\n\rinteract_type\030\007 \001(\0162\024.Vehic" +
-      "leInteractType\022\021\n\tgadget_id\030\r \001(\r\022\034\n\013JGO" +
-      "GBMEKOPP\030\001 \001(\0132\007.Vector\022\023\n\013CJIMMADJKHD\030\n" +
-      " \001(\rB\033\n\031emu.grasscutter.net.protob\006proto" +
+      "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" +
       "3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1475,7 +1485,7 @@ public final class VehicleInteractRspOuterClass {
     internal_static_VehicleInteractRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleInteractRsp_descriptor,
-        new java.lang.String[] { "Retcode", "Member", "KKDFCJENDNI", "EntityId", "InteractType", "GadgetId", "JGOGBMEKOPP", "CJIMMADJKHD", });
+        new java.lang.String[] { "Member", "GIICKAOFKDB", "Retcode", "GadgetId", "EntityId", "VehiclePos", "InteractType", "VehicleRot", });
     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/VehicleInteractTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractTypeOuterClass.java
index 80af56172..a081ca71f 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleInteractTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class VehicleInteractTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: HHAEHDABPEB
-   * </pre>
-   *
    * Protobuf enum {@code VehicleInteractType}
    */
   public enum VehicleInteractType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VehicleLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VehicleLocationInfoOuterClass.java
index 3d9e1c431..c6889ec83 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleLocationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleLocationInfoOuterClass.java
@@ -19,36 +19,57 @@ public final class VehicleLocationInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>float PCBCDBGOKOK = 3;</code>
-     * @return The pCBCDBGOKOK.
-     */
-    float getPCBCDBGOKOK();
-
-    /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @return A list containing the uidList.
      */
     java.util.List<java.lang.Integer> getUidListList();
     /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @return The count of uidList.
      */
     int getUidListCount();
     /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The uidList at the given index.
      */
     int getUidList(int index);
 
     /**
-     * <code>float FOHOENOKMML = 7;</code>
-     * @return The fOHOENOKMML.
+     * <code>float MEGKADCAAAJ = 2;</code>
+     * @return The mEGKADCAAAJ.
      */
-    float getFOHOENOKMML();
+    float getMEGKADCAAAJ();
 
     /**
-     * <code>uint32 owner_uid = 5;</code>
+     * <code>.Vector pos = 4;</code>
+     * @return Whether the pos field is set.
+     */
+    boolean hasPos();
+    /**
+     * <code>.Vector pos = 4;</code>
+     * @return The pos.
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
+    /**
+     * <code>.Vector pos = 4;</code>
+     */
+    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    int getEntityId();
+
+    /**
+     * <code>float FIPKPJPKJBN = 9;</code>
+     * @return The fIPKPJPKJBN.
+     */
+    float getFIPKPJPKJBN();
+
+    /**
+     * <code>uint32 owner_uid = 10;</code>
      * @return The ownerUid.
      */
     int getOwnerUid();
@@ -68,27 +89,6 @@ public final class VehicleLocationInfoOuterClass {
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
 
-    /**
-     * <code>.Vector pos = 4;</code>
-     * @return Whether the pos field is set.
-     */
-    boolean hasPos();
-    /**
-     * <code>.Vector pos = 4;</code>
-     * @return The pos.
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
-    /**
-     * <code>.Vector pos = 4;</code>
-     */
-    emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
-
-    /**
-     * <code>uint32 entity_id = 12;</code>
-     * @return The entityId.
-     */
-    int getEntityId();
-
     /**
      * <code>uint32 gadget_id = 15;</code>
      * @return The gadgetId.
@@ -96,10 +96,6 @@ public final class VehicleLocationInfoOuterClass {
     int getGadgetId();
   }
   /**
-   * <pre>
-   * Obf: JMGECLOKOFJ
-   * </pre>
-   *
    * Protobuf type {@code VehicleLocationInfo}
    */
   public static final class VehicleLocationInfo extends
@@ -146,9 +142,30 @@ public final class VehicleLocationInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 29: {
+            case 8: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                uidList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              uidList_.addInt(input.readUInt32());
+              break;
+            }
+            case 10: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                uidList_ = newIntList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                uidList_.addInt(input.readUInt32());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 21: {
 
-              pCBCDBGOKOK_ = input.readFloat();
+              mEGKADCAAAJ_ = input.readFloat();
               break;
             }
             case 34: {
@@ -164,42 +181,21 @@ public final class VehicleLocationInfoOuterClass {
 
               break;
             }
-            case 40: {
-
-              ownerUid_ = input.readUInt32();
-              break;
-            }
-            case 61: {
-
-              fOHOENOKMML_ = input.readFloat();
-              break;
-            }
-            case 88: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                uidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              uidList_.addInt(input.readUInt32());
-              break;
-            }
-            case 90: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                uidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                uidList_.addInt(input.readUInt32());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 96: {
+            case 48: {
 
               entityId_ = input.readUInt32();
               break;
             }
+            case 77: {
+
+              fIPKPJPKJBN_ = input.readFloat();
+              break;
+            }
+            case 80: {
+
+              ownerUid_ = input.readUInt32();
+              break;
+            }
             case 114: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (rot_ != null) {
@@ -253,21 +249,10 @@ public final class VehicleLocationInfoOuterClass {
               emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.class, emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.Builder.class);
     }
 
-    public static final int PCBCDBGOKOK_FIELD_NUMBER = 3;
-    private float pCBCDBGOKOK_;
-    /**
-     * <code>float PCBCDBGOKOK = 3;</code>
-     * @return The pCBCDBGOKOK.
-     */
-    @java.lang.Override
-    public float getPCBCDBGOKOK() {
-      return pCBCDBGOKOK_;
-    }
-
-    public static final int UID_LIST_FIELD_NUMBER = 11;
+    public static final int UID_LIST_FIELD_NUMBER = 1;
     private com.google.protobuf.Internal.IntList uidList_;
     /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @return A list containing the uidList.
      */
     @java.lang.Override
@@ -276,14 +261,14 @@ public final class VehicleLocationInfoOuterClass {
       return uidList_;
     }
     /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @return The count of uidList.
      */
     public int getUidListCount() {
       return uidList_.size();
     }
     /**
-     * <code>repeated uint32 uid_list = 11;</code>
+     * <code>repeated uint32 uid_list = 1;</code>
      * @param index The index of the element to return.
      * @return The uidList at the given index.
      */
@@ -292,21 +277,69 @@ public final class VehicleLocationInfoOuterClass {
     }
     private int uidListMemoizedSerializedSize = -1;
 
-    public static final int FOHOENOKMML_FIELD_NUMBER = 7;
-    private float fOHOENOKMML_;
+    public static final int MEGKADCAAAJ_FIELD_NUMBER = 2;
+    private float mEGKADCAAAJ_;
     /**
-     * <code>float FOHOENOKMML = 7;</code>
-     * @return The fOHOENOKMML.
+     * <code>float MEGKADCAAAJ = 2;</code>
+     * @return The mEGKADCAAAJ.
      */
     @java.lang.Override
-    public float getFOHOENOKMML() {
-      return fOHOENOKMML_;
+    public float getMEGKADCAAAJ() {
+      return mEGKADCAAAJ_;
     }
 
-    public static final int OWNER_UID_FIELD_NUMBER = 5;
+    public static final int POS_FIELD_NUMBER = 4;
+    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+    /**
+     * <code>.Vector pos = 4;</code>
+     * @return Whether the pos field is set.
+     */
+    @java.lang.Override
+    public boolean hasPos() {
+      return pos_ != null;
+    }
+    /**
+     * <code>.Vector pos = 4;</code>
+     * @return The pos.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+    }
+    /**
+     * <code>.Vector pos = 4;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+      return getPos();
+    }
+
+    public static final int ENTITY_ID_FIELD_NUMBER = 6;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 6;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int FIPKPJPKJBN_FIELD_NUMBER = 9;
+    private float fIPKPJPKJBN_;
+    /**
+     * <code>float FIPKPJPKJBN = 9;</code>
+     * @return The fIPKPJPKJBN.
+     */
+    @java.lang.Override
+    public float getFIPKPJPKJBN() {
+      return fIPKPJPKJBN_;
+    }
+
+    public static final int OWNER_UID_FIELD_NUMBER = 10;
     private int ownerUid_;
     /**
-     * <code>uint32 owner_uid = 5;</code>
+     * <code>uint32 owner_uid = 10;</code>
      * @return The ownerUid.
      */
     @java.lang.Override
@@ -340,43 +373,6 @@ public final class VehicleLocationInfoOuterClass {
       return getRot();
     }
 
-    public static final int POS_FIELD_NUMBER = 4;
-    private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-    /**
-     * <code>.Vector pos = 4;</code>
-     * @return Whether the pos field is set.
-     */
-    @java.lang.Override
-    public boolean hasPos() {
-      return pos_ != null;
-    }
-    /**
-     * <code>.Vector pos = 4;</code>
-     * @return The pos.
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-      return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-    }
-    /**
-     * <code>.Vector pos = 4;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-      return getPos();
-    }
-
-    public static final int ENTITY_ID_FIELD_NUMBER = 12;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 12;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
     public static final int GADGET_ID_FIELD_NUMBER = 15;
     private int gadgetId_;
     /**
@@ -403,27 +399,27 @@ public final class VehicleLocationInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
-      if (pCBCDBGOKOK_ != 0F) {
-        output.writeFloat(3, pCBCDBGOKOK_);
-      }
-      if (pos_ != null) {
-        output.writeMessage(4, getPos());
-      }
-      if (ownerUid_ != 0) {
-        output.writeUInt32(5, ownerUid_);
-      }
-      if (fOHOENOKMML_ != 0F) {
-        output.writeFloat(7, fOHOENOKMML_);
-      }
       if (getUidListList().size() > 0) {
-        output.writeUInt32NoTag(90);
+        output.writeUInt32NoTag(10);
         output.writeUInt32NoTag(uidListMemoizedSerializedSize);
       }
       for (int i = 0; i < uidList_.size(); i++) {
         output.writeUInt32NoTag(uidList_.getInt(i));
       }
+      if (mEGKADCAAAJ_ != 0F) {
+        output.writeFloat(2, mEGKADCAAAJ_);
+      }
+      if (pos_ != null) {
+        output.writeMessage(4, getPos());
+      }
       if (entityId_ != 0) {
-        output.writeUInt32(12, entityId_);
+        output.writeUInt32(6, entityId_);
+      }
+      if (fIPKPJPKJBN_ != 0F) {
+        output.writeFloat(9, fIPKPJPKJBN_);
+      }
+      if (ownerUid_ != 0) {
+        output.writeUInt32(10, ownerUid_);
       }
       if (rot_ != null) {
         output.writeMessage(14, getRot());
@@ -440,22 +436,6 @@ public final class VehicleLocationInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (pCBCDBGOKOK_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(3, pCBCDBGOKOK_);
-      }
-      if (pos_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getPos());
-      }
-      if (ownerUid_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(5, ownerUid_);
-      }
-      if (fOHOENOKMML_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(7, fOHOENOKMML_);
-      }
       {
         int dataSize = 0;
         for (int i = 0; i < uidList_.size(); i++) {
@@ -470,9 +450,25 @@ public final class VehicleLocationInfoOuterClass {
         }
         uidListMemoizedSerializedSize = dataSize;
       }
+      if (mEGKADCAAAJ_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(2, mEGKADCAAAJ_);
+      }
+      if (pos_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(4, getPos());
+      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, entityId_);
+          .computeUInt32Size(6, entityId_);
+      }
+      if (fIPKPJPKJBN_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(9, fIPKPJPKJBN_);
+      }
+      if (ownerUid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(10, ownerUid_);
       }
       if (rot_ != null) {
         size += com.google.protobuf.CodedOutputStream
@@ -497,21 +493,11 @@ public final class VehicleLocationInfoOuterClass {
       }
       emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo other = (emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo) obj;
 
-      if (java.lang.Float.floatToIntBits(getPCBCDBGOKOK())
-          != java.lang.Float.floatToIntBits(
-              other.getPCBCDBGOKOK())) return false;
       if (!getUidListList()
           .equals(other.getUidListList())) return false;
-      if (java.lang.Float.floatToIntBits(getFOHOENOKMML())
+      if (java.lang.Float.floatToIntBits(getMEGKADCAAAJ())
           != java.lang.Float.floatToIntBits(
-              other.getFOHOENOKMML())) return false;
-      if (getOwnerUid()
-          != other.getOwnerUid()) return false;
-      if (hasRot() != other.hasRot()) return false;
-      if (hasRot()) {
-        if (!getRot()
-            .equals(other.getRot())) return false;
-      }
+              other.getMEGKADCAAAJ())) return false;
       if (hasPos() != other.hasPos()) return false;
       if (hasPos()) {
         if (!getPos()
@@ -519,6 +505,16 @@ public final class VehicleLocationInfoOuterClass {
       }
       if (getEntityId()
           != other.getEntityId()) return false;
+      if (java.lang.Float.floatToIntBits(getFIPKPJPKJBN())
+          != java.lang.Float.floatToIntBits(
+              other.getFIPKPJPKJBN())) return false;
+      if (getOwnerUid()
+          != other.getOwnerUid()) return false;
+      if (hasRot() != other.hasRot()) return false;
+      if (hasRot()) {
+        if (!getRot()
+            .equals(other.getRot())) return false;
+      }
       if (getGadgetId()
           != other.getGadgetId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
@@ -532,28 +528,28 @@ public final class VehicleLocationInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + PCBCDBGOKOK_FIELD_NUMBER;
-      hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getPCBCDBGOKOK());
       if (getUidListCount() > 0) {
         hash = (37 * hash) + UID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getUidListList().hashCode();
       }
-      hash = (37 * hash) + FOHOENOKMML_FIELD_NUMBER;
+      hash = (37 * hash) + MEGKADCAAAJ_FIELD_NUMBER;
       hash = (53 * hash) + java.lang.Float.floatToIntBits(
-          getFOHOENOKMML());
-      hash = (37 * hash) + OWNER_UID_FIELD_NUMBER;
-      hash = (53 * hash) + getOwnerUid();
-      if (hasRot()) {
-        hash = (37 * hash) + ROT_FIELD_NUMBER;
-        hash = (53 * hash) + getRot().hashCode();
-      }
+          getMEGKADCAAAJ());
       if (hasPos()) {
         hash = (37 * hash) + POS_FIELD_NUMBER;
         hash = (53 * hash) + getPos().hashCode();
       }
       hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + FIPKPJPKJBN_FIELD_NUMBER;
+      hash = (53 * hash) + java.lang.Float.floatToIntBits(
+          getFIPKPJPKJBN());
+      hash = (37 * hash) + OWNER_UID_FIELD_NUMBER;
+      hash = (53 * hash) + getOwnerUid();
+      if (hasRot()) {
+        hash = (37 * hash) + ROT_FIELD_NUMBER;
+        hash = (53 * hash) + getRot().hashCode();
+      }
       hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
       hash = (53 * hash) + getGadgetId();
       hash = (29 * hash) + unknownFields.hashCode();
@@ -652,10 +648,6 @@ public final class VehicleLocationInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: JMGECLOKOFJ
-     * </pre>
-     *
      * Protobuf type {@code VehicleLocationInfo}
      */
     public static final class Builder extends
@@ -693,11 +685,19 @@ public final class VehicleLocationInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        pCBCDBGOKOK_ = 0F;
-
         uidList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        fOHOENOKMML_ = 0F;
+        mEGKADCAAAJ_ = 0F;
+
+        if (posBuilder_ == null) {
+          pos_ = null;
+        } else {
+          pos_ = null;
+          posBuilder_ = null;
+        }
+        entityId_ = 0;
+
+        fIPKPJPKJBN_ = 0F;
 
         ownerUid_ = 0;
 
@@ -707,14 +707,6 @@ public final class VehicleLocationInfoOuterClass {
           rot_ = null;
           rotBuilder_ = null;
         }
-        if (posBuilder_ == null) {
-          pos_ = null;
-        } else {
-          pos_ = null;
-          posBuilder_ = null;
-        }
-        entityId_ = 0;
-
         gadgetId_ = 0;
 
         return this;
@@ -744,25 +736,25 @@ public final class VehicleLocationInfoOuterClass {
       public emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo buildPartial() {
         emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo result = new emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo(this);
         int from_bitField0_ = bitField0_;
-        result.pCBCDBGOKOK_ = pCBCDBGOKOK_;
         if (((bitField0_ & 0x00000001) != 0)) {
           uidList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.uidList_ = uidList_;
-        result.fOHOENOKMML_ = fOHOENOKMML_;
-        result.ownerUid_ = ownerUid_;
-        if (rotBuilder_ == null) {
-          result.rot_ = rot_;
-        } else {
-          result.rot_ = rotBuilder_.build();
-        }
+        result.mEGKADCAAAJ_ = mEGKADCAAAJ_;
         if (posBuilder_ == null) {
           result.pos_ = pos_;
         } else {
           result.pos_ = posBuilder_.build();
         }
         result.entityId_ = entityId_;
+        result.fIPKPJPKJBN_ = fIPKPJPKJBN_;
+        result.ownerUid_ = ownerUid_;
+        if (rotBuilder_ == null) {
+          result.rot_ = rot_;
+        } else {
+          result.rot_ = rotBuilder_.build();
+        }
         result.gadgetId_ = gadgetId_;
         onBuilt();
         return result;
@@ -812,9 +804,6 @@ public final class VehicleLocationInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo other) {
         if (other == emu.grasscutter.net.proto.VehicleLocationInfoOuterClass.VehicleLocationInfo.getDefaultInstance()) return this;
-        if (other.getPCBCDBGOKOK() != 0F) {
-          setPCBCDBGOKOK(other.getPCBCDBGOKOK());
-        }
         if (!other.uidList_.isEmpty()) {
           if (uidList_.isEmpty()) {
             uidList_ = other.uidList_;
@@ -825,14 +814,8 @@ public final class VehicleLocationInfoOuterClass {
           }
           onChanged();
         }
-        if (other.getFOHOENOKMML() != 0F) {
-          setFOHOENOKMML(other.getFOHOENOKMML());
-        }
-        if (other.getOwnerUid() != 0) {
-          setOwnerUid(other.getOwnerUid());
-        }
-        if (other.hasRot()) {
-          mergeRot(other.getRot());
+        if (other.getMEGKADCAAAJ() != 0F) {
+          setMEGKADCAAAJ(other.getMEGKADCAAAJ());
         }
         if (other.hasPos()) {
           mergePos(other.getPos());
@@ -840,6 +823,15 @@ public final class VehicleLocationInfoOuterClass {
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
+        if (other.getFIPKPJPKJBN() != 0F) {
+          setFIPKPJPKJBN(other.getFIPKPJPKJBN());
+        }
+        if (other.getOwnerUid() != 0) {
+          setOwnerUid(other.getOwnerUid());
+        }
+        if (other.hasRot()) {
+          mergeRot(other.getRot());
+        }
         if (other.getGadgetId() != 0) {
           setGadgetId(other.getGadgetId());
         }
@@ -873,37 +865,6 @@ public final class VehicleLocationInfoOuterClass {
       }
       private int bitField0_;
 
-      private float pCBCDBGOKOK_ ;
-      /**
-       * <code>float PCBCDBGOKOK = 3;</code>
-       * @return The pCBCDBGOKOK.
-       */
-      @java.lang.Override
-      public float getPCBCDBGOKOK() {
-        return pCBCDBGOKOK_;
-      }
-      /**
-       * <code>float PCBCDBGOKOK = 3;</code>
-       * @param value The pCBCDBGOKOK to set.
-       * @return This builder for chaining.
-       */
-      public Builder setPCBCDBGOKOK(float value) {
-        
-        pCBCDBGOKOK_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>float PCBCDBGOKOK = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearPCBCDBGOKOK() {
-        
-        pCBCDBGOKOK_ = 0F;
-        onChanged();
-        return this;
-      }
-
       private com.google.protobuf.Internal.IntList uidList_ = emptyIntList();
       private void ensureUidListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -912,7 +873,7 @@ public final class VehicleLocationInfoOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @return A list containing the uidList.
        */
       public java.util.List<java.lang.Integer>
@@ -921,14 +882,14 @@ public final class VehicleLocationInfoOuterClass {
                  java.util.Collections.unmodifiableList(uidList_) : uidList_;
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @return The count of uidList.
        */
       public int getUidListCount() {
         return uidList_.size();
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @param index The index of the element to return.
        * @return The uidList at the given index.
        */
@@ -936,7 +897,7 @@ public final class VehicleLocationInfoOuterClass {
         return uidList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @param index The index to set the value at.
        * @param value The uidList to set.
        * @return This builder for chaining.
@@ -949,7 +910,7 @@ public final class VehicleLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @param value The uidList to add.
        * @return This builder for chaining.
        */
@@ -960,7 +921,7 @@ public final class VehicleLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @param values The uidList to add.
        * @return This builder for chaining.
        */
@@ -973,7 +934,7 @@ public final class VehicleLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 uid_list = 11;</code>
+       * <code>repeated uint32 uid_list = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearUidList() {
@@ -983,40 +944,221 @@ public final class VehicleLocationInfoOuterClass {
         return this;
       }
 
-      private float fOHOENOKMML_ ;
+      private float mEGKADCAAAJ_ ;
       /**
-       * <code>float FOHOENOKMML = 7;</code>
-       * @return The fOHOENOKMML.
+       * <code>float MEGKADCAAAJ = 2;</code>
+       * @return The mEGKADCAAAJ.
        */
       @java.lang.Override
-      public float getFOHOENOKMML() {
-        return fOHOENOKMML_;
+      public float getMEGKADCAAAJ() {
+        return mEGKADCAAAJ_;
       }
       /**
-       * <code>float FOHOENOKMML = 7;</code>
-       * @param value The fOHOENOKMML to set.
+       * <code>float MEGKADCAAAJ = 2;</code>
+       * @param value The mEGKADCAAAJ to set.
        * @return This builder for chaining.
        */
-      public Builder setFOHOENOKMML(float value) {
+      public Builder setMEGKADCAAAJ(float value) {
         
-        fOHOENOKMML_ = value;
+        mEGKADCAAAJ_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>float FOHOENOKMML = 7;</code>
+       * <code>float MEGKADCAAAJ = 2;</code>
        * @return This builder for chaining.
        */
-      public Builder clearFOHOENOKMML() {
+      public Builder clearMEGKADCAAAJ() {
         
-        fOHOENOKMML_ = 0F;
+        mEGKADCAAAJ_ = 0F;
+        onChanged();
+        return this;
+      }
+
+      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
+      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 = 4;</code>
+       * @return Whether the pos field is set.
+       */
+      public boolean hasPos() {
+        return posBuilder_ != null || pos_ != null;
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       * @return The pos.
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
+        if (posBuilder_ == null) {
+          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        } else {
+          return posBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          pos_ = value;
+          onChanged();
+        } else {
+          posBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public Builder setPos(
+          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
+        if (posBuilder_ == null) {
+          pos_ = builderForValue.build();
+          onChanged();
+        } else {
+          posBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
+        if (posBuilder_ == null) {
+          if (pos_ != null) {
+            pos_ =
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
+          } else {
+            pos_ = value;
+          }
+          onChanged();
+        } else {
+          posBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public Builder clearPos() {
+        if (posBuilder_ == null) {
+          pos_ = null;
+          onChanged();
+        } else {
+          pos_ = null;
+          posBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
+        
+        onChanged();
+        return getPosFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.Vector pos = 4;</code>
+       */
+      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
+        if (posBuilder_ != null) {
+          return posBuilder_.getMessageOrBuilder();
+        } else {
+          return pos_ == null ?
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
+        }
+      }
+      /**
+       * <code>.Vector pos = 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> 
+          getPosFieldBuilder() {
+        if (posBuilder_ == null) {
+          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
+                  getPos(),
+                  getParentForChildren(),
+                  isClean());
+          pos_ = null;
+        }
+        return posBuilder_;
+      }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 6;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 6;</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 = 6;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private float fIPKPJPKJBN_ ;
+      /**
+       * <code>float FIPKPJPKJBN = 9;</code>
+       * @return The fIPKPJPKJBN.
+       */
+      @java.lang.Override
+      public float getFIPKPJPKJBN() {
+        return fIPKPJPKJBN_;
+      }
+      /**
+       * <code>float FIPKPJPKJBN = 9;</code>
+       * @param value The fIPKPJPKJBN to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFIPKPJPKJBN(float value) {
+        
+        fIPKPJPKJBN_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>float FIPKPJPKJBN = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFIPKPJPKJBN() {
+        
+        fIPKPJPKJBN_ = 0F;
         onChanged();
         return this;
       }
 
       private int ownerUid_ ;
       /**
-       * <code>uint32 owner_uid = 5;</code>
+       * <code>uint32 owner_uid = 10;</code>
        * @return The ownerUid.
        */
       @java.lang.Override
@@ -1024,7 +1166,7 @@ public final class VehicleLocationInfoOuterClass {
         return ownerUid_;
       }
       /**
-       * <code>uint32 owner_uid = 5;</code>
+       * <code>uint32 owner_uid = 10;</code>
        * @param value The ownerUid to set.
        * @return This builder for chaining.
        */
@@ -1035,7 +1177,7 @@ public final class VehicleLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 owner_uid = 5;</code>
+       * <code>uint32 owner_uid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearOwnerUid() {
@@ -1164,156 +1306,6 @@ public final class VehicleLocationInfoOuterClass {
         return rotBuilder_;
       }
 
-      private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
-      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 = 4;</code>
-       * @return Whether the pos field is set.
-       */
-      public boolean hasPos() {
-        return posBuilder_ != null || pos_ != null;
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       * @return The pos.
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
-        if (posBuilder_ == null) {
-          return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        } else {
-          return posBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          pos_ = value;
-          onChanged();
-        } else {
-          posBuilder_.setMessage(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public Builder setPos(
-          emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
-        if (posBuilder_ == null) {
-          pos_ = builderForValue.build();
-          onChanged();
-        } else {
-          posBuilder_.setMessage(builderForValue.build());
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
-        if (posBuilder_ == null) {
-          if (pos_ != null) {
-            pos_ =
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.newBuilder(pos_).mergeFrom(value).buildPartial();
-          } else {
-            pos_ = value;
-          }
-          onChanged();
-        } else {
-          posBuilder_.mergeFrom(value);
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public Builder clearPos() {
-        if (posBuilder_ == null) {
-          pos_ = null;
-          onChanged();
-        } else {
-          pos_ = null;
-          posBuilder_ = null;
-        }
-
-        return this;
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
-        
-        onChanged();
-        return getPosFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>.Vector pos = 4;</code>
-       */
-      public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
-        if (posBuilder_ != null) {
-          return posBuilder_.getMessageOrBuilder();
-        } else {
-          return pos_ == null ?
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
-        }
-      }
-      /**
-       * <code>.Vector pos = 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> 
-          getPosFieldBuilder() {
-        if (posBuilder_ == null) {
-          posBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
-              emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder>(
-                  getPos(),
-                  getParentForChildren(),
-                  isClean());
-          pos_ = null;
-        }
-        return posBuilder_;
-      }
-
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 12;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 12;</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 = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int gadgetId_ ;
       /**
        * <code>uint32 gadget_id = 15;</code>
@@ -1412,11 +1404,11 @@ public final class VehicleLocationInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031VehicleLocationInfo.proto\032\014Vector.prot" +
-      "o\"\266\001\n\023VehicleLocationInfo\022\023\n\013PCBCDBGOKOK" +
-      "\030\003 \001(\002\022\020\n\010uid_list\030\013 \003(\r\022\023\n\013FOHOENOKMML\030" +
-      "\007 \001(\002\022\021\n\towner_uid\030\005 \001(\r\022\024\n\003rot\030\016 \001(\0132\007." +
-      "Vector\022\024\n\003pos\030\004 \001(\0132\007.Vector\022\021\n\tentity_i" +
-      "d\030\014 \001(\r\022\021\n\tgadget_id\030\017 \001(\rB\033\n\031emu.grassc" +
+      "o\"\266\001\n\023VehicleLocationInfo\022\020\n\010uid_list\030\001 " +
+      "\003(\r\022\023\n\013MEGKADCAAAJ\030\002 \001(\002\022\024\n\003pos\030\004 \001(\0132\007." +
+      "Vector\022\021\n\tentity_id\030\006 \001(\r\022\023\n\013FIPKPJPKJBN" +
+      "\030\t \001(\002\022\021\n\towner_uid\030\n \001(\r\022\024\n\003rot\030\016 \001(\0132\007" +
+      ".Vector\022\021\n\tgadget_id\030\017 \001(\rB\033\n\031emu.grassc" +
       "utter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1429,7 +1421,7 @@ public final class VehicleLocationInfoOuterClass {
     internal_static_VehicleLocationInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_VehicleLocationInfo_descriptor,
-        new java.lang.String[] { "PCBCDBGOKOK", "UidList", "FOHOENOKMML", "OwnerUid", "Rot", "Pos", "EntityId", "GadgetId", });
+        new java.lang.String[] { "UidList", "MEGKADCAAAJ", "Pos", "EntityId", "FIPKPJPKJBN", "OwnerUid", "Rot", "GadgetId", });
     emu.grasscutter.net.proto.VectorOuterClass.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 ace8708c5..14977ac49 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleMemberOuterClass.java
@@ -38,7 +38,7 @@ public final class VehicleMemberOuterClass {
   }
   /**
    * <pre>
-   * Obf: NFOCOBNABPO
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code VehicleMember}
@@ -345,7 +345,7 @@ public final class VehicleMemberOuterClass {
     }
     /**
      * <pre>
-     * Obf: NFOCOBNABPO
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code VehicleMember}
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 fc8354b1b..43e082b12 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VehicleStaminaNotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class VehicleStaminaNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 5;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>float cur_stamina = 5;</code>
+     * <code>float cur_stamina = 6;</code>
      * @return The curStamina.
      */
     float getCurStamina();
   }
   /**
-   * <pre>
-   * CmdId: 6743
-   * Obf: FJJEGAOHOAC
-   * </pre>
-   *
    * Protobuf type {@code VehicleStaminaNotify}
    */
   public static final class VehicleStaminaNotify extends
@@ -80,16 +75,16 @@ public final class VehicleStaminaNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 45: {
-
-              curStamina_ = input.readFloat();
-              break;
-            }
-            case 80: {
+            case 40: {
 
               entityId_ = input.readUInt32();
               break;
             }
+            case 53: {
+
+              curStamina_ = input.readFloat();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class VehicleStaminaNotifyOuterClass {
               emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify.class, emu.grasscutter.net.proto.VehicleStaminaNotifyOuterClass.VehicleStaminaNotify.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 10;
+    public static final int ENTITY_ID_FIELD_NUMBER = 5;
     private int entityId_;
     /**
-     * <code>uint32 entity_id = 10;</code>
+     * <code>uint32 entity_id = 5;</code>
      * @return The entityId.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class VehicleStaminaNotifyOuterClass {
       return entityId_;
     }
 
-    public static final int CUR_STAMINA_FIELD_NUMBER = 5;
+    public static final int CUR_STAMINA_FIELD_NUMBER = 6;
     private float curStamina_;
     /**
-     * <code>float cur_stamina = 5;</code>
+     * <code>float cur_stamina = 6;</code>
      * @return The curStamina.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class VehicleStaminaNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (curStamina_ != 0F) {
-        output.writeFloat(5, curStamina_);
-      }
       if (entityId_ != 0) {
-        output.writeUInt32(10, entityId_);
+        output.writeUInt32(5, entityId_);
+      }
+      if (curStamina_ != 0F) {
+        output.writeFloat(6, curStamina_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class VehicleStaminaNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (curStamina_ != 0F) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeFloatSize(5, curStamina_);
-      }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, entityId_);
+          .computeUInt32Size(5, entityId_);
+      }
+      if (curStamina_ != 0F) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeFloatSize(6, curStamina_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,11 +308,6 @@ public final class VehicleStaminaNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6743
-     * Obf: FJJEGAOHOAC
-     * </pre>
-     *
      * Protobuf type {@code VehicleStaminaNotify}
      */
     public static final class Builder extends
@@ -472,7 +462,7 @@ public final class VehicleStaminaNotifyOuterClass {
 
       private int entityId_ ;
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @return The entityId.
        */
       @java.lang.Override
@@ -480,7 +470,7 @@ public final class VehicleStaminaNotifyOuterClass {
         return entityId_;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @param value The entityId to set.
        * @return This builder for chaining.
        */
@@ -491,7 +481,7 @@ public final class VehicleStaminaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 entity_id = 10;</code>
+       * <code>uint32 entity_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearEntityId() {
@@ -503,7 +493,7 @@ public final class VehicleStaminaNotifyOuterClass {
 
       private float curStamina_ ;
       /**
-       * <code>float cur_stamina = 5;</code>
+       * <code>float cur_stamina = 6;</code>
        * @return The curStamina.
        */
       @java.lang.Override
@@ -511,7 +501,7 @@ public final class VehicleStaminaNotifyOuterClass {
         return curStamina_;
       }
       /**
-       * <code>float cur_stamina = 5;</code>
+       * <code>float cur_stamina = 6;</code>
        * @param value The curStamina to set.
        * @return This builder for chaining.
        */
@@ -522,7 +512,7 @@ public final class VehicleStaminaNotifyOuterClass {
         return this;
       }
       /**
-       * <code>float cur_stamina = 5;</code>
+       * <code>float cur_stamina = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearCurStamina() {
@@ -599,8 +589,8 @@ public final class VehicleStaminaNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032VehicleStaminaNotify.proto\">\n\024VehicleS" +
-      "taminaNotify\022\021\n\tentity_id\030\n \001(\r\022\023\n\013cur_s" +
-      "tamina\030\005 \001(\002B\033\n\031emu.grasscutter.net.prot" +
+      "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" +
       "ob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/VisionTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/VisionTypeOuterClass.java
index 50f2c6420..008708d93 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/VisionTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/VisionTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class VisionTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: IFLKBEFDMPH
-   * </pre>
-   *
    * Protobuf enum {@code VisionType}
    */
   public enum VisionType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java
index 7243fe2ef..3cd780ee3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenReqOuterClass.java
@@ -19,57 +19,35 @@ public final class WeaponAwakenReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 target_weapon_guid = 2;</code>
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @return A list containing the affixLevelList.
+     */
+    java.util.List<java.lang.Long> getAffixLevelListList();
+    /**
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @return The count of affixLevelList.
+     */
+    int getAffixLevelListCount();
+    /**
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The affixLevelList at the given index.
+     */
+    long getAffixLevelList(int index);
+
+    /**
+     * <code>uint32 item_guid = 13;</code>
+     * @return The itemGuid.
+     */
+    int getItemGuid();
+
+    /**
+     * <code>uint64 target_weapon_guid = 15;</code>
      * @return The targetWeaponGuid.
      */
     long getTargetWeaponGuid();
-
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    int getAffixLevelMapCount();
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    boolean containsAffixLevelMap(
-        int key);
-    /**
-     * Use {@link #getAffixLevelMapMap()} instead.
-     */
-    @java.lang.Deprecated
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getAffixLevelMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    java.util.Map<java.lang.Integer, java.lang.Integer>
-    getAffixLevelMapMap();
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-
-    int getAffixLevelMapOrDefault(
-        int key,
-        int defaultValue);
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-
-    int getAffixLevelMapOrThrow(
-        int key);
-
-    /**
-     * <code>uint64 item_guid = 15;</code>
-     * @return The itemGuid.
-     */
-    long getItemGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23146
-   * Obf: AFPFPKMLIPD
-   * </pre>
-   *
    * Protobuf type {@code WeaponAwakenReq}
    */
   public static final class WeaponAwakenReq extends
@@ -82,6 +60,7 @@ public final class WeaponAwakenReqOuterClass {
       super(builder);
     }
     private WeaponAwakenReq() {
+      affixLevelList_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -115,27 +94,35 @@ public final class WeaponAwakenReqOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              targetWeaponGuid_ = input.readUInt64();
-              break;
-            }
-            case 34: {
+            case 24: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                affixLevelMap_ = com.google.protobuf.MapField.newMapField(
-                    AffixLevelMapDefaultEntryHolder.defaultEntry);
+                affixLevelList_ = newLongList();
                 mutable_bitField0_ |= 0x00000001;
               }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              affixLevelMap__ = input.readMessage(
-                  AffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              affixLevelMap_.getMutableMap().put(
-                  affixLevelMap__.getKey(), affixLevelMap__.getValue());
+              affixLevelList_.addLong(input.readUInt64());
+              break;
+            }
+            case 26: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
+                affixLevelList_ = newLongList();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                affixLevelList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
+            case 104: {
+
+              itemGuid_ = input.readUInt32();
               break;
             }
             case 120: {
 
-              itemGuid_ = input.readUInt64();
+              targetWeaponGuid_ = input.readUInt64();
               break;
             }
             default: {
@@ -153,6 +140,9 @@ public final class WeaponAwakenReqOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          affixLevelList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -162,18 +152,6 @@ public final class WeaponAwakenReqOuterClass {
       return emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_descriptor;
     }
 
-    @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
-    protected com.google.protobuf.MapField internalGetMapField(
-        int number) {
-      switch (number) {
-        case 4:
-          return internalGetAffixLevelMap();
-        default:
-          throw new RuntimeException(
-              "Invalid map field number: " + number);
-      }
-    }
     @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
@@ -182,10 +160,49 @@ public final class WeaponAwakenReqOuterClass {
               emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.class, emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.Builder.class);
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 2;
+    public static final int AFFIX_LEVEL_LIST_FIELD_NUMBER = 3;
+    private com.google.protobuf.Internal.LongList affixLevelList_;
+    /**
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @return A list containing the affixLevelList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getAffixLevelListList() {
+      return affixLevelList_;
+    }
+    /**
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @return The count of affixLevelList.
+     */
+    public int getAffixLevelListCount() {
+      return affixLevelList_.size();
+    }
+    /**
+     * <code>repeated uint64 affix_level_list = 3;</code>
+     * @param index The index of the element to return.
+     * @return The affixLevelList at the given index.
+     */
+    public long getAffixLevelList(int index) {
+      return affixLevelList_.getLong(index);
+    }
+    private int affixLevelListMemoizedSerializedSize = -1;
+
+    public static final int ITEM_GUID_FIELD_NUMBER = 13;
+    private int itemGuid_;
+    /**
+     * <code>uint32 item_guid = 13;</code>
+     * @return The itemGuid.
+     */
+    @java.lang.Override
+    public int getItemGuid() {
+      return itemGuid_;
+    }
+
+    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 15;
     private long targetWeaponGuid_;
     /**
-     * <code>uint64 target_weapon_guid = 2;</code>
+     * <code>uint64 target_weapon_guid = 15;</code>
      * @return The targetWeaponGuid.
      */
     @java.lang.Override
@@ -193,98 +210,6 @@ public final class WeaponAwakenReqOuterClass {
       return targetWeaponGuid_;
     }
 
-    public static final int AFFIX_LEVEL_MAP_FIELD_NUMBER = 4;
-    private static final class AffixLevelMapDefaultEntryHolder {
-      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.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_AffixLevelMapEntry_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> affixLevelMap_;
-    private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-    internalGetAffixLevelMap() {
-      if (affixLevelMap_ == null) {
-        return com.google.protobuf.MapField.emptyMapField(
-            AffixLevelMapDefaultEntryHolder.defaultEntry);
-      }
-      return affixLevelMap_;
-    }
-
-    public int getAffixLevelMapCount() {
-      return internalGetAffixLevelMap().getMap().size();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-
-    @java.lang.Override
-    public boolean containsAffixLevelMap(
-        int key) {
-      
-      return internalGetAffixLevelMap().getMap().containsKey(key);
-    }
-    /**
-     * Use {@link #getAffixLevelMapMap()} instead.
-     */
-    @java.lang.Override
-    @java.lang.Deprecated
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getAffixLevelMap() {
-      return getAffixLevelMapMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public java.util.Map<java.lang.Integer, java.lang.Integer> getAffixLevelMapMap() {
-      return internalGetAffixLevelMap().getMap();
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public int getAffixLevelMapOrDefault(
-        int key,
-        int defaultValue) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetAffixLevelMap().getMap();
-      return map.containsKey(key) ? map.get(key) : defaultValue;
-    }
-    /**
-     * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-     */
-    @java.lang.Override
-
-    public int getAffixLevelMapOrThrow(
-        int key) {
-      
-      java.util.Map<java.lang.Integer, java.lang.Integer> map =
-          internalGetAffixLevelMap().getMap();
-      if (!map.containsKey(key)) {
-        throw new java.lang.IllegalArgumentException();
-      }
-      return map.get(key);
-    }
-
-    public static final int ITEM_GUID_FIELD_NUMBER = 15;
-    private long itemGuid_;
-    /**
-     * <code>uint64 item_guid = 15;</code>
-     * @return The itemGuid.
-     */
-    @java.lang.Override
-    public long getItemGuid() {
-      return itemGuid_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -299,17 +224,19 @@ public final class WeaponAwakenReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(2, targetWeaponGuid_);
+      getSerializedSize();
+      if (getAffixLevelListList().size() > 0) {
+        output.writeUInt32NoTag(26);
+        output.writeUInt32NoTag(affixLevelListMemoizedSerializedSize);
       }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetAffixLevelMap(),
-          AffixLevelMapDefaultEntryHolder.defaultEntry,
-          4);
-      if (itemGuid_ != 0L) {
-        output.writeUInt64(15, itemGuid_);
+      for (int i = 0; i < affixLevelList_.size(); i++) {
+        output.writeUInt64NoTag(affixLevelList_.getLong(i));
+      }
+      if (itemGuid_ != 0) {
+        output.writeUInt32(13, itemGuid_);
+      }
+      if (targetWeaponGuid_ != 0L) {
+        output.writeUInt64(15, targetWeaponGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -320,23 +247,27 @@ public final class WeaponAwakenReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      {
+        int dataSize = 0;
+        for (int i = 0; i < affixLevelList_.size(); i++) {
+          dataSize += com.google.protobuf.CodedOutputStream
+            .computeUInt64SizeNoTag(affixLevelList_.getLong(i));
+        }
+        size += dataSize;
+        if (!getAffixLevelListList().isEmpty()) {
+          size += 1;
+          size += com.google.protobuf.CodedOutputStream
+              .computeInt32SizeNoTag(dataSize);
+        }
+        affixLevelListMemoizedSerializedSize = dataSize;
+      }
+      if (itemGuid_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(13, itemGuid_);
+      }
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(2, targetWeaponGuid_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetAffixLevelMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        affixLevelMap__ = AffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(4, affixLevelMap__);
-      }
-      if (itemGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(15, itemGuid_);
+          .computeUInt64Size(15, targetWeaponGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -353,12 +284,12 @@ public final class WeaponAwakenReqOuterClass {
       }
       emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq other = (emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq) obj;
 
-      if (getTargetWeaponGuid()
-          != other.getTargetWeaponGuid()) return false;
-      if (!internalGetAffixLevelMap().equals(
-          other.internalGetAffixLevelMap())) return false;
+      if (!getAffixLevelListList()
+          .equals(other.getAffixLevelListList())) return false;
       if (getItemGuid()
           != other.getItemGuid()) return false;
+      if (getTargetWeaponGuid()
+          != other.getTargetWeaponGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -370,16 +301,15 @@ public final class WeaponAwakenReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (getAffixLevelListCount() > 0) {
+        hash = (37 * hash) + AFFIX_LEVEL_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getAffixLevelListList().hashCode();
+      }
+      hash = (37 * hash) + ITEM_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + getItemGuid();
       hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetWeaponGuid());
-      if (!internalGetAffixLevelMap().getMap().isEmpty()) {
-        hash = (37 * hash) + AFFIX_LEVEL_MAP_FIELD_NUMBER;
-        hash = (53 * hash) + internalGetAffixLevelMap().hashCode();
-      }
-      hash = (37 * hash) + ITEM_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getItemGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -476,11 +406,6 @@ public final class WeaponAwakenReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23146
-     * Obf: AFPFPKMLIPD
-     * </pre>
-     *
      * Protobuf type {@code WeaponAwakenReq}
      */
     public static final class Builder extends
@@ -492,28 +417,6 @@ public final class WeaponAwakenReqOuterClass {
         return emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.internal_static_WeaponAwakenReq_descriptor;
       }
 
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMapField(
-          int number) {
-        switch (number) {
-          case 4:
-            return internalGetAffixLevelMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
-      @SuppressWarnings({"rawtypes"})
-      protected com.google.protobuf.MapField internalGetMutableMapField(
-          int number) {
-        switch (number) {
-          case 4:
-            return internalGetMutableAffixLevelMap();
-          default:
-            throw new RuntimeException(
-                "Invalid map field number: " + number);
-        }
-      }
       @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
@@ -540,10 +443,11 @@ public final class WeaponAwakenReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetWeaponGuid_ = 0L;
+        affixLevelList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        itemGuid_ = 0;
 
-        internalGetMutableAffixLevelMap().clear();
-        itemGuid_ = 0L;
+        targetWeaponGuid_ = 0L;
 
         return this;
       }
@@ -572,10 +476,13 @@ public final class WeaponAwakenReqOuterClass {
       public emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq buildPartial() {
         emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq result = new emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq(this);
         int from_bitField0_ = bitField0_;
-        result.targetWeaponGuid_ = targetWeaponGuid_;
-        result.affixLevelMap_ = internalGetAffixLevelMap();
-        result.affixLevelMap_.makeImmutable();
+        if (((bitField0_ & 0x00000001) != 0)) {
+          affixLevelList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000001);
+        }
+        result.affixLevelList_ = affixLevelList_;
         result.itemGuid_ = itemGuid_;
+        result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
         return result;
       }
@@ -624,14 +531,22 @@ public final class WeaponAwakenReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq other) {
         if (other == emu.grasscutter.net.proto.WeaponAwakenReqOuterClass.WeaponAwakenReq.getDefaultInstance()) return this;
+        if (!other.affixLevelList_.isEmpty()) {
+          if (affixLevelList_.isEmpty()) {
+            affixLevelList_ = other.affixLevelList_;
+            bitField0_ = (bitField0_ & ~0x00000001);
+          } else {
+            ensureAffixLevelListIsMutable();
+            affixLevelList_.addAll(other.affixLevelList_);
+          }
+          onChanged();
+        }
+        if (other.getItemGuid() != 0) {
+          setItemGuid(other.getItemGuid());
+        }
         if (other.getTargetWeaponGuid() != 0L) {
           setTargetWeaponGuid(other.getTargetWeaponGuid());
         }
-        internalGetMutableAffixLevelMap().mergeFrom(
-            other.internalGetAffixLevelMap());
-        if (other.getItemGuid() != 0L) {
-          setItemGuid(other.getItemGuid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -662,9 +577,119 @@ public final class WeaponAwakenReqOuterClass {
       }
       private int bitField0_;
 
+      private com.google.protobuf.Internal.LongList affixLevelList_ = emptyLongList();
+      private void ensureAffixLevelListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          affixLevelList_ = mutableCopy(affixLevelList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @return A list containing the affixLevelList.
+       */
+      public java.util.List<java.lang.Long>
+          getAffixLevelListList() {
+        return ((bitField0_ & 0x00000001) != 0) ?
+                 java.util.Collections.unmodifiableList(affixLevelList_) : affixLevelList_;
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @return The count of affixLevelList.
+       */
+      public int getAffixLevelListCount() {
+        return affixLevelList_.size();
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @param index The index of the element to return.
+       * @return The affixLevelList at the given index.
+       */
+      public long getAffixLevelList(int index) {
+        return affixLevelList_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @param index The index to set the value at.
+       * @param value The affixLevelList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setAffixLevelList(
+          int index, long value) {
+        ensureAffixLevelListIsMutable();
+        affixLevelList_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @param value The affixLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAffixLevelList(long value) {
+        ensureAffixLevelListIsMutable();
+        affixLevelList_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @param values The affixLevelList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllAffixLevelList(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureAffixLevelListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, affixLevelList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 affix_level_list = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearAffixLevelList() {
+        affixLevelList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000001);
+        onChanged();
+        return this;
+      }
+
+      private int itemGuid_ ;
+      /**
+       * <code>uint32 item_guid = 13;</code>
+       * @return The itemGuid.
+       */
+      @java.lang.Override
+      public int getItemGuid() {
+        return itemGuid_;
+      }
+      /**
+       * <code>uint32 item_guid = 13;</code>
+       * @param value The itemGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setItemGuid(int value) {
+        
+        itemGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 item_guid = 13;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearItemGuid() {
+        
+        itemGuid_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long targetWeaponGuid_ ;
       /**
-       * <code>uint64 target_weapon_guid = 2;</code>
+       * <code>uint64 target_weapon_guid = 15;</code>
        * @return The targetWeaponGuid.
        */
       @java.lang.Override
@@ -672,7 +697,7 @@ public final class WeaponAwakenReqOuterClass {
         return targetWeaponGuid_;
       }
       /**
-       * <code>uint64 target_weapon_guid = 2;</code>
+       * <code>uint64 target_weapon_guid = 15;</code>
        * @param value The targetWeaponGuid to set.
        * @return This builder for chaining.
        */
@@ -683,7 +708,7 @@ public final class WeaponAwakenReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_weapon_guid = 2;</code>
+       * <code>uint64 target_weapon_guid = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetWeaponGuid() {
@@ -692,165 +717,6 @@ public final class WeaponAwakenReqOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.MapField<
-          java.lang.Integer, java.lang.Integer> affixLevelMap_;
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetAffixLevelMap() {
-        if (affixLevelMap_ == null) {
-          return com.google.protobuf.MapField.emptyMapField(
-              AffixLevelMapDefaultEntryHolder.defaultEntry);
-        }
-        return affixLevelMap_;
-      }
-      private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
-      internalGetMutableAffixLevelMap() {
-        onChanged();;
-        if (affixLevelMap_ == null) {
-          affixLevelMap_ = com.google.protobuf.MapField.newMapField(
-              AffixLevelMapDefaultEntryHolder.defaultEntry);
-        }
-        if (!affixLevelMap_.isMutable()) {
-          affixLevelMap_ = affixLevelMap_.copy();
-        }
-        return affixLevelMap_;
-      }
-
-      public int getAffixLevelMapCount() {
-        return internalGetAffixLevelMap().getMap().size();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-
-      @java.lang.Override
-      public boolean containsAffixLevelMap(
-          int key) {
-        
-        return internalGetAffixLevelMap().getMap().containsKey(key);
-      }
-      /**
-       * Use {@link #getAffixLevelMapMap()} instead.
-       */
-      @java.lang.Override
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getAffixLevelMap() {
-        return getAffixLevelMapMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public java.util.Map<java.lang.Integer, java.lang.Integer> getAffixLevelMapMap() {
-        return internalGetAffixLevelMap().getMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getAffixLevelMapOrDefault(
-          int key,
-          int defaultValue) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetAffixLevelMap().getMap();
-        return map.containsKey(key) ? map.get(key) : defaultValue;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-      @java.lang.Override
-
-      public int getAffixLevelMapOrThrow(
-          int key) {
-        
-        java.util.Map<java.lang.Integer, java.lang.Integer> map =
-            internalGetAffixLevelMap().getMap();
-        if (!map.containsKey(key)) {
-          throw new java.lang.IllegalArgumentException();
-        }
-        return map.get(key);
-      }
-
-      public Builder clearAffixLevelMap() {
-        internalGetMutableAffixLevelMap().getMutableMap()
-            .clear();
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-
-      public Builder removeAffixLevelMap(
-          int key) {
-        
-        internalGetMutableAffixLevelMap().getMutableMap()
-            .remove(key);
-        return this;
-      }
-      /**
-       * Use alternate mutation accessors instead.
-       */
-      @java.lang.Deprecated
-      public java.util.Map<java.lang.Integer, java.lang.Integer>
-      getMutableAffixLevelMap() {
-        return internalGetMutableAffixLevelMap().getMutableMap();
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-      public Builder putAffixLevelMap(
-          int key,
-          int value) {
-        
-        
-        internalGetMutableAffixLevelMap().getMutableMap()
-            .put(key, value);
-        return this;
-      }
-      /**
-       * <code>map&lt;uint32, uint32&gt; affix_level_map = 4;</code>
-       */
-
-      public Builder putAllAffixLevelMap(
-          java.util.Map<java.lang.Integer, java.lang.Integer> values) {
-        internalGetMutableAffixLevelMap().getMutableMap()
-            .putAll(values);
-        return this;
-      }
-
-      private long itemGuid_ ;
-      /**
-       * <code>uint64 item_guid = 15;</code>
-       * @return The itemGuid.
-       */
-      @java.lang.Override
-      public long getItemGuid() {
-        return itemGuid_;
-      }
-      /**
-       * <code>uint64 item_guid = 15;</code>
-       * @param value The itemGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setItemGuid(long value) {
-        
-        itemGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 item_guid = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearItemGuid() {
-        
-        itemGuid_ = 0L;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -909,11 +775,6 @@ public final class WeaponAwakenReqOuterClass {
   private static final 
     com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_WeaponAwakenReq_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
-    internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor;
-  private static final 
-    com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_WeaponAwakenReq_AffixLevelMapEntry_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor
       getDescriptor() {
@@ -923,13 +784,10 @@ public final class WeaponAwakenReqOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\025WeaponAwakenReq.proto\"\264\001\n\017WeaponAwaken" +
-      "Req\022\032\n\022target_weapon_guid\030\002 \001(\004\022<\n\017affix" +
-      "_level_map\030\004 \003(\0132#.WeaponAwakenReq.Affix" +
-      "LevelMapEntry\022\021\n\titem_guid\030\017 \001(\004\0324\n\022Affi" +
-      "xLevelMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 \001" +
-      "(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006pro" +
-      "to3"
+      "\n\025WeaponAwakenReq.proto\"Z\n\017WeaponAwakenR" +
+      "eq\022\030\n\020affix_level_list\030\003 \003(\004\022\021\n\titem_gui" +
+      "d\030\r \001(\r\022\032\n\022target_weapon_guid\030\017 \001(\004B\033\n\031e" +
+      "mu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -940,13 +798,7 @@ public final class WeaponAwakenReqOuterClass {
     internal_static_WeaponAwakenReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponAwakenReq_descriptor,
-        new java.lang.String[] { "TargetWeaponGuid", "AffixLevelMap", "ItemGuid", });
-    internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor =
-      internal_static_WeaponAwakenReq_descriptor.getNestedTypes().get(0);
-    internal_static_WeaponAwakenReq_AffixLevelMapEntry_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-        internal_static_WeaponAwakenReq_AffixLevelMapEntry_descriptor,
-        new java.lang.String[] { "Key", "Value", });
+        new java.lang.String[] { "AffixLevelList", "ItemGuid", "TargetWeaponGuid", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java
index 915e62aa0..ee0a08705 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponAwakenRspOuterClass.java
@@ -19,17 +19,35 @@ public final class WeaponAwakenRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>uint32 target_weapon_awaken_level = 1;</code>
+     * @return The targetWeaponAwakenLevel.
+     */
+    int getTargetWeaponAwakenLevel();
+
+    /**
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>uint64 avatar_guid = 6;</code>
+     * @return The avatarGuid.
+     */
+    long getAvatarGuid();
+
+    /**
+     * <code>uint64 target_weapon_guid = 9;</code>
+     * @return The targetWeaponGuid.
+     */
+    long getTargetWeaponGuid();
+
+    /**
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     int getOldAffixLevelMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     boolean containsOldAffixLevelMap(
         int key);
@@ -40,30 +58,30 @@ public final class WeaponAwakenRspOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOldAffixLevelMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getOldAffixLevelMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
 
     int getOldAffixLevelMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
 
     int getOldAffixLevelMapOrThrow(
         int key);
 
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     int getCurAffixLevelMapCount();
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     boolean containsCurAffixLevelMap(
         int key);
@@ -74,48 +92,25 @@ public final class WeaponAwakenRspOuterClass {
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getCurAffixLevelMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     java.util.Map<java.lang.Integer, java.lang.Integer>
     getCurAffixLevelMapMap();
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
 
     int getCurAffixLevelMapOrDefault(
         int key,
         int defaultValue);
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
 
     int getCurAffixLevelMapOrThrow(
         int key);
-
-    /**
-     * <code>uint64 target_weapon_guid = 11;</code>
-     * @return The targetWeaponGuid.
-     */
-    long getTargetWeaponGuid();
-
-    /**
-     * <code>uint32 target_weapon_awaken_level = 1;</code>
-     * @return The targetWeaponAwakenLevel.
-     */
-    int getTargetWeaponAwakenLevel();
-
-    /**
-     * <code>uint64 avatar_guid = 9;</code>
-     * @return The avatarGuid.
-     */
-    long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 26318
-   * Obf: BBBKJFJPFLK
-   * </pre>
-   *
    * Protobuf type {@code WeaponAwakenRsp}
    */
   public static final class WeaponAwakenRsp extends
@@ -166,35 +161,22 @@ public final class WeaponAwakenRspOuterClass {
               targetWeaponAwakenLevel_ = input.readUInt32();
               break;
             }
-            case 72: {
-
-              avatarGuid_ = input.readUInt64();
-              break;
-            }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                curAffixLevelMap_ = com.google.protobuf.MapField.newMapField(
-                    CurAffixLevelMapDefaultEntryHolder.defaultEntry);
-                mutable_bitField0_ |= 0x00000002;
-              }
-              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-              curAffixLevelMap__ = input.readMessage(
-                  CurAffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
-              curAffixLevelMap_.getMutableMap().put(
-                  curAffixLevelMap__.getKey(), curAffixLevelMap__.getValue());
-              break;
-            }
-            case 88: {
-
-              targetWeaponGuid_ = input.readUInt64();
-              break;
-            }
-            case 96: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 106: {
+            case 48: {
+
+              avatarGuid_ = input.readUInt64();
+              break;
+            }
+            case 72: {
+
+              targetWeaponGuid_ = input.readUInt64();
+              break;
+            }
+            case 98: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 oldAffixLevelMap_ = com.google.protobuf.MapField.newMapField(
                     OldAffixLevelMapDefaultEntryHolder.defaultEntry);
@@ -207,6 +189,19 @@ public final class WeaponAwakenRspOuterClass {
                   oldAffixLevelMap__.getKey(), oldAffixLevelMap__.getValue());
               break;
             }
+            case 122: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                curAffixLevelMap_ = com.google.protobuf.MapField.newMapField(
+                    CurAffixLevelMapDefaultEntryHolder.defaultEntry);
+                mutable_bitField0_ |= 0x00000002;
+              }
+              com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+              curAffixLevelMap__ = input.readMessage(
+                  CurAffixLevelMapDefaultEntryHolder.defaultEntry.getParserForType(), extensionRegistry);
+              curAffixLevelMap_.getMutableMap().put(
+                  curAffixLevelMap__.getKey(), curAffixLevelMap__.getValue());
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -236,9 +231,9 @@ public final class WeaponAwakenRspOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 13:
+        case 12:
           return internalGetOldAffixLevelMap();
-        case 10:
+        case 15:
           return internalGetCurAffixLevelMap();
         default:
           throw new RuntimeException(
@@ -253,10 +248,21 @@ public final class WeaponAwakenRspOuterClass {
               emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.class, emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 12;
+    public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 1;
+    private int targetWeaponAwakenLevel_;
+    /**
+     * <code>uint32 target_weapon_awaken_level = 1;</code>
+     * @return The targetWeaponAwakenLevel.
+     */
+    @java.lang.Override
+    public int getTargetWeaponAwakenLevel() {
+      return targetWeaponAwakenLevel_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 12;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -264,7 +270,29 @@ public final class WeaponAwakenRspOuterClass {
       return retcode_;
     }
 
-    public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 13;
+    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 TARGET_WEAPON_GUID_FIELD_NUMBER = 9;
+    private long targetWeaponGuid_;
+    /**
+     * <code>uint64 target_weapon_guid = 9;</code>
+     * @return The targetWeaponGuid.
+     */
+    @java.lang.Override
+    public long getTargetWeaponGuid() {
+      return targetWeaponGuid_;
+    }
+
+    public static final int OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER = 12;
     private static final class OldAffixLevelMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -291,7 +319,7 @@ public final class WeaponAwakenRspOuterClass {
       return internalGetOldAffixLevelMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
 
     @java.lang.Override
@@ -309,7 +337,7 @@ public final class WeaponAwakenRspOuterClass {
       return getOldAffixLevelMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     @java.lang.Override
 
@@ -317,7 +345,7 @@ public final class WeaponAwakenRspOuterClass {
       return internalGetOldAffixLevelMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     @java.lang.Override
 
@@ -330,7 +358,7 @@ public final class WeaponAwakenRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+     * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
      */
     @java.lang.Override
 
@@ -345,7 +373,7 @@ public final class WeaponAwakenRspOuterClass {
       return map.get(key);
     }
 
-    public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 10;
+    public static final int CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER = 15;
     private static final class CurAffixLevelMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, java.lang.Integer> defaultEntry =
@@ -372,7 +400,7 @@ public final class WeaponAwakenRspOuterClass {
       return internalGetCurAffixLevelMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
 
     @java.lang.Override
@@ -390,7 +418,7 @@ public final class WeaponAwakenRspOuterClass {
       return getCurAffixLevelMapMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     @java.lang.Override
 
@@ -398,7 +426,7 @@ public final class WeaponAwakenRspOuterClass {
       return internalGetCurAffixLevelMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     @java.lang.Override
 
@@ -411,7 +439,7 @@ public final class WeaponAwakenRspOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+     * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
      */
     @java.lang.Override
 
@@ -426,39 +454,6 @@ public final class WeaponAwakenRspOuterClass {
       return map.get(key);
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 11;
-    private long targetWeaponGuid_;
-    /**
-     * <code>uint64 target_weapon_guid = 11;</code>
-     * @return The targetWeaponGuid.
-     */
-    @java.lang.Override
-    public long getTargetWeaponGuid() {
-      return targetWeaponGuid_;
-    }
-
-    public static final int TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER = 1;
-    private int targetWeaponAwakenLevel_;
-    /**
-     * <code>uint32 target_weapon_awaken_level = 1;</code>
-     * @return The targetWeaponAwakenLevel.
-     */
-    @java.lang.Override
-    public int getTargetWeaponAwakenLevel() {
-      return targetWeaponAwakenLevel_;
-    }
-
-    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_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -476,27 +471,27 @@ public final class WeaponAwakenRspOuterClass {
       if (targetWeaponAwakenLevel_ != 0) {
         output.writeUInt32(1, targetWeaponAwakenLevel_);
       }
-      if (avatarGuid_ != 0L) {
-        output.writeUInt64(9, avatarGuid_);
-      }
-      com.google.protobuf.GeneratedMessageV3
-        .serializeIntegerMapTo(
-          output,
-          internalGetCurAffixLevelMap(),
-          CurAffixLevelMapDefaultEntryHolder.defaultEntry,
-          10);
-      if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(11, targetWeaponGuid_);
-      }
       if (retcode_ != 0) {
-        output.writeInt32(12, retcode_);
+        output.writeInt32(5, retcode_);
+      }
+      if (avatarGuid_ != 0L) {
+        output.writeUInt64(6, avatarGuid_);
+      }
+      if (targetWeaponGuid_ != 0L) {
+        output.writeUInt64(9, targetWeaponGuid_);
       }
       com.google.protobuf.GeneratedMessageV3
         .serializeIntegerMapTo(
           output,
           internalGetOldAffixLevelMap(),
           OldAffixLevelMapDefaultEntryHolder.defaultEntry,
-          13);
+          12);
+      com.google.protobuf.GeneratedMessageV3
+        .serializeIntegerMapTo(
+          output,
+          internalGetCurAffixLevelMap(),
+          CurAffixLevelMapDefaultEntryHolder.defaultEntry,
+          15);
       unknownFields.writeTo(output);
     }
 
@@ -510,27 +505,17 @@ public final class WeaponAwakenRspOuterClass {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(1, targetWeaponAwakenLevel_);
       }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(5, retcode_);
+      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(9, avatarGuid_);
-      }
-      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
-           : internalGetCurAffixLevelMap().getMap().entrySet()) {
-        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
-        curAffixLevelMap__ = CurAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType()
-            .setKey(entry.getKey())
-            .setValue(entry.getValue())
-            .build();
-        size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(10, curAffixLevelMap__);
+          .computeUInt64Size(6, avatarGuid_);
       }
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, targetWeaponGuid_);
-      }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(12, retcode_);
+          .computeUInt64Size(9, targetWeaponGuid_);
       }
       for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
            : internalGetOldAffixLevelMap().getMap().entrySet()) {
@@ -540,7 +525,17 @@ public final class WeaponAwakenRspOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(13, oldAffixLevelMap__);
+            .computeMessageSize(12, oldAffixLevelMap__);
+      }
+      for (java.util.Map.Entry<java.lang.Integer, java.lang.Integer> entry
+           : internalGetCurAffixLevelMap().getMap().entrySet()) {
+        com.google.protobuf.MapEntry<java.lang.Integer, java.lang.Integer>
+        curAffixLevelMap__ = CurAffixLevelMapDefaultEntryHolder.defaultEntry.newBuilderForType()
+            .setKey(entry.getKey())
+            .setValue(entry.getValue())
+            .build();
+        size += com.google.protobuf.CodedOutputStream
+            .computeMessageSize(15, curAffixLevelMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -557,18 +552,18 @@ public final class WeaponAwakenRspOuterClass {
       }
       emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp other = (emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp) obj;
 
+      if (getTargetWeaponAwakenLevel()
+          != other.getTargetWeaponAwakenLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getAvatarGuid()
+          != other.getAvatarGuid()) return false;
+      if (getTargetWeaponGuid()
+          != other.getTargetWeaponGuid()) return false;
       if (!internalGetOldAffixLevelMap().equals(
           other.internalGetOldAffixLevelMap())) return false;
       if (!internalGetCurAffixLevelMap().equals(
           other.internalGetCurAffixLevelMap())) return false;
-      if (getTargetWeaponGuid()
-          != other.getTargetWeaponGuid()) return false;
-      if (getTargetWeaponAwakenLevel()
-          != other.getTargetWeaponAwakenLevel()) return false;
-      if (getAvatarGuid()
-          != other.getAvatarGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -580,8 +575,16 @@ public final class WeaponAwakenRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getTargetWeaponAwakenLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + AVATAR_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getAvatarGuid());
+      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTargetWeaponGuid());
       if (!internalGetOldAffixLevelMap().getMap().isEmpty()) {
         hash = (37 * hash) + OLD_AFFIX_LEVEL_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetOldAffixLevelMap().hashCode();
@@ -590,14 +593,6 @@ public final class WeaponAwakenRspOuterClass {
         hash = (37 * hash) + CUR_AFFIX_LEVEL_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetCurAffixLevelMap().hashCode();
       }
-      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getTargetWeaponGuid());
-      hash = (37 * hash) + TARGET_WEAPON_AWAKEN_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getTargetWeaponAwakenLevel();
-      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;
@@ -694,11 +689,6 @@ public final class WeaponAwakenRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26318
-     * Obf: BBBKJFJPFLK
-     * </pre>
-     *
      * Protobuf type {@code WeaponAwakenRsp}
      */
     public static final class Builder extends
@@ -714,9 +704,9 @@ public final class WeaponAwakenRspOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 12:
             return internalGetOldAffixLevelMap();
-          case 10:
+          case 15:
             return internalGetCurAffixLevelMap();
           default:
             throw new RuntimeException(
@@ -727,9 +717,9 @@ public final class WeaponAwakenRspOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 13:
+          case 12:
             return internalGetMutableOldAffixLevelMap();
-          case 10:
+          case 15:
             return internalGetMutableCurAffixLevelMap();
           default:
             throw new RuntimeException(
@@ -762,16 +752,16 @@ public final class WeaponAwakenRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        retcode_ = 0;
-
-        internalGetMutableOldAffixLevelMap().clear();
-        internalGetMutableCurAffixLevelMap().clear();
-        targetWeaponGuid_ = 0L;
-
         targetWeaponAwakenLevel_ = 0;
 
+        retcode_ = 0;
+
         avatarGuid_ = 0L;
 
+        targetWeaponGuid_ = 0L;
+
+        internalGetMutableOldAffixLevelMap().clear();
+        internalGetMutableCurAffixLevelMap().clear();
         return this;
       }
 
@@ -799,14 +789,14 @@ public final class WeaponAwakenRspOuterClass {
       public emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp buildPartial() {
         emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp result = new emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp(this);
         int from_bitField0_ = bitField0_;
+        result.targetWeaponAwakenLevel_ = targetWeaponAwakenLevel_;
         result.retcode_ = retcode_;
+        result.avatarGuid_ = avatarGuid_;
+        result.targetWeaponGuid_ = targetWeaponGuid_;
         result.oldAffixLevelMap_ = internalGetOldAffixLevelMap();
         result.oldAffixLevelMap_.makeImmutable();
         result.curAffixLevelMap_ = internalGetCurAffixLevelMap();
         result.curAffixLevelMap_.makeImmutable();
-        result.targetWeaponGuid_ = targetWeaponGuid_;
-        result.targetWeaponAwakenLevel_ = targetWeaponAwakenLevel_;
-        result.avatarGuid_ = avatarGuid_;
         onBuilt();
         return result;
       }
@@ -855,22 +845,22 @@ public final class WeaponAwakenRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp other) {
         if (other == emu.grasscutter.net.proto.WeaponAwakenRspOuterClass.WeaponAwakenRsp.getDefaultInstance()) return this;
+        if (other.getTargetWeaponAwakenLevel() != 0) {
+          setTargetWeaponAwakenLevel(other.getTargetWeaponAwakenLevel());
+        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getAvatarGuid() != 0L) {
+          setAvatarGuid(other.getAvatarGuid());
+        }
+        if (other.getTargetWeaponGuid() != 0L) {
+          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        }
         internalGetMutableOldAffixLevelMap().mergeFrom(
             other.internalGetOldAffixLevelMap());
         internalGetMutableCurAffixLevelMap().mergeFrom(
             other.internalGetCurAffixLevelMap());
-        if (other.getTargetWeaponGuid() != 0L) {
-          setTargetWeaponGuid(other.getTargetWeaponGuid());
-        }
-        if (other.getTargetWeaponAwakenLevel() != 0) {
-          setTargetWeaponAwakenLevel(other.getTargetWeaponAwakenLevel());
-        }
-        if (other.getAvatarGuid() != 0L) {
-          setAvatarGuid(other.getAvatarGuid());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -901,9 +891,40 @@ public final class WeaponAwakenRspOuterClass {
       }
       private int bitField0_;
 
+      private int targetWeaponAwakenLevel_ ;
+      /**
+       * <code>uint32 target_weapon_awaken_level = 1;</code>
+       * @return The targetWeaponAwakenLevel.
+       */
+      @java.lang.Override
+      public int getTargetWeaponAwakenLevel() {
+        return targetWeaponAwakenLevel_;
+      }
+      /**
+       * <code>uint32 target_weapon_awaken_level = 1;</code>
+       * @param value The targetWeaponAwakenLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetWeaponAwakenLevel(int value) {
+        
+        targetWeaponAwakenLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 target_weapon_awaken_level = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetWeaponAwakenLevel() {
+        
+        targetWeaponAwakenLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -911,7 +932,7 @@ public final class WeaponAwakenRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -922,7 +943,7 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 12;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -932,6 +953,68 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
 
+      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 long targetWeaponGuid_ ;
+      /**
+       * <code>uint64 target_weapon_guid = 9;</code>
+       * @return The targetWeaponGuid.
+       */
+      @java.lang.Override
+      public long getTargetWeaponGuid() {
+        return targetWeaponGuid_;
+      }
+      /**
+       * <code>uint64 target_weapon_guid = 9;</code>
+       * @param value The targetWeaponGuid to set.
+       * @return This builder for chaining.
+       */
+      public Builder setTargetWeaponGuid(long value) {
+        
+        targetWeaponGuid_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint64 target_weapon_guid = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearTargetWeaponGuid() {
+        
+        targetWeaponGuid_ = 0L;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.MapField<
           java.lang.Integer, java.lang.Integer> oldAffixLevelMap_;
       private com.google.protobuf.MapField<java.lang.Integer, java.lang.Integer>
@@ -959,7 +1042,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetOldAffixLevelMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
 
       @java.lang.Override
@@ -977,7 +1060,7 @@ public final class WeaponAwakenRspOuterClass {
         return getOldAffixLevelMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
       @java.lang.Override
 
@@ -985,7 +1068,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetOldAffixLevelMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
       @java.lang.Override
 
@@ -998,7 +1081,7 @@ public final class WeaponAwakenRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
       @java.lang.Override
 
@@ -1019,7 +1102,7 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
 
       public Builder removeOldAffixLevelMap(
@@ -1038,7 +1121,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetMutableOldAffixLevelMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
       public Builder putOldAffixLevelMap(
           int key,
@@ -1050,7 +1133,7 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 13;</code>
+       * <code>map&lt;uint32, uint32&gt; old_affix_level_map = 12;</code>
        */
 
       public Builder putAllOldAffixLevelMap(
@@ -1087,7 +1170,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetCurAffixLevelMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
 
       @java.lang.Override
@@ -1105,7 +1188,7 @@ public final class WeaponAwakenRspOuterClass {
         return getCurAffixLevelMapMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1113,7 +1196,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetCurAffixLevelMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1126,7 +1209,7 @@ public final class WeaponAwakenRspOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
       @java.lang.Override
 
@@ -1147,7 +1230,7 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
 
       public Builder removeCurAffixLevelMap(
@@ -1166,7 +1249,7 @@ public final class WeaponAwakenRspOuterClass {
         return internalGetMutableCurAffixLevelMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
       public Builder putCurAffixLevelMap(
           int key,
@@ -1178,7 +1261,7 @@ public final class WeaponAwakenRspOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 10;</code>
+       * <code>map&lt;uint32, uint32&gt; cur_affix_level_map = 15;</code>
        */
 
       public Builder putAllCurAffixLevelMap(
@@ -1187,99 +1270,6 @@ public final class WeaponAwakenRspOuterClass {
             .putAll(values);
         return this;
       }
-
-      private long targetWeaponGuid_ ;
-      /**
-       * <code>uint64 target_weapon_guid = 11;</code>
-       * @return The targetWeaponGuid.
-       */
-      @java.lang.Override
-      public long getTargetWeaponGuid() {
-        return targetWeaponGuid_;
-      }
-      /**
-       * <code>uint64 target_weapon_guid = 11;</code>
-       * @param value The targetWeaponGuid to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetWeaponGuid(long value) {
-        
-        targetWeaponGuid_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint64 target_weapon_guid = 11;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetWeaponGuid() {
-        
-        targetWeaponGuid_ = 0L;
-        onChanged();
-        return this;
-      }
-
-      private int targetWeaponAwakenLevel_ ;
-      /**
-       * <code>uint32 target_weapon_awaken_level = 1;</code>
-       * @return The targetWeaponAwakenLevel.
-       */
-      @java.lang.Override
-      public int getTargetWeaponAwakenLevel() {
-        return targetWeaponAwakenLevel_;
-      }
-      /**
-       * <code>uint32 target_weapon_awaken_level = 1;</code>
-       * @param value The targetWeaponAwakenLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setTargetWeaponAwakenLevel(int value) {
-        
-        targetWeaponAwakenLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 target_weapon_awaken_level = 1;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearTargetWeaponAwakenLevel() {
-        
-        targetWeaponAwakenLevel_ = 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;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1358,13 +1348,13 @@ public final class WeaponAwakenRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025WeaponAwakenRsp.proto\"\363\002\n\017WeaponAwaken" +
-      "Rsp\022\017\n\007retcode\030\014 \001(\005\022C\n\023old_affix_level_" +
-      "map\030\r \003(\0132&.WeaponAwakenRsp.OldAffixLeve" +
-      "lMapEntry\022C\n\023cur_affix_level_map\030\n \003(\0132&" +
-      ".WeaponAwakenRsp.CurAffixLevelMapEntry\022\032" +
-      "\n\022target_weapon_guid\030\013 \001(\004\022\"\n\032target_wea" +
-      "pon_awaken_level\030\001 \001(\r\022\023\n\013avatar_guid\030\t " +
-      "\001(\004\0327\n\025OldAffixLevelMapEntry\022\013\n\003key\030\001 \001(" +
+      "Rsp\022\"\n\032target_weapon_awaken_level\030\001 \001(\r\022" +
+      "\017\n\007retcode\030\005 \001(\005\022\023\n\013avatar_guid\030\006 \001(\004\022\032\n" +
+      "\022target_weapon_guid\030\t \001(\004\022C\n\023old_affix_l" +
+      "evel_map\030\014 \003(\0132&.WeaponAwakenRsp.OldAffi" +
+      "xLevelMapEntry\022C\n\023cur_affix_level_map\030\017 " +
+      "\003(\0132&.WeaponAwakenRsp.CurAffixLevelMapEn" +
+      "try\0327\n\025OldAffixLevelMapEntry\022\013\n\003key\030\001 \001(" +
       "\r\022\r\n\005value\030\002 \001(\r:\0028\001\0327\n\025CurAffixLevelMap" +
       "Entry\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"
@@ -1378,7 +1368,7 @@ public final class WeaponAwakenRspOuterClass {
     internal_static_WeaponAwakenRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponAwakenRsp_descriptor,
-        new java.lang.String[] { "Retcode", "OldAffixLevelMap", "CurAffixLevelMap", "TargetWeaponGuid", "TargetWeaponAwakenLevel", "AvatarGuid", });
+        new java.lang.String[] { "TargetWeaponAwakenLevel", "Retcode", "AvatarGuid", "TargetWeaponGuid", "OldAffixLevelMap", "CurAffixLevelMap", });
     internal_static_WeaponAwakenRsp_OldAffixLevelMapEntry_descriptor =
       internal_static_WeaponAwakenRsp_descriptor.getNestedTypes().get(0);
     internal_static_WeaponAwakenRsp_OldAffixLevelMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponOuterClass.java
index 76f7db8d1..34a6477e2 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponOuterClass.java
@@ -69,12 +69,14 @@ public final class WeaponOuterClass {
 
     int getAffixMapOrThrow(
         int key);
+
+    /**
+     * <code>bool HHLNNPOILDL = 5;</code>
+     * @return The hHLNNPOILDL.
+     */
+    boolean getHHLNNPOILDL();
   }
   /**
-   * <pre>
-   * Obf: NHOLFKPNLCH
-   * </pre>
-   *
    * Protobuf type {@code Weapon}
    */
   public static final class Weapon extends
@@ -148,6 +150,11 @@ public final class WeaponOuterClass {
                   affixMap__.getKey(), affixMap__.getValue());
               break;
             }
+            case 40: {
+
+              hHLNNPOILDL_ = input.readBool();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -306,6 +313,17 @@ public final class WeaponOuterClass {
       return map.get(key);
     }
 
+    public static final int HHLNNPOILDL_FIELD_NUMBER = 5;
+    private boolean hHLNNPOILDL_;
+    /**
+     * <code>bool HHLNNPOILDL = 5;</code>
+     * @return The hHLNNPOILDL.
+     */
+    @java.lang.Override
+    public boolean getHHLNNPOILDL() {
+      return hHLNNPOILDL_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -335,6 +353,9 @@ public final class WeaponOuterClass {
           internalGetAffixMap(),
           AffixMapDefaultEntryHolder.defaultEntry,
           4);
+      if (hHLNNPOILDL_ != false) {
+        output.writeBool(5, hHLNNPOILDL_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -366,6 +387,10 @@ public final class WeaponOuterClass {
         size += com.google.protobuf.CodedOutputStream
             .computeMessageSize(4, affixMap__);
       }
+      if (hHLNNPOILDL_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(5, hHLNNPOILDL_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -389,6 +414,8 @@ public final class WeaponOuterClass {
           != other.getPromoteLevel()) return false;
       if (!internalGetAffixMap().equals(
           other.internalGetAffixMap())) return false;
+      if (getHHLNNPOILDL()
+          != other.getHHLNNPOILDL()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -410,6 +437,9 @@ public final class WeaponOuterClass {
         hash = (37 * hash) + AFFIX_MAP_FIELD_NUMBER;
         hash = (53 * hash) + internalGetAffixMap().hashCode();
       }
+      hash = (37 * hash) + HHLNNPOILDL_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getHHLNNPOILDL());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -506,10 +536,6 @@ public final class WeaponOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: NHOLFKPNLCH
-     * </pre>
-     *
      * Protobuf type {@code Weapon}
      */
     public static final class Builder extends
@@ -576,6 +602,8 @@ public final class WeaponOuterClass {
         promoteLevel_ = 0;
 
         internalGetMutableAffixMap().clear();
+        hHLNNPOILDL_ = false;
+
         return this;
       }
 
@@ -608,6 +636,7 @@ public final class WeaponOuterClass {
         result.promoteLevel_ = promoteLevel_;
         result.affixMap_ = internalGetAffixMap();
         result.affixMap_.makeImmutable();
+        result.hHLNNPOILDL_ = hHLNNPOILDL_;
         onBuilt();
         return result;
       }
@@ -667,6 +696,9 @@ public final class WeaponOuterClass {
         }
         internalGetMutableAffixMap().mergeFrom(
             other.internalGetAffixMap());
+        if (other.getHHLNNPOILDL() != false) {
+          setHHLNNPOILDL(other.getHHLNNPOILDL());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -917,6 +949,37 @@ public final class WeaponOuterClass {
             .putAll(values);
         return this;
       }
+
+      private boolean hHLNNPOILDL_ ;
+      /**
+       * <code>bool HHLNNPOILDL = 5;</code>
+       * @return The hHLNNPOILDL.
+       */
+      @java.lang.Override
+      public boolean getHHLNNPOILDL() {
+        return hHLNNPOILDL_;
+      }
+      /**
+       * <code>bool HHLNNPOILDL = 5;</code>
+       * @param value The hHLNNPOILDL to set.
+       * @return This builder for chaining.
+       */
+      public Builder setHHLNNPOILDL(boolean value) {
+        
+        hHLNNPOILDL_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool HHLNNPOILDL = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearHHLNNPOILDL() {
+        
+        hHLNNPOILDL_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -989,12 +1052,12 @@ public final class WeaponOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\014Weapon.proto\"\226\001\n\006Weapon\022\r\n\005level\030\001 \001(\r" +
+      "\n\014Weapon.proto\"\253\001\n\006Weapon\022\r\n\005level\030\001 \001(\r" +
       "\022\013\n\003exp\030\002 \001(\r\022\025\n\rpromote_level\030\003 \001(\r\022(\n\t" +
-      "affix_map\030\004 \003(\0132\025.Weapon.AffixMapEntry\032/" +
-      "\n\rAffixMapEntry\022\013\n\003key\030\001 \001(\r\022\r\n\005value\030\002 " +
-      "\001(\r:\0028\001B\033\n\031emu.grasscutter.net.protob\006pr" +
-      "oto3"
+      "affix_map\030\004 \003(\0132\025.Weapon.AffixMapEntry\022\023" +
+      "\n\013HHLNNPOILDL\030\005 \001(\010\032/\n\rAffixMapEntry\022\013\n\003" +
+      "key\030\001 \001(\r\022\r\n\005value\030\002 \001(\r:\0028\001B\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
@@ -1005,7 +1068,7 @@ public final class WeaponOuterClass {
     internal_static_Weapon_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_Weapon_descriptor,
-        new java.lang.String[] { "Level", "Exp", "PromoteLevel", "AffixMap", });
+        new java.lang.String[] { "Level", "Exp", "PromoteLevel", "AffixMap", "HHLNNPOILDL", });
     internal_static_Weapon_AffixMapEntry_descriptor =
       internal_static_Weapon_descriptor.getNestedTypes().get(0);
     internal_static_Weapon_AffixMapEntry_fieldAccessorTable = new
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java
index 0e4adc299..78f665947 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteReqOuterClass.java
@@ -19,17 +19,12 @@ public final class WeaponPromoteReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 target_weapon_guid = 12;</code>
+     * <code>uint64 target_weapon_guid = 4;</code>
      * @return The targetWeaponGuid.
      */
     long getTargetWeaponGuid();
   }
   /**
-   * <pre>
-   * CmdId: 23298
-   * Obf: LDCKBPMEBGB
-   * </pre>
-   *
    * Protobuf type {@code WeaponPromoteReq}
    */
   public static final class WeaponPromoteReq extends
@@ -74,7 +69,7 @@ public final class WeaponPromoteReqOuterClass {
             case 0:
               done = true;
               break;
-            case 96: {
+            case 32: {
 
               targetWeaponGuid_ = input.readUInt64();
               break;
@@ -111,10 +106,10 @@ public final class WeaponPromoteReqOuterClass {
               emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq.class, emu.grasscutter.net.proto.WeaponPromoteReqOuterClass.WeaponPromoteReq.Builder.class);
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 12;
+    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 4;
     private long targetWeaponGuid_;
     /**
-     * <code>uint64 target_weapon_guid = 12;</code>
+     * <code>uint64 target_weapon_guid = 4;</code>
      * @return The targetWeaponGuid.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class WeaponPromoteReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(12, targetWeaponGuid_);
+        output.writeUInt64(4, targetWeaponGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class WeaponPromoteReqOuterClass {
       size = 0;
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(12, targetWeaponGuid_);
+          .computeUInt64Size(4, targetWeaponGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -279,11 +274,6 @@ public final class WeaponPromoteReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 23298
-     * Obf: LDCKBPMEBGB
-     * </pre>
-     *
      * Protobuf type {@code WeaponPromoteReq}
      */
     public static final class Builder extends
@@ -432,7 +422,7 @@ public final class WeaponPromoteReqOuterClass {
 
       private long targetWeaponGuid_ ;
       /**
-       * <code>uint64 target_weapon_guid = 12;</code>
+       * <code>uint64 target_weapon_guid = 4;</code>
        * @return The targetWeaponGuid.
        */
       @java.lang.Override
@@ -440,7 +430,7 @@ public final class WeaponPromoteReqOuterClass {
         return targetWeaponGuid_;
       }
       /**
-       * <code>uint64 target_weapon_guid = 12;</code>
+       * <code>uint64 target_weapon_guid = 4;</code>
        * @param value The targetWeaponGuid to set.
        * @return This builder for chaining.
        */
@@ -451,7 +441,7 @@ public final class WeaponPromoteReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_weapon_guid = 12;</code>
+       * <code>uint64 target_weapon_guid = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetWeaponGuid() {
@@ -528,7 +518,7 @@ public final class WeaponPromoteReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeaponPromoteReq.proto\".\n\020WeaponPromot" +
-      "eReq\022\032\n\022target_weapon_guid\030\014 \001(\004B\033\n\031emu." +
+      "eReq\022\032\n\022target_weapon_guid\030\004 \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/WeaponPromoteRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
index cbffa3642..bf60c98e0 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponPromoteRspOuterClass.java
@@ -19,35 +19,30 @@ public final class WeaponPromoteRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 cur_promote_level = 4;</code>
+     * <code>uint64 target_weapon_guid = 2;</code>
+     * @return The targetWeaponGuid.
+     */
+    long getTargetWeaponGuid();
+
+    /**
+     * <code>uint32 cur_promote_level = 5;</code>
      * @return The curPromoteLevel.
      */
     int getCurPromoteLevel();
 
     /**
-     * <code>uint32 old_promote_level = 14;</code>
-     * @return The oldPromoteLevel.
-     */
-    int getOldPromoteLevel();
-
-    /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 target_weapon_guid = 3;</code>
-     * @return The targetWeaponGuid.
+     * <code>uint32 old_promote_level = 15;</code>
+     * @return The oldPromoteLevel.
      */
-    long getTargetWeaponGuid();
+    int getOldPromoteLevel();
   }
   /**
-   * <pre>
-   * CmdId: 715
-   * Obf: DMDOBJKPENG
-   * </pre>
-   *
    * Protobuf type {@code WeaponPromoteRsp}
    */
   public static final class WeaponPromoteRsp extends
@@ -92,22 +87,22 @@ public final class WeaponPromoteRspOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 16: {
 
               targetWeaponGuid_ = input.readUInt64();
               break;
             }
-            case 32: {
+            case 40: {
 
               curPromoteLevel_ = input.readUInt32();
               break;
             }
-            case 48: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 112: {
+            case 120: {
 
               oldPromoteLevel_ = input.readUInt32();
               break;
@@ -144,10 +139,21 @@ public final class WeaponPromoteRspOuterClass {
               emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.class, emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.Builder.class);
     }
 
-    public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 4;
+    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 2;
+    private long targetWeaponGuid_;
+    /**
+     * <code>uint64 target_weapon_guid = 2;</code>
+     * @return The targetWeaponGuid.
+     */
+    @java.lang.Override
+    public long getTargetWeaponGuid() {
+      return targetWeaponGuid_;
+    }
+
+    public static final int CUR_PROMOTE_LEVEL_FIELD_NUMBER = 5;
     private int curPromoteLevel_;
     /**
-     * <code>uint32 cur_promote_level = 4;</code>
+     * <code>uint32 cur_promote_level = 5;</code>
      * @return The curPromoteLevel.
      */
     @java.lang.Override
@@ -155,21 +161,10 @@ public final class WeaponPromoteRspOuterClass {
       return curPromoteLevel_;
     }
 
-    public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 14;
-    private int oldPromoteLevel_;
-    /**
-     * <code>uint32 old_promote_level = 14;</code>
-     * @return The oldPromoteLevel.
-     */
-    @java.lang.Override
-    public int getOldPromoteLevel() {
-      return oldPromoteLevel_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 6;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 6;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -177,15 +172,15 @@ public final class WeaponPromoteRspOuterClass {
       return retcode_;
     }
 
-    public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 3;
-    private long targetWeaponGuid_;
+    public static final int OLD_PROMOTE_LEVEL_FIELD_NUMBER = 15;
+    private int oldPromoteLevel_;
     /**
-     * <code>uint64 target_weapon_guid = 3;</code>
-     * @return The targetWeaponGuid.
+     * <code>uint32 old_promote_level = 15;</code>
+     * @return The oldPromoteLevel.
      */
     @java.lang.Override
-    public long getTargetWeaponGuid() {
-      return targetWeaponGuid_;
+    public int getOldPromoteLevel() {
+      return oldPromoteLevel_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -203,16 +198,16 @@ public final class WeaponPromoteRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(3, targetWeaponGuid_);
+        output.writeUInt64(2, targetWeaponGuid_);
       }
       if (curPromoteLevel_ != 0) {
-        output.writeUInt32(4, curPromoteLevel_);
+        output.writeUInt32(5, curPromoteLevel_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(6, retcode_);
+        output.writeInt32(11, retcode_);
       }
       if (oldPromoteLevel_ != 0) {
-        output.writeUInt32(14, oldPromoteLevel_);
+        output.writeUInt32(15, oldPromoteLevel_);
       }
       unknownFields.writeTo(output);
     }
@@ -225,19 +220,19 @@ public final class WeaponPromoteRspOuterClass {
       size = 0;
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(3, targetWeaponGuid_);
+          .computeUInt64Size(2, targetWeaponGuid_);
       }
       if (curPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, curPromoteLevel_);
+          .computeUInt32Size(5, curPromoteLevel_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(6, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       if (oldPromoteLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(14, oldPromoteLevel_);
+          .computeUInt32Size(15, oldPromoteLevel_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -254,14 +249,14 @@ public final class WeaponPromoteRspOuterClass {
       }
       emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other = (emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp) obj;
 
-      if (getCurPromoteLevel()
-          != other.getCurPromoteLevel()) return false;
-      if (getOldPromoteLevel()
-          != other.getOldPromoteLevel()) return false;
-      if (getRetcode()
-          != other.getRetcode()) return false;
       if (getTargetWeaponGuid()
           != other.getTargetWeaponGuid()) return false;
+      if (getCurPromoteLevel()
+          != other.getCurPromoteLevel()) return false;
+      if (getRetcode()
+          != other.getRetcode()) return false;
+      if (getOldPromoteLevel()
+          != other.getOldPromoteLevel()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -273,15 +268,15 @@ public final class WeaponPromoteRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurPromoteLevel();
-      hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getOldPromoteLevel();
-      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
-      hash = (53 * hash) + getRetcode();
       hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
           getTargetWeaponGuid());
+      hash = (37 * hash) + CUR_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurPromoteLevel();
+      hash = (37 * hash) + RETCODE_FIELD_NUMBER;
+      hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + OLD_PROMOTE_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getOldPromoteLevel();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -378,11 +373,6 @@ public final class WeaponPromoteRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 715
-     * Obf: DMDOBJKPENG
-     * </pre>
-     *
      * Protobuf type {@code WeaponPromoteRsp}
      */
     public static final class Builder extends
@@ -420,13 +410,13 @@ public final class WeaponPromoteRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        curPromoteLevel_ = 0;
+        targetWeaponGuid_ = 0L;
 
-        oldPromoteLevel_ = 0;
+        curPromoteLevel_ = 0;
 
         retcode_ = 0;
 
-        targetWeaponGuid_ = 0L;
+        oldPromoteLevel_ = 0;
 
         return this;
       }
@@ -454,10 +444,10 @@ public final class WeaponPromoteRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp buildPartial() {
         emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp result = new emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp(this);
-        result.curPromoteLevel_ = curPromoteLevel_;
-        result.oldPromoteLevel_ = oldPromoteLevel_;
-        result.retcode_ = retcode_;
         result.targetWeaponGuid_ = targetWeaponGuid_;
+        result.curPromoteLevel_ = curPromoteLevel_;
+        result.retcode_ = retcode_;
+        result.oldPromoteLevel_ = oldPromoteLevel_;
         onBuilt();
         return result;
       }
@@ -506,17 +496,17 @@ public final class WeaponPromoteRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp other) {
         if (other == emu.grasscutter.net.proto.WeaponPromoteRspOuterClass.WeaponPromoteRsp.getDefaultInstance()) return this;
+        if (other.getTargetWeaponGuid() != 0L) {
+          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        }
         if (other.getCurPromoteLevel() != 0) {
           setCurPromoteLevel(other.getCurPromoteLevel());
         }
-        if (other.getOldPromoteLevel() != 0) {
-          setOldPromoteLevel(other.getOldPromoteLevel());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
-        if (other.getTargetWeaponGuid() != 0L) {
-          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        if (other.getOldPromoteLevel() != 0) {
+          setOldPromoteLevel(other.getOldPromoteLevel());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -547,102 +537,9 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
 
-      private int curPromoteLevel_ ;
-      /**
-       * <code>uint32 cur_promote_level = 4;</code>
-       * @return The curPromoteLevel.
-       */
-      @java.lang.Override
-      public int getCurPromoteLevel() {
-        return curPromoteLevel_;
-      }
-      /**
-       * <code>uint32 cur_promote_level = 4;</code>
-       * @param value The curPromoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurPromoteLevel(int value) {
-        
-        curPromoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_promote_level = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurPromoteLevel() {
-        
-        curPromoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int oldPromoteLevel_ ;
-      /**
-       * <code>uint32 old_promote_level = 14;</code>
-       * @return The oldPromoteLevel.
-       */
-      @java.lang.Override
-      public int getOldPromoteLevel() {
-        return oldPromoteLevel_;
-      }
-      /**
-       * <code>uint32 old_promote_level = 14;</code>
-       * @param value The oldPromoteLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldPromoteLevel(int value) {
-        
-        oldPromoteLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_promote_level = 14;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldPromoteLevel() {
-        
-        oldPromoteLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 6;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <code>int32 retcode = 6;</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 = 6;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
       private long targetWeaponGuid_ ;
       /**
-       * <code>uint64 target_weapon_guid = 3;</code>
+       * <code>uint64 target_weapon_guid = 2;</code>
        * @return The targetWeaponGuid.
        */
       @java.lang.Override
@@ -650,7 +547,7 @@ public final class WeaponPromoteRspOuterClass {
         return targetWeaponGuid_;
       }
       /**
-       * <code>uint64 target_weapon_guid = 3;</code>
+       * <code>uint64 target_weapon_guid = 2;</code>
        * @param value The targetWeaponGuid to set.
        * @return This builder for chaining.
        */
@@ -661,7 +558,7 @@ public final class WeaponPromoteRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 target_weapon_guid = 3;</code>
+       * <code>uint64 target_weapon_guid = 2;</code>
        * @return This builder for chaining.
        */
       public Builder clearTargetWeaponGuid() {
@@ -670,6 +567,99 @@ public final class WeaponPromoteRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int curPromoteLevel_ ;
+      /**
+       * <code>uint32 cur_promote_level = 5;</code>
+       * @return The curPromoteLevel.
+       */
+      @java.lang.Override
+      public int getCurPromoteLevel() {
+        return curPromoteLevel_;
+      }
+      /**
+       * <code>uint32 cur_promote_level = 5;</code>
+       * @param value The curPromoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurPromoteLevel(int value) {
+        
+        curPromoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_promote_level = 5;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurPromoteLevel() {
+        
+        curPromoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 11;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int oldPromoteLevel_ ;
+      /**
+       * <code>uint32 old_promote_level = 15;</code>
+       * @return The oldPromoteLevel.
+       */
+      @java.lang.Override
+      public int getOldPromoteLevel() {
+        return oldPromoteLevel_;
+      }
+      /**
+       * <code>uint32 old_promote_level = 15;</code>
+       * @param value The oldPromoteLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldPromoteLevel(int value) {
+        
+        oldPromoteLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_promote_level = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldPromoteLevel() {
+        
+        oldPromoteLevel_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -738,9 +728,9 @@ public final class WeaponPromoteRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeaponPromoteRsp.proto\"u\n\020WeaponPromot" +
-      "eRsp\022\031\n\021cur_promote_level\030\004 \001(\r\022\031\n\021old_p" +
-      "romote_level\030\016 \001(\r\022\017\n\007retcode\030\006 \001(\005\022\032\n\022t" +
-      "arget_weapon_guid\030\003 \001(\004B\033\n\031emu.grasscutt" +
+      "eRsp\022\032\n\022target_weapon_guid\030\002 \001(\004\022\031\n\021cur_" +
+      "promote_level\030\005 \001(\r\022\017\n\007retcode\030\013 \001(\005\022\031\n\021" +
+      "old_promote_level\030\017 \001(\rB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -752,7 +742,7 @@ public final class WeaponPromoteRspOuterClass {
     internal_static_WeaponPromoteRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponPromoteRsp_descriptor,
-        new java.lang.String[] { "CurPromoteLevel", "OldPromoteLevel", "Retcode", "TargetWeaponGuid", });
+        new java.lang.String[] { "TargetWeaponGuid", "CurPromoteLevel", "Retcode", "OldPromoteLevel", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java
index a3b8794db..0c80a18e4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeReqOuterClass.java
@@ -19,58 +19,53 @@ public final class WeaponUpgradeReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 target_weapon_guid = 14;</code>
-     * @return The targetWeaponGuid.
+     * <code>repeated .ItemParam item_param_list = 8;</code>
      */
-    long getTargetWeaponGuid();
+    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
+        getItemParamListList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    int getItemParamListCount();
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList();
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index);
 
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
      * @return A list containing the foodWeaponGuidList.
      */
     java.util.List<java.lang.Long> getFoodWeaponGuidListList();
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
      * @return The count of foodWeaponGuidList.
      */
     int getFoodWeaponGuidListCount();
     /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
      * @param index The index of the element to return.
      * @return The foodWeaponGuidList at the given index.
      */
     long getFoodWeaponGuidList(int index);
 
     /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
+     * <code>uint64 target_weapon_guid = 14;</code>
+     * @return The targetWeaponGuid.
      */
-    java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
-        getItemParamListList();
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    int getItemParamListCount();
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getItemParamListOrBuilderList();
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
-        int index);
+    long getTargetWeaponGuid();
   }
   /**
-   * <pre>
-   * CmdId: 9010
-   * Obf: NHOOFHINDJC
-   * </pre>
-   *
    * Protobuf type {@code WeaponUpgradeReq}
    */
   public static final class WeaponUpgradeReq extends
@@ -83,8 +78,8 @@ public final class WeaponUpgradeReqOuterClass {
       super(builder);
     }
     private WeaponUpgradeReq() {
-      foodWeaponGuidList_ = emptyLongList();
       itemParamList_ = java.util.Collections.emptyList();
+      foodWeaponGuidList_ = emptyLongList();
     }
 
     @java.lang.Override
@@ -118,31 +113,10 @@ public final class WeaponUpgradeReqOuterClass {
             case 0:
               done = true;
               break;
-            case 72: {
+            case 66: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                foodWeaponGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              foodWeaponGuidList_.addLong(input.readUInt64());
-              break;
-            }
-            case 74: {
-              int length = input.readRawVarint32();
-              int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
-                foodWeaponGuidList_ = newLongList();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              while (input.getBytesUntilLimit() > 0) {
-                foodWeaponGuidList_.addLong(input.readUInt64());
-              }
-              input.popLimit(limit);
-              break;
-            }
-            case 98: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               itemParamList_.add(
                   input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
@@ -153,6 +127,27 @@ public final class WeaponUpgradeReqOuterClass {
               targetWeaponGuid_ = input.readUInt64();
               break;
             }
+            case 120: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                foodWeaponGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              foodWeaponGuidList_.addLong(input.readUInt64());
+              break;
+            }
+            case 122: {
+              int length = input.readRawVarint32();
+              int limit = input.pushLimit(length);
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
+                foodWeaponGuidList_ = newLongList();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              while (input.getBytesUntilLimit() > 0) {
+                foodWeaponGuidList_.addLong(input.readUInt64());
+              }
+              input.popLimit(limit);
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -169,10 +164,10 @@ public final class WeaponUpgradeReqOuterClass {
             e).setUnfinishedMessage(this);
       } finally {
         if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          foodWeaponGuidList_.makeImmutable(); // C
+          itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
         }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
-          itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
+          foodWeaponGuidList_.makeImmutable(); // C
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -191,6 +186,74 @@ public final class WeaponUpgradeReqOuterClass {
               emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.class, emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.Builder.class);
     }
 
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getItemParamListCount() {
+      return itemParamList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+      return itemParamList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index) {
+      return itemParamList_.get(index);
+    }
+
+    public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 15;
+    private com.google.protobuf.Internal.LongList foodWeaponGuidList_;
+    /**
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+     * @return A list containing the foodWeaponGuidList.
+     */
+    @java.lang.Override
+    public java.util.List<java.lang.Long>
+        getFoodWeaponGuidListList() {
+      return foodWeaponGuidList_;
+    }
+    /**
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+     * @return The count of foodWeaponGuidList.
+     */
+    public int getFoodWeaponGuidListCount() {
+      return foodWeaponGuidList_.size();
+    }
+    /**
+     * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+     * @param index The index of the element to return.
+     * @return The foodWeaponGuidList at the given index.
+     */
+    public long getFoodWeaponGuidList(int index) {
+      return foodWeaponGuidList_.getLong(index);
+    }
+    private int foodWeaponGuidListMemoizedSerializedSize = -1;
+
     public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 14;
     private long targetWeaponGuid_;
     /**
@@ -202,74 +265,6 @@ public final class WeaponUpgradeReqOuterClass {
       return targetWeaponGuid_;
     }
 
-    public static final int FOOD_WEAPON_GUID_LIST_FIELD_NUMBER = 9;
-    private com.google.protobuf.Internal.LongList foodWeaponGuidList_;
-    /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-     * @return A list containing the foodWeaponGuidList.
-     */
-    @java.lang.Override
-    public java.util.List<java.lang.Long>
-        getFoodWeaponGuidListList() {
-      return foodWeaponGuidList_;
-    }
-    /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-     * @return The count of foodWeaponGuidList.
-     */
-    public int getFoodWeaponGuidListCount() {
-      return foodWeaponGuidList_.size();
-    }
-    /**
-     * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-     * @param index The index of the element to return.
-     * @return The foodWeaponGuidList at the given index.
-     */
-    public long getFoodWeaponGuidList(int index) {
-      return foodWeaponGuidList_.getLong(index);
-    }
-    private int foodWeaponGuidListMemoizedSerializedSize = -1;
-
-    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 12;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-      return itemParamList_;
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getItemParamListOrBuilderList() {
-      return itemParamList_;
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    @java.lang.Override
-    public int getItemParamListCount() {
-      return itemParamList_.size();
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
-      return itemParamList_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 12;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
-        int index) {
-      return itemParamList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -285,19 +280,19 @@ public final class WeaponUpgradeReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        output.writeMessage(8, itemParamList_.get(i));
+      }
+      if (targetWeaponGuid_ != 0L) {
+        output.writeUInt64(14, targetWeaponGuid_);
+      }
       if (getFoodWeaponGuidListList().size() > 0) {
-        output.writeUInt32NoTag(74);
+        output.writeUInt32NoTag(122);
         output.writeUInt32NoTag(foodWeaponGuidListMemoizedSerializedSize);
       }
       for (int i = 0; i < foodWeaponGuidList_.size(); i++) {
         output.writeUInt64NoTag(foodWeaponGuidList_.getLong(i));
       }
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        output.writeMessage(12, itemParamList_.get(i));
-      }
-      if (targetWeaponGuid_ != 0L) {
-        output.writeUInt64(14, targetWeaponGuid_);
-      }
       unknownFields.writeTo(output);
     }
 
@@ -307,6 +302,14 @@ public final class WeaponUpgradeReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, itemParamList_.get(i));
+      }
+      if (targetWeaponGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(14, targetWeaponGuid_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < foodWeaponGuidList_.size(); i++) {
@@ -321,14 +324,6 @@ public final class WeaponUpgradeReqOuterClass {
         }
         foodWeaponGuidListMemoizedSerializedSize = dataSize;
       }
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(12, itemParamList_.get(i));
-      }
-      if (targetWeaponGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(14, targetWeaponGuid_);
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -344,12 +339,12 @@ public final class WeaponUpgradeReqOuterClass {
       }
       emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq other = (emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq) obj;
 
-      if (getTargetWeaponGuid()
-          != other.getTargetWeaponGuid()) return false;
-      if (!getFoodWeaponGuidListList()
-          .equals(other.getFoodWeaponGuidListList())) return false;
       if (!getItemParamListList()
           .equals(other.getItemParamListList())) return false;
+      if (!getFoodWeaponGuidListList()
+          .equals(other.getFoodWeaponGuidListList())) return false;
+      if (getTargetWeaponGuid()
+          != other.getTargetWeaponGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -361,17 +356,17 @@ public final class WeaponUpgradeReqOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getTargetWeaponGuid());
-      if (getFoodWeaponGuidListCount() > 0) {
-        hash = (37 * hash) + FOOD_WEAPON_GUID_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getFoodWeaponGuidListList().hashCode();
-      }
       if (getItemParamListCount() > 0) {
         hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemParamListList().hashCode();
       }
+      if (getFoodWeaponGuidListCount() > 0) {
+        hash = (37 * hash) + FOOD_WEAPON_GUID_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getFoodWeaponGuidListList().hashCode();
+      }
+      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTargetWeaponGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -468,11 +463,6 @@ public final class WeaponUpgradeReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 9010
-     * Obf: NHOOFHINDJC
-     * </pre>
-     *
      * Protobuf type {@code WeaponUpgradeReq}
      */
     public static final class Builder extends
@@ -511,16 +501,16 @@ public final class WeaponUpgradeReqOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetWeaponGuid_ = 0L;
-
-        foodWeaponGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         if (itemParamListBuilder_ == null) {
           itemParamList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           itemParamListBuilder_.clear();
         }
+        foodWeaponGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        targetWeaponGuid_ = 0L;
+
         return this;
       }
 
@@ -548,21 +538,21 @@ public final class WeaponUpgradeReqOuterClass {
       public emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq buildPartial() {
         emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq result = new emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq(this);
         int from_bitField0_ = bitField0_;
-        result.targetWeaponGuid_ = targetWeaponGuid_;
-        if (((bitField0_ & 0x00000001) != 0)) {
-          foodWeaponGuidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        }
-        result.foodWeaponGuidList_ = foodWeaponGuidList_;
         if (itemParamListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             itemParamList_ = java.util.Collections.unmodifiableList(itemParamList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.itemParamList_ = itemParamList_;
         } else {
           result.itemParamList_ = itemParamListBuilder_.build();
         }
+        if (((bitField0_ & 0x00000002) != 0)) {
+          foodWeaponGuidList_.makeImmutable();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        }
+        result.foodWeaponGuidList_ = foodWeaponGuidList_;
+        result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
         return result;
       }
@@ -611,24 +601,11 @@ public final class WeaponUpgradeReqOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq other) {
         if (other == emu.grasscutter.net.proto.WeaponUpgradeReqOuterClass.WeaponUpgradeReq.getDefaultInstance()) return this;
-        if (other.getTargetWeaponGuid() != 0L) {
-          setTargetWeaponGuid(other.getTargetWeaponGuid());
-        }
-        if (!other.foodWeaponGuidList_.isEmpty()) {
-          if (foodWeaponGuidList_.isEmpty()) {
-            foodWeaponGuidList_ = other.foodWeaponGuidList_;
-            bitField0_ = (bitField0_ & ~0x00000001);
-          } else {
-            ensureFoodWeaponGuidListIsMutable();
-            foodWeaponGuidList_.addAll(other.foodWeaponGuidList_);
-          }
-          onChanged();
-        }
         if (itemParamListBuilder_ == null) {
           if (!other.itemParamList_.isEmpty()) {
             if (itemParamList_.isEmpty()) {
               itemParamList_ = other.itemParamList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensureItemParamListIsMutable();
               itemParamList_.addAll(other.itemParamList_);
@@ -641,7 +618,7 @@ public final class WeaponUpgradeReqOuterClass {
               itemParamListBuilder_.dispose();
               itemParamListBuilder_ = null;
               itemParamList_ = other.itemParamList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               itemParamListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getItemParamListFieldBuilder() : null;
@@ -650,6 +627,19 @@ public final class WeaponUpgradeReqOuterClass {
             }
           }
         }
+        if (!other.foodWeaponGuidList_.isEmpty()) {
+          if (foodWeaponGuidList_.isEmpty()) {
+            foodWeaponGuidList_ = other.foodWeaponGuidList_;
+            bitField0_ = (bitField0_ & ~0x00000002);
+          } else {
+            ensureFoodWeaponGuidListIsMutable();
+            foodWeaponGuidList_.addAll(other.foodWeaponGuidList_);
+          }
+          onChanged();
+        }
+        if (other.getTargetWeaponGuid() != 0L) {
+          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -680,6 +670,325 @@ public final class WeaponUpgradeReqOuterClass {
       }
       private int bitField0_;
 
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
+        java.util.Collections.emptyList();
+      private void ensureItemParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
+
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+        if (itemParamListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        } else {
+          return itemParamListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public int getItemParamListCount() {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.size();
+        } else {
+          return itemParamListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);
+        } else {
+          return itemParamListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder addItemParamList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder addAllItemParamList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, itemParamList_);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder clearItemParamList() {
+        if (itemParamListBuilder_ == null) {
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          itemParamListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public Builder removeItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.remove(index);
+          onChanged();
+        } else {
+          itemParamListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+          int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);  } else {
+          return itemParamListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getItemParamListOrBuilderList() {
+        if (itemParamListBuilder_ != null) {
+          return itemParamListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
+        return getItemParamListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getItemParamListBuilderList() {
+        return getItemParamListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getItemParamListFieldBuilder() {
+        if (itemParamListBuilder_ == null) {
+          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  itemParamList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          itemParamList_ = null;
+        }
+        return itemParamListBuilder_;
+      }
+
+      private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList();
+      private void ensureFoodWeaponGuidListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          foodWeaponGuidList_ = mutableCopy(foodWeaponGuidList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @return A list containing the foodWeaponGuidList.
+       */
+      public java.util.List<java.lang.Long>
+          getFoodWeaponGuidListList() {
+        return ((bitField0_ & 0x00000002) != 0) ?
+                 java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_;
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @return The count of foodWeaponGuidList.
+       */
+      public int getFoodWeaponGuidListCount() {
+        return foodWeaponGuidList_.size();
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @param index The index of the element to return.
+       * @return The foodWeaponGuidList at the given index.
+       */
+      public long getFoodWeaponGuidList(int index) {
+        return foodWeaponGuidList_.getLong(index);
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @param index The index to set the value at.
+       * @param value The foodWeaponGuidList to set.
+       * @return This builder for chaining.
+       */
+      public Builder setFoodWeaponGuidList(
+          int index, long value) {
+        ensureFoodWeaponGuidListIsMutable();
+        foodWeaponGuidList_.setLong(index, value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @param value The foodWeaponGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addFoodWeaponGuidList(long value) {
+        ensureFoodWeaponGuidListIsMutable();
+        foodWeaponGuidList_.addLong(value);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @param values The foodWeaponGuidList to add.
+       * @return This builder for chaining.
+       */
+      public Builder addAllFoodWeaponGuidList(
+          java.lang.Iterable<? extends java.lang.Long> values) {
+        ensureFoodWeaponGuidListIsMutable();
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, foodWeaponGuidList_);
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>repeated uint64 food_weapon_guid_list = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearFoodWeaponGuidList() {
+        foodWeaponGuidList_ = emptyLongList();
+        bitField0_ = (bitField0_ & ~0x00000002);
+        onChanged();
+        return this;
+      }
+
       private long targetWeaponGuid_ ;
       /**
        * <code>uint64 target_weapon_guid = 14;</code>
@@ -710,325 +1019,6 @@ public final class WeaponUpgradeReqOuterClass {
         onChanged();
         return this;
       }
-
-      private com.google.protobuf.Internal.LongList foodWeaponGuidList_ = emptyLongList();
-      private void ensureFoodWeaponGuidListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          foodWeaponGuidList_ = mutableCopy(foodWeaponGuidList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @return A list containing the foodWeaponGuidList.
-       */
-      public java.util.List<java.lang.Long>
-          getFoodWeaponGuidListList() {
-        return ((bitField0_ & 0x00000001) != 0) ?
-                 java.util.Collections.unmodifiableList(foodWeaponGuidList_) : foodWeaponGuidList_;
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @return The count of foodWeaponGuidList.
-       */
-      public int getFoodWeaponGuidListCount() {
-        return foodWeaponGuidList_.size();
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @param index The index of the element to return.
-       * @return The foodWeaponGuidList at the given index.
-       */
-      public long getFoodWeaponGuidList(int index) {
-        return foodWeaponGuidList_.getLong(index);
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @param index The index to set the value at.
-       * @param value The foodWeaponGuidList to set.
-       * @return This builder for chaining.
-       */
-      public Builder setFoodWeaponGuidList(
-          int index, long value) {
-        ensureFoodWeaponGuidListIsMutable();
-        foodWeaponGuidList_.setLong(index, value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @param value The foodWeaponGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addFoodWeaponGuidList(long value) {
-        ensureFoodWeaponGuidListIsMutable();
-        foodWeaponGuidList_.addLong(value);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @param values The foodWeaponGuidList to add.
-       * @return This builder for chaining.
-       */
-      public Builder addAllFoodWeaponGuidList(
-          java.lang.Iterable<? extends java.lang.Long> values) {
-        ensureFoodWeaponGuidListIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, foodWeaponGuidList_);
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>repeated uint64 food_weapon_guid_list = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearFoodWeaponGuidList() {
-        foodWeaponGuidList_ = emptyLongList();
-        bitField0_ = (bitField0_ & ~0x00000001);
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
-        java.util.Collections.emptyList();
-      private void ensureItemParamListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
-          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
-          bitField0_ |= 0x00000002;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
-
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-        if (itemParamListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(itemParamList_);
-        } else {
-          return itemParamListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public int getItemParamListCount() {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.size();
-        } else {
-          return itemParamListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.get(index);
-        } else {
-          return itemParamListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder setItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.set(index, value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder setItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.add(value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder addItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.add(index, value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder addItemParamList(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder addItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder addAllItemParamList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, itemParamList_);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder clearItemParamList() {
-        if (itemParamListBuilder_ == null) {
-          itemParamList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
-          onChanged();
-        } else {
-          itemParamListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public Builder removeItemParamList(int index) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.remove(index);
-          onChanged();
-        } else {
-          itemParamListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
-          int index) {
-        return getItemParamListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
-          int index) {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.get(index);  } else {
-          return itemParamListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-           getItemParamListOrBuilderList() {
-        if (itemParamListBuilder_ != null) {
-          return itemParamListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(itemParamList_);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
-        return getItemParamListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
-          int index) {
-        return getItemParamListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 12;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-           getItemParamListBuilderList() {
-        return getItemParamListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getItemParamListFieldBuilder() {
-        if (itemParamListBuilder_ == null) {
-          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  itemParamList_,
-                  ((bitField0_ & 0x00000002) != 0),
-                  getParentForChildren(),
-                  isClean());
-          itemParamList_ = null;
-        }
-        return itemParamListBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1097,9 +1087,9 @@ public final class WeaponUpgradeReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeaponUpgradeReq.proto\032\017ItemParam.prot" +
-      "o\"r\n\020WeaponUpgradeReq\022\032\n\022target_weapon_g" +
-      "uid\030\016 \001(\004\022\035\n\025food_weapon_guid_list\030\t \003(\004" +
-      "\022#\n\017item_param_list\030\014 \003(\0132\n.ItemParamB\033\n" +
+      "o\"r\n\020WeaponUpgradeReq\022#\n\017item_param_list" +
+      "\030\010 \003(\0132\n.ItemParam\022\035\n\025food_weapon_guid_l" +
+      "ist\030\017 \003(\004\022\032\n\022target_weapon_guid\030\016 \001(\004B\033\n" +
       "\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1112,7 +1102,7 @@ public final class WeaponUpgradeReqOuterClass {
     internal_static_WeaponUpgradeReq_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponUpgradeReq_descriptor,
-        new java.lang.String[] { "TargetWeaponGuid", "FoodWeaponGuidList", "ItemParamList", });
+        new java.lang.String[] { "ItemParamList", "FoodWeaponGuidList", "TargetWeaponGuid", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java
index 1aa1d1f9b..24ca2108d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeaponUpgradeRspOuterClass.java
@@ -19,59 +19,54 @@ public final class WeaponUpgradeRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 target_weapon_guid = 13;</code>
-     * @return The targetWeaponGuid.
-     */
-    long getTargetWeaponGuid();
-
-    /**
-     * <code>uint32 cur_level = 10;</code>
-     * @return The curLevel.
-     */
-    int getCurLevel();
-
-    /**
-     * <code>uint32 old_level = 7;</code>
+     * <code>uint32 old_level = 1;</code>
      * @return The oldLevel.
      */
     int getOldLevel();
 
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 3;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 11;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getItemParamListList();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 11;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index);
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 11;</code>
      */
     int getItemParamListCount();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 11;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getItemParamListOrBuilderList();
     /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
+     * <code>repeated .ItemParam item_param_list = 11;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 cur_level = 12;</code>
+     * @return The curLevel.
+     */
+    int getCurLevel();
+
+    /**
+     * <code>uint64 target_weapon_guid = 13;</code>
+     * @return The targetWeaponGuid.
+     */
+    long getTargetWeaponGuid();
   }
   /**
-   * <pre>
-   * CmdId: 7193
-   * Obf: DMJFFIJEDGI
-   * </pre>
-   *
    * Protobuf type {@code WeaponUpgradeRsp}
    */
   public static final class WeaponUpgradeRsp extends
@@ -118,17 +113,26 @@ public final class WeaponUpgradeRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 56: {
+            case 8: {
 
               oldLevel_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 24: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+                itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000001;
+              }
+              itemParamList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
+            case 96: {
 
               curLevel_ = input.readUInt32();
               break;
@@ -138,15 +142,6 @@ public final class WeaponUpgradeRspOuterClass {
               targetWeaponGuid_ = input.readUInt64();
               break;
             }
-            case 122: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              itemParamList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -182,6 +177,79 @@ public final class WeaponUpgradeRspOuterClass {
               emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.class, emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.Builder.class);
     }
 
+    public static final int OLD_LEVEL_FIELD_NUMBER = 1;
+    private int oldLevel_;
+    /**
+     * <code>uint32 old_level = 1;</code>
+     * @return The oldLevel.
+     */
+    @java.lang.Override
+    public int getOldLevel() {
+      return oldLevel_;
+    }
+
+    public static final int RETCODE_FIELD_NUMBER = 3;
+    private int retcode_;
+    /**
+     * <code>int32 retcode = 3;</code>
+     * @return The retcode.
+     */
+    @java.lang.Override
+    public int getRetcode() {
+      return retcode_;
+    }
+
+    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 11;
+    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
+    /**
+     * <code>repeated .ItemParam item_param_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+        getItemParamListOrBuilderList() {
+      return itemParamList_;
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 11;</code>
+     */
+    @java.lang.Override
+    public int getItemParamListCount() {
+      return itemParamList_.size();
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+      return itemParamList_.get(index);
+    }
+    /**
+     * <code>repeated .ItemParam item_param_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+        int index) {
+      return itemParamList_.get(index);
+    }
+
+    public static final int CUR_LEVEL_FIELD_NUMBER = 12;
+    private int curLevel_;
+    /**
+     * <code>uint32 cur_level = 12;</code>
+     * @return The curLevel.
+     */
+    @java.lang.Override
+    public int getCurLevel() {
+      return curLevel_;
+    }
+
     public static final int TARGET_WEAPON_GUID_FIELD_NUMBER = 13;
     private long targetWeaponGuid_;
     /**
@@ -193,79 +261,6 @@ public final class WeaponUpgradeRspOuterClass {
       return targetWeaponGuid_;
     }
 
-    public static final int CUR_LEVEL_FIELD_NUMBER = 10;
-    private int curLevel_;
-    /**
-     * <code>uint32 cur_level = 10;</code>
-     * @return The curLevel.
-     */
-    @java.lang.Override
-    public int getCurLevel() {
-      return curLevel_;
-    }
-
-    public static final int OLD_LEVEL_FIELD_NUMBER = 7;
-    private int oldLevel_;
-    /**
-     * <code>uint32 old_level = 7;</code>
-     * @return The oldLevel.
-     */
-    @java.lang.Override
-    public int getOldLevel() {
-      return oldLevel_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 4;
-    private int retcode_;
-    /**
-     * <code>int32 retcode = 4;</code>
-     * @return The retcode.
-     */
-    @java.lang.Override
-    public int getRetcode() {
-      return retcode_;
-    }
-
-    public static final int ITEM_PARAM_LIST_FIELD_NUMBER = 15;
-    private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_;
-    /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-      return itemParamList_;
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-        getItemParamListOrBuilderList() {
-      return itemParamList_;
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
-     */
-    @java.lang.Override
-    public int getItemParamListCount() {
-      return itemParamList_.size();
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
-      return itemParamList_.get(index);
-    }
-    /**
-     * <code>repeated .ItemParam item_param_list = 15;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
-        int index) {
-      return itemParamList_.get(index);
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -280,21 +275,21 @@ public final class WeaponUpgradeRspOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
-      }
       if (oldLevel_ != 0) {
-        output.writeUInt32(7, oldLevel_);
+        output.writeUInt32(1, oldLevel_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(3, retcode_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        output.writeMessage(11, itemParamList_.get(i));
       }
       if (curLevel_ != 0) {
-        output.writeUInt32(10, curLevel_);
+        output.writeUInt32(12, curLevel_);
       }
       if (targetWeaponGuid_ != 0L) {
         output.writeUInt64(13, targetWeaponGuid_);
       }
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        output.writeMessage(15, itemParamList_.get(i));
-      }
       unknownFields.writeTo(output);
     }
 
@@ -304,26 +299,26 @@ public final class WeaponUpgradeRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
-      }
       if (oldLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, oldLevel_);
+          .computeUInt32Size(1, oldLevel_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(3, retcode_);
+      }
+      for (int i = 0; i < itemParamList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(11, itemParamList_.get(i));
       }
       if (curLevel_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, curLevel_);
+          .computeUInt32Size(12, curLevel_);
       }
       if (targetWeaponGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt64Size(13, targetWeaponGuid_);
       }
-      for (int i = 0; i < itemParamList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, itemParamList_.get(i));
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -339,16 +334,16 @@ public final class WeaponUpgradeRspOuterClass {
       }
       emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp other = (emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp) obj;
 
-      if (getTargetWeaponGuid()
-          != other.getTargetWeaponGuid()) return false;
-      if (getCurLevel()
-          != other.getCurLevel()) return false;
       if (getOldLevel()
           != other.getOldLevel()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!getItemParamListList()
           .equals(other.getItemParamListList())) return false;
+      if (getCurLevel()
+          != other.getCurLevel()) return false;
+      if (getTargetWeaponGuid()
+          != other.getTargetWeaponGuid()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -360,11 +355,6 @@ public final class WeaponUpgradeRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
-          getTargetWeaponGuid());
-      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
-      hash = (53 * hash) + getCurLevel();
       hash = (37 * hash) + OLD_LEVEL_FIELD_NUMBER;
       hash = (53 * hash) + getOldLevel();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
@@ -373,6 +363,11 @@ public final class WeaponUpgradeRspOuterClass {
         hash = (37 * hash) + ITEM_PARAM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemParamListList().hashCode();
       }
+      hash = (37 * hash) + CUR_LEVEL_FIELD_NUMBER;
+      hash = (53 * hash) + getCurLevel();
+      hash = (37 * hash) + TARGET_WEAPON_GUID_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+          getTargetWeaponGuid());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -469,11 +464,6 @@ public final class WeaponUpgradeRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7193
-     * Obf: DMJFFIJEDGI
-     * </pre>
-     *
      * Protobuf type {@code WeaponUpgradeRsp}
      */
     public static final class Builder extends
@@ -512,10 +502,6 @@ public final class WeaponUpgradeRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        targetWeaponGuid_ = 0L;
-
-        curLevel_ = 0;
-
         oldLevel_ = 0;
 
         retcode_ = 0;
@@ -526,6 +512,10 @@ public final class WeaponUpgradeRspOuterClass {
         } else {
           itemParamListBuilder_.clear();
         }
+        curLevel_ = 0;
+
+        targetWeaponGuid_ = 0L;
+
         return this;
       }
 
@@ -553,8 +543,6 @@ public final class WeaponUpgradeRspOuterClass {
       public emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp buildPartial() {
         emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp result = new emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp(this);
         int from_bitField0_ = bitField0_;
-        result.targetWeaponGuid_ = targetWeaponGuid_;
-        result.curLevel_ = curLevel_;
         result.oldLevel_ = oldLevel_;
         result.retcode_ = retcode_;
         if (itemParamListBuilder_ == null) {
@@ -566,6 +554,8 @@ public final class WeaponUpgradeRspOuterClass {
         } else {
           result.itemParamList_ = itemParamListBuilder_.build();
         }
+        result.curLevel_ = curLevel_;
+        result.targetWeaponGuid_ = targetWeaponGuid_;
         onBuilt();
         return result;
       }
@@ -614,12 +604,6 @@ public final class WeaponUpgradeRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp other) {
         if (other == emu.grasscutter.net.proto.WeaponUpgradeRspOuterClass.WeaponUpgradeRsp.getDefaultInstance()) return this;
-        if (other.getTargetWeaponGuid() != 0L) {
-          setTargetWeaponGuid(other.getTargetWeaponGuid());
-        }
-        if (other.getCurLevel() != 0) {
-          setCurLevel(other.getCurLevel());
-        }
         if (other.getOldLevel() != 0) {
           setOldLevel(other.getOldLevel());
         }
@@ -652,6 +636,12 @@ public final class WeaponUpgradeRspOuterClass {
             }
           }
         }
+        if (other.getCurLevel() != 0) {
+          setCurLevel(other.getCurLevel());
+        }
+        if (other.getTargetWeaponGuid() != 0L) {
+          setTargetWeaponGuid(other.getTargetWeaponGuid());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -682,6 +672,339 @@ public final class WeaponUpgradeRspOuterClass {
       }
       private int bitField0_;
 
+      private int oldLevel_ ;
+      /**
+       * <code>uint32 old_level = 1;</code>
+       * @return The oldLevel.
+       */
+      @java.lang.Override
+      public int getOldLevel() {
+        return oldLevel_;
+      }
+      /**
+       * <code>uint32 old_level = 1;</code>
+       * @param value The oldLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOldLevel(int value) {
+        
+        oldLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 old_level = 1;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOldLevel() {
+        
+        oldLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int retcode_ ;
+      /**
+       * <code>int32 retcode = 3;</code>
+       * @return The retcode.
+       */
+      @java.lang.Override
+      public int getRetcode() {
+        return retcode_;
+      }
+      /**
+       * <code>int32 retcode = 3;</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 = 3;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRetcode() {
+        
+        retcode_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
+        java.util.Collections.emptyList();
+      private void ensureItemParamListIsMutable() {
+        if (!((bitField0_ & 0x00000001) != 0)) {
+          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
+          bitField0_ |= 0x00000001;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
+
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
+        if (itemParamListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        } else {
+          return itemParamListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public int getItemParamListCount() {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.size();
+        } else {
+          return itemParamListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);
+        } else {
+          return itemParamListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder setItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
+        if (itemParamListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, value);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder addItemParamList(
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder addItemParamList(
+          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          itemParamListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder addAllItemParamList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, itemParamList_);
+          onChanged();
+        } else {
+          itemParamListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder clearItemParamList() {
+        if (itemParamListBuilder_ == null) {
+          itemParamList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000001);
+          onChanged();
+        } else {
+          itemParamListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public Builder removeItemParamList(int index) {
+        if (itemParamListBuilder_ == null) {
+          ensureItemParamListIsMutable();
+          itemParamList_.remove(index);
+          onChanged();
+        } else {
+          itemParamListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
+          int index) {
+        if (itemParamListBuilder_ == null) {
+          return itemParamList_.get(index);  } else {
+          return itemParamListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+           getItemParamListOrBuilderList() {
+        if (itemParamListBuilder_ != null) {
+          return itemParamListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(itemParamList_);
+        }
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
+        return getItemParamListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
+          int index) {
+        return getItemParamListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .ItemParam item_param_list = 11;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
+           getItemParamListBuilderList() {
+        return getItemParamListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
+          getItemParamListFieldBuilder() {
+        if (itemParamListBuilder_ == null) {
+          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
+                  itemParamList_,
+                  ((bitField0_ & 0x00000001) != 0),
+                  getParentForChildren(),
+                  isClean());
+          itemParamList_ = null;
+        }
+        return itemParamListBuilder_;
+      }
+
+      private int curLevel_ ;
+      /**
+       * <code>uint32 cur_level = 12;</code>
+       * @return The curLevel.
+       */
+      @java.lang.Override
+      public int getCurLevel() {
+        return curLevel_;
+      }
+      /**
+       * <code>uint32 cur_level = 12;</code>
+       * @param value The curLevel to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCurLevel(int value) {
+        
+        curLevel_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 cur_level = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCurLevel() {
+        
+        curLevel_ = 0;
+        onChanged();
+        return this;
+      }
+
       private long targetWeaponGuid_ ;
       /**
        * <code>uint64 target_weapon_guid = 13;</code>
@@ -712,339 +1035,6 @@ public final class WeaponUpgradeRspOuterClass {
         onChanged();
         return this;
       }
-
-      private int curLevel_ ;
-      /**
-       * <code>uint32 cur_level = 10;</code>
-       * @return The curLevel.
-       */
-      @java.lang.Override
-      public int getCurLevel() {
-        return curLevel_;
-      }
-      /**
-       * <code>uint32 cur_level = 10;</code>
-       * @param value The curLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCurLevel(int value) {
-        
-        curLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 cur_level = 10;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCurLevel() {
-        
-        curLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int oldLevel_ ;
-      /**
-       * <code>uint32 old_level = 7;</code>
-       * @return The oldLevel.
-       */
-      @java.lang.Override
-      public int getOldLevel() {
-        return oldLevel_;
-      }
-      /**
-       * <code>uint32 old_level = 7;</code>
-       * @param value The oldLevel to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOldLevel(int value) {
-        
-        oldLevel_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 old_level = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOldLevel() {
-        
-        oldLevel_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int retcode_ ;
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return The retcode.
-       */
-      @java.lang.Override
-      public int getRetcode() {
-        return retcode_;
-      }
-      /**
-       * <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;
-      }
-      /**
-       * <code>int32 retcode = 4;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRetcode() {
-        
-        retcode_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemParamList_ =
-        java.util.Collections.emptyList();
-      private void ensureItemParamListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          itemParamList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>(itemParamList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemParamListBuilder_;
-
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemParamListList() {
-        if (itemParamListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(itemParamList_);
-        } else {
-          return itemParamListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public int getItemParamListCount() {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.size();
-        } else {
-          return itemParamListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemParamList(int index) {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.get(index);
-        } else {
-          return itemParamListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder setItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.set(index, value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder setItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder addItemParamList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.add(value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder addItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
-        if (itemParamListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensureItemParamListIsMutable();
-          itemParamList_.add(index, value);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder addItemParamList(
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder addItemParamList(
-          int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          itemParamListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder addAllItemParamList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, itemParamList_);
-          onChanged();
-        } else {
-          itemParamListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder clearItemParamList() {
-        if (itemParamListBuilder_ == null) {
-          itemParamList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          itemParamListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public Builder removeItemParamList(int index) {
-        if (itemParamListBuilder_ == null) {
-          ensureItemParamListIsMutable();
-          itemParamList_.remove(index);
-          onChanged();
-        } else {
-          itemParamListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemParamListBuilder(
-          int index) {
-        return getItemParamListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemParamListOrBuilder(
-          int index) {
-        if (itemParamListBuilder_ == null) {
-          return itemParamList_.get(index);  } else {
-          return itemParamListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-           getItemParamListOrBuilderList() {
-        if (itemParamListBuilder_ != null) {
-          return itemParamListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(itemParamList_);
-        }
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder() {
-        return getItemParamListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemParamListBuilder(
-          int index) {
-        return getItemParamListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .ItemParam item_param_list = 15;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
-           getItemParamListBuilderList() {
-        return getItemParamListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
-          getItemParamListFieldBuilder() {
-        if (itemParamListBuilder_ == null) {
-          itemParamListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder>(
-                  itemParamList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          itemParamList_ = null;
-        }
-        return itemParamListBuilder_;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1113,10 +1103,10 @@ public final class WeaponUpgradeRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeaponUpgradeRsp.proto\032\017ItemParam.prot" +
-      "o\"\212\001\n\020WeaponUpgradeRsp\022\032\n\022target_weapon_" +
-      "guid\030\r \001(\004\022\021\n\tcur_level\030\n \001(\r\022\021\n\told_lev" +
-      "el\030\007 \001(\r\022\017\n\007retcode\030\004 \001(\005\022#\n\017item_param_" +
-      "list\030\017 \003(\0132\n.ItemParamB\033\n\031emu.grasscutte" +
+      "o\"\212\001\n\020WeaponUpgradeRsp\022\021\n\told_level\030\001 \001(" +
+      "\r\022\017\n\007retcode\030\003 \001(\005\022#\n\017item_param_list\030\013 " +
+      "\003(\0132\n.ItemParam\022\021\n\tcur_level\030\014 \001(\r\022\032\n\022ta" +
+      "rget_weapon_guid\030\r \001(\004B\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1129,7 +1119,7 @@ public final class WeaponUpgradeRspOuterClass {
     internal_static_WeaponUpgradeRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WeaponUpgradeRsp_descriptor,
-        new java.lang.String[] { "TargetWeaponGuid", "CurLevel", "OldLevel", "Retcode", "ItemParamList", });
+        new java.lang.String[] { "OldLevel", "Retcode", "ItemParamList", "CurLevel", "TargetWeaponGuid", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }
 
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 8471d9329..659a8a37d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipReqOuterClass.java
@@ -19,23 +19,18 @@ public final class WearEquipReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 equip_guid = 11;</code>
+     * <code>uint64 equip_guid = 10;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
 
     /**
-     * <code>uint64 avatar_guid = 13;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
   }
   /**
-   * <pre>
-   * CmdId: 7563
-   * Obf: HMKJLBFDOJP
-   * </pre>
-   *
    * Protobuf type {@code WearEquipReq}
    */
   public static final class WearEquipReq extends
@@ -80,16 +75,16 @@ public final class WearEquipReqOuterClass {
             case 0:
               done = true;
               break;
-            case 88: {
-
-              equipGuid_ = input.readUInt64();
-              break;
-            }
-            case 104: {
+            case 48: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
+            case 80: {
+
+              equipGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -122,10 +117,10 @@ public final class WearEquipReqOuterClass {
               emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq.class, emu.grasscutter.net.proto.WearEquipReqOuterClass.WearEquipReq.Builder.class);
     }
 
-    public static final int EQUIP_GUID_FIELD_NUMBER = 11;
+    public static final int EQUIP_GUID_FIELD_NUMBER = 10;
     private long equipGuid_;
     /**
-     * <code>uint64 equip_guid = 11;</code>
+     * <code>uint64 equip_guid = 10;</code>
      * @return The equipGuid.
      */
     @java.lang.Override
@@ -133,10 +128,10 @@ public final class WearEquipReqOuterClass {
       return equipGuid_;
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 13;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 6;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 13;</code>
+     * <code>uint64 avatar_guid = 6;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -158,11 +153,11 @@ public final class WearEquipReqOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (equipGuid_ != 0L) {
-        output.writeUInt64(11, equipGuid_);
-      }
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(13, avatarGuid_);
+        output.writeUInt64(6, avatarGuid_);
+      }
+      if (equipGuid_ != 0L) {
+        output.writeUInt64(10, equipGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -173,13 +168,13 @@ public final class WearEquipReqOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (equipGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(11, equipGuid_);
-      }
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(13, avatarGuid_);
+          .computeUInt64Size(6, avatarGuid_);
+      }
+      if (equipGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(10, equipGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -313,11 +308,6 @@ public final class WearEquipReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7563
-     * Obf: HMKJLBFDOJP
-     * </pre>
-     *
      * Protobuf type {@code WearEquipReq}
      */
     public static final class Builder extends
@@ -472,7 +462,7 @@ public final class WearEquipReqOuterClass {
 
       private long equipGuid_ ;
       /**
-       * <code>uint64 equip_guid = 11;</code>
+       * <code>uint64 equip_guid = 10;</code>
        * @return The equipGuid.
        */
       @java.lang.Override
@@ -480,7 +470,7 @@ public final class WearEquipReqOuterClass {
         return equipGuid_;
       }
       /**
-       * <code>uint64 equip_guid = 11;</code>
+       * <code>uint64 equip_guid = 10;</code>
        * @param value The equipGuid to set.
        * @return This builder for chaining.
        */
@@ -491,7 +481,7 @@ public final class WearEquipReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 equip_guid = 11;</code>
+       * <code>uint64 equip_guid = 10;</code>
        * @return This builder for chaining.
        */
       public Builder clearEquipGuid() {
@@ -503,7 +493,7 @@ public final class WearEquipReqOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 13;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -511,7 +501,7 @@ public final class WearEquipReqOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 13;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -522,7 +512,7 @@ public final class WearEquipReqOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 13;</code>
+       * <code>uint64 avatar_guid = 6;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -599,7 +589,7 @@ public final class WearEquipReqOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022WearEquipReq.proto\"7\n\014WearEquipReq\022\022\n\n" +
-      "equip_guid\030\013 \001(\004\022\023\n\013avatar_guid\030\r \001(\004B\033\n" +
+      "equip_guid\030\n \001(\004\022\023\n\013avatar_guid\030\006 \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 4c7f41199..af2fc0e5d 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WearEquipRspOuterClass.java
@@ -19,29 +19,24 @@ public final class WearEquipRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     long getAvatarGuid();
 
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>uint64 equip_guid = 5;</code>
+     * <code>uint64 equip_guid = 13;</code>
      * @return The equipGuid.
      */
     long getEquipGuid();
   }
   /**
-   * <pre>
-   * CmdId: 22727
-   * Obf: KHELHHLFJBO
-   * </pre>
-   *
    * Protobuf type {@code WearEquipRsp}
    */
   public static final class WearEquipRsp extends
@@ -86,21 +81,21 @@ public final class WearEquipRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 8: {
 
               avatarGuid_ = input.readUInt64();
               break;
             }
-            case 40: {
-
-              equipGuid_ = input.readUInt64();
-              break;
-            }
-            case 56: {
+            case 72: {
 
               retcode_ = input.readInt32();
               break;
             }
+            case 104: {
+
+              equipGuid_ = input.readUInt64();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -133,10 +128,10 @@ public final class WearEquipRspOuterClass {
               emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.class, emu.grasscutter.net.proto.WearEquipRspOuterClass.WearEquipRsp.Builder.class);
     }
 
-    public static final int AVATAR_GUID_FIELD_NUMBER = 4;
+    public static final int AVATAR_GUID_FIELD_NUMBER = 1;
     private long avatarGuid_;
     /**
-     * <code>uint64 avatar_guid = 4;</code>
+     * <code>uint64 avatar_guid = 1;</code>
      * @return The avatarGuid.
      */
     @java.lang.Override
@@ -144,10 +139,10 @@ public final class WearEquipRspOuterClass {
       return avatarGuid_;
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 7;
+    public static final int RETCODE_FIELD_NUMBER = 9;
     private int retcode_;
     /**
-     * <code>int32 retcode = 7;</code>
+     * <code>int32 retcode = 9;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -155,10 +150,10 @@ public final class WearEquipRspOuterClass {
       return retcode_;
     }
 
-    public static final int EQUIP_GUID_FIELD_NUMBER = 5;
+    public static final int EQUIP_GUID_FIELD_NUMBER = 13;
     private long equipGuid_;
     /**
-     * <code>uint64 equip_guid = 5;</code>
+     * <code>uint64 equip_guid = 13;</code>
      * @return The equipGuid.
      */
     @java.lang.Override
@@ -181,13 +176,13 @@ public final class WearEquipRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (avatarGuid_ != 0L) {
-        output.writeUInt64(4, avatarGuid_);
-      }
-      if (equipGuid_ != 0L) {
-        output.writeUInt64(5, equipGuid_);
+        output.writeUInt64(1, avatarGuid_);
       }
       if (retcode_ != 0) {
-        output.writeInt32(7, retcode_);
+        output.writeInt32(9, retcode_);
+      }
+      if (equipGuid_ != 0L) {
+        output.writeUInt64(13, equipGuid_);
       }
       unknownFields.writeTo(output);
     }
@@ -200,15 +195,15 @@ public final class WearEquipRspOuterClass {
       size = 0;
       if (avatarGuid_ != 0L) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(4, avatarGuid_);
-      }
-      if (equipGuid_ != 0L) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt64Size(5, equipGuid_);
+          .computeUInt64Size(1, avatarGuid_);
       }
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(7, retcode_);
+          .computeInt32Size(9, retcode_);
+      }
+      if (equipGuid_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt64Size(13, equipGuid_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,11 +341,6 @@ public final class WearEquipRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 22727
-     * Obf: KHELHHLFJBO
-     * </pre>
-     *
      * Protobuf type {@code WearEquipRsp}
      */
     public static final class Builder extends
@@ -511,7 +501,7 @@ public final class WearEquipRspOuterClass {
 
       private long avatarGuid_ ;
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @return The avatarGuid.
        */
       @java.lang.Override
@@ -519,7 +509,7 @@ public final class WearEquipRspOuterClass {
         return avatarGuid_;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @param value The avatarGuid to set.
        * @return This builder for chaining.
        */
@@ -530,7 +520,7 @@ public final class WearEquipRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 avatar_guid = 4;</code>
+       * <code>uint64 avatar_guid = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearAvatarGuid() {
@@ -542,7 +532,7 @@ public final class WearEquipRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 9;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -550,7 +540,7 @@ public final class WearEquipRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 9;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -561,7 +551,7 @@ public final class WearEquipRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 7;</code>
+       * <code>int32 retcode = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -573,7 +563,7 @@ public final class WearEquipRspOuterClass {
 
       private long equipGuid_ ;
       /**
-       * <code>uint64 equip_guid = 5;</code>
+       * <code>uint64 equip_guid = 13;</code>
        * @return The equipGuid.
        */
       @java.lang.Override
@@ -581,7 +571,7 @@ public final class WearEquipRspOuterClass {
         return equipGuid_;
       }
       /**
-       * <code>uint64 equip_guid = 5;</code>
+       * <code>uint64 equip_guid = 13;</code>
        * @param value The equipGuid to set.
        * @return This builder for chaining.
        */
@@ -592,7 +582,7 @@ public final class WearEquipRspOuterClass {
         return this;
       }
       /**
-       * <code>uint64 equip_guid = 5;</code>
+       * <code>uint64 equip_guid = 13;</code>
        * @return This builder for chaining.
        */
       public Builder clearEquipGuid() {
@@ -669,8 +659,8 @@ public final class WearEquipRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\022WearEquipRsp.proto\"H\n\014WearEquipRsp\022\023\n\013" +
-      "avatar_guid\030\004 \001(\004\022\017\n\007retcode\030\007 \001(\005\022\022\n\neq" +
-      "uip_guid\030\005 \001(\004B\033\n\031emu.grasscutter.net.pr" +
+      "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" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeatherInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeatherInfoOuterClass.java
index 5565f0398..91d94b37a 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeatherInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeatherInfoOuterClass.java
@@ -26,7 +26,7 @@ public final class WeatherInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: OGJENPCDJEN
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code WeatherInfo}
@@ -278,7 +278,7 @@ public final class WeatherInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: OGJENPCDJEN
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code WeatherInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeekendDjinnInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeekendDjinnInfoOuterClass.java
index 4725e3bec..38bca44b3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeekendDjinnInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeekendDjinnInfoOuterClass.java
@@ -19,40 +19,36 @@ public final class WeekendDjinnInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
 
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      * @return Whether the rot field is set.
      */
     boolean hasRot();
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      * @return The rot.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getRot();
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: PDPLPNHEJPH
-   * </pre>
-   *
    * Protobuf type {@code WeekendDjinnInfo}
    */
   public static final class WeekendDjinnInfo extends
@@ -97,20 +93,7 @@ public final class WeekendDjinnInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
-              if (rot_ != null) {
-                subBuilder = rot_.toBuilder();
-              }
-              rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
-              if (subBuilder != null) {
-                subBuilder.mergeFrom(rot_);
-                rot_ = subBuilder.buildPartial();
-              }
-
-              break;
-            }
-            case 34: {
+            case 90: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -123,6 +106,19 @@ public final class WeekendDjinnInfoOuterClass {
 
               break;
             }
+            case 114: {
+              emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
+              if (rot_ != null) {
+                subBuilder = rot_.toBuilder();
+              }
+              rot_ = input.readMessage(emu.grasscutter.net.proto.VectorOuterClass.Vector.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(rot_);
+                rot_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -155,10 +151,10 @@ public final class WeekendDjinnInfoOuterClass {
               emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.class, emu.grasscutter.net.proto.WeekendDjinnInfoOuterClass.WeekendDjinnInfo.Builder.class);
     }
 
-    public static final int POS_FIELD_NUMBER = 4;
+    public static final int POS_FIELD_NUMBER = 11;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -166,7 +162,7 @@ public final class WeekendDjinnInfoOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -174,17 +170,17 @@ public final class WeekendDjinnInfoOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 4;</code>
+     * <code>.Vector pos = 11;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
       return getPos();
     }
 
-    public static final int ROT_FIELD_NUMBER = 1;
+    public static final int ROT_FIELD_NUMBER = 14;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector rot_;
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      * @return Whether the rot field is set.
      */
     @java.lang.Override
@@ -192,7 +188,7 @@ public final class WeekendDjinnInfoOuterClass {
       return rot_ != null;
     }
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      * @return The rot.
      */
     @java.lang.Override
@@ -200,7 +196,7 @@ public final class WeekendDjinnInfoOuterClass {
       return rot_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : rot_;
     }
     /**
-     * <code>.Vector rot = 1;</code>
+     * <code>.Vector rot = 14;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
@@ -221,11 +217,11 @@ public final class WeekendDjinnInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (rot_ != null) {
-        output.writeMessage(1, getRot());
-      }
       if (pos_ != null) {
-        output.writeMessage(4, getPos());
+        output.writeMessage(11, getPos());
+      }
+      if (rot_ != null) {
+        output.writeMessage(14, getRot());
       }
       unknownFields.writeTo(output);
     }
@@ -236,13 +232,13 @@ public final class WeekendDjinnInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (rot_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, getRot());
-      }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(4, getPos());
+          .computeMessageSize(11, getPos());
+      }
+      if (rot_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(14, getRot());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -384,10 +380,6 @@ public final class WeekendDjinnInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: PDPLPNHEJPH
-     * </pre>
-     *
      * Protobuf type {@code WeekendDjinnInfo}
      */
     public static final class Builder extends
@@ -560,14 +552,14 @@ public final class WeekendDjinnInfoOuterClass {
       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 = 4;</code>
+       * <code>.Vector pos = 11;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -578,7 +570,7 @@ public final class WeekendDjinnInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -594,7 +586,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -608,7 +600,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -626,7 +618,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -640,7 +632,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -648,7 +640,7 @@ public final class WeekendDjinnInfoOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -659,7 +651,7 @@ public final class WeekendDjinnInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 4;</code>
+       * <code>.Vector pos = 11;</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> 
@@ -679,14 +671,14 @@ public final class WeekendDjinnInfoOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.VectorOuterClass.Vector, emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder, emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder> rotBuilder_;
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        * @return Whether the rot field is set.
        */
       public boolean hasRot() {
         return rotBuilder_ != null || rot_ != null;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        * @return The rot.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getRot() {
@@ -697,7 +689,7 @@ public final class WeekendDjinnInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public Builder setRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -713,7 +705,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public Builder setRot(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -727,7 +719,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public Builder mergeRot(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (rotBuilder_ == null) {
@@ -745,7 +737,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public Builder clearRot() {
         if (rotBuilder_ == null) {
@@ -759,7 +751,7 @@ public final class WeekendDjinnInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getRotBuilder() {
         
@@ -767,7 +759,7 @@ public final class WeekendDjinnInfoOuterClass {
         return getRotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder() {
         if (rotBuilder_ != null) {
@@ -778,7 +770,7 @@ public final class WeekendDjinnInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector rot = 1;</code>
+       * <code>.Vector rot = 14;</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> 
@@ -861,8 +853,8 @@ public final class WeekendDjinnInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WeekendDjinnInfo.proto\032\014Vector.proto\">" +
-      "\n\020WeekendDjinnInfo\022\024\n\003pos\030\004 \001(\0132\007.Vector" +
-      "\022\024\n\003rot\030\001 \001(\0132\007.VectorB\033\n\031emu.grasscutte" +
+      "\n\020WeekendDjinnInfo\022\024\n\003pos\030\013 \001(\0132\007.Vector" +
+      "\022\024\n\003rot\030\016 \001(\0132\007.VectorB\033\n\031emu.grasscutte" +
       "r.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WeeklyBossResinDiscountInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WeeklyBossResinDiscountInfoOuterClass.java
index b9bacd399..76cb9c972 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WeeklyBossResinDiscountInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WeeklyBossResinDiscountInfoOuterClass.java
@@ -44,7 +44,7 @@ public final class WeeklyBossResinDiscountInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: PABMLHHIDDM
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code WeeklyBossResinDiscountInfo}
@@ -377,7 +377,7 @@ public final class WeeklyBossResinDiscountInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: PABMLHHIDDM
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code WeeklyBossResinDiscountInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreateLocationInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreateLocationInfoOuterClass.java
index 332e745e5..870615e92 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreateLocationInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreateLocationInfoOuterClass.java
@@ -34,25 +34,21 @@ public final class WidgetCreateLocationInfoOuterClass {
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getRotOrBuilder();
 
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      * @return Whether the pos field is set.
      */
     boolean hasPos();
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      * @return The pos.
      */
     emu.grasscutter.net.proto.VectorOuterClass.Vector getPos();
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      */
     emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: EABFEFDDFEJ
-   * </pre>
-   *
    * Protobuf type {@code WidgetCreateLocationInfo}
    */
   public static final class WidgetCreateLocationInfo extends
@@ -110,7 +106,7 @@ public final class WidgetCreateLocationInfoOuterClass {
 
               break;
             }
-            case 50: {
+            case 74: {
               emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder subBuilder = null;
               if (pos_ != null) {
                 subBuilder = pos_.toBuilder();
@@ -181,10 +177,10 @@ public final class WidgetCreateLocationInfoOuterClass {
       return getRot();
     }
 
-    public static final int POS_FIELD_NUMBER = 6;
+    public static final int POS_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.VectorOuterClass.Vector pos_;
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      * @return Whether the pos field is set.
      */
     @java.lang.Override
@@ -192,7 +188,7 @@ public final class WidgetCreateLocationInfoOuterClass {
       return pos_ != null;
     }
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      * @return The pos.
      */
     @java.lang.Override
@@ -200,7 +196,7 @@ public final class WidgetCreateLocationInfoOuterClass {
       return pos_ == null ? emu.grasscutter.net.proto.VectorOuterClass.Vector.getDefaultInstance() : pos_;
     }
     /**
-     * <code>.Vector pos = 6;</code>
+     * <code>.Vector pos = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
@@ -225,7 +221,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         output.writeMessage(3, getRot());
       }
       if (pos_ != null) {
-        output.writeMessage(6, getPos());
+        output.writeMessage(9, getPos());
       }
       unknownFields.writeTo(output);
     }
@@ -242,7 +238,7 @@ public final class WidgetCreateLocationInfoOuterClass {
       }
       if (pos_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, getPos());
+          .computeMessageSize(9, getPos());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -384,10 +380,6 @@ public final class WidgetCreateLocationInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: EABFEFDDFEJ
-     * </pre>
-     *
      * Protobuf type {@code WidgetCreateLocationInfo}
      */
     public static final class Builder extends
@@ -679,14 +671,14 @@ public final class WidgetCreateLocationInfoOuterClass {
       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 = 9;</code>
        * @return Whether the pos field is set.
        */
       public boolean hasPos() {
         return posBuilder_ != null || pos_ != null;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        * @return The pos.
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector getPos() {
@@ -697,7 +689,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder setPos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -713,7 +705,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder setPos(
           emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder builderForValue) {
@@ -727,7 +719,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder mergePos(emu.grasscutter.net.proto.VectorOuterClass.Vector value) {
         if (posBuilder_ == null) {
@@ -745,7 +737,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public Builder clearPos() {
         if (posBuilder_ == null) {
@@ -759,7 +751,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         return this;
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.Vector.Builder getPosBuilder() {
         
@@ -767,7 +759,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         return getPosFieldBuilder().getBuilder();
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</code>
        */
       public emu.grasscutter.net.proto.VectorOuterClass.VectorOrBuilder getPosOrBuilder() {
         if (posBuilder_ != null) {
@@ -778,7 +770,7 @@ public final class WidgetCreateLocationInfoOuterClass {
         }
       }
       /**
-       * <code>.Vector pos = 6;</code>
+       * <code>.Vector pos = 9;</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> 
@@ -862,7 +854,7 @@ public final class WidgetCreateLocationInfoOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036WidgetCreateLocationInfo.proto\032\014Vector" +
       ".proto\"F\n\030WidgetCreateLocationInfo\022\024\n\003ro" +
-      "t\030\003 \001(\0132\007.Vector\022\024\n\003pos\030\006 \001(\0132\007.VectorB\033" +
+      "t\030\003 \001(\0132\007.Vector\022\024\n\003pos\030\t \001(\0132\007.VectorB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorInfoOuterClass.java
index ede2123af..723df3cb6 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorInfoOuterClass.java
@@ -19,42 +19,38 @@ public final class WidgetCreatorInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 entity_id = 15;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
+     * @return Whether the locationInfo field is set.
+     */
+    boolean hasLocationInfo();
+    /**
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
+     * @return The locationInfo.
+     */
+    emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo();
+    /**
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
+     */
+    emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder();
+
+    /**
+     * <code>uint32 entity_id = 9;</code>
      * @return The entityId.
      */
     int getEntityId();
 
     /**
-     * <code>.WidgetCreatorOpType op_type = 9;</code>
+     * <code>.WidgetCreatorOpType op_type = 12;</code>
      * @return The enum numeric value on the wire for opType.
      */
     int getOpTypeValue();
     /**
-     * <code>.WidgetCreatorOpType op_type = 9;</code>
+     * <code>.WidgetCreatorOpType op_type = 12;</code>
      * @return The opType.
      */
     emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType getOpType();
-
-    /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
-     * @return Whether the locationInfo field is set.
-     */
-    boolean hasLocationInfo();
-    /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
-     * @return The locationInfo.
-     */
-    emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo();
-    /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
-     */
-    emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder();
   }
   /**
-   * <pre>
-   * Obf: CNHLLOFHJEA
-   * </pre>
-   *
    * Protobuf type {@code WidgetCreatorInfo}
    */
   public static final class WidgetCreatorInfo extends
@@ -100,7 +96,7 @@ public final class WidgetCreatorInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
+            case 18: {
               emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder subBuilder = null;
               if (locationInfo_ != null) {
                 subBuilder = locationInfo_.toBuilder();
@@ -114,16 +110,16 @@ public final class WidgetCreatorInfoOuterClass {
               break;
             }
             case 72: {
+
+              entityId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
               int rawValue = input.readEnum();
 
               opType_ = rawValue;
               break;
             }
-            case 120: {
-
-              entityId_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -156,40 +152,10 @@ public final class WidgetCreatorInfoOuterClass {
               emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.class, emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder.class);
     }
 
-    public static final int ENTITY_ID_FIELD_NUMBER = 15;
-    private int entityId_;
-    /**
-     * <code>uint32 entity_id = 15;</code>
-     * @return The entityId.
-     */
-    @java.lang.Override
-    public int getEntityId() {
-      return entityId_;
-    }
-
-    public static final int OP_TYPE_FIELD_NUMBER = 9;
-    private int opType_;
-    /**
-     * <code>.WidgetCreatorOpType op_type = 9;</code>
-     * @return The enum numeric value on the wire for opType.
-     */
-    @java.lang.Override public int getOpTypeValue() {
-      return opType_;
-    }
-    /**
-     * <code>.WidgetCreatorOpType op_type = 9;</code>
-     * @return The opType.
-     */
-    @java.lang.Override public emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType getOpType() {
-      @SuppressWarnings("deprecation")
-      emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType result = emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.valueOf(opType_);
-      return result == null ? emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.UNRECOGNIZED : result;
-    }
-
-    public static final int LOCATION_INFO_FIELD_NUMBER = 5;
+    public static final int LOCATION_INFO_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo locationInfo_;
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
      * @return Whether the locationInfo field is set.
      */
     @java.lang.Override
@@ -197,7 +163,7 @@ public final class WidgetCreatorInfoOuterClass {
       return locationInfo_ != null;
     }
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
      * @return The locationInfo.
      */
     @java.lang.Override
@@ -205,13 +171,43 @@ public final class WidgetCreatorInfoOuterClass {
       return locationInfo_ == null ? emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance() : locationInfo_;
     }
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder() {
       return getLocationInfo();
     }
 
+    public static final int ENTITY_ID_FIELD_NUMBER = 9;
+    private int entityId_;
+    /**
+     * <code>uint32 entity_id = 9;</code>
+     * @return The entityId.
+     */
+    @java.lang.Override
+    public int getEntityId() {
+      return entityId_;
+    }
+
+    public static final int OP_TYPE_FIELD_NUMBER = 12;
+    private int opType_;
+    /**
+     * <code>.WidgetCreatorOpType op_type = 12;</code>
+     * @return The enum numeric value on the wire for opType.
+     */
+    @java.lang.Override public int getOpTypeValue() {
+      return opType_;
+    }
+    /**
+     * <code>.WidgetCreatorOpType op_type = 12;</code>
+     * @return The opType.
+     */
+    @java.lang.Override public emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType getOpType() {
+      @SuppressWarnings("deprecation")
+      emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType result = emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.valueOf(opType_);
+      return result == null ? emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.UNRECOGNIZED : result;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -227,13 +223,13 @@ public final class WidgetCreatorInfoOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (locationInfo_ != null) {
-        output.writeMessage(5, getLocationInfo());
-      }
-      if (opType_ != emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.WIDGET_CREATOR_TYPE_NONE.getNumber()) {
-        output.writeEnum(9, opType_);
+        output.writeMessage(2, getLocationInfo());
       }
       if (entityId_ != 0) {
-        output.writeUInt32(15, entityId_);
+        output.writeUInt32(9, entityId_);
+      }
+      if (opType_ != emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.WIDGET_CREATOR_TYPE_NONE.getNumber()) {
+        output.writeEnum(12, opType_);
       }
       unknownFields.writeTo(output);
     }
@@ -246,15 +242,15 @@ public final class WidgetCreatorInfoOuterClass {
       size = 0;
       if (locationInfo_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, getLocationInfo());
-      }
-      if (opType_ != emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.WIDGET_CREATOR_TYPE_NONE.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(9, opType_);
+          .computeMessageSize(2, getLocationInfo());
       }
       if (entityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, entityId_);
+          .computeUInt32Size(9, entityId_);
+      }
+      if (opType_ != emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.WIDGET_CREATOR_TYPE_NONE.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(12, opType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -271,14 +267,14 @@ public final class WidgetCreatorInfoOuterClass {
       }
       emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo other = (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) obj;
 
-      if (getEntityId()
-          != other.getEntityId()) return false;
-      if (opType_ != other.opType_) return false;
       if (hasLocationInfo() != other.hasLocationInfo()) return false;
       if (hasLocationInfo()) {
         if (!getLocationInfo()
             .equals(other.getLocationInfo())) return false;
       }
+      if (getEntityId()
+          != other.getEntityId()) return false;
+      if (opType_ != other.opType_) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -290,14 +286,14 @@ public final class WidgetCreatorInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getEntityId();
-      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + opType_;
       if (hasLocationInfo()) {
         hash = (37 * hash) + LOCATION_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getLocationInfo().hashCode();
       }
+      hash = (37 * hash) + ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getEntityId();
+      hash = (37 * hash) + OP_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + opType_;
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -394,10 +390,6 @@ public final class WidgetCreatorInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: CNHLLOFHJEA
-     * </pre>
-     *
      * Protobuf type {@code WidgetCreatorInfo}
      */
     public static final class Builder extends
@@ -435,16 +427,16 @@ public final class WidgetCreatorInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        entityId_ = 0;
-
-        opType_ = 0;
-
         if (locationInfoBuilder_ == null) {
           locationInfo_ = null;
         } else {
           locationInfo_ = null;
           locationInfoBuilder_ = null;
         }
+        entityId_ = 0;
+
+        opType_ = 0;
+
         return this;
       }
 
@@ -471,13 +463,13 @@ public final class WidgetCreatorInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo buildPartial() {
         emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo result = new emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo(this);
-        result.entityId_ = entityId_;
-        result.opType_ = opType_;
         if (locationInfoBuilder_ == null) {
           result.locationInfo_ = locationInfo_;
         } else {
           result.locationInfo_ = locationInfoBuilder_.build();
         }
+        result.entityId_ = entityId_;
+        result.opType_ = opType_;
         onBuilt();
         return result;
       }
@@ -526,15 +518,15 @@ public final class WidgetCreatorInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo other) {
         if (other == emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance()) return this;
+        if (other.hasLocationInfo()) {
+          mergeLocationInfo(other.getLocationInfo());
+        }
         if (other.getEntityId() != 0) {
           setEntityId(other.getEntityId());
         }
         if (other.opType_ != 0) {
           setOpTypeValue(other.getOpTypeValue());
         }
-        if (other.hasLocationInfo()) {
-          mergeLocationInfo(other.getLocationInfo());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -564,103 +556,18 @@ public final class WidgetCreatorInfoOuterClass {
         return this;
       }
 
-      private int entityId_ ;
-      /**
-       * <code>uint32 entity_id = 15;</code>
-       * @return The entityId.
-       */
-      @java.lang.Override
-      public int getEntityId() {
-        return entityId_;
-      }
-      /**
-       * <code>uint32 entity_id = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearEntityId() {
-        
-        entityId_ = 0;
-        onChanged();
-        return this;
-      }
-
-      private int opType_ = 0;
-      /**
-       * <code>.WidgetCreatorOpType op_type = 9;</code>
-       * @return The enum numeric value on the wire for opType.
-       */
-      @java.lang.Override public int getOpTypeValue() {
-        return opType_;
-      }
-      /**
-       * <code>.WidgetCreatorOpType op_type = 9;</code>
-       * @param value The enum numeric value on the wire for opType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpTypeValue(int value) {
-        
-        opType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.WidgetCreatorOpType op_type = 9;</code>
-       * @return The opType.
-       */
-      @java.lang.Override
-      public emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType getOpType() {
-        @SuppressWarnings("deprecation")
-        emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType result = emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.valueOf(opType_);
-        return result == null ? emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.UNRECOGNIZED : result;
-      }
-      /**
-       * <code>.WidgetCreatorOpType op_type = 9;</code>
-       * @param value The opType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setOpType(emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
-        
-        opType_ = value.getNumber();
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>.WidgetCreatorOpType op_type = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearOpType() {
-        
-        opType_ = 0;
-        onChanged();
-        return this;
-      }
-
       private emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo locationInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder> locationInfoBuilder_;
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        * @return Whether the locationInfo field is set.
        */
       public boolean hasLocationInfo() {
         return locationInfoBuilder_ != null || locationInfo_ != null;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        * @return The locationInfo.
        */
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo() {
@@ -671,7 +578,7 @@ public final class WidgetCreatorInfoOuterClass {
         }
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public Builder setLocationInfo(emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo value) {
         if (locationInfoBuilder_ == null) {
@@ -687,7 +594,7 @@ public final class WidgetCreatorInfoOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public Builder setLocationInfo(
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder builderForValue) {
@@ -701,7 +608,7 @@ public final class WidgetCreatorInfoOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public Builder mergeLocationInfo(emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo value) {
         if (locationInfoBuilder_ == null) {
@@ -719,7 +626,7 @@ public final class WidgetCreatorInfoOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public Builder clearLocationInfo() {
         if (locationInfoBuilder_ == null) {
@@ -733,7 +640,7 @@ public final class WidgetCreatorInfoOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder getLocationInfoBuilder() {
         
@@ -741,7 +648,7 @@ public final class WidgetCreatorInfoOuterClass {
         return getLocationInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder() {
         if (locationInfoBuilder_ != null) {
@@ -752,7 +659,7 @@ public final class WidgetCreatorInfoOuterClass {
         }
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 5;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder> 
@@ -767,6 +674,91 @@ public final class WidgetCreatorInfoOuterClass {
         }
         return locationInfoBuilder_;
       }
+
+      private int entityId_ ;
+      /**
+       * <code>uint32 entity_id = 9;</code>
+       * @return The entityId.
+       */
+      @java.lang.Override
+      public int getEntityId() {
+        return entityId_;
+      }
+      /**
+       * <code>uint32 entity_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearEntityId() {
+        
+        entityId_ = 0;
+        onChanged();
+        return this;
+      }
+
+      private int opType_ = 0;
+      /**
+       * <code>.WidgetCreatorOpType op_type = 12;</code>
+       * @return The enum numeric value on the wire for opType.
+       */
+      @java.lang.Override public int getOpTypeValue() {
+        return opType_;
+      }
+      /**
+       * <code>.WidgetCreatorOpType op_type = 12;</code>
+       * @param value The enum numeric value on the wire for opType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOpTypeValue(int value) {
+        
+        opType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.WidgetCreatorOpType op_type = 12;</code>
+       * @return The opType.
+       */
+      @java.lang.Override
+      public emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType getOpType() {
+        @SuppressWarnings("deprecation")
+        emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType result = emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.valueOf(opType_);
+        return result == null ? emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType.UNRECOGNIZED : result;
+      }
+      /**
+       * <code>.WidgetCreatorOpType op_type = 12;</code>
+       * @param value The opType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setOpType(emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.WidgetCreatorOpType value) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        
+        opType_ = value.getNumber();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>.WidgetCreatorOpType op_type = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearOpType() {
+        
+        opType_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -834,28 +826,28 @@ public final class WidgetCreatorInfoOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\027WidgetCreatorInfo.proto\032\031WidgetCreator" +
-      "OpType.proto\032\036WidgetCreateLocationInfo.p" +
-      "roto\"\177\n\021WidgetCreatorInfo\022\021\n\tentity_id\030\017" +
-      " \001(\r\022%\n\007op_type\030\t \001(\0162\024.WidgetCreatorOpT" +
-      "ype\0220\n\rlocation_info\030\005 \001(\0132\031.WidgetCreat" +
-      "eLocationInfoB\033\n\031emu.grasscutter.net.pro" +
+      "\n\027WidgetCreatorInfo.proto\032\036WidgetCreateL" +
+      "ocationInfo.proto\032\031WidgetCreatorOpType.p" +
+      "roto\"\177\n\021WidgetCreatorInfo\0220\n\rlocation_in" +
+      "fo\030\002 \001(\0132\031.WidgetCreateLocationInfo\022\021\n\te" +
+      "ntity_id\030\t \001(\r\022%\n\007op_type\030\014 \001(\0162\024.Widget" +
+      "CreatorOpTypeB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.getDescriptor(),
         });
     internal_static_WidgetCreatorInfo_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_WidgetCreatorInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetCreatorInfo_descriptor,
-        new java.lang.String[] { "EntityId", "OpType", "LocationInfo", });
-    emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.getDescriptor();
+        new java.lang.String[] { "LocationInfo", "EntityId", "OpType", });
     emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.WidgetCreatorOpTypeOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorOpTypeOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorOpTypeOuterClass.java
index 96699854d..dbdcb2544 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorOpTypeOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetCreatorOpTypeOuterClass.java
@@ -15,10 +15,6 @@ public final class WidgetCreatorOpTypeOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: GCEFDCIHAKA
-   * </pre>
-   *
    * Protobuf enum {@code WidgetCreatorOpType}
    */
   public enum WidgetCreatorOpType
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagReqOuterClass.java
index 7eac73e45..fe0528a82 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagReqOuterClass.java
@@ -19,49 +19,44 @@ public final class WidgetDoBagReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 material_id = 15;</code>
+     * <code>uint32 material_id = 11;</code>
      * @return The materialId.
      */
     int getMaterialId();
 
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      * @return Whether the locationInfo field is set.
      */
     boolean hasLocationInfo();
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      * @return The locationInfo.
      */
     emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo();
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      */
     emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder();
 
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      * @return Whether the widgetCreatorInfo field is set.
      */
     boolean hasWidgetCreatorInfo();
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      * @return The widgetCreatorInfo.
      */
     emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo getWidgetCreatorInfo();
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      */
     emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfoOrBuilder getWidgetCreatorInfoOrBuilder();
 
     public emu.grasscutter.net.proto.WidgetDoBagReqOuterClass.WidgetDoBagReq.OpInfoCase getOpInfoCase();
   }
   /**
-   * <pre>
-   * CmdId: 2739
-   * Obf: KFDNMJHKFAA
-   * </pre>
-   *
    * Protobuf type {@code WidgetDoBagReq}
    */
   public static final class WidgetDoBagReq extends
@@ -106,14 +101,14 @@ public final class WidgetDoBagReqOuterClass {
             case 0:
               done = true;
               break;
-            case 120: {
+            case 88: {
 
               materialId_ = input.readUInt32();
               break;
             }
-            case 9250: {
+            case 6866: {
               emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder subBuilder = null;
-              if (opInfoCase_ == 1156) {
+              if (opInfoCase_ == 858) {
                 subBuilder = ((emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_).toBuilder();
               }
               opInfo_ =
@@ -122,12 +117,12 @@ public final class WidgetDoBagReqOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_);
                 opInfo_ = subBuilder.buildPartial();
               }
-              opInfoCase_ = 1156;
+              opInfoCase_ = 858;
               break;
             }
-            case 16370: {
+            case 14042: {
               emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder subBuilder = null;
-              if (opInfoCase_ == 2046) {
+              if (opInfoCase_ == 1755) {
                 subBuilder = ((emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_).toBuilder();
               }
               opInfo_ =
@@ -136,7 +131,7 @@ public final class WidgetDoBagReqOuterClass {
                 subBuilder.mergeFrom((emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_);
                 opInfo_ = subBuilder.buildPartial();
               }
-              opInfoCase_ = 2046;
+              opInfoCase_ = 1755;
               break;
             }
             default: {
@@ -176,8 +171,8 @@ public final class WidgetDoBagReqOuterClass {
     public enum OpInfoCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      LOCATION_INFO(2046),
-      WIDGET_CREATOR_INFO(1156),
+      LOCATION_INFO(1755),
+      WIDGET_CREATOR_INFO(858),
       OPINFO_NOT_SET(0);
       private final int value;
       private OpInfoCase(int value) {
@@ -195,8 +190,8 @@ public final class WidgetDoBagReqOuterClass {
 
       public static OpInfoCase forNumber(int value) {
         switch (value) {
-          case 2046: return LOCATION_INFO;
-          case 1156: return WIDGET_CREATOR_INFO;
+          case 1755: return LOCATION_INFO;
+          case 858: return WIDGET_CREATOR_INFO;
           case 0: return OPINFO_NOT_SET;
           default: return null;
         }
@@ -212,10 +207,10 @@ public final class WidgetDoBagReqOuterClass {
           opInfoCase_);
     }
 
-    public static final int MATERIAL_ID_FIELD_NUMBER = 15;
+    public static final int MATERIAL_ID_FIELD_NUMBER = 11;
     private int materialId_;
     /**
-     * <code>uint32 material_id = 15;</code>
+     * <code>uint32 material_id = 11;</code>
      * @return The materialId.
      */
     @java.lang.Override
@@ -223,63 +218,63 @@ public final class WidgetDoBagReqOuterClass {
       return materialId_;
     }
 
-    public static final int LOCATION_INFO_FIELD_NUMBER = 2046;
+    public static final int LOCATION_INFO_FIELD_NUMBER = 1755;
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      * @return Whether the locationInfo field is set.
      */
     @java.lang.Override
     public boolean hasLocationInfo() {
-      return opInfoCase_ == 2046;
+      return opInfoCase_ == 1755;
     }
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      * @return The locationInfo.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo() {
-      if (opInfoCase_ == 2046) {
+      if (opInfoCase_ == 1755) {
          return (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_;
       }
       return emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
     }
     /**
-     * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+     * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder() {
-      if (opInfoCase_ == 2046) {
+      if (opInfoCase_ == 1755) {
          return (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_;
       }
       return emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
     }
 
-    public static final int WIDGET_CREATOR_INFO_FIELD_NUMBER = 1156;
+    public static final int WIDGET_CREATOR_INFO_FIELD_NUMBER = 858;
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      * @return Whether the widgetCreatorInfo field is set.
      */
     @java.lang.Override
     public boolean hasWidgetCreatorInfo() {
-      return opInfoCase_ == 1156;
+      return opInfoCase_ == 858;
     }
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      * @return The widgetCreatorInfo.
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo getWidgetCreatorInfo() {
-      if (opInfoCase_ == 1156) {
+      if (opInfoCase_ == 858) {
          return (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_;
       }
       return emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
     }
     /**
-     * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+     * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfoOrBuilder getWidgetCreatorInfoOrBuilder() {
-      if (opInfoCase_ == 1156) {
+      if (opInfoCase_ == 858) {
          return (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_;
       }
       return emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
@@ -300,13 +295,13 @@ public final class WidgetDoBagReqOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (materialId_ != 0) {
-        output.writeUInt32(15, materialId_);
+        output.writeUInt32(11, materialId_);
       }
-      if (opInfoCase_ == 1156) {
-        output.writeMessage(1156, (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_);
+      if (opInfoCase_ == 858) {
+        output.writeMessage(858, (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_);
       }
-      if (opInfoCase_ == 2046) {
-        output.writeMessage(2046, (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_);
+      if (opInfoCase_ == 1755) {
+        output.writeMessage(1755, (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_);
       }
       unknownFields.writeTo(output);
     }
@@ -319,15 +314,15 @@ public final class WidgetDoBagReqOuterClass {
       size = 0;
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, materialId_);
+          .computeUInt32Size(11, materialId_);
       }
-      if (opInfoCase_ == 1156) {
+      if (opInfoCase_ == 858) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1156, (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_);
+          .computeMessageSize(858, (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_);
       }
-      if (opInfoCase_ == 2046) {
+      if (opInfoCase_ == 1755) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2046, (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_);
+          .computeMessageSize(1755, (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -348,11 +343,11 @@ public final class WidgetDoBagReqOuterClass {
           != other.getMaterialId()) return false;
       if (!getOpInfoCase().equals(other.getOpInfoCase())) return false;
       switch (opInfoCase_) {
-        case 2046:
+        case 1755:
           if (!getLocationInfo()
               .equals(other.getLocationInfo())) return false;
           break;
-        case 1156:
+        case 858:
           if (!getWidgetCreatorInfo()
               .equals(other.getWidgetCreatorInfo())) return false;
           break;
@@ -373,11 +368,11 @@ public final class WidgetDoBagReqOuterClass {
       hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMaterialId();
       switch (opInfoCase_) {
-        case 2046:
+        case 1755:
           hash = (37 * hash) + LOCATION_INFO_FIELD_NUMBER;
           hash = (53 * hash) + getLocationInfo().hashCode();
           break;
-        case 1156:
+        case 858:
           hash = (37 * hash) + WIDGET_CREATOR_INFO_FIELD_NUMBER;
           hash = (53 * hash) + getWidgetCreatorInfo().hashCode();
           break;
@@ -480,11 +475,6 @@ public final class WidgetDoBagReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2739
-     * Obf: KFDNMJHKFAA
-     * </pre>
-     *
      * Protobuf type {@code WidgetDoBagReq}
      */
     public static final class Builder extends
@@ -553,14 +543,14 @@ public final class WidgetDoBagReqOuterClass {
       public emu.grasscutter.net.proto.WidgetDoBagReqOuterClass.WidgetDoBagReq buildPartial() {
         emu.grasscutter.net.proto.WidgetDoBagReqOuterClass.WidgetDoBagReq result = new emu.grasscutter.net.proto.WidgetDoBagReqOuterClass.WidgetDoBagReq(this);
         result.materialId_ = materialId_;
-        if (opInfoCase_ == 2046) {
+        if (opInfoCase_ == 1755) {
           if (locationInfoBuilder_ == null) {
             result.opInfo_ = opInfo_;
           } else {
             result.opInfo_ = locationInfoBuilder_.build();
           }
         }
-        if (opInfoCase_ == 1156) {
+        if (opInfoCase_ == 858) {
           if (widgetCreatorInfoBuilder_ == null) {
             result.opInfo_ = opInfo_;
           } else {
@@ -678,7 +668,7 @@ public final class WidgetDoBagReqOuterClass {
 
       private int materialId_ ;
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 11;</code>
        * @return The materialId.
        */
       @java.lang.Override
@@ -686,7 +676,7 @@ public final class WidgetDoBagReqOuterClass {
         return materialId_;
       }
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 11;</code>
        * @param value The materialId to set.
        * @return This builder for chaining.
        */
@@ -697,7 +687,7 @@ public final class WidgetDoBagReqOuterClass {
         return this;
       }
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaterialId() {
@@ -710,33 +700,33 @@ public final class WidgetDoBagReqOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder> locationInfoBuilder_;
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        * @return Whether the locationInfo field is set.
        */
       @java.lang.Override
       public boolean hasLocationInfo() {
-        return opInfoCase_ == 2046;
+        return opInfoCase_ == 1755;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        * @return The locationInfo.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo getLocationInfo() {
         if (locationInfoBuilder_ == null) {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             return (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_;
           }
           return emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
         } else {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             return locationInfoBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       public Builder setLocationInfo(emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo value) {
         if (locationInfoBuilder_ == null) {
@@ -748,11 +738,11 @@ public final class WidgetDoBagReqOuterClass {
         } else {
           locationInfoBuilder_.setMessage(value);
         }
-        opInfoCase_ = 2046;
+        opInfoCase_ = 1755;
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       public Builder setLocationInfo(
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder builderForValue) {
@@ -762,15 +752,15 @@ public final class WidgetDoBagReqOuterClass {
         } else {
           locationInfoBuilder_.setMessage(builderForValue.build());
         }
-        opInfoCase_ = 2046;
+        opInfoCase_ = 1755;
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       public Builder mergeLocationInfo(emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo value) {
         if (locationInfoBuilder_ == null) {
-          if (opInfoCase_ == 2046 &&
+          if (opInfoCase_ == 1755 &&
               opInfo_ != emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance()) {
             opInfo_ = emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.newBuilder((emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_)
                 .mergeFrom(value).buildPartial();
@@ -779,26 +769,26 @@ public final class WidgetDoBagReqOuterClass {
           }
           onChanged();
         } else {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             locationInfoBuilder_.mergeFrom(value);
           }
           locationInfoBuilder_.setMessage(value);
         }
-        opInfoCase_ = 2046;
+        opInfoCase_ = 1755;
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       public Builder clearLocationInfo() {
         if (locationInfoBuilder_ == null) {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             opInfoCase_ = 0;
             opInfo_ = null;
             onChanged();
           }
         } else {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             opInfoCase_ = 0;
             opInfo_ = null;
           }
@@ -807,33 +797,33 @@ public final class WidgetDoBagReqOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder getLocationInfoBuilder() {
         return getLocationInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder getLocationInfoOrBuilder() {
-        if ((opInfoCase_ == 2046) && (locationInfoBuilder_ != null)) {
+        if ((opInfoCase_ == 1755) && (locationInfoBuilder_ != null)) {
           return locationInfoBuilder_.getMessageOrBuilder();
         } else {
-          if (opInfoCase_ == 2046) {
+          if (opInfoCase_ == 1755) {
             return (emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo) opInfo_;
           }
           return emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.WidgetCreateLocationInfo location_info = 2046;</code>
+       * <code>.WidgetCreateLocationInfo location_info = 1755;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.Builder, emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfoOrBuilder> 
           getLocationInfoFieldBuilder() {
         if (locationInfoBuilder_ == null) {
-          if (!(opInfoCase_ == 2046)) {
+          if (!(opInfoCase_ == 1755)) {
             opInfo_ = emu.grasscutter.net.proto.WidgetCreateLocationInfoOuterClass.WidgetCreateLocationInfo.getDefaultInstance();
           }
           locationInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -843,7 +833,7 @@ public final class WidgetDoBagReqOuterClass {
                   isClean());
           opInfo_ = null;
         }
-        opInfoCase_ = 2046;
+        opInfoCase_ = 1755;
         onChanged();;
         return locationInfoBuilder_;
       }
@@ -851,33 +841,33 @@ public final class WidgetDoBagReqOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo, emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder, emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfoOrBuilder> widgetCreatorInfoBuilder_;
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        * @return Whether the widgetCreatorInfo field is set.
        */
       @java.lang.Override
       public boolean hasWidgetCreatorInfo() {
-        return opInfoCase_ == 1156;
+        return opInfoCase_ == 858;
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        * @return The widgetCreatorInfo.
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo getWidgetCreatorInfo() {
         if (widgetCreatorInfoBuilder_ == null) {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             return (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_;
           }
           return emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
         } else {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             return widgetCreatorInfoBuilder_.getMessage();
           }
           return emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       public Builder setWidgetCreatorInfo(emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo value) {
         if (widgetCreatorInfoBuilder_ == null) {
@@ -889,11 +879,11 @@ public final class WidgetDoBagReqOuterClass {
         } else {
           widgetCreatorInfoBuilder_.setMessage(value);
         }
-        opInfoCase_ = 1156;
+        opInfoCase_ = 858;
         return this;
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       public Builder setWidgetCreatorInfo(
           emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder builderForValue) {
@@ -903,15 +893,15 @@ public final class WidgetDoBagReqOuterClass {
         } else {
           widgetCreatorInfoBuilder_.setMessage(builderForValue.build());
         }
-        opInfoCase_ = 1156;
+        opInfoCase_ = 858;
         return this;
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       public Builder mergeWidgetCreatorInfo(emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo value) {
         if (widgetCreatorInfoBuilder_ == null) {
-          if (opInfoCase_ == 1156 &&
+          if (opInfoCase_ == 858 &&
               opInfo_ != emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance()) {
             opInfo_ = emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.newBuilder((emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_)
                 .mergeFrom(value).buildPartial();
@@ -920,26 +910,26 @@ public final class WidgetDoBagReqOuterClass {
           }
           onChanged();
         } else {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             widgetCreatorInfoBuilder_.mergeFrom(value);
           }
           widgetCreatorInfoBuilder_.setMessage(value);
         }
-        opInfoCase_ = 1156;
+        opInfoCase_ = 858;
         return this;
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       public Builder clearWidgetCreatorInfo() {
         if (widgetCreatorInfoBuilder_ == null) {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             opInfoCase_ = 0;
             opInfo_ = null;
             onChanged();
           }
         } else {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             opInfoCase_ = 0;
             opInfo_ = null;
           }
@@ -948,33 +938,33 @@ public final class WidgetDoBagReqOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder getWidgetCreatorInfoBuilder() {
         return getWidgetCreatorInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfoOrBuilder getWidgetCreatorInfoOrBuilder() {
-        if ((opInfoCase_ == 1156) && (widgetCreatorInfoBuilder_ != null)) {
+        if ((opInfoCase_ == 858) && (widgetCreatorInfoBuilder_ != null)) {
           return widgetCreatorInfoBuilder_.getMessageOrBuilder();
         } else {
-          if (opInfoCase_ == 1156) {
+          if (opInfoCase_ == 858) {
             return (emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo) opInfo_;
           }
           return emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
         }
       }
       /**
-       * <code>.WidgetCreatorInfo widget_creator_info = 1156;</code>
+       * <code>.WidgetCreatorInfo widget_creator_info = 858;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo, emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.Builder, emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfoOrBuilder> 
           getWidgetCreatorInfoFieldBuilder() {
         if (widgetCreatorInfoBuilder_ == null) {
-          if (!(opInfoCase_ == 1156)) {
+          if (!(opInfoCase_ == 858)) {
             opInfo_ = emu.grasscutter.net.proto.WidgetCreatorInfoOuterClass.WidgetCreatorInfo.getDefaultInstance();
           }
           widgetCreatorInfoBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
@@ -984,7 +974,7 @@ public final class WidgetDoBagReqOuterClass {
                   isClean());
           opInfo_ = null;
         }
-        opInfoCase_ = 1156;
+        opInfoCase_ = 858;
         onChanged();;
         return widgetCreatorInfoBuilder_;
       }
@@ -1057,9 +1047,9 @@ public final class WidgetDoBagReqOuterClass {
     java.lang.String[] descriptorData = {
       "\n\024WidgetDoBagReq.proto\032\036WidgetCreateLoca" +
       "tionInfo.proto\032\027WidgetCreatorInfo.proto\"" +
-      "\231\001\n\016WidgetDoBagReq\022\023\n\013material_id\030\017 \001(\r\022" +
-      "3\n\rlocation_info\030\376\017 \001(\0132\031.WidgetCreateLo" +
-      "cationInfoH\000\0222\n\023widget_creator_info\030\204\t \001" +
+      "\231\001\n\016WidgetDoBagReq\022\023\n\013material_id\030\013 \001(\r\022" +
+      "3\n\rlocation_info\030\333\r \001(\0132\031.WidgetCreateLo" +
+      "cationInfoH\000\0222\n\023widget_creator_info\030\332\006 \001" +
       "(\0132\022.WidgetCreatorInfoH\000B\t\n\007op_infoB\033\n\031e" +
       "mu.grasscutter.net.protob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagRspOuterClass.java
index ce8a80c55..60683a6ab 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetDoBagRspOuterClass.java
@@ -19,23 +19,18 @@ public final class WidgetDoBagRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 material_id = 15;</code>
-     * @return The materialId.
-     */
-    int getMaterialId();
-
-    /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     int getRetcode();
+
+    /**
+     * <code>uint32 material_id = 12;</code>
+     * @return The materialId.
+     */
+    int getMaterialId();
   }
   /**
-   * <pre>
-   * CmdId: 8212
-   * Obf: PIDNCNBIGBN
-   * </pre>
-   *
    * Protobuf type {@code WidgetDoBagRsp}
    */
   public static final class WidgetDoBagRsp extends
@@ -80,12 +75,12 @@ public final class WidgetDoBagRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 88: {
 
               retcode_ = input.readInt32();
               break;
             }
-            case 120: {
+            case 96: {
 
               materialId_ = input.readUInt32();
               break;
@@ -122,21 +117,10 @@ public final class WidgetDoBagRspOuterClass {
               emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.class, emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.Builder.class);
     }
 
-    public static final int MATERIAL_ID_FIELD_NUMBER = 15;
-    private int materialId_;
-    /**
-     * <code>uint32 material_id = 15;</code>
-     * @return The materialId.
-     */
-    @java.lang.Override
-    public int getMaterialId() {
-      return materialId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 4;
+    public static final int RETCODE_FIELD_NUMBER = 11;
     private int retcode_;
     /**
-     * <code>int32 retcode = 4;</code>
+     * <code>int32 retcode = 11;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -144,6 +128,17 @@ public final class WidgetDoBagRspOuterClass {
       return retcode_;
     }
 
+    public static final int MATERIAL_ID_FIELD_NUMBER = 12;
+    private int materialId_;
+    /**
+     * <code>uint32 material_id = 12;</code>
+     * @return The materialId.
+     */
+    @java.lang.Override
+    public int getMaterialId() {
+      return materialId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -159,10 +154,10 @@ public final class WidgetDoBagRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(4, retcode_);
+        output.writeInt32(11, retcode_);
       }
       if (materialId_ != 0) {
-        output.writeUInt32(15, materialId_);
+        output.writeUInt32(12, materialId_);
       }
       unknownFields.writeTo(output);
     }
@@ -175,11 +170,11 @@ public final class WidgetDoBagRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(4, retcode_);
+          .computeInt32Size(11, retcode_);
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, materialId_);
+          .computeUInt32Size(12, materialId_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -196,10 +191,10 @@ public final class WidgetDoBagRspOuterClass {
       }
       emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other = (emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp) obj;
 
-      if (getMaterialId()
-          != other.getMaterialId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
+      if (getMaterialId()
+          != other.getMaterialId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -211,10 +206,10 @@ public final class WidgetDoBagRspOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getMaterialId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
+      hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getMaterialId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -311,11 +306,6 @@ public final class WidgetDoBagRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 8212
-     * Obf: PIDNCNBIGBN
-     * </pre>
-     *
      * Protobuf type {@code WidgetDoBagRsp}
      */
     public static final class Builder extends
@@ -353,10 +343,10 @@ public final class WidgetDoBagRspOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        materialId_ = 0;
-
         retcode_ = 0;
 
+        materialId_ = 0;
+
         return this;
       }
 
@@ -383,8 +373,8 @@ public final class WidgetDoBagRspOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp buildPartial() {
         emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp result = new emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp(this);
-        result.materialId_ = materialId_;
         result.retcode_ = retcode_;
+        result.materialId_ = materialId_;
         onBuilt();
         return result;
       }
@@ -433,12 +423,12 @@ public final class WidgetDoBagRspOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp other) {
         if (other == emu.grasscutter.net.proto.WidgetDoBagRspOuterClass.WidgetDoBagRsp.getDefaultInstance()) return this;
-        if (other.getMaterialId() != 0) {
-          setMaterialId(other.getMaterialId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
+        if (other.getMaterialId() != 0) {
+          setMaterialId(other.getMaterialId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -468,40 +458,9 @@ public final class WidgetDoBagRspOuterClass {
         return this;
       }
 
-      private int materialId_ ;
-      /**
-       * <code>uint32 material_id = 15;</code>
-       * @return The materialId.
-       */
-      @java.lang.Override
-      public int getMaterialId() {
-        return materialId_;
-      }
-      /**
-       * <code>uint32 material_id = 15;</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 = 15;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearMaterialId() {
-        
-        materialId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -509,7 +468,7 @@ public final class WidgetDoBagRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -520,7 +479,7 @@ public final class WidgetDoBagRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 4;</code>
+       * <code>int32 retcode = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -529,6 +488,37 @@ public final class WidgetDoBagRspOuterClass {
         onChanged();
         return this;
       }
+
+      private int materialId_ ;
+      /**
+       * <code>uint32 material_id = 12;</code>
+       * @return The materialId.
+       */
+      @java.lang.Override
+      public int getMaterialId() {
+        return materialId_;
+      }
+      /**
+       * <code>uint32 material_id = 12;</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 = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearMaterialId() {
+        
+        materialId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -597,7 +587,7 @@ public final class WidgetDoBagRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024WidgetDoBagRsp.proto\"6\n\016WidgetDoBagRsp" +
-      "\022\023\n\013material_id\030\017 \001(\r\022\017\n\007retcode\030\004 \001(\005B\033" +
+      "\022\017\n\007retcode\030\013 \001(\005\022\023\n\013material_id\030\014 \001(\rB\033" +
       "\n\031emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -609,7 +599,7 @@ public final class WidgetDoBagRspOuterClass {
     internal_static_WidgetDoBagRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetDoBagRsp_descriptor,
-        new java.lang.String[] { "MaterialId", "Retcode", });
+        new java.lang.String[] { "Retcode", "MaterialId", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetAllDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetAllDataNotifyOuterClass.java
index d6113adae..03a557f99 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetAllDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetAllDataNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData> 
         getWidgetGadgetDataList();
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData getWidgetGadgetData(int index);
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     int getWidgetGadgetDataCount();
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> 
         getWidgetGadgetDataOrBuilderList();
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 6076
-   * Obf: GBEAGNDJKEC
-   * </pre>
-   *
    * Protobuf type {@code WidgetGadgetAllDataNotify}
    */
   public static final class WidgetGadgetAllDataNotify extends
@@ -94,7 +89,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 74: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 widgetGadgetData_ = new java.util.ArrayList<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
               emu.grasscutter.net.proto.WidgetGadgetAllDataNotifyOuterClass.WidgetGadgetAllDataNotify.class, emu.grasscutter.net.proto.WidgetGadgetAllDataNotifyOuterClass.WidgetGadgetAllDataNotify.Builder.class);
     }
 
-    public static final int WIDGET_GADGET_DATA_FIELD_NUMBER = 15;
+    public static final int WIDGET_GADGET_DATA_FIELD_NUMBER = 9;
     private java.util.List<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData> widgetGadgetData_;
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData> getWidgetGadgetDataList() {
       return widgetGadgetData_;
     }
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> 
@@ -156,21 +151,21 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
       return widgetGadgetData_;
     }
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public int getWidgetGadgetDataCount() {
       return widgetGadgetData_.size();
     }
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData getWidgetGadgetData(int index) {
       return widgetGadgetData_.get(index);
     }
     /**
-     * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+     * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder(
@@ -193,7 +188,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < widgetGadgetData_.size(); i++) {
-        output.writeMessage(15, widgetGadgetData_.get(i));
+        output.writeMessage(9, widgetGadgetData_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
       size = 0;
       for (int i = 0; i < widgetGadgetData_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, widgetGadgetData_.get(i));
+          .computeMessageSize(9, widgetGadgetData_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 6076
-     * Obf: GBEAGNDJKEC
-     * </pre>
-     *
      * Protobuf type {@code WidgetGadgetAllDataNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
           emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> widgetGadgetDataBuilder_;
 
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData> getWidgetGadgetDataList() {
         if (widgetGadgetDataBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public int getWidgetGadgetDataCount() {
         if (widgetGadgetDataBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData getWidgetGadgetData(int index) {
         if (widgetGadgetDataBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder setWidgetGadgetData(
           int index, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData value) {
@@ -585,7 +575,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder setWidgetGadgetData(
           int index, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder addWidgetGadgetData(emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData value) {
         if (widgetGadgetDataBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder addWidgetGadgetData(
           int index, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData value) {
@@ -632,7 +622,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder addWidgetGadgetData(
           emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder addWidgetGadgetData(
           int index, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder addAllWidgetGadgetData(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData> values) {
@@ -675,7 +665,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder clearWidgetGadgetData() {
         if (widgetGadgetDataBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder removeWidgetGadgetData(int index) {
         if (widgetGadgetDataBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder getWidgetGadgetDataBuilder(
           int index) {
         return getWidgetGadgetDataFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> 
            getWidgetGadgetDataOrBuilderList() {
@@ -729,14 +719,14 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder addWidgetGadgetDataBuilder() {
         return getWidgetGadgetDataFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder addWidgetGadgetDataBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
             index, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.getDefaultInstance());
       }
       /**
-       * <code>repeated .WidgetGadgetData widget_gadget_data = 15;</code>
+       * <code>repeated .WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder> 
            getWidgetGadgetDataBuilderList() {
@@ -833,7 +823,7 @@ public final class WidgetGadgetAllDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\037WidgetGadgetAllDataNotify.proto\032\026Widge" +
       "tGadgetData.proto\"J\n\031WidgetGadgetAllData" +
-      "Notify\022-\n\022widget_gadget_data\030\017 \003(\0132\021.Wid" +
+      "Notify\022-\n\022widget_gadget_data\030\t \003(\0132\021.Wid" +
       "getGadgetDataB\033\n\031emu.grasscutter.net.pro" +
       "tob\006proto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataNotifyOuterClass.java
index 8d6332723..9d3ec918e 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class WidgetGadgetDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      * @return Whether the widgetGadgetData field is set.
      */
     boolean hasWidgetGadgetData();
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      * @return The widgetGadgetData.
      */
     emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData getWidgetGadgetData();
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      */
     emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 4861
-   * Obf: HCNKGFAPJNC
-   * </pre>
-   *
    * Protobuf type {@code WidgetGadgetDataNotify}
    */
   public static final class WidgetGadgetDataNotify extends
@@ -83,7 +78,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 26: {
+            case 74: {
               emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder subBuilder = null;
               if (widgetGadgetData_ != null) {
                 subBuilder = widgetGadgetData_.toBuilder();
@@ -128,10 +123,10 @@ public final class WidgetGadgetDataNotifyOuterClass {
               emu.grasscutter.net.proto.WidgetGadgetDataNotifyOuterClass.WidgetGadgetDataNotify.class, emu.grasscutter.net.proto.WidgetGadgetDataNotifyOuterClass.WidgetGadgetDataNotify.Builder.class);
     }
 
-    public static final int WIDGET_GADGET_DATA_FIELD_NUMBER = 3;
+    public static final int WIDGET_GADGET_DATA_FIELD_NUMBER = 9;
     private emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData widgetGadgetData_;
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      * @return Whether the widgetGadgetData field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
       return widgetGadgetData_ != null;
     }
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      * @return The widgetGadgetData.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
       return widgetGadgetData_ == null ? emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.getDefaultInstance() : widgetGadgetData_;
     }
     /**
-     * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+     * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder() {
@@ -169,7 +164,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (widgetGadgetData_ != null) {
-        output.writeMessage(3, getWidgetGadgetData());
+        output.writeMessage(9, getWidgetGadgetData());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
       size = 0;
       if (widgetGadgetData_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(3, getWidgetGadgetData());
+          .computeMessageSize(9, getWidgetGadgetData());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class WidgetGadgetDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4861
-     * Obf: HCNKGFAPJNC
-     * </pre>
-     *
      * Protobuf type {@code WidgetGadgetDataNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class WidgetGadgetDataNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> widgetGadgetDataBuilder_;
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        * @return Whether the widgetGadgetData field is set.
        */
       public boolean hasWidgetGadgetData() {
         return widgetGadgetDataBuilder_ != null || widgetGadgetData_ != null;
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        * @return The widgetGadgetData.
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData getWidgetGadgetData() {
@@ -496,7 +486,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder setWidgetGadgetData(emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData value) {
         if (widgetGadgetDataBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder setWidgetGadgetData(
           emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder mergeWidgetGadgetData(emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData value) {
         if (widgetGadgetDataBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public Builder clearWidgetGadgetData() {
         if (widgetGadgetDataBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder getWidgetGadgetDataBuilder() {
         
@@ -566,7 +556,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         return getWidgetGadgetDataFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder getWidgetGadgetDataOrBuilder() {
         if (widgetGadgetDataBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
         }
       }
       /**
-       * <code>.WidgetGadgetData widget_gadget_data = 3;</code>
+       * <code>.WidgetGadgetData widget_gadget_data = 9;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetDataOrBuilder> 
@@ -661,7 +651,7 @@ public final class WidgetGadgetDataNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034WidgetGadgetDataNotify.proto\032\026WidgetGa" +
       "dgetData.proto\"G\n\026WidgetGadgetDataNotify" +
-      "\022-\n\022widget_gadget_data\030\003 \001(\0132\021.WidgetGad" +
+      "\022-\n\022widget_gadget_data\030\t \001(\0132\021.WidgetGad" +
       "getDataB\033\n\031emu.grasscutter.net.protob\006pr" +
       "oto3"
     };
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataOuterClass.java
index f06fe4ace..af7537bb1 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetGadgetDataOuterClass.java
@@ -19,33 +19,29 @@ public final class WidgetGadgetDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>uint32 gadget_id = 9;</code>
+     * @return The gadgetId.
+     */
+    int getGadgetId();
+
+    /**
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @return A list containing the gadgetEntityIdList.
      */
     java.util.List<java.lang.Integer> getGadgetEntityIdListList();
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @return The count of gadgetEntityIdList.
      */
     int getGadgetEntityIdListCount();
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @param index The index of the element to return.
      * @return The gadgetEntityIdList at the given index.
      */
     int getGadgetEntityIdList(int index);
-
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return The gadgetId.
-     */
-    int getGadgetId();
   }
   /**
-   * <pre>
-   * Obf: ENKCILBBOJN
-   * </pre>
-   *
    * Protobuf type {@code WidgetGadgetData}
    */
   public static final class WidgetGadgetData extends
@@ -92,12 +88,12 @@ public final class WidgetGadgetDataOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 72: {
 
               gadgetId_ = input.readUInt32();
               break;
             }
-            case 32: {
+            case 120: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 gadgetEntityIdList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -105,7 +101,7 @@ public final class WidgetGadgetDataOuterClass {
               gadgetEntityIdList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 122: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -153,10 +149,21 @@ public final class WidgetGadgetDataOuterClass {
               emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.class, emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.Builder.class);
     }
 
-    public static final int GADGET_ENTITY_ID_LIST_FIELD_NUMBER = 4;
+    public static final int GADGET_ID_FIELD_NUMBER = 9;
+    private int gadgetId_;
+    /**
+     * <code>uint32 gadget_id = 9;</code>
+     * @return The gadgetId.
+     */
+    @java.lang.Override
+    public int getGadgetId() {
+      return gadgetId_;
+    }
+
+    public static final int GADGET_ENTITY_ID_LIST_FIELD_NUMBER = 15;
     private com.google.protobuf.Internal.IntList gadgetEntityIdList_;
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @return A list containing the gadgetEntityIdList.
      */
     @java.lang.Override
@@ -165,14 +172,14 @@ public final class WidgetGadgetDataOuterClass {
       return gadgetEntityIdList_;
     }
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @return The count of gadgetEntityIdList.
      */
     public int getGadgetEntityIdListCount() {
       return gadgetEntityIdList_.size();
     }
     /**
-     * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+     * <code>repeated uint32 gadget_entity_id_list = 15;</code>
      * @param index The index of the element to return.
      * @return The gadgetEntityIdList at the given index.
      */
@@ -181,17 +188,6 @@ public final class WidgetGadgetDataOuterClass {
     }
     private int gadgetEntityIdListMemoizedSerializedSize = -1;
 
-    public static final int GADGET_ID_FIELD_NUMBER = 3;
-    private int gadgetId_;
-    /**
-     * <code>uint32 gadget_id = 3;</code>
-     * @return The gadgetId.
-     */
-    @java.lang.Override
-    public int getGadgetId() {
-      return gadgetId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -208,10 +204,10 @@ public final class WidgetGadgetDataOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (gadgetId_ != 0) {
-        output.writeUInt32(3, gadgetId_);
+        output.writeUInt32(9, gadgetId_);
       }
       if (getGadgetEntityIdListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(122);
         output.writeUInt32NoTag(gadgetEntityIdListMemoizedSerializedSize);
       }
       for (int i = 0; i < gadgetEntityIdList_.size(); i++) {
@@ -228,7 +224,7 @@ public final class WidgetGadgetDataOuterClass {
       size = 0;
       if (gadgetId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, gadgetId_);
+          .computeUInt32Size(9, gadgetId_);
       }
       {
         int dataSize = 0;
@@ -259,10 +255,10 @@ public final class WidgetGadgetDataOuterClass {
       }
       emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData other = (emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData) obj;
 
-      if (!getGadgetEntityIdListList()
-          .equals(other.getGadgetEntityIdListList())) return false;
       if (getGadgetId()
           != other.getGadgetId()) return false;
+      if (!getGadgetEntityIdListList()
+          .equals(other.getGadgetEntityIdListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -274,12 +270,12 @@ public final class WidgetGadgetDataOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetId();
       if (getGadgetEntityIdListCount() > 0) {
         hash = (37 * hash) + GADGET_ENTITY_ID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getGadgetEntityIdListList().hashCode();
       }
-      hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -376,10 +372,6 @@ public final class WidgetGadgetDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: ENKCILBBOJN
-     * </pre>
-     *
      * Protobuf type {@code WidgetGadgetData}
      */
     public static final class Builder extends
@@ -417,10 +409,10 @@ public final class WidgetGadgetDataOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        gadgetEntityIdList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         gadgetId_ = 0;
 
+        gadgetEntityIdList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -448,12 +440,12 @@ public final class WidgetGadgetDataOuterClass {
       public emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData buildPartial() {
         emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData result = new emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData(this);
         int from_bitField0_ = bitField0_;
+        result.gadgetId_ = gadgetId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           gadgetEntityIdList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.gadgetEntityIdList_ = gadgetEntityIdList_;
-        result.gadgetId_ = gadgetId_;
         onBuilt();
         return result;
       }
@@ -502,6 +494,9 @@ public final class WidgetGadgetDataOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData other) {
         if (other == emu.grasscutter.net.proto.WidgetGadgetDataOuterClass.WidgetGadgetData.getDefaultInstance()) return this;
+        if (other.getGadgetId() != 0) {
+          setGadgetId(other.getGadgetId());
+        }
         if (!other.gadgetEntityIdList_.isEmpty()) {
           if (gadgetEntityIdList_.isEmpty()) {
             gadgetEntityIdList_ = other.gadgetEntityIdList_;
@@ -512,9 +507,6 @@ public final class WidgetGadgetDataOuterClass {
           }
           onChanged();
         }
-        if (other.getGadgetId() != 0) {
-          setGadgetId(other.getGadgetId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,6 +537,37 @@ public final class WidgetGadgetDataOuterClass {
       }
       private int bitField0_;
 
+      private int gadgetId_ ;
+      /**
+       * <code>uint32 gadget_id = 9;</code>
+       * @return The gadgetId.
+       */
+      @java.lang.Override
+      public int getGadgetId() {
+        return gadgetId_;
+      }
+      /**
+       * <code>uint32 gadget_id = 9;</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 = 9;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetId() {
+        
+        gadgetId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList gadgetEntityIdList_ = emptyIntList();
       private void ensureGadgetEntityIdListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -553,7 +576,7 @@ public final class WidgetGadgetDataOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @return A list containing the gadgetEntityIdList.
        */
       public java.util.List<java.lang.Integer>
@@ -562,14 +585,14 @@ public final class WidgetGadgetDataOuterClass {
                  java.util.Collections.unmodifiableList(gadgetEntityIdList_) : gadgetEntityIdList_;
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @return The count of gadgetEntityIdList.
        */
       public int getGadgetEntityIdListCount() {
         return gadgetEntityIdList_.size();
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @param index The index of the element to return.
        * @return The gadgetEntityIdList at the given index.
        */
@@ -577,7 +600,7 @@ public final class WidgetGadgetDataOuterClass {
         return gadgetEntityIdList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @param index The index to set the value at.
        * @param value The gadgetEntityIdList to set.
        * @return This builder for chaining.
@@ -590,7 +613,7 @@ public final class WidgetGadgetDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @param value The gadgetEntityIdList to add.
        * @return This builder for chaining.
        */
@@ -601,7 +624,7 @@ public final class WidgetGadgetDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @param values The gadgetEntityIdList to add.
        * @return This builder for chaining.
        */
@@ -614,7 +637,7 @@ public final class WidgetGadgetDataOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 gadget_entity_id_list = 4;</code>
+       * <code>repeated uint32 gadget_entity_id_list = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearGadgetEntityIdList() {
@@ -623,37 +646,6 @@ public final class WidgetGadgetDataOuterClass {
         onChanged();
         return this;
       }
-
-      private int gadgetId_ ;
-      /**
-       * <code>uint32 gadget_id = 3;</code>
-       * @return The gadgetId.
-       */
-      @java.lang.Override
-      public int getGadgetId() {
-        return gadgetId_;
-      }
-      /**
-       * <code>uint32 gadget_id = 3;</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 = 3;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearGadgetId() {
-        
-        gadgetId_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -722,8 +714,8 @@ public final class WidgetGadgetDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WidgetGadgetData.proto\"D\n\020WidgetGadget" +
-      "Data\022\035\n\025gadget_entity_id_list\030\004 \003(\r\022\021\n\tg" +
-      "adget_id\030\003 \001(\rB\033\n\031emu.grasscutter.net.pr" +
+      "Data\022\021\n\tgadget_id\030\t \001(\r\022\035\n\025gadget_entity" +
+      "_id_list\030\017 \003(\rB\033\n\031emu.grasscutter.net.pr" +
       "otob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -735,7 +727,7 @@ public final class WidgetGadgetDataOuterClass {
     internal_static_WidgetGadgetData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetGadgetData_descriptor,
-        new java.lang.String[] { "GadgetEntityIdList", "GadgetId", });
+        new java.lang.String[] { "GadgetId", "GadgetEntityIdList", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotChangeNotifyOuterClass.java
index d6b57a1c3..cd5d9d1f9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotChangeNotifyOuterClass.java
@@ -19,37 +19,32 @@ public final class WidgetSlotChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      * @return Whether the slot field is set.
      */
     boolean hasSlot();
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      * @return The slot.
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlot();
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      */
     emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotOrBuilder();
 
     /**
-     * <code>.WidgetSlotOp op = 1;</code>
+     * <code>.WidgetSlotOp op = 15;</code>
      * @return The enum numeric value on the wire for op.
      */
     int getOpValue();
     /**
-     * <code>.WidgetSlotOp op = 1;</code>
+     * <code>.WidgetSlotOp op = 15;</code>
      * @return The op.
      */
     emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp();
   }
   /**
-   * <pre>
-   * CmdId: 26889
-   * Obf: GMLDKFNJJCH
-   * </pre>
-   *
    * Protobuf type {@code WidgetSlotChangeNotify}
    */
   public static final class WidgetSlotChangeNotify extends
@@ -95,13 +90,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 8: {
-              int rawValue = input.readEnum();
-
-              op_ = rawValue;
-              break;
-            }
-            case 74: {
+            case 66: {
               emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder subBuilder = null;
               if (slot_ != null) {
                 subBuilder = slot_.toBuilder();
@@ -114,6 +103,12 @@ public final class WidgetSlotChangeNotifyOuterClass {
 
               break;
             }
+            case 120: {
+              int rawValue = input.readEnum();
+
+              op_ = rawValue;
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -146,10 +141,10 @@ public final class WidgetSlotChangeNotifyOuterClass {
               emu.grasscutter.net.proto.WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify.class, emu.grasscutter.net.proto.WidgetSlotChangeNotifyOuterClass.WidgetSlotChangeNotify.Builder.class);
     }
 
-    public static final int SLOT_FIELD_NUMBER = 9;
+    public static final int SLOT_FIELD_NUMBER = 8;
     private emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData slot_;
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      * @return Whether the slot field is set.
      */
     @java.lang.Override
@@ -157,7 +152,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
       return slot_ != null;
     }
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      * @return The slot.
      */
     @java.lang.Override
@@ -165,24 +160,24 @@ public final class WidgetSlotChangeNotifyOuterClass {
       return slot_ == null ? emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.getDefaultInstance() : slot_;
     }
     /**
-     * <code>.WidgetSlotData slot = 9;</code>
+     * <code>.WidgetSlotData slot = 8;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotOrBuilder() {
       return getSlot();
     }
 
-    public static final int OP_FIELD_NUMBER = 1;
+    public static final int OP_FIELD_NUMBER = 15;
     private int op_;
     /**
-     * <code>.WidgetSlotOp op = 1;</code>
+     * <code>.WidgetSlotOp op = 15;</code>
      * @return The enum numeric value on the wire for op.
      */
     @java.lang.Override public int getOpValue() {
       return op_;
     }
     /**
-     * <code>.WidgetSlotOp op = 1;</code>
+     * <code>.WidgetSlotOp op = 15;</code>
      * @return The op.
      */
     @java.lang.Override public emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp getOp() {
@@ -205,11 +200,11 @@ public final class WidgetSlotChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        output.writeEnum(1, op_);
-      }
       if (slot_ != null) {
-        output.writeMessage(9, getSlot());
+        output.writeMessage(8, getSlot());
+      }
+      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
+        output.writeEnum(15, op_);
       }
       unknownFields.writeTo(output);
     }
@@ -220,13 +215,13 @@ public final class WidgetSlotChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(1, op_);
-      }
       if (slot_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getSlot());
+          .computeMessageSize(8, getSlot());
+      }
+      if (op_ != emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.WIDGET_SLOT_OP_ATTACH.getNumber()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeEnumSize(15, op_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -362,11 +357,6 @@ public final class WidgetSlotChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26889
-     * Obf: GMLDKFNJJCH
-     * </pre>
-     *
      * Protobuf type {@code WidgetSlotChangeNotify}
      */
     public static final class Builder extends
@@ -531,14 +521,14 @@ public final class WidgetSlotChangeNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> slotBuilder_;
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        * @return Whether the slot field is set.
        */
       public boolean hasSlot() {
         return slotBuilder_ != null || slot_ != null;
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        * @return The slot.
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData getSlot() {
@@ -549,7 +539,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public Builder setSlot(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
         if (slotBuilder_ == null) {
@@ -565,7 +555,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public Builder setSlot(
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder builderForValue) {
@@ -579,7 +569,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public Builder mergeSlot(emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData value) {
         if (slotBuilder_ == null) {
@@ -597,7 +587,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public Builder clearSlot() {
         if (slotBuilder_ == null) {
@@ -611,7 +601,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder getSlotBuilder() {
         
@@ -619,7 +609,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return getSlotFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder getSlotOrBuilder() {
         if (slotBuilder_ != null) {
@@ -630,7 +620,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.WidgetSlotData slot = 9;</code>
+       * <code>.WidgetSlotData slot = 8;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotDataOrBuilder> 
@@ -648,14 +638,14 @@ public final class WidgetSlotChangeNotifyOuterClass {
 
       private int op_ = 0;
       /**
-       * <code>.WidgetSlotOp op = 1;</code>
+       * <code>.WidgetSlotOp op = 15;</code>
        * @return The enum numeric value on the wire for op.
        */
       @java.lang.Override public int getOpValue() {
         return op_;
       }
       /**
-       * <code>.WidgetSlotOp op = 1;</code>
+       * <code>.WidgetSlotOp op = 15;</code>
        * @param value The enum numeric value on the wire for op to set.
        * @return This builder for chaining.
        */
@@ -666,7 +656,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotOp op = 1;</code>
+       * <code>.WidgetSlotOp op = 15;</code>
        * @return The op.
        */
       @java.lang.Override
@@ -676,7 +666,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.WidgetSlotOpOuterClass.WidgetSlotOp.UNRECOGNIZED : result;
       }
       /**
-       * <code>.WidgetSlotOp op = 1;</code>
+       * <code>.WidgetSlotOp op = 15;</code>
        * @param value The op to set.
        * @return This builder for chaining.
        */
@@ -690,7 +680,7 @@ public final class WidgetSlotChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotOp op = 1;</code>
+       * <code>.WidgetSlotOp op = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearOp() {
@@ -768,8 +758,8 @@ public final class WidgetSlotChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\034WidgetSlotChangeNotify.proto\032\024WidgetSl" +
       "otData.proto\032\022WidgetSlotOp.proto\"R\n\026Widg" +
-      "etSlotChangeNotify\022\035\n\004slot\030\t \001(\0132\017.Widge" +
-      "tSlotData\022\031\n\002op\030\001 \001(\0162\r.WidgetSlotOpB\033\n\031" +
+      "etSlotChangeNotify\022\035\n\004slot\030\010 \001(\0132\017.Widge" +
+      "tSlotData\022\031\n\002op\030\017 \001(\0162\r.WidgetSlotOpB\033\n\031" +
       "emu.grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotDataOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotDataOuterClass.java
index 3e51c7888..c2d0ca441 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotDataOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotDataOuterClass.java
@@ -19,39 +19,35 @@ public final class WidgetSlotDataOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WidgetSlotTag tag = 11;</code>
+     * <code>.WidgetSlotTag tag = 1;</code>
      * @return The enum numeric value on the wire for tag.
      */
     int getTagValue();
     /**
-     * <code>.WidgetSlotTag tag = 11;</code>
+     * <code>.WidgetSlotTag tag = 1;</code>
      * @return The tag.
      */
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTag();
 
     /**
-     * <code>bool is_active = 7;</code>
-     * @return The isActive.
-     */
-    boolean getIsActive();
-
-    /**
-     * <code>uint32 material_id = 15;</code>
+     * <code>uint32 material_id = 9;</code>
      * @return The materialId.
      */
     int getMaterialId();
 
     /**
-     * <code>uint32 cd_over_time = 12;</code>
+     * <code>uint32 cd_over_time = 11;</code>
      * @return The cdOverTime.
      */
     int getCdOverTime();
+
+    /**
+     * <code>bool is_active = 12;</code>
+     * @return The isActive.
+     */
+    boolean getIsActive();
   }
   /**
-   * <pre>
-   * Obf: BMPCNILFGEJ
-   * </pre>
-   *
    * Protobuf type {@code WidgetSlotData}
    */
   public static final class WidgetSlotData extends
@@ -97,25 +93,25 @@ public final class WidgetSlotDataOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
-
-              isActive_ = input.readBool();
-              break;
-            }
-            case 88: {
+            case 8: {
               int rawValue = input.readEnum();
 
               tag_ = rawValue;
               break;
             }
-            case 96: {
+            case 72: {
+
+              materialId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
 
               cdOverTime_ = input.readUInt32();
               break;
             }
-            case 120: {
+            case 96: {
 
-              materialId_ = input.readUInt32();
+              isActive_ = input.readBool();
               break;
             }
             default: {
@@ -150,17 +146,17 @@ public final class WidgetSlotDataOuterClass {
               emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.class, emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData.Builder.class);
     }
 
-    public static final int TAG_FIELD_NUMBER = 11;
+    public static final int TAG_FIELD_NUMBER = 1;
     private int tag_;
     /**
-     * <code>.WidgetSlotTag tag = 11;</code>
+     * <code>.WidgetSlotTag tag = 1;</code>
      * @return The enum numeric value on the wire for tag.
      */
     @java.lang.Override public int getTagValue() {
       return tag_;
     }
     /**
-     * <code>.WidgetSlotTag tag = 11;</code>
+     * <code>.WidgetSlotTag tag = 1;</code>
      * @return The tag.
      */
     @java.lang.Override public emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag getTag() {
@@ -169,21 +165,10 @@ public final class WidgetSlotDataOuterClass {
       return result == null ? emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag.UNRECOGNIZED : result;
     }
 
-    public static final int IS_ACTIVE_FIELD_NUMBER = 7;
-    private boolean isActive_;
-    /**
-     * <code>bool is_active = 7;</code>
-     * @return The isActive.
-     */
-    @java.lang.Override
-    public boolean getIsActive() {
-      return isActive_;
-    }
-
-    public static final int MATERIAL_ID_FIELD_NUMBER = 15;
+    public static final int MATERIAL_ID_FIELD_NUMBER = 9;
     private int materialId_;
     /**
-     * <code>uint32 material_id = 15;</code>
+     * <code>uint32 material_id = 9;</code>
      * @return The materialId.
      */
     @java.lang.Override
@@ -191,10 +176,10 @@ public final class WidgetSlotDataOuterClass {
       return materialId_;
     }
 
-    public static final int CD_OVER_TIME_FIELD_NUMBER = 12;
+    public static final int CD_OVER_TIME_FIELD_NUMBER = 11;
     private int cdOverTime_;
     /**
-     * <code>uint32 cd_over_time = 12;</code>
+     * <code>uint32 cd_over_time = 11;</code>
      * @return The cdOverTime.
      */
     @java.lang.Override
@@ -202,6 +187,17 @@ public final class WidgetSlotDataOuterClass {
       return cdOverTime_;
     }
 
+    public static final int IS_ACTIVE_FIELD_NUMBER = 12;
+    private boolean isActive_;
+    /**
+     * <code>bool is_active = 12;</code>
+     * @return The isActive.
+     */
+    @java.lang.Override
+    public boolean getIsActive() {
+      return isActive_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -216,17 +212,17 @@ public final class WidgetSlotDataOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (isActive_ != false) {
-        output.writeBool(7, isActive_);
-      }
       if (tag_ != emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_TAG_QUICK_USE.getNumber()) {
-        output.writeEnum(11, tag_);
-      }
-      if (cdOverTime_ != 0) {
-        output.writeUInt32(12, cdOverTime_);
+        output.writeEnum(1, tag_);
       }
       if (materialId_ != 0) {
-        output.writeUInt32(15, materialId_);
+        output.writeUInt32(9, materialId_);
+      }
+      if (cdOverTime_ != 0) {
+        output.writeUInt32(11, cdOverTime_);
+      }
+      if (isActive_ != false) {
+        output.writeBool(12, isActive_);
       }
       unknownFields.writeTo(output);
     }
@@ -237,21 +233,21 @@ public final class WidgetSlotDataOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (isActive_ != false) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(7, isActive_);
-      }
       if (tag_ != emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag.WIDGET_SLOT_TAG_QUICK_USE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(11, tag_);
-      }
-      if (cdOverTime_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, cdOverTime_);
+          .computeEnumSize(1, tag_);
       }
       if (materialId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(15, materialId_);
+          .computeUInt32Size(9, materialId_);
+      }
+      if (cdOverTime_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, cdOverTime_);
+      }
+      if (isActive_ != false) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBoolSize(12, isActive_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -269,12 +265,12 @@ public final class WidgetSlotDataOuterClass {
       emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData other = (emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData) obj;
 
       if (tag_ != other.tag_) return false;
-      if (getIsActive()
-          != other.getIsActive()) return false;
       if (getMaterialId()
           != other.getMaterialId()) return false;
       if (getCdOverTime()
           != other.getCdOverTime()) return false;
+      if (getIsActive()
+          != other.getIsActive()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -288,13 +284,13 @@ public final class WidgetSlotDataOuterClass {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + TAG_FIELD_NUMBER;
       hash = (53 * hash) + tag_;
-      hash = (37 * hash) + IS_ACTIVE_FIELD_NUMBER;
-      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
-          getIsActive());
       hash = (37 * hash) + MATERIAL_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMaterialId();
       hash = (37 * hash) + CD_OVER_TIME_FIELD_NUMBER;
       hash = (53 * hash) + getCdOverTime();
+      hash = (37 * hash) + IS_ACTIVE_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+          getIsActive());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -391,10 +387,6 @@ public final class WidgetSlotDataOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: BMPCNILFGEJ
-     * </pre>
-     *
      * Protobuf type {@code WidgetSlotData}
      */
     public static final class Builder extends
@@ -434,12 +426,12 @@ public final class WidgetSlotDataOuterClass {
         super.clear();
         tag_ = 0;
 
-        isActive_ = false;
-
         materialId_ = 0;
 
         cdOverTime_ = 0;
 
+        isActive_ = false;
+
         return this;
       }
 
@@ -467,9 +459,9 @@ public final class WidgetSlotDataOuterClass {
       public emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData buildPartial() {
         emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData result = new emu.grasscutter.net.proto.WidgetSlotDataOuterClass.WidgetSlotData(this);
         result.tag_ = tag_;
-        result.isActive_ = isActive_;
         result.materialId_ = materialId_;
         result.cdOverTime_ = cdOverTime_;
+        result.isActive_ = isActive_;
         onBuilt();
         return result;
       }
@@ -521,15 +513,15 @@ public final class WidgetSlotDataOuterClass {
         if (other.tag_ != 0) {
           setTagValue(other.getTagValue());
         }
-        if (other.getIsActive() != false) {
-          setIsActive(other.getIsActive());
-        }
         if (other.getMaterialId() != 0) {
           setMaterialId(other.getMaterialId());
         }
         if (other.getCdOverTime() != 0) {
           setCdOverTime(other.getCdOverTime());
         }
+        if (other.getIsActive() != false) {
+          setIsActive(other.getIsActive());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -561,14 +553,14 @@ public final class WidgetSlotDataOuterClass {
 
       private int tag_ = 0;
       /**
-       * <code>.WidgetSlotTag tag = 11;</code>
+       * <code>.WidgetSlotTag tag = 1;</code>
        * @return The enum numeric value on the wire for tag.
        */
       @java.lang.Override public int getTagValue() {
         return tag_;
       }
       /**
-       * <code>.WidgetSlotTag tag = 11;</code>
+       * <code>.WidgetSlotTag tag = 1;</code>
        * @param value The enum numeric value on the wire for tag to set.
        * @return This builder for chaining.
        */
@@ -579,7 +571,7 @@ public final class WidgetSlotDataOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotTag tag = 11;</code>
+       * <code>.WidgetSlotTag tag = 1;</code>
        * @return The tag.
        */
       @java.lang.Override
@@ -589,7 +581,7 @@ public final class WidgetSlotDataOuterClass {
         return result == null ? emu.grasscutter.net.proto.WidgetSlotTagOuterClass.WidgetSlotTag.UNRECOGNIZED : result;
       }
       /**
-       * <code>.WidgetSlotTag tag = 11;</code>
+       * <code>.WidgetSlotTag tag = 1;</code>
        * @param value The tag to set.
        * @return This builder for chaining.
        */
@@ -603,7 +595,7 @@ public final class WidgetSlotDataOuterClass {
         return this;
       }
       /**
-       * <code>.WidgetSlotTag tag = 11;</code>
+       * <code>.WidgetSlotTag tag = 1;</code>
        * @return This builder for chaining.
        */
       public Builder clearTag() {
@@ -613,40 +605,9 @@ public final class WidgetSlotDataOuterClass {
         return this;
       }
 
-      private boolean isActive_ ;
-      /**
-       * <code>bool is_active = 7;</code>
-       * @return The isActive.
-       */
-      @java.lang.Override
-      public boolean getIsActive() {
-        return isActive_;
-      }
-      /**
-       * <code>bool is_active = 7;</code>
-       * @param value The isActive to set.
-       * @return This builder for chaining.
-       */
-      public Builder setIsActive(boolean value) {
-        
-        isActive_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>bool is_active = 7;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsActive() {
-        
-        isActive_ = false;
-        onChanged();
-        return this;
-      }
-
       private int materialId_ ;
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 9;</code>
        * @return The materialId.
        */
       @java.lang.Override
@@ -654,7 +615,7 @@ public final class WidgetSlotDataOuterClass {
         return materialId_;
       }
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 9;</code>
        * @param value The materialId to set.
        * @return This builder for chaining.
        */
@@ -665,7 +626,7 @@ public final class WidgetSlotDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 material_id = 15;</code>
+       * <code>uint32 material_id = 9;</code>
        * @return This builder for chaining.
        */
       public Builder clearMaterialId() {
@@ -677,7 +638,7 @@ public final class WidgetSlotDataOuterClass {
 
       private int cdOverTime_ ;
       /**
-       * <code>uint32 cd_over_time = 12;</code>
+       * <code>uint32 cd_over_time = 11;</code>
        * @return The cdOverTime.
        */
       @java.lang.Override
@@ -685,7 +646,7 @@ public final class WidgetSlotDataOuterClass {
         return cdOverTime_;
       }
       /**
-       * <code>uint32 cd_over_time = 12;</code>
+       * <code>uint32 cd_over_time = 11;</code>
        * @param value The cdOverTime to set.
        * @return This builder for chaining.
        */
@@ -696,7 +657,7 @@ public final class WidgetSlotDataOuterClass {
         return this;
       }
       /**
-       * <code>uint32 cd_over_time = 12;</code>
+       * <code>uint32 cd_over_time = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearCdOverTime() {
@@ -705,6 +666,37 @@ public final class WidgetSlotDataOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isActive_ ;
+      /**
+       * <code>bool is_active = 12;</code>
+       * @return The isActive.
+       */
+      @java.lang.Override
+      public boolean getIsActive() {
+        return isActive_;
+      }
+      /**
+       * <code>bool is_active = 12;</code>
+       * @param value The isActive to set.
+       * @return This builder for chaining.
+       */
+      public Builder setIsActive(boolean value) {
+        
+        isActive_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>bool is_active = 12;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsActive() {
+        
+        isActive_ = false;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -773,9 +765,9 @@ public final class WidgetSlotDataOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\024WidgetSlotData.proto\032\023WidgetSlotTag.pr" +
-      "oto\"k\n\016WidgetSlotData\022\033\n\003tag\030\013 \001(\0162\016.Wid" +
-      "getSlotTag\022\021\n\tis_active\030\007 \001(\010\022\023\n\013materia" +
-      "l_id\030\017 \001(\r\022\024\n\014cd_over_time\030\014 \001(\rB\033\n\031emu." +
+      "oto\"k\n\016WidgetSlotData\022\033\n\003tag\030\001 \001(\0162\016.Wid" +
+      "getSlotTag\022\023\n\013material_id\030\t \001(\r\022\024\n\014cd_ov" +
+      "er_time\030\013 \001(\r\022\021\n\tis_active\030\014 \001(\010B\033\n\031emu." +
       "grasscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -788,7 +780,7 @@ public final class WidgetSlotDataOuterClass {
     internal_static_WidgetSlotData_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WidgetSlotData_descriptor,
-        new java.lang.String[] { "Tag", "IsActive", "MaterialId", "CdOverTime", });
+        new java.lang.String[] { "Tag", "MaterialId", "CdOverTime", "IsActive", });
     emu.grasscutter.net.proto.WidgetSlotTagOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotOpOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotOpOuterClass.java
index 51c3184d2..50c46fa32 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotOpOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotOpOuterClass.java
@@ -15,10 +15,6 @@ public final class WidgetSlotOpOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: DPNIPOMNPFI
-   * </pre>
-   *
    * Protobuf enum {@code WidgetSlotOp}
    */
   public enum WidgetSlotOp
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotTagOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotTagOuterClass.java
index 1ba0f6abc..ec0ab2cba 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotTagOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WidgetSlotTagOuterClass.java
@@ -15,10 +15,6 @@ public final class WidgetSlotTagOuterClass {
         (com.google.protobuf.ExtensionRegistryLite) registry);
   }
   /**
-   * <pre>
-   * Obf: BOCCJPKHICL
-   * </pre>
-   *
    * Protobuf enum {@code WidgetSlotTag}
    */
   public enum WidgetSlotTag
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 6c27a870c..9833755d9 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WindSeedType1NotifyOuterClass.java
@@ -19,23 +19,18 @@ public final class WindSeedType1NotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 config_id = 12;</code>
+     * <code>uint32 config_id = 5;</code>
      * @return The configId.
      */
     int getConfigId();
 
     /**
-     * <code>bytes payload = 2;</code>
+     * <code>bytes payload = 8;</code>
      * @return The payload.
      */
     com.google.protobuf.ByteString getPayload();
   }
   /**
-   * <pre>
-   * CmdId: 3604
-   * Obf: FGKAHIENJJG
-   * </pre>
-   *
    * Protobuf type {@code WindSeedType1Notify}
    */
   public static final class WindSeedType1Notify extends
@@ -81,16 +76,16 @@ public final class WindSeedType1NotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 18: {
-
-              payload_ = input.readBytes();
-              break;
-            }
-            case 96: {
+            case 40: {
 
               configId_ = input.readUInt32();
               break;
             }
+            case 66: {
+
+              payload_ = input.readBytes();
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -123,10 +118,10 @@ public final class WindSeedType1NotifyOuterClass {
               emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.class, emu.grasscutter.net.proto.WindSeedType1NotifyOuterClass.WindSeedType1Notify.Builder.class);
     }
 
-    public static final int CONFIG_ID_FIELD_NUMBER = 12;
+    public static final int CONFIG_ID_FIELD_NUMBER = 5;
     private int configId_;
     /**
-     * <code>uint32 config_id = 12;</code>
+     * <code>uint32 config_id = 5;</code>
      * @return The configId.
      */
     @java.lang.Override
@@ -134,10 +129,10 @@ public final class WindSeedType1NotifyOuterClass {
       return configId_;
     }
 
-    public static final int PAYLOAD_FIELD_NUMBER = 2;
+    public static final int PAYLOAD_FIELD_NUMBER = 8;
     private com.google.protobuf.ByteString payload_;
     /**
-     * <code>bytes payload = 2;</code>
+     * <code>bytes payload = 8;</code>
      * @return The payload.
      */
     @java.lang.Override
@@ -159,11 +154,11 @@ public final class WindSeedType1NotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (!payload_.isEmpty()) {
-        output.writeBytes(2, payload_);
-      }
       if (configId_ != 0) {
-        output.writeUInt32(12, configId_);
+        output.writeUInt32(5, configId_);
+      }
+      if (!payload_.isEmpty()) {
+        output.writeBytes(8, payload_);
       }
       unknownFields.writeTo(output);
     }
@@ -174,13 +169,13 @@ public final class WindSeedType1NotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (!payload_.isEmpty()) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(2, payload_);
-      }
       if (configId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, configId_);
+          .computeUInt32Size(5, configId_);
+      }
+      if (!payload_.isEmpty()) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(8, payload_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -312,11 +307,6 @@ public final class WindSeedType1NotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3604
-     * Obf: FGKAHIENJJG
-     * </pre>
-     *
      * Protobuf type {@code WindSeedType1Notify}
      */
     public static final class Builder extends
@@ -471,7 +461,7 @@ public final class WindSeedType1NotifyOuterClass {
 
       private int configId_ ;
       /**
-       * <code>uint32 config_id = 12;</code>
+       * <code>uint32 config_id = 5;</code>
        * @return The configId.
        */
       @java.lang.Override
@@ -479,7 +469,7 @@ public final class WindSeedType1NotifyOuterClass {
         return configId_;
       }
       /**
-       * <code>uint32 config_id = 12;</code>
+       * <code>uint32 config_id = 5;</code>
        * @param value The configId to set.
        * @return This builder for chaining.
        */
@@ -490,7 +480,7 @@ public final class WindSeedType1NotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 config_id = 12;</code>
+       * <code>uint32 config_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearConfigId() {
@@ -502,7 +492,7 @@ public final class WindSeedType1NotifyOuterClass {
 
       private com.google.protobuf.ByteString payload_ = com.google.protobuf.ByteString.EMPTY;
       /**
-       * <code>bytes payload = 2;</code>
+       * <code>bytes payload = 8;</code>
        * @return The payload.
        */
       @java.lang.Override
@@ -510,7 +500,7 @@ public final class WindSeedType1NotifyOuterClass {
         return payload_;
       }
       /**
-       * <code>bytes payload = 2;</code>
+       * <code>bytes payload = 8;</code>
        * @param value The payload to set.
        * @return This builder for chaining.
        */
@@ -524,7 +514,7 @@ public final class WindSeedType1NotifyOuterClass {
         return this;
       }
       /**
-       * <code>bytes payload = 2;</code>
+       * <code>bytes payload = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearPayload() {
@@ -601,8 +591,8 @@ public final class WindSeedType1NotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031WindSeedType1Notify.proto\"9\n\023WindSeedT" +
-      "ype1Notify\022\021\n\tconfig_id\030\014 \001(\r\022\017\n\007payload" +
-      "\030\002 \001(\014B\033\n\031emu.grasscutter.net.protob\006pro" +
+      "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" +
       "to3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorktopInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorktopInfoOuterClass.java
index c08019e96..d026b7f71 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorktopInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorktopInfoOuterClass.java
@@ -43,7 +43,7 @@ public final class WorktopInfoOuterClass {
   }
   /**
    * <pre>
-   * Obf: FHDMCJINDAH
+   * 5.0.0
    * </pre>
    *
    * Protobuf type {@code WorktopInfo}
@@ -378,7 +378,7 @@ public final class WorktopInfoOuterClass {
     }
     /**
      * <pre>
-     * Obf: FHDMCJINDAH
+     * 5.0.0
      * </pre>
      *
      * Protobuf type {@code WorktopInfo}
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorktopOptionNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorktopOptionNotifyOuterClass.java
index 11bc36b28..94ddeeaba 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorktopOptionNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorktopOptionNotifyOuterClass.java
@@ -19,34 +19,29 @@ public final class WorktopOptionNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>uint32 gadget_entity_id = 7;</code>
+     * @return The gadgetEntityId.
+     */
+    int getGadgetEntityId();
+
+    /**
+     * <code>repeated uint32 option_list = 11;</code>
      * @return A list containing the optionList.
      */
     java.util.List<java.lang.Integer> getOptionListList();
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>repeated uint32 option_list = 11;</code>
      * @return The count of optionList.
      */
     int getOptionListCount();
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>repeated uint32 option_list = 11;</code>
      * @param index The index of the element to return.
      * @return The optionList at the given index.
      */
     int getOptionList(int index);
-
-    /**
-     * <code>uint32 gadget_entity_id = 3;</code>
-     * @return The gadgetEntityId.
-     */
-    int getGadgetEntityId();
   }
   /**
-   * <pre>
-   * CmdId: 925
-   * Obf: AMKENHADEJN
-   * </pre>
-   *
    * Protobuf type {@code WorktopOptionNotify}
    */
   public static final class WorktopOptionNotify extends
@@ -93,12 +88,12 @@ public final class WorktopOptionNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 24: {
+            case 56: {
 
               gadgetEntityId_ = input.readUInt32();
               break;
             }
-            case 56: {
+            case 88: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 optionList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -106,7 +101,7 @@ public final class WorktopOptionNotifyOuterClass {
               optionList_.addInt(input.readUInt32());
               break;
             }
-            case 58: {
+            case 90: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -154,10 +149,21 @@ public final class WorktopOptionNotifyOuterClass {
               emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify.class, emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify.Builder.class);
     }
 
-    public static final int OPTION_LIST_FIELD_NUMBER = 7;
+    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 7;
+    private int gadgetEntityId_;
+    /**
+     * <code>uint32 gadget_entity_id = 7;</code>
+     * @return The gadgetEntityId.
+     */
+    @java.lang.Override
+    public int getGadgetEntityId() {
+      return gadgetEntityId_;
+    }
+
+    public static final int OPTION_LIST_FIELD_NUMBER = 11;
     private com.google.protobuf.Internal.IntList optionList_;
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>repeated uint32 option_list = 11;</code>
      * @return A list containing the optionList.
      */
     @java.lang.Override
@@ -166,14 +172,14 @@ public final class WorktopOptionNotifyOuterClass {
       return optionList_;
     }
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>repeated uint32 option_list = 11;</code>
      * @return The count of optionList.
      */
     public int getOptionListCount() {
       return optionList_.size();
     }
     /**
-     * <code>repeated uint32 option_list = 7;</code>
+     * <code>repeated uint32 option_list = 11;</code>
      * @param index The index of the element to return.
      * @return The optionList at the given index.
      */
@@ -182,17 +188,6 @@ public final class WorktopOptionNotifyOuterClass {
     }
     private int optionListMemoizedSerializedSize = -1;
 
-    public static final int GADGET_ENTITY_ID_FIELD_NUMBER = 3;
-    private int gadgetEntityId_;
-    /**
-     * <code>uint32 gadget_entity_id = 3;</code>
-     * @return The gadgetEntityId.
-     */
-    @java.lang.Override
-    public int getGadgetEntityId() {
-      return gadgetEntityId_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -209,10 +204,10 @@ public final class WorktopOptionNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       if (gadgetEntityId_ != 0) {
-        output.writeUInt32(3, gadgetEntityId_);
+        output.writeUInt32(7, gadgetEntityId_);
       }
       if (getOptionListList().size() > 0) {
-        output.writeUInt32NoTag(58);
+        output.writeUInt32NoTag(90);
         output.writeUInt32NoTag(optionListMemoizedSerializedSize);
       }
       for (int i = 0; i < optionList_.size(); i++) {
@@ -229,7 +224,7 @@ public final class WorktopOptionNotifyOuterClass {
       size = 0;
       if (gadgetEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(3, gadgetEntityId_);
+          .computeUInt32Size(7, gadgetEntityId_);
       }
       {
         int dataSize = 0;
@@ -260,10 +255,10 @@ public final class WorktopOptionNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify other = (emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify) obj;
 
-      if (!getOptionListList()
-          .equals(other.getOptionListList())) return false;
       if (getGadgetEntityId()
           != other.getGadgetEntityId()) return false;
+      if (!getOptionListList()
+          .equals(other.getOptionListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -275,12 +270,12 @@ public final class WorktopOptionNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getGadgetEntityId();
       if (getOptionListCount() > 0) {
         hash = (37 * hash) + OPTION_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getOptionListList().hashCode();
       }
-      hash = (37 * hash) + GADGET_ENTITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getGadgetEntityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,11 +372,6 @@ public final class WorktopOptionNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 925
-     * Obf: AMKENHADEJN
-     * </pre>
-     *
      * Protobuf type {@code WorktopOptionNotify}
      */
     public static final class Builder extends
@@ -419,10 +409,10 @@ public final class WorktopOptionNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        optionList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000001);
         gadgetEntityId_ = 0;
 
+        optionList_ = emptyIntList();
+        bitField0_ = (bitField0_ & ~0x00000001);
         return this;
       }
 
@@ -450,12 +440,12 @@ public final class WorktopOptionNotifyOuterClass {
       public emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify buildPartial() {
         emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify result = new emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify(this);
         int from_bitField0_ = bitField0_;
+        result.gadgetEntityId_ = gadgetEntityId_;
         if (((bitField0_ & 0x00000001) != 0)) {
           optionList_.makeImmutable();
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.optionList_ = optionList_;
-        result.gadgetEntityId_ = gadgetEntityId_;
         onBuilt();
         return result;
       }
@@ -504,6 +494,9 @@ public final class WorktopOptionNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify other) {
         if (other == emu.grasscutter.net.proto.WorktopOptionNotifyOuterClass.WorktopOptionNotify.getDefaultInstance()) return this;
+        if (other.getGadgetEntityId() != 0) {
+          setGadgetEntityId(other.getGadgetEntityId());
+        }
         if (!other.optionList_.isEmpty()) {
           if (optionList_.isEmpty()) {
             optionList_ = other.optionList_;
@@ -514,9 +507,6 @@ public final class WorktopOptionNotifyOuterClass {
           }
           onChanged();
         }
-        if (other.getGadgetEntityId() != 0) {
-          setGadgetEntityId(other.getGadgetEntityId());
-        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -547,6 +537,37 @@ public final class WorktopOptionNotifyOuterClass {
       }
       private int bitField0_;
 
+      private int gadgetEntityId_ ;
+      /**
+       * <code>uint32 gadget_entity_id = 7;</code>
+       * @return The gadgetEntityId.
+       */
+      @java.lang.Override
+      public int getGadgetEntityId() {
+        return gadgetEntityId_;
+      }
+      /**
+       * <code>uint32 gadget_entity_id = 7;</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 = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGadgetEntityId() {
+        
+        gadgetEntityId_ = 0;
+        onChanged();
+        return this;
+      }
+
       private com.google.protobuf.Internal.IntList optionList_ = emptyIntList();
       private void ensureOptionListIsMutable() {
         if (!((bitField0_ & 0x00000001) != 0)) {
@@ -555,7 +576,7 @@ public final class WorktopOptionNotifyOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @return A list containing the optionList.
        */
       public java.util.List<java.lang.Integer>
@@ -564,14 +585,14 @@ public final class WorktopOptionNotifyOuterClass {
                  java.util.Collections.unmodifiableList(optionList_) : optionList_;
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @return The count of optionList.
        */
       public int getOptionListCount() {
         return optionList_.size();
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @param index The index of the element to return.
        * @return The optionList at the given index.
        */
@@ -579,7 +600,7 @@ public final class WorktopOptionNotifyOuterClass {
         return optionList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @param index The index to set the value at.
        * @param value The optionList to set.
        * @return This builder for chaining.
@@ -592,7 +613,7 @@ public final class WorktopOptionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @param value The optionList to add.
        * @return This builder for chaining.
        */
@@ -603,7 +624,7 @@ public final class WorktopOptionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @param values The optionList to add.
        * @return This builder for chaining.
        */
@@ -616,7 +637,7 @@ public final class WorktopOptionNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 option_list = 7;</code>
+       * <code>repeated uint32 option_list = 11;</code>
        * @return This builder for chaining.
        */
       public Builder clearOptionList() {
@@ -625,37 +646,6 @@ public final class WorktopOptionNotifyOuterClass {
         onChanged();
         return this;
       }
-
-      private int gadgetEntityId_ ;
-      /**
-       * <code>uint32 gadget_entity_id = 3;</code>
-       * @return The gadgetEntityId.
-       */
-      @java.lang.Override
-      public int getGadgetEntityId() {
-        return gadgetEntityId_;
-      }
-      /**
-       * <code>uint32 gadget_entity_id = 3;</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 = 3;</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) {
@@ -724,8 +714,8 @@ public final class WorktopOptionNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\031WorktopOptionNotify.proto\"D\n\023WorktopOp" +
-      "tionNotify\022\023\n\013option_list\030\007 \003(\r\022\030\n\020gadge" +
-      "t_entity_id\030\003 \001(\rB\033\n\031emu.grasscutter.net" +
+      "tionNotify\022\030\n\020gadget_entity_id\030\007 \001(\r\022\023\n\013" +
+      "option_list\030\013 \003(\rB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -737,7 +727,7 @@ public final class WorktopOptionNotifyOuterClass {
     internal_static_WorktopOptionNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorktopOptionNotify_descriptor,
-        new java.lang.String[] { "OptionList", "GadgetEntityId", });
+        new java.lang.String[] { "GadgetEntityId", "OptionList", });
   }
 
   // @@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 b6dc9d5a0..0d5252837 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,11 @@ public final class WorldDataNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     int getWorldPropMapCount();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     boolean containsWorldPropMap(
         int key);
@@ -34,30 +34,25 @@ public final class WorldDataNotifyOuterClass {
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getWorldPropMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     java.util.Map<java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue>
     getWorldPropMapMap();
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</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 = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
 
     emu.grasscutter.net.proto.PropValueOuterClass.PropValue getWorldPropMapOrThrow(
         int key);
   }
   /**
-   * <pre>
-   * CmdId: 813
-   * Obf: FOHMBEGKOHM
-   * </pre>
-   *
    * Protobuf type {@code WorldDataNotify}
    */
   public static final class WorldDataNotify extends
@@ -103,7 +98,7 @@ public final class WorldDataNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 98: {
+            case 26: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 worldPropMap_ = com.google.protobuf.MapField.newMapField(
                     WorldPropMapDefaultEntryHolder.defaultEntry);
@@ -145,7 +140,7 @@ public final class WorldDataNotifyOuterClass {
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
-        case 12:
+        case 3:
           return internalGetWorldPropMap();
         default:
           throw new RuntimeException(
@@ -160,7 +155,7 @@ public final class WorldDataNotifyOuterClass {
               emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify.class, emu.grasscutter.net.proto.WorldDataNotifyOuterClass.WorldDataNotify.Builder.class);
     }
 
-    public static final int WORLD_PROP_MAP_FIELD_NUMBER = 12;
+    public static final int WORLD_PROP_MAP_FIELD_NUMBER = 3;
     private static final class WorldPropMapDefaultEntryHolder {
       static final com.google.protobuf.MapEntry<
           java.lang.Integer, emu.grasscutter.net.proto.PropValueOuterClass.PropValue> defaultEntry =
@@ -187,7 +182,7 @@ public final class WorldDataNotifyOuterClass {
       return internalGetWorldPropMap().getMap().size();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
 
     @java.lang.Override
@@ -205,7 +200,7 @@ public final class WorldDataNotifyOuterClass {
       return getWorldPropMapMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -213,7 +208,7 @@ public final class WorldDataNotifyOuterClass {
       return internalGetWorldPropMap().getMap();
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -226,7 +221,7 @@ public final class WorldDataNotifyOuterClass {
       return map.containsKey(key) ? map.get(key) : defaultValue;
     }
     /**
-     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+     * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
      */
     @java.lang.Override
 
@@ -260,7 +255,7 @@ public final class WorldDataNotifyOuterClass {
           output,
           internalGetWorldPropMap(),
           WorldPropMapDefaultEntryHolder.defaultEntry,
-          12);
+          3);
       unknownFields.writeTo(output);
     }
 
@@ -278,7 +273,7 @@ public final class WorldDataNotifyOuterClass {
             .setValue(entry.getValue())
             .build();
         size += com.google.protobuf.CodedOutputStream
-            .computeMessageSize(12, worldPropMap__);
+            .computeMessageSize(3, worldPropMap__);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -408,11 +403,6 @@ public final class WorldDataNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 813
-     * Obf: FOHMBEGKOHM
-     * </pre>
-     *
      * Protobuf type {@code WorldDataNotify}
      */
     public static final class Builder extends
@@ -428,7 +418,7 @@ public final class WorldDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 3:
             return internalGetWorldPropMap();
           default:
             throw new RuntimeException(
@@ -439,7 +429,7 @@ public final class WorldDataNotifyOuterClass {
       protected com.google.protobuf.MapField internalGetMutableMapField(
           int number) {
         switch (number) {
-          case 12:
+          case 3:
             return internalGetMutableWorldPropMap();
           default:
             throw new RuntimeException(
@@ -609,7 +599,7 @@ public final class WorldDataNotifyOuterClass {
         return internalGetWorldPropMap().getMap().size();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
 
       @java.lang.Override
@@ -627,7 +617,7 @@ public final class WorldDataNotifyOuterClass {
         return getWorldPropMapMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -635,7 +625,7 @@ public final class WorldDataNotifyOuterClass {
         return internalGetWorldPropMap().getMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -648,7 +638,7 @@ public final class WorldDataNotifyOuterClass {
         return map.containsKey(key) ? map.get(key) : defaultValue;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
       @java.lang.Override
 
@@ -669,7 +659,7 @@ public final class WorldDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
 
       public Builder removeWorldPropMap(
@@ -688,7 +678,7 @@ public final class WorldDataNotifyOuterClass {
         return internalGetMutableWorldPropMap().getMutableMap();
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
       public Builder putWorldPropMap(
           int key,
@@ -700,7 +690,7 @@ public final class WorldDataNotifyOuterClass {
         return this;
       }
       /**
-       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 12;</code>
+       * <code>map&lt;uint32, .PropValue&gt; world_prop_map = 3;</code>
        */
 
       public Builder putAllWorldPropMap(
@@ -782,7 +772,7 @@ public final class WorldDataNotifyOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\025WorldDataNotify.proto\032\017PropValue.proto" +
-      "\"\216\001\n\017WorldDataNotify\022:\n\016world_prop_map\030\014" +
+      "\"\216\001\n\017WorldDataNotify\022:\n\016world_prop_map\030\003" +
       " \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/generated/main/java/emu/grasscutter/net/proto/WorldPlayerDieNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerDieNotifyOuterClass.java
index 6b824f9ec..d5fc1044c 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerDieNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerDieNotifyOuterClass.java
@@ -19,52 +19,72 @@ public final class WorldPlayerDieNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 murderer_entity_id = 9;</code>
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     * @return Whether the gOEACHAMIAF field is set.
+     */
+    boolean hasGOEACHAMIAF();
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     * @return The gOEACHAMIAF.
+     */
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF();
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     */
+    emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder();
+
+    /**
+     * <pre>
+     * 7
+     * </pre>
+     *
+     * <code>uint32 murderer_entity_id = 5;</code>
      * @return The murdererEntityId.
      */
     int getMurdererEntityId();
 
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <code>uint32 GKHNLKAADNG = 7;</code>
+     * @return The gKHNLKAADNG.
+     */
+    int getGKHNLKAADNG();
+
+    /**
+     * <code>.PlayerDieType die_type = 15;</code>
      * @return The enum numeric value on the wire for dieType.
      */
     int getDieTypeValue();
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <code>.PlayerDieType die_type = 15;</code>
      * @return The dieType.
      */
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType();
 
     /**
-     * <code>uint32 monster_id = 8;</code>
-     * @return Whether the monsterId field is set.
-     */
-    boolean hasMonsterId();
-    /**
-     * <code>uint32 monster_id = 8;</code>
-     * @return The monsterId.
-     */
-    int getMonsterId();
-
-    /**
-     * <code>uint32 gadget_id = 5;</code>
+     * <code>uint32 gadget_id = 3;</code>
      * @return Whether the gadgetId field is set.
      */
     boolean hasGadgetId();
     /**
-     * <code>uint32 gadget_id = 5;</code>
+     * <code>uint32 gadget_id = 3;</code>
      * @return The gadgetId.
      */
     int getGadgetId();
 
+    /**
+     * <code>uint32 monster_id = 11;</code>
+     * @return Whether the monsterId field is set.
+     */
+    boolean hasMonsterId();
+    /**
+     * <code>uint32 monster_id = 11;</code>
+     * @return The monsterId.
+     */
+    int getMonsterId();
+
     public emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify.EntityCase getEntityCase();
   }
   /**
-   * <pre>
-   * CmdId: 26320
-   * Obf: AEFKDABOLLO
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerDieNotify}
    */
   public static final class WorldPlayerDieNotify extends
@@ -110,22 +130,40 @@ public final class WorldPlayerDieNotifyOuterClass {
             case 0:
               done = true;
               break;
+            case 10: {
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder subBuilder = null;
+              if (gOEACHAMIAF_ != null) {
+                subBuilder = gOEACHAMIAF_.toBuilder();
+              }
+              gOEACHAMIAF_ = input.readMessage(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(gOEACHAMIAF_);
+                gOEACHAMIAF_ = subBuilder.buildPartial();
+              }
+
+              break;
+            }
+            case 24: {
+              entityCase_ = 3;
+              entity_ = input.readUInt32();
+              break;
+            }
             case 40: {
-              entityCase_ = 5;
-              entity_ = input.readUInt32();
-              break;
-            }
-            case 64: {
-              entityCase_ = 8;
-              entity_ = input.readUInt32();
-              break;
-            }
-            case 72: {
 
               murdererEntityId_ = input.readUInt32();
               break;
             }
-            case 80: {
+            case 56: {
+
+              gKHNLKAADNG_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+              entityCase_ = 11;
+              entity_ = input.readUInt32();
+              break;
+            }
+            case 120: {
               int rawValue = input.readEnum();
 
               dieType_ = rawValue;
@@ -168,8 +206,8 @@ public final class WorldPlayerDieNotifyOuterClass {
     public enum EntityCase
         implements com.google.protobuf.Internal.EnumLite,
             com.google.protobuf.AbstractMessage.InternalOneOfEnum {
-      MONSTER_ID(8),
-      GADGET_ID(5),
+      GADGET_ID(3),
+      MONSTER_ID(11),
       ENTITY_NOT_SET(0);
       private final int value;
       private EntityCase(int value) {
@@ -187,8 +225,8 @@ public final class WorldPlayerDieNotifyOuterClass {
 
       public static EntityCase forNumber(int value) {
         switch (value) {
-          case 8: return MONSTER_ID;
-          case 5: return GADGET_ID;
+          case 3: return GADGET_ID;
+          case 11: return MONSTER_ID;
           case 0: return ENTITY_NOT_SET;
           default: return null;
         }
@@ -204,10 +242,40 @@ public final class WorldPlayerDieNotifyOuterClass {
           entityCase_);
     }
 
-    public static final int MURDERER_ENTITY_ID_FIELD_NUMBER = 9;
+    public static final int GOEACHAMIAF_FIELD_NUMBER = 1;
+    private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString gOEACHAMIAF_;
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     * @return Whether the gOEACHAMIAF field is set.
+     */
+    @java.lang.Override
+    public boolean hasGOEACHAMIAF() {
+      return gOEACHAMIAF_ != null;
+    }
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     * @return The gOEACHAMIAF.
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF() {
+      return gOEACHAMIAF_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+    }
+    /**
+     * <code>.AbilityString GOEACHAMIAF = 1;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder() {
+      return getGOEACHAMIAF();
+    }
+
+    public static final int MURDERER_ENTITY_ID_FIELD_NUMBER = 5;
     private int murdererEntityId_;
     /**
-     * <code>uint32 murderer_entity_id = 9;</code>
+     * <pre>
+     * 7
+     * </pre>
+     *
+     * <code>uint32 murderer_entity_id = 5;</code>
      * @return The murdererEntityId.
      */
     @java.lang.Override
@@ -215,17 +283,28 @@ public final class WorldPlayerDieNotifyOuterClass {
       return murdererEntityId_;
     }
 
-    public static final int DIE_TYPE_FIELD_NUMBER = 10;
+    public static final int GKHNLKAADNG_FIELD_NUMBER = 7;
+    private int gKHNLKAADNG_;
+    /**
+     * <code>uint32 GKHNLKAADNG = 7;</code>
+     * @return The gKHNLKAADNG.
+     */
+    @java.lang.Override
+    public int getGKHNLKAADNG() {
+      return gKHNLKAADNG_;
+    }
+
+    public static final int DIE_TYPE_FIELD_NUMBER = 15;
     private int dieType_;
     /**
-     * <code>.PlayerDieType die_type = 10;</code>
+     * <code>.PlayerDieType die_type = 15;</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>
+     * <code>.PlayerDieType die_type = 15;</code>
      * @return The dieType.
      */
     @java.lang.Override public emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType getDieType() {
@@ -234,43 +313,43 @@ public final class WorldPlayerDieNotifyOuterClass {
       return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
     }
 
-    public static final int MONSTER_ID_FIELD_NUMBER = 8;
+    public static final int GADGET_ID_FIELD_NUMBER = 3;
     /**
-     * <code>uint32 monster_id = 8;</code>
-     * @return Whether the monsterId field is set.
+     * <code>uint32 gadget_id = 3;</code>
+     * @return Whether the gadgetId field is set.
      */
     @java.lang.Override
-    public boolean hasMonsterId() {
-      return entityCase_ == 8;
+    public boolean hasGadgetId() {
+      return entityCase_ == 3;
     }
     /**
-     * <code>uint32 monster_id = 8;</code>
-     * @return The monsterId.
+     * <code>uint32 gadget_id = 3;</code>
+     * @return The gadgetId.
      */
     @java.lang.Override
-    public int getMonsterId() {
-      if (entityCase_ == 8) {
+    public int getGadgetId() {
+      if (entityCase_ == 3) {
         return (java.lang.Integer) entity_;
       }
       return 0;
     }
 
-    public static final int GADGET_ID_FIELD_NUMBER = 5;
+    public static final int MONSTER_ID_FIELD_NUMBER = 11;
     /**
-     * <code>uint32 gadget_id = 5;</code>
-     * @return Whether the gadgetId field is set.
+     * <code>uint32 monster_id = 11;</code>
+     * @return Whether the monsterId field is set.
      */
     @java.lang.Override
-    public boolean hasGadgetId() {
-      return entityCase_ == 5;
+    public boolean hasMonsterId() {
+      return entityCase_ == 11;
     }
     /**
-     * <code>uint32 gadget_id = 5;</code>
-     * @return The gadgetId.
+     * <code>uint32 monster_id = 11;</code>
+     * @return The monsterId.
      */
     @java.lang.Override
-    public int getGadgetId() {
-      if (entityCase_ == 5) {
+    public int getMonsterId() {
+      if (entityCase_ == 11) {
         return (java.lang.Integer) entity_;
       }
       return 0;
@@ -290,19 +369,25 @@ public final class WorldPlayerDieNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (entityCase_ == 5) {
-        output.writeUInt32(
-            5, (int)((java.lang.Integer) entity_));
+      if (gOEACHAMIAF_ != null) {
+        output.writeMessage(1, getGOEACHAMIAF());
       }
-      if (entityCase_ == 8) {
+      if (entityCase_ == 3) {
         output.writeUInt32(
-            8, (int)((java.lang.Integer) entity_));
+            3, (int)((java.lang.Integer) entity_));
       }
       if (murdererEntityId_ != 0) {
-        output.writeUInt32(9, murdererEntityId_);
+        output.writeUInt32(5, murdererEntityId_);
+      }
+      if (gKHNLKAADNG_ != 0) {
+        output.writeUInt32(7, gKHNLKAADNG_);
+      }
+      if (entityCase_ == 11) {
+        output.writeUInt32(
+            11, (int)((java.lang.Integer) entity_));
       }
       if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
-        output.writeEnum(10, dieType_);
+        output.writeEnum(15, dieType_);
       }
       unknownFields.writeTo(output);
     }
@@ -313,23 +398,31 @@ public final class WorldPlayerDieNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (entityCase_ == 5) {
+      if (gOEACHAMIAF_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(
-              5, (int)((java.lang.Integer) entity_));
+          .computeMessageSize(1, getGOEACHAMIAF());
       }
-      if (entityCase_ == 8) {
+      if (entityCase_ == 3) {
         size += com.google.protobuf.CodedOutputStream
           .computeUInt32Size(
-              8, (int)((java.lang.Integer) entity_));
+              3, (int)((java.lang.Integer) entity_));
       }
       if (murdererEntityId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, murdererEntityId_);
+          .computeUInt32Size(5, murdererEntityId_);
+      }
+      if (gKHNLKAADNG_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(7, gKHNLKAADNG_);
+      }
+      if (entityCase_ == 11) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(
+              11, (int)((java.lang.Integer) entity_));
       }
       if (dieType_ != emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.PLAYER_DIE_TYPE_NONE.getNumber()) {
         size += com.google.protobuf.CodedOutputStream
-          .computeEnumSize(10, dieType_);
+          .computeEnumSize(15, dieType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -346,19 +439,26 @@ public final class WorldPlayerDieNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify other = (emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify) obj;
 
+      if (hasGOEACHAMIAF() != other.hasGOEACHAMIAF()) return false;
+      if (hasGOEACHAMIAF()) {
+        if (!getGOEACHAMIAF()
+            .equals(other.getGOEACHAMIAF())) return false;
+      }
       if (getMurdererEntityId()
           != other.getMurdererEntityId()) return false;
+      if (getGKHNLKAADNG()
+          != other.getGKHNLKAADNG()) return false;
       if (dieType_ != other.dieType_) return false;
       if (!getEntityCase().equals(other.getEntityCase())) return false;
       switch (entityCase_) {
-        case 8:
-          if (getMonsterId()
-              != other.getMonsterId()) return false;
-          break;
-        case 5:
+        case 3:
           if (getGadgetId()
               != other.getGadgetId()) return false;
           break;
+        case 11:
+          if (getMonsterId()
+              != other.getMonsterId()) return false;
+          break;
         case 0:
         default:
       }
@@ -373,19 +473,25 @@ public final class WorldPlayerDieNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      if (hasGOEACHAMIAF()) {
+        hash = (37 * hash) + GOEACHAMIAF_FIELD_NUMBER;
+        hash = (53 * hash) + getGOEACHAMIAF().hashCode();
+      }
       hash = (37 * hash) + MURDERER_ENTITY_ID_FIELD_NUMBER;
       hash = (53 * hash) + getMurdererEntityId();
+      hash = (37 * hash) + GKHNLKAADNG_FIELD_NUMBER;
+      hash = (53 * hash) + getGKHNLKAADNG();
       hash = (37 * hash) + DIE_TYPE_FIELD_NUMBER;
       hash = (53 * hash) + dieType_;
       switch (entityCase_) {
-        case 8:
-          hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
-          hash = (53 * hash) + getMonsterId();
-          break;
-        case 5:
+        case 3:
           hash = (37 * hash) + GADGET_ID_FIELD_NUMBER;
           hash = (53 * hash) + getGadgetId();
           break;
+        case 11:
+          hash = (37 * hash) + MONSTER_ID_FIELD_NUMBER;
+          hash = (53 * hash) + getMonsterId();
+          break;
         case 0:
         default:
       }
@@ -485,11 +591,6 @@ public final class WorldPlayerDieNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26320
-     * Obf: AEFKDABOLLO
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerDieNotify}
      */
     public static final class Builder extends
@@ -527,8 +628,16 @@ public final class WorldPlayerDieNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = null;
+        } else {
+          gOEACHAMIAF_ = null;
+          gOEACHAMIAFBuilder_ = null;
+        }
         murdererEntityId_ = 0;
 
+        gKHNLKAADNG_ = 0;
+
         dieType_ = 0;
 
         entityCase_ = 0;
@@ -559,12 +668,18 @@ public final class WorldPlayerDieNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify buildPartial() {
         emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify result = new emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify(this);
+        if (gOEACHAMIAFBuilder_ == null) {
+          result.gOEACHAMIAF_ = gOEACHAMIAF_;
+        } else {
+          result.gOEACHAMIAF_ = gOEACHAMIAFBuilder_.build();
+        }
         result.murdererEntityId_ = murdererEntityId_;
+        result.gKHNLKAADNG_ = gKHNLKAADNG_;
         result.dieType_ = dieType_;
-        if (entityCase_ == 8) {
+        if (entityCase_ == 3) {
           result.entity_ = entity_;
         }
-        if (entityCase_ == 5) {
+        if (entityCase_ == 11) {
           result.entity_ = entity_;
         }
         result.entityCase_ = entityCase_;
@@ -616,21 +731,27 @@ public final class WorldPlayerDieNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify other) {
         if (other == emu.grasscutter.net.proto.WorldPlayerDieNotifyOuterClass.WorldPlayerDieNotify.getDefaultInstance()) return this;
+        if (other.hasGOEACHAMIAF()) {
+          mergeGOEACHAMIAF(other.getGOEACHAMIAF());
+        }
         if (other.getMurdererEntityId() != 0) {
           setMurdererEntityId(other.getMurdererEntityId());
         }
+        if (other.getGKHNLKAADNG() != 0) {
+          setGKHNLKAADNG(other.getGKHNLKAADNG());
+        }
         if (other.dieType_ != 0) {
           setDieTypeValue(other.getDieTypeValue());
         }
         switch (other.getEntityCase()) {
-          case MONSTER_ID: {
-            setMonsterId(other.getMonsterId());
-            break;
-          }
           case GADGET_ID: {
             setGadgetId(other.getGadgetId());
             break;
           }
+          case MONSTER_ID: {
+            setMonsterId(other.getMonsterId());
+            break;
+          }
           case ENTITY_NOT_SET: {
             break;
           }
@@ -679,9 +800,132 @@ public final class WorldPlayerDieNotifyOuterClass {
       }
 
 
+      private emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString gOEACHAMIAF_;
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> gOEACHAMIAFBuilder_;
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       * @return Whether the gOEACHAMIAF field is set.
+       */
+      public boolean hasGOEACHAMIAF() {
+        return gOEACHAMIAFBuilder_ != null || gOEACHAMIAF_ != null;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       * @return The gOEACHAMIAF.
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString getGOEACHAMIAF() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          return gOEACHAMIAF_ == null ? emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+        } else {
+          return gOEACHAMIAFBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public Builder setGOEACHAMIAF(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          gOEACHAMIAF_ = value;
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.setMessage(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public Builder setGOEACHAMIAF(
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder builderForValue) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = builderForValue.build();
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.setMessage(builderForValue.build());
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public Builder mergeGOEACHAMIAF(emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString value) {
+        if (gOEACHAMIAFBuilder_ == null) {
+          if (gOEACHAMIAF_ != null) {
+            gOEACHAMIAF_ =
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.newBuilder(gOEACHAMIAF_).mergeFrom(value).buildPartial();
+          } else {
+            gOEACHAMIAF_ = value;
+          }
+          onChanged();
+        } else {
+          gOEACHAMIAFBuilder_.mergeFrom(value);
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public Builder clearGOEACHAMIAF() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAF_ = null;
+          onChanged();
+        } else {
+          gOEACHAMIAF_ = null;
+          gOEACHAMIAFBuilder_ = null;
+        }
+
+        return this;
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder getGOEACHAMIAFBuilder() {
+        
+        onChanged();
+        return getGOEACHAMIAFFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      public emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder getGOEACHAMIAFOrBuilder() {
+        if (gOEACHAMIAFBuilder_ != null) {
+          return gOEACHAMIAFBuilder_.getMessageOrBuilder();
+        } else {
+          return gOEACHAMIAF_ == null ?
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.getDefaultInstance() : gOEACHAMIAF_;
+        }
+      }
+      /**
+       * <code>.AbilityString GOEACHAMIAF = 1;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilderV3<
+          emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder> 
+          getGOEACHAMIAFFieldBuilder() {
+        if (gOEACHAMIAFBuilder_ == null) {
+          gOEACHAMIAFBuilder_ = new com.google.protobuf.SingleFieldBuilderV3<
+              emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityString.Builder, emu.grasscutter.net.proto.AbilityStringOuterClass.AbilityStringOrBuilder>(
+                  getGOEACHAMIAF(),
+                  getParentForChildren(),
+                  isClean());
+          gOEACHAMIAF_ = null;
+        }
+        return gOEACHAMIAFBuilder_;
+      }
+
       private int murdererEntityId_ ;
       /**
-       * <code>uint32 murderer_entity_id = 9;</code>
+       * <pre>
+       * 7
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 5;</code>
        * @return The murdererEntityId.
        */
       @java.lang.Override
@@ -689,7 +933,11 @@ public final class WorldPlayerDieNotifyOuterClass {
         return murdererEntityId_;
       }
       /**
-       * <code>uint32 murderer_entity_id = 9;</code>
+       * <pre>
+       * 7
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 5;</code>
        * @param value The murdererEntityId to set.
        * @return This builder for chaining.
        */
@@ -700,7 +948,11 @@ public final class WorldPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 murderer_entity_id = 9;</code>
+       * <pre>
+       * 7
+       * </pre>
+       *
+       * <code>uint32 murderer_entity_id = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearMurdererEntityId() {
@@ -710,16 +962,47 @@ public final class WorldPlayerDieNotifyOuterClass {
         return this;
       }
 
+      private int gKHNLKAADNG_ ;
+      /**
+       * <code>uint32 GKHNLKAADNG = 7;</code>
+       * @return The gKHNLKAADNG.
+       */
+      @java.lang.Override
+      public int getGKHNLKAADNG() {
+        return gKHNLKAADNG_;
+      }
+      /**
+       * <code>uint32 GKHNLKAADNG = 7;</code>
+       * @param value The gKHNLKAADNG to set.
+       * @return This builder for chaining.
+       */
+      public Builder setGKHNLKAADNG(int value) {
+        
+        gKHNLKAADNG_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 GKHNLKAADNG = 7;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearGKHNLKAADNG() {
+        
+        gKHNLKAADNG_ = 0;
+        onChanged();
+        return this;
+      }
+
       private int dieType_ = 0;
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <code>.PlayerDieType die_type = 15;</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>
+       * <code>.PlayerDieType die_type = 15;</code>
        * @param value The enum numeric value on the wire for dieType to set.
        * @return This builder for chaining.
        */
@@ -730,7 +1013,7 @@ public final class WorldPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <code>.PlayerDieType die_type = 15;</code>
        * @return The dieType.
        */
       @java.lang.Override
@@ -740,7 +1023,7 @@ public final class WorldPlayerDieNotifyOuterClass {
         return result == null ? emu.grasscutter.net.proto.PlayerDieTypeOuterClass.PlayerDieType.UNRECOGNIZED : result;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <code>.PlayerDieType die_type = 15;</code>
        * @param value The dieType to set.
        * @return This builder for chaining.
        */
@@ -754,7 +1037,7 @@ public final class WorldPlayerDieNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.PlayerDieType die_type = 10;</code>
+       * <code>.PlayerDieType die_type = 15;</code>
        * @return This builder for chaining.
        */
       public Builder clearDieType() {
@@ -765,39 +1048,39 @@ public final class WorldPlayerDieNotifyOuterClass {
       }
 
       /**
-       * <code>uint32 monster_id = 8;</code>
-       * @return Whether the monsterId field is set.
+       * <code>uint32 gadget_id = 3;</code>
+       * @return Whether the gadgetId field is set.
        */
-      public boolean hasMonsterId() {
-        return entityCase_ == 8;
+      public boolean hasGadgetId() {
+        return entityCase_ == 3;
       }
       /**
-       * <code>uint32 monster_id = 8;</code>
-       * @return The monsterId.
+       * <code>uint32 gadget_id = 3;</code>
+       * @return The gadgetId.
        */
-      public int getMonsterId() {
-        if (entityCase_ == 8) {
+      public int getGadgetId() {
+        if (entityCase_ == 3) {
           return (java.lang.Integer) entity_;
         }
         return 0;
       }
       /**
-       * <code>uint32 monster_id = 8;</code>
-       * @param value The monsterId to set.
+       * <code>uint32 gadget_id = 3;</code>
+       * @param value The gadgetId to set.
        * @return This builder for chaining.
        */
-      public Builder setMonsterId(int value) {
-        entityCase_ = 8;
+      public Builder setGadgetId(int value) {
+        entityCase_ = 3;
         entity_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 monster_id = 8;</code>
+       * <code>uint32 gadget_id = 3;</code>
        * @return This builder for chaining.
        */
-      public Builder clearMonsterId() {
-        if (entityCase_ == 8) {
+      public Builder clearGadgetId() {
+        if (entityCase_ == 3) {
           entityCase_ = 0;
           entity_ = null;
           onChanged();
@@ -806,39 +1089,39 @@ public final class WorldPlayerDieNotifyOuterClass {
       }
 
       /**
-       * <code>uint32 gadget_id = 5;</code>
-       * @return Whether the gadgetId field is set.
+       * <code>uint32 monster_id = 11;</code>
+       * @return Whether the monsterId field is set.
        */
-      public boolean hasGadgetId() {
-        return entityCase_ == 5;
+      public boolean hasMonsterId() {
+        return entityCase_ == 11;
       }
       /**
-       * <code>uint32 gadget_id = 5;</code>
-       * @return The gadgetId.
+       * <code>uint32 monster_id = 11;</code>
+       * @return The monsterId.
        */
-      public int getGadgetId() {
-        if (entityCase_ == 5) {
+      public int getMonsterId() {
+        if (entityCase_ == 11) {
           return (java.lang.Integer) entity_;
         }
         return 0;
       }
       /**
-       * <code>uint32 gadget_id = 5;</code>
-       * @param value The gadgetId to set.
+       * <code>uint32 monster_id = 11;</code>
+       * @param value The monsterId to set.
        * @return This builder for chaining.
        */
-      public Builder setGadgetId(int value) {
-        entityCase_ = 5;
+      public Builder setMonsterId(int value) {
+        entityCase_ = 11;
         entity_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 gadget_id = 5;</code>
+       * <code>uint32 monster_id = 11;</code>
        * @return This builder for chaining.
        */
-      public Builder clearGadgetId() {
-        if (entityCase_ == 5) {
+      public Builder clearMonsterId() {
+        if (entityCase_ == 11) {
           entityCase_ = 0;
           entity_ = null;
           onChanged();
@@ -912,16 +1195,19 @@ public final class WorldPlayerDieNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\032WorldPlayerDieNotify.proto\032\023PlayerDieT" +
-      "ype.proto\"\211\001\n\024WorldPlayerDieNotify\022\032\n\022mu" +
-      "rderer_entity_id\030\t \001(\r\022 \n\010die_type\030\n \001(\016" +
-      "2\016.PlayerDieType\022\024\n\nmonster_id\030\010 \001(\rH\000\022\023" +
-      "\n\tgadget_id\030\005 \001(\rH\000B\010\n\006entityB\033\n\031emu.gra" +
-      "sscutter.net.protob\006proto3"
+      "\n\032WorldPlayerDieNotify.proto\032\023AbilityStr" +
+      "ing.proto\032\023PlayerDieType.proto\"\303\001\n\024World" +
+      "PlayerDieNotify\022#\n\013GOEACHAMIAF\030\001 \001(\0132\016.A" +
+      "bilityString\022\032\n\022murderer_entity_id\030\005 \001(\r" +
+      "\022\023\n\013GKHNLKAADNG\030\007 \001(\r\022 \n\010die_type\030\017 \001(\0162" +
+      "\016.PlayerDieType\022\023\n\tgadget_id\030\003 \001(\rH\000\022\024\n\n" +
+      "monster_id\030\013 \001(\rH\000B\010\n\006EntityB\033\n\031emu.gras" +
+      "scutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
+          emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor(),
         });
     internal_static_WorldPlayerDieNotify_descriptor =
@@ -929,7 +1215,8 @@ public final class WorldPlayerDieNotifyOuterClass {
     internal_static_WorldPlayerDieNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldPlayerDieNotify_descriptor,
-        new java.lang.String[] { "MurdererEntityId", "DieType", "MonsterId", "GadgetId", "Entity", });
+        new java.lang.String[] { "GOEACHAMIAF", "MurdererEntityId", "GKHNLKAADNG", "DieType", "GadgetId", "MonsterId", "Entity", });
+    emu.grasscutter.net.proto.AbilityStringOuterClass.getDescriptor();
     emu.grasscutter.net.proto.PlayerDieTypeOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
index 6b4abb233..e1dbf75ec 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerInfoNotifyOuterClass.java
@@ -19,76 +19,71 @@ public final class WorldPlayerInfoNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> 
-        getPlayerInfoListList();
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index);
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    int getPlayerInfoListCount();
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
-        getPlayerInfoListOrBuilderList();
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> 
         getPlayerWidgetInfoListList();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index);
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     int getPlayerWidgetInfoListCount();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
         getPlayerWidgetInfoListOrBuilderList();
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
         int index);
 
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @return A list containing the playerUidList.
      */
     java.util.List<java.lang.Integer> getPlayerUidListList();
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @return The count of playerUidList.
      */
     int getPlayerUidListCount();
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @param index The index of the element to return.
      * @return The playerUidList at the given index.
      */
     int getPlayerUidList(int index);
+
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> 
+        getPlayerInfoListList();
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index);
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    int getPlayerInfoListCount();
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
+        getPlayerInfoListOrBuilderList();
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * CmdId: 2239
-   * Obf: JGMOCNKDELA
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerInfoNotify}
    */
   public static final class WorldPlayerInfoNotify extends
@@ -101,9 +96,9 @@ public final class WorldPlayerInfoNotifyOuterClass {
       super(builder);
     }
     private WorldPlayerInfoNotify() {
-      playerInfoList_ = java.util.Collections.emptyList();
       playerWidgetInfoList_ = java.util.Collections.emptyList();
       playerUidList_ = emptyIntList();
+      playerInfoList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -137,38 +132,29 @@ public final class WorldPlayerInfoNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 42: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 10: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerWidgetInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               playerWidgetInfoList_.add(
                   input.readMessage(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.parser(), extensionRegistry));
               break;
             }
-            case 58: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
-                playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo>();
-                mutable_bitField0_ |= 0x00000001;
-              }
-              playerInfoList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.parser(), extensionRegistry));
-              break;
-            }
-            case 120: {
-              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+            case 40: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 playerUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               playerUidList_.addInt(input.readUInt32());
               break;
             }
-            case 122: {
+            case 42: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
-              if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) {
+              if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) {
                 playerUidList_ = newIntList();
-                mutable_bitField0_ |= 0x00000004;
+                mutable_bitField0_ |= 0x00000002;
               }
               while (input.getBytesUntilLimit() > 0) {
                 playerUidList_.addInt(input.readUInt32());
@@ -176,6 +162,15 @@ public final class WorldPlayerInfoNotifyOuterClass {
               input.popLimit(limit);
               break;
             }
+            case 66: {
+              if (!((mutable_bitField0_ & 0x00000004) != 0)) {
+                playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo>();
+                mutable_bitField0_ |= 0x00000004;
+              }
+              playerInfoList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.parser(), extensionRegistry));
+              break;
+            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -191,14 +186,14 @@ public final class WorldPlayerInfoNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           playerWidgetInfoList_ = java.util.Collections.unmodifiableList(playerWidgetInfoList_);
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+          playerUidList_.makeImmutable(); // C
         }
         if (((mutable_bitField0_ & 0x00000004) != 0)) {
-          playerUidList_.makeImmutable(); // C
+          playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
         }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
@@ -217,57 +212,17 @@ public final class WorldPlayerInfoNotifyOuterClass {
               emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.class, emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.Builder.class);
     }
 
-    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 7;
-    private java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> playerInfoList_;
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
-      return playerInfoList_;
-    }
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
-        getPlayerInfoListOrBuilderList() {
-      return playerInfoList_;
-    }
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    @java.lang.Override
-    public int getPlayerInfoListCount() {
-      return playerInfoList_.size();
-    }
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
-      return playerInfoList_.get(index);
-    }
-    /**
-     * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
-        int index) {
-      return playerInfoList_.get(index);
-    }
-
-    public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 5;
+    public static final int PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER = 1;
     private java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> playerWidgetInfoList_;
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> getPlayerWidgetInfoListList() {
       return playerWidgetInfoList_;
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
@@ -275,21 +230,21 @@ public final class WorldPlayerInfoNotifyOuterClass {
       return playerWidgetInfoList_;
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     @java.lang.Override
     public int getPlayerWidgetInfoListCount() {
       return playerWidgetInfoList_.size();
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
       return playerWidgetInfoList_.get(index);
     }
     /**
-     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+     * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
@@ -297,10 +252,10 @@ public final class WorldPlayerInfoNotifyOuterClass {
       return playerWidgetInfoList_.get(index);
     }
 
-    public static final int PLAYER_UID_LIST_FIELD_NUMBER = 15;
+    public static final int PLAYER_UID_LIST_FIELD_NUMBER = 5;
     private com.google.protobuf.Internal.IntList playerUidList_;
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @return A list containing the playerUidList.
      */
     @java.lang.Override
@@ -309,14 +264,14 @@ public final class WorldPlayerInfoNotifyOuterClass {
       return playerUidList_;
     }
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @return The count of playerUidList.
      */
     public int getPlayerUidListCount() {
       return playerUidList_.size();
     }
     /**
-     * <code>repeated uint32 player_uid_list = 15;</code>
+     * <code>repeated uint32 player_uid_list = 5;</code>
      * @param index The index of the element to return.
      * @return The playerUidList at the given index.
      */
@@ -325,6 +280,46 @@ public final class WorldPlayerInfoNotifyOuterClass {
     }
     private int playerUidListMemoizedSerializedSize = -1;
 
+    public static final int PLAYER_INFO_LIST_FIELD_NUMBER = 8;
+    private java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> playerInfoList_;
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
+      return playerInfoList_;
+    }
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
+        getPlayerInfoListOrBuilderList() {
+      return playerInfoList_;
+    }
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    @java.lang.Override
+    public int getPlayerInfoListCount() {
+      return playerInfoList_.size();
+    }
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
+      return playerInfoList_.get(index);
+    }
+    /**
+     * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+        int index) {
+      return playerInfoList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -341,18 +336,18 @@ public final class WorldPlayerInfoNotifyOuterClass {
                         throws java.io.IOException {
       getSerializedSize();
       for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
-        output.writeMessage(5, playerWidgetInfoList_.get(i));
-      }
-      for (int i = 0; i < playerInfoList_.size(); i++) {
-        output.writeMessage(7, playerInfoList_.get(i));
+        output.writeMessage(1, playerWidgetInfoList_.get(i));
       }
       if (getPlayerUidListList().size() > 0) {
-        output.writeUInt32NoTag(122);
+        output.writeUInt32NoTag(42);
         output.writeUInt32NoTag(playerUidListMemoizedSerializedSize);
       }
       for (int i = 0; i < playerUidList_.size(); i++) {
         output.writeUInt32NoTag(playerUidList_.getInt(i));
       }
+      for (int i = 0; i < playerInfoList_.size(); i++) {
+        output.writeMessage(8, playerInfoList_.get(i));
+      }
       unknownFields.writeTo(output);
     }
 
@@ -364,11 +359,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
       size = 0;
       for (int i = 0; i < playerWidgetInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(5, playerWidgetInfoList_.get(i));
-      }
-      for (int i = 0; i < playerInfoList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(7, playerInfoList_.get(i));
+          .computeMessageSize(1, playerWidgetInfoList_.get(i));
       }
       {
         int dataSize = 0;
@@ -384,6 +375,10 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
         playerUidListMemoizedSerializedSize = dataSize;
       }
+      for (int i = 0; i < playerInfoList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(8, playerInfoList_.get(i));
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -399,12 +394,12 @@ public final class WorldPlayerInfoNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify other = (emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify) obj;
 
-      if (!getPlayerInfoListList()
-          .equals(other.getPlayerInfoListList())) return false;
       if (!getPlayerWidgetInfoListList()
           .equals(other.getPlayerWidgetInfoListList())) return false;
       if (!getPlayerUidListList()
           .equals(other.getPlayerUidListList())) return false;
+      if (!getPlayerInfoListList()
+          .equals(other.getPlayerInfoListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -416,10 +411,6 @@ public final class WorldPlayerInfoNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getPlayerInfoListCount() > 0) {
-        hash = (37 * hash) + PLAYER_INFO_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPlayerInfoListList().hashCode();
-      }
       if (getPlayerWidgetInfoListCount() > 0) {
         hash = (37 * hash) + PLAYER_WIDGET_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerWidgetInfoListList().hashCode();
@@ -428,6 +419,10 @@ public final class WorldPlayerInfoNotifyOuterClass {
         hash = (37 * hash) + PLAYER_UID_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerUidListList().hashCode();
       }
+      if (getPlayerInfoListCount() > 0) {
+        hash = (37 * hash) + PLAYER_INFO_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPlayerInfoListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -524,11 +519,6 @@ public final class WorldPlayerInfoNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2239
-     * Obf: JGMOCNKDELA
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerInfoNotify}
      */
     public static final class Builder extends
@@ -561,27 +551,27 @@ public final class WorldPlayerInfoNotifyOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getPlayerInfoListFieldBuilder();
           getPlayerWidgetInfoListFieldBuilder();
+          getPlayerInfoListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (playerInfoListBuilder_ == null) {
-          playerInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          playerInfoListBuilder_.clear();
-        }
         if (playerWidgetInfoListBuilder_ == null) {
           playerWidgetInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           playerWidgetInfoListBuilder_.clear();
         }
         playerUidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
+        if (playerInfoListBuilder_ == null) {
+          playerInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+        } else {
+          playerInfoListBuilder_.clear();
+        }
         return this;
       }
 
@@ -609,29 +599,29 @@ public final class WorldPlayerInfoNotifyOuterClass {
       public emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify buildPartial() {
         emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify result = new emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify(this);
         int from_bitField0_ = bitField0_;
-        if (playerInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.playerInfoList_ = playerInfoList_;
-        } else {
-          result.playerInfoList_ = playerInfoListBuilder_.build();
-        }
         if (playerWidgetInfoListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             playerWidgetInfoList_ = java.util.Collections.unmodifiableList(playerWidgetInfoList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.playerWidgetInfoList_ = playerWidgetInfoList_;
         } else {
           result.playerWidgetInfoList_ = playerWidgetInfoListBuilder_.build();
         }
-        if (((bitField0_ & 0x00000004) != 0)) {
+        if (((bitField0_ & 0x00000002) != 0)) {
           playerUidList_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
+          bitField0_ = (bitField0_ & ~0x00000002);
         }
         result.playerUidList_ = playerUidList_;
+        if (playerInfoListBuilder_ == null) {
+          if (((bitField0_ & 0x00000004) != 0)) {
+            playerInfoList_ = java.util.Collections.unmodifiableList(playerInfoList_);
+            bitField0_ = (bitField0_ & ~0x00000004);
+          }
+          result.playerInfoList_ = playerInfoList_;
+        } else {
+          result.playerInfoList_ = playerInfoListBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -680,37 +670,11 @@ public final class WorldPlayerInfoNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify other) {
         if (other == emu.grasscutter.net.proto.WorldPlayerInfoNotifyOuterClass.WorldPlayerInfoNotify.getDefaultInstance()) return this;
-        if (playerInfoListBuilder_ == null) {
-          if (!other.playerInfoList_.isEmpty()) {
-            if (playerInfoList_.isEmpty()) {
-              playerInfoList_ = other.playerInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensurePlayerInfoListIsMutable();
-              playerInfoList_.addAll(other.playerInfoList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.playerInfoList_.isEmpty()) {
-            if (playerInfoListBuilder_.isEmpty()) {
-              playerInfoListBuilder_.dispose();
-              playerInfoListBuilder_ = null;
-              playerInfoList_ = other.playerInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              playerInfoListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPlayerInfoListFieldBuilder() : null;
-            } else {
-              playerInfoListBuilder_.addAllMessages(other.playerInfoList_);
-            }
-          }
-        }
         if (playerWidgetInfoListBuilder_ == null) {
           if (!other.playerWidgetInfoList_.isEmpty()) {
             if (playerWidgetInfoList_.isEmpty()) {
               playerWidgetInfoList_ = other.playerWidgetInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensurePlayerWidgetInfoListIsMutable();
               playerWidgetInfoList_.addAll(other.playerWidgetInfoList_);
@@ -723,7 +687,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
               playerWidgetInfoListBuilder_.dispose();
               playerWidgetInfoListBuilder_ = null;
               playerWidgetInfoList_ = other.playerWidgetInfoList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               playerWidgetInfoListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPlayerWidgetInfoListFieldBuilder() : null;
@@ -735,13 +699,39 @@ public final class WorldPlayerInfoNotifyOuterClass {
         if (!other.playerUidList_.isEmpty()) {
           if (playerUidList_.isEmpty()) {
             playerUidList_ = other.playerUidList_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            bitField0_ = (bitField0_ & ~0x00000002);
           } else {
             ensurePlayerUidListIsMutable();
             playerUidList_.addAll(other.playerUidList_);
           }
           onChanged();
         }
+        if (playerInfoListBuilder_ == null) {
+          if (!other.playerInfoList_.isEmpty()) {
+            if (playerInfoList_.isEmpty()) {
+              playerInfoList_ = other.playerInfoList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+            } else {
+              ensurePlayerInfoListIsMutable();
+              playerInfoList_.addAll(other.playerInfoList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.playerInfoList_.isEmpty()) {
+            if (playerInfoListBuilder_.isEmpty()) {
+              playerInfoListBuilder_.dispose();
+              playerInfoListBuilder_ = null;
+              playerInfoList_ = other.playerInfoList_;
+              bitField0_ = (bitField0_ & ~0x00000004);
+              playerInfoListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getPlayerInfoListFieldBuilder() : null;
+            } else {
+              playerInfoListBuilder_.addAllMessages(other.playerInfoList_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -772,252 +762,12 @@ public final class WorldPlayerInfoNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> playerInfoList_ =
-        java.util.Collections.emptyList();
-      private void ensurePlayerInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo>(playerInfoList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> playerInfoListBuilder_;
-
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
-        if (playerInfoListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(playerInfoList_);
-        } else {
-          return playerInfoListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public int getPlayerInfoListCount() {
-        if (playerInfoListBuilder_ == null) {
-          return playerInfoList_.size();
-        } else {
-          return playerInfoListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
-        if (playerInfoListBuilder_ == null) {
-          return playerInfoList_.get(index);
-        } else {
-          return playerInfoListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder setPlayerInfoList(
-          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
-        if (playerInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.set(index, value);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder setPlayerInfoList(
-          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
-        if (playerInfoListBuilder_ == null) {
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          playerInfoListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder addPlayerInfoList(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
-        if (playerInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.add(value);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder addPlayerInfoList(
-          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
-        if (playerInfoListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.add(index, value);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder addPlayerInfoList(
-          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
-        if (playerInfoListBuilder_ == null) {
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          playerInfoListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder addPlayerInfoList(
-          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
-        if (playerInfoListBuilder_ == null) {
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          playerInfoListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder addAllPlayerInfoList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> values) {
-        if (playerInfoListBuilder_ == null) {
-          ensurePlayerInfoListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, playerInfoList_);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder clearPlayerInfoList() {
-        if (playerInfoListBuilder_ == null) {
-          playerInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public Builder removePlayerInfoList(int index) {
-        if (playerInfoListBuilder_ == null) {
-          ensurePlayerInfoListIsMutable();
-          playerInfoList_.remove(index);
-          onChanged();
-        } else {
-          playerInfoListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getPlayerInfoListBuilder(
-          int index) {
-        return getPlayerInfoListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
-          int index) {
-        if (playerInfoListBuilder_ == null) {
-          return playerInfoList_.get(index);  } else {
-          return playerInfoListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
-           getPlayerInfoListOrBuilderList() {
-        if (playerInfoListBuilder_ != null) {
-          return playerInfoListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(playerInfoList_);
-        }
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder() {
-        return getPlayerInfoListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder(
-          int index) {
-        return getPlayerInfoListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .OnlinePlayerInfo player_info_list = 7;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder> 
-           getPlayerInfoListBuilderList() {
-        return getPlayerInfoListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
-          getPlayerInfoListFieldBuilder() {
-        if (playerInfoListBuilder_ == null) {
-          playerInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>(
-                  playerInfoList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          playerInfoList_ = null;
-        }
-        return playerInfoListBuilder_;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> playerWidgetInfoList_ =
         java.util.Collections.emptyList();
       private void ensurePlayerWidgetInfoListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           playerWidgetInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo>(playerWidgetInfoList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -1025,7 +775,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
           emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> playerWidgetInfoListBuilder_;
 
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> getPlayerWidgetInfoListList() {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -1035,7 +785,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public int getPlayerWidgetInfoListCount() {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -1045,7 +795,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo getPlayerWidgetInfoList(int index) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -1055,7 +805,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder setPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -1072,7 +822,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder setPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1086,7 +836,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder addPlayerWidgetInfoList(emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -1102,7 +852,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder addPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo value) {
@@ -1119,7 +869,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder addPlayerWidgetInfoList(
           emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1133,7 +883,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder addPlayerWidgetInfoList(
           int index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder builderForValue) {
@@ -1147,7 +897,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder addAllPlayerWidgetInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo> values) {
@@ -1162,12 +912,12 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder clearPlayerWidgetInfoList() {
         if (playerWidgetInfoListBuilder_ == null) {
           playerWidgetInfoList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           playerWidgetInfoListBuilder_.clear();
@@ -1175,7 +925,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public Builder removePlayerWidgetInfoList(int index) {
         if (playerWidgetInfoListBuilder_ == null) {
@@ -1188,14 +938,14 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder getPlayerWidgetInfoListBuilder(
           int index) {
         return getPlayerWidgetInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder getPlayerWidgetInfoListOrBuilder(
           int index) {
@@ -1205,7 +955,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder> 
            getPlayerWidgetInfoListOrBuilderList() {
@@ -1216,14 +966,14 @@ public final class WorldPlayerInfoNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder() {
         return getPlayerWidgetInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder addPlayerWidgetInfoListBuilder(
           int index) {
@@ -1231,7 +981,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 5;</code>
+       * <code>repeated .PlayerWidgetInfo player_widget_info_list = 1;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder> 
            getPlayerWidgetInfoListBuilderList() {
@@ -1244,7 +994,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
           playerWidgetInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfo.Builder, emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.PlayerWidgetInfoOrBuilder>(
                   playerWidgetInfoList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           playerWidgetInfoList_ = null;
@@ -1254,29 +1004,29 @@ public final class WorldPlayerInfoNotifyOuterClass {
 
       private com.google.protobuf.Internal.IntList playerUidList_ = emptyIntList();
       private void ensurePlayerUidListIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!((bitField0_ & 0x00000002) != 0)) {
           playerUidList_ = mutableCopy(playerUidList_);
-          bitField0_ |= 0x00000004;
+          bitField0_ |= 0x00000002;
          }
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @return A list containing the playerUidList.
        */
       public java.util.List<java.lang.Integer>
           getPlayerUidListList() {
-        return ((bitField0_ & 0x00000004) != 0) ?
+        return ((bitField0_ & 0x00000002) != 0) ?
                  java.util.Collections.unmodifiableList(playerUidList_) : playerUidList_;
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @return The count of playerUidList.
        */
       public int getPlayerUidListCount() {
         return playerUidList_.size();
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @param index The index of the element to return.
        * @return The playerUidList at the given index.
        */
@@ -1284,7 +1034,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return playerUidList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @param index The index to set the value at.
        * @param value The playerUidList to set.
        * @return This builder for chaining.
@@ -1297,7 +1047,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @param value The playerUidList to add.
        * @return This builder for chaining.
        */
@@ -1308,7 +1058,7 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @param values The playerUidList to add.
        * @return This builder for chaining.
        */
@@ -1321,15 +1071,255 @@ public final class WorldPlayerInfoNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 player_uid_list = 15;</code>
+       * <code>repeated uint32 player_uid_list = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearPlayerUidList() {
         playerUidList_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
+        bitField0_ = (bitField0_ & ~0x00000002);
         onChanged();
         return this;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> playerInfoList_ =
+        java.util.Collections.emptyList();
+      private void ensurePlayerInfoListIsMutable() {
+        if (!((bitField0_ & 0x00000004) != 0)) {
+          playerInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo>(playerInfoList_);
+          bitField0_ |= 0x00000004;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> playerInfoListBuilder_;
+
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> getPlayerInfoListList() {
+        if (playerInfoListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(playerInfoList_);
+        } else {
+          return playerInfoListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public int getPlayerInfoListCount() {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.size();
+        } else {
+          return playerInfoListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo getPlayerInfoList(int index) {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.get(index);
+        } else {
+          return playerInfoListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder setPlayerInfoList(
+          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.set(index, value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder setPlayerInfoList(
+          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder addPlayerInfoList(emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder addPlayerInfoList(
+          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo value) {
+        if (playerInfoListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(index, value);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder addPlayerInfoList(
+          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder addPlayerInfoList(
+          int index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder builderForValue) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder addAllPlayerInfoList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo> values) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, playerInfoList_);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder clearPlayerInfoList() {
+        if (playerInfoListBuilder_ == null) {
+          playerInfoList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000004);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public Builder removePlayerInfoList(int index) {
+        if (playerInfoListBuilder_ == null) {
+          ensurePlayerInfoListIsMutable();
+          playerInfoList_.remove(index);
+          onChanged();
+        } else {
+          playerInfoListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder getPlayerInfoListBuilder(
+          int index) {
+        return getPlayerInfoListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder getPlayerInfoListOrBuilder(
+          int index) {
+        if (playerInfoListBuilder_ == null) {
+          return playerInfoList_.get(index);  } else {
+          return playerInfoListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
+           getPlayerInfoListOrBuilderList() {
+        if (playerInfoListBuilder_ != null) {
+          return playerInfoListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(playerInfoList_);
+        }
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder() {
+        return getPlayerInfoListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder addPlayerInfoListBuilder(
+          int index) {
+        return getPlayerInfoListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .OnlinePlayerInfo player_info_list = 8;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder> 
+           getPlayerInfoListBuilderList() {
+        return getPlayerInfoListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder> 
+          getPlayerInfoListFieldBuilder() {
+        if (playerInfoListBuilder_ == null) {
+          playerInfoListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfo.Builder, emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.OnlinePlayerInfoOrBuilder>(
+                  playerInfoList_,
+                  ((bitField0_ & 0x00000004) != 0),
+                  getParentForChildren(),
+                  isClean());
+          playerInfoList_ = null;
+        }
+        return playerInfoListBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1397,28 +1387,28 @@ public final class WorldPlayerInfoNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\033WorldPlayerInfoNotify.proto\032\026OnlinePla" +
-      "yerInfo.proto\032\026PlayerWidgetInfo.proto\"\221\001" +
-      "\n\025WorldPlayerInfoNotify\022+\n\020player_info_l" +
-      "ist\030\007 \003(\0132\021.OnlinePlayerInfo\0222\n\027player_w" +
-      "idget_info_list\030\005 \003(\0132\021.PlayerWidgetInfo" +
-      "\022\027\n\017player_uid_list\030\017 \003(\rB\033\n\031emu.grasscu" +
+      "\n\033WorldPlayerInfoNotify.proto\032\026PlayerWid" +
+      "getInfo.proto\032\026OnlinePlayerInfo.proto\"\221\001" +
+      "\n\025WorldPlayerInfoNotify\0222\n\027player_widget" +
+      "_info_list\030\001 \003(\0132\021.PlayerWidgetInfo\022\027\n\017p" +
+      "layer_uid_list\030\005 \003(\r\022+\n\020player_info_list" +
+      "\030\010 \003(\0132\021.OnlinePlayerInfoB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor(),
         });
     internal_static_WorldPlayerInfoNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_WorldPlayerInfoNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldPlayerInfoNotify_descriptor,
-        new java.lang.String[] { "PlayerInfoList", "PlayerWidgetInfoList", "PlayerUidList", });
-    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "PlayerWidgetInfoList", "PlayerUidList", "PlayerInfoList", });
     emu.grasscutter.net.proto.PlayerWidgetInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.OnlinePlayerInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
index e9edc9fcd..f91396aad 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerLocationNotifyOuterClass.java
@@ -19,59 +19,54 @@ public final class WorldPlayerLocationNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> 
-        getPlayerWorldLocListList();
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index);
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    int getPlayerWorldLocListCount();
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
-        getPlayerWorldLocListOrBuilderList();
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
-        int index);
-
-    /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> 
         getPlayerLocListList();
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index);
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     int getPlayerLocListCount();
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> 
         getPlayerLocListOrBuilderList();
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
         int index);
+
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> 
+        getPlayerWorldLocListList();
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index);
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    int getPlayerWorldLocListCount();
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
+        getPlayerWorldLocListOrBuilderList();
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+        int index);
   }
   /**
-   * <pre>
-   * CmdId: 7085
-   * Obf: KEIDNDOFINC
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerLocationNotify}
    */
   public static final class WorldPlayerLocationNotify extends
@@ -84,8 +79,8 @@ public final class WorldPlayerLocationNotifyOuterClass {
       super(builder);
     }
     private WorldPlayerLocationNotify() {
-      playerWorldLocList_ = java.util.Collections.emptyList();
       playerLocList_ = java.util.Collections.emptyList();
+      playerWorldLocList_ = java.util.Collections.emptyList();
     }
 
     @java.lang.Override
@@ -119,19 +114,19 @@ public final class WorldPlayerLocationNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 10: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+            case 18: {
+              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo>();
-                mutable_bitField0_ |= 0x00000002;
+                mutable_bitField0_ |= 0x00000001;
               }
               playerLocList_.add(
                   input.readMessage(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.parser(), extensionRegistry));
               break;
             }
-            case 82: {
-              if (!((mutable_bitField0_ & 0x00000001) != 0)) {
+            case 90: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
                 playerWorldLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo>();
-                mutable_bitField0_ |= 0x00000001;
+                mutable_bitField0_ |= 0x00000002;
               }
               playerWorldLocList_.add(
                   input.readMessage(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.parser(), extensionRegistry));
@@ -152,10 +147,10 @@ public final class WorldPlayerLocationNotifyOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000002) != 0)) {
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
           playerLocList_ = java.util.Collections.unmodifiableList(playerLocList_);
         }
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+        if (((mutable_bitField0_ & 0x00000002) != 0)) {
           playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
         }
         this.unknownFields = unknownFields.build();
@@ -175,57 +170,17 @@ public final class WorldPlayerLocationNotifyOuterClass {
               emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.class, emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.Builder.class);
     }
 
-    public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 10;
-    private java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> playerWorldLocList_;
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> getPlayerWorldLocListList() {
-      return playerWorldLocList_;
-    }
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    @java.lang.Override
-    public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
-        getPlayerWorldLocListOrBuilderList() {
-      return playerWorldLocList_;
-    }
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    @java.lang.Override
-    public int getPlayerWorldLocListCount() {
-      return playerWorldLocList_.size();
-    }
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
-      return playerWorldLocList_.get(index);
-    }
-    /**
-     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-     */
-    @java.lang.Override
-    public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
-        int index) {
-      return playerWorldLocList_.get(index);
-    }
-
-    public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 1;
+    public static final int PLAYER_LOC_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> playerLocList_;
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> getPlayerLocListList() {
       return playerLocList_;
     }
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> 
@@ -233,21 +188,21 @@ public final class WorldPlayerLocationNotifyOuterClass {
       return playerLocList_;
     }
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     @java.lang.Override
     public int getPlayerLocListCount() {
       return playerLocList_.size();
     }
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
       return playerLocList_.get(index);
     }
     /**
-     * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+     * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
@@ -255,6 +210,46 @@ public final class WorldPlayerLocationNotifyOuterClass {
       return playerLocList_.get(index);
     }
 
+    public static final int PLAYER_WORLD_LOC_LIST_FIELD_NUMBER = 11;
+    private java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> playerWorldLocList_;
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> getPlayerWorldLocListList() {
+      return playerWorldLocList_;
+    }
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    @java.lang.Override
+    public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
+        getPlayerWorldLocListOrBuilderList() {
+      return playerWorldLocList_;
+    }
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    @java.lang.Override
+    public int getPlayerWorldLocListCount() {
+      return playerWorldLocList_.size();
+    }
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
+      return playerWorldLocList_.get(index);
+    }
+    /**
+     * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+     */
+    @java.lang.Override
+    public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+        int index) {
+      return playerWorldLocList_.get(index);
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -270,10 +265,10 @@ public final class WorldPlayerLocationNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < playerLocList_.size(); i++) {
-        output.writeMessage(1, playerLocList_.get(i));
+        output.writeMessage(2, playerLocList_.get(i));
       }
       for (int i = 0; i < playerWorldLocList_.size(); i++) {
-        output.writeMessage(10, playerWorldLocList_.get(i));
+        output.writeMessage(11, playerWorldLocList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -286,11 +281,11 @@ public final class WorldPlayerLocationNotifyOuterClass {
       size = 0;
       for (int i = 0; i < playerLocList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(1, playerLocList_.get(i));
+          .computeMessageSize(2, playerLocList_.get(i));
       }
       for (int i = 0; i < playerWorldLocList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(10, playerWorldLocList_.get(i));
+          .computeMessageSize(11, playerWorldLocList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -307,10 +302,10 @@ public final class WorldPlayerLocationNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify other = (emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify) obj;
 
-      if (!getPlayerWorldLocListList()
-          .equals(other.getPlayerWorldLocListList())) return false;
       if (!getPlayerLocListList()
           .equals(other.getPlayerLocListList())) return false;
+      if (!getPlayerWorldLocListList()
+          .equals(other.getPlayerWorldLocListList())) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -322,14 +317,14 @@ public final class WorldPlayerLocationNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      if (getPlayerWorldLocListCount() > 0) {
-        hash = (37 * hash) + PLAYER_WORLD_LOC_LIST_FIELD_NUMBER;
-        hash = (53 * hash) + getPlayerWorldLocListList().hashCode();
-      }
       if (getPlayerLocListCount() > 0) {
         hash = (37 * hash) + PLAYER_LOC_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getPlayerLocListList().hashCode();
       }
+      if (getPlayerWorldLocListCount() > 0) {
+        hash = (37 * hash) + PLAYER_WORLD_LOC_LIST_FIELD_NUMBER;
+        hash = (53 * hash) + getPlayerWorldLocListList().hashCode();
+      }
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -426,11 +421,6 @@ public final class WorldPlayerLocationNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 7085
-     * Obf: KEIDNDOFINC
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerLocationNotify}
      */
     public static final class Builder extends
@@ -463,25 +453,25 @@ public final class WorldPlayerLocationNotifyOuterClass {
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessageV3
                 .alwaysUseFieldBuilders) {
-          getPlayerWorldLocListFieldBuilder();
           getPlayerLocListFieldBuilder();
+          getPlayerWorldLocListFieldBuilder();
         }
       }
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        if (playerWorldLocListBuilder_ == null) {
-          playerWorldLocList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-        } else {
-          playerWorldLocListBuilder_.clear();
-        }
         if (playerLocListBuilder_ == null) {
           playerLocList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
         } else {
           playerLocListBuilder_.clear();
         }
+        if (playerWorldLocListBuilder_ == null) {
+          playerWorldLocList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+        } else {
+          playerWorldLocListBuilder_.clear();
+        }
         return this;
       }
 
@@ -509,24 +499,24 @@ public final class WorldPlayerLocationNotifyOuterClass {
       public emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify buildPartial() {
         emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify result = new emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify(this);
         int from_bitField0_ = bitField0_;
-        if (playerWorldLocListBuilder_ == null) {
-          if (((bitField0_ & 0x00000001) != 0)) {
-            playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
-            bitField0_ = (bitField0_ & ~0x00000001);
-          }
-          result.playerWorldLocList_ = playerWorldLocList_;
-        } else {
-          result.playerWorldLocList_ = playerWorldLocListBuilder_.build();
-        }
         if (playerLocListBuilder_ == null) {
-          if (((bitField0_ & 0x00000002) != 0)) {
+          if (((bitField0_ & 0x00000001) != 0)) {
             playerLocList_ = java.util.Collections.unmodifiableList(playerLocList_);
-            bitField0_ = (bitField0_ & ~0x00000002);
+            bitField0_ = (bitField0_ & ~0x00000001);
           }
           result.playerLocList_ = playerLocList_;
         } else {
           result.playerLocList_ = playerLocListBuilder_.build();
         }
+        if (playerWorldLocListBuilder_ == null) {
+          if (((bitField0_ & 0x00000002) != 0)) {
+            playerWorldLocList_ = java.util.Collections.unmodifiableList(playerWorldLocList_);
+            bitField0_ = (bitField0_ & ~0x00000002);
+          }
+          result.playerWorldLocList_ = playerWorldLocList_;
+        } else {
+          result.playerWorldLocList_ = playerWorldLocListBuilder_.build();
+        }
         onBuilt();
         return result;
       }
@@ -575,37 +565,11 @@ public final class WorldPlayerLocationNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify other) {
         if (other == emu.grasscutter.net.proto.WorldPlayerLocationNotifyOuterClass.WorldPlayerLocationNotify.getDefaultInstance()) return this;
-        if (playerWorldLocListBuilder_ == null) {
-          if (!other.playerWorldLocList_.isEmpty()) {
-            if (playerWorldLocList_.isEmpty()) {
-              playerWorldLocList_ = other.playerWorldLocList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-            } else {
-              ensurePlayerWorldLocListIsMutable();
-              playerWorldLocList_.addAll(other.playerWorldLocList_);
-            }
-            onChanged();
-          }
-        } else {
-          if (!other.playerWorldLocList_.isEmpty()) {
-            if (playerWorldLocListBuilder_.isEmpty()) {
-              playerWorldLocListBuilder_.dispose();
-              playerWorldLocListBuilder_ = null;
-              playerWorldLocList_ = other.playerWorldLocList_;
-              bitField0_ = (bitField0_ & ~0x00000001);
-              playerWorldLocListBuilder_ = 
-                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
-                   getPlayerWorldLocListFieldBuilder() : null;
-            } else {
-              playerWorldLocListBuilder_.addAllMessages(other.playerWorldLocList_);
-            }
-          }
-        }
         if (playerLocListBuilder_ == null) {
           if (!other.playerLocList_.isEmpty()) {
             if (playerLocList_.isEmpty()) {
               playerLocList_ = other.playerLocList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
             } else {
               ensurePlayerLocListIsMutable();
               playerLocList_.addAll(other.playerLocList_);
@@ -618,7 +582,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
               playerLocListBuilder_.dispose();
               playerLocListBuilder_ = null;
               playerLocList_ = other.playerLocList_;
-              bitField0_ = (bitField0_ & ~0x00000002);
+              bitField0_ = (bitField0_ & ~0x00000001);
               playerLocListBuilder_ = 
                 com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
                    getPlayerLocListFieldBuilder() : null;
@@ -627,6 +591,32 @@ public final class WorldPlayerLocationNotifyOuterClass {
             }
           }
         }
+        if (playerWorldLocListBuilder_ == null) {
+          if (!other.playerWorldLocList_.isEmpty()) {
+            if (playerWorldLocList_.isEmpty()) {
+              playerWorldLocList_ = other.playerWorldLocList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+            } else {
+              ensurePlayerWorldLocListIsMutable();
+              playerWorldLocList_.addAll(other.playerWorldLocList_);
+            }
+            onChanged();
+          }
+        } else {
+          if (!other.playerWorldLocList_.isEmpty()) {
+            if (playerWorldLocListBuilder_.isEmpty()) {
+              playerWorldLocListBuilder_.dispose();
+              playerWorldLocListBuilder_ = null;
+              playerWorldLocList_ = other.playerWorldLocList_;
+              bitField0_ = (bitField0_ & ~0x00000002);
+              playerWorldLocListBuilder_ = 
+                com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
+                   getPlayerWorldLocListFieldBuilder() : null;
+            } else {
+              playerWorldLocListBuilder_.addAllMessages(other.playerWorldLocList_);
+            }
+          }
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -657,252 +647,12 @@ public final class WorldPlayerLocationNotifyOuterClass {
       }
       private int bitField0_;
 
-      private java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> playerWorldLocList_ =
-        java.util.Collections.emptyList();
-      private void ensurePlayerWorldLocListIsMutable() {
-        if (!((bitField0_ & 0x00000001) != 0)) {
-          playerWorldLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo>(playerWorldLocList_);
-          bitField0_ |= 0x00000001;
-         }
-      }
-
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> playerWorldLocListBuilder_;
-
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> getPlayerWorldLocListList() {
-        if (playerWorldLocListBuilder_ == null) {
-          return java.util.Collections.unmodifiableList(playerWorldLocList_);
-        } else {
-          return playerWorldLocListBuilder_.getMessageList();
-        }
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public int getPlayerWorldLocListCount() {
-        if (playerWorldLocListBuilder_ == null) {
-          return playerWorldLocList_.size();
-        } else {
-          return playerWorldLocListBuilder_.getCount();
-        }
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
-        if (playerWorldLocListBuilder_ == null) {
-          return playerWorldLocList_.get(index);
-        } else {
-          return playerWorldLocListBuilder_.getMessage(index);
-        }
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder setPlayerWorldLocList(
-          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
-        if (playerWorldLocListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.set(index, value);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.setMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder setPlayerWorldLocList(
-          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
-        if (playerWorldLocListBuilder_ == null) {
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.set(index, builderForValue.build());
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.setMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
-        if (playerWorldLocListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.add(value);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.addMessage(value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder addPlayerWorldLocList(
-          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
-        if (playerWorldLocListBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.add(index, value);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.addMessage(index, value);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder addPlayerWorldLocList(
-          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
-        if (playerWorldLocListBuilder_ == null) {
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.add(builderForValue.build());
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.addMessage(builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder addPlayerWorldLocList(
-          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
-        if (playerWorldLocListBuilder_ == null) {
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.add(index, builderForValue.build());
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.addMessage(index, builderForValue.build());
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder addAllPlayerWorldLocList(
-          java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> values) {
-        if (playerWorldLocListBuilder_ == null) {
-          ensurePlayerWorldLocListIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, playerWorldLocList_);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.addAllMessages(values);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder clearPlayerWorldLocList() {
-        if (playerWorldLocListBuilder_ == null) {
-          playerWorldLocList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000001);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.clear();
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public Builder removePlayerWorldLocList(int index) {
-        if (playerWorldLocListBuilder_ == null) {
-          ensurePlayerWorldLocListIsMutable();
-          playerWorldLocList_.remove(index);
-          onChanged();
-        } else {
-          playerWorldLocListBuilder_.remove(index);
-        }
-        return this;
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder getPlayerWorldLocListBuilder(
-          int index) {
-        return getPlayerWorldLocListFieldBuilder().getBuilder(index);
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
-          int index) {
-        if (playerWorldLocListBuilder_ == null) {
-          return playerWorldLocList_.get(index);  } else {
-          return playerWorldLocListBuilder_.getMessageOrBuilder(index);
-        }
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
-           getPlayerWorldLocListOrBuilderList() {
-        if (playerWorldLocListBuilder_ != null) {
-          return playerWorldLocListBuilder_.getMessageOrBuilderList();
-        } else {
-          return java.util.Collections.unmodifiableList(playerWorldLocList_);
-        }
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder() {
-        return getPlayerWorldLocListFieldBuilder().addBuilder(
-            emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder(
-          int index) {
-        return getPlayerWorldLocListFieldBuilder().addBuilder(
-            index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
-      }
-      /**
-       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 10;</code>
-       */
-      public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder> 
-           getPlayerWorldLocListBuilderList() {
-        return getPlayerWorldLocListFieldBuilder().getBuilderList();
-      }
-      private com.google.protobuf.RepeatedFieldBuilderV3<
-          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
-          getPlayerWorldLocListFieldBuilder() {
-        if (playerWorldLocListBuilder_ == null) {
-          playerWorldLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
-              emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>(
-                  playerWorldLocList_,
-                  ((bitField0_ & 0x00000001) != 0),
-                  getParentForChildren(),
-                  isClean());
-          playerWorldLocList_ = null;
-        }
-        return playerWorldLocListBuilder_;
-      }
-
       private java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> playerLocList_ =
         java.util.Collections.emptyList();
       private void ensurePlayerLocListIsMutable() {
-        if (!((bitField0_ & 0x00000002) != 0)) {
+        if (!((bitField0_ & 0x00000001) != 0)) {
           playerLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo>(playerLocList_);
-          bitField0_ |= 0x00000002;
+          bitField0_ |= 0x00000001;
          }
       }
 
@@ -910,7 +660,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> playerLocListBuilder_;
 
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> getPlayerLocListList() {
         if (playerLocListBuilder_ == null) {
@@ -920,7 +670,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public int getPlayerLocListCount() {
         if (playerLocListBuilder_ == null) {
@@ -930,7 +680,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo getPlayerLocList(int index) {
         if (playerLocListBuilder_ == null) {
@@ -940,7 +690,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder setPlayerLocList(
           int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
@@ -957,7 +707,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder setPlayerLocList(
           int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
@@ -971,7 +721,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder addPlayerLocList(emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
         if (playerLocListBuilder_ == null) {
@@ -987,7 +737,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder addPlayerLocList(
           int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo value) {
@@ -1004,7 +754,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder addPlayerLocList(
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
@@ -1018,7 +768,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder addPlayerLocList(
           int index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder builderForValue) {
@@ -1032,7 +782,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder addAllPlayerLocList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo> values) {
@@ -1047,12 +797,12 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder clearPlayerLocList() {
         if (playerLocListBuilder_ == null) {
           playerLocList_ = java.util.Collections.emptyList();
-          bitField0_ = (bitField0_ & ~0x00000002);
+          bitField0_ = (bitField0_ & ~0x00000001);
           onChanged();
         } else {
           playerLocListBuilder_.clear();
@@ -1060,7 +810,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public Builder removePlayerLocList(int index) {
         if (playerLocListBuilder_ == null) {
@@ -1073,14 +823,14 @@ public final class WorldPlayerLocationNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder getPlayerLocListBuilder(
           int index) {
         return getPlayerLocListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder getPlayerLocListOrBuilder(
           int index) {
@@ -1090,7 +840,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder> 
            getPlayerLocListOrBuilderList() {
@@ -1101,14 +851,14 @@ public final class WorldPlayerLocationNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder() {
         return getPlayerLocListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder addPlayerLocListBuilder(
           int index) {
@@ -1116,7 +866,7 @@ public final class WorldPlayerLocationNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerLocationInfo player_loc_list = 1;</code>
+       * <code>repeated .PlayerLocationInfo player_loc_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder> 
            getPlayerLocListBuilderList() {
@@ -1129,13 +879,253 @@ public final class WorldPlayerLocationNotifyOuterClass {
           playerLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
               emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfo.Builder, emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.PlayerLocationInfoOrBuilder>(
                   playerLocList_,
-                  ((bitField0_ & 0x00000002) != 0),
+                  ((bitField0_ & 0x00000001) != 0),
                   getParentForChildren(),
                   isClean());
           playerLocList_ = null;
         }
         return playerLocListBuilder_;
       }
+
+      private java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> playerWorldLocList_ =
+        java.util.Collections.emptyList();
+      private void ensurePlayerWorldLocListIsMutable() {
+        if (!((bitField0_ & 0x00000002) != 0)) {
+          playerWorldLocList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo>(playerWorldLocList_);
+          bitField0_ |= 0x00000002;
+         }
+      }
+
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> playerWorldLocListBuilder_;
+
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> getPlayerWorldLocListList() {
+        if (playerWorldLocListBuilder_ == null) {
+          return java.util.Collections.unmodifiableList(playerWorldLocList_);
+        } else {
+          return playerWorldLocListBuilder_.getMessageList();
+        }
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public int getPlayerWorldLocListCount() {
+        if (playerWorldLocListBuilder_ == null) {
+          return playerWorldLocList_.size();
+        } else {
+          return playerWorldLocListBuilder_.getCount();
+        }
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo getPlayerWorldLocList(int index) {
+        if (playerWorldLocListBuilder_ == null) {
+          return playerWorldLocList_.get(index);
+        } else {
+          return playerWorldLocListBuilder_.getMessage(index);
+        }
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder setPlayerWorldLocList(
+          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+        if (playerWorldLocListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.set(index, value);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.setMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder setPlayerWorldLocList(
+          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+        if (playerWorldLocListBuilder_ == null) {
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.set(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.setMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder addPlayerWorldLocList(emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+        if (playerWorldLocListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.add(value);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.addMessage(value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder addPlayerWorldLocList(
+          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo value) {
+        if (playerWorldLocListBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.add(index, value);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.addMessage(index, value);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder addPlayerWorldLocList(
+          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+        if (playerWorldLocListBuilder_ == null) {
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.add(builderForValue.build());
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.addMessage(builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder addPlayerWorldLocList(
+          int index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder builderForValue) {
+        if (playerWorldLocListBuilder_ == null) {
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.add(index, builderForValue.build());
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.addMessage(index, builderForValue.build());
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder addAllPlayerWorldLocList(
+          java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo> values) {
+        if (playerWorldLocListBuilder_ == null) {
+          ensurePlayerWorldLocListIsMutable();
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, playerWorldLocList_);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.addAllMessages(values);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder clearPlayerWorldLocList() {
+        if (playerWorldLocListBuilder_ == null) {
+          playerWorldLocList_ = java.util.Collections.emptyList();
+          bitField0_ = (bitField0_ & ~0x00000002);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.clear();
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public Builder removePlayerWorldLocList(int index) {
+        if (playerWorldLocListBuilder_ == null) {
+          ensurePlayerWorldLocListIsMutable();
+          playerWorldLocList_.remove(index);
+          onChanged();
+        } else {
+          playerWorldLocListBuilder_.remove(index);
+        }
+        return this;
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder getPlayerWorldLocListBuilder(
+          int index) {
+        return getPlayerWorldLocListFieldBuilder().getBuilder(index);
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder getPlayerWorldLocListOrBuilder(
+          int index) {
+        if (playerWorldLocListBuilder_ == null) {
+          return playerWorldLocList_.get(index);  } else {
+          return playerWorldLocListBuilder_.getMessageOrBuilder(index);
+        }
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public java.util.List<? extends emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
+           getPlayerWorldLocListOrBuilderList() {
+        if (playerWorldLocListBuilder_ != null) {
+          return playerWorldLocListBuilder_.getMessageOrBuilderList();
+        } else {
+          return java.util.Collections.unmodifiableList(playerWorldLocList_);
+        }
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder() {
+        return getPlayerWorldLocListFieldBuilder().addBuilder(
+            emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder addPlayerWorldLocListBuilder(
+          int index) {
+        return getPlayerWorldLocListFieldBuilder().addBuilder(
+            index, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.getDefaultInstance());
+      }
+      /**
+       * <code>repeated .PlayerWorldLocationInfo player_world_loc_list = 11;</code>
+       */
+      public java.util.List<emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder> 
+           getPlayerWorldLocListBuilderList() {
+        return getPlayerWorldLocListFieldBuilder().getBuilderList();
+      }
+      private com.google.protobuf.RepeatedFieldBuilderV3<
+          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder> 
+          getPlayerWorldLocListFieldBuilder() {
+        if (playerWorldLocListBuilder_ == null) {
+          playerWorldLocListBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3<
+              emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfo.Builder, emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.PlayerWorldLocationInfoOrBuilder>(
+                  playerWorldLocList_,
+                  ((bitField0_ & 0x00000002) != 0),
+                  getParentForChildren(),
+                  isClean());
+          playerWorldLocList_ = null;
+        }
+        return playerWorldLocListBuilder_;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1203,28 +1193,28 @@ public final class WorldPlayerLocationNotifyOuterClass {
       descriptor;
   static {
     java.lang.String[] descriptorData = {
-      "\n\037WorldPlayerLocationNotify.proto\032\035Playe" +
-      "rWorldLocationInfo.proto\032\030PlayerLocation" +
+      "\n\037WorldPlayerLocationNotify.proto\032\030Playe" +
+      "rLocationInfo.proto\032\035PlayerWorldLocation" +
       "Info.proto\"\202\001\n\031WorldPlayerLocationNotify" +
-      "\0227\n\025player_world_loc_list\030\n \003(\0132\030.Player" +
-      "WorldLocationInfo\022,\n\017player_loc_list\030\001 \003" +
-      "(\0132\023.PlayerLocationInfoB\033\n\031emu.grasscutt" +
+      "\022,\n\017player_loc_list\030\002 \003(\0132\023.PlayerLocati" +
+      "onInfo\0227\n\025player_world_loc_list\030\013 \003(\0132\030." +
+      "PlayerWorldLocationInfoB\033\n\031emu.grasscutt" +
       "er.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
-          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.getDescriptor(),
           emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor(),
+          emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.getDescriptor(),
         });
     internal_static_WorldPlayerLocationNotify_descriptor =
       getDescriptor().getMessageTypes().get(0);
     internal_static_WorldPlayerLocationNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldPlayerLocationNotify_descriptor,
-        new java.lang.String[] { "PlayerWorldLocList", "PlayerLocList", });
-    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.getDescriptor();
+        new java.lang.String[] { "PlayerLocList", "PlayerWorldLocList", });
     emu.grasscutter.net.proto.PlayerLocationInfoOuterClass.getDescriptor();
+    emu.grasscutter.net.proto.PlayerWorldLocationInfoOuterClass.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
index 69ace6d7f..46268f9fe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerRTTNotifyOuterClass.java
@@ -19,35 +19,30 @@ public final class WorldPlayerRTTNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     java.util.List<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo> 
         getPlayerRttListList();
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index);
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     int getPlayerRttListCount();
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder> 
         getPlayerRttListOrBuilderList();
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
         int index);
   }
   /**
-   * <pre>
-   * CmdId: 421
-   * Obf: JNKBKEOBKGL
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerRTTNotify}
    */
   public static final class WorldPlayerRTTNotify extends
@@ -94,7 +89,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 50: {
+            case 18: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 playerRttList_ = new java.util.ArrayList<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -138,17 +133,17 @@ public final class WorldPlayerRTTNotifyOuterClass {
               emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify.class, emu.grasscutter.net.proto.WorldPlayerRTTNotifyOuterClass.WorldPlayerRTTNotify.Builder.class);
     }
 
-    public static final int PLAYER_RTT_LIST_FIELD_NUMBER = 6;
+    public static final int PLAYER_RTT_LIST_FIELD_NUMBER = 2;
     private java.util.List<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo> playerRttList_;
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo> getPlayerRttListList() {
       return playerRttList_;
     }
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder> 
@@ -156,21 +151,21 @@ public final class WorldPlayerRTTNotifyOuterClass {
       return playerRttList_;
     }
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     @java.lang.Override
     public int getPlayerRttListCount() {
       return playerRttList_.size();
     }
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index) {
       return playerRttList_.get(index);
     }
     /**
-     * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+     * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
@@ -193,7 +188,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < playerRttList_.size(); i++) {
-        output.writeMessage(6, playerRttList_.get(i));
+        output.writeMessage(2, playerRttList_.get(i));
       }
       unknownFields.writeTo(output);
     }
@@ -206,7 +201,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
       size = 0;
       for (int i = 0; i < playerRttList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(6, playerRttList_.get(i));
+          .computeMessageSize(2, playerRttList_.get(i));
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -336,11 +331,6 @@ public final class WorldPlayerRTTNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 421
-     * Obf: JNKBKEOBKGL
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerRTTNotify}
      */
     public static final class Builder extends
@@ -538,7 +528,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
           emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder> playerRttListBuilder_;
 
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo> getPlayerRttListList() {
         if (playerRttListBuilder_ == null) {
@@ -548,7 +538,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public int getPlayerRttListCount() {
         if (playerRttListBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo getPlayerRttList(int index) {
         if (playerRttListBuilder_ == null) {
@@ -568,7 +558,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder setPlayerRttList(
           int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
@@ -585,7 +575,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder setPlayerRttList(
           int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -599,7 +589,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder addPlayerRttList(emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
         if (playerRttListBuilder_ == null) {
@@ -615,7 +605,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder addPlayerRttList(
           int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo value) {
@@ -632,7 +622,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder addPlayerRttList(
           emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -646,7 +636,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder addPlayerRttList(
           int index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder builderForValue) {
@@ -660,7 +650,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder addAllPlayerRttList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo> values) {
@@ -675,7 +665,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder clearPlayerRttList() {
         if (playerRttListBuilder_ == null) {
@@ -688,7 +678,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public Builder removePlayerRttList(int index) {
         if (playerRttListBuilder_ == null) {
@@ -701,14 +691,14 @@ public final class WorldPlayerRTTNotifyOuterClass {
         return this;
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder getPlayerRttListBuilder(
           int index) {
         return getPlayerRttListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder getPlayerRttListOrBuilder(
           int index) {
@@ -718,7 +708,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfoOrBuilder> 
            getPlayerRttListOrBuilderList() {
@@ -729,14 +719,14 @@ public final class WorldPlayerRTTNotifyOuterClass {
         }
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder addPlayerRttListBuilder() {
         return getPlayerRttListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder addPlayerRttListBuilder(
           int index) {
@@ -744,7 +734,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
             index, emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .PlayerRTTInfo player_rtt_list = 6;</code>
+       * <code>repeated .PlayerRTTInfo player_rtt_list = 2;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.PlayerRTTInfoOuterClass.PlayerRTTInfo.Builder> 
            getPlayerRttListBuilderList() {
@@ -833,7 +823,7 @@ public final class WorldPlayerRTTNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\032WorldPlayerRTTNotify.proto\032\023PlayerRTTI" +
       "nfo.proto\"?\n\024WorldPlayerRTTNotify\022\'\n\017pla" +
-      "yer_rtt_list\030\006 \003(\0132\016.PlayerRTTInfoB\033\n\031em" +
+      "yer_rtt_list\030\002 \003(\0132\016.PlayerRTTInfoB\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/WorldPlayerReviveReqOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveReqOuterClass.java
index 97fe7b94b..54fbde0d3 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveReqOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveReqOuterClass.java
@@ -19,11 +19,6 @@ public final class WorldPlayerReviveReqOuterClass {
       com.google.protobuf.MessageOrBuilder {
   }
   /**
-   * <pre>
-   * CmdId: 2639
-   * Obf: CLFPPNDBGLJ
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerReviveReq}
    */
   public static final class WorldPlayerReviveReq extends
@@ -245,11 +240,6 @@ public final class WorldPlayerReviveReqOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 2639
-     * Obf: CLFPPNDBGLJ
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerReviveReq}
      */
     public static final class Builder extends
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveRspOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveRspOuterClass.java
index 3005d40ce..48d095b12 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveRspOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldPlayerReviveRspOuterClass.java
@@ -19,17 +19,12 @@ public final class WorldPlayerReviveRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     int getRetcode();
   }
   /**
-   * <pre>
-   * CmdId: 3657
-   * Obf: OBBNANBMDCB
-   * </pre>
-   *
    * Protobuf type {@code WorldPlayerReviveRsp}
    */
   public static final class WorldPlayerReviveRsp extends
@@ -74,7 +69,7 @@ public final class WorldPlayerReviveRspOuterClass {
             case 0:
               done = true;
               break;
-            case 112: {
+            case 40: {
 
               retcode_ = input.readInt32();
               break;
@@ -111,10 +106,10 @@ public final class WorldPlayerReviveRspOuterClass {
               emu.grasscutter.net.proto.WorldPlayerReviveRspOuterClass.WorldPlayerReviveRsp.class, emu.grasscutter.net.proto.WorldPlayerReviveRspOuterClass.WorldPlayerReviveRsp.Builder.class);
     }
 
-    public static final int RETCODE_FIELD_NUMBER = 14;
+    public static final int RETCODE_FIELD_NUMBER = 5;
     private int retcode_;
     /**
-     * <code>int32 retcode = 14;</code>
+     * <code>int32 retcode = 5;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class WorldPlayerReviveRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (retcode_ != 0) {
-        output.writeInt32(14, retcode_);
+        output.writeInt32(5, retcode_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class WorldPlayerReviveRspOuterClass {
       size = 0;
       if (retcode_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(14, retcode_);
+          .computeInt32Size(5, retcode_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class WorldPlayerReviveRspOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 3657
-     * Obf: OBBNANBMDCB
-     * </pre>
-     *
      * Protobuf type {@code WorldPlayerReviveRsp}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class WorldPlayerReviveRspOuterClass {
 
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class WorldPlayerReviveRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class WorldPlayerReviveRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 14;</code>
+       * <code>int32 retcode = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -527,7 +517,7 @@ public final class WorldPlayerReviveRspOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032WorldPlayerReviveRsp.proto\"\'\n\024WorldPla" +
-      "yerReviveRsp\022\017\n\007retcode\030\016 \001(\005B\033\n\031emu.gra" +
+      "yerReviveRsp\022\017\n\007retcode\030\005 \001(\005B\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineChangeNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineChangeNotifyOuterClass.java
index ff0ed77b3..dc6e48e40 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineChangeNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineChangeNotifyOuterClass.java
@@ -19,32 +19,27 @@ public final class WorldRoutineChangeNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>uint32 routine_type = 14;</code>
+     * @return The routineType.
+     */
+    int getRoutineType();
+
+    /**
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      * @return Whether the routineInfo field is set.
      */
     boolean hasRoutineInfo();
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      * @return The routineInfo.
      */
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo getRoutineInfo();
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      */
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getRoutineInfoOrBuilder();
-
-    /**
-     * <code>uint32 routine_type = 12;</code>
-     * @return The routineType.
-     */
-    int getRoutineType();
   }
   /**
-   * <pre>
-   * CmdId: 1471
-   * Obf: LFKFNGGMMDB
-   * </pre>
-   *
    * Protobuf type {@code WorldRoutineChangeNotify}
    */
   public static final class WorldRoutineChangeNotify extends
@@ -89,7 +84,12 @@ public final class WorldRoutineChangeNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 74: {
+            case 112: {
+
+              routineType_ = input.readUInt32();
+              break;
+            }
+            case 122: {
               emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder subBuilder = null;
               if (routineInfo_ != null) {
                 subBuilder = routineInfo_.toBuilder();
@@ -102,11 +102,6 @@ public final class WorldRoutineChangeNotifyOuterClass {
 
               break;
             }
-            case 96: {
-
-              routineType_ = input.readUInt32();
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -139,10 +134,21 @@ public final class WorldRoutineChangeNotifyOuterClass {
               emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify.class, emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify.Builder.class);
     }
 
-    public static final int ROUTINE_INFO_FIELD_NUMBER = 9;
+    public static final int ROUTINE_TYPE_FIELD_NUMBER = 14;
+    private int routineType_;
+    /**
+     * <code>uint32 routine_type = 14;</code>
+     * @return The routineType.
+     */
+    @java.lang.Override
+    public int getRoutineType() {
+      return routineType_;
+    }
+
+    public static final int ROUTINE_INFO_FIELD_NUMBER = 15;
     private emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo routineInfo_;
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      * @return Whether the routineInfo field is set.
      */
     @java.lang.Override
@@ -150,7 +156,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
       return routineInfo_ != null;
     }
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      * @return The routineInfo.
      */
     @java.lang.Override
@@ -158,24 +164,13 @@ public final class WorldRoutineChangeNotifyOuterClass {
       return routineInfo_ == null ? emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.getDefaultInstance() : routineInfo_;
     }
     /**
-     * <code>.WorldRoutineInfo routine_info = 9;</code>
+     * <code>.WorldRoutineInfo routine_info = 15;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getRoutineInfoOrBuilder() {
       return getRoutineInfo();
     }
 
-    public static final int ROUTINE_TYPE_FIELD_NUMBER = 12;
-    private int routineType_;
-    /**
-     * <code>uint32 routine_type = 12;</code>
-     * @return The routineType.
-     */
-    @java.lang.Override
-    public int getRoutineType() {
-      return routineType_;
-    }
-
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -190,11 +185,11 @@ public final class WorldRoutineChangeNotifyOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (routineInfo_ != null) {
-        output.writeMessage(9, getRoutineInfo());
-      }
       if (routineType_ != 0) {
-        output.writeUInt32(12, routineType_);
+        output.writeUInt32(14, routineType_);
+      }
+      if (routineInfo_ != null) {
+        output.writeMessage(15, getRoutineInfo());
       }
       unknownFields.writeTo(output);
     }
@@ -205,13 +200,13 @@ public final class WorldRoutineChangeNotifyOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (routineInfo_ != null) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(9, getRoutineInfo());
-      }
       if (routineType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(12, routineType_);
+          .computeUInt32Size(14, routineType_);
+      }
+      if (routineInfo_ != null) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(15, getRoutineInfo());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -228,13 +223,13 @@ public final class WorldRoutineChangeNotifyOuterClass {
       }
       emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify other = (emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify) obj;
 
+      if (getRoutineType()
+          != other.getRoutineType()) return false;
       if (hasRoutineInfo() != other.hasRoutineInfo()) return false;
       if (hasRoutineInfo()) {
         if (!getRoutineInfo()
             .equals(other.getRoutineInfo())) return false;
       }
-      if (getRoutineType()
-          != other.getRoutineType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -246,12 +241,12 @@ public final class WorldRoutineChangeNotifyOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + ROUTINE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getRoutineType();
       if (hasRoutineInfo()) {
         hash = (37 * hash) + ROUTINE_INFO_FIELD_NUMBER;
         hash = (53 * hash) + getRoutineInfo().hashCode();
       }
-      hash = (37 * hash) + ROUTINE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getRoutineType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -348,11 +343,6 @@ public final class WorldRoutineChangeNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 1471
-     * Obf: LFKFNGGMMDB
-     * </pre>
-     *
      * Protobuf type {@code WorldRoutineChangeNotify}
      */
     public static final class Builder extends
@@ -390,14 +380,14 @@ public final class WorldRoutineChangeNotifyOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
+        routineType_ = 0;
+
         if (routineInfoBuilder_ == null) {
           routineInfo_ = null;
         } else {
           routineInfo_ = null;
           routineInfoBuilder_ = null;
         }
-        routineType_ = 0;
-
         return this;
       }
 
@@ -424,12 +414,12 @@ public final class WorldRoutineChangeNotifyOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify buildPartial() {
         emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify result = new emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify(this);
+        result.routineType_ = routineType_;
         if (routineInfoBuilder_ == null) {
           result.routineInfo_ = routineInfo_;
         } else {
           result.routineInfo_ = routineInfoBuilder_.build();
         }
-        result.routineType_ = routineType_;
         onBuilt();
         return result;
       }
@@ -478,12 +468,12 @@ public final class WorldRoutineChangeNotifyOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify other) {
         if (other == emu.grasscutter.net.proto.WorldRoutineChangeNotifyOuterClass.WorldRoutineChangeNotify.getDefaultInstance()) return this;
-        if (other.hasRoutineInfo()) {
-          mergeRoutineInfo(other.getRoutineInfo());
-        }
         if (other.getRoutineType() != 0) {
           setRoutineType(other.getRoutineType());
         }
+        if (other.hasRoutineInfo()) {
+          mergeRoutineInfo(other.getRoutineInfo());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -513,18 +503,49 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return this;
       }
 
+      private int routineType_ ;
+      /**
+       * <code>uint32 routine_type = 14;</code>
+       * @return The routineType.
+       */
+      @java.lang.Override
+      public int getRoutineType() {
+        return routineType_;
+      }
+      /**
+       * <code>uint32 routine_type = 14;</code>
+       * @param value The routineType to set.
+       * @return This builder for chaining.
+       */
+      public Builder setRoutineType(int value) {
+        
+        routineType_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 routine_type = 14;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearRoutineType() {
+        
+        routineType_ = 0;
+        onChanged();
+        return this;
+      }
+
       private emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo routineInfo_;
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> routineInfoBuilder_;
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        * @return Whether the routineInfo field is set.
        */
       public boolean hasRoutineInfo() {
         return routineInfoBuilder_ != null || routineInfo_ != null;
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        * @return The routineInfo.
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo getRoutineInfo() {
@@ -535,7 +556,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public Builder setRoutineInfo(emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo value) {
         if (routineInfoBuilder_ == null) {
@@ -551,7 +572,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public Builder setRoutineInfo(
           emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder builderForValue) {
@@ -565,7 +586,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public Builder mergeRoutineInfo(emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo value) {
         if (routineInfoBuilder_ == null) {
@@ -583,7 +604,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public Builder clearRoutineInfo() {
         if (routineInfoBuilder_ == null) {
@@ -597,7 +618,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder getRoutineInfoBuilder() {
         
@@ -605,7 +626,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         return getRoutineInfoFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getRoutineInfoOrBuilder() {
         if (routineInfoBuilder_ != null) {
@@ -616,7 +637,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
         }
       }
       /**
-       * <code>.WorldRoutineInfo routine_info = 9;</code>
+       * <code>.WorldRoutineInfo routine_info = 15;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> 
@@ -631,37 +652,6 @@ public final class WorldRoutineChangeNotifyOuterClass {
         }
         return routineInfoBuilder_;
       }
-
-      private int routineType_ ;
-      /**
-       * <code>uint32 routine_type = 12;</code>
-       * @return The routineType.
-       */
-      @java.lang.Override
-      public int getRoutineType() {
-        return routineType_;
-      }
-      /**
-       * <code>uint32 routine_type = 12;</code>
-       * @param value The routineType to set.
-       * @return This builder for chaining.
-       */
-      public Builder setRoutineType(int value) {
-        
-        routineType_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 routine_type = 12;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearRoutineType() {
-        
-        routineType_ = 0;
-        onChanged();
-        return this;
-      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -731,8 +721,8 @@ public final class WorldRoutineChangeNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n\036WorldRoutineChangeNotify.proto\032\026WorldR" +
       "outineInfo.proto\"Y\n\030WorldRoutineChangeNo" +
-      "tify\022\'\n\014routine_info\030\t \001(\0132\021.WorldRoutin" +
-      "eInfo\022\024\n\014routine_type\030\014 \001(\rB\033\n\031emu.grass" +
+      "tify\022\024\n\014routine_type\030\016 \001(\r\022\'\n\014routine_in" +
+      "fo\030\017 \001(\0132\021.WorldRoutineInfoB\033\n\031emu.grass" +
       "cutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -745,7 +735,7 @@ public final class WorldRoutineChangeNotifyOuterClass {
     internal_static_WorldRoutineChangeNotify_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldRoutineChangeNotify_descriptor,
-        new java.lang.String[] { "RoutineInfo", "RoutineType", });
+        new java.lang.String[] { "RoutineType", "RoutineInfo", });
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineInfoOuterClass.java
index 4269cccda..cc3af9192 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineInfoOuterClass.java
@@ -19,34 +19,30 @@ public final class WorldRoutineInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>bool is_finished = 5;</code>
-     * @return The isFinished.
-     */
-    boolean getIsFinished();
-
-    /**
-     * <code>uint32 finish_progress = 10;</code>
+     * <code>uint32 finish_progress = 4;</code>
      * @return The finishProgress.
      */
     int getFinishProgress();
 
     /**
-     * <code>uint32 progress = 13;</code>
-     * @return The progress.
-     */
-    int getProgress();
-
-    /**
-     * <code>uint32 routine_id = 2;</code>
+     * <code>uint32 routine_id = 8;</code>
      * @return The routineId.
      */
     int getRoutineId();
+
+    /**
+     * <code>bool is_finished = 11;</code>
+     * @return The isFinished.
+     */
+    boolean getIsFinished();
+
+    /**
+     * <code>uint32 progress = 15;</code>
+     * @return The progress.
+     */
+    int getProgress();
   }
   /**
-   * <pre>
-   * Obf: FHLNAHHBMIK
-   * </pre>
-   *
    * Protobuf type {@code WorldRoutineInfo}
    */
   public static final class WorldRoutineInfo extends
@@ -91,22 +87,22 @@ public final class WorldRoutineInfoOuterClass {
             case 0:
               done = true;
               break;
-            case 16: {
-
-              routineId_ = input.readUInt32();
-              break;
-            }
-            case 40: {
-
-              isFinished_ = input.readBool();
-              break;
-            }
-            case 80: {
+            case 32: {
 
               finishProgress_ = input.readUInt32();
               break;
             }
-            case 104: {
+            case 64: {
+
+              routineId_ = input.readUInt32();
+              break;
+            }
+            case 88: {
+
+              isFinished_ = input.readBool();
+              break;
+            }
+            case 120: {
 
               progress_ = input.readUInt32();
               break;
@@ -143,21 +139,10 @@ public final class WorldRoutineInfoOuterClass {
               emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.class, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder.class);
     }
 
-    public static final int IS_FINISHED_FIELD_NUMBER = 5;
-    private boolean isFinished_;
-    /**
-     * <code>bool is_finished = 5;</code>
-     * @return The isFinished.
-     */
-    @java.lang.Override
-    public boolean getIsFinished() {
-      return isFinished_;
-    }
-
-    public static final int FINISH_PROGRESS_FIELD_NUMBER = 10;
+    public static final int FINISH_PROGRESS_FIELD_NUMBER = 4;
     private int finishProgress_;
     /**
-     * <code>uint32 finish_progress = 10;</code>
+     * <code>uint32 finish_progress = 4;</code>
      * @return The finishProgress.
      */
     @java.lang.Override
@@ -165,21 +150,10 @@ public final class WorldRoutineInfoOuterClass {
       return finishProgress_;
     }
 
-    public static final int PROGRESS_FIELD_NUMBER = 13;
-    private int progress_;
-    /**
-     * <code>uint32 progress = 13;</code>
-     * @return The progress.
-     */
-    @java.lang.Override
-    public int getProgress() {
-      return progress_;
-    }
-
-    public static final int ROUTINE_ID_FIELD_NUMBER = 2;
+    public static final int ROUTINE_ID_FIELD_NUMBER = 8;
     private int routineId_;
     /**
-     * <code>uint32 routine_id = 2;</code>
+     * <code>uint32 routine_id = 8;</code>
      * @return The routineId.
      */
     @java.lang.Override
@@ -187,6 +161,28 @@ public final class WorldRoutineInfoOuterClass {
       return routineId_;
     }
 
+    public static final int IS_FINISHED_FIELD_NUMBER = 11;
+    private boolean isFinished_;
+    /**
+     * <code>bool is_finished = 11;</code>
+     * @return The isFinished.
+     */
+    @java.lang.Override
+    public boolean getIsFinished() {
+      return isFinished_;
+    }
+
+    public static final int PROGRESS_FIELD_NUMBER = 15;
+    private int progress_;
+    /**
+     * <code>uint32 progress = 15;</code>
+     * @return The progress.
+     */
+    @java.lang.Override
+    public int getProgress() {
+      return progress_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -201,17 +197,17 @@ public final class WorldRoutineInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
+      if (finishProgress_ != 0) {
+        output.writeUInt32(4, finishProgress_);
+      }
       if (routineId_ != 0) {
-        output.writeUInt32(2, routineId_);
+        output.writeUInt32(8, routineId_);
       }
       if (isFinished_ != false) {
-        output.writeBool(5, isFinished_);
-      }
-      if (finishProgress_ != 0) {
-        output.writeUInt32(10, finishProgress_);
+        output.writeBool(11, isFinished_);
       }
       if (progress_ != 0) {
-        output.writeUInt32(13, progress_);
+        output.writeUInt32(15, progress_);
       }
       unknownFields.writeTo(output);
     }
@@ -222,21 +218,21 @@ public final class WorldRoutineInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      if (finishProgress_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(4, finishProgress_);
+      }
       if (routineId_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(2, routineId_);
+          .computeUInt32Size(8, routineId_);
       }
       if (isFinished_ != false) {
         size += com.google.protobuf.CodedOutputStream
-          .computeBoolSize(5, isFinished_);
-      }
-      if (finishProgress_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(10, finishProgress_);
+          .computeBoolSize(11, isFinished_);
       }
       if (progress_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(13, progress_);
+          .computeUInt32Size(15, progress_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -253,14 +249,14 @@ public final class WorldRoutineInfoOuterClass {
       }
       emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo other = (emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo) obj;
 
-      if (getIsFinished()
-          != other.getIsFinished()) return false;
       if (getFinishProgress()
           != other.getFinishProgress()) return false;
-      if (getProgress()
-          != other.getProgress()) return false;
       if (getRoutineId()
           != other.getRoutineId()) return false;
+      if (getIsFinished()
+          != other.getIsFinished()) return false;
+      if (getProgress()
+          != other.getProgress()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -272,15 +268,15 @@ public final class WorldRoutineInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
+      hash = (37 * hash) + FINISH_PROGRESS_FIELD_NUMBER;
+      hash = (53 * hash) + getFinishProgress();
+      hash = (37 * hash) + ROUTINE_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getRoutineId();
       hash = (37 * hash) + IS_FINISHED_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
           getIsFinished());
-      hash = (37 * hash) + FINISH_PROGRESS_FIELD_NUMBER;
-      hash = (53 * hash) + getFinishProgress();
       hash = (37 * hash) + PROGRESS_FIELD_NUMBER;
       hash = (53 * hash) + getProgress();
-      hash = (37 * hash) + ROUTINE_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getRoutineId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -377,10 +373,6 @@ public final class WorldRoutineInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: FHLNAHHBMIK
-     * </pre>
-     *
      * Protobuf type {@code WorldRoutineInfo}
      */
     public static final class Builder extends
@@ -418,14 +410,14 @@ public final class WorldRoutineInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        isFinished_ = false;
-
         finishProgress_ = 0;
 
-        progress_ = 0;
-
         routineId_ = 0;
 
+        isFinished_ = false;
+
+        progress_ = 0;
+
         return this;
       }
 
@@ -452,10 +444,10 @@ public final class WorldRoutineInfoOuterClass {
       @java.lang.Override
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo buildPartial() {
         emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo result = new emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo(this);
-        result.isFinished_ = isFinished_;
         result.finishProgress_ = finishProgress_;
-        result.progress_ = progress_;
         result.routineId_ = routineId_;
+        result.isFinished_ = isFinished_;
+        result.progress_ = progress_;
         onBuilt();
         return result;
       }
@@ -504,18 +496,18 @@ public final class WorldRoutineInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo other) {
         if (other == emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.getDefaultInstance()) return this;
-        if (other.getIsFinished() != false) {
-          setIsFinished(other.getIsFinished());
-        }
         if (other.getFinishProgress() != 0) {
           setFinishProgress(other.getFinishProgress());
         }
-        if (other.getProgress() != 0) {
-          setProgress(other.getProgress());
-        }
         if (other.getRoutineId() != 0) {
           setRoutineId(other.getRoutineId());
         }
+        if (other.getIsFinished() != false) {
+          setIsFinished(other.getIsFinished());
+        }
+        if (other.getProgress() != 0) {
+          setProgress(other.getProgress());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -545,40 +537,9 @@ public final class WorldRoutineInfoOuterClass {
         return this;
       }
 
-      private boolean isFinished_ ;
-      /**
-       * <code>bool is_finished = 5;</code>
-       * @return The isFinished.
-       */
-      @java.lang.Override
-      public boolean getIsFinished() {
-        return isFinished_;
-      }
-      /**
-       * <code>bool is_finished = 5;</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 = 5;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearIsFinished() {
-        
-        isFinished_ = false;
-        onChanged();
-        return this;
-      }
-
       private int finishProgress_ ;
       /**
-       * <code>uint32 finish_progress = 10;</code>
+       * <code>uint32 finish_progress = 4;</code>
        * @return The finishProgress.
        */
       @java.lang.Override
@@ -586,7 +547,7 @@ public final class WorldRoutineInfoOuterClass {
         return finishProgress_;
       }
       /**
-       * <code>uint32 finish_progress = 10;</code>
+       * <code>uint32 finish_progress = 4;</code>
        * @param value The finishProgress to set.
        * @return This builder for chaining.
        */
@@ -597,7 +558,7 @@ public final class WorldRoutineInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 finish_progress = 10;</code>
+       * <code>uint32 finish_progress = 4;</code>
        * @return This builder for chaining.
        */
       public Builder clearFinishProgress() {
@@ -607,40 +568,9 @@ public final class WorldRoutineInfoOuterClass {
         return this;
       }
 
-      private int progress_ ;
-      /**
-       * <code>uint32 progress = 13;</code>
-       * @return The progress.
-       */
-      @java.lang.Override
-      public int getProgress() {
-        return progress_;
-      }
-      /**
-       * <code>uint32 progress = 13;</code>
-       * @param value The progress to set.
-       * @return This builder for chaining.
-       */
-      public Builder setProgress(int value) {
-        
-        progress_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 progress = 13;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearProgress() {
-        
-        progress_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int routineId_ ;
       /**
-       * <code>uint32 routine_id = 2;</code>
+       * <code>uint32 routine_id = 8;</code>
        * @return The routineId.
        */
       @java.lang.Override
@@ -648,7 +578,7 @@ public final class WorldRoutineInfoOuterClass {
         return routineId_;
       }
       /**
-       * <code>uint32 routine_id = 2;</code>
+       * <code>uint32 routine_id = 8;</code>
        * @param value The routineId to set.
        * @return This builder for chaining.
        */
@@ -659,7 +589,7 @@ public final class WorldRoutineInfoOuterClass {
         return this;
       }
       /**
-       * <code>uint32 routine_id = 2;</code>
+       * <code>uint32 routine_id = 8;</code>
        * @return This builder for chaining.
        */
       public Builder clearRoutineId() {
@@ -668,6 +598,68 @@ public final class WorldRoutineInfoOuterClass {
         onChanged();
         return this;
       }
+
+      private boolean isFinished_ ;
+      /**
+       * <code>bool is_finished = 11;</code>
+       * @return The isFinished.
+       */
+      @java.lang.Override
+      public boolean getIsFinished() {
+        return isFinished_;
+      }
+      /**
+       * <code>bool is_finished = 11;</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 = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearIsFinished() {
+        
+        isFinished_ = false;
+        onChanged();
+        return this;
+      }
+
+      private int progress_ ;
+      /**
+       * <code>uint32 progress = 15;</code>
+       * @return The progress.
+       */
+      @java.lang.Override
+      public int getProgress() {
+        return progress_;
+      }
+      /**
+       * <code>uint32 progress = 15;</code>
+       * @param value The progress to set.
+       * @return This builder for chaining.
+       */
+      public Builder setProgress(int value) {
+        
+        progress_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 progress = 15;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearProgress() {
+        
+        progress_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -736,9 +728,9 @@ public final class WorldRoutineInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\026WorldRoutineInfo.proto\"f\n\020WorldRoutine" +
-      "Info\022\023\n\013is_finished\030\005 \001(\010\022\027\n\017finish_prog" +
-      "ress\030\n \001(\r\022\020\n\010progress\030\r \001(\r\022\022\n\nroutine_" +
-      "id\030\002 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "Info\022\027\n\017finish_progress\030\004 \001(\r\022\022\n\nroutine" +
+      "_id\030\010 \001(\r\022\023\n\013is_finished\030\013 \001(\010\022\020\n\010progre" +
+      "ss\030\017 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
       "roto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -750,7 +742,7 @@ public final class WorldRoutineInfoOuterClass {
     internal_static_WorldRoutineInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldRoutineInfo_descriptor,
-        new java.lang.String[] { "IsFinished", "FinishProgress", "Progress", "RoutineId", });
+        new java.lang.String[] { "FinishProgress", "RoutineId", "IsFinished", "Progress", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeCloseNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeCloseNotifyOuterClass.java
index db2ff65d0..f50e8f3fe 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeCloseNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeCloseNotifyOuterClass.java
@@ -19,17 +19,12 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 routine_type = 7;</code>
+     * <code>uint32 routine_type = 5;</code>
      * @return The routineType.
      */
     int getRoutineType();
   }
   /**
-   * <pre>
-   * CmdId: 4128
-   * Obf: PNDNHCJBFLN
-   * </pre>
-   *
    * Protobuf type {@code WorldRoutineTypeCloseNotify}
    */
   public static final class WorldRoutineTypeCloseNotify extends
@@ -74,7 +69,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 56: {
+            case 40: {
 
               routineType_ = input.readUInt32();
               break;
@@ -111,10 +106,10 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
               emu.grasscutter.net.proto.WorldRoutineTypeCloseNotifyOuterClass.WorldRoutineTypeCloseNotify.class, emu.grasscutter.net.proto.WorldRoutineTypeCloseNotifyOuterClass.WorldRoutineTypeCloseNotify.Builder.class);
     }
 
-    public static final int ROUTINE_TYPE_FIELD_NUMBER = 7;
+    public static final int ROUTINE_TYPE_FIELD_NUMBER = 5;
     private int routineType_;
     /**
-     * <code>uint32 routine_type = 7;</code>
+     * <code>uint32 routine_type = 5;</code>
      * @return The routineType.
      */
     @java.lang.Override
@@ -137,7 +132,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (routineType_ != 0) {
-        output.writeUInt32(7, routineType_);
+        output.writeUInt32(5, routineType_);
       }
       unknownFields.writeTo(output);
     }
@@ -150,7 +145,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
       size = 0;
       if (routineType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(7, routineType_);
+          .computeUInt32Size(5, routineType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -278,11 +273,6 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 4128
-     * Obf: PNDNHCJBFLN
-     * </pre>
-     *
      * Protobuf type {@code WorldRoutineTypeCloseNotify}
      */
     public static final class Builder extends
@@ -431,7 +421,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
 
       private int routineType_ ;
       /**
-       * <code>uint32 routine_type = 7;</code>
+       * <code>uint32 routine_type = 5;</code>
        * @return The routineType.
        */
       @java.lang.Override
@@ -439,7 +429,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
         return routineType_;
       }
       /**
-       * <code>uint32 routine_type = 7;</code>
+       * <code>uint32 routine_type = 5;</code>
        * @param value The routineType to set.
        * @return This builder for chaining.
        */
@@ -450,7 +440,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
         return this;
       }
       /**
-       * <code>uint32 routine_type = 7;</code>
+       * <code>uint32 routine_type = 5;</code>
        * @return This builder for chaining.
        */
       public Builder clearRoutineType() {
@@ -528,7 +518,7 @@ public final class WorldRoutineTypeCloseNotifyOuterClass {
     java.lang.String[] descriptorData = {
       "\n!WorldRoutineTypeCloseNotify.proto\"3\n\033W" +
       "orldRoutineTypeCloseNotify\022\024\n\014routine_ty" +
-      "pe\030\007 \001(\rB\033\n\031emu.grasscutter.net.protob\006p" +
+      "pe\030\005 \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/WorldRoutineTypeInfoOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeInfoOuterClass.java
index 1317b7e44..338a022e4 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeInfoOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeInfoOuterClass.java
@@ -19,46 +19,42 @@ public final class WorldRoutineTypeInfoOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>uint32 routine_type = 1;</code>
-     * @return The routineType.
+     * <code>uint32 next_refresh_time = 1;</code>
+     * @return The nextRefreshTime.
      */
-    int getRoutineType();
+    int getNextRefreshTime();
 
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     java.util.List<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo> 
         getWorldRoutineInfoListList();
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo getWorldRoutineInfoList(int index);
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     int getWorldRoutineInfoListCount();
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> 
         getWorldRoutineInfoListOrBuilderList();
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getWorldRoutineInfoListOrBuilder(
         int index);
 
     /**
-     * <code>uint32 next_refresh_time = 4;</code>
-     * @return The nextRefreshTime.
+     * <code>uint32 routine_type = 12;</code>
+     * @return The routineType.
      */
-    int getNextRefreshTime();
+    int getRoutineType();
   }
   /**
-   * <pre>
-   * Obf: HDDGMPBBPKH
-   * </pre>
-   *
    * Protobuf type {@code WorldRoutineTypeInfo}
    */
   public static final class WorldRoutineTypeInfo extends
@@ -107,10 +103,10 @@ public final class WorldRoutineTypeInfoOuterClass {
               break;
             case 8: {
 
-              routineType_ = input.readUInt32();
+              nextRefreshTime_ = input.readUInt32();
               break;
             }
-            case 18: {
+            case 42: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 worldRoutineInfoList_ = new java.util.ArrayList<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo>();
                 mutable_bitField0_ |= 0x00000001;
@@ -119,9 +115,9 @@ public final class WorldRoutineTypeInfoOuterClass {
                   input.readMessage(emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.parser(), extensionRegistry));
               break;
             }
-            case 32: {
+            case 96: {
 
-              nextRefreshTime_ = input.readUInt32();
+              routineType_ = input.readUInt32();
               break;
             }
             default: {
@@ -159,28 +155,28 @@ public final class WorldRoutineTypeInfoOuterClass {
               emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.class, emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder.class);
     }
 
-    public static final int ROUTINE_TYPE_FIELD_NUMBER = 1;
-    private int routineType_;
+    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 1;
+    private int nextRefreshTime_;
     /**
-     * <code>uint32 routine_type = 1;</code>
-     * @return The routineType.
+     * <code>uint32 next_refresh_time = 1;</code>
+     * @return The nextRefreshTime.
      */
     @java.lang.Override
-    public int getRoutineType() {
-      return routineType_;
+    public int getNextRefreshTime() {
+      return nextRefreshTime_;
     }
 
-    public static final int WORLD_ROUTINE_INFO_LIST_FIELD_NUMBER = 2;
+    public static final int WORLD_ROUTINE_INFO_LIST_FIELD_NUMBER = 5;
     private java.util.List<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo> worldRoutineInfoList_;
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo> getWorldRoutineInfoListList() {
       return worldRoutineInfoList_;
     }
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> 
@@ -188,21 +184,21 @@ public final class WorldRoutineTypeInfoOuterClass {
       return worldRoutineInfoList_;
     }
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     @java.lang.Override
     public int getWorldRoutineInfoListCount() {
       return worldRoutineInfoList_.size();
     }
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo getWorldRoutineInfoList(int index) {
       return worldRoutineInfoList_.get(index);
     }
     /**
-     * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+     * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getWorldRoutineInfoListOrBuilder(
@@ -210,15 +206,15 @@ public final class WorldRoutineTypeInfoOuterClass {
       return worldRoutineInfoList_.get(index);
     }
 
-    public static final int NEXT_REFRESH_TIME_FIELD_NUMBER = 4;
-    private int nextRefreshTime_;
+    public static final int ROUTINE_TYPE_FIELD_NUMBER = 12;
+    private int routineType_;
     /**
-     * <code>uint32 next_refresh_time = 4;</code>
-     * @return The nextRefreshTime.
+     * <code>uint32 routine_type = 12;</code>
+     * @return The routineType.
      */
     @java.lang.Override
-    public int getNextRefreshTime() {
-      return nextRefreshTime_;
+    public int getRoutineType() {
+      return routineType_;
     }
 
     private byte memoizedIsInitialized = -1;
@@ -235,14 +231,14 @@ public final class WorldRoutineTypeInfoOuterClass {
     @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
-      if (routineType_ != 0) {
-        output.writeUInt32(1, routineType_);
+      if (nextRefreshTime_ != 0) {
+        output.writeUInt32(1, nextRefreshTime_);
       }
       for (int i = 0; i < worldRoutineInfoList_.size(); i++) {
-        output.writeMessage(2, worldRoutineInfoList_.get(i));
+        output.writeMessage(5, worldRoutineInfoList_.get(i));
       }
-      if (nextRefreshTime_ != 0) {
-        output.writeUInt32(4, nextRefreshTime_);
+      if (routineType_ != 0) {
+        output.writeUInt32(12, routineType_);
       }
       unknownFields.writeTo(output);
     }
@@ -253,17 +249,17 @@ public final class WorldRoutineTypeInfoOuterClass {
       if (size != -1) return size;
 
       size = 0;
-      if (routineType_ != 0) {
+      if (nextRefreshTime_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(1, routineType_);
+          .computeUInt32Size(1, nextRefreshTime_);
       }
       for (int i = 0; i < worldRoutineInfoList_.size(); i++) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(2, worldRoutineInfoList_.get(i));
+          .computeMessageSize(5, worldRoutineInfoList_.get(i));
       }
-      if (nextRefreshTime_ != 0) {
+      if (routineType_ != 0) {
         size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(4, nextRefreshTime_);
+          .computeUInt32Size(12, routineType_);
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -280,12 +276,12 @@ public final class WorldRoutineTypeInfoOuterClass {
       }
       emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo other = (emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo) obj;
 
-      if (getRoutineType()
-          != other.getRoutineType()) return false;
-      if (!getWorldRoutineInfoListList()
-          .equals(other.getWorldRoutineInfoListList())) return false;
       if (getNextRefreshTime()
           != other.getNextRefreshTime()) return false;
+      if (!getWorldRoutineInfoListList()
+          .equals(other.getWorldRoutineInfoListList())) return false;
+      if (getRoutineType()
+          != other.getRoutineType()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -297,14 +293,14 @@ public final class WorldRoutineTypeInfoOuterClass {
       }
       int hash = 41;
       hash = (19 * hash) + getDescriptor().hashCode();
-      hash = (37 * hash) + ROUTINE_TYPE_FIELD_NUMBER;
-      hash = (53 * hash) + getRoutineType();
+      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
+      hash = (53 * hash) + getNextRefreshTime();
       if (getWorldRoutineInfoListCount() > 0) {
         hash = (37 * hash) + WORLD_ROUTINE_INFO_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getWorldRoutineInfoListList().hashCode();
       }
-      hash = (37 * hash) + NEXT_REFRESH_TIME_FIELD_NUMBER;
-      hash = (53 * hash) + getNextRefreshTime();
+      hash = (37 * hash) + ROUTINE_TYPE_FIELD_NUMBER;
+      hash = (53 * hash) + getRoutineType();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -401,10 +397,6 @@ public final class WorldRoutineTypeInfoOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * Obf: HDDGMPBBPKH
-     * </pre>
-     *
      * Protobuf type {@code WorldRoutineTypeInfo}
      */
     public static final class Builder extends
@@ -443,7 +435,7 @@ public final class WorldRoutineTypeInfoOuterClass {
       @java.lang.Override
       public Builder clear() {
         super.clear();
-        routineType_ = 0;
+        nextRefreshTime_ = 0;
 
         if (worldRoutineInfoListBuilder_ == null) {
           worldRoutineInfoList_ = java.util.Collections.emptyList();
@@ -451,7 +443,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         } else {
           worldRoutineInfoListBuilder_.clear();
         }
-        nextRefreshTime_ = 0;
+        routineType_ = 0;
 
         return this;
       }
@@ -480,7 +472,7 @@ public final class WorldRoutineTypeInfoOuterClass {
       public emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo buildPartial() {
         emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo result = new emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo(this);
         int from_bitField0_ = bitField0_;
-        result.routineType_ = routineType_;
+        result.nextRefreshTime_ = nextRefreshTime_;
         if (worldRoutineInfoListBuilder_ == null) {
           if (((bitField0_ & 0x00000001) != 0)) {
             worldRoutineInfoList_ = java.util.Collections.unmodifiableList(worldRoutineInfoList_);
@@ -490,7 +482,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         } else {
           result.worldRoutineInfoList_ = worldRoutineInfoListBuilder_.build();
         }
-        result.nextRefreshTime_ = nextRefreshTime_;
+        result.routineType_ = routineType_;
         onBuilt();
         return result;
       }
@@ -539,8 +531,8 @@ public final class WorldRoutineTypeInfoOuterClass {
 
       public Builder mergeFrom(emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo other) {
         if (other == emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.getDefaultInstance()) return this;
-        if (other.getRoutineType() != 0) {
-          setRoutineType(other.getRoutineType());
+        if (other.getNextRefreshTime() != 0) {
+          setNextRefreshTime(other.getNextRefreshTime());
         }
         if (worldRoutineInfoListBuilder_ == null) {
           if (!other.worldRoutineInfoList_.isEmpty()) {
@@ -568,8 +560,8 @@ public final class WorldRoutineTypeInfoOuterClass {
             }
           }
         }
-        if (other.getNextRefreshTime() != 0) {
-          setNextRefreshTime(other.getNextRefreshTime());
+        if (other.getRoutineType() != 0) {
+          setRoutineType(other.getRoutineType());
         }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
@@ -601,33 +593,33 @@ public final class WorldRoutineTypeInfoOuterClass {
       }
       private int bitField0_;
 
-      private int routineType_ ;
+      private int nextRefreshTime_ ;
       /**
-       * <code>uint32 routine_type = 1;</code>
-       * @return The routineType.
+       * <code>uint32 next_refresh_time = 1;</code>
+       * @return The nextRefreshTime.
        */
       @java.lang.Override
-      public int getRoutineType() {
-        return routineType_;
+      public int getNextRefreshTime() {
+        return nextRefreshTime_;
       }
       /**
-       * <code>uint32 routine_type = 1;</code>
-       * @param value The routineType to set.
+       * <code>uint32 next_refresh_time = 1;</code>
+       * @param value The nextRefreshTime to set.
        * @return This builder for chaining.
        */
-      public Builder setRoutineType(int value) {
+      public Builder setNextRefreshTime(int value) {
         
-        routineType_ = value;
+        nextRefreshTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 routine_type = 1;</code>
+       * <code>uint32 next_refresh_time = 1;</code>
        * @return This builder for chaining.
        */
-      public Builder clearRoutineType() {
+      public Builder clearNextRefreshTime() {
         
-        routineType_ = 0;
+        nextRefreshTime_ = 0;
         onChanged();
         return this;
       }
@@ -645,7 +637,7 @@ public final class WorldRoutineTypeInfoOuterClass {
           emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> worldRoutineInfoListBuilder_;
 
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo> getWorldRoutineInfoListList() {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -655,7 +647,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public int getWorldRoutineInfoListCount() {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -665,7 +657,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo getWorldRoutineInfoList(int index) {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -675,7 +667,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder setWorldRoutineInfoList(
           int index, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo value) {
@@ -692,7 +684,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder setWorldRoutineInfoList(
           int index, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder builderForValue) {
@@ -706,7 +698,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder addWorldRoutineInfoList(emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo value) {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -722,7 +714,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder addWorldRoutineInfoList(
           int index, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo value) {
@@ -739,7 +731,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder addWorldRoutineInfoList(
           emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder builderForValue) {
@@ -753,7 +745,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder addWorldRoutineInfoList(
           int index, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder builderForValue) {
@@ -767,7 +759,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder addAllWorldRoutineInfoList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo> values) {
@@ -782,7 +774,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder clearWorldRoutineInfoList() {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -795,7 +787,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public Builder removeWorldRoutineInfoList(int index) {
         if (worldRoutineInfoListBuilder_ == null) {
@@ -808,14 +800,14 @@ public final class WorldRoutineTypeInfoOuterClass {
         return this;
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder getWorldRoutineInfoListBuilder(
           int index) {
         return getWorldRoutineInfoListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder getWorldRoutineInfoListOrBuilder(
           int index) {
@@ -825,7 +817,7 @@ public final class WorldRoutineTypeInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfoOrBuilder> 
            getWorldRoutineInfoListOrBuilderList() {
@@ -836,14 +828,14 @@ public final class WorldRoutineTypeInfoOuterClass {
         }
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder addWorldRoutineInfoListBuilder() {
         return getWorldRoutineInfoListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder addWorldRoutineInfoListBuilder(
           int index) {
@@ -851,7 +843,7 @@ public final class WorldRoutineTypeInfoOuterClass {
             index, emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.getDefaultInstance());
       }
       /**
-       * <code>repeated .WorldRoutineInfo world_routine_info_list = 2;</code>
+       * <code>repeated .WorldRoutineInfo world_routine_info_list = 5;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.WorldRoutineInfo.Builder> 
            getWorldRoutineInfoListBuilderList() {
@@ -872,33 +864,33 @@ public final class WorldRoutineTypeInfoOuterClass {
         return worldRoutineInfoListBuilder_;
       }
 
-      private int nextRefreshTime_ ;
+      private int routineType_ ;
       /**
-       * <code>uint32 next_refresh_time = 4;</code>
-       * @return The nextRefreshTime.
+       * <code>uint32 routine_type = 12;</code>
+       * @return The routineType.
        */
       @java.lang.Override
-      public int getNextRefreshTime() {
-        return nextRefreshTime_;
+      public int getRoutineType() {
+        return routineType_;
       }
       /**
-       * <code>uint32 next_refresh_time = 4;</code>
-       * @param value The nextRefreshTime to set.
+       * <code>uint32 routine_type = 12;</code>
+       * @param value The routineType to set.
        * @return This builder for chaining.
        */
-      public Builder setNextRefreshTime(int value) {
+      public Builder setRoutineType(int value) {
         
-        nextRefreshTime_ = value;
+        routineType_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>uint32 next_refresh_time = 4;</code>
+       * <code>uint32 routine_type = 12;</code>
        * @return This builder for chaining.
        */
-      public Builder clearNextRefreshTime() {
+      public Builder clearRoutineType() {
         
-        nextRefreshTime_ = 0;
+        routineType_ = 0;
         onChanged();
         return this;
       }
@@ -970,10 +962,10 @@ public final class WorldRoutineTypeInfoOuterClass {
   static {
     java.lang.String[] descriptorData = {
       "\n\032WorldRoutineTypeInfo.proto\032\026WorldRouti" +
-      "neInfo.proto\"{\n\024WorldRoutineTypeInfo\022\024\n\014" +
-      "routine_type\030\001 \001(\r\0222\n\027world_routine_info" +
-      "_list\030\002 \003(\0132\021.WorldRoutineInfo\022\031\n\021next_r" +
-      "efresh_time\030\004 \001(\rB\033\n\031emu.grasscutter.net" +
+      "neInfo.proto\"{\n\024WorldRoutineTypeInfo\022\031\n\021" +
+      "next_refresh_time\030\001 \001(\r\0222\n\027world_routine" +
+      "_info_list\030\005 \003(\0132\021.WorldRoutineInfo\022\024\n\014r" +
+      "outine_type\030\014 \001(\rB\033\n\031emu.grasscutter.net" +
       ".protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -986,7 +978,7 @@ public final class WorldRoutineTypeInfoOuterClass {
     internal_static_WorldRoutineTypeInfo_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_WorldRoutineTypeInfo_descriptor,
-        new java.lang.String[] { "RoutineType", "WorldRoutineInfoList", "NextRefreshTime", });
+        new java.lang.String[] { "NextRefreshTime", "WorldRoutineInfoList", "RoutineType", });
     emu.grasscutter.net.proto.WorldRoutineInfoOuterClass.getDescriptor();
   }
 
diff --git a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeRefreshNotifyOuterClass.java b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeRefreshNotifyOuterClass.java
index a55408392..5fc35cade 100644
--- a/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeRefreshNotifyOuterClass.java
+++ b/src/generated/main/java/emu/grasscutter/net/proto/WorldRoutineTypeRefreshNotifyOuterClass.java
@@ -19,26 +19,21 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      * @return Whether the worldRoutineType field is set.
      */
     boolean hasWorldRoutineType();
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      * @return The worldRoutineType.
      */
     emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo getWorldRoutineType();
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      */
     emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfoOrBuilder getWorldRoutineTypeOrBuilder();
   }
   /**
-   * <pre>
-   * CmdId: 26687
-   * Obf: JHDIBPDJHEL
-   * </pre>
-   *
    * Protobuf type {@code WorldRoutineTypeRefreshNotify}
    */
   public static final class WorldRoutineTypeRefreshNotify extends
@@ -83,7 +78,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
             case 0:
               done = true;
               break;
-            case 122: {
+            case 18: {
               emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder subBuilder = null;
               if (worldRoutineType_ != null) {
                 subBuilder = worldRoutineType_.toBuilder();
@@ -128,10 +123,10 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
               emu.grasscutter.net.proto.WorldRoutineTypeRefreshNotifyOuterClass.WorldRoutineTypeRefreshNotify.class, emu.grasscutter.net.proto.WorldRoutineTypeRefreshNotifyOuterClass.WorldRoutineTypeRefreshNotify.Builder.class);
     }
 
-    public static final int WORLD_ROUTINE_TYPE_FIELD_NUMBER = 15;
+    public static final int WORLD_ROUTINE_TYPE_FIELD_NUMBER = 2;
     private emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo worldRoutineType_;
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      * @return Whether the worldRoutineType field is set.
      */
     @java.lang.Override
@@ -139,7 +134,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       return worldRoutineType_ != null;
     }
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      * @return The worldRoutineType.
      */
     @java.lang.Override
@@ -147,7 +142,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       return worldRoutineType_ == null ? emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.getDefaultInstance() : worldRoutineType_;
     }
     /**
-     * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+     * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfoOrBuilder getWorldRoutineTypeOrBuilder() {
@@ -169,7 +164,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (worldRoutineType_ != null) {
-        output.writeMessage(15, getWorldRoutineType());
+        output.writeMessage(2, getWorldRoutineType());
       }
       unknownFields.writeTo(output);
     }
@@ -182,7 +177,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       size = 0;
       if (worldRoutineType_ != null) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, getWorldRoutineType());
+          .computeMessageSize(2, getWorldRoutineType());
       }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
@@ -315,11 +310,6 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       return builder;
     }
     /**
-     * <pre>
-     * CmdId: 26687
-     * Obf: JHDIBPDJHEL
-     * </pre>
-     *
      * Protobuf type {@code WorldRoutineTypeRefreshNotify}
      */
     public static final class Builder extends
@@ -478,14 +468,14 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo, emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder, emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfoOrBuilder> worldRoutineTypeBuilder_;
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        * @return Whether the worldRoutineType field is set.
        */
       public boolean hasWorldRoutineType() {
         return worldRoutineTypeBuilder_ != null || worldRoutineType_ != null;
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        * @return The worldRoutineType.
        */
       public emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo getWorldRoutineType() {
@@ -496,7 +486,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         }
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public Builder setWorldRoutineType(emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo value) {
         if (worldRoutineTypeBuilder_ == null) {
@@ -512,7 +502,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public Builder setWorldRoutineType(
           emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder builderForValue) {
@@ -526,7 +516,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public Builder mergeWorldRoutineType(emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo value) {
         if (worldRoutineTypeBuilder_ == null) {
@@ -544,7 +534,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public Builder clearWorldRoutineType() {
         if (worldRoutineTypeBuilder_ == null) {
@@ -558,7 +548,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         return this;
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder getWorldRoutineTypeBuilder() {
         
@@ -566,7 +556,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         return getWorldRoutineTypeFieldBuilder().getBuilder();
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       public emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfoOrBuilder getWorldRoutineTypeOrBuilder() {
         if (worldRoutineTypeBuilder_ != null) {
@@ -577,7 +567,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
         }
       }
       /**
-       * <code>.WorldRoutineTypeInfo world_routine_type = 15;</code>
+       * <code>.WorldRoutineTypeInfo world_routine_type = 2;</code>
        */
       private com.google.protobuf.SingleFieldBuilderV3<
           emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo, emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfo.Builder, emu.grasscutter.net.proto.WorldRoutineTypeInfoOuterClass.WorldRoutineTypeInfoOrBuilder> 
@@ -662,7 +652,7 @@ public final class WorldRoutineTypeRefreshNotifyOuterClass {
       "\n#WorldRoutineTypeRefreshNotify.proto\032\032W" +
       "orldRoutineTypeInfo.proto\"R\n\035WorldRoutin" +
       "eTypeRefreshNotify\0221\n\022world_routine_type" +
-      "\030\017 \001(\0132\025.WorldRoutineTypeInfoB\033\n\031emu.gra" +
+      "\030\002 \001(\0132\025.WorldRoutineTypeInfoB\033\n\031emu.gra" +
       "sscutter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor